7 files changed, 99 insertions, 49 deletions

diff --git a/drivers/ide/ide-acpi.c b/drivers/ide/ide-acpi.c
index 89df48fdc69d..899d56536e80 100644
--- a/drivers/ide/ide-acpi.c
+++ b/drivers/ide/ide-acpi.c
@@ -16,6 +16,7 @@
 #include <acpi/acpi.h>
 #include <linux/ide.h>
 #include <linux/pci.h>
+#include <linux/dmi.h>
 
 #include <acpi/acpi_bus.h>
 #include <acpi/acnames.h>
@@ -65,6 +66,39 @@ extern int ide_noacpi;
 extern int ide_noacpitfs;
 extern int ide_noacpionboot;
 
+static bool ide_noacpi_psx;
+static int no_acpi_psx(const struct dmi_system_id *id)
+{
+        ide_noacpi_psx = true;
+        printk(KERN_NOTICE"%s detected - disable ACPI _PSx.\n", id->ident);
+        return 0;
+}
+
+static const struct dmi_system_id ide_acpi_dmi_table[] = {
+        /* Bug 9673. */
+        /* We should check if this is because ACPI NVS isn't save/restored. */
+        {
+                .callback = no_acpi_psx,
+                .ident    = "HP nx9005",
+                .matches  = {
+                        DMI_MATCH(DMI_BIOS_VENDOR, "Phoenix Technologies Ltd."),
+                        DMI_MATCH(DMI_BIOS_VERSION, "KAM1.60")
+                },
+        },
+
+        { }     /* terminate list */
+};
+
+static int ide_acpi_blacklist(void)
+{
+        static int done;
+        if (done)
+                return 0;
+        done = 1;
+        dmi_check_system(ide_acpi_dmi_table);
+        return 0;
+}
+
 /**
  * ide_get_dev_handle - finds acpi_handle and PCI device.function
  * @dev: device to locate
@@ -623,7 +657,7 @@ void ide_acpi_set_state(ide_hwif_t *hwif, int on)
 {
         int unit;
 
-        if (ide_noacpi)
+        if (ide_noacpi || ide_noacpi_psx)
                 return;
 
         DEBPRINT("ENTER:\n");
@@ -668,6 +702,8 @@ void ide_acpi_init(ide_hwif_t *hwif)
         struct ide_acpi_drive_link      *master;
         struct ide_acpi_drive_link      *slave;
 
+        ide_acpi_blacklist();
+
         hwif->acpidata = kzalloc(sizeof(struct ide_acpi_hwif_link), GFP_KERNEL);
         if (!hwif->acpidata)
                 return;
diff --git a/drivers/ide/ide-cd.c b/drivers/ide/ide-cd.c
index 92ac658dac33..c7d77f0ad892 100644
--- a/drivers/ide/ide-cd.c
+++ b/drivers/ide/ide-cd.c
@@ -1068,8 +1068,8 @@ int cdrom_read_check_ireason (ide_drive_t *drive, int len, int ireason)
                 return 0;
         else if (ireason == 0) {
                 /* Whoops... The drive is expecting to receive data from us! */
-                printk(KERN_ERR "%s: read_intr: Drive wants to transfer data the "
-                                                "wrong way!\n", drive->name);
+                printk(KERN_ERR "%s: %s: wrong transfer direction!\n",
+                                drive->name, __FUNCTION__);
 
                 /* Throw some data at the drive so it doesn't hang
                    and quit this request. */
@@ -1086,8 +1086,8 @@ int cdrom_read_check_ireason (ide_drive_t *drive, int len, int ireason)
                 return 0;
         } else {
                 /* Drive wants a command packet, or invalid ireason... */
-                printk(KERN_ERR "%s: read_intr: bad interrupt reason %x\n", drive->name,
-                                                                ireason);
+                printk(KERN_ERR "%s: %s: bad interrupt reason 0x%02x\n",
+                                drive->name, __FUNCTION__, ireason);
         }
 
         cdrom_end_request(drive, 0);
