1 files changed, 84 insertions, 106 deletions

diff --git a/drivers/ide/ide-probe.c b/drivers/ide/ide-probe.c
index edf650b20c67..98a8af44bf64 100644
--- a/drivers/ide/ide-probe.c
+++ b/drivers/ide/ide-probe.c
@@ -1,7 +1,6 @@
 /*
- *  linux/drivers/ide/ide-probe.c       Version 1.11    Mar 05, 2003
- *
- *  Copyright (C) 1994-1998  Linus Torvalds & authors (see below)
+ *  Copyright (C) 1994-1998   Linus Torvalds & authors (see below)
+ *  Copyright (C) 2005, 2007  Bartlomiej Zolnierkiewicz
  */
 
 /*
@@ -129,6 +128,10 @@ static inline void do_identify (ide_drive_t *drive, u8 cmd)
 
         drive->id_read = 1;
         local_irq_enable();
+#ifdef DEBUG
+        printk(KERN_INFO "%s: dumping identify data\n", drive->name);
+        ide_dump_identify((u8 *)id);
+#endif
         ide_fix_driveid(id);
 
 #if defined (CONFIG_SCSI_EATA_PIO) || defined (CONFIG_SCSI_EATA)
@@ -610,7 +613,7 @@ static void hwif_release_dev (struct device *dev)
         complete(&hwif->gendev_rel_comp);
 }
 
-static void hwif_register (ide_hwif_t *hwif)
+static void ide_register_port(ide_hwif_t *hwif)
 {
         int ret;
 
@@ -618,8 +621,8 @@ static void hwif_register (ide_hwif_t *hwif)
         strlcpy(hwif->gendev.bus_id,hwif->name,BUS_ID_SIZE);
         hwif->gendev.driver_data = hwif;
         if (hwif->gendev.parent == NULL) {
-                if (hwif->pci_dev)
-                        hwif->gendev.parent = &hwif->pci_dev->dev;
+                if (hwif->dev)
+                        hwif->gendev.parent = hwif->dev;
                 else
                         /* Would like to do = &device_legacy */
                         hwif->gendev.parent = NULL;
@@ -631,7 +634,33 @@ static void hwif_register (ide_hwif_t *hwif)
                         __FUNCTION__, ret);
 }
 
