| Message ID | 20250403-dt-cpu-schema-v1-14-076be7171a85@kernel.org |
|---|---|
| State | New |
| Headers | show |
| Series | Arm cpu schema clean-ups | expand |
On Thu, Apr 03, 2025 at 09:59:35PM -0500, Rob Herring (Arm) wrote: > Replace the prose for properties dependent on specific "enable-method" > values with schemas defining the same requirements. > > Both "qcom,acc" and "qcom,saw" properties appear to be required for any > of the Qualcomm enable-method values, so the schema is a bit simpler > than what the text said. The references to arm/msm/qcom,saw2.txt and > arm/msm/qcom,kpss-acc.txt are out of date, so just drop them. > For all the bindings changes(14-19/19,) Reviewed-by: Sudeep Holla <sudeep.holla@arm.com>
On Fri, Apr 4, 2025 at 9:56 AM Rob Herring (Arm) <robh@kernel.org> wrote: > > > On Thu, 03 Apr 2025 21:59:35 -0500, Rob Herring (Arm) wrote: > > Replace the prose for properties dependent on specific "enable-method" > > values with schemas defining the same requirements. > > > > Both "qcom,acc" and "qcom,saw" properties appear to be required for any > > of the Qualcomm enable-method values, so the schema is a bit simpler > > than what the text said. The references to arm/msm/qcom,saw2.txt and > > arm/msm/qcom,kpss-acc.txt are out of date, so just drop them. > > > > Signed-off-by: Rob Herring (Arm) <robh@kernel.org> > > --- > > Documentation/devicetree/bindings/arm/cpus.yaml | 82 +++++++++++++++---------- > > 1 file changed, 49 insertions(+), 33 deletions(-) > > > > My bot found errors running 'make dt_binding_check' on your patch: > > yamllint warnings/errors: > > dtschema/dtc warnings/errors: > /builds/robherring/dt-review-ci/linux/Documentation/devicetree/bindings/soc/qcom/qcom,saw2.example.dtb: cpu@0: 'qcom,acc' is a required property > from schema $id: http://devicetree.org/schemas/arm/cpus.yaml# Any Qcom folks want to tell me whether both qcom,acc and qcom,saw are required or not? All the actual users have both. Rob
On Thu, Apr 10, 2025 at 09:11:22AM -0500, Rob Herring wrote: > On Fri, Apr 4, 2025 at 9:56 AM Rob Herring (Arm) <robh@kernel.org> wrote: > > > > > > On Thu, 03 Apr 2025 21:59:35 -0500, Rob Herring (Arm) wrote: > > > Replace the prose for properties dependent on specific "enable-method" > > > values with schemas defining the same requirements. > > > > > > Both "qcom,acc" and "qcom,saw" properties appear to be required for any > > > of the Qualcomm enable-method values, so the schema is a bit simpler > > > than what the text said. The references to arm/msm/qcom,saw2.txt and > > > arm/msm/qcom,kpss-acc.txt are out of date, so just drop them. > > > > > > Signed-off-by: Rob Herring (Arm) <robh@kernel.org> > > > --- > > > Documentation/devicetree/bindings/arm/cpus.yaml | 82 +++++++++++++++---------- > > > 1 file changed, 49 insertions(+), 33 deletions(-) > > > > > > > My bot found errors running 'make dt_binding_check' on your patch: > > > > yamllint warnings/errors: > > > > dtschema/dtc warnings/errors: > > /builds/robherring/dt-review-ci/linux/Documentation/devicetree/bindings/soc/qcom/qcom,saw2.example.dtb: cpu@0: 'qcom,acc' is a required property > > from schema $id: http://devicetree.org/schemas/arm/cpus.yaml# > > Any Qcom folks want to tell me whether both qcom,acc and qcom,saw are > required or not? All the actual users have both. Yes, as far as I remember.
diff --git a/Documentation/devicetree/bindings/arm/cpus.yaml b/Documentation/devicetree/bindings/arm/cpus.yaml index 2e666b2a4dcd..963a9320cba8 100644 --- a/Documentation/devicetree/bindings/arm/cpus.yaml +++ b/Documentation/devicetree/bindings/arm/cpus.yaml @@ -273,8 +273,6 @@ properties: description: The DT specification defines this as 64-bit always, but some 32-bit Arm systems have used a 32-bit value which must be supported. - Required for systems that have an "enable-method" - property value of "spin-table". cpu-idle-states: $ref: /schemas/types.yaml#/definitions/phandle-array @@ -333,24 +331,13 @@ properties: qcom,saw: $ref: /schemas/types.yaml#/definitions/phandle - description: | - Specifies the SAW* node associated with this CPU. - - Required for systems that have an "enable-method" property - value of "qcom,kpss-acc-v1" or "qcom,kpss-acc-v2" - - * arm/msm/qcom,saw2.txt + description: + Specifies the SAW node associated with this CPU. qcom,acc: $ref: /schemas/types.yaml#/definitions/phandle - description: | - Specifies the ACC* node associated with this CPU. - - Required for systems that have an "enable-method" property - value of "qcom,kpss-acc-v1", "qcom,kpss-acc-v2", "qcom,msm8226-smp" or - "qcom,msm8916-smp". - - * arm/msm/qcom,kpss-acc.txt + description: + Specifies the ACC node associated with this CPU. rockchip,pmu: $ref: /schemas/types.yaml#/definitions/phandle @@ -378,22 +365,51 @@ properties: formed by encoding the target CPU id into the low bits of the physical start address it should jump to. -if: - # If the enable-method property contains one of those values - properties: - enable-method: - contains: - enum: - - brcm,bcm11351-cpu-method - - brcm,bcm23550 - - brcm,bcm-nsp-smp - # and if enable-method is present - required: - - enable-method - -then: - required: - - secondary-boot-reg +allOf: + - if: + # If the enable-method property contains one of those values + properties: + enable-method: + contains: + enum: + - brcm,bcm11351-cpu-method + - brcm,bcm23550 + - brcm,bcm-nsp-smp + # and if enable-method is present + required: + - enable-method + then: + required: + - secondary-boot-reg + - if: + properties: + enable-method: + enum: + - spin-table + - renesas,r9a06g032-smp + required: + - enable-method + then: + required: + - cpu-release-addr + - if: + properties: + enable-method: + enum: + - qcom,kpss-acc-v1 + - qcom,kpss-acc-v2 + - qcom,msm8226-smp + - qcom,msm8916-smp + required: + - enable-method + then: + required: + - qcom,acc + - qcom,saw + else: + properties: + qcom,acc: false + qcom,saw: false required: - device_type
Replace the prose for properties dependent on specific "enable-method" values with schemas defining the same requirements. Both "qcom,acc" and "qcom,saw" properties appear to be required for any of the Qualcomm enable-method values, so the schema is a bit simpler than what the text said. The references to arm/msm/qcom,saw2.txt and arm/msm/qcom,kpss-acc.txt are out of date, so just drop them. Signed-off-by: Rob Herring (Arm) <robh@kernel.org> --- Documentation/devicetree/bindings/arm/cpus.yaml | 82 +++++++++++++++---------- 1 file changed, 49 insertions(+), 33 deletions(-)