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

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

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

Pull rpmsg updates from Bjorn Andersson:
 "This migrates rpmsg to use SPDX license headers and fixes a
  use-after-free in SMD"

* tag 'rpmsg-v4.18' of git://github.com/andersson/remoteproc:
  rpmsg: smd: do not use mananged resources for endpoints and channels
  rpmsg: char: Switch to SPDX license identifier
  rpmsg: glink: Switch to SPDX license identifier
  rpmsg: smd: Switch to SPDX license identifier
  rpmsg: virtio_rpmsg_bus: Switch to SPDX license identifier
  rpmsg: Switch to SPDX license identifier
  rpmsg: qcom_smd: Access APCS through mailbox framework
  rpmsg: Add driver_override device attribute for rpmsg_device
parents b70c9d37 4a2e84c6

Documentation/ABI/testing/sysfs-bus-rpmsg

+20 −0
Original line number Diff line number Diff line
@@ -73,3 +73,23 @@ Description: 
		This sysfs entry tells us whether the channel is a local

		server channel that is announced (values are either

		true or false).



What:		/sys/bus/rpmsg/devices/.../driver_override

Date:		April 2018

KernelVersion:	4.18

Contact:	Bjorn Andersson <bjorn.andersson@linaro.org>

Description:

		Every rpmsg device is a communication channel with a remote

		processor. Channels are identified by a textual name (see

		/sys/bus/rpmsg/devices/.../name above) and have a local

		("source") rpmsg address, and remote ("destination") rpmsg

		address.



		The listening entity (or client) which communicates with a

		remote processor is referred as rpmsg driver. The rpmsg device

		and rpmsg driver are matched based on rpmsg device name and

		rpmsg driver ID table.



		This sysfs entry allows the rpmsg driver for a rpmsg device

		to be specified which will override standard OF, ID table

		and name matching.

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

+7 −1
Original line number Diff line number Diff line
@@ -22,9 +22,15 @@ The edge is described by the following properties: 
	Definition: should specify the IRQ used by the remote processor to

		    signal this processor about communication related updates



- qcom,ipc:

- mboxes:

	Usage: required

	Value type: <prop-encoded-array>

	Definition: reference to the associated doorbell in APCS, as described

		    in mailbox/mailbox.txt



- qcom,ipc:

	Usage: required, unless mboxes is specified

	Value type: <prop-encoded-array>

	Definition: three entries specifying the outgoing ipc bit used for

		    signaling the remote processor:

		    - phandle to a syscon node representing the apcs registers

drivers/rpmsg/Kconfig

+3 −0
Original line number Diff line number Diff line 
# SPDX-License-Identifier: GPL-2.0



menu "Rpmsg drivers"



# RPMSG always gets selected by whoever wants it
@@ -39,6 +41,7 @@ config RPMSG_QCOM_GLINK_SMEM 


config RPMSG_QCOM_SMD

	tristate "Qualcomm Shared Memory Driver (SMD)"

	depends on MAILBOX

	depends on QCOM_SMEM

	select RPMSG

	help

drivers/rpmsg/qcom_glink_native.c

+1 −9
Original line number Diff line number Diff line 
// SPDX-License-Identifier: GPL-2.0

/*

 * Copyright (c) 2016-2017, Linaro Ltd

 *

 * This program is free software; you can redistribute it and/or modify

 * it under the terms of the GNU General Public License version 2 and

 * only version 2 as published by the Free Software Foundation.

 *

 * This program is distributed in the hope that it will be useful,

 * but WITHOUT ANY WARRANTY; without even the implied warranty of

 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the

 * GNU General Public License for more details.

 */



#include <linux/idr.h>

drivers/rpmsg/qcom_glink_native.h

+1 −9
Original line number Diff line number Diff line 
/* SPDX-License-Identifier: GPL-2.0 */

/*

 * Copyright (c) 2016-2017, Linaro Ltd

 *

 * This program is free software; you can redistribute it and/or modify

 * it under the terms of the GNU General Public License version 2 and

 * only version 2 as published by the Free Software Foundation.

 *

 * This program is distributed in the hope that it will be useful,

 * but WITHOUT ANY WARRANTY; without even the implied warranty of

 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the

 * GNU General Public License for more details.

 */



#ifndef __QCOM_GLINK_NATIVE_H__