Commit 3d4c7cc3 authored by Lu Baolu's avatar Lu Baolu Committed by Joerg Roedel
Browse files

iommu/vt-d: Move iopf code from SVA to IOPF enabling path 



Generally enabling IOMMU_DEV_FEAT_SVA requires IOMMU_DEV_FEAT_IOPF, but
some devices manage I/O Page Faults themselves instead of relying on the
IOMMU. Move IOPF related code from SVA to IOPF enabling path.

For the device drivers that relies on the IOMMU for IOPF through PCI/PRI,
IOMMU_DEV_FEAT_IOPF must be enabled before and disabled after
IOMMU_DEV_FEAT_SVA.

Reviewed-by: default avatarKevin Tian <kevin.tian@intel.com>
Signed-off-by: default avatarLu Baolu <baolu.lu@linux.intel.com>
Link: https://lore.kernel.org/r/20230324120234.313643-4-baolu.lu@linux.intel.com


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

drivers/iommu/intel/iommu.c

+18 −14
Original line number Diff line number Diff line
@@ -4638,7 +4638,6 @@ static int intel_iommu_enable_sva(struct device *dev) 
{

	struct device_domain_info *info = dev_iommu_priv_get(dev);

	struct intel_iommu *iommu;

	int ret;



	if (!info || dmar_disabled)

		return -EINVAL;
@@ -4667,6 +4666,21 @@ static int intel_iommu_enable_sva(struct device *dev) 
	if (!info->pri_enabled)

		return -EINVAL;



	return 0;

}



static int intel_iommu_enable_iopf(struct device *dev)

{

	struct device_domain_info *info = dev_iommu_priv_get(dev);

	struct intel_iommu *iommu;

	int ret;



	if (!info || !info->ats_enabled || !info->pri_enabled)

		return -ENODEV;

	iommu = info->iommu;

	if (!iommu)

		return -EINVAL;



	ret = iopf_queue_add_device(iommu->iopf_queue, dev);

	if (ret)

		return ret;
@@ -4678,7 +4692,7 @@ static int intel_iommu_enable_sva(struct device *dev) 
	return ret;

}



static int intel_iommu_disable_sva(struct device *dev)

static int intel_iommu_disable_iopf(struct device *dev)

{

	struct device_domain_info *info = dev_iommu_priv_get(dev);

	struct intel_iommu *iommu = info->iommu;
@@ -4695,16 +4709,6 @@ static int intel_iommu_disable_sva(struct device *dev) 
	return ret;

}



static int intel_iommu_enable_iopf(struct device *dev)

{

	struct device_domain_info *info = dev_iommu_priv_get(dev);



	if (info && info->pri_supported)

		return 0;



	return -ENODEV;

}



static int

intel_iommu_dev_enable_feat(struct device *dev, enum iommu_dev_features feat)

{
@@ -4725,10 +4729,10 @@ intel_iommu_dev_disable_feat(struct device *dev, enum iommu_dev_features feat) 
{

	switch (feat) {

	case IOMMU_DEV_FEAT_IOPF:

		return 0;

		return intel_iommu_disable_iopf(dev);



	case IOMMU_DEV_FEAT_SVA:

		return intel_iommu_disable_sva(dev);

		return 0;



	default:

		return -ENODEV;