Skip to contentSkip to conversation

arm64: dts: allwinner: h6: Fix Cedrus IOMMU usage

PATCH In review Maxime Ripard 2 participants 2 messages Jun 28, 2020 – Jul 9, 2020

Subsystems (5)
lore
Share & tools
lore
#0 lore raw

PATCH 1/1 arm64: dts: allwinner: h6: Fix Cedrus IOMMU usage

Now that the IOMMU driver has been introduced, it prevents any access from a DMA master going through it that hasn't properly mapped the pages, and that link is set up through the iommus property.

Unfortunately we forgot to add that property to the video engine node when adding the IOMMU node, so now any DMA access is broken.

Fixes b3a0a2f910c7 ("arm64: dts: allwinner: h6: Add IOMMU")
---
 .../bindings/display/allwinner,sun8i-a83t-de2-mixer.yaml       | 3 +++
 arch/arm64/boot/dts/allwinner/sun50i-h6.dtsi                   | 1 +
 2 files changed, 4 insertions(+)
Documentation/devicetree/bindings/display/allwinner,sun8i-a83t-de2-mixer.yaml +3 -0
index 1dee641e3ea1..ef624327e33e 100644
@@ -39,6 +39,9 @@ properties:
   resets:
     maxItems: 1
 
+  iommus:
+    maxItems: 1
+
   ports:
     type: object
     description: |
arch/arm64/boot/dts/allwinner/sun50i-h6.dtsi +1 -0
index 78b1361dfbb9..9ce78a7b117d 100644
@@ -161,6 +161,7 @@ video-codec@1c0e000 {
 			resets = <&ccu RST_BUS_VE>;
 			interrupts = <GIC_SPI 89 IRQ_TYPE_LEVEL_HIGH>;
 			allwinner,sram = <&ve_sram 1>;
+			iommus = <&iommu 3>;
 		};
 
 		gpu: gpu@1800000 {
Signature · 7 lines
2.26.2


_______________________________________________
linux-arm-kernel mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
maintainer
#1 lore raw
Quoted 20 lines · Maxime Ripard

Now that the IOMMU driver has been introduced, it prevents any access from a DMA master going through it that hasn't properly mapped the pages, and that link is set up through the iommus property.

Unfortunately we forgot to add that property to the video engine node when adding the IOMMU node, so now any DMA access is broken.

Fixes b3a0a2f910c7 ("arm64: dts: allwinner: h6: Add IOMMU")
---
 .../bindings/display/allwinner,sun8i-a83t-de2-mixer.yaml       | 3 +++
 arch/arm64/boot/dts/allwinner/sun50i-h6.dtsi                   | 1 +
 2 files changed, 4 insertions(+)
Documentation/devicetree/bindings/display/allwinner,sun8i-a83t-de2-mixer.yaml +0 -0
index 1dee641e3ea1..ef624327e33e 100644

Documentation/devicetree/bindings/display/allwinner,sun8i-a83t-de2-mixer.yaml properties: · line 44

Quoted 6 lines
Documentation/devicetree/bindings/display/allwinner,sun8i-a83t-de2-mixer.yaml +3 -0
@@ -39,6 +39,9 @@ properties:
   resets:
     maxItems: 1
 
+  iommus:
+    maxItems: 1
+

This is breaking linux-next because there is already an 'iommus' property.

Rob

_______________________________________________
linux-arm-kernel mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel