Skip to contentSkip to conversation

dt-bindings: cpufreq: qcom-cpufreq-nvmem: make cpr bindings optional

PATCH Superseded Christian Marangi 2 participants 5 messages Jan 23, 2023 – Jan 26, 2023

Subsystems (5)

v3 of 4 Superseded Latest is v4 →

lore
Share & tools
lore
#0 lore raw

PATCH v3 1/2 dt-bindings: cpufreq: qcom-cpufreq-nvmem: make cpr bindings optional

The qcom-cpufreq-nvmem driver supports 2 kind of devices:
- pre-cpr that doesn't have power-domains and base everything on nvmem cells and multiple named microvolt bindings
- cpr-based that require power-domain in the cpu nodes and use various source to decide the correct voltage and freq

When the schema was introduced, it was wrongly set to always require these binding but this is not the case for pre-cpr devices.

Make the power-domain optional and set them required only for qcs404 based devices.

While at it also make more clear what the opp-table supports by adding ref to the opp-v2-kryo-cpu and opp-v2-qcom-level schema.

Fixes ec24d1d55469 ("dt-bindings: opp: Convert qcom-nvmem-cpufreq to DT schema")

---

Changes v2:
- Reword commit description
- Fix condition order
- Add allOf

 .../bindings/cpufreq/qcom-cpufreq-nvmem.yaml  | 81 +++++++++++++------
 1 file changed, 56 insertions(+), 25 deletions(-)
Documentation/devicetree/bindings/cpufreq/qcom-cpufreq-nvmem.yaml +56 -25
index 9c086eac6ca7..6f5e7904181f 100644
@@ -17,6 +17,9 @@ description: |
   on the CPU OPP in use. The CPUFreq driver sets the CPR power domain level
   according to the required OPPs defined in the CPU OPP tables.
 
+  For old implementation efuses are parsed to select the correct opp table and
+  voltage and CPR is not supported/used.
+
 select:
   properties:
     compatible:
@@ -33,37 +36,65 @@ select:
   required:
     - compatible
 
-properties:
-  cpus:
-    type: object
-
-    patternProperties:
-      '^cpu@[0-9a-f]+$':
-        type: object
-
-        properties:
-          power-domains:
-            maxItems: 1
-
-          power-domain-names:
-            items:
-              - const: cpr
-
-        required:
-          - power-domains
-          - power-domain-names
-
 patternProperties:
   '^opp-table(-[a-z0-9]+)?$':
-    if:
+    allOf:
+      - if:
+          properties:
+            compatible:
+              const: operating-points-v2-kryo-cpu
+        then:
+          $ref: /schemas/opp/opp-v2-kryo-cpu.yaml#
+
+      - if:
+          properties:
+            compatible:
+              const: operating-points-v2-qcom-level
+        then:
+          $ref: /schemas/opp/opp-v2-qcom-level.yaml#
+
+    unevaluatedProperties: false
+
+allOf:
+  - if:
       properties:
         compatible:
-          const: operating-points-v2-kryo-cpu
+          contains:
+            enum:
+              - qcom,qcs404
+
     then:
+      properties:
+        cpus:
+          type: object
+
+          patternProperties:
+            '^cpu@[0-9a-f]+$':
+              type: object
+
+              properties:
+                power-domains:
+                  maxItems: 1
+
+                power-domain-names:
+                  items:
+                    - const: cpr
+
+              required:
+                - power-domains
+                - power-domain-names
+
       patternProperties:
-        '^opp-?[0-9]+$':
-          required:
-            - required-opps
+        '^opp-table(-[a-z0-9]+)?$':
+          if:
+            properties:
+              compatible:
+                const: operating-points-v2-kryo-cpu
+          then:
+            patternProperties:
+              '^opp-?[0-9]+$':
+                required:
+                  - required-opps
 
 additionalProperties: true
 
Signature · 1 line
2.38.1
#1 lore raw

PATCH v3 2/2 dt-bindings: opp: opp-v2-kryo-cpu: enlarge opp-supported-hw maximum

Enlarge opp-supported-hw maximum value. In recent SoC we started matching more bit and we currently match mask of 112. The old maximum of 7 was good for old SoC that didn't had complex id, but now this is limiting and we need to enlarge it to support more variants.

