47 files changed, 2186 insertions, 1258 deletions

diff --git a/drivers/scsi/aacraid/commsup.c b/drivers/scsi/aacraid/commsup.c
index 38d6d00fb0fc..014cc8d54a9f 100644
--- a/drivers/scsi/aacraid/commsup.c
+++ b/drivers/scsi/aacraid/commsup.c
@@ -38,10 +38,10 @@
 #include <linux/slab.h>
 #include <linux/completion.h>
 #include <linux/blkdev.h>
+#include <linux/delay.h>
 #include <scsi/scsi_host.h>
 #include <scsi/scsi_device.h>
 #include <asm/semaphore.h>
-#include <asm/delay.h>
 
 #include "aacraid.h"
 
diff --git a/drivers/scsi/ahci.c b/drivers/scsi/ahci.c
index 5caf6dec1d40..c840d5ec12a7 100644
--- a/drivers/scsi/ahci.c
+++ b/drivers/scsi/ahci.c
@@ -290,6 +290,10 @@ static const struct pci_device_id ahci_pci_tbl[] = {
           board_ahci }, /* ICH8M */
         { PCI_VENDOR_ID_INTEL, 0x282a, PCI_ANY_ID, PCI_ANY_ID, 0, 0,
           board_ahci }, /* ICH8M */
+        { 0x197b, 0x2360, PCI_ANY_ID, PCI_ANY_ID, 0, 0,
+          board_ahci }, /* JMicron JMB360 */
+        { 0x197b, 0x2363, PCI_ANY_ID, PCI_ANY_ID, 0, 0,
+          board_ahci }, /* JMicron JMB363 */
         { }     /* terminate list */
 };
 
@@ -830,7 +834,6 @@ static int ahci_host_init(struct ata_probe_ent *probe_ent)
         struct pci_dev *pdev = to_pci_dev(probe_ent->dev);
         void __iomem *mmio = probe_ent->mmio_base;
         u32 tmp, cap_save;
-        u16 tmp16;
         unsigned int i, j, using_dac;
         int rc;
         void __iomem *port_mmio;
@@ -864,9 +867,13 @@ static int ahci_host_init(struct ata_probe_ent *probe_ent)
         writel(0xf, mmio + HOST_PORTS_IMPL);
         (void) readl(mmio + HOST_PORTS_IMPL);   /* flush */
 
-        pci_read_config_word(pdev, 0x92, &tmp16);
-        tmp16 |= 0xf;
-        pci_write_config_word(pdev, 0x92, tmp16);
+        if (pdev->vendor == PCI_VENDOR_ID_INTEL) {
+                u16 tmp16;
+
+                pci_read_config_word(pdev, 0x92, &tmp16);
+                tmp16 |= 0xf;
+                pci_write_config_word(pdev, 0x92, tmp16);
+        }
 
         hpriv->cap = readl(mmio + HOST_CAP);
         hpriv->port_map = readl(mmio + HOST_PORTS_IMPL);
@@ -1110,6 +1117,10 @@ static int ahci_init_one (struct pci_dev *pdev, const struct pci_device_id *ent)
         if (have_msi)
                 hpriv->flags |= AHCI_FLAG_MSI;
 
+        /* JMicron-specific fixup: make sure we're in AHCI mode */
+        if (pdev->vendor == 0x197b)
+                pci_write_config_byte(pdev, 0x41, 0xa1);
+
         /* initialize adapter */
         rc = ahci_host_init(probe_ent);
         if (rc)
diff --git a/drivers/scsi/aic7xxx/Kconfig.aic79xx b/drivers/scsi/aic7xxx/Kconfig.aic79xx
index 69ed77fcb71f..7955ebe8e1e8 100644
--- a/drivers/scsi/aic7xxx/Kconfig.aic79xx
+++ b/drivers/scsi/aic7xxx/Kconfig.aic79xx
@@ -37,13 +37,13 @@ config AIC79XX_CMDS_PER_DEVICE
 config AIC79XX_RESET_DELAY_MS
         int "Initial bus reset delay in milli-seconds"
         depends on SCSI_AIC79XX
-        default "15000"
+        default "5000"
         ---help---
         The number of milliseconds to delay after an initial bus reset.
         The bus settle delay following all error recovery actions is
         dictated by the SCSI layer and is not affected by this value.
 
-        Default: 15000 (15 seconds)
+        Default: 5000 (5 seconds)
 
 config AIC79XX_BUILD_FIRMWARE
         bool "Build Adapter Firmware with Kernel Build"
diff --git a/drivers/scsi/aic7xxx/aic79xx.h b/drivers/scsi/aic7xxx/aic79xx.h
index 2cfdbef447db..1d11f7e77564 100644
--- a/drivers/scsi/aic7xxx/aic79xx.h
+++ b/drivers/scsi/aic7xxx/aic79xx.h
@@ -37,7 +37,7 @@
  * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGES.
  *
- * $Id: //depot/aic7xxx/aic7xxx/aic79xx.h#108 $
+ * $Id: //depot/aic7xxx/aic7xxx/aic79xx.h#109 $
  *
  * $FreeBSD$
  */
@@ -222,6 +222,7 @@ typedef enum {
 typedef enum {
         AHD_FENONE              = 0x00000,
         AHD_WIDE                = 0x00001,/* Wide Channel */
+        AHD_AIC79XXB_SLOWCRC    = 0x00002,/* SLOWCRC bit should be set */
         AHD_MULTI_FUNC          = 0x00100,/* Multi-Function/Channel Device */
         AHD_TARGETMODE          = 0x01000,/* Has tested target mode support */
         AHD_MULTIROLE           = 0x02000,/* Space for two roles at a time */
diff --git a/drivers/scsi/aic7xxx/aic79xx.reg b/drivers/scsi/aic7xxx/aic79xx.reg
index 3a3204703b15..be14e2ecb8f7 100644
--- a/drivers/scsi/aic7xxx/aic79xx.reg
+++ b/drivers/scsi/aic7xxx/aic79xx.reg
@@ -1,7 +1,7 @@
 /*
  * Aic79xx register and scratch ram definitions.
  *
- * Copyright (c) 1994-2001 Justin T. Gibbs.
+ * Copyright (c) 1994-2001, 2004 Justin T. Gibbs.
  * Copyright (c) 2000-2002 Adaptec Inc.
  * All rights reserved.
  *
@@ -39,7 +39,7 @@
  *
  * $FreeBSD$
  */
-VERSION = "$Id: //depot/aic7xxx/aic7xxx/aic79xx.reg#76 $"
+VERSION = "$Id: //depot/aic7xxx/aic7xxx/aic79xx.reg#77 $"
 
 /*
  * This file is processed by the aic7xxx_asm utility for use in assembling
@@ -3715,8 +3715,9 @@ scratch_ram {
 
         SEQ_FLAGS2 {
                 size            1
-                field   TARGET_MSG_PENDING        0x02
-                field   SELECTOUT_QFROZEN         0x04
+                field   PENDING_MK_MESSAGE      0x01
+                field   TARGET_MSG_PENDING      0x02
+                field   SELECTOUT_QFROZEN       0x04
         }
 
         ALLOCFIFO_SCBPTR {
@@ -3777,6 +3778,26 @@ scratch_ram {
         CMDSIZE_TABLE {
                 size            8
         }
+        /*
+         * When an SCB with the MK_MESSAGE flag is
+         * queued to the controller, it cannot enter
+         * the waiting for selection list until the
+         * selections for any previously queued
+         * commands to that target complete.  During
+         * the wait, the MK_MESSAGE SCB is queued
+         * here.
+         */
+        MK_MESSAGE_SCB {
+                size            2
+        }
+        /*
+         * Saved SCSIID of MK_MESSAGE_SCB to avoid
+         * an extra SCBPTR operation when deciding
+         * if the MK_MESSAGE_SCB can be run.
+         */
+        MK_MESSAGE_SCSIID {
+                size            1
+        }
 }
 
 /************************* Hardware SCB Definition ****************************/
diff --git a/drivers/scsi/aic7xxx/aic79xx.seq b/drivers/scsi/aic7xxx/aic79xx.seq
index bef1f9d369b6..58bc17591b54 100644
--- a/drivers/scsi/aic7xxx/aic79xx.seq
+++ b/drivers/scsi/aic7xxx/aic79xx.seq
@@ -1,7 +1,7 @@
 /*
  * Adaptec U320 device driver firmware for Linux and FreeBSD.
  *
- * Copyright (c) 1994-2001 Justin T. Gibbs.
+ * Copyright (c) 1994-2001, 2004 Justin T. Gibbs.
  * Copyright (c) 2000-2002 Adaptec Inc.
  * All rights reserved.
  *
@@ -40,7 +40,7 @@
  * $FreeBSD$
  */
 
-VERSION = "$Id: //depot/aic7xxx/aic7xxx/aic79xx.seq#119 $"
+VERSION = "$Id: //depot/aic7xxx/aic7xxx/aic79xx.seq#120 $"
 PATCH_ARG_LIST = "struct ahd_softc *ahd"
 PREFIX = "ahd_"
 
@@ -110,10 +110,8 @@ check_waiting_list:
          * one last time.
          */
         test    SSTAT0, SELDO jnz select_out;
-END_CRITICAL;
         call    start_selection;
 idle_loop_checkbus:
-BEGIN_CRITICAL;
         test    SSTAT0, SELDO jnz select_out;
 END_CRITICAL;
         test    SSTAT0, SELDI jnz select_in;
@@ -294,7 +292,6 @@ fetch_new_scb_inprog:
         test    CCSCBCTL, ARRDONE jz return;
 fetch_new_scb_done:
         and     CCSCBCTL, ~(CCARREN|CCSCBEN);
-        bmov    REG0, SCBPTR, 2;
         clr     A;
         add     CMDS_PENDING, 1;
         adc     CMDS_PENDING[1], A;
@@ -316,43 +313,117 @@ fetch_new_scb_done:
         clr     SCB_FIFO_USE_COUNT;
         /* Update the next SCB address to download. */
         bmov    NEXT_QUEUED_SCB_ADDR, SCB_NEXT_SCB_BUSADDR, 4;
+        /*
+         * NULL out the SCB links since these fields
+         * occupy the same location as SCB_NEXT_SCB_BUSADDR.
+         */
         mvi     SCB_NEXT[1], SCB_LIST_NULL;
         mvi     SCB_NEXT2[1], SCB_LIST_NULL;
         /* Increment our position in the QINFIFO. */
         mov     NONE, SNSCB_QOFF;
+
         /*
-         * SCBs that want to send messages are always
-         * queued independently.  This ensures that they
-         * are at the head of the SCB list to select out
-         * to a target and we will see the MK_MESSAGE flag.
+         * Save SCBID of this SCB in REG0 since
+         * SCBPTR will be clobbered during target
+         * list updates.  We also record the SCB's
+         * flags so that we can refer to them even
+         * after SCBPTR has been changed.
+         */
+        bmov    REG0, SCBPTR, 2;
+        mov     A, SCB_CONTROL;
+
+        /*
+         * Find the tail SCB of the execution queue
+         * for this target.
          */
-        test    SCB_CONTROL, MK_MESSAGE jnz first_new_target_scb;
         shr     SINDEX, 3, SCB_SCSIID;
         and     SINDEX, ~0x1;
         mvi     SINDEX[1], (WAITING_SCB_TAILS >> 8);
         bmov    DINDEX, SINDEX, 2;
         bmov    SCBPTR, SINDIR, 2;
+
+        /*
+         * Update the tail to point to the new SCB.
+         */
         bmov    DINDIR, REG0, 2;
+
+        /*
+         * If the queue was empty, queue this SCB as
+         * the first for this target.
+         */
         cmp     SCBPTR[1], SCB_LIST_NULL je first_new_target_scb;
+
+        /*
+         * SCBs that want to send messages must always be
+         * at the head of their per-target queue so that
+         * ATN can be asserted even if the current
+         * negotiation agreement is packetized.  If the
+         * target queue is empty, the SCB can be queued
+         * immediately.  If the queue is not empty, we must
+         * wait for it to empty before entering this SCB
+         * into the waiting for selection queue.  Otherwise
+         * our batching and round-robin selection scheme 
+         * could allow commands to be queued out of order.
+         * To simplify the implementation, we stop pulling
+         * new commands from the host until the MK_MESSAGE
+         * SCB can be queued to the waiting for selection
+         * list.
+         */
+        test    A, MK_MESSAGE jz batch_scb; 
+
+        /*
+         * If the last SCB is also a MK_MESSAGE SCB, then
+         * order is preserved even if we batch.
+         */
+        test    SCB_CONTROL, MK_MESSAGE jz batch_scb; 
+
+        /*
+         * Defer this SCB and stop fetching new SCBs until
+         * it can be queued.  Since the SCB_SCSIID of the
+         * tail SCB must be the same as that of the newly
+         * queued SCB, there is no need to restore the SCBID
+         * here.
+         */
+        or      SEQ_FLAGS2, PENDING_MK_MESSAGE;
+        bmov    MK_MESSAGE_SCB, REG0, 2;
+        mov     MK_MESSAGE_SCSIID, SCB_SCSIID ret;
+
+batch_scb:
+        /*
+         * Otherwise just update the previous tail SCB to
+         * point to the new tail.
+         */
         bmov    SCB_NEXT, REG0, 2 ret;
+
 first_new_target_scb:
+        /*
+         * Append SCB to the tail of the waiting for
+         * selection list.
+         */
         cmp     WAITING_TID_HEAD[1], SCB_LIST_NULL je first_new_scb;
         bmov    SCBPTR, WAITING_TID_TAIL, 2;
         bmov    SCB_NEXT2, REG0, 2;
         bmov    WAITING_TID_TAIL, REG0, 2 ret;
 first_new_scb:
+        /*
+         * Whole list is empty, so the head of
+         * the list must be initialized too.
+         */
         bmov    WAITING_TID_HEAD, REG0, 2;
         bmov    WAITING_TID_TAIL, REG0, 2 ret;
 END_CRITICAL;
 
 scbdma_idle:
         /*
-         * Give precedence to downloading new SCBs to execute
-         * unless select-outs are currently frozen.
+         * Don't bother downloading new SCBs to execute
+         * if select-outs are currently frozen or we have
+         * a MK_MESSAGE SCB waiting to enter the queue.
          */
-        test    SEQ_FLAGS2, SELECTOUT_QFROZEN jnz . + 2;
+        test    SEQ_FLAGS2, SELECTOUT_QFROZEN|PENDING_MK_MESSAGE
+                jnz scbdma_no_new_scbs;
 BEGIN_CRITICAL;
         test    QOFF_CTLSTA, NEW_SCB_AVAIL jnz fetch_new_scb;
+scbdma_no_new_scbs:
         cmp     COMPLETE_DMA_SCB_HEAD[1], SCB_LIST_NULL jne dma_complete_scb;
         cmp     COMPLETE_SCB_HEAD[1], SCB_LIST_NULL je return;
         /* FALLTHROUGH */
@@ -671,27 +742,41 @@ curscb_ww_done:
         }
 
         /*
-         * Requeue any SCBs not sent, to the tail of the waiting Q.
+         * The whole list made it.  Clear our tail pointer to indicate
+         * that the per-target selection queue is now empty.
          */
-        cmp     SCB_NEXT[1], SCB_LIST_NULL je select_out_list_done;
+        cmp     SCB_NEXT[1], SCB_LIST_NULL je select_out_clear_tail;
 
         /*
+         * Requeue any SCBs not sent, to the tail of the waiting Q.
          * We know that neither the per-TID list nor the list of
-         * TIDs is empty.  Use this knowledge to our advantage.
+         * TIDs is empty.  Use this knowledge to our advantage and
+         * queue the remainder to the tail of the global execution
+         * queue.
          */
         bmov    REG0, SCB_NEXT, 2;
+select_out_queue_remainder:
         bmov    SCBPTR, WAITING_TID_TAIL, 2;
         bmov    SCB_NEXT2, REG0, 2;
         bmov    WAITING_TID_TAIL, REG0, 2;
         jmp     select_out_inc_tid_q;
 
-select_out_list_done:
+select_out_clear_tail:
+        /*
+         * Queue any pending MK_MESSAGE SCB for this target now
+         * that the queue is empty.
+         */
+        test    SEQ_FLAGS2, PENDING_MK_MESSAGE jz select_out_no_mk_message_scb;
+        mov     A, MK_MESSAGE_SCSIID;
+        cmp     SCB_SCSIID, A jne select_out_no_mk_message_scb;
+        and     SEQ_FLAGS2, ~PENDING_MK_MESSAGE;
+        bmov    REG0, MK_MESSAGE_SCB, 2;
+        jmp select_out_queue_remainder;
+
+select_out_no_mk_message_scb:
         /*
-         * The whole list made it.  Just clear our TID's tail pointer
-         * unless we were queued independently due to our need to
-         * send a message.
+         * Clear this target's execution tail and increment the queue.
          */
-        test    SCB_CONTROL, MK_MESSAGE jnz select_out_inc_tid_q;
         shr     DINDEX, 3, SCB_SCSIID;
         or      DINDEX, 1;      /* Want only the second byte */
         mvi     DINDEX[1], ((WAITING_SCB_TAILS) >> 8);
@@ -703,8 +788,8 @@ select_out_inc_tid_q:
         mvi     WAITING_TID_TAIL[1], SCB_LIST_NULL;
         bmov    SCBPTR, CURRSCB, 2;
         mvi     CLRSINT0, CLRSELDO;
-        test    LQOSTAT2, LQOPHACHGOUTPKT jnz unexpected_nonpkt_phase;
-        test    LQOSTAT1, LQOPHACHGINPKT jnz unexpected_nonpkt_phase;
+        test    LQOSTAT2, LQOPHACHGOUTPKT jnz unexpected_nonpkt_mode_cleared;
+        test    LQOSTAT1, LQOPHACHGINPKT jnz unexpected_nonpkt_mode_cleared;
 
         /*
          * If this is a packetized connection, return to our
@@ -2127,6 +2212,18 @@ SET_DST_MODE	M_DFF0;
         mvi     DFFSXFRCTL, CLRCHN;
 unexpected_nonpkt_mode_cleared:
         mvi     CLRSINT2, CLRNONPACKREQ;
+        if ((ahd->bugs & AHD_BUSFREEREV_BUG) != 0) {
+                /*
+                 * Test to ensure that the bus has not
+                 * already gone free prior to clearing
+                 * any stale busfree status.  This avoids
+                 * a window whereby a busfree just after
+                 * a selection could be missed.
+                 */
+                test    SCSISIGI, BSYI jz . + 2;
+                mvi     CLRSINT1,CLRBUSFREE;
+                or      SIMODE1, ENBUSFREE;
+        }
         test    SCSIPHASE, ~(MSG_IN_PHASE|MSG_OUT_PHASE) jnz illegal_phase;
         SET_SEQINTCODE(ENTERING_NONPACK)
         jmp     ITloop;
diff --git a/drivers/scsi/aic7xxx/aic79xx_core.c b/drivers/scsi/aic7xxx/aic79xx_core.c
index db8f5ce99ee3..342f77966a5b 100644
--- a/drivers/scsi/aic7xxx/aic79xx_core.c
+++ b/drivers/scsi/aic7xxx/aic79xx_core.c
@@ -37,7 +37,7 @@
  * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGES.
  *
- * $Id: //depot/aic7xxx/aic7xxx/aic79xx.c#247 $
+ * $Id: //depot/aic7xxx/aic7xxx/aic79xx.c#250 $
  */
 
 #ifdef __linux__
@@ -197,7 +197,8 @@ static int		ahd_search_scb_list(struct ahd_softc *ahd, int target,
                                             char channel, int lun, u_int tag,
                                             role_t role, uint32_t status,
                                             ahd_search_action action,
-                                            u_int *list_head, u_int tid);
+                                            u_int *list_head, u_int *list_tail,
+                                            u_int tid);
 static void             ahd_stitch_tid_list(struct ahd_softc *ahd,
                                             u_int tid_prev, u_int tid_cur,
                                             u_int tid_next);
@@ -1660,7 +1661,8 @@ ahd_handle_scsiint(struct ahd_softc *ahd, u_int intstat)
                  * so just clear the error.
                  */
                 ahd_outb(ahd, CLRLQIINT1, CLRLQICRCI_NLQ);
-        } else if ((status & BUSFREE) != 0) {
+        } else if ((status & BUSFREE) != 0
+                || (lqistat1 & LQOBUSFREE) != 0) {
                 u_int lqostat1;
                 int   restart;
                 int   clear_fifo;
@@ -2025,10 +2027,6 @@ ahd_handle_pkt_busfree(struct ahd_softc *ahd, u_int busfreetime)
                 u_int waiting_t;
                 u_int next;
 
-                if ((busfreetime & BUSFREE_LQO) == 0)
-                        printf("%s: Warning, BUSFREE time is 0x%x.  "
-                               "Expected BUSFREE_LQO.\n",
-                               ahd_name(ahd), busfreetime);
                 /*
                  * The LQO manager detected an unexpected busfree
                  * either:
@@ -2251,8 +2249,14 @@ ahd_handle_nonpkt_busfree(struct ahd_softc *ahd)
                         struct ahd_tmode_tstate *tstate;
 
                         /*
-                         * PPR Rejected.  Try non-ppr negotiation
-                         * and retry command.
+                         * PPR Rejected.
+                         *
+                         * If the previous negotiation was packetized,
+                         * this could be because the device has been
+                         * reset without our knowledge.  Force our
+                         * current negotiation to async and retry the
+                         * negotiation.  Otherwise retry the command
+                         * with non-ppr negotiation.
                          */
 #ifdef AHD_DEBUG
                         if ((ahd_debug & AHD_SHOW_MESSAGES) != 0)
@@ -2261,11 +2265,34 @@ ahd_handle_nonpkt_busfree(struct ahd_softc *ahd)
                         tinfo = ahd_fetch_transinfo(ahd, devinfo.channel,
                                                     devinfo.our_scsiid,
                                                     devinfo.target, &tstate);
-                        tinfo->curr.transport_version = 2;
-                        tinfo->goal.transport_version = 2;
-                        tinfo->goal.ppr_options = 0;
-                        ahd_qinfifo_requeue_tail(ahd, scb);
-                        printerror = 0;
+                        if ((tinfo->curr.ppr_options & MSG_EXT_PPR_IU_REQ)!=0) {
+                                ahd_set_width(ahd, &devinfo,
+                                              MSG_EXT_WDTR_BUS_8_BIT,
+                                              AHD_TRANS_CUR,
+                                              /*paused*/TRUE);
+                                ahd_set_syncrate(ahd, &devinfo,
+                                                /*period*/0, /*offset*/0,
+                                                /*ppr_options*/0,
+                                                AHD_TRANS_CUR,
+                                                /*paused*/TRUE);
+                                /*
+                                 * The expect PPR busfree handler below
+                                 * will effect the retry and necessary
+                                 * abort.
+                                 */
+                        } else {
+                                tinfo->curr.transport_version = 2;
+                                tinfo->goal.transport_version = 2;
+                                tinfo->goal.ppr_options = 0;
+                                /*
+                                 * Remove any SCBs in the waiting for selection
+                                 * queue that may also be for this target so
+                                 * that command ordering is preserved.
+                                 */
+                                ahd_freeze_devq(ahd, scb);
+                                ahd_qinfifo_requeue_tail(ahd, scb);
+                                printerror = 0;
+                        }
                 } else if (ahd_sent_msg(ahd, AHDMSG_EXT, MSG_EXT_WDTR, FALSE)
                         && ppr_busfree == 0) {
                         /*
@@ -2280,6 +2307,12 @@ ahd_handle_nonpkt_busfree(struct ahd_softc *ahd)
                                       MSG_EXT_WDTR_BUS_8_BIT,
                                       AHD_TRANS_CUR|AHD_TRANS_GOAL,
                                       /*paused*/TRUE);
+                        /*
+                         * Remove any SCBs in the waiting for selection
+                         * queue that may also be for this target so that
+                         * command ordering is preserved.
+                         */
+                        ahd_freeze_devq(ahd, scb);
                         ahd_qinfifo_requeue_tail(ahd, scb);
                         printerror = 0;
                 } else if (ahd_sent_msg(ahd, AHDMSG_EXT, MSG_EXT_SDTR, FALSE)
@@ -2297,6 +2330,12 @@ ahd_handle_nonpkt_busfree(struct ahd_softc *ahd)
                                         /*ppr_options*/0,
                                         AHD_TRANS_CUR|AHD_TRANS_GOAL,
                                         /*paused*/TRUE);
+                        /*
+                         * Remove any SCBs in the waiting for selection
+                         * queue that may also be for this target so that
+                         * command ordering is preserved.
+                         */
+                        ahd_freeze_devq(ahd, scb);
                         ahd_qinfifo_requeue_tail(ahd, scb);
                         printerror = 0;
                 } else if ((ahd->msg_flags & MSG_FLAG_EXPECT_IDE_BUSFREE) != 0
@@ -2369,14 +2408,14 @@ ahd_handle_nonpkt_busfree(struct ahd_softc *ahd)
                          */
                         printf("%s: ", ahd_name(ahd));
                 }
-                if (lastphase != P_BUSFREE)
-                        ahd_force_renegotiation(ahd, &devinfo);
                 printf("Unexpected busfree %s, %d SCBs aborted, "
                        "PRGMCNT == 0x%x\n",
                        ahd_lookup_phase_entry(lastphase)->phasemsg,
                        aborted,
                        ahd_inw(ahd, PRGMCNT));
                 ahd_dump_card_state(ahd);
+                if (lastphase != P_BUSFREE)
+                        ahd_force_renegotiation(ahd, &devinfo);
         }
         /* Always restart the sequencer. */
         return (1);
@@ -3293,6 +3332,15 @@ ahd_update_neg_table(struct ahd_softc *ahd, struct ahd_devinfo *devinfo,
                 con_opts |= WIDEXFER;
 
         /*
+         * Slow down our CRC interval to be
+         * compatible with packetized U320 devices
+         * that can't handle a CRC at full speed
+         */
+        if (ahd->features & AHD_AIC79XXB_SLOWCRC) {
+                con_opts |= ENSLOWCRC;
+        }
+
+        /*
          * During packetized transfers, the target will
          * give us the oportunity to send command packets
          * without us asserting attention.
@@ -3315,7 +3363,6 @@ ahd_update_pending_scbs(struct ahd_softc *ahd)
 {
         struct          scb *pending_scb;
         int             pending_scb_count;
-        u_int           scb_tag;
         int             paused;
         u_int           saved_scbptr;
         ahd_mode_state  saved_modes;
@@ -3333,7 +3380,6 @@ ahd_update_pending_scbs(struct ahd_softc *ahd)
         pending_scb_count = 0;
         LIST_FOREACH(pending_scb, &ahd->pending_scbs, pending_links) {
                 struct ahd_devinfo devinfo;
-                struct hardware_scb *pending_hscb;
                 struct ahd_initiator_tinfo *tinfo;
                 struct ahd_tmode_tstate *tstate;
 
@@ -3341,11 +3387,10 @@ ahd_update_pending_scbs(struct ahd_softc *ahd)
                 tinfo = ahd_fetch_transinfo(ahd, devinfo.channel,
                                             devinfo.our_scsiid,
                                             devinfo.target, &tstate);
-                pending_hscb = pending_scb->hscb;
                 if ((tstate->auto_negotiate & devinfo.target_mask) == 0
                  && (pending_scb->flags & SCB_AUTO_NEGOTIATE) != 0) {
                         pending_scb->flags &= ~SCB_AUTO_NEGOTIATE;
-                        pending_hscb->control &= ~MK_MESSAGE;
+                        pending_scb->hscb->control &= ~MK_MESSAGE;
                 }
                 ahd_sync_scb(ahd, pending_scb,
                              BUS_DMASYNC_PREREAD|BUS_DMASYNC_PREWRITE);
@@ -3377,18 +3422,15 @@ ahd_update_pending_scbs(struct ahd_softc *ahd)
                 ahd_outb(ahd, SCSISEQ0, ahd_inb(ahd, SCSISEQ0) & ~ENSELO);
         saved_scbptr = ahd_get_scbptr(ahd);
         /* Ensure that the hscbs down on the card match the new information */
-        for (scb_tag = 0; scb_tag < ahd->scb_data.maxhscbs; scb_tag++) {
-                struct  hardware_scb *pending_hscb;
+        LIST_FOREACH(pending_scb, &ahd->pending_scbs, pending_links) {
+                u_int   scb_tag;
                 u_int   control;
 
-                pending_scb = ahd_lookup_scb(ahd, scb_tag);
-                if (pending_scb == NULL)
-                        continue;
+                scb_tag = SCB_GET_TAG(pending_scb);
                 ahd_set_scbptr(ahd, scb_tag);
-                pending_hscb = pending_scb->hscb;
                 control = ahd_inb_scbram(ahd, SCB_CONTROL);
                 control &= ~MK_MESSAGE;
-                control |= pending_hscb->control & MK_MESSAGE;
+                control |= pending_scb->hscb->control & MK_MESSAGE;
                 ahd_outb(ahd, SCB_CONTROL, control);
         }
         ahd_set_scbptr(ahd, saved_scbptr);
@@ -6500,13 +6542,14 @@ ahd_chip_init(struct ahd_softc *ahd)
                               | ENLQIOVERI_LQ|ENLQIOVERI_NLQ);
         ahd_outb(ahd, LQOMODE0, ENLQOATNLQ|ENLQOATNPKT|ENLQOTCRC);
         /*
-         * An interrupt from LQOBUSFREE is made redundant by the
-         * BUSFREE interrupt.  We choose to have the sequencer catch
-         * LQOPHCHGINPKT errors manually for the command phase at the
-         * start of a packetized selection case.
-        ahd_outb(ahd, LQOMODE1, ENLQOBUSFREE|ENLQOPHACHGINPKT);
+         * We choose to have the sequencer catch LQOPHCHGINPKT errors
+         * manually for the command phase at the start of a packetized
+         * selection case.  ENLQOBUSFREE should be made redundant by
+         * the BUSFREE interrupt, but it seems that some LQOBUSFREE
+         * events fail to assert the BUSFREE interrupt so we must
+         * also enable LQOBUSFREE interrupts.
          */
-        ahd_outb(ahd, LQOMODE1, 0);
+        ahd_outb(ahd, LQOMODE1, ENLQOBUSFREE);
 
         /*
          * Setup sequencer interrupt handlers.
@@ -6617,6 +6660,8 @@ ahd_chip_init(struct ahd_softc *ahd)
         /* We don't have any waiting selections */
         ahd_outw(ahd, WAITING_TID_HEAD, SCB_LIST_NULL);
         ahd_outw(ahd, WAITING_TID_TAIL, SCB_LIST_NULL);
+        ahd_outw(ahd, MK_MESSAGE_SCB, SCB_LIST_NULL);
+        ahd_outw(ahd, MK_MESSAGE_SCSIID, 0xFF);
         for (i = 0; i < AHD_NUM_TARGETS; i++)
                 ahd_outw(ahd, WAITING_SCB_TAILS + (2 * i), SCB_LIST_NULL);
 
@@ -6704,6 +6749,18 @@ ahd_chip_init(struct ahd_softc *ahd)
 
         ahd_loadseq(ahd);
         ahd_set_modes(ahd, AHD_MODE_SCSI, AHD_MODE_SCSI);
+
+        if (ahd->features & AHD_AIC79XXB_SLOWCRC) {
+                u_int negodat3 = ahd_inb(ahd, NEGCONOPTS);
+
+                negodat3 |= ENSLOWCRC;
+                ahd_outb(ahd, NEGCONOPTS, negodat3);
+                negodat3 = ahd_inb(ahd, NEGCONOPTS);
+                if (!(negodat3 & ENSLOWCRC))
+                        printf("aic79xx: failed to set the SLOWCRC bit\n");
+                else
+                        printf("aic79xx: SLOWCRC bit set\n");
+        }
 }
 
 /*
@@ -7260,12 +7317,28 @@ ahd_reset_cmds_pending(struct ahd_softc *ahd)
         ahd->flags &= ~AHD_UPDATE_PEND_CMDS;
 }
 
+void
+ahd_done_with_status(struct ahd_softc *ahd, struct scb *scb, uint32_t status)
+{
+        cam_status ostat;
+        cam_status cstat;
+
+        ostat = ahd_get_transaction_status(scb);
+        if (ostat == CAM_REQ_INPROG)
+                ahd_set_transaction_status(scb, status);
+        cstat = ahd_get_transaction_status(scb);
+        if (cstat != CAM_REQ_CMP)
+                ahd_freeze_scb(scb);
+        ahd_done(ahd, scb);
+}
+
 int
 ahd_search_qinfifo(struct ahd_softc *ahd, int target, char channel,
                    int lun, u_int tag, role_t role, uint32_t status,
                    ahd_search_action action)
 {
         struct scb      *scb;
+        struct scb      *mk_msg_scb;
         struct scb      *prev_scb;
         ahd_mode_state   saved_modes;
         u_int            qinstart;
@@ -7274,6 +7347,7 @@ ahd_search_qinfifo(struct ahd_softc *ahd, int target, char channel,
         u_int            tid_next;
         u_int            tid_prev;
         u_int            scbid;
+        u_int            seq_flags2;
         u_int            savedscbptr;
         uint32_t         busaddr;
         int              found;
@@ -7329,23 +7403,10 @@ ahd_search_qinfifo(struct ahd_softc *ahd, int target, char channel,
                         found++;
                         switch (action) {
                         case SEARCH_COMPLETE:
-                        {
-                                cam_status ostat;
-                                cam_status cstat;
-
-                                ostat = ahd_get_transaction_status(scb);
-                                if (ostat == CAM_REQ_INPROG)
-                                        ahd_set_transaction_status(scb,
-                                                                   status);
-                                cstat = ahd_get_transaction_status(scb);
-                                if (cstat != CAM_REQ_CMP)
-                                        ahd_freeze_scb(scb);
                                 if ((scb->flags & SCB_ACTIVE) == 0)
                                         printf("Inactive SCB in qinfifo\n");
-                                ahd_done(ahd, scb);
-
+                                ahd_done_with_status(ahd, scb, status);
                                 /* FALLTHROUGH */
-                        }
                         case SEARCH_REMOVE:
                                 break;
                         case SEARCH_PRINT:
