[PATCH] arm64: dts: allwinner: h6: Fix Cedrus IOMMU usage

[PATCH] arm64: dts: allwinner: h6: Fix Cedrus IOMMU usage

[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")
Signed-off-by: Maxime Ripard <maxime@cerno.tech>
---
 .../bindings/display/allwinner,sun8i-a83t-de2-mixer.yaml       | 3 +++
 arch/arm64/boot/dts/allwinner/sun50i-h6.dtsi                   | 1 +
 2 files changed, 4 insertions(+)

diff --git a/Documentation/devicetree/bindings/display/allwinner,sun8i-a83t-de2-mixer.yaml b/Documentation/devicetree/bindings/display/allwinner,sun8i-a83t-de2-mixer.yaml
index 1dee641e3ea1..ef624327e33e 100644
--- a/Documentation/devicetree/bindings/display/allwinner,sun8i-a83t-de2-mixer.yaml
+++ b/Documentation/devicetree/bindings/display/allwinner,sun8i-a83t-de2-mixer.yaml
@@ -39,6 +39,9 @@ properties:
   resets:
     maxItems: 1
 
+  iommus:
+    maxItems: 1
+
   ports:
     type: object
     description: |
diff --git a/arch/arm64/boot/dts/allwinner/sun50i-h6.dtsi b/arch/arm64/boot/dts/allwinner/sun50i-h6.dtsi
index 78b1361dfbb9..9ce78a7b117d 100644
--- a/arch/arm64/boot/dts/allwinner/sun50i-h6.dtsi
+++ b/arch/arm64/boot/dts/allwinner/sun50i-h6.dtsi
@@ -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 {
-- 
2.26.2


_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel

Re: [PATCH] arm64: dts: allwinner: h6: Fix Cedrus IOMMU usage

[Rob Herring]

On Sun, Jun 28, 2020 at 12:10 PM Maxime Ripard <maxime@cerno.tech> wrote:
>
> 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")
> Signed-off-by: Maxime Ripard <maxime@cerno.tech>
> ---
>  .../bindings/display/allwinner,sun8i-a83t-de2-mixer.yaml       | 3 +++
>  arch/arm64/boot/dts/allwinner/sun50i-h6.dtsi                   | 1 +
>  2 files changed, 4 insertions(+)
>
> diff --git a/Documentation/devicetree/bindings/display/allwinner,sun8i-a83t-de2-mixer.yaml b/Documentation/devicetree/bindings/display/allwinner,sun8i-a83t-de2-mixer.yaml
> index 1dee641e3ea1..ef624327e33e 100644
> --- a/Documentation/devicetree/bindings/display/allwinner,sun8i-a83t-de2-mixer.yaml
> +++ b/Documentation/devicetree/bindings/display/allwinner,sun8i-a83t-de2-mixer.yaml
> @@ -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
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel