Skip to content

Commit f159f29

Browse files
committed
Merge tag 'juno-fix-5.17' of git://git.kernel.org/pub/scm/linux/kernel/git/sudeep.holla/linux into arm/fixes
Arm Juno fix for v5.17 Just a single fix to address coherency issue reported[1] by removing the GICv2m address from the DMA ranges as it loose coherency if mapped as cacheable at the SMMU due to the attribute combining rules. The GICv2m range is normally programmed for Device memory attributes. [1] https://lore.kernel.org/stable/[email protected]/ * tag 'juno-fix-5.17' of git://git.kernel.org/pub/scm/linux/kernel/git/sudeep.holla/linux: arm64: dts: juno: Remove GICv2m dma-range Link: https://lore.kernel.org/r/[email protected] Signed-off-by: Arnd Bergmann <[email protected]>
2 parents 4f6668f + 31eeb6b commit f159f29

File tree

1 file changed

+1
-2
lines changed

1 file changed

+1
-2
lines changed

arch/arm64/boot/dts/arm/juno-base.dtsi

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -543,8 +543,7 @@
543543
<0x02000000 0x00 0x50000000 0x00 0x50000000 0x0 0x08000000>,
544544
<0x42000000 0x40 0x00000000 0x40 0x00000000 0x1 0x00000000>;
545545
/* Standard AXI Translation entries as programmed by EDK2 */
546-
dma-ranges = <0x02000000 0x0 0x2c1c0000 0x0 0x2c1c0000 0x0 0x00040000>,
547-
<0x02000000 0x0 0x80000000 0x0 0x80000000 0x0 0x80000000>,
546+
dma-ranges = <0x02000000 0x0 0x80000000 0x0 0x80000000 0x0 0x80000000>,
548547
<0x43000000 0x8 0x00000000 0x8 0x00000000 0x2 0x00000000>;
549548
#interrupt-cells = <1>;
550549
interrupt-map-mask = <0 0 0 7>;

0 commit comments

Comments
 (0)