[PATCH v5 1/3] dt-bindings: cpufreq: qcom-cpufreq-nvmem: specify supported opp tables

[PATCH v5 1/3] dt-bindings: cpufreq: qcom-cpufreq-nvmem: specify supported opp tables

[Christian Marangi]

Add additional info on what opp tables the defined devices in this schema
supports (operating-points-v2-kryo-cpu and operating-points-v2-qcom-level)
and reference them.

Signed-off-by: Christian Marangi <ansuelsmth@gmail.com>
---
Changes v5:
- Swap patch 1 and patch 2 to fix dt_check_warning on single
  patch bisecting 
Changes v4:
- Add patch split from patch 1

 .../bindings/cpufreq/qcom-cpufreq-nvmem.yaml  | 35 ++++++++++++++-----
 1 file changed, 26 insertions(+), 9 deletions(-)

diff --git a/Documentation/devicetree/bindings/cpufreq/qcom-cpufreq-nvmem.yaml b/Documentation/devicetree/bindings/cpufreq/qcom-cpufreq-nvmem.yaml
index 9c086eac6ca7..7c42d9439abd 100644
--- a/Documentation/devicetree/bindings/cpufreq/qcom-cpufreq-nvmem.yaml
+++ b/Documentation/devicetree/bindings/cpufreq/qcom-cpufreq-nvmem.yaml
@@ -55,15 +55,32 @@ properties:
 
 patternProperties:
   '^opp-table(-[a-z0-9]+)?$':
-    if:
-      properties:
-        compatible:
-          const: operating-points-v2-kryo-cpu
-    then:
-      patternProperties:
-        '^opp-?[0-9]+$':
-          required:
-            - required-opps
+    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-kryo-cpu
+        then:
+          patternProperties:
+            '^opp-?[0-9]+$':
+              required:
+                - required-opps
+
+      - if:
+          properties:
+            compatible:
+              const: operating-points-v2-qcom-level
+        then:
+          $ref: /schemas/opp/opp-v2-qcom-level.yaml#
+
+    unevaluatedProperties: false
 
 additionalProperties: true
 
-- 
2.38.1

[PATCH v5 2/3] dt-bindings: cpufreq: qcom-cpufreq-nvmem: make cpr bindings optional

[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.
  Doesn't need required-opp binding in the opp nodes as they are only
  used for genpd based devices.
- cpr-based that require power-domain in the cpu nodes and use various
  source to decide the correct voltage and freq
  Require required-opp binding since they need to be linked to the
  related opp-level.

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 and the required-opp optional and set them required
only for qcs404 based devices.

Fixes: ec24d1d55469 ("dt-bindings: opp: Convert qcom-nvmem-cpufreq to DT schema")
Signed-off-by: Christian Marangi <ansuelsmth@gmail.com>
---
Changes v5:
- Swap patch 1 and patch 2 to fix dt_check_warning on single
Changes v4:
- Explain why required-opp needs to be conditional
- Split additional ref part
Changes v3:
- No change
Changes v2:
- Reword commit description
- Fix condition order
- Add allOf

 .../bindings/cpufreq/qcom-cpufreq-nvmem.yaml  | 74 +++++++++++--------
 1 file changed, 44 insertions(+), 30 deletions(-)

diff --git a/Documentation/devicetree/bindings/cpufreq/qcom-cpufreq-nvmem.yaml b/Documentation/devicetree/bindings/cpufreq/qcom-cpufreq-nvmem.yaml
index 7c42d9439abd..6f5e7904181f 100644
--- a/Documentation/devicetree/bindings/cpufreq/qcom-cpufreq-nvmem.yaml
+++ b/Documentation/devicetree/bindings/cpufreq/qcom-cpufreq-nvmem.yaml
@@ -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,26 +36,6 @@ 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]+)?$':
     allOf:
@@ -63,16 +46,6 @@ patternProperties:
         then:
           $ref: /schemas/opp/opp-v2-kryo-cpu.yaml#
 
-      - if:
-          properties:
-            compatible:
-              const: operating-points-v2-kryo-cpu
-        then:
-          patternProperties:
-            '^opp-?[0-9]+$':
-              required:
-                - required-opps
-
       - if:
           properties:
             compatible:
@@ -82,6 +55,47 @@ patternProperties:
 
     unevaluatedProperties: false
 
