fedora core 6 1.2949 + vserver 2.2.0
[linux-2.6.git] / drivers / ide / ide-taskfile.c
index 98f4f3e..30175c7 100644 (file)
@@ -5,7 +5,7 @@
  *  Copyright (C) 2000-2002    Andre Hedrick <andre@linux-ide.org>
  *  Copyright (C) 2001-2002    Klaus Smolin
  *                                     IBM Storage Technology Division
- *  Copyright (C) 2003         Bartlomiej Zolnierkiewicz
+ *  Copyright (C) 2003-2004    Bartlomiej Zolnierkiewicz
  *
  *  The big the bad and the ugly.
  *
  *     request.
  */
 
-#include <linux/config.h>
 #include <linux/module.h>
 #include <linux/types.h>
 #include <linux/string.h>
 #include <linux/kernel.h>
 #include <linux/timer.h>
 #include <linux/mm.h>
+#include <linux/sched.h>
 #include <linux/interrupt.h>
 #include <linux/major.h>
 #include <linux/errno.h>
 #include <linux/delay.h>
 #include <linux/hdreg.h>
 #include <linux/ide.h>
+#include <linux/bitops.h>
 
 #include <asm/byteorder.h>
 #include <asm/irq.h>
 #include <asm/uaccess.h>
 #include <asm/io.h>
-#include <asm/bitops.h>
-
-#define DEBUG_TASKFILE 0       /* unset when fixed */
-
-#if DEBUG_TASKFILE
-#define DTF(x...) printk(x)
-#else
-#define DTF(x...)
-#endif
 
 static void ata_bswap_data (void *buffer, int wcount)
 {
@@ -69,17 +61,14 @@ static void ata_bswap_data (void *buffer, int wcount)
        }
 }
 
-
-void taskfile_input_data (ide_drive_t *drive, void *buffer, u32 wcount)
+static void taskfile_input_data(ide_drive_t *drive, void *buffer, u32 wcount)
 {
        HWIF(drive)->ata_input_data(drive, buffer, wcount);
        if (drive->bswap)
                ata_bswap_data(buffer, wcount);
 }
 
-EXPORT_SYMBOL(taskfile_input_data);
-
-void taskfile_output_data (ide_drive_t *drive, void *buffer, u32 wcount)
+static void taskfile_output_data(ide_drive_t *drive, void *buffer, u32 wcount)
 {
        if (drive->bswap) {
                ata_bswap_data(buffer, wcount);
@@ -90,8 +79,6 @@ void taskfile_output_data (ide_drive_t *drive, void *buffer, u32 wcount)
        }
 }
 
-EXPORT_SYMBOL(taskfile_output_data);
-
 int taskfile_lib_get_identify (ide_drive_t *drive, u8 *buf)
 {
        ide_task_t args;
@@ -102,36 +89,11 @@ int taskfile_lib_get_identify (ide_drive_t *drive, u8 *buf)
        else
                args.tfRegister[IDE_COMMAND_OFFSET]     = WIN_PIDENTIFY;
        args.command_type = IDE_DRIVE_TASK_IN;
+       args.data_phase   = TASKFILE_IN;
        args.handler      = &task_in_intr;
        return ide_raw_taskfile(drive, &args, buf);
 }
 
-EXPORT_SYMBOL(taskfile_lib_get_identify);
-
-#ifdef CONFIG_IDE_TASK_IOCTL_DEBUG
-void debug_taskfile (ide_drive_t *drive, ide_task_t *args)
-{
-       printk(KERN_INFO "%s: ", drive->name);
-//     printk("TF.0=x%02x ", args->tfRegister[IDE_DATA_OFFSET]);
-       printk("TF.1=x%02x ", args->tfRegister[IDE_FEATURE_OFFSET]);
-       printk("TF.2=x%02x ", args->tfRegister[IDE_NSECTOR_OFFSET]);
-       printk("TF.3=x%02x ", args->tfRegister[IDE_SECTOR_OFFSET]);
-       printk("TF.4=x%02x ", args->tfRegister[IDE_LCYL_OFFSET]);
-       printk("TF.5=x%02x ", args->tfRegister[IDE_HCYL_OFFSET]);
-       printk("TF.6=x%02x ", args->tfRegister[IDE_SELECT_OFFSET]);
-       printk("TF.7=x%02x\n", args->tfRegister[IDE_COMMAND_OFFSET]);
-       printk(KERN_INFO "%s: ", drive->name);
-//     printk("HTF.0=x%02x ", args->hobRegister[IDE_DATA_OFFSET]);
-       printk("HTF.1=x%02x ", args->hobRegister[IDE_FEATURE_OFFSET]);
-       printk("HTF.2=x%02x ", args->hobRegister[IDE_NSECTOR_OFFSET]);
-       printk("HTF.3=x%02x ", args->hobRegister[IDE_SECTOR_OFFSET]);
-       printk("HTF.4=x%02x ", args->hobRegister[IDE_LCYL_OFFSET]);
-       printk("HTF.5=x%02x ", args->hobRegister[IDE_HCYL_OFFSET]);
-       printk("HTF.6=x%02x ", args->hobRegister[IDE_SELECT_OFFSET]);
-       printk("HTF.7=x%02x\n", args->hobRegister[IDE_CONTROL_OFFSET_HOB]);
-}
-#endif /* CONFIG_IDE_TASK_IOCTL_DEBUG */
-
 ide_startstop_t do_rw_taskfile (ide_drive_t *drive, ide_task_t *task)
 {
        ide_hwif_t *hwif        = HWIF(drive);
@@ -139,10 +101,6 @@ ide_startstop_t do_rw_taskfile (ide_drive_t *drive, ide_task_t *task)
        hob_struct_t *hobfile   = (hob_struct_t *) task->hobRegister;
        u8 HIHI                 = (drive->addressing == 1) ? 0xE0 : 0xEF;
 
-#ifdef CONFIG_IDE_TASK_IOCTL_DEBUG
-       void debug_taskfile(drive, task);
-#endif /* CONFIG_IDE_TASK_IOCTL_DEBUG */
-
        /* ALL Command Block Executions SHALL clear nIEN, unless otherwise */
        if (IDE_CONTROL_REG) {
                /* clear nIEN */
@@ -165,7 +123,7 @@ ide_startstop_t do_rw_taskfile (ide_drive_t *drive, ide_task_t *task)
        hwif->OUTB(taskfile->high_cylinder, IDE_HCYL_REG);
 
        hwif->OUTB((taskfile->device_head & HIHI) | drive->select.all, IDE_SELECT_REG);
-#ifdef CONFIG_IDE_TASKFILE_IO
+
        if (task->handler != NULL) {
                if (task->prehandler != NULL) {
                        hwif->OUTBSYNC(drive, taskfile->command, IDE_COMMAND_REG);
@@ -175,14 +133,6 @@ ide_startstop_t do_rw_taskfile (ide_drive_t *drive, ide_task_t *task)
                ide_execute_command(drive, taskfile->command, task->handler, WAIT_WORSTCASE, NULL);
                return ide_started;
        }
-#else
-       if (task->handler != NULL) {
-               ide_execute_command(drive, taskfile->command, task->handler, WAIT_WORSTCASE, NULL);
-               if (task->prehandler != NULL)
-                       return task->prehandler(drive, task->rq);
-               return ide_started;
-       }
-#endif
 
        if (!drive->using_dma)
                return ide_stopped;
@@ -191,15 +141,15 @@ ide_startstop_t do_rw_taskfile (ide_drive_t *drive, ide_task_t *task)
                case WIN_WRITEDMA_ONCE:
                case WIN_WRITEDMA:
                case WIN_WRITEDMA_EXT:
-                       if (!hwif->ide_dma_write(drive))
-                               return ide_started;
-                       break;
                case WIN_READDMA_ONCE:
                case WIN_READDMA:
                case WIN_READDMA_EXT:
                case WIN_IDENTIFY_DMA:
-                       if (!hwif->ide_dma_read(drive))
+                       if (!hwif->dma_setup(drive)) {
+                               hwif->dma_exec_cmd(drive, taskfile->command);
+                               hwif->dma_start(drive);
                                return ide_started;
+                       }
                        break;
                default:
                        if (task->handler == NULL)
@@ -209,8 +159,6 @@ ide_startstop_t do_rw_taskfile (ide_drive_t *drive, ide_task_t *task)
        return ide_stopped;
 }
 
-EXPORT_SYMBOL(do_rw_taskfile);
-
 /*
  * set_multmode_intr() is invoked on completion of a WIN_SETMULT cmd.
  */
@@ -229,8 +177,6 @@ ide_startstop_t set_multmode_intr (ide_drive_t *drive)
        return ide_stopped;
 }
 
-EXPORT_SYMBOL(set_multmode_intr);
-
 /*
  * set_geometry_intr() is invoked on completion of a WIN_SPECIFY cmd.
  */
@@ -247,16 +193,13 @@ ide_startstop_t set_geometry_intr (ide_drive_t *drive)
                return ide_stopped;
 
        if (stat & (ERR_STAT|DRQ_STAT))
-               return DRIVER(drive)->error(drive, "set_geometry_intr", stat);
+               return ide_error(drive, "set_geometry_intr", stat);
 
-       if (HWGROUP(drive)->handler != NULL)
-               BUG();
+       BUG_ON(HWGROUP(drive)->handler != NULL);
        ide_set_handler(drive, &set_geometry_intr, WAIT_WORSTCASE, NULL);
        return ide_started;
 }
 