@@ -1112,8 +1112,11 @@ static ide_startstop_t cdrom_read_intr (ide_drive_t *drive)
          */
         if (dma) {
                 info->dma = 0;
-                if ((dma_error = HWIF(drive)->ide_dma_end(drive)))
+                dma_error = HWIF(drive)->ide_dma_end(drive);
+                if (dma_error) {
+                        printk(KERN_ERR "%s: DMA read error\n", drive->name);
                         ide_dma_off(drive);
+                }
         }
 
         if (cdrom_decode_status(drive, 0, &stat))
@@ -1443,7 +1446,7 @@ static ide_startstop_t cdrom_pc_intr (ide_drive_t *drive)
                 return ide_stopped;
 
         /* Read the interrupt reason and the transfer length. */
-        ireason = HWIF(drive)->INB(IDE_IREASON_REG);
+        ireason = HWIF(drive)->INB(IDE_IREASON_REG) & 0x3;
         lowcyl  = HWIF(drive)->INB(IDE_BCOUNTL_REG);
         highcyl = HWIF(drive)->INB(IDE_BCOUNTH_REG);
 
@@ -1484,7 +1487,7 @@ static ide_startstop_t cdrom_pc_intr (ide_drive_t *drive)
         if (thislen > len) thislen = len;
 
         /* The drive wants to be written to. */
