Skip to contentSkip to conversation

rpmsg: Add driver_override device attribute for rpmsg_device

PATCH RESEND Superseded Anup Patel 2 participants 6 messages Jan 10, 2018 – Mar 21, 2018 Remote processor messaging (rpmsg)

v1 of 2 Superseded Latest is v2 →

lore
Share & tools
lore

Anup Patel

author
#0 lore raw

PATCH RESEND 1/1 rpmsg: Add driver_override device attribute for rpmsg_device

This patch adds "driver_override" device attribute for rpmsg_device which will allow users to explicitly specify the rpmsg_driver to be used via sysfs entry.

The "driver_override" device attribute implemented here is very similar to "driver_override" implemented for platform, pci, and amba bus types.

One important use-case of "driver_override" device attribute is to force use of rpmsg_chrdev driver for certain rpmsg_device instances.

---
 Documentation/ABI/testing/sysfs-bus-rpmsg | 20 ++++++++++++++
 drivers/rpmsg/rpmsg_core.c                | 46 +++++++++++++++++++++++++++++--
 2 files changed, 64 insertions(+), 2 deletions(-)
Documentation/ABI/testing/sysfs-bus-rpmsg +20 -0
index 189e419..1c8599e 100644
@@ -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:		January 2018
+KernelVersion:	4.16
+Contact:	Ohad Ben-Cohen <[email protected]>
+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.
drivers/rpmsg/rpmsg_core.c +44 -2

72 lines not on this page · raw message

Signature · 1 line
2.7.4
author
#1 lore raw
Quoted 124 lines · Anup Patel

This patch adds "driver_override" device attribute for rpmsg_device which will allow users to explicitly specify the rpmsg_driver to be used via sysfs entry.

The "driver_override" device attribute implemented here is very similar to "driver_override" implemented for platform, pci, and amba bus types.

One important use-case of "driver_override" device attribute is to force use of rpmsg_chrdev driver for certain rpmsg_device instances.

---
 Documentation/ABI/testing/sysfs-bus-rpmsg | 20 ++++++++++++++
 drivers/rpmsg/rpmsg_core.c                | 46 +++++++++++++++++++++++++++++--
 2 files changed, 64 insertions(+), 2 deletions(-)
Documentation/ABI/testing/sysfs-bus-rpmsg +20 -0
index 189e419..1c8599e 100644
@@ -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:          January 2018
+KernelVersion: 4.16
+Contact:       Ohad Ben-Cohen <[email protected]>
+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.
drivers/rpmsg/rpmsg_core.c +44 -3
index dffa3aa..9a25e42 100644
@@ -321,11 +321,11 @@ struct device *rpmsg_find_device(struct device *parent,
 }
 EXPORT_SYMBOL(rpmsg_find_device);
 
-/* sysfs show configuration fields */
+/* sysfs configuration fields */
 #define rpmsg_show_attr(field, path, format_string)                    \
 static ssize_t                                                         \
 field##_show(struct device *dev,                                       \
-                       struct device_attribute *attr, char *buf)       \
+            struct device_attribute *attr, char *buf)                  \
 {                                                                      \
        struct rpmsg_device *rpdev = to_rpmsg_device(dev);              \
                                                                        \
@@ -333,11 +333,52 @@ field##_show(struct device *dev,                                  \
 }                                                                      \
 static DEVICE_ATTR_RO(field);
 
+#define rpmsg_string_attr(field, path)                                 \
+static ssize_t                                                         \
+field##_store(struct device *dev,                                      \
+             struct device_attribute *attr, const char *buf, size_t sz)\
+{                                                                      \
+       struct rpmsg_device *rpdev = to_rpmsg_device(dev);              \
+       char *new, *old, *cp;                                           \
+                                                                       \
+       new = kstrndup(buf, sz, GFP_KERNEL);                            \
+       if (!new)                                                       \
+               return -ENOMEM;                                         \
+                                                                       \
+       cp = strchr(new, '\n');                                         \
+       if (cp)                                                         \
+               *cp = '\0';                                             \
+                                                                       \
+       device_lock(dev);                                               \
+       old = rpdev->path;                                              \
+       if (strlen(new)) {                                              \
+               rpdev->path = new;                                      \
+       } else {                                                        \
+               kfree(new);                                             \
+               rpdev->path = NULL;                                     \
+       }                                                               \
+       device_unlock(dev);                                             \
+                                                                       \
+       kfree(old);                                                     \
+                                                                       \
+       return sz;                                                      \
+}                                                                      \
+static ssize_t                                                         \
+field##_show(struct device *dev,                                       \
+            struct device_attribute *attr, char *buf)                  \
+{                                                                      \
+       struct rpmsg_device *rpdev = to_rpmsg_device(dev);              \
+                                                                       \
+       return sprintf(buf, "%s\n", rpdev->path);                       \
+}                                                                      \
+static DEVICE_ATTR_RW(field)
+
 /* for more info, see Documentation/ABI/testing/sysfs-bus-rpmsg */
 rpmsg_show_attr(name, id.name, "%s\n");
 rpmsg_show_attr(src, src, "0x%x\n");
 rpmsg_show_attr(dst, dst, "0x%x\n");
 rpmsg_show_attr(announce, announce ? "true" : "false", "%s\n");