-static int wait_hwif_ready(ide_hwif_t *hwif)
+/**
+ *      ide_port_wait_ready     -       wait for port to become ready
+ *      @hwif: IDE port
+ *
+ *      This is needed on some PPCs and a bunch of BIOS-less embedded
+ *      platforms.  Typical cases are:
+ *
+ *      - The firmware hard reset the disk before booting the kernel,
+ *        the drive is still doing it's poweron-reset sequence, that
+ *        can take up to 30 seconds.
+ *
+ *      - The firmware does nothing (or no firmware), the device is
+ *        still in POST state (same as above actually).
+ *
+ *      - Some CD/DVD/Writer combo drives tend to drive the bus during
+ *        their reset sequence even when they are non-selected slave
+ *        devices, thus preventing discovery of the main HD.
+ *
+ *      Doing this wait-for-non-busy should not harm any existing
+ *      configuration and fix some issues like the above.
+ *
+ *      BenH.
+ *
+ *      Returns 0 on success, error code (< 0) otherwise.
+ */
+
+static int ide_port_wait_ready(ide_hwif_t *hwif)
 {
         int unit, rc;
 
@@ -709,36 +738,16 @@ void ide_undecoded_slave(ide_drive_t *drive1)
 
 EXPORT_SYMBOL_GPL(ide_undecoded_slave);
 
-/*
- * This routine only knows how to look for drive units 0 and 1
- * on an interface, so any setting of MAX_DRIVES > 2 won't work here.
- */
-static void probe_hwif(ide_hwif_t *hwif)
+static int ide_probe_port(ide_hwif_t *hwif)
 {
         unsigned long flags;
         unsigned int irqd;
-        int unit;
+        int unit, rc = -ENODEV;
 
-        if (hwif->noprobe)
-                return;
+        BUG_ON(hwif->present);
 
-        if ((hwif->chipset != ide_4drives || !hwif->mate || !hwif->mate->present) &&
-            (ide_hwif_request_regions(hwif))) {
-                u16 msgout = 0;
-                for (unit = 0; unit < MAX_DRIVES; ++unit) {
-                        ide_drive_t *drive = &hwif->drives[unit];
-                        if (drive->present) {
-                                drive->present = 0;
-                                printk(KERN_ERR "%s: ERROR, PORTS ALREADY IN USE\n",
-                                        drive->name);
-                                msgout = 1;
-                        }
-                }
-                if (!msgout)
-                        printk(KERN_ERR "%s: ports already in use, skipping probe\n",
-                                hwif->name);
-                return; 
-        }
+        if (hwif->noprobe)
+                return -EACCES;
 
         /*
          * We must always disable IRQ, as probe_for_drive will assert IRQ, but
@@ -750,26 +759,7 @@ static void probe_hwif(ide_hwif_t *hwif)
 
         local_irq_set(flags);
 
-        /* This is needed on some PPCs and a bunch of BIOS-less embedded
-         * platforms. Typical cases are:
-         * 
-         *  - The firmware hard reset the disk before booting the kernel,
-         *    the drive is still doing it's poweron-reset sequence, that
-         *    can take up to 30 seconds
-         *  - The firmware does nothing (or no firmware), the device is
-         *    still in POST state (same as above actually).
-         *  - Some CD/DVD/Writer combo drives tend to drive the bus during
-         *    their reset sequence even when they are non-selected slave
-         *    devices, thus preventing discovery of the main HD
-         *    
-         *  Doing this wait-for-busy should not harm any existing configuration
-         *  (at least things won't be worse than what current code does, that
-         *  is blindly go & talk to the drive) and fix some issues like the
-         *  above.
-         *  
-         *  BenH.
-         */
-        if (wait_hwif_ready(hwif) == -EBUSY)
+        if (ide_port_wait_ready(hwif) == -EBUSY)
                 printk(KERN_DEBUG "%s: Wait for ready failed before probe !\n", hwif->name);
 
         /*
@@ -779,14 +769,8 @@ static void probe_hwif(ide_hwif_t *hwif)
                 ide_drive_t *drive = &hwif->drives[unit];
                 drive->dn = (hwif->channel ? 2 : 0) + unit;
                 (void) probe_for_drive(drive);
-                if (drive->present && !hwif->present) {
-                        hwif->present = 1;
-                        if (hwif->chipset != ide_4drives ||
-                            !hwif->mate || 
-                            !hwif->mate->present) {
-                                hwif_register(hwif);
-                        }
-                }
+                if (drive->present)
+                        rc = 0;
         }
         if (hwif->io_ports[IDE_CONTROL_OFFSET] && hwif->reset) {
                 printk(KERN_WARNING "%s: reset\n", hwif->name);
@@ -803,10 +787,12 @@ static void probe_hwif(ide_hwif_t *hwif)
         if (irqd)
                 enable_irq(irqd);
 
-        if (!hwif->present) {
-                ide_hwif_release_regions(hwif);
-                return;
-        }
+        return rc;
+}
+
+static void ide_port_tune_devices(ide_hwif_t *hwif)
+{
+        int unit;
 
         for (unit = 0; unit < MAX_DRIVES; unit++) {
                 ide_drive_t *drive = &hwif->drives[unit];
@@ -997,21 +983,17 @@ static int init_irq (ide_hwif_t *hwif)
                 spin_lock_irq(&ide_lock);
                 hwif->next = hwgroup->hwif->next;
                 hwgroup->hwif->next = hwif;
+                BUG_ON(hwif->next == hwif);
                 spin_unlock_irq(&ide_lock);
         } else {
-                hwgroup = kmalloc_node(sizeof(ide_hwgroup_t),
-                                        GFP_KERNEL | __GFP_ZERO,
-                                        hwif_to_node(hwif->drives[0].hwif));
-                if (!hwgroup)
-                        goto out_up;
+                hwgroup = kmalloc_node(sizeof(*hwgroup), GFP_KERNEL|__GFP_ZERO,
+                                       hwif_to_node(hwif));
+                if (hwgroup == NULL)
+                        goto out_up;
 
                 hwif->hwgroup = hwgroup;
+                hwgroup->hwif = hwif->next = hwif;
 
-                hwgroup->hwif     = hwif->next = hwif;
-                hwgroup->rq       = NULL;
-                hwgroup->handler  = NULL;
-                hwgroup->drive    = NULL;
-                hwgroup->busy     = 0;
                 init_timer(&hwgroup->timer);
                 hwgroup->timer.function = &ide_timer_expiry;
                 hwgroup->timer.data = (unsigned long) hwgroup;
@@ -1079,25 +1061,7 @@ static int init_irq (ide_hwif_t *hwif)
         mutex_unlock(&ide_cfg_mtx);
         return 0;
 out_unlink:
-        spin_lock_irq(&ide_lock);
-        if (hwif->next == hwif) {
-                BUG_ON(match);
-                BUG_ON(hwgroup->hwif != hwif);
-                kfree(hwgroup);
-        } else {
-                ide_hwif_t *g;
-                g = hwgroup->hwif;
-                while (g->next != hwif)
-                        g = g->next;
-                g->next = hwif->next;
-                if (hwgroup->hwif == hwif) {
-                        /* Impossible. */
-                        printk(KERN_ERR "Duh. Uninitialized hwif listed as active hwif.\n");
-                        hwgroup->hwif = g;
-                }
-                BUG_ON(hwgroup->hwif == hwif);
-        }
-        spin_unlock_irq(&ide_lock);
+        ide_remove_port_from_hwgroup(hwif);
 out_up:
         mutex_unlock(&ide_cfg_mtx);
         return 1;