-        if ((ireason & 3) == 0) {
+        if (ireason == 0) {
                 if (!rq->data) {
                         blk_dump_rq_flags(rq, "cdrom_pc_intr, write");
                         goto confused;
@@ -1506,9 +1509,9 @@ static ide_startstop_t cdrom_pc_intr (ide_drive_t *drive)
         }
 
         /* Same drill for reading. */
-        else if ((ireason & 3) == 2) {
+        else if (ireason == 2) {
                 if (!rq->data) {
-                        blk_dump_rq_flags(rq, "cdrom_pc_intr, write");
+                        blk_dump_rq_flags(rq, "cdrom_pc_intr, read");
                         goto confused;
                 }
                 /* Transfer the data. */
@@ -1632,8 +1635,8 @@ static int cdrom_write_check_ireason(ide_drive_t *drive, int len, int ireason)
                 return 0;
         else if (ireason == 2) {
                 /* Whoops... The drive wants to send data. */
-                printk(KERN_ERR "%s: write_intr: wrong transfer direction!\n",
-                                                        drive->name);
+                printk(KERN_ERR "%s: %s: wrong transfer direction!\n",
+                                drive->name, __FUNCTION__);
 
                 while (len > 0) {
                         int dum = 0;
@@ -1642,8 +1645,8 @@ static int cdrom_write_check_ireason(ide_drive_t *drive, int len, int ireason)
                 }
         } else {
                 /* Drive wants a command packet, or invalid ireason... */
-                printk(KERN_ERR "%s: write_intr: bad interrupt reason %x\n",
-                                                        drive->name, ireason);
+                printk(KERN_ERR "%s: %s: bad interrupt reason 0x%02x\n",
+                                drive->name, __FUNCTION__, ireason);
         }
 
         cdrom_end_request(drive, 0);
@@ -1805,8 +1808,9 @@ static ide_startstop_t cdrom_write_intr(ide_drive_t *drive)
         /* Check for errors. */
         if (dma) {
                 info->dma = 0;
-                if ((dma_error = HWIF(drive)->ide_dma_end(drive))) {
-                        printk(KERN_ERR "ide-cd: write dma error\n");
+                dma_error = HWIF(drive)->ide_dma_end(drive);
+                if (dma_error) {
+                        printk(KERN_ERR "%s: DMA write error\n", drive->name);
                         ide_dma_off(drive);
                 }
         }
@@ -1826,7 +1830,7 @@ static ide_startstop_t cdrom_write_intr(ide_drive_t *drive)
         }
 
         /* Read the interrupt reason and the transfer length. */
-        ireason = HWIF(drive)->INB(IDE_IREASON_REG);
+        ireason = HWIF(drive)->INB(IDE_IREASON_REG) & 0x3;
         lowcyl  = HWIF(drive)->INB(IDE_BCOUNTL_REG);
         highcyl = HWIF(drive)->INB(IDE_BCOUNTH_REG);
 
@@ -1839,8 +1843,9 @@ static ide_startstop_t cdrom_write_intr(ide_drive_t *drive)
                  */
                 uptodate = 1;
                 if (rq->current_nr_sectors > 0) {
-                        printk(KERN_ERR "%s: write_intr: data underrun (%d blocks)\n",
-                        drive->name, rq->current_nr_sectors);
+                        printk(KERN_ERR "%s: %s: data underrun (%d blocks)\n",
+                                        drive->name, __FUNCTION__,
+                                        rq->current_nr_sectors);
                         uptodate = 0;
                 }
                 cdrom_end_request(drive, uptodate);
@@ -1860,7 +1865,8 @@ static ide_startstop_t cdrom_write_intr(ide_drive_t *drive)
                 int this_transfer;
 
                 if (!rq->current_nr_sectors) {
-                        printk(KERN_ERR "ide-cd: write_intr: oops\n");
+                        printk(KERN_ERR "%s: %s: confused, missing data\n",
+                                        drive->name, __FUNCTION__);
                         break;
                 }
 
@@ -2688,14 +2694,14 @@ void ide_cdrom_update_speed (ide_drive_t *drive, struct atapi_capabilities_page
         if (!drive->id->model[0] &&
             !strncmp(drive->id->fw_rev, "241N", 4)) {
                 CDROM_STATE_FLAGS(drive)->current_speed  =
-                        (((unsigned int)cap->curspeed) + (176/2)) / 176;
+                        (le16_to_cpu(cap->curspeed) + (176/2)) / 176;
                 CDROM_CONFIG_FLAGS(drive)->max_speed =
-                        (((unsigned int)cap->maxspeed) + (176/2)) / 176;
+                        (le16_to_cpu(cap->maxspeed) + (176/2)) / 176;
         } else {
                 CDROM_STATE_FLAGS(drive)->current_speed  =
-                        (ntohs(cap->curspeed) + (176/2)) / 176;
+                        (be16_to_cpu(cap->curspeed) + (176/2)) / 176;
                 CDROM_CONFIG_FLAGS(drive)->max_speed =
-                        (ntohs(cap->maxspeed) + (176/2)) / 176;
+                        (be16_to_cpu(cap->maxspeed) + (176/2)) / 176;
         }
 }
 
@@ -2909,6 +2915,9 @@ static int ide_cdrom_register (ide_drive_t *drive, int nslots)
         if (!CDROM_CONFIG_FLAGS(drive)->ram)
                 devinfo->mask |= CDC_RAM;
 
+        if (CDROM_CONFIG_FLAGS(drive)->no_speed_select)
+                devinfo->mask |= CDC_SELECT_SPEED;
+
         devinfo->disk = info->disk;
         return register_cdrom(devinfo);
 }
@@ -3161,7 +3170,7 @@ int ide_cdrom_setup (ide_drive_t *drive)
                 CDROM_CONFIG_FLAGS(drive)->limit_nframes = 1;
         /* the 3231 model does not support the SET_CD_SPEED command */
         else if (!strcmp(drive->id->model, "SAMSUNG CD-ROM SCR-3231"))
-                cdi->mask |= CDC_SELECT_SPEED;
+                CDROM_CONFIG_FLAGS(drive)->no_speed_select = 1;
 
 #if ! STANDARD_ATAPI
         /* by default Sanyo 3 CD changer support is turned off and
@@ -3504,15 +3513,8 @@ static int ide_cd_probe(ide_drive_t *drive)
         g->driverfs_dev = &drive->gendev;
         g->flags = GENHD_FL_CD | GENHD_FL_REMOVABLE;
         if (ide_cdrom_setup(drive)) {
-                struct cdrom_device_info *devinfo = &info->devinfo;
                 ide_proc_unregister_driver(drive, &ide_cdrom_driver);
-                kfree(info->buffer);
-                kfree(info->toc);
-                kfree(info->changer_info);
-                if (devinfo->handle == drive && unregister_cdrom(devinfo))
-                        printk (KERN_ERR "%s: ide_cdrom_cleanup failed to unregister device from the cdrom driver.\n", drive->name);
-                kfree(info);
-                drive->driver_data = NULL;
+                ide_cd_release(&info->kref);
                 goto failed;
         }
 
diff --git a/drivers/ide/ide-cd.h b/drivers/ide/ide-cd.h
index 228b29c5d2e4..1b302fe2724d 100644
--- a/drivers/ide/ide-cd.h
+++ b/drivers/ide/ide-cd.h
@@ -91,7 +91,8 @@ struct ide_cd_config_flags {
         __u8 close_tray         : 1; /* can close the tray */
         __u8 writing            : 1; /* pseudo write in progress */
         __u8 mo_drive           : 1; /* drive is an MO device */
-        __u8 reserved           : 2;
+        __u8 no_speed_select    : 1; /* SET_CD_SPEED command is unsupported. */
+        __u8 reserved           : 1;
         byte max_speed;              /* Max speed of the drive */
 };
 #define CDROM_CONFIG_FLAGS(drive) (&(((struct cdrom_info *)(drive->driver_data))->config_flags))
diff --git a/drivers/ide/ide-iops.c b/drivers/ide/ide-iops.c
index cef405ddaf0e..bb9693dabe41 100644
--- a/drivers/ide/ide-iops.c
+++ b/drivers/ide/ide-iops.c
@@ -612,12 +612,12 @@ u8 eighty_ninty_three (ide_drive_t *drive)
                 printk(KERN_DEBUG "%s: skipping word 93 validity check\n",
                                   drive->name);
 
+        if (ide_dev_is_sata(id) && !ivb)
+                return 1;
+
         if (hwif->cbl != ATA_CBL_PATA80 && !ivb)
                 goto no_80w;
 
-        if (ide_dev_is_sata(id))
-                return 1;
-
         /*
          * FIXME:
          * - force bit13 (80c cable present) check also for !ivb devices
diff --git a/drivers/ide/pci/cmd64x.c b/drivers/ide/pci/cmd64x.c
index 51fca441c294..bc553337b1be 100644
--- a/drivers/ide/pci/cmd64x.c
+++ b/drivers/ide/pci/cmd64x.c
@@ -1,5 +1,5 @@
 /*
- * linux/drivers/ide/pci/cmd64x.c               Version 1.51    Nov 8, 2007
+ * linux/drivers/ide/pci/cmd64x.c               Version 1.52    Dec 24, 2007
  *
  * cmd64x.c: Enable interrupts at initialization time on Ultra/PCI machines.
  *           Due to massive hardware bugs, UltraDMA is only supported
@@ -564,6 +564,7 @@ static const struct ide_port_info cmd64x_chipsets[] __devinitdata = {
                 .init_chipset   = init_chipset_cmd64x,
                 .init_hwif      = init_hwif_cmd64x,
                 .enablebits     = {{0x51,0x04,0x04}, {0x51,0x08,0x08}},
+                .chipset        = ide_cmd646,
                 .host_flags     = IDE_HFLAG_ABUSE_PREFETCH | IDE_HFLAG_BOOTABLE,
                 .pio_mask       = ATA_PIO5,
                 .mwdma_mask     = ATA_MWDMA2,
@@ -573,7 +574,6 @@ static const struct ide_port_info cmd64x_chipsets[] __devinitdata = {
                 .init_chipset   = init_chipset_cmd64x,
                 .init_hwif      = init_hwif_cmd64x,
                 .enablebits     = {{0x51,0x04,0x04}, {0x51,0x08,0x08}},
-                .chipset        = ide_cmd646,
                 .host_flags     = IDE_HFLAG_ABUSE_PREFETCH | IDE_HFLAG_BOOTABLE,
                 .pio_mask       = ATA_PIO5,
                 .mwdma_mask     = ATA_MWDMA2,
diff --git a/drivers/ide/pci/cs5535.c b/drivers/ide/pci/cs5535.c
index 9094916e3780..ddcbeba671e1 100644
--- a/drivers/ide/pci/cs5535.c
+++ b/drivers/ide/pci/cs5535.c
@@ -49,7 +49,7 @@
 #define ATAC_BM0_PRD            0x04
 #define CS5535_CABLE_DETECT     0x48
 
-/* Format I PIO settings. We seperate out cmd and data for safer timings */
+/* Format I PIO settings. We separate out cmd and data for safer timings */
 
 static unsigned int cs5535_pio_cmd_timings[5] =
 { 0xF7F4, 0x53F3, 0x13F1, 0x5131, 0x1131 };
diff --git a/drivers/ide/pci/trm290.c b/drivers/ide/pci/trm290.c
index 0895e753a35d..0151d7fdfb8a 100644
--- a/drivers/ide/pci/trm290.c
+++ b/drivers/ide/pci/trm290.c
@@ -1,7 +1,8 @@
 /*
- *  linux/drivers/ide/pci/trm290.c              Version 1.02    Mar. 18, 2000
+ *  linux/drivers/ide/pci/trm290.c              Version 1.05    Dec. 26, 2007
  *
  *  Copyright (c) 1997-1998  Mark Lord
+ *  Copyright (c) 2007       MontaVista Software, Inc. <source@mvista.com>
  *  May be copied or modified under the terms of the GNU General Public License
  *
  *  June 22, 2004 - get rid of check_region
@@ -177,7 +178,7 @@ static void trm290_selectproc (ide_drive_t *drive)
         trm290_prepare_drive(drive, drive->using_dma);
 }
 
-static void trm290_ide_dma_exec_cmd(ide_drive_t *drive, u8 command)
+static void trm290_dma_exec_cmd(ide_drive_t *drive, u8 command)
 {
         BUG_ON(HWGROUP(drive)->handler != NULL);        /* paranoia check */
         ide_set_handler(drive, &ide_dma_intr, WAIT_CMD, NULL);
@@ -185,7 +186,7 @@ static void trm290_ide_dma_exec_cmd(ide_drive_t *drive, u8 command)
         outb(command, IDE_COMMAND_REG);
 }
 
-static int trm290_ide_dma_setup(ide_drive_t *drive)
+static int trm290_dma_setup(ide_drive_t *drive)
 {
         ide_hwif_t *hwif = drive->hwif;
         struct request *rq = hwif->hwgroup->rq;
@@ -215,7 +216,7 @@ static int trm290_ide_dma_setup(ide_drive_t *drive)
         return 0;
 }
 
-static void trm290_ide_dma_start(ide_drive_t *drive)
+static void trm290_dma_start(ide_drive_t *drive)
 {
 }
 
@@ -240,6 +241,14 @@ static int trm290_ide_dma_test_irq (ide_drive_t *drive)
         return (status == 0x00ff);
 }
 
