[PATCH 0/6] remoteproc: qcom_q6v5_mss: Add MSM8909

[PATCH 0/6] remoteproc: qcom_q6v5_mss: Add MSM8909

[Stephan Gerhold]

Convert parts of the qcom,q6v5.txt binding documentation to a DT schema
(together with some DT fixes) in preparation of adding a new
"qcom,msm8909-mss-pil" compatible. The schema can be easily shared
between MSM8916, MSM8974 and MSM8909 because they have almost the same
requirements. The other SoCs are quite different and would be better
described in a separate DT schema to avoid a lot of complicated if
statements.

Finally, add support for MSM8909 to the qcom_q6v5_mss driver by reusing
the initialization sequence for MSM8996/8, with some minor if statements
to handle the differences for MSM8909.

Stephan Gerhold (6):
  arm64: dts: qcom: msm8916: Drop MSS fallback compatible
  dt-bindings: remoteproc: qcom,q6v5: Move MSM8916 to schema
  ARM: dts: qcom: msm8974: Disable remoteprocs by default
  dt-bindings: remoteproc: qcom,msm8916-mss-pil: Add MSM8974
  dt-bindings: remoteproc: qcom,q6v5-pil: Add MSM8909
  remoteproc: qcom_q6v5_mss: Add support for MSM8909

 .../remoteproc/qcom,msm8916-mss-pil.yaml      | 263 ++++++++++++++++++
 .../bindings/remoteproc/qcom,q6v5.txt         |  35 ---
 arch/arm/boot/dts/qcom-msm8974.dtsi           |   4 +
 .../dts/qcom-msm8974pro-fairphone-fp2.dts     |   2 +
 .../boot/dts/qcom-msm8974pro-samsung-klte.dts |   2 +
 arch/arm64/boot/dts/qcom/msm8916.dtsi         |   2 +-
 drivers/remoteproc/qcom_q6v5_mss.c            | 123 +++++---
 7 files changed, 362 insertions(+), 69 deletions(-)
 create mode 100644 Documentation/devicetree/bindings/remoteproc/qcom,msm8916-mss-pil.yaml

-- 
2.30.2

[PATCH 1/6] arm64: dts: qcom: msm8916: Drop MSS fallback compatible

[Stephan Gerhold]

MSM8916 was originally using the "qcom,q6v5-pil" compatible for the
MSS remoteproc. Later it was decided to use SoC-specific compatibles
instead, so "qcom,msm8916-mss-pil" is now the preferred compatible.

