Commit 2bfc50c6 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'rproc-v7.0' of git://git.kernel.org/pub/scm/linux/kernel/git/remoteproc/linux 

Pull remoteproc updates from Bjorn Andersson:

 - Fix a memory remapping issue and make a few life-cycle improvements
   in the i.MX HiFi remoteproc driver

 - Add support the System Manager CPU and LMM APIs and use this to
   support i.MX95

 - Rework the handling of the Mediatek SCP clock to avoid a potential
   circular deadlock in the clock providers

 - Refactor the Qualcomm secure-world helpers and add support in the
   Qualcomm PAS remoteproc driver for reading a resource-table from
   secure world. Use this to configure the IOMMU on newer targets where
   Linux runs in EL2

* tag 'rproc-v7.0' of git://git.kernel.org/pub/scm/linux/kernel/git/remoteproc/linux:
  remoteproc: imx_rproc: Fix invalid loaded resource table detection
  remoteproc: mediatek: Break lock dependency to `prepare_lock`
  remoteproc: imx_rproc: Add support for i.MX95
  remoteproc: imx_rproc: Add support for System Manager CPU API
  remoteproc: imx_rproc: Add support for System Manager LMM API
  remoteproc: imx_rproc: Introduce prepare ops for imx_rproc_dcfg
  remoteproc: imx_rproc: Add runtime ops copy to support dynamic behavior
  dt-bindings: remoteproc: fsl,imx-rproc: Add support for i.MX95
  dt-bindings: remoteproc: Add HSM M4F core on TI K3 SoCs
  remoteproc: xlnx_r5: Simplify with scoped for each OF child loop
  remoteproc: mtk_scp: Simplify with scoped for each OF child loop
  remoteproc: imx_dsp_rproc: Only reset carveout memory at RPROC_OFFLINE state
  dt-bindings: remoteproc: qcom,sm8550-pas: Drop SM8750 ADSP from if-branch
  dt-bindings: remoteproc: qcom,adsp: Allow cx-supply on qcom,sdm845-slpi-pas
  remoteproc: imx_dsp_rproc: Fix multiple start/stop operations
  remoteproc: imx_rproc: Use strstarts for "rsc-table" check
  remoteproc: imx_dsp_rproc: Wait for suspend ACK only if WAIT_FW_CONFIRMATION is set
  remoteproc: imx_dsp_rproc: Rename macro to reflect multiple contexts
  remoteproc: imx_dsp_rproc: Skip RP_MBOX_SUSPEND_SYSTEM when mailbox TX channel is uninitialized
  dt-bindings: remoteproc: Fix dead link to Keystone DSP GPIO binding
parents f0a475ae 26aa5295

Documentation/devicetree/bindings/remoteproc/fsl,imx-rproc.yaml

+1 −0
Original line number Diff line number Diff line
@@ -28,6 +28,7 @@ properties: 
      - fsl,imx8qxp-cm4

      - fsl,imx8ulp-cm33

      - fsl,imx93-cm33

      - fsl,imx95-cm7



  clocks:

    maxItems: 1

Documentation/devicetree/bindings/remoteproc/qcom,adsp.yaml

+5 −0
Original line number Diff line number Diff line
@@ -32,6 +32,8 @@ properties: 
  reg:

    maxItems: 1



  cx-supply: true



  px-supply:

    description: Phandle to the PX regulator
@@ -159,6 +161,9 @@ allOf: 
          items:

            - const: lcx

            - const: lmx

    else:

      properties:

        cx-supply: false



  - if:

      properties:

Documentation/devicetree/bindings/remoteproc/qcom,sm8550-pas.yaml

+0 −1
Original line number Diff line number Diff line
@@ -187,7 +187,6 @@ allOf: 
            enum:

              - qcom,sm8550-adsp-pas

              - qcom,sm8650-adsp-pas

              - qcom,sm8750-adsp-pas

              - qcom,x1e80100-adsp-pas

    then:

      properties:

Documentation/devicetree/bindings/remoteproc/ti,hsm-m4fss.yaml

0 → 100644
+72 −0
Original line number Diff line number Diff line 
# SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause)

%YAML 1.2

---

$id: http://devicetree.org/schemas/remoteproc/ti,hsm-m4fss.yaml#

$schema: http://devicetree.org/meta-schemas/core.yaml#



title: TI K3 HSM M4F processor subsystems



maintainers:

  - Beleswar Padhi <b-padhi@ti.com>



description: |

  Some K3 family SoCs have a HSM (High Security Module) M4F core in the

  Wakeup Voltage Domain which could be used to run secure services like

  Authentication. Some of those are J721S2, J784S4, J722S, AM62X.



$ref: /schemas/arm/keystone/ti,k3-sci-common.yaml#



properties:

  compatible:

    enum:

      - ti,hsm-m4fss



  reg:

    items:

      - description: SRAM0_0 internal memory region

      - description: SRAM0_1 internal memory region

      - description: SRAM1 internal memory region



  reg-names:

    items:

      - const: sram0_0

      - const: sram0_1

      - const: sram1



  resets:

    maxItems: 1



  firmware-name:

    maxItems: 1



required:

  - compatible

  - reg

  - reg-names

  - resets

  - firmware-name

  - ti,sci

  - ti,sci-dev-id

  - ti,sci-proc-ids



unevaluatedProperties: false



examples:

  - |

    soc {

        #address-cells = <2>;

        #size-cells = <2>;



        remoteproc@43c00000 {

            compatible = "ti,hsm-m4fss";

            reg = <0x00 0x43c00000 0x00 0x20000>,

                  <0x00 0x43c20000 0x00 0x10000>,

                  <0x00 0x43c30000 0x00 0x10000>;

            reg-names = "sram0_0", "sram0_1", "sram1";

            resets = <&k3_reset 225 1>;

            firmware-name = "hsm.bin";

            ti,sci = <&sms>;

            ti,sci-dev-id = <225>;

            ti,sci-proc-ids = <0x80 0xff>;

        };

    };

Documentation/devicetree/bindings/remoteproc/ti,keystone-rproc.txt

+1 −1
Original line number Diff line number Diff line
@@ -66,7 +66,7 @@ The following are the mandatory properties: 
- kick-gpios: 		Should specify the gpio device needed for the virtio IPC

			stack. This will be used to interrupt the remote processor.

			The gpio device to be used is as per the bindings in,

			Documentation/devicetree/bindings/gpio/gpio-dsp-keystone.txt

			Documentation/devicetree/bindings/gpio/ti,keystone-dsp-gpio.yaml



SoC-specific Required properties:

---------------------------------