Merge branch 'upstream'

8 files changed, 925 insertions, 108 deletions

diff --git a/drivers/scsi/Kconfig b/drivers/scsi/Kconfig
index be96cb78e3b5..9c9f162bd6ed 100644
--- a/drivers/scsi/Kconfig
+++ b/drivers/scsi/Kconfig
@@ -489,11 +489,11 @@ config SCSI_SATA_NV
 
           If unsure, say N.
 
-config SCSI_SATA_PROMISE
-        tristate "Promise SATA TX2/TX4 support"
+config SCSI_PDC_ADMA
+        tristate "Pacific Digital ADMA support"
         depends on SCSI_SATA && PCI
         help
-          This option enables support for Promise Serial ATA TX2/TX4.
+          This option enables support for Pacific Digital ADMA controllers
 
           If unsure, say N.
 
@@ -505,6 +505,14 @@ config SCSI_SATA_QSTOR
 
           If unsure, say N.
 
+config SCSI_SATA_PROMISE
+        tristate "Promise SATA TX2/TX4 support"
+        depends on SCSI_SATA && PCI
+        help
+          This option enables support for Promise Serial ATA TX2/TX4.
+
+          If unsure, say N.
+
 config SCSI_SATA_SX4
         tristate "Promise SATA SX4 support"
         depends on SCSI_SATA && PCI && EXPERIMENTAL
@@ -561,6 +569,11 @@ config SCSI_SATA_VITESSE
 
           If unsure, say N.
 
+config SCSI_SATA_INTEL_COMBINED
+        bool
+        depends on IDE=y && !BLK_DEV_IDE_SATA && (SCSI_SATA_AHCI || SCSI_ATA_PIIX)
+        default y
+
 config SCSI_BUSLOGIC
         tristate "BusLogic SCSI support"
         depends on (PCI || ISA || MCA) && SCSI && ISA_DMA_API
diff --git a/drivers/scsi/Makefile b/drivers/scsi/Makefile
index e2e3d8671930..2d4439826c08 100644
--- a/drivers/scsi/Makefile
+++ b/drivers/scsi/Makefile
@@ -138,6 +138,7 @@ obj-$(CONFIG_SCSI_SATA_SX4)	+= libata.o sata_sx4.o
 obj-$(CONFIG_SCSI_SATA_NV)      += libata.o sata_nv.o
 obj-$(CONFIG_SCSI_SATA_ULI)     += libata.o sata_uli.o
 obj-$(CONFIG_SCSI_SATA_MV)      += libata.o sata_mv.o
+obj-$(CONFIG_SCSI_PDC_ADMA)     += libata.o pdc_adma.o
 
 obj-$(CONFIG_ARM)               += arm/
 
diff --git a/drivers/scsi/aacraid/linit.c b/drivers/scsi/aacraid/linit.c
index de8490a92831..a1f9ceef0ac9 100644
--- a/drivers/scsi/aacraid/linit.c
+++ b/drivers/scsi/aacraid/linit.c
@@ -453,9 +453,9 @@ static int aac_eh_reset(struct scsi_cmnd* cmd)
                 /*
                  * We can exit If all the commands are complete
                  */
+                spin_unlock_irq(host->host_lock);
                 if (active == 0)
                         return SUCCESS;
-                spin_unlock_irq(host->host_lock);
                 ssleep(1);
                 spin_lock_irq(host->host_lock);
         }
diff --git a/drivers/scsi/libata-core.c b/drivers/scsi/libata-core.c
index 9aa93087d495..c5e663fefdf7 100644
--- a/drivers/scsi/libata-core.c
+++ b/drivers/scsi/libata-core.c
@@ -63,6 +63,7 @@
 static unsigned int ata_busy_sleep (struct ata_port *ap,
                                     unsigned long tmout_pat,
                                     unsigned long tmout);
+static void ata_dev_reread_id(struct ata_port *ap, struct ata_device *dev);
 static void ata_dev_init_params(struct ata_port *ap, struct ata_device *dev);
 static void ata_set_mode(struct ata_port *ap);
 static void ata_dev_set_xfermode(struct ata_port *ap, struct ata_device *dev);
@@ -616,79 +617,53 @@ void ata_tf_from_fis(u8 *fis, struct ata_taskfile *tf)
         tf->hob_nsect   = fis[13];
 }
 
-/**
- *      ata_prot_to_cmd - determine which read/write opcodes to use
- *      @protocol: ATA_PROT_xxx taskfile protocol
- *      @lba48: true is lba48 is present
- *
- *      Given necessary input, determine which read/write commands
- *      to use to transfer data.
- *
- *      LOCKING:
- *      None.
- */
-static int ata_prot_to_cmd(int protocol, int lba48)
-{
-        int rcmd = 0, wcmd = 0;
-
-        switch (protocol) {
-        case ATA_PROT_PIO:
-                if (lba48) {
-                        rcmd = ATA_CMD_PIO_READ_EXT;
-                        wcmd = ATA_CMD_PIO_WRITE_EXT;
-                } else {
-                        rcmd = ATA_CMD_PIO_READ;
-                        wcmd = ATA_CMD_PIO_WRITE;
-                }
-                break;
-
-        case ATA_PROT_DMA:
-                if (lba48) {
-                        rcmd = ATA_CMD_READ_EXT;
-                        wcmd = ATA_CMD_WRITE_EXT;
-                } else {
-                        rcmd = ATA_CMD_READ;
-                        wcmd = ATA_CMD_WRITE;
-                }
-                break;
-
-        default:
-                return -1;
-        }
-
-        return rcmd | (wcmd << 8);
-}
+static const u8 ata_rw_cmds[] = {
+        /* pio multi */
+        ATA_CMD_READ_MULTI,
+        ATA_CMD_WRITE_MULTI,
+        ATA_CMD_READ_MULTI_EXT,
+        ATA_CMD_WRITE_MULTI_EXT,
+        /* pio */
+        ATA_CMD_PIO_READ,
+        ATA_CMD_PIO_WRITE,
+        ATA_CMD_PIO_READ_EXT,
+        ATA_CMD_PIO_WRITE_EXT,
+        /* dma */
+        ATA_CMD_READ,
+        ATA_CMD_WRITE,
+        ATA_CMD_READ_EXT,
+        ATA_CMD_WRITE_EXT
+};
 
 /**
- *      ata_dev_set_protocol - set taskfile protocol and r/w commands
- *      @dev: device to examine and configure
+ *      ata_rwcmd_protocol - set taskfile r/w commands and protocol
+ *      @qc: command to examine and configure
  *
- *      Examine the device configuration, after we have
- *      read the identify-device page and configured the
- *      data transfer mode.  Set internal state related to
- *      the ATA taskfile protocol (pio, pio mult, dma, etc.)
- *      and calculate the proper read/write commands to use.
+ *      Examine the device configuration and tf->flags to calculate 
+ *      the proper read/write commands and protocol to use.
  *
  *      LOCKING:
  *      caller.
  */