Commit 60a05ed059a0 ("arm64: dts: qcom: msm8916: Add MSM8916-specific
compatibles to SCM/MSS") updated the MSM8916 device tree to make use of
the new compatible but still kept the old "qcom,q6v5-pil" as fallback.

This is inconsistent with other SoCs and conflicts with the description
in the binding documentation (which says that only one compatible should
be present). Also, it has no functional advantage since older kernels
could not handle this DT anyway (e.g. "power-domains" in the MSS node is
only supported by kernels that also support "qcom,msm8916-mss-pil").

Make this consistent with other SoCs by using only the
"qcom,msm8916-mss-pil" compatible.

Fixes: 60a05ed059a0 ("arm64: dts: qcom: msm8916: Add MSM8916-specific compatibles to SCM/MSS")
Signed-off-by: Stephan Gerhold <stephan.gerhold@kernkonzept.com>
---
This fixes the following dtbs_check warning after the DT schema
conversion:

remoteproc@4080000: compatible: 'oneOf' conditional failed, one must be fixed:
        ['qcom,msm8916-mss-pil', 'qcom,q6v5-pil'] is too long, or
        'qcom,q6v5-pil' was expected
        From schema: remoteproc/qcom,msm8916-mss-pil.yaml
---
 arch/arm64/boot/dts/qcom/msm8916.dtsi | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/arch/arm64/boot/dts/qcom/msm8916.dtsi b/arch/arm64/boot/dts/qcom/msm8916.dtsi
index 05472510e29d..07b23e0730d9 100644
--- a/arch/arm64/boot/dts/qcom/msm8916.dtsi
+++ b/arch/arm64/boot/dts/qcom/msm8916.dtsi
@@ -1329,7 +1329,7 @@ bam_dmux_dma: dma-controller@4044000 {
 		};
 
 		mpss: remoteproc@4080000 {
-			compatible = "qcom,msm8916-mss-pil", "qcom,q6v5-pil";
+			compatible = "qcom,msm8916-mss-pil";
 			reg = <0x04080000 0x100>,
 			      <0x04020000 0x040>;
 
-- 
2.30.2

Re: [PATCH 1/6] arm64: dts: qcom: msm8916: Drop MSS fallback compatible

[Krzysztof Kozlowski]

On 12/07/2022 14:44, Stephan Gerhold wrote:
> MSM8916 was originally using the "qcom,q6v5-pil" compatible for the
> MSS remoteproc. Later it was decided to use SoC-specific compatibles
> instead, so "qcom,msm8916-mss-pil" is now the preferred compatible.
> 
> Commit 60a05ed059a0 ("arm64: dts: qcom: msm8916: Add MSM8916-specific
> compatibles to SCM/MSS") updated the MSM8916 device tree to make use of
> the new compatible but still kept the old "qcom,q6v5-pil" as fallback.
> 
> This is inconsistent with other SoCs and conflicts with the description
> in the binding documentation (which says that only one compatible should
> be present). Also, it has no functional advantage since older kernels
> could not handle this DT anyway (e.g. "power-domains" in the MSS node is
> only supported by kernels that also support "qcom,msm8916-mss-pil").
> 
> Make this consistent with other SoCs by using only the
> "qcom,msm8916-mss-pil" compatible.
> 
> Fixes: 60a05ed059a0 ("arm64: dts: qcom: msm8916: Add MSM8916-specific compatibles to SCM/MSS")
> Signed-off-by: Stephan Gerhold <stephan.gerhold@kernkonzept.com>
> ---


Reviewed-by: Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org>


Best regards,
Krzysztof

[PATCH 2/6] dt-bindings: remoteproc: qcom,q6v5: Move MSM8916 to schema

[Stephan Gerhold]

qcom,q6v5.txt covers multiple SoCs with quite different binding
requirements. Converting this into one DT schema would require
several if statements, making the DT schema overall harder to
read and understand.

To avoid this, follow the example of SC7180/SC7280 and split
"qcom,msm8916-mss-pil" (and the equivalent deprecated "qcom,q6v5-pil"
compatible) into a separate DT schema. The schema is somewhat based
on the one for SC7180/SC7280 but adjusted for the old platforms.

Compared to the old plain text bindings, add missing documentation for
the "bam-dmux" subnode and recommend one particular approach to specify
the MBA/MPSS "memory-region" (the other one is marked as deprecated).

Cc: Sireesh Kodali <sireeshkodali1@gmail.com>
Signed-off-by: Stephan Gerhold <stephan.gerhold@kernkonzept.com>
---
Like Sibi's patch series for SC7180/SC7820 [1] this is somewhat related
to Sireesh's series that converts all of qcom,q6v5.txt [2] (with a lot
of if statements). However, this series focuses on MSM8916/MSM8974 (or
actually MSM8909) only.

[1]: https://lore.kernel.org/linux-arm-msm/1657020721-24939-1-git-send-email-quic_sibis@quicinc.com/
[2]: https://lore.kernel.org/linux-arm-msm/20220511161602.117772-7-sireeshkodali1@gmail.com/
---
 .../remoteproc/qcom,msm8916-mss-pil.yaml      | 246 ++++++++++++++++++
 .../bindings/remoteproc/qcom,q6v5.txt         |  19 --
 2 files changed, 246 insertions(+), 19 deletions(-)
 create mode 100644 Documentation/devicetree/bindings/remoteproc/qcom,msm8916-mss-pil.yaml

diff --git a/Documentation/devicetree/bindings/remoteproc/qcom,msm8916-mss-pil.yaml b/Documentation/devicetree/bindings/remoteproc/qcom,msm8916-mss-pil.yaml
new file mode 100644
index 000000000000..3968348dc982
--- /dev/null
+++ b/Documentation/devicetree/bindings/remoteproc/qcom,msm8916-mss-pil.yaml
@@ -0,0 +1,246 @@
+# SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause)
+%YAML 1.2
+---
+$id: http://devicetree.org/schemas/remoteproc/qcom,msm8916-mss-pil.yaml#
+$schema: http://devicetree.org/meta-schemas/core.yaml#
+
+title: Qualcomm MSM8916 MSS Peripheral Image Loader (and similar)
+
+maintainers:
+  - Stephan Gerhold <stephan@gerhold.net>
+
+description:
+  This document describes the hardware for a component that loads and boots
+  firmware on the Qualcomm MSM8916 Modem Hexagon Core (and similar).
+
+properties:
+  compatible:
+    oneOf:
+      - enum:
+          - qcom,msm8916-mss-pil
+
+      - const: qcom,q6v5-pil
+        description: Deprecated, prefer using qcom,msm8916-mss-pil
+        deprecated: true
+
+  reg:
+    items:
+      - description: MSS QDSP6 registers
+      - description: RMB registers
+
+  reg-names:
+    items:
+      - const: qdsp6
+      - const: rmb
+
+  interrupts:
+    items:
+      - description: Watchdog interrupt
+      - description: Fatal interrupt
+      - description: Ready interrupt
+      - description: Handover interrupt
+      - description: Stop acknowledge interrupt
+
+  interrupt-names:
+    items:
+      - const: wdog
+      - const: fatal
+      - const: ready
+      - const: handover
+      - const: stop-ack
+
+  clocks:
+    items:
+      - description: Configuration interface (AXI) clock
+      - description: Configuration bus (AHB) clock
+      - description: Boot ROM (AHB) clock
+      - description: XO proxy clock (control handed over after startup)
+
+  clock-names:
+    items:
+      - const: iface
+      - const: bus
+      - const: mem
+      - const: xo
+
+  power-domains:
+    items:
+      - description: CX proxy power domain (control handed over after startup)
+      - description: MX proxy power domain (control handed over after startup)
+
+  power-domain-names:
+    items:
+      - const: cx
+      - const: mx
+
+  pll-supply:
+    description: PLL proxy supply (control handed over after startup)
+
+  resets:
+    items:
+      - description: MSS restart control
+
+  reset-names:
+    items:
+      - const: mss_restart
+
+  qcom,smem-states:
+    $ref: /schemas/types.yaml#/definitions/phandle-array
+    description: States used by the AP to signal the Hexagon core
+    items:
+      - description: Stop modem
+
+  qcom,smem-state-names:
+    description: Names of the states used by the AP to signal the Hexagon core
+    items:
+      - const: stop
+
+  qcom,halt-regs:
+    $ref: /schemas/types.yaml#/definitions/phandle-array
+    description:
+      Halt registers are used to halt transactions of various sub-components
+      within MSS.
+    items:
+      - items:
+          - description: phandle to TCSR syscon region
+          - description: offset to the Q6 halt register
+          - description: offset to the modem halt register
+          - description: offset to the nc halt register
+
+  memory-region:
+    items:
+      - description: MBA reserved region
+      - description: MPSS reserved region
+
+  firmware-name:
+    $ref: /schemas/types.yaml#/definitions/string-array
+    items:
+      - description: Name of MBA firmware
+      - description: Name of modem firmware
+
+  bam-dmux:
+    $ref: /schemas/net/qcom,bam-dmux.yaml#
+    description:
+      Qualcomm BAM Data Multiplexer (provides network interface to the modem)
+
+  smd-edge:
+    $ref: qcom,smd-edge.yaml#
+    description:
+      Qualcomm SMD subnode which represents communication edge, channels
+      and devices related to the DSP.
+
+    properties:
+      label:
+        enum:
+          - modem
+          - hexagon
+
+  # Deprecated properties
+  cx-supply:
+    description: CX power domain regulator supply (prefer using power-domains)
+    deprecated: true
+  mx-supply:
+    description: MX power domain regulator supply (prefer using power-domains)
+    deprecated: true
+  mba:
+    type: object
+    description:
+      MBA reserved region (prefer using memory-region with two items)
+    properties:
+      memory-region: true
+    required:
+      - memory-region
+    deprecated: true
+  mpss:
+    type: object
+    description:
+      MPSS reserved region (prefer using memory-region with two items)
+    properties:
+      memory-region: true
+    required:
+      - memory-region
+    deprecated: true
+
+required:
+  - compatible
+  - reg
+  - reg-names
+  - interrupts
+  - interrupt-names
+  - clocks
+  - clock-names
+  - pll-supply
+  - resets
+  - reset-names
+  - qcom,halt-regs
+  - qcom,smem-states
+  - qcom,smem-state-names
+  - smd-edge
+
+# Fallbacks for deprecated properties
+allOf:
+  - oneOf:
+      - required:
+          - memory-region
+      - required:
+          - mba
+          - mpss
+        deprecated: true
+  - oneOf:
+      - required:
+          - power-domains
+          - power-domain-names
+      - required:
+          - cx-supply
+          - mx-supply
+        deprecated: true
+
+additionalProperties: false
+
+examples:
+  - |
+    #include <dt-bindings/clock/qcom,gcc-msm8916.h>
+    #include <dt-bindings/interrupt-controller/arm-gic.h>
+    #include <dt-bindings/power/qcom-rpmpd.h>
+
+    remoteproc_mpss: remoteproc@4080000 {
+        compatible = "qcom,msm8916-mss-pil";
+        reg = <0x04080000 0x100>, <0x04020000 0x40>;
+        reg-names = "qdsp6", "rmb";
+
+        interrupts-extended = <&intc GIC_SPI 24 IRQ_TYPE_EDGE_RISING>,
+                              <&hexagon_smp2p_in 0 IRQ_TYPE_EDGE_RISING>,
+                              <&hexagon_smp2p_in 1 IRQ_TYPE_EDGE_RISING>,
+                              <&hexagon_smp2p_in 2 IRQ_TYPE_EDGE_RISING>,
+                              <&hexagon_smp2p_in 3 IRQ_TYPE_EDGE_RISING>;
+        interrupt-names = "wdog", "fatal", "ready", "handover", "stop-ack";
+
+        qcom,smem-states = <&hexagon_smp2p_out 0>;
+        qcom,smem-state-names = "stop";
+        qcom,halt-regs = <&tcsr 0x18000 0x19000 0x1a000>;
+
+        clocks = <&gcc GCC_MSS_CFG_AHB_CLK>,
+                 <&gcc GCC_MSS_Q6_BIMC_AXI_CLK>,
+                 <&gcc GCC_BOOT_ROM_AHB_CLK>,
+                 <&xo_board>;
+        clock-names = "iface", "bus", "mem", "xo";
+
+        power-domains = <&rpmpd MSM8916_VDDCX>, <&rpmpd MSM8916_VDDMX>;
+        power-domain-names = "cx", "mx";
+        pll-supply = <&pm8916_l7>;
+
+        resets = <&scm 0>;
+        reset-names = "mss_restart";
+
+        memory-region = <&mba_mem>, <&mpss_mem>;
+
+        smd-edge {
+            interrupts = <GIC_SPI 25 IRQ_TYPE_EDGE_RISING>;
+
+            qcom,smd-edge = <0>;
+            qcom,ipc = <&apcs 8 12>;
+            qcom,remote-pid = <1>;
+
+            label = "hexagon";
+        };
+    };
diff --git a/Documentation/devicetree/bindings/remoteproc/qcom,q6v5.txt b/Documentation/devicetree/bindings/remoteproc/qcom,q6v5.txt
index d0a75443e27e..3beb01da134b 100644
--- a/Documentation/devicetree/bindings/remoteproc/qcom,q6v5.txt
+++ b/Documentation/devicetree/bindings/remoteproc/qcom,q6v5.txt
@@ -7,10 +7,8 @@ on the Qualcomm Hexagon core.
 	Usage: required
 	Value type: <string>
 	Definition: must be one of:
-		    "qcom,q6v5-pil",
 		    "qcom,ipq8074-wcss-pil"
 		    "qcom,qcs404-wcss-pil"
-		    "qcom,msm8916-mss-pil",
 		    "qcom,msm8974-mss-pil"
 		    "qcom,msm8996-mss-pil"
 		    "qcom,msm8998-mss-pil"
@@ -37,10 +35,8 @@ on the Qualcomm Hexagon core.
 	Value type: <stringlist>
 	Definition: The interrupts needed depends on the the compatible
 		    string:
-	qcom,q6v5-pil:
 	qcom,ipq8074-wcss-pil:
 	qcom,qcs404-wcss-pil:
-	qcom,msm8916-mss-pil:
 	qcom,msm8974-mss-pil:
 		    must be "wdog", "fatal", "ready", "handover", "stop-ack"
 	qcom,msm8996-mss-pil:
@@ -72,8 +68,6 @@ on the Qualcomm Hexagon core.
 		    "gcc_axim_cbcr", "lcc_ahbfabric_cbc", "tcsr_lcc_cbc",
 		    "lcc_abhs_cbc", "lcc_tcm_slave_cbc", "lcc_abhm_cbc",
 		    "lcc_axim_cbc", "lcc_bcr_sleep"
-	qcom,q6v5-pil:
-	qcom,msm8916-mss-pil:
 	qcom,msm8974-mss-pil:
 		    must be "iface", "bus", "mem", "xo"
 	qcom,msm8996-mss-pil:
@@ -112,17 +106,6 @@ should be referenced as follows:
 	Definition: reference to the reserved-memory for the mba region followed
 		    by the mpss region
 
-For the compatible strings below the following supplies are required:
-  "qcom,q6v5-pil"
-  "qcom,msm8916-mss-pil",
-- cx-supply: (deprecated, use power domain instead)
-- mx-supply: (deprecated, use power domain instead)
-- pll-supply:
-	Usage: required
-	Value type: <phandle>
-	Definition: reference to the regulators to be held on behalf of the
-		    booting of the Hexagon core
-
 For the compatible string below the following supplies are required:
   "qcom,msm8974-mss-pil"
 - cx-supply: (deprecated, use power domain instead)
@@ -161,8 +144,6 @@ For the compatible string below the following supplies are required:
 	Definition: The power-domains needed depend on the compatible string:
 	qcom,ipq8074-wcss-pil:
 		    no power-domain names required
-	qcom,q6v5-pil:
-	qcom,msm8916-mss-pil:
 	qcom,msm8974-mss-pil:
 	qcom,msm8996-mss-pil:
 	qcom,msm8998-mss-pil:
-- 
2.30.2

Re: [PATCH 2/6] dt-bindings: remoteproc: qcom,q6v5: Move MSM8916 to schema

[Rob Herring]

On Tue, 12 Jul 2022 14:44:17 +0200, Stephan Gerhold wrote:
> qcom,q6v5.txt covers multiple SoCs with quite different binding
> requirements. Converting this into one DT schema would require
> several if statements, making the DT schema overall harder to
> read and understand.
> 
> To avoid this, follow the example of SC7180/SC7280 and split
> "qcom,msm8916-mss-pil" (and the equivalent deprecated "qcom,q6v5-pil"
> compatible) into a separate DT schema. The schema is somewhat based
> on the one for SC7180/SC7280 but adjusted for the old platforms.
> 
> Compared to the old plain text bindings, add missing documentation for
> the "bam-dmux" subnode and recommend one particular approach to specify
> the MBA/MPSS "memory-region" (the other one is marked as deprecated).
> 
> Cc: Sireesh Kodali <sireeshkodali1@gmail.com>
> Signed-off-by: Stephan Gerhold <stephan.gerhold@kernkonzept.com>
> ---
> Like Sibi's patch series for SC7180/SC7820 [1] this is somewhat related
> to Sireesh's series that converts all of qcom,q6v5.txt [2] (with a lot
> of if statements). However, this series focuses on MSM8916/MSM8974 (or
> actually MSM8909) only.
> 
> [1]: https://lore.kernel.org/linux-arm-msm/1657020721-24939-1-git-send-email-quic_sibis@quicinc.com/
> [2]: https://lore.kernel.org/linux-arm-msm/20220511161602.117772-7-sireeshkodali1@gmail.com/
> ---
>  .../remoteproc/qcom,msm8916-mss-pil.yaml      | 246 ++++++++++++++++++
>  .../bindings/remoteproc/qcom,q6v5.txt         |  19 --
>  2 files changed, 246 insertions(+), 19 deletions(-)
>  create mode 100644 Documentation/devicetree/bindings/remoteproc/qcom,msm8916-mss-pil.yaml
> 

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,msm8916-mss-pil.yaml: Unable to find schema file matching $id: http://devicetree.org/schemas/remoteproc/qcom,smd-edge.yaml
/builds/robherring/linux-dt-review/Documentation/devicetree/bindings/remoteproc/qcom,msm8916-mss-pil.example.dtb: remoteproc@4080000: smd-edge: False schema does not allow {'interrupts': [[0, 25, 1]], 'qcom,smd-edge': [[0]], 'qcom,ipc': [[4294967295, 8, 12]], 'qcom,remote-pid': [[1]], 'label': ['hexagon']}
	From schema: /builds/robherring/linux-dt-review/Documentation/devicetree/bindings/remoteproc/qcom,msm8916-mss-pil.yaml

doc reference errors (make refcheckdocs):

See https://patchwork.ozlabs.org/patch/

This check can fail if there are any dependencies. The base for a patch
series is generally the most recent rc1.

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.

Re: [PATCH 2/6] dt-bindings: remoteproc: qcom,q6v5: Move MSM8916 to schema

[Krzysztof Kozlowski]

On 12/07/2022 14:44, Stephan Gerhold wrote:
> qcom,q6v5.txt covers multiple SoCs with quite different binding
> requirements. Converting this into one DT schema would require
> several if statements, making the DT schema overall harder to
> read and understand.
> 
> To avoid this, follow the example of SC7180/SC7280 and split
> "qcom,msm8916-mss-pil" (and the equivalent deprecated "qcom,q6v5-pil"
> compatible) into a separate DT schema. The schema is somewhat based
> on the one for SC7180/SC7280 but adjusted for the old platforms.
> 
> Compared to the old plain text bindings, add missing documentation for
> the "bam-dmux" subnode and recommend one particular approach to specify
> the MBA/MPSS "memory-region" (the other one is marked as deprecated).
> 
> Cc: Sireesh Kodali <sireeshkodali1@gmail.com>
> Signed-off-by: Stephan Gerhold <stephan.gerhold@kernkonzept.com>
> ---
> Like Sibi's patch series for SC7180/SC7820 [1] this is somewhat related
> to Sireesh's series that converts all of qcom,q6v5.txt [2] (with a lot
> of if statements). However, this series focuses on MSM8916/MSM8974 (or
> actually MSM8909) only.
> 