Document all the various mask that can be used and limit them to only reasonable values instead of using a generic maximum limit.

---

Changes v3:
- Fix dt_binding_check for missing 0x5 and 0x6 value Changes v2:
- Document additional bit format

 .../devicetree/bindings/opp/opp-v2-kryo-cpu.yaml | 16 +++++++++++++---
 1 file changed, 13 insertions(+), 3 deletions(-)
Documentation/devicetree/bindings/opp/opp-v2-kryo-cpu.yaml +13 -3
index b4947b326773..bbbad31ae4ca 100644
@@ -50,12 +50,22 @@ patternProperties:
       opp-supported-hw:
         description: |
           A single 32 bit bitmap value, representing compatible HW.
-          Bitmap:
+          Bitmap for MSM8996 format:
           0:  MSM8996, speedbin 0
           1:  MSM8996, speedbin 1
           2:  MSM8996, speedbin 2
-          3-31:  unused
-        maximum: 0x7
+          3:  MSM8996, speedbin 3
+          4-31:  unused
+
+          Bitmap for MSM8996SG format (speedbin shifted of 4 left):
+          0-3:  unused
+          4:  MSM8996SG, speedbin 0
+          5:  MSM8996SG, speedbin 1
+          6:  MSM8996SG, speedbin 2
+          7-31:  unused
+        enum: [0x1, 0x2, 0x3, 0x4, 0x5, 0x6, 0x7,
+               0x9, 0xd, 0xe, 0xf,
+               0x10, 0x20, 0x30, 0x70]
 
       clock-latency-ns: true
 
Signature · 1 line
2.38.1
Reviewed-by on v3 2/2
#2 lore raw

Re: [PATCH v3 2/2] dt-bindings: opp: opp-v2-kryo-cpu: enlarge opp-supported-hw maximum

Quoted 10 lines · Christian Marangi

Enlarge opp-supported-hw maximum value. In recent SoC we started matching more bit and we currently match mask of 112. The old maximum of 7 was good for old SoC that didn't had complex id, but now this is limiting and we need to enlarge it to support more variants.

Document all the various mask that can be used and limit them to only reasonable values instead of using a generic maximum limit.

---

Best regards,
Krzysztof

#3 lore raw
In reply to Christian Marangi
Quoted 72 lines · Christian Marangi

The qcom-cpufreq-nvmem driver supports 2 kind of devices:
- pre-cpr that doesn't have power-domains and base everything on nvmem cells and multiple named microvolt bindings
- cpr-based that require power-domain in the cpu nodes and use various source to decide the correct voltage and freq

When the schema was introduced, it was wrongly set to always require these binding but this is not the case for pre-cpr devices.

Make the power-domain optional and set them required only for qcs404 based devices.

While at it also make more clear what the opp-table supports by adding ref to the opp-v2-kryo-cpu and opp-v2-qcom-level schema.

Fixes ec24d1d55469 ("dt-bindings: opp: Convert qcom-nvmem-cpufreq to DT schema")

---

Changes v2:
- Reword commit description
- Fix condition order
- Add allOf

 .../bindings/cpufreq/qcom-cpufreq-nvmem.yaml  | 81 +++++++++++++------
 1 file changed, 56 insertions(+), 25 deletions(-)
Documentation/devicetree/bindings/cpufreq/qcom-cpufreq-nvmem.yaml +7 -21
index 9c086eac6ca7..6f5e7904181f 100644
@@ -17,6 +17,9 @@ description: |
   on the CPU OPP in use. The CPUFreq driver sets the CPR power domain level
   according to the required OPPs defined in the CPU OPP tables.
 
+  For old implementation efuses are parsed to select the correct opp table and
+  voltage and CPR is not supported/used.
+
 select:
   properties:
     compatible:
@@ -33,37 +36,65 @@ select:
   required:
     - compatible
 