-EXPORT_SYMBOL(set_geometry_intr);
-
 /*
  * recal_intr() is invoked on completion of a WIN_RESTORE (recalibrate) cmd.
  */
@@ -266,12 +209,10 @@ ide_startstop_t recal_intr (ide_drive_t *drive)
        u8 stat;
 
        if (!OK_STAT(stat = hwif->INB(IDE_STATUS_REG), READY_STAT, BAD_STAT))
-               return DRIVER(drive)->error(drive, "recal_intr", stat);
+               return ide_error(drive, "recal_intr", stat);
        return ide_stopped;
 }
 
-EXPORT_SYMBOL(recal_intr);
-
 /*
  * Handler for commands without a data phase
  */
@@ -281,11 +222,9 @@ ide_startstop_t task_no_data_intr (ide_drive_t *drive)
        ide_hwif_t *hwif        = HWIF(drive);
        u8 stat;
 
-       local_irq_enable();
+       local_irq_enable_in_hardirq();
        if (!OK_STAT(stat = hwif->INB(IDE_STATUS_REG),READY_STAT,BAD_STAT)) {
-               DTF("%s: command opcode 0x%02x\n", drive->name,
-                       args->tfRegister[IDE_COMMAND_OFFSET]);
-               return DRIVER(drive)->error(drive, "task_no_data_intr", stat);
+               return ide_error(drive, "task_no_data_intr", stat);
                /* calls ide_end_drive_cmd */
        }
        if (args)
@@ -296,317 +235,180 @@ ide_startstop_t task_no_data_intr (ide_drive_t *drive)
 
 EXPORT_SYMBOL(task_no_data_intr);
 
-/*
- * old taskfile PIO handlers, to be killed as soon as possible.
- */
-#ifndef CONFIG_IDE_TASKFILE_IO
-
-/*
- * Handler for command with PIO data-in phase, READ
- */
-ide_startstop_t task_in_intr (ide_drive_t *drive)
+static u8 wait_drive_not_busy(ide_drive_t *drive)
 {
-       struct request *rq      = HWGROUP(drive)->rq;
-       ide_hwif_t *hwif        = HWIF(drive);
-       char *pBuf              = NULL;
+       ide_hwif_t *hwif = HWIF(drive);
+       int retries = 100;
        u8 stat;
 
-       if (!OK_STAT(stat = hwif->INB(IDE_STATUS_REG),DATA_READY,BAD_R_STAT)) {
-               if (stat & (ERR_STAT|DRQ_STAT)) {
-                       return DRIVER(drive)->error(drive, "task_in_intr", stat);
-               }
-               if (!(stat & BUSY_STAT)) {
-                       DTF("task_in_intr to Soon wait for next interrupt\n");
-                       if (HWGROUP(drive)->handler == NULL)
-                               ide_set_handler(drive, &task_in_intr, WAIT_WORSTCASE, NULL);
-                       return ide_started;  
-               }
-       }
-
-       pBuf = rq->buffer + task_rq_offset(rq);
-       DTF("Read: %p, rq->current_nr_sectors: %d, stat: %02x\n",
-               pBuf, (int) rq->current_nr_sectors, stat);
-       taskfile_input_data(drive, pBuf, SECTOR_WORDS);
-
-       /* FIXME: check drive status */
-       if (--rq->current_nr_sectors <= 0)
-               if (!DRIVER(drive)->end_request(drive, 1, 0))
-                       return ide_stopped;
        /*
-        * ERM, it is techincally legal to leave/exit here but it makes
-        * a mess of the code ...
+        * Last sector was transfered, wait until drive is ready.
+        * This can take up to 10 usec, but we will wait max 1 ms
+        * (drive_cmd_intr() waits that long).
         */
-       if (HWGROUP(drive)->handler == NULL)
-               ide_set_handler(drive, &task_in_intr, WAIT_WORSTCASE, NULL);
-       return ide_started;
-}
+       while (((stat = hwif->INB(IDE_STATUS_REG)) & BUSY_STAT) && retries--)
+               udelay(10);
 
-EXPORT_SYMBOL(task_in_intr);
+       if (!retries)
+               printk(KERN_ERR "%s: drive still BUSY!\n", drive->name);
 
-/*
- * Handler for command with Read Multiple
- */
-ide_startstop_t task_mulin_intr (ide_drive_t *drive)
-{
-       ide_hwif_t *hwif        = HWIF(drive);
-       struct request *rq      = HWGROUP(drive)->rq;
-       char *pBuf              = NULL;
-       unsigned int msect      = drive->mult_count;
-       unsigned int nsect;
-       u8 stat;
+       return stat;
+}
 
-       if (!OK_STAT(stat = hwif->INB(IDE_STATUS_REG),DATA_READY,BAD_R_STAT)) {
-               if (stat & (ERR_STAT|DRQ_STAT)) {
-                       return DRIVER(drive)->error(drive, "task_mulin_intr", stat);
-               }
-               /* no data yet, so wait for another interrupt */
-               if (HWGROUP(drive)->handler == NULL)
-                       ide_set_handler(drive, &task_mulin_intr, WAIT_WORSTCASE, NULL);
-               return ide_started;
-       }
+static void ide_pio_sector(ide_drive_t *drive, unsigned int write)
+{
+       ide_hwif_t *hwif = drive->hwif;
+       struct scatterlist *sg = hwif->sg_table;
+       struct page *page;
+#ifdef CONFIG_HIGHMEM
+       unsigned long flags;
+#endif
+       unsigned int offset;
+       u8 *buf;
 
-       do {
-               nsect = rq->current_nr_sectors;
-               if (nsect > msect)
-                       nsect = msect;
-               pBuf = rq->buffer + task_rq_offset(rq);
-               DTF("Multiread: %p, nsect: %d, msect: %d, " \
-                       " rq->current_nr_sectors: %d\n",
-                       pBuf, nsect, msect, rq->current_nr_sectors);
-               taskfile_input_data(drive, pBuf, nsect * SECTOR_WORDS);
-               rq->errors = 0;
-               rq->current_nr_sectors -= nsect;
-               msect -= nsect;
+       page = sg[hwif->cursg].page;
+       offset = sg[hwif->cursg].offset + hwif->cursg_ofs * SECTOR_SIZE;
 
-               /* FIXME: check drive status */
-               if (!rq->current_nr_sectors) {
-                       if (!DRIVER(drive)->end_request(drive, 1, 0))
-                               return ide_stopped;
-               }
-       } while (msect);
-       if (HWGROUP(drive)->handler == NULL)
-               ide_set_handler(drive, &task_mulin_intr, WAIT_WORSTCASE, NULL);
-       return ide_started;
-}
+       /* get the current page and offset */
+       page = nth_page(page, (offset >> PAGE_SHIFT));
+       offset %= PAGE_SIZE;
 
-EXPORT_SYMBOL(task_mulin_intr);
+#ifdef CONFIG_HIGHMEM
+       local_irq_save(flags);
+#endif
+       buf = kmap_atomic(page, KM_BIO_SRC_IRQ) + offset;
 
