Merge branch 'for-2.6.31' of git://git.kernel.org/pub/scm/linux/kernel/git/bart/ide-2.6

* 'for-2.6.31' of git://git.kernel.org/pub/scm/linux/kernel/git/bart/ide-2.6: (29 commits)
  ide: re-implement ide_pci_init_one() on top of ide_pci_init_two()
  ide: unexport ide_find_dma_mode()
  ide: fix PowerMac bootup oops
  ide: skip probe if there are no devices on the port (v2)
  sl82c105: add printk() logging facility
  ide-tape: fix proc warning
  ide: add IDE_DFLAG_NIEN_QUIRK device flag
  ide: respect quirk_drives[] list on all controllers
  hpt366: enable all quirks for devices on quirk_drives[] list
  hpt366: sync quirk_drives[] list with pdc202xx_{new,old}.c
  ide: remove superfluous SELECT_MASK() call from do_rw_taskfile()
  ide: remove superfluous SELECT_MASK() call from ide_driveid_update()
  icside: remove superfluous ->maskproc method
  ide-tape: fix IDE_AFLAG_* atomic accesses
  ide-tape: change IDE_AFLAG_IGNORE_DSC non-atomically
  pdc202xx_old: kill resetproc() method
  pdc202xx_old: don't call pdc202xx_reset() on IRQ timeout
  pdc202xx_old: use ide_dma_test_irq()
  ide: preserve Host Protected Area by default (v2)
  ide-gd: implement block device ->set_capacity method (v2)
  ...

1 files changed, 53 insertions, 42 deletions

diff --git a/drivers/ide/ide-probe.c b/drivers/ide/ide-probe.c
index c895ed52b2e8..f371b0de314f 100644
--- a/drivers/ide/ide-probe.c
+++ b/drivers/ide/ide-probe.c
@@ -97,7 +97,7 @@ static void ide_disk_init_mult_count(ide_drive_t *drive)
                 drive->mult_req = id[ATA_ID_MULTSECT] & 0xff;
 
                 if (drive->mult_req)
-                        drive->special.b.set_multmode = 1;
+                        drive->special_flags |= IDE_SFLAG_SET_MULTMODE;
         }
 }
 
@@ -465,23 +465,8 @@ static u8 probe_for_drive(ide_drive_t *drive)
         int rc;
         u8 cmd;
 
-        /*
-         *      In order to keep things simple we have an id
-         *      block for all drives at all times. If the device
-         *      is pre ATA or refuses ATA/ATAPI identify we
-         *      will add faked data to this.
-         *
-         *      Also note that 0 everywhere means "can't do X"
-         */
- 
         drive->dev_flags &= ~IDE_DFLAG_ID_READ;
 
-        drive->id = kzalloc(SECTOR_SIZE, GFP_KERNEL);
-        if (drive->id == NULL) {
-                printk(KERN_ERR "ide: out of memory for id data.\n");
-                return 0;
-        }
-
         m = (char *)&drive->id[ATA_ID_PROD];
         strcpy(m, "UNKNOWN");
 
@@ -497,7 +482,7 @@ static u8 probe_for_drive(ide_drive_t *drive)
                 }
 
                 if ((drive->dev_flags & IDE_DFLAG_PRESENT) == 0)
-                        goto out_free;
+                        return 0;
 
                 /* identification failed? */
                 if ((drive->dev_flags & IDE_DFLAG_ID_READ) == 0) {
@@ -521,7 +506,7 @@ static u8 probe_for_drive(ide_drive_t *drive)
         }
 
         if ((drive->dev_flags & IDE_DFLAG_PRESENT) == 0)
-                goto out_free;
+                return 0;
 
         /* The drive wasn't being helpful. Add generic info only */
         if ((drive->dev_flags & IDE_DFLAG_ID_READ) == 0) {
@@ -535,9 +520,6 @@ static u8 probe_for_drive(ide_drive_t *drive)
         }
 
         return 1;
-out_free:
-        kfree(drive->id);
-        return 0;
 }
 
 static void hwif_release_dev(struct device *dev)
@@ -702,8 +684,14 @@ static int ide_probe_port(ide_hwif_t *hwif)
         if (irqd)
                 disable_irq(hwif->irq);
 
