dt-bindings: cpufreq: qcom-cpufreq-nvmem: make cpr bindings optional
Subsystems (5)
PATCH v4 1/3 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.
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.
---
Changes v4:
- Explain why required-opp needs to be conditional
- Split additional ref part
Changesv3:
- No change
Changes v2:
- Reword commit description
- Fix condition order
- Add allOf
.../bindings/cpufreq/qcom-cpufreq-nvmem.yaml | 62 +++++++++++-------- 1 file changed, 37 insertions(+), 25 deletions(-)
Documentation/devicetree/bindings/cpufreq/qcom-cpufreq-nvmem.yaml +37 -25
@@ -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,46 @@ select: required: - compatible -properties: - cpus: - type: object +allOf: + - if: + properties: + compatible: + contains: + enum: + - qcom,qcs404 - patternProperties: - '^cpu@[0-9a-f]+$': - type: object + then: + properties: + cpus: + type: object - properties: - power-domains: - maxItems: 1 + patternProperties: + '^cpu@[0-9a-f]+$': + type: object - power-domain-names: - items: - - const: cpr + properties: + power-domains: + maxItems: 1 - required: - - power-domains - - power-domain-names + 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 + '^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
PATCH v4 2/3 dt-bindings: cpufreq: qcom-cpufreq-nvmem: specify supported opp tables
Add 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.
---
Changes v4:
- Add patch split from patch 1
.../bindings/cpufreq/qcom-cpufreq-nvmem.yaml | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+)
Documentation/devicetree/bindings/cpufreq/qcom-cpufreq-nvmem.yaml +19 -0
@@ -36,6 +36,25 @@ select: required: - compatible +patternProperties: + '^opp-table(-[a-z0-9]+)?$': + 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:
Signature · 1 line
2.38.1
PATCH v4 3/3 dt-bindings: opp: opp-v2-kryo-cpu: enlarge opp-supported-hw maximum
In reply to Christian MarangiEnlarge 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 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(-)
Documentation/devicetree/bindings/opp/opp-v2-kryo-cpu.yaml +13 -3
@@ -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
Rob Herring
maintainerQuoted 29 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.
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 <[email protected]>---
Changes v4:
- Explain why required-opp needs to be conditional
- Split additional ref part
Changesv3:
- No change
Changes v2:
- Reword commit description
- Fix condition order
- Add allOf
Quoted 3 lines
.../bindings/cpufreq/qcom-cpufreq-nvmem.yaml | 62 +++++++++++-------- 1 file changed, 37 insertions(+), 25 deletions(-)
My bot found errors running 'make DT_CHECKER_FLAGS=-m dt_binding_check' on your patch (DT_CHECKER_FLAGS is new in v5.13):
yamllint warnings/errors:
dtschema/dtc warnings/errors:
/builds/robherring/dt-review-ci/linux/Documentation/devicetree/bindings/cpufreq/qcom-cpufreq-nvmem.yaml: 'anyOf' conditional failed, one must be fixed:
'type' is a required property
'properties' is a required property
'patternProperties' is a required property
hint: 'additionalProperties' depends on 'properties' or 'patternProperties'
from schema $id: http://devicetree.org/meta-schemas/keywords.yaml#
/builds/robherring/dt-review-ci/linux/Documentation/devicetree/bindings/cpufreq/qcom-cpufreq-nvmem.yaml: 'anyOf' conditional failed, one must be fixed:
'properties' is a required property
'patternProperties' is a required property
hint: Metaschema for devicetree binding documentation
from schema $id: http://devicetree.org/meta-schemas/core.yaml#
doc reference errors (make refcheckdocs):
See https://patchwork.ozlabs.org/project/devicetree-bindings/patch/[email protected]
The base for the series is generally the latest rc1. A different dependency should be noted in *this* patch.
If you already ran 'make dt_binding_check' and didn't see the above error(s), then make sure 'yamllint' is installed and dt-schema is up to date:
pip3 install dtschema --upgrade
Please check and re-submit after running the above command yourself. Note that DT_SCHEMA_FILES can be set to your schema file to speed up checking your schema. However, it must be unset to test all examples with your schema.
Quoted 64 lines · Rob Herring
Quoted 29 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.
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 <[email protected]>---
Changes v4:
- Explain why required-opp needs to be conditional
- Split additional ref part
Changesv3:
- No change
Changes v2:
- Reword commit description
- Fix condition order
- Add allOfQuoted 3 lines
.../bindings/cpufreq/qcom-cpufreq-nvmem.yaml | 62 +++++++++++-------- 1 file changed, 37 insertions(+), 25 deletions(-)My bot found errors running 'make DT_CHECKER_FLAGS=-m
dt_binding_check' on your patch (DT_CHECKER_FLAGSis new in v5.13):yamllint warnings/errors:
dtschema/dtc warnings/errors:
/builds/robherring/dt-review-ci/linux/Documentation/devicetree/bindings/cpufreq/qcom-cpufreq-nvmem.yaml: 'anyOf' conditional failed, one must be fixed:
'type' is a required property
'properties' is a required property
'patternProperties' is a required property
hint: 'additionalProperties' depends on 'properties' or 'patternProperties'
from schema $id: http://devicetree.org/meta-schemas/keywords.yaml#
/builds/robherring/dt-review-ci/linux/Documentation/devicetree/bindings/cpufreq/qcom-cpufreq-nvmem.yaml: 'anyOf' conditional failed, one must be fixed:
'properties' is a required property
'patternProperties' is a required property
hint: Metaschema for devicetree binding documentation
from schema $id: http://devicetree.org/meta-schemas/core.yaml#doc reference errors (make refcheckdocs):
See https://patchwork.ozlabs.org/project/devicetree-bindings/patch/[email protected]
The base for the series is generally the latest rc1. A different dependency should be noted in *this* patch.
If you already ran 'make
dt_binding_check' and didn't see the above error(s), then make sure 'yamllint' is installed and dt-schema is up to date:
Quoted 6 lines
pip3 install dtschema --upgrade
Please check and re-submit after running the above command yourself. Note that
DT_SCHEMA_FILEScan be set to your schema file to speed up checking your schema. However, it must be unset to test all examples with your schema.
Hi, Rob, was aware of this error but it was expected from the split of patches. (since i made each part of the patch conditional the check complain for no binding defined)
If we really want I can send v5 that should fix this bisect problem by swapping patch 1 with patch 2 and rebasing.
I already have that ready and fix this bisect error.
Signature · 1 line
Ansuel