Commit b0ffdb23 authored Oct 28, 2024 by Vasant Hegde Committed by Joerg Roedel Oct 29, 2024

iommu/amd: Add helper function to check GIOSUP/GTSUP



amd_iommu_gt_ppr_supported() only checks for GTSUP. To support PASID
with V2 page table we need GIOSUP as well. Hence add new helper function
to check GIOSUP/GTSUP.

Signed-off-by: Vasant Hegde <vasant.hegde@amd.com>
Reviewed-by: Jason Gunthorpe <jgg@nvidia.com>
Link: https://lore.kernel.org/r/20241028093810.5901-6-vasant.hegde@amd.com


Signed-off-by: Joerg Roedel <jroedel@suse.de>

parent 60c30aa6

drivers/iommu/amd/amd_iommu.h

+6 −1

Original line number	Diff line number	Diff line
		@@ -118,9 +118,14 @@ static inline bool check_feature2(u64 mask)
		return (amd_iommu_efr2 & mask);
		}

		static inline bool amd_iommu_v2_pgtbl_supported(void)
		{
		return (check_feature(FEATURE_GIOSUP) && check_feature(FEATURE_GT));
		}

		static inline bool amd_iommu_gt_ppr_supported(void)
		{
		return (check_feature(FEATURE_GT) &&
		return (amd_iommu_v2_pgtbl_supported() &&
		check_feature(FEATURE_PPR) &&
		check_feature(FEATURE_EPHSUP));
		}

drivers/iommu/amd/init.c

+1 −2

Original line number	Diff line number	Diff line
		@@ -2071,8 +2071,7 @@ static int __init iommu_init_pci(struct amd_iommu *iommu)
		init_iommu_perf_ctr(iommu);

		if (amd_iommu_pgtable == AMD_IOMMU_V2) {
		if (!check_feature(FEATURE_GIOSUP) \|\|
		!check_feature(FEATURE_GT)) {
		if (!amd_iommu_v2_pgtbl_supported()) {
		pr_warn("Cannot enable v2 page table for DMA-API. Fallback to v1.\n");
		amd_iommu_pgtable = AMD_IOMMU_V1;
		}