Commit 263756ec authored by Kay Sievers's avatar Kay Sievers Committed by Greg Kroah-Hartman
Browse files

[PATCH] ide: MODALIAS support for autoloading of ide-cd, ide-disk, ... 



IDE: MODALIAS support for autoloading of ide-cd, ide-disk, ...

Add MODULE_ALIAS to IDE midlayer modules: ide-disk, ide-cd, ide-floppy and
ide-tape, to autoload these modules depending on the probed media type of
the IDE device.

It is used by udev and replaces the former agent shell script of the hotplug
package, which was required to lookup the media type in the proc filesystem.
Using proc was racy, cause the media file is created after the hotplug event
is sent out.

The module autoloading does not take any effect, until something like the
following udev rule is configured:
  SUBSYSTEM=="ide",  ACTION=="add", ENV{MODALIAS}=="?*", RUN+="/sbin/modprobe $env{MODALIAS}"

The module ide-scsi will not be autoloaded, cause it requires manual
configuration. It can't be, and never was supported for automatic setup in
the hotplug package. Adding a MODULE_ALIAS to ide-scsi for all supported
media types, would just lead to a default blacklist entry anyway.

  $ 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

Signed-off-by: default avatarKay Sievers <kay.sievers@suse.de>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent f743ca5e

drivers/ide/ide-cd.c

+1 −0
Original line number Diff line number Diff line
@@ -3509,6 +3509,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
Original line number Diff line number Diff line
@@ -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
Original line number Diff line number Diff line
@@ -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-tape.c

+1 −0
Original line number Diff line number Diff line
@@ -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

+60 −0
Original line number Diff line number Diff line
@@ -1904,9 +1904,69 @@ static int ide_bus_match(struct device *dev, struct device_driver *drv) 
	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 = to_ide_device(dev);

	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 = to_ide_device(dev);

	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 = to_ide_device(dev);

	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 = to_ide_device(dev);

	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,

};

CRA Git | Maintained and supported by SUSTech CRA and CCSE