-        if (ide_port_wait_ready(hwif) == -EBUSY)
-                printk(KERN_DEBUG "%s: Wait for ready failed before probe !\n", hwif->name);
+        rc = ide_port_wait_ready(hwif);
+        if (rc == -ENODEV) {
+                printk(KERN_INFO "%s: no devices on the port\n", hwif->name);
+                goto out;
+        } else if (rc == -EBUSY)
+                printk(KERN_ERR "%s: not ready before the probe\n", hwif->name);
+        else
+                rc = -ENODEV;
 
         /*
          * Second drive should only exist if first drive was found,
@@ -714,7 +702,7 @@ static int ide_probe_port(ide_hwif_t *hwif)
                 if (drive->dev_flags & IDE_DFLAG_PRESENT)
                         rc = 0;
         }
-
+out:
         /*
          * Use cached IRQ number. It might be (and is...) changed by probe
          * code above
@@ -732,6 +720,8 @@ static void ide_port_tune_devices(ide_hwif_t *hwif)
         int i;
 
         ide_port_for_each_present_dev(i, drive, hwif) {
+                ide_check_nien_quirk_list(drive);
+
                 if (port_ops && port_ops->quirkproc)
                         port_ops->quirkproc(drive);
         }
@@ -817,8 +807,6 @@ static int ide_port_setup_devices(ide_hwif_t *hwif)
                 if (ide_init_queue(drive)) {
                         printk(KERN_ERR "ide: failed to init %s\n",
                                         drive->name);
-                        kfree(drive->id);
-                        drive->id = NULL;
                         drive->dev_flags &= ~IDE_DFLAG_PRESENT;
                         continue;
                 }
@@ -947,9 +935,6 @@ static void drive_release_dev (struct device *dev)
         blk_cleanup_queue(drive->queue);
         drive->queue = NULL;
 
-        kfree(drive->id);
-        drive->id = NULL;
-
         drive->dev_flags &= ~IDE_DFLAG_PRESENT;
 
         complete(&drive->gendev_rel_comp);
@@ -1035,6 +1020,15 @@ static void ide_port_init_devices(ide_hwif_t *hwif)
                 if (port_ops && port_ops->init_dev)
                         port_ops->init_dev(drive);
         }
+
+        ide_port_for_each_dev(i, drive, hwif) {
+                /*
+                 * default to PIO Mode 0 before we figure out
+                 * the most suited mode for the attached device
+                 */
+                if (port_ops && port_ops->set_pio_mode)
+                        port_ops->set_pio_mode(drive, 0);
+        }
 }
 
 static void ide_init_port(ide_hwif_t *hwif, unsigned int port,
@@ -1042,8 +1036,7 @@ static void ide_init_port(ide_hwif_t *hwif, unsigned int port,
 {
         hwif->channel = port;
 
-        if (d->chipset)
-                hwif->chipset = d->chipset;
+        hwif->chipset = d->chipset ? d->chipset : ide_pci;
 
         if (d->init_iops)
                 d->init_iops(hwif);
@@ -1124,16 +1117,19 @@ static void ide_port_init_devices_data(ide_hwif_t *hwif)
 
         ide_port_for_each_dev(i, drive, hwif) {
                 u8 j = (hwif->index * MAX_DRIVES) + i;
+                u16 *saved_id = drive->id;
 
                 memset(drive, 0, sizeof(*drive));
+                memset(saved_id, 0, SECTOR_SIZE);
+                drive->id = saved_id;
 
                 drive->media                    = ide_disk;
                 drive->select                   = (i << 4) | ATA_DEVICE_OBS;
                 drive->hwif                     = hwif;
                 drive->ready_stat               = ATA_DRDY;
                 drive->bad_wstat                = BAD_W_STAT;
-                drive->special.b.recalibrate    = 1;
-                drive->special.b.set_geometry   = 1;
+                drive->special_flags            = IDE_SFLAG_RECALIBRATE |
+                                                  IDE_SFLAG_SET_GEOMETRY;
                 drive->name[0]                  = 'h';
                 drive->name[1]                  = 'd';
                 drive->name[2]                  = 'a' + j;
@@ -1168,11 +1164,10 @@ static void ide_init_port_data(ide_hwif_t *hwif, unsigned int index)
         ide_port_init_devices_data(hwif);
 }
 
-static void ide_init_port_hw(ide_hwif_t *hwif, hw_regs_t *hw)
+static void ide_init_port_hw(ide_hwif_t *hwif, struct ide_hw *hw)
 {
         memcpy(&hwif->io_ports, &hw->io_ports, sizeof(hwif->io_ports));
         hwif->irq = hw->irq;
-        hwif->chipset = hw->chipset;
         hwif->dev = hw->dev;
         hwif->gendev.parent = hw->parent ? hw->parent : hw->dev;
         hwif->ack_intr = hw->ack_intr;
@@ -1233,8 +1228,10 @@ static void ide_port_free_devices(ide_hwif_t *hwif)
         ide_drive_t *drive;
         int i;
 
-        ide_port_for_each_dev(i, drive, hwif)
+        ide_port_for_each_dev(i, drive, hwif) {
+                kfree(drive->id);
                 kfree(drive);
+        }
 }
 
 static int ide_port_alloc_devices(ide_hwif_t *hwif, int node)
@@ -1248,6 +1245,18 @@ static int ide_port_alloc_devices(ide_hwif_t *hwif, int node)
                 if (drive == NULL)
                         goto out_nomem;
 
+                /*
+                 * In order to keep things simple we have an id
+                 * block for all drives at all times. If the device
+                 * is pre ATA or refuses ATA/ATAPI identify we
+                 * will add faked data to this.
+                 *
+                 * Also note that 0 everywhere means "can't do X"
+                 */
+                drive->id = kzalloc_node(SECTOR_SIZE, GFP_KERNEL, node);
+                if (drive->id == NULL)
+                        goto out_nomem;
+
                 hwif->devices[i] = drive;
         }
         return 0;
@@ -1257,7 +1266,8 @@ out_nomem:
         return -ENOMEM;
 }
 
-struct ide_host *ide_host_alloc(const struct ide_port_info *d, hw_regs_t **hws)
+struct ide_host *ide_host_alloc(const struct ide_port_info *d,
+                                struct ide_hw **hws, unsigned int n_ports)
 {
         struct ide_host *host;
         struct device *dev = hws[0] ? hws[0]->dev : NULL;
@@ -1268,7 +1278,7 @@ struct ide_host *ide_host_alloc(const struct ide_port_info *d, hw_regs_t **hws)
         if (host == NULL)
                 return NULL;
 
-        for (i = 0; i < MAX_HOST_PORTS; i++) {
+        for (i = 0; i < n_ports; i++) {
                 ide_hwif_t *hwif;
                 int idx;
 
@@ -1288,6 +1298,7 @@ struct ide_host *ide_host_alloc(const struct ide_port_info *d, hw_regs_t **hws)
                 if (idx < 0) {
                         printk(KERN_ERR "%s: no free slot for interface\n",
                                         d ? d->name : "ide");
+                        ide_port_free_devices(hwif);
                         kfree(hwif);
                         continue;
                 }
@@ -1344,7 +1355,7 @@ static void ide_disable_port(ide_hwif_t *hwif)
 }
 
 int ide_host_register(struct ide_host *host, const struct ide_port_info *d,
-                      hw_regs_t **hws)
+                      struct ide_hw **hws)
 {
         ide_hwif_t *hwif, *mate = NULL;
         int i, j = 0;
@@ -1438,13 +1449,13 @@ int ide_host_register(struct ide_host *host, const struct ide_port_info *d,
 }
 EXPORT_SYMBOL_GPL(ide_host_register);
 
-int ide_host_add(const struct ide_port_info *d, hw_regs_t **hws,
-                 struct ide_host **hostp)
+int ide_host_add(const struct ide_port_info *d, struct ide_hw **hws,
+                 unsigned int n_ports, struct ide_host **hostp)
 {
         struct ide_host *host;
         int rc;
 
-        host = ide_host_alloc(d, hws);
+        host = ide_host_alloc(d, hws, n_ports);
         if (host == NULL)
                 return -ENOMEM;