android/android_kernel_samsung_sm8650
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

iommu: dart: Support t6000 variant

Browse Source 
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>
Reviewed-by: Rob Herring <robh@kernel.org>
Acked-by: Hector Martin <marcan@marcan.st>
Link: https://lore.kernel.org/r/20220916094152.87137-6-j@jannau.net
Signed-off-by: Joerg Roedel <jroedel@suse.de>
This commit is contained in:
Sven Peter 2022-09-16 11:41:52 +02:00 committed by Joerg Roedel
parent dc09fe1c5e
commit a380b8dcf2
1 changed files with 21 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
drivers/iommu/apple-dart.c
View File

@ -81,10 +81,16 @@
#define DART_TTBR_VALID BIT(31) #define DART_TTBR_VALID BIT(31)
#define DART_TTBR_SHIFT 12 #define DART_TTBR_SHIFT 12
struct apple_dart_hw {
u32 oas;
enum io_pgtable_fmt fmt;
};
/* /*
* Private structure associated with each DART device. * Private structure associated with each DART device.
* *
* @dev: device struct * @dev: device struct
* @hw: SoC-specific hardware data
* @regs: mapped MMIO region * @regs: mapped MMIO region
* @irq: interrupt number, can be shared with other DARTs * @irq: interrupt number, can be shared with other DARTs
* @clks: clocks associated with this DART * @clks: clocks associated with this DART
@ -98,6 +104,7 @@
*/ */
struct apple_dart { struct apple_dart {
struct device *dev; struct device *dev;
const struct apple_dart_hw *hw;
void __iomem *regs; void __iomem *regs;
@ -421,13 +428,13 @@ static int apple_dart_finalize_domain(struct iommu_domain *domain,
pgtbl_cfg = (struct io_pgtable_cfg){ pgtbl_cfg = (struct io_pgtable_cfg){
.pgsize_bitmap = dart->pgsize, .pgsize_bitmap = dart->pgsize,
.ias = 32, .ias = 32,
.oas = 36, .oas = dart->hw->oas,
.coherent_walk = 1, .coherent_walk = 1,
.iommu_dev = dart->dev, .iommu_dev = dart->dev,
}; };
dart_domain->pgtbl_ops = 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) { if (!dart_domain->pgtbl_ops) {
ret = -ENOMEM; ret = -ENOMEM;
goto done; goto done;
@ -854,6 +861,7 @@ static int apple_dart_probe(struct platform_device *pdev)
return -ENOMEM; return -ENOMEM;
dart->dev = dev; dart->dev = dev;
dart->hw = of_device_get_match_data(dev);
spin_lock_init(&dart->lock); spin_lock_init(&dart->lock);
dart->regs = devm_platform_get_and_ioremap_resource(pdev, 0, &res); dart->regs = devm_platform_get_and_ioremap_resource(pdev, 0, &res);
@ -942,8 +950,18 @@ static int apple_dart_remove(struct platform_device *pdev)
return 0; 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[] = { 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); MODULE_DEVICE_TABLE(of, apple_dart_of_match);