+static void trm290_dma_host_on(ide_drive_t *drive)
+{
+}
+
+static void trm290_dma_host_off(ide_drive_t *drive)
+{
+}
+
 static void __devinit init_hwif_trm290(ide_hwif_t *hwif)
 {
         unsigned int cfgbase = 0;
@@ -280,11 +289,13 @@ static void __devinit init_hwif_trm290(ide_hwif_t *hwif)
 
         ide_setup_dma(hwif, (hwif->config_data + 4) ^ (hwif->channel ? 0x0080 : 0x0000), 3);
 
-        hwif->dma_setup = &trm290_ide_dma_setup;
-        hwif->dma_exec_cmd = &trm290_ide_dma_exec_cmd;
-        hwif->dma_start = &trm290_ide_dma_start;
-        hwif->ide_dma_end = &trm290_ide_dma_end;
-        hwif->ide_dma_test_irq = &trm290_ide_dma_test_irq;
+        hwif->dma_host_off      = &trm290_dma_host_off;
+        hwif->dma_host_on       = &trm290_dma_host_on;
+        hwif->dma_setup         = &trm290_dma_setup;
+        hwif->dma_exec_cmd      = &trm290_dma_exec_cmd;
+        hwif->dma_start         = &trm290_dma_start;
+        hwif->ide_dma_end       = &trm290_ide_dma_end;
+        hwif->ide_dma_test_irq  = &trm290_ide_dma_test_irq;
 
         hwif->selectproc = &trm290_selectproc;
 #if 1