]> git.hungrycats.org Git - linux/commitdiff
Update promise drivers to new ide pci init scheme, remove now unused
authorJens Axboe <axboe@burns.home.kernel.dk>
Mon, 16 Sep 2002 16:58:09 +0000 (18:58 +0200)
committerJens Axboe <axboe@burns.home.kernel.dk>
Mon, 16 Sep 2002 16:58:09 +0000 (18:58 +0200)
old pdc202xx.c

drivers/ide/pci/pdc202xx.c [deleted file]
drivers/ide/pci/pdc202xx_new.c
drivers/ide/pci/pdc202xx_new.h
drivers/ide/pci/pdc202xx_old.c
drivers/ide/pci/pdc202xx_old.h

diff --git a/drivers/ide/pci/pdc202xx.c b/drivers/ide/pci/pdc202xx.c
deleted file mode 100644 (file)
index 4c0a9fa..0000000
+++ /dev/null
@@ -1,1181 +0,0 @@
-/*
- *  linux/drivers/ide/pdc202xx.c       Version 0.35    Mar. 30, 2002
- *
- *  Copyright (C) 1998-2002            Andre Hedrick <andre@linux-ide.org>
- *
- *  Promise Ultra33 cards with BIOS v1.20 through 1.28 will need this
- *  compiled into the kernel if you have more than one card installed.
- *  Note that BIOS v1.29 is reported to fix the problem.  Since this is
- *  safe chipset tuning, including this support is harmless
- *
- *  Promise Ultra66 cards with BIOS v1.11 this
- *  compiled into the kernel if you have more than one card installed.
- *
- *  Promise Ultra100 cards.
- *
- *  The latest chipset code will support the following ::
- *  Three Ultra33 controllers and 12 drives.
- *  8 are UDMA supported and 4 are limited to DMA mode 2 multi-word.
- *  The 8/4 ratio is a BIOS code limit by promise.
- *
- *  UNLESS you enable "CONFIG_PDC202XX_BURST"
- *
- */
-
-/*
- *  Portions Copyright (C) 1999 Promise Technology, Inc.
- *  Author: Frank Tiernan (frankt@promise.com)
- *  Released under terms of General Public License
- */
-
-#include <linux/config.h>
-#include <linux/types.h>
-#include <linux/kernel.h>
-#include <linux/delay.h>
-#include <linux/timer.h>
-#include <linux/mm.h>
-#include <linux/ioport.h>
-#include <linux/blkdev.h>
-#include <linux/hdreg.h>
-#include <linux/interrupt.h>
-#include <linux/pci.h>
-#include <linux/init.h>
-#include <linux/ide.h>
-
-#include <asm/io.h>
-#include <asm/irq.h>
-
-#include "ide_modes.h"
-#include "pdc202xx.h"
-
-#define PDC202_DEBUG_CABLE     0
-
-#if defined(DISPLAY_PDC202XX_TIMINGS) && defined(CONFIG_PROC_FS)
-#include <linux/stat.h>
-#include <linux/proc_fs.h>
-
-static u8 pdc202xx_proc = 0;
-#define PDC202_MAX_DEVS                5
-static struct pci_dev *pdc202_devs[PDC202_MAX_DEVS];
-static int n_pdc202_devs;
-
-static char * pdc202xx_info (char *buf, struct pci_dev *dev)
-{
-       char *p = buf;
-
-       u32 bibma  = pci_resource_start(dev, 4);
-       u32 reg60h = 0, reg64h = 0, reg68h = 0, reg6ch = 0;
-       u16 reg50h = 0, pmask = (1<<10), smask = (1<<11);
-       u8 hi = 0, lo = 0;
-
-        /*
-         * at that point bibma+0x2 et bibma+0xa are byte registers
-         * to investigate:
-         */
-       u8 c0   = inb_p((u16)bibma + 0x02);
-       u8 c1   = inb_p((u16)bibma + 0x0a);
-
-       u8 sc11 = inb_p((u16)bibma + 0x11);
-       u8 sc1a = inb_p((u16)bibma + 0x1a);
-       u8 sc1b = inb_p((u16)bibma + 0x1b);
-       u8 sc1c = inb_p((u16)bibma + 0x1c); 
-       u8 sc1d = inb_p((u16)bibma + 0x1d);
-       u8 sc1e = inb_p((u16)bibma + 0x1e);
-       u8 sc1f = inb_p((u16)bibma + 0x1f);
-
-       pci_read_config_word(dev, 0x50, &reg50h);
-       pci_read_config_dword(dev, 0x60, &reg60h);
-       pci_read_config_dword(dev, 0x64, &reg64h);
-       pci_read_config_dword(dev, 0x68, &reg68h);
-       pci_read_config_dword(dev, 0x6c, &reg6ch);
-
-       p += sprintf(p, "\n                                ");
-       switch(dev->device) {
-               case PCI_DEVICE_ID_PROMISE_20267:
-                       p += sprintf(p, "Ultra100"); break;
-               case PCI_DEVICE_ID_PROMISE_20265:
-                       p += sprintf(p, "Ultra100 on M/B"); break;
-               case PCI_DEVICE_ID_PROMISE_20263:
-                       p += sprintf(p, "FastTrak 66"); break;
-               case PCI_DEVICE_ID_PROMISE_20262:
-                       p += sprintf(p, "Ultra66"); break;
-               case PCI_DEVICE_ID_PROMISE_20246:
-                       p += sprintf(p, "Ultra33");
-                       reg50h |= 0x0c00;
-                       break;
-               default:
-                       p += sprintf(p, "Ultra Series"); break;
-       }
-       p += sprintf(p, " Chipset.\n");
-
-       p += sprintf(p, "------------------------------- General Status "
-                       "---------------------------------\n");
-       p += sprintf(p, "Burst Mode                           : %sabled\n",
-               (sc1f & 0x01) ? "en" : "dis");
-       p += sprintf(p, "Host Mode                            : %s\n",
-               (sc1f & 0x08) ? "Tri-Stated" : "Normal");
-       p += sprintf(p, "Bus Clocking                         : %s\n",
-               ((sc1f & 0xC0) == 0xC0) ? "100 External" :
-               ((sc1f & 0x80) == 0x80) ? "66 External" :
-               ((sc1f & 0x40) == 0x40) ? "33 External" : "33 PCI Internal");
-       p += sprintf(p, "IO pad select                        : %s mA\n",
-               ((sc1c & 0x03) == 0x03) ? "10" :
-               ((sc1c & 0x02) == 0x02) ? "8" :
-               ((sc1c & 0x01) == 0x01) ? "6" :
-               ((sc1c & 0x00) == 0x00) ? "4" : "??");
-       SPLIT_BYTE(sc1e, hi, lo);
-       p += sprintf(p, "Status Polling Period                : %d\n", hi);
-       p += sprintf(p, "Interrupt Check Status Polling Delay : %d\n", lo);
-       p += sprintf(p, "--------------- Primary Channel "
-                       "---------------- Secondary Channel "
-                       "-------------\n");
-       p += sprintf(p, "                %s                         %s\n",
-               (c0&0x80)?"disabled":"enabled ",
-               (c1&0x80)?"disabled":"enabled ");
-       p += sprintf(p, "66 Clocking     %s                         %s\n",
-               (sc11&0x02)?"enabled ":"disabled",
-               (sc11&0x08)?"enabled ":"disabled");
-       p += sprintf(p, "           Mode %s                      Mode %s\n",
-               (sc1a & 0x01) ? "MASTER" : "PCI   ",
-               (sc1b & 0x01) ? "MASTER" : "PCI   ");
-       p += sprintf(p, "                %s                     %s\n",
-               (sc1d & 0x08) ? "Error       " :
-               ((sc1d & 0x05) == 0x05) ? "Not My INTR " :
-               (sc1d & 0x04) ? "Interrupting" :
-               (sc1d & 0x02) ? "FIFO Full   " :
-               (sc1d & 0x01) ? "FIFO Empty  " : "????????????",
-               (sc1d & 0x80) ? "Error       " :
-               ((sc1d & 0x50) == 0x50) ? "Not My INTR " :
-               (sc1d & 0x40) ? "Interrupting" :
-               (sc1d & 0x20) ? "FIFO Full   " :
-               (sc1d & 0x10) ? "FIFO Empty  " : "????????????");
-       p += sprintf(p, "--------------- drive0 --------- drive1 "
-                       "-------- drive0 ---------- drive1 ------\n");
-       p += sprintf(p, "DMA enabled:    %s              %s "
-                       "            %s               %s\n",
-               (c0&0x20)?"yes":"no ", (c0&0x40)?"yes":"no ",
-               (c1&0x20)?"yes":"no ", (c1&0x40)?"yes":"no ");
-       p += sprintf(p, "DMA Mode:       %s           %s "
-                       "         %s            %s\n",
-               pdc202xx_ultra_verbose(reg60h, (reg50h & pmask)),
-               pdc202xx_ultra_verbose(reg64h, (reg50h & pmask)),
-               pdc202xx_ultra_verbose(reg68h, (reg50h & smask)),
-               pdc202xx_ultra_verbose(reg6ch, (reg50h & smask)));
-       p += sprintf(p, "PIO Mode:       %s            %s "
-                       "          %s            %s\n",
-               pdc202xx_pio_verbose(reg60h),
-               pdc202xx_pio_verbose(reg64h),
-               pdc202xx_pio_verbose(reg68h),
-               pdc202xx_pio_verbose(reg6ch));
-#if 0
-       p += sprintf(p, "--------------- Can ATAPI DMA ---------------\n");
-#endif
-       return (char *)p;
-}
-
-static char * pdc202xx_info_new (char *buf, struct pci_dev *dev)
-{
-       char *p = buf;
-//     u32 bibma = pci_resource_start(dev, 4);
-
-//     u32 reg60h = 0, reg64h = 0, reg68h = 0, reg6ch = 0;
-//     u16 reg50h = 0, word88 = 0;
-//     int udmasel[4]={0,0,0,0}, piosel[4]={0,0,0,0}, i=0, hd=0;
-
-       p += sprintf(p, "\n                                ");
-       switch(dev->device) {
-               case PCI_DEVICE_ID_PROMISE_20277:
-                       p += sprintf(p, "SBFastTrak 133 Lite"); break;
-               case PCI_DEVICE_ID_PROMISE_20276:
-                       p += sprintf(p, "MBFastTrak 133 Lite"); break;
-               case PCI_DEVICE_ID_PROMISE_20275:
-                       p += sprintf(p, "MBUltra133"); break;
-               case PCI_DEVICE_ID_PROMISE_20271:
-                       p += sprintf(p, "FastTrak TX2000"); break;
-               case PCI_DEVICE_ID_PROMISE_20270:
-                       p += sprintf(p, "FastTrak LP/TX2/TX4"); break;
-               case PCI_DEVICE_ID_PROMISE_20269:
-                       p += sprintf(p, "Ultra133 TX2"); break;
-               case PCI_DEVICE_ID_PROMISE_20268:
-                       p += sprintf(p, "Ultra100 TX2"); break;
-               default:
-                       p += sprintf(p, "Ultra series"); break;
-                       break;
-       }
-       p += sprintf(p, " Chipset.\n");
-       return (char *)p;
-}
-
-static int pdc202xx_get_info (char *buffer, char **addr, off_t offset, int count)
-{
-       char *p = buffer;
-       int i;
-
-       for (i = 0; i < n_pdc202_devs; i++) {
-               struct pci_dev *dev     = pdc202_devs[i];
-
-               switch(dev->device) {
-                       case PCI_DEVICE_ID_PROMISE_20277:
-                       case PCI_DEVICE_ID_PROMISE_20276:
-                       case PCI_DEVICE_ID_PROMISE_20275:
-                       case PCI_DEVICE_ID_PROMISE_20271:
-                       case PCI_DEVICE_ID_PROMISE_20269:
-                       case PCI_DEVICE_ID_PROMISE_20268:
-                       case PCI_DEVICE_ID_PROMISE_20270:
-                               p = pdc202xx_info_new(buffer, dev);
-                               break;
-                       default:
-                               p = pdc202xx_info(buffer, dev);
-                               break;
-               }
-       }
-       return p-buffer;        /* => must be less than 4k! */
-}
-#endif  /* defined(DISPLAY_PDC202XX_TIMINGS) && defined(CONFIG_PROC_FS) */
-
-
-static u8 pdc202xx_ratemask (ide_drive_t *drive)
-{
-       u8 mode;
-
-       switch(HWIF(drive)->pci_dev->device) {
-               case PCI_DEVICE_ID_PROMISE_20277:
-               case PCI_DEVICE_ID_PROMISE_20276:
-               case PCI_DEVICE_ID_PROMISE_20275:
-               case PCI_DEVICE_ID_PROMISE_20271:
-               case PCI_DEVICE_ID_PROMISE_20269:
-                       mode = 4;
-                       break;
-               case PCI_DEVICE_ID_PROMISE_20270:
-               case PCI_DEVICE_ID_PROMISE_20268:
-                       mode = 3;
-                       break;
-               case PCI_DEVICE_ID_PROMISE_20267:
-               case PCI_DEVICE_ID_PROMISE_20265:
-                       mode = 3;
-                       break;
-               case PCI_DEVICE_ID_PROMISE_20263:
-               case PCI_DEVICE_ID_PROMISE_20262:
-                       mode = 2;
-                       break;
-               case PCI_DEVICE_ID_PROMISE_20246:
-                       return 1;
-               default:
-                       return 0;
-       }
-       if (!eighty_ninty_three(drive))
-               mode = min(mode, (u8)1);
-       return mode;
-}
-
-static int check_in_drive_lists (ide_drive_t *drive, const char **list)
-{
-       struct hd_driveid *id = drive->id;
-
-       if (pdc_quirk_drives == list) {
-               while (*list) {
-                       if (strstr(id->model, *list++)) {
-                               return 2;
-                       }
-               }
-       } else {
-               while (*list) {
-                       if (!strcmp(*list++,id->model)) {
-                               return 1;
-                       }
-               }
-       }
-       return 0;
-}
-
-static int pdc202xx_tune_chipset (ide_drive_t *drive, u8 xferspeed)
-{
-       ide_hwif_t *hwif        = HWIF(drive);
-       struct pci_dev *dev     = hwif->pci_dev;
-       u8 drive_pci            = 0x60 + (drive->dn << 2);
-       u8 speed        = ide_rate_filter(pdc202xx_ratemask(drive), xferspeed);
-
-       u32                     drive_conf;
-       u8                      AP, BP, CP, DP;
-       u8                      TA = 0, TB = 0, TC = 0;
-
-       if ((drive->media != ide_disk) && (speed < XFER_SW_DMA_0))
-               return -1;
-
-       pci_read_config_dword(dev, drive_pci, &drive_conf);
-       pci_read_config_byte(dev, (drive_pci), &AP);
-       pci_read_config_byte(dev, (drive_pci)|0x01, &BP);
-       pci_read_config_byte(dev, (drive_pci)|0x02, &CP);
-       pci_read_config_byte(dev, (drive_pci)|0x03, &DP);
-
-       if (speed < XFER_SW_DMA_0) {
-               if ((AP & 0x0F) || (BP & 0x07)) {
-                       /* clear PIO modes of lower 8421 bits of A Register */
-                       pci_write_config_byte(dev, (drive_pci), AP &~0x0F);
-                       pci_read_config_byte(dev, (drive_pci), &AP);
-
-                       /* clear PIO modes of lower 421 bits of B Register */
-                       pci_write_config_byte(dev, (drive_pci)|0x01, BP &~0x07);
-                       pci_read_config_byte(dev, (drive_pci)|0x01, &BP);
-
-                       pci_read_config_byte(dev, (drive_pci), &AP);
-                       pci_read_config_byte(dev, (drive_pci)|0x01, &BP);
-               }
-#ifdef CONFIG_BLK_DEV_IDEDMA
-       } else {
-               if ((BP & 0xF0) && (CP & 0x0F)) {
-                       /* clear DMA modes of upper 842 bits of B Register */
-                       /* clear PIO forced mode upper 1 bit of B Register */
-                       pci_write_config_byte(dev, (drive_pci)|0x01, BP &~0xF0);
-                       pci_read_config_byte(dev, (drive_pci)|0x01, &BP);
-
-                       /* clear DMA modes of lower 8421 bits of C Register */
-                       pci_write_config_byte(dev, (drive_pci)|0x02, CP &~0x0F);
-                       pci_read_config_byte(dev, (drive_pci)|0x02, &CP);
-               }
-#endif /* CONFIG_BLK_DEV_IDEDMA */
-       }
-
-       pci_read_config_byte(dev, (drive_pci), &AP);
-       pci_read_config_byte(dev, (drive_pci)|0x01, &BP);
-       pci_read_config_byte(dev, (drive_pci)|0x02, &CP);
-
-       switch(speed) {
-#ifdef CONFIG_BLK_DEV_IDEDMA
-               case XFER_UDMA_6:       speed = XFER_UDMA_5;
-               case XFER_UDMA_5:
-               case XFER_UDMA_4:       TB = 0x20; TC = 0x01; break;
-               case XFER_UDMA_2:       TB = 0x20; TC = 0x01; break;
-               case XFER_UDMA_3:
-               case XFER_UDMA_1:       TB = 0x40; TC = 0x02; break;
-               case XFER_UDMA_0:
-               case XFER_MW_DMA_2:     TB = 0x60; TC = 0x03; break;
-               case XFER_MW_DMA_1:     TB = 0x60; TC = 0x04; break;
-               case XFER_MW_DMA_0:
-               case XFER_SW_DMA_2:     TB = 0x60; TC = 0x05; break;
-               case XFER_SW_DMA_1:     TB = 0x80; TC = 0x06; break;
-               case XFER_SW_DMA_0:     TB = 0xC0; TC = 0x0B; break;
-#endif /* CONFIG_BLK_DEV_IDEDMA */
-               case XFER_PIO_4:        TA = 0x01; TB = 0x04; break;
-               case XFER_PIO_3:        TA = 0x02; TB = 0x06; break;
-               case XFER_PIO_2:        TA = 0x03; TB = 0x08; break;
-               case XFER_PIO_1:        TA = 0x05; TB = 0x0C; break;
-               case XFER_PIO_0:
-               default:                TA = 0x09; TB = 0x13; break;
-       }
-
-       if (speed < XFER_SW_DMA_0) {
-               pci_write_config_byte(dev, (drive_pci), AP|TA);
-               pci_write_config_byte(dev, (drive_pci)|0x01, BP|TB);
-#ifdef CONFIG_BLK_DEV_IDEDMA
-       } else {
-               pci_write_config_byte(dev, (drive_pci)|0x01, BP|TB);
-               pci_write_config_byte(dev, (drive_pci)|0x02, CP|TC);
-#endif /* CONFIG_BLK_DEV_IDEDMA */
-       }
-
-#if PDC202XX_DECODE_REGISTER_INFO
-       pci_read_config_byte(dev, (drive_pci), &AP);
-       pci_read_config_byte(dev, (drive_pci)|0x01, &BP);
-       pci_read_config_byte(dev, (drive_pci)|0x02, &CP);
-       pci_read_config_byte(dev, (drive_pci)|0x03, &DP);
-
-       decode_registers(REG_A, AP);
-       decode_registers(REG_B, BP);
-       decode_registers(REG_C, CP);
-       decode_registers(REG_D, DP);
-#endif /* PDC202XX_DECODE_REGISTER_INFO */
-#if PDC202XX_DEBUG_DRIVE_INFO
-       printk("%s: %s drive%d 0x%08x ",
-               drive->name, ide_xfer_verbose(speed),
-               drive->dn, drive_conf);
-               pci_read_config_dword(dev, drive_pci, &drive_conf);
-       printk("0x%08x\n", drive_conf);
-#endif /* PDC202XX_DEBUG_DRIVE_INFO */
-
-       return (ide_config_drive_speed(drive, speed));
-}
-
-static int pdc202xx_new_tune_chipset (ide_drive_t *drive, u8 xferspeed)
-{
-       ide_hwif_t *hwif        = HWIF(drive);
-#ifdef CONFIG_BLK_DEV_IDEDMA
-       u32 indexreg            = hwif->dma_vendor1;
-       u32 datareg             = hwif->dma_vendor3;
-#else /* !CONFIG_BLK_DEV_IDEDMA */
-       struct pci_dev *dev     = hwif->pci_dev;
-       u32 high_16             = pci_resource_start(dev, 4);
-       u32 indexreg            = high_16 + (hwif->channel ? 0x09 : 0x01);
-       u32 datareg             = (indexreg + 2);
-#endif /* CONFIG_BLK_DEV_IDEDMA */
-       u8 thold                = 0x10;
-       u8 adj                  = (drive->dn%2) ? 0x08 : 0x00;
-       u8 speed        = ide_rate_filter(pdc202xx_ratemask(drive), xferspeed);
-
-#ifdef CONFIG_BLK_DEV_IDEDMA
-       if (speed == XFER_UDMA_2) {
-               hwif->OUTB((thold + adj), indexreg);
-               hwif->OUTB((hwif->INB(datareg) & 0x7f), datareg);
-       }
-#endif /* CONFIG_BLK_DEV_IDEDMA */
-
-       switch (speed) {
-#ifdef CONFIG_BLK_DEV_IDEDMA
-               case XFER_UDMA_7:
-                       speed = XFER_UDMA_6;
-               case XFER_UDMA_6:       set_ultra(0x1a, 0x01, 0xcb); break;
-               case XFER_UDMA_5:       set_ultra(0x1a, 0x02, 0xcb); break;
-               case XFER_UDMA_4:       set_ultra(0x1a, 0x03, 0xcd); break;
-               case XFER_UDMA_3:       set_ultra(0x1a, 0x05, 0xcd); break;
-               case XFER_UDMA_2:       set_ultra(0x2a, 0x07, 0xcd); break;
-               case XFER_UDMA_1:       set_ultra(0x3a, 0x0a, 0xd0); break;
-               case XFER_UDMA_0:       set_ultra(0x4a, 0x0f, 0xd5); break;
-               case XFER_MW_DMA_2:     set_ata2(0x69, 0x25); break;
-               case XFER_MW_DMA_1:     set_ata2(0x6b, 0x27); break;
-               case XFER_MW_DMA_0:     set_ata2(0xdf, 0x5f); break;
-#endif /* CONFIG_BLK_DEV_IDEDMA */
-               case XFER_PIO_4:        set_pio(0x23, 0x09, 0x25); break;
-               case XFER_PIO_3:        set_pio(0x27, 0x0d, 0x35); break;
-               case XFER_PIO_2:        set_pio(0x23, 0x26, 0x64); break;
-               case XFER_PIO_1:        set_pio(0x46, 0x29, 0xa4); break;
-               case XFER_PIO_0:        set_pio(0xfb, 0x2b, 0xac); break;
-               default:
-                       ;
-       }
-
-       return (ide_config_drive_speed(drive, speed));
-}
-
-/*   0    1    2    3    4    5    6   7   8
- * 960, 480, 390, 300, 240, 180, 120, 90, 60
- *           180, 150, 120,  90,  60
- * DMA_Speed
- * 180, 120,  90,  90,  90,  60,  30
- *  11,   5,   4,   3,   2,   1,   0
- */
-static int config_chipset_for_pio (ide_drive_t *drive, u8 pio)
-{
-       u8 speed = 0;
-
-       pio = (pio == 5) ? 4 : pio;
-       speed = XFER_PIO_0 + ide_get_best_pio_mode(drive, 255, pio, NULL);
-        
-       return ((int) pdc202xx_tune_chipset(drive, speed));
-}
-
-static void pdc202xx_tune_drive (ide_drive_t *drive, u8 pio)
-{
-       (void) config_chipset_for_pio(drive, pio);
-}
-
-#ifdef CONFIG_BLK_DEV_IDEDMA
-
-static u8 pdc202xx_new_cable_detect (ide_hwif_t *hwif)
-{
-       hwif->OUTB(0x0b, hwif->dma_vendor1);
-       return ((u8)((hwif->INB(hwif->dma_vendor3) & 0x04)));
-}
-
-static u8 pdc202xx_old_cable_detect (ide_hwif_t *hwif)
-{
-       u16 CIS = 0, mask = (hwif->channel) ? (1<<11) : (1<<10);
-       pci_read_config_word(hwif->pci_dev, 0x50, &CIS);
-       return ((u8)(CIS & mask));
-}
-
-static int config_chipset_for_dma (ide_drive_t *drive)
-{
-       struct hd_driveid *id   = drive->id;
-       ide_hwif_t *hwif        = HWIF(drive);
-       struct pci_dev *dev     = hwif->pci_dev;
-       u32 drive_conf          = 0;
-       u8 mask                 = hwif->channel ? 0x08 : 0x02;
-       u8 drive_pci            = 0x60 + (drive->dn << 2);
-       u8 test1 = 0, test2 = 0, speed = -1;
-       u8 AP = 0, CLKSPD = 0, jumpbit = 0, cable = 0;
-
-       u8 ultra_66             = ((id->dma_ultra & 0x0010) ||
-                                  (id->dma_ultra & 0x0008)) ? 1 : 0;
-
-       switch(dev->device) {
-               case PCI_DEVICE_ID_PROMISE_20277:
-               case PCI_DEVICE_ID_PROMISE_20276:
-               case PCI_DEVICE_ID_PROMISE_20275:
-               case PCI_DEVICE_ID_PROMISE_20271:
-               case PCI_DEVICE_ID_PROMISE_20269:
-               case PCI_DEVICE_ID_PROMISE_20270:
-               case PCI_DEVICE_ID_PROMISE_20268:
-                       cable = pdc202xx_new_cable_detect(hwif);
-#if PDC202_DEBUG_CABLE
-                       printk("%s: %s-pin cable, %s-pin cable, %d\n",
-                               hwif->name, hwif->udma_four ? "80" : "40",
-                               cable ? "40" : "80", cable);
-#endif /* PDC202_DEBUG_CABLE */
-                       jumpbit = 1;
-                       break;
-               case PCI_DEVICE_ID_PROMISE_20267:
-               case PCI_DEVICE_ID_PROMISE_20265:
-               case PCI_DEVICE_ID_PROMISE_20263:
-               case PCI_DEVICE_ID_PROMISE_20262:
-                       cable = pdc202xx_old_cable_detect(hwif);
-#if PDC202_DEBUG_CABLE
-                       printk("%s: %s-pin cable, %s-pin cable, %d\n",
-                               hwif->name, hwif->udma_four ? "80" : "40",
-                               cable ? "40" : "80", cable);
-#endif /* PDC202_DEBUG_CABLE */
-                       jumpbit = 0;
-                       break;
-               default:
-                       cable = 1; jumpbit = 0;
-                       break;
-       }
-
-       if (!jumpbit)
-               CLKSPD = hwif->INB(hwif->dma_master + 0x11);
-       /*
-        * Set the control register to use the 66Mhz system
-        * clock for UDMA 3/4 mode operation. If one drive on
-        * a channel is U66 capable but the other isn't we
-        * fall back to U33 mode. The BIOS INT 13 hooks turn
-        * the clock on then off for each read/write issued. I don't
-        * do that here because it would require modifying the
-        * kernel, seperating the fop routines from the kernel or
-        * somehow hooking the fops calls. It may also be possible to
-        * leave the 66Mhz clock on and readjust the timing
-        * parameters.
-        */
-
-       if ((ultra_66) && (cable)) {
-#ifdef DEBUG
-               printk("ULTRA 66/100/133: %s channel of Ultra 66/100/133 "
-                       "requires an 80-pin cable for Ultra66 operation.\n",
-                       hwif->channel ? "Secondary" : "Primary");
-               printk("         Switching to Ultra33 mode.\n");
-#endif /* DEBUG */
-               /* Primary   : zero out second bit */
-               /* Secondary : zero out fourth bit */
-               if (!jumpbit)
-                       hwif->OUTB(CLKSPD & ~mask, (hwif->dma_master + 0x11));
-               printk("Warning: %s channel requires an 80-pin cable for operation.\n", hwif->channel ? "Secondary":"Primary");
-               printk("%s reduced to Ultra33 mode.\n", drive->name);
-       } else {
-               if (ultra_66) {
-                       /*
-                        * check to make sure drive on same channel
-                        * is u66 capable
-                        */
-                       if (hwif->drives[!(drive->dn%2)].id) {
-                               if (hwif->drives[!(drive->dn%2)].id->dma_ultra & 0x0078) {
-                                       if (!jumpbit)
-                                               hwif->OUTB(CLKSPD | mask, (hwif->dma_master + 0x11));
-                               } else {
-                                       if (!jumpbit)
-                                               hwif->OUTB(CLKSPD & ~mask, (hwif->dma_master + 0x11));
-                               }
-                       } else { /* udma4 drive by itself */
-                               if (!jumpbit)
-                                       hwif->OUTB(CLKSPD | mask, (hwif->dma_master + 0x11));
-                       }
-               }
-       }
-
-       if (jumpbit) {
-               if (drive->media != ide_disk)
-                       return 0;
-               if (id->capability & 4) {       /* IORDY_EN & PREFETCH_EN */
-                       hwif->OUTB((0x13 + ((drive->dn%2) ? 0x08 : 0x00)), hwif->dma_vendor1);
-                       hwif->OUTB((hwif->INB(hwif->dma_vendor3)|0x03), hwif->dma_vendor3);
-               }
-               goto jumpbit_is_set;
-       }
-
-       drive_pci = 0x60 + (drive->dn << 2);
-       pci_read_config_dword(dev, drive_pci, &drive_conf);
-       if ((drive_conf != 0x004ff304) && (drive_conf != 0x004ff3c4))
-               goto chipset_is_set;
-
-       pci_read_config_byte(dev, drive_pci, &test1);
-       if (!(test1 & SYNC_ERRDY_EN)) {
-               if (drive->select.b.unit & 0x01) {
-                       pci_read_config_byte(dev, drive_pci - 4, &test2);
-                       if ((test2 & SYNC_ERRDY_EN) &&
-                           !(test1 & SYNC_ERRDY_EN)) {
-                               pci_write_config_byte(dev, drive_pci,
-                                       test1|SYNC_ERRDY_EN);
-                       }
-               } else {
-                       pci_write_config_byte(dev, drive_pci,
-                               test1|SYNC_ERRDY_EN);
-               }
-       }
-
-chipset_is_set:
-
-       if (drive->media == ide_disk) {
-               pci_read_config_byte(dev, (drive_pci), &AP);
-               if (id->capability & 4) /* IORDY_EN */
-                       pci_write_config_byte(dev, (drive_pci), AP|IORDY_EN);
-               pci_read_config_byte(dev, (drive_pci), &AP);
-               if (drive->media == ide_disk)   /* PREFETCH_EN */
-                       pci_write_config_byte(dev, (drive_pci), AP|PREFETCH_EN);
-       }
-
-jumpbit_is_set:
-
-       speed = ide_dma_speed(drive, pdc202xx_ratemask(drive));
-
-       if (!(speed)) {
-               /* restore original pci-config space */
-               if (!jumpbit)
-                       pci_write_config_dword(dev, drive_pci, drive_conf);
-               hwif->tuneproc(drive, 5);
-               return 0;
-       }
-
-       (void) hwif->speedproc(drive, speed);
-       return ide_dma_enable(drive);
-}
-
-static int pdc202xx_config_drive_xfer_rate (ide_drive_t *drive)
-{
-       ide_hwif_t *hwif        = HWIF(drive);
-       struct hd_driveid *id   = drive->id;
-
-       drive->init_speed = 0;
-
-       if (id && (id->capability & 1) && drive->autodma) {
-               /* Consult the list of known "bad" drives */
-               if (hwif->ide_dma_bad_drive(drive))
-                       goto fast_ata_pio;
-               if (id->field_valid & 4) {
-                       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 (hwif->ide_dma_good_drive(drive) &&
-                           (id->eide_dma_time < 150)) {
-                               goto no_dma_set;
-                       /* Consult the list of known "good" drives */
-                       if (!config_chipset_for_dma(drive))
-                               goto no_dma_set;
-               } else {
-                       goto fast_ata_pio;
-               }
-       } else if ((id->capability & 8) || (id->field_valid & 2)) {
-fast_ata_pio:
-no_dma_set:
-               hwif->tuneproc(drive, 5);
-               return hwif->ide_dma_off_quietly(drive);
-       }
-       return hwif->ide_dma_on(drive);
-}
-
-static int pdc202xx_quirkproc (ide_drive_t *drive)
-{
-       return ((int) check_in_drive_lists(drive, pdc_quirk_drives));
-}
-
-static int pdc202xx_old_ide_dma_begin(ide_drive_t *drive)
-{
-       if (drive->addressing == 1) {
-               struct request *rq      = HWGROUP(drive)->rq;
-               ide_hwif_t *hwif        = HWIF(drive);
-               struct pci_dev *dev     = hwif->pci_dev;
-               u32 high_16     = pci_resource_start(dev, 4);
-               u32 atapi_reg   = high_16 + (hwif->channel ? 0x24 : 0x20);
-               u32 word_count  = 0;
-               u8 clock = hwif->INB(high_16 + 0x11);
-
-               hwif->OUTB(clock|(hwif->channel ? 0x08 : 0x02), high_16+0x11);
-               word_count = (rq->nr_sectors << 8);
-               word_count = (rq->cmd == READ) ? word_count | 0x05000000 :
-                                                word_count | 0x06000000;
-               hwif->OUTL(word_count, atapi_reg);
-       }
-       return __ide_dma_begin(drive);
-}
-
-static int pdc202xx_old_ide_dma_end(ide_drive_t *drive)
-{
-       if (drive->addressing == 1) {
-               ide_hwif_t *hwif        = HWIF(drive);
-               u32 high_16     = pci_resource_start(hwif->pci_dev, 4);
-               u32 atapi_reg   = high_16 + (hwif->channel ? 0x24 : 0x20);
-               u8 clock        = 0;
-
-               hwif->OUTL(0, atapi_reg); /* zero out extra */
-               clock = hwif->INB(high_16 + 0x11);
-               hwif->OUTB(clock & ~(hwif->channel ? 0x08:0x02), high_16+0x11);
-       }
-       return __ide_dma_end(drive);
-}
-
-static int pdc202xx_old_ide_dma_test_irq(ide_drive_t *drive)
-{
-       ide_hwif_t *hwif        = HWIF(drive);
-       struct pci_dev *dev     = hwif->pci_dev;
-       unsigned long high_16   = pci_resource_start(dev, 4);
-       u8 dma_stat             = hwif->INB(hwif->dma_status);
-       u8 sc1d                 = hwif->INB((high_16 + 0x001d));
-
-       if (hwif->channel) {
-               if ((sc1d & 0x50) == 0x50)
-                       goto somebody_else;
-               else if ((sc1d & 0x40) == 0x40)
-                       return (dma_stat & 4) == 4;
-       } else {
-               if ((sc1d & 0x05) == 0x05)
-                       goto somebody_else;
-               else if ((sc1d & 0x04) == 0x04)
-                       return (dma_stat & 4) == 4;
-       }
-somebody_else:
-       return (dma_stat & 4) == 4;     /* return 1 if INTR asserted */
-}
-
-static int pdc202xx_ide_dma_lostirq(ide_drive_t *drive)
-{
-       if (HWIF(drive)->resetproc != NULL)
-               HWIF(drive)->resetproc(drive);
-       return __ide_dma_lostirq(drive);
-}
-
-static int pdc202xx_ide_dma_timeout(ide_drive_t *drive)
-{
-       if (HWIF(drive)->resetproc != NULL)
-               HWIF(drive)->resetproc(drive);
-       return __ide_dma_timeout(drive);
-}
-
-#endif /* CONFIG_BLK_DEV_IDEDMA */
-
-static void pdc202xx_new_reset (ide_drive_t *drive)
-{
-       /*
-        * Deleted this because it is redundant from the caller.
-        */
-       printk("PDC202XX: %s channel reset.\n",
-               HWIF(drive)->channel ? "Secondary" : "Primary");
-}
-
-static void pdc202xx_reset_host (ide_hwif_t *hwif)
-{
-#ifdef CONFIG_BLK_DEV_IDEDMA
-//     unsigned long high_16   = hwif->dma_base - (8*(hwif->channel));
-       unsigned long high_16   = hwif->dma_master;
-#else /* !CONFIG_BLK_DEV_IDEDMA */
-       unsigned long high_16   = pci_resource_start(hwif->pci_dev, 4);
-#endif /* CONFIG_BLK_DEV_IDEDMA */
-       u8 udma_speed_flag      = hwif->INB(high_16|0x001f);
-
-       hwif->OUTB((udma_speed_flag | 0x10), (high_16|0x001f));
-       mdelay(100);
-       hwif->OUTB((udma_speed_flag & ~0x10), (high_16|0x001f));
-       mdelay(2000);   /* 2 seconds ?! */
-
-       printk("PDC202XX: %s channel reset.\n",
-               hwif->channel ? "Secondary" : "Primary");
-}
-
-void pdc202xx_reset (ide_drive_t *drive)
-{
-       ide_hwif_t *hwif        = HWIF(drive);
-       ide_hwif_t *mate        = hwif->mate;
-       
-       pdc202xx_reset_host(hwif);
-       pdc202xx_reset_host(mate);
-#if 0
-       /*
-        * FIXME: Have to kick all the drives again :-/
-        * What a pain in the ACE!
-        */
-       if (hwif->present) {
-               u16 hunit = 0;
-               hwif->initializing = 1;
-               for (hunit = 0; hunit < MAX_DRIVES; ++hunit) {
-                       ide_drive_t *hdrive = &hwif->drives[hunit];
-                       if (hdrive->present) {
-                               if (hwif->ide_dma_check)
-                                       hwif->ide_dma_check(hdrive);
-                               else
-                                       hwif->tuneproc(hdrive, 5);
-                       }
-               }
-               hwif->initializing = 0;
-       }
-       if (mate->present) {
-               u16 munit = 0;
-               mate->initializing = 1;
-               for (munit = 0; munit < MAX_DRIVES; ++munit) {
-                       ide_drive_t *mdrive = &mate->drives[munit];
-                       if (mdrive->present) {
-                               if (mate->ide_dma_check) 
-                                       mate->ide_dma_check(mdrive);
-                               else
-                                       mate->tuneproc(mdrive, 5);
-                       }
-               }
-               mate->initializing = 0;
-       }
-#else
-       hwif->tuneproc(drive, 5);
-#endif
-}
-
-/*
- * Since SUN Cobalt is attempting to do this operation, I should disclose
- * this has been a long time ago Thu Jul 27 16:40:57 2000 was the patch date
- * HOTSWAP ATA Infrastructure.
- */
-static int pdc202xx_tristate (ide_drive_t * drive, int state)
-{
-       ide_hwif_t *hwif        = HWIF(drive);
-#ifdef CONFIG_BLK_DEV_IDEDMA
-//     unsigned long high_16   = hwif->dma_base - (8*(hwif->channel));
-       unsigned long high_16   = hwif->dma_master;
-#else /* !CONFIG_BLK_DEV_IDEDMA */
-       unsigned long high_16   = pci_resource_start(hwif->pci_dev, 4);
-#endif /* CONFIG_BLK_DEV_IDEDMA */
-       u8 sc1f                 = hwif->INB(high_16|0x001f);
-
-       if (!hwif)
-               return -EINVAL;
-
-//     hwif->bus_state = state;
-
-       if (state) {
-               hwif->OUTB(sc1f | 0x08, (high_16|0x001f));
-       } else {
-               hwif->OUTB(sc1f & ~0x08, (high_16|0x001f));
-       }
-       return 0;
-}
-
-static unsigned int __init init_chipset_pdc202xx (struct pci_dev *dev, const char *name)
-{
-       if (dev->resource[PCI_ROM_RESOURCE].start) {
-               pci_write_config_dword(dev, PCI_ROM_ADDRESS,
-                       dev->resource[PCI_ROM_RESOURCE].start | PCI_ROM_ADDRESS_ENABLE);
-               printk("%s: ROM enabled at 0x%08lx\n",
-                       name, dev->resource[PCI_ROM_RESOURCE].start);
-       }
-
-#if defined(DISPLAY_PDC202XX_TIMINGS) && defined(CONFIG_PROC_FS)
-       pdc202_devs[n_pdc202_devs++] = dev;
-
-       if (!pdc202xx_proc) {
-               pdc202xx_proc = 1;
-               ide_pci_register_host_proc(&pdc202xx_procs[0]);
-       }
-#endif /* DISPLAY_PDC202XX_TIMINGS && CONFIG_PROC_FS */
-
-       /*
-        * software reset -  this is required because the bios
-        * will set UDMA timing on if the hdd supports it. The
-        * user may want to turn udma off. A bug in the pdc20262
-        * is that it cannot handle a downgrade in timing from
-        * UDMA to DMA. Disk accesses after issuing a set
-        * feature command will result in errors. A software
-        * reset leaves the timing registers intact,
-        * but resets the drives.
-        */
-#if 0
-       if ((dev->device == PCI_DEVICE_ID_PROMISE_20267) ||
-           (dev->device == PCI_DEVICE_ID_PROMISE_20265) ||
-           (dev->device == PCI_DEVICE_ID_PROMISE_20263) ||
-           (dev->device == PCI_DEVICE_ID_PROMISE_20262)) {
-               unsigned long high_16   = pci_resource_start(dev, 4);
-               byte udma_speed_flag    = inb(high_16 + 0x001f);
-               outb(udma_speed_flag | 0x10, high_16 + 0x001f);
-               mdelay(100);
-               outb(udma_speed_flag & ~0x10, high_16 + 0x001f);
-               mdelay(2000);   /* 2 seconds ?! */
-       }
-
-#endif
-       return dev->irq;
-}
-
-static void __init init_hwif_pdc202xx (ide_hwif_t *hwif)
-{
-       hwif->autodma = 0;
-       hwif->tuneproc  = &pdc202xx_tune_drive;
-       hwif->quirkproc = &pdc202xx_quirkproc;
-
-       if (hwif->pci_dev->device == PCI_DEVICE_ID_PROMISE_20267)
-               hwif->addressing = (hwif->channel) ? 0 : 1;
-       if (hwif->pci_dev->device == PCI_DEVICE_ID_PROMISE_20265)
-               hwif->addressing = (hwif->channel) ? 0 : 1;
-
-       if (hwif->pci_dev->device != PCI_DEVICE_ID_PROMISE_20246) {
-               hwif->busproc   = &pdc202xx_tristate;
-               hwif->resetproc = &pdc202xx_reset;
-       }
-
-       hwif->speedproc = &pdc202xx_tune_chipset;
-
-       if (!hwif->dma_base) {
-               hwif->drives[0].autotune = hwif->drives[1].autotune = 1;
-               return;
-       }
-
-       hwif->ultra_mask = 0x3f;
-       hwif->mwdma_mask = 0x07;
-       hwif->swdma_mask = 0x07;
-
-#ifdef CONFIG_BLK_DEV_IDEDMA
-
-       hwif->ide_dma_check = &pdc202xx_config_drive_xfer_rate;
-       hwif->ide_dma_lostirq = &pdc202xx_ide_dma_lostirq;
-       hwif->ide_dma_timeout = &pdc202xx_ide_dma_timeout;
-
-       if (hwif->pci_dev->device != PCI_DEVICE_ID_PROMISE_20246) {
-               if (!(hwif->udma_four))
-                       hwif->udma_four = (pdc202xx_old_cable_detect(hwif)) ? 0 : 1;
-               hwif->ide_dma_begin = &pdc202xx_old_ide_dma_begin;
-               hwif->ide_dma_end = &pdc202xx_old_ide_dma_end;
-       } 
-       hwif->ide_dma_test_irq = &pdc202xx_old_ide_dma_test_irq;
-
-       if (!noautodma)
-               hwif->autodma = 1;
-       hwif->drives[0].autodma = hwif->drives[1].autodma = hwif->autodma;
-#endif /* CONFIG_BLK_DEV_IDEDMA */
-#if PDC202_DEBUG_CABLE
-       printk("%s: %s-pin cable\n",
-               hwif->name, hwif->udma_four ? "80" : "40");
-#endif /* PDC202_DEBUG_CABLE */        
-}
-
-static void __init init_hwif_pdc202new (ide_hwif_t *hwif)
-{
-       hwif->autodma = 0;
-
-       hwif->tuneproc  = &pdc202xx_tune_drive;
-       hwif->quirkproc = &pdc202xx_quirkproc;
-       hwif->speedproc = &pdc202xx_new_tune_chipset;
-       hwif->resetproc = &pdc202xx_new_reset;
-
-       if (!hwif->dma_base) {
-               hwif->drives[0].autotune = hwif->drives[1].autotune = 1;
-               return;
-       }
-
-       hwif->ultra_mask = 0x7f;
-       hwif->mwdma_mask = 0x07;
-
-#ifdef CONFIG_BLK_DEV_IDEDMA
-
-       hwif->ide_dma_check = &pdc202xx_config_drive_xfer_rate;
-       hwif->ide_dma_lostirq = &pdc202xx_ide_dma_lostirq;
-       hwif->ide_dma_timeout = &pdc202xx_ide_dma_timeout;
-       if (!(hwif->udma_four))
-               hwif->udma_four = (pdc202xx_new_cable_detect(hwif)) ? 0 : 1;
-       if (!noautodma)
-               hwif->autodma = 1;
-       hwif->drives[0].autodma = hwif->drives[1].autodma = hwif->autodma;
-#endif /* CONFIG_BLK_DEV_IDEDMA */
-#if PDC202_DEBUG_CABLE
-       printk("%s: %s-pin cable\n",
-               hwif->name, hwif->udma_four ? "80" : "40");
-#endif /* PDC202_DEBUG_CABLE */
-}
-
-static void __init init_dma_pdc202xx (ide_hwif_t *hwif, unsigned long dmabase)
-{
-       u8 udma_speed_flag = 0, primary_mode = 0, secondary_mode = 0;
-
-       if (hwif->channel) {
-               ide_setup_dma(hwif, dmabase, 8);
-               return;
-       }
-
-       udma_speed_flag = hwif->INB((dmabase|0x1f));
-       primary_mode    = hwif->INB((dmabase|0x1a));
-       secondary_mode  = hwif->INB((dmabase|0x1b));
-       printk("%s: (U)DMA Burst Bit %sABLED " \
-               "Primary %s Mode " \
-               "Secondary %s Mode.\n", hwif->cds->name,
-               (udma_speed_flag & 1) ? "EN" : "DIS",
-               (primary_mode & 1) ? "MASTER" : "PCI",
-               (secondary_mode & 1) ? "MASTER" : "PCI" );
-
-#ifdef CONFIG_PDC202XX_BURST
-       if (!(udma_speed_flag & 1)) {
-               printk("%s: FORCING BURST BIT 0x%02x->0x%02x ",
-                       hwif->cds->name, udma_speed_flag,
-                       (udma_speed_flag|1));
-               hwif->OUTB(udma_speed_flag|1,(dmabase|0x1f));
-               printk("%sACTIVE\n",
-                       (hwif->INB(dmabase|0x1f)&1) ? "":"IN");
-       }
-#endif /* CONFIG_PDC202XX_BURST */
-#ifdef CONFIG_PDC202XX_MASTER
-       if (!(primary_mode & 1)) {
-               printk("%s: FORCING PRIMARY MODE BIT "
-                       "0x%02x -> 0x%02x ", hwif->cds->name,
-                       primary_mode, (primary_mode|1));
-               hwif->OUTB(primary_mode|1, (dmabase|0x1a));
-               printk("%s\n",
-                       (hwif->INB((dmabase|0x1a)) & 1) ? "MASTER" : "PCI");
-       }
-
-       if (!(secondary_mode & 1)) {
-               printk("%s: FORCING SECONDARY MODE BIT "
-                       "0x%02x -> 0x%02x ", hwif->cds->name,
-                       secondary_mode, (secondary_mode|1));
-               hwif->OUTB(secondary_mode|1, (dmabase|0x1b));
-               printk("%s\n",
-                       (hwif->INB((dmabase|0x1b)) & 1) ? "MASTER" : "PCI");
-       }
-#endif /* CONFIG_PDC202XX_MASTER */
-
-       ide_setup_dma(hwif, dmabase, 8);
-}
-
-static void __init init_dma_pdc202new (ide_hwif_t *hwif, unsigned long dmabase)
-{
-       ide_setup_dma(hwif, dmabase, 8);
-}
-
-extern void ide_setup_pci_device(struct pci_dev *, ide_pci_device_t *);
-extern void ide_setup_pci_devices(struct pci_dev *, struct pci_dev *, ide_pci_device_t *);
-
-static void __init init_setup_pdc202ata4 (struct pci_dev *dev, ide_pci_device_t *d)
-{
-       if ((dev->class >> 8) != PCI_CLASS_STORAGE_IDE) {
-               u8 irq = 0, irq2 = 0;
-               pci_read_config_byte(dev, PCI_INTERRUPT_LINE, &irq);
-               /* 0xbc */
-               pci_read_config_byte(dev, (PCI_INTERRUPT_LINE)|0x80, &irq2);
-               if (irq != irq2) {
-                       pci_write_config_byte(dev,
-                               (PCI_INTERRUPT_LINE)|0x80, irq);     /* 0xbc */
-                       printk("%s: pci-config space interrupt "
-                               "mirror fixed.\n", d->name);
-               }
-       }
-
-#if 0
-        if (dev->device == PCI_DEVICE_ID_PROMISE_20262)
-        if (e->reg && (pci_read_config_byte(dev, e->reg, &tmp) ||
-             (tmp & e->mask) != e->val))
-
-        if (d->enablebits[0].reg != d->enablebits[1].reg) {
-                d->enablebits[0].reg    = d->enablebits[1].reg;
-                d->enablebits[0].mask   = d->enablebits[1].mask;
-                d->enablebits[0].val    = d->enablebits[1].val;
-        }
-#endif
-
-       ide_setup_pci_device(dev, d);
-}
-
-static void __init init_setup_pdc20265 (struct pci_dev *dev, ide_pci_device_t *d)
-{
-       if ((dev->bus->self) &&
-           (dev->bus->self->vendor == PCI_VENDOR_ID_INTEL) &&
-           ((dev->bus->self->device == PCI_DEVICE_ID_INTEL_I960) ||
-            (dev->bus->self->device == PCI_DEVICE_ID_INTEL_I960RM))) {
-               printk(KERN_INFO "ide: Skipping Promise PDC20265 "
-                       "attached to I2O RAID controller.\n");
-               return;
-       }
-
-#if 0
-        {
-                u8 pri = 0, sec = 0;
-
-        if (e->reg && (pci_read_config_byte(dev, e->reg, &tmp) ||
-             (tmp & e->mask) != e->val))
-
-        if (d->enablebits[0].reg != d->enablebits[1].reg) {
-                d->enablebits[0].reg    = d->enablebits[1].reg;
-                d->enablebits[0].mask   = d->enablebits[1].mask;
-                d->enablebits[0].val    = d->enablebits[1].val;
-        }
-        }
-#endif
-
-       ide_setup_pci_device(dev, d);
-}
-
-static void __init init_setup_pdc202xx (struct pci_dev *dev, ide_pci_device_t *d)
-{
-       ide_setup_pci_device(dev, d);
-}
-
-static void __init init_setup_pdc20270 (struct pci_dev *dev, ide_pci_device_t *d)
-{
-       struct pci_dev *findev;
-
-       if ((dev->bus->self &&
-            dev->bus->self->vendor == PCI_VENDOR_ID_DEC) &&
-           (dev->bus->self->device == PCI_DEVICE_ID_DEC_21150)) {
-               if (PCI_SLOT(dev->devfn) & 2) {
-                       return;
-               }
-               d->extra = 0;
-               pci_for_each_dev(findev) {
-                       if ((findev->vendor == dev->vendor) &&
-                           (findev->device == dev->device) &&
-                           (PCI_SLOT(findev->devfn) & 2)) {
-                               u8 irq = 0, irq2 = 0;
-                               pci_read_config_byte(dev,
-                                       PCI_INTERRUPT_LINE, &irq);
-                               pci_read_config_byte(findev,
-                                       PCI_INTERRUPT_LINE, &irq2);
-                               if (irq != irq2) {
-                                       findev->irq = dev->irq;
-                                       pci_write_config_byte(findev,
-                                               PCI_INTERRUPT_LINE, irq);
-                               }
-                               ide_setup_pci_devices(dev, findev, d);
-                               return;
-                       }
-               }
-       }
-       ide_setup_pci_device(dev, d);
-}
-
-static void __init init_setup_pdc20276 (struct pci_dev *dev, ide_pci_device_t *d)
-{
-       if ((dev->bus->self) &&
-           (dev->bus->self->vendor == PCI_VENDOR_ID_INTEL) &&
-           ((dev->bus->self->device == PCI_DEVICE_ID_INTEL_I960) ||
-            (dev->bus->self->device == PCI_DEVICE_ID_INTEL_I960RM))) {
-               printk(KERN_INFO "ide: Skipping Promise PDC20276 "
-                       "attached to I2O RAID controller.\n");
-               return;
-       }
-       ide_setup_pci_device(dev, d);
-}
-
-int __init pdc202xx_scan_pcidev (struct pci_dev *dev)
-{
-       ide_pci_device_t *d;
-
-       if (dev->vendor != PCI_VENDOR_ID_PROMISE)
-               return 0;
-
-       for (d = pdc202xx_chipsets; d && d->vendor && d->device; ++d) {
-               if (((d->vendor == dev->vendor) &&
-                    (d->device == dev->device)) &&
-                   (d->init_setup)) {
-                       d->init_setup(dev, d);
-                       return 1;
-               }
-       }
-       return 0;
-}
-
index 07655ca95404972879e0d5d24c1998da263f8274..276df401938e56079c97004644fc04cee2dfd7b8 100644 (file)
@@ -15,6 +15,7 @@
  */
 
 #include <linux/config.h>
+#include <linux/module.h>
 #include <linux/types.h>
 #include <linux/kernel.h>
 #include <linux/delay.h>
@@ -646,21 +647,71 @@ static void __init init_setup_pdc20276 (struct pci_dev *dev, ide_pci_device_t *d
        ide_setup_pci_device(dev, d);
 }
 
-int __init pdcnew_scan_pcidev (struct pci_dev *dev)
+/**
+ *     pdc202new_init_one      -       called when a pdc202xx is found
+ *     @dev: the pdc202new device
+ *     @id: the matching pci id
+ *
+ *     Called when the PCI registration layer (or the IDE initialization)
+ *     finds a device matching our IDE device tables.
+ */
+static int __devinit pdc202new_init_one(struct pci_dev *dev, const struct pci_device_id *id)
 {
-       ide_pci_device_t *d;
+       ide_pci_device_t *d = &pdcnew_chipsets[id->driver_data];
 
-       if (dev->vendor != PCI_VENDOR_ID_PROMISE)
-               return 0;
-
-       for (d = pdcnew_chipsets; d && d->vendor && d->device; ++d) {
-               if (((d->vendor == dev->vendor) &&
-                    (d->device == dev->device)) &&
-                   (d->init_setup)) {
-                       d->init_setup(dev, d);
-                       return 1;
-               }
-       }
+       if (dev->device != d->device)
+               BUG();
+       d->init_setup(dev, d);
        return 0;
 }
 
+/**
+ *     pdc202new_remove_one    -       called when a pdc202xx is unplugged
+ *     @dev: the device that was removed
+ *
+ *     Disconnect an IDE device that has been unplugged either by hotplug
+ *     or by a more civilized notification scheme. Not yet supported.
+ */
+static void pdc202new_remove_one(struct pci_dev *dev)
+{
+       panic("Promise IDE removal not yet supported");
+}
+
+static struct pci_device_id pdc202new_pci_tbl[] __devinitdata = {
+       { PCI_VENDOR_ID_PROMISE, PCI_DEVICE_ID_PROMISE_20268, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0},
+       { PCI_VENDOR_ID_PROMISE, PCI_DEVICE_ID_PROMISE_20269, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 1},
+       { PCI_VENDOR_ID_PROMISE, PCI_DEVICE_ID_PROMISE_20270, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 2},
+       { PCI_VENDOR_ID_PROMISE, PCI_DEVICE_ID_PROMISE_20271, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 3},
+       { PCI_VENDOR_ID_PROMISE, PCI_DEVICE_ID_PROMISE_20275, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 4},
+       { PCI_VENDOR_ID_PROMISE, PCI_DEVICE_ID_PROMISE_20276, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 5},
+       { PCI_VENDOR_ID_PROMISE, PCI_DEVICE_ID_PROMISE_20277, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 6},
+       { 0, },
+};
+
+static struct pci_driver driver = {
+       name:           "Promise IDE",
+       id_table:       pdc202new_pci_tbl,
+       probe:          pdc202new_init_one,
+       remove:         __devexit_p(pdc202new_remove_one),
+};
+
+static int pdc202new_ide_init(void)
+{
+       return ide_pci_register_driver(&driver);
+}
+
+static void pdc202new_ide_exit(void)
+{
+       ide_pci_unregister_driver(&driver);
+}
+
+module_init(pdc202new_ide_init);
+module_exit(pdc202new_ide_exit);
+
+MODULE_AUTHOR("Andre Hedrick, Frank Tiernan");
+MODULE_DESCRIPTION("PCI driver module for Promise PDC20268 and higher");
+MODULE_LICENSE("GPL");
+
+EXPORT_NO_SYMBOLS;
index 12bb97bfb9e455eb4770660b8d1176edc41bd84a..064dba8b412cbf7f00d6e59bbbafcca8fc59a4b2 100644 (file)
@@ -226,7 +226,7 @@ static void init_hwif_pdc202new(ide_hwif_t *);
 static void init_dma_pdc202new(ide_hwif_t *, unsigned long);
 
 static ide_pci_device_t pdcnew_chipsets[] __initdata = {
-       {
+       {       /* 0 */
                vendor:         PCI_VENDOR_ID_PROMISE,
                device:         PCI_DEVICE_ID_PROMISE_20268,
                name:           "PDC20268",
@@ -240,7 +240,7 @@ static ide_pci_device_t pdcnew_chipsets[] __initdata = {
                enablebits:     {{0x00,0x00,0x00}, {0x00,0x00,0x00}},
                bootable:       OFF_BOARD,
                extra:          0,
-       },{
+       },{     /* 1 */
                vendor:         PCI_VENDOR_ID_PROMISE,
                device:         PCI_DEVICE_ID_PROMISE_20269,
                name:           "PDC20269",
@@ -254,7 +254,7 @@ static ide_pci_device_t pdcnew_chipsets[] __initdata = {
                enablebits:     {{0x00,0x00,0x00}, {0x00,0x00,0x00}},
                bootable:       OFF_BOARD,
                extra:          0,
-       },{
+       },{     /* 2 */
                vendor:         PCI_VENDOR_ID_PROMISE,
                device:         PCI_DEVICE_ID_PROMISE_20270,
                name:           "PDC20270",
@@ -272,7 +272,7 @@ static ide_pci_device_t pdcnew_chipsets[] __initdata = {
 #endif
                bootable:       OFF_BOARD,
                extra:          0,
-       },{
+       },{     /* 3 */
                vendor:         PCI_VENDOR_ID_PROMISE,
                device:         PCI_DEVICE_ID_PROMISE_20271,
                name:           "PDC20271",
@@ -286,7 +286,7 @@ static ide_pci_device_t pdcnew_chipsets[] __initdata = {
                enablebits:     {{0x00,0x00,0x00}, {0x00,0x00,0x00}},
                bootable:       OFF_BOARD,
                extra:          0,
-       },{
+       },{     /* 4 */
                vendor:         PCI_VENDOR_ID_PROMISE,
                device:         PCI_DEVICE_ID_PROMISE_20275,
                name:           "PDC20275",
@@ -300,7 +300,7 @@ static ide_pci_device_t pdcnew_chipsets[] __initdata = {
                enablebits:     {{0x00,0x00,0x00}, {0x00,0x00,0x00}},
                bootable:       OFF_BOARD,
                extra:          0,
-       },{
+       },{     /* 5 */
                vendor:         PCI_VENDOR_ID_PROMISE,
                device:         PCI_DEVICE_ID_PROMISE_20276,
                name:           "PDC20276",
@@ -318,7 +318,7 @@ static ide_pci_device_t pdcnew_chipsets[] __initdata = {
 #endif
                bootable:       OFF_BOARD,
                extra:          0,
-       },{
+       },{     /* 6 */
                vendor:         PCI_VENDOR_ID_PROMISE,
                device:         PCI_DEVICE_ID_PROMISE_20277,
                name:           "PDC20277",
index e4ace83bcfafd6f1fed45a718bdb54ff6d700224..9da7f883425115084e063c2034d966f1d162d8ba 100644 (file)
@@ -1,5 +1,5 @@
 /*
- *  linux/drivers/ide/pdc202xx.c       Version 0.35    Mar. 30, 2002
+ *  linux/drivers/ide/pdc202xx.c       Version 0.36    Sept 11, 2002
  *
  *  Copyright (C) 1998-2002            Andre Hedrick <andre@linux-ide.org>
  *
@@ -30,6 +30,7 @@
 
 #include <linux/config.h>
 #include <linux/types.h>
+#include <linux/module.h>
 #include <linux/kernel.h>
 #include <linux/delay.h>
 #include <linux/timer.h>
@@ -918,21 +919,69 @@ static void __init init_setup_pdc202xx (struct pci_dev *dev, ide_pci_device_t *d
        ide_setup_pci_device(dev, d);
 }
 
-int __init pdc202xx_scan_pcidev (struct pci_dev *dev)
+/**
+ *     pdc202xx_init_one       -       called when a PDC202xx is found
+ *     @dev: the pdc202xx device
+ *     @id: the matching pci id
+ *
+ *     Called when the PCI registration layer (or the IDE initialization)
+ *     finds a device matching our IDE device tables.
+ */
+static int __devinit pdc202xx_init_one(struct pci_dev *dev, const struct pci_device_id *id)
 {
-       ide_pci_device_t *d;
+       ide_pci_device_t *d = &pdc202xx_chipsets[id->driver_data];
 
-       if (dev->vendor != PCI_VENDOR_ID_PROMISE)
-               return 0;
-
-       for (d = pdc202xx_chipsets; d && d->vendor && d->device; ++d) {
-               if (((d->vendor == dev->vendor) &&
-                    (d->device == dev->device)) &&
-                   (d->init_setup)) {
-                       d->init_setup(dev, d);
-                       return 1;
-               }
-       }
+       if (dev->device != d->device)
+               BUG();
+       d->init_setup(dev, d);
        return 0;
 }
 
+/**
+ *     pdc202xx_remove_one     -       called with the IDE to be unplugged
+ *     @dev: the device that was removed
+ *
+ *     Disconnect an IDE device that has been unplugged either by hotplug
+ *     or by a more civilized notification scheme. Not yet supported.
+ */
+static void pdc202xx_remove_one(struct pci_dev *dev)
+{
+       panic("Promise IDE removal not yet supported");
+}
+
+static struct pci_device_id pdc202xx_pci_tbl[] __devinitdata = {
+       { PCI_VENDOR_ID_PROMISE, PCI_DEVICE_ID_PROMISE_20246, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0},
+       { PCI_VENDOR_ID_PROMISE, PCI_DEVICE_ID_PROMISE_20262, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 1},
+       { PCI_VENDOR_ID_PROMISE, PCI_DEVICE_ID_PROMISE_20263, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 2},
+       { PCI_VENDOR_ID_PROMISE, PCI_DEVICE_ID_PROMISE_20265, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 3},
+       { PCI_VENDOR_ID_PROMISE, PCI_DEVICE_ID_PROMISE_20267, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 4},
+       { 0, },
+};
+
+static struct pci_driver driver = {
+       name:           "Promise Old IDE",
+       id_table:       pdc202xx_pci_tbl,
+       probe:          pdc202xx_init_one,
+       remove:         __devexit_p(pdc202xx_remove_one),
+};
+
+static int pdc202xx_ide_init(void)
+{
+       return ide_pci_register_driver(&driver);
+}
+
+static void pdc202xx_ide_exit(void)
+{
+       ide_pci_unregister_driver(&driver);
+}
+
+module_init(pdc202xx_ide_init);
+module_exit(pdc202xx_ide_exit);
+
+MODULE_AUTHOR("Andre Hedrick, Frank Tiernan");
+MODULE_DESCRIPTION("PCI driver module for older Promise IDE");
+MODULE_LICENSE("GPL");
+
+EXPORT_NO_SYMBOLS;
index f40065845453a779deacb6dd84d1b9bad97f2228..9b897e3728b493f27c53a5212451b85667e2f499 100644 (file)
@@ -226,7 +226,7 @@ static void init_hwif_pdc202xx(ide_hwif_t *);
 static void init_dma_pdc202xx(ide_hwif_t *, unsigned long);
 
 static ide_pci_device_t pdc202xx_chipsets[] __initdata = {
-       {
+       {       /* 0 */
                vendor:         PCI_VENDOR_ID_PROMISE,
                device:         PCI_DEVICE_ID_PROMISE_20246,
                name:           "PDC20246",
@@ -244,7 +244,7 @@ static ide_pci_device_t pdc202xx_chipsets[] __initdata = {
 #endif
                bootable:       OFF_BOARD,
                extra:          16,
-       },{
+       },{     /* 1 */
                vendor:         PCI_VENDOR_ID_PROMISE,
                device:         PCI_DEVICE_ID_PROMISE_20262,
                name:           "PDC20262",
@@ -262,7 +262,7 @@ static ide_pci_device_t pdc202xx_chipsets[] __initdata = {
 #endif
                bootable:       OFF_BOARD,
                extra:          48,
-       },{
+       },{     /* 2 */
                vendor:         PCI_VENDOR_ID_PROMISE,
                device:         PCI_DEVICE_ID_PROMISE_20263,
                name:           "PDC20263",
@@ -280,7 +280,7 @@ static ide_pci_device_t pdc202xx_chipsets[] __initdata = {
 #endif
                bootable:       OFF_BOARD,
                extra:          48,
-       },{
+       },{     /* 3 */
                vendor:         PCI_VENDOR_ID_PROMISE,
                device:         PCI_DEVICE_ID_PROMISE_20265,
                name:           "PDC20265",
@@ -297,7 +297,7 @@ static ide_pci_device_t pdc202xx_chipsets[] __initdata = {
 #endif
                bootable:       OFF_BOARD,
                extra:          48,
-       },{
+       },{     /* 4 */
                vendor:         PCI_VENDOR_ID_PROMISE,
                device:         PCI_DEVICE_ID_PROMISE_20267,
                name:           "PDC20267",