mirror of
https://github.com/coolsnowwolf/lede.git
synced 2025-04-16 04:13:31 +00:00
100 lines
2.8 KiB
Diff
100 lines
2.8 KiB
Diff
From 69d73a2d8f767b1e1d4ea00fcd8be33f5fc8b7c0 Mon Sep 17 00:00:00 2001
|
|
From: Sven Peter <sven@svenpeter.dev>
|
|
Date: Tue, 2 Nov 2021 18:10:52 +0100
|
|
Subject: [PATCH 050/171] iommu: dart: Support t6000 variant
|
|
|
|
The M1 Pro/Max/Ultra SoCs come with a new variant of DART which
|
|
supports a larger physical address space with a different PTE format.
|
|
Pass through the correct paddr address space size and the PTE format
|
|
to the io-pgtable code which will take care of the rest.
|
|
|
|
Signed-off-by: Sven Peter <sven@svenpeter.dev>
|
|
Co-developed-by: Janne Grunau <j@jannau.net>
|
|
Signed-off-by: Janne Grunau <j@jannau.net>
|
|
|
|
Commit-changes: 2
|
|
- use APPLE_DART2 PTE format for dart-t6000
|
|
|
|
Commit-changes: 3
|
|
- apply change to io-pgtable-dart.c
|
|
---
|
|
drivers/iommu/apple-dart.c | 24 +++++++++++++++++++++---
|
|
1 file changed, 21 insertions(+), 3 deletions(-)
|
|
|
|
diff --git a/drivers/iommu/apple-dart.c b/drivers/iommu/apple-dart.c
|
|
index 8af0242a90d9..e5793c0d08b4 100644
|
|
--- a/drivers/iommu/apple-dart.c
|
|
+++ b/drivers/iommu/apple-dart.c
|
|
@@ -81,10 +81,16 @@
|
|
#define DART_TTBR_VALID BIT(31)
|
|
#define DART_TTBR_SHIFT 12
|
|
|
|
+struct apple_dart_hw {
|
|
+ u32 oas;
|
|
+ enum io_pgtable_fmt fmt;
|
|
+};
|
|
+
|
|
/*
|
|
* 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 +104,7 @@
|
|
*/
|
|
struct apple_dart {
|
|
struct device *dev;
|
|
+ const struct apple_dart_hw *hw;
|
|
|
|
void __iomem *regs;
|
|
|
|
@@ -421,13 +428,13 @@ 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,
|
|
};
|
|
|
|
dart_domain->pgtbl_ops =
|
|
- alloc_io_pgtable_ops(APPLE_DART, &pgtbl_cfg, domain);
|
|
+ alloc_io_pgtable_ops(dart->hw->fmt, &pgtbl_cfg, domain);
|
|
if (!dart_domain->pgtbl_ops) {
|
|
ret = -ENOMEM;
|
|
goto done;
|
|
@@ -858,6 +865,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);
|
|
|
|
dart->regs = devm_platform_get_and_ioremap_resource(pdev, 0, &res);
|
|
@@ -946,8 +954,18 @@ static int apple_dart_remove(struct platform_device *pdev)
|
|
return 0;
|
|
}
|
|
|
|
+static const struct apple_dart_hw apple_dart_hw_t8103 = {
|
|
+ .oas = 36,
|
|
+ .fmt = APPLE_DART,
|
|
+};
|
|
+static const struct apple_dart_hw apple_dart_hw_t6000 = {
|
|
+ .oas = 42,
|
|
+ .fmt = APPLE_DART2,
|
|
+};
|
|
+
|
|
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.34.1
|
|
|