From: Jean-Philippe Brucker <jean-philippe@linaro.org>
To: linux-pci@vger.kernel.org, linux-arm-kernel@lists.infradead.org,
linux-acpi@vger.kernel.org, devicetree@vger.kernel.org,
iommu@lists.linux-foundation.org
Cc: joro@8bytes.org, robh+dt@kernel.org, mark.rutland@arm.com,
lorenzo.pieralisi@arm.com, guohanjun@huawei.com,
sudeep.holla@arm.com, rjw@rjwysocki.net, lenb@kernel.org,
will@kernel.org, robin.murphy@arm.com, bhelgaas@google.com,
eric.auger@redhat.com, jonathan.cameron@huawei.com,
zhangfei.gao@linaro.org
Subject: [PATCH v4 00/13] iommu: Add PASID support to Arm SMMUv3
Date: Thu, 19 Dec 2019 17:30:20 +0100 [thread overview]
Message-ID: <20191219163033.2608177-1-jean-philippe@linaro.org> (raw)
Add support for Substream ID and PASIDs to the SMMUv3 driver. Since v3
[1], I added review and tested tags where appropriate and applied the
suggested changes, shown in the diff below. Thanks all!
I'm testing using the zip accelerator on the Hisilicon KunPeng920 and
Zhangfei's uacce module [2]. The full SVA support, which I'll send out
early next year, is available on my branch sva/zip-devel at
https://jpbrucker.net/git/linux/
[1] https://lore.kernel.org/linux-iommu/20191209180514.272727-1-jean-philippe@linaro.org/
[2] https://lore.kernel.org/linux-iommu/1576465697-27946-1-git-send-email-zhangfei.gao@linaro.org/
Jean-Philippe Brucker (13):
iommu/arm-smmu-v3: Drop __GFP_ZERO flag from DMA allocation
dt-bindings: document PASID property for IOMMU masters
iommu/arm-smmu-v3: Parse PASID devicetree property of platform devices
ACPI/IORT: Parse SSID property of named component node
iommu/arm-smmu-v3: Prepare arm_smmu_s1_cfg for SSID support
iommu/arm-smmu-v3: Add context descriptor tables allocators
iommu/arm-smmu-v3: Add support for Substream IDs
iommu/arm-smmu-v3: Propagate ssid_bits
iommu/arm-smmu-v3: Prepare for handling arm_smmu_write_ctx_desc()
failure
iommu/arm-smmu-v3: Add second level of context descriptor table
iommu/arm-smmu-v3: Improve add_device() error handling
PCI/ATS: Add PASID stubs
iommu/arm-smmu-v3: Add support for PCI PASID
.../devicetree/bindings/iommu/iommu.txt | 6 +
drivers/acpi/arm64/iort.c | 18 +
drivers/iommu/arm-smmu-v3.c | 467 +++++++++++++++---
drivers/iommu/of_iommu.c | 6 +-
include/linux/iommu.h | 2 +
include/linux/pci-ats.h | 3 +
6 files changed, 442 insertions(+), 60 deletions(-)
--
Diff since v3:
#diff --git a/drivers/iommu/arm-smmu-v3.c b/drivers/iommu/arm-smmu-v3.c
index cde7af39681c..8e95ecad4c9a 100644
--- a/drivers/iommu/arm-smmu-v3.c
+++ b/drivers/iommu/arm-smmu-v3.c
@@ -589,8 +589,10 @@ struct arm_smmu_cd_table {
};
struct arm_smmu_s1_cfg {
+ /* Leaf tables or linear table */
struct arm_smmu_cd_table *tables;
size_t num_tables;
+ /* First level tables, when two levels are used */
__le64 *l1ptr;
dma_addr_t l1ptr_dma;
struct arm_smmu_ctx_desc cd;
@@ -1561,27 +1563,22 @@ static __le64 *arm_smmu_get_cd_ptr(struct arm_smmu_domain *smmu_domain,
struct arm_smmu_device *smmu = smmu_domain->smmu;
struct arm_smmu_s1_cfg *cfg = &smmu_domain->s1_cfg;
- if (cfg->s1fmt == STRTAB_STE_0_S1FMT_LINEAR) {
- table = &cfg->tables[0];
- idx = ssid;
- } else {
- idx = ssid >> CTXDESC_SPLIT;
- if (idx >= cfg->num_tables)
- return NULL;
+ if (cfg->s1fmt == STRTAB_STE_0_S1FMT_LINEAR)
+ return cfg->tables[0].ptr + ssid * CTXDESC_CD_DWORDS;
- table = &cfg->tables[idx];
- if (!table->ptr) {
- if (arm_smmu_alloc_cd_leaf_table(smmu, table,
- CTXDESC_L2_ENTRIES))
- return NULL;
+ idx = ssid >> CTXDESC_SPLIT;
+ table = &cfg->tables[idx];
+ if (!table->ptr) {
+ if (arm_smmu_alloc_cd_leaf_table(smmu, table,
+ CTXDESC_L2_ENTRIES))
+ return NULL;
- l1ptr = cfg->l1ptr + idx * CTXDESC_L1_DESC_DWORDS;
- arm_smmu_write_cd_l1_desc(l1ptr, table);
- /* An invalid L1CD can be cached */
- arm_smmu_sync_cd(smmu_domain, ssid, false);
- }
- idx = ssid & (CTXDESC_L2_ENTRIES - 1);
+ l1ptr = cfg->l1ptr + idx * CTXDESC_L1_DESC_DWORDS;
+ arm_smmu_write_cd_l1_desc(l1ptr, table);
+ /* An invalid L1CD can be cached */
+ arm_smmu_sync_cd(smmu_domain, ssid, false);
}
+ idx = ssid & (CTXDESC_L2_ENTRIES - 1);
return table->ptr + idx * CTXDESC_CD_DWORDS;
}
@@ -1617,8 +1614,12 @@ static int arm_smmu_write_ctx_desc(struct arm_smmu_domain *smmu_domain,
u64 val;
bool cd_live;
struct arm_smmu_device *smmu = smmu_domain->smmu;
- __le64 *cdptr = arm_smmu_get_cd_ptr(smmu_domain, ssid);
+ __le64 *cdptr;
+ if (WARN_ON(ssid >= (1 << smmu_domain->s1_cfg.s1cdmax)))
+ return -E2BIG;
+
+ cdptr = arm_smmu_get_cd_ptr(smmu_domain, ssid);
if (!cdptr)
return -ENOMEM;
@@ -1640,9 +1641,9 @@ static int arm_smmu_write_ctx_desc(struct arm_smmu_domain *smmu_domain,
cdptr[3] = cpu_to_le64(cd->mair);
/*
- * STE is live, and the SMMU might fetch this CD at any
- * time. Ensure that it observes the rest of the CD before we
- * enable it.
+ * STE is live, and the SMMU might read dwords of this CD in any
+ * order. Ensure that it observes valid values before reading
+ * V=1.
*/
arm_smmu_sync_cd(smmu_domain, ssid, true);
@@ -1706,7 +1707,7 @@ static int arm_smmu_alloc_cd_tables(struct arm_smmu_domain *smmu_domain)
* Only allocate a leaf table for linear case. With two levels, leaf
* tables are allocated lazily.
*/
- if (!cfg->l1ptr) {
+ if (cfg->s1fmt == STRTAB_STE_0_S1FMT_LINEAR) {
ret = arm_smmu_alloc_cd_leaf_table(smmu, &cfg->tables[0],
max_contexts);
if (ret)
@@ -2657,17 +2658,21 @@ static int arm_smmu_enable_pasid(struct arm_smmu_master *master)
features = pci_pasid_features(pdev);
if (features < 0)
- return -ENODEV;
+ return features;
num_pasids = pci_max_pasids(pdev);
if (num_pasids <= 0)
- return -ENODEV;
+ return num_pasids;
ret = pci_enable_pasid(pdev, features);
- if (!ret)
- master->ssid_bits = min_t(u8, ilog2(num_pasids),
- master->smmu->ssid_bits);
- return ret;
+ if (ret) {
+ dev_err(&pdev->dev, "Failed to enable PASID\n");
+ return ret;
+ }
+
+ master->ssid_bits = min_t(u8, ilog2(num_pasids),
+ master->smmu->ssid_bits);
+ return 0;
}
static void arm_smmu_disable_pasid(struct arm_smmu_master *master)
next reply other threads:[~2019-12-19 16:31 UTC|newest]
Thread overview: 34+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-12-19 16:30 Jean-Philippe Brucker [this message]
2019-12-19 16:30 ` [PATCH v4 01/13] iommu/arm-smmu-v3: Drop __GFP_ZERO flag from DMA allocation Jean-Philippe Brucker
2019-12-19 16:30 ` [PATCH v4 02/13] dt-bindings: document PASID property for IOMMU masters Jean-Philippe Brucker
2019-12-19 16:30 ` [PATCH v4 03/13] iommu/arm-smmu-v3: Parse PASID devicetree property of platform devices Jean-Philippe Brucker
2019-12-19 16:30 ` [PATCH v4 04/13] ACPI/IORT: Parse SSID property of named component node Jean-Philippe Brucker
2019-12-19 16:30 ` [PATCH v4 05/13] iommu/arm-smmu-v3: Prepare arm_smmu_s1_cfg for SSID support Jean-Philippe Brucker
2019-12-19 16:30 ` [PATCH v4 06/13] iommu/arm-smmu-v3: Add context descriptor tables allocators Jean-Philippe Brucker
2020-01-14 11:06 ` Will Deacon
2020-01-14 11:52 ` Jean-Philippe Brucker
2020-01-14 11:56 ` Will Deacon
2019-12-19 16:30 ` [PATCH v4 07/13] iommu/arm-smmu-v3: Add support for Substream IDs Jean-Philippe Brucker
2020-01-14 12:38 ` Will Deacon
2020-01-14 16:30 ` Jean-Philippe Brucker
2019-12-19 16:30 ` [PATCH v4 08/13] iommu/arm-smmu-v3: Propagate ssid_bits Jean-Philippe Brucker
2019-12-19 16:30 ` [PATCH v4 09/13] iommu/arm-smmu-v3: Prepare for handling arm_smmu_write_ctx_desc() failure Jean-Philippe Brucker
2020-01-14 12:42 ` Will Deacon
2020-01-14 16:31 ` Jean-Philippe Brucker
2019-12-19 16:30 ` [PATCH v4 10/13] iommu/arm-smmu-v3: Add second level of context descriptor table Jean-Philippe Brucker
2019-12-20 7:37 ` Auger Eric
2020-01-14 15:04 ` Will Deacon
2020-01-15 9:45 ` Jean-Philippe Brucker
2019-12-19 16:30 ` [PATCH v4 11/13] iommu/arm-smmu-v3: Improve add_device() error handling Jean-Philippe Brucker
2020-01-14 15:25 ` Will Deacon
2020-01-15 16:17 ` Will Deacon
2020-01-15 17:44 ` Robin Murphy
2019-12-19 16:30 ` [PATCH v4 12/13] PCI/ATS: Add PASID stubs Jean-Philippe Brucker
2019-12-19 16:30 ` [PATCH v4 13/13] iommu/arm-smmu-v3: Add support for PCI PASID Jean-Philippe Brucker
2019-12-20 7:37 ` Auger Eric
2020-01-14 12:45 ` Will Deacon
2020-01-15 7:57 ` Jean-Philippe Brucker
2020-01-09 14:36 ` [PATCH v4 00/13] iommu: Add PASID support to Arm SMMUv3 Jean-Philippe Brucker
2020-01-09 14:41 ` Will Deacon
2020-01-10 7:15 ` Jean-Philippe Brucker
2020-01-14 15:40 ` Will Deacon
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=20191219163033.2608177-1-jean-philippe@linaro.org \
--to=jean-philippe@linaro.org \
--cc=bhelgaas@google.com \
--cc=devicetree@vger.kernel.org \
--cc=eric.auger@redhat.com \
--cc=guohanjun@huawei.com \
--cc=iommu@lists.linux-foundation.org \
--cc=jonathan.cameron@huawei.com \
--cc=joro@8bytes.org \
--cc=lenb@kernel.org \
--cc=linux-acpi@vger.kernel.org \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-pci@vger.kernel.org \
--cc=lorenzo.pieralisi@arm.com \
--cc=mark.rutland@arm.com \
--cc=rjw@rjwysocki.net \
--cc=robh+dt@kernel.org \
--cc=robin.murphy@arm.com \
--cc=sudeep.holla@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 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).