diff options
| author | Maxime Ripard <maxime@cerno.tech> | 2020-06-28 21:08:04 +0300 |
|---|---|---|
| committer | Maxime Ripard <maxime@cerno.tech> | 2020-07-16 11:10:30 +0300 |
| commit | 62a8ccf3a248cd222985ee5568b6bd6217282dbc (patch) | |
| tree | e7f04e76fbdfcf661d8df0d885a51580f8eecd25 | |
| parent | 92025b90f18d45e26b7f17d68756b1abd771b9d3 (diff) | |
| download | linux-62a8ccf3a248cd222985ee5568b6bd6217282dbc.tar.xz | |
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")
Signed-off-by: Maxime Ripard <maxime@cerno.tech>
Link: https://lore.kernel.org/r/20200628180804.79026-1-maxime@cerno.tech
| -rw-r--r-- | Documentation/devicetree/bindings/media/allwinner,sun4i-a10-video-engine.yaml | 3 | ||||
| -rw-r--r-- | arch/arm64/boot/dts/allwinner/sun50i-h6.dtsi | 1 |
2 files changed, 4 insertions, 0 deletions
diff --git a/Documentation/devicetree/bindings/media/allwinner,sun4i-a10-video-engine.yaml b/Documentation/devicetree/bindings/media/allwinner,sun4i-a10-video-engine.yaml index 526593c8c614..4cc1a670c986 100644 --- a/Documentation/devicetree/bindings/media/allwinner,sun4i-a10-video-engine.yaml +++ b/Documentation/devicetree/bindings/media/allwinner,sun4i-a10-video-engine.yaml @@ -47,6 +47,9 @@ properties: $ref: /schemas/types.yaml#/definitions/phandle-array description: Phandle to the device SRAM + iommus: + maxItems: 1 + memory-region: description: CMA pool to use for buffers allocation instead of the default 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 @@ resets = <&ccu RST_BUS_VE>; interrupts = <GIC_SPI 89 IRQ_TYPE_LEVEL_HIGH>; allwinner,sram = <&ve_sram 1>; + iommus = <&iommu 3>; }; gpu: gpu@1800000 { |