/proc/driver support for ide
Hi!
Attached. This will allow me to do suspend to disk/ram, without eating data, once I add suspend/resume functions to ide-disk.c. As of now, it adds ide interface and ide disk to /proc/driver...
Does it look like it could find its way to Linus?
Pavel
drivers/ide/ide-disk.c +14 -0
@@ -925,12 +925,16 @@ide_add_setting (drive,"max_failures" ,SETTING_RW ,-1 ,-1 ,TYPE_INT ,0 ,65535 ,1 ,1 , &drive->max_failures,NULL ); } +static struct device_driver idedisk_device_driver = { +}; +static void idedisk_setup (ide_drive_t *drive) {int i;struct hd_driveid *id = drive->id;unsigned long capacity; +int myid =-1 ;idedisk_add_settings (drive);
@@ -953,11 +957,20 @@ide_hwif_t *hwif =HWIF (drive);if (drive != &hwif->drives[i])continue ; + myid = i; hwif->gd->de_arr[i] = drive->de;if (drive->removable) hwif->gd->flags[i] |=GENHD_FL_REMOVABLE ;break ; } + { +ide_hwif_t *hwif =HWIF (drive); +sprintf (drive->device.bus_id,"%d" , myid); +sprintf (drive->device.name,"ide-disk" ); + drive->device.driver = &idedisk_device_driver; + drive->device.parent = &hwif->device; +device_register (&drive->device); + }/* Extract geometry if we did not already have one for the drive */ if (!drive->cyl || !drive->head || !drive->sect) {
@@ -1033,6 +1046,7 @@static int idedisk_cleanup (ide_drive_t *drive) { +put_device (&drive->device);if ((drive->id->cfs_enable_2 &0x3000 ) && drive->wcache)if (do_idedisk_flushcache (drive)) printk (KERN_INFO "%s: Write Cache FAILED Flushing!\n",
drivers/ide/ide-pnp.c +3 -1
@@ -57,6 +57,7 @@static int __init pnpide_generic_init (struct pci_dev *dev,int enable) {hw_regs_t hw; +ide_hwif_t *hwif;int index;if (!enable)
@@ -69,9 +70,10 @@ generic_ide_offsets, (ide_ioreg_t )DEV_IO (dev,1 ), 0, NULL, DEV_IRQ(dev, 0)); - index =ide_register_hw (&hw,NULL ); + index =ide_register_hw (&hw, &hwif);if (index !=-1 ) { + hwif->pci_dev = dev;printk ("ide%d: %s IDE interface\n" , index,DEV_NAME (dev));return 0 ; }
drivers/ide/ide-probe.c +9 -0
@@ -46,6 +46,7 @@#include <linux/delay.h> #include <linux/ide.h> #include <linux/spinlock.h> +#include <linux/pci.h> #include <asm/byteorder.h> #include <asm/irq.h>
@@ -469,6 +470,14 @@static void hwif_register (ide_hwif_t *hwif) { +sprintf (hwif->device.bus_id,"%04x" , hwif->io_ports[IDE_DATA_OFFSET ]); +sprintf (hwif->device.name,"ide" ); + hwif->device.driver_data = hwif; +if (hwif->pci_dev) + hwif->device.parent = &hwif->pci_dev->dev; +else + hwif->device.parent =NULL ;/* Would like to do = &device_legacy */ +device_register (&hwif->device);if (((unsigned long )hwif->io_ports[IDE_DATA_OFFSET ] |7 ) == ((unsigned long )hwif->io_ports[IDE_STATUS_OFFSET ])) {ide_request_region (hwif->io_ports[IDE_DATA_OFFSET ],8 , hwif->name);
drivers/ide/ide.c +3 -3
@@ -153,6 +151,8 @@#include <linux/completion.h> #include <linux/reboot.h> #include <linux/cdrom.h> +#include <linux/device.h> +#include <linux/kmod.h> #include <asm/byteorder.h> #include <asm/irq.h>
@@ -162,9 +162,6 @@#include "ide_modes.h" -#ifdef CONFIG_KMOD -#include <linux/kmod.h> -#endif /* CONFIG_KMOD */ /* default maximum number of failures */ #define IDE_DEFAULT_MAX_FAILURES 1
@@ -2027,6 +2024,7 @@ hwif = &ide_hwifs[index];if (!hwif->present) goto abort; +put_device (&hwif->device);for (unit =0 ; unit <MAX_DRIVES ; ++unit) { drive = &hwif->drives[unit];if (!drive->present)
include/linux/ide.h +3 -0
@@ -14,6 +14,7 @@#include <linux/blkdev.h> #include <linux/proc_fs.h> #include <linux/devfs_fs_kernel.h> +#include <linux/device.h> #include <asm/hdreg.h> /*
@@ -448,6 +449,7 @@byte acoustic;/* acoustic management */ unsigned int failures;/* current failure count */ unsigned int max_failures;/* maximum allowed failure count */ +struct device device; } ide_drive_t;/*
@@ -580,6 +582,7 @@void *hwif_data;/* extra hwif data */ ide_busproc_t *busproc;/* driver soft-power interface */ byte bus_state;/* power state of the IDE bus */ +struct device device; } ide_hwif_t;/*
Signature · 2 lines
(about SSSCA) "I don't say this lightly. However, I really think that the U.S. no longer is classifiable as a democracy, but rather as a plutocracy." --hpa
Quoted 8 lines · Pavel Machek
Hi!
Attached. This will allow me to do suspend to disk/ram, without eating data, once I add suspend/resume functions to
ide-disk.c. As of now, it adds ide interface and ide disk to/proc/driver...Does it look like it could find its way to Linus?
The patch looks and works fine...