From: Jean-Philippe Brucker <jean-philippe@linaro.org>
To: joro@8bytes.org, will@kernel.org
Cc: lorenzo.pieralisi@arm.com, robh+dt@kernel.org,
guohanjun@huawei.com, sudeep.holla@arm.com, rjw@rjwysocki.net,
lenb@kernel.org, robin.murphy@arm.com,
Jonathan.Cameron@huawei.com, eric.auger@redhat.com,
iommu@lists.linux-foundation.org, devicetree@vger.kernel.org,
linux-acpi@vger.kernel.org, linux-arm-kernel@lists.infradead.org,
linux-accelerators@lists.ozlabs.org, baolu.lu@linux.intel.com,
jacob.jun.pan@linux.intel.com, kevin.tian@intel.com,
vdumpa@nvidia.com, zhangfei.gao@linaro.org,
shameerali.kolothum.thodi@huawei.com, vivek.gautam@arm.com,
zhukeqian1@huawei.com, wangzhou1@hisilicon.com,
Jean-Philippe Brucker <jean-philippe@linaro.org>,
David Woodhouse <dwmw2@infradead.org>
Subject: [PATCH v14 04/10] iommu/vt-d: Support IOMMU_DEV_FEAT_IOPF
Date: Thu, 1 Apr 2021 17:47:13 +0200 [thread overview]
Message-ID: <20210401154718.307519-5-jean-philippe@linaro.org> (raw)
In-Reply-To: <20210401154718.307519-1-jean-philippe@linaro.org>
Allow drivers to query and enable IOMMU_DEV_FEAT_IOPF, which amounts to
checking whether PRI is enabled.
Reviewed-by: Lu Baolu <baolu.lu@linux.intel.com>
Signed-off-by: Jean-Philippe Brucker <jean-philippe@linaro.org>
---
Cc: David Woodhouse <dwmw2@infradead.org>
Cc: Lu Baolu <baolu.lu@linux.intel.com>
---
drivers/iommu/intel/iommu.c | 11 ++++++++---
1 file changed, 8 insertions(+), 3 deletions(-)
diff --git a/drivers/iommu/intel/iommu.c b/drivers/iommu/intel/iommu.c
index ee0932307d64..c5c5fd444779 100644
--- a/drivers/iommu/intel/iommu.c
+++ b/drivers/iommu/intel/iommu.c
@@ -5343,6 +5343,8 @@ static int siov_find_pci_dvsec(struct pci_dev *pdev)
static bool
intel_iommu_dev_has_feat(struct device *dev, enum iommu_dev_features feat)
{
+ struct device_domain_info *info = get_domain_info(dev);
+
if (feat == IOMMU_DEV_FEAT_AUX) {
int ret;
@@ -5357,13 +5359,13 @@ intel_iommu_dev_has_feat(struct device *dev, enum iommu_dev_features feat)
return !!siov_find_pci_dvsec(to_pci_dev(dev));
}
- if (feat == IOMMU_DEV_FEAT_SVA) {
- struct device_domain_info *info = get_domain_info(dev);
+ if (feat == IOMMU_DEV_FEAT_IOPF)
+ return info && info->pri_supported;
+ if (feat == IOMMU_DEV_FEAT_SVA)
return info && (info->iommu->flags & VTD_FLAG_SVM_CAPABLE) &&
info->pasid_supported && info->pri_supported &&
info->ats_supported;
- }
return false;
}
@@ -5374,6 +5376,9 @@ intel_iommu_dev_enable_feat(struct device *dev, enum iommu_dev_features feat)
if (feat == IOMMU_DEV_FEAT_AUX)
return intel_iommu_enable_auxd(dev);
+ if (feat == IOMMU_DEV_FEAT_IOPF)
+ return intel_iommu_dev_has_feat(dev, feat) ? 0 : -ENODEV;
+
if (feat == IOMMU_DEV_FEAT_SVA) {
struct device_domain_info *info = get_domain_info(dev);
--
2.31.1
next prev parent reply other threads:[~2021-04-01 18:21 UTC|newest]
Thread overview: 21+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-04-01 15:47 [PATCH v14 00/10] iommu: I/O page faults for SMMUv3 Jean-Philippe Brucker
2021-04-01 15:47 ` [PATCH v14 01/10] iommu: Fix comment for struct iommu_fwspec Jean-Philippe Brucker
2021-04-01 15:47 ` [PATCH v14 02/10] iommu/arm-smmu-v3: Use device properties for pasid-num-bits Jean-Philippe Brucker
2021-04-02 0:35 ` Hanjun Guo
2021-04-01 15:47 ` [PATCH v14 03/10] iommu: Separate IOMMU_DEV_FEAT_IOPF from IOMMU_DEV_FEAT_SVA Jean-Philippe Brucker
2021-04-01 15:47 ` Jean-Philippe Brucker [this message]
2021-04-01 15:47 ` [PATCH v14 05/10] uacce: Enable IOMMU_DEV_FEAT_IOPF Jean-Philippe Brucker
2021-04-01 15:47 ` [PATCH v14 06/10] iommu: Add a page fault handler Jean-Philippe Brucker
2021-04-01 15:47 ` [PATCH v14 07/10] iommu/arm-smmu-v3: Maintain a SID->device structure Jean-Philippe Brucker
2021-04-01 17:07 ` Will Deacon
2021-04-01 15:47 ` [PATCH v14 08/10] dt-bindings: document stall property for IOMMU masters Jean-Philippe Brucker
2021-04-01 15:47 ` [PATCH v14 09/10] ACPI/IORT: Enable stall support for platform devices Jean-Philippe Brucker
2021-04-02 0:45 ` Hanjun Guo
2021-04-06 15:29 ` Lorenzo Pieralisi
2021-04-01 15:47 ` [PATCH v14 10/10] iommu/arm-smmu-v3: Add " Jean-Philippe Brucker
2021-04-01 17:11 ` Will Deacon
2021-04-02 1:34 ` Zhangfei Gao
2021-04-02 1:45 ` Zhou Wang
2021-04-01 17:15 ` [PATCH v14 00/10] iommu: I/O page faults for SMMUv3 Will Deacon
2021-04-06 8:01 ` Jean-Philippe Brucker
2021-04-07 8:55 ` Joerg Roedel
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20210401154718.307519-5-jean-philippe@linaro.org \
--to=jean-philippe@linaro.org \
--cc=Jonathan.Cameron@huawei.com \
--cc=baolu.lu@linux.intel.com \
--cc=devicetree@vger.kernel.org \
--cc=dwmw2@infradead.org \
--cc=eric.auger@redhat.com \
--cc=guohanjun@huawei.com \
--cc=iommu@lists.linux-foundation.org \
--cc=jacob.jun.pan@linux.intel.com \
--cc=joro@8bytes.org \
--cc=kevin.tian@intel.com \
--cc=lenb@kernel.org \
--cc=linux-accelerators@lists.ozlabs.org \
--cc=linux-acpi@vger.kernel.org \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=lorenzo.pieralisi@arm.com \
--cc=rjw@rjwysocki.net \
--cc=robh+dt@kernel.org \
--cc=robin.murphy@arm.com \
--cc=shameerali.kolothum.thodi@huawei.com \
--cc=sudeep.holla@arm.com \
--cc=vdumpa@nvidia.com \
--cc=vivek.gautam@arm.com \
--cc=wangzhou1@hisilicon.com \
--cc=will@kernel.org \
--cc=zhangfei.gao@linaro.org \
--cc=zhukeqian1@huawei.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).