Merge git://git.kernel.org/pub/scm/linux/kernel/git/bart/ide-2.6

* git://git.kernel.org/pub/scm/linux/kernel/git/bart/ide-2.6: (53 commits)
  ide: use try_to_identify() in ide_driveid_update()
  ide: clear drive IRQ after re-enabling local IRQs in ide_driveid_update()
  ide: sanitize SELECT_MASK() usage in ide_driveid_update()
  ide: classify device type in do_probe()
  ide: remove broken EXABYTENEST support
  ide: shorten timeout value in ide_driveid_update()
  ide: propagate AltStatus workarounds to ide_driveid_update()
  ide: fix kmalloc() failure handling in ide_driveid_update()
  mn10300: remove <asm/ide.h>
  frv: remove <asm/ide.h>
  ide: remove pciirq argument from ide_pci_setup_ports()
  ide: fix ->init_chipset method to return 'int' value
  ide: remove try_to_identify() wrapper
  ide: remove no longer needed IRQ auto-probing from try_to_identify() (v2)
  ide: remove no longer needed IRQ fallback code from hwif_init()
  amd74xx: remove no longer needed ->init_hwif method
  ide: remove no longer needed IDE_HFLAG[_FORCE]_LEGACY_IRQS
  ide: use ide_pci_is_in_compatibility_mode() in ide_pci_init_{one,two}()
  ide: use pci_get_legacy_ide_irq() in ide_pci_init_{one,two}()
  ide: handle IDE_HFLAG[_FORCE]_LEGACY_IRQS in ide_pci_init_{one,two}()
  ...

1 files changed, 58 insertions, 199 deletions

diff --git a/drivers/ide/ide-probe.c b/drivers/ide/ide-probe.c
index ee8e3e7cad51..974067043fba 100644
--- a/drivers/ide/ide-probe.c
+++ b/drivers/ide/ide-probe.c
@@ -181,16 +181,16 @@ static void ide_classify_atapi_dev(ide_drive_t *drive)
  *      do_identify     -       identify a drive
  *      @drive: drive to identify 
  *      @cmd: command used
+ *      @id: buffer for IDENTIFY data
  *
  *      Called when we have issued a drive identify command to
  *      read and parse the results. This function is run with
  *      interrupts disabled. 
  */
 
-static void do_identify(ide_drive_t *drive, u8 cmd)
+static void do_identify(ide_drive_t *drive, u8 cmd, u16 *id)
 {
         ide_hwif_t *hwif = drive->hwif;
-        u16 *id = drive->id;
         char *m = (char *)&id[ATA_ID_PROD];
         unsigned long flags;
         int bswap = 1;
@@ -233,16 +233,6 @@ static void do_identify(ide_drive_t *drive, u8 cmd)
         drive->dev_flags |= IDE_DFLAG_PRESENT;
         drive->dev_flags &= ~IDE_DFLAG_DEAD;
 
-        /*
-         * Check for an ATAPI device
-         */
-        if (cmd == ATA_CMD_ID_ATAPI)
-                ide_classify_atapi_dev(drive);
-        else
-        /*
-         * Not an ATAPI device: looks like a "regular" hard disk
-         */
-                ide_classify_ata_dev(drive);
         return;
 err_misc:
         kfree(id);
@@ -250,21 +240,19 @@ err_misc:
 }
 
 /**
- *      actual_try_to_identify  -       send ata/atapi identify
+ *      ide_dev_read_id -       send ATA/ATAPI IDENTIFY command
  *      @drive: drive to identify
  *      @cmd: command to use
+ *      @id: buffer for IDENTIFY data
  *
- *      try_to_identify() sends an ATA(PI) IDENTIFY request to a drive
- *      and waits for a response.  It also monitors irqs while this is
- *      happening, in hope of automatically determining which one is
- *      being used by the interface.
+ *      Sends an ATA(PI) IDENTIFY request to a drive and waits for a response.
  *
  *      Returns:        0  device was identified
  *                      1  device timed-out (no response to identify request)
  *                      2  device aborted the command (refused to identify itself)
  */
 
