HID: uhid: allocate static minor
Subsystems (3)
PATCH 1/1 HID: uhid: allocate static minor
udev has this nice feature of creating "dead" /dev/<node> device-nodes if it finds a devnode:<node> modalias. Once the node is accessed, the kernel automatically loads the module that provides the node. However, this requires udev to know the major:minor code to use for the node. This feature was introduced by:
commit 578454ff7eab61d13a26b568f99a89a2c9edc881
Author: Kay Sievers <[email protected]>
Date: Thu May 20 18:07:20 2010 +0200
driver core: add devname module aliases to allow module on-demand auto-loading
However, uhid uses dynamic minor numbers so this doesn't actually work. We need to load uhid to know which minor it's going to use.
Hence, allocate a static minor (just like uinput does) and we're good to go.
--- drivers/hid/uhid.c | 3 ++- include/linux/miscdevice.h | 1 + 2 files changed, 3 insertions(+), 1 deletion(-)
drivers/hid/uhid.c +2 -1
@@ -615,7 +615,7 @@ static const struct file_operations uhid_fops = {static struct miscdevice uhid_misc = { .fops = &uhid_fops, - .minor =MISC_DYNAMIC_MINOR , + .minor =UHID_MINOR , .name =UHID_NAME , };
@@ -634,4 +634,5 @@ module_exit(uhid_exit);MODULE_LICENSE ("GPL" );MODULE_AUTHOR ("David Herrmann <[email protected]>" );MODULE_DESCRIPTION ("User-space I/O driver support for HID subsystem" ); +MODULE_ALIAS_MISCDEV (UHID_MINOR );MODULE_ALIAS ("devname:" UHID_NAME );
include/linux/miscdevice.h +1 -0
@@ -45,6 +45,7 @@#define MAPPER_CTRL_MINOR 236#define LOOP_CTRL_MINOR 237#define VHOST_NET_MINOR 238 +#define UHID_MINOR 239#define MISC_DYNAMIC_MINOR 255struct device ;
Signature · 1 line
1.8.4
Quoted 12 lines · David Herrmann
udev has this nice feature of creating "dead" /dev/<node> device-nodes if it finds a devnode:<node> modalias. Once the node is accessed, the kernel automatically loads the module that provides the node. However, this requires udev to know the major:minor code to use for the node. This feature was introduced by:
commit
578454ff7eab61d13a26b568f99a89a2c9edc881
Author: Kay Sievers <[email protected]>
Date: Thu May 20 18:07:20 2010 +0200driver core: add devname module aliases to allow module on-demand auto-loading
Quoted 7 lines
However, uhid uses dynamic minor numbers so this doesn't actually work. We need to load uhid to know which minor it's going to use.
Hence, allocate a static minor (just like uinput does) and we're good to go.
Reported-by Tom Gundersen <[email protected]>
Thanks, this works (I only tested the creation of the device node, not the actual module loading).
Quoted 40 lines
Signed-off-by David Herrmann <[email protected]>--- drivers/hid/uhid.c | 3 ++- include/linux/miscdevice.h | 1 + 2 files changed, 3 insertions(+), 1 deletion(-)drivers/hid/uhid.c +2
-1@@ -615,7 +615,7 @@ static const struct file_operations uhid_fops = {static struct miscdevice uhid_misc = { .fops = &uhid_fops, - .minor =MISC_DYNAMIC_MINOR , + .minor =UHID_MINOR , .name =UHID_NAME , };@@ -634,4 +634,5 @@ module_exit(uhid_exit);MODULE_LICENSE ("GPL" );MODULE_AUTHOR ("David Herrmann <[email protected]>" );MODULE_DESCRIPTION ("User-space I/O driver support for HID subsystem" ); +MODULE_ALIAS_MISCDEV (UHID_MINOR );MODULE_ALIAS ("devname:" UHID_NAME );include/linux/miscdevice.h +1
-1@@ -45,6 +45,7 @@#define MAPPER_CTRL_MINOR 236#define LOOP_CTRL_MINOR 237#define VHOST_NET_MINOR 238 +#define UHID_MINOR 239#define MISC_DYNAMIC_MINOR 255struct device ; --1.8.4
Hey Jiri
I forgot to put you on CC on the initial patch. Any comments on this?
Cheers
David
Quoted 64 lines · Tom Gundersen
Quoted 12 lines · David Herrmann
udev has this nice feature of creating "dead" /dev/<node> device-nodes if it finds a devnode:<node> modalias. Once the node is accessed, the kernel automatically loads the module that provides the node. However, this requires udev to know the major:minor code to use for the node. This feature was introduced by:
commit
578454ff7eab61d13a26b568f99a89a2c9edc881
Author: Kay Sievers <[email protected]>
Date: Thu May 20 18:07:20 2010 +0200driver core: add devname module aliases to allow module on-demand auto-loading
Quoted 7 lines
However, uhid uses dynamic minor numbers so this doesn't actually work. We need to load uhid to know which minor it's going to use.
Hence, allocate a static minor (just like uinput does) and we're good to go.
Reported-by Tom Gundersen <[email protected]>Thanks, this works (I only tested the creation of the device node, not the actual module loading).
Quoted 40 lines
Signed-off-by David Herrmann <[email protected]>--- drivers/hid/uhid.c | 3 ++- include/linux/miscdevice.h | 1 + 2 files changed, 3 insertions(+), 1 deletion(-)drivers/hid/uhid.c +2
-1@@ -615,7 +615,7 @@ static const struct file_operations uhid_fops = {static struct miscdevice uhid_misc = { .fops = &uhid_fops, - .minor =MISC_DYNAMIC_MINOR , + .minor =UHID_MINOR , .name =UHID_NAME , };@@ -634,4 +634,5 @@ module_exit(uhid_exit);MODULE_LICENSE ("GPL" );MODULE_AUTHOR ("David Herrmann <[email protected]>" );MODULE_DESCRIPTION ("User-space I/O driver support for HID subsystem" ); +MODULE_ALIAS_MISCDEV (UHID_MINOR );MODULE_ALIAS ("devname:" UHID_NAME );include/linux/miscdevice.h +1
-1@@ -45,6 +45,7 @@#define MAPPER_CTRL_MINOR 236#define LOOP_CTRL_MINOR 237#define VHOST_NET_MINOR 238 +#define UHID_MINOR 239#define MISC_DYNAMIC_MINOR 255struct device ; --1.8.4