* [PATCH 1/4] dt-bindings: iommu: dart: add t6000 compatible
2021-11-17 21:15 [PATCH 0/4] iommu: M1 Pro/Max DART support Sven Peter
@ 2021-11-17 21:15 ` Sven Peter
2021-11-29 22:50 ` Rob Herring
2021-11-17 21:15 ` [PATCH 2/4] iommu/io-pgtable: Add DART subpage protection support Sven Peter
` (4 subsequent siblings)
5 siblings, 1 reply; 8+ messages in thread
From: Sven Peter @ 2021-11-17 21:15 UTC (permalink / raw)
To: iommu, Rob Herring, devicetree
Cc: Sven Peter, Joerg Roedel, Will Deacon, Janne Grunau,
Hector Martin, Robin Murphy, Alyssa Rosenzweig, linux-kernel,
linux-arm-kernel
The M1 Max/Pro SoCs come with a new DART variant that is incompatible with
the previous one. Add a new compatible for those.
Signed-off-by: Sven Peter <sven@svenpeter.dev>
---
Documentation/devicetree/bindings/iommu/apple,dart.yaml | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/Documentation/devicetree/bindings/iommu/apple,dart.yaml b/Documentation/devicetree/bindings/iommu/apple,dart.yaml
index 94aa9e9afa59..ca2cbde9f3c9 100644
--- a/Documentation/devicetree/bindings/iommu/apple,dart.yaml
+++ b/Documentation/devicetree/bindings/iommu/apple,dart.yaml
@@ -22,7 +22,9 @@ description: |+
properties:
compatible:
- const: apple,t8103-dart
+ enum:
+ - apple,t8103-dart
+ - apple,t6000-dart
reg:
maxItems: 1
--
2.25.1
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
^ permalink raw reply related [flat|nested] 8+ messages in thread
* Re: [PATCH 1/4] dt-bindings: iommu: dart: add t6000 compatible
2021-11-17 21:15 ` [PATCH 1/4] dt-bindings: iommu: dart: add t6000 compatible Sven Peter
@ 2021-11-29 22:50 ` Rob Herring
0 siblings, 0 replies; 8+ messages in thread
From: Rob Herring @ 2021-11-29 22:50 UTC (permalink / raw)
To: Sven Peter
Cc: Joerg Roedel, Robin Murphy, devicetree, linux-arm-kernel,
linux-kernel, Rob Herring, Will Deacon, Alyssa Rosenzweig,
Hector Martin, iommu, Janne Grunau
On Wed, 17 Nov 2021 22:15:06 +0100, Sven Peter wrote:
> The M1 Max/Pro SoCs come with a new DART variant that is incompatible with
> the previous one. Add a new compatible for those.
>
> Signed-off-by: Sven Peter <sven@svenpeter.dev>
> ---
> Documentation/devicetree/bindings/iommu/apple,dart.yaml | 4 +++-
> 1 file changed, 3 insertions(+), 1 deletion(-)
>
Acked-by: Rob Herring <robh@kernel.org>
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
^ permalink raw reply [flat|nested] 8+ messages in thread
* [PATCH 2/4] iommu/io-pgtable: Add DART subpage protection support
2021-11-17 21:15 [PATCH 0/4] iommu: M1 Pro/Max DART support Sven Peter
2021-11-17 21:15 ` [PATCH 1/4] dt-bindings: iommu: dart: add t6000 compatible Sven Peter
@ 2021-11-17 21:15 ` Sven Peter
2021-11-17 21:15 ` [PATCH 3/4] iommu/io-pgtable: Add DART PTE support for t6000 Sven Peter
` (3 subsequent siblings)
5 siblings, 0 replies; 8+ messages in thread
From: Sven Peter @ 2021-11-17 21:15 UTC (permalink / raw)
To: iommu, Robin Murphy
Cc: Sven Peter, Joerg Roedel, Will Deacon, Rob Herring, Janne Grunau,
Hector Martin, Alyssa Rosenzweig, devicetree, linux-kernel,
linux-arm-kernel
DART allows to only expose a subpage to the device. While this is an
optional feature on the M1 DARTs the new ones present on the Pro/Max
models require this field in every PTE.
Signed-off-by: Sven Peter <sven@svenpeter.dev>
---
drivers/iommu/io-pgtable-arm.c | 10 ++++++++++
1 file changed, 10 insertions(+)
diff --git a/drivers/iommu/io-pgtable-arm.c b/drivers/iommu/io-pgtable-arm.c
index dd9e47189d0d..a8c660b8b3e9 100644
--- a/drivers/iommu/io-pgtable-arm.c
+++ b/drivers/iommu/io-pgtable-arm.c
@@ -10,6 +10,7 @@
#define pr_fmt(fmt) "arm-lpae io-pgtable: " fmt
#include <linux/atomic.h>
+#include <linux/bitfield.h>
#include <linux/bitops.h>
#include <linux/io-pgtable.h>
#include <linux/kernel.h>
@@ -133,6 +134,9 @@
#define APPLE_DART_PTE_PROT_NO_WRITE (1<<7)
#define APPLE_DART_PTE_PROT_NO_READ (1<<8)
+#define APPLE_DART_PTE_SUBPAGE_START GENMASK_ULL(63, 52)
+#define APPLE_DART_PTE_SUBPAGE_END GENMASK_ULL(51, 40)
+
/* IOPTE accessors */
#define iopte_deref(pte,d) __va(iopte_to_paddr(pte, d))
@@ -273,6 +277,12 @@ static void __arm_lpae_init_pte(struct arm_lpae_io_pgtable *data,
else
pte |= ARM_LPAE_PTE_TYPE_BLOCK;
+ if (data->iop.fmt == APPLE_DART) {
+ /* subpage protection: always allow access to the entire page */
+ pte |= FIELD_PREP(APPLE_DART_PTE_SUBPAGE_START, 0);
+ pte |= FIELD_PREP(APPLE_DART_PTE_SUBPAGE_END, 0xfff);
+ }
+
for (i = 0; i < num_entries; i++)
ptep[i] = pte | paddr_to_iopte(paddr + i * sz, data);
--
2.25.1
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
^ permalink raw reply related [flat|nested] 8+ messages in thread
* [PATCH 3/4] iommu/io-pgtable: Add DART PTE support for t6000
2021-11-17 21:15 [PATCH 0/4] iommu: M1 Pro/Max DART support Sven Peter
2021-11-17 21:15 ` [PATCH 1/4] dt-bindings: iommu: dart: add t6000 compatible Sven Peter
2021-11-17 21:15 ` [PATCH 2/4] iommu/io-pgtable: Add DART subpage protection support Sven Peter
@ 2021-11-17 21:15 ` Sven Peter
2021-11-17 21:15 ` [PATCH 4/4] iommu: dart: Support t6000 variant Sven Peter
` (2 subsequent siblings)
5 siblings, 0 replies; 8+ messages in thread
From: Sven Peter @ 2021-11-17 21:15 UTC (permalink / raw)
To: iommu, Robin Murphy
Cc: Sven Peter, Joerg Roedel, Will Deacon, Rob Herring, Janne Grunau,
Hector Martin, Alyssa Rosenzweig, devicetree, linux-kernel,
linux-arm-kernel
The DARTs present in the M1 Pro/Max SoC support a 42bit physical address
space by shifting the paddr and extending its mask inside the PTE.
Signed-off-by: Sven Peter <sven@svenpeter.dev>
---
drivers/iommu/io-pgtable-arm.c | 30 +++++++++++++++++++++++++++++-
include/linux/io-pgtable.h | 2 ++
2 files changed, 31 insertions(+), 1 deletion(-)
diff --git a/drivers/iommu/io-pgtable-arm.c b/drivers/iommu/io-pgtable-arm.c
index a8c660b8b3e9..be66774aaf70 100644
--- a/drivers/iommu/io-pgtable-arm.c
+++ b/drivers/iommu/io-pgtable-arm.c
@@ -137,6 +137,11 @@
#define APPLE_DART_PTE_SUBPAGE_START GENMASK_ULL(63, 52)
#define APPLE_DART_PTE_SUBPAGE_END GENMASK_ULL(51, 40)
+#define APPLE_DART_PADDR_MASK_PS_36BIT GENMASK_ULL(35, 12)
+#define APPLE_DART_PADDR_SHIFT_PS_36BIT (0)
+#define APPLE_DART_PADDR_MASK_PS_42BIT GENMASK_ULL(37, 10)
+#define APPLE_DART_PADDR_SHIFT_PS_42BIT (4)
+
/* IOPTE accessors */
#define iopte_deref(pte,d) __va(iopte_to_paddr(pte, d))
@@ -171,6 +176,13 @@ static arm_lpae_iopte paddr_to_iopte(phys_addr_t paddr,
{
arm_lpae_iopte pte = paddr;
+ if (data->iop.fmt == APPLE_DART) {
+ pte = paddr >> data->iop.cfg.apple_dart_cfg.paddr_shift;
+ pte &= data->iop.cfg.apple_dart_cfg.paddr_mask;
+
+ return pte;
+ }
+
/* Of the bits which overlap, either 51:48 or 15:12 are always RES0 */
return (pte | (pte >> (48 - 12))) & ARM_LPAE_PTE_ADDR_MASK;
}
@@ -180,6 +192,12 @@ static phys_addr_t iopte_to_paddr(arm_lpae_iopte pte,
{
u64 paddr = pte & ARM_LPAE_PTE_ADDR_MASK;
+ if (data->iop.fmt == APPLE_DART) {
+ paddr = pte & data->iop.cfg.apple_dart_cfg.paddr_mask;
+ paddr <<= data->iop.cfg.apple_dart_cfg.paddr_shift;
+ return paddr;
+ }
+
if (ARM_LPAE_GRANULE(data) < SZ_64K)
return paddr;
@@ -1122,8 +1140,18 @@ apple_dart_alloc_pgtable(struct io_pgtable_cfg *cfg, void *cookie)
struct arm_lpae_io_pgtable *data;
int i;
- if (cfg->oas > 36)
+ switch (cfg->oas) {
+ case 36:
+ cfg->apple_dart_cfg.paddr_shift = APPLE_DART_PADDR_SHIFT_PS_36BIT;
+ cfg->apple_dart_cfg.paddr_mask = APPLE_DART_PADDR_MASK_PS_36BIT;
+ break;
+ case 42:
+ cfg->apple_dart_cfg.paddr_shift = APPLE_DART_PADDR_SHIFT_PS_42BIT;
+ cfg->apple_dart_cfg.paddr_mask = APPLE_DART_PADDR_MASK_PS_42BIT;
+ break;
+ default:
return NULL;
+ }
data = arm_lpae_alloc_pgtable(cfg);
if (!data)
diff --git a/include/linux/io-pgtable.h b/include/linux/io-pgtable.h
index 86af6f0a00a2..4e26ebb0be93 100644
--- a/include/linux/io-pgtable.h
+++ b/include/linux/io-pgtable.h
@@ -136,6 +136,8 @@ struct io_pgtable_cfg {
struct {
u64 ttbr[4];
u32 n_ttbrs;
+ u32 paddr_shift;
+ u64 paddr_mask;
} apple_dart_cfg;
};
};
--
2.25.1
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
^ permalink raw reply related [flat|nested] 8+ messages in thread
* [PATCH 4/4] iommu: dart: Support t6000 variant
2021-11-17 21:15 [PATCH 0/4] iommu: M1 Pro/Max DART support Sven Peter
` (2 preceding siblings ...)
2021-11-17 21:15 ` [PATCH 3/4] iommu/io-pgtable: Add DART PTE support for t6000 Sven Peter
@ 2021-11-17 21:15 ` Sven Peter
2021-11-30 20:56 ` [PATCH 0/4] iommu: M1 Pro/Max DART support Janne Grunau
2021-12-06 12:07 ` Joerg Roedel
5 siblings, 0 replies; 8+ messages in thread
From: Sven Peter @ 2021-11-17 21:15 UTC (permalink / raw)
To: iommu
Cc: Sven Peter, Joerg Roedel, Will Deacon, Rob Herring, Janne Grunau,
Hector Martin, Robin Murphy, Alyssa Rosenzweig, devicetree,
linux-kernel, linux-arm-kernel
The M1 Pro/Max SoCs come with a new variant of DART which supports a
larger physical address space with a slightly different PTE format.
Pass through the correct paddr address space size to the io-pgtable code
which will take care of the rest.
Signed-off-by: Sven Peter <sven@svenpeter.dev>
---
drivers/iommu/apple-dart.c | 19 +++++++++++++++++--
1 file changed, 17 insertions(+), 2 deletions(-)
diff --git a/drivers/iommu/apple-dart.c b/drivers/iommu/apple-dart.c
index 565ef5598811..c04648dfd747 100644
--- a/drivers/iommu/apple-dart.c
+++ b/drivers/iommu/apple-dart.c
@@ -81,10 +81,15 @@
#define DART_TTBR_VALID BIT(31)
#define DART_TTBR_SHIFT 12
+struct apple_dart_hw {
+ u32 oas;
+};
+
/*
* Private structure associated with each DART device.
*
* @dev: device struct
+ * @hw: SoC-specific hardware data
* @regs: mapped MMIO region
* @irq: interrupt number, can be shared with other DARTs
* @clks: clocks associated with this DART
@@ -98,6 +103,7 @@
*/
struct apple_dart {
struct device *dev;
+ const struct apple_dart_hw *hw;
void __iomem *regs;
@@ -421,7 +427,7 @@ static int apple_dart_finalize_domain(struct iommu_domain *domain,
pgtbl_cfg = (struct io_pgtable_cfg){
.pgsize_bitmap = dart->pgsize,
.ias = 32,
- .oas = 36,
+ .oas = dart->hw->oas,
.coherent_walk = 1,
.iommu_dev = dart->dev,
};
@@ -855,6 +861,7 @@ static int apple_dart_probe(struct platform_device *pdev)
return -ENOMEM;
dart->dev = dev;
+ dart->hw = of_device_get_match_data(dev);
spin_lock_init(&dart->lock);
res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
@@ -944,8 +951,16 @@ static int apple_dart_remove(struct platform_device *pdev)
return 0;
}
+static const struct apple_dart_hw apple_dart_hw_t8103 = {
+ .oas = 36,
+};
+static const struct apple_dart_hw apple_dart_hw_t6000 = {
+ .oas = 42,
+};
+
static const struct of_device_id apple_dart_of_match[] = {
- { .compatible = "apple,t8103-dart", .data = NULL },
+ { .compatible = "apple,t8103-dart", .data = &apple_dart_hw_t8103 },
+ { .compatible = "apple,t6000-dart", .data = &apple_dart_hw_t6000 },
{},
};
MODULE_DEVICE_TABLE(of, apple_dart_of_match);
--
2.25.1
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
^ permalink raw reply related [flat|nested] 8+ messages in thread
* Re: [PATCH 0/4] iommu: M1 Pro/Max DART support
2021-11-17 21:15 [PATCH 0/4] iommu: M1 Pro/Max DART support Sven Peter
` (3 preceding siblings ...)
2021-11-17 21:15 ` [PATCH 4/4] iommu: dart: Support t6000 variant Sven Peter
@ 2021-11-30 20:56 ` Janne Grunau
2021-12-06 12:07 ` Joerg Roedel
5 siblings, 0 replies; 8+ messages in thread
From: Janne Grunau @ 2021-11-30 20:56 UTC (permalink / raw)
To: Sven Peter
Cc: iommu, Joerg Roedel, Will Deacon, Rob Herring, Hector Martin,
Robin Murphy, Alyssa Rosenzweig, devicetree, linux-kernel,
linux-arm-kernel
Hej,
On 2021-11-17 22:15:05 +0100, Sven Peter wrote:
>
> This is a fairly brief series to add support for the DARTs present in the
> M1 Pro/Max. They have two differences that make them incompatible with
> those in the M1:
>
> - the physical addresses are shifted left by 4 bits and and have 2 more
> bits inside the PTE entries
> - the subpage protection feature is now mandatory. For Linux we can
> just configure it to always allow access to the entire page.
>
> Note that this needs a fix to the core pagetable code. Hector already
> sent a first version separately to the mailing list since the problem
> is (at least in theory) also present on other SoCs using the LPAE format
> with a large physical address space [1].
>
> Sven
>
> [1] https://lore.kernel.org/linux-iommu/a2b45243-7e0a-a2ac-4e14-5256a3e7abb4@arm.com/T/#t
>
> Sven Peter (4):
> dt-bindings: iommu: dart: add t6000 compatible
> iommu/io-pgtable: Add DART subpage protection support
> iommu/io-pgtable: Add DART PTE support for t6000
> iommu: dart: Support t6000 variant
>
> .../devicetree/bindings/iommu/apple,dart.yaml | 4 +-
> drivers/iommu/apple-dart.c | 19 ++++++++-
> drivers/iommu/io-pgtable-arm.c | 40 ++++++++++++++++++-
> include/linux/io-pgtable.h | 2 +
> 4 files changed, 61 insertions(+), 4 deletions(-)
Whole series tested on M1 Max. Feel free to add
Tested-by: Janne Grunau <j@jannau.net>
best
Janne
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: [PATCH 0/4] iommu: M1 Pro/Max DART support
2021-11-17 21:15 [PATCH 0/4] iommu: M1 Pro/Max DART support Sven Peter
` (4 preceding siblings ...)
2021-11-30 20:56 ` [PATCH 0/4] iommu: M1 Pro/Max DART support Janne Grunau
@ 2021-12-06 12:07 ` Joerg Roedel
5 siblings, 0 replies; 8+ messages in thread
From: Joerg Roedel @ 2021-12-06 12:07 UTC (permalink / raw)
To: Sven Peter
Cc: iommu, Will Deacon, Rob Herring, Janne Grunau, Hector Martin,
Robin Murphy, Alyssa Rosenzweig, devicetree, linux-kernel,
linux-arm-kernel
Hi Sven,
On Wed, Nov 17, 2021 at 10:15:05PM +0100, Sven Peter wrote:
> Sven Peter (4):
> dt-bindings: iommu: dart: add t6000 compatible
> iommu/io-pgtable: Add DART subpage protection support
> iommu/io-pgtable: Add DART PTE support for t6000
> iommu: dart: Support t6000 variant
Looks good to me, will apply it when Robin had a chance to look at the
io-pgtable changes.
Thanks,
Joerg
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
^ permalink raw reply [flat|nested] 8+ messages in thread