Thank you for your patch. There is something to discuss/improve.

> [1]: https://lore.kernel.org/linux-arm-msm/1657020721-24939-1-git-send-email-quic_sibis@quicinc.com/
> [2]: https://lore.kernel.org/linux-arm-msm/20220511161602.117772-7-sireeshkodali1@gmail.com/
> ---
>  .../remoteproc/qcom,msm8916-mss-pil.yaml      | 246 ++++++++++++++++++
>  .../bindings/remoteproc/qcom,q6v5.txt         |  19 --
>  2 files changed, 246 insertions(+), 19 deletions(-)
>  create mode 100644 Documentation/devicetree/bindings/remoteproc/qcom,msm8916-mss-pil.yaml
> 
> diff --git a/Documentation/devicetree/bindings/remoteproc/qcom,msm8916-mss-pil.yaml b/Documentation/devicetree/bindings/remoteproc/qcom,msm8916-mss-pil.yaml
> new file mode 100644
> index 000000000000..3968348dc982
> --- /dev/null
> +++ b/Documentation/devicetree/bindings/remoteproc/qcom,msm8916-mss-pil.yaml
> @@ -0,0 +1,246 @@
> +# SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause)
> +%YAML 1.2
> +---
> +$id: http://devicetree.org/schemas/remoteproc/qcom,msm8916-mss-pil.yaml#
> +$schema: http://devicetree.org/meta-schemas/core.yaml#
> +
> +title: Qualcomm MSM8916 MSS Peripheral Image Loader (and similar)
> +
> +maintainers:
> +  - Stephan Gerhold <stephan@gerhold.net>
> +
> +description:
> +  This document describes the hardware for a component that loads and boots
> +  firmware on the Qualcomm MSM8916 Modem Hexagon Core (and similar).
> +
> +properties:
> +  compatible:
> +    oneOf:
> +      - enum:
> +          - qcom,msm8916-mss-pil
> +
> +      - const: qcom,q6v5-pil
> +        description: Deprecated, prefer using qcom,msm8916-mss-pil
> +        deprecated: true

The last compatible does not seem applicable here. Aren't you moving
only MSM8916 to new schema?

