[PATCH 2.6.17-rc3] platform_bus learns about modalias

[PATCH 2.6.17-rc3] platform_bus learns about modalias

[David Brownell]

[-- Attachment #1: Type: text/plain, Size: 115 bytes --]

This is one of the most significant busses not to support the $MODALIAS
and /sys/devices/.../modalias conventions.

[-- Attachment #2: plat.patch --]
[-- Type: text/x-diff, Size: 1924 bytes --]

This patch adds modalias support to platform devices, for simpler
hotplug/coldplug driven driver setup.

Signed-off-by: David Brownell <dbrownell@users.sourceforge.net>

Index: g26/drivers/base/platform.c
===================================================================
--- g26.orig/drivers/base/platform.c	2006-04-30 19:25:25.000000000 -0700
+++ g26/drivers/base/platform.c	2006-05-01 10:30:54.000000000 -0700
@@ -452,6 +452,40 @@ void platform_driver_unregister(struct p
 EXPORT_SYMBOL_GPL(platform_driver_unregister);
 
 
+/* modalias support enables more hands-off userspace setup:
+ * (a) environment variable lets new-style hotplug events work once system is
+ *     fully running:  "modprobe $MODALIAS"
+ * (b) sysfs attribute lets new-style coldplug recover from hotplug events
+ *     mishandled before system is fully running:  "modprobe $(cat modalias)"
+ */
+static ssize_t
+modalias_show(struct device *dev, struct device_attribute *a, char *buf)
+{
+	struct platform_device	*pdev = to_platform_device(dev);
+	unsigned		len = strlen(pdev->name);
+
+	len = min(len, (size_t)(PAGE_SIZE - 1));
+	memcpy(buf, pdev->name, len);
+	buf[PAGE_SIZE - 1] = 0;
+	return len;
+}
+
+static struct device_attribute platform_dev_attrs[] = {
+	__ATTR_RO(modalias),
+	__ATTR_NULL,
+};
+
+static int platform_uevent(struct device *dev, char **envp, int num_envp,
+		char *buffer, int buffer_size)
+{
+	struct platform_device	*pdev = to_platform_device(dev);
+
+	envp[0] = buffer;
+	snprintf(buffer, buffer_size, "MODALIAS=%s", pdev->name);
+	return 0;
+}
+
+
 /**
  *	platform_match - bind platform device to platform driver.
  *	@dev:	device.
@@ -496,7 +530,9 @@ static int platform_resume(struct device
 
 struct bus_type platform_bus_type = {
 	.name		= "platform",
+	.dev_attrs	= platform_dev_attrs,
 	.match		= platform_match,
+	.uevent		= platform_uevent,
 	.suspend	= platform_suspend,
 	.resume		= platform_resume,
 };

patch platform_bus-learns-about-modalias.patch added to gregkh-2.6 tree

[gregkh]

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

     Subject: platform_bus learns about modalias

to my gregkh-2.6 tree.  Its filename is

     platform_bus-learns-about-modalias.patch

This tree can be found at 
    http://www.kernel.org/pub/linux/kernel/people/gregkh/gregkh-2.6/patches/


>From david-b@pacbell.net Mon May  1 14:05:05 2006
From: David Brownell <david-b@pacbell.net>
To: Greg KH <greg@kroah.com>
Subject: platform_bus learns about modalias
Date: Mon, 1 May 2006 11:16:01 -0700
Cc: Russell King <rmk@arm.linux.org.uk>,
 Linux Kernel list <linux-kernel@vger.kernel.org>
Message-Id: <200605011116.02250.david-b@pacbell.net>

This patch adds modalias support to platform devices, for simpler
hotplug/coldplug driven driver setup.

Signed-off-by: David Brownell <dbrownell@users.sourceforge.net>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

---
 drivers/base/platform.c |   36 ++++++++++++++++++++++++++++++++++++
 1 file changed, 36 insertions(+)

--- gregkh-2.6.orig/drivers/base/platform.c
+++ gregkh-2.6/drivers/base/platform.c
@@ -452,6 +452,40 @@ void platform_driver_unregister(struct p
 EXPORT_SYMBOL_GPL(platform_driver_unregister);
 
 
+/* modalias support enables more hands-off userspace setup:
+ * (a) environment variable lets new-style hotplug events work once system is
+ *     fully running:  "modprobe $MODALIAS"
+ * (b) sysfs attribute lets new-style coldplug recover from hotplug events
+ *     mishandled before system is fully running:  "modprobe $(cat modalias)"
+ */
+static ssize_t
+modalias_show(struct device *dev, struct device_attribute *a, char *buf)
+{
+	struct platform_device	*pdev = to_platform_device(dev);
+	unsigned		len = strlen(pdev->name);
+
+	len = min(len, (size_t)(PAGE_SIZE - 1));
+	memcpy(buf, pdev->name, len);
+	buf[PAGE_SIZE - 1] = 0;
+	return len;
+}
+
+static struct device_attribute platform_dev_attrs[] = {
+	__ATTR_RO(modalias),
+	__ATTR_NULL,
+};
+
+static int platform_uevent(struct device *dev, char **envp, int num_envp,
+		char *buffer, int buffer_size)
+{
+	struct platform_device	*pdev = to_platform_device(dev);
+
+	envp[0] = buffer;
+	snprintf(buffer, buffer_size, "MODALIAS=%s", pdev->name);
+	return 0;
+}
+
+
 /**
  *	platform_match - bind platform device to platform driver.
  *	@dev:	device.
@@ -496,7 +530,9 @@ static int platform_resume(struct device
 
 struct bus_type platform_bus_type = {
 	.name		= "platform",
+	.dev_attrs	= platform_dev_attrs,
 	.match		= platform_match,
+	.uevent		= platform_uevent,
 	.suspend	= platform_suspend,
 	.resume		= platform_resume,
 };


Patches currently in gregkh-2.6 which might be from david-b@pacbell.net are

driver/spi-add-david-as-the-spi-subsystem-maintainer.patch
driver/platform_bus-learns-about-modalias.patch
driver/spi-spi_bitbang-clocking-fixes.patch
driver/driver-core-config_debug_pm-covers-drivers-base-power-too.patch
driver/spi-busnum-0-needs-to-work.patch
driver/spi-devices-can-require-lsb-first-encodings.patch
driver/spi-renamed-bitbang_transfer_setup-to-spi_bitbang_setup_transfer-and-export-it.patch
driver/spi-spi-bounce-buffer-has-a-minimum-length.patch
driver/spi-spi-whitespace-fixes.patch
driver/spi-add-pxa2xx-ssp-spi-driver.patch
driver/spi-per-transfer-overrides-for-wordsize-and-clocking.patch
usb/usb-pegasus-fixes.patch
usb/usb-allow-multiple-types-of-ehci-controllers-to-be-built-as-modules.patch
usb/usb-fix-bug-in-ohci-hcd.c-ohci_restart.patch
usb/usb-usbcore-always-turn-on-hub-port-power.patch

Re: [PATCH 2.6.17-rc3] platform_bus learns about modalias

[David Brownell]

[-- Attachment #1: Type: text/plain, Size: 396 bytes --]

On Monday 01 May 2006 11:16 am, David Brownell wrote:
> This is one of the most significant busses not to support the $MODALIAS
> and /sys/devices/.../modalias conventions.

Here's a replacement patch, against RC5.  The modalias file itself
should have a newline termination, and on some platforms the min()
invocation caused compiler trouble (hence a build patch found in
the MM tree).

- Dave


[-- Attachment #2: plat.patch --]
[-- Type: text/x-diff, Size: 1882 bytes --]

This patch adds modalias support to platform devices, for simpler
hotplug/coldplug driven driver setup.

Signed-off-by: David Brownell <dbrownell@users.sourceforge.net>

Index: g26/drivers/base/platform.c
===================================================================
--- g26.orig/drivers/base/platform.c	2006-05-24 19:16:50.000000000 -0700
+++ g26/drivers/base/platform.c	2006-05-24 21:15:52.000000000 -0700
@@ -452,6 +452,37 @@ void platform_driver_unregister(struct p
 EXPORT_SYMBOL_GPL(platform_driver_unregister);
 
 
+/* modalias support enables more hands-off userspace setup:
+ * (a) environment variable lets new-style hotplug events work once system is
+ *     fully running:  "modprobe $MODALIAS"
+ * (b) sysfs attribute lets new-style coldplug recover from hotplug events
+ *     mishandled before system is fully running:  "modprobe $(cat modalias)"
+ */
+static ssize_t
+modalias_show(struct device *dev, struct device_attribute *a, char *buf)
+{
+	struct platform_device	*pdev = to_platform_device(dev);
+	int len = snprintf(buf, PAGE_SIZE, "%s\n", pdev->name);
+
+	return (len >= PAGE_SIZE) ? (PAGE_SIZE - 1) : len;
+}
+
+static struct device_attribute platform_dev_attrs[] = {
+	__ATTR_RO(modalias),
+	__ATTR_NULL,
+};
+
+static int platform_uevent(struct device *dev, char **envp, int num_envp,
+		char *buffer, int buffer_size)
+{
+	struct platform_device	*pdev = to_platform_device(dev);
+
+	envp[0] = buffer;
+	snprintf(buffer, buffer_size, "MODALIAS=%s", pdev->name);
+	return 0;
+}
+
+
 /**
  *	platform_match - bind platform device to platform driver.
  *	@dev:	device.
@@ -496,7 +527,9 @@ static int platform_resume(struct device
 
 struct bus_type platform_bus_type = {
 	.name		= "platform",
+	.dev_attrs	= platform_dev_attrs,
 	.match		= platform_match,
+	.uevent		= platform_uevent,
 	.suspend	= platform_suspend,
 	.resume		= platform_resume,
 };