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

Merge tag 'rproc-v5.3' of git://github.com/andersson/remoteproc

Pull remoteproc updates from Bjorn Andersson:
 "This adds support for the STM32 remoteproc, additional i.MX platforms
  with Cortex M4 remoteprocs and Qualcomm's QCS404 Compute DSP.

  Also initial support for vendor specific resource table entries and
  support for unprocessed Qualcomm firmware files"

* tag 'rproc-v5.3' of git://github.com/andersson/remoteproc:
  remoteproc: stm32: fix building without ARM SMCC
  remoteproc: qcom: q6v5-mss: Fix build error without QCOM_MDT_LOADER
  remoteproc: copy parent dma_pfn_offset for vdev
  remoteproc: qcom: q6v5-mss: Support loading non-split images
  soc: qcom: mdt_loader: Support loading non-split images
  remoteproc: stm32: add an ST stm32_rproc driver
  dt-bindings: remoteproc: add bindings for stm32 remote processor driver
  dt-bindings: stm32: add bindings for ML-AHB interconnect
  remoteproc: Use struct_size() helper
  remoteproc: add vendor resources handling
  remoteproc: imx: Fix typo in "failed"
  remoteproc: imx: Broaden the Kconfig selection logic
  remoteproc,rpmsg: add missing MAINTAINERS file entries
  remoteproc: qcom: qdsp6-adsp: Add support for QCS404 CDSP
  dt-bindings: remoteproc: Rename and amend Hexagon v56 binding
parents 7636b758 93f1d3e4
Loading
Loading
Loading
Loading
+37 −0
Original line number Diff line number Diff line
ML-AHB interconnect bindings

These bindings describe the STM32 SoCs ML-AHB interconnect bus which connects
a Cortex-M subsystem with dedicated memories.
The MCU SRAM and RETRAM memory parts can be accessed through different addresses
(see "RAM aliases" in [1]) using different buses (see [2]) : balancing the
Cortex-M firmware accesses among those ports allows to tune the system
performance.

[1]: https://www.st.com/resource/en/reference_manual/dm00327659.pdf
[2]: https://wiki.st.com/stm32mpu/wiki/STM32MP15_RAM_mapping

Required properties:
- compatible: should be "simple-bus"
- dma-ranges: describes memory addresses translation between the local CPU and
	   the remote Cortex-M processor. Each memory region, is declared with
	   3 parameters:
		 - param 1: device base address (Cortex-M processor address)
		 - param 2: physical base address (local CPU address)
		 - param 3: size of the memory region.

The Cortex-M remote processor accessed via the mlahb interconnect is described
by a child node.

Example:
mlahb {
	compatible = "simple-bus";
	#address-cells = <1>;
	#size-cells = <1>;
	dma-ranges = <0x00000000 0x38000000 0x10000>,
		     <0x10000000 0x10000000 0x60000>,
		     <0x30000000 0x30000000 0x60000>;

	m4_rproc: m4@10000000 {
		...
	};
};
+25 −10
Original line number Diff line number Diff line
Qualcomm Technology Inc. ADSP Peripheral Image Loader
Qualcomm Technology Inc. Hexagon v56 Peripheral Image Loader

This document defines the binding for a component that loads and boots firmware
on the Qualcomm Technology Inc. ADSP Hexagon core.
on the Qualcomm Technology Inc. Hexagon v56 core.

- compatible:
	Usage: required
	Value type: <string>
	Definition: must be one of:
		    "qcom,qcs404-cdsp-pil",
		    "qcom,sdm845-adsp-pil"

- reg:
@@ -28,10 +29,11 @@ on the Qualcomm Technology Inc. ADSP Hexagon core.
- clocks:
	Usage: required
	Value type: <prop-encoded-array>
	Definition:  List of 8 phandle and clock specifier pairs for the adsp.
	Definition:  List of phandles and clock specifier pairs for the Hexagon,
		     per clock-names below.

- clock-names:
	Usage: required
	Usage: required for SDM845 ADSP
	Value type: <stringlist>
	Definition: List of clock input name strings sorted in the same
		    order as the clocks property. Definition must have
@@ -39,6 +41,14 @@ on the Qualcomm Technology Inc. ADSP Hexagon core.
		    "lpass_ahbm_aon_cbcr", "qdsp6ss_xo", "qdsp6ss_sleep"
		    and "qdsp6ss_core".

- clock-names:
	Usage: required for QCS404 CDSP
	Value type: <stringlist>
	Definition: List of clock input name strings sorted in the same
		    order as the clocks property. Definition must have
		    "xo", "sway", "tbu", "bimc", "ahb_aon", "q6ss_slave",
		    "q6ss_master", "q6_axim".

- power-domains:
	Usage: required
	Value type: <phandle>
@@ -47,28 +57,33 @@ on the Qualcomm Technology Inc. ADSP Hexagon core.
- resets:
	Usage: required
	Value type: <phandle>
	Definition: reference to the list of 2 reset-controller for the adsp.
	Definition: reference to the list of resets for the Hexagon.

- reset-names:
        Usage: required
        Usage: required for SDM845 ADSP
        Value type: <stringlist>
        Definition: must be "pdc_sync" and "cc_lpass"

- reset-names:
        Usage: required for QCS404 CDSP
        Value type: <stringlist>
        Definition: must be "restart"

- qcom,halt-regs:
	Usage: required
	Value type: <prop-encoded-array>
	Definition: a phandle reference to a syscon representing TCSR followed
			by the offset within syscon for lpass halt register.
		    by the offset within syscon for Hexagon halt register.

- memory-region:
	Usage: required
	Value type: <phandle>
	Definition: reference to the reserved-memory for the ADSP
	Definition: reference to the reserved-memory for the firmware

