Skip to contentSkip to conversation

Mediatek SCP dt-binding tweaks

PATCH In review Nícolas F. R. A. Prado 3 participants 7 messages May 11, 2022 – May 17, 2022

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

v5 cover Mediatek SCP dt-binding tweaks

Two simple patches for the Mediatek SCP dt-binding. The first fixes the reg/reg-names property while the second adds a new optional memory-region property.

v4: https://lore.kernel.org/all/[email protected]
v3: https://lore.kernel.org/all/[email protected]
v2: https://lore.kernel.org/all/[email protected]
v1: https://lore.kernel.org/all/[email protected]

Changes in v5:
- Made l1tcm optional for mt8192/mt8195
- Greatly simplified the constraints override in the if:then:

Changes in v4:
- Reworked presence of l1tcm reg to be if:then: based and present only on mt8192/mt8195

Changes in v3:
- Made the cfg reg required again. After looking again into the mtk-scp driver, only l1tcm is optional.

Changes in v2:
- Dropped type and description from memory-region since it's a well-known property
- Set memory-region maxItems to 1

Nícolas F. R. A. Prado (2):
dt-bindings: remoteproc: mediatek: Make l1tcm reg exclusive to mt819x
dt-bindings: remoteproc: mediatek: Add optional memory-region to
mtk,scp

 .../bindings/remoteproc/mtk,scp.yaml          | 47 +++++++++++++------
 1 file changed, 33 insertions(+), 14 deletions(-)
Signature · 1 line
2.36.1
#1 lore raw

PATCH v5 1/2 dt-bindings: remoteproc: mediatek: Make l1tcm reg exclusive to mt819x

Commit ca23ecfdbd44 ("remoteproc/mediatek: support L1TCM") added support for the l1tcm memory region on the MT8192 SCP, adding a new da_to_va callback that handles l1tcm while keeping the old one for back-compatibility with MT8183. However, since the mt8192 compatible was missing from the dt-binding, the accompanying dt-binding commit 503c64cc42f1 ("dt-bindings: remoteproc: mediatek: add L1TCM memory region") mistakenly added this reg as if it were for mt8183. And later it became common to all platforms as their compatibles were added.

Fix the dt-binding so that the l1tcm reg can be present only on the supported platforms: mt8192 and mt8195.

Fixes 503c64cc42f1 ("dt-bindings: remoteproc: mediatek: add L1TCM memory region")

---

Changes in v5:
- Made l1tcm optional for mt8192/mt8195
- Greatly simplified the constraints override in the if:then:
- Updated commit message

Changes in v4:
- Reworked presence of l1tcm reg to be if:then: based and present only on mt8192/mt8195
- Rewrote commit message
- Added Fixes tag

Changes in v3:
- Made the cfg reg required again. After looking again into the mtk-scp driver, only l1tcm is optional.
- Added mention that a dtbs_check warning gets fixed by patch in commit message.

 .../bindings/remoteproc/mtk,scp.yaml          | 44 +++++++++++++------
 1 file changed, 30 insertions(+), 14 deletions(-)
Documentation/devicetree/bindings/remoteproc/mtk,scp.yaml +30 -14
index abc11ac92818..832064d635b3 100644
@@ -23,11 +23,13 @@ properties:
 
   reg:
     description:
-      Should contain the address ranges for memory regions SRAM, CFG, and
-      L1TCM.
+      Should contain the address ranges for memory regions SRAM, CFG, and,
+      on some platforms, L1TCM.
+    minItems: 2
     maxItems: 3
 
   reg-names:
+    minItems: 2
     items:
       - const: sram
       - const: cfg
@@ -57,16 +59,30 @@ required:
   - reg
   - reg-names
 