-/*
- * VERIFY ME before 2.4 ... unexpected race is possible based on details
- * RMK with 74LS245/373/374 TTL buffer logic because of passthrough.
- */
-ide_startstop_t pre_task_out_intr (ide_drive_t *drive, struct request *rq)
-{
-       ide_startstop_t startstop;
+       hwif->nleft--;
+       hwif->cursg_ofs++;
 
-       if (ide_wait_stat(&startstop, drive, DATA_READY,
-                       drive->bad_wstat, WAIT_DRQ)) {
-               printk(KERN_ERR "%s: no DRQ after issuing WRITE%s\n",
-                       drive->name,
-                       drive->addressing ? "_EXT" : "");
-               return startstop;
+       if ((hwif->cursg_ofs * SECTOR_SIZE) == sg[hwif->cursg].length) {
+               hwif->cursg++;
+               hwif->cursg_ofs = 0;
        }
-       /* For Write_sectors we need to stuff the first sector */
-       taskfile_output_data(drive, rq->buffer + task_rq_offset(rq), SECTOR_WORDS);
-       rq->current_nr_sectors--;
-       return ide_started;
-}
 
-EXPORT_SYMBOL(pre_task_out_intr);
+       /* do the actual data transfer */
+       if (write)
+               taskfile_output_data(drive, buf, SECTOR_WORDS);
+       else
+               taskfile_input_data(drive, buf, SECTOR_WORDS);
 
-/*
- * Handler for command with PIO data-out phase WRITE
- *
- * WOOHOO this is a CORRECT STATE DIAGRAM NOW, <andre@linux-ide.org>
- */
-ide_startstop_t task_out_intr (ide_drive_t *drive)
+       kunmap_atomic(buf, KM_BIO_SRC_IRQ);
+#ifdef CONFIG_HIGHMEM
+       local_irq_restore(flags);
+#endif
+}
+
+static void ide_pio_multi(ide_drive_t *drive, unsigned int write)
 {
-       ide_hwif_t *hwif        = HWIF(drive);
-       struct request *rq      = HWGROUP(drive)->rq;
-       char *pBuf              = NULL;
-       u8 stat;
+       unsigned int nsect;
 
-       if (!OK_STAT(stat = hwif->INB(IDE_STATUS_REG), DRIVE_READY, drive->bad_wstat)) {
-               return DRIVER(drive)->error(drive, "task_out_intr", stat);
-       }
-       /*
-        * Safe to update request for partial completions.
-        * We have a good STATUS CHECK!!!
-        */
-       if (!rq->current_nr_sectors)
-               if (!DRIVER(drive)->end_request(drive, 1, 0))
-                       return ide_stopped;
-       if ((rq->current_nr_sectors==1) ^ (stat & DRQ_STAT)) {
-               rq = HWGROUP(drive)->rq;
-               pBuf = rq->buffer + task_rq_offset(rq);
-               DTF("write: %p, rq->current_nr_sectors: %d\n",
-                       pBuf, (int) rq->current_nr_sectors);
-               taskfile_output_data(drive, pBuf, SECTOR_WORDS);
-               rq->errors = 0;
-               rq->current_nr_sectors--;
-       }
-       if (HWGROUP(drive)->handler == NULL)
-               ide_set_handler(drive, &task_out_intr, WAIT_WORSTCASE, NULL);
-       return ide_started;
+       nsect = min_t(unsigned int, drive->hwif->nleft, drive->mult_count);
+       while (nsect--)
+               ide_pio_sector(drive, write);
 }
 
-EXPORT_SYMBOL(task_out_intr);
-
-ide_startstop_t pre_task_mulout_intr (ide_drive_t *drive, struct request *rq)
+static void ide_pio_datablock(ide_drive_t *drive, struct request *rq,
+                                    unsigned int write)
 {
-       ide_task_t *args = rq->special;
-       ide_startstop_t startstop;
+       if (rq->bio)    /* fs request */
+               rq->errors = 0;
 
-       if (ide_wait_stat(&startstop, drive, DATA_READY,
-                       drive->bad_wstat, WAIT_DRQ)) {
-               printk(KERN_ERR "%s: no DRQ after issuing %s\n",
-                       drive->name,
-                       drive->addressing ? "MULTWRITE_EXT" : "MULTWRITE");
-               return startstop;
-       }
-       if (!(drive_is_ready(drive))) {
-               int i;
-               for (i=0; i<100; i++) {
-                       if (drive_is_ready(drive))
-                               break;
-               }
-       }
+       touch_softlockup_watchdog();
 
-       /*
-        * WARNING :: if the drive as not acked good status we may not
-        * move the DATA-TRANSFER T-Bar as BSY != 0. <andre@linux-ide.org>
-        */
-       return args->handler(drive);
+       switch (drive->hwif->data_phase) {
+       case TASKFILE_MULTI_IN:
+       case TASKFILE_MULTI_OUT:
+               ide_pio_multi(drive, write);
+               break;
+       default:
+               ide_pio_sector(drive, write);
+               break;
+       }
 }
 