+allOf:
+  - if:
+      properties:
+        compatible:
+          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-table(-[a-z0-9]+)?$':
+          if:
+            properties:
+              compatible:
+                const: operating-points-v2-kryo-cpu
+          then:
+            patternProperties:
+              '^opp-?[0-9]+$':
+                required:
+                  - required-opps
+
 additionalProperties: true
 
 examples:
-- 
2.38.1

[PATCH v5 3/3] dt-bindings: opp: opp-v2-kryo-cpu: enlarge opp-supported-hw maximum

[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.

Signed-off-by: Christian Marangi <ansuelsmth@gmail.com>
Reviewed-by: Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org>
---
Changes v5:
- No change
Changes v4:
- Add review tag from Krzysztof
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(-)

diff --git a/Documentation/devicetree/bindings/opp/opp-v2-kryo-cpu.yaml b/Documentation/devicetree/bindings/opp/opp-v2-kryo-cpu.yaml
index b4947b326773..bbbad31ae4ca 100644
--- a/Documentation/devicetree/bindings/opp/opp-v2-kryo-cpu.yaml
+++ b/Documentation/devicetree/bindings/opp/opp-v2-kryo-cpu.yaml
@@ -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
 
-- 
2.38.1

Re: [PATCH v5 1/3] dt-bindings: cpufreq: qcom-cpufreq-nvmem: specify supported opp tables

[Krzysztof Kozlowski]

On 31/01/2023 16:18, Christian Marangi wrote:
> Add additional info on what opp tables the defined devices in this schema
> supports (operating-points-v2-kryo-cpu and operating-points-v2-qcom-level)
> and reference them.
> 
> Signed-off-by: Christian Marangi <ansuelsmth@gmail.com>
> ---
> Changes v5:
> - Swap patch 1 and patch 2 to fix dt_check_warning on single
>   patch bisecting 
> Changes v4:
> - Add patch split from patch 1
> 
>  .../bindings/cpufreq/qcom-cpufreq-nvmem.yaml  | 35 ++++++++++++++-----

This patch causes new warnings:

arch/arm64/boot/dts/qcom/apq8096-ifc6640.dtb: /: opp-table-cluster0:
Unevaluated properties are not allowed ('compatible', 'nvmem-cells',
'opp-1036800000', 'opp-1113600000', 'opp-1190400000', 'opp-1228800000',
'opp-1324800000', 'opp-1363200000', 'opp-1401600000', 'opp-1478400000',
'opp-1497600000', 'opp-1593600000', 'opp-307200000', 'opp-422400000',
'opp-480000000', 'opp-556800000', 'opp-652800000', 'opp-729600000',
'opp-844800000', 'opp-960000000', 'opp-shared' were unexpected)


Best regards,
Krzysztof

Re: [PATCH v5 2/3] dt-bindings: cpufreq: qcom-cpufreq-nvmem: make cpr bindings optional

[Krzysztof Kozlowski]

On 31/01/2023 16:18, Christian Marangi wrote:
> 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.
>   Doesn't need required-opp binding in the opp nodes as they are only
>   used for genpd based devices.
> - cpr-based that require power-domain in the cpu nodes and use various
>   source to decide the correct voltage and freq
>   Require required-opp binding since they need to be linked to the
>   related opp-level.
> 
> 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 and the required-opp optional and set them required
> only for qcs404 based devices.
> 
> Fixes: ec24d1d55469 ("dt-bindings: opp: Convert qcom-nvmem-cpufreq to DT schema")

Fixes go as first patches in the series.



Best regards,
Krzysztof

Re: [PATCH v5 2/3] dt-bindings: cpufreq: qcom-cpufreq-nvmem: make cpr bindings optional

[Christian Marangi]

On Wed, Feb 01, 2023 at 09:20:39AM +0100, Krzysztof Kozlowski wrote:
> On 31/01/2023 16:18, Christian Marangi wrote:
> > 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.
> >   Doesn't need required-opp binding in the opp nodes as they are only
> >   used for genpd based devices.
> > - cpr-based that require power-domain in the cpu nodes and use various
> >   source to decide the correct voltage and freq
> >   Require required-opp binding since they need to be linked to the
> >   related opp-level.
> > 
> > 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 and the required-opp optional and set them required
> > only for qcs404 based devices.
> > 
> > Fixes: ec24d1d55469 ("dt-bindings: opp: Convert qcom-nvmem-cpufreq to DT schema")
> 
> Fixes go as first patches in the series.
> 

Hi,
this is problematic. This documentation is a bit special.

v4 had this patch as first but this cause error with make
dt_binding_check as the schema will be effectively empty (as it will
have only if condition)

This is why I pushed v5 that swap this with the second patch and first
add non conditional stuff to the schema and only with the second patch
makes them conditional.

Any hint to handle this corner case? I'm having some diffiulties due to
how special this is but we really need this fix since it's blocking the
introduction of opp table for ipq806x and ipq807x (as the schema is
currently flawed)

-- 
	Ansuel

Re: [PATCH v5 1/3] dt-bindings: cpufreq: qcom-cpufreq-nvmem: specify supported opp tables

[Christian Marangi]

On Wed, Feb 01, 2023 at 09:19:42AM +0100, Krzysztof Kozlowski wrote:
> On 31/01/2023 16:18, Christian Marangi wrote:
> > Add additional info on what opp tables the defined devices in this schema
> > supports (operating-points-v2-kryo-cpu and operating-points-v2-qcom-level)
> > and reference them.
> > 
> > Signed-off-by: Christian Marangi <ansuelsmth@gmail.com>
> > ---
> > Changes v5:
> > - Swap patch 1 and patch 2 to fix dt_check_warning on single
> >   patch bisecting 
> > Changes v4:
> > - Add patch split from patch 1
> > 
> >  .../bindings/cpufreq/qcom-cpufreq-nvmem.yaml  | 35 ++++++++++++++-----
> 
> This patch causes new warnings:
> 
> arch/arm64/boot/dts/qcom/apq8096-ifc6640.dtb: /: opp-table-cluster0:
> Unevaluated properties are not allowed ('compatible', 'nvmem-cells',
> 'opp-1036800000', 'opp-1113600000', 'opp-1190400000', 'opp-1228800000',
> 'opp-1324800000', 'opp-1363200000', 'opp-1401600000', 'opp-1478400000',
> 'opp-1497600000', 'opp-1593600000', 'opp-307200000', 'opp-422400000',
> 'opp-480000000', 'opp-556800000', 'opp-652800000', 'opp-729600000',
> 'opp-844800000', 'opp-960000000', 'opp-shared' were unexpected)
> 

Hi, this is fixed by the third patch and caused by

opp-supported-hw:0:0: 16 is greater than the maximum of 7

that is fixed by documenting the new bits.

-- 
	Ansuel

Re: [PATCH v5 2/3] dt-bindings: cpufreq: qcom-cpufreq-nvmem: make cpr bindings optional

[Krzysztof Kozlowski]

On 08/02/2023 01:09, Christian Marangi wrote:
> On Wed, Feb 01, 2023 at 09:20:39AM +0100, Krzysztof Kozlowski wrote:
>> On 31/01/2023 16:18, Christian Marangi wrote:
>>> 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.
>>>   Doesn't need required-opp binding in the opp nodes as they are only
>>>   used for genpd based devices.
>>> - cpr-based that require power-domain in the cpu nodes and use various
>>>   source to decide the correct voltage and freq
>>>   Require required-opp binding since they need to be linked to the
>>>   related opp-level.
>>>
>>> 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 and the required-opp optional and set them required
>>> only for qcs404 based devices.
>>>
>>> Fixes: ec24d1d55469 ("dt-bindings: opp: Convert qcom-nvmem-cpufreq to DT schema")
>>
>> Fixes go as first patches in the series.
>>
> 
> Hi,
> this is problematic. This documentation is a bit special.
> 
> v4 had this patch as first but this cause error with make
> dt_binding_check as the schema will be effectively empty (as it will
> have only if condition)
> 
> This is why I pushed v5 that swap this with the second patch and first
> add non conditional stuff to the schema and only with the second patch
> makes them conditional.
> 
> Any hint to handle this corner case? I'm having some diffiulties due to
> how special this is but we really need this fix since it's blocking the
> introduction of opp table for ipq806x and ipq807x (as the schema is
> currently flawed)

Let's then drop fixes tag, because it will only confuse any backporters.

Best regards,
Krzysztof