> +
> +  reg:
> +    items:
> +      - description: MSS QDSP6 registers
> +      - description: RMB registers
> +
> +  reg-names:
> +    items:
> +      - const: qdsp6
> +      - const: rmb
> +
> +  interrupts:
> +    items:
> +      - description: Watchdog interrupt
> +      - description: Fatal interrupt
> +      - description: Ready interrupt
> +      - description: Handover interrupt
> +      - description: Stop acknowledge interrupt
> +
> +  interrupt-names:
> +    items:
> +      - const: wdog
> +      - const: fatal
> +      - const: ready
> +      - const: handover
> +      - const: stop-ack
> +
> +  clocks:
> +    items:
> +      - description: Configuration interface (AXI) clock
> +      - description: Configuration bus (AHB) clock
> +      - description: Boot ROM (AHB) clock
> +      - description: XO proxy clock (control handed over after startup)
> +
> +  clock-names:
> +    items:
> +      - const: iface
> +      - const: bus
> +      - const: mem
> +      - const: xo
> +
> +  power-domains:
> +    items:
> +      - description: CX proxy power domain (control handed over after startup)
> +      - description: MX proxy power domain (control handed over after startup)
> +
> +  power-domain-names:
> +    items:
> +      - const: cx
> +      - const: mx
> +
> +  pll-supply:
> +    description: PLL proxy supply (control handed over after startup)
> +
> +  resets:
> +    items:
> +      - description: MSS restart control
> +
> +  reset-names:
> +    items:
> +      - const: mss_restart
> +
> +  qcom,smem-states:
> +    $ref: /schemas/types.yaml#/definitions/phandle-array
> +    description: States used by the AP to signal the Hexagon core
> +    items:
> +      - description: Stop modem
> +
> +  qcom,smem-state-names:
> +    description: Names of the states used by the AP to signal the Hexagon core
> +    items:
> +      - const: stop
> +
> +  qcom,halt-regs:
> +    $ref: /schemas/types.yaml#/definitions/phandle-array
> +    description:
> +      Halt registers are used to halt transactions of various sub-components
> +      within MSS.
> +    items:
> +      - items:
> +          - description: phandle to TCSR syscon region
> +          - description: offset to the Q6 halt register
> +          - description: offset to the modem halt register
> +          - description: offset to the nc halt register
> +
> +  memory-region:
> +    items:
> +      - description: MBA reserved region
> +      - description: MPSS reserved region
> +
> +  firmware-name:
> +    $ref: /schemas/types.yaml#/definitions/string-array
> +    items:
> +      - description: Name of MBA firmware
> +      - description: Name of modem firmware
> +
> +  bam-dmux:
> +    $ref: /schemas/net/qcom,bam-dmux.yaml#
> +    description:
> +      Qualcomm BAM Data Multiplexer (provides network interface to the modem)
> +
> +  smd-edge:
> +    $ref: qcom,smd-edge.yaml#
> +    description:
> +      Qualcomm SMD subnode which represents communication edge, channels
> +      and devices related to the DSP.
> +
> +    properties:
> +      label:
> +        enum:
> +          - modem
> +          - hexagon
> +
> +  # Deprecated properties
> +  cx-supply:
> +    description: CX power domain regulator supply (prefer using power-domains)
> +    deprecated: true

Blank line, here and in other places between top-level properties.

> +  mx-supply:
> +    description: MX power domain regulator supply (prefer using power-domains)
> +    deprecated: true
> +  mba:
> +    type: object
> +    description:
> +      MBA reserved region (prefer using memory-region with two items)
> +    properties:
> +      memory-region: true
> +    required:
> +      - memory-region
> +    deprecated: true
> +  mpss:
> +    type: object
> +    description:
> +      MPSS reserved region (prefer using memory-region with two items)
> +    properties:
> +      memory-region: true
> +    required:
> +      - memory-region
> +    deprecated: true
> +
> +required:
> +  - compatible
> +  - reg
> +  - reg-names
> +  - interrupts
> +  - interrupt-names
> +  - clocks
> +  - clock-names
> +  - pll-supply
> +  - resets
> +  - reset-names
> +  - qcom,halt-regs
> +  - qcom,smem-states
> +  - qcom,smem-state-names
> +  - smd-edge
> +
> +# Fallbacks for deprecated properties
> +allOf:
> +  - oneOf:
> +      - required:
> +          - memory-region
> +      - required:
> +          - mba
> +          - mpss
> +        deprecated: true

Not sure if this is correct syntax.

> +  - oneOf:
> +      - required:
> +          - power-domains
> +          - power-domain-names
> +      - required:
> +          - cx-supply
> +          - mx-supply
> +        deprecated: true
> +
> +additionalProperties: false



Best regards,
Krzysztof

Re: [PATCH 2/6] dt-bindings: remoteproc: qcom,q6v5: Move MSM8916 to schema

[Stephan Gerhold]

On Thu, Jul 14, 2022 at 11:50:30AM +0200, Krzysztof Kozlowski wrote:
> On 12/07/2022 14:44, Stephan Gerhold wrote:
> > [...]
> > +properties:
> > +  compatible:
> > +    oneOf:
> > +      - enum:
> > +          - qcom,msm8916-mss-pil
> > +
> > +      - const: qcom,q6v5-pil
> > +        description: Deprecated, prefer using qcom,msm8916-mss-pil
> > +        deprecated: true
> 
> The last compatible does not seem applicable here. Aren't you moving
> only MSM8916 to new schema?
> 

"qcom,q6v5-pil" is exactly the same as "qcom,msm8916-mss-pil". It's just
a deprecated quite unfortunately chosen old name for the same thing. :)

See these lines in the driver:

	{ .compatible = "qcom,q6v5-pil", .data = &msm8916_mss},
	{ .compatible = "qcom,msm8916-mss-pil", .data = &msm8916_mss},

> > [...]
> > +  # Deprecated properties
> > +  cx-supply:
> > +    description: CX power domain regulator supply (prefer using power-domains)
> > +    deprecated: true
> 
> Blank line, here and in other places between top-level properties.
> 

Ack, will change this in v2.

> > [...]
> > +# Fallbacks for deprecated properties
> > +allOf:
> > +  - oneOf:
> > +      - required:
> > +          - memory-region
> > +      - required:
> > +          - mba
> > +          - mpss
> > +        deprecated: true
> 
> Not sure if this is correct syntax.
> 

Yeah I was not sure either but at least dt_binding_check does not
complain about this. :-)

Maybe Rob has an opinion if this makes sense or not?

Thanks,
Stephan

Re: [PATCH 2/6] dt-bindings: remoteproc: qcom,q6v5: Move MSM8916 to schema

[Krzysztof Kozlowski]

On 14/07/2022 20:48, Stephan Gerhold wrote:
> On Thu, Jul 14, 2022 at 11:50:30AM +0200, Krzysztof Kozlowski wrote:
>> On 12/07/2022 14:44, Stephan Gerhold wrote:
>>> [...]
>>> +properties:
>>> +  compatible:
>>> +    oneOf:
>>> +      - enum:
>>> +          - qcom,msm8916-mss-pil
>>> +
>>> +      - const: qcom,q6v5-pil
>>> +        description: Deprecated, prefer using qcom,msm8916-mss-pil
>>> +        deprecated: true
>>
>> The last compatible does not seem applicable here. Aren't you moving
>> only MSM8916 to new schema?
>>
> 
> "qcom,q6v5-pil" is exactly the same as "qcom,msm8916-mss-pil". It's just
> a deprecated quite unfortunately chosen old name for the same thing. :)
> 
> See these lines in the driver:
> 
> 	{ .compatible = "qcom,q6v5-pil", .data = &msm8916_mss},
> 	{ .compatible = "qcom,msm8916-mss-pil", .data = &msm8916_mss},

Yeah, but previous bindings were not mentioning it alone, so this would
not be a direct conversion.


Best regards,
Krzysztof

Re: [PATCH 2/6] dt-bindings: remoteproc: qcom,q6v5: Move MSM8916 to schema

[Stephan Gerhold]

On Fri, Jul 15, 2022 at 08:33:53AM +0200, Krzysztof Kozlowski wrote:
> On 14/07/2022 20:48, Stephan Gerhold wrote:
> > On Thu, Jul 14, 2022 at 11:50:30AM +0200, Krzysztof Kozlowski wrote:
> >> On 12/07/2022 14:44, Stephan Gerhold wrote:
> >>> [...]
> >>> +properties:
> >>> +  compatible:
> >>> +    oneOf:
> >>> +      - enum:
> >>> +          - qcom,msm8916-mss-pil
> >>> +
> >>> +      - const: qcom,q6v5-pil
> >>> +        description: Deprecated, prefer using qcom,msm8916-mss-pil
> >>> +        deprecated: true
> >>
> >> The last compatible does not seem applicable here. Aren't you moving
> >> only MSM8916 to new schema?
> >>
> > 
> > "qcom,q6v5-pil" is exactly the same as "qcom,msm8916-mss-pil". It's just
> > a deprecated quite unfortunately chosen old name for the same thing. :)
> > 
> > See these lines in the driver:
> > 
> > 	{ .compatible = "qcom,q6v5-pil", .data = &msm8916_mss},
> > 	{ .compatible = "qcom,msm8916-mss-pil", .data = &msm8916_mss},
> 
> Yeah, but previous bindings were not mentioning it alone, so this would
> not be a direct conversion.
> 

