aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDavid Woodhouse <David.Woodhouse@intel.com>2014-03-19 06:38:49 -0400
committerDavid Woodhouse <David.Woodhouse@intel.com>2014-03-19 13:22:13 -0400
commit214e39aa36c9c02355d388f20d83b93fc2fa7298 (patch)
tree9300218db801c8aa7a12314b89348fe376934d8f
parentea8ea460c9ace60bbb5ac6e5521d637d5c15293d (diff)
iommu/vt-d: Honour intel_iommu=sp_off for non-VMM domains
Signed-off-by: David Woodhouse <David.Woodhouse@intel.com>
-rw-r--r--drivers/iommu/intel-iommu.c6
1 files changed, 5 insertions, 1 deletions
diff --git a/drivers/iommu/intel-iommu.c b/drivers/iommu/intel-iommu.c
index f5934fc2bbcc..c3d4bc91a189 100644
--- 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)
1624 else 1624 else
1625 domain->iommu_snooping = 0; 1625 domain->iommu_snooping = 0;
1626 1626
1627 domain->iommu_superpage = fls(cap_super_page_val(iommu->cap)); 1627 if (intel_iommu_superpage)
1628 domain->iommu_superpage = fls(cap_super_page_val(iommu->cap));
1629 else
1630 domain->iommu_superpage = 0;
1631
1628 domain->nid = iommu->node; 1632 domain->nid = iommu->node;
1629 1633
1630 /* always allocate the top pgd */ 1634 /* always allocate the top pgd */