]> pilppa.org Git - linux-2.6-omap-h63xx.git/blobdiff - drivers/ide/pci/it8213.c
Merge branch 'fixes-2.6.24' of master.kernel.org:/pub/scm/linux/kernel/git/galak...
[linux-2.6-omap-h63xx.git] / drivers / ide / pci / it8213.c
index 95dbed7e6022b839ebc5467bbb31e82909ecfa71..24a71d03744a35bb88d3e68f30c15a4a972ebd93 100644 (file)
 #include <asm/io.h>
 
 /**
- *     it8213_dma_2_pio                -       return the PIO mode matching DMA
- *     @xfer_rate: transfer speed
- *
- *     Returns the nearest equivalent PIO timing for the PIO or DMA
- *     mode requested by the controller.
- */
-
-static u8 it8213_dma_2_pio (u8 xfer_rate) {
-       switch(xfer_rate) {
-               case XFER_UDMA_6:
-               case XFER_UDMA_5:
-               case XFER_UDMA_4:
-               case XFER_UDMA_3:
-               case XFER_UDMA_2:
-               case XFER_UDMA_1:
-               case XFER_UDMA_0:
-               case XFER_MW_DMA_2:
-               case XFER_PIO_4:
-                       return 4;
-               case XFER_MW_DMA_1:
-               case XFER_PIO_3:
-                       return 3;
-               case XFER_SW_DMA_2:
-               case XFER_PIO_2:
-                       return 2;
-               case XFER_MW_DMA_0:
-               case XFER_SW_DMA_1:
-               case XFER_SW_DMA_0:
-               case XFER_PIO_1:
-               case XFER_PIO_0:
-               case XFER_PIO_SLOW:
-               default:
-                       return 0;
-       }
-}
-
-/*
- *     it8213_tuneproc -       tune a drive
- *     @drive: drive to tune
- *     @pio: desired PIO mode
+ *     it8213_set_pio_mode     -       set host controller for PIO mode
+ *     @drive: drive
+ *     @pio: PIO mode number
  *
  *     Set the interface PIO mode.
  */
 
-static void it8213_tuneproc (ide_drive_t *drive, u8 pio)
+static void it8213_set_pio_mode(ide_drive_t *drive, const u8 pio)
 {
        ide_hwif_t *hwif        = HWIF(drive);
        struct pci_dev *dev     = hwif->pci_dev;
@@ -82,8 +45,6 @@ static void it8213_tuneproc (ide_drive_t *drive, u8 pio)
                                        { 2, 1 },
                                        { 2, 3 }, };
 
-       pio = ide_get_best_pio_mode(drive, pio, 4);
-
        spin_lock_irqsave(&tune_lock, flags);
        pci_read_config_word(dev, master_port, &master_data);
 
@@ -114,22 +75,18 @@ static void it8213_tuneproc (ide_drive_t *drive, u8 pio)
 }
 
 /**
- *     it8213_tune_chipset     -       set controller timings
- *     @drive: Drive to set up
- *     @xferspeed: speed we want to achieve
+ *     it8213_set_dma_mode     -       set host controller for DMA mode
+ *     @drive: drive
+ *     @speed: DMA mode
  *
- *     Tune the ITE chipset for the desired mode. If we can't achieve
- *     the desired mode then tune for a lower one, but ultimately
- *     make the thing work.
+ *     Tune the ITE chipset for the DMA mode.
  */
 
