This commit was manufactured by cvs2svn to create tag

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

diff --git a/drivers/ide/pci/sgiioc4.c b/drivers/ide/pci/sgiioc4.c
index d85338a..f93ff65 100644 (file)
--- a/drivers/ide/pci/sgiioc4.c
+++ b/drivers/ide/pci/sgiioc4.c
@@ -192,13 +192,16 @@ sgiioc4_clearirq(ide_drive_t * drive)
        return intr_reg & 3;
 }
 
-static void sgiioc4_ide_dma_start(ide_drive_t * drive)
+static int
+sgiioc4_ide_dma_begin(ide_drive_t * drive)
 {
        ide_hwif_t *hwif = HWIF(drive);
        unsigned int reg = hwif->INL(hwif->dma_base + IOC4_DMA_CTRL * 4);
        unsigned int temp_reg = reg | IOC4_S_DMA_START;
 
        hwif->OUTL(temp_reg, hwif->dma_base + IOC4_DMA_CTRL * 4);
+
+       return 0;
 }
 
 static u32
@@ -331,6 +334,17 @@ sgiioc4_ide_dma_host_off(ide_drive_t * drive)
        return 0;
 }
 
+static int
+sgiioc4_ide_dma_verbose(ide_drive_t * drive)
+{
+       if (drive->using_dma == 1)
+               printk(", UDMA(16)");
+       else
+               printk(", PIO");
+
+       return 1;
+}
+
 static int
 sgiioc4_ide_dma_lostirq(ide_drive_t * drive)
 {
@@ -368,7 +382,7 @@ sgiioc4_INB(unsigned long port)
 }
 
 /* Creates a dma map for the scatter-gather list entries */
