iommu/vt-d: Honour intel_iommu=sp_off for non-VMM domains

Signed-off-by: David Woodhouse <David.Woodhouse@intel.com>

diff --git a/drivers/iommu/intel-iommu.c b/drivers/iommu/intel-iommu.c
index f5934fc2bbccad6ca9bf63cb710dbf688dd7fdac..c3d4bc91a189a7c34ef7f1809fa0feb474cad1a9 100644 (file)
--- a/drivers/iommu/intel-iommu.c
+++ b/drivers/iommu/intel-iommu.c
@@ -1624,7 +1624,11 @@ static int domain_init(struct dmar_domain *domain, int guest_width)
        else
                domain->iommu_snooping = 0;
 
-       domain->iommu_superpage = fls(cap_super_page_val(iommu->cap));
+       if (intel_iommu_superpage)
+               domain->iommu_superpage = fls(cap_super_page_val(iommu->cap));
+       else
+               domain->iommu_superpage = 0;
+
        domain->nid = iommu->node;
 
        /* always allocate the top pgd */