Commit 33aef978 authored by Suravee Suthikulpanit's avatar Suravee Suthikulpanit Committed by Joerg Roedel
Browse files

iommu/amd: Rename variables to be consistent with struct io_pgtable_ops 



There is no functional change.

Signed-off-by: default avatarSuravee Suthikulpanit <suravee.suthikulpanit@amd.com>
Link: https://lore.kernel.org/r/20201215073705.123786-10-suravee.suthikulpanit@amd.com


Signed-off-by: default avatarJoerg Roedel <jroedel@suse.de>
parent 6eedb59c

drivers/iommu/amd/io_pgtable.c

+15 −16
Original line number Diff line number Diff line
@@ -387,9 +387,9 @@ static struct page *free_clear_pte(u64 *pte, u64 pteval, struct page *freelist) 
 * and full 64 bit address spaces.

 */

int iommu_map_page(struct protection_domain *dom,

		   unsigned long bus_addr,

		   unsigned long phys_addr,

		   unsigned long page_size,

		   unsigned long iova,

		   unsigned long paddr,

		   unsigned long size,

		   int prot,

		   gfp_t gfp)

{
@@ -398,15 +398,15 @@ int iommu_map_page(struct protection_domain *dom, 
	u64 __pte, *pte;

	int ret, i, count;



	BUG_ON(!IS_ALIGNED(bus_addr, page_size));

	BUG_ON(!IS_ALIGNED(phys_addr, page_size));

	BUG_ON(!IS_ALIGNED(iova, size));

	BUG_ON(!IS_ALIGNED(paddr, size));



	ret = -EINVAL;

	if (!(prot & IOMMU_PROT_MASK))

		goto out;



	count = PAGE_SIZE_PTE_COUNT(page_size);

	pte   = alloc_pte(dom, bus_addr, page_size, NULL, gfp, &updated);

	count = PAGE_SIZE_PTE_COUNT(size);

	pte   = alloc_pte(dom, iova, size, NULL, gfp, &updated);



	ret = -ENOMEM;

	if (!pte)
@@ -419,10 +419,10 @@ int iommu_map_page(struct protection_domain *dom, 
		updated = true;



	if (count > 1) {

		__pte = PAGE_SIZE_PTE(__sme_set(phys_addr), page_size);

		__pte = PAGE_SIZE_PTE(__sme_set(paddr), size);

		__pte |= PM_LEVEL_ENC(7) | IOMMU_PTE_PR | IOMMU_PTE_FC;

	} else

		__pte = __sme_set(phys_addr) | IOMMU_PTE_PR | IOMMU_PTE_FC;

		__pte = __sme_set(paddr) | IOMMU_PTE_PR | IOMMU_PTE_FC;



	if (prot & IOMMU_PROT_IR)

		__pte |= IOMMU_PTE_IR;
@@ -456,20 +456,19 @@ int iommu_map_page(struct protection_domain *dom, 
}



unsigned long iommu_unmap_page(struct protection_domain *dom,

			       unsigned long bus_addr,

			       unsigned long page_size)

			       unsigned long iova,

			       unsigned long size)

{

	unsigned long long unmapped;

	unsigned long unmap_size;

	u64 *pte;



	BUG_ON(!is_power_of_2(page_size));

	BUG_ON(!is_power_of_2(size));



	unmapped = 0;



	while (unmapped < page_size) {



		pte = fetch_pte(dom, bus_addr, &unmap_size);

	while (unmapped < size) {

		pte = fetch_pte(dom, iova, &unmap_size);



		if (pte) {

			int i, count;
@@ -479,7 +478,7 @@ unsigned long iommu_unmap_page(struct protection_domain *dom, 
				pte[i] = 0ULL;

		}



		bus_addr  = (bus_addr & ~(unmap_size - 1)) + unmap_size;

		iova = (iova & ~(unmap_size - 1)) + unmap_size;

		unmapped += unmap_size;

	}