- qcom,smem-states:
	Usage: required
	Value type: <phandle>
	Definition: reference to the smem state for requesting the ADSP to
	Definition: reference to the smem state for requesting the Hexagon to
		    shut down

- qcom,smem-state-names:
@@ -79,7 +94,7 @@ on the Qualcomm Technology Inc. ADSP Hexagon core.

= SUBNODES
The adsp node may have an subnode named "glink-edge" that describes the
communication edge, channels and devices related to the ADSP.
communication edge, channels and devices related to the Hexagon.
See ../soc/qcom/qcom,glink.txt for details on how to describe these.

= EXAMPLE
+63 −0
Original line number Diff line number Diff line
STMicroelectronics STM32 Remoteproc
-----------------------------------
This document defines the binding for the remoteproc component that loads and
boots firmwares on the ST32MP family chipset.

Required properties:
- compatible:	Must be "st,stm32mp1-m4"
- reg:		Address ranges of the RETRAM and MCU SRAM memories used by the
		remote processor.
- resets:	Reference to a reset controller asserting the remote processor.
- st,syscfg-holdboot: Reference to the system configuration which holds the
		remote processor reset hold boot
	1st cell: phandle of syscon block
	2nd cell: register offset containing the hold boot setting
	3rd cell: register bitmask for the hold boot field
- st,syscfg-tz: Reference to the system configuration which holds the RCC trust
		zone mode
	1st cell: phandle to syscon block
	2nd cell: register offset containing the RCC trust zone mode setting
	3rd cell: register bitmask for the RCC trust zone mode bit

Optional properties:
- interrupts:	Should contain the watchdog interrupt
- mboxes:	This property is required only if the rpmsg/virtio functionality
		is used. List of phandle and mailbox channel specifiers:
		- a channel (a) used to communicate through virtqueues with the
		  remote proc.
		  Bi-directional channel:
		      - from local to remote = send message
		      - from remote to local = send message ack
		- a channel (b) working the opposite direction of channel (a)
		- a channel (c) used by the local proc to notify the remote proc
		  that it is about to be shut down.
		  Unidirectional channel:
		      - from local to remote, where ACK from the remote means
		        that it is ready for shutdown
- mbox-names:	This property is required if the mboxes property is used.
		- must be "vq0" for channel (a)
		- must be "vq1" for channel (b)
		- must be "shutdown" for channel (c)
- memory-region: List of phandles to the reserved memory regions associated with
		the remoteproc device. This is variable and describes the
		memories shared with the remote processor (eg: remoteproc
		firmware and carveouts, rpmsg vrings, ...).
		(see ../reserved-memory/reserved-memory.txt)
- st,syscfg-pdds: Reference to the system configuration which holds the remote
		processor deep sleep setting
	1st cell: phandle to syscon block
	2nd cell: register offset containing the deep sleep setting
	3rd cell: register bitmask for the deep sleep bit
- st,auto-boot:	If defined, when remoteproc is probed, it loads the default
		firmware and starts the remote processor.

Example:
	m4_rproc: m4@10000000 {
		compatible = "st,stm32mp1-m4";
		reg = <0x10000000 0x40000>,
		      <0x30000000 0x40000>,
		      <0x38000000 0x10000>;
		resets = <&rcc MCU_R>;
		st,syscfg-holdboot = <&rcc 0x10C 0x1>;
		st,syscfg-tz = <&rcc 0x000 0x1>;
	};
+9 −5
Original line number Diff line number Diff line
@@ -314,6 +314,8 @@ Here are the various resource types that are currently supported::
   * @RSC_VDEV:       declare support for a virtio device, and serve as its
   *		    virtio header.
   * @RSC_LAST:       just keep this one at the end
   * @RSC_VENDOR_START:	start of the vendor specific resource types range
   * @RSC_VENDOR_END:	end of the vendor specific resource types range
   *
   * Please note that these values are used as indices to the rproc_handle_rsc
   * lookup table, so please keep them sane. Moreover, @RSC_LAST is used to
@@ -326,6 +328,8 @@ Here are the various resource types that are currently supported::
	RSC_TRACE		= 2,
	RSC_VDEV		= 3,
	RSC_LAST		= 4,
	RSC_VENDOR_START	= 128,
	RSC_VENDOR_END		= 512,
  };

For more details regarding a specific resource type, please see its
+5 −0
Original line number Diff line number Diff line
@@ -13590,9 +13590,11 @@ L: linux-remoteproc@vger.kernel.org
T:	git git://git.kernel.org/pub/scm/linux/kernel/git/ohad/remoteproc.git
S:	Maintained
F:	Documentation/devicetree/bindings/remoteproc/
F:	Documentation/ABI/testing/sysfs-class-remoteproc
F:	Documentation/remoteproc.txt
F:	drivers/remoteproc/
F:	include/linux/remoteproc.h
F:	include/linux/remoteproc/

REMOTE PROCESSOR MESSAGING (RPMSG) SUBSYSTEM
M:	Ohad Ben-Cohen <ohad@wizery.com>
@@ -13602,8 +13604,11 @@ T: git git://git.kernel.org/pub/scm/linux/kernel/git/ohad/rpmsg.git
S:	Maintained
F:	drivers/rpmsg/
F:	Documentation/rpmsg.txt
F:	Documentation/ABI/testing/sysfs-bus-rpmsg
F:	include/linux/rpmsg.h
F:	include/linux/rpmsg/
F:	include/uapi/linux/rpmsg.h
F:	samples/rpmsg/

RENESAS CLOCK DRIVERS
M:	Geert Uytterhoeven <geert+renesas@glider.be>
Loading