+rpmsg_string_attr(driver_override, driver_override);
 
 static ssize_t modalias_show(struct device *dev,
                             struct device_attribute *attr, char *buf)
@@ -359,6 +400,7 @@ static struct attribute *rpmsg_dev_attrs[] = {
        &dev_attr_dst.attr,
        &dev_attr_src.attr,
        &dev_attr_announce.attr,
+       &dev_attr_driver_override.attr,
        NULL,
 };
 ATTRIBUTE_GROUPS(rpmsg_dev);
--
Quoted 2 lines

2.7.4

Hi All,

Any comments on this??

Regards,
Anup

author
#3 lore raw
In reply to Anup Patel
Quoted 124 lines · Anup Patel

This patch adds "driver_override" device attribute for rpmsg_device which will allow users to explicitly specify the rpmsg_driver to be used via sysfs entry.

The "driver_override" device attribute implemented here is very similar to "driver_override" implemented for platform, pci, and amba bus types.

One important use-case of "driver_override" device attribute is to force use of rpmsg_chrdev driver for certain rpmsg_device instances.

---
 Documentation/ABI/testing/sysfs-bus-rpmsg | 20 ++++++++++++++
 drivers/rpmsg/rpmsg_core.c                | 46 +++++++++++++++++++++++++++++--
 2 files changed, 64 insertions(+), 2 deletions(-)
Documentation/ABI/testing/sysfs-bus-rpmsg +20 -0
index 189e419..1c8599e 100644
@@ -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:          January 2018
+KernelVersion: 4.16
+Contact:       Ohad Ben-Cohen <[email protected]>
+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.
drivers/rpmsg/rpmsg_core.c +44 -3
index dffa3aa..9a25e42 100644
@@ -321,11 +321,11 @@ struct device *rpmsg_find_device(struct device *parent,
 }
 EXPORT_SYMBOL(rpmsg_find_device);
 
-/* sysfs show configuration fields */
+/* sysfs configuration fields */
 #define rpmsg_show_attr(field, path, format_string)                    \
 static ssize_t                                                         \
 field##_show(struct device *dev,                                       \
-                       struct device_attribute *attr, char *buf)       \
+            struct device_attribute *attr, char *buf)                  \
 {                                                                      \
        struct rpmsg_device *rpdev = to_rpmsg_device(dev);              \
                                                                        \
@@ -333,11 +333,52 @@ field##_show(struct device *dev,                                  \
 }                                                                      \
 static DEVICE_ATTR_RO(field);
 
