Commit 739eb255 authored by Suravee Suthikulpanit's avatar Suravee Suthikulpanit Committed by Joerg Roedel
Browse files

iommu/amd: Introduce iommu_dev_data.ppr 



For AMD IOMMU, the PPR feature is needed to support IO page fault (IOPF).
PPR is enabled per PCI end-point device, and is configured by the PPR bit
in the IOMMU device table entry (i.e DTE[PPR]).

Introducing struct iommu_dev_data.ppr track PPR setting for each device.

Also iommu_dev_data.ppr will be set only when IOMMU supports PPR. Hence
remove redundant feature support check in set_dte_entry().

Signed-off-by: default avatarSuravee Suthikulpanit <suravee.suthikulpanit@amd.com>
Co-developed-by: default avatarVasant Hegde <vasant.hegde@amd.com>
Signed-off-by: default avatarVasant Hegde <vasant.hegde@amd.com>
Reviewed-by: default avatarJason Gunthorpe <jgg@nvidia.com>
Reviewed-by: default avatarJerry Snitselaar <jsnitsel@redhat.com>
Link: https://lore.kernel.org/r/20230921092147.5930-12-vasant.hegde@amd.com


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

drivers/iommu/amd/amd_iommu_types.h

+1 −0
Original line number Diff line number Diff line
@@ -816,6 +816,7 @@ struct iommu_dev_data { 
	u8 ats_enabled  :1;		  /* ATS state */

	u8 pri_tlp      :1;		  /* PASID TLB required for

					     PPR completions */

	u8 ppr          :1;		  /* Enable device PPR support */

	bool use_vapic;			  /* Enable device to use vapic mode */

	bool defer_attach;

drivers/iommu/amd/iommu.c

+4 −6
Original line number Diff line number Diff line
@@ -1638,10 +1638,8 @@ static void set_dte_entry(struct amd_iommu *iommu, u16 devid, 
	if (ats)

		flags |= DTE_FLAG_IOTLB;



	if (ppr) {

		if (check_feature(FEATURE_EPHSUP))

	if (ppr)

		pte_root |= 1ULL << DEV_ENTRY_PPR;

	}



	if (domain->flags & PD_IOMMUV2_MASK) {

		u64 gcr3 = iommu_virt_to_phys(domain->gcr3_tbl);
@@ -1734,7 +1732,7 @@ static void do_attach(struct iommu_dev_data *dev_data, 


	/* Update device table */

	set_dte_entry(iommu, dev_data->devid, domain,

		      ats, dev_data->iommu_v2);

		      ats, dev_data->ppr);

	clone_aliases(iommu, dev_data->dev);



	device_flush_dte(dev_data);
@@ -2013,7 +2011,7 @@ static void update_device_table(struct protection_domain *domain) 
		if (!iommu)

			continue;

		set_dte_entry(iommu, dev_data->devid, domain,

			      dev_data->ats_enabled, dev_data->iommu_v2);

			      dev_data->ats_enabled, dev_data->ppr);

		clone_aliases(iommu, dev_data->dev);

	}

}