-if:
-  properties:
-    compatible:
-      enum:
-        - mediatek,mt8183-scp
-        - mediatek,mt8192-scp
-then:
-  required:
-    - clocks
-    - clock-names
+allOf:
+  - if:
+      properties:
+        compatible:
+          enum:
+            - mediatek,mt8183-scp
+            - mediatek,mt8192-scp
+    then:
+      required:
+        - clocks
+        - clock-names
+
+  - if:
+      properties:
+        compatible:
+          enum:
+            - mediatek,mt8183-scp
+            - mediatek,mt8186-scp
+    then:
+      properties:
+        reg:
+          maxItems: 2
+        reg-names:
+          maxItems: 2
 
 additionalProperties:
   type: object
@@ -86,10 +102,10 @@ additionalProperties:
 
 examples:
   - |
-    #include <dt-bindings/clock/mt8183-clk.h>
+    #include <dt-bindings/clock/mt8192-clk.h>
 
     scp@10500000 {
-        compatible = "mediatek,mt8183-scp";
+        compatible = "mediatek,mt8192-scp";
         reg = <0x10500000 0x80000>,
               <0x10700000 0x8000>,
               <0x10720000 0xe0000>;
Signature · 1 line
2.36.1
#2 lore raw

Re: [PATCH v5 1/2] dt-bindings: remoteproc: mediatek: Make l1tcm reg exclusive to mt819x

On 11/05/2022 21:54, Nícolas F. R. A. Prado wrote:

Thank you for your patch. There is something to discuss/improve.

Quoted 25 lines
Documentation/devicetree/bindings/remoteproc/mtk,scp.yaml +14 -10
-if:
-  properties:
-    compatible:
-      enum:
-        - mediatek,mt8183-scp
-        - mediatek,mt8192-scp
-then:
-  required:
-    - clocks
-    - clock-names
+allOf:
+  - if:
+      properties:
+        compatible:
+          enum:
+            - mediatek,mt8183-scp
+            - mediatek,mt8192-scp
+    then:
+      required:
+        - clocks
+        - clock-names
+
+  - if:
+      properties:

Documentation/devicetree/bindings/remoteproc/mtk,scp.yaml required: · line 85

Quoted 10 lines
Documentation/devicetree/bindings/remoteproc/mtk,scp.yaml +10 -0
+        compatible:
+          enum:
+            - mediatek,mt8183-scp
+            - mediatek,mt8186-scp
+    then:
+      properties:
+        reg:
+          maxItems: 2
+        reg-names:
+          maxItems: 2

Isn't l1tcm required on mt819x? Now it is left optional.

Best regards,
Krzysztof

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

#3 lore raw

Re: [PATCH v5 1/2] dt-bindings: remoteproc: mediatek: Make l1tcm reg exclusive to mt819x

Quoted 33 lines · Krzysztof Kozlowski

On 11/05/2022 21:54, Nícolas F. R. A. Prado wrote:

Thank you for your patch. There is something to discuss/improve.

Quoted 29 lines
Documentation/devicetree/bindings/remoteproc/mtk,scp.yaml +18 -10
-if:
-  properties:
-    compatible:
-      enum:
-        - mediatek,mt8183-scp
-        - mediatek,mt8192-scp
-then:
-  required:
-    - clocks
-    - clock-names
+allOf:
+  - if:
+      properties:
+        compatible:
+          enum:
+            - mediatek,mt8183-scp
+            - mediatek,mt8192-scp
+    then:
+      required:
+        - clocks
+        - clock-names
+
+  - if:
+      properties:
+        compatible:
+          enum:
+            - mediatek,mt8183-scp
+            - mediatek,mt8186-scp
Quoted 8 lines

Documentation/devicetree/bindings/remoteproc/mtk,scp.yaml required: · line 85

Quoted 6 lines
Documentation/devicetree/bindings/remoteproc/mtk,scp.yaml +6 -0
+    then:
+      properties:
+        reg:
+          maxItems: 2
+        reg-names:
+          maxItems: 2

Isn't l1tcm required on mt819x? Now it is left optional.

Hi Krzysztof,

actually l1tcm is optional for mt819x, as commented by Tzung-Bi on v4 [1]. So that change was intended.

Thanks,
Nícolas

[1] https://lore.kernel.org/all/CA+Px+wXQjys8xvTSSJkLXoGp4yQnANbKWBtfuxiYi0UX6DH0jw@mail.gmail.com/

Quoted 4 lines

Best regards,
Krzysztof

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

Reviewed-by on v5 1/2
#4 lore raw

Re: [PATCH v5 1/2] dt-bindings: remoteproc: mediatek: Make l1tcm reg exclusive to mt819x

In reply to Nícolas F. R. A. Prado
Quoted 15 lines · Nícolas F. R. A. Prado

Commit ca23ecfdbd44 ("remoteproc/mediatek: support L1TCM") added support for the l1tcm memory region on the MT8192 SCP, adding a new da_to_va callback that handles l1tcm while keeping the old one for back-compatibility with MT8183. However, since the mt8192 compatible was missing from the dt-binding, the accompanying dt-binding commit 503c64cc42f1 ("dt-bindings: remoteproc: mediatek: add L1TCM memory region") mistakenly added this reg as if it were for mt8183. And later it became common to all platforms as their compatibles were added.

Fix the dt-binding so that the l1tcm reg can be present only on the supported platforms: mt8192 and mt8195.

Fixes 503c64cc42f1 ("dt-bindings: remoteproc: mediatek: add L1TCM memory region")
Quoted 7 lines

---

Changes in v5:
- Made l1tcm optional for mt8192/mt8195
- Greatly simplified the constraints override in the if:then:
- Updated commit message

Best regards,
Krzysztof

#5 lore raw

PATCH v5 2/2 dt-bindings: remoteproc: mediatek: Add optional memory-region to mtk,scp

In reply to Nícolas F. R. A. Prado

The SCP co-processor can optionally be passed a reserved memory region to use. Add this property in the dt-binding.

---

(no changes since v2)

Changes in v2:
- Dropped type and description since it's a well-known property
- Set maxItems to 1

 Documentation/devicetree/bindings/remoteproc/mtk,scp.yaml | 3 +++
 1 file changed, 3 insertions(+)
Documentation/devicetree/bindings/remoteproc/mtk,scp.yaml +3 -0
index 832064d635b3..eec3b9c4c713 100644
@@ -54,6 +54,9 @@ properties:
       firmware search path containing the firmware image used when
       initializing SCP.
 
+  memory-region:
+    maxItems: 1
+
 required:
   - compatible
   - reg
Signature · 1 line
2.36.1
maintainer
#6 lore raw
In reply to Nícolas F. R. A. Prado

I have applied this set.

Thanks,
Mathieu

Quoted 27 lines · Nícolas F. R. A. Prado

Two simple patches for the Mediatek SCP dt-binding. The first fixes the reg/reg-names property while the second adds a new optional memory-region property.

v4: https://lore.kernel.org/all/[email protected]
v3: https://lore.kernel.org/all/[email protected]
v2: https://lore.kernel.org/all/[email protected]
v1: https://lore.kernel.org/all/[email protected]

Changes in v5:
- Made l1tcm optional for mt8192/mt8195
- Greatly simplified the constraints override in the if:then:

Changes in v4:
- Reworked presence of l1tcm reg to be if:then: based and present only on mt8192/mt8195

Changes in v3:
- Made the cfg reg required again. After looking again into the mtk-scp driver, only l1tcm is optional.

Changes in v2:
- Dropped type and description from memory-region since it's a well-known property
- Set memory-region maxItems to 1

Quoted 11 lines

Nícolas F. R. A. Prado (2):
dt-bindings: remoteproc: mediatek: Make l1tcm reg exclusive to mt819x
dt-bindings: remoteproc: mediatek: Add optional memory-region to
mtk,scp

 .../bindings/remoteproc/mtk,scp.yaml          | 47 +++++++++++++------
 1 file changed, 33 insertions(+), 14 deletions(-)
Signature · 1 line
2.36.1

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