Signed-off-by: Jacob Pan <jacob.jun....@linux.intel.com>
---
 drivers/iommu/intel-pasid.c | 14 ++++----------
 1 file changed, 4 insertions(+), 10 deletions(-)

diff --git a/drivers/iommu/intel-pasid.c b/drivers/iommu/intel-pasid.c
index 191508c7c03e..9bdb7ee228b6 100644
--- a/drivers/iommu/intel-pasid.c
+++ b/drivers/iommu/intel-pasid.c
@@ -544,17 +544,11 @@ int intel_pasid_setup_second_level(struct intel_iommu 
*iommu,
                return -EINVAL;
        }
 
-       /*
-        * Skip top levels of page tables for iommu which has less agaw
-        * than default. Unnecessary for PT mode.
-        */
        pgd = domain->pgd;
-       for (agaw = domain->agaw; agaw > iommu->agaw; agaw--) {
-               pgd = phys_to_virt(dma_pte_addr(pgd));
-               if (!dma_pte_present(pgd)) {
-                       dev_err(dev, "Invalid domain page table\n");
-                       return -EINVAL;
-               }
+       agaw = iommu_skip_agaw(domain, iommu, &pgd);
+       if (agaw < 0) {
+               dev_err(dev, "Invalid domain page table\n");
+               return -EINVAL;
        }
 
        pgd_val = virt_to_phys(pgd);
-- 
2.7.4

_______________________________________________
iommu mailing list
iommu@lists.linux-foundation.org
https://lists.linuxfoundation.org/mailman/listinfo/iommu

Reply via email to