iommu/vt-d: Use a helper function to skip agaw for SL (3aef9ca6) · Commits · 戴 / test

drivers/iommu/intel-pasid.c

+23 −10

Original line number	Diff line number	Diff line
		@@ -499,6 +499,25 @@ int intel_pasid_setup_first_level(struct intel_iommu *iommu,
		return 0;
		}

		/*
		* Skip top levels of page tables for iommu which has less agaw
		* than default. Unnecessary for PT mode.
		*/
		static inline int iommu_skip_agaw(struct dmar_domain *domain,
		struct intel_iommu *iommu,
		struct dma_pte **pgd)
		{
		int agaw;

		for (agaw = domain->agaw; agaw > iommu->agaw; agaw--) {
		pgd = phys_to_virt(dma_pte_addr(pgd));
		if (!dma_pte_present(*pgd))
		return -EINVAL;
		}

		return agaw;
		}

		/*
		* Set up the scalable mode pasid entry for second only translation type.
		*/
		@@ -522,18 +541,12 @@ 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)) {
		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);
		did = domain->iommu_did[iommu->seq_id];