Commit 7b4e5623 authored by Vasant Hegde's avatar Vasant Hegde Committed by Joerg Roedel
Browse files

iommu/amd: Use protection_domain.flags to check page table mode 



Page table mode (v1, v2 or pt) is per domain property. Recently we have
enhanced protection_domain.pd_mode to track per domain page table mode.
Use that variable to check the page table mode instead of global
'amd_iommu_pgtable' in {map/unmap}_pages path.

Signed-off-by: default avatarVasant Hegde <vasant.hegde@amd.com>
Reviewed-by: default avatarJason Gunthorpe <jgg@nvidia.com>
Link: https://lore.kernel.org/r/20240205115615.6053-7-vasant.hegde@amd.com


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

drivers/iommu/amd/iommu.c

+2 −2
Original line number Diff line number Diff line
@@ -2310,7 +2310,7 @@ static int amd_iommu_map_pages(struct iommu_domain *dom, unsigned long iova, 
	int prot = 0;

	int ret = -EINVAL;



	if ((amd_iommu_pgtable == AMD_IOMMU_V1) &&

	if ((domain->pd_mode == PD_MODE_V1) &&

	    (domain->iop.mode == PAGE_MODE_NONE))

		return -EINVAL;
@@ -2356,7 +2356,7 @@ static size_t amd_iommu_unmap_pages(struct iommu_domain *dom, unsigned long iova 
	struct io_pgtable_ops *ops = &domain->iop.iop.ops;

	size_t r;



	if ((amd_iommu_pgtable == AMD_IOMMU_V1) &&

	if ((domain->pd_mode == PD_MODE_V1) &&

	    (domain->iop.mode == PAGE_MODE_NONE))

		return 0;