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,
Jean-Philippe Brucker <jean-philippe@linaro.org>,
David Woodhouse <dwmw2@infradead.org>
Subject: [PATCH v11 04/10] iommu/vt-d: Support IOMMU_DEV_FEAT_IOPF
Date: Mon, 25 Jan 2021 12:06:45 +0100 [thread overview]
Message-ID: <20210125110650.3232195-5-jean-philippe@linaro.org> (raw)
In-Reply-To: <20210125110650.3232195-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 f665322a0991..c777bd94df5d 100644
--- a/drivers/iommu/intel/iommu.c
+++ b/drivers/iommu/intel/iommu.c
@@ -5330,6 +5330,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;
@@ -5344,13 +5346,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;
}
@@ -5361,6 +5363,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.30.0
WARNING: multiple messages have this Message-ID (diff)
From: Jean-Philippe Brucker <jean-philippe@linaro.org>
To: joro@8bytes.org, will@kernel.org
Cc: vivek.gautam@arm.com, guohanjun@huawei.com,
Jean-Philippe Brucker <jean-philippe@linaro.org>,
linux-acpi@vger.kernel.org, zhangfei.gao@linaro.org,
lenb@kernel.org, devicetree@vger.kernel.org,
kevin.tian@intel.com, robh+dt@kernel.org,
linux-arm-kernel@lists.infradead.org,
David Woodhouse <dwmw2@infradead.org>,
rjw@rjwysocki.net, iommu@lists.linux-foundation.org,
sudeep.holla@arm.com, robin.murphy@arm.com,
linux-accelerators@lists.ozlabs.org
Subject: [PATCH v11 04/10] iommu/vt-d: Support IOMMU_DEV_FEAT_IOPF
Date: Mon, 25 Jan 2021 12:06:45 +0100 [thread overview]
Message-ID: <20210125110650.3232195-5-jean-philippe@linaro.org> (raw)
In-Reply-To: <20210125110650.3232195-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 f665322a0991..c777bd94df5d 100644
--- a/drivers/iommu/intel/iommu.c
+++ b/drivers/iommu/intel/iommu.c
@@ -5330,6 +5330,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;
@@ -5344,13 +5346,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;
}
@@ -5361,6 +5363,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.30.0
_______________________________________________
iommu mailing list
iommu@lists.linux-foundation.org
https://lists.linuxfoundation.org/mailman/listinfo/iommu
WARNING: multiple messages have this Message-ID (diff)
From: Jean-Philippe Brucker <jean-philippe@linaro.org>
To: joro@8bytes.org, will@kernel.org
Cc: vivek.gautam@arm.com, guohanjun@huawei.com,
Jean-Philippe Brucker <jean-philippe@linaro.org>,
lorenzo.pieralisi@arm.com, linux-acpi@vger.kernel.org,
zhangfei.gao@linaro.org, lenb@kernel.org,
devicetree@vger.kernel.org, kevin.tian@intel.com,
jacob.jun.pan@linux.intel.com, eric.auger@redhat.com,
robh+dt@kernel.org, Jonathan.Cameron@huawei.com,
linux-arm-kernel@lists.infradead.org,
David Woodhouse <dwmw2@infradead.org>,
rjw@rjwysocki.net, shameerali.kolothum.thodi@huawei.com,
iommu@lists.linux-foundation.org, sudeep.holla@arm.com,
robin.murphy@arm.com, linux-accelerators@lists.ozlabs.org,
baolu.lu@linux.intel.com
Subject: [PATCH v11 04/10] iommu/vt-d: Support IOMMU_DEV_FEAT_IOPF
Date: Mon, 25 Jan 2021 12:06:45 +0100 [thread overview]
Message-ID: <20210125110650.3232195-5-jean-philippe@linaro.org> (raw)
In-Reply-To: <20210125110650.3232195-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 f665322a0991..c777bd94df5d 100644
--- a/drivers/iommu/intel/iommu.c
+++ b/drivers/iommu/intel/iommu.c
@@ -5330,6 +5330,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;
@@ -5344,13 +5346,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;
}
@@ -5361,6 +5363,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.30.0
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
next prev parent reply other threads:[~2021-01-25 11:27 UTC|newest]
Thread overview: 39+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-01-25 11:06 [PATCH v11 00/10] iommu: I/O page faults for SMMUv3 Jean-Philippe Brucker
2021-01-25 11:06 ` Jean-Philippe Brucker
2021-01-25 11:06 ` Jean-Philippe Brucker
2021-01-25 11:06 ` [PATCH v11 01/10] iommu: Fix comment for struct iommu_fwspec Jean-Philippe Brucker
2021-01-25 11:06 ` Jean-Philippe Brucker
2021-01-25 11:06 ` Jean-Philippe Brucker
2021-01-25 11:06 ` [PATCH v11 02/10] iommu/arm-smmu-v3: Use device properties for pasid-num-bits Jean-Philippe Brucker
2021-01-25 11:06 ` Jean-Philippe Brucker
2021-01-25 11:06 ` Jean-Philippe Brucker
2021-01-25 11:06 ` [PATCH v11 03/10] iommu: Separate IOMMU_DEV_FEAT_IOPF from IOMMU_DEV_FEAT_SVA Jean-Philippe Brucker
2021-01-25 11:06 ` Jean-Philippe Brucker
2021-01-25 11:06 ` Jean-Philippe Brucker
2021-01-25 11:06 ` Jean-Philippe Brucker [this message]
2021-01-25 11:06 ` [PATCH v11 04/10] iommu/vt-d: Support IOMMU_DEV_FEAT_IOPF Jean-Philippe Brucker
2021-01-25 11:06 ` Jean-Philippe Brucker
2021-01-25 11:06 ` [PATCH v11 05/10] uacce: Enable IOMMU_DEV_FEAT_IOPF Jean-Philippe Brucker
2021-01-25 11:06 ` Jean-Philippe Brucker
2021-01-25 11:06 ` Jean-Philippe Brucker
2021-01-25 11:06 ` [PATCH v11 06/10] iommu: Add a page fault handler Jean-Philippe Brucker
2021-01-25 11:06 ` Jean-Philippe Brucker
2021-01-25 11:06 ` Jean-Philippe Brucker
2021-01-25 11:06 ` [PATCH v11 07/10] iommu/arm-smmu-v3: Maintain a SID->device structure Jean-Philippe Brucker
2021-01-25 11:06 ` Jean-Philippe Brucker
2021-01-25 11:06 ` Jean-Philippe Brucker
2021-01-25 11:06 ` [PATCH v11 08/10] dt-bindings: document stall property for IOMMU masters Jean-Philippe Brucker
2021-01-25 11:06 ` Jean-Philippe Brucker
2021-01-25 11:06 ` Jean-Philippe Brucker
2021-01-25 11:06 ` [PATCH v11 09/10] ACPI/IORT: Enable stall support for platform devices Jean-Philippe Brucker
2021-01-25 11:06 ` Jean-Philippe Brucker
2021-01-25 11:06 ` Jean-Philippe Brucker
2021-01-25 11:06 ` [PATCH v11 10/10] iommu/arm-smmu-v3: Add " Jean-Philippe Brucker
2021-01-25 11:06 ` Jean-Philippe Brucker
2021-01-25 11:06 ` Jean-Philippe Brucker
2021-01-25 13:50 ` Jonathan Cameron
2021-01-25 13:50 ` Jonathan Cameron
2021-01-25 13:50 ` Jonathan Cameron
2021-01-25 15:46 ` Jean-Philippe Brucker
2021-01-25 15:46 ` Jean-Philippe Brucker
2021-01-25 15:46 ` Jean-Philippe Brucker
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=20210125110650.3232195-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=will@kernel.org \
--cc=zhangfei.gao@linaro.org \
/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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.