-static int actual_try_to_identify (ide_drive_t *drive, u8 cmd)
+int ide_dev_read_id(ide_drive_t *drive, u8 cmd, u16 *id)
 {
         ide_hwif_t *hwif = drive->hwif;
         struct ide_io_ports *io_ports = &hwif->io_ports;
@@ -273,6 +261,13 @@ static int actual_try_to_identify (ide_drive_t *drive, u8 cmd)
         unsigned long timeout;
         u8 s = 0, a = 0;
 
+        /*
+         * Disable device IRQ.  Otherwise we'll get spurious interrupts
+         * during the identify phase that the IRQ handler isn't expecting.
+         */
+        if (io_ports->ctl_addr)
+                tp_ops->set_irq(hwif, 0);
+
         /* take a deep breath */
         msleep(50);
 
@@ -317,7 +312,7 @@ static int actual_try_to_identify (ide_drive_t *drive, u8 cmd)
 
         if (OK_STAT(s, ATA_DRQ, BAD_R_STAT)) {
                 /* drive returned ID */
-                do_identify(drive, cmd);
+                do_identify(drive, cmd, id);
                 /* drive responded with ID */
                 rc = 0;
                 /* clear drive IRQ */
@@ -329,63 +324,6 @@ static int actual_try_to_identify (ide_drive_t *drive, u8 cmd)
         return rc;
 }
 
-/**
- *      try_to_identify -       try to identify a drive
- *      @drive: drive to probe
- *      @cmd: command to use
- *
- *      Issue the identify command and then do IRQ probing to
- *      complete the identification when needed by finding the
- *      IRQ the drive is attached to
- */
- 
-static int try_to_identify (ide_drive_t *drive, u8 cmd)
-{
-        ide_hwif_t *hwif = drive->hwif;
-        const struct ide_tp_ops *tp_ops = hwif->tp_ops;
-        int retval;
-        int autoprobe = 0;
-        unsigned long cookie = 0;
-
-        /*
-         * Disable device irq unless we need to
-         * probe for it. Otherwise we'll get spurious
-         * interrupts during the identify-phase that
-         * the irq handler isn't expecting.
-         */
-        if (hwif->io_ports.ctl_addr) {
-                if (!hwif->irq) {
-                        autoprobe = 1;
-                        cookie = probe_irq_on();
-                }
-                tp_ops->set_irq(hwif, autoprobe);
-        }
-
-        retval = actual_try_to_identify(drive, cmd);
-
-        if (autoprobe) {
-                int irq;
-
-                tp_ops->set_irq(hwif, 0);
-                /* clear drive IRQ */
-                (void)tp_ops->read_status(hwif);
-                udelay(5);
-                irq = probe_irq_off(cookie);
-                if (!hwif->irq) {
-                        if (irq > 0) {
-                                hwif->irq = irq;
-                        } else {
-                                /* Mmmm.. multiple IRQs..
-                                 * don't know which was ours
-                                 */
-                                printk(KERN_ERR "%s: IRQ probe failed (0x%lx)\n",
-                                        drive->name, cookie);
-                        }
-                }
-        }
-        return retval;
-}
-
 int ide_busy_sleep(ide_hwif_t *hwif, unsigned long timeout, int altstatus)
 {
         u8 stat;
@@ -440,6 +378,7 @@ static int do_probe (ide_drive_t *drive, u8 cmd)
 {
         ide_hwif_t *hwif = drive->hwif;
         const struct ide_tp_ops *tp_ops = hwif->tp_ops;
+        u16 *id = drive->id;
         int rc;
         u8 present = !!(drive->dev_flags & IDE_DFLAG_PRESENT), stat;
 
@@ -475,11 +414,10 @@ static int do_probe (ide_drive_t *drive, u8 cmd)
 
         if (OK_STAT(stat, ATA_DRDY, ATA_BUSY) ||
             present || cmd == ATA_CMD_ID_ATAPI) {
-                /* send cmd and wait */
-                if ((rc = try_to_identify(drive, cmd))) {
+                rc = ide_dev_read_id(drive, cmd, id);
+                if (rc)
                         /* failed: try again */
-                        rc = try_to_identify(drive,cmd);
-                }
+                        rc = ide_dev_read_id(drive, cmd, id);
 
                 stat = tp_ops->read_status(hwif);
 
@@ -494,7 +432,7 @@ static int do_probe (ide_drive_t *drive, u8 cmd)
                         msleep(50);
                         tp_ops->exec_command(hwif, ATA_CMD_DEV_RESET);
                         (void)ide_busy_sleep(hwif, WAIT_WORSTCASE, 0);
-                        rc = try_to_identify(drive, cmd);
+                        rc = ide_dev_read_id(drive, cmd, id);
                 }
 
                 /* ensure drive IRQ is clear */
@@ -517,37 +455,6 @@ static int do_probe (ide_drive_t *drive, u8 cmd)
         return rc;
 }
 
-/*
- *
- */
-static void enable_nest (ide_drive_t *drive)
-{
-        ide_hwif_t *hwif = drive->hwif;
-        const struct ide_tp_ops *tp_ops = hwif->tp_ops;
-        u8 stat;
-
-        printk(KERN_INFO "%s: enabling %s -- ",
-                hwif->name, (char *)&drive->id[ATA_ID_PROD]);
-
-        SELECT_DRIVE(drive);
-        msleep(50);
-        tp_ops->exec_command(hwif, ATA_EXABYTE_ENABLE_NEST);
-
-        if (ide_busy_sleep(hwif, WAIT_WORSTCASE, 0)) {
-                printk(KERN_CONT "failed (timeout)\n");
-                return;
-        }
-
-        msleep(50);
-
-        stat = tp_ops->read_status(hwif);
-
-        if (!OK_STAT(stat, 0, BAD_STAT))
-                printk(KERN_CONT "failed (status = 0x%02x)\n", stat);
-        else
-                printk(KERN_CONT "success\n");
-}
-
 /**
  *      probe_for_drives        -       upper level drive probe
  *      @drive: drive to probe for
@@ -563,6 +470,8 @@ static void enable_nest (ide_drive_t *drive)
 static u8 probe_for_drive(ide_drive_t *drive)
 {
         char *m;
+        int rc;
+        u8 cmd;
 
         /*
          *      In order to keep things simple we have an id
@@ -586,21 +495,19 @@ static u8 probe_for_drive(ide_drive_t *drive)
 
         /* skip probing? */
         if ((drive->dev_flags & IDE_DFLAG_NOPROBE) == 0) {
-retry:
                 /* if !(success||timed-out) */
-                if (do_probe(drive, ATA_CMD_ID_ATA) >= 2)
+                cmd = ATA_CMD_ID_ATA;
+                rc = do_probe(drive, cmd);
+                if (rc >= 2) {
                         /* look for ATAPI device */
-                        (void)do_probe(drive, ATA_CMD_ID_ATAPI);
+                        cmd = ATA_CMD_ID_ATAPI;
+                        rc = do_probe(drive, cmd);
+                }
 
                 if ((drive->dev_flags & IDE_DFLAG_PRESENT) == 0)
                         /* drive not found */
                         return 0;
 
-                if (strstr(m, "E X A B Y T E N E S T")) {
-                        enable_nest(drive);
-                        goto retry;
-                }
-
                 /* identification failed? */
                 if ((drive->dev_flags & IDE_DFLAG_ID_READ) == 0) {
                         if (drive->media == ide_disk) {
@@ -614,8 +521,12 @@ retry:
                                 printk(KERN_WARNING "%s: Unknown device on bus refused identification. Ignoring.\n", drive->name);
                                 drive->dev_flags &= ~IDE_DFLAG_PRESENT;
                         }
+                } else {
+                        if (cmd == ATA_CMD_ID_ATAPI)
+                                ide_classify_atapi_dev(drive);
+                        else
+                                ide_classify_ata_dev(drive);
                 }
-                /* drive was found */
         }
 
         if ((drive->dev_flags & IDE_DFLAG_PRESENT) == 0)
@@ -779,7 +690,6 @@ EXPORT_SYMBOL_GPL(ide_undecoded_slave);
 static int ide_probe_port(ide_hwif_t *hwif)
 {
         ide_drive_t *drive;
-        unsigned long flags;
         unsigned int irqd;
         int i, rc = -ENODEV;
 
@@ -797,9 +707,6 @@ static int ide_probe_port(ide_hwif_t *hwif)
         if (irqd)
                 disable_irq(hwif->irq);
 
-        local_save_flags(flags);
-        local_irq_enable_in_hardirq();
-
         if (ide_port_wait_ready(hwif) == -EBUSY)
                 printk(KERN_DEBUG "%s: Wait for ready failed before probe !\n", hwif->name);
 
@@ -813,8 +720,6 @@ static int ide_probe_port(ide_hwif_t *hwif)
                         rc = 0;
         }
 
-        local_irq_restore(flags);
-
         /*
          * Use cached IRQ number. It might be (and is...) changed by probe
          * code above
@@ -831,29 +736,18 @@ static void ide_port_tune_devices(ide_hwif_t *hwif)
         ide_drive_t *drive;
         int i;
 
-        ide_port_for_each_dev(i, drive, hwif) {
-                if (drive->dev_flags & IDE_DFLAG_PRESENT) {
-                        if (port_ops && port_ops->quirkproc)
-                                port_ops->quirkproc(drive);
-                }
+        ide_port_for_each_present_dev(i, drive, hwif) {
+                if (port_ops && port_ops->quirkproc)
+                        port_ops->quirkproc(drive);
         }
 
-        ide_port_for_each_dev(i, drive, hwif) {
-                if (drive->dev_flags & IDE_DFLAG_PRESENT) {
-                        ide_set_max_pio(drive);
+        ide_port_for_each_present_dev(i, drive, hwif) {
+                ide_set_max_pio(drive);
 
-                        drive->dev_flags |= IDE_DFLAG_NICE1;
-
-                        if (hwif->dma_ops)
-                                ide_set_dma(drive);
-                }
-        }
+                drive->dev_flags |= IDE_DFLAG_NICE1;
 
-        ide_port_for_each_dev(i, drive, hwif) {
-                if (hwif->host_flags & IDE_HFLAG_NO_IO_32BIT)
-                        drive->dev_flags |= IDE_DFLAG_NO_IO_32BIT;
-                else
-                        drive->dev_flags &= ~IDE_DFLAG_NO_IO_32BIT;
+                if (hwif->dma_ops)
+                        ide_set_dma(drive);
         }
 }
 
@@ -924,10 +818,7 @@ static int ide_port_setup_devices(ide_hwif_t *hwif)
         int i, j = 0;
 
         mutex_lock(&ide_cfg_mtx);
-        ide_port_for_each_dev(i, drive, hwif) {
-                if ((drive->dev_flags & IDE_DFLAG_PRESENT) == 0)
-                        continue;
-
+        ide_port_for_each_present_dev(i, drive, hwif) {
                 if (ide_init_queue(drive)) {
                         printk(KERN_ERR "ide: failed to init %s\n",
                                         drive->name);
@@ -953,13 +844,6 @@ static int init_irq (ide_hwif_t *hwif)
         irq_handler_t irq_handler;
         int sa = 0;
 
-        mutex_lock(&ide_cfg_mtx);
-        spin_lock_init(&hwif->lock);
-
-        init_timer(&hwif->timer);
-        hwif->timer.function = &ide_timer_expiry;
-        hwif->timer.data = (unsigned long)hwif;
-
         irq_handler = hwif->host->irq_handler;
         if (irq_handler == NULL)
                 irq_handler = ide_intr;
@@ -997,10 +881,8 @@ static int init_irq (ide_hwif_t *hwif)
                 printk(KERN_CONT " (serialized)");
         printk(KERN_CONT "\n");
 
-        mutex_unlock(&ide_cfg_mtx);
         return 0;
 out_up:
-        mutex_unlock(&ide_cfg_mtx);
         return 1;
 }
 
@@ -1099,14 +981,9 @@ static void drive_release_dev (struct device *dev)
 
 static int hwif_init(ide_hwif_t *hwif)
 {
-        int old_irq;
-
         if (!hwif->irq) {
-                hwif->irq = __ide_default_irq(hwif->io_ports.data_addr);
-                if (!hwif->irq) {
-                        printk(KERN_ERR "%s: disabled, no IRQ\n", hwif->name);
-                        return 0;
-                }
+                printk(KERN_ERR "%s: disabled, no IRQ\n", hwif->name);
+                return 0;
         }
 
         if (register_blkdev(hwif->major, hwif->name))
@@ -1124,29 +1001,12 @@ static int hwif_init(ide_hwif_t *hwif)
 
         sg_init_table(hwif->sg_table, hwif->sg_max_nents);
         
-        if (init_irq(hwif) == 0)
-                goto done;
-
-        old_irq = hwif->irq;
-        /*
-         *      It failed to initialise. Find the default IRQ for 
-         *      this port and try that.
-         */
-        hwif->irq = __ide_default_irq(hwif->io_ports.data_addr);
-        if (!hwif->irq) {
-                printk(KERN_ERR "%s: disabled, unable to get IRQ %d\n",
-                        hwif->name, old_irq);
-                goto out;
-        }
         if (init_irq(hwif)) {
-                printk(KERN_ERR "%s: probed IRQ %d and default IRQ %d failed\n",
-                        hwif->name, old_irq, hwif->irq);
+                printk(KERN_ERR "%s: disabled, unable to get IRQ %d\n",
+                        hwif->name, hwif->irq);
                 goto out;
         }
-        printk(KERN_WARNING "%s: probed IRQ %d failed, using default\n",
-                hwif->name, hwif->irq);
 
-done:
         blk_register_region(MKDEV(hwif->major, 0), MAX_DRIVES << PARTN_BITS,
                             THIS_MODULE, ata_probe, ata_lock, hwif);
         return 1;
@@ -1161,13 +1021,10 @@ static void hwif_register_devices(ide_hwif_t *hwif)
         ide_drive_t *drive;
         unsigned int i;
 
-        ide_port_for_each_dev(i, drive, hwif) {
+        ide_port_for_each_present_dev(i, drive, hwif) {
                 struct device *dev = &drive->gendev;
                 int ret;
 
-                if ((drive->dev_flags & IDE_DFLAG_PRESENT) == 0)
-                        continue;
-
                 dev_set_name(dev, "%u.%u", hwif->index, i);
                 dev->parent = &hwif->gendev;
                 dev->bus = &ide_bus_type;
@@ -1192,6 +1049,8 @@ static void ide_port_init_devices(ide_hwif_t *hwif)
 
                 if (hwif->host_flags & IDE_HFLAG_IO_32BIT)
                         drive->io_32bit = 1;
+                if (hwif->host_flags & IDE_HFLAG_NO_IO_32BIT)
+                        drive->dev_flags |= IDE_DFLAG_NO_IO_32BIT;
                 if (hwif->host_flags & IDE_HFLAG_UNMASK_IRQS)
                         drive->dev_flags |= IDE_DFLAG_UNMASK;
                 if (hwif->host_flags & IDE_HFLAG_NO_UNMASK_IRQS)
@@ -1213,10 +1072,6 @@ static void ide_init_port(ide_hwif_t *hwif, unsigned int port,
         if (d->init_iops)
                 d->init_iops(hwif);
 
-        if ((!hwif->irq && (d->host_flags & IDE_HFLAG_LEGACY_IRQS)) ||
-            (d->host_flags & IDE_HFLAG_FORCE_LEGACY_IRQS))
-                hwif->irq = port ? 15 : 14;
-
         /* ->host_flags may be set by ->init_iops (or even earlier...) */
         hwif->host_flags |= d->host_flags;
         hwif->pio_mask = d->pio_mask;
@@ -1317,6 +1172,12 @@ static void ide_init_port_data(ide_hwif_t *hwif, unsigned int index)
         hwif->name[2]   = 'e';
         hwif->name[3]   = '0' + index;
 
+        spin_lock_init(&hwif->lock);
+
+        init_timer(&hwif->timer);
+        hwif->timer.function = &ide_timer_expiry;
+        hwif->timer.data = (unsigned long)hwif;
+
         init_completion(&hwif->gendev_rel_comp);
 
         hwif->tp_ops = &default_tp_ops;
@@ -1567,7 +1428,7 @@ int ide_host_register(struct ide_host *host, const struct ide_port_info *d,
 
                 j++;
 
-                ide_acpi_init(hwif);
+                ide_acpi_init_port(hwif);
 
                 if (hwif->present)
                         ide_acpi_port_init_devices(hwif);
@@ -1624,11 +1485,9 @@ static void __ide_port_unregister_devices(ide_hwif_t *hwif)
         ide_drive_t *drive;
         int i;
 
-        ide_port_for_each_dev(i, drive, hwif) {
-                if (drive->dev_flags & IDE_DFLAG_PRESENT) {
-                        device_unregister(&drive->gendev);
-                        wait_for_completion(&drive->gendev_rel_comp);
-                }
+        ide_port_for_each_present_dev(i, drive, hwif) {
+                device_unregister(&drive->gendev);
+                wait_for_completion(&drive->gendev_rel_comp);
         }
 }