-EXPORT_SYMBOL(pre_task_mulout_intr);
-
-/*
- * Handler for command write multiple
- * Called directly from execute_drive_cmd for the first bunch of sectors,
- * afterwards only by the ISR
- */
-ide_startstop_t task_mulout_intr (ide_drive_t *drive)
+static ide_startstop_t task_error(ide_drive_t *drive, struct request *rq,
+                                 const char *s, u8 stat)
 {
-       ide_hwif_t *hwif                = HWIF(drive);
-       u8 stat                         = hwif->INB(IDE_STATUS_REG);
-       struct request *rq              = HWGROUP(drive)->rq;
-       char *pBuf                      = NULL;
-       unsigned int msect              = drive->mult_count;
-       unsigned int nsect;
+       if (rq->bio) {
+               ide_hwif_t *hwif = drive->hwif;
+               int sectors = hwif->nsect - hwif->nleft;
 
-       if (!OK_STAT(stat, DATA_READY, BAD_R_STAT) || !rq->current_nr_sectors) {
-               if (stat & (ERR_STAT|DRQ_STAT)) {
-                       return DRIVER(drive)->error(drive, "task_mulout_intr", stat);
-               }
-               /* Handle last IRQ, occurs after all data was sent. */
-               if (!rq->current_nr_sectors) {
-                       DRIVER(drive)->end_request(drive, 1, 0);
-                       return ide_stopped;
+               switch (hwif->data_phase) {
+               case TASKFILE_IN:
+                       if (hwif->nleft)
+                               break;
+                       /* fall through */
+               case TASKFILE_OUT:
+                       sectors--;
+                       break;
+               case TASKFILE_MULTI_IN:
+                       if (hwif->nleft)
+                               break;
+                       /* fall through */
+               case TASKFILE_MULTI_OUT:
+                       sectors -= drive->mult_count;
+               default:
+                       break;
                }
-               /* no data yet, so wait for another interrupt */
-               if (HWGROUP(drive)->handler == NULL)
-                       ide_set_handler(drive, &task_mulout_intr, WAIT_WORSTCASE, NULL);
-               return ide_started;
-       }
 
-       if (HWGROUP(drive)->handler != NULL) {
-               unsigned long lflags;
-               spin_lock_irqsave(&ide_lock, lflags);
-               HWGROUP(drive)->handler = NULL;
-               del_timer(&HWGROUP(drive)->timer);
-               spin_unlock_irqrestore(&ide_lock, lflags);
-       }
+               if (sectors > 0) {
+                       ide_driver_t *drv;
 
-       do {
-               nsect = rq->current_nr_sectors;
-               if (nsect > msect)
-                       nsect = msect;
-               pBuf = rq->buffer + task_rq_offset(rq);
-               DTF("Multiwrite: %p, nsect: %d, msect: %d, " \
-                       "rq->current_nr_sectors: %ld\n",
-                       pBuf, nsect, msect, rq->current_nr_sectors);
-               msect -= nsect;
-               taskfile_output_data(drive, pBuf, nsect * SECTOR_WORDS);
-               rq->current_nr_sectors -= nsect;
-
-               /* FIXME: check drive status */
-               if (!rq->current_nr_sectors) {
-                       if (!DRIVER(drive)->end_request(drive, 1, 0))
-                               if (!rq->bio)
-                                       return ide_stopped;
+                       drv = *(ide_driver_t **)rq->rq_disk->private_data;
+                       drv->end_request(drive, 1, sectors);
                }
-       } while (msect);
-       rq->errors = 0;
-       if (HWGROUP(drive)->handler == NULL)
-               ide_set_handler(drive, &task_mulout_intr, WAIT_WORSTCASE, NULL);
-       return ide_started;
+       }
+       return ide_error(drive, s, stat);
 }
 
-EXPORT_SYMBOL(task_mulout_intr);
-
-#else /* !CONFIG_IDE_TASKFILE_IO */
-
-static u8 wait_drive_not_busy(ide_drive_t *drive)
+static void task_end_request(ide_drive_t *drive, struct request *rq, u8 stat)
 {
-       ide_hwif_t *hwif = HWIF(drive);
-       int retries = 100;
-       u8 stat;
+       if (rq->cmd_type == REQ_TYPE_ATA_TASKFILE) {
+               ide_task_t *task = rq->special;
 
-       /*
-        * Last sector was transfered, wait until drive is ready.
-        * This can take up to 10 usec, but we will wait max 1 ms
-        * (drive_cmd_intr() waits that long).
-        */
-       while (((stat = hwif->INB(IDE_STATUS_REG)) & BUSY_STAT) && retries--)
-               udelay(10);
+               if (task->tf_out_flags.all) {
+                       u8 err = drive->hwif->INB(IDE_ERROR_REG);
+                       ide_end_drive_cmd(drive, stat, err);
+                       return;
+               }
+       }
 
-       if (!retries)
-               printk(KERN_ERR "%s: drive still BUSY!\n", drive->name);
+       if (rq->rq_disk) {
+               ide_driver_t *drv;
 
-       return stat;
+               drv = *(ide_driver_t **)rq->rq_disk->private_data;;
+               drv->end_request(drive, 1, rq->hard_nr_sectors);
+       } else
+               ide_end_request(drive, 1, rq->hard_nr_sectors);
 }
 
 /*
- * Handler for command with PIO data-in phase (Read).
+ * Handler for command with PIO data-in phase (Read/Read Multiple).
  */
 ide_startstop_t task_in_intr (ide_drive_t *drive)
 {
+       ide_hwif_t *hwif = drive->hwif;
        struct request *rq = HWGROUP(drive)->rq;
-       u8 stat, good_stat;
+       u8 stat = hwif->INB(IDE_STATUS_REG);
 
-       good_stat = DATA_READY;
-       stat = HWIF(drive)->INB(IDE_STATUS_REG);
-check_status:
-       if (!OK_STAT(stat, good_stat, BAD_R_STAT)) {
+       /* new way for dealing with premature shared PCI interrupts */
+       if (!OK_STAT(stat, DATA_READY, BAD_R_STAT)) {
                if (stat & (ERR_STAT | DRQ_STAT))
-                       return DRIVER(drive)->error(drive, __FUNCTION__, stat);
-               /* BUSY_STAT: No data yet, so wait for another IRQ. */
+                       return task_error(drive, rq, __FUNCTION__, stat);
+               /* No data yet, so wait for another IRQ. */
                ide_set_handler(drive, &task_in_intr, WAIT_WORSTCASE, NULL);
                return ide_started;
        }
 
-       /*
-        * Complete previously submitted bios (if any).
-        * Status was already verifyied.
-        */
-       while (rq->bio != rq->cbio)
-               if (!DRIVER(drive)->end_request(drive, 1, bio_sectors(rq->bio)))
-                       return ide_stopped;
-       /* Complete rq->buffer based request (ioctls). */
-       if (!rq->bio && !rq->nr_sectors) {
-               ide_end_drive_cmd(drive, stat, HWIF(drive)->INB(IDE_ERROR_REG));
-               return ide_stopped;
-       }
-
-       rq->errors = 0;
-       task_sectors(drive, rq, 1, IDE_PIO_IN);
+       ide_pio_datablock(drive, rq, 0);
 
        /* If it was the last datablock check status and finish transfer. */
-       if (!rq->nr_sectors) {
-               good_stat = 0;
+       if (!hwif->nleft) {
                stat = wait_drive_not_busy(drive);
-               goto check_status;
+               if (!OK_STAT(stat, 0, BAD_R_STAT))
+                       return task_error(drive, rq, __FUNCTION__, stat);
+               task_end_request(drive, rq, stat);
+               return ide_stopped;
        }
 
        /* Still data left to transfer. */
@@ -617,221 +419,62 @@ check_status:
 EXPORT_SYMBOL(task_in_intr);
 
 /*
- * Handler for command with PIO data-in phase (Read Multiple).
- */
-ide_startstop_t task_mulin_intr (ide_drive_t *drive)
-{
-       struct request *rq = HWGROUP(drive)->rq;
-       unsigned int msect = drive->mult_count;
-       unsigned int nsect;
-       u8 stat, good_stat;
-
-       good_stat = DATA_READY;
-       stat = HWIF(drive)->INB(IDE_STATUS_REG);
-check_status:
-       if (!OK_STAT(stat, good_stat, BAD_R_STAT)) {
-               if (stat & (ERR_STAT | DRQ_STAT))
-                       return DRIVER(drive)->error(drive, __FUNCTION__, stat);
-               /* BUSY_STAT: No data yet, so wait for another IRQ. */
-               ide_set_handler(drive, &task_mulin_intr, WAIT_WORSTCASE, NULL);
-               return ide_started;
-       }
-
-       /*
-        * Complete previously submitted bios (if any).
-        * Status was already verifyied.
-        */
-       while (rq->bio != rq->cbio)
-               if (!DRIVER(drive)->end_request(drive, 1, bio_sectors(rq->bio)))
-                       return ide_stopped;
-       /* Complete rq->buffer based request (ioctls). */
-       if (!rq->bio && !rq->nr_sectors) {
-               ide_end_drive_cmd(drive, stat, HWIF(drive)->INB(IDE_ERROR_REG));
-               return ide_stopped;
-       }
-
-       rq->errors = 0;
-       do {
-               nsect = rq->current_nr_sectors;
-               if (nsect > msect)
-                       nsect = msect;
-
-               task_sectors(drive, rq, nsect, IDE_PIO_IN);
-
-               if (!rq->nr_sectors)
-                       msect = 0;
-               else
-                       msect -= nsect;
-       } while (msect);
-
-       /* If it was the last datablock check status and finish transfer. */
-       if (!rq->nr_sectors) {
-               good_stat = 0;
-               stat = wait_drive_not_busy(drive);
-               goto check_status;
-       }
-
-       /* Still data left to transfer. */
-       ide_set_handler(drive, &task_mulin_intr, WAIT_WORSTCASE, NULL);
-
-       return ide_started;
-}
-EXPORT_SYMBOL(task_mulin_intr);
-
-/*
- * Handler for command with PIO data-out phase (Write).
+ * Handler for command with PIO data-out phase (Write/Write Multiple).
  */
-ide_startstop_t task_out_intr (ide_drive_t *drive)
+static ide_startstop_t task_out_intr (ide_drive_t *drive)
 {
+       ide_hwif_t *hwif = drive->hwif;
        struct request *rq = HWGROUP(drive)->rq;
-       u8 stat;
+       u8 stat = hwif->INB(IDE_STATUS_REG);
 
-       stat = HWIF(drive)->INB(IDE_STATUS_REG);
-       if (!OK_STAT(stat, DRIVE_READY, drive->bad_wstat)) {
-               if ((stat & (ERR_STAT | DRQ_STAT)) ||
-                   ((stat & WRERR_STAT) && !drive->nowerr))
-                       return DRIVER(drive)->error(drive, __FUNCTION__, stat);
-               if (stat & BUSY_STAT) {
-                       /* Not ready yet, so wait for another IRQ. */
-                       ide_set_handler(drive, &task_out_intr, WAIT_WORSTCASE, NULL);
-                       return ide_started;
-               }
-       }
+       if (!OK_STAT(stat, DRIVE_READY, drive->bad_wstat))
+               return task_error(drive, rq, __FUNCTION__, stat);
 
        /* Deal with unexpected ATA data phase. */
-       if ((!(stat & DATA_READY) && rq->nr_sectors) ||
-           ((stat & DATA_READY) && !rq->nr_sectors))
-               return DRIVER(drive)->error(drive, __FUNCTION__, stat);
+       if (((stat & DRQ_STAT) == 0) ^ !hwif->nleft)
+               return task_error(drive, rq, __FUNCTION__, stat);
 
-       /* 
-        * Complete previously submitted bios (if any).
-        * Status was already verifyied.
-        */
-       while (rq->bio != rq->cbio)
-               if (!DRIVER(drive)->end_request(drive, 1, bio_sectors(rq->bio)))
-                       return ide_stopped;
-       /* Complete rq->buffer based request (ioctls). */
-       if (!rq->bio && !rq->nr_sectors) {
-               ide_end_drive_cmd(drive, stat, HWIF(drive)->INB(IDE_ERROR_REG));
+       if (!hwif->nleft) {
+               task_end_request(drive, rq, stat);
                return ide_stopped;
        }
 
        /* Still data left to transfer. */
+       ide_pio_datablock(drive, rq, 1);
        ide_set_handler(drive, &task_out_intr, WAIT_WORSTCASE, NULL);
 
-       rq->errors = 0;
-       task_sectors(drive, rq, 1, IDE_PIO_OUT);
-
        return ide_started;
 }
 
-EXPORT_SYMBOL(task_out_intr);
-
 ide_startstop_t pre_task_out_intr (ide_drive_t *drive, struct request *rq)
 {
        ide_startstop_t startstop;
 
        if (ide_wait_stat(&startstop, drive, DATA_READY,
                          drive->bad_wstat, WAIT_DRQ)) {
-               printk(KERN_ERR "%s: no DRQ after issuing WRITE%s\n",
-                               drive->name, drive->addressing ? "_EXT" : "");
+               printk(KERN_ERR "%s: no DRQ after issuing %sWRITE%s\n",
+                               drive->name,
+                               drive->hwif->data_phase ? "MULT" : "",
+                               drive->addressing ? "_EXT" : "");
                return startstop;
        }
 
        if (!drive->unmask)
                local_irq_disable();
 
-       return task_out_intr(drive);
-}
-EXPORT_SYMBOL(pre_task_out_intr);
-
-/*
- * Handler for command with PIO data-out phase (Write Multiple).
- */
-ide_startstop_t task_mulout_intr (ide_drive_t *drive)
-{
-       struct request *rq = HWGROUP(drive)->rq;
-       unsigned int msect = drive->mult_count;
-       unsigned int nsect;
-       u8 stat;
-
-       stat = HWIF(drive)->INB(IDE_STATUS_REG);
-       if (!OK_STAT(stat, DRIVE_READY, drive->bad_wstat)) {
-               if ((stat & (ERR_STAT | DRQ_STAT)) ||
-                   ((stat & WRERR_STAT) && !drive->nowerr))
-                       return DRIVER(drive)->error(drive, __FUNCTION__, stat);
-               if (stat & BUSY_STAT) {
-                       /* Not ready yet, so wait for another IRQ. */
-                       ide_set_handler(drive, &task_mulout_intr, WAIT_WORSTCASE, NULL);
-                       return ide_started;
-               }
-       }
-
-       /* Deal with unexpected ATA data phase. */
-       if ((!(stat & DATA_READY) && rq->nr_sectors) ||
-           ((stat & DATA_READY) && !rq->nr_sectors))
-               return DRIVER(drive)->error(drive, __FUNCTION__, stat);
-
-       /* 
-        * Complete previously submitted bios (if any).
-        * Status was already verifyied.
-        */
-       while (rq->bio != rq->cbio)
-               if (!DRIVER(drive)->end_request(drive, 1, bio_sectors(rq->bio)))
-                       return ide_stopped;
-       /* Complete rq->buffer based request (ioctls). */
-       if (!rq->bio && !rq->nr_sectors) {
-               ide_end_drive_cmd(drive, stat, HWIF(drive)->INB(IDE_ERROR_REG));
-               return ide_stopped;
-       }
-
-       /* Still data left to transfer. */
-       ide_set_handler(drive, &task_mulout_intr, WAIT_WORSTCASE, NULL);
-
-       rq->errors = 0;
-       do {
-               nsect = rq->current_nr_sectors;
-               if (nsect > msect)
-                       nsect = msect;
-
-               task_sectors(drive, rq, nsect, IDE_PIO_OUT);
-
-               if (!rq->nr_sectors)
-                       msect = 0;
-               else
-                       msect -= nsect;
-       } while (msect);
+       ide_set_handler(drive, &task_out_intr, WAIT_WORSTCASE, NULL);
+       ide_pio_datablock(drive, rq, 1);
 
        return ide_started;
 }
-EXPORT_SYMBOL(task_mulout_intr);
-
-ide_startstop_t pre_task_mulout_intr (ide_drive_t *drive, struct request *rq)
-{
-       ide_startstop_t startstop;
-
-       if (ide_wait_stat(&startstop, drive, DATA_READY,
-                         drive->bad_wstat, WAIT_DRQ)) {
-               printk(KERN_ERR "%s: no DRQ after issuing MULTWRITE%s\n",
-                               drive->name, drive->addressing ? "_EXT" : "");
-               return startstop;
-       }
-
-       if (!drive->unmask)
-               local_irq_disable();
-
-       return task_mulout_intr(drive);
-}
-EXPORT_SYMBOL(pre_task_mulout_intr);
-
-#endif /* !CONFIG_IDE_TASKFILE_IO */
+EXPORT_SYMBOL(pre_task_out_intr);
 
-int ide_diag_taskfile (ide_drive_t *drive, ide_task_t *args, unsigned long data_size, u8 *buf)
+static int ide_diag_taskfile(ide_drive_t *drive, ide_task_t *args, unsigned long data_size, u8 *buf)
 {
        struct request rq;
 
        memset(&rq, 0, sizeof(rq));
-       rq.flags = REQ_DRIVE_TASKFILE;
+       rq.cmd_type = REQ_TYPE_ATA_TASKFILE;
        rq.buffer = buf;
 
        /*
@@ -854,14 +497,16 @@ int ide_diag_taskfile (ide_drive_t *drive, ide_task_t *args, unsigned long data_
 
                rq.hard_nr_sectors = rq.nr_sectors;
                rq.hard_cur_sectors = rq.current_nr_sectors = rq.nr_sectors;
+
+               if (args->command_type == IDE_DRIVE_TASK_RAW_WRITE)
+                       rq.cmd_flags |= REQ_RW;
        }
 
        rq.special = args;
+       args->rq = &rq;
        return ide_do_drive_cmd(drive, &rq, ide_wait);
 }
 
-EXPORT_SYMBOL(ide_diag_taskfile);
-
 int ide_raw_taskfile (ide_drive_t *drive, ide_task_t *args, u8 *buf)
 {
        return ide_diag_taskfile(drive, args, 0, buf);
@@ -869,17 +514,6 @@ int ide_raw_taskfile (ide_drive_t *drive, ide_task_t *args, u8 *buf)
 
 EXPORT_SYMBOL(ide_raw_taskfile);
 
-#define MAX_DMA                (256*SECTOR_WORDS)
-
-ide_startstop_t flagged_taskfile(ide_drive_t *, ide_task_t *);
-ide_startstop_t flagged_task_no_data_intr(ide_drive_t *);
-ide_startstop_t flagged_task_in_intr(ide_drive_t *);
-ide_startstop_t flagged_task_mulin_intr(ide_drive_t *);
-ide_startstop_t flagged_pre_task_out_intr(ide_drive_t *, struct request *);
-ide_startstop_t flagged_task_out_intr(ide_drive_t *);
-ide_startstop_t flagged_pre_task_mulout_intr(ide_drive_t *, struct request *);
-ide_startstop_t flagged_task_mulout_intr(ide_drive_t *);
-
 int ide_taskfile_ioctl (ide_drive_t *drive, unsigned int cmd, unsigned long arg)
 {
        ide_task_request_t      *req_task;
@@ -890,32 +524,35 @@ int ide_taskfile_ioctl (ide_drive_t *drive, unsigned int cmd, unsigned long arg)
        task_ioreg_t *hobsptr   = args.hobRegister;
        int err                 = 0;
        int tasksize            = sizeof(struct ide_task_request_s);
-       int taskin              = 0;
-       int taskout             = 0;
+       unsigned int taskin     = 0;
+       unsigned int taskout    = 0;
        u8 io_32bit             = drive->io_32bit;
        char __user *buf = (char __user *)arg;
 
 //     printk("IDE Taskfile ...\n");
 
-       req_task = kmalloc(tasksize, GFP_KERNEL);
+       req_task = kzalloc(tasksize, GFP_KERNEL);
        if (req_task == NULL) return -ENOMEM;
-       memset(req_task, 0, tasksize);
        if (copy_from_user(req_task, buf, tasksize)) {
                kfree(req_task);
                return -EFAULT;
        }
 
-       taskout = (int) req_task->out_size;
-       taskin  = (int) req_task->in_size;
+       taskout = req_task->out_size;
+       taskin  = req_task->in_size;
+       
+       if (taskin > 65536 || taskout > 65536) {
+               err = -EINVAL;
+               goto abort;
+       }
 
        if (taskout) {
                int outtotal = tasksize;
-               outbuf = kmalloc(taskout, GFP_KERNEL);
+               outbuf = kzalloc(taskout, GFP_KERNEL);
                if (outbuf == NULL) {
                        err = -ENOMEM;
                        goto abort;
                }
-               memset(outbuf, 0, taskout);
                if (copy_from_user(outbuf, buf + outtotal, taskout)) {
                        err = -EFAULT;
                        goto abort;
@@ -924,12 +561,11 @@ int ide_taskfile_ioctl (ide_drive_t *drive, unsigned int cmd, unsigned long arg)
 
        if (taskin) {
                int intotal = tasksize + taskout;
-               inbuf = kmalloc(taskin, GFP_KERNEL);
+               inbuf = kzalloc(taskin, GFP_KERNEL);
                if (inbuf == NULL) {
                        err = -ENOMEM;
                        goto abort;
                }
-               memset(inbuf, 0, taskin);
                if (copy_from_user(inbuf, buf + intotal, taskin)) {
                        err = -EFAULT;
                        goto abort;
@@ -955,19 +591,6 @@ int ide_taskfile_ioctl (ide_drive_t *drive, unsigned int cmd, unsigned long arg)
                case TASKFILE_IN_DMA:
                        err = ide_diag_taskfile(drive, &args, taskin, inbuf);
                        break;
-               case TASKFILE_IN_OUT:
-#if 0
-                       args.prehandler = &pre_task_out_intr;
-                       args.handler = &task_out_intr;
-                       err = ide_diag_taskfile(drive, &args, taskout, outbuf);
-                       args.prehandler = NULL;
-                       args.handler = &task_in_intr;
-                       err = ide_diag_taskfile(drive, &args, taskin, inbuf);
-                       break;
-#else
-                       err = -EFAULT;
-                       goto abort;
-#endif
                case TASKFILE_MULTI_OUT:
                        if (!drive->mult_count) {
                                /* (hs): give up if multcount is not set */
@@ -977,23 +600,10 @@ int ide_taskfile_ioctl (ide_drive_t *drive, unsigned int cmd, unsigned long arg)
                                err = -EPERM;
                                goto abort;
                        }
-                       if (args.tf_out_flags.all != 0) {
-                               args.prehandler = &flagged_pre_task_mulout_intr;
-                               args.handler = &flagged_task_mulout_intr;
-                       } else {
-                               args.prehandler = &pre_task_mulout_intr;
-                               args.handler = &task_mulout_intr;
-                       }
-                       err = ide_diag_taskfile(drive, &args, taskout, outbuf);
-                       break;
+                       /* fall through */
                case TASKFILE_OUT:
-                       if (args.tf_out_flags.all != 0) {
-                               args.prehandler = &flagged_pre_task_out_intr;
-                               args.handler    = &flagged_task_out_intr;
-                       } else {
-                               args.prehandler = &pre_task_out_intr;
-                               args.handler = &task_out_intr;
-                       }
+                       args.prehandler = &pre_task_out_intr;
+                       args.handler = &task_out_intr;
                        err = ide_diag_taskfile(drive, &args, taskout, outbuf);
                        break;
                case TASKFILE_MULTI_IN:
@@ -1005,27 +615,13 @@ int ide_taskfile_ioctl (ide_drive_t *drive, unsigned int cmd, unsigned long arg)
                                err = -EPERM;
                                goto abort;
                        }
-                       if (args.tf_out_flags.all != 0) {
-                               args.handler = &flagged_task_mulin_intr;
-                       } else {
-                               args.handler = &task_mulin_intr;
-                       }
-                       err = ide_diag_taskfile(drive, &args, taskin, inbuf);
-                       break;
+                       /* fall through */
                case TASKFILE_IN:
-                       if (args.tf_out_flags.all != 0) {
-                               args.handler = &flagged_task_in_intr;
-                       } else {
-                               args.handler = &task_in_intr;
-                       }
+                       args.handler = &task_in_intr;
                        err = ide_diag_taskfile(drive, &args, taskin, inbuf);
                        break;
                case TASKFILE_NO_DATA:
-                       if (args.tf_out_flags.all != 0) {
-                               args.handler = &flagged_task_no_data_intr;
-                       } else {
-                               args.handler = &task_no_data_intr;
-                       }
+                       args.handler = &task_no_data_intr;
                        err = ide_diag_taskfile(drive, &args, 0, NULL);
                        break;
                default:
@@ -1058,10 +654,8 @@ int ide_taskfile_ioctl (ide_drive_t *drive, unsigned int cmd, unsigned long arg)
        }
 abort:
        kfree(req_task);
-       if (outbuf != NULL)
-               kfree(outbuf);
-       if (inbuf != NULL)
-               kfree(inbuf);
+       kfree(outbuf);
+       kfree(inbuf);
 
 //     printk("IDE Taskfile ioctl ended. rc = %i\n", err);
 
@@ -1070,8 +664,6 @@ abort:
        return err;
 }
 
-EXPORT_SYMBOL(ide_taskfile_ioctl);
-
 int ide_wait_cmd (ide_drive_t *drive, u8 cmd, u8 nsect, u8 feature, u8 sectors, u8 *buf)
 {
        struct request rq;
@@ -1089,8 +681,6 @@ int ide_wait_cmd (ide_drive_t *drive, u8 cmd, u8 nsect, u8 feature, u8 sectors,
        return ide_do_drive_cmd(drive, &rq, ide_wait);
 }
 
-EXPORT_SYMBOL(ide_wait_cmd);
-
 /*
  * FIXME : this needs to map into at taskfile. <andre@linux-ide.org>
  */
@@ -1122,10 +712,9 @@ int ide_cmd_ioctl (ide_drive_t *drive, unsigned int cmd, unsigned long arg)
 
        if (args[3]) {
                argsize = 4 + (SECTOR_WORDS * 4 * args[3]);
-               argbuf = kmalloc(argsize, GFP_KERNEL);
+               argbuf = kzalloc(argsize, GFP_KERNEL);
                if (argbuf == NULL)
                        return -ENOMEM;
-               memcpy(argbuf, args, 4);
        }
        if (set_transfer(drive, &tfargs)) {
                xfer_rate = args[1];
@@ -1148,20 +737,16 @@ abort:
        return err;
 }
 
-EXPORT_SYMBOL(ide_cmd_ioctl);
-
-int ide_wait_cmd_task (ide_drive_t *drive, u8 *buf)
+static int ide_wait_cmd_task(ide_drive_t *drive, u8 *buf)
 {
        struct request rq;
 
        ide_init_drive_cmd(&rq);
-       rq.flags = REQ_DRIVE_TASK;
+       rq.cmd_type = REQ_TYPE_ATA_TASK;
        rq.buffer = buf;
        return ide_do_drive_cmd(drive, &rq, ide_wait);
 }
 
-EXPORT_SYMBOL(ide_wait_cmd_task);
-
 /*
  * FIXME : this needs to map into at taskfile. <andre@linux-ide.org>
  */
@@ -1180,8 +765,6 @@ int ide_task_ioctl (ide_drive_t *drive, unsigned int cmd, unsigned long arg)
        return err;
 }
 
-EXPORT_SYMBOL(ide_task_ioctl);
-
 /*
  * NOTICE: This is additions from IBM to provide a discrete interface,
  * for selective taskregister access operations.  Nice JOB Klaus!!!
@@ -1192,29 +775,23 @@ ide_startstop_t flagged_taskfile (ide_drive_t *drive, ide_task_t *task)
        ide_hwif_t *hwif        = HWIF(drive);
        task_struct_t *taskfile = (task_struct_t *) task->tfRegister;
        hob_struct_t *hobfile   = (hob_struct_t *) task->hobRegister;
-#if DEBUG_TASKFILE
-       u8 status;
-#endif
-
 
-#ifdef CONFIG_IDE_TASK_IOCTL_DEBUG
-       void debug_taskfile(drive, task);
-#endif /* CONFIG_IDE_TASK_IOCTL_DEBUG */
+       if (task->data_phase == TASKFILE_MULTI_IN ||
+           task->data_phase == TASKFILE_MULTI_OUT) {
+               if (!drive->mult_count) {
+                       printk(KERN_ERR "%s: multimode not set!\n", drive->name);
+                       return ide_stopped;
+               }
+       }
 
        /*
-        * (ks) Check taskfile in/out flags.
+        * (ks) Check taskfile in flags.
         * If set, then execute as it is defined.
         * If not set, then define default settings.
         * The default values are:
-        *      write and read all taskfile registers (except data) 
-        *      write and read the hob registers (sector,nsector,lcyl,hcyl)
+        *      read all taskfile registers (except data)
+        *      read the hob registers (sector, nsector, lcyl, hcyl)
         */
-       if (task->tf_out_flags.all == 0) {
-               task->tf_out_flags.all = IDE_TASKFILE_STD_OUT_FLAGS;
-               if (drive->addressing == 1)
-                       task->tf_out_flags.all |= (IDE_HOB_STD_OUT_FLAGS << 8);
-        }
-
        if (task->tf_in_flags.all == 0) {
                task->tf_in_flags.all = IDE_TASKFILE_STD_IN_FLAGS;
                if (drive->addressing == 1)
@@ -1227,16 +804,6 @@ ide_startstop_t flagged_taskfile (ide_drive_t *drive, ide_task_t *task)
                hwif->OUTB(drive->ctl, IDE_CONTROL_REG);
        SELECT_MASK(drive, 0);
 
-#if DEBUG_TASKFILE
-       status = hwif->INB(IDE_STATUS_REG);
-       if (status & 0x80) {
-               printk("flagged_taskfile -> Bad status. Status = %02x. wait 100 usec ...\n", status);
-               udelay(100);
-               status = hwif->INB(IDE_STATUS_REG);
-               printk("flagged_taskfile -> Status = %02x\n", status);
-       }
-#endif
-
        if (task->tf_out_flags.b.data) {
                u16 data =  taskfile->data + (hobfile->data << 8);
                hwif->OUTW(data, IDE_DATA_REG);
@@ -1267,8 +834,8 @@ ide_startstop_t flagged_taskfile (ide_drive_t *drive, ide_task_t *task)
                hwif->OUTB(taskfile->high_cylinder, IDE_HCYL_REG);
 
         /*
-        * (ks) In the flagged taskfile approch, we will used all specified
-        * registers and the register value will not be changed. Except the
+        * (ks) In the flagged taskfile approch, we will use all specified
+        * registers and the register value will not be changed, except the
         * select bit (master/slave) in the drive_head register. We must make
         * sure that the desired drive is selected.
         */
@@ -1277,12 +844,11 @@ ide_startstop_t flagged_taskfile (ide_drive_t *drive, ide_task_t *task)
 
                case TASKFILE_OUT_DMAQ:
                case TASKFILE_OUT_DMA:
-                       hwif->ide_dma_write(drive);
-                       break;
-
                case TASKFILE_IN_DMAQ:
                case TASKFILE_IN_DMA:
-                       hwif->ide_dma_read(drive);
+                       hwif->dma_setup(drive);
+                       hwif->dma_exec_cmd(drive, taskfile->command);
+                       hwif->dma_start(drive);
                        break;
 
                default:
@@ -1290,277 +856,13 @@ ide_startstop_t flagged_taskfile (ide_drive_t *drive, ide_task_t *task)
                                return ide_stopped;
 
                        /* Issue the command */
+                       if (task->prehandler) {
+                               hwif->OUTBSYNC(drive, taskfile->command, IDE_COMMAND_REG);
+                               ndelay(400);    /* FIXME */
+                               return task->prehandler(drive, task->rq);
+                       }
                        ide_execute_command(drive, taskfile->command, task->handler, WAIT_WORSTCASE, NULL);
-                       if (task->prehandler != NULL)
-                               return task->prehandler(drive, HWGROUP(drive)->rq);
        }
 
        return ide_started;
 }
-
-EXPORT_SYMBOL(flagged_taskfile);
-
-ide_startstop_t flagged_task_no_data_intr (ide_drive_t *drive)
-{
-       ide_hwif_t *hwif = HWIF(drive);
-       u8 stat;
-
-       local_irq_enable();
-
-       if (!OK_STAT(stat = hwif->INB(IDE_STATUS_REG), READY_STAT, BAD_STAT)) {
-               if (stat & ERR_STAT) {
-                       return DRIVER(drive)->error(drive, "flagged_task_no_data_intr", stat);
-               }
-               /*
-                * (ks) Unexpected ATA data phase detected.
-                * This should not happen. But, it can !
-                * I am not sure, which function is best to clean up
-                * this situation.  I choose: ide_error(...)
-                */
-               return DRIVER(drive)->error(drive, "flagged_task_no_data_intr (unexpected phase)", stat); 
-       }
-
-       ide_end_drive_cmd(drive, stat, hwif->INB(IDE_ERROR_REG));
-
-       return ide_stopped;
-}
-
-/*
- * Handler for command with PIO data-in phase
- */
-ide_startstop_t flagged_task_in_intr (ide_drive_t *drive)
-{
-       ide_hwif_t *hwif        = HWIF(drive);
-       u8 stat                 = hwif->INB(IDE_STATUS_REG);
-       struct request *rq      = HWGROUP(drive)->rq;
-       char *pBuf              = NULL;
-       int retries             = 5;
-
-       if (!OK_STAT(stat, DATA_READY, BAD_R_STAT)) {
-               if (stat & ERR_STAT) {
-                       return DRIVER(drive)->error(drive, "flagged_task_in_intr", stat);
-               }
-               /*
-                * (ks) Unexpected ATA data phase detected.
-                * This should not happen. But, it can !
-                * I am not sure, which function is best to clean up
-                * this situation.  I choose: ide_error(...)
-                */
-               return DRIVER(drive)->error(drive, "flagged_task_in_intr (unexpected data phase)", stat); 
-       }
-
-       pBuf = rq->buffer + ((rq->nr_sectors - rq->current_nr_sectors) * SECTOR_SIZE);
-       DTF("Read - rq->current_nr_sectors: %d, status: %02x\n", (int) rq->current_nr_sectors, stat);
-
-       taskfile_input_data(drive, pBuf, SECTOR_WORDS);
-
-       if (--rq->current_nr_sectors != 0) {
-               /*
-                 * (ks) We don't know which command was executed. 
-                * So, we wait the 'WORSTCASE' value.
-                 */
-               ide_set_handler(drive, &flagged_task_in_intr,  WAIT_WORSTCASE, NULL);
-               return ide_started;
-       }
-       /*
-        * (ks) Last sector was transfered, wait until drive is ready. 
-        * This can take up to 10 usec. We willl wait max 50 us.
-        */
-       while (((stat = hwif->INB(IDE_STATUS_REG)) & BUSY_STAT) && retries--)
-               udelay(10);
-       ide_end_drive_cmd (drive, stat, hwif->INB(IDE_ERROR_REG));
-
-       return ide_stopped;
-}
-
-ide_startstop_t flagged_task_mulin_intr (ide_drive_t *drive)
-{
-       ide_hwif_t *hwif        = HWIF(drive);
-       u8 stat                 = hwif->INB(IDE_STATUS_REG);
-       struct request *rq      = HWGROUP(drive)->rq;
-       char *pBuf              = NULL;
-       int retries             = 5;
-       unsigned int msect, nsect;
-
-       msect = drive->mult_count;
-       if (msect == 0) 
-               return DRIVER(drive)->error(drive, "flagged_task_mulin_intr (multimode not set)", stat); 
-
-       if (!OK_STAT(stat, DATA_READY, BAD_R_STAT)) {
-               if (stat & ERR_STAT) {
-                       return DRIVER(drive)->error(drive, "flagged_task_mulin_intr", stat);
-               }
-               /*
-                * (ks) Unexpected ATA data phase detected.
-                * This should not happen. But, it can !
-                * I am not sure, which function is best to clean up
-                * this situation.  I choose: ide_error(...)
-                */
-               return DRIVER(drive)->error(drive, "flagged_task_mulin_intr (unexpected data phase)", stat); 
-       }
-
-       nsect = (rq->current_nr_sectors > msect) ? msect : rq->current_nr_sectors;
-       pBuf = rq->buffer + ((rq->nr_sectors - rq->current_nr_sectors) * SECTOR_SIZE);
-
-       DTF("Multiread: %p, nsect: %d , rq->current_nr_sectors: %ld\n",
-           pBuf, nsect, rq->current_nr_sectors);
-
-       taskfile_input_data(drive, pBuf, nsect * SECTOR_WORDS);
-
-       rq->current_nr_sectors -= nsect;
-       if (rq->current_nr_sectors != 0) {
-               /*
-                 * (ks) We don't know which command was executed. 
-                * So, we wait the 'WORSTCASE' value.
-                 */
-               ide_set_handler(drive, &flagged_task_mulin_intr,  WAIT_WORSTCASE, NULL);
-               return ide_started;
-       }
-
-       /*
-        * (ks) Last sector was transfered, wait until drive is ready. 
-        * This can take up to 10 usec. We willl wait max 50 us.
-        */
-       while (((stat = hwif->INB(IDE_STATUS_REG)) & BUSY_STAT) && retries--)
-               udelay(10);
-       ide_end_drive_cmd (drive, stat, hwif->INB(IDE_ERROR_REG));
-
-       return ide_stopped;
-}
-
-/*
- * Pre handler for command with PIO data-out phase
- */
-ide_startstop_t flagged_pre_task_out_intr (ide_drive_t *drive, struct request *rq)
-{
-       ide_startstop_t startstop;
-
-       if (ide_wait_stat(&startstop, drive, DATA_READY,
-                       BAD_W_STAT, WAIT_DRQ)) {
-               printk(KERN_ERR "%s: No DRQ bit after issuing write command.\n", drive->name);
-               return startstop;
-       }
-
-       taskfile_output_data(drive, rq->buffer, SECTOR_WORDS);
-       --rq->current_nr_sectors;
-
-       return ide_started;
-}
-
-ide_startstop_t flagged_task_out_intr (ide_drive_t *drive)
-{
-       ide_hwif_t *hwif        = HWIF(drive);
-       u8 stat                 = hwif->INB(IDE_STATUS_REG);
-       struct request *rq      = HWGROUP(drive)->rq;
-       char *pBuf              = NULL;
-
-       if (!OK_STAT(stat, DRIVE_READY, BAD_W_STAT)) 
-               return DRIVER(drive)->error(drive, "flagged_task_out_intr", stat);
-       
-       if (!rq->current_nr_sectors) { 
-               ide_end_drive_cmd (drive, stat, hwif->INB(IDE_ERROR_REG));
-               return ide_stopped;
-       }
-
-       if (!OK_STAT(stat, DATA_READY, BAD_W_STAT)) {
-               /*
-                * (ks) Unexpected ATA data phase detected.
-                * This should not happen. But, it can !
-                * I am not sure, which function is best to clean up
-                * this situation.  I choose: ide_error(...)
-                */
-               return DRIVER(drive)->error(drive, "flagged_task_out_intr (unexpected data phase)", stat); 
-       }
-
-       pBuf = rq->buffer + ((rq->nr_sectors - rq->current_nr_sectors) * SECTOR_SIZE);
-       DTF("Write - rq->current_nr_sectors: %d, status: %02x\n",
-               (int) rq->current_nr_sectors, stat);
-
-       taskfile_output_data(drive, pBuf, SECTOR_WORDS);
-       --rq->current_nr_sectors;
-
-       /*
-        * (ks) We don't know which command was executed. 
-        * So, we wait the 'WORSTCASE' value.
-        */
-       ide_set_handler(drive, &flagged_task_out_intr, WAIT_WORSTCASE, NULL);
-
-       return ide_started;
-}
-
-ide_startstop_t flagged_pre_task_mulout_intr (ide_drive_t *drive, struct request *rq)
-{
-       ide_hwif_t *hwif        = HWIF(drive);
-       u8 stat                 = hwif->INB(IDE_STATUS_REG);
-       char *pBuf              = NULL;
-       ide_startstop_t startstop;
-       unsigned int msect, nsect;
-
-       msect = drive->mult_count;
-       if (msect == 0)
-               return DRIVER(drive)->error(drive, "flagged_pre_task_mulout_intr (multimode not set)", stat);
-
-       if (ide_wait_stat(&startstop, drive, DATA_READY,
-                       BAD_W_STAT, WAIT_DRQ)) {
-               printk(KERN_ERR "%s: No DRQ bit after issuing write command.\n", drive->name);
-               return startstop;
-       }
-
-       nsect = (rq->current_nr_sectors > msect) ? msect : rq->current_nr_sectors;
-       pBuf = rq->buffer + ((rq->nr_sectors - rq->current_nr_sectors) * SECTOR_SIZE);
-       DTF("Multiwrite: %p, nsect: %d , rq->current_nr_sectors: %ld\n",
-           pBuf, nsect, rq->current_nr_sectors);
-
-       taskfile_output_data(drive, pBuf, nsect * SECTOR_WORDS);
-
-       rq->current_nr_sectors -= nsect;
-
-       return ide_started;
-}
-
-ide_startstop_t flagged_task_mulout_intr (ide_drive_t *drive)
-{
-       ide_hwif_t *hwif        = HWIF(drive);
-       u8 stat                 = hwif->INB(IDE_STATUS_REG);
-       struct request *rq      = HWGROUP(drive)->rq;
-       char *pBuf              = NULL;
-       unsigned int msect, nsect;
-
-       msect = drive->mult_count;
-       if (msect == 0)
-               return DRIVER(drive)->error(drive, "flagged_task_mulout_intr (multimode not set)", stat);
-
-       if (!OK_STAT(stat, DRIVE_READY, BAD_W_STAT)) 
-               return DRIVER(drive)->error(drive, "flagged_task_mulout_intr", stat);
-       
-       if (!rq->current_nr_sectors) { 
-               ide_end_drive_cmd (drive, stat, hwif->INB(IDE_ERROR_REG));
-               return ide_stopped;
-       }
-
-       if (!OK_STAT(stat, DATA_READY, BAD_W_STAT)) {
-               /*
-                * (ks) Unexpected ATA data phase detected.
-                * This should not happen. But, it can !
-                * I am not sure, which function is best to clean up
-                * this situation.  I choose: ide_error(...)
-                */
-               return DRIVER(drive)->error(drive, "flagged_task_mulout_intr (unexpected data phase)", stat); 
-       }
-
-       nsect = (rq->current_nr_sectors > msect) ? msect : rq->current_nr_sectors;
-       pBuf = rq->buffer + ((rq->nr_sectors - rq->current_nr_sectors) * SECTOR_SIZE);
-       DTF("Multiwrite: %p, nsect: %d , rq->current_nr_sectors: %ld\n",
-           pBuf, nsect, rq->current_nr_sectors);
-
-       taskfile_output_data(drive, pBuf, nsect * SECTOR_WORDS);
-       rq->current_nr_sectors -= nsect;
-
-       /*
-        * (ks) We don't know which command was executed. 
-        * So, we wait the 'WORSTCASE' value.
-        */
-       ide_set_handler(drive, &flagged_task_mulout_intr, WAIT_WORSTCASE, NULL);
-
-       return ide_started;
-}