Sorry, I'm not sure I understand you correctly: What do you mean with
"the previous bindings were not mentioning it alone"? "qcom,q6v5-pil"
was listed as standalone compatible just like all the other compatibles:

- compatible:
	Usage: required
	Value type: <string>
	Definition: must be one of:
		    "qcom,q6v5-pil",         <----
		    "qcom,ipq8074-wcss-pil"
		    "qcom,qcs404-wcss-pil"
		    "qcom,msm8916-mss-pil",  <----
		    "qcom,msm8974-mss-pil"
		    "qcom,msm8996-mss-pil"
		    "qcom,msm8998-mss-pil"
		    "qcom,sc7180-mss-pil"
		    "qcom,sc7280-mss-pil"
		    "qcom,sdm845-mss-pil"

The only non-conversion steps I did was to mark some of the redundant
bindings as deprecated (e.g. "memory-region" with 2 items vs "mba" and
"mpss" subnode, "qcom,msm8916-mss-pil" vs "qcom,q6v5-pil"). I can put
the deprecations in a separate patch if that clarifies the situation.

Thanks,
Stephan

Re: [PATCH 2/6] dt-bindings: remoteproc: qcom,q6v5: Move MSM8916 to schema

[Krzysztof Kozlowski]

On 15/07/2022 10:00, Stephan Gerhold wrote:
>>
> 
> Sorry, I'm not sure I understand you correctly: What do you mean with
> "the previous bindings were not mentioning it alone"? "qcom,q6v5-pil"
> was listed as standalone compatible just like all the other compatibles:
> 
> - compatible:
> 	Usage: required
> 	Value type: <string>
> 	Definition: must be one of:
> 		    "qcom,q6v5-pil",         <----

You're right, sorry for confusion.


Best regards,
Krzysztof

[PATCH 3/6] ARM: dts: qcom: msm8974: Disable remoteprocs by default

[Stephan Gerhold]

The remoteproc configuration in qcom-msm8974.dtsi is incomplete because
it lacks the regulator supplies that should be added in the board DT
files. Some of the msm8974 boards are currently missing the regulator
supplies and should have the remoteprocs disabled to avoid making use
of the incomplete configuration.

This also fixes dtbs_check warnings after moving "qcom,msm8974-mss-pil"
to DT schema, which rightfully complains that the -supply properties
are missing for some boards:

qcom-apq8074-dragonboard.dtb:
remoteproc@fc880000: 'pll-supply' is a required property
        From schema: remoteproc/qcom,msm8916-mss-pil.yaml
remoteproc@fc880000: 'mss-supply' is a required property
        From schema: remoteproc/qcom,msm8916-mss-pil.yaml
remoteproc@fc880000: 'oneOf' conditional failed, one must be fixed:
        'power-domains' is a required property
        'power-domain-names' is a required property, or
        'cx-supply' is a required property
        'mx-supply' is a required property

Cc: Luca Weiss <luca@z3ntu.xyz>
Cc: Konrad Dybcio <konrad.dybcio@somainline.org>
Fixes: f300826d27be ("ARM: dts: qcom-msm8974: Sort and clean up nodes")
Signed-off-by: Stephan Gerhold <stephan.gerhold@kernkonzept.com>
---
 arch/arm/boot/dts/qcom-msm8974.dtsi                 | 4 ++++
 arch/arm/boot/dts/qcom-msm8974pro-fairphone-fp2.dts | 2 ++
 arch/arm/boot/dts/qcom-msm8974pro-samsung-klte.dts  | 2 ++
 3 files changed, 8 insertions(+)

