Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 7151202b authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'rpmsg-v4.14' of git://github.com/andersson/remoteproc 

Pull rpmsg updates from Bjorn Andersson:
 "This extends the Qualcomm GLINK implementation to support the
  additional features used for communicating with modem and DSP
  coprocessors in modern Qualcomm platforms.

  In addition to this there's support for placing virtio RPMSG buffers
  in non-System RAM"

* tag 'rpmsg-v4.14' of git://github.com/andersson/remoteproc: (29 commits)
  rpmsg: glink: initialize ret to zero to ensure error status check is correct
  rpmsg: glink: fix null pointer dereference on a null intent
  dt-bindings: soc: qcom: Extend GLINK to cover SMEM
  remoteproc: qcom: adsp: Allow defining GLINK edge
  rpmsg: glink: Export symbols from common code
  rpmsg: glink: Release idr lock before returning on error
  rpmsg: glink: Handle remote rx done command
  rpmsg: glink: Request for intents when unavailable
  rpmsg: glink: Use the intents passed by remote
  rpmsg: glink: Receive and store the remote intent buffers
  rpmsg: glink: Add announce_create ops and preallocate intents
  rpmsg: glink: Add rx done command
  rpmsg: glink: Make RX FIFO peak accessor to take an offset
  rpmsg: glink: Use the local intents when receiving data
  rpmsg: glink: Add support for TX intents
  rpmsg: glink: Fix idr_lock from mutex to spinlock
  rpmsg: glink: Add support for transport version negotiation
  rpmsg: glink: Introduce glink smem based transport
  rpmsg: glink: Do a mbox_free_channel in remove
  rpmsg: glink: Return -EAGAIN when there is no FIFO space
  ...
parents d7efc352 ed43d098

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

+4 −3
Original line number Diff line number Diff line
@@ -63,9 +63,10 @@ on the Qualcomm ADSP Hexagon core. 




= SUBNODES

The adsp node may have an subnode named "smd-edge" that describes the SMD edge,

channels and devices related to the ADSP.  See ../soc/qcom/qcom,smd.txt for

details on how to describe the SMD edge.

The adsp node may have an subnode named either "smd-edge" or "glink-edge" that

describes the communication edge, channels and devices related to the ADSP.

See ../soc/qcom/qcom,smd.txt and ../soc/qcom/qcom,glink.txt for details on how

to describe these.





= EXAMPLE

Documentation/devicetree/bindings/remoteproc/qcom,q6v5.txt

+5 −0
Original line number Diff line number Diff line
@@ -90,6 +90,11 @@ the memory regions used by the Hexagon firmware. Each sub-node must contain: 
	Value type: <phandle>

	Definition: reference to the reserved-memory for the region



The Hexagon node may also have an subnode named either "smd-edge" or

"glink-edge" that describes the communication edge, channels and devices

related to the Hexagon.  See ../soc/qcom/qcom,smd.txt and

../soc/qcom/qcom,glink.txt for details on how to describe these.



= EXAMPLE

The following example describes the resources needed to boot control the

Hexagon, as it is found on MSM8974 boards.

Documentation/devicetree/bindings/soc/qcom/qcom,glink.txt

+7 −6
Original line number Diff line number Diff line 
Qualcomm RPM GLINK binding

Qualcomm GLINK edge binding



This binding describes the Qualcomm RPM GLINK, a fifo based mechanism for

communication with the Resource Power Management system on various Qualcomm

platforms.

This binding describes a Qualcomm GLINK edge, a fifo based mechanism for

communication between subsystem-pairs on various Qualcomm platforms. Two types

of edges can be described by the binding; the GLINK RPM edge and a SMEM based

edge.



- compatible:

	Usage: required

	Usage: required for glink-rpm

	Value type: <stringlist>

	Definition: must be "qcom,glink-rpm"
@@ -16,7 +17,7 @@ platforms. 
		    signal this processor about communication related events



- qcom,rpm-msg-ram:

	Usage: required

	Usage: required for glink-rpm

	Value type: <prop-encoded-array>

	Definition: handle to RPM message memory resource

drivers/remoteproc/Kconfig

+1 −0
Original line number Diff line number Diff line
@@ -92,6 +92,7 @@ config QCOM_ADSP_PIL 
	depends on OF && ARCH_QCOM

	depends on QCOM_SMEM

	depends on RPMSG_QCOM_SMD || (COMPILE_TEST && RPMSG_QCOM_SMD=n)

	depends on RPMSG_QCOM_GLINK_SMEM || RPMSG_QCOM_GLINK_SMEM=n

	select MFD_SYSCON

	select QCOM_MDT_LOADER

	select QCOM_RPROC_COMMON

drivers/remoteproc/qcom_adsp_pil.c

+3 −0
Original line number Diff line number Diff line
@@ -72,6 +72,7 @@ struct qcom_adsp { 
	void *mem_region;

	size_t mem_size;



	struct qcom_rproc_glink glink_subdev;

	struct qcom_rproc_subdev smd_subdev;

	struct qcom_rproc_ssr ssr_subdev;

};
@@ -400,6 +401,7 @@ static int adsp_probe(struct platform_device *pdev) 
		goto free_rproc;

	}



	qcom_add_glink_subdev(rproc, &adsp->glink_subdev);

	qcom_add_smd_subdev(rproc, &adsp->smd_subdev);

	qcom_add_ssr_subdev(rproc, &adsp->ssr_subdev, desc->ssr_name);
@@ -422,6 +424,7 @@ static int adsp_remove(struct platform_device *pdev) 
	qcom_smem_state_put(adsp->state);

	rproc_del(adsp->rproc);



	qcom_remove_glink_subdev(adsp->rproc, &adsp->glink_subdev);

	qcom_remove_smd_subdev(adsp->rproc, &adsp->smd_subdev);

	qcom_remove_ssr_subdev(adsp->rproc, &adsp->ssr_subdev);

	rproc_free(adsp->rproc);