ide: MODALIAS support for autoloading of ide-cd, ide-disk, ...
This applies on top of the changes currently in the -mm tree, which rename ".hotplug" to ".uevent". I don't have any IDE hardware left around here, so I've tested it only with a PCMCIA CF adapter. :)
Thanks,
Kay
From: Kay Sievers <[email protected]>
IDE: MODALIAS support for autoloading of ide-cd, ide-disk, ...
Add MODULE_ALIAS to IDE midlayer modules to autoload them depending on the probed media type.
$ modinfo ide-disk filename: /lib/modules/2.6.15-rc4-g1b0997f5/kernel/drivers/ide/ide-disk.ko description: ATA DISK Driver alias: ide:*m-disk* license: GPL ...
$ modprobe -vn ide:m-disk insmod /lib/modules/2.6.15-rc4-g1b0997f5/kernel/drivers/ide/ide-disk.ko
$ cat /sys/bus/ide/devices/0.0/modalias ide:m-disk
It also adds attributes to the IDE device:
$ tree /sys/bus/ide/devices/0.0/ /sys/bus/ide/devices/0.0/ |-- bus -> ../../../../../../../bus/ide |-- drivename |-- media |-- modalias |-- power | |-- state | `-- wakeup `-- uevent
$ cat /sys/bus/ide/devices/0.0/{modalias,drivename,media}
ide:m-disk
hda
disk---
drivers/ide/ide-cd.c +1 -0
@@ -3516,6 +3516,7 @@ static int __init ide_cdrom_init(void)return driver_register (&ide_cdrom_driver.gen_driver); } +MODULE_ALIAS ("ide:*m-cdrom*" );module_init (ide_cdrom_init);module_exit (ide_cdrom_exit);MODULE_LICENSE ("GPL" );
drivers/ide/ide-disk.c +1 -0
@@ -1271,6 +1271,7 @@ static int __init idedisk_init(void)return driver_register (&idedisk_driver.gen_driver); } +MODULE_ALIAS ("ide:*m-disk*" );module_init (idedisk_init);module_exit (idedisk_exit);MODULE_LICENSE ("GPL" );
drivers/ide/ide-floppy.c +1 -0
@@ -2197,6 +2197,7 @@ static int __init idefloppy_init(void)return driver_register (&idefloppy_driver.gen_driver); } +MODULE_ALIAS ("ide:*m-floppy*" );module_init (idefloppy_init);module_exit (idefloppy_exit);MODULE_LICENSE ("GPL" );
drivers/ide/ide-generic.c +0 -0
drivers/ide/ide-tape.c +1 -0
@@ -4947,6 +4947,7 @@ out:return error; } +MODULE_ALIAS ("ide:*m-tape*" );module_init (idetape_init);module_exit (idetape_exit);MODULE_ALIAS_CHARDEV_MAJOR (IDETAPE_MAJOR );
drivers/ide/ide.c +64 -0
73 lines not on this page · raw message
Hi,
Looks fine but what about ide-scsi driver and ide_optical media?
Bartlomiej
Quoted 175 lines · Kay Sievers
This applies on top of the changes currently in the -mm tree, which rename ".hotplug" to ".uevent". I don't have any IDE hardware left around here, so I've tested it only with a PCMCIA CF adapter. :)
Thanks,
KayFrom: Kay Sievers <[email protected]>
IDE: MODALIAS support for autoloading of ide-cd, ide-disk, ...
Add
MODULE_ALIASto IDE midlayer modules to autoload them depending on the probed media type.$ modinfo ide-disk filename: /lib/modules/2.6.15-rc4-g1b0997f5/kernel/drivers/ide/ide-disk.ko description: ATA DISK Driver alias: ide:*m-disk* license: GPL ...$ modprobe -vn ide:m-disk insmod /lib/modules/2.6.15-rc4-g1b0997f5/kernel/drivers/ide/ide-disk.ko$ cat /sys/bus/ide/devices/0.0/modalias ide:m-diskIt also adds attributes to the IDE device:
$ tree /sys/bus/ide/devices/0.0/ /sys/bus/ide/devices/0.0/ |-- bus -> ../../../../../../../bus/ide |-- drivename |-- media |-- modalias |-- power | |-- state | `-- wakeup `-- uevent$ cat /sys/bus/ide/devices/0.0/{modalias,drivename,media} ide:m-disk hda diskSigned-off-by Kay Sievers <[email protected]>---
drivers/ide/ide-cd.c +1
-0@@ -3516,6 +3516,7 @@ static int __init ide_cdrom_init(void)return driver_register (&ide_cdrom_driver.gen_driver); } +MODULE_ALIAS ("ide:*m-cdrom*" );module_init (ide_cdrom_init);module_exit (ide_cdrom_exit);MODULE_LICENSE ("GPL" );drivers/ide/ide-disk.c +1
-0@@ -1271,6 +1271,7 @@ static int __init idedisk_init(void)return driver_register (&idedisk_driver.gen_driver); } +MODULE_ALIAS ("ide:*m-disk*" );module_init (idedisk_init);module_exit (idedisk_exit);MODULE_LICENSE ("GPL" );drivers/ide/ide-floppy.c +1
-0@@ -2197,6 +2197,7 @@ static int __init idefloppy_init(void)return driver_register (&idefloppy_driver.gen_driver); } +MODULE_ALIAS ("ide:*m-floppy*" );module_init (idefloppy_init);module_exit (idefloppy_exit);MODULE_LICENSE ("GPL" );drivers/ide/ide-generic.c +0
-0drivers/ide/ide-tape.c +1
-0@@ -4947,6 +4947,7 @@ out:return error; } +MODULE_ALIAS ("ide:*m-tape*" );module_init (idetape_init);module_exit (idetape_exit);MODULE_ALIAS_CHARDEV_MAJOR (IDETAPE_MAJOR );drivers/ide/ide.c +64
-0@@ -1904,9 +1904,73 @@ static int ide_bus_match(struct device *return 1 ; } +static char *media_string (ide_drive_t *drive) +{ +switch (drive->media) { +case ide_disk: +return "disk" ; +case ide_cdrom: +return "cdrom" ; +case ide_tape: +return "tape" ; +case ide_floppy: +return "floppy" ; +default : +return "UNKNOWN" ; + } +} + +static ssize_t media_show (struct device *dev,struct device_attribute *attr,char *buf) +{ +ide_drive_t *drive = dev->driver_data; +return sprintf (buf,"%s\n" ,media_string (drive)); +} + +static ssize_t drivename_show (struct device *dev,struct device_attribute *attr,char *buf) +{ +ide_drive_t *drive = dev->driver_data; +return sprintf (buf,"%s\n" , drive->name); +} + +static ssize_t modalias_show (struct device *dev,struct device_attribute *attr,char *buf) +{ +ide_drive_t *drive = dev->driver_data; +return sprintf (buf,"ide:m-%s\n" ,media_string (drive)); +} + +static struct device_attribute ide_dev_attrs[] = { +__ATTR_RO (media), +__ATTR_RO (drivename), +__ATTR_RO (modalias), + __ATTR_NULL +}; + +static int ide_uevent (struct device *dev,char **envp,int num_envp, +char *buffer,int buffer_size) +{ +ide_drive_t *drive = dev->driver_data; +int i =0 ; +int length =0 ; + +add_uevent_var (envp, num_envp, &i, buffer, buffer_size, &length, +"MEDIA=%s" ,media_string (drive)); + +add_uevent_var (envp, num_envp, &i, buffer, buffer_size, &length, +"DRIVENAME=%s" , drive->name); + +add_uevent_var (envp, num_envp, &i, buffer, buffer_size, &length, +"MODALIAS=ide:m-%s" , +media_string (drive)); + + envp[i] =NULL ; +return 0 ; +} +struct bus_type ide_bus_type = { .name ="ide" , .match = ide_bus_match, + .uevent = ide_uevent, + .dev_attrs = ide_dev_attrs, .suspend = generic_ide_suspend, .resume = generic_ide_resume, };
Quoted 1 line · Bartlomiej Zolnierkiewicz
Looks fine but what about ide-scsi driver and
ide_opticalmedia?
The Debian hotplug script, which does the same thing, does not know about these modules and nobody ever complained, so if some support is needed it can be added later.
(And ide-scsi is dead anyway...)
Signature · 2 lines
ciao, Marco
Quoted 5 lines · Marco d'Itri
Quoted 1 line · Bartlomiej Zolnierkiewicz
Looks fine but what about ide-scsi driver and
ide_opticalmedia?The Debian hotplug script, which does the same thing, does not know about these modules and nobody ever complained, so if some support is
Does the hotplug script export kernel sysfs attributes?
Quoted 1 line
needed it can be added later.
The problem is that you get wrong data for "modalias" sysfs attribute for ide-scsi module (because "modalias" is based on the media type).
Until this is issue solved I can't accept this patch.
Quoted 1 line
(And ide-scsi is dead anyway...)
ide-scsi is the only way to support some devices currently
Bartlomiej
Quoted 8 lines · Bartlomiej Zolnierkiewicz
Quoted 5 lines · Marco d'Itri
Quoted 1 line · Bartlomiej Zolnierkiewicz
Looks fine but what about ide-scsi driver and
ide_opticalmedia?The Debian hotplug script, which does the same thing, does not know about these modules and nobody ever complained, so if some support is
Does the hotplug script export kernel sysfs attributes?
You mean if the hotplug script uses sysfs? It looks up the data in /proc (which is ugly, cause you have to loop until the /proc file arrives).
Quoted 6 lines
Quoted 1 line
needed it can be added later.
The problem is that you get wrong data for "modalias" sysfs attribute for ide-scsi module (because "modalias" is based on the media type).
Until this is issue solved I can't accept this patch.
The correct way is probably to have the same MODULE_ALIAS() in ide-scsi and we just control the loaded module with the module-init-tools blacklist entry. Does that make sense to you?
Thanks,
Kay
And after more careful inspection....
$ tree /sys/bus/ide/devices/0.0/ /sys/bus/ide/devices/0.0/ |-- block -> ../../../../../block/hda |-- bus -> ../../../../../bus/ide |-- driver -> ../../../../../bus/ide/drivers/ide-disk |-- power | |-- state | `-- wakeup `-- uevent
this is with the standard kernel without this patch.
Key, could you please explain what this patch actually *does* (besides adding MODALIAS support) to such sysfs dummy as me?
Thanks,
Bartlomiej
Quoted 22 lines · Bartlomiej Zolnierkiewicz
Quoted 5 lines · Marco d'Itri
Quoted 1 line · Bartlomiej Zolnierkiewicz
Looks fine but what about ide-scsi driver and
ide_opticalmedia?The Debian hotplug script, which does the same thing, does not know about these modules and nobody ever complained, so if some support is
Does the hotplug script export kernel sysfs attributes?
Quoted 1 line
needed it can be added later.
The problem is that you get wrong data for "modalias" sysfs attribute for ide-scsi module (because "modalias" is based on the media type).
Until this is issue solved I can't accept this patch.
Quoted 1 line
(And ide-scsi is dead anyway...)
ide-scsi is the only way to support some devices currently
Bartlomiej