+#define rpmsg_string_attr(field, path)                                 \
+static ssize_t                                                         \
+field##_store(struct device *dev,                                      \
+             struct device_attribute *attr, const char *buf, size_t sz)\
+{                                                                      \
+       struct rpmsg_device *rpdev = to_rpmsg_device(dev);              \
+       char *new, *old, *cp;                                           \
+                                                                       \
+       new = kstrndup(buf, sz, GFP_KERNEL);                            \
+       if (!new)                                                       \
+               return -ENOMEM;                                         \
+                                                                       \
+       cp = strchr(new, '\n');                                         \
+       if (cp)                                                         \
+               *cp = '\0';                                             \
+                                                                       \
+       device_lock(dev);                                               \
+       old = rpdev->path;                                              \
+       if (strlen(new)) {                                              \
+               rpdev->path = new;                                      \
+       } else {                                                        \
+               kfree(new);                                             \
+               rpdev->path = NULL;                                     \
+       }                                                               \
+       device_unlock(dev);                                             \
+                                                                       \
+       kfree(old);                                                     \
+                                                                       \
+       return sz;                                                      \
+}                                                                      \
+static ssize_t                                                         \
+field##_show(struct device *dev,                                       \
+            struct device_attribute *attr, char *buf)                  \
+{                                                                      \
+       struct rpmsg_device *rpdev = to_rpmsg_device(dev);              \
+                                                                       \
+       return sprintf(buf, "%s\n", rpdev->path);                       \
+}                                                                      \
+static DEVICE_ATTR_RW(field)
+
 /* for more info, see Documentation/ABI/testing/sysfs-bus-rpmsg */
 rpmsg_show_attr(name, id.name, "%s\n");
 rpmsg_show_attr(src, src, "0x%x\n");
 rpmsg_show_attr(dst, dst, "0x%x\n");
 rpmsg_show_attr(announce, announce ? "true" : "false", "%s\n");
+rpmsg_string_attr(driver_override, driver_override);
 
 static ssize_t modalias_show(struct device *dev,
                             struct device_attribute *attr, char *buf)
@@ -359,6 +400,7 @@ static struct attribute *rpmsg_dev_attrs[] = {
        &dev_attr_dst.attr,
        &dev_attr_src.attr,
        &dev_attr_announce.attr,
+       &dev_attr_driver_override.attr,
        NULL,
 };
 ATTRIBUTE_GROUPS(rpmsg_dev);
--
Quoted 2 lines

2.7.4

Hi Bjorn,

Can you please review this patch?

Regards,
Anup

#4 lore raw
In reply to Anup Patel
Quoted 10 lines · Anup Patel

This patch adds "driver_override" device attribute for rpmsg_device which will allow users to explicitly specify the rpmsg_driver to be used via sysfs entry.

The "driver_override" device attribute implemented here is very similar to "driver_override" implemented for platform, pci, and amba bus types.

One important use-case of "driver_override" device attribute is to force use of rpmsg_chrdev driver for certain rpmsg_device instances.

I assume you mean specifically for the case where you want to prevent some kernel driver to probe for some given channel?

The intention with rpmsg_char is that you through the rpmsg_ctrlX interface create and destroy endpoints dynamically, so you wouldn't need to use this mechanism to bind some specific channel to rpmsg_char.

That said, this does make sense for completeness sake.

[..]

Quoted 5 lines
drivers/rpmsg/rpmsg_core.c +0 -0
index dffa3aa..9a25e42 100644

drivers/rpmsg/rpmsg_core.c struct device *rpmsg_find_device(struct device *parent, · line 328

Quoted 10 lines
drivers/rpmsg/rpmsg_core.c +2 -2
@@ -321,11 +321,11 @@ struct device *rpmsg_find_device(struct device *parent,
 }
 EXPORT_SYMBOL(rpmsg_find_device);
 
-/* sysfs show configuration fields */
+/* sysfs configuration fields */
 #define rpmsg_show_attr(field, path, format_string)			\
 static ssize_t								\
 field##_show(struct device *dev,					\
-			struct device_attribute *attr, char *buf)	\
+	     struct device_attribute *attr, char *buf)			\

Seems unnecessary.

drivers/rpmsg/rpmsg_core.c field##_show(struct device *dev, \ · line 336

Quoted 8 lines
drivers/rpmsg/rpmsg_core.c +1 -0
 {									\
 	struct rpmsg_device *rpdev = to_rpmsg_device(dev);		\
 									\
@@ -333,11 +333,52 @@ field##_show(struct device *dev,					\
 }									\
 static DEVICE_ATTR_RO(field);
 
+#define rpmsg_string_attr(field, path)					\

"path" is an odd name for these, I think it's a "member".

drivers/rpmsg/rpmsg_core.c field##_show(struct device *dev, \ · line 339

Quoted 3 lines
drivers/rpmsg/rpmsg_core.c +3 -0
+static ssize_t								\
+field##_store(struct device *dev,					\
+	      struct device_attribute *attr, const char *buf, size_t sz)\
field##_store(struct device *dev, struct device_attribute *attr, 	\
	      const char *buf, size_t sz)				\

Is prettier

drivers/rpmsg/rpmsg_core.c field##_show(struct device *dev, \ · line 350

