Skip to contentSkip to conversation

Patch "rpmsg: virtio_rpmsg_bus: fix channel creation" has been added to the 4.9-stable tree

PATCH [email protected] 1 participant 1 message Jan 23, 2017

Subsystems (2)
lore
Share & tools
lore

[email protected]

author maintainer Applied
#0 lore raw

This is a note to let you know that I've just added the patch titled

rpmsg: virtio_rpmsg_bus: fix channel creation

to the 4.9-stable tree which can be found at:
http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary

The filename of the patch is:
rpmsg-virtio_rpmsg_bus-fix-channel-creation.patch
and it can be found in the queue-4.9 subdirectory.

If you, or anyone else, feels it should not be added to the stable tree, please let <[email protected]> know about it.

Quoted 1 line

From 63447646ac657fde00bb658ce21a3431940ae0ad Mon Sep 17 00:00:00 2001

From: Loic Pallardy <[email protected]>
Date: Thu, 15 Dec 2016 15:49:56 +0100
Subject: rpmsg: virtio_rpmsg_bus: fix channel creation

From: Loic Pallardy <[email protected]>

commit 63447646ac657fde00bb658ce21a3431940ae0ad upstream.

Since commit 4dffed5b3ac796b ("rpmsg: Name rpmsg devices based on channel id"), it is no more possible for a firmware to register twice a service (on different endpoints). rpmsg_register_device function is failing when calling device_add for the second time as second device has the same name as first one already register.
It is because name is based only on service name and so is not more unique. Previously name was unique thanks to the use of rpmsg_dev_index.

This patch adds destination and source endpoint numbers device name to create an unique identifier.

Fixes 4dffed5b3ac7 ("rpmsg: Name rpmsg devices based on channel id")
[bjorn: flipped name and address in device name]
---
 drivers/rpmsg/rpmsg_core.c |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/rpmsg/rpmsg_core.c +2 -2
@@ -411,8 +411,8 @@ int rpmsg_register_device(struct rpmsg_d
 	struct device *dev = &rpdev->dev;
 	int ret;
 
-	dev_set_name(&rpdev->dev, "%s:%s",
-		     dev_name(dev->parent), rpdev->id.name);
+	dev_set_name(&rpdev->dev, "%s.%s.%d.%d", dev_name(dev->parent),
+		     rpdev->id.name, rpdev->src, rpdev->dst);
 
 	rpdev->dev.bus = &rpmsg_bus;
 	rpdev->dev.release = rpmsg_release_device;

Patches currently in stable-queue which might be from [email protected] are

queue-4.9/rpmsg-virtio_rpmsg_bus-fix-channel-creation.patch