-properties:
-  cpus:
-    type: object
-
-    patternProperties:
-      '^cpu@[0-9a-f]+$':
-        type: object
-
-        properties:
-          power-domains:
-            maxItems: 1
-
-          power-domain-names:
-            items:
-              - const: cpr
-
-        required:
-          - power-domains
-          - power-domain-names
-
 patternProperties:
   '^opp-table(-[a-z0-9]+)?$':
-    if:
+    allOf:
+      - if:
+          properties:
+            compatible:

Documentation/devicetree/bindings/cpufreq/qcom-cpufreq-nvmem.yaml select: · line 54

Quoted 10 lines
Documentation/devicetree/bindings/cpufreq/qcom-cpufreq-nvmem.yaml +10 -0
+              const: operating-points-v2-kryo-cpu
+        then:
+          $ref: /schemas/opp/opp-v2-kryo-cpu.yaml#
+
+      - if:
+          properties:
+            compatible:
+              const: operating-points-v2-qcom-level
+        then:
+          $ref: /schemas/opp/opp-v2-qcom-level.yaml#

This entire part looks independent, please split it into separate patch with its own explanation. What I still miss here - why do you remove "required-opps" from required properties. It's not clear to me at all.

Best regards,
Krzysztof

#4 lore raw
Quoted 79 lines · Krzysztof Kozlowski
Quoted 78 lines · Christian Marangi

The qcom-cpufreq-nvmem driver supports 2 kind of devices:
- pre-cpr that doesn't have power-domains and base everything on nvmem cells and multiple named microvolt bindings
- cpr-based that require power-domain in the cpu nodes and use various source to decide the correct voltage and freq

When the schema was introduced, it was wrongly set to always require these binding but this is not the case for pre-cpr devices.

Make the power-domain optional and set them required only for qcs404 based devices.

While at it also make more clear what the opp-table supports by adding ref to the opp-v2-kryo-cpu and opp-v2-qcom-level schema.

Fixes ec24d1d55469 ("dt-bindings: opp: Convert qcom-nvmem-cpufreq to DT schema")

---

Changes v2:
- Reword commit description
- Fix condition order
- Add allOf

 .../bindings/cpufreq/qcom-cpufreq-nvmem.yaml  | 81 +++++++++++++------
 1 file changed, 56 insertions(+), 25 deletions(-)
Documentation/devicetree/bindings/cpufreq/qcom-cpufreq-nvmem.yaml +13 -21
index 9c086eac6ca7..6f5e7904181f 100644
@@ -17,6 +17,9 @@ description: |
   on the CPU OPP in use. The CPUFreq driver sets the CPR power domain level
   according to the required OPPs defined in the CPU OPP tables.
 
+  For old implementation efuses are parsed to select the correct opp table and
+  voltage and CPR is not supported/used.
+
 select:
   properties:
     compatible:
@@ -33,37 +36,65 @@ select:
   required:
     - compatible
 
-properties:
-  cpus:
-    type: object
-
-    patternProperties:
-      '^cpu@[0-9a-f]+$':
-        type: object
-
-        properties:
-          power-domains:
-            maxItems: 1
-
-          power-domain-names:
-            items:
-              - const: cpr
-
-        required:
-          - power-domains
-          - power-domain-names
-
 patternProperties:
   '^opp-table(-[a-z0-9]+)?$':
-    if:
+    allOf:
+      - if:
+          properties:
+            compatible:
+              const: operating-points-v2-kryo-cpu
+        then:
+          $ref: /schemas/opp/opp-v2-kryo-cpu.yaml#
+
+      - if:
+          properties:
Quoted 9 lines

Documentation/devicetree/bindings/cpufreq/qcom-cpufreq-nvmem.yaml select: · line 54

Quoted 4 lines
Documentation/devicetree/bindings/cpufreq/qcom-cpufreq-nvmem.yaml +4 -0
+            compatible:
+              const: operating-points-v2-qcom-level
+        then:
+          $ref: /schemas/opp/opp-v2-qcom-level.yaml#

This entire part looks independent, please split it into separate patch with its own explanation. What I still miss here - why do you remove "required-opps" from required properties. It's not clear to me at all.

Hi, the required-opps needs to be part of this patch since they are only needed for genpd based devices.

I will split the additional if parts in another patch since they are not related.

Signature · 1 line
	Ansuel