| Message ID | 20221114-narmstrong-sm8550-upstream-remoteproc-v2-2-12bc22255474@linaro.org (mailing list archive) |
|---|---|
| State | Superseded |
| Headers | show |
| Series | remoteproc: qcom_q6v5_pas: add support for SM8550 adsp, cdsp & mpss | expand |
On Wed, 30 Nov 2022 11:29:46 +0100, Neil Armstrong wrote: > This documents the compatible for the component used to boot the > aDSP, cDSP and MPSS on the SM8550 SoC. > > The SM8550 boot process on SM8550 now requires a secondary "Devicetree" > firmware to be passed along the main Firmware, and the cDSP a new power > domain named "NSP". > > A third memory domain for the DSM memory zone is also needed for the MPSS > PAS bindings. > > Signed-off-by: Neil Armstrong <neil.armstrong@linaro.org> > --- > .../bindings/remoteproc/qcom,sm8550-pas.yaml | 195 +++++++++++++++++++++ > 1 file changed, 195 insertions(+) > 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: ./Documentation/devicetree/bindings/remoteproc/qcom,sm8550-pas.yaml: Unable to find schema file matching $id: http://devicetree.org/schemas/remoteproc/qcom,pas-common.yaml /builds/robherring/dt-review-ci/linux/Documentation/devicetree/bindings/remoteproc/qcom,sm8550-pas.example.dtb: remoteproc@30000000: False schema does not allow {'compatible': ['qcom,sm8550-adsp-pas'], 'reg': [[805306368, 256]], 'clocks': [[4294967295, 0]], 'clock-names': ['xo'], 'interrupts-extended': [[4294967295, 6, 1], [4294967295, 0, 1], [4294967295, 1, 1], [4294967295, 2, 1], [4294967295, 3, 1]], 'interrupt-names': ['wdog', 'fatal', 'ready', 'handover', 'stop-ack'], 'memory-region': [[4294967295], [4294967295]], 'firmware-name': ['qcom/sm8550/adsp.mbn', 'qcom/sm8550/adsp_dtb.mbn'], 'power-domains': [[4294967295], [4294967295]], 'power-domain-names': ['lcx', 'lmx'], 'qcom,qmp': [[4294967295]], 'qcom,smem-states': [[4294967295, 0]], 'qcom,smem-state-names': ['stop'], 'glink-edge': {'interrupts-extended': [[4294967295, 3, 0, 1]], 'mboxes': [[4294967295, 3, 0]], 'label': ['lpass'], 'qcom,remote-pid': [[2]]}, '$nodename': ['remoteproc@30000000']} From schema: /builds/robherring/dt-review-ci/linux/Documentation/devicetree/bindings/remoteproc/qcom,sm8550-pas.yaml /builds/robherring/dt-review-ci/linux/Documentation/devicetree/bindings/remoteproc/qcom,sm8550-pas.example.dtb: remoteproc@30000000: Unevaluated properties are not allowed ('glink-edge', 'qcom,smem-state-names', 'qcom,smem-states' were unexpected) From schema: /builds/robherring/dt-review-ci/linux/Documentation/devicetree/bindings/remoteproc/qcom,sm8550-pas.yaml doc reference errors (make refcheckdocs): See https://patchwork.ozlabs.org/project/devicetree-bindings/patch/20221114-narmstrong-sm8550-upstream-remoteproc-v2-2-12bc22255474@linaro.org 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.
On 30/11/2022 11:29, Neil Armstrong wrote: > This documents the compatible for the component used to boot the > aDSP, cDSP and MPSS on the SM8550 SoC. > > The SM8550 boot process on SM8550 now requires a secondary "Devicetree" > firmware to be passed along the main Firmware, and the cDSP a new power > domain named "NSP". > > A third memory domain for the DSM memory zone is also needed for the MPSS > PAS bindings. > > Signed-off-by: Neil Armstrong <neil.armstrong@linaro.org> Thank you for your patch. There is something to discuss/improve. > + > + - if: > + properties: > + compatible: > + enum: > + - qcom,sm8550-adsp-pas > + then: > + properties: > + power-domains: > + items: > + - description: LCX power domain > + - description: LMX power domain > + power-domain-names: > + items: > + - const: lcx > + - const: lmx > + > + - if: > + properties: > + compatible: > + enum: > + - qcom,sm8550-cdsp-pas > + then: > + properties: > + power-domains: > + items: > + - description: CX power domain > + - description: MXC power domain > + power-domain-names: > + items: > + - const: cx > + - const: mxc > + - if: > + properties: > + compatible: > + contains: > + enum: > + - qcom,sm8550-cdsp-pas This entire if does not look valid - compatible is covered in the previous one. You should see `dtbs_check` warnings on your DTS. > + then: > + properties: > + power-domains: > + items: > + - description: CX power domain > + - description: MXC power domain > + - description: NSP power domain > + power-domain-names: > + items: > + - const: cx > + - const: mxc > + - const: nsp > + > +unevaluatedProperties: false > + Best regards, Krzysztof
On 01/12/2022 11:58, Krzysztof Kozlowski wrote: > On 30/11/2022 11:29, Neil Armstrong wrote: >> This documents the compatible for the component used to boot the >> aDSP, cDSP and MPSS on the SM8550 SoC. >> >> The SM8550 boot process on SM8550 now requires a secondary "Devicetree" >> firmware to be passed along the main Firmware, and the cDSP a new power >> domain named "NSP". >> >> A third memory domain for the DSM memory zone is also needed for the MPSS >> PAS bindings. >> >> Signed-off-by: Neil Armstrong <neil.armstrong@linaro.org> > > Thank you for your patch. There is something to discuss/improve. > >> + >> + - if: >> + properties: >> + compatible: >> + enum: >> + - qcom,sm8550-adsp-pas >> + then: >> + properties: >> + power-domains: >> + items: >> + - description: LCX power domain >> + - description: LMX power domain >> + power-domain-names: >> + items: >> + - const: lcx >> + - const: lmx >> + >> + - if: >> + properties: >> + compatible: >> + enum: >> + - qcom,sm8550-cdsp-pas >> + then: >> + properties: >> + power-domains: >> + items: >> + - description: CX power domain >> + - description: MXC power domain >> + power-domain-names: >> + items: >> + - const: cx >> + - const: mxc >> + - if: >> + properties: >> + compatible: >> + contains: >> + enum: >> + - qcom,sm8550-cdsp-pas > > This entire if does not look valid - compatible is covered in the > previous one. You should see `dtbs_check` warnings on your DTS. Wow indeed, this should be mpss-pas... The main changes here was firmware-name and memory-region to handle the dtb firmware and the DSM memory region, are those OK ? Neil > >> + then: >> + properties: >> + power-domains: >> + items: >> + - description: CX power domain >> + - description: MXC power domain >> + - description: NSP power domain >> + power-domain-names: >> + items: >> + - const: cx >> + - const: mxc >> + - const: nsp >> + >> +unevaluatedProperties: false >> + > > Best regards, > Krzysztof >
On 02/12/2022 11:33, Neil Armstrong wrote: >>> + >>> + - if: >>> + properties: >>> + compatible: >>> + enum: >>> + - qcom,sm8550-cdsp-pas >>> + then: >>> + properties: >>> + power-domains: >>> + items: >>> + - description: CX power domain >>> + - description: MXC power domain >>> + power-domain-names: >>> + items: >>> + - const: cx >>> + - const: mxc >>> + - if: >>> + properties: >>> + compatible: >>> + contains: >>> + enum: >>> + - qcom,sm8550-cdsp-pas >> >> This entire if does not look valid - compatible is covered in the >> previous one. You should see `dtbs_check` warnings on your DTS. > > Wow indeed, this should be mpss-pas... Then also drop "contains" to match other places (and other files). > > The main changes here was firmware-name and memory-region to handle > the dtb firmware and the DSM memory region, are those OK ? > Yes. Best regards, Krzysztof
diff --git a/Documentation/devicetree/bindings/remoteproc/qcom,sm8550-pas.yaml b/Documentation/devicetree/bindings/remoteproc/qcom,sm8550-pas.yaml new file mode 100644 index 000000000000..ac1c02ee780c --- /dev/null +++ b/Documentation/devicetree/bindings/remoteproc/qcom,sm8550-pas.yaml @@ -0,0 +1,195 @@ +# SPDX-License-Identifier: GPL-2.0 OR BSD-2-Clause +%YAML 1.2 +--- +$id: http://devicetree.org/schemas/remoteproc/qcom,sm8550-pas.yaml# +$schema: http://devicetree.org/meta-schemas/core.yaml# + +title: Qualcomm SM8550 Peripheral Authentication Service + +maintainers: + - Manivannan Sadhasivam <manivannan.sadhasivam@linaro.org> + +description: + Qualcomm SM8550 SoC Peripheral Authentication Service loads and boots firmware + on the Qualcomm DSP Hexagon cores. + +properties: + compatible: + enum: + - qcom,sm8550-adsp-pas + - qcom,sm8550-cdsp-pas + - qcom,sm8550-mpss-pas + + reg: + maxItems: 1 + + clocks: + items: + - description: XO clock + + clock-names: + items: + - const: xo + + qcom,qmp: + $ref: /schemas/types.yaml#/definitions/phandle + description: Reference to the AOSS side-channel message RAM. + + smd-edge: false + + firmware-name: + $ref: /schemas/types.yaml#/definitions/string-array + items: + - description: Firmware name of the Hexagon core + - description: Firmware name of the Hexagon Devicetree + + memory-region: + minItems: 2 + items: + - description: Memory region for main Firmware authentication + - description: Memory region for Devicetree Firmware authentication + - description: DSM Memory region + +required: + - compatible + - reg + +allOf: + - $ref: /schemas/remoteproc/qcom,pas-common.yaml# + - if: + properties: + compatible: + enum: + - qcom,sm8550-adsp-pas + - qcom,sm8550-cdsp-pas + then: + properties: + interrupts: + maxItems: 5 + interrupt-names: + maxItems: 5 + memory-region: + maxItems: 2 + else: + properties: + interrupts: + minItems: 6 + interrupt-names: + minItems: 6 + memory-region: + minItems: 3 + + - if: + properties: + compatible: + enum: + - qcom,sm8550-mpss-pas + then: + properties: + power-domains: + items: + - description: CX power domain + - description: MSS power domain + power-domain-names: + items: + - const: cx + - const: mss + + - if: + properties: + compatible: + enum: + - qcom,sm8550-adsp-pas + then: + properties: + power-domains: + items: + - description: LCX power domain + - description: LMX power domain + power-domain-names: + items: + - const: lcx + - const: lmx + + - if: + properties: + compatible: + enum: + - qcom,sm8550-cdsp-pas + then: + properties: + power-domains: + items: + - description: CX power domain + - description: MXC power domain + power-domain-names: + items: + - const: cx + - const: mxc + - if: + properties: + compatible: + contains: + enum: + - qcom,sm8550-cdsp-pas + then: + properties: + power-domains: + items: + - description: CX power domain + - description: MXC power domain + - description: NSP power domain + power-domain-names: + items: + - const: cx + - const: mxc + - const: nsp + +unevaluatedProperties: false + +examples: + - | + #include <dt-bindings/clock/qcom,rpmh.h> + #include <dt-bindings/interrupt-controller/irq.h> + #include <dt-bindings/mailbox/qcom-ipcc.h> + + remoteproc@30000000 { + compatible = "qcom,sm8550-adsp-pas"; + reg = <0x030000000 0x100>; + + clocks = <&rpmhcc RPMH_CXO_CLK>; + clock-names = "xo"; + + interrupts-extended = <&pdc 6 IRQ_TYPE_EDGE_RISING>, + <&smp2p_adsp_in 0 IRQ_TYPE_EDGE_RISING>, + <&smp2p_adsp_in 1 IRQ_TYPE_EDGE_RISING>, + <&smp2p_adsp_in 2 IRQ_TYPE_EDGE_RISING>, + <&smp2p_adsp_in 3 IRQ_TYPE_EDGE_RISING>; + interrupt-names = "wdog", "fatal", "ready", + "handover", "stop-ack"; + + memory-region = <&adsp_mem>, <&dtb_adsp_mem>; + + firmware-name = "qcom/sm8550/adsp.mbn", + "qcom/sm8550/adsp_dtb.mbn"; + + power-domains = <&rpmhpd_sm8550_lcx>, + <&rpmhpd_sm8550_lmx>; + power-domain-names = "lcx", "lmx"; + + qcom,qmp = <&aoss_qmp>; + qcom,smem-states = <&smp2p_adsp_out 0>; + qcom,smem-state-names = "stop"; + + glink-edge { + interrupts-extended = <&ipcc IPCC_CLIENT_LPASS + IPCC_MPROC_SIGNAL_GLINK_QMP + IRQ_TYPE_EDGE_RISING>; + mboxes = <&ipcc IPCC_CLIENT_LPASS IPCC_MPROC_SIGNAL_GLINK_QMP>; + + label = "lpass"; + qcom,remote-pid = <2>; + + /* ... */ + }; + };
This documents the compatible for the component used to boot the aDSP, cDSP and MPSS on the SM8550 SoC. The SM8550 boot process on SM8550 now requires a secondary "Devicetree" firmware to be passed along the main Firmware, and the cDSP a new power domain named "NSP". A third memory domain for the DSM memory zone is also needed for the MPSS PAS bindings. Signed-off-by: Neil Armstrong <neil.armstrong@linaro.org> --- .../bindings/remoteproc/qcom,sm8550-pas.yaml | 195 +++++++++++++++++++++ 1 file changed, 195 insertions(+)