Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit d14d6577 authored by Joerg Roedel's avatar Joerg Roedel
Browse files

VT-d: adapt domain iova_to_phys function for IOMMU API 



Signed-off-by: default avatarJoerg Roedel <joerg.roedel@amd.com>
parent dde57a21

drivers/pci/intel-iommu.c

+4 −3
Original line number Original line Diff line number Diff line
@@ -3106,15 +3106,16 @@ int intel_iommu_found(void) 
}

}

EXPORT_SYMBOL_GPL(intel_iommu_found);

EXPORT_SYMBOL_GPL(intel_iommu_found);





u64 intel_iommu_iova_to_phys(struct dmar_domain *domain, u64 iova)

static phys_addr_t intel_iommu_iova_to_phys(struct iommu_domain *domain,

					    unsigned long iova)

{

{

	struct dmar_domain *dmar_domain = domain->priv;

	struct dma_pte *pte;

	struct dma_pte *pte;

	u64 phys = 0;

	u64 phys = 0;





	pte = addr_to_dma_pte(domain, iova);

	pte = addr_to_dma_pte(dmar_domain, iova);

	if (pte)

	if (pte)

		phys = dma_pte_addr(pte);

		phys = dma_pte_addr(pte);





	return phys;

	return phys;

}
 
}
 
EXPORT_SYMBOL_GPL(intel_iommu_iova_to_phys);

include/linux/intel-iommu.h

+0 −2
Original line number Original line Diff line number Diff line
@@ -330,8 +330,6 @@ extern int qi_flush_iotlb(struct intel_iommu *iommu, u16 did, u64 addr, 




extern void qi_submit_sync(struct qi_desc *desc, struct intel_iommu *iommu);

extern void qi_submit_sync(struct qi_desc *desc, struct intel_iommu *iommu);





u64 intel_iommu_iova_to_phys(struct dmar_domain *domain, u64 iova);



#ifdef CONFIG_DMAR

#ifdef CONFIG_DMAR

int intel_iommu_found(void);

int intel_iommu_found(void);

#else /* CONFIG_DMAR */

#else /* CONFIG_DMAR */