uevents handler for macio & of_platform
Subsystems (2)
cover uevents handler for macio & of_platform
Hi Paul, Hi Ben, and Hi everyone ;)
This couple of patch is a rework of the uevent handler in macio and of_platform. For macio, it was present but not using the latest helper that makes the code more readable. The of_platform one is new (no uevent support in of_platform before) but is basically the same code as the macio one.
The of_platform one has been tested on Efika and enable module autoloading by udev. The macio patch is not tested. However, being based on the same code as the of_platform handler I would excpect it to be fine.
Sylvain
PS: The previous one I sent a few weeks back were buggy, theses are new ones ;)
PATCH 1/2 macintosh: tidy up uevent handler by using add_uevent_var
This add_uevent_var helper is specifically there for that task and that makes the code more readable.
--- drivers/macintosh/macio_asic.c | 92 +++++++++++++++------------------------- 1 files changed, 34 insertions(+), 58 deletions(-)
drivers/macintosh/macio_asic.c +34 -58
@@ -139,11 +139,12 @@ static int macio_uevent(struct device *d {struct macio_dev * macio_dev;struct of_device * of; -char *scratch; -const char *compat, *compat2; +const char *compat; +char *compat2; +char compat_buf[128 ];/* need to be size of 'compatible' */ int i =0 ; -int length, cplen, cplen2, seen =0 ; +int length =0 , cplen, sl, seen =0 ;if (!dev)return -ENODEV ;
@@ -155,75 +156,50 @@ static int macio_uevent(struct device *d of = &macio_dev->ofdev;/* stuff we want to pass to /sbin/hotplug */ - envp[i++] = scratch = buffer; - length =scnprintf (scratch, buffer_size,"OF_NAME=%s" , of->node->name); - ++length; - buffer_size -= length; -if ((buffer_size <=0 ) || (i >= num_envp)) +if (add_uevent_var (envp, num_envp, &i, + buffer, buffer_size, &length, +"OF_NAME=%s" , of->node->name))return -ENOMEM ; - scratch += length; - envp[i++] = scratch; - length =scnprintf (scratch, buffer_size,"OF_TYPE=%s" , of->node->type); - ++length; - buffer_size -= length; -if ((buffer_size <=0 ) || (i >= num_envp)) +if (add_uevent_var (envp, num_envp, &i, + buffer, buffer_size, &length, +"OF_TYPE=%s" , of->node->type))return -ENOMEM ; - scratch += length;/* Since the compatible field can contain pretty much anything * it's not really legal to split it out with commas. We split it * up using a number of environment variables instead. */ compat =get_property (of->node,"compatible" , &cplen); - compat2 = compat; - cplen2= cplen; -while (compat && cplen >0 ) { - envp[i++] = scratch; - length =scnprintf (scratch, buffer_size, -"OF_COMPATIBLE_%d=%s" , seen, compat); - ++length; - buffer_size -= length; -if ((buffer_size <=0 ) || (i >= num_envp)) + compat2 = compat_buf; +if (compat) +memcpy (compat2, compat, cplen); +while (compat && *compat && cplen >0 ) { +if (add_uevent_var (envp, num_envp, &i, + buffer, buffer_size, &length, +"OF_COMPATIBLE_%d=%s" , seen, compat))return -ENOMEM ; - scratch += length; - length =strlen (compat) +1 ; - compat += length; - cplen -= length; + + sl =strlen (compat) +1 ; + compat += sl; + compat2 += sl; + cplen -= sl; seen++; + compat2[-1 ] ='C' ; } + compat2[seen?-1 :0 ] =0 ; - envp[i++] = scratch; - length =scnprintf (scratch, buffer_size,"OF_COMPATIBLE_N=%d" , seen); - ++length; - buffer_size -= length; -if ((buffer_size <=0 ) || (i >= num_envp)) -return -ENOMEM ; - scratch += length; - - envp[i++] = scratch; - length =scnprintf (scratch, buffer_size,"MODALIAS=of:N%sT%s" , - of->node->name, of->node->type); -/* overwrite '\0' */ - buffer_size -= length; -if ((buffer_size <=0 ) || (i >= num_envp)) +if (add_uevent_var (envp, num_envp, &i, + buffer, buffer_size, &length, +"OF_COMPATIBLE_N=%d" , seen))return -ENOMEM ; - scratch += length; -if (!compat2) { - compat2 ="" ; - cplen2 =1 ; - } -while (cplen2 >0 ) { - length =snprintf (scratch, buffer_size,"C%s" , compat2); - buffer_size -= length; -if (buffer_size <=0 ) -return -ENOMEM ; - scratch += length; - length =strlen (compat2) +1 ; - compat2 += length; - cplen2 -= length; - } +if (add_uevent_var (envp, num_envp, &i, + buffer, buffer_size, &length, +"MODALIAS=of:N%sT%sC%s" , + of->node->name, of->node->type, + compat_buf)) +return -ENOMEM ; envp[i] =NULL ;
@@ -235,7 +211,7 @@ extern struct device_attribute macio_devstruct bus_type macio_bus_type = { .name ="macio" , .match = macio_bus_match, - .uevent = macio_uevent, + .uevent = macio_uevent, .probe = macio_device_probe, .remove = macio_device_remove, .shutdown = macio_device_shutdown,
Signature · 1 line
1.4.2
PATCH 2/2 powerpc: Add support for uevent to of_platform
This adds a proper uevent handler to the of_platform bus. This allows autoloading of modules (or at least should ;). It's _heavily_ based on the macio counterpart.
--- arch/powerpc/kernel/of_platform.c | 70 +++++++++++++++++++++++++++++++++++++ 1 files changed, 70 insertions(+), 0 deletions(-)
arch/powerpc/kernel/of_platform.c +70 -0
@@ -73,6 +73,75 @@ static int of_platform_bus_match(structreturn of_match_device (matches, of_dev) !=NULL ; } +static int of_platform_uevent (struct device *dev,char **envp,int num_envp, +char *buffer,int buffer_size) +{ +struct of_device *of; +const char *compat; +char *compat2; +char compat_buf[128 ];/* need to be size of 'compatible' */ + +int i =0 ; +int length =0 , cplen, sl, seen =0 ; + +if (!dev) +return -ENODEV ; + + of =to_of_device (dev); +if (!of) +return -ENODEV ; + +/* stuff we want to pass to /sbin/hotplug */ +if (add_uevent_var (envp, num_envp, &i, + buffer, buffer_size, &length, +"OF_NAME=%s" , of->node->name)) +return -ENOMEM ; + +if (add_uevent_var (envp, num_envp, &i, + buffer, buffer_size, &length, +"OF_TYPE=%s" , of->node->type)) +return -ENOMEM ; + +/* Since the compatible field can contain pretty much anything +* it's not really legal to split it out with commas. We split it +* up using a number of environment variables instead. */ + + compat =get_property (of->node,"compatible" , &cplen); + compat2 = compat_buf; +if (compat) +memcpy (compat2, compat, cplen); +while (compat && *compat && cplen >0 ) { +if (add_uevent_var (envp, num_envp, &i, + buffer, buffer_size, &length, +"OF_COMPATIBLE_%d=%s" , seen, compat)) +return -ENOMEM ; + + sl =strlen (compat) +1 ; + compat += sl; + compat2 += sl; + cplen -= sl; + seen++; + compat2[-1 ] ='C' ; + } + compat2[seen?-1 :0 ] =0 ; + +if (add_uevent_var (envp, num_envp, &i, + buffer, buffer_size, &length, +"OF_COMPATIBLE_N=%d" , seen)) +return -ENOMEM ; + +if (add_uevent_var (envp, num_envp, &i, + buffer, buffer_size, &length, +"MODALIAS=of:N%sT%sC%s" , + of->node->name, of->node->type, + compat_buf)) +return -ENOMEM ; + + envp[i] =NULL ; + +return 0 ; +} +static int of_platform_device_probe (struct device *dev) {int error = -ENODEV ;
@@ -132,6 +201,7 @@ static int of_platform_device_resume(strstruct bus_type of_platform_bus_type = { .name ="of_platform" , .match = of_platform_bus_match, + .uevent = of_platform_uevent, .probe = of_platform_device_probe, .remove = of_platform_device_remove, .suspend = of_platform_device_suspend,
Signature · 1 line
1.4.2
Quoted 4 lines · Sylvain Munaut
The
of_platformone has been tested on Efika and enable module autoloading by udev. The macio patch is not tested. However, being based on the same code as theof_platformhandler I would excpect it to be fine.
Would it be possible to have only a single copy of that code, for all of_device probes? I guess the same code also will be used on ibmebus and the ps3platform bus eventually.
Arnd <><
Quoted 8 lines · Arnd Bergmann
Quoted 5 lines · Sylvain Munaut
The
of_platformone has been tested on Efika and enable module autoloading by udev. The macio patch is not tested. However, being based on the same code as theof_platformhandler I would excpect it to be fine.
Quoted 4 lines
Would it be possible to have only a single copy of that code, for all
of_deviceprobes? I guess the same code also will be used on ibmebus and the ps3platform bus eventually.
Mmmh. Yes actually,
I could put that code in of_device.c and export it, then in each bus, you would only need a small stub to handle the conversion to of_device * and call the common code.
I'll do that and resend.
Sylvain