This commit was manufactured by cvs2svn to create tag

[linux-2.6.git] / drivers / ide / pci / siimage.c

diff --git a/drivers/ide/pci/siimage.c b/drivers/ide/pci/siimage.c
index 414ffe9..3b44b0b 100644 (file)
--- a/drivers/ide/pci/siimage.c
+++ b/drivers/ide/pci/siimage.c
@@ -48,8 +48,6 @@ static int pdev_is_sata(struct pci_dev *pdev)
        {
                case PCI_DEVICE_ID_SII_3112:
                case PCI_DEVICE_ID_SII_1210SA:
-               case PCI_DEVICE_ID_ATI_IXP300_SATA:
-               case PCI_DEVICE_ID_ATI_IXP400_SATA:
                        return 1;
                case PCI_DEVICE_ID_SII_680:
                        return 0;
@@ -422,16 +420,37 @@ static int siimage_config_drive_for_dma (ide_drive_t *drive)
        struct hd_driveid *id   = drive->id;
 
        if ((id->capability & 1) != 0 && drive->autodma) {
-
-               if (ide_use_dma(drive)) {
-                       if (config_chipset_for_dma(drive))
-                               return hwif->ide_dma_on(drive);
+               /* Consult the list of known "bad" drives */
+               if (__ide_dma_bad_drive(drive))
+                       goto fast_ata_pio;
+
+               if ((id->field_valid & 4) && siimage_ratemask(drive)) {
+                       if (id->dma_ultra & hwif->ultra_mask) {
+                               /* Force if Capable UltraDMA */
+                               int dma = config_chipset_for_dma(drive);
+                               if ((id->field_valid & 2) && !dma)
+                                       goto try_dma_modes;
+                       }
+               } else if (id->field_valid & 2) {
+try_dma_modes:
+                       if ((id->dma_mword & hwif->mwdma_mask) ||
+                           (id->dma_1word & hwif->swdma_mask)) {
+                               /* Force if Capable regular DMA modes */
+                               if (!config_chipset_for_dma(drive))
+                                       goto no_dma_set;
+                       }
+               } else if (__ide_dma_good_drive(drive) &&
+                          (id->eide_dma_time < 150)) {
+                       /* Consult the list of known "good" drives */
+                       if (!config_chipset_for_dma(drive))
+                               goto no_dma_set;
+               } else {
+                       goto fast_ata_pio;
                }
-
-               goto fast_ata_pio;
-
+               return hwif->ide_dma_on(drive);
        } else if ((id->capability & 8) || (id->field_valid & 2)) {
 fast_ata_pio:
+no_dma_set:
                config_chipset_for_pio(drive, 1);
                return hwif->ide_dma_off_quietly(drive);
        }
@@ -535,6 +554,12 @@ static int siimage_mmio_ide_dma_test_irq (ide_drive_t *drive)
        return 0;
 }
 
+static int siimage_mmio_ide_dma_verbose (ide_drive_t *drive)
+{
+       int temp = __ide_dma_verbose(drive);
+       return temp;
+}
+
 /**
  *     siimage_busproc         -       bus isolation ioctl
  *     @drive: drive to isolate/restore
@@ -873,11 +898,12 @@ static void __devinit init_mmio_iops_siimage(ide_hwif_t *hwif)
         *      the MMIO layout isnt the same as the the standard port
         *      based I/O
         */
-
+        
        memset(&hw, 0, sizeof(hw_regs_t));
+       hw.priv                         = addr;
 
-       base = (unsigned long)addr;
-       if (ch)
+       base                            = (unsigned long)addr;
+       if(ch)
                base += 0xC0;
        else
                base += 0x80;
@@ -902,16 +928,16 @@ static void __devinit init_mmio_iops_siimage(ide_hwif_t *hwif)
 
        hw.io_ports[IDE_IRQ_OFFSET]     = 0;
 
-       if (pdev_is_sata(dev)) {
-               base = (unsigned long)addr;
-               if (ch)
-                       base += 0x80;
-               hwif->sata_scr[SATA_STATUS_OFFSET]      = base + 0x104;
-               hwif->sata_scr[SATA_ERROR_OFFSET]       = base + 0x108;
-               hwif->sata_scr[SATA_CONTROL_OFFSET]     = base + 0x100;
-               hwif->sata_misc[SATA_MISC_OFFSET]       = base + 0x140;
-               hwif->sata_misc[SATA_PHY_OFFSET]        = base + 0x144;
-               hwif->sata_misc[SATA_IEN_OFFSET]        = base + 0x148;
+        if (pdev_is_sata(dev)) {
+               base = (unsigned long) addr;
+               if(ch)
+                       base += 0x80;
+               hw.sata_scr[SATA_STATUS_OFFSET] = base + 0x104;
+               hw.sata_scr[SATA_ERROR_OFFSET]  = base + 0x108;
+               hw.sata_scr[SATA_CONTROL_OFFSET]= base + 0x100;
+               hw.sata_misc[SATA_MISC_OFFSET]  = base + 0x140;
+               hw.sata_misc[SATA_PHY_OFFSET]   = base + 0x144;
+               hw.sata_misc[SATA_IEN_OFFSET]   = base + 0x148;
        }
 
        hw.irq                          = hwif->pci_dev->irq;
@@ -919,6 +945,11 @@ static void __devinit init_mmio_iops_siimage(ide_hwif_t *hwif)
        memcpy(&hwif->hw, &hw, sizeof(hw));
        memcpy(hwif->io_ports, hwif->hw.io_ports, sizeof(hwif->hw.io_ports));
 
+       if (is_sata(hwif)) {
+               memcpy(hwif->sata_scr, hwif->hw.sata_scr, sizeof(hwif->hw.sata_scr));
+               memcpy(hwif->sata_misc, hwif->hw.sata_misc, sizeof(hwif->hw.sata_misc));
+       }
+
        hwif->irq                       = hw.irq;
 
                base = (unsigned long) addr;
@@ -961,12 +992,11 @@ static int is_dev_seagate_sata(ide_drive_t *drive)
  *     @hwif: interface to fix up
  *
  *     Called after drive probe we use this to decide whether the
- *     Seagate fixup must be applied. This used to be in init_iops but
+ *     Seagate fixup must be applied. This used otbe in init_iops but
  *     that can occur before we know what drives are present.
  */
-
-static void __devinit siimage_fixup(ide_hwif_t *hwif)
-{
+ 
+static void siimage_fixup(ide_hwif_t *hwif) {
        /* Try and raise the rqsize */
        if (!is_sata(hwif) || !is_dev_seagate_sata(&hwif->drives[0]))
                hwif->rqsize = 128;
@@ -1061,6 +1091,7 @@ static void __devinit init_hwif_siimage(ide_hwif_t *hwif)
 
        if (hwif->mmio) {
                hwif->ide_dma_test_irq = &siimage_mmio_ide_dma_test_irq;
+               hwif->ide_dma_verbose = &siimage_mmio_ide_dma_verbose;
        } else {
                hwif->ide_dma_test_irq = & siimage_io_ide_dma_test_irq;
        }
@@ -1081,10 +1112,10 @@ static void __devinit init_hwif_siimage(ide_hwif_t *hwif)
                .init_chipset   = init_chipset_siimage, \
                .init_iops      = init_iops_siimage,    \
                .init_hwif      = init_hwif_siimage,    \
-               .fixup          = siimage_fixup,        \
                .channels       = 2,                    \
                .autodma        = AUTODMA,              \
                .bootable       = ON_BOARD,             \
+               .fixup          = siimage_fixup         \
        }
 
 static ide_pci_device_t siimage_chipsets[] __devinitdata = {
@@ -1113,8 +1144,6 @@ static struct pci_device_id siimage_pci_tbl[] = {
 #ifdef CONFIG_BLK_DEV_IDE_SATA
        { PCI_VENDOR_ID_CMD, PCI_DEVICE_ID_SII_3112, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 1},
        { PCI_VENDOR_ID_CMD, PCI_DEVICE_ID_SII_1210SA, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 2},
-       { PCI_VENDOR_ID_ATI, PCI_DEVICE_ID_ATI_IXP300_SATA, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 3},
-       { PCI_VENDOR_ID_ATI, PCI_DEVICE_ID_ATI_IXP400_SATA, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 4},
 #endif
        { 0, },
 };