7 files changed, 93 insertions, 52 deletions

diff --git a/drivers/ide/Kconfig b/drivers/ide/Kconfig
index 3ac0a535b4aa..0273f124a4f7 100644
--- a/drivers/ide/Kconfig
+++ b/drivers/ide/Kconfig
@@ -672,8 +672,8 @@ config BLK_DEV_SVWKS
           chipsets.
 
 config BLK_DEV_SGIIOC4
-        tristate "Silicon Graphics IOC4 chipset support"
-        depends on IA64_SGI_SN2 || IA64_GENERIC
+        tristate "Silicon Graphics IOC4 chipset ATA/ATAPI support"
+        depends on (IA64_SGI_SN2 || IA64_GENERIC) && SGI_IOC4
         help
           This driver adds PIO & MultiMode DMA-2 support for the SGI IOC4
           chipset, which has one channel and can support two devices.
diff --git a/drivers/ide/ide-cd.c b/drivers/ide/ide-cd.c
index 78e3e7b24d7d..0a31cfda08a0 100644
--- a/drivers/ide/ide-cd.c
+++ b/drivers/ide/ide-cd.c
@@ -1936,7 +1936,7 @@ static ide_startstop_t cdrom_do_block_pc(ide_drive_t *drive, struct request *rq)
                  * NOTE! The "len" and "addr" checks should possibly have
                  * separate masks.
                  */
-                if ((rq->data_len & mask) || (addr & mask))
+                if ((rq->data_len & 15) || (addr & mask))
                         info->dma = 0;
         }
 
@@ -2657,16 +2657,63 @@ int ide_cdrom_lock_door (struct cdrom_device_info *cdi, int lock)
 }
 
 static
+int ide_cdrom_get_capabilities(ide_drive_t *drive, struct atapi_capabilities_page *cap)
+{
+        struct cdrom_info *info = drive->driver_data;
+        struct cdrom_device_info *cdi = &info->devinfo;
+        struct packet_command cgc;
+        int stat, attempts = 3, size = sizeof(*cap);
+
+        /*
+         * ACER50 (and others?) require the full spec length mode sense
+         * page capabilities size, but older drives break.
+         */
+        if (!(!strcmp(drive->id->model, "ATAPI CD ROM DRIVE 50X MAX") ||
+            !strcmp(drive->id->model, "WPI CDS-32X")))
+                size -= sizeof(cap->pad);
+
+        init_cdrom_command(&cgc, cap, size, CGC_DATA_UNKNOWN);
+        do { /* we seem to get stat=0x01,err=0x00 the first time (??) */
+                stat = cdrom_mode_sense(cdi, &cgc, GPMODE_CAPABILITIES_PAGE, 0);
+                if (!stat)
+                        break;
+        } while (--attempts);
+        return stat;
+}
+
+static
+void ide_cdrom_update_speed (ide_drive_t *drive, struct atapi_capabilities_page *cap)
+{
+        /* The ACER/AOpen 24X cdrom has the speed fields byte-swapped */
+        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;
+                CDROM_CONFIG_FLAGS(drive)->max_speed =
+                        (((unsigned int)cap->maxspeed) + (176/2)) / 176;
+        } else {
+                CDROM_STATE_FLAGS(drive)->current_speed  =
+                        (ntohs(cap->curspeed) + (176/2)) / 176;
+                CDROM_CONFIG_FLAGS(drive)->max_speed =
+                        (ntohs(cap->maxspeed) + (176/2)) / 176;
+        }
+}
+
+static
 int ide_cdrom_select_speed (struct cdrom_device_info *cdi, int speed)
 {
         ide_drive_t *drive = (ide_drive_t*) cdi->handle;
         struct request_sense sense;
+        struct atapi_capabilities_page cap;
         int stat;
 
         if ((stat = cdrom_select_speed(drive, speed, &sense)) < 0)
                 return stat;
 
-        cdi->speed = CDROM_STATE_FLAGS(drive)->current_speed;
+        if (!ide_cdrom_get_capabilities(drive, &cap)) {
+                ide_cdrom_update_speed(drive, &cap);
+                cdi->speed = CDROM_STATE_FLAGS(drive)->current_speed;
+        }
         return 0;
 }
 
@@ -2869,31 +2916,6 @@ static int ide_cdrom_register (ide_drive_t *drive, int nslots)
 }
 
 static