diff --git a/arch/arm/boot/dts/qcom-msm8974.dtsi b/arch/arm/boot/dts/qcom-msm8974.dtsi
index 814ad0b46232..35246bd02132 100644
--- a/arch/arm/boot/dts/qcom-msm8974.dtsi
+++ b/arch/arm/boot/dts/qcom-msm8974.dtsi
@@ -1172,6 +1172,8 @@ remoteproc_mss: remoteproc@fc880000 {
 			qcom,smem-states = <&modem_smp2p_out 0>;
 			qcom,smem-state-names = "stop";
 
+			status = "disabled";
+
 			mba {
 				memory-region = <&mba_region>;
 			};
@@ -1639,6 +1641,8 @@ remoteproc_adsp: remoteproc@fe200000 {
 			qcom,smem-states = <&adsp_smp2p_out 0>;
 			qcom,smem-state-names = "stop";
 
+			status = "disabled";
+
 			smd-edge {
 				interrupts = <GIC_SPI 156 IRQ_TYPE_EDGE_RISING>;
 
diff --git a/arch/arm/boot/dts/qcom-msm8974pro-fairphone-fp2.dts b/arch/arm/boot/dts/qcom-msm8974pro-fairphone-fp2.dts
index 58cb2ce1e4df..8a6b8e4de887 100644
--- a/arch/arm/boot/dts/qcom-msm8974pro-fairphone-fp2.dts
+++ b/arch/arm/boot/dts/qcom-msm8974pro-fairphone-fp2.dts
@@ -147,10 +147,12 @@ wcnss {
 };
 
 &remoteproc_adsp {
+	status = "okay";
 	cx-supply = <&pm8841_s2>;
 };
 
 &remoteproc_mss {
+	status = "okay";
 	cx-supply = <&pm8841_s2>;
 	mss-supply = <&pm8841_s3>;
 	mx-supply = <&pm8841_s1>;
diff --git a/arch/arm/boot/dts/qcom-msm8974pro-samsung-klte.dts b/arch/arm/boot/dts/qcom-msm8974pro-samsung-klte.dts
index d6b2300a8223..577cbffad010 100644
--- a/arch/arm/boot/dts/qcom-msm8974pro-samsung-klte.dts
+++ b/arch/arm/boot/dts/qcom-msm8974pro-samsung-klte.dts
@@ -457,10 +457,12 @@ fuelgauge_pin: fuelgauge-int-pin {
 };
 
 &remoteproc_adsp {
+	status = "okay";
 	cx-supply = <&pma8084_s2>;
 };
 
 &remoteproc_mss {
+	status = "okay";
 	cx-supply = <&pma8084_s2>;
 	mss-supply = <&pma8084_s6>;
 	mx-supply = <&pma8084_s1>;
-- 
2.30.2

Re: [PATCH 3/6] ARM: dts: qcom: msm8974: Disable remoteprocs by default

[Krzysztof Kozlowski]

On 12/07/2022 14:44, Stephan Gerhold wrote:
> The remoteproc configuration in qcom-msm8974.dtsi is incomplete because
> 
> diff --git a/arch/arm/boot/dts/qcom-msm8974.dtsi b/arch/arm/boot/dts/qcom-msm8974.dtsi
> index 814ad0b46232..35246bd02132 100644
> --- a/arch/arm/boot/dts/qcom-msm8974.dtsi
> +++ b/arch/arm/boot/dts/qcom-msm8974.dtsi
> @@ -1172,6 +1172,8 @@ remoteproc_mss: remoteproc@fc880000 {
>  			qcom,smem-states = <&modem_smp2p_out 0>;
>  			qcom,smem-state-names = "stop";
>  
> +			status = "disabled";
> +
>  			mba {
>  				memory-region = <&mba_region>;
>  			};
> @@ -1639,6 +1641,8 @@ remoteproc_adsp: remoteproc@fe200000 {
>  			qcom,smem-states = <&adsp_smp2p_out 0>;
>  			qcom,smem-state-names = "stop";
>  
> +			status = "disabled";
> +
>  			smd-edge {
>  				interrupts = <GIC_SPI 156 IRQ_TYPE_EDGE_RISING>;
>  
> diff --git a/arch/arm/boot/dts/qcom-msm8974pro-fairphone-fp2.dts b/arch/arm/boot/dts/qcom-msm8974pro-fairphone-fp2.dts
> index 58cb2ce1e4df..8a6b8e4de887 100644
> --- a/arch/arm/boot/dts/qcom-msm8974pro-fairphone-fp2.dts
> +++ b/arch/arm/boot/dts/qcom-msm8974pro-fairphone-fp2.dts
> @@ -147,10 +147,12 @@ wcnss {
>  };
>  
>  &remoteproc_adsp {
> +	status = "okay";

These go to the end of properties.

>  	cx-supply = <&pm8841_s2>;
>  };
>  
>  &remoteproc_mss {
> +	status = "okay";

Ditto

>  	cx-supply = <&pm8841_s2>;
>  	mss-supply = <&pm8841_s3>;
>  	mx-supply = <&pm8841_s1>;
> diff --git a/arch/arm/boot/dts/qcom-msm8974pro-samsung-klte.dts b/arch/arm/boot/dts/qcom-msm8974pro-samsung-klte.dts
> index d6b2300a8223..577cbffad010 100644
> --- a/arch/arm/boot/dts/qcom-msm8974pro-samsung-klte.dts
> +++ b/arch/arm/boot/dts/qcom-msm8974pro-samsung-klte.dts
> @@ -457,10 +457,12 @@ fuelgauge_pin: fuelgauge-int-pin {
>  };
>  
>  &remoteproc_adsp {
> +	status = "okay";

Ditto

>  	cx-supply = <&pma8084_s2>;
>  };
>  
>  &remoteproc_mss {
> +	status = "okay";
>  	cx-supply = <&pma8084_s2>;
>  	mss-supply = <&pma8084_s6>;
>  	mx-supply = <&pma8084_s1>;


Best regards,
Krzysztof

Re: [PATCH 3/6] ARM: dts: qcom: msm8974: Disable remoteprocs by default

[Stephan Gerhold]

On Thu, Jul 14, 2022 at 11:55:44AM +0200, Krzysztof Kozlowski wrote:
> On 12/07/2022 14:44, Stephan Gerhold wrote:
> > The remoteproc configuration in qcom-msm8974.dtsi is incomplete because
> > 
> > diff --git a/arch/arm/boot/dts/qcom-msm8974.dtsi b/arch/arm/boot/dts/qcom-msm8974.dtsi
> > index 814ad0b46232..35246bd02132 100644
> > --- a/arch/arm/boot/dts/qcom-msm8974.dtsi
> > +++ b/arch/arm/boot/dts/qcom-msm8974.dtsi
> > @@ -1172,6 +1172,8 @@ remoteproc_mss: remoteproc@fc880000 {
> >  			qcom,smem-states = <&modem_smp2p_out 0>;
> >  			qcom,smem-state-names = "stop";
> >  
> > +			status = "disabled";
> > +
> >  			mba {
> >  				memory-region = <&mba_region>;
> >  			};
> > @@ -1639,6 +1641,8 @@ remoteproc_adsp: remoteproc@fe200000 {
> >  			qcom,smem-states = <&adsp_smp2p_out 0>;
> >  			qcom,smem-state-names = "stop";
> >  
> > +			status = "disabled";
> > +
> >  			smd-edge {
> >  				interrupts = <GIC_SPI 156 IRQ_TYPE_EDGE_RISING>;
> >  
> > diff --git a/arch/arm/boot/dts/qcom-msm8974pro-fairphone-fp2.dts b/arch/arm/boot/dts/qcom-msm8974pro-fairphone-fp2.dts
> > index 58cb2ce1e4df..8a6b8e4de887 100644
> > --- a/arch/arm/boot/dts/qcom-msm8974pro-fairphone-fp2.dts
> > +++ b/arch/arm/boot/dts/qcom-msm8974pro-fairphone-fp2.dts
> > @@ -147,10 +147,12 @@ wcnss {
> >  };
> >  
> >  &remoteproc_adsp {
> > +	status = "okay";
> 
> These go to the end of properties.
> 

All the other nodes in these two files have the 'status = "okay"' at the
beginning (just like most of the Qualcomm boards actually). I know there
have been some discussion to change this, but until existing boards have
been changed I would rather not introduce a wild mix of both approaches
(within the same file at least).

Thanks,
Stephan

Re: [PATCH 3/6] ARM: dts: qcom: msm8974: Disable remoteprocs by default

[Krzysztof Kozlowski]

On 14/07/2022 21:01, Stephan Gerhold wrote:
> On Thu, Jul 14, 2022 at 11:55:44AM +0200, Krzysztof Kozlowski wrote:
>> On 12/07/2022 14:44, Stephan Gerhold wrote:
>>> The remoteproc configuration in qcom-msm8974.dtsi is incomplete because
>>>
>>> diff --git a/arch/arm/boot/dts/qcom-msm8974.dtsi b/arch/arm/boot/dts/qcom-msm8974.dtsi
>>> index 814ad0b46232..35246bd02132 100644
>>> --- a/arch/arm/boot/dts/qcom-msm8974.dtsi
>>> +++ b/arch/arm/boot/dts/qcom-msm8974.dtsi
>>> @@ -1172,6 +1172,8 @@ remoteproc_mss: remoteproc@fc880000 {
>>>  			qcom,smem-states = <&modem_smp2p_out 0>;
>>>  			qcom,smem-state-names = "stop";
>>>  
>>> +			status = "disabled";
>>> +
>>>  			mba {
>>>  				memory-region = <&mba_region>;
>>>  			};
>>> @@ -1639,6 +1641,8 @@ remoteproc_adsp: remoteproc@fe200000 {
>>>  			qcom,smem-states = <&adsp_smp2p_out 0>;
>>>  			qcom,smem-state-names = "stop";
>>>  
>>> +			status = "disabled";
>>> +
>>>  			smd-edge {
>>>  				interrupts = <GIC_SPI 156 IRQ_TYPE_EDGE_RISING>;
>>>  
>>> diff --git a/arch/arm/boot/dts/qcom-msm8974pro-fairphone-fp2.dts b/arch/arm/boot/dts/qcom-msm8974pro-fairphone-fp2.dts
>>> index 58cb2ce1e4df..8a6b8e4de887 100644
>>> --- a/arch/arm/boot/dts/qcom-msm8974pro-fairphone-fp2.dts
>>> +++ b/arch/arm/boot/dts/qcom-msm8974pro-fairphone-fp2.dts
>>> @@ -147,10 +147,12 @@ wcnss {
>>>  };
>>>  
>>>  &remoteproc_adsp {
>>> +	status = "okay";
>>
>> These go to the end of properties.
>>
> 
> All the other nodes in these two files have the 'status = "okay"' at the
> beginning (just like most of the Qualcomm boards actually). I know there
> have been some discussion to change this, but until existing boards have
> been changed I would rather not introduce a wild mix of both approaches
> (within the same file at least).

I would say less code to fix later, but OK.

Best regards,
Krzysztof

Re: (subset) [PATCH 3/6] ARM: dts: qcom: msm8974: Disable remoteprocs by default

[Bjorn Andersson]

On Tue, 12 Jul 2022 14:44:18 +0200, Stephan Gerhold wrote:
> The remoteproc configuration in qcom-msm8974.dtsi is incomplete because
> it lacks the regulator supplies that should be added in the board DT
> files. Some of the msm8974 boards are currently missing the regulator
> supplies and should have the remoteprocs disabled to avoid making use
> of the incomplete configuration.
> 
> This also fixes dtbs_check warnings after moving "qcom,msm8974-mss-pil"
> to DT schema, which rightfully complains that the -supply properties
> are missing for some boards:
> 
> [...]

Applied, thanks!

[3/6] ARM: dts: qcom: msm8974: Disable remoteprocs by default
      commit: 8d8be8dd7c1f5d50f84ecc7a6a41962da48c6164

Best regards,
-- 
Bjorn Andersson <bjorn.andersson@linaro.org>

[PATCH 4/6] dt-bindings: remoteproc: qcom,msm8916-mss-pil: Add MSM8974

[Stephan Gerhold]

The "qcom,msm8974-mss-pil" binding is still similar enough to MSM8916
to be covered by the same DT schema. The only difference is the
additional "mss-supply", which can be easily handled using a single
if statement.

Signed-off-by: Stephan Gerhold <stephan.gerhold@kernkonzept.com>
---
Note: I generated this patch on top of Sibi's series [1] to avoid
conflicts later (I expect it will be picked up first).

[1]: https://lore.kernel.org/linux-arm-msm/1657020721-24939-1-git-send-email-quic_sibis@quicinc.com/
---
 .../remoteproc/qcom,msm8916-mss-pil.yaml         | 16 ++++++++++++++++
 .../devicetree/bindings/remoteproc/qcom,q6v5.txt | 16 ----------------
 2 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/Documentation/devicetree/bindings/remoteproc/qcom,msm8916-mss-pil.yaml b/Documentation/devicetree/bindings/remoteproc/qcom,msm8916-mss-pil.yaml
index 3968348dc982..ca7146551ba9 100644
--- a/Documentation/devicetree/bindings/remoteproc/qcom,msm8916-mss-pil.yaml
+++ b/Documentation/devicetree/bindings/remoteproc/qcom,msm8916-mss-pil.yaml
@@ -18,6 +18,7 @@ properties:
     oneOf:
       - enum:
           - qcom,msm8916-mss-pil
+          - qcom,msm8974-mss-pil
 
       - const: qcom,q6v5-pil
         description: Deprecated, prefer using qcom,msm8916-mss-pil
@@ -76,6 +77,9 @@ properties:
   pll-supply:
     description: PLL proxy supply (control handed over after startup)
 
+  mss-supply:
+    description: MSS power domain supply (only valid for qcom,msm8974-mss-pil)
+
   resets:
     items:
       - description: MSS restart control
@@ -177,6 +181,18 @@ required:
   - qcom,smem-state-names
   - smd-edge
 
+# mss-supply is only valid (and required) for MSM8974
+if:
+  properties:
+    compatible:
+      const: qcom,msm8974-mss-pil
+then:
+  required:
+    - mss-supply
+else:
+  properties:
+    mss-supply: false
+
 # Fallbacks for deprecated properties
 allOf:
   - oneOf:
diff --git a/Documentation/devicetree/bindings/remoteproc/qcom,q6v5.txt b/Documentation/devicetree/bindings/remoteproc/qcom,q6v5.txt
index 3beb01da134b..9366ef087209 100644
--- a/Documentation/devicetree/bindings/remoteproc/qcom,q6v5.txt
+++ b/Documentation/devicetree/bindings/remoteproc/qcom,q6v5.txt
@@ -9,7 +9,6 @@ on the Qualcomm Hexagon core.
 	Definition: must be one of:
 		    "qcom,ipq8074-wcss-pil"
 		    "qcom,qcs404-wcss-pil"
-		    "qcom,msm8974-mss-pil"
 		    "qcom,msm8996-mss-pil"
 		    "qcom,msm8998-mss-pil"
 		    "qcom,sdm845-mss-pil"
@@ -37,7 +36,6 @@ on the Qualcomm Hexagon core.
 		    string:
 	qcom,ipq8074-wcss-pil:
 	qcom,qcs404-wcss-pil:
-	qcom,msm8974-mss-pil:
 		    must be "wdog", "fatal", "ready", "handover", "stop-ack"
 	qcom,msm8996-mss-pil:
 	qcom,msm8998-mss-pil:
@@ -68,8 +66,6 @@ on the Qualcomm Hexagon core.
 		    "gcc_axim_cbcr", "lcc_ahbfabric_cbc", "tcsr_lcc_cbc",
 		    "lcc_abhs_cbc", "lcc_tcm_slave_cbc", "lcc_abhm_cbc",
 		    "lcc_axim_cbc", "lcc_bcr_sleep"
-	qcom,msm8974-mss-pil:
-		    must be "iface", "bus", "mem", "xo"
 	qcom,msm8996-mss-pil:
 		    must be "iface", "bus", "mem", "xo", "gpll0_mss",
 		    "snoc_axi", "mnoc_axi", "pnoc", "qdss"
@@ -106,17 +102,6 @@ should be referenced as follows:
 	Definition: reference to the reserved-memory for the mba region followed
 		    by the mpss region
 
-For the compatible string below the following supplies are required:
-  "qcom,msm8974-mss-pil"
-- cx-supply: (deprecated, use power domain instead)
-- mss-supply:
-- mx-supply: (deprecated, use power domain instead)
-- pll-supply:
-	Usage: required
-	Value type: <phandle>
-	Definition: reference to the regulators to be held on behalf of the
-		    booting of the Hexagon core
-
 For the compatible string below the following supplies are required:
   "qcom,qcs404-wcss-pil"
 - cx-supply:
@@ -144,7 +129,6 @@ For the compatible string below the following supplies are required:
 	Definition: The power-domains needed depend on the compatible string:
 	qcom,ipq8074-wcss-pil:
 		    no power-domain names required
-	qcom,msm8974-mss-pil:
 	qcom,msm8996-mss-pil:
 	qcom,msm8998-mss-pil:
 		    must be "cx", "mx"
-- 
2.30.2

Re: [PATCH 4/6] dt-bindings: remoteproc: qcom,msm8916-mss-pil: Add MSM8974

[Krzysztof Kozlowski]

On 12/07/2022 14:44, Stephan Gerhold wrote:
> The "qcom,msm8974-mss-pil" binding is still similar enough to MSM8916
> to be covered by the same DT schema. The only difference is the
> additional "mss-supply", which can be easily handled using a single
> if statement.
> 
> Signed-off-by: Stephan Gerhold <stephan.gerhold@kernkonzept.com>
> ---
> Note: I generated this patch on top of Sibi's series [1] to avoid
> conflicts later (I expect it will be picked up first).
> 
> [1]: https://lore.kernel.org/linux-arm-msm/1657020721-24939-1-git-send-email-quic_sibis@quicinc.com/
> ---
>  .../remoteproc/qcom,msm8916-mss-pil.yaml         | 16 ++++++++++++++++
>  .../devicetree/bindings/remoteproc/qcom,q6v5.txt | 16 ----------------
>  2 files changed, 16 insertions(+), 16 deletions(-)
> 
> diff --git a/Documentation/devicetree/bindings/remoteproc/qcom,msm8916-mss-pil.yaml b/Documentation/devicetree/bindings/remoteproc/qcom,msm8916-mss-pil.yaml
> index 3968348dc982..ca7146551ba9 100644
> --- a/Documentation/devicetree/bindings/remoteproc/qcom,msm8916-mss-pil.yaml
> +++ b/Documentation/devicetree/bindings/remoteproc/qcom,msm8916-mss-pil.yaml
> @@ -18,6 +18,7 @@ properties:
>      oneOf:
>        - enum:
>            - qcom,msm8916-mss-pil
> +          - qcom,msm8974-mss-pil
>  
>        - const: qcom,q6v5-pil
>          description: Deprecated, prefer using qcom,msm8916-mss-pil
> @@ -76,6 +77,9 @@ properties:
>    pll-supply:
>      description: PLL proxy supply (control handed over after startup)
>  
> +  mss-supply:
> +    description: MSS power domain supply (only valid for qcom,msm8974-mss-pil)
> +
>    resets:
>      items:
>        - description: MSS restart control
> @@ -177,6 +181,18 @@ required:
>    - qcom,smem-state-names
>    - smd-edge
>  
> +# mss-supply is only valid (and required) for MSM8974
> +if:

Put it under allOf. This makes it prepared for growing.

> +  properties:
> +    compatible:
> +      const: qcom,msm8974-mss-pil
> +then:
> +  required:
> +    - mss-supply
> +else:
> +  properties:
> +    mss-supply: false
> +

Best regards,
Krzysztof

[PATCH 5/6] dt-bindings: remoteproc: qcom,q6v5-pil: Add MSM8909

[Stephan Gerhold]

Document the "qcom,msm8909-mss-pil" compatible for the modem remote
processor on MSM8909. It is used pretty much exactly like the existing
one for MSM8916.

Signed-off-by: Stephan Gerhold <stephan.gerhold@kernkonzept.com>
---
 .../devicetree/bindings/remoteproc/qcom,msm8916-mss-pil.yaml     | 1 +
 1 file changed, 1 insertion(+)

diff --git a/Documentation/devicetree/bindings/remoteproc/qcom,msm8916-mss-pil.yaml b/Documentation/devicetree/bindings/remoteproc/qcom,msm8916-mss-pil.yaml
index ca7146551ba9..ef268005a57a 100644
--- a/Documentation/devicetree/bindings/remoteproc/qcom,msm8916-mss-pil.yaml
+++ b/Documentation/devicetree/bindings/remoteproc/qcom,msm8916-mss-pil.yaml
@@ -17,6 +17,7 @@ properties:
   compatible:
     oneOf:
       - enum:
+          - qcom,msm8909-mss-pil
           - qcom,msm8916-mss-pil
           - qcom,msm8974-mss-pil
 
-- 
2.30.2

Re: [PATCH 5/6] dt-bindings: remoteproc: qcom,q6v5-pil: Add MSM8909

[Krzysztof Kozlowski]

On 12/07/2022 14:44, Stephan Gerhold wrote:
> Document the "qcom,msm8909-mss-pil" compatible for the modem remote
> processor on MSM8909. It is used pretty much exactly like the existing
> one for MSM8916.
> 
> Signed-off-by: Stephan Gerhold <stephan.gerhold@kernkonzept.com>


Acked-by: Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org>


Best regards,
Krzysztof

[PATCH 6/6] remoteproc: qcom_q6v5_mss: Add support for MSM8909

[Stephan Gerhold]

Port the initialization sequence necessary for booting the modem remote
processor on the MSM8909 SoC from Qualcomm's msm-3.10 release [1].
The sequence is actually similar to the existing one for MSM8996 and
MSM8998 except that there is no separate QDSP6SS_MEM_PWR_CTL register
and most of the "memories" are enabled at once instead of sequentially.

To reuse the existing code just insert some if statements where needed
and add a configuration similar to the one from MSM8916.

[1]: https://git.codelinaro.org/clo/la/kernel/msm-3.10/-/commit/56dcedc8dac8abff6b007f76a29430b2d0a44704

Signed-off-by: Stephan Gerhold <stephan.gerhold@kernkonzept.com>
---
 drivers/remoteproc/qcom_q6v5_mss.c | 123 +++++++++++++++++++++--------
 1 file changed, 90 insertions(+), 33 deletions(-)

diff --git a/drivers/remoteproc/qcom_q6v5_mss.c b/drivers/remoteproc/qcom_q6v5_mss.c
index af217de75e4d..31f561619b19 100644
--- a/drivers/remoteproc/qcom_q6v5_mss.c
+++ b/drivers/remoteproc/qcom_q6v5_mss.c
@@ -110,6 +110,9 @@
 #define QDSS_BHS_ON			BIT(21)
 #define QDSS_LDO_BYP			BIT(22)
 
+/* QDSP6v55 parameters */
+#define QDSP6V55_MEM_BITS		GENMASK(16, 8)
+
 /* QDSP6v56 parameters */
 #define QDSP6v56_LDO_BYP		BIT(25)
 #define QDSP6v56_BHS_ON		BIT(24)
@@ -233,6 +236,7 @@ struct q6v5 {
 };
 
 enum {
+	MSS_MSM8909,
 	MSS_MSM8916,
 	MSS_MSM8974,
 	MSS_MSM8996,
@@ -686,13 +690,14 @@ static int q6v5proc_reset(struct q6v5 *qproc)
 			return ret;
 		}
 		goto pbl_wait;
-	} else if (qproc->version == MSS_MSM8996 ||
+	} else if (qproc->version == MSS_MSM8909 ||
+		   qproc->version == MSS_MSM8996 ||
 		   qproc->version == MSS_MSM8998) {
-		int mem_pwr_ctl;
 
-		/* Override the ACC value if required */
-		writel(QDSP6SS_ACC_OVERRIDE_VAL,
-		       qproc->reg_base + QDSP6SS_STRAP_ACC);
+		if (qproc->version != MSS_MSM8909)
+			/* Override the ACC value if required */
+			writel(QDSP6SS_ACC_OVERRIDE_VAL,
+			       qproc->reg_base + QDSP6SS_STRAP_ACC);
 
 		/* Assert resets, stop core */
 		val = readl(qproc->reg_base + QDSP6SS_RESET_REG);
@@ -724,36 +729,53 @@ static int q6v5proc_reset(struct q6v5 *qproc)
 		val |= QDSP6v56_LDO_BYP;
 		writel(val, qproc->reg_base + QDSP6SS_PWR_CTL_REG);
 
-		/* Deassert QDSP6 compiler memory clamp */
-		val = readl(qproc->reg_base + QDSP6SS_PWR_CTL_REG);
-		val &= ~QDSP6v56_CLAMP_QMC_MEM;
-		writel(val, qproc->reg_base + QDSP6SS_PWR_CTL_REG);
-
-		/* Deassert memory peripheral sleep and L2 memory standby */
-		val |= Q6SS_L2DATA_STBY_N | Q6SS_SLP_RET_N;
-		writel(val, qproc->reg_base + QDSP6SS_PWR_CTL_REG);
-
-		/* Turn on L1, L2, ETB and JU memories 1 at a time */
-		if (qproc->version == MSS_MSM8996) {
-			mem_pwr_ctl = QDSP6SS_MEM_PWR_CTL;
-			i = 19;
+		if (qproc->version != MSS_MSM8909) {
+			int mem_pwr_ctl;
+
+			/* Deassert QDSP6 compiler memory clamp */
+			val = readl(qproc->reg_base + QDSP6SS_PWR_CTL_REG);
+			val &= ~QDSP6v56_CLAMP_QMC_MEM;
+			writel(val, qproc->reg_base + QDSP6SS_PWR_CTL_REG);
+
+			/* Deassert memory peripheral sleep and L2 memory standby */
+			val |= Q6SS_L2DATA_STBY_N | Q6SS_SLP_RET_N;
+			writel(val, qproc->reg_base + QDSP6SS_PWR_CTL_REG);
+
+			/* Turn on L1, L2, ETB and JU memories 1 at a time */
+			if (qproc->version == MSS_MSM8996) {
+				mem_pwr_ctl = QDSP6SS_MEM_PWR_CTL;
+				i = 19;
+			} else {
+				/* MSS_MSM8998 */
+				mem_pwr_ctl = QDSP6V6SS_MEM_PWR_CTL;
+				i = 28;
+			}
+			val = readl(qproc->reg_base + mem_pwr_ctl);
+			for (; i >= 0; i--) {
+				val |= BIT(i);
+				writel(val, qproc->reg_base + mem_pwr_ctl);
+				/*
+				 * Read back value to ensure the write is done then
+				 * wait for 1us for both memory peripheral and data
+				 * array to turn on.
+				 */
+				val |= readl(qproc->reg_base + mem_pwr_ctl);
+				udelay(1);
+			}
 		} else {
-			/* MSS_MSM8998 */
-			mem_pwr_ctl = QDSP6V6SS_MEM_PWR_CTL;
-			i = 28;
-		}
-		val = readl(qproc->reg_base + mem_pwr_ctl);
-		for (; i >= 0; i--) {
-			val |= BIT(i);
-			writel(val, qproc->reg_base + mem_pwr_ctl);
-			/*
-			 * Read back value to ensure the write is done then
-			 * wait for 1us for both memory peripheral and data
-			 * array to turn on.
-			 */
-			val |= readl(qproc->reg_base + mem_pwr_ctl);
-			udelay(1);
+			/* Turn on memories */
+			val = readl(qproc->reg_base + QDSP6SS_PWR_CTL_REG);
+			val |= Q6SS_SLP_RET_N | Q6SS_L2DATA_STBY_N |
+			       Q6SS_ETB_SLP_NRET_N | QDSP6V55_MEM_BITS;
+			writel(val, qproc->reg_base + QDSP6SS_PWR_CTL_REG);
+
+			/* Turn on L2 banks 1 at a time */
+			for (i = 0; i <= 7; i++) {
+				val |= BIT(i);
+				writel(val, qproc->reg_base + QDSP6SS_PWR_CTL_REG);
+			}
 		}
+
 		/* Remove word line clamp */
 		val = readl(qproc->reg_base + QDSP6SS_PWR_CTL_REG);
 		val &= ~QDSP6v56_CLAMP_WL;
@@ -2198,6 +2220,40 @@ static const struct rproc_hexagon_res msm8996_mss = {
 	.version = MSS_MSM8996,
 };
 
+static const struct rproc_hexagon_res msm8909_mss = {
+	.hexagon_mba_image = "mba.mbn",
+	.proxy_supply = (struct qcom_mss_reg_res[]) {
+		{
+			.supply = "pll",
+			.uA = 100000,
+		},
+		{}
+	},
+	.proxy_clk_names = (char*[]){
+		"xo",
+		NULL
+	},
+	.active_clk_names = (char*[]){
+		"iface",
+		"bus",
+		"mem",
+		NULL
+	},
+	.proxy_pd_names = (char*[]){
+		"mx",
+		"cx",
+		NULL
+	},
+	.need_mem_protection = false,
+	.has_alt_reset = false,
+	.has_mba_logs = false,
+	.has_spare_reg = false,
+	.has_qaccept_regs = false,
+	.has_ext_cntl_regs = false,
+	.has_vq6 = false,
+	.version = MSS_MSM8909,
+};
+
 static const struct rproc_hexagon_res msm8916_mss = {
 	.hexagon_mba_image = "mba.mbn",
 	.proxy_supply = (struct qcom_mss_reg_res[]) {
@@ -2298,6 +2354,7 @@ static const struct rproc_hexagon_res msm8974_mss = {
 
 static const struct of_device_id q6v5_of_match[] = {
 	{ .compatible = "qcom,q6v5-pil", .data = &msm8916_mss},
+	{ .compatible = "qcom,msm8909-mss-pil", .data = &msm8909_mss},
 	{ .compatible = "qcom,msm8916-mss-pil", .data = &msm8916_mss},
 	{ .compatible = "qcom,msm8974-mss-pil", .data = &msm8974_mss},
 	{ .compatible = "qcom,msm8996-mss-pil", .data = &msm8996_mss},
-- 
2.30.2