-static void ata_dev_set_protocol(struct ata_device *dev)
+void ata_rwcmd_protocol(struct ata_queued_cmd *qc)
 {
-        int pio = (dev->flags & ATA_DFLAG_PIO);
-        int lba48 = (dev->flags & ATA_DFLAG_LBA48);
-        int proto, cmd;
+        struct ata_taskfile *tf = &qc->tf;
+        struct ata_device *dev = qc->dev;
 
-        if (pio)
-                proto = dev->xfer_protocol = ATA_PROT_PIO;
-        else
-                proto = dev->xfer_protocol = ATA_PROT_DMA;
+        int index, lba48, write;
+ 
+        lba48 = (tf->flags & ATA_TFLAG_LBA48) ? 2 : 0;
+        write = (tf->flags & ATA_TFLAG_WRITE) ? 1 : 0;
 
-        cmd = ata_prot_to_cmd(proto, lba48);
-        if (cmd < 0)
-                BUG();
+        if (dev->flags & ATA_DFLAG_PIO) {
+                tf->protocol = ATA_PROT_PIO;
+                index = dev->multi_count ? 0 : 4;
+        } else {
+                tf->protocol = ATA_PROT_DMA;
+                index = 8;
+        }
 
-        dev->read_cmd = cmd & 0xff;
-        dev->write_cmd = (cmd >> 8) & 0xff;
+        tf->command = ata_rw_cmds[index + lba48 + write];
 }
 
 static const char * xfer_mode_str[] = {
@@ -1266,9 +1241,15 @@ retry:
                  * anything else..
                  * Some drives were very specific about that exact sequence.
                  */
-                if (major_version < 4 || (!ata_id_has_lba(dev->id)))
+                if (major_version < 4 || (!ata_id_has_lba(dev->id))) {
                         ata_dev_init_params(ap, dev);
 
+                        /* current CHS translation info (id[53-58]) might be
+                         * changed. reread the identify device info.
+                         */
+                        ata_dev_reread_id(ap, dev);
+                }
+
                 if (ata_id_has_lba(dev->id)) {
                         dev->flags |= ATA_DFLAG_LBA;
 
@@ -1641,7 +1622,7 @@ static void ata_host_set_dma(struct ata_port *ap, u8 xfer_mode,
  */
 static void ata_set_mode(struct ata_port *ap)
 {
-        unsigned int i, xfer_shift;
+        unsigned int xfer_shift;
         u8 xfer_mode;
         int rc;
 
@@ -1670,11 +1651,6 @@ static void ata_set_mode(struct ata_port *ap)
         if (ap->ops->post_set_mode)
                 ap->ops->post_set_mode(ap);
 
-        for (i = 0; i < 2; i++) {
-                struct ata_device *dev = &ap->device[i];
-                ata_dev_set_protocol(dev);
-        }
-
         return;
 
 err_out:
@@ -2182,6 +2158,62 @@ static void ata_dev_set_xfermode(struct ata_port *ap, struct ata_device *dev)
 }
 
 /**
+ *      ata_dev_reread_id - Reread the device identify device info
+ *      @ap: port where the device is
+ *      @dev: device to reread the identify device info
+ *
+ *      LOCKING:
+ */
+
+static void ata_dev_reread_id(struct ata_port *ap, struct ata_device *dev)
+{
+        DECLARE_COMPLETION(wait);
+        struct ata_queued_cmd *qc;
+        unsigned long flags;
+        int rc;
+
+        qc = ata_qc_new_init(ap, dev);
+        BUG_ON(qc == NULL);
+
+        ata_sg_init_one(qc, dev->id, sizeof(dev->id));
+        qc->dma_dir = DMA_FROM_DEVICE;
+
+        if (dev->class == ATA_DEV_ATA) {
+                qc->tf.command = ATA_CMD_ID_ATA;
+                DPRINTK("do ATA identify\n");
+        } else {
+                qc->tf.command = ATA_CMD_ID_ATAPI;
+                DPRINTK("do ATAPI identify\n");
+        }
+
+        qc->tf.flags |= ATA_TFLAG_DEVICE;
+        qc->tf.protocol = ATA_PROT_PIO;
+        qc->nsect = 1;
+
+        qc->waiting = &wait;
+        qc->complete_fn = ata_qc_complete_noop;
+
+        spin_lock_irqsave(&ap->host_set->lock, flags);
+        rc = ata_qc_issue(qc);
+        spin_unlock_irqrestore(&ap->host_set->lock, flags);
+
+        if (rc)
+                goto err_out;
+
+        wait_for_completion(&wait);
+
+        swap_buf_le16(dev->id, ATA_ID_WORDS);
+
+        ata_dump_id(dev);
+
+        DPRINTK("EXIT\n");
+
+        return;
+err_out:
+        ata_port_disable(ap);
+}
+
+/**
  *      ata_dev_init_params - Issue INIT DEV PARAMS command
  *      @ap: Port associated with device @dev
  *      @dev: Device to which command will be sent
@@ -3277,13 +3309,6 @@ struct ata_queued_cmd *ata_qc_new_init(struct ata_port *ap,
                 qc->nbytes = qc->curbytes = 0;
 
                 ata_tf_init(ap, &qc->tf, dev->devno);
-
-                if (dev->flags & ATA_DFLAG_LBA) {
-                        qc->tf.flags |= ATA_TFLAG_LBA;
-
-                        if (dev->flags & ATA_DFLAG_LBA48)
-                                qc->tf.flags |= ATA_TFLAG_LBA48;
-                }
         }
 
         return qc;
diff --git a/drivers/scsi/libata-scsi.c b/drivers/scsi/libata-scsi.c
index 4cf43de4060e..9944adbe5a1d 100644
--- a/drivers/scsi/libata-scsi.c
+++ b/drivers/scsi/libata-scsi.c
@@ -502,7 +502,7 @@ static unsigned int ata_scsi_flush_xlat(struct ata_queued_cmd *qc, u8 *scsicmd)
         tf->flags |= ATA_TFLAG_DEVICE;
         tf->protocol = ATA_PROT_NODATA;
 
-        if ((tf->flags & ATA_TFLAG_LBA48) &&
+        if ((qc->dev->flags & ATA_DFLAG_LBA48) &&
             (ata_id_has_flush_ext(qc->dev->id)))
                 tf->command = ATA_CMD_FLUSH_EXT;
         else
@@ -622,8 +622,6 @@ static unsigned int ata_scsi_verify_xlat(struct ata_queued_cmd *qc, u8 *scsicmd)
 {
         struct ata_taskfile *tf = &qc->tf;
         struct ata_device *dev = qc->dev;
-        unsigned int lba   = tf->flags & ATA_TFLAG_LBA;
-        unsigned int lba48 = tf->flags & ATA_TFLAG_LBA48;
         u64 dev_sectors = qc->dev->n_sectors;
         u64 block;
         u32 n_block;
@@ -644,16 +642,16 @@ static unsigned int ata_scsi_verify_xlat(struct ata_queued_cmd *qc, u8 *scsicmd)
                 goto out_of_range;
         if ((block + n_block) > dev_sectors)
                 goto out_of_range;
-        if (lba48) {
-                if (n_block > (64 * 1024))
-                        goto invalid_fld;
-        } else {
-                if (n_block > 256)
-                        goto invalid_fld;
-        }
 
-        if (lba) {
-                if (lba48) {
+        if (dev->flags & ATA_DFLAG_LBA) {
+                tf->flags |= ATA_TFLAG_LBA;
+
+                if (dev->flags & ATA_DFLAG_LBA48) {
+                        if (n_block > (64 * 1024))
+                                goto invalid_fld;
+
+                        /* use LBA48 */
+                        tf->flags |= ATA_TFLAG_LBA48;
                         tf->command = ATA_CMD_VERIFY_EXT;
 
                         tf->hob_nsect = (n_block >> 8) & 0xff;
@@ -662,6 +660,10 @@ static unsigned int ata_scsi_verify_xlat(struct ata_queued_cmd *qc, u8 *scsicmd)
                         tf->hob_lbam = (block >> 32) & 0xff;
                         tf->hob_lbal = (block >> 24) & 0xff;
                 } else {
+                        if (n_block > 256)
+                                goto invalid_fld;
+
+                        /* use LBA28 */
                         tf->command = ATA_CMD_VERIFY;
 
                         tf->device |= (block >> 24) & 0xf;
@@ -678,6 +680,9 @@ static unsigned int ata_scsi_verify_xlat(struct ata_queued_cmd *qc, u8 *scsicmd)
                 /* CHS */
                 u32 sect, head, cyl, track;
 
+                if (n_block > 256)
+                        goto invalid_fld;
+
                 /* Convert LBA to CHS */
                 track = (u32)block / dev->sectors;
                 cyl   = track / dev->heads;
@@ -743,21 +748,14 @@ static unsigned int ata_scsi_rw_xlat(struct ata_queued_cmd *qc, u8 *scsicmd)
 {
         struct ata_taskfile *tf = &qc->tf;
         struct ata_device *dev = qc->dev;
-        unsigned int lba   = tf->flags & ATA_TFLAG_LBA;
-        unsigned int lba48 = tf->flags & ATA_TFLAG_LBA48;
         u64 block;
         u32 n_block;
 
         tf->flags |= ATA_TFLAG_ISADDR | ATA_TFLAG_DEVICE;
-        tf->protocol = qc->dev->xfer_protocol;
 
-        if (scsicmd[0] == READ_10 || scsicmd[0] == READ_6 ||
-            scsicmd[0] == READ_16) {
-                tf->command = qc->dev->read_cmd;
-        } else {
-                tf->command = qc->dev->write_cmd;
+        if (scsicmd[0] == WRITE_10 || scsicmd[0] == WRITE_6 ||
+            scsicmd[0] == WRITE_16)
                 tf->flags |= ATA_TFLAG_WRITE;
-        }
 
         /* Calculate the SCSI LBA and transfer length. */
         switch (scsicmd[0]) {
@@ -793,19 +791,24 @@ static unsigned int ata_scsi_rw_xlat(struct ata_queued_cmd *qc, u8 *scsicmd)
                  */
                 goto nothing_to_do;
 
-        if (lba) {
-                if (lba48) {
+        if (dev->flags & ATA_DFLAG_LBA) {
+                tf->flags |= ATA_TFLAG_LBA;
+
+                if (dev->flags & ATA_DFLAG_LBA48) {
                         /* The request -may- be too large for LBA48. */
                         if ((block >> 48) || (n_block > 65536))
                                 goto out_of_range;
 
+                        /* use LBA48 */
+                        tf->flags |= ATA_TFLAG_LBA48;
+
                         tf->hob_nsect = (n_block >> 8) & 0xff;
 
                         tf->hob_lbah = (block >> 40) & 0xff;
                         tf->hob_lbam = (block >> 32) & 0xff;
                         tf->hob_lbal = (block >> 24) & 0xff;
                 } else { 
-                        /* LBA28 */
+                        /* use LBA28 */
 
                         /* The request -may- be too large for LBA28. */
                         if ((block >> 28) || (n_block > 256))
@@ -814,6 +817,8 @@ static unsigned int ata_scsi_rw_xlat(struct ata_queued_cmd *qc, u8 *scsicmd)
                         tf->device |= (block >> 24) & 0xf;
                 }
 
+                ata_rwcmd_protocol(qc);
+
                 qc->nsect = n_block;
                 tf->nsect = n_block & 0xff;
 
@@ -830,6 +835,8 @@ static unsigned int ata_scsi_rw_xlat(struct ata_queued_cmd *qc, u8 *scsicmd)
                 if ((block >> 28) || (n_block > 256))
                         goto out_of_range;
 
+                ata_rwcmd_protocol(qc);
+
                 /* Convert LBA to CHS */
                 track = (u32)block / dev->sectors;
                 cyl   = track / dev->heads;
diff --git a/drivers/scsi/libata.h b/drivers/scsi/libata.h
index a18f2ac1d4a1..67d752ca8ae2 100644
--- a/drivers/scsi/libata.h
+++ b/drivers/scsi/libata.h
@@ -42,6 +42,7 @@ extern int atapi_enabled;
 extern int ata_qc_complete_noop(struct ata_queued_cmd *qc, u8 drv_stat);
 extern struct ata_queued_cmd *ata_qc_new_init(struct ata_port *ap,
                                       struct ata_device *dev);
+extern void ata_rwcmd_protocol(struct ata_queued_cmd *qc);
 extern void ata_qc_free(struct ata_queued_cmd *qc);
 extern int ata_qc_issue(struct ata_queued_cmd *qc);
 extern int ata_check_atapi_dma(struct ata_queued_cmd *qc);
diff --git a/drivers/scsi/pdc_adma.c b/drivers/scsi/pdc_adma.c
new file mode 100644
index 000000000000..53b8db4be1a9
--- /dev/null
+++ b/drivers/scsi/pdc_adma.c
@@ -0,0 +1,739 @@
+/*
+ *  pdc_adma.c - Pacific Digital Corporation ADMA
+ *
+ *  Maintained by:  Mark Lord <mlord@pobox.com>
+ *
+ *  Copyright 2005 Mark Lord
+ *
+ *  This program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 2, or (at your option)
+ *  any later version.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with this program; see the file COPYING.  If not, write to
+ *  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
+ *
+ *
+ *  libata documentation is available via 'make {ps|pdf}docs',
+ *  as Documentation/DocBook/libata.*
+ *
+ *
+ *  Supports ATA disks in single-packet ADMA mode.
+ *  Uses PIO for everything else.
+ *
+ *  TODO:  Use ADMA transfers for ATAPI devices, when possible.
+ *  This requires careful attention to a number of quirks of the chip.
+ *
+ */
+
+#include <linux/kernel.h>
+#include <linux/module.h>
+#include <linux/pci.h>
+#include <linux/init.h>
+#include <linux/blkdev.h>
+#include <linux/delay.h>
+#include <linux/interrupt.h>
+#include <linux/sched.h>
+#include "scsi.h"
+#include <scsi/scsi_host.h>
+#include <asm/io.h>
+#include <linux/libata.h>
+
+#define DRV_NAME        "pdc_adma"
+#define DRV_VERSION     "0.01"
+
+/* macro to calculate base address for ATA regs */
+#define ADMA_ATA_REGS(base,port_no)     ((base) + ((port_no) * 0x40))
+
+/* macro to calculate base address for ADMA regs */
+#define ADMA_REGS(base,port_no) ((base) + 0x80 + ((port_no) * 0x20))
+
+enum {
+        ADMA_PORTS              = 2,
+        ADMA_CPB_BYTES          = 40,
+        ADMA_PRD_BYTES          = LIBATA_MAX_PRD * 16,
+        ADMA_PKT_BYTES          = ADMA_CPB_BYTES + ADMA_PRD_BYTES,
+
+        ADMA_DMA_BOUNDARY       = 0xffffffff,
+
+        /* global register offsets */
+        ADMA_MODE_LOCK          = 0x00c7,
+
+        /* per-channel register offsets */
+        ADMA_CONTROL            = 0x0000, /* ADMA control */
+        ADMA_STATUS             = 0x0002, /* ADMA status */
+        ADMA_CPB_COUNT          = 0x0004, /* CPB count */
+        ADMA_CPB_CURRENT        = 0x000c, /* current CPB address */
+        ADMA_CPB_NEXT           = 0x000c, /* next CPB address */
+        ADMA_CPB_LOOKUP         = 0x0010, /* CPB lookup table */
+        ADMA_FIFO_IN            = 0x0014, /* input FIFO threshold */
+        ADMA_FIFO_OUT           = 0x0016, /* output FIFO threshold */
+
+        /* ADMA_CONTROL register bits */
+        aNIEN                   = (1 << 8), /* irq mask: 1==masked */
+        aGO                     = (1 << 7), /* packet trigger ("Go!") */
+        aRSTADM                 = (1 << 5), /* ADMA logic reset */
+        aRSTA                   = (1 << 2), /* ATA hard reset */
+        aPIOMD4                 = 0x0003,   /* PIO mode 4 */
+
+        /* ADMA_STATUS register bits */
+        aPSD                    = (1 << 6),
+        aUIRQ                   = (1 << 4),
+        aPERR                   = (1 << 0),
+
+        /* CPB bits */
+        cDONE                   = (1 << 0),
+        cVLD                    = (1 << 0),
+        cDAT                    = (1 << 2),
+        cIEN                    = (1 << 3),
+
+        /* PRD bits */
+        pORD                    = (1 << 4),
+        pDIRO                   = (1 << 5),
+        pEND                    = (1 << 7),
+
+        /* ATA register flags */
+        rIGN                    = (1 << 5),
+        rEND                    = (1 << 7),
+
+        /* ATA register addresses */
+        ADMA_REGS_CONTROL       = 0x0e,
+        ADMA_REGS_SECTOR_COUNT  = 0x12,
+        ADMA_REGS_LBA_LOW       = 0x13,
+        ADMA_REGS_LBA_MID       = 0x14,
+        ADMA_REGS_LBA_HIGH      = 0x15,
+        ADMA_REGS_DEVICE        = 0x16,
+        ADMA_REGS_COMMAND       = 0x17,
+
+        /* PCI device IDs */
+        board_1841_idx          = 0,    /* ADMA 2-port controller */
+};
+
+typedef enum { adma_state_idle, adma_state_pkt, adma_state_mmio } adma_state_t;
+
+struct adma_port_priv {
+        u8                      *pkt;
+        dma_addr_t              pkt_dma;
+        adma_state_t            state;
+};
+
+static int adma_ata_init_one (struct pci_dev *pdev,
+                                const struct pci_device_id *ent);
+static irqreturn_t adma_intr (int irq, void *dev_instance,
+                                struct pt_regs *regs);
+static int adma_port_start(struct ata_port *ap);
+static void adma_host_stop(struct ata_host_set *host_set);
+static void adma_port_stop(struct ata_port *ap);
+static void adma_phy_reset(struct ata_port *ap);
+static void adma_qc_prep(struct ata_queued_cmd *qc);
+static int adma_qc_issue(struct ata_queued_cmd *qc);
+static int adma_check_atapi_dma(struct ata_queued_cmd *qc);
+static void adma_bmdma_stop(struct ata_queued_cmd *qc);
+static u8 adma_bmdma_status(struct ata_port *ap);
+static void adma_irq_clear(struct ata_port *ap);
+static void adma_eng_timeout(struct ata_port *ap);
+
+static Scsi_Host_Template adma_ata_sht = {
+        .module                 = THIS_MODULE,
+        .name                   = DRV_NAME,
+        .ioctl                  = ata_scsi_ioctl,
+        .queuecommand           = ata_scsi_queuecmd,
+        .eh_strategy_handler    = ata_scsi_error,
+        .can_queue              = ATA_DEF_QUEUE,
+        .this_id                = ATA_SHT_THIS_ID,
+        .sg_tablesize           = LIBATA_MAX_PRD,
+        .max_sectors            = ATA_MAX_SECTORS,
+        .cmd_per_lun            = ATA_SHT_CMD_PER_LUN,
+        .emulated               = ATA_SHT_EMULATED,
+        .use_clustering         = ENABLE_CLUSTERING,
+        .proc_name              = DRV_NAME,
+        .dma_boundary           = ADMA_DMA_BOUNDARY,
+        .slave_configure        = ata_scsi_slave_config,
+        .bios_param             = ata_std_bios_param,
+};
+
+static struct ata_port_operations adma_ata_ops = {
+        .port_disable           = ata_port_disable,
+        .tf_load                = ata_tf_load,
+        .tf_read                = ata_tf_read,
+        .check_status           = ata_check_status,
+        .check_atapi_dma        = adma_check_atapi_dma,
+        .exec_command           = ata_exec_command,
+        .dev_select             = ata_std_dev_select,
+        .phy_reset              = adma_phy_reset,
+        .qc_prep                = adma_qc_prep,
+        .qc_issue               = adma_qc_issue,
+        .eng_timeout            = adma_eng_timeout,
+        .irq_handler            = adma_intr,
+        .irq_clear              = adma_irq_clear,
+        .port_start             = adma_port_start,
+        .port_stop              = adma_port_stop,
+        .host_stop              = adma_host_stop,
+        .bmdma_stop             = adma_bmdma_stop,
+        .bmdma_status           = adma_bmdma_status,
+};
+
+static struct ata_port_info adma_port_info[] = {
+        /* board_1841_idx */
+        {
+                .sht            = &adma_ata_sht,
+                .host_flags     = ATA_FLAG_SLAVE_POSS | ATA_FLAG_SRST |
+                                  ATA_FLAG_NO_LEGACY | ATA_FLAG_MMIO,
+                .pio_mask       = 0x10, /* pio4 */
+                .udma_mask      = 0x1f, /* udma0-4 */
+                .port_ops       = &adma_ata_ops,
+        },
+};
+
+static struct pci_device_id adma_ata_pci_tbl[] = {
+        { PCI_VENDOR_ID_PDC, 0x1841, PCI_ANY_ID, PCI_ANY_ID, 0, 0,
+          board_1841_idx },
+
+        { }     /* terminate list */
+};
+
+static struct pci_driver adma_ata_pci_driver = {
+        .name                   = DRV_NAME,
+        .id_table               = adma_ata_pci_tbl,
+        .probe                  = adma_ata_init_one,
+        .remove                 = ata_pci_remove_one,
+};
+
+static int adma_check_atapi_dma(struct ata_queued_cmd *qc)
+{
+        return 1;       /* ATAPI DMA not yet supported */
+}
+
+static void adma_bmdma_stop(struct ata_queued_cmd *qc)
+{
+        /* nothing */
+}
+
+static u8 adma_bmdma_status(struct ata_port *ap)
+{
+        return 0;
+}
+
+static void adma_irq_clear(struct ata_port *ap)
+{
+        /* nothing */
+}
+
+static void adma_reset_engine(void __iomem *chan)
+{
+        /* reset ADMA to idle state */
+        writew(aPIOMD4 | aNIEN | aRSTADM, chan + ADMA_CONTROL);
+        udelay(2);
+        writew(aPIOMD4, chan + ADMA_CONTROL);
+        udelay(2);
+}
+
+static void adma_reinit_engine(struct ata_port *ap)
+{
+        struct adma_port_priv *pp = ap->private_data;
+        void __iomem *mmio_base = ap->host_set->mmio_base;
+        void __iomem *chan = ADMA_REGS(mmio_base, ap->port_no);
+
+        /* mask/clear ATA interrupts */
+        writeb(ATA_NIEN, (void __iomem *)ap->ioaddr.ctl_addr);
+        ata_check_status(ap);
+
+        /* reset the ADMA engine */
+        adma_reset_engine(chan);
+
+        /* set in-FIFO threshold to 0x100 */
+        writew(0x100, chan + ADMA_FIFO_IN);
+
+        /* set CPB pointer */
+        writel((u32)pp->pkt_dma, chan + ADMA_CPB_NEXT);
+
+        /* set out-FIFO threshold to 0x100 */
+        writew(0x100, chan + ADMA_FIFO_OUT);
+
+        /* set CPB count */
+        writew(1, chan + ADMA_CPB_COUNT);
+
+        /* read/discard ADMA status */
+        readb(chan + ADMA_STATUS);
+}
+
+static inline void adma_enter_reg_mode(struct ata_port *ap)
+{
+        void __iomem *chan = ADMA_REGS(ap->host_set->mmio_base, ap->port_no);
+
+        writew(aPIOMD4, chan + ADMA_CONTROL);
+        readb(chan + ADMA_STATUS);      /* flush */
+}
+
+static void adma_phy_reset(struct ata_port *ap)
+{
+        struct adma_port_priv *pp = ap->private_data;
+
+        pp->state = adma_state_idle;
+        adma_reinit_engine(ap);
+        ata_port_probe(ap);
+        ata_bus_reset(ap);
+}
+
+static void adma_eng_timeout(struct ata_port *ap)
+{
+        struct adma_port_priv *pp = ap->private_data;
+
+        if (pp->state != adma_state_idle) /* healthy paranoia */
+                pp->state = adma_state_mmio;
+        adma_reinit_engine(ap);
+        ata_eng_timeout(ap);
+}
+
+static int adma_fill_sg(struct ata_queued_cmd *qc)
+{
+        struct scatterlist *sg = qc->sg;
+        struct ata_port *ap = qc->ap;
+        struct adma_port_priv *pp = ap->private_data;
+        u8  *buf = pp->pkt;
+        int nelem, i = (2 + buf[3]) * 8;
+        u8 pFLAGS = pORD | ((qc->tf.flags & ATA_TFLAG_WRITE) ? pDIRO : 0);
+
+        for (nelem = 0; nelem < qc->n_elem; nelem++,sg++) {
+                u32 addr;
+                u32 len;
+
+                addr = (u32)sg_dma_address(sg);
+                *(__le32 *)(buf + i) = cpu_to_le32(addr);
+                i += 4;
+
+                len = sg_dma_len(sg) >> 3;
+                *(__le32 *)(buf + i) = cpu_to_le32(len);
+                i += 4;
+
+                if ((nelem + 1) == qc->n_elem)
+                        pFLAGS |= pEND;
+                buf[i++] = pFLAGS;
+                buf[i++] = qc->dev->dma_mode & 0xf;
+                buf[i++] = 0;   /* pPKLW */
+                buf[i++] = 0;   /* reserved */
+
+                *(__le32 *)(buf + i)
+                        = (pFLAGS & pEND) ? 0 : cpu_to_le32(pp->pkt_dma + i + 4);
+                i += 4;
+
+                VPRINTK("PRD[%u] = (0x%lX, 0x%X)\n", nelem,
+                                        (unsigned long)addr, len);
+        }
+        return i;
+}
+
+static void adma_qc_prep(struct ata_queued_cmd *qc)
+{
+        struct adma_port_priv *pp = qc->ap->private_data;
+        u8  *buf = pp->pkt;
+        u32 pkt_dma = (u32)pp->pkt_dma;
+        int i = 0;
+
+        VPRINTK("ENTER\n");
+
+        adma_enter_reg_mode(qc->ap);
+        if (qc->tf.protocol != ATA_PROT_DMA) {
+                ata_qc_prep(qc);
+                return;
+        }
+
+        buf[i++] = 0;   /* Response flags */
+        buf[i++] = 0;   /* reserved */
+        buf[i++] = cVLD | cDAT | cIEN;
+        i++;            /* cLEN, gets filled in below */
+
+        *(__le32 *)(buf+i) = cpu_to_le32(pkt_dma);      /* cNCPB */
+        i += 4;         /* cNCPB */
+        i += 4;         /* cPRD, gets filled in below */
+
+        buf[i++] = 0;   /* reserved */
+        buf[i++] = 0;   /* reserved */
+        buf[i++] = 0;   /* reserved */
+        buf[i++] = 0;   /* reserved */
+
+        /* ATA registers; must be a multiple of 4 */
+        buf[i++] = qc->tf.device;
+        buf[i++] = ADMA_REGS_DEVICE;
+        if ((qc->tf.flags & ATA_TFLAG_LBA48)) {
+                buf[i++] = qc->tf.hob_nsect;
+                buf[i++] = ADMA_REGS_SECTOR_COUNT;
+                buf[i++] = qc->tf.hob_lbal;
+                buf[i++] = ADMA_REGS_LBA_LOW;
+                buf[i++] = qc->tf.hob_lbam;
+                buf[i++] = ADMA_REGS_LBA_MID;
+                buf[i++] = qc->tf.hob_lbah;
+                buf[i++] = ADMA_REGS_LBA_HIGH;
+        }
+        buf[i++] = qc->tf.nsect;
+        buf[i++] = ADMA_REGS_SECTOR_COUNT;
+        buf[i++] = qc->tf.lbal;
+        buf[i++] = ADMA_REGS_LBA_LOW;
+        buf[i++] = qc->tf.lbam;
+        buf[i++] = ADMA_REGS_LBA_MID;
+        buf[i++] = qc->tf.lbah;
+        buf[i++] = ADMA_REGS_LBA_HIGH;
+        buf[i++] = 0;
+        buf[i++] = ADMA_REGS_CONTROL;
+        buf[i++] = rIGN;
+        buf[i++] = 0;
+        buf[i++] = qc->tf.command;
+        buf[i++] = ADMA_REGS_COMMAND | rEND;
+
+        buf[3] = (i >> 3) - 2;                          /* cLEN */
+        *(__le32 *)(buf+8) = cpu_to_le32(pkt_dma + i);  /* cPRD */
+
+        i = adma_fill_sg(qc);
+        wmb();  /* flush PRDs and pkt to memory */
+#if 0
+        /* dump out CPB + PRDs for debug */
+        {
+                int j, len = 0;
+                static char obuf[2048];
+                for (j = 0; j < i; ++j) {
+                        len += sprintf(obuf+len, "%02x ", buf[j]);
+                        if ((j & 7) == 7) {
+                                printk("%s\n", obuf);
+                                len = 0;
+                        }
+                }
+                if (len)
+                        printk("%s\n", obuf);
+        }
+#endif
+}
+
+static inline void adma_packet_start(struct ata_queued_cmd *qc)
+{
+        struct ata_port *ap = qc->ap;
+        void __iomem *chan = ADMA_REGS(ap->host_set->mmio_base, ap->port_no);
+
+        VPRINTK("ENTER, ap %p\n", ap);
+
+        /* fire up the ADMA engine */
+        writew(aPIOMD4 | aGO, chan + ADMA_CONTROL);
+}
+
+static int adma_qc_issue(struct ata_queued_cmd *qc)
+{
+        struct adma_port_priv *pp = qc->ap->private_data;
+
+        switch (qc->tf.protocol) {
+        case ATA_PROT_DMA:
+                pp->state = adma_state_pkt;
+                adma_packet_start(qc);
+                return 0;
+
+        case ATA_PROT_ATAPI_DMA:
+                BUG();
+                break;
+
+        default:
+                break;
+        }
+
+        pp->state = adma_state_mmio;
+        return ata_qc_issue_prot(qc);
+}
+
+static inline unsigned int adma_intr_pkt(struct ata_host_set *host_set)
+{
+        unsigned int handled = 0, port_no;
+        u8 __iomem *mmio_base = host_set->mmio_base;
+
+        for (port_no = 0; port_no < host_set->n_ports; ++port_no) {
+                struct ata_port *ap = host_set->ports[port_no];
+                struct adma_port_priv *pp;
+                struct ata_queued_cmd *qc;
+                void __iomem *chan = ADMA_REGS(mmio_base, port_no);
+                u8 drv_stat, status = readb(chan + ADMA_STATUS);
+
+                if (status == 0)
+                        continue;
+                handled = 1;
+                adma_enter_reg_mode(ap);
+                if ((ap->flags & ATA_FLAG_PORT_DISABLED))
+                        continue;
+                pp = ap->private_data;
+                if (!pp || pp->state != adma_state_pkt)
+                        continue;
+                qc = ata_qc_from_tag(ap, ap->active_tag);
+                drv_stat = 0;
+                if ((status & (aPERR | aPSD | aUIRQ)))
+                        drv_stat = ATA_ERR;
+                else if (pp->pkt[0] != cDONE)
+                        drv_stat = ATA_ERR;
+                ata_qc_complete(qc, drv_stat);
+        }
+        return handled;
+}
+
+static inline unsigned int adma_intr_mmio(struct ata_host_set *host_set)
+{
+        unsigned int handled = 0, port_no;
+
+        for (port_no = 0; port_no < host_set->n_ports; ++port_no) {
+                struct ata_port *ap;
+                ap = host_set->ports[port_no];
+                if (ap && (!(ap->flags & (ATA_FLAG_PORT_DISABLED | ATA_FLAG_NOINTR)))) {
+                        struct ata_queued_cmd *qc;
+                        struct adma_port_priv *pp = ap->private_data;
+                        if (!pp || pp->state != adma_state_mmio)
+                                continue;
+                        qc = ata_qc_from_tag(ap, ap->active_tag);
+                        if (qc && (!(qc->tf.ctl & ATA_NIEN))) {
+
+                                /* check main status, clearing INTRQ */
+                                u8 status = ata_chk_status(ap);
+                                if ((status & ATA_BUSY))
+                                        continue;
+                                DPRINTK("ata%u: protocol %d (dev_stat 0x%X)\n",
+                                        ap->id, qc->tf.protocol, status);
+                
+                                /* complete taskfile transaction */
+                                pp->state = adma_state_idle;
+                                ata_qc_complete(qc, status);
+                                handled = 1;
+                        }
+                }
+        }
+        return handled;
+}
+
+static irqreturn_t adma_intr(int irq, void *dev_instance, struct pt_regs *regs)
+{
+        struct ata_host_set *host_set = dev_instance;
+        unsigned int handled = 0;
+
+        VPRINTK("ENTER\n");
+
+        spin_lock(&host_set->lock);
+        handled  = adma_intr_pkt(host_set) | adma_intr_mmio(host_set);
+        spin_unlock(&host_set->lock);
+
+        VPRINTK("EXIT\n");
+
+        return IRQ_RETVAL(handled);
+}
+
+static void adma_ata_setup_port(struct ata_ioports *port, unsigned long base)
+{
+        port->cmd_addr          =
+        port->data_addr         = base + 0x000;
+        port->error_addr        =
+        port->feature_addr      = base + 0x004;
+        port->nsect_addr        = base + 0x008;
+        port->lbal_addr         = base + 0x00c;
+        port->lbam_addr         = base + 0x010;
+        port->lbah_addr         = base + 0x014;
+        port->device_addr       = base + 0x018;
+        port->status_addr       =
+        port->command_addr      = base + 0x01c;
+        port->altstatus_addr    =
+        port->ctl_addr          = base + 0x038;
+}
+
+static int adma_port_start(struct ata_port *ap)
+{
+        struct device *dev = ap->host_set->dev;
+        struct adma_port_priv *pp;
+        int rc;
+
+        rc = ata_port_start(ap);
+        if (rc)
+                return rc;
+        adma_enter_reg_mode(ap);
+        rc = -ENOMEM;
+        pp = kcalloc(1, sizeof(*pp), GFP_KERNEL);
+        if (!pp)
+                goto err_out;
+        pp->pkt = dma_alloc_coherent(dev, ADMA_PKT_BYTES, &pp->pkt_dma,
+                                                                GFP_KERNEL);
+        if (!pp->pkt)
+                goto err_out_kfree;
+        /* paranoia? */
+        if ((pp->pkt_dma & 7) != 0) {
+                printk("bad alignment for pp->pkt_dma: %08x\n",
+                                                (u32)pp->pkt_dma);
+                goto err_out_kfree2;
+        }
+        memset(pp->pkt, 0, ADMA_PKT_BYTES);
+        ap->private_data = pp;
+        adma_reinit_engine(ap);
+        return 0;
+
+err_out_kfree2:
+        kfree(pp);
+err_out_kfree:
+        kfree(pp);
+err_out:
+        ata_port_stop(ap);
+        return rc;
+}
+
+static void adma_port_stop(struct ata_port *ap)
+{
+        struct device *dev = ap->host_set->dev;
+        struct adma_port_priv *pp = ap->private_data;
+
+        adma_reset_engine(ADMA_REGS(ap->host_set->mmio_base, ap->port_no));
+        if (pp != NULL) {
+                ap->private_data = NULL;
+                if (pp->pkt != NULL)
+                        dma_free_coherent(dev, ADMA_PKT_BYTES,
+                                        pp->pkt, pp->pkt_dma);
+                kfree(pp);
+        }
+        ata_port_stop(ap);
+}
+
+static void adma_host_stop(struct ata_host_set *host_set)
+{
+        unsigned int port_no;
+
+        for (port_no = 0; port_no < ADMA_PORTS; ++port_no)
+                adma_reset_engine(ADMA_REGS(host_set->mmio_base, port_no));
+
+        ata_pci_host_stop(host_set);
+}
+
+static void adma_host_init(unsigned int chip_id,
+                                struct ata_probe_ent *probe_ent)
+{
+        unsigned int port_no;
+        void __iomem *mmio_base = probe_ent->mmio_base;
+
+        /* enable/lock aGO operation */
+        writeb(7, mmio_base + ADMA_MODE_LOCK);
+
+        /* reset the ADMA logic */
+        for (port_no = 0; port_no < ADMA_PORTS; ++port_no)
+                adma_reset_engine(ADMA_REGS(mmio_base, port_no));
+}
+
+static int adma_set_dma_masks(struct pci_dev *pdev, void __iomem *mmio_base)
+{
+        int rc;
+
+        rc = pci_set_dma_mask(pdev, DMA_32BIT_MASK);
+        if (rc) {
+                printk(KERN_ERR DRV_NAME
+                        "(%s): 32-bit DMA enable failed\n",
+                        pci_name(pdev));
+                return rc;
+        }
+        rc = pci_set_consistent_dma_mask(pdev, DMA_32BIT_MASK);
+        if (rc) {
+                printk(KERN_ERR DRV_NAME
+                        "(%s): 32-bit consistent DMA enable failed\n",
+                        pci_name(pdev));
+                return rc;
+        }
+        return 0;
+}
+
+static int adma_ata_init_one(struct pci_dev *pdev,
+                                const struct pci_device_id *ent)
+{
+        static int printed_version;
+        struct ata_probe_ent *probe_ent = NULL;
+        void __iomem *mmio_base;
+        unsigned int board_idx = (unsigned int) ent->driver_data;
+        int rc, port_no;
+
+        if (!printed_version++)
+                printk(KERN_DEBUG DRV_NAME " version " DRV_VERSION "\n");
+
+        rc = pci_enable_device(pdev);
+        if (rc)
+                return rc;
+
+        rc = pci_request_regions(pdev, DRV_NAME);
+        if (rc)
+                goto err_out;
+
+        if ((pci_resource_flags(pdev, 4) & IORESOURCE_MEM) == 0) {
+                rc = -ENODEV;
+                goto err_out_regions;
+        }
+
+        mmio_base = pci_iomap(pdev, 4, 0);
+        if (mmio_base == NULL) {
+                rc = -ENOMEM;
+                goto err_out_regions;
+        }
+
+        rc = adma_set_dma_masks(pdev, mmio_base);
+        if (rc)
+                goto err_out_iounmap;
+
+        probe_ent = kcalloc(1, sizeof(*probe_ent), GFP_KERNEL);
+        if (probe_ent == NULL) {
+                rc = -ENOMEM;
+                goto err_out_iounmap;
+        }
+
+        probe_ent->dev = pci_dev_to_dev(pdev);
+        INIT_LIST_HEAD(&probe_ent->node);
+
+        probe_ent->sht          = adma_port_info[board_idx].sht;
+        probe_ent->host_flags   = adma_port_info[board_idx].host_flags;
+        probe_ent->pio_mask     = adma_port_info[board_idx].pio_mask;
+        probe_ent->mwdma_mask   = adma_port_info[board_idx].mwdma_mask;
+        probe_ent->udma_mask    = adma_port_info[board_idx].udma_mask;
+        probe_ent->port_ops     = adma_port_info[board_idx].port_ops;
+
+        probe_ent->irq          = pdev->irq;
+        probe_ent->irq_flags    = SA_SHIRQ;
+        probe_ent->mmio_base    = mmio_base;
+        probe_ent->n_ports      = ADMA_PORTS;
+
+        for (port_no = 0; port_no < probe_ent->n_ports; ++port_no) {
+                adma_ata_setup_port(&probe_ent->port[port_no],
+                        ADMA_ATA_REGS((unsigned long)mmio_base, port_no));
+        }
+
+        pci_set_master(pdev);
+
+        /* initialize adapter */
+        adma_host_init(board_idx, probe_ent);
+
+        rc = ata_device_add(probe_ent);
+        kfree(probe_ent);
+        if (rc != ADMA_PORTS)
+                goto err_out_iounmap;
+        return 0;
+
+err_out_iounmap:
+        pci_iounmap(pdev, mmio_base);
+err_out_regions:
+        pci_release_regions(pdev);
+err_out:
+        pci_disable_device(pdev);
+        return rc;
+}
+
+static int __init adma_ata_init(void)
+{
+        return pci_module_init(&adma_ata_pci_driver);
+}
+
+static void __exit adma_ata_exit(void)
+{
+        pci_unregister_driver(&adma_ata_pci_driver);
+}
+
+MODULE_AUTHOR("Mark Lord");
+MODULE_DESCRIPTION("Pacific Digital Corporation ADMA low-level driver");
+MODULE_LICENSE("GPL");
+MODULE_DEVICE_TABLE(pci, adma_ata_pci_tbl);
+MODULE_VERSION(DRV_VERSION);
+
+module_init(adma_ata_init);
+module_exit(adma_ata_exit);
diff --git a/drivers/scsi/qlogicpti.c b/drivers/scsi/qlogicpti.c
index a917ab7475ac..1fd5fc6d0fe3 100644
--- a/drivers/scsi/qlogicpti.c
+++ b/drivers/scsi/qlogicpti.c
@@ -1119,6 +1119,36 @@ static inline void update_can_queue(struct Scsi_Host *host, u_int in_ptr, u_int
         host->sg_tablesize = QLOGICPTI_MAX_SG(num_free);
 }
 
+static unsigned int scsi_rbuf_get(struct scsi_cmnd *cmd, unsigned char **buf_out)
+{
+        unsigned char *buf;
+        unsigned int buflen;
+
+        if (cmd->use_sg) {
+                struct scatterlist *sg;
+
+                sg = (struct scatterlist *) cmd->request_buffer;
+                buf = kmap_atomic(sg->page, KM_IRQ0) + sg->offset;
+                buflen = sg->length;
+        } else {
+                buf = cmd->request_buffer;
+                buflen = cmd->request_bufflen;
+        }
+
+        *buf_out = buf;
+        return buflen;
+}
+
+static void scsi_rbuf_put(struct scsi_cmnd *cmd, unsigned char *buf)
+{
+        if (cmd->use_sg) {
+                struct scatterlist *sg;
+
+                sg = (struct scatterlist *) cmd->request_buffer;
+                kunmap_atomic(buf - sg->offset, KM_IRQ0);
+        }
+}
+
 /*
  * Until we scan the entire bus with inquiries, go throught this fella...
  */
@@ -1145,11 +1175,9 @@ static void ourdone(struct scsi_cmnd *Cmnd)
                 int ok = host_byte(Cmnd->result) == DID_OK;
                 if (Cmnd->cmnd[0] == 0x12 && ok) {
                         unsigned char *iqd;
+                        unsigned int iqd_len;
 
-                        if (Cmnd->use_sg != 0)
-                                BUG();
-
-                        iqd = ((unsigned char *)Cmnd->buffer);
+                        iqd_len = scsi_rbuf_get(Cmnd, &iqd);
 
                         /* tags handled in midlayer */
                         /* enable sync mode? */
@@ -1163,6 +1191,9 @@ static void ourdone(struct scsi_cmnd *Cmnd)
                         if (iqd[7] & 0x20) {
                                 qpti->dev_param[tgt].device_flags |= 0x20;
                         }
+
+                        scsi_rbuf_put(Cmnd, iqd);
+
                         qpti->sbits |= (1 << tgt);
                 } else if (!ok) {
                         qpti->sbits |= (1 << tgt);