-int ide_cdrom_get_capabilities(ide_drive_t *drive, struct atapi_capabilities_page *cap)
-{
-        struct cdrom_info *info = drive->driver_data;
-        struct cdrom_device_info *cdi = &info->devinfo;
-        struct packet_command cgc;
-        int stat, attempts = 3, size = sizeof(*cap);
-
-        /*
-         * ACER50 (and others?) require the full spec length mode sense
-         * page capabilities size, but older drives break.
-         */
-        if (!(!strcmp(drive->id->model, "ATAPI CD ROM DRIVE 50X MAX") ||
-            !strcmp(drive->id->model, "WPI CDS-32X")))
-                size -= sizeof(cap->pad);
-
-        init_cdrom_command(&cgc, cap, size, CGC_DATA_UNKNOWN);
-        do { /* we seem to get stat=0x01,err=0x00 the first time (??) */
-                stat = cdrom_mode_sense(cdi, &cgc, GPMODE_CAPABILITIES_PAGE, 0);
-                if (!stat)
-                        break;
-        } while (--attempts);
-        return stat;
-}
-
-static
 int ide_cdrom_probe_capabilities (ide_drive_t *drive)
 {
         struct cdrom_info *info = drive->driver_data;
@@ -2978,20 +3000,7 @@ int ide_cdrom_probe_capabilities (ide_drive_t *drive)
                 }
         }
 
-        /* The ACER/AOpen 24X cdrom has the speed fields byte-swapped */
-        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;
-                CDROM_CONFIG_FLAGS(drive)->max_speed = 
-                        (((unsigned int)cap.maxspeed) + (176/2)) / 176;
-        } else {
-                CDROM_STATE_FLAGS(drive)->current_speed  = 
-                        (ntohs(cap.curspeed) + (176/2)) / 176;
-                CDROM_CONFIG_FLAGS(drive)->max_speed = 
-                        (ntohs(cap.maxspeed) + (176/2)) / 176;
-        }
-
+        ide_cdrom_update_speed(drive, &cap);
         /* don't print speed if the drive reported 0.
          */
         printk(KERN_INFO "%s: ATAPI", drive->name);
diff --git a/drivers/ide/ide-disk.c b/drivers/ide/ide-disk.c
index 3302cd8eab4c..d6f934886b04 100644
--- a/drivers/ide/ide-disk.c
+++ b/drivers/ide/ide-disk.c
@@ -1215,7 +1215,8 @@ static int ide_disk_probe(struct device *dev)
         if (!idkp)
                 goto failed;
 
-        g = alloc_disk(1 << PARTN_BITS);
+        g = alloc_disk_node(1 << PARTN_BITS,
+                        pcibus_to_node(drive->hwif->pci_dev->bus));
         if (!g)
                 goto out_free_idkp;
 
diff --git a/drivers/ide/ide-floppy.c b/drivers/ide/ide-floppy.c
index c949e98df4b6..9eab6426148e 100644
--- a/drivers/ide/ide-floppy.c
+++ b/drivers/ide/ide-floppy.c
@@ -661,10 +661,12 @@ static void idefloppy_output_buffers (ide_drive_t *drive, idefloppy_pc_t *pc, un
 
         idefloppy_do_end_request(drive, 1, done >> 9);
 
+#if IDEFLOPPY_DEBUG_BUGS
         if (bcount) {
                 printk(KERN_ERR "%s: leftover data in idefloppy_output_buffers, bcount == %d\n", drive->name, bcount);
                 idefloppy_write_zeros(drive, bcount);
         }
+#endif
 }
 
 static void idefloppy_update_buffers (ide_drive_t *drive, idefloppy_pc_t *pc)