Quoted 11 lines
drivers/rpmsg/rpmsg_core.c +11 -0
+{									\
+	struct rpmsg_device *rpdev = to_rpmsg_device(dev);		\
+	char *new, *old, *cp;						\
+									\
+	new = kstrndup(buf, sz, GFP_KERNEL);				\
+	if (!new)							\
+		return -ENOMEM;						\
+									\
+	cp = strchr(new, '\n');						\
+	if (cp)								\
+		*cp = '\0';						\

I prefer

	new[strcspn(new, "\n")] = '\0';

Regards,
Bjorn

author
#5 lore raw
Quoted 9 lines · Bjorn Andersson
Quoted 7 lines · Anup Patel

This patch adds "driver_override" device attribute for rpmsg_device which will allow users to explicitly specify the rpmsg_driver to be used via sysfs entry.

The "driver_override" device attribute implemented here is very similar to "driver_override" implemented for platform, pci, and amba bus types.

Quoted 6 lines
Quoted 3 lines

One important use-case of "driver_override" device attribute is to force use of rpmsg_chrdev driver for certain rpmsg_device instances.

I assume you mean specifically for the case where you want to prevent some kernel driver to probe for some given channel?

Yes, there are few use-cases where we want to prevent kernel driver and rather access rpmsg device from user-space using rpmsg_chrdev driver.

Quoted 17 lines

The intention with rpmsg_char is that you through the rpmsg_ctrlX interface create and destroy endpoints dynamically, so you wouldn't need to use this mechanism to bind some specific channel to rpmsg_char.

That said, this does make sense for completeness sake.

[..]

Quoted 8 lines
drivers/rpmsg/rpmsg_core.c +0 -0
index dffa3aa..9a25e42 100644
@@ -321,11 +321,11 @@ struct device *rpmsg_find_device(struct device *parent,
 }
 EXPORT_SYMBOL(rpmsg_find_device);
 
Quoted 9 lines

drivers/rpmsg/rpmsg_core.c struct device *rpmsg_find_device(struct device *parent, · line 328

Quoted 7 lines
drivers/rpmsg/rpmsg_core.c +2 -2
-/* sysfs show configuration fields */
+/* sysfs configuration fields */
 #define rpmsg_show_attr(field, path, format_string)                  \
 static ssize_t                                                               \
 field##_show(struct device *dev,                                     \
-                     struct device_attribute *attr, char *buf)       \
+          struct device_attribute *attr, char *buf)                  \

Seems unnecessary.

OK, I will drop these changes.

Quoted 12 lines

drivers/rpmsg/rpmsg_core.c field##_show(struct device *dev, \ · line 336

Quoted 9 lines
drivers/rpmsg/rpmsg_core.c +1 -0
 {                                                                    \
      struct rpmsg_device *rpdev = to_rpmsg_device(dev);              \
                                                                      \
@@ -333,11 +333,52 @@ field##_show(struct device *dev,                                        \
 }                                                                    \
 static DEVICE_ATTR_RO(field);
 
+#define rpmsg_string_attr(field, path)                                       \

"path" is an odd name for these, I think it's a "member".

Quoted 8 lines

drivers/rpmsg/rpmsg_core.c field##_show(struct device *dev, \ · line 339

Quoted 3 lines
drivers/rpmsg/rpmsg_core.c +3 -0
+static ssize_t                                                               \
+field##_store(struct device *dev,                                    \
+           struct device_attribute *attr, const char *buf, size_t sz)\
field##_store(struct device *dev, struct device_attribute *attr,        \
              const char *buf, size_t sz)                               \

Is prettier

OK, I will update this.

Quoted 13 lines

drivers/rpmsg/rpmsg_core.c field##_show(struct device *dev, \ · line 350

Quoted 12 lines
drivers/rpmsg/rpmsg_core.c +11 -0
+{                                                                    \
+     struct rpmsg_device *rpdev = to_rpmsg_device(dev);              \
+     char *new, *old, *cp;                                           \
+                                                                     \
+     new = kstrndup(buf, sz, GFP_KERNEL);                            \
+     if (!new)                                                       \
+             return -ENOMEM;                                         \
+                                                                     \
+     cp = strchr(new, '\n');                                         \
+     if (cp)                                                         \
+             *cp = '\0';                                             \
Quoted 3 lines

I prefer

        new[strcspn(new, "\n")] = '\0';

Sure, I will update this.

Thanks,
Anup