From: Lu Baolu <baolu.lu@linux.intel.com>
To: Joerg Roedel <joro@8bytes.org>, Jason Gunthorpe <jgg@nvidia.com>,
Christoph Hellwig <hch@infradead.org>,
Bjorn Helgaas <bhelgaas@google.com>,
Kevin Tian <kevin.tian@intel.com>,
Ashok Raj <ashok.raj@intel.com>, Will Deacon <will@kernel.org>,
Robin Murphy <robin.murphy@arm.com>,
Jean-Philippe Brucker <jean-philippe@linaro.com>,
Dave Jiang <dave.jiang@intel.com>,
Fenghua Yu <fenghua.yu@intel.com>, Vinod Koul <vkoul@kernel.org>
Cc: Eric Auger <eric.auger@redhat.com>, Liu Yi L <yi.l.liu@intel.com>,
Jacob jun Pan <jacob.jun.pan@intel.com>,
Zhangfei Gao <zhangfei.gao@linaro.org>,
Zhu Tony <tony.zhu@intel.com>,
iommu@lists.linux.dev, linux-pci@vger.kernel.org,
linux-kernel@vger.kernel.org, Lu Baolu <baolu.lu@linux.intel.com>
Subject: [PATCH v12 02/17] iommu: Add max_pasids field in struct dev_iommu
Date: Fri, 26 Aug 2022 20:11:26 +0800 [thread overview]
Message-ID: <20220826121141.50743-3-baolu.lu@linux.intel.com> (raw)
In-Reply-To: <20220826121141.50743-1-baolu.lu@linux.intel.com>
Use this field to save the number of PASIDs that a device is able to
consume. It is a generic attribute of a device and lifting it into the
per-device dev_iommu struct could help to avoid the boilerplate code
in various IOMMU drivers.
Signed-off-by: Lu Baolu <baolu.lu@linux.intel.com>
Reviewed-by: Kevin Tian <kevin.tian@intel.com>
Reviewed-by: Jason Gunthorpe <jgg@nvidia.com>
Reviewed-by: Yi Liu <yi.l.liu@intel.com>
Tested-by: Zhangfei Gao <zhangfei.gao@linaro.org>
Tested-by: Tony Zhu <tony.zhu@intel.com>
---
include/linux/iommu.h | 2 ++
drivers/iommu/iommu.c | 20 ++++++++++++++++++++
2 files changed, 22 insertions(+)
diff --git a/include/linux/iommu.h b/include/linux/iommu.h
index ed172cbdabf2..0d9ce209a501 100644
--- a/include/linux/iommu.h
+++ b/include/linux/iommu.h
@@ -368,6 +368,7 @@ struct iommu_fault_param {
* @fwspec: IOMMU fwspec data
* @iommu_dev: IOMMU device this device is linked to
* @priv: IOMMU Driver private data
+ * @max_pasids: number of PASIDs this device can consume
*
* TODO: migrate other per device data pointers under iommu_dev_data, e.g.
* struct iommu_group *iommu_group;
@@ -379,6 +380,7 @@ struct dev_iommu {
struct iommu_fwspec *fwspec;
struct iommu_device *iommu_dev;
void *priv;
+ u32 max_pasids;
};
int iommu_device_register(struct iommu_device *iommu,
diff --git a/drivers/iommu/iommu.c b/drivers/iommu/iommu.c
index 780fb7071577..e9f6a8d33b58 100644
--- a/drivers/iommu/iommu.c
+++ b/drivers/iommu/iommu.c
@@ -20,6 +20,7 @@
#include <linux/idr.h>
#include <linux/err.h>
#include <linux/pci.h>
+#include <linux/pci-ats.h>
#include <linux/bitops.h>
#include <linux/property.h>
#include <linux/fsl/mc.h>
@@ -218,6 +219,24 @@ static void dev_iommu_free(struct device *dev)
kfree(param);
}
+static u32 dev_iommu_get_max_pasids(struct device *dev)
+{
+ u32 max_pasids = 0, bits = 0;
+ int ret;
+
+ if (dev_is_pci(dev)) {
+ ret = pci_max_pasids(to_pci_dev(dev));
+ if (ret > 0)
+ max_pasids = ret;
+ } else {
+ ret = device_property_read_u32(dev, "pasid-num-bits", &bits);
+ if (!ret)
+ max_pasids = 1UL << bits;
+ }
+
+ return min_t(u32, max_pasids, dev->iommu->iommu_dev->max_pasids);
+}
+
static int __iommu_probe_device(struct device *dev, struct list_head *group_list)
{
const struct iommu_ops *ops = dev->bus->iommu_ops;
@@ -243,6 +262,7 @@ static int __iommu_probe_device(struct device *dev, struct list_head *group_list
}
dev->iommu->iommu_dev = iommu_dev;
+ dev->iommu->max_pasids = dev_iommu_get_max_pasids(dev);
group = iommu_group_get_for_dev(dev);
if (IS_ERR(group)) {
--
2.25.1
next prev parent reply other threads:[~2022-08-26 12:17 UTC|newest]
Thread overview: 43+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-08-26 12:11 [PATCH v12 00/17] iommu: SVA and IOPF refactoring Lu Baolu
2022-08-26 12:11 ` [PATCH v12 01/17] iommu: Add max_pasids field in struct iommu_device Lu Baolu
2022-08-26 12:11 ` Lu Baolu [this message]
2022-08-26 12:11 ` [PATCH v12 03/17] iommu: Remove SVM_FLAG_SUPERVISOR_MODE support Lu Baolu
2022-08-26 12:11 ` [PATCH v12 04/17] PCI: Enable PASID only when ACS RR & UF enabled on upstream path Lu Baolu
2022-08-26 14:26 ` Jason Gunthorpe
2022-08-26 12:11 ` [PATCH v12 05/17] iommu: Add attach/detach_dev_pasid iommu interface Lu Baolu
2022-08-26 14:37 ` Jason Gunthorpe
2022-08-28 12:52 ` Baolu Lu
2022-08-26 12:11 ` [PATCH v12 06/17] iommu: Add IOMMU SVA domain support Lu Baolu
2022-08-26 12:11 ` [PATCH v12 07/17] iommu: Try to allocate blocking domain when probing device Lu Baolu
2022-08-26 14:52 ` Jason Gunthorpe
2022-08-29 3:40 ` Baolu Lu
2022-08-29 17:27 ` Jason Gunthorpe
2022-08-30 1:46 ` Baolu Lu
2022-08-30 13:29 ` Jason Gunthorpe
2022-08-31 1:49 ` Baolu Lu
2022-08-31 14:10 ` Jason Gunthorpe
2022-09-01 10:44 ` Baolu Lu
2022-09-02 12:48 ` Jason Gunthorpe
2022-08-26 12:11 ` [PATCH v12 08/17] iommu: Make free of iommu_domain_ops optional Lu Baolu
2022-08-26 14:53 ` Jason Gunthorpe
2022-08-26 14:55 ` Jason Gunthorpe
2022-08-26 12:11 ` [PATCH v12 09/17] iommu/vt-d: Add blocking domain support Lu Baolu
2022-08-26 14:54 ` Jason Gunthorpe
2022-08-28 12:55 ` Baolu Lu
2022-08-26 12:11 ` [PATCH v12 10/17] iommu/vt-d: Add SVA " Lu Baolu
2022-08-26 12:11 ` [PATCH v12 11/17] arm-smmu-v3: Add blocking " Lu Baolu
2022-08-26 14:31 ` Jason Gunthorpe
2022-08-26 12:11 ` [PATCH v12 12/17] arm-smmu-v3/sva: Add SVA " Lu Baolu
2022-08-26 14:56 ` Jason Gunthorpe
2022-08-28 13:57 ` Baolu Lu
2022-08-29 17:29 ` Jason Gunthorpe
2022-08-30 2:04 ` Baolu Lu
2022-08-26 12:11 ` [PATCH v12 13/17] iommu/sva: Refactoring iommu_sva_bind/unbind_device() Lu Baolu
2022-08-30 7:30 ` Yuan Can
2022-08-30 7:45 ` Baolu Lu
2022-08-30 7:46 ` Baolu Lu
2022-08-26 12:11 ` [PATCH v12 14/17] iommu: Remove SVA related callbacks from iommu ops Lu Baolu
2022-08-26 12:11 ` [PATCH v12 15/17] iommu: Prepare IOMMU domain for IOPF Lu Baolu
2022-08-26 12:11 ` [PATCH v12 16/17] iommu: Per-domain I/O page fault handling Lu Baolu
2022-08-26 12:11 ` [PATCH v12 17/17] iommu: Rename iommu-sva-lib.{c,h} Lu Baolu
2022-08-26 15:50 ` [PATCH v12 00/17] iommu: SVA and IOPF refactoring Jason Gunthorpe
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=20220826121141.50743-3-baolu.lu@linux.intel.com \
--to=baolu.lu@linux.intel.com \
--cc=ashok.raj@intel.com \
--cc=bhelgaas@google.com \
--cc=dave.jiang@intel.com \
--cc=eric.auger@redhat.com \
--cc=fenghua.yu@intel.com \
--cc=hch@infradead.org \
--cc=iommu@lists.linux.dev \
--cc=jacob.jun.pan@intel.com \
--cc=jean-philippe@linaro.com \
--cc=jgg@nvidia.com \
--cc=joro@8bytes.org \
--cc=kevin.tian@intel.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-pci@vger.kernel.org \
--cc=robin.murphy@arm.com \
--cc=tony.zhu@intel.com \
--cc=vkoul@kernel.org \
--cc=will@kernel.org \
--cc=yi.l.liu@intel.com \
--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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox