[PATCH 0/7] dt-bindings: remoteproc/misc/qcom: stricten SMD/GLINK

[PATCH 0/7] dt-bindings: remoteproc/misc/qcom: stricten SMD/GLINK

[Krzysztof Kozlowski]

Hi,

This depends on qcom,fastrpc.yaml conversion in Rob's tree, therefore
everything should go the same way, I think.

Best regards,
Krzysztof

Krzysztof Kozlowski (7):
  dt-bindings: misc: qcom,fastrpc: correct qcom,nsessions name
  dt-bindings: misc: qcom,fastrpc: add compute iommus
  dt-bindings: misc: qcom,fastrpc: restrict channel names
  dt-bindings: misc: qcom,fastrpc: correct example for GLINK edge
  dt-bindings: remoteproc: qcom,glink-edge: require channels in children
  dt-bindings: soc: qcom: smd: restrict child name to smd-edge
  dt-bindings: remoteproc: qcom,smd-edge: define children

 .../bindings/misc/qcom,fastrpc.yaml           | 25 +++++++++++---
 .../bindings/remoteproc/qcom,glink-edge.yaml  |  4 +++
 .../bindings/remoteproc/qcom,smd-edge.yaml    | 34 ++++++++++++++++++-
 .../bindings/soc/qcom/qcom,smd.yaml           | 29 ++--------------
 4 files changed, 59 insertions(+), 33 deletions(-)

-- 
2.34.1

[PATCH 1/7] dt-bindings: misc: qcom,fastrpc: correct qcom,nsessions name

[Krzysztof Kozlowski]

The property in old TXT bindings, in Linux driver and in DTS is
qcom,nsessions.

Fixes: ed18a9b140bc ("dt-bindings: misc: fastrpc convert bindings to yaml")
Signed-off-by: Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org>

---

Fixed commit in Rob's tree.
---
 Documentation/devicetree/bindings/misc/qcom,fastrpc.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Documentation/devicetree/bindings/misc/qcom,fastrpc.yaml b/Documentation/devicetree/bindings/misc/qcom,fastrpc.yaml
index f25924d33fa9..4b4072b6be1c 100644
--- a/Documentation/devicetree/bindings/misc/qcom,fastrpc.yaml
+++ b/Documentation/devicetree/bindings/misc/qcom,fastrpc.yaml
@@ -70,7 +70,7 @@ patternProperties:
       reg:
         maxItems: 1
 
-      qcom,nsession:
+      qcom,nsessions:
         $ref: /schemas/types.yaml#/definitions/uint32
         default: 1
         description: >
-- 
2.34.1

[PATCH 2/7] dt-bindings: misc: qcom,fastrpc: add compute iommus

[Krzysztof Kozlowski]

The children of FastRPC have either one or two IOMMUs in existing DTS
(SM8150, SM8450 and others).

Signed-off-by: Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org>
---
 Documentation/devicetree/bindings/misc/qcom,fastrpc.yaml | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/Documentation/devicetree/bindings/misc/qcom,fastrpc.yaml b/Documentation/devicetree/bindings/misc/qcom,fastrpc.yaml
index 4b4072b6be1c..809de43afe35 100644
--- a/Documentation/devicetree/bindings/misc/qcom,fastrpc.yaml
+++ b/Documentation/devicetree/bindings/misc/qcom,fastrpc.yaml
@@ -70,6 +70,10 @@ patternProperties:
       reg:
         maxItems: 1
 
+      iommus:
+        minItems: 1
+        maxItems: 2
+
       qcom,nsessions:
         $ref: /schemas/types.yaml#/definitions/uint32
         default: 1
-- 
2.34.1

[PATCH 3/7] dt-bindings: misc: qcom,fastrpc: restrict channel names

[Krzysztof Kozlowski]

The Qualcomm FastRPC is expected to in GLINK or SMD edge node and its
channel name is always the same.

Signed-off-by: Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org>
---
 Documentation/devicetree/bindings/misc/qcom,fastrpc.yaml | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/Documentation/devicetree/bindings/misc/qcom,fastrpc.yaml b/Documentation/devicetree/bindings/misc/qcom,fastrpc.yaml
index 809de43afe35..1ed0ce0f3cbe 100644
--- a/Documentation/devicetree/bindings/misc/qcom,fastrpc.yaml
+++ b/Documentation/devicetree/bindings/misc/qcom,fastrpc.yaml
@@ -32,7 +32,8 @@ properties:
       A list of channels tied to this function, used for matching
       the function to a set of virtual channels.
     $ref: "/schemas/types.yaml#/definitions/string-array"
-    maxItems: 1
+    items:
+      - const: fastrpcglink-apps-dsp
 
   qcom,non-secure-domain:
     description:
@@ -43,7 +44,8 @@ properties:
     description:
       Channel name used for the RPM communication
     $ref: "/schemas/types.yaml#/definitions/string-array"
-    maxItems: 1
+    items:
+      - const: fastrpcsmd-apps-dsp
 
   qcom,vmids:
     description:
-- 
2.34.1

[PATCH 4/7] dt-bindings: misc: qcom,fastrpc: correct example for GLINK edge

[Krzysztof Kozlowski]

The parent of FastRPC node is GLINK edge, so the properties should be
matching GLINK, not SMD.  Correct the example and extend it based on
SM8350.

Signed-off-by: Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org>
---
 .../devicetree/bindings/misc/qcom,fastrpc.yaml      | 13 +++++++++++--
 1 file changed, 11 insertions(+), 2 deletions(-)

diff --git a/Documentation/devicetree/bindings/misc/qcom,fastrpc.yaml b/Documentation/devicetree/bindings/misc/qcom,fastrpc.yaml
index 1ed0ce0f3cbe..439b3f4a801b 100644
--- a/Documentation/devicetree/bindings/misc/qcom,fastrpc.yaml
+++ b/Documentation/devicetree/bindings/misc/qcom,fastrpc.yaml
@@ -112,19 +112,28 @@ examples:
 
         fastrpc {
             compatible = "qcom,fastrpc";
-            label = "adsp";
-            qcom,smd-channels = "fastrpcsmd-apps-dsp";
+            qcom,glink-channels = "fastrpcglink-apps-dsp";
+            label = "sdsp";
+            qcom,non-secure-domain;
             #address-cells = <1>;
             #size-cells = <0>;
 
             compute-cb@1 {
                 compatible = "qcom,fastrpc-compute-cb";
                 reg = <1>;
+                iommus = <&apps_smmu 0x0541 0x0>;
             };
 
             compute-cb@2 {
                 compatible = "qcom,fastrpc-compute-cb";
                 reg = <2>;
+                iommus = <&apps_smmu 0x0542 0x0>;
+            };
+
+            compute-cb@3 {
+                compatible = "qcom,fastrpc-compute-cb";
+                reg = <3>;
+                iommus = <&apps_smmu 0x0543 0x0>;
             };
         };
     };
-- 
2.34.1

[PATCH 5/7] dt-bindings: remoteproc: qcom,glink-edge: require channels in children

[Krzysztof Kozlowski]

GLINK edge contains subnodes representing devices related to the remote
processor.  Each of such device (e.g. APR or FastRPC) must have
a "qcom,glink-channels" property.  However the APR or FastRPC device can
be also part of other communication - SMD - thus their schema does not
require "qcom,glink-channels".

To make the GLINK edge bindings strict, require "qcom,glink-channels"
for its children.

Signed-off-by: Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org>
---
 .../devicetree/bindings/remoteproc/qcom,glink-edge.yaml       | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/Documentation/devicetree/bindings/remoteproc/qcom,glink-edge.yaml b/Documentation/devicetree/bindings/remoteproc/qcom,glink-edge.yaml
index 8953678da83e..25c27464ef25 100644
--- a/Documentation/devicetree/bindings/remoteproc/qcom,glink-edge.yaml
+++ b/Documentation/devicetree/bindings/remoteproc/qcom,glink-edge.yaml
@@ -19,11 +19,15 @@ properties:
 
   apr:
     $ref: /schemas/soc/qcom/qcom,apr.yaml#
+    required:
+      - qcom,glink-channels
     description:
       Qualcomm APR/GPR (Asynchronous/Generic Packet Router)
 
   fastrpc:
     $ref: /schemas/misc/qcom,fastrpc.yaml#
+    required:
+      - qcom,glink-channels
     description:
       Qualcomm FastRPC
 
-- 
2.34.1

[PATCH 6/7] dt-bindings: soc: qcom: smd: restrict child name to smd-edge

[Krzysztof Kozlowski]

Child node of SMD must be either smd-edge or rpm, so the pattern can be
narrowed.

Signed-off-by: Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org>
---
 Documentation/devicetree/bindings/soc/qcom/qcom,smd.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Documentation/devicetree/bindings/soc/qcom/qcom,smd.yaml b/Documentation/devicetree/bindings/soc/qcom/qcom,smd.yaml
index 9b3efe97f47c..0e548234611e 100644
--- a/Documentation/devicetree/bindings/soc/qcom/qcom,smd.yaml
+++ b/Documentation/devicetree/bindings/soc/qcom/qcom,smd.yaml
@@ -20,7 +20,7 @@ properties:
     const: qcom,smd
 
 patternProperties:
-  "^.*-edge|rpm$":
+  "^smd-edge|rpm$":
     $ref: /schemas/remoteproc/qcom,smd-edge.yaml#
     description:
       Each subnode of the SMD node represents a remote subsystem or a remote
-- 
2.34.1

[PATCH 7/7] dt-bindings: remoteproc: qcom,smd-edge: define children

[Krzysztof Kozlowski]

SMD edge contains subnodes representing devices related to the remote
processor.  With limietd number of remote processors, there is a limited
set of such devices.

List all of them in smd-edge bindings so schema can strictly check for
subnodes.

Additional benefit is requirement of "qcom,smd-channels" for such
subnodes, because their schema cannot enforce it (few devices like APR
or FastRPC can be part of either SMD or GLINK edge).

Signed-off-by: Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org>
---
 .../bindings/remoteproc/qcom,smd-edge.yaml    | 34 ++++++++++++++++++-
 .../bindings/soc/qcom/qcom,smd.yaml           | 27 +--------------
 2 files changed, 34 insertions(+), 27 deletions(-)

diff --git a/Documentation/devicetree/bindings/remoteproc/qcom,smd-edge.yaml b/Documentation/devicetree/bindings/remoteproc/qcom,smd-edge.yaml
index 06eebf791e32..7ec8a6b6682c 100644
--- a/Documentation/devicetree/bindings/remoteproc/qcom,smd-edge.yaml
+++ b/Documentation/devicetree/bindings/remoteproc/qcom,smd-edge.yaml
@@ -13,12 +13,30 @@ description:
   Qualcomm SMD subnode represents a remote subsystem or a remote processor of
   some sort - or in SMD language an "edge". The name of the edges are not
   important.
+
+  In turn, subnodes of the "edges" represent devices tied to SMD channels on
+  that "edge". The names of the devices are not important. The properties of
+  these nodes are defined by the individual bindings for the SMD devices.
   See also Documentation/devicetree/bindings/soc/qcom/qcom,smd.yaml
 
 properties:
   $nodename:
     const: "smd-edge"
 
+  apr:
+    $ref: /schemas/soc/qcom/qcom,apr.yaml#
+    required:
+      - qcom,smd-channels
+    description:
+      Qualcomm APR/GPR (Asynchronous/Generic Packet Router)
+
+  fastrpc:
+    $ref: /schemas/misc/qcom,fastrpc.yaml#
+    required:
+      - qcom,smd-channels
+    description:
+      Qualcomm FastRPC
+
   interrupts:
     maxItems: 1
 
@@ -56,6 +74,20 @@ properties:
       The identifier for the remote processor as known by the rest of the
       system.
 
+  rpm-requests:
+    $ref: /schemas/soc/qcom/qcom,smd-rpm.yaml#
+    required:
+      - qcom,smd-channels
+    description:
+      Qualcomm Resource Power Manager (RPM) over SMD.
+
+  wcnss:
+    $ref: /schemas/soc/qcom/qcom,wcnss.yaml
+    required:
+      - qcom,smd-channels
+    description:
+      Qualcomm WCNSS for Bluetooth, WiFi and FM radio.
+
 required:
   - interrupts
   - qcom,smd-edge
@@ -66,7 +98,7 @@ oneOf:
   - required:
       - qcom,ipc
 
-additionalProperties: true
+additionalProperties: false
 
 examples:
   - |
diff --git a/Documentation/devicetree/bindings/soc/qcom/qcom,smd.yaml b/Documentation/devicetree/bindings/soc/qcom/qcom,smd.yaml
index 0e548234611e..063e595c12f7 100644
--- a/Documentation/devicetree/bindings/soc/qcom/qcom,smd.yaml
+++ b/Documentation/devicetree/bindings/soc/qcom/qcom,smd.yaml
@@ -22,37 +22,12 @@ properties:
 patternProperties:
   "^smd-edge|rpm$":
     $ref: /schemas/remoteproc/qcom,smd-edge.yaml#
+    unevaluatedProperties: false
     description:
       Each subnode of the SMD node represents a remote subsystem or a remote
       processor of some sort - or in SMD language an "edge". The name of the
       edges are not important.
 
-    properties:
-      rpm-requests:
-        type: object
-        description:
-          In turn, subnodes of the "edges" represent devices tied to SMD
-          channels on that "edge". The names of the devices are not
-          important. The properties of these nodes are defined by the
-          individual bindings for the SMD devices.
-
-        properties:
-          qcom,smd-channels:
-            $ref: /schemas/types.yaml#/definitions/string-array
-            minItems: 1
-            maxItems: 32
-            description:
-              A list of channels tied to this device, used for matching the
-              device to channels.
-
-        required:
-          - compatible
-          - qcom,smd-channels
-
-        additionalProperties: true
-
-    unevaluatedProperties: false
-
 required:
   - compatible
 
-- 
2.34.1

Re: [PATCH 0/7] dt-bindings: remoteproc/misc/qcom: stricten SMD/GLINK

[Rob Herring]

On Fri, Sep 09, 2022 at 02:53:56PM +0200, Krzysztof Kozlowski wrote:
> Hi,
> 
> This depends on qcom,fastrpc.yaml conversion in Rob's tree, therefore
> everything should go the same way, I think.
> 
> Best regards,
> Krzysztof
> 
> Krzysztof Kozlowski (7):
>   dt-bindings: misc: qcom,fastrpc: correct qcom,nsessions name
>   dt-bindings: misc: qcom,fastrpc: add compute iommus
>   dt-bindings: misc: qcom,fastrpc: restrict channel names
>   dt-bindings: misc: qcom,fastrpc: correct example for GLINK edge
>   dt-bindings: remoteproc: qcom,glink-edge: require channels in children
>   dt-bindings: soc: qcom: smd: restrict child name to smd-edge
>   dt-bindings: remoteproc: qcom,smd-edge: define children

Series applied.

Rob

Re: [PATCH 0/7] dt-bindings: remoteproc/misc/qcom: stricten SMD/GLINK

[Krzysztof Kozlowski]

On 09/09/2022 18:23, Rob Herring wrote:
> On Fri, Sep 09, 2022 at 02:53:56PM +0200, Krzysztof Kozlowski wrote:
>> Hi,
>>
>> This depends on qcom,fastrpc.yaml conversion in Rob's tree, therefore
>> everything should go the same way, I think.
>>
>> Best regards,
>> Krzysztof
>>
>> Krzysztof Kozlowski (7):
>>   dt-bindings: misc: qcom,fastrpc: correct qcom,nsessions name
>>   dt-bindings: misc: qcom,fastrpc: add compute iommus
>>   dt-bindings: misc: qcom,fastrpc: restrict channel names
>>   dt-bindings: misc: qcom,fastrpc: correct example for GLINK edge
>>   dt-bindings: remoteproc: qcom,glink-edge: require channels in children
>>   dt-bindings: soc: qcom: smd: restrict child name to smd-edge
>>   dt-bindings: remoteproc: qcom,smd-edge: define children
> 
> Series applied.


OK, thanks!

Best regards,
Krzysztof