@@ -1246,28 +1210,21 @@ static int hwif_init(ide_hwif_t *hwif)
 {
         int old_irq;
 
-        /* Return success if no device is connected */
-        if (!hwif->present)
-                return 1;
-
         if (!hwif->irq) {
                 if (!(hwif->irq = ide_default_irq(hwif->io_ports[IDE_DATA_OFFSET])))
                 {
                         printk("%s: DISABLED, NO IRQ\n", hwif->name);
-                        return (hwif->present = 0);
+                        return 0;
                 }
         }
 #ifdef CONFIG_BLK_DEV_HD
         if (hwif->irq == HD_IRQ && hwif->io_ports[IDE_DATA_OFFSET] != HD_DATA) {
                 printk("%s: CANNOT SHARE IRQ WITH OLD "
                         "HARDDISK DRIVER (hd.c)\n", hwif->name);
-                return (hwif->present = 0);
+                return 0;
         }
 #endif /* CONFIG_BLK_DEV_HD */
 
-        /* we set it back to 1 if all is ok below */    
-        hwif->present = 0;
-
         if (register_blkdev(hwif->major, hwif->name))
                 return 0;
 
@@ -1306,10 +1263,7 @@ static int hwif_init(ide_hwif_t *hwif)
 
 done:
         init_gendisk(hwif);
-
         ide_acpi_init(hwif);
-
-        hwif->present = 1;      /* success */
         return 1;
 
 out:
@@ -1344,7 +1298,27 @@ int ide_device_add_all(u8 *idx)
                 if (idx[i] == 0xff)
                         continue;
 
-                probe_hwif(&ide_hwifs[idx[i]]);
+                hwif = &ide_hwifs[idx[i]];
+
+                if ((hwif->chipset != ide_4drives || !hwif->mate ||
+                     !hwif->mate->present) && ide_hwif_request_regions(hwif)) {
+                        printk(KERN_ERR "%s: ports already in use, "
+                                        "skipping probe\n", hwif->name);
+                        continue;
+                }
+
+                if (ide_probe_port(hwif) < 0) {
+                        ide_hwif_release_regions(hwif);
+                        continue;
+                }
+
+                hwif->present = 1;
+
+                if (hwif->chipset != ide_4drives || !hwif->mate ||
+                    !hwif->mate->present)
+                        ide_register_port(hwif);
+
+                ide_port_tune_devices(hwif);
         }
 
         for (i = 0; i < MAX_HWIFS; i++) {
@@ -1353,9 +1327,13 @@ int ide_device_add_all(u8 *idx)
 
                 hwif = &ide_hwifs[idx[i]];
 
+                if (!hwif->present)
+                        continue;
+
                 if (hwif_init(hwif) == 0) {
                         printk(KERN_INFO "%s: failed to initialize IDE "
                                          "interface\n", hwif->name);
+                        hwif->present = 0;
                         rc = -1;
                         continue;
                 }