-static int it8213_tune_chipset (ide_drive_t *drive, u8 xferspeed)
+static void it8213_set_dma_mode(ide_drive_t *drive, const u8 speed)
 {
-
        ide_hwif_t *hwif        = HWIF(drive);
        struct pci_dev *dev     = hwif->pci_dev;
        u8 maslave              = 0x40;
-       u8 speed                = ide_rate_filter(drive, xferspeed);
        int a_speed             = 3 << (drive->dn * 4);
        int u_flag              = 1 << drive->dn;
        int v_flag              = 0x01 << drive->dn;
@@ -157,14 +114,8 @@ static int it8213_tune_chipset (ide_drive_t *drive, u8 xferspeed)
                case XFER_MW_DMA_1:
                case XFER_SW_DMA_2:
                        break;
-               case XFER_PIO_4:
-               case XFER_PIO_3:
-               case XFER_PIO_2:
-               case XFER_PIO_1:
-               case XFER_PIO_0:
-                       break;
                default:
-                       return -1;
+                       return;
        }
 
        if (speed >= XFER_UDMA_0) {
@@ -184,6 +135,9 @@ static int it8213_tune_chipset (ide_drive_t *drive, u8 xferspeed)
                } else
                        pci_write_config_byte(dev, 0x54, reg54 & ~v_flag);
        } else {
+               const u8 mwdma_to_pio[] = { 0, 3, 4 };
+               u8 pio;
+
                if (reg48 & u_flag)
                        pci_write_config_byte(dev, 0x48, reg48 & ~u_flag);
                if (reg4a & a_speed)
@@ -192,51 +146,29 @@ static int it8213_tune_chipset (ide_drive_t *drive, u8 xferspeed)
                        pci_write_config_byte(dev, 0x54, reg54 & ~v_flag);
                if (reg55 & w_flag)
                        pci_write_config_byte(dev, 0x55, (u8) reg55 & ~w_flag);
-       }
-       it8213_tuneproc(drive, it8213_dma_2_pio(speed));
-       return ide_config_drive_speed(drive, speed);
-}
 
-/**
- *     it8213_configure_drive_for_dma  -       set up for DMA transfers
- *     @drive: drive we are going to set up
- *
- *     Set up the drive for DMA, tune the controller and drive as
- *     required. If the drive isn't suitable for DMA or we hit
- *     other problems then we will drop down to PIO and set up
- *     PIO appropriately
- */
-
-static int it8213_config_drive_for_dma (ide_drive_t *drive)
-{
-       u8 pio;
+               if (speed >= XFER_MW_DMA_0)
+                       pio = mwdma_to_pio[speed - XFER_MW_DMA_0];
+               else
+                       pio = 2; /* only SWDMA2 is allowed */
 
-       if (ide_tune_dma(drive))
-               return 0;
-
-       pio = ide_get_best_pio_mode(drive, 255, 4);
-       it8213_tune_chipset(drive, XFER_PIO_0 + pio);
-
-       return -1;
+               it8213_set_pio_mode(drive, pio);
+       }
 }
 
 /**
  *     init_hwif_it8213        -       set up hwif structs
  *     @hwif: interface to set up
  *
- *     We do the basic set up of the interface structure. The IT8212
- *     requires several custom handlers so we override the default
- *     ide DMA handlers appropriately
+ *     We do the basic set up of the interface structure.
  */
 
 static void __devinit init_hwif_it8213(ide_hwif_t *hwif)
 {
        u8 reg42h = 0;
 
-       hwif->speedproc = &it8213_tune_chipset;
-       hwif->tuneproc  = &it8213_tuneproc;
-
-       hwif->autodma = 0;
+       hwif->set_dma_mode = &it8213_set_dma_mode;
+       hwif->set_pio_mode = &it8213_set_pio_mode;
 
        hwif->drives[0].autotune = 1;
        hwif->drives[1].autotune = 1;
@@ -251,20 +183,8 @@ static void __devinit init_hwif_it8213(ide_hwif_t *hwif)
 
        pci_read_config_byte(hwif->pci_dev, 0x42, &reg42h);
 
-       hwif->ide_dma_check = &it8213_config_drive_for_dma;
-
        if (hwif->cbl != ATA_CBL_PATA40_SHORT)
                hwif->cbl = (reg42h & 0x02) ? ATA_CBL_PATA40 : ATA_CBL_PATA80;
-
-       /*
-        *      The BIOS often doesn't set up DMA on this controller
-        *      so we always do it.
-        */
-       if (!noautodma)
-               hwif->autodma = 1;
-
-       hwif->drives[0].autodma = hwif->autodma;
-       hwif->drives[1].autodma = hwif->autodma;
 }
 
 
@@ -300,9 +220,8 @@ static int __devinit it8213_init_one(struct pci_dev *dev, const struct pci_devic
        return 0;
 }
 
-
-static struct pci_device_id it8213_pci_tbl[] = {
-       { PCI_VENDOR_ID_ITE, 0x8213, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0 },
+static const struct pci_device_id it8213_pci_tbl[] = {
+       { PCI_VDEVICE(ITE, PCI_DEVICE_ID_ITE_8213), 0 },
        { 0, },
 };