| Message ID | 20230307023507.13306-3-yong.wu@mediatek.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | Adjust the dma-ranges for MTK IOMMU | expand |
On 07/03/2023 03:34, Yong Wu wrote: > After commit f1ad5338a4d5 ("of: Fix "dma-ranges" handling for bus > controllers"), the dma-ranges of the leaf node doesn't work. Remove > it for jpeg here. > > Currently there is only mt8195 jpeg node has this property in upstream, > and it already uses parent-child node, this property did work. But instead, > MediaTek iommu will control the masters' iova ranges by the master's > larb/port id internally, then this property is unnecessary. > > Cc: Mauro Carvalho Chehab <mchehab@kernel.org> > Cc: Matthias Brugger <matthias.bgg@gmail.com> > Cc: Bin Liu <bin.liu@mediatek.com> > Cc: kyrie wu <kyrie.wu@mediatek.corp-partner.google.com> > Cc: Xia Jiang <xia.jiang@mediatek.com> > Signed-off-by: Yong Wu <yong.wu@mediatek.com> > Reviewed-by: AngeloGioacchino Del Regno <angelogioacchino.delregno@collabora.com> > Acked-by: Rob Herring <robh@kernel.org> Reviewed-by: Hans Verkuil <hverkuil-cisco@xs4all.nl> Thanks! Hans > --- > .../devicetree/bindings/media/mediatek,mt8195-jpegdec.yaml | 7 ------- > .../devicetree/bindings/media/mediatek,mt8195-jpegenc.yaml | 7 ------- > .../devicetree/bindings/media/mediatek-jpeg-encoder.yaml | 5 ----- > 3 files changed, 19 deletions(-) > > diff --git a/Documentation/devicetree/bindings/media/mediatek,mt8195-jpegdec.yaml b/Documentation/devicetree/bindings/media/mediatek,mt8195-jpegdec.yaml > index 71595c013dbb..e5448c60e3eb 100644 > --- a/Documentation/devicetree/bindings/media/mediatek,mt8195-jpegdec.yaml > +++ b/Documentation/devicetree/bindings/media/mediatek,mt8195-jpegdec.yaml > @@ -26,11 +26,6 @@ properties: > Documentation/devicetree/bindings/iommu/mediatek,iommu.yaml for details. > Ports are according to the HW. > > - dma-ranges: > - maxItems: 1 > - description: | > - Describes the physical address space of IOMMU maps to memory. > - > "#address-cells": > const: 2 > > @@ -89,7 +84,6 @@ required: > - compatible > - power-domains > - iommus > - - dma-ranges > - ranges > > additionalProperties: false > @@ -115,7 +109,6 @@ examples: > <&iommu_vpp M4U_PORT_L19_JPGDEC_BSDMA1>, > <&iommu_vpp M4U_PORT_L19_JPGDEC_BUFF_OFFSET1>, > <&iommu_vpp M4U_PORT_L19_JPGDEC_BUFF_OFFSET0>; > - dma-ranges = <0x1 0x0 0x0 0x40000000 0x0 0xfff00000>; > #address-cells = <2>; > #size-cells = <2>; > ranges; > diff --git a/Documentation/devicetree/bindings/media/mediatek,mt8195-jpegenc.yaml b/Documentation/devicetree/bindings/media/mediatek,mt8195-jpegenc.yaml > index 95990539f7c0..596186497b68 100644 > --- a/Documentation/devicetree/bindings/media/mediatek,mt8195-jpegenc.yaml > +++ b/Documentation/devicetree/bindings/media/mediatek,mt8195-jpegenc.yaml > @@ -26,11 +26,6 @@ properties: > Documentation/devicetree/bindings/iommu/mediatek,iommu.yaml for details. > Ports are according to the HW. > > - dma-ranges: > - maxItems: 1 > - description: | > - Describes the physical address space of IOMMU maps to memory. > - > "#address-cells": > const: 2 > > @@ -89,7 +84,6 @@ required: > - compatible > - power-domains > - iommus > - - dma-ranges > - ranges > > additionalProperties: false > @@ -113,7 +107,6 @@ examples: > <&iommu_vpp M4U_PORT_L20_JPGENC_C_RDMA>, > <&iommu_vpp M4U_PORT_L20_JPGENC_Q_TABLE>, > <&iommu_vpp M4U_PORT_L20_JPGENC_BSDMA>; > - dma-ranges = <0x1 0x0 0x0 0x40000000 0x0 0xfff00000>; > #address-cells = <2>; > #size-cells = <2>; > ranges; > diff --git a/Documentation/devicetree/bindings/media/mediatek-jpeg-encoder.yaml b/Documentation/devicetree/bindings/media/mediatek-jpeg-encoder.yaml > index c8412e8ab353..37800e1908cc 100644 > --- a/Documentation/devicetree/bindings/media/mediatek-jpeg-encoder.yaml > +++ b/Documentation/devicetree/bindings/media/mediatek-jpeg-encoder.yaml > @@ -44,11 +44,6 @@ properties: > Documentation/devicetree/bindings/iommu/mediatek,iommu.yaml for details. > Ports are according to the HW. > > - dma-ranges: > - maxItems: 1 > - description: | > - Describes the physical address space of IOMMU maps to memory. > - > required: > - compatible > - reg
diff --git a/Documentation/devicetree/bindings/media/mediatek,mt8195-jpegdec.yaml b/Documentation/devicetree/bindings/media/mediatek,mt8195-jpegdec.yaml index 71595c013dbb..e5448c60e3eb 100644 --- a/Documentation/devicetree/bindings/media/mediatek,mt8195-jpegdec.yaml +++ b/Documentation/devicetree/bindings/media/mediatek,mt8195-jpegdec.yaml @@ -26,11 +26,6 @@ properties: Documentation/devicetree/bindings/iommu/mediatek,iommu.yaml for details. Ports are according to the HW. - dma-ranges: - maxItems: 1 - description: | - Describes the physical address space of IOMMU maps to memory. - "#address-cells": const: 2 @@ -89,7 +84,6 @@ required: - compatible - power-domains - iommus - - dma-ranges - ranges additionalProperties: false @@ -115,7 +109,6 @@ examples: <&iommu_vpp M4U_PORT_L19_JPGDEC_BSDMA1>, <&iommu_vpp M4U_PORT_L19_JPGDEC_BUFF_OFFSET1>, <&iommu_vpp M4U_PORT_L19_JPGDEC_BUFF_OFFSET0>; - dma-ranges = <0x1 0x0 0x0 0x40000000 0x0 0xfff00000>; #address-cells = <2>; #size-cells = <2>; ranges; diff --git a/Documentation/devicetree/bindings/media/mediatek,mt8195-jpegenc.yaml b/Documentation/devicetree/bindings/media/mediatek,mt8195-jpegenc.yaml index 95990539f7c0..596186497b68 100644 --- a/Documentation/devicetree/bindings/media/mediatek,mt8195-jpegenc.yaml +++ b/Documentation/devicetree/bindings/media/mediatek,mt8195-jpegenc.yaml @@ -26,11 +26,6 @@ properties: Documentation/devicetree/bindings/iommu/mediatek,iommu.yaml for details. Ports are according to the HW. - dma-ranges: - maxItems: 1 - description: | - Describes the physical address space of IOMMU maps to memory. - "#address-cells": const: 2 @@ -89,7 +84,6 @@ required: - compatible - power-domains - iommus - - dma-ranges - ranges additionalProperties: false @@ -113,7 +107,6 @@ examples: <&iommu_vpp M4U_PORT_L20_JPGENC_C_RDMA>, <&iommu_vpp M4U_PORT_L20_JPGENC_Q_TABLE>, <&iommu_vpp M4U_PORT_L20_JPGENC_BSDMA>; - dma-ranges = <0x1 0x0 0x0 0x40000000 0x0 0xfff00000>; #address-cells = <2>; #size-cells = <2>; ranges; diff --git a/Documentation/devicetree/bindings/media/mediatek-jpeg-encoder.yaml b/Documentation/devicetree/bindings/media/mediatek-jpeg-encoder.yaml index c8412e8ab353..37800e1908cc 100644 --- a/Documentation/devicetree/bindings/media/mediatek-jpeg-encoder.yaml +++ b/Documentation/devicetree/bindings/media/mediatek-jpeg-encoder.yaml @@ -44,11 +44,6 @@ properties: Documentation/devicetree/bindings/iommu/mediatek,iommu.yaml for details. Ports are according to the HW. - dma-ranges: - maxItems: 1 - description: | - Describes the physical address space of IOMMU maps to memory. - required: - compatible - reg
After commit f1ad5338a4d5 ("of: Fix "dma-ranges" handling for bus controllers"), the dma-ranges of the leaf node doesn't work. Remove it for jpeg here. Currently there is only mt8195 jpeg node has this property in upstream, and it already uses parent-child node, this property did work. But instead, MediaTek iommu will control the masters' iova ranges by the master's larb/port id internally, then this property is unnecessary. Cc: Mauro Carvalho Chehab <mchehab@kernel.org> Cc: Matthias Brugger <matthias.bgg@gmail.com> Cc: Bin Liu <bin.liu@mediatek.com> Cc: kyrie wu <kyrie.wu@mediatek.corp-partner.google.com> Cc: Xia Jiang <xia.jiang@mediatek.com> Signed-off-by: Yong Wu <yong.wu@mediatek.com> Reviewed-by: AngeloGioacchino Del Regno <angelogioacchino.delregno@collabora.com> Acked-by: Rob Herring <robh@kernel.org> --- .../devicetree/bindings/media/mediatek,mt8195-jpegdec.yaml | 7 ------- .../devicetree/bindings/media/mediatek,mt8195-jpegenc.yaml | 7 ------- .../devicetree/bindings/media/mediatek-jpeg-encoder.yaml | 5 ----- 3 files changed, 19 deletions(-)