Commit 11185742 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

Pull remoteproc updates from Bjorn Andersson:

 - Make the Xilinx remoteproc driver support running on only a single
   core, disable still unsupported remoteproc features, and stop the
   remoteproc on shutdown to facilitate kexec.

 - Conclude the renaming of the Qualcomm ADSP driver to "PAS" that was
   started many years ago.

* tag 'rproc-v6.17' of git://git.kernel.org/pub/scm/linux/kernel/git/remoteproc/linux:
  remoteproc: xlnx: Fix kernel-doc warnings
  remoteproc: xlnx: Disable unsupported features
  remoteproc: xlnx: Add shutdown callback
  remoteproc: xlnx: Allow single core use in split mode
  dt-bindings: remoteproc: qcom,sa8775p-pas: Correct the interrupt number
  remoteproc: Don't use %pK through printk
  dt-bindings: remoteproc: qcom,sm8150-pas: Document QCS615 remoteproc
  remoteproc: qcom: pas: Conclude the rename from adsp
parents 821c9e51 1c202241

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

+1 −1
Original line number Diff line number Diff line
@@ -144,8 +144,8 @@ examples: 


        interrupts-extended = <&pdc 6 IRQ_TYPE_EDGE_RISING>,

                              <&smp2p_adsp_in 0 IRQ_TYPE_EDGE_RISING>,

                              <&smp2p_adsp_in 2 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";

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

+38 −27
Original line number Diff line number Diff line
@@ -15,7 +15,16 @@ description: 


properties:

  compatible:

    enum:

    oneOf:

      - items:

          - enum:

              - qcom,qcs615-adsp-pas

          - const: qcom,sm8150-adsp-pas

      - items:

          - enum:

              - qcom,qcs615-cdsp-pas

          - const: qcom,sm8150-cdsp-pas

      - enum:

          - qcom,sc8180x-adsp-pas

          - qcom,sc8180x-cdsp-pas

          - qcom,sc8180x-slpi-pas
@@ -62,6 +71,7 @@ allOf: 
  - if:

      properties:

        compatible:

          contains:

            enum:

              - qcom,sc8180x-adsp-pas

              - qcom,sc8180x-cdsp-pas
@@ -88,6 +98,7 @@ allOf: 
  - if:

      properties:

        compatible:

          contains:

            enum:

              - qcom,sc8180x-adsp-pas

              - qcom,sc8180x-cdsp-pas

drivers/remoteproc/Kconfig

+5 −6
Original line number Diff line number Diff line
@@ -214,7 +214,7 @@ config QCOM_Q6V5_MSS 
	  handled by QCOM_Q6V5_PAS driver.



config QCOM_Q6V5_PAS

	tristate "Qualcomm Hexagon v5 Peripheral Authentication Service support"

	tristate "Qualcomm Peripheral Authentication Service support"

	depends on OF && ARCH_QCOM

	depends on QCOM_SMEM

	depends on RPMSG_QCOM_SMD || RPMSG_QCOM_SMD=n
@@ -229,11 +229,10 @@ config QCOM_Q6V5_PAS 
	select QCOM_RPROC_COMMON

	select QCOM_SCM

	help

	  Say y here to support the TrustZone based Peripheral Image Loader

	  for the Qualcomm Hexagon v5 based remote processors. This is commonly

	  used to control subsystems such as ADSP (Audio DSP),

	  CDSP (Compute DSP), MPSS (Modem Peripheral SubSystem), and

	  SLPI (Sensor Low Power Island).

	  Say y here to support the TrustZone based Peripheral Image Loader for

	  the Qualcomm remote processors. This is commonly used to control

	  subsystems such as ADSP (Audio DSP), CDSP (Compute DSP), MPSS (Modem

	  Peripheral SubSystem), and SLPI (Sensor Low Power Island).



config QCOM_Q6V5_WCSS

	tristate "Qualcomm Hexagon based WCSS Peripheral Image Loader"

drivers/remoteproc/omap_remoteproc.c

+1 −1
Original line number Diff line number Diff line
@@ -1211,7 +1211,7 @@ static int omap_rproc_of_get_internal_memories(struct platform_device *pdev, 
		oproc->mem[i].dev_addr = data->mems[i].dev_addr;

		oproc->mem[i].size = resource_size(res);



		dev_dbg(dev, "memory %8s: bus addr %pa size 0x%x va %pK da 0x%x\n",

		dev_dbg(dev, "memory %8s: bus addr %pa size 0x%x va %p da 0x%x\n",

			data->mems[i].name, &oproc->mem[i].bus_addr,

			oproc->mem[i].size, oproc->mem[i].cpu_addr,

			oproc->mem[i].dev_addr);

drivers/remoteproc/pru_rproc.c

+1 −1
Original line number Diff line number Diff line
@@ -1055,7 +1055,7 @@ static int pru_rproc_probe(struct platform_device *pdev) 
		pru->mem_regions[i].pa = res->start;

		pru->mem_regions[i].size = resource_size(res);



		dev_dbg(dev, "memory %8s: pa %pa size 0x%zx va %pK\n",

		dev_dbg(dev, "memory %8s: pa %pa size 0x%zx va %p\n",

			mem_names[i], &pru->mem_regions[i].pa,

			pru->mem_regions[i].size, pru->mem_regions[i].va);

	}