Re: [PATCH v2 01/23] dt-bindings: iommu: mediatek: Convert IOMMU to DT schema
On Mon, Sep 14, 2020 at 11:51 PM Yong Wu wrote: > > On Mon, 2020-09-14 at 17:22 -0600, Rob Herring wrote: > > On Sat, Sep 05, 2020 at 04:08:58PM +0800, Yong Wu wrote: > > > Convert MediaTek IOMMU to DT schema. > > > > > > Signed-off-by: Yong Wu > > > --- > > [...] > > > > +properties: > > > + compatible: > > > +enum: > > > + - mediatek,mt2701-m4u #mt2701 generation one HW > > > + - mediatek,mt2712-m4u #mt2712 generation two HW > > > + - mediatek,mt6779-m4u #mt6779 generation two HW > > > + - mediatek,mt7623-m4u, mediatek,mt2701-m4u #mt7623 generation one > > > HW > > > > This is not right. > > > > items: > > - const: mediatek,mt7623-m4u > > - const: mediatek,mt2701-m4u > > > > And that has to be under a 'oneOf' with the rest of this. > > Thanks for the review. Is this OK? > > compatible: > oneOf: > - const: mediatek,mt2701-m4u # mt2701 generation one HW > - const: mediatek,mt2712-m4u # mt2712 generation two HW > - const: mediatek,mt6779-m4u # mt6779 generation two HW > - const: mediatek,mt8173-m4u # mt8173 generation two HW > - const: mediatek,mt8183-m4u # mt8183 generation two HW > - const: mediatek,mt8192-m4u # mt8192 generation two HW It is correct, but I prefer all these to be a single enum. So 'oneOf' would have 2 entries. > - description: mt7623 generation one HW > items: > - const: mediatek,mt7623-m4u > - const: mediatek,mt2701-m4u > > > > > > + - mediatek,mt8173-m4u #mt8173 generation two HW > > > + - mediatek,mt8183-m4u #mt8183 generation two HW > > > + > > > + reg: > > > +maxItems: 1 > > [snip] ___ iommu mailing list iommu@lists.linux-foundation.org https://lists.linuxfoundation.org/mailman/listinfo/iommu
Re: [PATCH v2 01/23] dt-bindings: iommu: mediatek: Convert IOMMU to DT schema
On Mon, 2020-09-14 at 17:22 -0600, Rob Herring wrote: > On Sat, Sep 05, 2020 at 04:08:58PM +0800, Yong Wu wrote: > > Convert MediaTek IOMMU to DT schema. > > > > Signed-off-by: Yong Wu > > --- [...] > > +properties: > > + compatible: > > +enum: > > + - mediatek,mt2701-m4u #mt2701 generation one HW > > + - mediatek,mt2712-m4u #mt2712 generation two HW > > + - mediatek,mt6779-m4u #mt6779 generation two HW > > + - mediatek,mt7623-m4u, mediatek,mt2701-m4u #mt7623 generation one HW > > This is not right. > > items: > - const: mediatek,mt7623-m4u > - const: mediatek,mt2701-m4u > > And that has to be under a 'oneOf' with the rest of this. Thanks for the review. Is this OK? compatible: oneOf: - const: mediatek,mt2701-m4u # mt2701 generation one HW - const: mediatek,mt2712-m4u # mt2712 generation two HW - const: mediatek,mt6779-m4u # mt6779 generation two HW - const: mediatek,mt8173-m4u # mt8173 generation two HW - const: mediatek,mt8183-m4u # mt8183 generation two HW - const: mediatek,mt8192-m4u # mt8192 generation two HW - description: mt7623 generation one HW items: - const: mediatek,mt7623-m4u - const: mediatek,mt2701-m4u > > > + - mediatek,mt8173-m4u #mt8173 generation two HW > > + - mediatek,mt8183-m4u #mt8183 generation two HW > > + > > + reg: > > +maxItems: 1 [snip] ___ iommu mailing list iommu@lists.linux-foundation.org https://lists.linuxfoundation.org/mailman/listinfo/iommu
Re: [PATCH v2 01/23] dt-bindings: iommu: mediatek: Convert IOMMU to DT schema
On Sat, Sep 05, 2020 at 04:08:58PM +0800, Yong Wu wrote: > Convert MediaTek IOMMU to DT schema. > > Signed-off-by: Yong Wu > --- > .../bindings/iommu/mediatek,iommu.txt | 103 > .../bindings/iommu/mediatek,iommu.yaml| 150 ++ > 2 files changed, 150 insertions(+), 103 deletions(-) > delete mode 100644 Documentation/devicetree/bindings/iommu/mediatek,iommu.txt > create mode 100644 > Documentation/devicetree/bindings/iommu/mediatek,iommu.yaml > > diff --git a/Documentation/devicetree/bindings/iommu/mediatek,iommu.txt > b/Documentation/devicetree/bindings/iommu/mediatek,iommu.txt > deleted file mode 100644 > index c1ccd8582eb2.. > --- a/Documentation/devicetree/bindings/iommu/mediatek,iommu.txt > +++ /dev/null > @@ -1,103 +0,0 @@ > -* Mediatek IOMMU Architecture Implementation > - > - Some Mediatek SOCs contain a Multimedia Memory Management Unit (M4U), and > -this M4U have two generations of HW architecture. Generation one uses flat > -pagetable, and only supports 4K size page mapping. Generation two uses the > -ARM Short-Descriptor translation table format for address translation. > - > - About the M4U Hardware Block Diagram, please check below: > - > - EMI (External Memory Interface) > - | > - m4u (Multimedia Memory Management Unit) > - | > - ++ > - || > - gals0-rx gals1-rx(Global Async Local Sync rx) > - || > - || > - gals0-tx gals1-tx(Global Async Local Sync tx) > - || Some SoCs may have GALS. > - ++ > - | > - SMI Common(Smart Multimedia Interface Common) > - | > - ++--- > - || > - | gals-rxThere may be GALS in some larbs. > - || > - || > - | gals-tx > - || > - SMI larb0SMI larb1 ... SoCs have several SMI local > arbiter(larb). > - (display) (vdec) > - || > - || > - +-+-+ +++ > - | | | ||| > - | | |... ||| ... There are different ports in each larb. > - | | | ||| > -OVL0 RDMA0 WDMA0 MC PP VLD > - > - As above, The Multimedia HW will go through SMI and M4U while it > -access EMI. SMI is a bridge between m4u and the Multimedia HW. It contain > -smi local arbiter and smi common. It will control whether the Multimedia > -HW should go though the m4u for translation or bypass it and talk > -directly with EMI. And also SMI help control the power domain and clocks for > -each local arbiter. > - Normally we specify a local arbiter(larb) for each multimedia HW > -like display, video decode, and camera. And there are different ports > -in each larb. Take a example, There are many ports like MC, PP, VLD in the > -video decode local arbiter, all these ports are according to the video HW. > - In some SoCs, there may be a GALS(Global Async Local Sync) module between > -smi-common and m4u, and additional GALS module between smi-larb and > -smi-common. GALS can been seen as a "asynchronous fifo" which could help > -synchronize for the modules in different clock frequency. > - > -Required properties: > -- compatible : must be one of the following string: > - "mediatek,mt2701-m4u" for mt2701 which uses generation one m4u HW. > - "mediatek,mt2712-m4u" for mt2712 which uses generation two m4u HW. > - "mediatek,mt6779-m4u" for mt6779 which uses generation two m4u HW. > - "mediatek,mt7623-m4u", "mediatek,mt2701-m4u" for mt7623 which uses > - generation one m4u HW. > - "mediatek,mt8173-m4u" for mt8173 which uses generation two m4u HW. > - "mediatek,mt8183-m4u" for mt8183 which uses generation two m4u HW. > -- reg : m4u register base and size. > -- interrupts : the interrupt of m4u. > -- clocks : must contain one entry for each clock-names. > -- clock-names : Only 1 optional clock: > - - "bclk": the block clock of m4u. > - Here is the list which require this "bclk": > - - mt2701, mt2712, mt7623 and mt8173. > - Note that m4u use the EMI clock which always has been enabled before kernel > - if there is no this "bclk". > -- mediatek,larbs : List of phandle to the local arbiters in the current Socs. > - Refer to bindings/memory-controllers/mediatek,smi-larb.txt. It must sort > - according to the local arbiter index, like larb0, larb1, larb2... > -- iommu-cells : must be 1. This is the mtk_m4u_id according to the HW. > - Specifies the mtk_m4u_id as defined in > - dt-binding/memory/mt2701-larb-port.h for mt2701, mt7623 > - dt-binding/memory/mt2712-larb-port.h for mt2712, > - dt-binding/memory/mt6779-larb-port.h for mt6779, > - dt-binding/me
[PATCH v2 01/23] dt-bindings: iommu: mediatek: Convert IOMMU to DT schema
Convert MediaTek IOMMU to DT schema.
Signed-off-by: Yong Wu
---
.../bindings/iommu/mediatek,iommu.txt | 103
.../bindings/iommu/mediatek,iommu.yaml| 150 ++
2 files changed, 150 insertions(+), 103 deletions(-)
delete mode 100644 Documentation/devicetree/bindings/iommu/mediatek,iommu.txt
create mode 100644 Documentation/devicetree/bindings/iommu/mediatek,iommu.yaml
diff --git a/Documentation/devicetree/bindings/iommu/mediatek,iommu.txt
b/Documentation/devicetree/bindings/iommu/mediatek,iommu.txt
deleted file mode 100644
index c1ccd8582eb2..
--- a/Documentation/devicetree/bindings/iommu/mediatek,iommu.txt
+++ /dev/null
@@ -1,103 +0,0 @@
-* Mediatek IOMMU Architecture Implementation
-
- Some Mediatek SOCs contain a Multimedia Memory Management Unit (M4U), and
-this M4U have two generations of HW architecture. Generation one uses flat
-pagetable, and only supports 4K size page mapping. Generation two uses the
-ARM Short-Descriptor translation table format for address translation.
-
- About the M4U Hardware Block Diagram, please check below:
-
- EMI (External Memory Interface)
- |
- m4u (Multimedia Memory Management Unit)
- |
- ++
- ||
- gals0-rx gals1-rx(Global Async Local Sync rx)
- ||
- ||
- gals0-tx gals1-tx(Global Async Local Sync tx)
- || Some SoCs may have GALS.
- ++
- |
- SMI Common(Smart Multimedia Interface Common)
- |
- ++---
- ||
- | gals-rxThere may be GALS in some larbs.
- ||
- ||
- | gals-tx
- ||
- SMI larb0SMI larb1 ... SoCs have several SMI local arbiter(larb).
- (display) (vdec)
- ||
- ||
- +-+-+ +++
- | | | |||
- | | |... ||| ... There are different ports in each larb.
- | | | |||
-OVL0 RDMA0 WDMA0 MC PP VLD
-
- As above, The Multimedia HW will go through SMI and M4U while it
-access EMI. SMI is a bridge between m4u and the Multimedia HW. It contain
-smi local arbiter and smi common. It will control whether the Multimedia
-HW should go though the m4u for translation or bypass it and talk
-directly with EMI. And also SMI help control the power domain and clocks for
-each local arbiter.
- Normally we specify a local arbiter(larb) for each multimedia HW
-like display, video decode, and camera. And there are different ports
-in each larb. Take a example, There are many ports like MC, PP, VLD in the
-video decode local arbiter, all these ports are according to the video HW.
- In some SoCs, there may be a GALS(Global Async Local Sync) module between
-smi-common and m4u, and additional GALS module between smi-larb and
-smi-common. GALS can been seen as a "asynchronous fifo" which could help
-synchronize for the modules in different clock frequency.
-
-Required properties:
-- compatible : must be one of the following string:
- "mediatek,mt2701-m4u" for mt2701 which uses generation one m4u HW.
- "mediatek,mt2712-m4u" for mt2712 which uses generation two m4u HW.
- "mediatek,mt6779-m4u" for mt6779 which uses generation two m4u HW.
- "mediatek,mt7623-m4u", "mediatek,mt2701-m4u" for mt7623 which uses
-generation one m4u HW.
- "mediatek,mt8173-m4u" for mt8173 which uses generation two m4u HW.
- "mediatek,mt8183-m4u" for mt8183 which uses generation two m4u HW.
-- reg : m4u register base and size.
-- interrupts : the interrupt of m4u.
-- clocks : must contain one entry for each clock-names.
-- clock-names : Only 1 optional clock:
- - "bclk": the block clock of m4u.
- Here is the list which require this "bclk":
- - mt2701, mt2712, mt7623 and mt8173.
- Note that m4u use the EMI clock which always has been enabled before kernel
- if there is no this "bclk".
-- mediatek,larbs : List of phandle to the local arbiters in the current Socs.
- Refer to bindings/memory-controllers/mediatek,smi-larb.txt. It must sort
- according to the local arbiter index, like larb0, larb1, larb2...
-- iommu-cells : must be 1. This is the mtk_m4u_id according to the HW.
- Specifies the mtk_m4u_id as defined in
- dt-binding/memory/mt2701-larb-port.h for mt2701, mt7623
- dt-binding/memory/mt2712-larb-port.h for mt2712,
- dt-binding/memory/mt6779-larb-port.h for mt6779,
- dt-binding/memory/mt8173-larb-port.h for mt8173, and
- dt-binding/memory/mt8183-larb-port.h for mt8183.
-
-Example:
- iommu: iommu@10205000 {
- compatible = "mediatek,mt8173-m4u";
- reg = <0 0x10205000 0 0x10