-static void __devinit
+static void __init
 ide_dma_sgiioc4(ide_hwif_t * hwif, unsigned long dma_base)
 {
        int num_ports = sizeof (ioc4_dma_regs_t);
@@ -393,7 +407,11 @@ ide_dma_sgiioc4(ide_hwif_t * hwif, unsigned long dma_base)
        if (!hwif->dmatable_cpu)
                goto dma_alloc_failure;
 
-       hwif->sg_max_nents = IOC4_PRD_ENTRIES;
+       hwif->sg_table =
+           kmalloc(sizeof (struct scatterlist) * IOC4_PRD_ENTRIES, GFP_KERNEL);
+
+       if (!hwif->sg_table)
+               goto dma_sgalloc_failure;
 
        hwif->dma_base2 = (unsigned long)
                pci_alloc_consistent(hwif->pci_dev,
@@ -406,6 +424,9 @@ ide_dma_sgiioc4(ide_hwif_t * hwif, unsigned long dma_base)
        return;
 
 dma_base2alloc_failure:
+       kfree(hwif->sg_table);
+
+dma_sgalloc_failure:
        pci_free_consistent(hwif->pci_dev,
                            IOC4_PRD_ENTRIES * IOC4_PRD_BYTES,
                            hwif->dmatable_cpu, hwif->dmatable_dma);
@@ -490,7 +511,10 @@ sgiioc4_build_dma_table(ide_drive_t * drive, struct request *rq, int ddir)
        unsigned int count = 0, i = 1;
        struct scatterlist *sg;
 
-       hwif->sg_nents = i = ide_build_sglist(drive, rq);
+       if (HWGROUP(drive)->rq->flags & REQ_DRIVE_TASKFILE)
+               hwif->sg_nents = i = ide_raw_build_sglist(drive, rq);
+       else
+               hwif->sg_nents = i = ide_build_sglist(drive, rq);
 
        if (!i)
                return 0;       /* sglist of length Zero */
@@ -550,36 +574,40 @@ use_pio_instead:
        return 0;               /* revert to PIO for this request */
 }
 
-static int sgiioc4_ide_dma_setup(ide_drive_t *drive)
+static int
+sgiioc4_ide_dma_read(ide_drive_t * drive)
 {
        struct request *rq = HWGROUP(drive)->rq;
        unsigned int count = 0;
-       int ddir;
-
-       if (rq_data_dir(rq))
-               ddir = PCI_DMA_TODEVICE;
-       else
-               ddir = PCI_DMA_FROMDEVICE;
 
-       if (!(count = sgiioc4_build_dma_table(drive, rq, ddir))) {
+       if (!(count = sgiioc4_build_dma_table(drive, rq, PCI_DMA_FROMDEVICE))) {
                /* try PIO instead of DMA */
-               ide_map_sg(drive, rq);
                return 1;
        }
+       /* Writes FROM the IOC4 TO Main Memory */
+       sgiioc4_configure_for_dma(IOC4_DMA_WRITE, drive);
 
-       if (rq_data_dir(rq))
-               /* Writes TO the IOC4 FROM Main Memory */
-               ddir = IOC4_DMA_READ;
-       else
-               /* Writes FROM the IOC4 TO Main Memory */
-               ddir = IOC4_DMA_WRITE;
+       return 0;
+}
+
+static int
+sgiioc4_ide_dma_write(ide_drive_t * drive)
+{
+       struct request *rq = HWGROUP(drive)->rq;
+       unsigned int count = 0;
 
-       sgiioc4_configure_for_dma(ddir, drive);
+       if (!(count = sgiioc4_build_dma_table(drive, rq, PCI_DMA_TODEVICE))) {
+               /* try PIO instead of DMA */
+               return 1;
+       }
+
+       sgiioc4_configure_for_dma(IOC4_DMA_READ, drive);
+       /* Writes TO the IOC4 FROM Main Memory */
 
        return 0;
 }
 
-static void __devinit
+static void __init
 ide_init_sgiioc4(ide_hwif_t * hwif)
 {
        hwif->mmio = 2;
@@ -588,6 +616,7 @@ ide_init_sgiioc4(ide_hwif_t * hwif)
        hwif->ultra_mask = 0x0; /* Disable Ultra DMA */
        hwif->mwdma_mask = 0x2; /* Multimode-2 DMA  */
        hwif->swdma_mask = 0x2;
+       hwif->identify = NULL;
        hwif->tuneproc = NULL;  /* Sets timing for PIO mode */
        hwif->speedproc = NULL; /* Sets timing for DMA &/or PIO modes */
        hwif->selectproc = NULL;/* Use the default routine to select drive */
@@ -600,8 +629,9 @@ ide_init_sgiioc4(ide_hwif_t * hwif)
        hwif->quirkproc = NULL;
        hwif->busproc = NULL;
 
-       hwif->ide_dma_setup = &sgiioc4_ide_dma_setup;
-       hwif->ide_dma_start = &sgiioc4_ide_dma_start;
+       hwif->ide_dma_read = &sgiioc4_ide_dma_read;
+       hwif->ide_dma_write = &sgiioc4_ide_dma_write;
+       hwif->ide_dma_begin = &sgiioc4_ide_dma_begin;
        hwif->ide_dma_end = &sgiioc4_ide_dma_end;
        hwif->ide_dma_check = &sgiioc4_ide_dma_check;
        hwif->ide_dma_on = &sgiioc4_ide_dma_on;
@@ -609,12 +639,13 @@ ide_init_sgiioc4(ide_hwif_t * hwif)
        hwif->ide_dma_test_irq = &sgiioc4_ide_dma_test_irq;
        hwif->ide_dma_host_on = &sgiioc4_ide_dma_host_on;
        hwif->ide_dma_host_off = &sgiioc4_ide_dma_host_off;
+       hwif->ide_dma_verbose = &sgiioc4_ide_dma_verbose;
        hwif->ide_dma_lostirq = &sgiioc4_ide_dma_lostirq;
        hwif->ide_dma_timeout = &__ide_dma_timeout;
        hwif->INB = &sgiioc4_INB;
 }
 
-static int __devinit
+static int __init
 sgiioc4_ide_setup_pci_device(struct pci_dev *dev, ide_pci_device_t * d)
 {
        unsigned long base, ctl, dma_base, irqport;
@@ -677,7 +708,7 @@ sgiioc4_ide_setup_pci_device(struct pci_dev *dev, ide_pci_device_t * d)
        return 0;
 }
 
-static unsigned int __devinit
+static unsigned int __init
 pci_init_sgiioc4(struct pci_dev *dev, ide_pci_device_t * d)
 {
        unsigned int class_rev;
@@ -700,6 +731,7 @@ pci_init_sgiioc4(struct pci_dev *dev, ide_pci_device_t * d)
                        "46 or higher\n", d->name, dev->slot_name);
                return -ENODEV;
        }
+
        return sgiioc4_ide_setup_pci_device(dev, d);
 }
 
@@ -730,13 +762,13 @@ static struct pci_device_id sgiioc4_pci_tbl[] = {
 };
 MODULE_DEVICE_TABLE(pci, sgiioc4_pci_tbl);
 
-static struct pci_driver __devinitdata driver = {
+static struct pci_driver driver = {
        .name = "SGI-IOC4_IDE",
        .id_table = sgiioc4_pci_tbl,
        .probe = sgiioc4_init_one,
 };
 
-static int __devinit
+static int
 sgiioc4_ide_init(void)
 {
        return ide_pci_register_driver(&driver);