lkml.org 
[lkml]   [2019]   [Sep]   [27]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
Patch in this message
/
From
Subject[PATCH] powerpc/vio: use simple dummy struct device as bus parent
Date
The dummy vio_bus_device creates the /sys/devices/vio directory, which
contains real vio devices under it; since it represents itself as having
a bus = &vio_bus_type, its /sys/devices/vio/uevent does call the bus's
.uevent function, vio_hotplug(), and as that function won't find a real
device for the dummy vio_dev, it will return -ENODEV.

One of the main users of the uevent node is udevadm, e.g. when it is called
with 'udevadm trigger --devices'. Up until recently, it would ignore any
errors returned when writing to devices' uevent file, but it was recently
changed to start returning error if it gets an error writing to any uevent
file:
https://github.com/systemd/systemd/commit/97afc0351a96e0daa83964df33937967c75c644f

since the /sys/devices/vio/uevent file has always returned ENODEV from
any write to it, this now causes the udevadm trigger command to return
an error. This may be fixed in udevadm to ignore ENODEV errors, but the
vio driver should still be fixed.

This patch changes the arch/powerpc/platform/pseries/vio.c 'dummy'
parent device into a real dummy device with no .bus, so its uevent
file will stop returning ENODEV and simply do nothing and return 0.

Signed-off-by: Dan Streetman <ddstreet@canonical.com>
---
arch/powerpc/platforms/pseries/vio.c | 11 ++++-------
1 file changed, 4 insertions(+), 7 deletions(-)

diff --git a/arch/powerpc/platforms/pseries/vio.c b/arch/powerpc/platforms/pseries/vio.c
index 79e2287991db..63bc16631680 100644
--- a/arch/powerpc/platforms/pseries/vio.c
+++ b/arch/powerpc/platforms/pseries/vio.c
@@ -32,11 +32,8 @@
#include <asm/page.h>
#include <asm/hvcall.h>

-static struct vio_dev vio_bus_device = { /* fake "parent" device */
- .name = "vio",
- .type = "",
- .dev.init_name = "vio",
- .dev.bus = &vio_bus_type,
+static struct device vio_bus = {
+ .init_name = "vio",
};

#ifdef CONFIG_PPC_SMLPAR
@@ -1412,7 +1409,7 @@ struct vio_dev *vio_register_device_node(struct device_node *of_node)
set_dev_node(&viodev->dev, of_node_to_nid(of_node));

/* init generic 'struct device' fields: */
- viodev->dev.parent = &vio_bus_device.dev;
+ viodev->dev.parent = &vio_bus;
viodev->dev.bus = &vio_bus_type;
viodev->dev.release = vio_dev_release;

@@ -1499,7 +1496,7 @@ static int __init vio_bus_init(void)
* The fake parent of all vio devices, just to give us
* a nice directory
*/
- err = device_register(&vio_bus_device.dev);
+ err = device_register(&vio_bus);
if (err) {
printk(KERN_WARNING "%s: device_register returned %i\n",
__func__, err);
--
2.20.1
\
 
 \ /
  Last update: 2019-09-27 15:05    [W:0.058 / U:5.632 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site