@@ -7375,21 +7436,24 @@ ahd_search_qinfifo(struct ahd_softc *ahd, int target, char channel,
          * looking for matches.
          */
         ahd_set_modes(ahd, AHD_MODE_SCSI, AHD_MODE_SCSI);
+        seq_flags2 = ahd_inb(ahd, SEQ_FLAGS2);
+        if ((seq_flags2 & PENDING_MK_MESSAGE) != 0) {
+                scbid = ahd_inw(ahd, MK_MESSAGE_SCB);
+                mk_msg_scb = ahd_lookup_scb(ahd, scbid);
+        } else
+                mk_msg_scb = NULL;
         savedscbptr = ahd_get_scbptr(ahd);
         tid_next = ahd_inw(ahd, WAITING_TID_HEAD);
         tid_prev = SCB_LIST_NULL;
         targets = 0;
         for (scbid = tid_next; !SCBID_IS_NULL(scbid); scbid = tid_next) {
                 u_int tid_head;
+                u_int tid_tail;
 
-                /*
-                 * We limit based on the number of SCBs since
-                 * MK_MESSAGE SCBs are not in the per-tid lists.
-                 */
                 targets++;
-                if (targets > AHD_SCB_MAX) {
+                if (targets > AHD_NUM_TARGETS)
                         panic("TID LIST LOOP");
-                }
+
                 if (scbid >= ahd->scb_data.numscbs) {
                         printf("%s: Waiting TID List inconsistency. "
                                "SCB index == 0x%x, yet numscbs == 0x%x.",
@@ -7419,8 +7483,71 @@ ahd_search_qinfifo(struct ahd_softc *ahd, int target, char channel,
                 tid_head = scbid;
                 found += ahd_search_scb_list(ahd, target, channel,
                                              lun, tag, role, status,
-                                             action, &tid_head,
+                                             action, &tid_head, &tid_tail,
                                              SCB_GET_TARGET(ahd, scb));
+                /*
+                 * Check any MK_MESSAGE SCB that is still waiting to
+                 * enter this target's waiting for selection queue.
+                 */
+                if (mk_msg_scb != NULL
+                 && ahd_match_scb(ahd, mk_msg_scb, target, channel,
+                                  lun, tag, role)) {
+
+                        /*
+                         * We found an scb that needs to be acted on.
+                         */
+                        found++;
+                        switch (action) {
+                        case SEARCH_COMPLETE:
+                                if ((mk_msg_scb->flags & SCB_ACTIVE) == 0)
+                                        printf("Inactive SCB pending MK_MSG\n");
+                                ahd_done_with_status(ahd, mk_msg_scb, status);
+                                /* FALLTHROUGH */
+                        case SEARCH_REMOVE:
+                        {
+                                u_int tail_offset;
+
+                                printf("Removing MK_MSG scb\n");
+
+                                /*
+                                 * Reset our tail to the tail of the
+                                 * main per-target list.
+                                 */
+                                tail_offset = WAITING_SCB_TAILS
+                                    + (2 * SCB_GET_TARGET(ahd, mk_msg_scb));
+                                ahd_outw(ahd, tail_offset, tid_tail);
+
+                                seq_flags2 &= ~PENDING_MK_MESSAGE;
+                                ahd_outb(ahd, SEQ_FLAGS2, seq_flags2);
+                                ahd_outw(ahd, CMDS_PENDING,
+                                         ahd_inw(ahd, CMDS_PENDING)-1);
+                                mk_msg_scb = NULL;
+                                break;
+                        }
+                        case SEARCH_PRINT:
+                                printf(" 0x%x", SCB_GET_TAG(scb));
+                                /* FALLTHROUGH */
+                        case SEARCH_COUNT:
+                                break;
+                        }
+                }
+
+                if (mk_msg_scb != NULL
+                 && SCBID_IS_NULL(tid_head)
+                 && ahd_match_scb(ahd, scb, target, channel, CAM_LUN_WILDCARD,
+                                  SCB_LIST_NULL, ROLE_UNKNOWN)) {
+
+                        /*
+                         * When removing the last SCB for a target
+                         * queue with a pending MK_MESSAGE scb, we
+                         * must queue the MK_MESSAGE scb.
+                         */
+                        printf("Queueing mk_msg_scb\n");
+                        tid_head = ahd_inw(ahd, MK_MESSAGE_SCB);
+                        seq_flags2 &= ~PENDING_MK_MESSAGE;
+                        ahd_outb(ahd, SEQ_FLAGS2, seq_flags2);
+                        mk_msg_scb = NULL;
+                }
                 if (tid_head != scbid)
                         ahd_stitch_tid_list(ahd, tid_prev, tid_head, tid_next);
                 if (!SCBID_IS_NULL(tid_head))
@@ -7428,6 +7555,8 @@ ahd_search_qinfifo(struct ahd_softc *ahd, int target, char channel,
                 if (action == SEARCH_PRINT)
                         printf(")\n");
         }
+
+        /* Restore saved state. */
         ahd_set_scbptr(ahd, savedscbptr);
         ahd_restore_modes(ahd, saved_modes);
         return (found);
@@ -7436,7 +7565,8 @@ ahd_search_qinfifo(struct ahd_softc *ahd, int target, char channel,
 static int
 ahd_search_scb_list(struct ahd_softc *ahd, int target, char channel,
                     int lun, u_int tag, role_t role, uint32_t status,
-                    ahd_search_action action, u_int *list_head, u_int tid)
+                    ahd_search_action action, u_int *list_head, 
+                    u_int *list_tail, u_int tid)
 {
         struct  scb *scb;
         u_int   scbid;
@@ -7448,6 +7578,7 @@ ahd_search_scb_list(struct ahd_softc *ahd, int target, char channel,
         found = 0;
         prev = SCB_LIST_NULL;
         next = *list_head;
+        *list_tail = SCB_LIST_NULL;
         for (scbid = next; !SCBID_IS_NULL(scbid); scbid = next) {
                 if (scbid >= ahd->scb_data.numscbs) {
                         printf("%s:SCB List inconsistency. "
@@ -7463,6 +7594,7 @@ ahd_search_scb_list(struct ahd_softc *ahd, int target, char channel,
                         panic("Waiting List traversal\n");
                 }
                 ahd_set_scbptr(ahd, scbid);
+                *list_tail = scbid;
                 next = ahd_inw_scbram(ahd, SCB_NEXT);
                 if (ahd_match_scb(ahd, scb, target, channel,
                                   lun, SCB_LIST_NULL, role) == 0) {
@@ -7472,24 +7604,14 @@ ahd_search_scb_list(struct ahd_softc *ahd, int target, char channel,
                 found++;
                 switch (action) {
                 case SEARCH_COMPLETE:
-                {
-                        cam_status ostat;
-                        cam_status cstat;
-
-                        ostat = ahd_get_transaction_status(scb);
-                        if (ostat == CAM_REQ_INPROG)
-                                ahd_set_transaction_status(scb, status);
-                        cstat = ahd_get_transaction_status(scb);
-                        if (cstat != CAM_REQ_CMP)
-                                ahd_freeze_scb(scb);
                         if ((scb->flags & SCB_ACTIVE) == 0)
                                 printf("Inactive SCB in Waiting List\n");
-                        ahd_done(ahd, scb);
+                        ahd_done_with_status(ahd, scb, status);
                         /* FALLTHROUGH */
-                }
                 case SEARCH_REMOVE:
                         ahd_rem_wscb(ahd, scbid, prev, next, tid);
-                        if (prev == SCB_LIST_NULL)
+                        *list_tail = prev;
+                        if (SCBID_IS_NULL(prev))
                                 *list_head = next;
                         break;
                 case SEARCH_PRINT:
@@ -7558,14 +7680,17 @@ ahd_rem_wscb(struct ahd_softc *ahd, u_int scbid,
         }
 
         /*
-         * SCBs that had MK_MESSAGE set in them will not
-         * be queued to the per-target lists, so don't
-         * blindly clear the tail pointer.
+         * SCBs that have MK_MESSAGE set in them may
+         * cause the tail pointer to be updated without
+         * setting the next pointer of the previous tail.
+         * Only clear the tail if the removed SCB was
+         * the tail.
          */
         tail_offset = WAITING_SCB_TAILS + (2 * tid);
         if (SCBID_IS_NULL(next)
          && ahd_inw(ahd, tail_offset) == scbid)
                 ahd_outw(ahd, tail_offset, prev);
+
         ahd_add_scb_to_free_list(ahd, scbid);
         return (next);
 }
@@ -8148,11 +8273,6 @@ ahd_handle_scsi_status(struct ahd_softc *ahd, struct scb *scb)
                 ahd_setup_data_scb(ahd, scb);
                 scb->flags |= SCB_SENSE;
                 ahd_queue_scb(ahd, scb);
-                /*
-                 * Ensure we have enough time to actually
-                 * retrieve the sense.
-                 */
-                ahd_scb_timer_reset(scb, 5 * 1000000);
                 break;
         }
         case SCSI_STATUS_OK:
@@ -8793,6 +8913,9 @@ ahd_dump_card_state(struct ahd_softc *ahd)
          * Mode independent registers.
          */
         cur_col = 0;
+        ahd_intstat_print(ahd_inb(ahd, INTSTAT), &cur_col, 50);
+        ahd_seloid_print(ahd_inb(ahd, SELOID), &cur_col, 50);
+        ahd_selid_print(ahd_inb(ahd, SELID), &cur_col, 50);
         ahd_hs_mailbox_print(ahd_inb(ahd, LOCAL_HS_MAILBOX), &cur_col, 50);
         ahd_intctl_print(ahd_inb(ahd, INTCTL), &cur_col, 50);
         ahd_seqintstat_print(ahd_inb(ahd, SEQINTSTAT), &cur_col, 50);
@@ -8808,6 +8931,12 @@ ahd_dump_card_state(struct ahd_softc *ahd)
         ahd_seqintctl_print(ahd_inb(ahd, SEQINTCTL), &cur_col, 50);
         ahd_seq_flags_print(ahd_inb(ahd, SEQ_FLAGS), &cur_col, 50);
         ahd_seq_flags2_print(ahd_inb(ahd, SEQ_FLAGS2), &cur_col, 50);
+        ahd_qfreeze_count_print(ahd_inw(ahd, QFREEZE_COUNT), &cur_col, 50);
+        ahd_kernel_qfreeze_count_print(ahd_inw(ahd, KERNEL_QFREEZE_COUNT),
+                                       &cur_col, 50);
+        ahd_mk_message_scb_print(ahd_inw(ahd, MK_MESSAGE_SCB), &cur_col, 50);
+        ahd_mk_message_scsiid_print(ahd_inb(ahd, MK_MESSAGE_SCSIID),
+                                    &cur_col, 50);
         ahd_sstat0_print(ahd_inb(ahd, SSTAT0), &cur_col, 50);
         ahd_sstat1_print(ahd_inb(ahd, SSTAT1), &cur_col, 50);
         ahd_sstat2_print(ahd_inb(ahd, SSTAT2), &cur_col, 50);
@@ -8915,7 +9044,7 @@ ahd_dump_card_state(struct ahd_softc *ahd)
 
                 ahd_set_modes(ahd, AHD_MODE_DFF0 + i, AHD_MODE_DFF0 + i);
                 fifo_scbptr = ahd_get_scbptr(ahd);
-                printf("\n%s: FIFO%d %s, LONGJMP == 0x%x, SCB 0x%x\n",
+                printf("\n\n%s: FIFO%d %s, LONGJMP == 0x%x, SCB 0x%x\n",
                        ahd_name(ahd), i,
                        (dffstat & (FIFO0FREE << i)) ? "Free" : "Active",
                        ahd_inw(ahd, LONGJMP_ADDR), fifo_scbptr);
@@ -8970,6 +9099,9 @@ ahd_dump_card_state(struct ahd_softc *ahd)
         printf("%s: OS_SPACE_CNT = 0x%x MAXCMDCNT = 0x%x\n",
                ahd_name(ahd), ahd_inb(ahd, OS_SPACE_CNT),
                ahd_inb(ahd, MAXCMDCNT));
+        printf("%s: SAVED_SCSIID = 0x%x SAVED_LUN = 0x%x\n",
+               ahd_name(ahd), ahd_inb(ahd, SAVED_SCSIID),
+               ahd_inb(ahd, SAVED_LUN));
         ahd_simode0_print(ahd_inb(ahd, SIMODE0), &cur_col, 50);
         printf("\n");
         ahd_set_modes(ahd, AHD_MODE_CCHAN, AHD_MODE_CCHAN);
diff --git a/drivers/scsi/aic7xxx/aic79xx_inline.h b/drivers/scsi/aic7xxx/aic79xx_inline.h
index 91c4f7f484b1..8ad3ce945b9e 100644
--- a/drivers/scsi/aic7xxx/aic79xx_inline.h
+++ b/drivers/scsi/aic7xxx/aic79xx_inline.h
@@ -37,7 +37,7 @@
  * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGES.
  *
- * $Id: //depot/aic7xxx/aic7xxx/aic79xx_inline.h#58 $
+ * $Id: //depot/aic7xxx/aic7xxx/aic79xx_inline.h#59 $
  *
  * $FreeBSD$
  */
@@ -804,9 +804,10 @@ ahd_queue_scb(struct ahd_softc *ahd, struct scb *scb)
                 uint64_t host_dataptr;
 
                 host_dataptr = ahd_le64toh(scb->hscb->dataptr);
-                printf("%s: Queueing SCB 0x%x bus addr 0x%x - 0x%x%x/0x%x\n",
+                printf("%s: Queueing SCB %d:0x%x bus addr 0x%x - 0x%x%x/0x%x\n",
                        ahd_name(ahd),
-                       SCB_GET_TAG(scb), ahd_le32toh(scb->hscb->hscb_busaddr),
+                       SCB_GET_TAG(scb), scb->hscb->scsiid,
+                       ahd_le32toh(scb->hscb->hscb_busaddr),
                        (u_int)((host_dataptr >> 32) & 0xFFFFFFFF),
                        (u_int)(host_dataptr & 0xFFFFFFFF),
                        ahd_le32toh(scb->hscb->datacnt));
diff --git a/drivers/scsi/aic7xxx/aic79xx_osm.c b/drivers/scsi/aic7xxx/aic79xx_osm.c
index 2567e29960bd..7254ea535a16 100644
--- a/drivers/scsi/aic7xxx/aic79xx_osm.c
+++ b/drivers/scsi/aic7xxx/aic79xx_osm.c
@@ -314,6 +314,21 @@ static uint32_t aic79xx_seltime;
  */
 uint32_t aic79xx_periodic_otag;
 
+/* Some storage boxes are using an LSI chip which has a bug making it
+ * impossible to use aic79xx Rev B chip in 320 speeds.  The following
+ * storage boxes have been reported to be buggy:
+ * EonStor 3U 16-Bay: U16U-G3A3
+ * EonStor 2U 12-Bay: U12U-G3A3
+ * SentinelRAID: 2500F R5 / R6
+ * SentinelRAID: 2500F R1
+ * SentinelRAID: 2500F/1500F
+ * SentinelRAID: 150F
+ * 
+ * To get around this LSI bug, you can set your board to 160 mode
+ * or you can enable the SLOWCRC bit.
+ */
+uint32_t aic79xx_slowcrc;
+
 /*
  * Module information and settable options.
  */
@@ -343,6 +358,7 @@ MODULE_PARM_DESC(aic79xx,
 "       amplitude:<int>         Set the signal amplitude (0-7).\n"
 "       seltime:<int>           Selection Timeout:\n"
 "                               (0/256ms,1/128ms,2/64ms,3/32ms)\n"
+"       slowcrc                 Turn on the SLOWCRC bit (Rev B only)\n"          
 "\n"
 "       Sample /etc/modprobe.conf line:\n"
 "               Enable verbose logging\n"
@@ -1003,6 +1019,7 @@ aic79xx_setup(char *s)
                 { "slewrate", NULL },
                 { "precomp", NULL },
                 { "amplitude", NULL },
+                { "slowcrc", &aic79xx_slowcrc },
         };
 
         end = strchr(s, '\0');
@@ -1072,7 +1089,6 @@ ahd_linux_register_host(struct ahd_softc *ahd, struct scsi_host_template *templa
                 return (ENOMEM);
 
         *((struct ahd_softc **)host->hostdata) = ahd;
-        ahd_lock(ahd, &s);
         ahd->platform_data->host = host;
         host->can_queue = AHD_MAX_QUEUE;
         host->cmd_per_lun = 2;
@@ -1083,7 +1099,9 @@ ahd_linux_register_host(struct ahd_softc *ahd, struct scsi_host_template *templa
         host->max_lun = AHD_NUM_LUNS;
         host->max_channel = 0;
         host->sg_tablesize = AHD_NSEG;
+        ahd_lock(ahd, &s);
         ahd_set_unit(ahd, ahd_linux_unit++);
+        ahd_unlock(ahd, &s);
         sprintf(buf, "scsi%d", host->host_no);
         new_name = malloc(strlen(buf) + 1, M_DEVBUF, M_NOWAIT);
         if (new_name != NULL) {
@@ -1093,7 +1111,6 @@ ahd_linux_register_host(struct ahd_softc *ahd, struct scsi_host_template *templa
         host->unique_id = ahd->unit;
         ahd_linux_initialize_scsi_bus(ahd);
         ahd_intr_enable(ahd, TRUE);
-        ahd_unlock(ahd, &s);
 
         host->transportt = ahd_linux_transport_template;
 
@@ -1127,6 +1144,7 @@ ahd_linux_initialize_scsi_bus(struct ahd_softc *ahd)
 {
         u_int target_id;
         u_int numtarg;
+        unsigned long s;
 
         target_id = 0;
         numtarg = 0;
@@ -1139,6 +1157,8 @@ ahd_linux_initialize_scsi_bus(struct ahd_softc *ahd)
         else
                 numtarg = (ahd->features & AHD_WIDE) ? 16 : 8;
 
+        ahd_lock(ahd, &s);
+
         /*
          * Force negotiation to async for all targets that
          * will not see an initial bus reset.
@@ -1155,16 +1175,12 @@ ahd_linux_initialize_scsi_bus(struct ahd_softc *ahd)
                 ahd_update_neg_request(ahd, &devinfo, tstate,
                                        tinfo, AHD_NEG_ALWAYS);
         }
+        ahd_unlock(ahd, &s);
         /* Give the bus some time to recover */
         if ((ahd->flags & AHD_RESET_BUS_A) != 0) {
                 ahd_freeze_simq(ahd);
-                init_timer(&ahd->platform_data->reset_timer);
-                ahd->platform_data->reset_timer.data = (u_long)ahd;
-                ahd->platform_data->reset_timer.expires =
-                    jiffies + (AIC79XX_RESET_DELAY * HZ)/1000;
-                ahd->platform_data->reset_timer.function =
-                    (ahd_linux_callback_t *)ahd_release_simq;
-                add_timer(&ahd->platform_data->reset_timer);
+                msleep(AIC79XX_RESET_DELAY);
+                ahd_release_simq(ahd);
         }
 }
 
@@ -2033,6 +2049,9 @@ ahd_linux_sem_timeout(u_long arg)
 void
 ahd_freeze_simq(struct ahd_softc *ahd)
 {
+        unsigned long s;
+
+        ahd_lock(ahd, &s);
         ahd->platform_data->qfrozen++;
         if (ahd->platform_data->qfrozen == 1) {
                 scsi_block_requests(ahd->platform_data->host);
@@ -2040,6 +2059,7 @@ ahd_freeze_simq(struct ahd_softc *ahd)
                                         CAM_LUN_WILDCARD, SCB_LIST_NULL,
                                         ROLE_INITIATOR, CAM_REQUEUE_REQ);
         }
+        ahd_unlock(ahd, &s);
 }
 
 void
@@ -2344,8 +2364,9 @@ done:
                                ahd_name(ahd), dev->active);
                         retval = FAILED;
                 }
-        }
-        ahd_unlock(ahd, &flags);
+        } else
+                ahd_unlock(ahd, &flags);
+
         return (retval);
 }
 
diff --git a/drivers/scsi/aic7xxx/aic79xx_osm.h b/drivers/scsi/aic7xxx/aic79xx_osm.h
index cb74fccc8100..9cb101345107 100644
--- a/drivers/scsi/aic7xxx/aic79xx_osm.h
+++ b/drivers/scsi/aic7xxx/aic79xx_osm.h
@@ -36,7 +36,7 @@
  * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGES.
  *
- * $Id: //depot/aic7xxx/linux/drivers/scsi/aic7xxx/aic79xx_osm.h#137 $
+ * $Id: //depot/aic7xxx/linux/drivers/scsi/aic7xxx/aic79xx_osm.h#166 $
  *
  */
 #ifndef _AIC79XX_LINUX_H_
@@ -228,7 +228,6 @@ typedef struct timer_list ahd_timer_t;
 typedef void ahd_linux_callback_t (u_long);  
 static __inline void ahd_timer_reset(ahd_timer_t *timer, int usec,
                                      ahd_callback_t *func, void *arg);
-static __inline void ahd_scb_timer_reset(struct scb *scb, u_int usec);
 
 static __inline void
 ahd_timer_reset(ahd_timer_t *timer, int usec, ahd_callback_t *func, void *arg)
@@ -243,12 +242,6 @@ ahd_timer_reset(ahd_timer_t *timer, int usec, ahd_callback_t *func, void *arg)
         add_timer(timer);
 }
 
-static __inline void
-ahd_scb_timer_reset(struct scb *scb, u_int usec)
-{
-        mod_timer(&scb->io_ctx->eh_timeout, jiffies + (usec * HZ)/1000000);
-}
-
 /***************************** SMP support ************************************/
 #include <linux/spinlock.h>
 
@@ -389,7 +382,6 @@ struct ahd_platform_data {
 
         spinlock_t               spin_lock;
         u_int                    qfrozen;
-        struct timer_list        reset_timer;
         struct semaphore         eh_sem;
         struct Scsi_Host        *host;          /* pointer to scsi host */
 #define AHD_LINUX_NOIRQ ((uint32_t)~0)
diff --git a/drivers/scsi/aic7xxx/aic79xx_osm_pci.c b/drivers/scsi/aic7xxx/aic79xx_osm_pci.c
index bf360ae021ab..ebbf7e4ff4cc 100644
--- a/drivers/scsi/aic7xxx/aic79xx_osm_pci.c
+++ b/drivers/scsi/aic7xxx/aic79xx_osm_pci.c
@@ -220,10 +220,10 @@ ahd_linux_pci_reserve_io_regions(struct ahd_softc *ahd, u_long *base,
         *base2 = pci_resource_start(ahd->dev_softc, 3);
         if (*base == 0 || *base2 == 0)
                 return (ENOMEM);
-        if (request_region(*base, 256, "aic79xx") == 0)
+        if (!request_region(*base, 256, "aic79xx"))
                 return (ENOMEM);
-        if (request_region(*base2, 256, "aic79xx") == 0) {
-                release_region(*base2, 256);
+        if (!request_region(*base2, 256, "aic79xx")) {
+                release_region(*base, 256);
                 return (ENOMEM);
         }
         return (0);
@@ -237,7 +237,7 @@ ahd_linux_pci_reserve_mem_region(struct ahd_softc *ahd,
         u_long  start;
         u_long  base_page;
         u_long  base_offset;
-        int     error;
+        int     error = 0;
 
         if (aic79xx_allow_memio == 0)
                 return (ENOMEM);
@@ -245,16 +245,15 @@ ahd_linux_pci_reserve_mem_region(struct ahd_softc *ahd,
         if ((ahd->bugs & AHD_PCIX_MMAPIO_BUG) != 0)
                 return (ENOMEM);
 
-        error = 0;
         start = pci_resource_start(ahd->dev_softc, 1);
         base_page = start & PAGE_MASK;
         base_offset = start - base_page;
         if (start != 0) {
                 *bus_addr = start;
-                if (request_mem_region(start, 0x1000, "aic79xx") == 0)
+                if (!request_mem_region(start, 0x1000, "aic79xx"))
                         error = ENOMEM;
-                if (error == 0) {
-                        *maddr = ioremap_nocache(base_page, base_offset + 256);
+                if (!error) {
+                        *maddr = ioremap_nocache(base_page, base_offset + 512);
                         if (*maddr == NULL) {
                                 error = ENOMEM;
                                 release_mem_region(start, 0x1000);
@@ -344,7 +343,7 @@ ahd_pci_map_int(struct ahd_softc *ahd)
 
         error = request_irq(ahd->dev_softc->irq, ahd_linux_isr,
                             SA_SHIRQ, "aic79xx", ahd);
-        if (error == 0)
+        if (!error)
                 ahd->platform_data->irq = ahd->dev_softc->irq;
         
         return (-error);
diff --git a/drivers/scsi/aic7xxx/aic79xx_pci.c b/drivers/scsi/aic7xxx/aic79xx_pci.c
index 196a6344b037..757242e522c2 100644
--- a/drivers/scsi/aic7xxx/aic79xx_pci.c
+++ b/drivers/scsi/aic7xxx/aic79xx_pci.c
@@ -38,7 +38,7 @@
  * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGES.
  *
- * $Id: //depot/aic7xxx/aic7xxx/aic79xx_pci.c#89 $
+ * $Id: //depot/aic7xxx/aic7xxx/aic79xx_pci.c#92 $
  */
 
 #ifdef __linux__
@@ -950,12 +950,19 @@ ahd_aic790X_setup(struct ahd_softc *ahd)
                 if ((ahd->flags & AHD_HP_BOARD) == 0)
                         AHD_SET_SLEWRATE(ahd, AHD_SLEWRATE_DEF_REVA);
         } else {
+                /* This is revision B and newer. */
+                extern uint32_t aic79xx_slowcrc;
                 u_int devconfig1;
 
                 ahd->features |= AHD_RTI|AHD_NEW_IOCELL_OPTS
-                              |  AHD_NEW_DFCNTRL_OPTS|AHD_FAST_CDB_DELIVERY;
+                              |  AHD_NEW_DFCNTRL_OPTS|AHD_FAST_CDB_DELIVERY
+                              |  AHD_BUSFREEREV_BUG;
                 ahd->bugs |= AHD_LQOOVERRUN_BUG|AHD_EARLY_REQ_BUG;
 
+                /* If the user requested the the SLOWCRC bit to be set. */
+                if (aic79xx_slowcrc)
+                        ahd->features |= AHD_AIC79XXB_SLOWCRC;
+
                 /*
                  * Some issues have been resolved in the 7901B.
                  */
diff --git a/drivers/scsi/aic7xxx/aic79xx_reg.h_shipped b/drivers/scsi/aic7xxx/aic79xx_reg.h_shipped
index 8763b158856b..2068e00d2c75 100644
--- a/drivers/scsi/aic7xxx/aic79xx_reg.h_shipped
+++ b/drivers/scsi/aic7xxx/aic79xx_reg.h_shipped
@@ -2,8 +2,8 @@
  * DO NOT EDIT - This file is automatically generated
  *               from the following source files:
  *
- * $Id: //depot/aic7xxx/aic7xxx/aic79xx.seq#119 $
- * $Id: //depot/aic7xxx/aic7xxx/aic79xx.reg#76 $
+ * $Id: //depot/aic7xxx/aic7xxx/aic79xx.seq#120 $
+ * $Id: //depot/aic7xxx/aic7xxx/aic79xx.reg#77 $
  */
 typedef int (ahd_reg_print_t)(u_int, u_int *, u_int);
 typedef struct ahd_reg_parse_entry {
@@ -2204,6 +2204,20 @@ ahd_reg_print_t ahd_cmdsize_table_print;
 #endif
 
 #if AIC_DEBUG_REGISTERS
+ahd_reg_print_t ahd_mk_message_scb_print;
+#else
+#define ahd_mk_message_scb_print(regvalue, cur_col, wrap) \
+    ahd_print_register(NULL, 0, "MK_MESSAGE_SCB", 0x160, regvalue, cur_col, wrap)
+#endif
+
+#if AIC_DEBUG_REGISTERS
+ahd_reg_print_t ahd_mk_message_scsiid_print;
+#else
+#define ahd_mk_message_scsiid_print(regvalue, cur_col, wrap) \
+    ahd_print_register(NULL, 0, "MK_MESSAGE_SCSIID", 0x162, regvalue, cur_col, wrap)
+#endif
+
+#if AIC_DEBUG_REGISTERS
 ahd_reg_print_t ahd_scb_base_print;
 #else
 #define ahd_scb_base_print(regvalue, cur_col, wrap) \
@@ -3638,6 +3652,7 @@ ahd_reg_print_t ahd_scb_disconnected_lists_print;
 #define SEQ_FLAGS2                      0x14d
 #define         SELECTOUT_QFROZEN       0x04
 #define         TARGET_MSG_PENDING      0x02
+#define         PENDING_MK_MESSAGE      0x01
 
 #define ALLOCFIFO_SCBPTR                0x14e
 
@@ -3655,6 +3670,10 @@ ahd_reg_print_t ahd_scb_disconnected_lists_print;
 
 #define CMDSIZE_TABLE                   0x158
 
+#define MK_MESSAGE_SCB                  0x160
+
+#define MK_MESSAGE_SCSIID               0x162
+
 #define SCB_BASE                        0x180
 
 #define SCB_RESIDUAL_DATACNT            0x180
@@ -3800,5 +3819,5 @@ ahd_reg_print_t ahd_scb_disconnected_lists_print;
 
 
 /* Exported Labels */
-#define LABEL_seq_isr   0x285
-#define LABEL_timer_isr 0x281
+#define LABEL_seq_isr   0x28f
+#define LABEL_timer_isr 0x28b
diff --git a/drivers/scsi/aic7xxx/aic79xx_reg_print.c_shipped b/drivers/scsi/aic7xxx/aic79xx_reg_print.c_shipped
index a4137c985376..db38a61a8cb4 100644
--- a/drivers/scsi/aic7xxx/aic79xx_reg_print.c_shipped
+++ b/drivers/scsi/aic7xxx/aic79xx_reg_print.c_shipped
@@ -2,8 +2,8 @@
  * DO NOT EDIT - This file is automatically generated
  *               from the following source files:
  *
- * $Id: //depot/aic7xxx/aic7xxx/aic79xx.seq#118 $
- * $Id: //depot/aic7xxx/aic7xxx/aic79xx.reg#75 $
+ * $Id: //depot/aic7xxx/aic7xxx/aic79xx.seq#120 $
+ * $Id: //depot/aic7xxx/aic7xxx/aic79xx.reg#77 $
  */
 
 #include "aic79xx_osm.h"
@@ -3382,6 +3382,7 @@ ahd_initiator_tag_print(u_int regvalue, u_int *cur_col, u_int wrap)
 }
 
 static ahd_reg_parse_entry_t SEQ_FLAGS2_parse_table[] = {
+        { "PENDING_MK_MESSAGE", 0x01, 0x01 },
         { "TARGET_MSG_PENDING", 0x02, 0x02 },
         { "SELECTOUT_QFROZEN",  0x04, 0x04 }
 };
@@ -3389,7 +3390,7 @@ static ahd_reg_parse_entry_t SEQ_FLAGS2_parse_table[] = {
 int
 ahd_seq_flags2_print(u_int regvalue, u_int *cur_col, u_int wrap)
 {
-        return (ahd_print_register(SEQ_FLAGS2_parse_table, 2, "SEQ_FLAGS2",
+        return (ahd_print_register(SEQ_FLAGS2_parse_table, 3, "SEQ_FLAGS2",
             0x14d, regvalue, cur_col, wrap));
 }
 
@@ -3450,6 +3451,20 @@ ahd_cmdsize_table_print(u_int regvalue, u_int *cur_col, u_int wrap)
 }
 
 int
+ahd_mk_message_scb_print(u_int regvalue, u_int *cur_col, u_int wrap)
+{
+        return (ahd_print_register(NULL, 0, "MK_MESSAGE_SCB",
+            0x160, regvalue, cur_col, wrap));
+}
+
+int
+ahd_mk_message_scsiid_print(u_int regvalue, u_int *cur_col, u_int wrap)
+{
+        return (ahd_print_register(NULL, 0, "MK_MESSAGE_SCSIID",
+            0x162, regvalue, cur_col, wrap));
+}
+
+int
 ahd_scb_base_print(u_int regvalue, u_int *cur_col, u_int wrap)
 {
         return (ahd_print_register(NULL, 0, "SCB_BASE",
diff --git a/drivers/scsi/aic7xxx/aic79xx_seq.h_shipped b/drivers/scsi/aic7xxx/aic79xx_seq.h_shipped
index b1e5365be230..11bed07e90b7 100644
--- a/drivers/scsi/aic7xxx/aic79xx_seq.h_shipped
+++ b/drivers/scsi/aic7xxx/aic79xx_seq.h_shipped
@@ -2,17 +2,17 @@
  * DO NOT EDIT - This file is automatically generated
  *               from the following source files:
  *
- * $Id: //depot/aic7xxx/aic7xxx/aic79xx.seq#119 $
- * $Id: //depot/aic7xxx/aic7xxx/aic79xx.reg#76 $
+ * $Id: //depot/aic7xxx/aic7xxx/aic79xx.seq#120 $
+ * $Id: //depot/aic7xxx/aic7xxx/aic79xx.reg#77 $
  */
 static uint8_t seqprog[] = {
         0xff, 0x02, 0x06, 0x78,
-        0x00, 0xea, 0x64, 0x59,
+        0x00, 0xea, 0x6e, 0x59,
         0x01, 0xea, 0x04, 0x30,
         0xff, 0x04, 0x0c, 0x78,
-        0x19, 0xea, 0x64, 0x59,
+        0x19, 0xea, 0x6e, 0x59,
         0x19, 0xea, 0x04, 0x00,
-        0x33, 0xea, 0x5e, 0x59,
+        0x33, 0xea, 0x68, 0x59,
         0x33, 0xea, 0x00, 0x00,
         0x60, 0x3a, 0x3a, 0x68,
         0x04, 0x4d, 0x35, 0x78,
@@ -33,15 +33,15 @@ static uint8_t seqprog[] = {
         0xff, 0xea, 0x62, 0x02,
         0x00, 0xe2, 0x3a, 0x40,
         0xff, 0x21, 0x3b, 0x70,
-        0x40, 0x4b, 0xaa, 0x69,
-        0x00, 0xe2, 0x68, 0x59,
-        0x40, 0x4b, 0xaa, 0x69,
-        0x20, 0x4b, 0x96, 0x69,
+        0x40, 0x4b, 0xb4, 0x69,
+        0x00, 0xe2, 0x72, 0x59,
+        0x40, 0x4b, 0xb4, 0x69,
+        0x20, 0x4b, 0xa0, 0x69,
         0xfc, 0x42, 0x44, 0x78,
         0x10, 0x40, 0x44, 0x78,
-        0x00, 0xe2, 0xfc, 0x5d,
+        0x00, 0xe2, 0x10, 0x5e,
         0x20, 0x4d, 0x48, 0x78,
-        0x00, 0xe2, 0xfc, 0x5d,
+        0x00, 0xe2, 0x10, 0x5e,
         0x30, 0x3f, 0xc0, 0x09,
         0x30, 0xe0, 0x50, 0x60,
         0x7f, 0x4a, 0x94, 0x08,
@@ -51,7 +51,7 @@ static uint8_t seqprog[] = {
         0x00, 0xe2, 0x76, 0x58,
         0x00, 0xe2, 0x86, 0x58,
         0x00, 0xe2, 0x06, 0x40,
-        0x33, 0xea, 0x5e, 0x59,
+        0x33, 0xea, 0x68, 0x59,
         0x33, 0xea, 0x00, 0x00,
         0x01, 0x52, 0x84, 0x78,
         0x02, 0x58, 0x50, 0x31,
@@ -59,26 +59,26 @@ static uint8_t seqprog[] = {
         0xff, 0x97, 0x6f, 0x78,
         0x50, 0x4b, 0x6a, 0x68,
         0xbf, 0x3a, 0x74, 0x08,
-        0x14, 0xea, 0x64, 0x59,
+        0x14, 0xea, 0x6e, 0x59,
         0x14, 0xea, 0x04, 0x00,
         0x08, 0x92, 0x25, 0x03,
         0xff, 0x90, 0x5f, 0x68,
-        0x00, 0xe2, 0x76, 0x5b,
+        0x00, 0xe2, 0x8a, 0x5b,
         0x00, 0xe2, 0x5e, 0x40,
-        0x00, 0xea, 0x5e, 0x59,
+        0x00, 0xea, 0x68, 0x59,
         0x01, 0xea, 0x00, 0x30,
         0x80, 0xf9, 0x7e, 0x68,
-        0x00, 0xe2, 0x5c, 0x59,
-        0x11, 0xea, 0x5e, 0x59,
+        0x00, 0xe2, 0x66, 0x59,
+        0x11, 0xea, 0x68, 0x59,
         0x11, 0xea, 0x00, 0x00,
-        0x80, 0xf9, 0x5c, 0x79,
+        0x80, 0xf9, 0x66, 0x79,
         0xff, 0xea, 0xd4, 0x0d,
-        0x22, 0xea, 0x5e, 0x59,
+        0x22, 0xea, 0x68, 0x59,
         0x22, 0xea, 0x00, 0x00,
         0x10, 0x16, 0x90, 0x78,
         0x10, 0x16, 0x2c, 0x00,
         0x01, 0x0b, 0xae, 0x32,
-        0x18, 0xad, 0x12, 0x79,
+        0x18, 0xad, 0x1c, 0x79,
         0x04, 0xad, 0xdc, 0x68,
         0x80, 0xad, 0x84, 0x78,
         0x10, 0xad, 0xaa, 0x78,
@@ -118,7 +118,6 @@ static uint8_t seqprog[] = {
         0x80, 0x18, 0x30, 0x04,
         0x40, 0xad, 0x84, 0x78,
         0xe7, 0xad, 0x5a, 0x09,
-        0x02, 0xa8, 0x40, 0x31,
         0xff, 0xea, 0xc0, 0x09,
         0x01, 0x54, 0xa9, 0x1a,
         0x00, 0x55, 0xab, 0x22,
@@ -128,24 +127,30 @@ static uint8_t seqprog[] = {
         0xff, 0xea, 0x5a, 0x03,
         0xff, 0xea, 0x5e, 0x03,
         0x01, 0x10, 0xd4, 0x31,
-        0x10, 0x92, 0x07, 0x69,
+        0x02, 0xa8, 0x40, 0x31,
+        0x01, 0x92, 0xc1, 0x31,
         0x3d, 0x93, 0xc5, 0x29,
         0xfe, 0xe2, 0xc4, 0x09,
         0x01, 0xea, 0xc6, 0x01,
         0x02, 0xe2, 0xc8, 0x31,
         0x02, 0xec, 0x50, 0x31,
         0x02, 0xa0, 0xda, 0x31,
-        0xff, 0xa9, 0x06, 0x71,
+        0xff, 0xa9, 0x10, 0x71,
+        0x10, 0xe0, 0x0e, 0x79,
+        0x10, 0x92, 0x0f, 0x79,
+        0x01, 0x4d, 0x9b, 0x02,
+        0x02, 0xa0, 0xc0, 0x32,
+        0x01, 0x93, 0xc5, 0x36,
         0x02, 0xa0, 0x58, 0x37,
-        0xff, 0x21, 0x0f, 0x71,
+        0xff, 0x21, 0x19, 0x71,
         0x02, 0x22, 0x51, 0x31,
         0x02, 0xa0, 0x5c, 0x33,
         0x02, 0xa0, 0x44, 0x36,
         0x02, 0xa0, 0x40, 0x32,
         0x02, 0xa0, 0x44, 0x36,
-        0x04, 0x4d, 0x17, 0x69,
-        0x40, 0x16, 0x48, 0x69,
-        0xff, 0x2d, 0x4d, 0x61,
+        0x05, 0x4d, 0x21, 0x69,
+        0x40, 0x16, 0x52, 0x69,
+        0xff, 0x2d, 0x57, 0x61,
         0xff, 0x29, 0x85, 0x70,
         0x02, 0x28, 0x55, 0x32,
         0x01, 0xea, 0x5a, 0x01,
@@ -159,22 +164,22 @@ static uint8_t seqprog[] = {
         0x01, 0x56, 0xad, 0x1a,
         0xff, 0x54, 0xa9, 0x1a,
         0xff, 0x55, 0xab, 0x22,
-        0xff, 0x8d, 0x41, 0x71,
-        0x80, 0xac, 0x40, 0x71,
-        0x20, 0x16, 0x40, 0x69,
+        0xff, 0x8d, 0x4b, 0x71,
+        0x80, 0xac, 0x4a, 0x71,
+        0x20, 0x16, 0x4a, 0x69,
         0x00, 0xac, 0xc4, 0x19,
-        0x07, 0xe2, 0x40, 0xf9,
+        0x07, 0xe2, 0x4a, 0xf9,
         0x02, 0x8c, 0x51, 0x31,
-        0x00, 0xe2, 0x24, 0x41,
+        0x00, 0xe2, 0x2e, 0x41,
         0x01, 0xac, 0x08, 0x31,
         0x09, 0xea, 0x5a, 0x01,
         0x02, 0x8c, 0x51, 0x32,
         0xff, 0xea, 0x1a, 0x07,
         0x04, 0x24, 0xf9, 0x30,
-        0x1d, 0xea, 0x52, 0x41,
+        0x1d, 0xea, 0x5c, 0x41,
         0x02, 0x2c, 0x51, 0x31,
         0x04, 0xa8, 0xf9, 0x30,
-        0x19, 0xea, 0x52, 0x41,
+        0x19, 0xea, 0x5c, 0x41,
         0x06, 0xea, 0x08, 0x81,
         0x01, 0xe2, 0x5a, 0x35,
         0x02, 0xf2, 0xf0, 0x31,
@@ -190,27 +195,27 @@ static uint8_t seqprog[] = {
         0x02, 0x20, 0xb9, 0x30,
         0x02, 0x20, 0x51, 0x31,
         0x4c, 0x93, 0xd7, 0x28,
-        0x10, 0x92, 0x77, 0x79,
+        0x10, 0x92, 0x81, 0x79,
         0x01, 0x6b, 0xc0, 0x30,
         0x02, 0x64, 0xc8, 0x00,
         0x40, 0x3a, 0x74, 0x04,
         0x00, 0xe2, 0x76, 0x58,
-        0x33, 0xea, 0x5e, 0x59,
+        0x33, 0xea, 0x68, 0x59,
         0x33, 0xea, 0x00, 0x00,
         0x30, 0x3f, 0xc0, 0x09,
-        0x30, 0xe0, 0x78, 0x61,
-        0x20, 0x3f, 0x8e, 0x69,
-        0x10, 0x3f, 0x78, 0x79,
+        0x30, 0xe0, 0x82, 0x61,
+        0x20, 0x3f, 0x98, 0x69,
+        0x10, 0x3f, 0x82, 0x79,
         0x02, 0xea, 0x7e, 0x00,
-        0x00, 0xea, 0x5e, 0x59,
+        0x00, 0xea, 0x68, 0x59,
         0x01, 0xea, 0x00, 0x30,
         0x02, 0x4e, 0x51, 0x35,
         0x01, 0xea, 0x7e, 0x00,
-        0x11, 0xea, 0x5e, 0x59,
+        0x11, 0xea, 0x68, 0x59,
         0x11, 0xea, 0x00, 0x00,
         0x02, 0x4e, 0x51, 0x35,
         0xc0, 0x4a, 0x94, 0x00,
-        0x04, 0x41, 0x9c, 0x79,
+        0x04, 0x41, 0xa6, 0x79,
         0x08, 0xea, 0x98, 0x00,
         0x08, 0x57, 0xae, 0x00,
         0x08, 0x3c, 0x78, 0x00,
@@ -218,12 +223,12 @@ static uint8_t seqprog[] = {
         0x0f, 0x67, 0xc0, 0x09,
         0x00, 0x3a, 0x75, 0x02,
         0x20, 0xea, 0x96, 0x00,
-        0x00, 0xe2, 0x14, 0x42,
+        0x00, 0xe2, 0x28, 0x42,
         0xc0, 0x4a, 0x94, 0x00,
-        0x40, 0x3a, 0xc8, 0x69,
+        0x40, 0x3a, 0xd2, 0x69,
         0x02, 0x55, 0x06, 0x68,
-        0x02, 0x56, 0xc8, 0x69,
-        0xff, 0x5b, 0xc8, 0x61,
+        0x02, 0x56, 0xd2, 0x69,
+        0xff, 0x5b, 0xd2, 0x61,
         0x02, 0x20, 0x51, 0x31,
         0x80, 0xea, 0xb2, 0x01,
         0x44, 0xea, 0x00, 0x00,
@@ -231,40 +236,45 @@ static uint8_t seqprog[] = {
         0x33, 0xea, 0x00, 0x00,
         0xff, 0xea, 0xb2, 0x09,
         0xff, 0xe0, 0xc0, 0x19,
-        0xff, 0xe0, 0xca, 0x79,
+        0xff, 0xe0, 0xd4, 0x79,
         0x02, 0xac, 0x51, 0x31,
-        0x00, 0xe2, 0xc0, 0x41,
+        0x00, 0xe2, 0xca, 0x41,
         0x02, 0x5e, 0x50, 0x31,
         0x02, 0xa8, 0xb8, 0x30,
         0x02, 0x5c, 0x50, 0x31,
-        0xff, 0xad, 0xdb, 0x71,
+        0xff, 0xad, 0xe5, 0x71,
         0x02, 0xac, 0x41, 0x31,
         0x02, 0x22, 0x51, 0x31,
         0x02, 0xa0, 0x5c, 0x33,
         0x02, 0xa0, 0x44, 0x32,
-        0x00, 0xe2, 0xe4, 0x41,
-        0x10, 0x92, 0xe5, 0x69,
+        0x00, 0xe2, 0xf8, 0x41,
+        0x01, 0x4d, 0xf1, 0x79,
+        0x01, 0x62, 0xc1, 0x31,
+        0x00, 0x93, 0xf1, 0x61,
+        0xfe, 0x4d, 0x9b, 0x0a,
+        0x02, 0x60, 0x41, 0x31,
+        0x00, 0xe2, 0xdc, 0x41,
         0x3d, 0x93, 0xc9, 0x29,
         0x01, 0xe4, 0xc8, 0x01,
         0x01, 0xea, 0xca, 0x01,
         0xff, 0xea, 0xda, 0x01,
         0x02, 0x20, 0x51, 0x31,
         0x02, 0xae, 0x41, 0x32,
-        0xff, 0x21, 0xed, 0x61,
+        0xff, 0x21, 0x01, 0x62,
         0xff, 0xea, 0x46, 0x02,
         0x02, 0x5c, 0x50, 0x31,
         0x40, 0xea, 0x96, 0x00,
-        0x02, 0x56, 0x04, 0x6e,
-        0x01, 0x55, 0x04, 0x6e,
-        0x10, 0x92, 0xf9, 0x79,
-        0x10, 0x40, 0x02, 0x6a,
-        0x01, 0x56, 0x02, 0x7a,
+        0x02, 0x56, 0x20, 0x6e,
+        0x01, 0x55, 0x20, 0x6e,
+        0x10, 0x92, 0x0d, 0x7a,
+        0x10, 0x40, 0x16, 0x6a,
+        0x01, 0x56, 0x16, 0x7a,
         0xff, 0x97, 0x07, 0x78,
-        0x13, 0xea, 0x64, 0x59,
+        0x13, 0xea, 0x6e, 0x59,
         0x13, 0xea, 0x04, 0x00,
         0x00, 0xe2, 0x06, 0x40,
         0xbf, 0x3a, 0x74, 0x08,
-        0x04, 0x41, 0x08, 0x7a,
+        0x04, 0x41, 0x1c, 0x7a,
         0x08, 0xea, 0x98, 0x00,
         0x08, 0x57, 0xae, 0x00,
         0x01, 0x93, 0x75, 0x32,
@@ -272,108 +282,108 @@ static uint8_t seqprog[] = {
         0x40, 0xea, 0x72, 0x02,
         0x08, 0x3c, 0x78, 0x00,
         0x80, 0xea, 0x6e, 0x02,
-        0x00, 0xe2, 0xe2, 0x5b,
+        0x00, 0xe2, 0xf6, 0x5b,
         0x01, 0x3c, 0xc1, 0x31,
-        0x9f, 0xe0, 0x84, 0x7c,
-        0x80, 0xe0, 0x28, 0x72,
-        0xa0, 0xe0, 0x64, 0x72,
-        0xc0, 0xe0, 0x5a, 0x72,
-        0xe0, 0xe0, 0x94, 0x72,
-        0x01, 0xea, 0x64, 0x59,
+        0x9f, 0xe0, 0x98, 0x7c,
+        0x80, 0xe0, 0x3c, 0x72,
+        0xa0, 0xe0, 0x78, 0x72,
+        0xc0, 0xe0, 0x6e, 0x72,
+        0xe0, 0xe0, 0xa8, 0x72,
+        0x01, 0xea, 0x6e, 0x59,
         0x01, 0xea, 0x04, 0x00,
-        0x00, 0xe2, 0x14, 0x42,
-        0x80, 0x39, 0x2f, 0x7a,
-        0x03, 0xea, 0x64, 0x59,
+        0x00, 0xe2, 0x28, 0x42,
+        0x80, 0x39, 0x43, 0x7a,
+        0x03, 0xea, 0x6e, 0x59,
         0x03, 0xea, 0x04, 0x00,
-        0xee, 0x00, 0x36, 0x6a,
+        0xee, 0x00, 0x4a, 0x6a,
         0x05, 0xea, 0xb4, 0x00,
-        0x33, 0xea, 0x5e, 0x59,
+        0x33, 0xea, 0x68, 0x59,
         0x33, 0xea, 0x00, 0x00,
         0x02, 0xa8, 0x9c, 0x32,
-        0x00, 0xe2, 0x7e, 0x59,
+        0x00, 0xe2, 0x88, 0x59,
         0xef, 0x96, 0xd5, 0x19,
-        0x00, 0xe2, 0x46, 0x52,
+        0x00, 0xe2, 0x5a, 0x52,
         0x09, 0x80, 0xe1, 0x30,
         0x02, 0xea, 0x36, 0x00,
         0xa8, 0xea, 0x32, 0x00,
-        0x00, 0xe2, 0x4c, 0x42,
+        0x00, 0xe2, 0x60, 0x42,
         0x01, 0x96, 0xd1, 0x30,
         0x10, 0x80, 0x89, 0x31,
         0x20, 0xea, 0x32, 0x00,
         0xbf, 0x39, 0x73, 0x0a,
-        0x10, 0x4c, 0x56, 0x6a,
-        0x20, 0x19, 0x4e, 0x6a,
-        0x20, 0x19, 0x52, 0x6a,
-        0x02, 0x4d, 0x14, 0x6a,
+        0x10, 0x4c, 0x6a, 0x6a,
+        0x20, 0x19, 0x62, 0x6a,
+        0x20, 0x19, 0x66, 0x6a,
+        0x02, 0x4d, 0x28, 0x6a,
         0x40, 0x39, 0x73, 0x02,
-        0x00, 0xe2, 0x14, 0x42,
-        0x80, 0x39, 0xd5, 0x6a,
+        0x00, 0xe2, 0x28, 0x42,
+        0x80, 0x39, 0xe9, 0x6a,
         0x01, 0x44, 0x10, 0x33,
         0x08, 0x92, 0x25, 0x03,
-        0x00, 0xe2, 0x14, 0x42,
+        0x00, 0xe2, 0x28, 0x42,
         0x10, 0xea, 0x80, 0x00,
         0x01, 0x37, 0xc5, 0x31,
-        0x80, 0xe2, 0x80, 0x62,
-        0x10, 0x92, 0xa5, 0x6a,
+        0x80, 0xe2, 0x94, 0x62,
+        0x10, 0x92, 0xb9, 0x6a,
         0xc0, 0x94, 0xc5, 0x01,
-        0x40, 0x92, 0x71, 0x6a,
+        0x40, 0x92, 0x85, 0x6a,
         0xbf, 0xe2, 0xc4, 0x09,
-        0x20, 0x92, 0x85, 0x7a,
+        0x20, 0x92, 0x99, 0x7a,
         0x01, 0xe2, 0x88, 0x30,
-        0x00, 0xe2, 0xe2, 0x5b,
-        0xa0, 0x3c, 0x8d, 0x62,
+        0x00, 0xe2, 0xf6, 0x5b,
+        0xa0, 0x3c, 0xa1, 0x62,
         0x23, 0x92, 0x89, 0x08,
-        0x00, 0xe2, 0xe2, 0x5b,
-        0xa0, 0x3c, 0x8d, 0x62,
-        0x00, 0xa8, 0x84, 0x42,
-        0xff, 0xe2, 0x84, 0x62,
-        0x00, 0xe2, 0xa4, 0x42,
+        0x00, 0xe2, 0xf6, 0x5b,
+        0xa0, 0x3c, 0xa1, 0x62,
+        0x00, 0xa8, 0x98, 0x42,
+        0xff, 0xe2, 0x98, 0x62,
+        0x00, 0xe2, 0xb8, 0x42,
         0x40, 0xea, 0x98, 0x00,
         0x01, 0xe2, 0x88, 0x30,
-        0x00, 0xe2, 0xe2, 0x5b,
-        0xa0, 0x3c, 0x63, 0x72,
+        0x00, 0xe2, 0xf6, 0x5b,
+        0xa0, 0x3c, 0x77, 0x72,
         0x40, 0xea, 0x98, 0x00,
         0x01, 0x37, 0x95, 0x32,
         0x08, 0xea, 0x6e, 0x02,
-        0x00, 0xe2, 0x14, 0x42,
-        0xe0, 0xea, 0xfe, 0x5b,
-        0x80, 0xe0, 0xe0, 0x6a,
-        0x04, 0xe0, 0x92, 0x73,
-        0x02, 0xe0, 0xc4, 0x73,
-        0x00, 0xea, 0x3e, 0x73,
-        0x03, 0xe0, 0xd4, 0x73,
-        0x23, 0xe0, 0xb6, 0x72,
-        0x08, 0xe0, 0xdc, 0x72,
-        0x00, 0xe2, 0xe2, 0x5b,
-        0x07, 0xea, 0x64, 0x59,
+        0x00, 0xe2, 0x28, 0x42,
+        0xe0, 0xea, 0x12, 0x5c,
+        0x80, 0xe0, 0xf4, 0x6a,
+        0x04, 0xe0, 0xa6, 0x73,
+        0x02, 0xe0, 0xd8, 0x73,
+        0x00, 0xea, 0x52, 0x73,
+        0x03, 0xe0, 0xe8, 0x73,
+        0x23, 0xe0, 0xca, 0x72,
+        0x08, 0xe0, 0xf0, 0x72,
+        0x00, 0xe2, 0xf6, 0x5b,
+        0x07, 0xea, 0x6e, 0x59,
         0x07, 0xea, 0x04, 0x00,
-        0x08, 0x48, 0x15, 0x72,
-        0x04, 0x48, 0xb3, 0x62,
+        0x08, 0x48, 0x29, 0x72,
+        0x04, 0x48, 0xc7, 0x62,
         0x01, 0x49, 0x89, 0x30,
-        0x00, 0xe2, 0xa4, 0x42,
+        0x00, 0xe2, 0xb8, 0x42,
         0x01, 0x44, 0xd4, 0x31,
-        0x00, 0xe2, 0xa4, 0x42,
+        0x00, 0xe2, 0xb8, 0x42,
         0x01, 0x00, 0x6c, 0x32,
-        0x33, 0xea, 0x5e, 0x59,
+        0x33, 0xea, 0x68, 0x59,
         0x33, 0xea, 0x00, 0x00,
         0x4c, 0x3a, 0xc1, 0x28,
         0x01, 0x64, 0xc0, 0x31,
-        0x00, 0x36, 0x5f, 0x59,
+        0x00, 0x36, 0x69, 0x59,
         0x01, 0x36, 0x01, 0x30,
-        0x01, 0xe0, 0xda, 0x7a,
-        0xa0, 0xea, 0xf4, 0x5b,
-        0x01, 0xa0, 0xda, 0x62,
-        0x01, 0x84, 0xcf, 0x7a,
-        0x01, 0x95, 0xdd, 0x6a,
-        0x05, 0xea, 0x64, 0x59,
+        0x01, 0xe0, 0xee, 0x7a,
+        0xa0, 0xea, 0x08, 0x5c,
+        0x01, 0xa0, 0xee, 0x62,
+        0x01, 0x84, 0xe3, 0x7a,
+        0x01, 0x95, 0xf1, 0x6a,
+        0x05, 0xea, 0x6e, 0x59,
         0x05, 0xea, 0x04, 0x00,
-        0x00, 0xe2, 0xdc, 0x42,
-        0x03, 0xea, 0x64, 0x59,
+        0x00, 0xe2, 0xf0, 0x42,
+        0x03, 0xea, 0x6e, 0x59,
         0x03, 0xea, 0x04, 0x00,
-        0x00, 0xe2, 0xdc, 0x42,
-        0x07, 0xea, 0x06, 0x5c,
+        0x00, 0xe2, 0xf0, 0x42,
+        0x07, 0xea, 0x1a, 0x5c,
         0x01, 0x44, 0xd4, 0x31,
-        0x00, 0xe2, 0x14, 0x42,
+        0x00, 0xe2, 0x28, 0x42,
         0x3f, 0xe0, 0x76, 0x0a,
         0xc0, 0x3a, 0xc1, 0x09,
         0x00, 0x3b, 0x51, 0x01,
@@ -384,54 +394,54 @@ static uint8_t seqprog[] = {
         0x01, 0xea, 0xc6, 0x01,
         0x02, 0xe2, 0xc8, 0x31,
         0x02, 0xec, 0x40, 0x31,
-        0xff, 0xa1, 0xfc, 0x72,
+        0xff, 0xa1, 0x10, 0x73,
         0x02, 0xe8, 0xda, 0x31,
         0x02, 0xa0, 0x50, 0x31,
-        0x00, 0xe2, 0x1e, 0x43,
+        0x00, 0xe2, 0x32, 0x43,
         0x80, 0x39, 0x73, 0x02,
         0x01, 0x44, 0xd4, 0x31,
-        0x00, 0xe2, 0xe2, 0x5b,
+        0x00, 0xe2, 0xf6, 0x5b,
         0x01, 0x39, 0x73, 0x02,
-        0xe0, 0x3c, 0x39, 0x63,
+        0xe0, 0x3c, 0x4d, 0x63,
         0x02, 0x39, 0x73, 0x02,
-        0x20, 0x46, 0x32, 0x63,
+        0x20, 0x46, 0x46, 0x63,
         0xff, 0xea, 0x52, 0x09,
-        0xa8, 0xea, 0xf4, 0x5b,
-        0x04, 0x92, 0x19, 0x7b,
+        0xa8, 0xea, 0x08, 0x5c,
+        0x04, 0x92, 0x2d, 0x7b,
         0x01, 0x3a, 0xc1, 0x31,
-        0x00, 0x93, 0x19, 0x63,
+        0x00, 0x93, 0x2d, 0x63,
         0x01, 0x3b, 0xc1, 0x31,
-        0x00, 0x94, 0x23, 0x73,
+        0x00, 0x94, 0x37, 0x73,
         0x01, 0xa9, 0x52, 0x11,
-        0xff, 0xa9, 0x0e, 0x6b,
-        0x00, 0xe2, 0x32, 0x43,
+        0xff, 0xa9, 0x22, 0x6b,
+        0x00, 0xe2, 0x46, 0x43,
         0x10, 0x39, 0x73, 0x02,
-        0x04, 0x92, 0x33, 0x7b,
+        0x04, 0x92, 0x47, 0x7b,
         0xfb, 0x92, 0x25, 0x0b,
         0xff, 0xea, 0x72, 0x0a,
-        0x01, 0xa4, 0x2d, 0x6b,
+        0x01, 0xa4, 0x41, 0x6b,
         0x02, 0xa8, 0x9c, 0x32,
-        0x00, 0xe2, 0x7e, 0x59,
-        0x10, 0x92, 0xdd, 0x7a,
-        0xff, 0xea, 0x06, 0x5c,
-        0x00, 0xe2, 0xdc, 0x42,
-        0x04, 0xea, 0x64, 0x59,
+        0x00, 0xe2, 0x88, 0x59,
+        0x10, 0x92, 0xf1, 0x7a,
+        0xff, 0xea, 0x1a, 0x5c,
+        0x00, 0xe2, 0xf0, 0x42,
+        0x04, 0xea, 0x6e, 0x59,
         0x04, 0xea, 0x04, 0x00,
-        0x00, 0xe2, 0xdc, 0x42,
-        0x04, 0xea, 0x64, 0x59,
+        0x00, 0xe2, 0xf0, 0x42,
+        0x04, 0xea, 0x6e, 0x59,
         0x04, 0xea, 0x04, 0x00,
-        0x00, 0xe2, 0x14, 0x42,
-        0x08, 0x92, 0xd5, 0x7a,
-        0xc0, 0x39, 0x49, 0x7b,
-        0x80, 0x39, 0xd5, 0x6a,
-        0xff, 0x88, 0x49, 0x6b,
-        0x40, 0x39, 0xd5, 0x6a,
-        0x10, 0x92, 0x4f, 0x7b,
-        0x0a, 0xea, 0x64, 0x59,
+        0x00, 0xe2, 0x28, 0x42,
+        0x08, 0x92, 0xe9, 0x7a,
+        0xc0, 0x39, 0x5d, 0x7b,
+        0x80, 0x39, 0xe9, 0x6a,
+        0xff, 0x88, 0x5d, 0x6b,
+        0x40, 0x39, 0xe9, 0x6a,
+        0x10, 0x92, 0x63, 0x7b,
+        0x0a, 0xea, 0x6e, 0x59,
         0x0a, 0xea, 0x04, 0x00,
-        0x00, 0xe2, 0x6e, 0x5b,
-        0x00, 0xe2, 0xae, 0x43,
-        0x50, 0x4b, 0x56, 0x6b,
+        0x00, 0xe2, 0x82, 0x5b,
+        0x00, 0xe2, 0xc2, 0x43,
+        0x50, 0x4b, 0x6a, 0x6b,
         0xbf, 0x3a, 0x74, 0x08,
         0x01, 0xe0, 0xf4, 0x31,
         0xff, 0xea, 0xc0, 0x09,
@@ -441,31 +451,31 @@ static uint8_t seqprog[] = {
         0x01, 0xfa, 0xc0, 0x35,
         0x02, 0xa8, 0x90, 0x32,
         0x02, 0xea, 0xb4, 0x00,
-        0x33, 0xea, 0x5e, 0x59,
+        0x33, 0xea, 0x68, 0x59,
         0x33, 0xea, 0x00, 0x00,
         0x02, 0x48, 0x51, 0x31,
         0xff, 0x90, 0x85, 0x68,
-        0xff, 0x88, 0x7b, 0x6b,
-        0x01, 0xa4, 0x77, 0x6b,
-        0x02, 0xa4, 0x7f, 0x6b,
-        0x01, 0x84, 0x7f, 0x7b,
+        0xff, 0x88, 0x8f, 0x6b,
+        0x01, 0xa4, 0x8b, 0x6b,
+        0x02, 0xa4, 0x93, 0x6b,
+        0x01, 0x84, 0x93, 0x7b,
         0x02, 0x28, 0x19, 0x33,
         0x02, 0xa8, 0x50, 0x36,
-        0xff, 0x88, 0x7f, 0x73,
-        0x00, 0xe2, 0x52, 0x5b,
+        0xff, 0x88, 0x93, 0x73,
+        0x00, 0xe2, 0x66, 0x5b,
         0x02, 0xa8, 0x20, 0x33,
         0x04, 0xa4, 0x49, 0x03,
         0xff, 0xea, 0x1a, 0x03,
-        0xff, 0x2d, 0x8b, 0x63,
+        0xff, 0x2d, 0x9f, 0x63,
         0x02, 0xa8, 0x58, 0x32,
         0x02, 0xa8, 0x5c, 0x36,
         0x02, 0xa8, 0x40, 0x31,
         0x02, 0x2e, 0x51, 0x31,
         0x02, 0xa0, 0x18, 0x33,
         0x02, 0xa0, 0x5c, 0x36,
-        0xc0, 0x39, 0xd5, 0x6a,
+        0xc0, 0x39, 0xe9, 0x6a,
         0x04, 0x92, 0x25, 0x03,
-        0x20, 0x92, 0xaf, 0x6b,
+        0x20, 0x92, 0xc3, 0x6b,
         0x02, 0xa8, 0x40, 0x31,
         0xc0, 0x3a, 0xc1, 0x09,
         0x00, 0x3b, 0x51, 0x01,
@@ -480,60 +490,60 @@ static uint8_t seqprog[] = {
         0xf7, 0x57, 0xae, 0x08,
         0x08, 0xea, 0x98, 0x00,
         0x01, 0x44, 0xd4, 0x31,
-        0xee, 0x00, 0xb8, 0x6b,
+        0xee, 0x00, 0xcc, 0x6b,
         0x02, 0xea, 0xb4, 0x00,
         0xc0, 0xea, 0x72, 0x02,
-        0x09, 0x4c, 0xba, 0x7b,
+        0x09, 0x4c, 0xce, 0x7b,
         0x01, 0xea, 0x78, 0x02,
         0x08, 0x4c, 0x06, 0x68,
-        0x0b, 0xea, 0x64, 0x59,
+        0x0b, 0xea, 0x6e, 0x59,
         0x0b, 0xea, 0x04, 0x00,
         0x01, 0x44, 0xd4, 0x31,
-        0x20, 0x39, 0x15, 0x7a,
-        0x00, 0xe2, 0xcc, 0x5b,
-        0x00, 0xe2, 0x14, 0x42,
-        0x01, 0x84, 0xd1, 0x7b,
+        0x20, 0x39, 0x29, 0x7a,
+        0x00, 0xe2, 0xe0, 0x5b,
+        0x00, 0xe2, 0x28, 0x42,
+        0x01, 0x84, 0xe5, 0x7b,
         0x01, 0xa4, 0x49, 0x07,
         0x08, 0x60, 0x30, 0x33,
         0x08, 0x80, 0x41, 0x37,
         0xdf, 0x39, 0x73, 0x0a,
-        0xee, 0x00, 0xde, 0x6b,
+        0xee, 0x00, 0xf2, 0x6b,
         0x05, 0xea, 0xb4, 0x00,
-        0x33, 0xea, 0x5e, 0x59,
+        0x33, 0xea, 0x68, 0x59,
         0x33, 0xea, 0x00, 0x00,
-        0x00, 0xe2, 0x7e, 0x59,
-        0x00, 0xe2, 0xdc, 0x42,
-        0xff, 0x42, 0xee, 0x6b,
-        0x01, 0x41, 0xe2, 0x6b,
-        0x02, 0x41, 0xe2, 0x7b,
-        0xff, 0x42, 0xee, 0x6b,
-        0x01, 0x41, 0xe2, 0x6b,
-        0x02, 0x41, 0xe2, 0x7b,
-        0xff, 0x42, 0xee, 0x7b,
-        0x04, 0x4c, 0xe2, 0x6b,
+        0x00, 0xe2, 0x88, 0x59,
+        0x00, 0xe2, 0xf0, 0x42,
+        0xff, 0x42, 0x02, 0x6c,
+        0x01, 0x41, 0xf6, 0x6b,
+        0x02, 0x41, 0xf6, 0x7b,
+        0xff, 0x42, 0x02, 0x6c,
+        0x01, 0x41, 0xf6, 0x6b,
+        0x02, 0x41, 0xf6, 0x7b,
+        0xff, 0x42, 0x02, 0x7c,
+        0x04, 0x4c, 0xf6, 0x6b,
         0xe0, 0x41, 0x78, 0x0e,
         0x01, 0x44, 0xd4, 0x31,
-        0xff, 0x42, 0xf6, 0x7b,
-        0x04, 0x4c, 0xf6, 0x6b,
+        0xff, 0x42, 0x0a, 0x7c,
+        0x04, 0x4c, 0x0a, 0x6c,
         0xe0, 0x41, 0x78, 0x0a,
-        0xe0, 0x3c, 0x15, 0x62,
+        0xe0, 0x3c, 0x29, 0x62,
         0xff, 0xea, 0xca, 0x09,
         0x01, 0xe2, 0xc8, 0x31,
         0x01, 0x46, 0xda, 0x35,
         0x01, 0x44, 0xd4, 0x35,
         0x10, 0xea, 0x80, 0x00,
         0x01, 0xe2, 0x6e, 0x36,
-        0x04, 0xa6, 0x0e, 0x7c,
+        0x04, 0xa6, 0x22, 0x7c,
         0xff, 0xea, 0x5a, 0x09,
         0xff, 0xea, 0x4c, 0x0d,
-        0x01, 0xa6, 0x3a, 0x6c,
+        0x01, 0xa6, 0x4e, 0x6c,
         0x10, 0xad, 0x84, 0x78,
-        0x80, 0xad, 0x32, 0x6c,
+        0x80, 0xad, 0x46, 0x6c,
         0x08, 0xad, 0x84, 0x68,
-        0x20, 0x19, 0x26, 0x7c,
+        0x20, 0x19, 0x3a, 0x7c,
         0x80, 0xea, 0xb2, 0x01,
         0x11, 0x00, 0x00, 0x10,
-        0x02, 0xa6, 0x22, 0x7c,
+        0x02, 0xa6, 0x36, 0x7c,
         0xff, 0xea, 0xb2, 0x0d,
         0x11, 0x00, 0x00, 0x10,
         0xff, 0xea, 0xb2, 0x09,
@@ -561,7 +571,7 @@ static uint8_t seqprog[] = {
         0x00, 0x86, 0x0d, 0x23,
         0x00, 0x87, 0x0f, 0x23,
         0x01, 0x84, 0xc5, 0x31,
-        0x80, 0x83, 0x5d, 0x7c,
+        0x80, 0x83, 0x71, 0x7c,
         0x02, 0xe2, 0xc4, 0x01,
         0xff, 0xea, 0x4c, 0x09,
         0x01, 0xe2, 0x36, 0x30,
@@ -572,75 +582,75 @@ static uint8_t seqprog[] = {
         0xfe, 0xa6, 0x4c, 0x0d,
         0x0b, 0x98, 0xe1, 0x30,
         0xfd, 0xa4, 0x49, 0x09,
-        0x80, 0xa3, 0x71, 0x7c,
+        0x80, 0xa3, 0x85, 0x7c,
         0x02, 0xa4, 0x48, 0x01,
         0x01, 0xa4, 0x36, 0x30,
         0xa8, 0xea, 0x32, 0x00,
         0xfd, 0xa4, 0x49, 0x0b,
         0x05, 0xa3, 0x07, 0x33,
-        0x80, 0x83, 0x7d, 0x6c,
+        0x80, 0x83, 0x91, 0x6c,
         0x02, 0xea, 0x4c, 0x05,
         0xff, 0xea, 0x4c, 0x0d,
-        0x00, 0xe2, 0x56, 0x59,
-        0x02, 0xa6, 0x10, 0x6c,
+        0x00, 0xe2, 0x60, 0x59,
+        0x02, 0xa6, 0x24, 0x6c,
         0x80, 0xf9, 0xf2, 0x05,
-        0xc0, 0x39, 0x8b, 0x7c,
-        0x03, 0xea, 0x64, 0x59,
+        0xc0, 0x39, 0x9f, 0x7c,
+        0x03, 0xea, 0x6e, 0x59,
         0x03, 0xea, 0x04, 0x00,
-        0x20, 0x39, 0xaf, 0x7c,
-        0x01, 0x84, 0x95, 0x6c,
-        0x06, 0xea, 0x64, 0x59,
+        0x20, 0x39, 0xc3, 0x7c,
+        0x01, 0x84, 0xa9, 0x6c,
+        0x06, 0xea, 0x6e, 0x59,
         0x06, 0xea, 0x04, 0x00,
-        0x00, 0xe2, 0xb2, 0x44,
+        0x00, 0xe2, 0xc6, 0x44,
         0x01, 0x00, 0x6c, 0x32,
-        0xee, 0x00, 0x9e, 0x6c,
+        0xee, 0x00, 0xb2, 0x6c,
         0x05, 0xea, 0xb4, 0x00,
-        0x33, 0xea, 0x5e, 0x59,
+        0x33, 0xea, 0x68, 0x59,
         0x33, 0xea, 0x00, 0x00,
         0x80, 0x3d, 0x7a, 0x00,
-        0xfc, 0x42, 0xa0, 0x7c,
+        0xfc, 0x42, 0xb4, 0x7c,
         0x7f, 0x3d, 0x7a, 0x08,
-        0x00, 0x36, 0x5f, 0x59,
+        0x00, 0x36, 0x69, 0x59,
         0x01, 0x36, 0x01, 0x30,
-        0x09, 0xea, 0x64, 0x59,
+        0x09, 0xea, 0x6e, 0x59,
         0x09, 0xea, 0x04, 0x00,
-        0x00, 0xe2, 0x14, 0x42,
-        0x01, 0xa4, 0x95, 0x6c,
-        0x00, 0xe2, 0x68, 0x5c,
+        0x00, 0xe2, 0x28, 0x42,
+        0x01, 0xa4, 0xa9, 0x6c,
+        0x00, 0xe2, 0x7c, 0x5c,
         0x20, 0x39, 0x73, 0x02,
         0x01, 0x00, 0x6c, 0x32,
-        0x02, 0xa6, 0xba, 0x7c,
-        0x00, 0xe2, 0x7e, 0x5c,
+        0x02, 0xa6, 0xce, 0x7c,
+        0x00, 0xe2, 0x92, 0x5c,
         0x00, 0xe2, 0x76, 0x58,
         0x00, 0xe2, 0x86, 0x58,
         0x00, 0xe2, 0x5a, 0x58,
-        0x00, 0x36, 0x5f, 0x59,
+        0x00, 0x36, 0x69, 0x59,
         0x01, 0x36, 0x01, 0x30,
-        0x20, 0x19, 0xba, 0x6c,
-        0x00, 0xe2, 0xea, 0x5c,
-        0x04, 0x19, 0xd4, 0x6c,
+        0x20, 0x19, 0xce, 0x6c,
+        0x00, 0xe2, 0xfe, 0x5c,
+        0x04, 0x19, 0xe8, 0x6c,
         0x02, 0x19, 0x32, 0x00,
-        0x01, 0x84, 0xd5, 0x7c,
-        0x01, 0x1b, 0xce, 0x7c,
-        0x01, 0x1a, 0xd4, 0x6c,
-        0x00, 0xe2, 0x84, 0x44,
-        0x80, 0x4b, 0xda, 0x6c,
-        0x01, 0x4c, 0xd6, 0x7c,
-        0x03, 0x42, 0x84, 0x6c,
-        0x00, 0xe2, 0x0a, 0x5c,
+        0x01, 0x84, 0xe9, 0x7c,
+        0x01, 0x1b, 0xe2, 0x7c,
+        0x01, 0x1a, 0xe8, 0x6c,
+        0x00, 0xe2, 0x98, 0x44,
+        0x80, 0x4b, 0xee, 0x6c,
+        0x01, 0x4c, 0xea, 0x7c,
+        0x03, 0x42, 0x98, 0x6c,
+        0x00, 0xe2, 0x1e, 0x5c,
         0x80, 0xf9, 0xf2, 0x01,
-        0x04, 0x39, 0x15, 0x7a,
-        0x00, 0xe2, 0x14, 0x42,
-        0x08, 0x5d, 0xf2, 0x6c,
+        0x04, 0x39, 0x29, 0x7a,
+        0x00, 0xe2, 0x28, 0x42,
+        0x08, 0x5d, 0x06, 0x6d,
         0x00, 0xe2, 0x76, 0x58,
-        0x00, 0x36, 0x5f, 0x59,
+        0x00, 0x36, 0x69, 0x59,
         0x01, 0x36, 0x01, 0x30,
-        0x02, 0x1b, 0xe2, 0x7c,
-        0x08, 0x5d, 0xf0, 0x7c,
+        0x02, 0x1b, 0xf6, 0x7c,
+        0x08, 0x5d, 0x04, 0x7d,
         0x03, 0x68, 0x00, 0x37,
         0x01, 0x84, 0x09, 0x07,
-        0x80, 0x1b, 0xfc, 0x7c,
-        0x80, 0x84, 0xfd, 0x6c,
+        0x80, 0x1b, 0x10, 0x7d,
+        0x80, 0x84, 0x11, 0x6d,
         0xff, 0x85, 0x0b, 0x1b,
         0xff, 0x86, 0x0d, 0x23,
         0xff, 0x87, 0x0f, 0x23,
@@ -652,161 +662,164 @@ static uint8_t seqprog[] = {
         0xf9, 0xd9, 0xb2, 0x0d,
         0x01, 0xd9, 0xb2, 0x05,
         0x01, 0x52, 0x48, 0x31,
-        0x20, 0xa4, 0x26, 0x7d,
-        0x20, 0x5b, 0x26, 0x7d,
-        0x80, 0xf9, 0x34, 0x7d,
+        0x20, 0xa4, 0x3a, 0x7d,
+        0x20, 0x5b, 0x3a, 0x7d,
+        0x80, 0xf9, 0x48, 0x7d,
         0x02, 0xea, 0xb4, 0x00,
         0x11, 0x00, 0x00, 0x10,
-        0x04, 0x19, 0x40, 0x7d,
+        0x04, 0x19, 0x54, 0x7d,
         0xdf, 0x19, 0x32, 0x08,
-        0x60, 0x5b, 0x40, 0x6d,
-        0x01, 0x4c, 0x1a, 0x7d,
+        0x60, 0x5b, 0x54, 0x6d,
+        0x01, 0x4c, 0x2e, 0x7d,
         0x20, 0x19, 0x32, 0x00,
         0x01, 0xd9, 0xb2, 0x05,
         0x02, 0xea, 0xb4, 0x00,
         0x01, 0xd9, 0xb2, 0x05,
-        0x10, 0x5b, 0x38, 0x6d,
-        0x08, 0x5b, 0x42, 0x6d,
-        0x20, 0x5b, 0x32, 0x6d,
-        0x02, 0x5b, 0x62, 0x6d,
-        0x0e, 0xea, 0x64, 0x59,
+        0x10, 0x5b, 0x4c, 0x6d,
+        0x08, 0x5b, 0x56, 0x6d,
+        0x20, 0x5b, 0x46, 0x6d,
+        0x02, 0x5b, 0x76, 0x6d,
+        0x0e, 0xea, 0x6e, 0x59,
         0x0e, 0xea, 0x04, 0x00,
-        0x80, 0xf9, 0x22, 0x6d,
+        0x80, 0xf9, 0x36, 0x6d,
         0xdf, 0x5c, 0xb8, 0x08,
         0x01, 0xd9, 0xb2, 0x05,
-        0x01, 0xa4, 0x1d, 0x6e,
-        0x00, 0xe2, 0x68, 0x5c,
-        0x00, 0xe2, 0x6c, 0x5d,
+        0x01, 0xa4, 0x37, 0x6e,
+        0x00, 0xe2, 0x7c, 0x5c,
+        0x00, 0xe2, 0x80, 0x5d,
         0x01, 0x90, 0x21, 0x1b,
         0x01, 0xd9, 0xb2, 0x05,
-        0x00, 0xe2, 0x52, 0x5b,
+        0x00, 0xe2, 0x66, 0x5b,
         0xf3, 0x96, 0xd5, 0x19,
-        0x00, 0xe2, 0x50, 0x55,
-        0x80, 0x96, 0x51, 0x6d,
-        0x0f, 0xea, 0x64, 0x59,
+        0x00, 0xe2, 0x64, 0x55,
+        0x80, 0x96, 0x65, 0x6d,
+        0x0f, 0xea, 0x6e, 0x59,
         0x0f, 0xea, 0x04, 0x00,
-        0x00, 0xe2, 0x58, 0x45,
+        0x00, 0xe2, 0x6c, 0x45,
         0x04, 0x8c, 0xe1, 0x30,
         0x01, 0xea, 0xf2, 0x00,
         0x02, 0xea, 0x36, 0x00,
         0xa8, 0xea, 0x32, 0x00,
-        0xff, 0x97, 0x5f, 0x7d,
-        0x14, 0xea, 0x64, 0x59,
+        0xff, 0x97, 0x73, 0x7d,
+        0x14, 0xea, 0x6e, 0x59,
         0x14, 0xea, 0x04, 0x00,
-        0x00, 0xe2, 0xce, 0x5d,
+        0x00, 0xe2, 0xe2, 0x5d,
         0x01, 0xd9, 0xb2, 0x05,
         0x09, 0x80, 0xe1, 0x30,
         0x02, 0xea, 0x36, 0x00,
         0xa8, 0xea, 0x32, 0x00,
-        0x00, 0xe2, 0xc6, 0x5d,
+        0x00, 0xe2, 0xda, 0x5d,
         0x01, 0xd9, 0xb2, 0x05,
-        0x02, 0xa6, 0x7c, 0x7d,
-        0x00, 0xe2, 0x56, 0x59,
-        0x20, 0x5b, 0x8a, 0x6d,
-        0xfc, 0x42, 0x76, 0x7d,
-        0x10, 0x40, 0x78, 0x6d,
-        0x20, 0x4d, 0x7a, 0x7d,
-        0x08, 0x5d, 0x8a, 0x6d,
-        0x02, 0xa6, 0x10, 0x6c,
-        0x00, 0xe2, 0x56, 0x59,
-        0x20, 0x5b, 0x8a, 0x6d,
-        0x01, 0x1b, 0xaa, 0x6d,
-        0xfc, 0x42, 0x86, 0x7d,
-        0x10, 0x40, 0x88, 0x6d,
+        0x02, 0xa6, 0x90, 0x7d,
+        0x00, 0xe2, 0x60, 0x59,
+        0x20, 0x5b, 0x9e, 0x6d,
+        0xfc, 0x42, 0x8a, 0x7d,
+        0x10, 0x40, 0x8c, 0x6d,
+        0x20, 0x4d, 0x8e, 0x7d,
+        0x08, 0x5d, 0x9e, 0x6d,
+        0x02, 0xa6, 0x24, 0x6c,
+        0x00, 0xe2, 0x60, 0x59,
+        0x20, 0x5b, 0x9e, 0x6d,
+        0x01, 0x1b, 0xbe, 0x6d,
+        0xfc, 0x42, 0x9a, 0x7d,
+        0x10, 0x40, 0x9c, 0x6d,
         0x20, 0x4d, 0x84, 0x78,
         0x08, 0x5d, 0x84, 0x78,
         0x02, 0x19, 0x32, 0x00,
         0x01, 0x5b, 0x40, 0x31,
-        0x00, 0xe2, 0xea, 0x5c,
-        0x00, 0xe2, 0xcc, 0x5b,
+        0x00, 0xe2, 0xfe, 0x5c,
+        0x00, 0xe2, 0xe0, 0x5b,
         0x20, 0xea, 0xb6, 0x00,
-        0x00, 0xe2, 0x0a, 0x5c,
+        0x00, 0xe2, 0x1e, 0x5c,
         0x20, 0x5c, 0xb8, 0x00,
-        0x04, 0x19, 0xa0, 0x6d,
-        0x01, 0x1a, 0xa0, 0x6d,
-        0x00, 0xe2, 0x56, 0x59,
+        0x04, 0x19, 0xb4, 0x6d,
+        0x01, 0x1a, 0xb4, 0x6d,
+        0x00, 0xe2, 0x60, 0x59,
         0x01, 0x1a, 0x84, 0x78,
         0x80, 0xf9, 0xf2, 0x01,
-        0x20, 0xa0, 0x04, 0x7e,
+        0x20, 0xa0, 0x18, 0x7e,
         0xff, 0x90, 0x21, 0x1b,
-        0x08, 0x92, 0x63, 0x6b,
+        0x08, 0x92, 0x77, 0x6b,
         0x02, 0xea, 0xb4, 0x04,
         0x01, 0xa4, 0x49, 0x03,
-        0x40, 0x5b, 0xba, 0x6d,
-        0x00, 0xe2, 0x56, 0x59,
-        0x40, 0x5b, 0xba, 0x6d,
-        0x04, 0x5d, 0x1e, 0x7e,
-        0x01, 0x1a, 0x1e, 0x7e,
+        0x40, 0x5b, 0xce, 0x6d,
+        0x00, 0xe2, 0x60, 0x59,
+        0x40, 0x5b, 0xce, 0x6d,
+        0x04, 0x5d, 0x38, 0x7e,
+        0x01, 0x1a, 0x38, 0x7e,
         0x20, 0x4d, 0x84, 0x78,
-        0x40, 0x5b, 0x04, 0x7e,
-        0x04, 0x5d, 0x1e, 0x7e,
-        0x01, 0x1a, 0x1e, 0x7e,
+        0x40, 0x5b, 0x18, 0x7e,
+        0x04, 0x5d, 0x38, 0x7e,
+        0x01, 0x1a, 0x38, 0x7e,
         0x80, 0xf9, 0xf2, 0x01,
         0xff, 0x90, 0x21, 0x1b,
-        0x08, 0x92, 0x63, 0x6b,
+        0x08, 0x92, 0x77, 0x6b,
         0x02, 0xea, 0xb4, 0x04,
-        0x00, 0xe2, 0x56, 0x59,
+        0x00, 0xe2, 0x60, 0x59,
         0x01, 0x1b, 0x84, 0x78,
         0x80, 0xf9, 0xf2, 0x01,
         0x02, 0xea, 0xb4, 0x04,
-        0x00, 0xe2, 0x56, 0x59,
-        0x01, 0x1b, 0xe2, 0x6d,
-        0x40, 0x5b, 0xf0, 0x7d,
-        0x01, 0x1b, 0xe2, 0x6d,
+        0x00, 0xe2, 0x60, 0x59,
+        0x01, 0x1b, 0xf6, 0x6d,
+        0x40, 0x5b, 0x04, 0x7e,
+        0x01, 0x1b, 0xf6, 0x6d,
         0x02, 0x19, 0x32, 0x00,
         0x01, 0x1a, 0x84, 0x78,
         0x80, 0xf9, 0xf2, 0x01,
         0xff, 0xea, 0x10, 0x03,
         0x08, 0x92, 0x25, 0x03,
-        0x00, 0xe2, 0x62, 0x43,
-        0x01, 0x1a, 0xec, 0x7d,
-        0x40, 0x5b, 0xe8, 0x7d,
-        0x01, 0x1a, 0xd6, 0x6d,
+        0x00, 0xe2, 0x76, 0x43,
+        0x01, 0x1a, 0x00, 0x7e,
+        0x40, 0x5b, 0xfc, 0x7d,
+        0x01, 0x1a, 0xea, 0x6d,
         0xfc, 0x42, 0x84, 0x78,
-        0x01, 0x1a, 0xf0, 0x6d,
-        0x10, 0xea, 0x64, 0x59,
+        0x01, 0x1a, 0x04, 0x6e,
+        0x10, 0xea, 0x6e, 0x59,
         0x10, 0xea, 0x04, 0x00,
         0xfc, 0x42, 0x84, 0x78,
-        0x10, 0x40, 0xf6, 0x6d,
+        0x10, 0x40, 0x0a, 0x6e,
         0x20, 0x4d, 0x84, 0x78,
-        0x40, 0x5b, 0xd6, 0x6d,
+        0x40, 0x5b, 0xea, 0x6d,
         0x01, 0x1a, 0x84, 0x78,
         0x01, 0x90, 0x21, 0x1b,
         0x30, 0x3f, 0xc0, 0x09,
         0x30, 0xe0, 0x84, 0x60,
         0x40, 0x4b, 0x84, 0x68,
         0xff, 0xea, 0x52, 0x01,
-        0xee, 0x00, 0x0c, 0x6e,
+        0xee, 0x00, 0x20, 0x6e,
         0x80, 0xf9, 0xf2, 0x01,
         0xff, 0x90, 0x21, 0x1b,
         0x02, 0xea, 0xb4, 0x00,
         0x20, 0xea, 0x9a, 0x00,
-        0xf3, 0x42, 0x16, 0x6e,
-        0x12, 0xea, 0x64, 0x59,
+        0x04, 0x41, 0x26, 0x7e,
+        0x08, 0xea, 0x98, 0x00,
+        0x08, 0x57, 0xae, 0x00,
+        0xf3, 0x42, 0x30, 0x6e,
+        0x12, 0xea, 0x6e, 0x59,
         0x12, 0xea, 0x04, 0x00,
-        0x00, 0xe2, 0x14, 0x42,
-        0x0d, 0xea, 0x64, 0x59,
+        0x00, 0xe2, 0x28, 0x42,
+        0x0d, 0xea, 0x6e, 0x59,
         0x0d, 0xea, 0x04, 0x00,
-        0x00, 0xe2, 0x14, 0x42,
+        0x00, 0xe2, 0x28, 0x42,
         0x01, 0x90, 0x21, 0x1b,
-        0x11, 0xea, 0x64, 0x59,
+        0x11, 0xea, 0x6e, 0x59,
         0x11, 0xea, 0x04, 0x00,
-        0x00, 0xe2, 0x52, 0x5b,
+        0x00, 0xe2, 0x66, 0x5b,
         0x08, 0x5a, 0xb4, 0x00,
-        0x00, 0xe2, 0x44, 0x5e,
+        0x00, 0xe2, 0x5e, 0x5e,
         0xa8, 0xea, 0x32, 0x00,
-        0x00, 0xe2, 0x56, 0x59,
-        0x80, 0x1a, 0x32, 0x7e,
-        0x00, 0xe2, 0x44, 0x5e,
+        0x00, 0xe2, 0x60, 0x59,
+        0x80, 0x1a, 0x4c, 0x7e,
+        0x00, 0xe2, 0x5e, 0x5e,
         0x80, 0x19, 0x32, 0x00,
-        0x40, 0x5b, 0x38, 0x6e,
-        0x08, 0x5a, 0x38, 0x7e,
+        0x40, 0x5b, 0x52, 0x6e,
+        0x08, 0x5a, 0x52, 0x7e,
         0x20, 0x4d, 0x84, 0x78,
         0x02, 0x84, 0x09, 0x03,
-        0x40, 0x5b, 0x04, 0x7e,
+        0x40, 0x5b, 0x18, 0x7e,
         0xff, 0x90, 0x21, 0x1b,
         0x80, 0xf9, 0xf2, 0x01,
-        0x08, 0x92, 0x63, 0x6b,
+        0x08, 0x92, 0x77, 0x6b,
         0x02, 0xea, 0xb4, 0x04,
         0x01, 0x40, 0xe1, 0x30,
         0x05, 0x41, 0xe3, 0x98,
@@ -1039,138 +1052,138 @@ static struct patch {
         { ahd_patch0_func, 64, 1, 1 },
         { ahd_patch2_func, 67, 1, 2 },
         { ahd_patch0_func, 68, 1, 1 },
-        { ahd_patch4_func, 116, 1, 1 },
-        { ahd_patch2_func, 175, 3, 1 },
-        { ahd_patch1_func, 178, 2, 1 },
-        { ahd_patch5_func, 180, 1, 1 },
-        { ahd_patch2_func, 189, 1, 2 },
-        { ahd_patch0_func, 190, 1, 1 },
-        { ahd_patch6_func, 191, 2, 2 },
-        { ahd_patch0_func, 193, 6, 3 },
-        { ahd_patch2_func, 196, 1, 2 },
-        { ahd_patch0_func, 197, 1, 1 },
-        { ahd_patch2_func, 200, 1, 2 },
-        { ahd_patch0_func, 201, 1, 1 },
-        { ahd_patch3_func, 203, 1, 1 },
-        { ahd_patch7_func, 204, 3, 1 },
-        { ahd_patch3_func, 213, 1, 1 },
-        { ahd_patch5_func, 214, 16, 2 },
-        { ahd_patch0_func, 230, 1, 1 },
-        { ahd_patch8_func, 250, 2, 1 },
-        { ahd_patch1_func, 254, 1, 2 },
-        { ahd_patch0_func, 255, 1, 1 },
-        { ahd_patch7_func, 258, 3, 1 },
-        { ahd_patch1_func, 273, 1, 2 },
-        { ahd_patch0_func, 274, 1, 1 },
-        { ahd_patch1_func, 277, 1, 2 },
-        { ahd_patch0_func, 278, 1, 1 },
-        { ahd_patch2_func, 281, 1, 2 },
-        { ahd_patch0_func, 282, 1, 1 },
-        { ahd_patch9_func, 295, 2, 2 },
-        { ahd_patch0_func, 297, 1, 1 },
-        { ahd_patch1_func, 339, 1, 2 },
-        { ahd_patch0_func, 340, 1, 1 },
-        { ahd_patch2_func, 348, 1, 2 },
-        { ahd_patch0_func, 349, 1, 1 },
-        { ahd_patch2_func, 352, 1, 2 },
-        { ahd_patch0_func, 353, 1, 1 },
-        { ahd_patch1_func, 359, 1, 2 },
-        { ahd_patch0_func, 360, 1, 1 },
-        { ahd_patch1_func, 362, 1, 2 },
+        { ahd_patch4_func, 115, 1, 1 },
+        { ahd_patch2_func, 180, 3, 1 },
+        { ahd_patch1_func, 183, 2, 1 },
+        { ahd_patch5_func, 185, 1, 1 },
+        { ahd_patch2_func, 194, 1, 2 },
+        { ahd_patch0_func, 195, 1, 1 },
+        { ahd_patch6_func, 196, 2, 2 },
+        { ahd_patch0_func, 198, 6, 3 },
+        { ahd_patch2_func, 201, 1, 2 },
+        { ahd_patch0_func, 202, 1, 1 },
+        { ahd_patch2_func, 205, 1, 2 },
+        { ahd_patch0_func, 206, 1, 1 },
+        { ahd_patch3_func, 208, 1, 1 },
+        { ahd_patch7_func, 209, 3, 1 },
+        { ahd_patch3_func, 218, 1, 1 },
+        { ahd_patch5_func, 219, 16, 2 },
+        { ahd_patch0_func, 235, 1, 1 },
+        { ahd_patch8_func, 260, 2, 1 },
+        { ahd_patch1_func, 264, 1, 2 },
+        { ahd_patch0_func, 265, 1, 1 },
+        { ahd_patch7_func, 268, 3, 1 },
+        { ahd_patch1_func, 283, 1, 2 },
+        { ahd_patch0_func, 284, 1, 1 },
+        { ahd_patch1_func, 287, 1, 2 },
+        { ahd_patch0_func, 288, 1, 1 },
+        { ahd_patch2_func, 291, 1, 2 },
+        { ahd_patch0_func, 292, 1, 1 },
+        { ahd_patch9_func, 305, 2, 2 },
+        { ahd_patch0_func, 307, 1, 1 },
+        { ahd_patch1_func, 349, 1, 2 },
+        { ahd_patch0_func, 350, 1, 1 },
+        { ahd_patch2_func, 358, 1, 2 },
+        { ahd_patch0_func, 359, 1, 1 },
+        { ahd_patch2_func, 362, 1, 2 },
         { ahd_patch0_func, 363, 1, 1 },
-        { ahd_patch10_func, 382, 1, 1 },
-        { ahd_patch10_func, 385, 1, 1 },
-        { ahd_patch10_func, 387, 1, 1 },
-        { ahd_patch10_func, 399, 1, 1 },
-        { ahd_patch1_func, 409, 1, 2 },
-        { ahd_patch0_func, 410, 1, 1 },
-        { ahd_patch1_func, 412, 1, 2 },
-        { ahd_patch0_func, 413, 1, 1 },
-        { ahd_patch1_func, 421, 1, 2 },
-        { ahd_patch0_func, 422, 1, 1 },
-        { ahd_patch2_func, 435, 1, 2 },
-        { ahd_patch0_func, 436, 1, 1 },
-        { ahd_patch11_func, 472, 1, 1 },
-        { ahd_patch1_func, 480, 1, 2 },
-        { ahd_patch0_func, 481, 1, 1 },
-        { ahd_patch2_func, 493, 1, 2 },
-        { ahd_patch0_func, 494, 1, 1 },
-        { ahd_patch12_func, 497, 6, 2 },
-        { ahd_patch0_func, 503, 1, 1 },
-        { ahd_patch13_func, 524, 7, 1 },
-        { ahd_patch14_func, 533, 1, 1 },
-        { ahd_patch15_func, 542, 1, 1 },
-        { ahd_patch16_func, 543, 1, 2 },
-        { ahd_patch0_func, 544, 1, 1 },
-        { ahd_patch17_func, 547, 1, 1 },
-        { ahd_patch16_func, 548, 1, 1 },
-        { ahd_patch18_func, 559, 1, 2 },
-        { ahd_patch0_func, 560, 1, 1 },
-        { ahd_patch1_func, 579, 1, 2 },
-        { ahd_patch0_func, 580, 1, 1 },
-        { ahd_patch1_func, 583, 1, 2 },
-        { ahd_patch0_func, 584, 1, 1 },
-        { ahd_patch2_func, 589, 1, 2 },
+        { ahd_patch1_func, 369, 1, 2 },
+        { ahd_patch0_func, 370, 1, 1 },
+        { ahd_patch1_func, 372, 1, 2 },
+        { ahd_patch0_func, 373, 1, 1 },
+        { ahd_patch10_func, 392, 1, 1 },
+        { ahd_patch10_func, 395, 1, 1 },
+        { ahd_patch10_func, 397, 1, 1 },
+        { ahd_patch10_func, 409, 1, 1 },
+        { ahd_patch1_func, 419, 1, 2 },
+        { ahd_patch0_func, 420, 1, 1 },
+        { ahd_patch1_func, 422, 1, 2 },
+        { ahd_patch0_func, 423, 1, 1 },
+        { ahd_patch1_func, 431, 1, 2 },
+        { ahd_patch0_func, 432, 1, 1 },
+        { ahd_patch2_func, 445, 1, 2 },
+        { ahd_patch0_func, 446, 1, 1 },
+        { ahd_patch11_func, 482, 1, 1 },
+        { ahd_patch1_func, 490, 1, 2 },
+        { ahd_patch0_func, 491, 1, 1 },
+        { ahd_patch2_func, 503, 1, 2 },
+        { ahd_patch0_func, 504, 1, 1 },
+        { ahd_patch12_func, 507, 6, 2 },
+        { ahd_patch0_func, 513, 1, 1 },
+        { ahd_patch13_func, 534, 7, 1 },
+        { ahd_patch14_func, 543, 1, 1 },
+        { ahd_patch15_func, 552, 1, 1 },
+        { ahd_patch16_func, 553, 1, 2 },
+        { ahd_patch0_func, 554, 1, 1 },
+        { ahd_patch17_func, 557, 1, 1 },
+        { ahd_patch16_func, 558, 1, 1 },
+        { ahd_patch18_func, 569, 1, 2 },
+        { ahd_patch0_func, 570, 1, 1 },
+        { ahd_patch1_func, 589, 1, 2 },
         { ahd_patch0_func, 590, 1, 1 },
-        { ahd_patch2_func, 594, 1, 2 },
-        { ahd_patch0_func, 595, 1, 1 },
-        { ahd_patch1_func, 596, 1, 2 },
-        { ahd_patch0_func, 597, 1, 1 },
-        { ahd_patch2_func, 608, 1, 2 },
-        { ahd_patch0_func, 609, 1, 1 },
-        { ahd_patch19_func, 613, 1, 1 },
-        { ahd_patch20_func, 618, 1, 1 },
-        { ahd_patch21_func, 619, 2, 1 },
-        { ahd_patch20_func, 623, 1, 2 },
-        { ahd_patch0_func, 624, 1, 1 },
-        { ahd_patch2_func, 627, 1, 2 },
-        { ahd_patch0_func, 628, 1, 1 },
-        { ahd_patch2_func, 643, 1, 2 },
-        { ahd_patch0_func, 644, 1, 1 },
-        { ahd_patch13_func, 645, 14, 1 },
-        { ahd_patch1_func, 663, 1, 2 },
-        { ahd_patch0_func, 664, 1, 1 },
-        { ahd_patch13_func, 665, 1, 1 },
-        { ahd_patch1_func, 677, 1, 2 },
-        { ahd_patch0_func, 678, 1, 1 },
-        { ahd_patch1_func, 685, 1, 2 },
-        { ahd_patch0_func, 686, 1, 1 },
-        { ahd_patch19_func, 709, 1, 1 },
-        { ahd_patch19_func, 747, 1, 1 },
-        { ahd_patch1_func, 758, 1, 2 },
-        { ahd_patch0_func, 759, 1, 1 },
-        { ahd_patch1_func, 776, 1, 2 },
-        { ahd_patch0_func, 777, 1, 1 },
-        { ahd_patch1_func, 779, 1, 2 },
-        { ahd_patch0_func, 780, 1, 1 },
-        { ahd_patch1_func, 783, 1, 2 },
-        { ahd_patch0_func, 784, 1, 1 },
-        { ahd_patch22_func, 786, 1, 2 },
-        { ahd_patch0_func, 787, 2, 1 },
-        { ahd_patch23_func, 790, 4, 2 },
-        { ahd_patch0_func, 794, 1, 1 },
-        { ahd_patch23_func, 802, 11, 1 }
+        { ahd_patch1_func, 593, 1, 2 },
+        { ahd_patch0_func, 594, 1, 1 },
+        { ahd_patch2_func, 599, 1, 2 },
+        { ahd_patch0_func, 600, 1, 1 },
+        { ahd_patch2_func, 604, 1, 2 },
+        { ahd_patch0_func, 605, 1, 1 },
+        { ahd_patch1_func, 606, 1, 2 },
+        { ahd_patch0_func, 607, 1, 1 },
+        { ahd_patch2_func, 618, 1, 2 },
+        { ahd_patch0_func, 619, 1, 1 },
+        { ahd_patch19_func, 623, 1, 1 },
+        { ahd_patch20_func, 628, 1, 1 },
+        { ahd_patch21_func, 629, 2, 1 },
+        { ahd_patch20_func, 633, 1, 2 },
+        { ahd_patch0_func, 634, 1, 1 },
+        { ahd_patch2_func, 637, 1, 2 },
+        { ahd_patch0_func, 638, 1, 1 },
+        { ahd_patch2_func, 653, 1, 2 },
+        { ahd_patch0_func, 654, 1, 1 },
+        { ahd_patch13_func, 655, 14, 1 },
+        { ahd_patch1_func, 673, 1, 2 },
+        { ahd_patch0_func, 674, 1, 1 },
+        { ahd_patch13_func, 675, 1, 1 },
+        { ahd_patch1_func, 687, 1, 2 },
+        { ahd_patch0_func, 688, 1, 1 },
+        { ahd_patch1_func, 695, 1, 2 },
+        { ahd_patch0_func, 696, 1, 1 },
+        { ahd_patch19_func, 719, 1, 1 },
+        { ahd_patch19_func, 757, 1, 1 },
+        { ahd_patch1_func, 768, 1, 2 },
+        { ahd_patch0_func, 769, 1, 1 },
+        { ahd_patch7_func, 785, 3, 1 },
+        { ahd_patch1_func, 789, 1, 2 },
+        { ahd_patch0_func, 790, 1, 1 },
+        { ahd_patch1_func, 792, 1, 2 },
+        { ahd_patch0_func, 793, 1, 1 },
+        { ahd_patch1_func, 796, 1, 2 },
+        { ahd_patch0_func, 797, 1, 1 },
+        { ahd_patch22_func, 799, 1, 2 },
+        { ahd_patch0_func, 800, 2, 1 },
+        { ahd_patch23_func, 803, 4, 2 },
+        { ahd_patch0_func, 807, 1, 1 },
+        { ahd_patch23_func, 815, 11, 1 }
 };
 
 static struct cs {
         uint16_t        begin;
         uint16_t        end;
 } critical_sections[] = {
-        { 17, 28 },
-        { 29, 30 },
+        { 17, 30 },
         { 47, 58 },
         { 61, 63 },
         { 65, 66 },
         { 72, 92 },
-        { 110, 137 },
-        { 138, 175 },
-        { 180, 188 },
-        { 213, 264 },
-        { 425, 433 },
-        { 443, 445 },
-        { 448, 457 },
-        { 709, 739 },
-        { 749, 753 }
+        { 110, 142 },
+        { 143, 180 },
+        { 185, 193 },
+        { 218, 274 },
+        { 435, 443 },
+        { 453, 455 },
+        { 458, 467 },
+        { 719, 749 },
+        { 759, 763 }
 };
 
 static const int num_critical_sections = sizeof(critical_sections)
diff --git a/drivers/scsi/aic7xxx/aicasm/aicasm.c b/drivers/scsi/aic7xxx/aicasm/aicasm.c
index f936b691232f..924102720b14 100644
--- a/drivers/scsi/aic7xxx/aicasm/aicasm.c
+++ b/drivers/scsi/aic7xxx/aicasm/aicasm.c
@@ -37,7 +37,7 @@
  * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGES.
  *
- * $Id: //depot/aic7xxx/aic7xxx/aicasm/aicasm.c#22 $
+ * $Id: //depot/aic7xxx/aic7xxx/aicasm/aicasm.c#23 $
  *
  * $FreeBSD$
  */
@@ -609,10 +609,10 @@ output_listing(char *ifilename)
 
                 while (line < cur_instr->srcline) {
                         fgets(buf, sizeof(buf), ifile);
-                                fprintf(listfile, "\t\t%s", buf);
+                                fprintf(listfile, "             \t%s", buf);
                                 line++;
                 }
-                fprintf(listfile, "%03x %02x%02x%02x%02x", instrptr,
+                fprintf(listfile, "%04x %02x%02x%02x%02x", instrptr,
 #ifdef __LITTLE_ENDIAN
                         cur_instr->format.bytes[0],
                         cur_instr->format.bytes[1],
@@ -624,14 +624,23 @@ output_listing(char *ifilename)
                         cur_instr->format.bytes[1],
                         cur_instr->format.bytes[0]);
 #endif
-                fgets(buf, sizeof(buf), ifile);
-                fprintf(listfile, "\t%s", buf);
-                line++;
+                /*
+                 * Macro expansions can cause several instructions
+                 * to be output for a single source line.  Only
+                 * advance the line once in these cases.
+                 */
+                if (line == cur_instr->srcline) {
+                        fgets(buf, sizeof(buf), ifile);
+                        fprintf(listfile, "\t%s", buf);
+                        line++;
+                } else {
+                        fprintf(listfile, "\n");
+                }
                 instrptr++;
         }
         /* Dump the remainder of the file */
         while(fgets(buf, sizeof(buf), ifile) != NULL)
-                fprintf(listfile, "\t\t%s", buf);
+                fprintf(listfile, "             %s", buf);
 
         fclose(ifile);
 }
diff --git a/drivers/scsi/aic7xxx/aicasm/aicasm_gram.y b/drivers/scsi/aic7xxx/aicasm/aicasm_gram.y
index 67e046d96625..c328596def3c 100644
--- a/drivers/scsi/aic7xxx/aicasm/aicasm_gram.y
+++ b/drivers/scsi/aic7xxx/aicasm/aicasm_gram.y
@@ -38,7 +38,7 @@
  * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGES.
  *
- * $Id: //depot/aic7xxx/aic7xxx/aicasm/aicasm_gram.y#29 $
+ * $Id: //depot/aic7xxx/aic7xxx/aicasm/aicasm_gram.y#30 $
  *
  * $FreeBSD$
  */
@@ -157,6 +157,8 @@ static int  is_download_const(expression_t *immed);
 
 %token T_END_CS
 
+%token T_PAD_PAGE
+
 %token T_FIELD
 
 %token T_ENUM
@@ -189,6 +191,10 @@ static int  is_download_const(expression_t *immed);
 
 %token <value> T_OR
 
+/* 16 bit extensions */
+%token <value> T_OR16 T_AND16 T_XOR16 T_ADD16
+%token <value> T_ADC16 T_MVI16 T_TEST16 T_CMP16 T_CMPXCHG
+
 %token T_RET
 
 %token T_NOP
@@ -207,7 +213,7 @@ static int  is_download_const(expression_t *immed);
 
 %type <expression> expression immediate immediate_or_a
 
-%type <value> export ret f1_opcode f2_opcode jmp_jc_jnc_call jz_jnz je_jne
+%type <value> export ret f1_opcode f2_opcode f4_opcode jmp_jc_jnc_call jz_jnz je_jne
 
 %type <value> mode_value mode_list macro_arglist
 
@@ -1304,6 +1310,15 @@ f2_opcode:
 |       T_ROR { $$ = AIC_OP_ROR; }
 ;
 
+f4_opcode:
+        T_OR16  { $$ = AIC_OP_OR16; }
+|       T_AND16 { $$ = AIC_OP_AND16; }
+|       T_XOR16 { $$ = AIC_OP_XOR16; }
+|       T_ADD16 { $$ = AIC_OP_ADD16; }
+|       T_ADC16 { $$ = AIC_OP_ADC16; }
+|       T_MVI16 { $$ = AIC_OP_MVI16; }
+;
+
 code:
         f2_opcode destination ',' expression opt_source ret ';'
         {
diff --git a/drivers/scsi/aic7xxx/aicasm/aicasm_insformat.h b/drivers/scsi/aic7xxx/aicasm/aicasm_insformat.h
index e64f802bbaaa..9df9e2ce3538 100644
--- a/drivers/scsi/aic7xxx/aicasm/aicasm_insformat.h
+++ b/drivers/scsi/aic7xxx/aicasm/aicasm_insformat.h
@@ -37,13 +37,14 @@
  * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGES.
  *
- * $Id: //depot/aic7xxx/aic7xxx/aicasm/aicasm_insformat.h#11 $
+ * $Id: //depot/aic7xxx/aic7xxx/aicasm/aicasm_insformat.h#12 $
  *
  * $FreeBSD$
  */
 
 #include <asm/byteorder.h>
 
+/* 8bit ALU logic operations */
 struct ins_format1 {
 #ifdef __LITTLE_ENDIAN
         uint32_t        immediate       : 8,
@@ -62,6 +63,7 @@ struct ins_format1 {
 #endif
 };
 
+/* 8bit ALU shift/rotate operations */
 struct ins_format2 {
 #ifdef __LITTLE_ENDIAN
         uint32_t        shift_control   : 8,
@@ -80,6 +82,7 @@ struct ins_format2 {
 #endif
 };
 
+/* 8bit branch control operations */
 struct ins_format3 {
 #ifdef __LITTLE_ENDIAN
         uint32_t        immediate       : 8,
@@ -96,10 +99,68 @@ struct ins_format3 {
 #endif
 };
 
+/* 16bit ALU logic operations */
+struct ins_format4 {
+#ifdef __LITTLE_ENDIAN
+        uint32_t        opcode_ext      : 8,
+                        source          : 9,
+                        destination     : 9,
+                        ret             : 1,
+                        opcode          : 4,
+                        parity          : 1;
+#else
+        uint32_t        parity          : 1,
+                        opcode          : 4,
+                        ret             : 1,
+                        destination     : 9,
+                        source          : 9,
+                        opcode_ext      : 8;
+#endif
+};
+
+/* 16bit branch control operations */
+struct ins_format5 {
+#ifdef __LITTLE_ENDIAN
+        uint32_t        opcode_ext      : 8,
+                        source          : 9,
+                        address         : 10,
+                        opcode          : 4,
+                        parity          : 1;
+#else
+        uint32_t        parity          : 1,
+                        opcode          : 4,
+                        address         : 10,
+                        source          : 9,
+                        opcode_ext      : 8;
+#endif
+};
+
+/*  Far branch operations */
+struct ins_format6 {
+#ifdef __LITTLE_ENDIAN
+        uint32_t        page            : 3,
+                        opcode_ext      : 5,
+                        source          : 9,
+                        address         : 10,
+                        opcode          : 4,
+                        parity          : 1;
+#else
+        uint32_t        parity          : 1,
+                        opcode          : 4,
+                        address         : 10,
+                        source          : 9,
+                        opcode_ext      : 5,
+                        page            : 3;
+#endif
+};
+
 union ins_formats {
                 struct ins_format1 format1;
                 struct ins_format2 format2;
                 struct ins_format3 format3;
+                struct ins_format4 format4;
+                struct ins_format5 format5;
+                struct ins_format6 format6;
                 uint8_t            bytes[4];
                 uint32_t           integer;
 };
@@ -118,6 +179,8 @@ struct instruction {
 #define AIC_OP_ROL      0x5
 #define AIC_OP_BMOV     0x6
 
+#define AIC_OP_MVI16    0x7
+
 #define AIC_OP_JMP      0x8
 #define AIC_OP_JC       0x9
 #define AIC_OP_JNC      0xa
@@ -131,3 +194,26 @@ struct instruction {
 #define AIC_OP_SHL      0x10
 #define AIC_OP_SHR      0x20
 #define AIC_OP_ROR      0x30
+
+/* 16bit Ops. Low byte main opcode.  High byte extended opcode. */ 
+#define AIC_OP_OR16     0x8005
+#define AIC_OP_AND16    0x8105
+#define AIC_OP_XOR16    0x8205
+#define AIC_OP_ADD16    0x8305
+#define AIC_OP_ADC16    0x8405
+#define AIC_OP_JNE16    0x8805
+#define AIC_OP_JNZ16    0x8905
+#define AIC_OP_JE16     0x8C05
+#define AIC_OP_JZ16     0x8B05
+#define AIC_OP_JMP16    0x9005
+#define AIC_OP_JC16     0x9105
+#define AIC_OP_JNC16    0x9205
+#define AIC_OP_CALL16   0x9305
+#define AIC_OP_CALL16   0x9305
+
+/* Page extension is low three bits of second opcode byte. */
+#define AIC_OP_JMPF     0xA005
+#define AIC_OP_CALLF    0xB005
+#define AIC_OP_JCF      0xC005
+#define AIC_OP_JNCF     0xD005
+#define AIC_OP_CMPXCHG  0xE005
diff --git a/drivers/scsi/aic7xxx/aicasm/aicasm_scan.l b/drivers/scsi/aic7xxx/aicasm/aicasm_scan.l
index 45c0b233d0bc..7c3983f868a9 100644
--- a/drivers/scsi/aic7xxx/aicasm/aicasm_scan.l
+++ b/drivers/scsi/aic7xxx/aicasm/aicasm_scan.l
@@ -38,7 +38,7 @@
  * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGES.
  *
- * $Id: //depot/aic7xxx/aic7xxx/aicasm/aicasm_scan.l#19 $
+ * $Id: //depot/aic7xxx/aic7xxx/aicasm/aicasm_scan.l#20 $
  *
  * $FreeBSD$
  */
@@ -132,7 +132,7 @@ if[ \t]*\(		{
                                                 *string_buf_ptr++ = *yptr++;
                                 }
                         }
-
+else                    { return T_ELSE; }
 VERSION                 { return T_VERSION; }
 PREFIX                  { return T_PREFIX; }
 PATCH_ARG_LIST          { return T_PATCH_ARG_LIST; }
@@ -173,10 +173,6 @@ RW|RO|WO		{
                                         yylval.value = WO;
                                  return T_MODE;
                         }
-BEGIN_CRITICAL          { return T_BEGIN_CS; }
-END_CRITICAL            { return T_END_CS; }
-SET_SRC_MODE            { return T_SET_SRC_MODE; }
-SET_DST_MODE            { return T_SET_DST_MODE; }
 field                   { return T_FIELD; }
 enum                    { return T_ENUM; }
 mask                    { return T_MASK; }
@@ -192,6 +188,13 @@ none			{ return T_NONE; }
 sindex                  { return T_SINDEX; }
 A                       { return T_A; }
 
+        /* Instruction Formatting */
+PAD_PAGE                { return T_PAD_PAGE; }
+BEGIN_CRITICAL          { return T_BEGIN_CS; }
+END_CRITICAL            { return T_END_CS; }
+SET_SRC_MODE            { return T_SET_SRC_MODE; }
+SET_DST_MODE            { return T_SET_DST_MODE; }
+
         /* Opcodes */
 shl                     { return T_SHL; }
 shr                     { return T_SHR; }
@@ -223,7 +226,17 @@ and			{ return T_AND;	}
 or                      { return T_OR;  }
 ret                     { return T_RET; }
 nop                     { return T_NOP; }
-else                    { return T_ELSE; }
+
+        /* ARP2 16bit extensions */
+or16                    { return T_OR16; }
+and16                   { return T_AND16; }
+xor16                   { return T_XOR16; }
+add16                   { return T_ADD16; }
+adc16                   { return T_ADC16; }
+mvi16                   { return T_MVI16; }
+test16                  { return T_TEST16; }
+cmp16                   { return T_CMP16; }
+cmpxchg                 { return T_CMPXCHG; }
 
         /* Allowed Symbols */
 \<\<                    { return T_EXPR_LSHIFT; }
diff --git a/drivers/scsi/ata_piix.c b/drivers/scsi/ata_piix.c
index 19d8d4ba6a1e..49cc4209fe16 100644
--- a/drivers/scsi/ata_piix.c
+++ b/drivers/scsi/ata_piix.c
@@ -630,6 +630,7 @@ static int piix_disable_ahci(struct pci_dev *pdev)
 
 /**
  *      piix_check_450nx_errata -       Check for problem 450NX setup
+ *      @ata_dev: the PCI device to check
  *      
  *      Check for the present of 450NX errata #19 and errata #25. If
  *      they are found return an error code so we can turn off DMA
@@ -713,7 +714,7 @@ static int piix_init_one (struct pci_dev *pdev, const struct pci_device_id *ent)
                 pci_read_config_byte(pdev, ICH5_PMR, &tmp);
 
                 if (host_flags & PIIX_FLAG_COMBINED_ICH6) {
-                        switch (tmp) {
+                        switch (tmp & 0x3) {
                         case 0:
                                 break;
                         case 1:
diff --git a/drivers/scsi/dc395x.c b/drivers/scsi/dc395x.c
index c8a32cf47d73..cbf825263f3b 100644
--- a/drivers/scsi/dc395x.c
+++ b/drivers/scsi/dc395x.c
@@ -246,6 +246,7 @@ struct ScsiReqBlk {
          * total_xfer_length in xferred. These values are restored in
          * pci_unmap_srb_sense. This is the only place xferred is used.
          */
+        unsigned char *virt_addr_req;   /* Saved virtual address of the request buffer */
         u32 xferred;                    /* Saved copy of total_xfer_length */
 
         u16 state;
@@ -2017,7 +2018,7 @@ static void sg_update_list(struct ScsiReqBlk *srb, u32 left)
         sg_verify_length(srb);
 
         /* we need the corresponding virtual address */
-        if (!segment) {
+        if (!segment || (srb->flag & AUTO_REQSENSE)) {
                 srb->virt_addr += xferred;
                 return;
         }
@@ -3318,6 +3319,7 @@ static void pci_unmap_srb_sense(struct AdapterCtlBlk *acb,
             srb->segment_x[DC395x_MAX_SG_LISTENTRY - 1].address;
         srb->segment_x[0].length =
             srb->segment_x[DC395x_MAX_SG_LISTENTRY - 1].length;
+        srb->virt_addr = srb->virt_addr_req;
 }
 
 
@@ -3711,6 +3713,8 @@ static void request_sense(struct AdapterCtlBlk *acb, struct DeviceCtlBlk *dcb,
         srb->xferred = srb->total_xfer_length;
         /* srb->segment_x : a one entry of S/G list table */
         srb->total_xfer_length = sizeof(cmd->sense_buffer);
+        srb->virt_addr_req = srb->virt_addr;
+        srb->virt_addr = cmd->sense_buffer;
         srb->segment_x[0].length = sizeof(cmd->sense_buffer);
         /* Map sense buffer */
         srb->segment_x[0].address =
diff --git a/drivers/scsi/ibmvscsi/ibmvscsi.c b/drivers/scsi/ibmvscsi/ibmvscsi.c
index 822b9fa706f3..eaefeddb2b4a 100644
--- a/drivers/scsi/ibmvscsi/ibmvscsi.c
+++ b/drivers/scsi/ibmvscsi/ibmvscsi.c
@@ -87,7 +87,7 @@ static int max_channel = 3;
 static int init_timeout = 5;
 static int max_requests = 50;
 
-#define IBMVSCSI_VERSION "1.5.7"
+#define IBMVSCSI_VERSION "1.5.8"
 
 MODULE_DESCRIPTION("IBM Virtual SCSI");
 MODULE_AUTHOR("Dave Boutcher");
@@ -534,7 +534,6 @@ static int map_data_for_srp_cmd(struct scsi_cmnd *cmd,
 static int ibmvscsi_send_srp_event(struct srp_event_struct *evt_struct,
                                    struct ibmvscsi_host_data *hostdata)
 {
-        struct scsi_cmnd *cmnd;
         u64 *crq_as_u64 = (u64 *) &evt_struct->crq;
         int rc;
 
@@ -544,19 +543,8 @@ static int ibmvscsi_send_srp_event(struct srp_event_struct *evt_struct,
          * can handle more requests (can_queue) when we actually can't
          */
         if ((evt_struct->crq.format == VIOSRP_SRP_FORMAT) &&
-            (atomic_dec_if_positive(&hostdata->request_limit) < 0)) {
-                /* See if the adapter is disabled */
-                if (atomic_read(&hostdata->request_limit) < 0)
-                        goto send_error;
-        
-                printk(KERN_WARNING 
-                       "ibmvscsi: Warning, request_limit exceeded\n");
-                unmap_cmd_data(&evt_struct->iu.srp.cmd,
-                               evt_struct,
-                               hostdata->dev);
-                free_event_struct(&hostdata->pool, evt_struct);
-                return SCSI_MLQUEUE_HOST_BUSY;
-        }
+            (atomic_dec_if_positive(&hostdata->request_limit) < 0))
+                goto send_error;
 
         /* Copy the IU into the transfer area */
         *evt_struct->xfer_iu = evt_struct->iu;
@@ -572,7 +560,7 @@ static int ibmvscsi_send_srp_event(struct srp_event_struct *evt_struct,
              ibmvscsi_send_crq(hostdata, crq_as_u64[0], crq_as_u64[1])) != 0) {
                 list_del(&evt_struct->list);
 
-                printk(KERN_ERR "ibmvscsi: failed to send event struct rc %d\n",
+                printk(KERN_ERR "ibmvscsi: send error %d\n",
                        rc);
                 goto send_error;
         }
@@ -582,14 +570,8 @@ static int ibmvscsi_send_srp_event(struct srp_event_struct *evt_struct,
  send_error:
         unmap_cmd_data(&evt_struct->iu.srp.cmd, evt_struct, hostdata->dev);
 
-        if ((cmnd = evt_struct->cmnd) != NULL) {
-                cmnd->result = DID_ERROR << 16;
-                evt_struct->cmnd_done(cmnd);
-        } else if (evt_struct->done)
-                evt_struct->done(evt_struct);
-        
         free_event_struct(&hostdata->pool, evt_struct);
-        return 0;
+        return SCSI_MLQUEUE_HOST_BUSY;
 }
 
 /**
@@ -802,7 +784,8 @@ static void login_rsp(struct srp_event_struct *evt_struct)
         case SRP_LOGIN_RSP_TYPE:        /* it worked! */
                 break;
         case SRP_LOGIN_REJ_TYPE:        /* refused! */
-                printk(KERN_INFO "ibmvscsi: SRP_LOGIN_REQ rejected\n");
+                printk(KERN_INFO "ibmvscsi: SRP_LOGIN_REJ reason %u\n",
+                       evt_struct->xfer_iu->srp.login_rej.reason);
                 /* Login failed.  */
                 atomic_set(&hostdata->request_limit, -1);
                 return;
@@ -834,6 +817,9 @@ static void login_rsp(struct srp_event_struct *evt_struct)
                 return;
         }
 
+        /* If we had any pending I/Os, kick them */
+        scsi_unblock_requests(hostdata->host);
+
         send_mad_adapter_info(hostdata);
         return;
 }
@@ -862,6 +848,7 @@ static int send_srp_login(struct ibmvscsi_host_data *hostdata)
                           init_timeout * HZ);
 
         login = &evt_struct->iu.srp.login_req;
+        memset(login, 0x00, sizeof(struct srp_login_req));
         login->type = SRP_LOGIN_REQ_TYPE;
         login->max_requested_initiator_to_target_iulen = sizeof(union srp_iu);
         login->required_buffer_formats = 0x0006;
@@ -1122,7 +1109,7 @@ static int ibmvscsi_eh_device_reset_handler(struct scsi_cmnd *cmd)
  * purge_requests: Our virtual adapter just shut down.  purge any sent requests
  * @hostdata:    the adapter
  */
-static void purge_requests(struct ibmvscsi_host_data *hostdata)
+static void purge_requests(struct ibmvscsi_host_data *hostdata, int error_code)
 {
         struct srp_event_struct *tmp_evt, *pos;
         unsigned long flags;
@@ -1131,7 +1118,7 @@ static void purge_requests(struct ibmvscsi_host_data *hostdata)
         list_for_each_entry_safe(tmp_evt, pos, &hostdata->sent, list) {
                 list_del(&tmp_evt->list);
                 if (tmp_evt->cmnd) {
-                        tmp_evt->cmnd->result = (DID_ERROR << 16);
+                        tmp_evt->cmnd->result = (error_code << 16);
                         unmap_cmd_data(&tmp_evt->iu.srp.cmd, 
                                        tmp_evt, 
                                        tmp_evt->hostdata->dev);
@@ -1186,12 +1173,30 @@ void ibmvscsi_handle_crq(struct viosrp_crq *crq,
                         printk(KERN_ERR "ibmvscsi: unknown crq message type\n");
                 }
                 return;
-        case 0xFF:              /* Hypervisor telling us the connection is closed */
-                printk(KERN_INFO "ibmvscsi: Virtual adapter failed!\n");
+        case 0xFF:      /* Hypervisor telling us the connection is closed */
+                scsi_block_requests(hostdata->host);
+                if (crq->format == 0x06) {
+                        /* We need to re-setup the interpartition connection */
+                        printk(KERN_INFO
+                               "ibmvscsi: Re-enabling adapter!\n");
+                        purge_requests(hostdata, DID_REQUEUE);
+                        if (ibmvscsi_reenable_crq_queue(&hostdata->queue,
+                                                        hostdata) == 0)
+                                if (ibmvscsi_send_crq(hostdata,
+                                                      0xC001000000000000LL, 0))
+                                        printk(KERN_ERR
+                                               "ibmvscsi: transmit error after"
+                                               " enable\n");
+                } else {
+                        printk(KERN_INFO
+                               "ibmvscsi: Virtual adapter failed rc %d!\n",
+                               crq->format);
 
-                atomic_set(&hostdata->request_limit, -1);
-                purge_requests(hostdata);
-                ibmvscsi_reset_crq_queue(&hostdata->queue, hostdata);
+                        atomic_set(&hostdata->request_limit, -1);
+                        purge_requests(hostdata, DID_ERROR);
+                        ibmvscsi_reset_crq_queue(&hostdata->queue, hostdata);
+                }
+                scsi_unblock_requests(hostdata->host);
                 return;
         case 0x80:              /* real payload */
                 break;
diff --git a/drivers/scsi/ibmvscsi/ibmvscsi.h b/drivers/scsi/ibmvscsi/ibmvscsi.h
index 5b0edd1f1921..4550d71e4744 100644
--- a/drivers/scsi/ibmvscsi/ibmvscsi.h
+++ b/drivers/scsi/ibmvscsi/ibmvscsi.h
@@ -103,6 +103,9 @@ void ibmvscsi_release_crq_queue(struct crq_queue *queue,
 int ibmvscsi_reset_crq_queue(struct crq_queue *queue,
                               struct ibmvscsi_host_data *hostdata);
 
+int ibmvscsi_reenable_crq_queue(struct crq_queue *queue,
+                                struct ibmvscsi_host_data *hostdata);
+
 void ibmvscsi_handle_crq(struct viosrp_crq *crq,
                          struct ibmvscsi_host_data *hostdata);
 int ibmvscsi_send_crq(struct ibmvscsi_host_data *hostdata,
diff --git a/drivers/scsi/ibmvscsi/iseries_vscsi.c b/drivers/scsi/ibmvscsi/iseries_vscsi.c
index ce15d9e39621..7eed0b098171 100644
--- a/drivers/scsi/ibmvscsi/iseries_vscsi.c
+++ b/drivers/scsi/ibmvscsi/iseries_vscsi.c
@@ -124,6 +124,19 @@ int ibmvscsi_reset_crq_queue(struct crq_queue *queue,
 }
 
 /**
+ * reenable_crq_queue: - reenables a crq after a failure
+ * @queue:      crq_queue to initialize and register
+ * @hostdata:   ibmvscsi_host_data of host
+ *
+ * no-op for iSeries
+ */
+int ibmvscsi_reenable_crq_queue(struct crq_queue *queue,
+                                struct ibmvscsi_host_data *hostdata)
+{
+        return 0;
+}
+
+/**
  * ibmvscsi_send_crq: - Send a CRQ
  * @hostdata:   the adapter
  * @word1:      the first 64 bits of the data
diff --git a/drivers/scsi/ibmvscsi/rpa_vscsi.c b/drivers/scsi/ibmvscsi/rpa_vscsi.c
index 75db2f5c545e..f47dd87c05e7 100644
--- a/drivers/scsi/ibmvscsi/rpa_vscsi.c
+++ b/drivers/scsi/ibmvscsi/rpa_vscsi.c
@@ -281,6 +281,28 @@ int ibmvscsi_init_crq_queue(struct crq_queue *queue,
 }
 
 /**
+ * reenable_crq_queue: - reenables a crq after
+ * @queue:      crq_queue to initialize and register
+ * @hostdata:   ibmvscsi_host_data of host
+ *
+ */
+int ibmvscsi_reenable_crq_queue(struct crq_queue *queue,
+                                 struct ibmvscsi_host_data *hostdata)
+{
+        int rc;
+        struct vio_dev *vdev = to_vio_dev(hostdata->dev);
+
+        /* Re-enable the CRQ */
+        do {
+                rc = plpar_hcall_norets(H_ENABLE_CRQ, vdev->unit_address);
+        } while ((rc == H_InProgress) || (rc == H_Busy) || (H_isLongBusy(rc)));
+
+        if (rc)
+                printk(KERN_ERR "ibmvscsi: Error %d enabling adapter\n", rc);
+        return rc;
+}
+
+/**
  * reset_crq_queue: - resets a crq after a failure
  * @queue:      crq_queue to initialize and register
  * @hostdata:   ibmvscsi_host_data of host
diff --git a/drivers/scsi/ide-scsi.c b/drivers/scsi/ide-scsi.c
index 3c688ef54660..0cf0e4c7ac0c 100644
--- a/drivers/scsi/ide-scsi.c
+++ b/drivers/scsi/ide-scsi.c
@@ -751,9 +751,8 @@ static void idescsi_setup (ide_drive_t *drive, idescsi_scsi_t *scsi)
         idescsi_add_settings(drive);
 }
 
-static int ide_scsi_remove(struct device *dev)
+static void ide_scsi_remove(ide_drive_t *drive)
 {
-        ide_drive_t *drive = to_ide_device(dev);
         struct Scsi_Host *scsihost = drive->driver_data;
         struct ide_scsi_obj *scsi = scsihost_to_idescsi(scsihost);
         struct gendisk *g = scsi->disk;
@@ -768,11 +767,9 @@ static int ide_scsi_remove(struct device *dev)
 
         scsi_remove_host(scsihost);
         ide_scsi_put(scsi);
-
-        return 0;
 }
 
-static int ide_scsi_probe(struct device *);
+static int ide_scsi_probe(ide_drive_t *);
 
 #ifdef CONFIG_PROC_FS
 static ide_proc_entry_t idescsi_proc[] = {
@@ -788,9 +785,9 @@ static ide_driver_t idescsi_driver = {
                 .owner          = THIS_MODULE,
                 .name           = "ide-scsi",
                 .bus            = &ide_bus_type,
-                .probe          = ide_scsi_probe,
-                .remove         = ide_scsi_remove,
         },
+        .probe                  = ide_scsi_probe,
+        .remove                 = ide_scsi_remove,
         .version                = IDESCSI_VERSION,
         .media                  = ide_scsi,
         .supports_dsc_overlap   = 0,
@@ -1119,9 +1116,8 @@ static struct scsi_host_template idescsi_template = {
         .proc_name              = "ide-scsi",
 };
 
-static int ide_scsi_probe(struct device *dev)
+static int ide_scsi_probe(ide_drive_t *drive)
 {
-        ide_drive_t *drive = to_ide_device(dev);
         idescsi_scsi_t *idescsi;
         struct Scsi_Host *host;
         struct gendisk *g;
diff --git a/drivers/scsi/ips.c b/drivers/scsi/ips.c
index e5e1ca44e1ee..86c546164da9 100644
--- a/drivers/scsi/ips.c
+++ b/drivers/scsi/ips.c
@@ -3499,6 +3499,7 @@ ips_map_status(ips_ha_t * ha, ips_scb_t * scb, ips_stat_t * sp)
         int device_error;
         uint32_t transfer_len;
         IPS_DCDB_TABLE_TAPE *tapeDCDB;
+        IPS_SCSI_INQ_DATA inquiryData;
 
         METHOD_TRACE("ips_map_status", 1);
 
@@ -3557,13 +3558,13 @@ ips_map_status(ips_ha_t * ha, ips_scb_t * scb, ips_stat_t * sp)
                                 errcode = DID_OK;
 
                                 /* Restrict access to physical DASD */
-                                if ((scb->scsi_cmd->cmnd[0] == INQUIRY) &&
-                                    ((((char *) scb->scsi_cmd->
-                                       buffer)[0] & 0x1f) == TYPE_DISK)) {
-                                        /* underflow -- no error               */
-                                        /* restrict access to physical DASD    */
-                                        errcode = DID_TIME_OUT;
-                                        break;
+                                if (scb->scsi_cmd->cmnd[0] == INQUIRY) {
+                                    ips_scmd_buf_read(scb->scsi_cmd, 
+                                      &inquiryData, sizeof (inquiryData));
+                                    if ((inquiryData.DeviceType & 0x1f) == TYPE_DISK) {
+                                        errcode = DID_TIME_OUT;
+                                        break;
+                                    }
                                 }
                         } else
                                 errcode = DID_ERROR;
@@ -4135,6 +4136,7 @@ ips_chkstatus(ips_ha_t * ha, IPS_STATUS * pstatus)
         uint8_t basic_status;
         uint8_t ext_status;
         int errcode;
+        IPS_SCSI_INQ_DATA inquiryData;
 
         METHOD_TRACE("ips_chkstatus", 1);
 
@@ -4255,11 +4257,11 @@ ips_chkstatus(ips_ha_t * ha, IPS_STATUS * pstatus)
                         scb->scsi_cmd->result = errcode << 16;
                 } else {        /* bus == 0 */
                         /* restrict access to physical drives */
-                        if ((scb->scsi_cmd->cmnd[0] == INQUIRY) &&
-                            ((((char *) scb->scsi_cmd->buffer)[0] & 0x1f) ==
-                             TYPE_DISK)) {
-
-                                scb->scsi_cmd->result = DID_TIME_OUT << 16;
+                        if (scb->scsi_cmd->cmnd[0] == INQUIRY) { 
+                            ips_scmd_buf_read(scb->scsi_cmd, 
+                                  &inquiryData, sizeof (inquiryData));
+                            if ((inquiryData.DeviceType & 0x1f) == TYPE_DISK) 
+                                scb->scsi_cmd->result = DID_TIME_OUT << 16;
                         }
                 }               /* else */
         } else {                /* recovered error / success */
@@ -5012,7 +5014,7 @@ ips_init_copperhead(ips_ha_t * ha)
                                 break;
 
                         /* Delay for 1 Second */
-                        MDELAY(IPS_ONE_SEC);
+                        msleep(IPS_ONE_SEC);
                 }
 
                 if (j >= 45)
@@ -5038,7 +5040,7 @@ ips_init_copperhead(ips_ha_t * ha)
                                 break;
 
                         /* Delay for 1 Second */
-                        MDELAY(IPS_ONE_SEC);
+                        msleep(IPS_ONE_SEC);
                 }
 
                 if (j >= 240)
@@ -5056,7 +5058,7 @@ ips_init_copperhead(ips_ha_t * ha)
                         break;
 
                 /* Delay for 1 Second */
-                MDELAY(IPS_ONE_SEC);
+                msleep(IPS_ONE_SEC);
         }
 
         if (i >= 240)
@@ -5106,7 +5108,7 @@ ips_init_copperhead_memio(ips_ha_t * ha)
                                 break;
 
                         /* Delay for 1 Second */
-                        MDELAY(IPS_ONE_SEC);
+                        msleep(IPS_ONE_SEC);
                 }
 
                 if (j >= 45)
@@ -5132,7 +5134,7 @@ ips_init_copperhead_memio(ips_ha_t * ha)
                                 break;
 
                         /* Delay for 1 Second */
-                        MDELAY(IPS_ONE_SEC);
+                        msleep(IPS_ONE_SEC);
                 }
 
                 if (j >= 240)
@@ -5150,7 +5152,7 @@ ips_init_copperhead_memio(ips_ha_t * ha)
                         break;
 
                 /* Delay for 1 Second */
-                MDELAY(IPS_ONE_SEC);
+                msleep(IPS_ONE_SEC);
         }
 
         if (i >= 240)
@@ -5202,7 +5204,7 @@ ips_init_morpheus(ips_ha_t * ha)
                         break;
 
                 /* Delay for 1 Second */
-                MDELAY(IPS_ONE_SEC);
+                msleep(IPS_ONE_SEC);
         }
 
         if (i >= 45) {
@@ -5228,7 +5230,7 @@ ips_init_morpheus(ips_ha_t * ha)
                         if (Post != 0x4F00)
                                 break;
                         /* Delay for 1 Second */
-                        MDELAY(IPS_ONE_SEC);
+                        msleep(IPS_ONE_SEC);
                 }
 
                 if (i >= 120) {
@@ -5258,7 +5260,7 @@ ips_init_morpheus(ips_ha_t * ha)
                         break;
 
                 /* Delay for 1 Second */
-                MDELAY(IPS_ONE_SEC);
+                msleep(IPS_ONE_SEC);
         }
 
         if (i >= 240) {
@@ -5318,12 +5320,12 @@ ips_reset_copperhead(ips_ha_t * ha)
                 outb(IPS_BIT_RST, ha->io_addr + IPS_REG_SCPR);
 
                 /* Delay for 1 Second */
-                MDELAY(IPS_ONE_SEC);
+                msleep(IPS_ONE_SEC);
 
                 outb(0, ha->io_addr + IPS_REG_SCPR);
 
                 /* Delay for 1 Second */
-                MDELAY(IPS_ONE_SEC);
+                msleep(IPS_ONE_SEC);
 
                 if ((*ha->func.init) (ha))
                         break;
@@ -5363,12 +5365,12 @@ ips_reset_copperhead_memio(ips_ha_t * ha)
                 writeb(IPS_BIT_RST, ha->mem_ptr + IPS_REG_SCPR);
 
                 /* Delay for 1 Second */
-                MDELAY(IPS_ONE_SEC);
+                msleep(IPS_ONE_SEC);
 
                 writeb(0, ha->mem_ptr + IPS_REG_SCPR);
 
                 /* Delay for 1 Second */
-                MDELAY(IPS_ONE_SEC);
+                msleep(IPS_ONE_SEC);
 
                 if ((*ha->func.init) (ha))
                         break;
@@ -5409,7 +5411,7 @@ ips_reset_morpheus(ips_ha_t * ha)
                 writel(0x80000000, ha->mem_ptr + IPS_REG_I960_IDR);
 
                 /* Delay for 5 Seconds */
-                MDELAY(5 * IPS_ONE_SEC);
+                msleep(5 * IPS_ONE_SEC);
 
                 /* Do a PCI config read to wait for adapter */
                 pci_read_config_byte(ha->pcidev, 4, &junk);
diff --git a/drivers/scsi/libata-core.c b/drivers/scsi/libata-core.c
index ff31b0b6a6b3..c93bb1bd3332 100644
--- a/drivers/scsi/libata-core.c
+++ b/drivers/scsi/libata-core.c
@@ -1075,13 +1075,59 @@ static unsigned int ata_pio_modes(const struct ata_device *adev)
 static inline void
 ata_queue_pio_task(struct ata_port *ap)
 {
-        queue_work(ata_wq, &ap->pio_task);
+        if (!(ap->flags & ATA_FLAG_FLUSH_PIO_TASK))
+                queue_work(ata_wq, &ap->pio_task);
 }
 
 static inline void
 ata_queue_delayed_pio_task(struct ata_port *ap, unsigned long delay)
 {
-        queue_delayed_work(ata_wq, &ap->pio_task, delay);
+        if (!(ap->flags & ATA_FLAG_FLUSH_PIO_TASK))
+                queue_delayed_work(ata_wq, &ap->pio_task, delay);
+}
+
+/**
+ *      ata_flush_pio_tasks - Flush pio_task and packet_task
+ *      @ap: the target ata_port
+ *
+ *      After this function completes, pio_task and packet_task are
+ *      guranteed not to be running or scheduled.
+ *
+ *      LOCKING:
+ *      Kernel thread context (may sleep)
+ */
+
+static void ata_flush_pio_tasks(struct ata_port *ap)
+{
+        int tmp = 0;
+        unsigned long flags;
+
+        DPRINTK("ENTER\n");
+
+        spin_lock_irqsave(&ap->host_set->lock, flags);
+        ap->flags |= ATA_FLAG_FLUSH_PIO_TASK;
+        spin_unlock_irqrestore(&ap->host_set->lock, flags);
+
+        DPRINTK("flush #1\n");
+        flush_workqueue(ata_wq);
+
+        /*
+         * At this point, if a task is running, it's guaranteed to see
+         * the FLUSH flag; thus, it will never queue pio tasks again.
+         * Cancel and flush.
+         */
+        tmp |= cancel_delayed_work(&ap->pio_task);
+        tmp |= cancel_delayed_work(&ap->packet_task);
+        if (!tmp) {
+                DPRINTK("flush #2\n");
+                flush_workqueue(ata_wq);
+        }
+
+        spin_lock_irqsave(&ap->host_set->lock, flags);
+        ap->flags &= ~ATA_FLAG_FLUSH_PIO_TASK;
+        spin_unlock_irqrestore(&ap->host_set->lock, flags);
+
+        DPRINTK("EXIT\n");
 }
 
 void ata_qc_complete_internal(struct ata_queued_cmd *qc)
@@ -1446,12 +1492,11 @@ static inline u8 ata_dev_knobble(const struct ata_port *ap)
 }
 
 /**
- *      ata_dev_config - Run device specific handlers and check for
- *                       SATA->PATA bridges
- *      @ap: Bus
- *      @i:  Device
+ * ata_dev_config - Run device specific handlers & check for SATA->PATA bridges
+ * @ap: Bus
+ * @i:  Device
  *
- *      LOCKING:
+ * LOCKING:
  */
 
 void ata_dev_config(struct ata_port *ap, unsigned int i)
@@ -1798,9 +1843,9 @@ int ata_timing_compute(struct ata_device *adev, unsigned short speed,
         ata_timing_quantize(t, t, T, UT);
 
         /*
-         * Even in DMA/UDMA modes we still use PIO access for IDENTIFY, S.M.A.R.T
-         * and some other commands. We have to ensure that the DMA cycle timing is
-         * slower/equal than the fastest PIO timing.
+         * Even in DMA/UDMA modes we still use PIO access for IDENTIFY,
+         * S.M.A.R.T * and some other commands. We have to ensure that the
+         * DMA cycle timing is slower/equal than the fastest PIO timing.
          */
 
         if (speed > XFER_PIO_4) {
@@ -1809,7 +1854,7 @@ int ata_timing_compute(struct ata_device *adev, unsigned short speed,
         }
 
         /*
-         * Lenghten active & recovery time so that cycle time is correct.
+         * Lengthen active & recovery time so that cycle time is correct.
          */
 
         if (t->act8b + t->rec8b < t->cyc8b) {
@@ -1928,7 +1973,6 @@ static void ata_host_set_dma(struct ata_port *ap, u8 xfer_mode,
  *
  *      LOCKING:
  *      PCI/etc. bus probe sem.
- *
  */
 static void ata_set_mode(struct ata_port *ap)
 {
@@ -1977,7 +2021,6 @@ err_out:
  *      or a timeout occurs.
  *
  *      LOCKING: None.
- *
  */
 
 unsigned int ata_busy_sleep (struct ata_port *ap,
@@ -2237,6 +2280,324 @@ err_out:
         DPRINTK("EXIT\n");
 }
 
+static int sata_phy_resume(struct ata_port *ap)
+{
+        unsigned long timeout = jiffies + (HZ * 5);
+        u32 sstatus;
+
+        scr_write_flush(ap, SCR_CONTROL, 0x300);
+
+        /* Wait for phy to become ready, if necessary. */
+        do {
+                msleep(200);
+                sstatus = scr_read(ap, SCR_STATUS);
+                if ((sstatus & 0xf) != 1)
+                        return 0;
+        } while (time_before(jiffies, timeout));
+
+        return -1;
+}
+
+/**
+ *      ata_std_probeinit - initialize probing
+ *      @ap: port to be probed
+ *
+ *      @ap is about to be probed.  Initialize it.  This function is
+ *      to be used as standard callback for ata_drive_probe_reset().
+ */
+extern void ata_std_probeinit(struct ata_port *ap)
+{
+        if (ap->flags & ATA_FLAG_SATA && ap->ops->scr_read)
+                sata_phy_resume(ap);
+}
+
+/**
+ *      ata_std_softreset - reset host port via ATA SRST
+ *      @ap: port to reset
+ *      @verbose: fail verbosely
+ *      @classes: resulting classes of attached devices
+ *
+ *      Reset host port using ATA SRST.  This function is to be used
+ *      as standard callback for ata_drive_*_reset() functions.
+ *
+ *      LOCKING:
+ *      Kernel thread context (may sleep)
+ *
+ *      RETURNS:
+ *      0 on success, -errno otherwise.
+ */
+int ata_std_softreset(struct ata_port *ap, int verbose, unsigned int *classes)
+{
+        unsigned int slave_possible = ap->flags & ATA_FLAG_SLAVE_POSS;
+        unsigned int devmask = 0, err_mask;
+        u8 err;
+
+        DPRINTK("ENTER\n");
+
+        /* determine if device 0/1 are present */
+        if (ata_devchk(ap, 0))
+                devmask |= (1 << 0);
+        if (slave_possible && ata_devchk(ap, 1))
+                devmask |= (1 << 1);
+
+        /* devchk reports device presence without actual device on
+         * most SATA controllers.  Check SStatus and turn devmask off
+         * if link is offline.  Note that we should continue resetting
+         * even when it seems like there's no device.
+         */
+        if (ap->ops->scr_read && !sata_dev_present(ap))
+                devmask = 0;
+
+        /* select device 0 again */
+        ap->ops->dev_select(ap, 0);
+
+        /* issue bus reset */
+        DPRINTK("about to softreset, devmask=%x\n", devmask);
+        err_mask = ata_bus_softreset(ap, devmask);
+        if (err_mask) {
+                if (verbose)
+                        printk(KERN_ERR "ata%u: SRST failed (err_mask=0x%x)\n",
+                               ap->id, err_mask);
+                else
+                        DPRINTK("EXIT, softreset failed (err_mask=0x%x)\n",
+                                err_mask);
+                return -EIO;
+        }
+
+        /* determine by signature whether we have ATA or ATAPI devices */
+        classes[0] = ata_dev_try_classify(ap, 0, &err);
+        if (slave_possible && err != 0x81)
+                classes[1] = ata_dev_try_classify(ap, 1, &err);
+
+        DPRINTK("EXIT, classes[0]=%u [1]=%u\n", classes[0], classes[1]);
+        return 0;
+}
+
+/**
+ *      sata_std_hardreset - reset host port via SATA phy reset
+ *      @ap: port to reset
+ *      @verbose: fail verbosely
+ *      @class: resulting class of attached device
+ *
+ *      SATA phy-reset host port using DET bits of SControl register.
+ *      This function is to be used as standard callback for
+ *      ata_drive_*_reset().
+ *
+ *      LOCKING:
+ *      Kernel thread context (may sleep)
+ *
+ *      RETURNS:
+ *      0 on success, -errno otherwise.
+ */
+int sata_std_hardreset(struct ata_port *ap, int verbose, unsigned int *class)
+{
+        u32 serror;
+
+        DPRINTK("ENTER\n");
+
+        /* Issue phy wake/reset */
+        scr_write_flush(ap, SCR_CONTROL, 0x301);
+
+        /*
+         * Couldn't find anything in SATA I/II specs, but AHCI-1.1
+         * 10.4.2 says at least 1 ms.
+         */
+        msleep(1);
+
+        /* Bring phy back */
+        sata_phy_resume(ap);
+
+        /* Clear SError */
+        serror = scr_read(ap, SCR_ERROR);
+        scr_write(ap, SCR_ERROR, serror);
+
+        /* TODO: phy layer with polling, timeouts, etc. */
+        if (!sata_dev_present(ap)) {
+                *class = ATA_DEV_NONE;
+                DPRINTK("EXIT, link offline\n");
+                return 0;
+        }
+
+        if (ata_busy_sleep(ap, ATA_TMOUT_BOOT_QUICK, ATA_TMOUT_BOOT)) {
+                if (verbose)
+                        printk(KERN_ERR "ata%u: COMRESET failed "
+                               "(device not ready)\n", ap->id);
+                else
+                        DPRINTK("EXIT, device not ready\n");
+                return -EIO;
+        }
+
+        *class = ata_dev_try_classify(ap, 0, NULL);
+
+        DPRINTK("EXIT, class=%u\n", *class);
+        return 0;
+}
+
+/**
+ *      ata_std_postreset - standard postreset callback
+ *      @ap: the target ata_port
+ *      @classes: classes of attached devices
+ *
+ *      This function is invoked after a successful reset.  Note that
+ *      the device might have been reset more than once using
+ *      different reset methods before postreset is invoked.
+ *      postreset is also reponsible for setting cable type.
+ *
+ *      This function is to be used as standard callback for
+ *      ata_drive_*_reset().
+ *
+ *      LOCKING:
+ *      Kernel thread context (may sleep)
+ */
+void ata_std_postreset(struct ata_port *ap, unsigned int *classes)
+{
+        DPRINTK("ENTER\n");
+
+        /* set cable type */
+        if (ap->cbl == ATA_CBL_NONE && ap->flags & ATA_FLAG_SATA)
+                ap->cbl = ATA_CBL_SATA;
+
+        /* print link status */
+        if (ap->cbl == ATA_CBL_SATA)
+                sata_print_link_status(ap);
+
+        /* bail out if no device is present */
+        if (classes[0] == ATA_DEV_NONE && classes[1] == ATA_DEV_NONE) {
+                DPRINTK("EXIT, no device\n");
+                return;
+        }
+
+        /* is double-select really necessary? */
+        if (classes[0] != ATA_DEV_NONE)
+                ap->ops->dev_select(ap, 1);
+        if (classes[1] != ATA_DEV_NONE)
+                ap->ops->dev_select(ap, 0);
+
+        /* re-enable interrupts & set up device control */
+        if (ap->ioaddr.ctl_addr)        /* FIXME: hack. create a hook instead */
+                ata_irq_on(ap);
+
+        DPRINTK("EXIT\n");
+}
+
+/**
+ *      ata_std_probe_reset - standard probe reset method
+ *      @ap: prot to perform probe-reset
+ *      @classes: resulting classes of attached devices
+ *
+ *      The stock off-the-shelf ->probe_reset method.
+ *
+ *      LOCKING:
+ *      Kernel thread context (may sleep)
+ *
+ *      RETURNS:
+ *      0 on success, -errno otherwise.
+ */
+int ata_std_probe_reset(struct ata_port *ap, unsigned int *classes)
+{
+        ata_reset_fn_t hardreset;
+
+        hardreset = NULL;
+        if (ap->flags & ATA_FLAG_SATA && ap->ops->scr_read)
+                hardreset = sata_std_hardreset;
+
+        return ata_drive_probe_reset(ap, ata_std_probeinit,
+                                     ata_std_softreset, hardreset,
+                                     ata_std_postreset, classes);
+}
+
+static int do_probe_reset(struct ata_port *ap, ata_reset_fn_t reset,
+                          ata_postreset_fn_t postreset,
+                          unsigned int *classes)
+{
+        int i, rc;
+
+        for (i = 0; i < ATA_MAX_DEVICES; i++)
+                classes[i] = ATA_DEV_UNKNOWN;
+
+        rc = reset(ap, 0, classes);
+        if (rc)
+                return rc;
+
+        /* If any class isn't ATA_DEV_UNKNOWN, consider classification
+         * is complete and convert all ATA_DEV_UNKNOWN to
+         * ATA_DEV_NONE.
+         */
+        for (i = 0; i < ATA_MAX_DEVICES; i++)
+                if (classes[i] != ATA_DEV_UNKNOWN)
+                        break;
+
+        if (i < ATA_MAX_DEVICES)
+                for (i = 0; i < ATA_MAX_DEVICES; i++)
+                        if (classes[i] == ATA_DEV_UNKNOWN)
+                                classes[i] = ATA_DEV_NONE;
+
+        if (postreset)
+                postreset(ap, classes);
+
+        return classes[0] != ATA_DEV_UNKNOWN ? 0 : -ENODEV;
+}
+
+/**
+ *      ata_drive_probe_reset - Perform probe reset with given methods
+ *      @ap: port to reset
+ *      @probeinit: probeinit method (can be NULL)
+ *      @softreset: softreset method (can be NULL)
+ *      @hardreset: hardreset method (can be NULL)
+ *      @postreset: postreset method (can be NULL)
+ *      @classes: resulting classes of attached devices
+ *
+ *      Reset the specified port and classify attached devices using
+ *      given methods.  This function prefers softreset but tries all
+ *      possible reset sequences to reset and classify devices.  This
+ *      function is intended to be used for constructing ->probe_reset
+ *      callback by low level drivers.
+ *
+ *      Reset methods should follow the following rules.
+ *
+ *      - Return 0 on sucess, -errno on failure.
+ *      - If classification is supported, fill classes[] with
+ *        recognized class codes.
+ *      - If classification is not supported, leave classes[] alone.
+ *      - If verbose is non-zero, print error message on failure;
+ *        otherwise, shut up.
+ *
+ *      LOCKING:
+ *      Kernel thread context (may sleep)
+ *
+ *      RETURNS:
+ *      0 on success, -EINVAL if no reset method is avaliable, -ENODEV
+ *      if classification fails, and any error code from reset
+ *      methods.
+ */
+int ata_drive_probe_reset(struct ata_port *ap, ata_probeinit_fn_t probeinit,
+                          ata_reset_fn_t softreset, ata_reset_fn_t hardreset,
+                          ata_postreset_fn_t postreset, unsigned int *classes)
+{
+        int rc = -EINVAL;
+
+        if (probeinit)
+                probeinit(ap);
+
+        if (softreset) {
+                rc = do_probe_reset(ap, softreset, postreset, classes);
+                if (rc == 0)
+                        return 0;
+        }
+
+        if (!hardreset)
+                return rc;
+
+        rc = do_probe_reset(ap, hardreset, postreset, classes);
+        if (rc == 0 || rc != -ENODEV)
+                return rc;
+
+        if (softreset)
+                rc = do_probe_reset(ap, softreset, postreset, classes);
+
+        return rc;
+}
+
 static void ata_pr_blacklisted(const struct ata_port *ap,
                                const struct ata_device *dev)
 {
@@ -2913,7 +3274,7 @@ void ata_poll_qc_complete(struct ata_queued_cmd *qc)
 }
 
 /**
- *      ata_pio_poll -
+ *      ata_pio_poll - poll using PIO, depending on current state
  *      @ap: the target ata_port
  *
  *      LOCKING:
@@ -3021,7 +3382,7 @@ static int ata_pio_complete (struct ata_port *ap)
 
 
 /**
- *      swap_buf_le16 - swap halves of 16-words in place
+ *      swap_buf_le16 - swap halves of 16-bit words in place
  *      @buf:  Buffer to swap
  *      @buf_words:  Number of 16-bit words in buffer.
  *
@@ -3658,6 +4019,9 @@ static void ata_qc_timeout(struct ata_queued_cmd *qc)
 
         DPRINTK("ENTER\n");
 
+        ata_flush_pio_tasks(ap);
+        ap->hsm_task_state = HSM_ST_IDLE;
+
         spin_lock_irqsave(&host_set->lock, flags);
 
         switch (qc->tf.protocol) {
@@ -4561,6 +4925,8 @@ static int ata_start_drive(struct ata_port *ap, struct ata_device *dev)
 
 /**
  *      ata_device_resume - wakeup a previously suspended devices
+ *      @ap: port the device is connected to
+ *      @dev: the device to resume
  *
  *      Kick the drive back into action, by sending it an idle immediate
  *      command and making sure its transfer mode matches between drive
@@ -4583,10 +4949,11 @@ int ata_device_resume(struct ata_port *ap, struct ata_device *dev)
 
 /**
  *      ata_device_suspend - prepare a device for suspend
+ *      @ap: port the device is connected to
+ *      @dev: the device to suspend
  *
  *      Flush the cache on the drive, if appropriate, then issue a
  *      standbynow command.
- *
  */
 int ata_device_suspend(struct ata_port *ap, struct ata_device *dev)
 {
@@ -4869,9 +5236,9 @@ int ata_device_add(const struct ata_probe_ent *ent)
 
                 ap = host_set->ports[i];
 
-                DPRINTK("ata%u: probe begin\n", ap->id);
+                DPRINTK("ata%u: bus probe begin\n", ap->id);
                 rc = ata_bus_probe(ap);
-                DPRINTK("ata%u: probe end\n", ap->id);
+                DPRINTK("ata%u: bus probe end\n", ap->id);
 
                 if (rc) {
                         /* FIXME: do something useful here?
@@ -4895,7 +5262,7 @@ int ata_device_add(const struct ata_probe_ent *ent)
         }
 
         /* probes are done, now scan each port's disk(s) */
-        DPRINTK("probe begin\n");
+        DPRINTK("host probe begin\n");
         for (i = 0; i < count; i++) {
                 struct ata_port *ap = host_set->ports[i];
 
@@ -5459,6 +5826,12 @@ EXPORT_SYMBOL_GPL(ata_port_probe);
 EXPORT_SYMBOL_GPL(sata_phy_reset);
 EXPORT_SYMBOL_GPL(__sata_phy_reset);
 EXPORT_SYMBOL_GPL(ata_bus_reset);
+EXPORT_SYMBOL_GPL(ata_std_probeinit);
+EXPORT_SYMBOL_GPL(ata_std_softreset);
+EXPORT_SYMBOL_GPL(sata_std_hardreset);
+EXPORT_SYMBOL_GPL(ata_std_postreset);
+EXPORT_SYMBOL_GPL(ata_std_probe_reset);
+EXPORT_SYMBOL_GPL(ata_drive_probe_reset);
 EXPORT_SYMBOL_GPL(ata_port_disable);
 EXPORT_SYMBOL_GPL(ata_ratelimit);
 EXPORT_SYMBOL_GPL(ata_busy_sleep);
diff --git a/drivers/scsi/libata-scsi.c b/drivers/scsi/libata-scsi.c
index ab6b53349d6f..b007bb409382 100644
--- a/drivers/scsi/libata-scsi.c
+++ b/drivers/scsi/libata-scsi.c
@@ -151,7 +151,7 @@ int ata_cmd_ioctl(struct scsi_device *scsidev, void __user *arg)
         struct scsi_sense_hdr sshdr;
         enum dma_data_direction data_dir;
 
-        if (NULL == (void *)arg)
+        if (arg == NULL)
                 return -EINVAL;
 
         if (copy_from_user(args, arg, sizeof(args)))
@@ -201,7 +201,7 @@ int ata_cmd_ioctl(struct scsi_device *scsidev, void __user *arg)
         /* Need code to retrieve data from check condition? */
 
         if ((argbuf)
-         && copy_to_user((void *)(arg + sizeof(args)), argbuf, argsize))
+         && copy_to_user(arg + sizeof(args), argbuf, argsize))
                 rc = -EFAULT;
 error:
         if (argbuf)
@@ -228,7 +228,7 @@ int ata_task_ioctl(struct scsi_device *scsidev, void __user *arg)
         u8 args[7];
         struct scsi_sense_hdr sshdr;
 
-        if (NULL == (void *)arg)
+        if (arg == NULL)
                 return -EINVAL;
 
         if (copy_from_user(args, arg, sizeof(args)))
@@ -732,16 +732,27 @@ int ata_scsi_slave_config(struct scsi_device *sdev)
 int ata_scsi_error(struct Scsi_Host *host)
 {
         struct ata_port *ap;
+        unsigned long flags;
 
         DPRINTK("ENTER\n");
 
         ap = (struct ata_port *) &host->hostdata[0];
+
+        spin_lock_irqsave(&ap->host_set->lock, flags);
+        assert(!(ap->flags & ATA_FLAG_IN_EH));
+        ap->flags |= ATA_FLAG_IN_EH;
+        spin_unlock_irqrestore(&ap->host_set->lock, flags);
+
         ap->ops->eng_timeout(ap);
 
         assert(host->host_failed == 0 && list_empty(&host->eh_cmd_q));
 
         scsi_eh_flush_done_q(&ap->eh_done_q);
 
+        spin_lock_irqsave(&ap->host_set->lock, flags);
+        ap->flags &= ~ATA_FLAG_IN_EH;
+        spin_unlock_irqrestore(&ap->host_set->lock, flags);
+
         DPRINTK("EXIT\n");
         return 0;
 }
@@ -1742,6 +1753,31 @@ static unsigned int ata_msense_rw_recovery(u8 **ptr_io, const u8 *last)
         return sizeof(def_rw_recovery_mpage);
 }
 
+/*
+ * We can turn this into a real blacklist if it's needed, for now just
+ * blacklist any Maxtor BANC1G10 revision firmware
+ */
+static int ata_dev_supports_fua(u16 *id)
+{
+        unsigned char model[41], fw[9];
+
+        if (!ata_id_has_fua(id))
+                return 0;
+
+        model[40] = '\0';
+        fw[8] = '\0';
+
+        ata_dev_id_string(id, model, ATA_ID_PROD_OFS, sizeof(model) - 1);
+        ata_dev_id_string(id, fw, ATA_ID_FW_REV_OFS, sizeof(fw) - 1);
+
+        if (strncmp(model, "Maxtor", 6))
+                return 1;
+        if (strncmp(fw, "BANC1G10", 8))
+                return 1;
+
+        return 0; /* blacklisted */
+}
+
 /**
  *      ata_scsiop_mode_sense - Simulate MODE SENSE 6, 10 commands
  *      @args: device IDENTIFY data / SCSI command of interest.
@@ -1839,7 +1875,7 @@ unsigned int ata_scsiop_mode_sense(struct ata_scsi_args *args, u8 *rbuf,
                 return 0;
 
         dpofua = 0;
-        if (ata_id_has_fua(args->id) && dev->flags & ATA_DFLAG_LBA48 &&
+        if (ata_dev_supports_fua(args->id) && dev->flags & ATA_DFLAG_LBA48 &&
             (!(dev->flags & ATA_DFLAG_PIO) || dev->multi_count))
                 dpofua = 1 << 4;
 
@@ -2533,7 +2569,8 @@ out_unlock:
 
 /**
  *      ata_scsi_simulate - simulate SCSI command on ATA device
- *      @id: current IDENTIFY data for target device.
+ *      @ap: port the device is connected to
+ *      @dev: the target device
  *      @cmd: SCSI command being sent to device.
  *      @done: SCSI command completion function.
  *
diff --git a/drivers/scsi/mac53c94.c b/drivers/scsi/mac53c94.c
index 311a4122bd70..93edaa8696cf 100644
--- a/drivers/scsi/mac53c94.c
+++ b/drivers/scsi/mac53c94.c
@@ -537,9 +537,9 @@ static int mac53c94_remove(struct macio_dev *mdev)
         free_irq(fp->intr, fp);
 
         if (fp->regs)
-                iounmap((void *) fp->regs);
+                iounmap(fp->regs);
         if (fp->dma)
-                iounmap((void *) fp->dma);
+                iounmap(fp->dma);
         kfree(fp->dma_cmd_space);
 
         scsi_host_put(host);
diff --git a/drivers/scsi/megaraid/megaraid_sas.c b/drivers/scsi/megaraid/megaraid_sas.c
index 511ed52a5807..a487f414960e 100644
--- a/drivers/scsi/megaraid/megaraid_sas.c
+++ b/drivers/scsi/megaraid/megaraid_sas.c
@@ -10,7 +10,7 @@
  *         2 of the License, or (at your option) any later version.
  *
  * FILE         : megaraid_sas.c
- * Version      : v00.00.02.00-rc4
+ * Version      : v00.00.02.02
  *
  * Authors:
  *      Sreenivas Bagalkote     <Sreenivas.Bagalkote@lsil.com>
@@ -55,13 +55,13 @@ static struct pci_device_id megasas_pci_table[] = {
 
         {
          PCI_VENDOR_ID_LSI_LOGIC,
-         PCI_DEVICE_ID_LSI_SAS1064R,
+         PCI_DEVICE_ID_LSI_SAS1064R, // xscale IOP
          PCI_ANY_ID,
          PCI_ANY_ID,
          },
         {
          PCI_VENDOR_ID_DELL,
-         PCI_DEVICE_ID_DELL_PERC5,
+         PCI_DEVICE_ID_DELL_PERC5, // xscale IOP
          PCI_ANY_ID,
          PCI_ANY_ID,
          },
@@ -119,12 +119,18 @@ megasas_return_cmd(struct megasas_instance *instance, struct megasas_cmd *cmd)
         spin_unlock_irqrestore(&instance->cmd_pool_lock, flags);
 }
 
+
+/**
+*       The following functions are defined for xscale 
+*       (deviceid : 1064R, PERC5) controllers
+*/
+
 /**
- * megasas_enable_intr -        Enables interrupts
+ * megasas_enable_intr_xscale - Enables interrupts
  * @regs:                       MFI register set
  */
 static inline void
-megasas_enable_intr(struct megasas_register_set __iomem * regs)
+megasas_enable_intr_xscale(struct megasas_register_set __iomem * regs)
 {
         writel(1, &(regs)->outbound_intr_mask);
 
@@ -133,13 +139,73 @@ megasas_enable_intr(struct megasas_register_set __iomem * regs)
 }
 
 /**
+ * megasas_read_fw_status_reg_xscale - returns the current FW status value
+ * @regs:                       MFI register set
+ */
+static u32
+megasas_read_fw_status_reg_xscale(struct megasas_register_set __iomem * regs)
+{
+        return readl(&(regs)->outbound_msg_0);
+}
+/**
+ * megasas_clear_interrupt_xscale -     Check & clear interrupt
+ * @regs:                               MFI register set
+ */
+static int 
+megasas_clear_intr_xscale(struct megasas_register_set __iomem * regs)
+{
+        u32 status;
+        /*
+         * Check if it is our interrupt
+         */
+        status = readl(&regs->outbound_intr_status);
+
+        if (!(status & MFI_OB_INTR_STATUS_MASK)) {
+                return 1;
+        }
+
+        /*
+         * Clear the interrupt by writing back the same value
+         */
+        writel(status, &regs->outbound_intr_status);
+
+        return 0;
+}
+
+/**
+ * megasas_fire_cmd_xscale -    Sends command to the FW
+ * @frame_phys_addr :           Physical address of cmd
+ * @frame_count :               Number of frames for the command
+ * @regs :                      MFI register set
+ */
+static inline void 
+megasas_fire_cmd_xscale(dma_addr_t frame_phys_addr,u32 frame_count, struct megasas_register_set __iomem *regs)
+{
+        writel((frame_phys_addr >> 3)|(frame_count),
+               &(regs)->inbound_queue_port);
+}
+
+static struct megasas_instance_template megasas_instance_template_xscale = {
+
+        .fire_cmd = megasas_fire_cmd_xscale,
+        .enable_intr = megasas_enable_intr_xscale,
+        .clear_intr = megasas_clear_intr_xscale,
+        .read_fw_status_reg = megasas_read_fw_status_reg_xscale,
+};
+
+/**
+*       This is the end of set of functions & definitions specific 
+*       to xscale (deviceid : 1064R, PERC5) controllers
+*/
+
+/**
  * megasas_disable_intr -       Disables interrupts
  * @regs:                       MFI register set
  */
 static inline void
 megasas_disable_intr(struct megasas_register_set __iomem * regs)
 {
-        u32 mask = readl(&regs->outbound_intr_mask) & (~0x00000001);
+        u32 mask = 0x1f; 
         writel(mask, &regs->outbound_intr_mask);
 
         /* Dummy readl to force pci flush */
@@ -167,8 +233,7 @@ megasas_issue_polled(struct megasas_instance *instance, struct megasas_cmd *cmd)
         /*
          * Issue the frame using inbound queue port
          */
-        writel(cmd->frame_phys_addr >> 3,
-               &instance->reg_set->inbound_queue_port);
+        instance->instancet->fire_cmd(cmd->frame_phys_addr ,0,instance->reg_set);
 
         /*
          * Wait for cmd_status to change
@@ -198,8 +263,7 @@ megasas_issue_blocked_cmd(struct megasas_instance *instance,
 {
         cmd->cmd_status = ENODATA;
 
-        writel(cmd->frame_phys_addr >> 3,
-               &instance->reg_set->inbound_queue_port);
+        instance->instancet->fire_cmd(cmd->frame_phys_addr ,0,instance->reg_set);
 
         wait_event(instance->int_cmd_wait_q, (cmd->cmd_status != ENODATA));
 
@@ -242,8 +306,7 @@ megasas_issue_blocked_abort_cmd(struct megasas_instance *instance,
         cmd->sync_cmd = 1;
         cmd->cmd_status = 0xFF;
 
-        writel(cmd->frame_phys_addr >> 3,
-               &instance->reg_set->inbound_queue_port);
+        instance->instancet->fire_cmd(cmd->frame_phys_addr ,0,instance->reg_set);
 
         /*
          * Wait for this cmd to complete
@@ -558,112 +621,29 @@ megasas_build_ldio(struct megasas_instance *instance, struct scsi_cmnd *scp,
 }
 
 /**
- * megasas_build_cmd -  Prepares a command packet
- * @instance:           Adapter soft state
- * @scp:                SCSI command
- * @frame_count:        [OUT] Number of frames used to prepare this command
+ * megasas_is_ldio -            Checks if the cmd is for logical drive
+ * @scmd:                       SCSI command
+ *      
+ * Called by megasas_queue_command to find out if the command to be queued
+ * is a logical drive command   
  */
-static struct megasas_cmd *megasas_build_cmd(struct megasas_instance
-                                                    *instance,
-                                                    struct scsi_cmnd *scp,
-                                                    int *frame_count)
+static inline int megasas_is_ldio(struct scsi_cmnd *cmd)
 {
-        u32 logical_cmd;
-        struct megasas_cmd *cmd;
-
-        /*
-         * Find out if this is logical or physical drive command.
-         */
-        logical_cmd = MEGASAS_IS_LOGICAL(scp);
-
-        /*
-         * Logical drive command
-         */
-        if (logical_cmd) {
-
-                if (scp->device->id >= MEGASAS_MAX_LD) {
-                        scp->result = DID_BAD_TARGET << 16;
-                        return NULL;
-                }
-
-                switch (scp->cmnd[0]) {
-
-                case READ_10:
-                case WRITE_10:
-                case READ_12:
-                case WRITE_12:
-                case READ_6:
-                case WRITE_6:
-                case READ_16:
-                case WRITE_16:
-                        /*
-                         * Fail for LUN > 0
-                         */
-                        if (scp->device->lun) {
-                                scp->result = DID_BAD_TARGET << 16;
-                                return NULL;
-                        }
-
-                        cmd = megasas_get_cmd(instance);
-
-                        if (!cmd) {
-                                scp->result = DID_IMM_RETRY << 16;
-                                return NULL;
-                        }
-
-                        *frame_count = megasas_build_ldio(instance, scp, cmd);
-
-                        if (!(*frame_count)) {
-                                megasas_return_cmd(instance, cmd);
-                                return NULL;
-                        }
-
-                        return cmd;
-
-                default:
-                        /*
-                         * Fail for LUN > 0
-                         */
-                        if (scp->device->lun) {
-                                scp->result = DID_BAD_TARGET << 16;
-                                return NULL;
-                        }
-
-                        cmd = megasas_get_cmd(instance);
-
-                        if (!cmd) {
-                                scp->result = DID_IMM_RETRY << 16;
-                                return NULL;
-                        }
-
-                        *frame_count = megasas_build_dcdb(instance, scp, cmd);
-
-                        if (!(*frame_count)) {
-                                megasas_return_cmd(instance, cmd);
-                                return NULL;
-                        }
-
-                        return cmd;
-                }
-        } else {
-                cmd = megasas_get_cmd(instance);
-
-                if (!cmd) {
-                        scp->result = DID_IMM_RETRY << 16;
-                        return NULL;
-                }
-
-                *frame_count = megasas_build_dcdb(instance, scp, cmd);
-
-                if (!(*frame_count)) {
-                        megasas_return_cmd(instance, cmd);
-                        return NULL;
-                }
-
-                return cmd;
+        if (!MEGASAS_IS_LOGICAL(cmd))
+                return 0;
+        switch (cmd->cmnd[0]) {
+        case READ_10:
+        case WRITE_10:
+        case READ_12:
+        case WRITE_12:
+        case READ_6:
+        case WRITE_6:
+        case READ_16:
+        case WRITE_16:
+                return 1;
+        default:
+                return 0;
         }
-
-        return NULL;
 }
 
 /**
@@ -684,13 +664,27 @@ megasas_queue_command(struct scsi_cmnd *scmd, void (*done) (struct scsi_cmnd *))
         scmd->scsi_done = done;
         scmd->result = 0;
 
-        cmd = megasas_build_cmd(instance, scmd, &frame_count);
-
-        if (!cmd) {
-                done(scmd);
-                return 0;
+        if (MEGASAS_IS_LOGICAL(scmd) &&
+            (scmd->device->id >= MEGASAS_MAX_LD || scmd->device->lun)) {
+                scmd->result = DID_BAD_TARGET << 16;
+                goto out_done;
         }
 
+        cmd = megasas_get_cmd(instance);
+        if (!cmd)
+                return SCSI_MLQUEUE_HOST_BUSY;
+
+        /*
+         * Logical drive command
+         */
+        if (megasas_is_ldio(scmd))
+                frame_count = megasas_build_ldio(instance, scmd, cmd);
+        else
+                frame_count = megasas_build_dcdb(instance, scmd, cmd);
+
+        if (!frame_count)
+                goto out_return_cmd;
+
         cmd->scmd = scmd;
         scmd->SCp.ptr = (char *)cmd;
         scmd->SCp.sent_command = jiffies;
@@ -702,10 +696,15 @@ megasas_queue_command(struct scsi_cmnd *scmd, void (*done) (struct scsi_cmnd *))
         instance->fw_outstanding++;
         spin_unlock_irqrestore(&instance->instance_lock, flags);
 
-        writel(((cmd->frame_phys_addr >> 3) | (cmd->frame_count - 1)),
-               &instance->reg_set->inbound_queue_port);
+        instance->instancet->fire_cmd(cmd->frame_phys_addr ,cmd->frame_count-1,instance->reg_set);
 
         return 0;
+
+ out_return_cmd:
+        megasas_return_cmd(instance, cmd);
+ out_done:
+        done(scmd);
+        return 0;
 }
 
 /**
@@ -1108,7 +1107,6 @@ megasas_complete_cmd(struct megasas_instance *instance, struct megasas_cmd *cmd,
 static int
 megasas_deplete_reply_queue(struct megasas_instance *instance, u8 alt_status)
 {
-        u32 status;
         u32 producer;
         u32 consumer;
         u32 context;
@@ -1116,17 +1114,10 @@ megasas_deplete_reply_queue(struct megasas_instance *instance, u8 alt_status)
 
         /*
          * Check if it is our interrupt
+         * Clear the interrupt 
          */
-        status = readl(&instance->reg_set->outbound_intr_status);
-
-        if (!(status & MFI_OB_INTR_STATUS_MASK)) {
+        if(instance->instancet->clear_intr(instance->reg_set))
                 return IRQ_NONE;
-        }
-
-        /*
-         * Clear the interrupt by writing back the same value
-         */
-        writel(status, &instance->reg_set->outbound_intr_status);
 
         producer = *instance->producer;
         consumer = *instance->consumer;
@@ -1160,7 +1151,7 @@ static irqreturn_t megasas_isr(int irq, void *devp, struct pt_regs *regs)
 
 /**
  * megasas_transition_to_ready -        Move the FW to READY state
- * @reg_set:                            MFI register set
+ * @instance:                           Adapter soft state
  *
  * During the initialization, FW passes can potentially be in any one of
  * several possible states. If the FW in operational, waiting-for-handshake
@@ -1168,14 +1159,14 @@ static irqreturn_t megasas_isr(int irq, void *devp, struct pt_regs *regs)
  * has to wait for the ready state.
  */
 static int
-megasas_transition_to_ready(struct megasas_register_set __iomem * reg_set)
+megasas_transition_to_ready(struct megasas_instance* instance)
 {
         int i;
         u8 max_wait;
         u32 fw_state;
         u32 cur_state;
 
-        fw_state = readl(&reg_set->outbound_msg_0) & MFI_STATE_MASK;
+        fw_state = instance->instancet->read_fw_status_reg(instance->reg_set) & MFI_STATE_MASK;
 
         while (fw_state != MFI_STATE_READY) {
 
@@ -1193,7 +1184,7 @@ megasas_transition_to_ready(struct megasas_register_set __iomem * reg_set)
                          * Set the CLR bit in inbound doorbell
                          */
                         writel(MFI_INIT_CLEAR_HANDSHAKE,
-                               &reg_set->inbound_doorbell);
+                                &instance->reg_set->inbound_doorbell);
 
                         max_wait = 2;
                         cur_state = MFI_STATE_WAIT_HANDSHAKE;
@@ -1203,8 +1194,8 @@ megasas_transition_to_ready(struct megasas_register_set __iomem * reg_set)
                         /*
                          * Bring it to READY state; assuming max wait 2 secs
                          */
-                        megasas_disable_intr(reg_set);
-                        writel(MFI_INIT_READY, &reg_set->inbound_doorbell);
+                        megasas_disable_intr(instance->reg_set);
+                        writel(MFI_INIT_READY, &instance->reg_set->inbound_doorbell);
 
                         max_wait = 10;
                         cur_state = MFI_STATE_OPERATIONAL;
@@ -1253,8 +1244,8 @@ megasas_transition_to_ready(struct megasas_register_set __iomem * reg_set)
                  * The cur_state should not last for more than max_wait secs
                  */
                 for (i = 0; i < (max_wait * 1000); i++) {
-                        fw_state = MFI_STATE_MASK &
-                            readl(&reg_set->outbound_msg_0);
+                        fw_state = instance->instancet->read_fw_status_reg(instance->reg_set) &  
+                                        MFI_STATE_MASK ;
 
                         if (fw_state == cur_state) {
                                 msleep(1);
@@ -1616,18 +1607,20 @@ static int megasas_init_mfi(struct megasas_instance *instance)
 
         reg_set = instance->reg_set;
 
+        instance->instancet = &megasas_instance_template_xscale;
+
         /*
          * We expect the FW state to be READY
          */
-        if (megasas_transition_to_ready(instance->reg_set))
+        if (megasas_transition_to_ready(instance))
                 goto fail_ready_state;
 
         /*
          * Get various operational parameters from status register
          */
-        instance->max_fw_cmds = readl(&reg_set->outbound_msg_0) & 0x00FFFF;
-        instance->max_num_sge = (readl(&reg_set->outbound_msg_0) & 0xFF0000) >>
-            0x10;
+        instance->max_fw_cmds = instance->instancet->read_fw_status_reg(reg_set) & 0x00FFFF;
+        instance->max_num_sge = (instance->instancet->read_fw_status_reg(reg_set) & 0xFF0000) >> 
+                                        0x10;
         /*
          * Create a pool of commands
          */
@@ -1936,8 +1929,7 @@ megasas_register_aen(struct megasas_instance *instance, u32 seq_num,
         /*
          * Issue the aen registration frame
          */
-        writel(cmd->frame_phys_addr >> 3,
-               &instance->reg_set->inbound_queue_port);
+        instance->instancet->fire_cmd(cmd->frame_phys_addr ,0,instance->reg_set);
 
         return 0;
 }
@@ -2126,7 +2118,7 @@ megasas_probe_one(struct pci_dev *pdev, const struct pci_device_id *id)
                 goto fail_irq;
         }
 
-        megasas_enable_intr(instance->reg_set);
+        instance->instancet->enable_intr(instance->reg_set);
 
         /*
          * Store instance in PCI softstate
@@ -2681,9 +2673,8 @@ megasas_mgmt_compat_ioctl(struct file *file, unsigned int cmd,
                           unsigned long arg)
 {
         switch (cmd) {
-        case MEGASAS_IOC_FIRMWARE:{
-                        return megasas_mgmt_compat_ioctl_fw(file, arg);
-                }
+        case MEGASAS_IOC_FIRMWARE32:
+                return megasas_mgmt_compat_ioctl_fw(file, arg);
         case MEGASAS_IOC_GET_AEN:
                 return megasas_mgmt_ioctl_aen(file, arg);
         }
diff --git a/drivers/scsi/megaraid/megaraid_sas.h b/drivers/scsi/megaraid/megaraid_sas.h
index eaec9d531424..d6d166c0663f 100644
--- a/drivers/scsi/megaraid/megaraid_sas.h
+++ b/drivers/scsi/megaraid/megaraid_sas.h
@@ -18,10 +18,9 @@
 /**
  * MegaRAID SAS Driver meta data
  */
-#define MEGASAS_VERSION                         "00.00.02.00-rc4"
-#define MEGASAS_RELDATE                         "Sep 16, 2005"
-#define MEGASAS_EXT_VERSION                     "Fri Sep 16 12:37:08 EDT 2005"
-
+#define MEGASAS_VERSION                         "00.00.02.02"
+#define MEGASAS_RELDATE                         "Jan 23, 2006"
+#define MEGASAS_EXT_VERSION                     "Mon Jan 23 14:09:01 PST 2006"
 /*
  * =====================================
  * MegaRAID SAS MFI firmware definitions
@@ -1013,6 +1012,16 @@ struct megasas_evt_detail {
 
 } __attribute__ ((packed));
 
+ struct megasas_instance_template {
+        void (*fire_cmd)(dma_addr_t ,u32 ,struct megasas_register_set __iomem *);
+
+        void (*enable_intr)(struct megasas_register_set __iomem *) ;
+
+        int (*clear_intr)(struct megasas_register_set __iomem *);
+
+        u32 (*read_fw_status_reg)(struct megasas_register_set __iomem *);
+ };
+
 struct megasas_instance {
 
         u32 *producer;
@@ -1056,6 +1065,8 @@ struct megasas_instance {
         u32 fw_outstanding;
         u32 hw_crit_error;
         spinlock_t instance_lock;
+
+        struct megasas_instance_template *instancet;
 };
 
 #define MEGASAS_IS_LOGICAL(scp)                                         \
@@ -1125,11 +1136,10 @@ struct compat_megasas_iocpacket {
         struct compat_iovec sgl[MAX_IOCTL_SGE];
 } __attribute__ ((packed));
 
-#define MEGASAS_IOC_FIRMWARE    _IOWR('M', 1, struct compat_megasas_iocpacket)
-#else
-#define MEGASAS_IOC_FIRMWARE    _IOWR('M', 1, struct megasas_iocpacket)
 #endif
 
+#define MEGASAS_IOC_FIRMWARE    _IOWR('M', 1, struct megasas_iocpacket)
+#define MEGASAS_IOC_FIRMWARE32  _IOWR('M', 1, struct compat_megasas_iocpacket)
 #define MEGASAS_IOC_GET_AEN     _IOW('M', 3, struct megasas_aen)
 
 struct megasas_mgmt_info {
diff --git a/drivers/scsi/qla1280.c b/drivers/scsi/qla1280.c
index 0878f95b5449..e0230249fa0f 100644
--- a/drivers/scsi/qla1280.c
+++ b/drivers/scsi/qla1280.c
@@ -17,9 +17,11 @@
 * General Public License for more details.
 *
 ******************************************************************************/
-#define QLA1280_VERSION      "3.25"
+#define QLA1280_VERSION      "3.26"
 /*****************************************************************************
     Revision History:
+    Rev  3.26, January 16, 2006 Jes Sorensen
+        - Ditch all < 2.6 support
     Rev  3.25.1, February 10, 2005 Christoph Hellwig
         - use pci_map_single to map non-S/G requests
         - remove qla1280_proc_info
@@ -356,25 +358,18 @@
 #include <asm/types.h>
 #include <asm/system.h>
 
-#if LINUX_VERSION_CODE >= 0x020545
 #include <scsi/scsi.h>
 #include <scsi/scsi_cmnd.h>
 #include <scsi/scsi_device.h>
 #include <scsi/scsi_host.h>
 #include <scsi/scsi_tcq.h>
-#else
-#include <linux/blk.h>
-#include "scsi.h"
-#include <scsi/scsi_host.h>
-#include "sd.h"
-#endif
 
 #if defined(CONFIG_IA64_GENERIC) || defined(CONFIG_IA64_SGI_SN2)
 #include <asm/sn/io.h>
 #endif
 
-#if LINUX_VERSION_CODE < 0x020407
-#error "Kernels older than 2.4.7 are no longer supported"
+#if LINUX_VERSION_CODE < 0x020600
+#error "Kernels older than 2.6.0 are no longer supported"
 #endif
 
 
@@ -441,52 +436,6 @@
 
 #define NVRAM_DELAY()                   udelay(500)     /* 2 microseconds */
 
-#if LINUX_VERSION_CODE < 0x020500
-#define HOST_LOCK                       &io_request_lock
-#define irqreturn_t                     void
-#define IRQ_RETVAL(foo)
-#define MSG_ORDERED_TAG                 1
-
-#define DMA_BIDIRECTIONAL       SCSI_DATA_UNKNOWN
-#define DMA_TO_DEVICE           SCSI_DATA_WRITE
-#define DMA_FROM_DEVICE         SCSI_DATA_READ
-#define DMA_NONE                SCSI_DATA_NONE
-
-#ifndef HAVE_SECTOR_T
-typedef unsigned int sector_t;
-#endif
-
-static inline void
-scsi_adjust_queue_depth(struct scsi_device *device, int tag, int depth)
-{
-        if (tag) {
-                device->tagged_queue = tag;
-                device->current_tag = 0;
-        }
-        device->queue_depth = depth;
-}
-static inline struct Scsi_Host *scsi_host_alloc(struct scsi_host_template *t, size_t s)
-{
-        return scsi_register(t, s);
-}
-static inline void scsi_host_put(struct Scsi_Host *h)
-{
-        scsi_unregister(h);
-}
-#else
-#define HOST_LOCK                       ha->host->host_lock
-#endif
-#if LINUX_VERSION_CODE < 0x020600
-#define DEV_SIMPLE_TAGS(device)         device->tagged_queue
-/*
- * Hack around that qla1280_remove_one is called from
- * qla1280_release in 2.4
- */
-#undef __devexit
-#define __devexit
-#else
-#define DEV_SIMPLE_TAGS(device)         device->simple_tags
-#endif
 #if defined(__ia64__) && !defined(ia64_platform_is)
 #define ia64_platform_is(foo)           (!strcmp(x, platform_name))
 #endif
@@ -506,9 +455,6 @@ static void qla1280_remove_one(struct pci_dev *);
  *  QLogic Driver Support Function Prototypes.
  */
 static void qla1280_done(struct scsi_qla_host *);
-#if LINUX_VERSION_CODE < 0x020545
-static void qla1280_get_target_options(struct scsi_cmnd *, struct scsi_qla_host *);
-#endif
 static int qla1280_get_token(char *);
 static int qla1280_setup(char *s) __init;
 
@@ -610,11 +556,7 @@ __setup("qla1280=", qla1280_setup);
 #define CMD_SNSLEN(Cmnd)        sizeof(Cmnd->sense_buffer)
 #define CMD_RESULT(Cmnd)        Cmnd->result
 #define CMD_HANDLE(Cmnd)        Cmnd->host_scribble
-#if LINUX_VERSION_CODE < 0x020545
-#define CMD_REQUEST(Cmnd)       Cmnd->request.cmd
-#else
 #define CMD_REQUEST(Cmnd)       Cmnd->request->cmd
-#endif
 
 #define CMD_HOST(Cmnd)          Cmnd->device->host
 #define SCSI_BUS_32(Cmnd)       Cmnd->device->channel
@@ -1064,10 +1006,10 @@ qla1280_error_action(struct scsi_cmnd *cmd, enum action action)
         add_timer(&timer);
 
         /* wait for the action to complete (or the timer to expire) */
-        spin_unlock_irq(HOST_LOCK);
+        spin_unlock_irq(ha->host->host_lock);
         wait_for_completion(&wait);
         del_timer_sync(&timer);
-        spin_lock_irq(HOST_LOCK);
+        spin_lock_irq(ha->host->host_lock);
         sp->wait = NULL;
 
         /* the only action we might get a fail for is abort */
@@ -1173,96 +1115,6 @@ qla1280_biosparam(struct scsi_device *sdev, struct block_device *bdev,
         return 0;
 }
 
-#if LINUX_VERSION_CODE < 0x020600
-static int
-qla1280_detect(struct scsi_host_template *template)
-{
-        struct pci_device_id *id = &qla1280_pci_tbl[0];
-        struct pci_dev *pdev = NULL;
-        int num_hosts = 0;
-
-        if (sizeof(struct srb) > sizeof(Scsi_Pointer)) {
-                printk(KERN_WARNING
-                       "qla1280: struct srb too big, aborting\n");
-                return 0;
-        }
-
-        if ((DMA_BIDIRECTIONAL != PCI_DMA_BIDIRECTIONAL) ||
-            (DMA_TO_DEVICE != PCI_DMA_TODEVICE) ||
-            (DMA_FROM_DEVICE != PCI_DMA_FROMDEVICE) ||
-            (DMA_NONE != PCI_DMA_NONE)) {
-                printk(KERN_WARNING
-                       "qla1280: dma direction bits don't match\n");
-                return 0;
-        }
-
-#ifdef MODULE
-        /*
-         * If we are called as a module, the qla1280 pointer may not be null
-         * and it would point to our bootup string, just like on the lilo
-         * command line.  IF not NULL, then process this config string with
-         * qla1280_setup
-         *
-         * Boot time Options
-         * To add options at boot time add a line to your lilo.conf file like:
-         * append="qla1280=verbose,max_tags:{{255,255,255,255},{255,255,255,255}}"
-         * which will result in the first four devices on the first two
-         * controllers being set to a tagged queue depth of 32.
-         */
-        if (qla1280)
-                qla1280_setup(qla1280);
-#endif
-
-        /* First Initialize QLA12160 on PCI Bus 1 Dev 2 */
-        while ((pdev = pci_find_device(id->vendor, id->device, pdev))) {
-                if (pdev->bus->number == 1 && PCI_SLOT(pdev->devfn) == 2) {
-                        if (!qla1280_probe_one(pdev, id))
-                                num_hosts++;
-                }
-        }
-
-        pdev = NULL;
-        /* Try and find each different type of adapter we support */
-        for (id = &qla1280_pci_tbl[0]; id->device; id++) {
-                while ((pdev = pci_find_device(id->vendor, id->device, pdev))) {
-                        /*
-                         * skip QLA12160 already initialized on
-                         * PCI Bus 1 Dev 2 since we already initialized
-                         * and presented it
-                         */
-                        if (id->device == PCI_DEVICE_ID_QLOGIC_ISP12160 &&
-                            pdev->bus->number == 1 &&
-                            PCI_SLOT(pdev->devfn) == 2)
-                                continue;
-
-                        if (!qla1280_probe_one(pdev, id))
-                                num_hosts++;
-                }
-        }
-
-        return num_hosts;
-}
-
-/*
- * This looks a bit ugly as we could just pass down host to
- * qla1280_remove_one, but I want to keep qla1280_release purely a wrapper
- * around pci_driver::remove as used from 2.6 onwards.
- */
-static int
-qla1280_release(struct Scsi_Host *host)
-{
-        struct scsi_qla_host *ha = (struct scsi_qla_host *)host->hostdata;
-
-        qla1280_remove_one(ha->pdev);
-        return 0;
-}
-
-static int
-qla1280_biosparam_old(Disk * disk, kdev_t dev, int geom[])
-{
-        return qla1280_biosparam(disk->device, NULL, disk->capacity, geom);
-}
-#endif
  
 /* disable risc and host interrupts */
 static inline void
@@ -1295,7 +1147,7 @@ qla1280_intr_handler(int irq, void *dev_id, struct pt_regs *regs)
         ENTER_INTR ("qla1280_intr_handler");
         ha = (struct scsi_qla_host *)dev_id;
 
-        spin_lock(HOST_LOCK);
+        spin_lock(ha->host->host_lock);
 
         ha->isr_count++;
         reg = ha->iobase;
@@ -1311,7 +1163,7 @@ qla1280_intr_handler(int irq, void *dev_id, struct pt_regs *regs)
         if (!list_empty(&ha->done_q))
                 qla1280_done(ha);
 
-        spin_unlock(HOST_LOCK);
+        spin_unlock(ha->host->host_lock);
 
         qla1280_enable_intrs(ha);
 
@@ -1411,11 +1263,9 @@ qla1280_slave_configure(struct scsi_device *device)
                 scsi_adjust_queue_depth(device, 0, default_depth);
         }
 
-#if LINUX_VERSION_CODE > 0x020500
         nv->bus[bus].target[target].parameter.enable_sync = device->sdtr;
         nv->bus[bus].target[target].parameter.enable_wide = device->wdtr;
         nv->bus[bus].target[target].ppr_1x160.flags.enable_ppr = device->ppr;
-#endif
 
         if (driver_setup.no_sync ||
             (driver_setup.sync_mask &&
@@ -1432,38 +1282,14 @@ qla1280_slave_configure(struct scsi_device *device)
                         nv->bus[bus].target[target].ppr_1x160.flags.enable_ppr = 0;
         }
 
-        spin_lock_irqsave(HOST_LOCK, flags);
+        spin_lock_irqsave(ha->host->host_lock, flags);
         if (nv->bus[bus].target[target].parameter.enable_sync)
                 status = qla1280_set_target_parameters(ha, bus, target);
         qla1280_get_target_parameters(ha, device);
-        spin_unlock_irqrestore(HOST_LOCK, flags);
+        spin_unlock_irqrestore(ha->host->host_lock, flags);
         return status;
 }
 
-#if LINUX_VERSION_CODE < 0x020545
-/**************************************************************************
- *   qla1280_select_queue_depth
- *
- *   Sets the queue depth for each SCSI device hanging off the input
- *   host adapter.  We use a queue depth of 2 for devices that do not
- *   support tagged queueing.
- **************************************************************************/
-static void
-qla1280_select_queue_depth(struct Scsi_Host *host, struct scsi_device *sdev_q)
-{
-        struct scsi_qla_host *ha = (struct scsi_qla_host *)host->hostdata;
-        struct scsi_device *sdev;
-
-        ENTER("qla1280_select_queue_depth");
-        for (sdev = sdev_q; sdev; sdev = sdev->next)
-                if (sdev->host == host)
-                        qla1280_slave_configure(sdev);
-
-        if (sdev_q)
-                qla1280_check_for_dead_scsi_bus(ha, sdev_q->channel);
-        LEAVE("qla1280_select_queue_depth");
-}
-#endif
 
 /*
  * qla1280_done
@@ -1523,10 +1349,6 @@ qla1280_done(struct scsi_qla_host *ha)
                 CMD_HANDLE(sp->cmd) = (unsigned char *)INVALID_HANDLE;
                 ha->actthreads--;
 
-#if LINUX_VERSION_CODE < 0x020500
-                if (cmd->cmnd[0] == INQUIRY)
-                        qla1280_get_target_options(cmd, ha);
-#endif
                 (*(cmd)->scsi_done)(cmd);
 
                 if(sp->wait != NULL)
@@ -1655,9 +1477,7 @@ qla1280_initialize_adapter(struct scsi_qla_host *ha)
         struct device_reg __iomem *reg;
         int status;
         int bus;
-#if LINUX_VERSION_CODE > 0x020500
         unsigned long flags;
-#endif
 
         ENTER("qla1280_initialize_adapter");
 
@@ -1695,15 +1515,12 @@ qla1280_initialize_adapter(struct scsi_qla_host *ha)
                         "NVRAM\n");
         }
 
-#if LINUX_VERSION_CODE >= 0x020500
         /*
          * It's necessary to grab the spin here as qla1280_mailbox_command
          * needs to be able to drop the lock unconditionally to wait
          * for completion.
-         * In 2.4 ->detect is called with the io_request_lock held.
          */
-        spin_lock_irqsave(HOST_LOCK, flags);
-#endif
+        spin_lock_irqsave(ha->host->host_lock, flags);
 
         status = qla1280_load_firmware(ha);
         if (status) {
@@ -1735,9 +1552,8 @@ qla1280_initialize_adapter(struct scsi_qla_host *ha)
 
         ha->flags.online = 1;
  out:
-#if LINUX_VERSION_CODE >= 0x020500
-        spin_unlock_irqrestore(HOST_LOCK, flags);
-#endif
+        spin_unlock_irqrestore(ha->host->host_lock, flags);
+
         if (status)
                 dprintk(2, "qla1280_initialize_adapter: **** FAILED ****\n");
 
@@ -2650,14 +2466,14 @@ qla1280_mailbox_command(struct scsi_qla_host *ha, uint8_t mr, uint16_t *mb)
         timer.function = qla1280_mailbox_timeout;
         add_timer(&timer);
 
-        spin_unlock_irq(HOST_LOCK);
+        spin_unlock_irq(ha->host->host_lock);
         WRT_REG_WORD(&reg->host_cmd, HC_SET_HOST_INT);
         data = qla1280_debounce_register(&reg->istatus);
 
         wait_for_completion(&wait);
         del_timer_sync(&timer);
 
-        spin_lock_irq(HOST_LOCK);
+        spin_lock_irq(ha->host->host_lock);
 
         ha->mailbox_wait = NULL;
 
@@ -2770,9 +2586,9 @@ qla1280_bus_reset(struct scsi_qla_host *ha, int bus)
                         ha->bus_settings[bus].scsi_bus_dead = 1;
                 ha->bus_settings[bus].failed_reset_count++;
         } else {
-                spin_unlock_irq(HOST_LOCK);
+                spin_unlock_irq(ha->host->host_lock);
                 ssleep(reset_delay);
-                spin_lock_irq(HOST_LOCK);
+                spin_lock_irq(ha->host->host_lock);
 
                 ha->bus_settings[bus].scsi_bus_dead = 0;
                 ha->bus_settings[bus].failed_reset_count = 0;
@@ -3078,7 +2894,7 @@ qla1280_64bit_start_scsi(struct scsi_qla_host *ha, struct srb * sp)
                 (SCSI_TCN_32(cmd) | BIT_7) : SCSI_TCN_32(cmd);
 
         /* Enable simple tag queuing if device supports it. */
-        if (DEV_SIMPLE_TAGS(cmd->device))
+        if (cmd->device->simple_tags)
                 pkt->control_flags |= cpu_to_le16(BIT_3);
 
         /* Load SCSI command packet. */
@@ -3377,7 +3193,7 @@ qla1280_32bit_start_scsi(struct scsi_qla_host *ha, struct srb * sp)
                 (SCSI_TCN_32(cmd) | BIT_7) : SCSI_TCN_32(cmd);
 
         /* Enable simple tag queuing if device supports it. */
-        if (DEV_SIMPLE_TAGS(cmd->device))
+        if (cmd->device->simple_tags)
                 pkt->control_flags |= cpu_to_le16(BIT_3);
 
         /* Load SCSI command packet. */
@@ -3889,50 +3705,6 @@ qla1280_rst_aen(struct scsi_qla_host *ha)
 }
 
 
-#if LINUX_VERSION_CODE < 0x020500
-/*
- *
- */
-static void
-qla1280_get_target_options(struct scsi_cmnd *cmd, struct scsi_qla_host *ha)
-{
-        unsigned char *result;
-        struct nvram *n;
-        int bus, target, lun;
-
-        bus = SCSI_BUS_32(cmd);
-        target = SCSI_TCN_32(cmd);
-        lun = SCSI_LUN_32(cmd);
-
-        /*
-         * Make sure to not touch anything if someone is using the
-         * sg interface.
-         */
-        if (cmd->use_sg || (CMD_RESULT(cmd) >> 16) != DID_OK || lun)
-                return;
-
-        result = cmd->request_buffer;
-        n = &ha->nvram;
-
-        n->bus[bus].target[target].parameter.enable_wide = 0;
-        n->bus[bus].target[target].parameter.enable_sync = 0;
-        n->bus[bus].target[target].ppr_1x160.flags.enable_ppr = 0;
-
-        if (result[7] & 0x60)
-                n->bus[bus].target[target].parameter.enable_wide = 1;
-        if (result[7] & 0x10)
-                n->bus[bus].target[target].parameter.enable_sync = 1;
-        if ((result[2] >= 3) && (result[4] + 5 > 56) &&
-            (result[56] & 0x4))
-                n->bus[bus].target[target].ppr_1x160.flags.enable_ppr = 1;
-
-        dprintk(2, "get_target_options(): wide %i, sync %i, ppr %i\n",
-                n->bus[bus].target[target].parameter.enable_wide,
-                n->bus[bus].target[target].parameter.enable_sync,
-                n->bus[bus].target[target].ppr_1x160.flags.enable_ppr);
-}
-#endif
-
 /*
  *  qla1280_status_entry
  *      Processes received ISP status entry.
@@ -4271,7 +4043,7 @@ qla1280_get_target_parameters(struct scsi_qla_host *ha,
         } else
                 printk(" Async");
 
-        if (DEV_SIMPLE_TAGS(device))
+        if (device->simple_tags)
                 printk(", Tagged queuing: depth %d", device->queue_depth);
         printk("\n");
 }
@@ -4485,7 +4257,7 @@ qla1280_get_token(char *str)
         return ret;
 }
 
-#if LINUX_VERSION_CODE >= 0x020600
+
 static struct scsi_host_template qla1280_driver_template = {
         .module                 = THIS_MODULE,
         .proc_name              = "qla1280",
@@ -4504,27 +4276,7 @@ static struct scsi_host_template qla1280_driver_template = {
         .cmd_per_lun            = 1,
         .use_clustering         = ENABLE_CLUSTERING,
 };
-#else
-static struct scsi_host_template qla1280_driver_template = {
-        .proc_name              = "qla1280",
-        .name                   = "Qlogic ISP 1280/12160",
-        .detect                 = qla1280_detect,
-        .release                = qla1280_release,
-        .info                   = qla1280_info,
-        .queuecommand           = qla1280_queuecommand,
-        .eh_abort_handler       = qla1280_eh_abort,
-        .eh_device_reset_handler= qla1280_eh_device_reset,
-        .eh_bus_reset_handler   = qla1280_eh_bus_reset,
-        .eh_host_reset_handler  = qla1280_eh_adapter_reset,
-        .bios_param             = qla1280_biosparam_old,
-        .can_queue              = 0xfffff,
-        .this_id                = -1,
-        .sg_tablesize           = SG_ALL,
-        .cmd_per_lun            = 1,
-        .use_clustering         = ENABLE_CLUSTERING,
-        .use_new_eh_code        = 1,
-};
-#endif
+
 
 static int __devinit
 qla1280_probe_one(struct pci_dev *pdev, const struct pci_device_id *id)
@@ -4615,10 +4367,6 @@ qla1280_probe_one(struct pci_dev *pdev, const struct pci_device_id *id)
         host->max_sectors = 1024;
         host->unique_id = host->host_no;
 
-#if LINUX_VERSION_CODE < 0x020545
-        host->select_queue_depths = qla1280_select_queue_depth;
-#endif
-
         error = -ENODEV;
 
 #if MEMORY_MAPPED_IO
@@ -4666,21 +4414,15 @@ qla1280_probe_one(struct pci_dev *pdev, const struct pci_device_id *id)
 
         pci_set_drvdata(pdev, host);
 
-#if LINUX_VERSION_CODE >= 0x020600
         error = scsi_add_host(host, &pdev->dev);
         if (error)
                 goto error_disable_adapter;
         scsi_scan_host(host);
-#else
-        scsi_set_pci_device(host, pdev);
-#endif
 
         return 0;
 
-#if LINUX_VERSION_CODE >= 0x020600
  error_disable_adapter:
         qla1280_disable_intrs(ha);
-#endif
  error_free_irq:
         free_irq(pdev->irq, ha);
  error_release_region:
@@ -4712,9 +4454,7 @@ qla1280_remove_one(struct pci_dev *pdev)
         struct Scsi_Host *host = pci_get_drvdata(pdev);
         struct scsi_qla_host *ha = (struct scsi_qla_host *)host->hostdata;
 
-#if LINUX_VERSION_CODE >= 0x020600
         scsi_remove_host(host);
-#endif
 
         qla1280_disable_intrs(ha);
 
@@ -4738,7 +4478,6 @@ qla1280_remove_one(struct pci_dev *pdev)
         scsi_host_put(host);
 }
 
-#if LINUX_VERSION_CODE >= 0x020600
 static struct pci_driver qla1280_pci_driver = {
         .name           = "qla1280",
         .id_table       = qla1280_pci_tbl,
@@ -4784,10 +4523,6 @@ qla1280_exit(void)
 module_init(qla1280_init);
 module_exit(qla1280_exit);
 
-#else
-# define driver_template qla1280_driver_template
-# include "scsi_module.c"
-#endif
 
 MODULE_AUTHOR("Qlogic & Jes Sorensen");
 MODULE_DESCRIPTION("Qlogic ISP SCSI (qla1x80/qla1x160) driver");
diff --git a/drivers/scsi/qla2xxx/qla_def.h b/drivers/scsi/qla2xxx/qla_def.h
index 79d8a914f9d0..bad066e5772a 100644
--- a/drivers/scsi/qla2xxx/qla_def.h
+++ b/drivers/scsi/qla2xxx/qla_def.h
@@ -1680,7 +1680,8 @@ typedef struct fc_port {
         uint8_t mp_byte;                /* multi-path byte (not used) */
         uint8_t cur_path;               /* current path id */
 
-        struct fc_rport *rport;
+        spinlock_t rport_lock;
+        struct fc_rport *rport, *drport;
         u32 supported_classes;
         struct work_struct rport_add_work;
         struct work_struct rport_del_work;
@@ -2270,6 +2271,7 @@ typedef struct scsi_qla_host {
 #define LOOP_RESET_NEEDED       24
 #define BEACON_BLINK_NEEDED     25
 #define REGISTER_FDMI_NEEDED    26
+#define FCPORT_UPDATE_NEEDED    27
 
         uint32_t        device_flags;
 #define DFLG_LOCAL_DEVICES              BIT_0
diff --git a/drivers/scsi/qla2xxx/qla_gbl.h b/drivers/scsi/qla2xxx/qla_gbl.h
index 32be4c14cccb..35266bd5d538 100644
--- a/drivers/scsi/qla2xxx/qla_gbl.h
+++ b/drivers/scsi/qla2xxx/qla_gbl.h
@@ -47,9 +47,11 @@ extern int qla2x00_local_device_login(scsi_qla_host_t *, uint16_t);
 extern void qla2x00_restart_queues(scsi_qla_host_t *, uint8_t);
 
 extern void qla2x00_rescan_fcports(scsi_qla_host_t *);
+extern void qla2x00_update_fcports(scsi_qla_host_t *);
 
 extern int qla2x00_abort_isp(scsi_qla_host_t *);
 
+extern void qla2x00_update_fcport(scsi_qla_host_t *, fc_port_t *);
 extern void qla2x00_reg_remote_port(scsi_qla_host_t *, fc_port_t *);
 
 /*
@@ -70,8 +72,8 @@ extern char *qla2x00_get_fw_version_str(struct scsi_qla_host *, char *);
 
 extern void qla2x00_cmd_timeout(srb_t *);
 
-extern void qla2x00_mark_device_lost(scsi_qla_host_t *, fc_port_t *, int);
-extern void qla2x00_mark_all_devices_lost(scsi_qla_host_t *);
+extern void qla2x00_mark_device_lost(scsi_qla_host_t *, fc_port_t *, int, int);
+extern void qla2x00_mark_all_devices_lost(scsi_qla_host_t *, int);
 
 extern void qla2x00_blink_led(scsi_qla_host_t *);
 
diff --git a/drivers/scsi/qla2xxx/qla_init.c b/drivers/scsi/qla2xxx/qla_init.c
index a91fea69ad63..e67bb0997818 100644
--- a/drivers/scsi/qla2xxx/qla_init.c
+++ b/drivers/scsi/qla2xxx/qla_init.c
@@ -32,7 +32,6 @@ static int qla2x00_fw_ready(scsi_qla_host_t *);
 static int qla2x00_configure_hba(scsi_qla_host_t *);
 static int qla2x00_configure_loop(scsi_qla_host_t *);
 static int qla2x00_configure_local_loop(scsi_qla_host_t *);
-static void qla2x00_update_fcport(scsi_qla_host_t *, fc_port_t *);
 static int qla2x00_configure_fabric(scsi_qla_host_t *);
 static int qla2x00_find_all_fabric_devs(scsi_qla_host_t *, struct list_head *);
 static int qla2x00_device_resync(scsi_qla_host_t *);
@@ -1688,10 +1687,16 @@ static void
 qla2x00_rport_del(void *data)
 {
         fc_port_t *fcport = data;
+        struct fc_rport *rport;
+        unsigned long flags;
+
+        spin_lock_irqsave(&fcport->rport_lock, flags);
+        rport = fcport->drport;
+        fcport->drport = NULL;
+        spin_unlock_irqrestore(&fcport->rport_lock, flags);
+        if (rport)
+                fc_remote_port_delete(rport);
 
-        if (fcport->rport)
-                fc_remote_port_delete(fcport->rport);
-        fcport->rport = NULL;
 }
 
 /**
@@ -1719,6 +1724,7 @@ qla2x00_alloc_fcport(scsi_qla_host_t *ha, gfp_t flags)
         atomic_set(&fcport->state, FCS_UNCONFIGURED);
         fcport->flags = FCF_RLC_SUPPORT;
         fcport->supported_classes = FC_COS_UNSPECIFIED;
+        spin_lock_init(&fcport->rport_lock);
         INIT_WORK(&fcport->rport_add_work, qla2x00_rport_add, fcport);
         INIT_WORK(&fcport->rport_del_work, qla2x00_rport_del, fcport);
 
@@ -2008,7 +2014,7 @@ qla2x00_probe_for_all_luns(scsi_qla_host_t *ha)
 {
         fc_port_t       *fcport;
 
-        qla2x00_mark_all_devices_lost(ha);
+        qla2x00_mark_all_devices_lost(ha, 0);
         list_for_each_entry(fcport, &ha->fcports, list) {
                 if (fcport->port_type != FCT_TARGET)
                         continue;
@@ -2032,13 +2038,9 @@ qla2x00_probe_for_all_luns(scsi_qla_host_t *ha)
  * Context:
  *      Kernel context.
  */
-static void
+void
 qla2x00_update_fcport(scsi_qla_host_t *ha, fc_port_t *fcport)
 {
-        uint16_t        index;
-        unsigned long flags;
-        srb_t *sp;
-
         fcport->ha = ha;
         fcport->login_retry = 0;
         fcport->port_login_retry_count = ha->port_down_retry_count *
@@ -2047,28 +2049,6 @@ qla2x00_update_fcport(scsi_qla_host_t *ha, fc_port_t *fcport)
             PORT_RETRY_TIME);
         fcport->flags &= ~FCF_LOGIN_NEEDED;
 
-        /*
-         * Check for outstanding cmd on tape Bypass LUN discovery if active
-         * command on tape.
-         */
-        if (fcport->flags & FCF_TAPE_PRESENT) {
-                spin_lock_irqsave(&ha->hardware_lock, flags);
-                for (index = 1; index < MAX_OUTSTANDING_COMMANDS; index++) {
-                        fc_port_t *sfcp;
-
-                        if ((sp = ha->outstanding_cmds[index]) != 0) {
-                                sfcp = sp->fcport;
-                                if (sfcp == fcport) {
-                                        atomic_set(&fcport->state, FCS_ONLINE);
-                                        spin_unlock_irqrestore(
-                                            &ha->hardware_lock, flags);
-                                        return;
-                                }
-                        }
-                }
-                spin_unlock_irqrestore(&ha->hardware_lock, flags);
-        }
-
         if (fcport->port_type == FCT_INITIATOR ||
             fcport->port_type == FCT_BROADCAST)
                 fcport->device_type = TYPE_PROCESSOR;
@@ -2084,24 +2064,29 @@ qla2x00_reg_remote_port(scsi_qla_host_t *ha, fc_port_t *fcport)
 {
         struct fc_rport_identifiers rport_ids;
         struct fc_rport *rport;
+        unsigned long flags;
 
-        if (fcport->rport) {
-                fc_remote_port_delete(fcport->rport);
-                fcport->rport = NULL;
-        }
+        if (fcport->drport)
+                qla2x00_rport_del(fcport);
+        if (fcport->rport)
+                return;
 
         rport_ids.node_name = wwn_to_u64(fcport->node_name);
         rport_ids.port_name = wwn_to_u64(fcport->port_name);
         rport_ids.port_id = fcport->d_id.b.domain << 16 |
             fcport->d_id.b.area << 8 | fcport->d_id.b.al_pa;
         rport_ids.roles = FC_RPORT_ROLE_UNKNOWN;
-        fcport->rport = rport = fc_remote_port_add(ha->host, 0, &rport_ids);
+        rport = fc_remote_port_add(ha->host, 0, &rport_ids);
         if (!rport) {
                 qla_printk(KERN_WARNING, ha,
                     "Unable to allocate fc remote port!\n");
                 return;
         }
+        spin_lock_irqsave(&fcport->rport_lock, flags);
+        fcport->rport = rport;
         *((fc_port_t **)rport->dd_data) = fcport;
+        spin_unlock_irqrestore(&fcport->rport_lock, flags);
+
         rport->supported_classes = fcport->supported_classes;
 
         rport_ids.roles = FC_RPORT_ROLE_UNKNOWN;
@@ -2217,12 +2202,11 @@ qla2x00_configure_fabric(scsi_qla_host_t *ha)
 
                         if (atomic_read(&fcport->state) == FCS_DEVICE_LOST) {
                                 qla2x00_mark_device_lost(ha, fcport,
-                                    ql2xplogiabsentdevice);
+                                    ql2xplogiabsentdevice, 0);
                                 if (fcport->loop_id != FC_NO_LOOP_ID &&
                                     (fcport->flags & FCF_TAPE_PRESENT) == 0 &&
                                     fcport->port_type != FCT_INITIATOR &&
                                     fcport->port_type != FCT_BROADCAST) {
-
                                         ha->isp_ops.fabric_logout(ha,
                                             fcport->loop_id,
                                             fcport->d_id.b.domain,
@@ -2694,7 +2678,8 @@ qla2x00_device_resync(scsi_qla_host_t *ha)
                         if (atomic_read(&fcport->state) == FCS_ONLINE) {
                                 if (format != 3 ||
                                     fcport->port_type != FCT_INITIATOR) {
-                                        qla2x00_mark_device_lost(ha, fcport, 0);
+                                        qla2x00_mark_device_lost(ha, fcport,
+                                            0, 0);
                                 }
                         }
                         fcport->flags &= ~FCF_FARP_DONE;
@@ -2741,8 +2726,7 @@ qla2x00_fabric_dev_login(scsi_qla_host_t *ha, fc_port_t *fcport,
                         ha->isp_ops.fabric_logout(ha, fcport->loop_id,
                             fcport->d_id.b.domain, fcport->d_id.b.area,
                             fcport->d_id.b.al_pa);
-                        qla2x00_mark_device_lost(ha, fcport, 1);
-
+                        qla2x00_mark_device_lost(ha, fcport, 1, 0);
                 } else {
                         qla2x00_update_fcport(ha, fcport);
                 }
@@ -2855,7 +2839,7 @@ qla2x00_fabric_login(scsi_qla_host_t *ha, fc_port_t *fcport,
                         ha->isp_ops.fabric_logout(ha, fcport->loop_id,
                             fcport->d_id.b.domain, fcport->d_id.b.area,
                             fcport->d_id.b.al_pa);
-                        qla2x00_mark_device_lost(ha, fcport, 1);
+                        qla2x00_mark_device_lost(ha, fcport, 1, 0);
 
                         rval = 1;
                         break;
@@ -2990,6 +2974,17 @@ qla2x00_rescan_fcports(scsi_qla_host_t *ha)
         qla2x00_probe_for_all_luns(ha);
 }
 
+void
+qla2x00_update_fcports(scsi_qla_host_t *ha)
+{
+        fc_port_t *fcport;
+
+        /* Go with deferred removal of rport references. */
+        list_for_each_entry(fcport, &ha->fcports, list)
+                if (fcport->drport)
+                        qla2x00_rport_del(fcport);
+}
+
 /*
 *  qla2x00_abort_isp
 *      Resets ISP and aborts all outstanding commands.
@@ -3019,7 +3014,7 @@ qla2x00_abort_isp(scsi_qla_host_t *ha)
                 atomic_set(&ha->loop_down_timer, LOOP_DOWN_TIME);
                 if (atomic_read(&ha->loop_state) != LOOP_DOWN) {
                         atomic_set(&ha->loop_state, LOOP_DOWN);
-                        qla2x00_mark_all_devices_lost(ha);
+                        qla2x00_mark_all_devices_lost(ha, 0);
                 } else {
                         if (!atomic_read(&ha->loop_down_timer))
                                 atomic_set(&ha->loop_down_timer,
diff --git a/drivers/scsi/qla2xxx/qla_isr.c b/drivers/scsi/qla2xxx/qla_isr.c
index f63af081d4ff..71a46fcee8cc 100644
--- a/drivers/scsi/qla2xxx/qla_isr.c
+++ b/drivers/scsi/qla2xxx/qla_isr.c
@@ -389,7 +389,7 @@ qla2x00_async_event(scsi_qla_host_t *ha, uint16_t *mb)
                 if (atomic_read(&ha->loop_state) != LOOP_DOWN) {
                         atomic_set(&ha->loop_state, LOOP_DOWN);
                         atomic_set(&ha->loop_down_timer, LOOP_DOWN_TIME);
-                        qla2x00_mark_all_devices_lost(ha);
+                        qla2x00_mark_all_devices_lost(ha, 1);
                 }
 
                 set_bit(REGISTER_FC4_NEEDED, &ha->dpc_flags);
@@ -432,7 +432,7 @@ qla2x00_async_event(scsi_qla_host_t *ha, uint16_t *mb)
                         atomic_set(&ha->loop_state, LOOP_DOWN);
                         atomic_set(&ha->loop_down_timer, LOOP_DOWN_TIME);
                         ha->device_flags |= DFLG_NO_CABLE;
-                        qla2x00_mark_all_devices_lost(ha);
+                        qla2x00_mark_all_devices_lost(ha, 1);
                 }
 
                 ha->flags.management_server_logged_in = 0;
@@ -453,7 +453,7 @@ qla2x00_async_event(scsi_qla_host_t *ha, uint16_t *mb)
                 if (atomic_read(&ha->loop_state) != LOOP_DOWN) {
                         atomic_set(&ha->loop_state, LOOP_DOWN);
                         atomic_set(&ha->loop_down_timer, LOOP_DOWN_TIME);
-                        qla2x00_mark_all_devices_lost(ha);
+                        qla2x00_mark_all_devices_lost(ha, 1);
                 }
 
                 set_bit(RESET_MARKER_NEEDED, &ha->dpc_flags);
@@ -482,7 +482,7 @@ qla2x00_async_event(scsi_qla_host_t *ha, uint16_t *mb)
                         if (!atomic_read(&ha->loop_down_timer))
                                 atomic_set(&ha->loop_down_timer,
                                     LOOP_DOWN_TIME);
-                        qla2x00_mark_all_devices_lost(ha);
+                        qla2x00_mark_all_devices_lost(ha, 1);
                 }
 
                 if (!(test_bit(ABORT_ISP_ACTIVE, &ha->dpc_flags))) {
@@ -506,7 +506,7 @@ qla2x00_async_event(scsi_qla_host_t *ha, uint16_t *mb)
                         if (!atomic_read(&ha->loop_down_timer))
                                 atomic_set(&ha->loop_down_timer,
                                     LOOP_DOWN_TIME);
-                        qla2x00_mark_all_devices_lost(ha);
+                        qla2x00_mark_all_devices_lost(ha, 1);
                 }
 
                 set_bit(LOOP_RESYNC_NEEDED, &ha->dpc_flags);
@@ -580,7 +580,7 @@ qla2x00_async_event(scsi_qla_host_t *ha, uint16_t *mb)
                  */
                 atomic_set(&ha->loop_state, LOOP_UP);
 
-                qla2x00_mark_all_devices_lost(ha);
+                qla2x00_mark_all_devices_lost(ha, 1);
 
                 ha->flags.rscn_queue_overflow = 1;
 
@@ -1091,7 +1091,7 @@ qla2x00_status_entry(scsi_qla_host_t *ha, void *pkt)
 
                 cp->result = DID_BUS_BUSY << 16;
                 if (atomic_read(&fcport->state) == FCS_ONLINE) {
-                        qla2x00_mark_device_lost(ha, fcport, 1);
+                        qla2x00_mark_device_lost(ha, fcport, 1, 1);
                 }
                 break;
 
@@ -1135,7 +1135,7 @@ qla2x00_status_entry(scsi_qla_host_t *ha, void *pkt)
 
                 /* Check to see if logout occurred. */
                 if ((le16_to_cpu(sts->status_flags) & SF_LOGOUT_SENT))
-                        qla2x00_mark_device_lost(ha, fcport, 1);
+                        qla2x00_mark_device_lost(ha, fcport, 1, 1);
                 break;
 
         case CS_QUEUE_FULL:
diff --git a/drivers/scsi/qla2xxx/qla_os.c b/drivers/scsi/qla2xxx/qla_os.c
index 4916847d84ec..5866a7c706a8 100644
--- a/drivers/scsi/qla2xxx/qla_os.c
+++ b/drivers/scsi/qla2xxx/qla_os.c
@@ -756,7 +756,7 @@ qla2xxx_eh_device_reset(struct scsi_cmnd *cmd)
                 if (ret == SUCCESS) {
                         if (fcport->flags & FC_FABRIC_DEVICE) {
                                 ha->isp_ops.fabric_logout(ha, fcport->loop_id);
-                                qla2x00_mark_device_lost(ha, fcport);
+                                qla2x00_mark_device_lost(ha, fcport, 0, 0);
                         }
                 }
 #endif
@@ -1642,6 +1642,31 @@ qla2x00_free_device(scsi_qla_host_t *ha)
         pci_disable_device(ha->pdev);
 }
 
+static inline void
+qla2x00_schedule_rport_del(struct scsi_qla_host *ha, fc_port_t *fcport,
+    int defer)
+{
+        unsigned long flags;
+        struct fc_rport *rport;
+
+        if (!fcport->rport)
+                return;
+
+        rport = fcport->rport;
+        if (defer) {
+                spin_lock_irqsave(&fcport->rport_lock, flags);
+                fcport->drport = rport;
+                fcport->rport = NULL;
+                spin_unlock_irqrestore(&fcport->rport_lock, flags);
+                set_bit(FCPORT_UPDATE_NEEDED, &ha->dpc_flags);
+        } else {
+                spin_lock_irqsave(&fcport->rport_lock, flags);
+                fcport->rport = NULL;
+                spin_unlock_irqrestore(&fcport->rport_lock, flags);
+                fc_remote_port_delete(rport);
+        }
+}
+
 /*
  * qla2x00_mark_device_lost Updates fcport state when device goes offline.
  *
@@ -1652,10 +1677,10 @@ qla2x00_free_device(scsi_qla_host_t *ha)
  * Context:
  */
 void qla2x00_mark_device_lost(scsi_qla_host_t *ha, fc_port_t *fcport,
-    int do_login)
+    int do_login, int defer)
 {
-        if (atomic_read(&fcport->state) == FCS_ONLINE && fcport->rport)
-                schedule_work(&fcport->rport_del_work);
+        if (atomic_read(&fcport->state) == FCS_ONLINE)
+                qla2x00_schedule_rport_del(ha, fcport, defer);
 
         /*
          * We may need to retry the login, so don't change the state of the
@@ -1702,7 +1727,7 @@ void qla2x00_mark_device_lost(scsi_qla_host_t *ha, fc_port_t *fcport,
  * Context:
  */
 void
-qla2x00_mark_all_devices_lost(scsi_qla_host_t *ha)
+qla2x00_mark_all_devices_lost(scsi_qla_host_t *ha, int defer)
 {
         fc_port_t *fcport;
 
@@ -1716,10 +1741,13 @@ qla2x00_mark_all_devices_lost(scsi_qla_host_t *ha)
                  */
                 if (atomic_read(&fcport->state) == FCS_DEVICE_DEAD)
                         continue;
-                if (atomic_read(&fcport->state) == FCS_ONLINE && fcport->rport)
-                        schedule_work(&fcport->rport_del_work);
+                if (atomic_read(&fcport->state) == FCS_ONLINE)
+                        qla2x00_schedule_rport_del(ha, fcport, defer);
                 atomic_set(&fcport->state, FCS_DEVICE_LOST);
         }
+
+        if (defer && ha->dpc_wait && !ha->dpc_active)
+                up(ha->dpc_wait);
 }
 
 /*
@@ -2161,6 +2189,9 @@ qla2x00_do_dpc(void *data)
                             ha->host_no));
                 }
 
+                if (test_and_clear_bit(FCPORT_UPDATE_NEEDED, &ha->dpc_flags))
+                        qla2x00_update_fcports(ha);
+
                 if (test_and_clear_bit(LOOP_RESET_NEEDED, &ha->dpc_flags)) {
                         DEBUG(printk("scsi(%ld): dpc: sched loop_reset()\n",
                             ha->host_no));
@@ -2219,13 +2250,8 @@ qla2x00_do_dpc(void *data)
                                                 DEBUG(printk("scsi(%ld): port login OK: logged in ID 0x%x\n",
                                                     ha->host_no, fcport->loop_id));
 
-                                                fcport->port_login_retry_count =
-                                                    ha->port_down_retry_count * PORT_RETRY_TIME;
-                                                atomic_set(&fcport->state, FCS_ONLINE);
-                                                atomic_set(&fcport->port_down_timer,
-                                                    ha->port_down_retry_count * PORT_RETRY_TIME);
-
-                                                fcport->login_retry = 0;
+                                                qla2x00_update_fcport(ha,
+                                                    fcport);
                                         } else if (status == 1) {
                                                 set_bit(RELOGIN_NEEDED, &ha->dpc_flags);
                                                 /* retry the login again */
@@ -2469,6 +2495,7 @@ qla2x00_timer(scsi_qla_host_t *ha)
         if ((test_bit(ISP_ABORT_NEEDED, &ha->dpc_flags) ||
             test_bit(LOOP_RESYNC_NEEDED, &ha->dpc_flags) ||
             test_bit(LOOP_RESET_NEEDED, &ha->dpc_flags) ||
+            test_bit(FCPORT_UPDATE_NEEDED, &ha->dpc_flags) ||
             start_dpc ||
             test_bit(LOGIN_RETRY_NEEDED, &ha->dpc_flags) ||
             test_bit(RESET_MARKER_NEEDED, &ha->dpc_flags) ||
diff --git a/drivers/scsi/sata_mv.c b/drivers/scsi/sata_mv.c
index 0042c7840d80..5b36a23455de 100644
--- a/drivers/scsi/sata_mv.c
+++ b/drivers/scsi/sata_mv.c
@@ -37,7 +37,7 @@
 #include <asm/io.h>
 
 #define DRV_NAME        "sata_mv"
-#define DRV_VERSION     "0.5"
+#define DRV_VERSION     "0.6"
 
 enum {
         /* BAR's are enumerated in terms of pci_resource_start() terms */
@@ -228,7 +228,9 @@ enum {
         MV_HP_ERRATA_50XXB2     = (1 << 2),
         MV_HP_ERRATA_60X1B2     = (1 << 3),
         MV_HP_ERRATA_60X1C0     = (1 << 4),
-        MV_HP_50XX              = (1 << 5),
+        MV_HP_ERRATA_XX42A0     = (1 << 5),
+        MV_HP_50XX              = (1 << 6),
+        MV_HP_GEN_IIE           = (1 << 7),
 
         /* Port private flags (pp_flags) */
         MV_PP_FLAG_EDMA_EN      = (1 << 0),
@@ -237,6 +239,9 @@ enum {
 
 #define IS_50XX(hpriv) ((hpriv)->hp_flags & MV_HP_50XX)
 #define IS_60XX(hpriv) (((hpriv)->hp_flags & MV_HP_50XX) == 0)
+#define IS_GEN_I(hpriv) IS_50XX(hpriv)
+#define IS_GEN_II(hpriv) IS_60XX(hpriv)
+#define IS_GEN_IIE(hpriv) ((hpriv)->hp_flags & MV_HP_GEN_IIE)
 
 enum {
         /* Our DMA boundary is determined by an ePRD being unable to handle
@@ -255,6 +260,8 @@ enum chip_type {
         chip_5080,
         chip_604x,
         chip_608x,
+        chip_6042,
+        chip_7042,
 };
 
 /* Command ReQuest Block: 32B */
@@ -265,6 +272,14 @@ struct mv_crqb {
         u16                     ata_cmd[11];
 };
 
+struct mv_crqb_iie {
+        u32                     addr;
+        u32                     addr_hi;
+        u32                     flags;
+        u32                     len;
+        u32                     ata_cmd[4];
+};
+
 /* Command ResPonse Block: 8B */
 struct mv_crpb {
         u16                     id;
@@ -328,6 +343,7 @@ static void mv_host_stop(struct ata_host_set *host_set);
 static int mv_port_start(struct ata_port *ap);
 static void mv_port_stop(struct ata_port *ap);
 static void mv_qc_prep(struct ata_queued_cmd *qc);
+static void mv_qc_prep_iie(struct ata_queued_cmd *qc);
 static unsigned int mv_qc_issue(struct ata_queued_cmd *qc);
 static irqreturn_t mv_interrupt(int irq, void *dev_instance,
                                 struct pt_regs *regs);
@@ -430,6 +446,33 @@ static const struct ata_port_operations mv6_ops = {
         .host_stop              = mv_host_stop,
 };
 
+static const struct ata_port_operations mv_iie_ops = {
+        .port_disable           = ata_port_disable,
+
+        .tf_load                = ata_tf_load,
+        .tf_read                = ata_tf_read,
+        .check_status           = ata_check_status,
+        .exec_command           = ata_exec_command,
+        .dev_select             = ata_std_dev_select,
+
+        .phy_reset              = mv_phy_reset,
+
+        .qc_prep                = mv_qc_prep_iie,
+        .qc_issue               = mv_qc_issue,
+
+        .eng_timeout            = mv_eng_timeout,
+
+        .irq_handler            = mv_interrupt,
+        .irq_clear              = mv_irq_clear,
+
+        .scr_read               = mv_scr_read,
+        .scr_write              = mv_scr_write,
+
+        .port_start             = mv_port_start,
+        .port_stop              = mv_port_stop,
+        .host_stop              = mv_host_stop,
+};
+
 static const struct ata_port_info mv_port_info[] = {
         {  /* chip_504x */
                 .sht            = &mv_sht,
@@ -467,6 +510,21 @@ static const struct ata_port_info mv_port_info[] = {
                 .udma_mask      = 0x7f, /* udma0-6 */
                 .port_ops       = &mv6_ops,
         },
+        {  /* chip_6042 */
+                .sht            = &mv_sht,
+                .host_flags     = (MV_COMMON_FLAGS | MV_6XXX_FLAGS),
+                .pio_mask       = 0x1f, /* pio0-4 */
+                .udma_mask      = 0x7f, /* udma0-6 */
+                .port_ops       = &mv_iie_ops,
+        },
+        {  /* chip_7042 */
+                .sht            = &mv_sht,
+                .host_flags     = (MV_COMMON_FLAGS | MV_6XXX_FLAGS |
+                                   MV_FLAG_DUAL_HC),
+                .pio_mask       = 0x1f, /* pio0-4 */
+                .udma_mask      = 0x7f, /* udma0-6 */
+                .port_ops       = &mv_iie_ops,
+        },
 };
 
 static const struct pci_device_id mv_pci_tbl[] = {
@@ -477,6 +535,7 @@ static const struct pci_device_id mv_pci_tbl[] = {
 
         {PCI_DEVICE(PCI_VENDOR_ID_MARVELL, 0x6040), 0, 0, chip_604x},
         {PCI_DEVICE(PCI_VENDOR_ID_MARVELL, 0x6041), 0, 0, chip_604x},
+        {PCI_DEVICE(PCI_VENDOR_ID_MARVELL, 0x6042), 0, 0, chip_6042},
         {PCI_DEVICE(PCI_VENDOR_ID_MARVELL, 0x6080), 0, 0, chip_608x},
         {PCI_DEVICE(PCI_VENDOR_ID_MARVELL, 0x6081), 0, 0, chip_608x},
 
@@ -510,6 +569,12 @@ static const struct mv_hw_ops mv6xxx_ops = {
 };
 
 /*
+ * module options
+ */
+static int msi;       /* Use PCI msi; either zero (off, default) or non-zero */
+
+
+/*
  * Functions
  */
 
@@ -767,6 +832,33 @@ static inline void mv_priv_free(struct mv_port_priv *pp, struct device *dev)
         dma_free_coherent(dev, MV_PORT_PRIV_DMA_SZ, pp->crpb, pp->crpb_dma);
 }
 
+static void mv_edma_cfg(struct mv_host_priv *hpriv, void __iomem *port_mmio)
+{
+        u32 cfg = readl(port_mmio + EDMA_CFG_OFS);
+
+        /* set up non-NCQ EDMA configuration */
+        cfg &= ~0x1f;           /* clear queue depth */
+        cfg &= ~EDMA_CFG_NCQ;   /* clear NCQ mode */
+        cfg &= ~(1 << 9);       /* disable equeue */
+
+        if (IS_GEN_I(hpriv))
+                cfg |= (1 << 8);        /* enab config burst size mask */
+
+        else if (IS_GEN_II(hpriv))
+                cfg |= EDMA_CFG_RD_BRST_EXT | EDMA_CFG_WR_BUFF_LEN;
+
+        else if (IS_GEN_IIE(hpriv)) {
+                cfg |= (1 << 23);       /* dis RX PM port mask */
+                cfg &= ~(1 << 16);      /* dis FIS-based switching (for now) */
+                cfg &= ~(1 << 19);      /* dis 128-entry queue (for now?) */
+                cfg |= (1 << 18);       /* enab early completion */
+                cfg |= (1 << 17);       /* enab host q cache */
+                cfg |= (1 << 22);       /* enab cutthrough */
+        }
+
+        writelfl(cfg, port_mmio + EDMA_CFG_OFS);
+}
+
 /**
  *      mv_port_start - Port specific init/start routine.
  *      @ap: ATA channel to manipulate
@@ -780,6 +872,7 @@ static inline void mv_priv_free(struct mv_port_priv *pp, struct device *dev)
 static int mv_port_start(struct ata_port *ap)
 {
         struct device *dev = ap->host_set->dev;
+        struct mv_host_priv *hpriv = ap->host_set->private_data;
         struct mv_port_priv *pp;
         void __iomem *port_mmio = mv_ap_base(ap);
         void *mem;
@@ -823,17 +916,26 @@ static int mv_port_start(struct ata_port *ap)
         pp->sg_tbl = mem;
         pp->sg_tbl_dma = mem_dma;
 
-        writelfl(EDMA_CFG_Q_DEPTH | EDMA_CFG_RD_BRST_EXT |
-                 EDMA_CFG_WR_BUFF_LEN, port_mmio + EDMA_CFG_OFS);
+        mv_edma_cfg(hpriv, port_mmio);
 
         writel((pp->crqb_dma >> 16) >> 16, port_mmio + EDMA_REQ_Q_BASE_HI_OFS);
         writelfl(pp->crqb_dma & EDMA_REQ_Q_BASE_LO_MASK,
                  port_mmio + EDMA_REQ_Q_IN_PTR_OFS);
 
-        writelfl(0, port_mmio + EDMA_REQ_Q_OUT_PTR_OFS);
-        writelfl(0, port_mmio + EDMA_RSP_Q_IN_PTR_OFS);
+        if (hpriv->hp_flags & MV_HP_ERRATA_XX42A0)
+                writelfl(pp->crqb_dma & 0xffffffff,
+                         port_mmio + EDMA_REQ_Q_OUT_PTR_OFS);
+        else
+                writelfl(0, port_mmio + EDMA_REQ_Q_OUT_PTR_OFS);
 
         writel((pp->crpb_dma >> 16) >> 16, port_mmio + EDMA_RSP_Q_BASE_HI_OFS);
+
+        if (hpriv->hp_flags & MV_HP_ERRATA_XX42A0)
+                writelfl(pp->crpb_dma & 0xffffffff,
+                         port_mmio + EDMA_RSP_Q_IN_PTR_OFS);
+        else
+                writelfl(0, port_mmio + EDMA_RSP_Q_IN_PTR_OFS);
+
         writelfl(pp->crpb_dma & EDMA_RSP_Q_BASE_LO_MASK,
                  port_mmio + EDMA_RSP_Q_OUT_PTR_OFS);
 
@@ -954,9 +1056,8 @@ static void mv_qc_prep(struct ata_queued_cmd *qc)
         struct ata_taskfile *tf;
         u16 flags = 0;
 
-        if (ATA_PROT_DMA != qc->tf.protocol) {
+        if (ATA_PROT_DMA != qc->tf.protocol)
                 return;
-        }
 
         /* the req producer index should be the same as we remember it */
         assert(((readl(mv_ap_base(qc->ap) + EDMA_REQ_Q_IN_PTR_OFS) >>
@@ -965,9 +1066,8 @@ static void mv_qc_prep(struct ata_queued_cmd *qc)
 
         /* Fill in command request block
          */
-        if (!(qc->tf.flags & ATA_TFLAG_WRITE)) {
+        if (!(qc->tf.flags & ATA_TFLAG_WRITE))
                 flags |= CRQB_FLAG_READ;
-        }
         assert(MV_MAX_Q_DEPTH > qc->tag);
         flags |= qc->tag << CRQB_TAG_SHIFT;
 
@@ -1022,9 +1122,76 @@ static void mv_qc_prep(struct ata_queued_cmd *qc)
         mv_crqb_pack_cmd(cw++, tf->device, ATA_REG_DEVICE, 0);
         mv_crqb_pack_cmd(cw++, tf->command, ATA_REG_CMD, 1);    /* last */
 
-        if (!(qc->flags & ATA_QCFLAG_DMAMAP)) {
+        if (!(qc->flags & ATA_QCFLAG_DMAMAP))
+                return;
+        mv_fill_sg(qc);
+}
+
+/**
+ *      mv_qc_prep_iie - Host specific command preparation.
+ *      @qc: queued command to prepare
+ *
+ *      This routine simply redirects to the general purpose routine
+ *      if command is not DMA.  Else, it handles prep of the CRQB
+ *      (command request block), does some sanity checking, and calls
+ *      the SG load routine.
+ *
+ *      LOCKING:
+ *      Inherited from caller.
+ */
+static void mv_qc_prep_iie(struct ata_queued_cmd *qc)
+{
+        struct ata_port *ap = qc->ap;
+        struct mv_port_priv *pp = ap->private_data;
+        struct mv_crqb_iie *crqb;
+        struct ata_taskfile *tf;
+        u32 flags = 0;
+
+        if (ATA_PROT_DMA != qc->tf.protocol)
+                return;
+
+        /* the req producer index should be the same as we remember it */
+        assert(((readl(mv_ap_base(qc->ap) + EDMA_REQ_Q_IN_PTR_OFS) >>
+                 EDMA_REQ_Q_PTR_SHIFT) & MV_MAX_Q_DEPTH_MASK) ==
+               pp->req_producer);
+
+        /* Fill in Gen IIE command request block
+         */
+        if (!(qc->tf.flags & ATA_TFLAG_WRITE))
+                flags |= CRQB_FLAG_READ;
+
+        assert(MV_MAX_Q_DEPTH > qc->tag);
+        flags |= qc->tag << CRQB_TAG_SHIFT;
+
+        crqb = (struct mv_crqb_iie *) &pp->crqb[pp->req_producer];
+        crqb->addr = cpu_to_le32(pp->sg_tbl_dma & 0xffffffff);
+        crqb->addr_hi = cpu_to_le32((pp->sg_tbl_dma >> 16) >> 16);
+        crqb->flags = cpu_to_le32(flags);
+
+        tf = &qc->tf;
+        crqb->ata_cmd[0] = cpu_to_le32(
+                        (tf->command << 16) |
+                        (tf->feature << 24)
+                );
+        crqb->ata_cmd[1] = cpu_to_le32(
+                        (tf->lbal << 0) |
+                        (tf->lbam << 8) |
+                        (tf->lbah << 16) |
+                        (tf->device << 24)
+                );
+        crqb->ata_cmd[2] = cpu_to_le32(
+                        (tf->hob_lbal << 0) |
+                        (tf->hob_lbam << 8) |
+                        (tf->hob_lbah << 16) |
+                        (tf->hob_feature << 24)
+                );
+        crqb->ata_cmd[3] = cpu_to_le32(
+                        (tf->nsect << 0) |
+                        (tf->hob_nsect << 8)
+                );
+
+        if (!(qc->flags & ATA_QCFLAG_DMAMAP))
                 return;
-        }
         mv_fill_sg(qc);
 }
 
@@ -1673,6 +1840,12 @@ static void mv6_phy_errata(struct mv_host_priv *hpriv, void __iomem *mmio,
         m2 |= hpriv->signal[port].pre;
         m2 &= ~(1 << 16);
 
+        /* according to mvSata 3.6.1, some IIE values are fixed */
+        if (IS_GEN_IIE(hpriv)) {
+                m2 &= ~0xC30FF01F;
+                m2 |= 0x0000900F;
+        }
+
         writel(m2, port_mmio + PHY_MODE2);
 }
 
@@ -1977,6 +2150,27 @@ static int mv_chip_id(struct pci_dev *pdev, struct mv_host_priv *hpriv,
                 }
                 break;
 
+        case chip_7042:
+        case chip_6042:
+                hpriv->ops = &mv6xxx_ops;
+
+                hp_flags |= MV_HP_GEN_IIE;
+
+                switch (rev_id) {
+                case 0x0:
+                        hp_flags |= MV_HP_ERRATA_XX42A0;
+                        break;
+                case 0x1:
+                        hp_flags |= MV_HP_ERRATA_60X1C0;
+                        break;
+                default:
+                        dev_printk(KERN_WARNING, &pdev->dev,
+                           "Applying 60X1C0 workarounds to unknown rev\n");
+                        hp_flags |= MV_HP_ERRATA_60X1C0;
+                        break;
+                }
+                break;
+
         default:
                 printk(KERN_ERR DRV_NAME ": BUG: invalid board index %u\n", board_idx);
                 return 1;
@@ -2180,7 +2374,7 @@ static int mv_init_one(struct pci_dev *pdev, const struct pci_device_id *ent)
         }
 
         /* Enable interrupts */
-        if (pci_enable_msi(pdev) == 0) {
+        if (msi && pci_enable_msi(pdev) == 0) {
                 hpriv->hp_flags |= MV_HP_FLAG_MSI;
         } else {
                 pci_intx(pdev, 1);
@@ -2235,5 +2429,8 @@ MODULE_LICENSE("GPL");
 MODULE_DEVICE_TABLE(pci, mv_pci_tbl);
 MODULE_VERSION(DRV_VERSION);
 
+module_param(msi, int, 0444);
+MODULE_PARM_DESC(msi, "Enable use of PCI MSI (0=off, 1=on)");
+
 module_init(mv_init);
 module_exit(mv_exit);
diff --git a/drivers/scsi/sata_promise.c b/drivers/scsi/sata_promise.c
index 760c56f71632..dcd1667f4144 100644
--- a/drivers/scsi/sata_promise.c
+++ b/drivers/scsi/sata_promise.c
@@ -46,7 +46,7 @@
 #include "sata_promise.h"
 
 #define DRV_NAME        "sata_promise"
-#define DRV_VERSION     "1.03"
+#define DRV_VERSION     "1.04"
 
 
 enum {
@@ -58,6 +58,7 @@ enum {
         PDC_GLOBAL_CTL          = 0x48, /* Global control/status (per port) */
         PDC_CTLSTAT             = 0x60, /* IDE control and status (per port) */
         PDC_SATA_PLUG_CSR       = 0x6C, /* SATA Plug control/status reg */
+        PDC2_SATA_PLUG_CSR      = 0x60, /* SATAII Plug control/status reg */
         PDC_SLEW_CTL            = 0x470, /* slew rate control reg */
 
         PDC_ERR_MASK            = (1<<19) | (1<<20) | (1<<21) | (1<<22) |
@@ -67,8 +68,10 @@ enum {
         board_20319             = 1,    /* FastTrak S150 TX4 */
         board_20619             = 2,    /* FastTrak TX4000 */
         board_20771             = 3,    /* FastTrak TX2300 */
+        board_2057x             = 4,    /* SATAII150 Tx2plus */
+        board_40518             = 5,    /* SATAII150 Tx4 */
 
-        PDC_HAS_PATA            = (1 << 1), /* PDC20375 has PATA */
+        PDC_HAS_PATA            = (1 << 1), /* PDC20375/20575 has PATA */
 
         PDC_RESET               = (1 << 11), /* HDMA reset */
 
@@ -83,6 +86,10 @@ struct pdc_port_priv {
         dma_addr_t              pkt_dma;
 };
 
+struct pdc_host_priv {
+        int                     hotplug_offset;
+};
+
 static u32 pdc_sata_scr_read (struct ata_port *ap, unsigned int sc_reg);
 static void pdc_sata_scr_write (struct ata_port *ap, unsigned int sc_reg, u32 val);
 static int pdc_ata_init_one (struct pci_dev *pdev, const struct pci_device_id *ent);
@@ -97,6 +104,7 @@ static void pdc_tf_load_mmio(struct ata_port *ap, const struct ata_taskfile *tf)
 static void pdc_exec_command_mmio(struct ata_port *ap, const struct ata_taskfile *tf);
 static void pdc_irq_clear(struct ata_port *ap);
 static unsigned int pdc_qc_issue_prot(struct ata_queued_cmd *qc);
+static void pdc_host_stop(struct ata_host_set *host_set);
 
 
 static struct scsi_host_template pdc_ata_sht = {
@@ -138,7 +146,7 @@ static const struct ata_port_operations pdc_sata_ops = {
         .scr_write              = pdc_sata_scr_write,
         .port_start             = pdc_port_start,
         .port_stop              = pdc_port_stop,
-        .host_stop              = ata_pci_host_stop,
+        .host_stop              = pdc_host_stop,
 };
 
 static const struct ata_port_operations pdc_pata_ops = {
@@ -159,7 +167,7 @@ static const struct ata_port_operations pdc_pata_ops = {
 
         .port_start             = pdc_port_start,
         .port_stop              = pdc_port_stop,
-        .host_stop              = ata_pci_host_stop,
+        .host_stop              = pdc_host_stop,
 };
 
 static const struct ata_port_info pdc_port_info[] = {
@@ -202,6 +210,26 @@ static const struct ata_port_info pdc_port_info[] = {
                 .udma_mask      = 0x7f, /* udma0-6 ; FIXME */
                 .port_ops       = &pdc_sata_ops,
         },
+
+        /* board_2057x */
+        {
+                .sht            = &pdc_ata_sht,
+                .host_flags     = PDC_COMMON_FLAGS | ATA_FLAG_SATA,
+                .pio_mask       = 0x1f, /* pio0-4 */
+                .mwdma_mask     = 0x07, /* mwdma0-2 */
+                .udma_mask      = 0x7f, /* udma0-6 ; FIXME */
+                .port_ops       = &pdc_sata_ops,
+        },
+
+        /* board_40518 */
+        {
+                .sht            = &pdc_ata_sht,
+                .host_flags     = PDC_COMMON_FLAGS | ATA_FLAG_SATA,
+                .pio_mask       = 0x1f, /* pio0-4 */
+                .mwdma_mask     = 0x07, /* mwdma0-2 */
+                .udma_mask      = 0x7f, /* udma0-6 ; FIXME */
+                .port_ops       = &pdc_sata_ops,
+        },
 };
 
 static const struct pci_device_id pdc_ata_pci_tbl[] = {
@@ -218,9 +246,9 @@ static const struct pci_device_id pdc_ata_pci_tbl[] = {
         { PCI_VENDOR_ID_PROMISE, 0x3376, PCI_ANY_ID, PCI_ANY_ID, 0, 0,
           board_2037x },
         { PCI_VENDOR_ID_PROMISE, 0x3574, PCI_ANY_ID, PCI_ANY_ID, 0, 0,
-          board_2037x },
+          board_2057x },
         { PCI_VENDOR_ID_PROMISE, 0x3d75, PCI_ANY_ID, PCI_ANY_ID, 0, 0,
-          board_2037x },
+          board_2057x },
         { PCI_VENDOR_ID_PROMISE, 0x3d73, PCI_ANY_ID, PCI_ANY_ID, 0, 0,
           board_2037x },
 
@@ -233,7 +261,7 @@ static const struct pci_device_id pdc_ata_pci_tbl[] = {
         { PCI_VENDOR_ID_PROMISE, 0x3d17, PCI_ANY_ID, PCI_ANY_ID, 0, 0,
           board_20319 },
         { PCI_VENDOR_ID_PROMISE, 0x3d18, PCI_ANY_ID, PCI_ANY_ID, 0, 0,
-          board_20319 },
+          board_40518 },
 
         { PCI_VENDOR_ID_PROMISE, 0x6629, PCI_ANY_ID, PCI_ANY_ID, 0, 0,
           board_20619 },
@@ -262,12 +290,11 @@ static int pdc_port_start(struct ata_port *ap)
         if (rc)
                 return rc;
 
-        pp = kmalloc(sizeof(*pp), GFP_KERNEL);
+        pp = kzalloc(sizeof(*pp), GFP_KERNEL);
         if (!pp) {
                 rc = -ENOMEM;
                 goto err_out;
         }
-        memset(pp, 0, sizeof(*pp));
 
         pp->pkt = dma_alloc_coherent(dev, 128, &pp->pkt_dma, GFP_KERNEL);
         if (!pp->pkt) {
@@ -299,6 +326,16 @@ static void pdc_port_stop(struct ata_port *ap)
 }
 
 
+static void pdc_host_stop(struct ata_host_set *host_set)
+{
+        struct pdc_host_priv *hp = host_set->private_data;
+
+        ata_pci_host_stop(host_set);
+
+        kfree(hp);
+}
+
+
 static void pdc_reset_port(struct ata_port *ap)
 {
         void __iomem *mmio = (void __iomem *) ap->ioaddr.cmd_addr + PDC_CTLSTAT;
@@ -488,14 +525,15 @@ static irqreturn_t pdc_interrupt (int irq, void *dev_instance, struct pt_regs *r
                 VPRINTK("QUICK EXIT 2\n");
                 return IRQ_NONE;
         }
+
+        spin_lock(&host_set->lock);
+
         mask &= 0xffff;         /* only 16 tags possible */
         if (!mask) {
                 VPRINTK("QUICK EXIT 3\n");
-                return IRQ_NONE;
+                goto done_irq;
         }
 
-        spin_lock(&host_set->lock);
-
         writel(mask, mmio_base + PDC_INT_SEQMASK);
 
         for (i = 0; i < host_set->n_ports; i++) {
@@ -512,10 +550,10 @@ static irqreturn_t pdc_interrupt (int irq, void *dev_instance, struct pt_regs *r
                 }
         }
 
-        spin_unlock(&host_set->lock);
-
         VPRINTK("EXIT\n");
 
+done_irq:
+        spin_unlock(&host_set->lock);
         return IRQ_RETVAL(handled);
 }
 
@@ -593,6 +631,8 @@ static void pdc_ata_setup_port(struct ata_ioports *port, unsigned long base)
 static void pdc_host_init(unsigned int chip_id, struct ata_probe_ent *pe)
 {
         void __iomem *mmio = pe->mmio_base;
+        struct pdc_host_priv *hp = pe->private_data;
+        int hotplug_offset = hp->hotplug_offset;
         u32 tmp;
 
         /*
@@ -607,12 +647,12 @@ static void pdc_host_init(unsigned int chip_id, struct ata_probe_ent *pe)
         writel(tmp, mmio + PDC_FLASH_CTL);
 
         /* clear plug/unplug flags for all ports */
-        tmp = readl(mmio + PDC_SATA_PLUG_CSR);
-        writel(tmp | 0xff, mmio + PDC_SATA_PLUG_CSR);
+        tmp = readl(mmio + hotplug_offset);
+        writel(tmp | 0xff, mmio + hotplug_offset);
 
         /* mask plug/unplug ints */
-        tmp = readl(mmio + PDC_SATA_PLUG_CSR);
-        writel(tmp | 0xff0000, mmio + PDC_SATA_PLUG_CSR);
+        tmp = readl(mmio + hotplug_offset);
+        writel(tmp | 0xff0000, mmio + hotplug_offset);
 
         /* reduce TBG clock to 133 Mhz. */
         tmp = readl(mmio + PDC_TBG_MODE);
@@ -634,6 +674,7 @@ static int pdc_ata_init_one (struct pci_dev *pdev, const struct pci_device_id *e
 {
         static int printed_version;
         struct ata_probe_ent *probe_ent = NULL;
+        struct pdc_host_priv *hp;
         unsigned long base;
         void __iomem *mmio_base;
         unsigned int board_idx = (unsigned int) ent->driver_data;
@@ -664,13 +705,12 @@ static int pdc_ata_init_one (struct pci_dev *pdev, const struct pci_device_id *e
         if (rc)
                 goto err_out_regions;
 
-        probe_ent = kmalloc(sizeof(*probe_ent), GFP_KERNEL);
+        probe_ent = kzalloc(sizeof(*probe_ent), GFP_KERNEL);
         if (probe_ent == NULL) {
                 rc = -ENOMEM;
                 goto err_out_regions;
         }
 
-        memset(probe_ent, 0, sizeof(*probe_ent));
         probe_ent->dev = pci_dev_to_dev(pdev);
         INIT_LIST_HEAD(&probe_ent->node);
 
@@ -681,6 +721,16 @@ static int pdc_ata_init_one (struct pci_dev *pdev, const struct pci_device_id *e
         }
         base = (unsigned long) mmio_base;
 
+        hp = kzalloc(sizeof(*hp), GFP_KERNEL);
+        if (hp == NULL) {
+                rc = -ENOMEM;
+                goto err_out_free_ent;
+        }
+
+        /* Set default hotplug offset */
+        hp->hotplug_offset = PDC_SATA_PLUG_CSR;
+        probe_ent->private_data = hp;
+
         probe_ent->sht          = pdc_port_info[board_idx].sht;
         probe_ent->host_flags   = pdc_port_info[board_idx].host_flags;
         probe_ent->pio_mask     = pdc_port_info[board_idx].pio_mask;
@@ -700,6 +750,10 @@ static int pdc_ata_init_one (struct pci_dev *pdev, const struct pci_device_id *e
 
         /* notice 4-port boards */
         switch (board_idx) {
+        case board_40518:
+                /* Override hotplug offset for SATAII150 */
+                hp->hotplug_offset = PDC2_SATA_PLUG_CSR;
+                /* Fall through */
         case board_20319:
                 probe_ent->n_ports = 4;
 
@@ -709,6 +763,10 @@ static int pdc_ata_init_one (struct pci_dev *pdev, const struct pci_device_id *e
                 probe_ent->port[2].scr_addr = base + 0x600;
                 probe_ent->port[3].scr_addr = base + 0x700;
                 break;
+        case board_2057x:
+                /* Override hotplug offset for SATAII150 */
+                hp->hotplug_offset = PDC2_SATA_PLUG_CSR;
+                /* Fall through */
         case board_2037x:
                 probe_ent->n_ports = 2;
                 break;
@@ -734,8 +792,10 @@ static int pdc_ata_init_one (struct pci_dev *pdev, const struct pci_device_id *e
         /* initialize adapter */
         pdc_host_init(board_idx, probe_ent);
 
-        /* FIXME: check ata_device_add return value */
-        ata_device_add(probe_ent);
+        /* FIXME: Need any other frees than hp? */
+        if (!ata_device_add(probe_ent))
+                kfree(hp);
+
         kfree(probe_ent);
 
         return 0;
diff --git a/drivers/scsi/scsi.c b/drivers/scsi/scsi.c
index 245ca99a641e..c551bb84dbfb 100644
--- a/drivers/scsi/scsi.c
+++ b/drivers/scsi/scsi.c
@@ -1245,7 +1245,7 @@ static int __init init_scsi(void)
         if (error)
                 goto cleanup_sysctl;
 
-        for (i = 0; i < NR_CPUS; i++)
+        for_each_cpu(i)
                 INIT_LIST_HEAD(&per_cpu(scsi_done_q, i));
 
         devfs_mk_dir("scsi");
diff --git a/drivers/scsi/scsi_error.c b/drivers/scsi/scsi_error.c
index 6bac3d2668fa..50f8057be75d 100644
--- a/drivers/scsi/scsi_error.c
+++ b/drivers/scsi/scsi_error.c
@@ -1350,7 +1350,7 @@ static void scsi_eh_lock_door(struct scsi_device *sdev)
         cmnd[4] = SCSI_REMOVAL_PREVENT;
         cmnd[5] = 0;
 
-        scsi_execute_async(sdev, cmnd, DMA_NONE, NULL, 0, 0, 10 * HZ,
+        scsi_execute_async(sdev, cmnd, 6, DMA_NONE, NULL, 0, 0, 10 * HZ,
                            5, NULL, NULL, GFP_KERNEL);
 }
 
diff --git a/drivers/scsi/scsi_lib.c b/drivers/scsi/scsi_lib.c
index 3574ba935af8..4a602853a98e 100644
--- a/drivers/scsi/scsi_lib.c
+++ b/drivers/scsi/scsi_lib.c
@@ -436,6 +436,7 @@ free_bios:
  * scsi_execute_async - insert request
  * @sdev:       scsi device
  * @cmd:        scsi command
+ * @cmd_len:    length of scsi cdb
  * @data_direction: data direction
  * @buffer:     data buffer (this can be a kernel buffer or scatterlist)
  * @bufflen:    len of buffer
@@ -445,7 +446,7 @@ free_bios:
  * @flags:      or into request flags
  **/
 int scsi_execute_async(struct scsi_device *sdev, const unsigned char *cmd,
-                       int data_direction, void *buffer, unsigned bufflen,
+                       int cmd_len, int data_direction, void *buffer, unsigned bufflen,
                        int use_sg, int timeout, int retries, void *privdata,
                        void (*done)(void *, char *, int, int), gfp_t gfp)
 {
@@ -472,7 +473,7 @@ int scsi_execute_async(struct scsi_device *sdev, const unsigned char *cmd,
         if (err)
                 goto free_req;
 
-        req->cmd_len = COMMAND_SIZE(cmd[0]);
+        req->cmd_len = cmd_len;
         memcpy(req->cmd, cmd, req->cmd_len);
         req->sense = sioc->sense;
         req->sense_len = 0;
diff --git a/drivers/scsi/scsi_transport_iscsi.c b/drivers/scsi/scsi_transport_iscsi.c
index 59a1c9d9d3bd..723f7acbeb12 100644
--- a/drivers/scsi/scsi_transport_iscsi.c
+++ b/drivers/scsi/scsi_transport_iscsi.c
@@ -463,7 +463,7 @@ static inline struct list_head *skb_to_lh(struct sk_buff *skb)
 }
 
 static void*
-mempool_zone_alloc_skb(unsigned int gfp_mask, void *pool_data)
+mempool_zone_alloc_skb(gfp_t gfp_mask, void *pool_data)
 {
         struct mempool_zone *zone = pool_data;
 
diff --git a/drivers/scsi/scsi_transport_sas.c b/drivers/scsi/scsi_transport_sas.c
index a3e0b7bc2d7b..210dab5879fa 100644
--- a/drivers/scsi/scsi_transport_sas.c
+++ b/drivers/scsi/scsi_transport_sas.c
@@ -377,7 +377,7 @@ static void sas_phy_release(struct device *dev)
 /**
  * sas_phy_alloc  --  allocates and initialize a SAS PHY structure
  * @parent:     Parent device
- * @number:     Port number
+ * @number:     Phy index
  *
  * Allocates an SAS PHY structure.  It will be added in the device tree
  * below the device specified by @parent, which has to be either a Scsi_Host
@@ -595,8 +595,8 @@ struct sas_rphy *sas_rphy_alloc(struct sas_phy *parent)
         device_initialize(&rphy->dev);
         rphy->dev.parent = get_device(&parent->dev);
         rphy->dev.release = sas_rphy_release;
-        sprintf(rphy->dev.bus_id, "rphy-%d:%d",
-                shost->host_no, parent->number);
+        sprintf(rphy->dev.bus_id, "rphy-%d:%d-%d",
+                shost->host_no, parent->port_identifier, parent->number);
         transport_setup_device(&rphy->dev);
 
         return rphy;
diff --git a/drivers/scsi/sg.c b/drivers/scsi/sg.c
index 78aad9582bcf..2a547538d444 100644
--- a/drivers/scsi/sg.c
+++ b/drivers/scsi/sg.c
@@ -741,7 +741,7 @@ sg_common_write(Sg_fd * sfp, Sg_request * srp,
         hp->duration = jiffies_to_msecs(jiffies);
 /* Now send everything of to mid-level. The next time we hear about this
    packet is when sg_cmd_done() is called (i.e. a callback). */
-        if (scsi_execute_async(sdp->device, cmnd, data_dir, srp->data.buffer,
+        if (scsi_execute_async(sdp->device, cmnd, hp->cmd_len, data_dir, srp->data.buffer,
                                 hp->dxfer_len, srp->data.k_use_sg, timeout,
                                 SG_DEFAULT_RETRIES, srp, sg_cmd_done,
                                 GFP_ATOMIC)) {
@@ -1679,7 +1679,7 @@ static int
 sg_build_sgat(Sg_scatter_hold * schp, const Sg_fd * sfp, int tablesize)
 {
         int sg_bufflen = tablesize * sizeof(struct scatterlist);
-        unsigned int gfp_flags = GFP_ATOMIC | __GFP_NOWARN;
+        gfp_t gfp_flags = GFP_ATOMIC | __GFP_NOWARN;
 
         /*
          * TODO: test without low_dma, we should not need it since
diff --git a/drivers/scsi/st.c b/drivers/scsi/st.c
index 13b1d3aac265..7f96f33c1bb1 100644
--- a/drivers/scsi/st.c
+++ b/drivers/scsi/st.c
@@ -508,7 +508,7 @@ st_do_scsi(struct st_request * SRpnt, struct scsi_tape * STp, unsigned char *cmd
         STp->buffer->cmdstat.have_sense = 0;
         STp->buffer->syscall_result = 0;
 
-        if (scsi_execute_async(STp->device, cmd, direction,
+        if (scsi_execute_async(STp->device, cmd, COMMAND_SIZE(cmd[0]), direction,
                         &((STp->buffer)->sg[0]), bytes, (STp->buffer)->sg_segs,
                                timeout, retries, SRpnt, st_sleep_done, GFP_KERNEL)) {
                 /* could not allocate the buffer or request was too large */