@@ -1048,6 +1050,9 @@ static ide_startstop_t idefloppy_issue_pc (ide_drive_t *drive, idefloppy_pc_t *p
         atapi_bcount_t bcount;
         ide_handler_t *pkt_xfer_routine;
 
+#if 0 /* Accessing floppy->pc is not valid here, the previous pc may be gone
+         and have lived on another thread's stack; that stack may have become
+         unmapped meanwhile (CONFIG_DEBUG_PAGEALLOC). */
 #if IDEFLOPPY_DEBUG_BUGS
         if (floppy->pc->c[0] == IDEFLOPPY_REQUEST_SENSE_CMD &&
             pc->c[0] == IDEFLOPPY_REQUEST_SENSE_CMD) {
@@ -1055,6 +1060,7 @@ static ide_startstop_t idefloppy_issue_pc (ide_drive_t *drive, idefloppy_pc_t *p
                         "Two request sense in serial were issued\n");
         }
 #endif /* IDEFLOPPY_DEBUG_BUGS */
+#endif
 
         if (floppy->failed_pc == NULL &&
             pc->c[0] != IDEFLOPPY_REQUEST_SENSE_CMD)
diff --git a/drivers/ide/ide-probe.c b/drivers/ide/ide-probe.c
index 5d876f53c697..7df85af75371 100644
--- a/drivers/ide/ide-probe.c
+++ b/drivers/ide/ide-probe.c
@@ -977,8 +977,9 @@ static int ide_init_queue(ide_drive_t *drive)
          *      limits and LBA48 we could raise it but as yet
          *      do not.
          */
-         
-        q = blk_init_queue(do_ide_request, &ide_lock);
+
+        q = blk_init_queue_node(do_ide_request, &ide_lock,
+                                pcibus_to_node(drive->hwif->pci_dev->bus));
         if (!q)
                 return 1;
 
@@ -1095,7 +1096,8 @@ static int init_irq (ide_hwif_t *hwif)
                 hwgroup->hwif->next = hwif;
                 spin_unlock_irq(&ide_lock);
         } else {
-                hwgroup = kmalloc(sizeof(ide_hwgroup_t),GFP_KERNEL);
+                hwgroup = kmalloc_node(sizeof(ide_hwgroup_t), GFP_KERNEL,
+                        pcibus_to_node(hwif->drives[0].hwif->pci_dev->bus));
                 if (!hwgroup)
                         goto out_up;
 
diff --git a/drivers/ide/pci/amd74xx.c b/drivers/ide/pci/amd74xx.c
index 47225e324356..4e0f13d1d060 100644
--- a/drivers/ide/pci/amd74xx.c
+++ b/drivers/ide/pci/amd74xx.c
@@ -72,6 +72,7 @@ static struct amd_ide_chip {
         { PCI_DEVICE_ID_NVIDIA_NFORCE3S_SATA2,  0x50, AMD_UDMA_133 },
         { PCI_DEVICE_ID_NVIDIA_NFORCE_CK804_IDE,        0x50, AMD_UDMA_133 },
         { PCI_DEVICE_ID_NVIDIA_NFORCE_MCP04_IDE,        0x50, AMD_UDMA_133 },
+        { PCI_DEVICE_ID_NVIDIA_NFORCE_MCP51_IDE,        0x50, AMD_UDMA_133 },
         { 0 }
 };
 
@@ -487,6 +488,7 @@ static ide_pci_device_t amd74xx_chipsets[] __devinitdata = {
         /* 12 */ DECLARE_NV_DEV("NFORCE3-250-SATA2"),
         /* 13 */ DECLARE_NV_DEV("NFORCE-CK804"),
         /* 14 */ DECLARE_NV_DEV("NFORCE-MCP04"),
+        /* 15 */ DECLARE_NV_DEV("NFORCE-MCP51"),
 };
 
 static int __devinit amd74xx_probe(struct pci_dev *dev, const struct pci_device_id *id)
@@ -521,6 +523,7 @@ static struct pci_device_id amd74xx_pci_tbl[] = {
 #endif
         { PCI_VENDOR_ID_NVIDIA, PCI_DEVICE_ID_NVIDIA_NFORCE_CK804_IDE,  PCI_ANY_ID, PCI_ANY_ID, 0, 0, 13 },
         { PCI_VENDOR_ID_NVIDIA, PCI_DEVICE_ID_NVIDIA_NFORCE_MCP04_IDE,  PCI_ANY_ID, PCI_ANY_ID, 0, 0, 14 },
+        { PCI_VENDOR_ID_NVIDIA, PCI_DEVICE_ID_NVIDIA_NFORCE_MCP51_IDE,  PCI_ANY_ID, PCI_ANY_ID, 0, 0, 15 },
         { 0, },
 };
 MODULE_DEVICE_TABLE(pci, amd74xx_pci_tbl);
diff --git a/drivers/ide/pci/sgiioc4.c b/drivers/ide/pci/sgiioc4.c
index 4651a22bf12e..af526b671c4e 100644
--- a/drivers/ide/pci/sgiioc4.c
+++ b/drivers/ide/pci/sgiioc4.c
@@ -34,7 +34,7 @@
 #include <linux/mm.h>
 #include <linux/ioport.h>
 #include <linux/blkdev.h>
-#include <linux/ioc4_common.h>
+#include <linux/ioc4.h>
 #include <asm/io.h>
 
 #include <linux/ide.h>
@@ -715,14 +715,34 @@ static ide_pci_device_t sgiioc4_chipsets[] __devinitdata = {
 };
 
 int
-ioc4_ide_attach_one(struct pci_dev *dev, const struct pci_device_id *id)
+ioc4_ide_attach_one(struct ioc4_driver_data *idd)
 {
-        return pci_init_sgiioc4(dev, &sgiioc4_chipsets[id->driver_data]);
+        return pci_init_sgiioc4(idd->idd_pdev,
+                                &sgiioc4_chipsets[idd->idd_pci_id->driver_data]);
 }
 
+static struct ioc4_submodule ioc4_ide_submodule = {
+        .is_name = "IOC4_ide",
+        .is_owner = THIS_MODULE,
+        .is_probe = ioc4_ide_attach_one,
+/*      .is_remove = ioc4_ide_remove_one,       */
+};
+
+static int __devinit
+ioc4_ide_init(void)
+{
+        return ioc4_register_submodule(&ioc4_ide_submodule);
+}
+
+static void __devexit
+ioc4_ide_exit(void)
+{
+        ioc4_unregister_submodule(&ioc4_ide_submodule);
+}
+
+module_init(ioc4_ide_init);
+module_exit(ioc4_ide_exit);
 
 MODULE_AUTHOR("Aniket Malatpure - Silicon Graphics Inc. (SGI)");
 MODULE_DESCRIPTION("IDE PCI driver module for SGI IOC4 Base-IO Card");
 MODULE_LICENSE("GPL");
-
-EXPORT_SYMBOL(ioc4_ide_attach_one);