Merge branch 'master' into for-next

Fast-forwarded to current state of Linus' tree as there are patches to be
applied for files that didn't exist on the old branch.

173 files changed, 2263 insertions, 1216 deletions

diff --git a/drivers/scsi/3w-9xxx.h b/drivers/scsi/3w-9xxx.h
index 3343824855d0..040f7214e5b7 100644
--- a/drivers/scsi/3w-9xxx.h
+++ b/drivers/scsi/3w-9xxx.h
@@ -61,7 +61,7 @@ static twa_message_type twa_aen_table[] = {
         {0x0000, "AEN queue empty"},
         {0x0001, "Controller reset occurred"},
         {0x0002, "Degraded unit detected"},
-        {0x0003, "Controller error occured"},
+        {0x0003, "Controller error occurred"},
         {0x0004, "Background rebuild failed"},
         {0x0005, "Background rebuild done"},
         {0x0006, "Incomplete unit detected"},
diff --git a/drivers/scsi/3w-xxxx.h b/drivers/scsi/3w-xxxx.h
index 8b9f9d17e7fe..49dcf03c631a 100644
--- a/drivers/scsi/3w-xxxx.h
+++ b/drivers/scsi/3w-xxxx.h
@@ -8,7 +8,7 @@
 
    Copyright (C) 1999-2010 3ware Inc.
 
-   Kernel compatiblity By:      Andre Hedrick <andre@suse.com>
+   Kernel compatibility By:     Andre Hedrick <andre@suse.com>
    Non-Copyright (C) 2000       Andre Hedrick <andre@suse.com>
 
    This program is free software; you can redistribute it and/or modify
diff --git a/drivers/scsi/53c700.scr b/drivers/scsi/53c700.scr
index a064a092c604..ec822e3b7a27 100644
--- a/drivers/scsi/53c700.scr
+++ b/drivers/scsi/53c700.scr
@@ -31,7 +31,7 @@ ABSOLUTE	StatusAddress = 0	; Addr to receive status return
 ABSOLUTE        ReceiveMsgAddress = 0   ; Addr to receive msg
 ;
 ; This is the magic component for handling scatter-gather.  Each of the
-; SG components is preceeded by a script fragment which moves the
+; SG components is preceded by a script fragment which moves the
 ; necessary amount of data and jumps to the next SG segment.  The final
 ; SG segment jumps back to .  However, this address is the first SG script
 ; segment.
diff --git a/drivers/scsi/53c700_d.h_shipped b/drivers/scsi/53c700_d.h_shipped
index 0b42a51257f2..aa623da333c8 100644
--- a/drivers/scsi/53c700_d.h_shipped
+++ b/drivers/scsi/53c700_d.h_shipped
@@ -34,7 +34,7 @@ ABSOLUTE	StatusAddress = 0	; Addr to receive status return
 ABSOLUTE        ReceiveMsgAddress = 0   ; Addr to receive msg
 ;
 ; This is the magic component for handling scatter-gather.  Each of the
-; SG components is preceeded by a script fragment which moves the
+; SG components is preceded by a script fragment which moves the
 ; necessary amount of data and jumps to the next SG segment.  The final
 ; SG segment jumps back to .  However, this address is the first SG script
 ; segment.
diff --git a/drivers/scsi/FlashPoint.c b/drivers/scsi/FlashPoint.c
index e40cdfb7541f..dcd716d68600 100644
--- a/drivers/scsi/FlashPoint.c
+++ b/drivers/scsi/FlashPoint.c
@@ -2509,7 +2509,7 @@ static void FPT_ssel(unsigned long port, unsigned char p_card)
                                 WR_HARPOON(port + hp_autostart_3,
                                            (SELECT + SELCHK_STRT));
 
-                                /* Setup our STATE so we know what happend when
+                                /* Setup our STATE so we know what happened when
                                    the wheels fall off. */
                                 currSCCB->Sccb_scsistat = SELECT_ST;
 
@@ -2900,7 +2900,7 @@ static void FPT_SendMsg(unsigned long port, unsigned char message)
  *
  * Function: FPT_sdecm
  *
- * Description: Determine the proper responce to the message from the
+ * Description: Determine the proper response to the message from the
  *              target device.
  *
  *---------------------------------------------------------------------*/
diff --git a/drivers/scsi/NCR5380.c b/drivers/scsi/NCR5380.c
index e7cd2fcbe036..165e4dd865d9 100644
--- a/drivers/scsi/NCR5380.c
+++ b/drivers/scsi/NCR5380.c
@@ -1198,12 +1198,12 @@ static irqreturn_t NCR5380_intr(int dummy, void *dev_id)
                                  */
 
                                 if ((NCR5380_read(MODE_REG) & MR_DMA) && ((basr & BASR_END_DMA_TRANSFER) || !(basr & BASR_PHASE_MATCH))) {
-                                        int transfered;
+                                        int transferred;
 
                                         if (!hostdata->connected)
                                                 panic("scsi%d : received end of DMA interrupt with no connected cmd\n", instance->hostno);
 
-                                        transfered = (hostdata->dmalen - NCR5380_dma_residual(instance));
+                                        transferred = (hostdata->dmalen - NCR5380_dma_residual(instance));
                                         hostdata->connected->SCp.this_residual -= transferred;
                                         hostdata->connected->SCp.ptr += transferred;
                                         hostdata->dmalen = 0;
@@ -1563,7 +1563,7 @@ failed:
  *      bytes to transfer, **data - pointer to data pointer.
  * 
  * Returns : -1 when different phase is entered without transferring
- *      maximum number of bytes, 0 if all bytes or transfered or exit
+ *      maximum number of bytes, 0 if all bytes or transferred or exit
  *      is in same phase.
  *
  *      Also, *phase, *count, *data are modified in place.
@@ -1800,7 +1800,7 @@ static int do_abort(struct Scsi_Host *host) {
  *      bytes to transfer, **data - pointer to data pointer.
  * 
  * Returns : -1 when different phase is entered without transferring
- *      maximum number of bytes, 0 if all bytes or transfered or exit
+ *      maximum number of bytes, 0 if all bytes or transferred or exit
  *      is in same phase.
  *
  *      Also, *phase, *count, *data are modified in place.
diff --git a/drivers/scsi/aacraid/Makefile b/drivers/scsi/aacraid/Makefile
index f1cca4ee5410..1bd9fd18f7f3 100644
--- a/drivers/scsi/aacraid/Makefile
+++ b/drivers/scsi/aacraid/Makefile
@@ -3,6 +3,6 @@
 obj-$(CONFIG_SCSI_AACRAID) := aacraid.o
 
 aacraid-objs    := linit.o aachba.o commctrl.o comminit.o commsup.o \
-                   dpcsup.o rx.o sa.o rkt.o nark.o
+                   dpcsup.o rx.o sa.o rkt.o nark.o src.o
 
-EXTRA_CFLAGS    := -Idrivers/scsi
+ccflags-y       := -Idrivers/scsi
diff --git a/drivers/scsi/aacraid/aachba.c b/drivers/scsi/aacraid/aachba.c
index 7df2dd1d2c6f..061995741444 100644
--- a/drivers/scsi/aacraid/aachba.c
+++ b/drivers/scsi/aacraid/aachba.c
@@ -5,7 +5,8 @@
  * based on the old aacraid driver that is..
  * Adaptec aacraid device driver for Linux.
  *
- * Copyright (c) 2000-2007 Adaptec, Inc. (aacraid@adaptec.com)
+ * Copyright (c) 2000-2010 Adaptec, Inc.
+ *               2010 PMC-Sierra, Inc. (aacraid@pmc-sierra.com)
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -746,8 +747,8 @@ char * get_container_type(unsigned tindex)
  * Arguments: [1] pointer to void [1] int
  *
  * Purpose: Sets SCSI inquiry data strings for vendor, product
- * and revision level. Allows strings to be set in platform dependant
- * files instead of in OS dependant driver source.
+ * and revision level. Allows strings to be set in platform dependent
+ * files instead of in OS dependent driver source.
  */
 
 static void setinqstr(struct aac_dev *dev, void *data, int tindex)
@@ -1486,7 +1487,9 @@ int aac_get_adapter_info(struct aac_dev* dev)
                         dev->a_ops.adapter_write = aac_write_block;
                 }
                 dev->scsi_host_ptr->max_sectors = AAC_MAX_32BIT_SGBCOUNT;
-                if(!(dev->adapter_info.options & AAC_OPT_NEW_COMM)) {
+                if (dev->adapter_info.options & AAC_OPT_NEW_COMM_TYPE1)
+                        dev->adapter_info.options |= AAC_OPT_NEW_COMM;
+                if (!(dev->adapter_info.options & AAC_OPT_NEW_COMM)) {
                         /*
                          * Worst case size that could cause sg overflow when
                          * we break up SG elements that are larger than 64KB.
diff --git a/drivers/scsi/aacraid/aacraid.h b/drivers/scsi/aacraid/aacraid.h
index 4dbcc055ac78..ffb587817efc 100644
--- a/drivers/scsi/aacraid/aacraid.h
+++ b/drivers/scsi/aacraid/aacraid.h
@@ -12,7 +12,7 @@
  *----------------------------------------------------------------------------*/
 
 #ifndef AAC_DRIVER_BUILD
-# define AAC_DRIVER_BUILD 26400
+# define AAC_DRIVER_BUILD 28000
 # define AAC_DRIVER_BRANCH "-ms"
 #endif
 #define MAXIMUM_NUM_CONTAINERS  32
@@ -277,6 +277,16 @@ enum aac_queue_types {
 
 #define         FsaNormal       1
 
+/* transport FIB header (PMC) */
+struct aac_fib_xporthdr {
+        u64     HostAddress;    /* FIB host address w/o xport header */
+        u32     Size;           /* FIB size excluding xport header */
+        u32     Handle;         /* driver handle to reference the FIB */
+        u64     Reserved[2];
+};
+
+#define         ALIGN32         32
+
 /*
  * Define the FIB. The FIB is the where all the requested data and
  * command information are put to the application on the FSA adapter.
@@ -394,7 +404,9 @@ enum fib_xfer_state {
         AdapterMicroFib                 = (1<<17),
         BIOSFibPath                     = (1<<18),
         FastResponseCapable             = (1<<19),
-        ApiFib                          = (1<<20)       // Its an API Fib.
+        ApiFib                          = (1<<20),      /* Its an API Fib */
+        /* PMC NEW COMM: There is no more AIF data pending */
+        NoMoreAifDataAvailable          = (1<<21)
 };
 
 /*
@@ -404,6 +416,7 @@ enum fib_xfer_state {
 
 #define ADAPTER_INIT_STRUCT_REVISION            3
 #define ADAPTER_INIT_STRUCT_REVISION_4          4 // rocket science
+#define ADAPTER_INIT_STRUCT_REVISION_6          6 /* PMC src */
 
 struct aac_init
 {
@@ -428,9 +441,15 @@ struct aac_init
 #define INITFLAGS_NEW_COMM_SUPPORTED    0x00000001
 #define INITFLAGS_DRIVER_USES_UTC_TIME  0x00000010
 #define INITFLAGS_DRIVER_SUPPORTS_PM    0x00000020
+#define INITFLAGS_NEW_COMM_TYPE1_SUPPORTED      0x00000041
         __le32  MaxIoCommands;  /* max outstanding commands */
         __le32  MaxIoSize;      /* largest I/O command */
         __le32  MaxFibSize;     /* largest FIB to adapter */
+        /* ADAPTER_INIT_STRUCT_REVISION_5 begins here */
+        __le32  MaxNumAif;      /* max number of aif */
+        /* ADAPTER_INIT_STRUCT_REVISION_6 begins here */
+        __le32  HostRRQ_AddrLow;
+        __le32  HostRRQ_AddrHigh;       /* Host RRQ (response queue) for SRC */
 };
 
 enum aac_log_level {
@@ -685,7 +704,7 @@ struct rx_inbound {
 #define OutboundDoorbellReg     MUnit.ODR
 
 struct rx_registers {
-        struct rx_mu_registers          MUnit;          /* 1300h - 1344h */
+        struct rx_mu_registers          MUnit;          /* 1300h - 1347h */
         __le32                          reserved1[2];   /* 1348h - 134ch */
         struct rx_inbound               IndexRegs;
 };
@@ -703,7 +722,7 @@ struct rx_registers {
 #define rkt_inbound rx_inbound
 
 struct rkt_registers {
-        struct rkt_mu_registers         MUnit;           /* 1300h - 1344h */
+        struct rkt_mu_registers         MUnit;           /* 1300h - 1347h */
         __le32                          reserved1[1006]; /* 1348h - 22fch */
         struct rkt_inbound              IndexRegs;       /* 2300h - */
 };
@@ -713,6 +732,44 @@ struct rkt_registers {
 #define rkt_writeb(AEP, CSR, value)     writeb(value, &((AEP)->regs.rkt->CSR))
 #define rkt_writel(AEP, CSR, value)     writel(value, &((AEP)->regs.rkt->CSR))
 
+/*
+ * PMC SRC message unit registers
+ */
+
+#define src_inbound rx_inbound
+
+struct src_mu_registers {
+                                /*      PCI*| Name */
+        __le32  reserved0[8];   /*      00h | Reserved */
+        __le32  IDR;            /*      20h | Inbound Doorbell Register */
+        __le32  IISR;           /*      24h | Inbound Int. Status Register */
+        __le32  reserved1[3];   /*      28h | Reserved */
+        __le32  OIMR;           /*      34h | Outbound Int. Mask Register */
+        __le32  reserved2[25];  /*      38h | Reserved */
+        __le32  ODR_R;          /*      9ch | Outbound Doorbell Read */
+        __le32  ODR_C;          /*      a0h | Outbound Doorbell Clear */
+        __le32  reserved3[6];   /*      a4h | Reserved */
+        __le32  OMR;            /*      bch | Outbound Message Register */
+        __le32  IQ_L;           /*  c0h | Inbound Queue (Low address) */
+        __le32  IQ_H;           /*  c4h | Inbound Queue (High address) */
+};
+
+struct src_registers {
+        struct src_mu_registers MUnit;  /* 00h - c7h */
+        __le32 reserved1[130790];       /* c8h - 7fc5fh */
+        struct src_inbound IndexRegs;   /* 7fc60h */
+};
+
+#define src_readb(AEP, CSR)             readb(&((AEP)->regs.src.bar0->CSR))
+#define src_readl(AEP, CSR)             readl(&((AEP)->regs.src.bar0->CSR))
+#define src_writeb(AEP, CSR, value)     writeb(value, \
+                                                &((AEP)->regs.src.bar0->CSR))
+#define src_writel(AEP, CSR, value)     writel(value, \
+                                                &((AEP)->regs.src.bar0->CSR))
+
+#define SRC_ODR_SHIFT           12
+#define SRC_IDR_SHIFT           9
+
 typedef void (*fib_callback)(void *ctxt, struct fib *fibctx);
 
 struct aac_fib_context {
@@ -879,6 +936,7 @@ struct aac_supplement_adapter_info
 #define AAC_OPTION_MU_RESET             cpu_to_le32(0x00000001)
 #define AAC_OPTION_IGNORE_RESET         cpu_to_le32(0x00000002)
 #define AAC_OPTION_POWER_MANAGEMENT     cpu_to_le32(0x00000004)
+#define AAC_OPTION_DOORBELL_RESET       cpu_to_le32(0x00004000)
 #define AAC_SIS_VERSION_V3      3
 #define AAC_SIS_SLOT_UNKNOWN    0xFF
 
@@ -940,6 +998,7 @@ struct aac_bus_info_response {
 #define AAC_OPT_SUPPLEMENT_ADAPTER_INFO cpu_to_le32(1<<16)
 #define AAC_OPT_NEW_COMM                cpu_to_le32(1<<17)
 #define AAC_OPT_NEW_COMM_64             cpu_to_le32(1<<18)
+#define AAC_OPT_NEW_COMM_TYPE1          cpu_to_le32(1<<28)
 
 struct aac_dev
 {
@@ -952,6 +1011,7 @@ struct aac_dev
          */
         unsigned                max_fib_size;
         unsigned                sg_tablesize;
+        unsigned                max_num_aif;
 
         /*
          *      Map for 128 fib objects (64k)
@@ -980,10 +1040,21 @@ struct aac_dev
         struct adapter_ops      a_ops;
         unsigned long           fsrev;          /* Main driver's revision number */
 
-        unsigned                base_size;      /* Size of mapped in region */
+        unsigned long           dbg_base;       /* address of UART
+                                                 * debug buffer */
+
+        unsigned                base_size, dbg_size;    /* Size of
+                                                         *  mapped in region */
+
         struct aac_init         *init;          /* Holds initialization info to communicate with adapter */
         dma_addr_t              init_pa;        /* Holds physical address of the init struct */
 
+        u32                     *host_rrq;      /* response queue
+                                                 * if AAC_COMM_MESSAGE_TYPE1 */
+
+        dma_addr_t              host_rrq_pa;    /* phys. address */
+        u32                     host_rrq_idx;   /* index into rrq buffer */
+
         struct pci_dev          *pdev;          /* Our PCI interface */
         void *                  printfbuf;      /* pointer to buffer used for printf's from the adapter */
         void *                  comm_addr;      /* Base address of Comm area */
@@ -1003,14 +1074,20 @@ struct aac_dev
          */
 #ifndef AAC_MIN_FOOTPRINT_SIZE
 #       define AAC_MIN_FOOTPRINT_SIZE 8192
+#       define AAC_MIN_SRC_BAR0_SIZE 0x400000
+#       define AAC_MIN_SRC_BAR1_SIZE 0x800
 #endif
         union
         {
                 struct sa_registers __iomem *sa;
                 struct rx_registers __iomem *rx;
                 struct rkt_registers __iomem *rkt;
+                struct {
+                        struct src_registers __iomem *bar0;
+                        char __iomem *bar1;
+                } src;
         } regs;
-        volatile void __iomem *base;
+        volatile void __iomem *base, *dbg_base_mapped;
         volatile struct rx_inbound __iomem *IndexRegs;
         u32                     OIMR; /* Mask Register Cache */
         /*
@@ -1031,9 +1108,8 @@ struct aac_dev
         u8                      comm_interface;
 #       define AAC_COMM_PRODUCER 0
 #       define AAC_COMM_MESSAGE  1
-        /* macro side-effects BEWARE */
-#       define                  raw_io_interface \
-          init->InitStructRevision==cpu_to_le32(ADAPTER_INIT_STRUCT_REVISION_4)
+#       define AAC_COMM_MESSAGE_TYPE1   3
+        u8                      raw_io_interface;
         u8                      raw_io_64;
         u8                      printf_enabled;
         u8                      in_reset;
@@ -1183,7 +1259,7 @@ struct aac_dev
 #define CACHE_UNSTABLE          2
 
 /*
- *      Lets the client know at which level the data was commited on
+ *      Lets the client know at which level the data was committed on
  *      a write request
  */
 
@@ -1789,6 +1865,10 @@ extern struct aac_common aac_config;
 #define DoorBellAdapterNormCmdNotFull   (1<<3)  /* Adapter -> Host */
 #define DoorBellAdapterNormRespNotFull  (1<<4)  /* Adapter -> Host */
 #define DoorBellPrintfReady             (1<<5)  /* Adapter -> Host */
+#define DoorBellAifPending              (1<<6)  /* Adapter -> Host */
+
+/* PMC specific outbound doorbell bits */
+#define PmDoorBellResponseSent          (1<<1)  /* Adapter -> Host */
 
 /*
  *      For FIB communication, we need all of the following things
@@ -1831,6 +1911,9 @@ extern struct aac_common aac_config;
 #define         AifReqAPIJobUpdate      109     /* Update a job report from the API */
 #define         AifReqAPIJobFinish      110     /* Finish a job from the API */
 
+/* PMC NEW COMM: Request the event data */
+#define         AifReqEvent             200
+
 /*
  *      Adapter Initiated FIB command structures. Start with the adapter
  *      initiated FIBs that really come from the adapter, and get responded
@@ -1886,10 +1969,13 @@ int aac_rx_init(struct aac_dev *dev);
 int aac_rkt_init(struct aac_dev *dev);
 int aac_nark_init(struct aac_dev *dev);
 int aac_sa_init(struct aac_dev *dev);
+int aac_src_init(struct aac_dev *dev);
 int aac_queue_get(struct aac_dev * dev, u32 * index, u32 qid, struct hw_fib * hw_fib, int wait, struct fib * fibptr, unsigned long *nonotify);
 unsigned int aac_response_normal(struct aac_queue * q);
 unsigned int aac_command_normal(struct aac_queue * q);
-unsigned int aac_intr_normal(struct aac_dev * dev, u32 Index);
+unsigned int aac_intr_normal(struct aac_dev *dev, u32 Index,
+                        int isAif, int isFastResponse,
+                        struct hw_fib *aif_fib);
 int aac_reset_adapter(struct aac_dev * dev, int forced);
 int aac_check_health(struct aac_dev * dev);
 int aac_command_thread(void *data);
diff --git a/drivers/scsi/aacraid/commctrl.c b/drivers/scsi/aacraid/commctrl.c
index 645ddd9d9b9e..8a0b33033177 100644
--- a/drivers/scsi/aacraid/commctrl.c
+++ b/drivers/scsi/aacraid/commctrl.c
@@ -5,7 +5,8 @@
  * based on the old aacraid driver that is..
  * Adaptec aacraid device driver for Linux.
  *
- * Copyright (c) 2000-2007 Adaptec, Inc. (aacraid@adaptec.com)
+ * Copyright (c) 2000-2010 Adaptec, Inc.
+ *               2010 PMC-Sierra, Inc. (aacraid@pmc-sierra.com)
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff --git a/drivers/scsi/aacraid/comminit.c b/drivers/scsi/aacraid/comminit.c
index a7261486ccd4..7ac8fdb5577b 100644
--- a/drivers/scsi/aacraid/comminit.c
+++ b/drivers/scsi/aacraid/comminit.c
@@ -5,7 +5,8 @@
  * based on the old aacraid driver that is..
  * Adaptec aacraid device driver for Linux.
  *
- * Copyright (c) 2000-2007 Adaptec, Inc. (aacraid@adaptec.com)
+ * Copyright (c) 2000-2010 Adaptec, Inc.
+ *               2010 PMC-Sierra, Inc. (aacraid@pmc-sierra.com)
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -52,12 +53,16 @@ static int aac_alloc_comm(struct aac_dev *dev, void **commaddr, unsigned long co
         unsigned long size, align;
         const unsigned long fibsize = 4096;
         const unsigned long printfbufsiz = 256;
+        unsigned long host_rrq_size = 0;
         struct aac_init *init;
         dma_addr_t phys;
         unsigned long aac_max_hostphysmempages;
 
-        size = fibsize + sizeof(struct aac_init) + commsize + commalign + printfbufsiz;
-
+        if (dev->comm_interface == AAC_COMM_MESSAGE_TYPE1)
+                host_rrq_size = (dev->scsi_host_ptr->can_queue
+                        + AAC_NUM_MGT_FIB) * sizeof(u32);
+        size = fibsize + sizeof(struct aac_init) + commsize +
+                        commalign + printfbufsiz + host_rrq_size;
  
         base = pci_alloc_consistent(dev->pdev, size, &phys);
 
@@ -70,8 +75,14 @@ static int aac_alloc_comm(struct aac_dev *dev, void **commaddr, unsigned long co
         dev->comm_phys = phys;
         dev->comm_size = size;
         
-        dev->init = (struct aac_init *)(base + fibsize);
-        dev->init_pa = phys + fibsize;
+        if (dev->comm_interface == AAC_COMM_MESSAGE_TYPE1) {
+                dev->host_rrq = (u32 *)(base + fibsize);
+                dev->host_rrq_pa = phys + fibsize;
+                memset(dev->host_rrq, 0, host_rrq_size);
+        }
+
+        dev->init = (struct aac_init *)(base + fibsize + host_rrq_size);
+        dev->init_pa = phys + fibsize + host_rrq_size;
 
         init = dev->init;
 
@@ -106,8 +117,13 @@ static int aac_alloc_comm(struct aac_dev *dev, void **commaddr, unsigned long co
 
         init->InitFlags = 0;
         if (dev->comm_interface == AAC_COMM_MESSAGE) {
-                init->InitFlags = cpu_to_le32(INITFLAGS_NEW_COMM_SUPPORTED);
+                init->InitFlags |= cpu_to_le32(INITFLAGS_NEW_COMM_SUPPORTED);
                 dprintk((KERN_WARNING"aacraid: New Comm Interface enabled\n"));
+        } else if (dev->comm_interface == AAC_COMM_MESSAGE_TYPE1) {
+                init->InitStructRevision = cpu_to_le32(ADAPTER_INIT_STRUCT_REVISION_6);
+                init->InitFlags |= cpu_to_le32(INITFLAGS_NEW_COMM_TYPE1_SUPPORTED);
+                dprintk((KERN_WARNING
+                        "aacraid: New Comm Interface type1 enabled\n"));
         }
         init->InitFlags |= cpu_to_le32(INITFLAGS_DRIVER_USES_UTC_TIME |
                                        INITFLAGS_DRIVER_SUPPORTS_PM);
@@ -115,11 +131,18 @@ static int aac_alloc_comm(struct aac_dev *dev, void **commaddr, unsigned long co
         init->MaxIoSize = cpu_to_le32(dev->scsi_host_ptr->max_sectors << 9);
         init->MaxFibSize = cpu_to_le32(dev->max_fib_size);
 
+        init->MaxNumAif = cpu_to_le32(dev->max_num_aif);
+        init->HostRRQ_AddrHigh = (u32)((u64)dev->host_rrq_pa >> 32);
+        init->HostRRQ_AddrLow = (u32)(dev->host_rrq_pa & 0xffffffff);
+
+
         /*
          * Increment the base address by the amount already used
          */
-        base = base + fibsize + sizeof(struct aac_init);
-        phys = (dma_addr_t)((ulong)phys + fibsize + sizeof(struct aac_init));
+        base = base + fibsize + host_rrq_size + sizeof(struct aac_init);
+        phys = (dma_addr_t)((ulong)phys + fibsize + host_rrq_size +
+                sizeof(struct aac_init));
+
         /*
          *      Align the beginning of Headers to commalign
          */
@@ -314,15 +337,22 @@ struct aac_dev *aac_init_adapter(struct aac_dev *dev)
                 - sizeof(struct aac_write) + sizeof(struct sgentry))
                         / sizeof(struct sgentry);
         dev->comm_interface = AAC_COMM_PRODUCER;
-        dev->raw_io_64 = 0;
+        dev->raw_io_interface = dev->raw_io_64 = 0;
+
         if ((!aac_adapter_sync_cmd(dev, GET_ADAPTER_PROPERTIES,
                 0, 0, 0, 0, 0, 0, status+0, status+1, status+2, NULL, NULL)) &&
                         (status[0] == 0x00000001)) {
                 if (status[1] & le32_to_cpu(AAC_OPT_NEW_COMM_64))
                         dev->raw_io_64 = 1;
-                if (dev->a_ops.adapter_comm &&
-                    (status[1] & le32_to_cpu(AAC_OPT_NEW_COMM)))
-                        dev->comm_interface = AAC_COMM_MESSAGE;
+                if (dev->a_ops.adapter_comm) {
+                        if (status[1] & le32_to_cpu(AAC_OPT_NEW_COMM_TYPE1)) {
+                                dev->comm_interface = AAC_COMM_MESSAGE_TYPE1;
+                                dev->raw_io_interface = 1;
+                        } else if (status[1] & le32_to_cpu(AAC_OPT_NEW_COMM)) {
+                                dev->comm_interface = AAC_COMM_MESSAGE;
+                                dev->raw_io_interface = 1;
+                        }
+                }
                 if ((dev->comm_interface == AAC_COMM_MESSAGE) &&
                     (status[2] > dev->base_size)) {
                         aac_adapter_ioremap(dev, 0);
@@ -350,10 +380,12 @@ struct aac_dev *aac_init_adapter(struct aac_dev *dev)
                  *      status[3] & 0xFFFF      maximum number FIBs outstanding
                  */
                 host->max_sectors = (status[1] >> 16) << 1;
-                dev->max_fib_size = status[1] & 0xFFFF;
+                /* Multiple of 32 for PMC */
+                dev->max_fib_size = status[1] & 0xFFE0;
                 host->sg_tablesize = status[2] >> 16;
                 dev->sg_tablesize = status[2] & 0xFFFF;
                 host->can_queue = (status[3] & 0xFFFF) - AAC_NUM_MGT_FIB;
+                dev->max_num_aif = status[4] & 0xFFFF;
                 /*
                  *      NOTE:
                  *      All these overrides are based on a fixed internal
diff --git a/drivers/scsi/aacraid/commsup.c b/drivers/scsi/aacraid/commsup.c
index 060ac4bd5a14..e7d0d47b9185 100644
--- a/drivers/scsi/aacraid/commsup.c
+++ b/drivers/scsi/aacraid/commsup.c
@@ -5,7 +5,8 @@
  * based on the old aacraid driver that is..
  * Adaptec aacraid device driver for Linux.
  *
- * Copyright (c) 2000-2007 Adaptec, Inc. (aacraid@adaptec.com)
+ * Copyright (c) 2000-2010 Adaptec, Inc.
+ *               2010 PMC-Sierra, Inc. (aacraid@pmc-sierra.com)
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -63,9 +64,11 @@ static int fib_map_alloc(struct aac_dev *dev)
           "allocate hardware fibs pci_alloc_consistent(%p, %d * (%d + %d), %p)\n",
           dev->pdev, dev->max_fib_size, dev->scsi_host_ptr->can_queue,
           AAC_NUM_MGT_FIB, &dev->hw_fib_pa));
-        if((dev->hw_fib_va = pci_alloc_consistent(dev->pdev, dev->max_fib_size
-          * (dev->scsi_host_ptr->can_queue + AAC_NUM_MGT_FIB),
-          &dev->hw_fib_pa))==NULL)
+        dev->hw_fib_va = pci_alloc_consistent(dev->pdev,
+                (dev->max_fib_size + sizeof(struct aac_fib_xporthdr))
+                * (dev->scsi_host_ptr->can_queue + AAC_NUM_MGT_FIB) + (ALIGN32 - 1),
+                &dev->hw_fib_pa);
+        if (dev->hw_fib_va == NULL)
                 return -ENOMEM;
         return 0;
 }
@@ -110,9 +113,22 @@ int aac_fib_setup(struct aac_dev * dev)
         if (i<0)
                 return -ENOMEM;
 
+        /* 32 byte alignment for PMC */
+        hw_fib_pa = (dev->hw_fib_pa + (ALIGN32 - 1)) & ~(ALIGN32 - 1);
+        dev->hw_fib_va = (struct hw_fib *)((unsigned char *)dev->hw_fib_va +
+                (hw_fib_pa - dev->hw_fib_pa));
+        dev->hw_fib_pa = hw_fib_pa;
+        memset(dev->hw_fib_va, 0,
+                (dev->max_fib_size + sizeof(struct aac_fib_xporthdr)) *
+                (dev->scsi_host_ptr->can_queue + AAC_NUM_MGT_FIB));
+
+        /* add Xport header */
+        dev->hw_fib_va = (struct hw_fib *)((unsigned char *)dev->hw_fib_va +
+                sizeof(struct aac_fib_xporthdr));
+        dev->hw_fib_pa += sizeof(struct aac_fib_xporthdr);
+
         hw_fib = dev->hw_fib_va;
         hw_fib_pa = dev->hw_fib_pa;
-        memset(hw_fib, 0, dev->max_fib_size * (dev->scsi_host_ptr->can_queue + AAC_NUM_MGT_FIB));
         /*
          *      Initialise the fibs
          */
@@ -129,8 +145,10 @@ int aac_fib_setup(struct aac_dev * dev)
                 hw_fib->header.XferState = cpu_to_le32(0xffffffff);
                 hw_fib->header.SenderSize = cpu_to_le16(dev->max_fib_size);
                 fibptr->hw_fib_pa = hw_fib_pa;
-                hw_fib = (struct hw_fib *)((unsigned char *)hw_fib + dev->max_fib_size);
-                hw_fib_pa = hw_fib_pa + dev->max_fib_size;
+                hw_fib = (struct hw_fib *)((unsigned char *)hw_fib +
+                        dev->max_fib_size + sizeof(struct aac_fib_xporthdr));
+                hw_fib_pa = hw_fib_pa +
+                        dev->max_fib_size + sizeof(struct aac_fib_xporthdr);
         }
         /*
          *      Add the fib chain to the free list
@@ -403,7 +421,7 @@ int aac_fib_send(u16 command, struct fib *fibptr, unsigned long size,
         if (!(hw_fib->header.XferState & cpu_to_le32(HostOwned)))
                 return -EBUSY;
         /*
-         *      There are 5 cases with the wait and reponse requested flags.
+         *      There are 5 cases with the wait and response requested flags.
          *      The only invalid cases are if the caller requests to wait and
          *      does not request a response and if the caller does not want a
          *      response and the Fib is not allocated from pool. If a response
@@ -664,9 +682,14 @@ int aac_fib_adapter_complete(struct fib *fibptr, unsigned short size)
         unsigned long nointr = 0;
         unsigned long qflags;
 
+        if (dev->comm_interface == AAC_COMM_MESSAGE_TYPE1) {
+                kfree(hw_fib);
+                return 0;
+        }
+
         if (hw_fib->header.XferState == 0) {
                 if (dev->comm_interface == AAC_COMM_MESSAGE)
-                        kfree (hw_fib);
+                        kfree(hw_fib);
                 return 0;
         }
         /*
@@ -674,7 +697,7 @@ int aac_fib_adapter_complete(struct fib *fibptr, unsigned short size)
          */
         if (hw_fib->header.StructType != FIB_MAGIC) {
                 if (dev->comm_interface == AAC_COMM_MESSAGE)
-                        kfree (hw_fib);
+                        kfree(hw_fib);
                 return -EINVAL;
         }
         /*
diff --git a/drivers/scsi/aacraid/dpcsup.c b/drivers/scsi/aacraid/dpcsup.c
index 9c7408fe8c7d..f0c66a80ad13 100644
--- a/drivers/scsi/aacraid/dpcsup.c
+++ b/drivers/scsi/aacraid/dpcsup.c
@@ -5,7 +5,8 @@
  * based on the old aacraid driver that is..
  * Adaptec aacraid device driver for Linux.
  *
- * Copyright (c) 2000-2007 Adaptec, Inc. (aacraid@adaptec.com)
+ * Copyright (c) 2000-2010 Adaptec, Inc.
+ *               2010 PMC-Sierra, Inc. (aacraid@pmc-sierra.com)
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -228,6 +229,48 @@ unsigned int aac_command_normal(struct aac_queue *q)
         return 0;
 }
 
+/*
+ *
+ * aac_aif_callback
+ * @context: the context set in the fib - here it is scsi cmd
+ * @fibptr: pointer to the fib
+ *
+ * Handles the AIFs - new method (SRC)
+ *
+ */
+
+static void aac_aif_callback(void *context, struct fib * fibptr)
+{
+        struct fib *fibctx;
+        struct aac_dev *dev;
+        struct aac_aifcmd *cmd;
+        int status;
+
+        fibctx = (struct fib *)context;
+        BUG_ON(fibptr == NULL);
+        dev = fibptr->dev;
+
+        if (fibptr->hw_fib_va->header.XferState &
+            cpu_to_le32(NoMoreAifDataAvailable)) {
+                aac_fib_complete(fibptr);
+                aac_fib_free(fibptr);
+                return;
+        }
+
+        aac_intr_normal(dev, 0, 1, 0, fibptr->hw_fib_va);
+
+        aac_fib_init(fibctx);
+        cmd = (struct aac_aifcmd *) fib_data(fibctx);
+        cmd->command = cpu_to_le32(AifReqEvent);
+
+        status = aac_fib_send(AifRequest,
+                fibctx,
+                sizeof(struct hw_fib)-sizeof(struct aac_fibhdr),
+                FsaNormal,
+                0, 1,
+                (fib_callback)aac_aif_callback, fibctx);
+}
+
 
 /**
  *      aac_intr_normal -       Handle command replies
@@ -238,19 +281,17 @@ unsigned int aac_command_normal(struct aac_queue *q)
  *      know there is a response on our normal priority queue. We will pull off
  *      all QE there are and wake up all the waiters before exiting.
  */
-
-unsigned int aac_intr_normal(struct aac_dev * dev, u32 index)
+unsigned int aac_intr_normal(struct aac_dev *dev, u32 index,
+                        int isAif, int isFastResponse, struct hw_fib *aif_fib)
 {
         unsigned long mflags;
         dprintk((KERN_INFO "aac_intr_normal(%p,%x)\n", dev, index));
-        if ((index & 0x00000002L)) {
+        if (isAif == 1) {       /* AIF - common */
                 struct hw_fib * hw_fib;
                 struct fib * fib;
                 struct aac_queue *q = &dev->queues->queue[HostNormCmdQueue];
                 unsigned long flags;
 
-                if (index == 0xFFFFFFFEL) /* Special Case */
-                        return 0;         /* Do nothing */
                 /*
                  *      Allocate a FIB. For non queued stuff we can just use
                  * the stack so we are happy. We need a fib object in order to
@@ -263,8 +304,13 @@ unsigned int aac_intr_normal(struct aac_dev * dev, u32 index)
                         kfree (fib);
                         return 1;
                 }
-                memcpy(hw_fib, (struct hw_fib *)(((uintptr_t)(dev->regs.sa)) +
-                  (index & ~0x00000002L)), sizeof(struct hw_fib));
+                if (aif_fib != NULL) {
+                        memcpy(hw_fib, aif_fib, sizeof(struct hw_fib));
+                } else {
+                        memcpy(hw_fib,
+                                (struct hw_fib *)(((uintptr_t)(dev->regs.sa)) +
+                                index), sizeof(struct hw_fib));
+                }
                 INIT_LIST_HEAD(&fib->fiblink);
                 fib->type = FSAFS_NTC_FIB_CONTEXT;
                 fib->size = sizeof(struct fib);
@@ -277,9 +323,26 @@ unsigned int aac_intr_normal(struct aac_dev * dev, u32 index)
                 wake_up_interruptible(&q->cmdready);
                 spin_unlock_irqrestore(q->lock, flags);
                 return 1;
+        } else if (isAif == 2) {        /* AIF - new (SRC) */
+                struct fib *fibctx;
+                struct aac_aifcmd *cmd;
+
+                fibctx = aac_fib_alloc(dev);
+                if (!fibctx)
+                        return 1;
+                aac_fib_init(fibctx);
+
+                cmd = (struct aac_aifcmd *) fib_data(fibctx);
+                cmd->command = cpu_to_le32(AifReqEvent);
+
+                return aac_fib_send(AifRequest,
+                        fibctx,
+                        sizeof(struct hw_fib)-sizeof(struct aac_fibhdr),
+                        FsaNormal,
+                        0, 1,
+                        (fib_callback)aac_aif_callback, fibctx);
         } else {
-                int fast = index & 0x01;
-                struct fib * fib = &dev->fibs[index >> 2];
+                struct fib *fib = &dev->fibs[index];
                 struct hw_fib * hwfib = fib->hw_fib_va;
 
                 /*
@@ -298,7 +361,7 @@ unsigned int aac_intr_normal(struct aac_dev * dev, u32 index)
                         return 0;
                 }
 
-                if (fast) {
+                if (isFastResponse) {
                         /*
                          *      Doctor the fib
                          */
diff --git a/drivers/scsi/aacraid/linit.c b/drivers/scsi/aacraid/linit.c
index 2c93d9496d62..4ff26521d75f 100644
--- a/drivers/scsi/aacraid/linit.c
+++ b/drivers/scsi/aacraid/linit.c
@@ -5,7 +5,8 @@
  * based on the old aacraid driver that is..
  * Adaptec aacraid device driver for Linux.
  *
- * Copyright (c) 2000-2007 Adaptec, Inc. (aacraid@adaptec.com)
+ * Copyright (c) 2000-2010 Adaptec, Inc.
+ *               2010 PMC-Sierra, Inc. (aacraid@pmc-sierra.com)
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -54,7 +55,7 @@
 
 #include "aacraid.h"
 
-#define AAC_DRIVER_VERSION              "1.1-5"
+#define AAC_DRIVER_VERSION              "1.1-7"
 #ifndef AAC_DRIVER_BRANCH
 #define AAC_DRIVER_BRANCH               ""
 #endif
@@ -161,6 +162,7 @@ static const struct pci_device_id aac_pci_tbl[] __devinitdata = {
         { 0x9005, 0x0285, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 59 }, /* Adaptec Catch All */
         { 0x9005, 0x0286, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 60 }, /* Adaptec Rocket Catch All */
         { 0x9005, 0x0288, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 61 }, /* Adaptec NEMER/ARK Catch All */
+        { 0x9005, 0x028b, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 62 }, /* Adaptec PMC Catch All */
         { 0,}
 };
 MODULE_DEVICE_TABLE(pci, aac_pci_tbl);
@@ -235,7 +237,8 @@ static struct aac_driver_ident aac_drivers[] = {
         { aac_rx_init, "aacraid",  "Legend  ", "RAID            ", 2, AAC_QUIRK_31BIT | AAC_QUIRK_34SG | AAC_QUIRK_SCSI_32 }, /* Legend Catchall */
         { aac_rx_init, "aacraid",  "ADAPTEC ", "RAID            ", 2 }, /* Adaptec Catch All */
         { aac_rkt_init, "aacraid", "ADAPTEC ", "RAID            ", 2 }, /* Adaptec Rocket Catch All */
-        { aac_nark_init, "aacraid", "ADAPTEC ", "RAID            ", 2 } /* Adaptec NEMER/ARK Catch All */
+        { aac_nark_init, "aacraid", "ADAPTEC ", "RAID           ", 2 }, /* Adaptec NEMER/ARK Catch All */
+        { aac_src_init, "aacraid", "ADAPTEC ", "RAID            ", 2 } /* Adaptec PMC Catch All */
 };
 
 /**
@@ -653,8 +656,10 @@ static int aac_eh_reset(struct scsi_cmnd* cmd)
          * This adapter needs a blind reset, only do so for Adapters that
          * support a register, instead of a commanded, reset.
          */
-        if ((aac->supplement_adapter_info.SupportedOptions2 &
-           AAC_OPTION_MU_RESET) &&
+        if (((aac->supplement_adapter_info.SupportedOptions2 &
+          AAC_OPTION_MU_RESET) ||
+          (aac->supplement_adapter_info.SupportedOptions2 &
+          AAC_OPTION_DOORBELL_RESET)) &&
           aac_check_reset &&
           ((aac_check_reset != 1) ||
            !(aac->supplement_adapter_info.SupportedOptions2 &
diff --git a/drivers/scsi/aacraid/nark.c b/drivers/scsi/aacraid/nark.c
index c55f7c862f0e..f397d21a0c06 100644
--- a/drivers/scsi/aacraid/nark.c
+++ b/drivers/scsi/aacraid/nark.c
@@ -4,7 +4,8 @@
  * based on the old aacraid driver that is..
  * Adaptec aacraid device driver for Linux.
  *
- * Copyright (c) 2006-2007 Adaptec, Inc. (aacraid@adaptec.com)
+ * Copyright (c) 2000-2010 Adaptec, Inc.
+ *               2010 PMC-Sierra, Inc. (aacraid@pmc-sierra.com)
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff --git a/drivers/scsi/aacraid/rkt.c b/drivers/scsi/aacraid/rkt.c
index 16d8db550027..be44de92429a 100644
--- a/drivers/scsi/aacraid/rkt.c
+++ b/drivers/scsi/aacraid/rkt.c
@@ -5,7 +5,8 @@
  * based on the old aacraid driver that is..
  * Adaptec aacraid device driver for Linux.
  *
- * Copyright (c) 2000-2007 Adaptec, Inc. (aacraid@adaptec.com)
+ * Copyright (c) 2000-2010 Adaptec, Inc.
+ *               2010 PMC-Sierra, Inc. (aacraid@pmc-sierra.com)
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff --git a/drivers/scsi/aacraid/rx.c b/drivers/scsi/aacraid/rx.c
index 84d77fd86e5b..ce530f113fdb 100644
--- a/drivers/scsi/aacraid/rx.c
+++ b/drivers/scsi/aacraid/rx.c
@@ -5,7 +5,8 @@
  * based on the old aacraid driver that is..
  * Adaptec aacraid device driver for Linux.
  *
- * Copyright (c) 2000-2007 Adaptec, Inc. (aacraid@adaptec.com)
+ * Copyright (c) 2000-2010 Adaptec, Inc.
+ *               2010 PMC-Sierra, Inc. (aacraid@pmc-sierra.com)
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -84,15 +85,35 @@ static irqreturn_t aac_rx_intr_producer(int irq, void *dev_id)
 
 static irqreturn_t aac_rx_intr_message(int irq, void *dev_id)
 {
+        int isAif, isFastResponse, isSpecial;
         struct aac_dev *dev = dev_id;
         u32 Index = rx_readl(dev, MUnit.OutboundQueue);
         if (unlikely(Index == 0xFFFFFFFFL))
                 Index = rx_readl(dev, MUnit.OutboundQueue);
         if (likely(Index != 0xFFFFFFFFL)) {
                 do {
-                        if (unlikely(aac_intr_normal(dev, Index))) {
-                                rx_writel(dev, MUnit.OutboundQueue, Index);
-                                rx_writel(dev, MUnit.ODR, DoorBellAdapterNormRespReady);
+                        isAif = isFastResponse = isSpecial = 0;
+                        if (Index & 0x00000002L) {
+                                isAif = 1;
+                                if (Index == 0xFFFFFFFEL)
+                                        isSpecial = 1;
+                                Index &= ~0x00000002L;
+                        } else {
+                                if (Index & 0x00000001L)
+                                        isFastResponse = 1;
+                                Index >>= 2;
+                        }
+                        if (!isSpecial) {
+                                if (unlikely(aac_intr_normal(dev,
+                                                Index, isAif,
+                                                isFastResponse, NULL))) {
+                                        rx_writel(dev,
+                                                MUnit.OutboundQueue,
+                                                Index);
+                                        rx_writel(dev,
+                                                MUnit.ODR,
+                                                DoorBellAdapterNormRespReady);
+                                }
                         }
                         Index = rx_readl(dev, MUnit.OutboundQueue);
                 } while (Index != 0xFFFFFFFFL);
@@ -631,6 +652,10 @@ int _aac_rx_init(struct aac_dev *dev)
                         name, instance);
                 goto error_iounmap;
         }
+        dev->dbg_base = dev->scsi_host_ptr->base;
+        dev->dbg_base_mapped = dev->base;
+        dev->dbg_size = dev->base_size;
+
         aac_adapter_enable_int(dev);
         /*
          *      Tell the adapter that all is configured, and it can
diff --git a/drivers/scsi/aacraid/sa.c b/drivers/scsi/aacraid/sa.c
index 622c21c68e65..e5d4457121ea 100644
--- a/drivers/scsi/aacraid/sa.c
+++ b/drivers/scsi/aacraid/sa.c
@@ -5,7 +5,8 @@
  * based on the old aacraid driver that is..
  * Adaptec aacraid device driver for Linux.
  *
- * Copyright (c) 2000-2007 Adaptec, Inc. (aacraid@adaptec.com)
+ * Copyright (c) 2000-2010 Adaptec, Inc.
+ *               2010 PMC-Sierra, Inc. (aacraid@pmc-sierra.com)
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -391,6 +392,10 @@ int aac_sa_init(struct aac_dev *dev)
                         name, instance);
                 goto error_iounmap;
         }
+        dev->dbg_base = dev->scsi_host_ptr->base;
+        dev->dbg_base_mapped = dev->base;
+        dev->dbg_size = dev->base_size;
+
         aac_adapter_enable_int(dev);
 
         /*
diff --git a/drivers/scsi/aacraid/src.c b/drivers/scsi/aacraid/src.c
new file mode 100644
index 000000000000..c20494660603
--- /dev/null
+++ b/drivers/scsi/aacraid/src.c
@@ -0,0 +1,594 @@
+/*
+ *      Adaptec AAC series RAID controller driver
+ *      (c) Copyright 2001 Red Hat Inc.
+ *
+ * based on the old aacraid driver that is..
+ * Adaptec aacraid device driver for Linux.
+ *
+ * Copyright (c) 2000-2010 Adaptec, Inc.
+ *               2010 PMC-Sierra, Inc. (aacraid@pmc-sierra.com)
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2, or (at your option)
+ * any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; see the file COPYING.  If not, write to
+ * the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
+ *
+ * Module Name:
+ *  src.c
+ *
+ * Abstract: Hardware Device Interface for PMC SRC based controllers
+ *
+ */
+
+#include <linux/kernel.h>
+#include <linux/init.h>
+#include <linux/types.h>
+#include <linux/pci.h>
+#include <linux/spinlock.h>
+#include <linux/slab.h>
+#include <linux/blkdev.h>
+#include <linux/delay.h>
+#include <linux/version.h>
+#include <linux/completion.h>
+#include <linux/time.h>
+#include <linux/interrupt.h>
+#include <scsi/scsi_host.h>
+
+#include "aacraid.h"
+
+static irqreturn_t aac_src_intr_message(int irq, void *dev_id)
+{
+        struct aac_dev *dev = dev_id;
+        unsigned long bellbits, bellbits_shifted;
+        int our_interrupt = 0;
+        int isFastResponse;
+        u32 index, handle;
+
+        bellbits = src_readl(dev, MUnit.ODR_R);
+        if (bellbits & PmDoorBellResponseSent) {
+                bellbits = PmDoorBellResponseSent;
+                /* handle async. status */
+                our_interrupt = 1;
+                index = dev->host_rrq_idx;
+                if (dev->host_rrq[index] == 0) {
+                        u32 old_index = index;
+                        /* adjust index */
+                        do {
+                                index++;
+                                if (index == dev->scsi_host_ptr->can_queue +
+                                                        AAC_NUM_MGT_FIB)
+                                        index = 0;
+                                if (dev->host_rrq[index] != 0)
+                                        break;
+                        } while (index != old_index);
+                        dev->host_rrq_idx = index;
+                }
+                for (;;) {
+                        isFastResponse = 0;
+                        /* remove toggle bit (31) */
+                        handle = (dev->host_rrq[index] & 0x7fffffff);
+                        /* check fast response bit (30) */
+                        if (handle & 0x40000000)
+                                isFastResponse = 1;
+                        handle &= 0x0000ffff;
+                        if (handle == 0)
+                                break;
+
+                        aac_intr_normal(dev, handle-1, 0, isFastResponse, NULL);
+
+                        dev->host_rrq[index++] = 0;
+                        if (index == dev->scsi_host_ptr->can_queue +
+                                                AAC_NUM_MGT_FIB)
+                                index = 0;
+                        dev->host_rrq_idx = index;
+                }
+        } else {
+                bellbits_shifted = (bellbits >> SRC_ODR_SHIFT);
+                if (bellbits_shifted & DoorBellAifPending) {
+                        our_interrupt = 1;
+                        /* handle AIF */
+                        aac_intr_normal(dev, 0, 2, 0, NULL);
+                }
+        }
+
+        if (our_interrupt) {
+                src_writel(dev, MUnit.ODR_C, bellbits);
+                return IRQ_HANDLED;
+        }
+        return IRQ_NONE;
+}
+
+/**
+ *      aac_src_disable_interrupt       -       Disable interrupts
+ *      @dev: Adapter
+ */
+
+static void aac_src_disable_interrupt(struct aac_dev *dev)
+{
+        src_writel(dev, MUnit.OIMR, dev->OIMR = 0xffffffff);
+}
+
+/**
+ *      aac_src_enable_interrupt_message        -       Enable interrupts
+ *      @dev: Adapter
+ */
+
+static void aac_src_enable_interrupt_message(struct aac_dev *dev)
+{
+        src_writel(dev, MUnit.OIMR, dev->OIMR = 0xfffffff8);
+}
+
+/**
+ *      src_sync_cmd    -       send a command and wait
+ *      @dev: Adapter
+ *      @command: Command to execute
+ *      @p1: first parameter
+ *      @ret: adapter status
+ *
+ *      This routine will send a synchronous command to the adapter and wait
+ *      for its completion.
+ */
+
+static int src_sync_cmd(struct aac_dev *dev, u32 command,
+        u32 p1, u32 p2, u32 p3, u32 p4, u32 p5, u32 p6,
+        u32 *status, u32 * r1, u32 * r2, u32 * r3, u32 * r4)
+{
+        unsigned long start;
+        int ok;
+
+        /*
+         *      Write the command into Mailbox 0
+         */
+        writel(command, &dev->IndexRegs->Mailbox[0]);
+        /*
+         *      Write the parameters into Mailboxes 1 - 6
+         */
+        writel(p1, &dev->IndexRegs->Mailbox[1]);
+        writel(p2, &dev->IndexRegs->Mailbox[2]);
+        writel(p3, &dev->IndexRegs->Mailbox[3]);
+        writel(p4, &dev->IndexRegs->Mailbox[4]);
+
+        /*
+         *      Clear the synch command doorbell to start on a clean slate.
+         */
+        src_writel(dev, MUnit.ODR_C, OUTBOUNDDOORBELL_0 << SRC_ODR_SHIFT);
+
+        /*
+         *      Disable doorbell interrupts
+         */
+        src_writel(dev, MUnit.OIMR, dev->OIMR = 0xffffffff);
+
+        /*
+         *      Force the completion of the mask register write before issuing
+         *      the interrupt.
+         */
+        src_readl(dev, MUnit.OIMR);
+
+        /*
+         *      Signal that there is a new synch command
+         */
+        src_writel(dev, MUnit.IDR, INBOUNDDOORBELL_0 << SRC_IDR_SHIFT);
+
+        ok = 0;
+        start = jiffies;
+
+        /*
+         *      Wait up to 30 seconds
+         */
+        while (time_before(jiffies, start+30*HZ)) {
+                /* Delay 5 microseconds to let Mon960 get info. */
+                udelay(5);
+
+                /* Mon960 will set doorbell0 bit
+                 * when it has completed the command
+                 */
+                if ((src_readl(dev, MUnit.ODR_R) >> SRC_ODR_SHIFT) & OUTBOUNDDOORBELL_0) {
+                        /* Clear the doorbell */
+                        src_writel(dev,
+                                MUnit.ODR_C,
+                                OUTBOUNDDOORBELL_0 << SRC_ODR_SHIFT);
+                        ok = 1;
+                        break;
+                }
+
+                 /* Yield the processor in case we are slow */
+                msleep(1);
+        }
+        if (unlikely(ok != 1)) {
+                 /* Restore interrupt mask even though we timed out */
+                aac_adapter_enable_int(dev);
+                return -ETIMEDOUT;
+        }
+
+         /* Pull the synch status from Mailbox 0 */
+        if (status)
+                *status = readl(&dev->IndexRegs->Mailbox[0]);
+        if (r1)
+                *r1 = readl(&dev->IndexRegs->Mailbox[1]);
+        if (r2)
+                *r2 = readl(&dev->IndexRegs->Mailbox[2]);
+        if (r3)
+                *r3 = readl(&dev->IndexRegs->Mailbox[3]);
+        if (r4)
+                *r4 = readl(&dev->IndexRegs->Mailbox[4]);
+
+         /* Clear the synch command doorbell */
+        src_writel(dev, MUnit.ODR_C, OUTBOUNDDOORBELL_0 << SRC_ODR_SHIFT);
+
+         /* Restore interrupt mask */
+        aac_adapter_enable_int(dev);
+        return 0;
+
+}
+
+/**
+ *      aac_src_interrupt_adapter       -       interrupt adapter
+ *      @dev: Adapter
+ *
+ *      Send an interrupt to the i960 and breakpoint it.
+ */
+
+static void aac_src_interrupt_adapter(struct aac_dev *dev)
+{
+        src_sync_cmd(dev, BREAKPOINT_REQUEST,
+                0, 0, 0, 0, 0, 0,
+                NULL, NULL, NULL, NULL, NULL);
+}
+
+/**
+ *      aac_src_notify_adapter          -       send an event to the adapter
+ *      @dev: Adapter
+ *      @event: Event to send
+ *
+ *      Notify the i960 that something it probably cares about has
+ *      happened.
+ */
+
+static void aac_src_notify_adapter(struct aac_dev *dev, u32 event)
+{
+        switch (event) {
+
+        case AdapNormCmdQue:
+                src_writel(dev, MUnit.ODR_C,
+                        INBOUNDDOORBELL_1 << SRC_ODR_SHIFT);
+                break;
+        case HostNormRespNotFull:
+                src_writel(dev, MUnit.ODR_C,
+                        INBOUNDDOORBELL_4 << SRC_ODR_SHIFT);
+                break;
+        case AdapNormRespQue:
+                src_writel(dev, MUnit.ODR_C,
+                        INBOUNDDOORBELL_2 << SRC_ODR_SHIFT);
+                break;
+        case HostNormCmdNotFull:
+                src_writel(dev, MUnit.ODR_C,
+                        INBOUNDDOORBELL_3 << SRC_ODR_SHIFT);
+                break;
+        case FastIo:
+                src_writel(dev, MUnit.ODR_C,
+                        INBOUNDDOORBELL_6 << SRC_ODR_SHIFT);
+                break;
+        case AdapPrintfDone:
+                src_writel(dev, MUnit.ODR_C,
+                        INBOUNDDOORBELL_5 << SRC_ODR_SHIFT);
+                break;
+        default:
+                BUG();
+                break;
+        }
+}
+
+/**
+ *      aac_src_start_adapter           -       activate adapter
+ *      @dev:   Adapter
+ *
+ *      Start up processing on an i960 based AAC adapter
+ */
+
+static void aac_src_start_adapter(struct aac_dev *dev)
+{
+        struct aac_init *init;
+
+        init = dev->init;
+        init->HostElapsedSeconds = cpu_to_le32(get_seconds());
+
+        /* We can only use a 32 bit address here */
+        src_sync_cmd(dev, INIT_STRUCT_BASE_ADDRESS, (u32)(ulong)dev->init_pa,
+          0, 0, 0, 0, 0, NULL, NULL, NULL, NULL, NULL);
+}
+
+/**
+ *      aac_src_check_health
+ *      @dev: device to check if healthy
+ *
+ *      Will attempt to determine if the specified adapter is alive and
+ *      capable of handling requests, returning 0 if alive.
+ */
+static int aac_src_check_health(struct aac_dev *dev)
+{
+        u32 status = src_readl(dev, MUnit.OMR);
+
+        /*
+         *      Check to see if the board failed any self tests.
+         */
+        if (unlikely(status & SELF_TEST_FAILED))
+                return -1;
+
+        /*
+         *      Check to see if the board panic'd.
+         */
+        if (unlikely(status & KERNEL_PANIC))
+                return (status >> 16) & 0xFF;
+        /*
+         *      Wait for the adapter to be up and running.
+         */
+        if (unlikely(!(status & KERNEL_UP_AND_RUNNING)))
+                return -3;
+        /*
+         *      Everything is OK
+         */
+        return 0;
+}
+
+/**
+ *      aac_src_deliver_message
+ *      @fib: fib to issue
+ *
+ *      Will send a fib, returning 0 if successful.
+ */
+static int aac_src_deliver_message(struct fib *fib)
+{
+        struct aac_dev *dev = fib->dev;
+        struct aac_queue *q = &dev->queues->queue[AdapNormCmdQueue];
+        unsigned long qflags;
+        u32 fibsize;
+        u64 address;
+        struct aac_fib_xporthdr *pFibX;
+
+        spin_lock_irqsave(q->lock, qflags);
+        q->numpending++;
+        spin_unlock_irqrestore(q->lock, qflags);
+
+        /* Calculate the amount to the fibsize bits */
+        fibsize = (sizeof(struct aac_fib_xporthdr) +
+                fib->hw_fib_va->header.Size + 127) / 128 - 1;
+        if (fibsize > (ALIGN32 - 1))
+                fibsize = ALIGN32 - 1;
+
+    /* Fill XPORT header */
+        pFibX = (struct aac_fib_xporthdr *)
+                ((unsigned char *)fib->hw_fib_va -
+                sizeof(struct aac_fib_xporthdr));
+        pFibX->Handle = fib->hw_fib_va->header.SenderData + 1;
+        pFibX->HostAddress = fib->hw_fib_pa;
+        pFibX->Size = fib->hw_fib_va->header.Size;
+        address = fib->hw_fib_pa - (u64)sizeof(struct aac_fib_xporthdr);
+
+        src_writel(dev, MUnit.IQ_H, (u32)(address >> 32));
+        src_writel(dev, MUnit.IQ_L, (u32)(address & 0xffffffff) + fibsize);
+        return 0;
+}
+
+/**
+ *      aac_src_ioremap
+ *      @size: mapping resize request
+ *
+ */
+static int aac_src_ioremap(struct aac_dev *dev, u32 size)
+{
+        if (!size) {
+                iounmap(dev->regs.src.bar0);
+                dev->regs.src.bar0 = NULL;
+                iounmap(dev->base);
+                dev->base = NULL;
+                return 0;
+        }
+        dev->regs.src.bar1 = ioremap(pci_resource_start(dev->pdev, 2),
+                AAC_MIN_SRC_BAR1_SIZE);
+        dev->base = NULL;
+        if (dev->regs.src.bar1 == NULL)
+                return -1;
+        dev->base = dev->regs.src.bar0 = ioremap(dev->scsi_host_ptr->base,
+                                size);
+        if (dev->base == NULL) {
+                iounmap(dev->regs.src.bar1);
+                dev->regs.src.bar1 = NULL;
+                return -1;
+        }
+        dev->IndexRegs = &((struct src_registers __iomem *)
+                dev->base)->IndexRegs;
+        return 0;
+}
+
+static int aac_src_restart_adapter(struct aac_dev *dev, int bled)
+{
+        u32 var, reset_mask;
+
+        if (bled >= 0) {
+                if (bled)
+                        printk(KERN_ERR "%s%d: adapter kernel panic'd %x.\n",
+                                dev->name, dev->id, bled);
+                bled = aac_adapter_sync_cmd(dev, IOP_RESET_ALWAYS,
+                        0, 0, 0, 0, 0, 0, &var, &reset_mask, NULL, NULL, NULL);
+                        if (bled || (var != 0x00000001))
+                                bled = -EINVAL;
+                if (dev->supplement_adapter_info.SupportedOptions2 &
+                        AAC_OPTION_DOORBELL_RESET) {
+                        src_writel(dev, MUnit.IDR, reset_mask);
+                        msleep(5000); /* Delay 5 seconds */
+                }
+        }
+
+        if (src_readl(dev, MUnit.OMR) & KERNEL_PANIC)
+                return -ENODEV;
+
+        if (startup_timeout < 300)
+                startup_timeout = 300;
+
+        return 0;
+}
+
+/**
+ *      aac_src_select_comm     -       Select communications method
+ *      @dev: Adapter
+ *      @comm: communications method
+ */
+int aac_src_select_comm(struct aac_dev *dev, int comm)
+{
+        switch (comm) {
+        case AAC_COMM_MESSAGE:
+                dev->a_ops.adapter_enable_int = aac_src_enable_interrupt_message;
+                dev->a_ops.adapter_intr = aac_src_intr_message;
+                dev->a_ops.adapter_deliver = aac_src_deliver_message;
+                break;
+        default:
+                return 1;
+        }
+        return 0;
+}
+
+/**
+ *  aac_src_init        -       initialize an Cardinal Frey Bar card
+ *  @dev: device to configure
+ *
+ */
+
+int aac_src_init(struct aac_dev *dev)
+{
+        unsigned long start;
+        unsigned long status;
+        int restart = 0;
+        int instance = dev->id;
+        const char *name = dev->name;
+
+        dev->a_ops.adapter_ioremap = aac_src_ioremap;
+        dev->a_ops.adapter_comm = aac_src_select_comm;
+
+        dev->base_size = AAC_MIN_SRC_BAR0_SIZE;
+        if (aac_adapter_ioremap(dev, dev->base_size)) {
+                printk(KERN_WARNING "%s: unable to map adapter.\n", name);
+                goto error_iounmap;
+        }
+
+        /* Failure to reset here is an option ... */
+        dev->a_ops.adapter_sync_cmd = src_sync_cmd;
+        dev->a_ops.adapter_enable_int = aac_src_disable_interrupt;
+        if ((aac_reset_devices || reset_devices) &&
+                !aac_src_restart_adapter(dev, 0))
+                ++restart;
+        /*
+         *      Check to see if the board panic'd while booting.
+         */
+        status = src_readl(dev, MUnit.OMR);
+        if (status & KERNEL_PANIC) {
+                if (aac_src_restart_adapter(dev, aac_src_check_health(dev)))
+                        goto error_iounmap;
+                ++restart;
+        }
+        /*
+         *      Check to see if the board failed any self tests.
+         */
+        status = src_readl(dev, MUnit.OMR);
+        if (status & SELF_TEST_FAILED) {
+                printk(KERN_ERR "%s%d: adapter self-test failed.\n",
+                        dev->name, instance);
+                goto error_iounmap;
+        }
+        /*
+         *      Check to see if the monitor panic'd while booting.
+         */
+        if (status & MONITOR_PANIC) {
+                printk(KERN_ERR "%s%d: adapter monitor panic.\n",
+                        dev->name, instance);
+                goto error_iounmap;
+        }
+        start = jiffies;
+        /*
+         *      Wait for the adapter to be up and running. Wait up to 3 minutes
+         */
+        while (!((status = src_readl(dev, MUnit.OMR)) &
+                KERNEL_UP_AND_RUNNING)) {
+                if ((restart &&
+                  (status & (KERNEL_PANIC|SELF_TEST_FAILED|MONITOR_PANIC))) ||
+                  time_after(jiffies, start+HZ*startup_timeout)) {
+                        printk(KERN_ERR "%s%d: adapter kernel failed to start, init status = %lx.\n",
+                                        dev->name, instance, status);
+                        goto error_iounmap;
+                }
+                if (!restart &&
+                  ((status & (KERNEL_PANIC|SELF_TEST_FAILED|MONITOR_PANIC)) ||
+                  time_after(jiffies, start + HZ *
+                  ((startup_timeout > 60)
+                    ? (startup_timeout - 60)
+                    : (startup_timeout / 2))))) {
+                        if (likely(!aac_src_restart_adapter(dev,
+                            aac_src_check_health(dev))))
+                                start = jiffies;
+                        ++restart;
+                }
+                msleep(1);
+        }
+        if (restart && aac_commit)
+                aac_commit = 1;
+        /*
+         *      Fill in the common function dispatch table.
+         */
+        dev->a_ops.adapter_interrupt = aac_src_interrupt_adapter;
+        dev->a_ops.adapter_disable_int = aac_src_disable_interrupt;
+        dev->a_ops.adapter_notify = aac_src_notify_adapter;
+        dev->a_ops.adapter_sync_cmd = src_sync_cmd;
+        dev->a_ops.adapter_check_health = aac_src_check_health;
+        dev->a_ops.adapter_restart = aac_src_restart_adapter;
+
+        /*
+         *      First clear out all interrupts.  Then enable the one's that we
+         *      can handle.
+         */
+        aac_adapter_comm(dev, AAC_COMM_MESSAGE);
+        aac_adapter_disable_int(dev);
+        src_writel(dev, MUnit.ODR_C, 0xffffffff);
+        aac_adapter_enable_int(dev);
+
+        if (aac_init_adapter(dev) == NULL)
+                goto error_iounmap;
+        if (dev->comm_interface != AAC_COMM_MESSAGE_TYPE1)
+                goto error_iounmap;
+
+        dev->msi = aac_msi && !pci_enable_msi(dev->pdev);
+
+        if (request_irq(dev->pdev->irq, dev->a_ops.adapter_intr,
+                        IRQF_SHARED|IRQF_DISABLED, "aacraid", dev) < 0) {
+
+                if (dev->msi)
+                        pci_disable_msi(dev->pdev);
+
+                printk(KERN_ERR "%s%d: Interrupt unavailable.\n",
+                        name, instance);
+                goto error_iounmap;
+        }
+        dev->dbg_base = pci_resource_start(dev->pdev, 2);
+        dev->dbg_base_mapped = dev->regs.src.bar1;
+        dev->dbg_size = AAC_MIN_SRC_BAR1_SIZE;
+
+        aac_adapter_enable_int(dev);
+        /*
+         *      Tell the adapter that all is configured, and it can
+         * start accepting requests
+         */
+        aac_src_start_adapter(dev);
+
+        return 0;
+
+error_iounmap:
+
+        return -1;
+}
diff --git a/drivers/scsi/advansys.c b/drivers/scsi/advansys.c
index 081c6de92bc5..bfd618a69499 100644
--- a/drivers/scsi/advansys.c
+++ b/drivers/scsi/advansys.c
@@ -4544,7 +4544,7 @@ AscMemWordCopyPtrToLram(PortAddr iop_base, ushort s_addr,
  * Copy 4 bytes to LRAM.
  *
  * The source data is assumed to be in little-endian order in memory
- * and is maintained in little-endian order when writen to LRAM.
+ * and is maintained in little-endian order when written to LRAM.
  */
 static void
 AscMemDWordCopyPtrToLram(PortAddr iop_base,
diff --git a/drivers/scsi/aha1740.c b/drivers/scsi/aha1740.c
index d058f1ab82b5..1c10b796c1a2 100644
--- a/drivers/scsi/aha1740.c
+++ b/drivers/scsi/aha1740.c
@@ -461,7 +461,7 @@ static int aha1740_queuecommand_lck(Scsi_Cmnd * SCpnt, void (*done)(Scsi_Cmnd *)
         /* The Adaptec Spec says the card is so fast that the loops
            will only be executed once in the code below. Even if this
            was true with the fastest processors when the spec was
-           written, it doesn't seem to be true with todays fast
+           written, it doesn't seem to be true with today's fast
            processors. We print a warning if the code is executed more
            often than LOOPCNT_WARN. If this happens, it should be
            investigated. If the count reaches LOOPCNT_MAX, we assume
diff --git a/drivers/scsi/aic7xxx/aic79xx.h b/drivers/scsi/aic7xxx/aic79xx.h
index 95ee50385188..9b059422aacb 100644
--- a/drivers/scsi/aic7xxx/aic79xx.h
+++ b/drivers/scsi/aic7xxx/aic79xx.h
@@ -473,7 +473,7 @@ struct hardware_scb {
  *      o A residual has occurred if SG_FULL_RESID is set in sgptr,
  *        or residual_sgptr does not have SG_LIST_NULL set.
  *
- *      o We are transfering the last segment if residual_datacnt has
+ *      o We are transferring the last segment if residual_datacnt has
  *        the SG_LAST_SEG flag set.
  *
  * Host:
@@ -516,7 +516,7 @@ struct hardware_scb {
  */
 
 /*
- * Definition of a scatter/gather element as transfered to the controller.
+ * Definition of a scatter/gather element as transferred to the controller.
  * The aic7xxx chips only support a 24bit length.  We use the top byte of
  * the length to store additional address bits and a flag to indicate
  * that a given segment terminates the transfer.  This gives us an
diff --git a/drivers/scsi/aic7xxx/aic79xx.reg b/drivers/scsi/aic7xxx/aic79xx.reg
index 0666c22ab55b..7e12c31ccfda 100644
--- a/drivers/scsi/aic7xxx/aic79xx.reg
+++ b/drivers/scsi/aic7xxx/aic79xx.reg
@@ -305,7 +305,7 @@ register HS_MAILBOX {
 }
 
 /*
- * Sequencer Interupt Status
+ * Sequencer Interrupt Status
  */
 register SEQINTSTAT {
         address                 0x00C
@@ -685,7 +685,7 @@ register DCHRXMSG0 {
 }
 
 /*
- * CMC Recieve Message 0
+ * CMC Receive Message 0
  */
 register CMCRXMSG0 {
         address                 0x090
@@ -696,7 +696,7 @@ register CMCRXMSG0 {
 }
 
 /*
- * Overlay Recieve Message 0
+ * Overlay Receive Message 0
  */
 register OVLYRXMSG0 {
         address                 0x090
@@ -732,7 +732,7 @@ register DCHRXMSG1 {
 }
 
 /*
- * CMC Recieve Message 1
+ * CMC Receive Message 1
  */
 register CMCRXMSG1 {
         address                 0x091
@@ -742,7 +742,7 @@ register CMCRXMSG1 {
 }
 
 /*
- * Overlay Recieve Message 1
+ * Overlay Receive Message 1
  */
 register OVLYRXMSG1 {
         address                 0x091
@@ -777,7 +777,7 @@ register DCHRXMSG2 {
 }
 
 /*
- * CMC Recieve Message 2
+ * CMC Receive Message 2
  */
 register CMCRXMSG2 {
         address                 0x092
@@ -787,7 +787,7 @@ register CMCRXMSG2 {
 }
 
 /*
- * Overlay Recieve Message 2
+ * Overlay Receive Message 2
  */
 register OVLYRXMSG2 {
         address                 0x092
@@ -816,7 +816,7 @@ register DCHRXMSG3 {
 }
 
 /*
- * CMC Recieve Message 3
+ * CMC Receive Message 3
  */
 register CMCRXMSG3 {
         address                 0x093
@@ -826,7 +826,7 @@ register CMCRXMSG3 {
 }
 
 /*
- * Overlay Recieve Message 3
+ * Overlay Receive Message 3
  */
 register OVLYRXMSG3 {
         address                 0x093
@@ -1249,7 +1249,7 @@ register TARGPCISTAT {
 
 /*
  * LQ Packet In
- * The last LQ Packet recieved
+ * The last LQ Packet received
  */
 register LQIN {
         address                 0x020
@@ -2573,7 +2573,7 @@ register IOPDNCTL {
 }
 
 /*
- * Shaddow Host Address.
+ * Shadow Host Address.
  */
 register SHADDR {
         address                 0x060
@@ -3983,7 +3983,7 @@ scratch_ram {
 
         /*
          * The maximum amount of time to wait, when interrupt coalescing
-         * is enabled, before issueing a CMDCMPLT interrupt for a completed
+         * is enabled, before issuing a CMDCMPLT interrupt for a completed
          * command.
          */
         INT_COALESCING_TIMER {
diff --git a/drivers/scsi/aic7xxx/aic79xx.seq b/drivers/scsi/aic7xxx/aic79xx.seq
index 2fb78e35a9e5..3a36d9362a10 100644
--- a/drivers/scsi/aic7xxx/aic79xx.seq
+++ b/drivers/scsi/aic7xxx/aic79xx.seq
@@ -567,7 +567,7 @@ BEGIN_CRITICAL;
         shr     SELOID, 4, SCB_SCSIID;
         /*
          * If we want to send a message to the device, ensure
-         * we are selecting with atn irregardless of our packetized
+         * we are selecting with atn regardless of our packetized
          * agreement.  Since SPI4 only allows target reset or PPR
          * messages if this is a packetized connection, the change
          * to our negotiation table entry for this selection will
@@ -960,7 +960,7 @@ p_status_okay:
  * This is done to allow the host to send messages outside of an identify
  * sequence while protecting the seqencer from testing the MK_MESSAGE bit
  * on an SCB that might not be for the current nexus. (For example, a
- * BDR message in responce to a bad reselection would leave us pointed to
+ * BDR message in response to a bad reselection would leave us pointed to
  * an SCB that doesn't have anything to do with the current target).
  *
  * Otherwise, treat MSG_OUT as a 1 byte message to send (abort, abort tag,
@@ -1507,7 +1507,7 @@ service_fifo:
                  * If the other FIFO needs loading, then it
                  * must not have claimed the S/G cache yet
                  * (SG_CACHE_AVAIL would have been cleared in
-                 * the orginal FIFO mode and we test this above).
+                 * the original FIFO mode and we test this above).
                  * Return to the idle loop so we can process the
                  * FIFO not currently on the bus first.
                  */
@@ -1521,7 +1521,7 @@ idle_sgfetch_okay:
 idle_sgfetch_start:
         /*
          * We fetch a "cacheline aligned" and sized amount of data
-         * so we don't end up referencing a non-existant page.
+         * so we don't end up referencing a non-existent page.
          * Cacheline aligned is in quotes because the kernel will
          * set the prefetch amount to a reasonable level if the
          * cacheline size is unknown.
@@ -1551,7 +1551,7 @@ idle_sg_avail:
         test    DFSTATUS, PRELOAD_AVAIL jz return;
         /*
          * On the A, preloading a segment before HDMAENACK
-         * comes true can clobber the shaddow address of the
+         * comes true can clobber the shadow address of the
          * first segment in the S/G FIFO.  Wait until it is
          * safe to proceed.
          */
@@ -2004,10 +2004,10 @@ pkt_handle_xfer:
          * Defer handling of this NONPACKREQ until we
          * can be sure it pertains to this FIFO.  SAVEPTRS
          * will not be asserted if the NONPACKREQ is for us,
-         * so we must simulate it if shaddow is valid.  If
-         * shaddow is not valid, keep running this FIFO until we
+         * so we must simulate it if shadow is valid.  If
+         * shadow is not valid, keep running this FIFO until we
          * have satisfied the transfer by loading segments and
-         * waiting for either shaddow valid or last_seg_done.
+         * waiting for either shadow valid or last_seg_done.
          */
         test    MDFFSTAT, SHVALID jnz pkt_saveptrs;
 pkt_service_fifo:
@@ -2171,7 +2171,7 @@ pkt_status_check_nonpackreq:
         /*
          * The unexpected nonpkt phase handler assumes that any
          * data channel use will have a FIFO reference count.  It
-         * turns out that the status handler doesn't need a refernce
+         * turns out that the status handler doesn't need a references
          * count since the status received flag, and thus completion
          * processing, cannot be set until the handler is finished.
          * We increment the count here to make the nonpkt handler
diff --git a/drivers/scsi/aic7xxx/aic79xx_core.c b/drivers/scsi/aic7xxx/aic79xx_core.c
index 3233bf564435..5f8617dd43bb 100644
--- a/drivers/scsi/aic7xxx/aic79xx_core.c
+++ b/drivers/scsi/aic7xxx/aic79xx_core.c
@@ -562,7 +562,7 @@ ahd_targetcmd_offset(struct ahd_softc *ahd, u_int index)
 }
 #endif
 
-/*********************** Miscelaneous Support Functions ***********************/
+/*********************** Miscellaneous Support Functions ***********************/
 /*
  * Return pointers to the transfer negotiation information
  * for the specified our_id/remote_id pair.
@@ -599,7 +599,7 @@ void
 ahd_outw(struct ahd_softc *ahd, u_int port, u_int value)
 {
         /*
-         * Write low byte first to accomodate registers
+         * Write low byte first to accommodate registers
          * such as PRGMCNT where the order maters.
          */
         ahd_outb(ahd, port, value & 0xFF);
@@ -2067,7 +2067,7 @@ ahd_handle_seqint(struct ahd_softc *ahd, u_int intstat)
                  * that requires host assistance for completion.
                  * While handling the message phase(s), we will be
                  * notified by the sequencer after each byte is
-                 * transfered so we can track bus phase changes.
+                 * transferred so we can track bus phase changes.
                  *
                  * If this is the first time we've seen a HOST_MSG_LOOP
                  * interrupt, initialize the state of the host message
@@ -2487,7 +2487,7 @@ ahd_handle_scsiint(struct ahd_softc *ahd, u_int intstat)
                 /*
                  * Although the driver does not care about the
                  * 'Selection in Progress' status bit, the busy
-                 * LED does.  SELINGO is only cleared by a successfull
+                 * LED does.  SELINGO is only cleared by a successful
                  * selection, so we must manually clear it to insure
                  * the LED turns off just incase no future successful
                  * selections occur (e.g. no devices on the bus).
@@ -3548,7 +3548,7 @@ ahd_clear_critical_section(struct ahd_softc *ahd)
                 ahd_outb(ahd, SEQCTL0, ahd_inb(ahd, SEQCTL0) & ~STEP);
                 ahd_outb(ahd, SIMODE1, simode1);
                 /*
-                 * SCSIINT seems to glitch occassionally when
+                 * SCSIINT seems to glitch occasionally when
                  * the interrupt masks are restored.  Clear SCSIINT
                  * one more time so that only persistent errors
                  * are seen as a real interrupt.
@@ -3838,7 +3838,7 @@ ahd_validate_width(struct ahd_softc *ahd, struct ahd_initiator_tinfo *tinfo,
 
 /*
  * Update the bitmask of targets for which the controller should
- * negotiate with at the next convenient oportunity.  This currently
+ * negotiate with at the next convenient opportunity.  This currently
  * means the next time we send the initial identify messages for
  * a new transaction.
  */
@@ -4200,7 +4200,7 @@ ahd_update_neg_table(struct ahd_softc *ahd, struct ahd_devinfo *devinfo,
 
         /*
          * During packetized transfers, the target will
-         * give us the oportunity to send command packets
+         * give us the opportunity to send command packets
          * without us asserting attention.
          */
         if ((tinfo->ppr_options & MSG_EXT_PPR_IU_REQ) == 0)
@@ -5651,7 +5651,7 @@ ahd_handle_msg_reject(struct ahd_softc *ahd, struct ahd_devinfo *devinfo)
 
                 /*
                  * Requeue all tagged commands for this target
-                 * currently in our posession so they can be
+                 * currently in our possession so they can be
                  * converted to untagged commands.
                  */
                 ahd_search_qinfifo(ahd, SCB_GET_TARGET(ahd, scb),
@@ -6245,7 +6245,7 @@ ahd_shutdown(void *arg)
 /*
  * Reset the controller and record some information about it
  * that is only available just after a reset.  If "reinit" is
- * non-zero, this reset occured after initial configuration
+ * non-zero, this reset occurred after initial configuration
  * and the caller requests that the chip be fully reinitialized
  * to a runable state.  Chip interrupts are *not* enabled after
  * a reinitialization.  The caller must enable interrupts via
@@ -6495,7 +6495,7 @@ ahd_init_scbdata(struct ahd_softc *ahd)
         }
 
         /*
-         * Note that we were successfull
+         * Note that we were successful
          */
         return (0); 
 
@@ -7079,7 +7079,7 @@ ahd_init(struct ahd_softc *ahd)
                 return (ENOMEM);
 
         /*
-         * Verify that the compiler hasn't over-agressively
+         * Verify that the compiler hasn't over-aggressively
          * padded important structures.
          */
         if (sizeof(struct hardware_scb) != 64)
@@ -10087,7 +10087,7 @@ ahd_write_seeprom(struct ahd_softc *ahd, uint16_t *buf,
                 return (error);
 
         /*
-         * Write the data.  If we don't get throught the loop at
+         * Write the data.  If we don't get through the loop at
          * least once, the arguments were invalid.
          */
         retval = EINVAL;
diff --git a/drivers/scsi/aic7xxx/aic79xx_osm.c b/drivers/scsi/aic7xxx/aic79xx_osm.c
index 25d066624476..7d48700257a7 100644
--- a/drivers/scsi/aic7xxx/aic79xx_osm.c
+++ b/drivers/scsi/aic7xxx/aic79xx_osm.c
@@ -1441,7 +1441,7 @@ ahd_platform_set_tags(struct ahd_softc *ahd, struct scsi_device *sdev,
                 usertags = ahd_linux_user_tagdepth(ahd, devinfo);
                 if (!was_queuing) {
                         /*
-                         * Start out agressively and allow our
+                         * Start out aggressively and allow our
                          * dynamic queue depth algorithm to take
                          * care of the rest.
                          */
diff --git a/drivers/scsi/aic7xxx/aic7xxx.h b/drivers/scsi/aic7xxx/aic7xxx.h
index 17444bc18bca..f695774645c1 100644
--- a/drivers/scsi/aic7xxx/aic7xxx.h
+++ b/drivers/scsi/aic7xxx/aic7xxx.h
@@ -440,7 +440,7 @@ struct hardware_scb {
  *      o A residual has occurred if SG_FULL_RESID is set in sgptr,
  *        or residual_sgptr does not have SG_LIST_NULL set.
  *
- *      o We are transfering the last segment if residual_datacnt has
+ *      o We are transferring the last segment if residual_datacnt has
  *        the SG_LAST_SEG flag set.
  *
  * Host:
@@ -494,7 +494,7 @@ struct hardware_scb {
  */
 
 /*
- * Definition of a scatter/gather element as transfered to the controller.
+ * Definition of a scatter/gather element as transferred to the controller.
  * The aic7xxx chips only support a 24bit length.  We use the top byte of
  * the length to store additional address bits and a flag to indicate
  * that a given segment terminates the transfer.  This gives us an
diff --git a/drivers/scsi/aic7xxx/aic7xxx.reg b/drivers/scsi/aic7xxx/aic7xxx.reg
index 9a96e55da39a..ba0b411d03e2 100644
--- a/drivers/scsi/aic7xxx/aic7xxx.reg
+++ b/drivers/scsi/aic7xxx/aic7xxx.reg
@@ -351,7 +351,7 @@ register SSTAT2 {
         address                 0x00d
         access_mode RO
         field   OVERRUN         0x80
-        field   SHVALID         0x40    /* Shaddow Layer non-zero */
+        field   SHVALID         0x40    /* Shadow Layer non-zero */
         field   EXP_ACTIVE      0x10    /* SCSI Expander Active */
         field   CRCVALERR       0x08    /* CRC doesn't match (U3 only) */
         field   CRCENDERR       0x04    /* No terminal CRC packet (U3 only) */
diff --git a/drivers/scsi/aic7xxx/aic7xxx.seq b/drivers/scsi/aic7xxx/aic7xxx.seq
index 5a4cfc954a9f..e60041e8f2d1 100644
--- a/drivers/scsi/aic7xxx/aic7xxx.seq
+++ b/drivers/scsi/aic7xxx/aic7xxx.seq
@@ -57,10 +57,10 @@ PREFIX = "ahc_"
  * a later time.  This problem cannot be resolved by holding a single entry
  * in scratch ram since a reconnecting target can request sense and this will
  * create yet another SCB waiting for selection.  The solution used here is to 
- * use byte 27 of the SCB as a psuedo-next pointer and to thread a list
+ * use byte 27 of the SCB as a pseudo-next pointer and to thread a list
  * of SCBs that are awaiting selection.  Since 0-0xfe are valid SCB indexes, 
  * SCB_LIST_NULL is 0xff which is out of range.  An entry is also added to
- * this list everytime a request sense occurs or after completing a non-tagged
+ * this list every time a request sense occurs or after completing a non-tagged
  * command for which a second SCB has been queued.  The sequencer will
  * automatically consume the entries.
  */
@@ -752,7 +752,7 @@ idle_loop:
 
         /*
          * We fetch a "cacheline aligned" and sized amount of data
-         * so we don't end up referencing a non-existant page.
+         * so we don't end up referencing a non-existent page.
          * Cacheline aligned is in quotes because the kernel will
          * set the prefetch amount to a reasonable level if the
          * cacheline size is unknown.
@@ -1485,7 +1485,7 @@ p_status_okay:
  * This is done to allow the host to send messages outside of an identify
  * sequence while protecting the seqencer from testing the MK_MESSAGE bit
  * on an SCB that might not be for the current nexus. (For example, a
- * BDR message in responce to a bad reselection would leave us pointed to
+ * BDR message in response to a bad reselection would leave us pointed to
  * an SCB that doesn't have anything to do with the current target).
  *
  * Otherwise, treat MSG_OUT as a 1 byte message to send (abort, abort tag,
@@ -1999,7 +1999,7 @@ if ((ahc->flags & AHC_TARGETROLE) != 0) {
  * from out to in, wait an additional data release delay before continuing.
  */
 change_phase:
-        /* Wait for preceeding I/O session to complete. */
+        /* Wait for preceding I/O session to complete. */
         test    SCSISIGI, ACKI jnz .;
 
         /* Change the phase */
diff --git a/drivers/scsi/aic7xxx/aic7xxx_core.c b/drivers/scsi/aic7xxx/aic7xxx_core.c
index e021b4812d58..dc28b0a91b22 100644
--- a/drivers/scsi/aic7xxx/aic7xxx_core.c
+++ b/drivers/scsi/aic7xxx/aic7xxx_core.c
@@ -427,7 +427,7 @@ ahc_targetcmd_offset(struct ahc_softc *ahc, u_int index)
 }
 #endif
 
-/*********************** Miscelaneous Support Functions ***********************/
+/*********************** Miscellaneous Support Functions ***********************/
 /*
  * Determine whether the sequencer reported a residual
  * for this SCB/transaction.
@@ -1243,7 +1243,7 @@ ahc_handle_seqint(struct ahc_softc *ahc, u_int intstat)
                  * that requires host assistance for completion.
                  * While handling the message phase(s), we will be
                  * notified by the sequencer after each byte is
-                 * transfered so we can track bus phase changes.
+                 * transferred so we can track bus phase changes.
                  *
                  * If this is the first time we've seen a HOST_MSG_LOOP
                  * interrupt, initialize the state of the host message
@@ -1487,7 +1487,7 @@ ahc_handle_seqint(struct ahc_softc *ahc, u_int intstat)
                        scbptr, ahc_inb(ahc, ARG_1),
                        ahc->scb_data->hscbs[scbptr].tag);
                 ahc_dump_card_state(ahc);
-                panic("for saftey");
+                panic("for safety");
                 break;
         }
         case OUT_OF_RANGE:
@@ -1733,7 +1733,7 @@ ahc_handle_scsiint(struct ahc_softc *ahc, u_int intstat)
                 /*
                  * Although the driver does not care about the
                  * 'Selection in Progress' status bit, the busy
-                 * LED does.  SELINGO is only cleared by a successfull
+                 * LED does.  SELINGO is only cleared by a successful
                  * selection, so we must manually clear it to insure
                  * the LED turns off just incase no future successful
                  * selections occur (e.g. no devices on the bus).
@@ -1943,7 +1943,7 @@ ahc_handle_scsiint(struct ahc_softc *ahc, u_int intstat)
                         if (lastphase != P_BUSFREE) {
                                 /*
                                  * Renegotiate with this device at the
-                                 * next oportunity just in case this busfree
+                                 * next opportunity just in case this busfree
                                  * is due to a negotiation mismatch with the
                                  * device.
                                  */
@@ -2442,7 +2442,7 @@ ahc_validate_width(struct ahc_softc *ahc, struct ahc_initiator_tinfo *tinfo,
 
 /*
  * Update the bitmask of targets for which the controller should
- * negotiate with at the next convenient oportunity.  This currently
+ * negotiate with at the next convenient opportunity.  This currently
  * means the next time we send the initial identify messages for
  * a new transaction.
  */
@@ -4131,7 +4131,7 @@ ahc_handle_msg_reject(struct ahc_softc *ahc, struct ahc_devinfo *devinfo)
 
                 /*
                  * Requeue all tagged commands for this target
-                 * currently in our posession so they can be
+                 * currently in our possession so they can be
                  * converted to untagged commands.
                  */
                 ahc_search_qinfifo(ahc, SCB_GET_TARGET(ahc, scb),
@@ -4581,7 +4581,7 @@ ahc_shutdown(void *arg)
 /*
  * Reset the controller and record some information about it
  * that is only available just after a reset.  If "reinit" is
- * non-zero, this reset occured after initial configuration
+ * non-zero, this reset occurred after initial configuration
  * and the caller requests that the chip be fully reinitialized
  * to a runable state.  Chip interrupts are *not* enabled after
  * a reinitialization.  The caller must enable interrupts via
@@ -4899,7 +4899,7 @@ ahc_init_scbdata(struct ahc_softc *ahc)
         ahc->next_queued_scb = ahc_get_scb(ahc);
 
         /*
-         * Note that we were successfull
+         * Note that we were successful
          */
         return (0); 
 
diff --git a/drivers/scsi/aic7xxx/aic7xxx_osm.c b/drivers/scsi/aic7xxx/aic7xxx_osm.c
index 4a359bb307c6..c6251bb4f438 100644
--- a/drivers/scsi/aic7xxx/aic7xxx_osm.c
+++ b/drivers/scsi/aic7xxx/aic7xxx_osm.c
@@ -294,7 +294,7 @@ static uint32_t aic7xxx_extended;
  * dubious at best.  To my knowledge, this option has never actually
  * solved a PCI parity problem, but on certain machines with broken PCI
  * chipset configurations where stray PCI transactions with bad parity are
- * the norm rather than the exception, the error messages can be overwelming.
+ * the norm rather than the exception, the error messages can be overwhelming.
  * It's included in the driver for completeness.
  *   0     = Shut off PCI parity check
  *   non-0 = reverse polarity pci parity checking
@@ -1318,7 +1318,7 @@ ahc_platform_set_tags(struct ahc_softc *ahc, struct scsi_device *sdev,
                 usertags = ahc_linux_user_tagdepth(ahc, devinfo);
                 if (!was_queuing) {
                         /*
-                         * Start out agressively and allow our
+                         * Start out aggressively and allow our
                          * dynamic queue depth algorithm to take
                          * care of the rest.
                          */
diff --git a/drivers/scsi/aic7xxx/aic7xxx_pci.c b/drivers/scsi/aic7xxx/aic7xxx_pci.c
index 2b11a4272364..6917b4f5ac9e 100644
--- a/drivers/scsi/aic7xxx/aic7xxx_pci.c
+++ b/drivers/scsi/aic7xxx/aic7xxx_pci.c
@@ -789,7 +789,7 @@ ahc_pci_config(struct ahc_softc *ahc, const struct ahc_pci_identity *entry)
         ahc->bus_intr = ahc_pci_intr;
         ahc->bus_chip_init = ahc_pci_chip_init;
 
-        /* Remeber how the card was setup in case there is no SEEPROM */
+        /* Remember how the card was setup in case there is no SEEPROM */
         if ((ahc_inb(ahc, HCNTRL) & POWRDN) == 0) {
                 ahc_pause(ahc);
                 if ((ahc->features & AHC_ULTRA2) != 0)
@@ -860,7 +860,7 @@ ahc_pci_config(struct ahc_softc *ahc, const struct ahc_pci_identity *entry)
         }
 
         /*
-         * We cannot perform ULTRA speeds without the presense
+         * We cannot perform ULTRA speeds without the presence
          * of the external precision resistor.
          */
         if ((ahc->features & AHC_ULTRA) != 0) {
@@ -969,7 +969,7 @@ ahc_pci_config(struct ahc_softc *ahc, const struct ahc_pci_identity *entry)
 }
 
 /*
- * Test for the presense of external sram in an
+ * Test for the presence of external sram in an
  * "unshared" configuration.
  */
 static int
diff --git a/drivers/scsi/aic7xxx/aicasm/aicasm_gram.y b/drivers/scsi/aic7xxx/aicasm/aicasm_gram.y
index e4064433842e..f1586a437906 100644
--- a/drivers/scsi/aic7xxx/aicasm/aicasm_gram.y
+++ b/drivers/scsi/aic7xxx/aicasm/aicasm_gram.y
@@ -803,7 +803,7 @@ macro_arglist:
 |       macro_arglist ',' T_ARG
         {
                 if ($1 == 0) {
-                        stop("Comma without preceeding argument in arg list",
+                        stop("Comma without preceding argument in arg list",
                              EX_DATAERR);
                         /* NOTREACHED */
                 }
@@ -1319,8 +1319,8 @@ code:
 ;
 
         /*
-         * This grammer differs from the one in the aic7xxx
-         * reference manual since the grammer listed there is
+         * This grammar differs from the one in the aic7xxx
+         * reference manual since the grammar listed there is
          * ambiguous and causes a shift/reduce conflict.
          * It also seems more logical as the "immediate"
          * argument is listed as the second arg like the
@@ -1799,7 +1799,7 @@ format_3_instr(int opcode, symbol_ref_t *src,
         instr = seq_alloc();
         f3_instr = &instr->format.format3;
         if (address->symbol == NULL) {
-                /* 'dot' referrence.  Use the current instruction pointer */
+                /* 'dot' reference.  Use the current instruction pointer */
                 addr = instruction_ptr + address->offset;
         } else if (address->symbol->type == UNINITIALIZED) {
                 /* forward reference */
diff --git a/drivers/scsi/aic7xxx/aicasm/aicasm_macro_gram.y b/drivers/scsi/aic7xxx/aicasm/aicasm_macro_gram.y
index ff46aa6801bf..708326df0766 100644
--- a/drivers/scsi/aic7xxx/aicasm/aicasm_macro_gram.y
+++ b/drivers/scsi/aic7xxx/aicasm/aicasm_macro_gram.y
@@ -115,7 +115,7 @@ macro_arglist:
 |       macro_arglist ',' T_ARG
         {
                 if ($1 == 0) {
-                        stop("Comma without preceeding argument in arg list",
+                        stop("Comma without preceding argument in arg list",
                              EX_DATAERR);
                         /* NOTREACHED */
                 }
diff --git a/drivers/scsi/aic7xxx_old.c b/drivers/scsi/aic7xxx_old.c
index 4ff60a08df0f..5b212f0df898 100644
--- a/drivers/scsi/aic7xxx_old.c
+++ b/drivers/scsi/aic7xxx_old.c
@@ -905,7 +905,7 @@ struct aic_dev_data {
  * problems with architectures I can't test on (because I don't have one,
  * such as the Alpha based systems) which happen to give faults for
  * non-aligned memory accesses, care was taken to align this structure
- * in a way that gauranteed all accesses larger than 8 bits were aligned
+ * in a way that guaranteed all accesses larger than 8 bits were aligned
  * on the appropriate boundary.  It's also organized to try and be more
  * cache line efficient.  Be careful when changing this lest you might hurt
  * overall performance and bring down the wrath of the masses.
@@ -1180,7 +1180,7 @@ static int aic7xxx_pci_parity = 0;
  * the card's registers in a hex dump format tailored to each model of
  * controller.
  * 
- * NOTE: THE CONTROLLER IS LEFT IN AN UNUSEABLE STATE BY THIS OPTION.
+ * NOTE: THE CONTROLLER IS LEFT IN AN UNUSABLE STATE BY THIS OPTION.
  *       YOU CANNOT BOOT UP WITH THIS OPTION, IT IS FOR DEBUGGING PURPOSES
  *       ONLY
  */
@@ -3467,7 +3467,7 @@ aic7xxx_reset_current_bus(struct aic7xxx_host *p)
   /* Turn off the bus' current operations, after all, we shouldn't have any
    * valid commands left to cause a RSELI and SELO once we've tossed the
    * bus away with this reset, so we might as well shut down the sequencer
-   * until the bus is restarted as oppossed to saving the current settings
+   * until the bus is restarted as opposed to saving the current settings
    * and restoring them (which makes no sense to me). */
 
   /* Turn on the bus reset. */
@@ -4070,7 +4070,7 @@ aic7xxx_handle_seqint(struct aic7xxx_host *p, unsigned char intstat)
             aic_dev->max_q_depth = aic_dev->temp_q_depth = 1;
             /*
              * We set this command up as a bus device reset.  However, we have
-             * to clear the tag type as it's causing us problems.  We shouldnt
+             * to clear the tag type as it's causing us problems.  We shouldn't
              * have to worry about any other commands being active, since if
              * the device is refusing tagged commands, this should be the
              * first tagged command sent to the device, however, we do have
@@ -9748,7 +9748,7 @@ skip_pci_controller:
     }
 
     /*
-     * We are commited now, everything has been checked and this card
+     * We are committed now, everything has been checked and this card
      * has been found, now we just set it up
      */
 
@@ -9906,7 +9906,7 @@ skip_pci_controller:
    *  2: All PCI controllers with BIOS_ENABLED next, according to BIOS
    *     address, going from lowest to highest.
    *  3: Remaining VLB/EISA controllers going in slot order.
-   *  4: Remaining PCI controllers, going in PCI device order (reversable)
+   *  4: Remaining PCI controllers, going in PCI device order (reversible)
    */
 
   {
diff --git a/drivers/scsi/aic7xxx_old/aic7xxx.seq b/drivers/scsi/aic7xxx_old/aic7xxx.seq
index 1565be9ebd49..823ff2873229 100644
--- a/drivers/scsi/aic7xxx_old/aic7xxx.seq
+++ b/drivers/scsi/aic7xxx_old/aic7xxx.seq
@@ -51,7 +51,7 @@
  * use byte 27 of the SCB as a pseudo-next pointer and to thread a list
  * of SCBs that are awaiting selection.  Since 0-0xfe are valid SCB indexes, 
  * SCB_LIST_NULL is 0xff which is out of range.  An entry is also added to
- * this list everytime a request sense occurs or after completing a non-tagged
+ * this list every time a request sense occurs or after completing a non-tagged
  * command for which a second SCB has been queued.  The sequencer will
  * automatically consume the entries.
  */
@@ -696,7 +696,7 @@ p_status:
  * This is done to allow the hsot to send messages outside of an identify
  * sequence while protecting the seqencer from testing the MK_MESSAGE bit
  * on an SCB that might not be for the current nexus. (For example, a
- * BDR message in responce to a bad reselection would leave us pointed to
+ * BDR message in response to a bad reselection would leave us pointed to
  * an SCB that doesn't have anything to do with the current target).
  * Otherwise, treat MSG_OUT as a 1 byte message to send (abort, abort tag,
  * bus device reset).
@@ -716,8 +716,8 @@ p_mesgout_identify:
         } else {
                 and     SINDEX,0x7,SCB_TCL;     /* lun */
         }
-        and     A,DISCENB,SCB_CONTROL;  /* mask off disconnect privledge */
-        or      SINDEX,A;               /* or in disconnect privledge */
+        and     A,DISCENB,SCB_CONTROL;  /* mask off disconnect privilege */
+        or      SINDEX,A;               /* or in disconnect privilege */
         or      SINDEX,MSG_IDENTIFYFLAG;
 p_mesgout_mk_message:
         test    SCB_CONTROL,MK_MESSAGE  jz p_mesgout_tag;
diff --git a/drivers/scsi/aic94xx/Makefile b/drivers/scsi/aic94xx/Makefile
index e78ce0fa44d2..c0a15c754585 100644
--- a/drivers/scsi/aic94xx/Makefile
+++ b/drivers/scsi/aic94xx/Makefile
@@ -22,9 +22,7 @@
 # along with the aic94xx driver; if not, write to the Free Software
 # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 
-ifeq ($(CONFIG_AIC94XX_DEBUG),y)
-        EXTRA_CFLAGS += -DASD_DEBUG -DASD_ENTER_EXIT
-endif
+ccflags-$(CONFIG_AIC94XX_DEBUG) := -DASD_DEBUG -DASD_ENTER_EXIT
 
 obj-$(CONFIG_SCSI_AIC94XX) += aic94xx.o
 aic94xx-y += aic94xx_init.o \
diff --git a/drivers/scsi/aic94xx/aic94xx_reg_def.h b/drivers/scsi/aic94xx/aic94xx_reg_def.h
index 40273a747d29..dd6cc8008b16 100644
--- a/drivers/scsi/aic94xx/aic94xx_reg_def.h
+++ b/drivers/scsi/aic94xx/aic94xx_reg_def.h
@@ -2134,7 +2134,7 @@
 * The host accesses this scratch in a different manner from the
 * link sequencer. The sequencer has to use LSEQ registers
 * LmSCRPAGE and LmMnSCRPAGE to access the scratch memory. A flat
-* mapping of the scratch memory is avaliable for software
+* mapping of the scratch memory is available for software
 * convenience and to prevent corruption while the sequencer is
 * running. This memory is mapped onto addresses 800h - 9FFh.
 *
diff --git a/drivers/scsi/arm/acornscsi.c b/drivers/scsi/arm/acornscsi.c
index ec166726b314..c454e44cf51c 100644
--- a/drivers/scsi/arm/acornscsi.c
+++ b/drivers/scsi/arm/acornscsi.c
@@ -100,7 +100,7 @@
  */
 #define TIMEOUT_TIME 10
 /*
- * Define this if you want to have verbose explaination of SCSI
+ * Define this if you want to have verbose explanation of SCSI
  * status/messages.
  */
 #undef CONFIG_ACORNSCSI_CONSTANTS
@@ -1561,7 +1561,7 @@ void acornscsi_message(AS_Host *host)
         /*
          * If we were negociating sync transfer, we don't yet know if
          * this REJECT is for the sync transfer or for the tagged queue/wide
-         * transfer.  Re-initiate sync transfer negociation now, and if
+         * transfer.  Re-initiate sync transfer negotiation now, and if
          * we got a REJECT in response to SDTR, then it'll be set to DONE.
          */
         if (host->device[host->SCpnt->device->id].sync_state == SYNC_SENT_REQUEST)
diff --git a/drivers/scsi/arm/acornscsi.h b/drivers/scsi/arm/acornscsi.h
index 8d2172a0b351..01bc715a3aec 100644
--- a/drivers/scsi/arm/acornscsi.h
+++ b/drivers/scsi/arm/acornscsi.h
@@ -223,8 +223,8 @@ typedef enum {
  * Synchronous transfer state
  */
 typedef enum {                                  /* Synchronous transfer state           */
-    SYNC_ASYNCHRONOUS,                          /* don't negociate synchronous transfers*/
-    SYNC_NEGOCIATE,                             /* start negociation                    */
+    SYNC_ASYNCHRONOUS,                          /* don't negotiate synchronous transfers*/
+    SYNC_NEGOCIATE,                             /* start negotiation                    */
     SYNC_SENT_REQUEST,                          /* sent SDTR message                    */
     SYNC_COMPLETED,                             /* received SDTR reply                  */
 } syncxfer_t;
@@ -322,7 +322,7 @@ typedef struct acornscsi_hostdata {
     /* per-device info */
     struct {
         unsigned char   sync_xfer;              /* synchronous transfer (SBIC value)    */
-        syncxfer_t      sync_state;             /* sync xfer negociation state          */
+        syncxfer_t      sync_state;             /* sync xfer negotiation state          */
         unsigned char   disconnect_ok:1;        /* device can disconnect                */
     } device[8];
     unsigned long       busyluns[64 / sizeof(unsigned long)];/* array of bits indicating LUNs busy      */
diff --git a/drivers/scsi/arm/arxescsi.c b/drivers/scsi/arm/arxescsi.c
index 2836fe248df9..a750aa72b8ef 100644
--- a/drivers/scsi/arm/arxescsi.c
+++ b/drivers/scsi/arm/arxescsi.c
@@ -228,7 +228,7 @@ static const char *arxescsi_info(struct Scsi_Host *host)
  * Params  : buffer - a buffer to write information to
  *           start  - a pointer into this buffer set by this routine to the start
  *                    of the required information.
- *           offset - offset into information that we have read upto.
+ *           offset - offset into information that we have read up to.
  *           length - length of buffer
  *           host_no - host number to return information for
  *           inout  - 0 for reading, 1 for writing.
diff --git a/drivers/scsi/arm/cumana_2.c b/drivers/scsi/arm/cumana_2.c
index c9902b5c1f2b..547987b86384 100644
--- a/drivers/scsi/arm/cumana_2.c
+++ b/drivers/scsi/arm/cumana_2.c
@@ -344,7 +344,7 @@ cumanascsi_2_set_proc_info(struct Scsi_Host *host, char *buffer, int length)
  * Params   : buffer - a buffer to write information to
  *            start  - a pointer into this buffer set by this routine to the start
  *                     of the required information.
- *            offset - offset into information that we have read upto.
+ *            offset - offset into information that we have read up to.
  *            length - length of buffer
  *            host_no - host number to return information for
  *            inout  - 0 for reading, 1 for writing.
diff --git a/drivers/scsi/arm/eesox.c b/drivers/scsi/arm/eesox.c
index d8435132f461..edfd12b48c28 100644
--- a/drivers/scsi/arm/eesox.c
+++ b/drivers/scsi/arm/eesox.c
@@ -429,7 +429,7 @@ eesoxscsi_set_proc_info(struct Scsi_Host *host, char *buffer, int length)
  * Params   : buffer - a buffer to write information to
  *            start  - a pointer into this buffer set by this routine to the start
  *                     of the required information.
- *            offset - offset into information that we have read upto.
+ *            offset - offset into information that we have read up to.
  *            length - length of buffer
  *            host_no - host number to return information for
  *            inout  - 0 for reading, 1 for writing.
diff --git a/drivers/scsi/arm/fas216.c b/drivers/scsi/arm/fas216.c
index 2b2ce21e227e..e85c40b6e19b 100644
--- a/drivers/scsi/arm/fas216.c
+++ b/drivers/scsi/arm/fas216.c
@@ -2119,7 +2119,7 @@ request_sense:
          * executed, unless a target connects to us.
          */
         if (info->reqSCpnt)
-                printk(KERN_WARNING "scsi%d.%c: loosing request command\n",
+                printk(KERN_WARNING "scsi%d.%c: losing request command\n",
                         info->host->host_no, '0' + SCpnt->device->id);
         info->reqSCpnt = SCpnt;
 }
@@ -2294,7 +2294,7 @@ static int fas216_noqueue_command_lck(struct scsi_cmnd *SCpnt,
                  * If we don't have an IRQ, then we must poll the card for
                  * it's interrupt, and use that to call this driver's
                  * interrupt routine.  That way, we keep the command
-                 * progressing.  Maybe we can add some inteligence here
+                 * progressing.  Maybe we can add some intelligence here
                  * and go to sleep if we know that the device is going
                  * to be some time (eg, disconnected).
                  */
diff --git a/drivers/scsi/arm/fas216.h b/drivers/scsi/arm/fas216.h
index f30f8d659dc4..84b7127c0121 100644
--- a/drivers/scsi/arm/fas216.h
+++ b/drivers/scsi/arm/fas216.h
@@ -203,11 +203,11 @@ typedef enum {
 } fasdmatype_t;
 
 typedef enum {
-        neg_wait,                                       /* Negociate with device                */
-        neg_inprogress,                                 /* Negociation sent                     */
-        neg_complete,                                   /* Negociation complete                 */
-        neg_targcomplete,                               /* Target completed negociation         */
-        neg_invalid                                     /* Negociation not supported            */
+        neg_wait,                                       /* Negotiate with device                */
+        neg_inprogress,                                 /* Negotiation sent                     */
+        neg_complete,                                   /* Negotiation complete                 */
+        neg_targcomplete,                               /* Target completed negotiation         */
+        neg_invalid                                     /* Negotiation not supported            */
 } neg_t;
 
 #define MAGIC   0x441296bdUL
diff --git a/drivers/scsi/arm/powertec.c b/drivers/scsi/arm/powertec.c
index e2297b4c1b9e..9274c0677b9c 100644
--- a/drivers/scsi/arm/powertec.c
+++ b/drivers/scsi/arm/powertec.c
@@ -232,7 +232,7 @@ powertecscsi_set_proc_info(struct Scsi_Host *host, char *buffer, int length)
  * Params   : buffer  - a buffer to write information to
  *            start   - a pointer into this buffer set by this routine to the start
  *                      of the required information.
- *            offset  - offset into information that we have read upto.
+ *            offset  - offset into information that we have read up to.
  *            length  - length of buffer
  *            inout   - 0 for reading, 1 for writing.
  * Returns  : length of data written to buffer.
diff --git a/drivers/scsi/atari_NCR5380.c b/drivers/scsi/atari_NCR5380.c
index 88b2928b4d3b..ea439f93ed81 100644
--- a/drivers/scsi/atari_NCR5380.c
+++ b/drivers/scsi/atari_NCR5380.c
@@ -464,7 +464,7 @@ static void free_all_tags(void)
  *
  * Parameters: Scsi_Cmnd *cmd
  *    The command to work on. The first scatter buffer's data are
- *    assumed to be already transfered into ptr/this_residual.
+ *    assumed to be already transferred into ptr/this_residual.
  */
 
 static void merge_contiguous_buffers(Scsi_Cmnd *cmd)
@@ -1720,7 +1720,7 @@ static int NCR5380_select(struct Scsi_Host *instance, Scsi_Cmnd *cmd, int tag)
  *      bytes to transfer, **data - pointer to data pointer.
  *
  * Returns : -1 when different phase is entered without transferring
- *      maximum number of bytes, 0 if all bytes are transfered or exit
+ *      maximum number of bytes, 0 if all bytes are transferred or exit
  *      is in same phase.
  *
  *      Also, *phase, *count, *data are modified in place.
@@ -1911,7 +1911,7 @@ static int do_abort(struct Scsi_Host *host)
  *      bytes to transfer, **data - pointer to data pointer.
  *
  * Returns : -1 when different phase is entered without transferring
- *      maximum number of bytes, 0 if all bytes or transfered or exit
+ *      maximum number of bytes, 0 if all bytes or transferred or exit
  *      is in same phase.
  *
  *      Also, *phase, *count, *data are modified in place.
diff --git a/drivers/scsi/atp870u.c b/drivers/scsi/atp870u.c
index 76029d570beb..7e6eca4a125e 100644
--- a/drivers/scsi/atp870u.c
+++ b/drivers/scsi/atp870u.c
@@ -1228,7 +1228,7 @@ TCM_5:			/* isolation complete..  */
         printk(" \n%x %x %x %s\n ",assignid_map,mbuf[0],mbuf[1],&mbuf[2]); */
         i = 15;
         j = mbuf[0];
-        if ((j & 0x20) != 0) {  /* bit5=1:ID upto 7      */
+        if ((j & 0x20) != 0) {  /* bit5=1:ID up to 7      */
                 i = 7;
         }
         if ((j & 0x06) == 0) {  /* IDvalid?             */
diff --git a/drivers/scsi/be2iscsi/be_cmds.h b/drivers/scsi/be2iscsi/be_cmds.h
index 5218de4ab35a..fbd1dc2c15f7 100644
--- a/drivers/scsi/be2iscsi/be_cmds.h
+++ b/drivers/scsi/be2iscsi/be_cmds.h
@@ -877,7 +877,7 @@ struct be_all_if_id {
                                                  */
 #define CXN_KILLED_PDU_SIZE_EXCEEDS_DSL 3       /* Connection got invalidated
                                                  * internally
-                                                 * due to a recieved PDU
+                                                 * due to a received PDU
                                                  * size > DSL
                                                  */
 #define CXN_KILLED_BURST_LEN_MISMATCH   4       /* Connection got invalidated
@@ -886,7 +886,7 @@ struct be_all_if_id {
                                                  * FBL/MBL.
                                                  */
 #define CXN_KILLED_AHS_RCVD             5       /* Connection got invalidated
-                                                 * internally due to a recieved
+                                                 * internally due to a received
                                                  * PDU Hdr that has
                                                  * AHS */
 #define CXN_KILLED_HDR_DIGEST_ERR       6       /* Connection got invalidated
@@ -899,12 +899,12 @@ struct be_all_if_id {
                                                  * pdu hdr
                                                  */
 #define CXN_KILLED_STALE_ITT_TTT_RCVD   8       /* Connection got invalidated
-                                                 * internally due to a recieved
+                                                 * internally due to a received
                                                  * ITT/TTT that does not belong
                                                  * to this Connection
                                                  */
 #define CXN_KILLED_INVALID_ITT_TTT_RCVD 9       /* Connection got invalidated
-                                                 * internally due to recieved
+                                                 * internally due to received
                                                  * ITT/TTT value > Max
                                                  * Supported ITTs/TTTs
                                                  */
@@ -936,21 +936,21 @@ struct be_all_if_id {
                                                  * index.
                                                  */
 #define CXN_KILLED_OVER_RUN_RESIDUAL    16      /* Command got invalidated
-                                                 * internally due to recived
+                                                 * internally due to received
                                                  * command has residual
                                                  * over run bytes.
                                                  */
 #define CXN_KILLED_UNDER_RUN_RESIDUAL   17      /* Command got invalidated
-                                                 * internally due to recived
+                                                 * internally due to received
                                                  * command has residual under
                                                  * run bytes.
                                                  */
 #define CMD_KILLED_INVALID_STATSN_RCVD  18      /* Command got invalidated
-                                                 * internally due to a recieved
+                                                 * internally due to a received
                                                  * PDU has an invalid StatusSN
                                                  */
 #define CMD_KILLED_INVALID_R2T_RCVD     19      /* Command got invalidated
-                                                 * internally due to a recieved
+                                                 * internally due to a received
                                                  * an R2T with some invalid
                                                  * fields in it
                                                  */
@@ -973,7 +973,7 @@ struct be_all_if_id {
                                                  */
 #define CMD_CXN_KILLED_INVALID_DATASN_RCVD 24   /* Command got invalidated
                                                  * internally due to a
-                                                 * recieved PDU has an invalid
+                                                 * received PDU has an invalid
                                                  * DataSN
                                                  */
 #define CXN_INVALIDATE_NOTIFY           25      /* Connection invalidation
diff --git a/drivers/scsi/bfa/bfa_core.c b/drivers/scsi/bfa/bfa_core.c
index 1cd5c8b0618d..91838c51fb76 100644
--- a/drivers/scsi/bfa/bfa_core.c
+++ b/drivers/scsi/bfa/bfa_core.c
@@ -355,7 +355,7 @@ bfa_msix_lpu_err(struct bfa_s *bfa, int vec)
                         /*
                          * ERR_PSS bit needs to be cleared as well in case
                          * interrups are shared so driver's interrupt handler is
-                         * still called eventhough it is already masked out.
+                         * still called even though it is already masked out.
                          */
                         curr_value = readl(
                                         bfa->ioc.ioc_regs.pss_err_status_reg);
diff --git a/drivers/scsi/bfa/bfa_defs_svc.h b/drivers/scsi/bfa/bfa_defs_svc.h
index 648c84176722..207f598877c7 100644
--- a/drivers/scsi/bfa/bfa_defs_svc.h
+++ b/drivers/scsi/bfa/bfa_defs_svc.h
@@ -145,7 +145,7 @@ struct bfa_fw_io_stats_s {
         u32     ioh_data_oor_event;     /*  Data out of range */
         u32     ioh_ro_ooo_event;       /*  Relative offset out of range */
         u32     ioh_cpu_owned_event;    /*  IOH hit -iost owned by f/w */
-        u32     ioh_unexp_frame_event;  /*  unexpected frame recieved
+        u32     ioh_unexp_frame_event;  /*  unexpected frame received
                                                  *   count */
         u32     ioh_err_int;            /*  IOH error int during data-phase
                                                  *   for scsi write
@@ -566,8 +566,8 @@ struct bfa_itnim_iostats_s {
         u32     input_reqs;             /*  Data in-bound requests      */
         u32     output_reqs;            /*  Data out-bound requests     */
         u32     io_comps;               /*  Total IO Completions        */
-        u32     wr_throughput;          /*  Write data transfered in bytes */
-        u32     rd_throughput;          /*  Read data transfered in bytes  */
+        u32     wr_throughput;          /*  Write data transferred in bytes */
+        u32     rd_throughput;          /*  Read data transferred in bytes  */
 
         u32     iocomp_ok;              /*  Slowpath IO completions     */
         u32     iocomp_underrun;        /*  IO underrun         */
diff --git a/drivers/scsi/bfa/bfa_fc.h b/drivers/scsi/bfa/bfa_fc.h
index 8e764fae8dc9..bf0067e0fd0d 100644
--- a/drivers/scsi/bfa/bfa_fc.h
+++ b/drivers/scsi/bfa/bfa_fc.h
@@ -315,7 +315,7 @@ struct fc_plogi_csp_s {
                         query_dbc:1,
                         hg_supp:1;
 #endif
-        __be16          rxsz;           /* recieve data_field size */
+        __be16          rxsz;           /* receive data_field size */
         __be16          conseq;
         __be16          ro_bitmap;
         __be32          e_d_tov;
diff --git a/drivers/scsi/bfa/bfa_fcs.c b/drivers/scsi/bfa/bfa_fcs.c
index f674f9318629..9b43ca4b6778 100644
--- a/drivers/scsi/bfa/bfa_fcs.c
+++ b/drivers/scsi/bfa/bfa_fcs.c
@@ -1033,7 +1033,7 @@ bfa_fcs_fabric_delvport(struct bfa_fcs_fabric_s *fabric,
 
 
 /*
- * Lookup for a vport withing a fabric given its pwwn
+ * Lookup for a vport within a fabric given its pwwn
  */
 struct bfa_fcs_vport_s *
 bfa_fcs_fabric_vport_lookup(struct bfa_fcs_fabric_s *fabric, wwn_t pwwn)
diff --git a/drivers/scsi/bfa/bfa_fcs.h b/drivers/scsi/bfa/bfa_fcs.h
index 0fd63168573f..61cdce4bd913 100644
--- a/drivers/scsi/bfa/bfa_fcs.h
+++ b/drivers/scsi/bfa/bfa_fcs.h
@@ -705,7 +705,7 @@ enum rport_event {
         RPSM_EVENT_ADDRESS_CHANGE = 15, /*  Rport's PID has changed     */
         RPSM_EVENT_ADDRESS_DISC = 16,   /*  Need to Discover rport's PID */
         RPSM_EVENT_PRLO_RCVD   = 17,    /*  PRLO from remote device     */
-        RPSM_EVENT_PLOGI_RETRY = 18,    /*  Retry PLOGI continously */
+        RPSM_EVENT_PLOGI_RETRY = 18,    /*  Retry PLOGI continuously */
 };
 
 /*
diff --git a/drivers/scsi/bfa/bfa_fcs_lport.c b/drivers/scsi/bfa/bfa_fcs_lport.c
index 43fa986bb586..1d6be8c14473 100644
--- a/drivers/scsi/bfa/bfa_fcs_lport.c
+++ b/drivers/scsi/bfa/bfa_fcs_lport.c
@@ -1149,7 +1149,7 @@ bfa_fcs_lport_fdmi_sm_offline(struct bfa_fcs_lport_fdmi_s *fdmi,
                 } else {
                         /*
                          * For a base port, we should first register the HBA
-                         * atribute. The HBA attribute also contains the base
+                         * attribute. The HBA attribute also contains the base
                          *  port registration.
                          */
                         bfa_sm_set_state(fdmi,
diff --git a/drivers/scsi/bfa/bfa_svc.c b/drivers/scsi/bfa/bfa_svc.c
index 1d34921f88bf..16d9a5f61c18 100644
--- a/drivers/scsi/bfa/bfa_svc.c
+++ b/drivers/scsi/bfa/bfa_svc.c
@@ -1035,7 +1035,7 @@ bfa_fcxp_free(struct bfa_fcxp_s *fcxp)
  * @param[in]   rport   BFA rport pointer. Could be left NULL for WKA rports
  * @param[in]   vf_id   virtual Fabric ID
  * @param[in]   lp_tag  lport tag
- * @param[in]   cts     use Continous sequence
+ * @param[in]   cts     use Continuous sequence
  * @param[in]   cos     fc Class of Service
  * @param[in]   reqlen  request length, does not include FCHS length
  * @param[in]   fchs    fc Header Pointer. The header content will be copied
@@ -5022,7 +5022,7 @@ bfa_uf_start(struct bfa_s *bfa)
 }
 
 /*
- * Register handler for all unsolicted recieve frames.
+ * Register handler for all unsolicted receive frames.
  *
  * @param[in]   bfa             BFA instance
  * @param[in]   ufrecv  receive handler function
diff --git a/drivers/scsi/bfa/bfa_svc.h b/drivers/scsi/bfa/bfa_svc.h
index 331ad992a581..5902a45c080f 100644
--- a/drivers/scsi/bfa/bfa_svc.h
+++ b/drivers/scsi/bfa/bfa_svc.h
@@ -127,7 +127,7 @@ struct bfa_fcxp_req_info_s {
                                          * rport nexus is established
                                          */
         struct fchs_s   fchs;   /*  request FC header structure */
-        u8              cts;    /*  continous sequence */
+        u8              cts;    /*  continuous sequence */
         u8              class;  /*  FC class for the request/response */
         u16     max_frmsz;      /*  max send frame size */
         u16     vf_id;  /*  vsan tag if applicable */
diff --git a/drivers/scsi/bfa/bfad.c b/drivers/scsi/bfa/bfad.c
index 44524cf55d33..0fd510a01561 100644
--- a/drivers/scsi/bfa/bfad.c
+++ b/drivers/scsi/bfa/bfad.c
@@ -1278,7 +1278,7 @@ bfad_setup_intr(struct bfad_s *bfad)
                          * interrupts into one vector, so even if we
                          * can try to request less vectors, we don't
                          * know how to associate interrupt events to
-                         *  vectors. Linux doesn't dupicate vectors
+                         *  vectors. Linux doesn't duplicate vectors
                          * in the MSIX table for this case.
                          */
 
diff --git a/drivers/scsi/bnx2fc/57xx_hsi_bnx2fc.h b/drivers/scsi/bnx2fc/57xx_hsi_bnx2fc.h
index 69d031d98469..97a61b4d81b7 100644
--- a/drivers/scsi/bnx2fc/57xx_hsi_bnx2fc.h
+++ b/drivers/scsi/bnx2fc/57xx_hsi_bnx2fc.h
@@ -898,7 +898,7 @@ struct fcoe_confqe {
 
 
 /*
- * FCoE conection data base
+ * FCoE connection data base
  */
 struct fcoe_conn_db {
 #if defined(__BIG_ENDIAN)
diff --git a/drivers/scsi/bnx2fc/bnx2fc.h b/drivers/scsi/bnx2fc/bnx2fc.h
index df2fc09ba479..b6d350ac4288 100644
--- a/drivers/scsi/bnx2fc/bnx2fc.h
+++ b/drivers/scsi/bnx2fc/bnx2fc.h
@@ -62,7 +62,7 @@
 #include "bnx2fc_constants.h"
 
 #define BNX2FC_NAME             "bnx2fc"
-#define BNX2FC_VERSION          "1.0.0"
+#define BNX2FC_VERSION          "1.0.1"
 
 #define PFX                     "bnx2fc: "
 
@@ -84,9 +84,15 @@
 #define BNX2FC_NUM_MAX_SESS     128
 #define BNX2FC_NUM_MAX_SESS_LOG (ilog2(BNX2FC_NUM_MAX_SESS))
 
-#define BNX2FC_MAX_OUTSTANDING_CMNDS    4096
+#define BNX2FC_MAX_OUTSTANDING_CMNDS    2048
+#define BNX2FC_CAN_QUEUE                BNX2FC_MAX_OUTSTANDING_CMNDS
+#define BNX2FC_ELSTM_XIDS               BNX2FC_CAN_QUEUE
 #define BNX2FC_MIN_PAYLOAD              256
 #define BNX2FC_MAX_PAYLOAD              2048
+#define BNX2FC_MFS                      \
+                        (BNX2FC_MAX_PAYLOAD + sizeof(struct fc_frame_header))
+#define BNX2FC_MINI_JUMBO_MTU           2500
+
 
 #define BNX2FC_RQ_BUF_SZ                256
 #define BNX2FC_RQ_BUF_LOG_SZ            (ilog2(BNX2FC_RQ_BUF_SZ))
@@ -98,7 +104,8 @@
 #define BNX2FC_CONFQ_WQE_SIZE           (sizeof(struct fcoe_confqe))
 #define BNX2FC_5771X_DB_PAGE_SIZE       128
 
-#define BNX2FC_MAX_TASKS                BNX2FC_MAX_OUTSTANDING_CMNDS
+#define BNX2FC_MAX_TASKS                \
+                             (BNX2FC_MAX_OUTSTANDING_CMNDS + BNX2FC_ELSTM_XIDS)
 #define BNX2FC_TASK_SIZE                128
 #define BNX2FC_TASKS_PER_PAGE           (PAGE_SIZE/BNX2FC_TASK_SIZE)
 #define BNX2FC_TASK_CTX_ARR_SZ          (BNX2FC_MAX_TASKS/BNX2FC_TASKS_PER_PAGE)
@@ -112,10 +119,10 @@
 #define BNX2FC_WRITE                    (1 << 0)
 
 #define BNX2FC_MIN_XID                  0
-#define BNX2FC_MAX_XID                  (BNX2FC_MAX_OUTSTANDING_CMNDS - 1)
-#define FCOE_MIN_XID                    (BNX2FC_MAX_OUTSTANDING_CMNDS)
-#define FCOE_MAX_XID            \
-                        (BNX2FC_MAX_OUTSTANDING_CMNDS + (nr_cpu_ids * 256))
+#define BNX2FC_MAX_XID                  \
+                        (BNX2FC_MAX_OUTSTANDING_CMNDS + BNX2FC_ELSTM_XIDS - 1)
+#define FCOE_MIN_XID                    (BNX2FC_MAX_XID + 1)
+#define FCOE_MAX_XID                    (FCOE_MIN_XID + 4095)
 #define BNX2FC_MAX_LUN                  0xFFFF
 #define BNX2FC_MAX_FCP_TGT              256
 #define BNX2FC_MAX_CMD_LEN              16
@@ -125,7 +132,6 @@
 
 #define BNX2FC_WAIT_CNT                 120
 #define BNX2FC_FW_TIMEOUT               (3 * HZ)
-
 #define PORT_MAX                        2
 
 #define CMD_SCSI_STATUS(Cmnd)           ((Cmnd)->SCp.Status)
diff --git a/drivers/scsi/bnx2fc/bnx2fc_els.c b/drivers/scsi/bnx2fc/bnx2fc_els.c
index 7a11a255157f..52c358427ce2 100644
--- a/drivers/scsi/bnx2fc/bnx2fc_els.c
+++ b/drivers/scsi/bnx2fc/bnx2fc_els.c
@@ -397,7 +397,7 @@ void bnx2fc_process_els_compl(struct bnx2fc_cmd *els_req,
                              &els_req->req_flags)) {
                 BNX2FC_ELS_DBG("Timer context finished processing this "
                            "els - 0x%x\n", els_req->xid);
-                /* This IO doesnt receive cleanup completion */
+                /* This IO doesn't receive cleanup completion */
                 kref_put(&els_req->refcount, bnx2fc_cmd_release);
                 return;
         }
diff --git a/drivers/scsi/bnx2fc/bnx2fc_fcoe.c b/drivers/scsi/bnx2fc/bnx2fc_fcoe.c
index e476e8753079..e2e647509a73 100644
--- a/drivers/scsi/bnx2fc/bnx2fc_fcoe.c
+++ b/drivers/scsi/bnx2fc/bnx2fc_fcoe.c
@@ -21,7 +21,7 @@ DEFINE_PER_CPU(struct bnx2fc_percpu_s, bnx2fc_percpu);
 
 #define DRV_MODULE_NAME         "bnx2fc"
 #define DRV_MODULE_VERSION      BNX2FC_VERSION
-#define DRV_MODULE_RELDATE      "Jan 25, 2011"
+#define DRV_MODULE_RELDATE      "Mar 17, 2011"
 
 
 static char version[] __devinitdata =
@@ -437,17 +437,16 @@ static int bnx2fc_l2_rcv_thread(void *arg)
         set_current_state(TASK_INTERRUPTIBLE);
         while (!kthread_should_stop()) {
                 schedule();
-                set_current_state(TASK_RUNNING);
                 spin_lock_bh(&bg->fcoe_rx_list.lock);
                 while ((skb = __skb_dequeue(&bg->fcoe_rx_list)) != NULL) {
                         spin_unlock_bh(&bg->fcoe_rx_list.lock);
                         bnx2fc_recv_frame(skb);
                         spin_lock_bh(&bg->fcoe_rx_list.lock);
                 }
+                __set_current_state(TASK_INTERRUPTIBLE);
                 spin_unlock_bh(&bg->fcoe_rx_list.lock);
-                set_current_state(TASK_INTERRUPTIBLE);
         }
-        set_current_state(TASK_RUNNING);
+        __set_current_state(TASK_RUNNING);
         return 0;
 }
 
@@ -569,7 +568,6 @@ int bnx2fc_percpu_io_thread(void *arg)
         set_current_state(TASK_INTERRUPTIBLE);
         while (!kthread_should_stop()) {
                 schedule();
-                set_current_state(TASK_RUNNING);
                 spin_lock_bh(&p->fp_work_lock);
                 while (!list_empty(&p->work_list)) {
                         list_splice_init(&p->work_list, &work_list);
@@ -583,10 +581,10 @@ int bnx2fc_percpu_io_thread(void *arg)
 
                         spin_lock_bh(&p->fp_work_lock);
                 }
+                __set_current_state(TASK_INTERRUPTIBLE);
                 spin_unlock_bh(&p->fp_work_lock);
-                set_current_state(TASK_INTERRUPTIBLE);
         }
-        set_current_state(TASK_RUNNING);
+        __set_current_state(TASK_RUNNING);
 
         return 0;
 }
@@ -661,31 +659,6 @@ static int bnx2fc_shost_config(struct fc_lport *lport, struct device *dev)
         return 0;
 }
 
-static int  bnx2fc_mfs_update(struct fc_lport *lport)
-{
-        struct fcoe_port *port = lport_priv(lport);
-        struct bnx2fc_hba *hba = port->priv;
-        struct net_device *netdev = hba->netdev;
-        u32 mfs;
-        u32 max_mfs;
-
-        mfs = netdev->mtu - (sizeof(struct fcoe_hdr) +
-                             sizeof(struct fcoe_crc_eof));
-        max_mfs = BNX2FC_MAX_PAYLOAD + sizeof(struct fc_frame_header);
-        BNX2FC_HBA_DBG(lport, "mfs = %d, max_mfs = %d\n", mfs, max_mfs);
-        if (mfs > max_mfs)
-                mfs = max_mfs;
-
-        /* Adjust mfs to be a multiple of 256 bytes */
-        mfs = (((mfs - sizeof(struct fc_frame_header)) / BNX2FC_MIN_PAYLOAD) *
-                        BNX2FC_MIN_PAYLOAD);
-        mfs = mfs + sizeof(struct fc_frame_header);
-
-        BNX2FC_HBA_DBG(lport, "Set MFS = %d\n", mfs);
-        if (fc_set_mfs(lport, mfs))
-                return -EINVAL;
-        return 0;
-}
 static void bnx2fc_link_speed_update(struct fc_lport *lport)
 {
         struct fcoe_port *port = lport_priv(lport);
@@ -754,7 +727,7 @@ static int bnx2fc_net_config(struct fc_lport *lport)
             !hba->phys_dev->ethtool_ops->get_pauseparam)
                 return -EOPNOTSUPP;
 
-        if (bnx2fc_mfs_update(lport))
+        if (fc_set_mfs(lport, BNX2FC_MFS))
                 return -EINVAL;
 
         skb_queue_head_init(&port->fcoe_pending_queue);
@@ -825,14 +798,6 @@ static void bnx2fc_indicate_netevent(void *context, unsigned long event)
                 if (!test_bit(ADAPTER_STATE_UP, &hba->adapter_state))
                         printk(KERN_ERR "indicate_netevent: "\
                                         "adapter is not UP!!\n");
-                /* fall thru to update mfs if MTU has changed */
-        case NETDEV_CHANGEMTU:
-                BNX2FC_HBA_DBG(lport, "NETDEV_CHANGEMTU event\n");
-                bnx2fc_mfs_update(lport);
-                mutex_lock(&lport->lp_mutex);
-                list_for_each_entry(vport, &lport->vports, list)
-                        bnx2fc_mfs_update(vport);
-                mutex_unlock(&lport->lp_mutex);
                 break;
 
         case NETDEV_DOWN:
@@ -1095,13 +1060,6 @@ static int bnx2fc_netdev_setup(struct bnx2fc_hba *hba)
         struct netdev_hw_addr *ha;
         int sel_san_mac = 0;
 
-        /* Do not support for bonding device */
-        if ((netdev->priv_flags & IFF_MASTER_ALB) ||
-                        (netdev->priv_flags & IFF_SLAVE_INACTIVE) ||
-                        (netdev->priv_flags & IFF_MASTER_8023AD)) {
-                return -EOPNOTSUPP;
-        }
-
         /* setup Source MAC Address */
         rcu_read_lock();
         for_each_dev_addr(physdev, ha) {
@@ -1432,16 +1390,9 @@ static int bnx2fc_destroy(struct net_device *netdev)
         struct net_device *phys_dev;
         int rc = 0;
 
-        if (!rtnl_trylock())
-                return restart_syscall();
+        rtnl_lock();
 
         mutex_lock(&bnx2fc_dev_lock);
-#ifdef CONFIG_SCSI_BNX2X_FCOE_MODULE
-        if (THIS_MODULE->state != MODULE_STATE_LIVE) {
-                rc = -ENODEV;
-                goto netdev_err;
-        }
-#endif
         /* obtain physical netdev */
         if (netdev->priv_flags & IFF_802_1Q_VLAN)
                 phys_dev = vlan_dev_real_dev(netdev);
@@ -1805,18 +1756,10 @@ static int bnx2fc_disable(struct net_device *netdev)
         struct ethtool_drvinfo drvinfo;
         int rc = 0;
 
-        if (!rtnl_trylock()) {
-                printk(KERN_ERR PFX "retrying for rtnl_lock\n");
-                return -EIO;
-        }
+        rtnl_lock();
 
         mutex_lock(&bnx2fc_dev_lock);
 
-        if (THIS_MODULE->state != MODULE_STATE_LIVE) {
-                rc = -ENODEV;
-                goto nodev;
-        }
-
         /* obtain physical netdev */
         if (netdev->priv_flags & IFF_802_1Q_VLAN)
                 phys_dev = vlan_dev_real_dev(netdev);
@@ -1867,19 +1810,11 @@ static int bnx2fc_enable(struct net_device *netdev)
         struct ethtool_drvinfo drvinfo;
         int rc = 0;
 
-        if (!rtnl_trylock()) {
-                printk(KERN_ERR PFX "retrying for rtnl_lock\n");
-                return -EIO;
-        }
+        rtnl_lock();
 
         BNX2FC_MISC_DBG("Entered %s\n", __func__);
         mutex_lock(&bnx2fc_dev_lock);
 
-        if (THIS_MODULE->state != MODULE_STATE_LIVE) {
-                rc = -ENODEV;
-                goto nodev;
-        }
-
         /* obtain physical netdev */
         if (netdev->priv_flags & IFF_802_1Q_VLAN)
                 phys_dev = vlan_dev_real_dev(netdev);
@@ -1942,18 +1877,9 @@ static int bnx2fc_create(struct net_device *netdev, enum fip_state fip_mode)
                 return -EIO;
         }
 
-        if (!rtnl_trylock()) {
-                printk(KERN_ERR "trying for rtnl_lock\n");
-                return -EIO;
-        }
-        mutex_lock(&bnx2fc_dev_lock);
+        rtnl_lock();
 
-#ifdef CONFIG_SCSI_BNX2X_FCOE_MODULE
-        if (THIS_MODULE->state != MODULE_STATE_LIVE) {
-                rc = -ENODEV;
-                goto mod_err;
-        }
-#endif
+        mutex_lock(&bnx2fc_dev_lock);
 
         if (!try_module_get(THIS_MODULE)) {
                 rc = -EINVAL;
@@ -2506,7 +2432,7 @@ static struct scsi_host_template bnx2fc_shost_template = {
         .change_queue_type      = fc_change_queue_type,
         .this_id                = -1,
         .cmd_per_lun            = 3,
-        .can_queue              = (BNX2FC_MAX_OUTSTANDING_CMNDS/2),
+        .can_queue              = BNX2FC_CAN_QUEUE,
         .use_clustering         = ENABLE_CLUSTERING,
         .sg_tablesize           = BNX2FC_MAX_BDS_PER_CMD,
         .max_sectors            = 512,
diff --git a/drivers/scsi/bnx2fc/bnx2fc_hwi.c b/drivers/scsi/bnx2fc/bnx2fc_hwi.c
index 4f4096836742..1b680e288c56 100644
--- a/drivers/scsi/bnx2fc/bnx2fc_hwi.c
+++ b/drivers/scsi/bnx2fc/bnx2fc_hwi.c
@@ -87,7 +87,7 @@ int bnx2fc_send_fw_fcoe_init_msg(struct bnx2fc_hba *hba)
         fcoe_init1.task_list_pbl_addr_lo = (u32) hba->task_ctx_bd_dma;
         fcoe_init1.task_list_pbl_addr_hi =
                                 (u32) ((u64) hba->task_ctx_bd_dma >> 32);
-        fcoe_init1.mtu = hba->netdev->mtu;
+        fcoe_init1.mtu = BNX2FC_MINI_JUMBO_MTU;
 
         fcoe_init1.flags = (PAGE_SHIFT <<
                                 FCOE_KWQE_INIT1_LOG_PAGE_SIZE_SHIFT);
@@ -590,7 +590,10 @@ static void bnx2fc_process_unsol_compl(struct bnx2fc_rport *tgt, u16 wqe)
 
                 num_rq = (frame_len + BNX2FC_RQ_BUF_SZ - 1) / BNX2FC_RQ_BUF_SZ;
 
+                spin_lock_bh(&tgt->tgt_lock);
                 rq_data = (unsigned char *)bnx2fc_get_next_rqe(tgt, num_rq);
+                spin_unlock_bh(&tgt->tgt_lock);
+
                 if (rq_data) {
                         buf = rq_data;
                 } else {
@@ -603,8 +606,10 @@ static void bnx2fc_process_unsol_compl(struct bnx2fc_rport *tgt, u16 wqe)
                         }
 
                         for (i = 0; i < num_rq; i++) {
+                                spin_lock_bh(&tgt->tgt_lock);
                                 rq_data = (unsigned char *)
                                            bnx2fc_get_next_rqe(tgt, 1);
+                                spin_unlock_bh(&tgt->tgt_lock);
                                 len = BNX2FC_RQ_BUF_SZ;
                                 memcpy(buf1, rq_data, len);
                                 buf1 += len;
@@ -615,13 +620,15 @@ static void bnx2fc_process_unsol_compl(struct bnx2fc_rport *tgt, u16 wqe)
 
                 if (buf != rq_data)
                         kfree(buf);
+                spin_lock_bh(&tgt->tgt_lock);
                 bnx2fc_return_rqe(tgt, num_rq);
+                spin_unlock_bh(&tgt->tgt_lock);
                 break;
 
         case FCOE_ERROR_DETECTION_CQE_TYPE:
                 /*
-                 *In case of error reporting CQE a single RQ entry
-                 * is consumes.
+                 * In case of error reporting CQE a single RQ entry
+                 * is consumed.
                  */
                 spin_lock_bh(&tgt->tgt_lock);
                 num_rq = 1;
@@ -705,6 +712,7 @@ static void bnx2fc_process_unsol_compl(struct bnx2fc_rport *tgt, u16 wqe)
                  *In case of warning reporting CQE a single RQ entry
                  * is consumes.
                  */
+                spin_lock_bh(&tgt->tgt_lock);
                 num_rq = 1;
                 err_entry = (struct fcoe_err_report_entry *)
                              bnx2fc_get_next_rqe(tgt, 1);
@@ -717,6 +725,7 @@ static void bnx2fc_process_unsol_compl(struct bnx2fc_rport *tgt, u16 wqe)
                         err_entry->tx_buf_off, err_entry->rx_buf_off);
 
                 bnx2fc_return_rqe(tgt, 1);
+                spin_unlock_bh(&tgt->tgt_lock);
                 break;
 
         default:
diff --git a/drivers/scsi/bnx2fc/bnx2fc_io.c b/drivers/scsi/bnx2fc/bnx2fc_io.c
index 0f1dd23730db..1decefbf32e3 100644
--- a/drivers/scsi/bnx2fc/bnx2fc_io.c
+++ b/drivers/scsi/bnx2fc/bnx2fc_io.c
@@ -11,6 +11,9 @@
  */
 
 #include "bnx2fc.h"
+
+#define RESERVE_FREE_LIST_INDEX num_possible_cpus()
+
 static int bnx2fc_split_bd(struct bnx2fc_cmd *io_req, u64 addr, int sg_len,
                            int bd_index);
 static int bnx2fc_map_sg(struct bnx2fc_cmd *io_req);
@@ -242,8 +245,9 @@ struct bnx2fc_cmd_mgr *bnx2fc_cmd_mgr_alloc(struct bnx2fc_hba *hba,
         u32 mem_size;
         u16 xid;
         int i;
-        int num_ios;
+        int num_ios, num_pri_ios;
         size_t bd_tbl_sz;
+        int arr_sz = num_possible_cpus() + 1;
 
         if (max_xid <= min_xid || max_xid == FC_XID_UNKNOWN) {
                 printk(KERN_ERR PFX "cmd_mgr_alloc: Invalid min_xid 0x%x \
@@ -263,14 +267,14 @@ struct bnx2fc_cmd_mgr *bnx2fc_cmd_mgr_alloc(struct bnx2fc_hba *hba,
         }
 
         cmgr->free_list = kzalloc(sizeof(*cmgr->free_list) *
-                                  num_possible_cpus(), GFP_KERNEL);
+                                  arr_sz, GFP_KERNEL);
         if (!cmgr->free_list) {
                 printk(KERN_ERR PFX "failed to alloc free_list\n");
                 goto mem_err;
         }
 
         cmgr->free_list_lock = kzalloc(sizeof(*cmgr->free_list_lock) *
-                                       num_possible_cpus(), GFP_KERNEL);
+                                       arr_sz, GFP_KERNEL);
         if (!cmgr->free_list_lock) {
                 printk(KERN_ERR PFX "failed to alloc free_list_lock\n");
                 goto mem_err;
@@ -279,13 +283,18 @@ struct bnx2fc_cmd_mgr *bnx2fc_cmd_mgr_alloc(struct bnx2fc_hba *hba,
         cmgr->hba = hba;
         cmgr->cmds = (struct bnx2fc_cmd **)(cmgr + 1);
 
-        for (i = 0; i < num_possible_cpus(); i++)  {
+        for (i = 0; i < arr_sz; i++)  {
                 INIT_LIST_HEAD(&cmgr->free_list[i]);
                 spin_lock_init(&cmgr->free_list_lock[i]);
         }
 
-        /* Pre-allocated pool of bnx2fc_cmds */
+        /*
+         * Pre-allocated pool of bnx2fc_cmds.
+         * Last entry in the free list array is the free list
+         * of slow path requests.
+         */
         xid = BNX2FC_MIN_XID;
+        num_pri_ios = num_ios - BNX2FC_ELSTM_XIDS;
         for (i = 0; i < num_ios; i++) {
                 io_req = kzalloc(sizeof(*io_req), GFP_KERNEL);
 
@@ -298,11 +307,13 @@ struct bnx2fc_cmd_mgr *bnx2fc_cmd_mgr_alloc(struct bnx2fc_hba *hba,
                 INIT_DELAYED_WORK(&io_req->timeout_work, bnx2fc_cmd_timeout);
 
                 io_req->xid = xid++;
-                if (io_req->xid >= BNX2FC_MAX_OUTSTANDING_CMNDS)
-                        printk(KERN_ERR PFX "ERROR allocating xids - 0x%x\n",
-                                io_req->xid);
-                list_add_tail(&io_req->link,
-                        &cmgr->free_list[io_req->xid % num_possible_cpus()]);
+                if (i < num_pri_ios)
+                        list_add_tail(&io_req->link,
+                                &cmgr->free_list[io_req->xid %
+                                                 num_possible_cpus()]);
+                else
+                        list_add_tail(&io_req->link,
+                                &cmgr->free_list[num_possible_cpus()]);
                 io_req++;
         }
 
@@ -389,7 +400,7 @@ free_cmd_pool:
         if (!cmgr->free_list)
                 goto free_cmgr;
 
-        for (i = 0; i < num_possible_cpus(); i++)  {
+        for (i = 0; i < num_possible_cpus() + 1; i++)  {
                 struct list_head *list;
                 struct list_head *tmp;
 
@@ -413,6 +424,7 @@ struct bnx2fc_cmd *bnx2fc_elstm_alloc(struct bnx2fc_rport *tgt, int type)
         struct bnx2fc_cmd *io_req;
         struct list_head *listp;
         struct io_bdt *bd_tbl;
+        int index = RESERVE_FREE_LIST_INDEX;
         u32 max_sqes;
         u16 xid;
 
@@ -432,26 +444,26 @@ struct bnx2fc_cmd *bnx2fc_elstm_alloc(struct bnx2fc_rport *tgt, int type)
          * NOTE: Free list insertions and deletions are protected with
          * cmgr lock
          */
-        spin_lock_bh(&cmd_mgr->free_list_lock[smp_processor_id()]);
-        if ((list_empty(&(cmd_mgr->free_list[smp_processor_id()]))) ||
+        spin_lock_bh(&cmd_mgr->free_list_lock[index]);
+        if ((list_empty(&(cmd_mgr->free_list[index]))) ||
             (tgt->num_active_ios.counter  >= max_sqes)) {
                 BNX2FC_TGT_DBG(tgt, "No free els_tm cmds available "
                         "ios(%d):sqes(%d)\n",
                         tgt->num_active_ios.counter, tgt->max_sqes);
-                if (list_empty(&(cmd_mgr->free_list[smp_processor_id()])))
+                if (list_empty(&(cmd_mgr->free_list[index])))
                         printk(KERN_ERR PFX "elstm_alloc: list_empty\n");
-                spin_unlock_bh(&cmd_mgr->free_list_lock[smp_processor_id()]);
+                spin_unlock_bh(&cmd_mgr->free_list_lock[index]);
                 return NULL;
         }
 
         listp = (struct list_head *)
-                        cmd_mgr->free_list[smp_processor_id()].next;
+                        cmd_mgr->free_list[index].next;
         list_del_init(listp);
         io_req = (struct bnx2fc_cmd *) listp;
         xid = io_req->xid;
         cmd_mgr->cmds[xid] = io_req;
         atomic_inc(&tgt->num_active_ios);
-        spin_unlock_bh(&cmd_mgr->free_list_lock[smp_processor_id()]);
+        spin_unlock_bh(&cmd_mgr->free_list_lock[index]);
 
         INIT_LIST_HEAD(&io_req->link);
 
@@ -479,27 +491,30 @@ static struct bnx2fc_cmd *bnx2fc_cmd_alloc(struct bnx2fc_rport *tgt)
         struct io_bdt *bd_tbl;
         u32 max_sqes;
         u16 xid;
+        int index = get_cpu();
 
         max_sqes = BNX2FC_SCSI_MAX_SQES;
         /*
          * NOTE: Free list insertions and deletions are protected with
          * cmgr lock
          */
-        spin_lock_bh(&cmd_mgr->free_list_lock[smp_processor_id()]);
-        if ((list_empty(&cmd_mgr->free_list[smp_processor_id()])) ||
+        spin_lock_bh(&cmd_mgr->free_list_lock[index]);
+        if ((list_empty(&cmd_mgr->free_list[index])) ||
             (tgt->num_active_ios.counter  >= max_sqes)) {
-                spin_unlock_bh(&cmd_mgr->free_list_lock[smp_processor_id()]);
+                spin_unlock_bh(&cmd_mgr->free_list_lock[index]);
+                put_cpu();
                 return NULL;
         }
 
         listp = (struct list_head *)
-                cmd_mgr->free_list[smp_processor_id()].next;
+                cmd_mgr->free_list[index].next;
         list_del_init(listp);
         io_req = (struct bnx2fc_cmd *) listp;
         xid = io_req->xid;
         cmd_mgr->cmds[xid] = io_req;
         atomic_inc(&tgt->num_active_ios);
-        spin_unlock_bh(&cmd_mgr->free_list_lock[smp_processor_id()]);
+        spin_unlock_bh(&cmd_mgr->free_list_lock[index]);
+        put_cpu();
 
         INIT_LIST_HEAD(&io_req->link);
 
@@ -522,8 +537,15 @@ void bnx2fc_cmd_release(struct kref *ref)
         struct bnx2fc_cmd *io_req = container_of(ref,
                                                 struct bnx2fc_cmd, refcount);
         struct bnx2fc_cmd_mgr *cmd_mgr = io_req->cmd_mgr;
+        int index;
+
+        if (io_req->cmd_type == BNX2FC_SCSI_CMD)
+                index = io_req->xid % num_possible_cpus();
+        else
+                index = RESERVE_FREE_LIST_INDEX;
 
-        spin_lock_bh(&cmd_mgr->free_list_lock[smp_processor_id()]);
+
+        spin_lock_bh(&cmd_mgr->free_list_lock[index]);
         if (io_req->cmd_type != BNX2FC_SCSI_CMD)
                 bnx2fc_free_mp_resc(io_req);
         cmd_mgr->cmds[io_req->xid] = NULL;
@@ -531,9 +553,10 @@ void bnx2fc_cmd_release(struct kref *ref)
         list_del_init(&io_req->link);
         /* Add it to the free list */
         list_add(&io_req->link,
-                        &cmd_mgr->free_list[smp_processor_id()]);
+                        &cmd_mgr->free_list[index]);
         atomic_dec(&io_req->tgt->num_active_ios);
-        spin_unlock_bh(&cmd_mgr->free_list_lock[smp_processor_id()]);
+        spin_unlock_bh(&cmd_mgr->free_list_lock[index]);
+
 }
 
 static void bnx2fc_free_mp_resc(struct bnx2fc_cmd *io_req)
@@ -1250,7 +1273,7 @@ static void bnx2fc_lun_reset_cmpl(struct bnx2fc_cmd *io_req)
                                                  bnx2fc_cmd_release);
                                                         /* timer hold */
                                 rc = bnx2fc_initiate_abts(cmd);
-                                /* abts shouldnt fail in this context */
+                                /* abts shouldn't fail in this context */
                                 WARN_ON(rc != SUCCESS);
                         } else
                                 printk(KERN_ERR PFX "lun_rst: abts already in"
@@ -1285,7 +1308,7 @@ static void bnx2fc_tgt_reset_cmpl(struct bnx2fc_cmd *io_req)
                                 kref_put(&io_req->refcount,
                                          bnx2fc_cmd_release); /* timer hold */
                         rc = bnx2fc_initiate_abts(cmd);
-                        /* abts shouldnt fail in this context */
+                        /* abts shouldn't fail in this context */
                         WARN_ON(rc != SUCCESS);
 
                 } else
diff --git a/drivers/scsi/bnx2fc/bnx2fc_tgt.c b/drivers/scsi/bnx2fc/bnx2fc_tgt.c
index 7ea93af60260..a2e3830bd268 100644
--- a/drivers/scsi/bnx2fc/bnx2fc_tgt.c
+++ b/drivers/scsi/bnx2fc/bnx2fc_tgt.c
@@ -304,10 +304,8 @@ static void bnx2fc_upload_session(struct fcoe_port *port,
                                 " not sent to FW\n");
 
         /* Free session resources */
-        spin_lock_bh(&tgt->cq_lock);
         bnx2fc_free_session_resc(hba, tgt);
         bnx2fc_free_conn_id(hba, tgt->fcoe_conn_id);
-        spin_unlock_bh(&tgt->cq_lock);
 }
 
 static int bnx2fc_init_tgt(struct bnx2fc_rport *tgt,
@@ -397,7 +395,7 @@ void bnx2fc_rport_event_handler(struct fc_lport *lport,
                 rp = rport->dd_data;
                 if (rport->port_id == FC_FID_DIR_SERV) {
                         /*
-                         * bnx2fc_rport structure doesnt exist for
+                         * bnx2fc_rport structure doesn't exist for
                          * directory server.
                          * We should not come here, as lport will
                          * take care of fabric login
@@ -830,11 +828,13 @@ static void bnx2fc_free_session_resc(struct bnx2fc_hba *hba,
                 tgt->rq = NULL;
         }
         /* Free CQ */
+        spin_lock_bh(&tgt->cq_lock);
         if (tgt->cq) {
                 dma_free_coherent(&hba->pcidev->dev, tgt->cq_mem_size,
                                     tgt->cq, tgt->cq_dma);
                 tgt->cq = NULL;
         }
+        spin_unlock_bh(&tgt->cq_lock);
         /* Free SQ */
         if (tgt->sq) {
                 dma_free_coherent(&hba->pcidev->dev, tgt->sq_mem_size,
diff --git a/drivers/scsi/bnx2i/bnx2i_hwi.c b/drivers/scsi/bnx2i/bnx2i_hwi.c
index 1da34c019b8a..f0b89513faed 100644
--- a/drivers/scsi/bnx2i/bnx2i_hwi.c
+++ b/drivers/scsi/bnx2i/bnx2i_hwi.c
@@ -173,7 +173,7 @@ void bnx2i_arm_cq_event_coalescing(struct bnx2i_endpoint *ep, u8 action)
 
 /**
  * bnx2i_get_rq_buf - copy RQ buffer contents to driver buffer
- * @conn:               iscsi connection on which RQ event occured
+ * @conn:               iscsi connection on which RQ event occurred
  * @ptr:                driver buffer to which RQ buffer contents is to
  *                      be copied
  * @len:                length of valid data inside RQ buf
diff --git a/drivers/scsi/cxgbi/libcxgbi.h b/drivers/scsi/cxgbi/libcxgbi.h
index 0a20fd5f7102..9267844519c9 100644
--- a/drivers/scsi/cxgbi/libcxgbi.h
+++ b/drivers/scsi/cxgbi/libcxgbi.h
@@ -262,9 +262,9 @@ struct cxgbi_skb_tx_cb {
 enum cxgbi_skcb_flags {
         SKCBF_TX_NEED_HDR,      /* packet needs a header */
         SKCBF_RX_COALESCED,     /* received whole pdu */
-        SKCBF_RX_HDR,           /* recieved pdu header */
-        SKCBF_RX_DATA,          /* recieved pdu payload */
-        SKCBF_RX_STATUS,        /* recieved ddp status */
+        SKCBF_RX_HDR,           /* received pdu header */
+        SKCBF_RX_DATA,          /* received pdu payload */
+        SKCBF_RX_STATUS,        /* received ddp status */
         SKCBF_RX_DATA_DDPD,     /* pdu payload ddp'd */
         SKCBF_RX_HCRC_ERR,      /* header digest error */
         SKCBF_RX_DCRC_ERR,      /* data digest error */
diff --git a/drivers/scsi/dc395x.c b/drivers/scsi/dc395x.c
index b0f8523e665f..b10b3841535c 100644
--- a/drivers/scsi/dc395x.c
+++ b/drivers/scsi/dc395x.c
@@ -235,7 +235,7 @@ struct ScsiReqBlk {
 
         u8 sg_count;                    /* No of HW sg entries for this request */
         u8 sg_index;                    /* Index of HW sg entry for this request */
-        size_t total_xfer_length;       /* Total number of bytes remaining to be transfered */
+        size_t total_xfer_length;       /* Total number of bytes remaining to be transferred */
         size_t request_length;          /* Total number of bytes in this request */
         /*
          * The sense buffer handling function, request_sense, uses
@@ -1774,7 +1774,7 @@ static void dc395x_handle_interrupt(struct AdapterCtlBlk *acb,
                 dc395x_statev(acb, srb, &scsi_status);
 
                 /* 
-                 * if there were any exception occured scsi_status
+                 * if there were any exception occurred scsi_status
                  * will be modify to bus free phase new scsi_status
                  * transfer out from ... previous dc395x_statev
                  */
@@ -1954,11 +1954,11 @@ static void sg_verify_length(struct ScsiReqBlk *srb)
 static void sg_update_list(struct ScsiReqBlk *srb, u32 left)
 {
         u8 idx;
-        u32 xferred = srb->total_xfer_length - left; /* bytes transfered */
+        u32 xferred = srb->total_xfer_length - left; /* bytes transferred */
         struct SGentry *psge = srb->segment_x + srb->sg_index;
 
         dprintkdbg(DBG_0,
-                "sg_update_list: Transfered %i of %i bytes, %i remain\n",
+                "sg_update_list: Transferred %i of %i bytes, %i remain\n",
                 xferred, srb->total_xfer_length, left);
         if (xferred == 0) {
                 /* nothing to update since we did not transfer any data */
@@ -1990,7 +1990,7 @@ static void sg_update_list(struct ScsiReqBlk *srb, u32 left)
 
 
 /*
- * We have transfered a single byte (PIO mode?) and need to update
+ * We have transferred a single byte (PIO mode?) and need to update
  * the count of bytes remaining (total_xfer_length) and update the sg
  * entry to either point to next byte in the current sg entry, or of
  * already at the end to point to the start of the next sg entry
@@ -2029,7 +2029,7 @@ static void cleanup_after_transfer(struct AdapterCtlBlk *acb,
 
 
 /*
- * Those no of bytes will be transfered w/ PIO through the SCSI FIFO
+ * Those no of bytes will be transferred w/ PIO through the SCSI FIFO
  * Seems to be needed for unknown reasons; could be a hardware bug :-(
  */
 #define DC395x_LASTPIO 4
@@ -2256,7 +2256,7 @@ static void data_in_phase0(struct AdapterCtlBlk *acb, struct ScsiReqBlk *srb,
                         DC395x_read32(acb, TRM_S1040_DMA_CXCNT),
                         srb->total_xfer_length, d_left_counter);
 #if DC395x_LASTPIO
-                /* KG: Less than or equal to 4 bytes can not be transfered via DMA, it seems. */
+                /* KG: Less than or equal to 4 bytes can not be transferred via DMA, it seems. */
                 if (d_left_counter
                     && srb->total_xfer_length <= DC395x_LASTPIO) {
                         size_t left_io = srb->total_xfer_length;
diff --git a/drivers/scsi/dc395x.h b/drivers/scsi/dc395x.h
index b38360e5fe4f..fbf35e37701e 100644
--- a/drivers/scsi/dc395x.h
+++ b/drivers/scsi/dc395x.h
@@ -617,7 +617,7 @@ struct ScsiInqData
 #define NTC_DO_SEND_START               0x08    /* Send start command SPINUP            */
 #define NTC_DO_DISCONNECT               0x04    /* Enable SCSI disconnect               */
 #define NTC_DO_SYNC_NEGO                0x02    /* Sync negotiation                     */
-#define NTC_DO_PARITY_CHK               0x01    /* (it sould define at NAC)             */
+#define NTC_DO_PARITY_CHK               0x01    /* (it should define at NAC)            */
                                                 /* Parity check enable                  */
 
 /************************************************************************/
diff --git a/drivers/scsi/device_handler/scsi_dh_alua.c b/drivers/scsi/device_handler/scsi_dh_alua.c
index 7cae0bc85390..42fe52902add 100644
--- a/drivers/scsi/device_handler/scsi_dh_alua.c
+++ b/drivers/scsi/device_handler/scsi_dh_alua.c
@@ -541,7 +541,7 @@ static int alua_check_sense(struct scsi_device *sdev,
  *
  * Evaluate the Target Port Group State.
  * Returns SCSI_DH_DEV_OFFLINED if the path is
- * found to be unuseable.
+ * found to be unusable.
  */
 static int alua_rtpg(struct scsi_device *sdev, struct alua_dh_data *h)
 {
@@ -620,7 +620,7 @@ static int alua_rtpg(struct scsi_device *sdev, struct alua_dh_data *h)
                 break;
         case TPGS_STATE_OFFLINE:
         case TPGS_STATE_UNAVAILABLE:
-                /* Path unuseable for unavailable/offline */
+                /* Path unusable for unavailable/offline */
                 err = SCSI_DH_DEV_OFFLINED;
                 break;
         default:
diff --git a/drivers/scsi/dpt/sys_info.h b/drivers/scsi/dpt/sys_info.h
index a90c4cb8ea8b..a4aa1c31ff72 100644
--- a/drivers/scsi/dpt/sys_info.h
+++ b/drivers/scsi/dpt/sys_info.h
@@ -79,9 +79,9 @@
    typedef struct  {
 #endif
 
-   uSHORT       cylinders;      /* Upto 1024 */
-   uCHAR        heads;          /* Upto 255 */
-   uCHAR        sectors;        /* Upto 63 */
+   uSHORT       cylinders;      /* Up to 1024 */
+   uCHAR        heads;          /* Up to 255 */
+   uCHAR        sectors;        /* Up to 63 */
 
 #ifdef  __cplusplus
 
diff --git a/drivers/scsi/eata.c b/drivers/scsi/eata.c
index 53925ac178fd..0eb4fe6a4c8a 100644
--- a/drivers/scsi/eata.c
+++ b/drivers/scsi/eata.c
@@ -63,7 +63,7 @@
  *          ep:[y|n]      eisa_probe=[1|0]  CONFIG_EISA defined
  *          pp:[y|n]      pci_probe=[1|0]   CONFIG_PCI  defined
  *
- *          The default action is to perform probing if the corrisponding
+ *          The default action is to perform probing if the corresponding
  *          bus is configured and to skip probing otherwise.
  *
  *        + If pci_probe is in effect and a list of I/O  ports is specified
diff --git a/drivers/scsi/fcoe/fcoe_ctlr.c b/drivers/scsi/fcoe/fcoe_ctlr.c
index c93f007e702f..9d38be2a41f9 100644
--- a/drivers/scsi/fcoe/fcoe_ctlr.c
+++ b/drivers/scsi/fcoe/fcoe_ctlr.c
@@ -656,7 +656,7 @@ int fcoe_ctlr_els_send(struct fcoe_ctlr *fip, struct fc_lport *lport,
                  * If non-FIP, we may have gotten an SID by accepting an FLOGI
                  * from a point-to-point connection.  Switch to using
                  * the source mac based on the SID.  The destination
-                 * MAC in this case would have been set by receving the
+                 * MAC in this case would have been set by receiving the
                  * FLOGI.
                  */
                 if (fip->state == FIP_ST_NON_FIP) {
@@ -1876,7 +1876,7 @@ static void fcoe_ctlr_vn_send(struct fcoe_ctlr *fip,
  * fcoe_ctlr_vn_rport_callback - Event handler for rport events.
  * @lport: The lport which is receiving the event
  * @rdata: remote port private data
- * @event: The event that occured
+ * @event: The event that occurred
  *
  * Locking Note:  The rport lock must not be held when calling this function.
  */
diff --git a/drivers/scsi/fdomain.c b/drivers/scsi/fdomain.c
index 69b7aa54f43f..643f6d500fe7 100644
--- a/drivers/scsi/fdomain.c
+++ b/drivers/scsi/fdomain.c
@@ -174,7 +174,7 @@
  Future Domain sold DOS BIOS source for $250 and the UN*X driver source was
  $750, but these required a non-disclosure agreement, so even if I could
  have afforded them, they would *not* have been useful for writing this
- publically distributable driver.  Future Domain technical support has
+ publicly distributable driver.  Future Domain technical support has
  provided some information on the phone and have sent a few useful FAXs.
  They have been much more helpful since they started to recognize that the
  word "Linux" refers to an operating system :-).
diff --git a/drivers/scsi/fnic/fnic_fcs.c b/drivers/scsi/fnic/fnic_fcs.c
index 2b48d79bad94..3c53c3478ee7 100644
--- a/drivers/scsi/fnic/fnic_fcs.c
+++ b/drivers/scsi/fnic/fnic_fcs.c
@@ -411,7 +411,7 @@ int fnic_rq_cmpl_handler(struct fnic *fnic, int rq_work_to_do)
                         err = vnic_rq_fill(&fnic->rq[i], fnic_alloc_rq_frame);
                         if (err)
                                 shost_printk(KERN_ERR, fnic->lport->host,
-                                             "fnic_alloc_rq_frame cant alloc"
+                                             "fnic_alloc_rq_frame can't alloc"
                                              " frame\n");
                 }
                 tot_rq_work_done += cur_work_done;
diff --git a/drivers/scsi/fnic/fnic_scsi.c b/drivers/scsi/fnic/fnic_scsi.c
index 22d02404d15f..538b31c2cf58 100644
--- a/drivers/scsi/fnic/fnic_scsi.c
+++ b/drivers/scsi/fnic/fnic_scsi.c
@@ -1123,7 +1123,7 @@ void fnic_rport_exch_reset(struct fnic *fnic, u32 port_id)
                                             fc_lun.scsi_lun, io_req)) {
                         /*
                          * Revert the cmd state back to old state, if
-                         * it hasnt changed in between. This cmd will get
+                         * it hasn't changed in between. This cmd will get
                          * aborted later by scsi_eh, or cleaned up during
                          * lun reset
                          */
@@ -1208,7 +1208,7 @@ void fnic_terminate_rport_io(struct fc_rport *rport)
                                             fc_lun.scsi_lun, io_req)) {
                         /*
                          * Revert the cmd state back to old state, if
-                         * it hasnt changed in between. This cmd will get
+                         * it hasn't changed in between. This cmd will get
                          * aborted later by scsi_eh, or cleaned up during
                          * lun reset
                          */
diff --git a/drivers/scsi/g_NCR5380.c b/drivers/scsi/g_NCR5380.c
index 427a56d3117e..81182badfeb1 100644
--- a/drivers/scsi/g_NCR5380.c
+++ b/drivers/scsi/g_NCR5380.c
@@ -566,7 +566,7 @@ generic_NCR5380_biosparam(struct scsi_device *sdev, struct block_device *bdev,
  *      @dst: buffer to read into
  *      @len: buffer length
  *
- *      Perform a psuedo DMA mode read from an NCR53C400 or equivalent
+ *      Perform a pseudo DMA mode read from an NCR53C400 or equivalent
  *      controller
  */
  
@@ -650,7 +650,7 @@ static inline int NCR5380_pread(struct Scsi_Host *instance, unsigned char *dst,
  *      @dst: buffer to read into
  *      @len: buffer length
  *
- *      Perform a psuedo DMA mode read from an NCR53C400 or equivalent
+ *      Perform a pseudo DMA mode read from an NCR53C400 or equivalent
  *      controller
  */
 
diff --git a/drivers/scsi/gdth.h b/drivers/scsi/gdth.h
index 120a0625a7b5..d969855ac64a 100644
--- a/drivers/scsi/gdth.h
+++ b/drivers/scsi/gdth.h
@@ -895,7 +895,7 @@ typedef struct {
         u8          ldr_no;                 /* log. drive no. */
         u8          rw_attribs;             /* r/w attributes */
         u8          cluster_type;           /* cluster properties */
-        u8          media_changed;          /* Flag:MOUNT/UNMOUNT occured */
+        u8          media_changed;          /* Flag:MOUNT/UNMOUNT occurred */
         u32         start_sec;              /* start sector */
     } hdr[MAX_LDRIVES];                         /* host drives */
     struct {
diff --git a/drivers/scsi/gvp11.c b/drivers/scsi/gvp11.c
index 2ce26eb7a1ec..50bb54150a78 100644
--- a/drivers/scsi/gvp11.c
+++ b/drivers/scsi/gvp11.c
@@ -300,7 +300,7 @@ static int __devinit gvp11_probe(struct zorro_dev *z,
         /*
          * Rumors state that some GVP ram boards use the same product
          * code as the SCSI controllers. Therefore if the board-size
-         * is not 64KB we asume it is a ram board and bail out.
+         * is not 64KB we assume it is a ram board and bail out.
          */
         if (zorro_resource_len(z) != 0x10000)
                 return -ENODEV;
diff --git a/drivers/scsi/imm.c b/drivers/scsi/imm.c
index 99aa0e5699bc..26cd9d1d7571 100644
--- a/drivers/scsi/imm.c
+++ b/drivers/scsi/imm.c
@@ -3,7 +3,7 @@
  * 
  * (The IMM is the embedded controller in the ZIP Plus drive.)
  * 
- * My unoffical company acronym list is 21 pages long:
+ * My unofficial company acronym list is 21 pages long:
  *      FLA:    Four letter acronym with built in facility for
  *              future expansion to five letters.
  */
diff --git a/drivers/scsi/initio.c b/drivers/scsi/initio.c
index 9627d062e16b..dd741bcd6ccd 100644
--- a/drivers/scsi/initio.c
+++ b/drivers/scsi/initio.c
@@ -242,7 +242,7 @@ static u8 i91udftNvRam[64] =
 
 static u8 initio_rate_tbl[8] =  /* fast 20      */
 {
-                                /* nanosecond devide by 4 */
+                                /* nanosecond divide by 4 */
         12,                     /* 50ns,  20M   */
         18,                     /* 75ns,  13.3M */
         25,                     /* 100ns, 10M   */
@@ -1917,7 +1917,7 @@ static int int_initio_scsi_rst(struct initio_host * host)
 }
 
 /**
- *      int_initio_scsi_resel   -       Reselection occured
+ *      int_initio_scsi_resel   -       Reselection occurred
  *      @host: InitIO host adapter
  *
  *      A SCSI reselection event has been signalled and the interrupt
diff --git a/drivers/scsi/initio.h b/drivers/scsi/initio.h
index e58af9e95506..219b901bdc25 100644
--- a/drivers/scsi/initio.h
+++ b/drivers/scsi/initio.h
@@ -116,7 +116,7 @@ typedef struct {
 #define TUL_SBusId      0x89    /* 09 R   SCSI BUS ID                   */
 #define TUL_STimeOut    0x8A    /* 0A W   Sel/Resel Time Out Register   */
 #define TUL_SIdent      0x8A    /* 0A R   Identify Message Register     */
-#define TUL_SAvail      0x8A    /* 0A R   Availiable Counter Register   */
+#define TUL_SAvail      0x8A    /* 0A R   Available Counter Register   */
 #define TUL_SData       0x8B    /* 0B R/W SCSI data in/out              */
 #define TUL_SFifo       0x8C    /* 0C R/W FIFO                          */
 #define TUL_SSignal     0x90    /* 10 R/W SCSI signal in/out            */
@@ -389,7 +389,7 @@ struct scsi_ctrl_blk {
 /* Bit Definition for status */
 #define SCB_RENT        0x01
 #define SCB_PEND        0x02
-#define SCB_CONTIG      0x04    /* Contigent Allegiance */
+#define SCB_CONTIG      0x04    /* Contingent Allegiance */
 #define SCB_SELECT      0x08
 #define SCB_BUSY        0x10
 #define SCB_DONE        0x20
diff --git a/drivers/scsi/ips.c b/drivers/scsi/ips.c
index b2511acd39bd..218f71a8726e 100644
--- a/drivers/scsi/ips.c
+++ b/drivers/scsi/ips.c
@@ -137,7 +137,7 @@
 /*          - Fix path/name for scsi_hosts.h include for 2.6 kernels         */
 /*          - Fix sort order of 7k                                           */
 /*          - Remove 3 unused "inline" functions                             */
-/* 7.12.xx  - Use STATIC functions whereever possible                        */
+/* 7.12.xx  - Use STATIC functions wherever possible                        */
 /*          - Clean up deprecated MODULE_PARM calls                          */
 /* 7.12.05  - Remove Version Matching per IBM request                        */
 /*****************************************************************************/
@@ -1665,7 +1665,7 @@ ips_flash_copperhead(ips_ha_t * ha, ips_passthru_t * pt, ips_scb_t * scb)
         int datasize;
 
         /* Trombone is the only copperhead that can do packet flash, but only
-         * for firmware. No one said it had to make sence. */
+         * for firmware. No one said it had to make sense. */
         if (IPS_IS_TROMBONE(ha) && pt->CoppCP.cmd.flashfw.type == IPS_FW_IMAGE) {
                 if (ips_usrcmd(ha, pt, scb))
                         return IPS_SUCCESS;
diff --git a/drivers/scsi/ips.h b/drivers/scsi/ips.h
index 4e49fbcfe8af..f2df0593332b 100644
--- a/drivers/scsi/ips.h
+++ b/drivers/scsi/ips.h
@@ -1193,7 +1193,7 @@ typedef struct {
 #define IPS_VER_SEBRING "7.12.02"
 #define IPS_VER_KEYWEST "7.12.02"
 
-/* Compatability IDs for various adapters */
+/* Compatibility IDs for various adapters */
 #define IPS_COMPAT_UNKNOWN ""
 #define IPS_COMPAT_CURRENT "KW710"
 #define IPS_COMPAT_SERVERAID1 "2.25.01"
diff --git a/drivers/scsi/iscsi_tcp.c b/drivers/scsi/iscsi_tcp.c
index a860452a8f71..3df985305f69 100644
--- a/drivers/scsi/iscsi_tcp.c
+++ b/drivers/scsi/iscsi_tcp.c
@@ -295,7 +295,7 @@ static int iscsi_sw_tcp_xmit(struct iscsi_conn *conn)
                 rc = iscsi_sw_tcp_xmit_segment(tcp_conn, segment);
                 /*
                  * We may not have been able to send data because the conn
-                 * is getting stopped. libiscsi will know so propogate err
+                 * is getting stopped. libiscsi will know so propagate err
                  * for it to do the right thing.
                  */
                 if (rc == -EAGAIN)
diff --git a/drivers/scsi/libfc/fc_exch.c b/drivers/scsi/libfc/fc_exch.c
index 28231badd9e6..77035a746f60 100644
--- a/drivers/scsi/libfc/fc_exch.c
+++ b/drivers/scsi/libfc/fc_exch.c
@@ -1042,7 +1042,7 @@ static void fc_exch_set_addr(struct fc_exch *ep,
 }
 
 /**
- * fc_seq_els_rsp_send() - Send an ELS response using infomation from
+ * fc_seq_els_rsp_send() - Send an ELS response using information from
  *                         the existing sequence/exchange.
  * @fp:       The received frame
  * @els_cmd:  The ELS command to be sent
@@ -1153,7 +1153,7 @@ static void fc_seq_send_ack(struct fc_seq *sp, const struct fc_frame *rx_fp)
  * fc_exch_send_ba_rjt() - Send BLS Reject
  * @rx_fp:  The frame being rejected
  * @reason: The reason the frame is being rejected
- * @explan: The explaination for the rejection
+ * @explan: The explanation for the rejection
  *
  * This is for rejecting BA_ABTS only.
  */
diff --git a/drivers/scsi/libfc/fc_fcp.c b/drivers/scsi/libfc/fc_fcp.c
index b1b03af158bf..5b799a37ad09 100644
--- a/drivers/scsi/libfc/fc_fcp.c
+++ b/drivers/scsi/libfc/fc_fcp.c
@@ -870,7 +870,7 @@ static void fc_fcp_resp(struct fc_fcp_pkt *fsp, struct fc_frame *fp)
                                 fsp->scsi_resid = ntohl(rp_ex->fr_resid);
                                 /*
                                  * The cmnd->underflow is the minimum number of
-                                 * bytes that must be transfered for this
+                                 * bytes that must be transferred for this
                                  * command.  Provided a sense condition is not
                                  * present, make sure the actual amount
                                  * transferred is at least the underflow value
@@ -1306,7 +1306,7 @@ static int fc_lun_reset(struct fc_lport *lport, struct fc_fcp_pkt *fsp,
 }
 
 /**
- * fc_tm_done() - Task Managment response handler
+ * fc_tm_done() - Task Management response handler
  * @seq: The sequence that the response is on
  * @fp:  The response frame
  * @arg: The FCP packet the response is for
diff --git a/drivers/scsi/libfc/fc_lport.c b/drivers/scsi/libfc/fc_lport.c
index 8c08b210001d..906bbcad0e2d 100644
--- a/drivers/scsi/libfc/fc_lport.c
+++ b/drivers/scsi/libfc/fc_lport.c
@@ -52,7 +52,7 @@
  * while making the callback. To ensure that the rport is not free'd while
  * processing the callback the rport callbacks are serialized through a
  * single-threaded workqueue. An rport would never be free'd while in a
- * callback handler becuase no other rport work in this queue can be executed
+ * callback handler because no other rport work in this queue can be executed
  * at the same time.
  *
  * When discovery succeeds or fails a callback is made to the lport as
@@ -163,7 +163,7 @@ static int fc_frame_drop(struct fc_lport *lport, struct fc_frame *fp)
  * fc_lport_rport_callback() - Event handler for rport events
  * @lport: The lport which is receiving the event
  * @rdata: private remote port data
- * @event: The event that occured
+ * @event: The event that occurred
  *
  * Locking Note: The rport lock should not be held when calling
  *               this function.
@@ -379,7 +379,7 @@ static void fc_lport_add_fc4_type(struct fc_lport *lport, enum fc_fh_type type)
 
 /**
  * fc_lport_recv_rlir_req() - Handle received Registered Link Incident Report.
- * @lport: Fibre Channel local port recieving the RLIR
+ * @lport: Fibre Channel local port receiving the RLIR
  * @fp:    The RLIR request frame
  *
  * Locking Note: The lport lock is expected to be held before calling
@@ -396,7 +396,7 @@ static void fc_lport_recv_rlir_req(struct fc_lport *lport, struct fc_frame *fp)
 
 /**
  * fc_lport_recv_echo_req() - Handle received ECHO request
- * @lport: The local port recieving the ECHO
+ * @lport: The local port receiving the ECHO
  * @fp:    ECHO request frame
  *
  * Locking Note: The lport lock is expected to be held before calling
@@ -432,7 +432,7 @@ static void fc_lport_recv_echo_req(struct fc_lport *lport,
 
 /**
  * fc_lport_recv_rnid_req() - Handle received Request Node ID data request
- * @lport: The local port recieving the RNID
+ * @lport: The local port receiving the RNID
  * @fp:    The RNID request frame
  *
  * Locking Note: The lport lock is expected to be held before calling
@@ -491,7 +491,7 @@ static void fc_lport_recv_rnid_req(struct fc_lport *lport,
 
 /**
  * fc_lport_recv_logo_req() - Handle received fabric LOGO request
- * @lport: The local port recieving the LOGO
+ * @lport: The local port receiving the LOGO
  * @fp:    The LOGO request frame
  *
  * Locking Note: The lport lock is exected to be held before calling
@@ -771,7 +771,7 @@ EXPORT_SYMBOL(fc_lport_set_local_id);
 
 /**
  * fc_lport_recv_flogi_req() - Receive a FLOGI request
- * @lport: The local port that recieved the request
+ * @lport: The local port that received the request
  * @rx_fp: The FLOGI frame
  *
  * A received FLOGI request indicates a point-to-point connection.
@@ -858,7 +858,7 @@ out:
  * if an rport should handle the request.
  *
  * Locking Note: This function should not be called with the lport
- *               lock held becuase it will grab the lock.
+ *               lock held because it will grab the lock.
  */
 static void fc_lport_recv_els_req(struct fc_lport *lport,
                                   struct fc_frame *fp)
@@ -925,7 +925,7 @@ struct fc4_prov fc_lport_els_prov = {
  * @fp: The frame the request is in
  *
  * Locking Note: This function should not be called with the lport
- *               lock held becuase it may grab the lock.
+ *               lock held because it may grab the lock.
  */
 static void fc_lport_recv_req(struct fc_lport *lport,
                               struct fc_frame *fp)
diff --git a/drivers/scsi/libiscsi_tcp.c b/drivers/scsi/libiscsi_tcp.c
index 8eeb39ffa37f..e98ae33f1295 100644
--- a/drivers/scsi/libiscsi_tcp.c
+++ b/drivers/scsi/libiscsi_tcp.c
@@ -132,14 +132,25 @@ static void iscsi_tcp_segment_map(struct iscsi_segment *segment, int recv)
         if (page_count(sg_page(sg)) >= 1 && !recv)
                 return;
 
-        segment->sg_mapped = kmap_atomic(sg_page(sg), KM_SOFTIRQ0);
+        if (recv) {
+                segment->atomic_mapped = true;
+                segment->sg_mapped = kmap_atomic(sg_page(sg), KM_SOFTIRQ0);
+        } else {
+                segment->atomic_mapped = false;
+                /* the xmit path can sleep with the page mapped so use kmap */
+                segment->sg_mapped = kmap(sg_page(sg));
+        }
+
         segment->data = segment->sg_mapped + sg->offset + segment->sg_offset;
 }
 
 void iscsi_tcp_segment_unmap(struct iscsi_segment *segment)
 {
         if (segment->sg_mapped) {
-                kunmap_atomic(segment->sg_mapped, KM_SOFTIRQ0);
+                if (segment->atomic_mapped)
+                        kunmap_atomic(segment->sg_mapped, KM_SOFTIRQ0);
+                else
+                        kunmap(sg_page(segment->sg));
                 segment->sg_mapped = NULL;
                 segment->data = NULL;
         }
diff --git a/drivers/scsi/libsas/Makefile b/drivers/scsi/libsas/Makefile
index 566a10024598..2e70140f70c3 100644
--- a/drivers/scsi/libsas/Makefile
+++ b/drivers/scsi/libsas/Makefile
@@ -32,4 +32,4 @@ libsas-y +=  sas_init.o     \
                 sas_scsi_host.o \
                 sas_task.o
 libsas-$(CONFIG_SCSI_SAS_ATA) +=        sas_ata.o
-libsas-$(CONFIG_SCSI_SAS_HOST_SMP) +=   sas_host_smp.o
\ No newline at end of file
+libsas-$(CONFIG_SCSI_SAS_HOST_SMP) +=   sas_host_smp.o
diff --git a/drivers/scsi/libsas/sas_expander.c b/drivers/scsi/libsas/sas_expander.c
index f3f693b772ac..874e29d9533f 100644
--- a/drivers/scsi/libsas/sas_expander.c
+++ b/drivers/scsi/libsas/sas_expander.c
@@ -240,7 +240,7 @@ static int sas_ex_phy_discover_helper(struct domain_device *dev, u8 *disc_req,
                                        disc_resp, DISCOVER_RESP_SIZE);
                 if (res)
                         return res;
-                /* This is detecting a failure to transmit inital
+                /* This is detecting a failure to transmit initial
                  * dev to host FIS as described in section G.5 of
                  * sas-2 r 04b */
                 dr = &((struct smp_resp *)disc_resp)->disc;
diff --git a/drivers/scsi/lpfc/Makefile b/drivers/scsi/lpfc/Makefile
index ad05d6edb8f6..88928f00aa2d 100644
--- a/drivers/scsi/lpfc/Makefile
+++ b/drivers/scsi/lpfc/Makefile
@@ -1,7 +1,7 @@
 #/*******************************************************************
 # * This file is part of the Emulex Linux Device Driver for         *
 # * Fibre Channel Host Bus Adapters.                                *
-# * Copyright (C) 2004-2006 Emulex.  All rights reserved.           *
+# * Copyright (C) 2004-2011 Emulex.  All rights reserved.           *
 # * EMULEX and SLI are trademarks of Emulex.                        *
 # * www.emulex.com                                                  *
 # *                                                                 *
@@ -19,10 +19,8 @@
 # *******************************************************************/
 ######################################################################
 
-ifneq ($(GCOV),)
-  EXTRA_CFLAGS += -fprofile-arcs -ftest-coverage
-  EXTRA_CFLAGS += -O0
-endif
+ccflags-$(GCOV) := -fprofile-arcs -ftest-coverage
+ccflags-$(GCOV) += -O0
 
 obj-$(CONFIG_SCSI_LPFC) := lpfc.o
 
diff --git a/drivers/scsi/lpfc/lpfc.h b/drivers/scsi/lpfc/lpfc.h
index b64c6da870d3..60e98a62f308 100644
--- a/drivers/scsi/lpfc/lpfc.h
+++ b/drivers/scsi/lpfc/lpfc.h
@@ -539,6 +539,8 @@ struct lpfc_hba {
                 (struct lpfc_hba *, uint32_t);
         int (*lpfc_hba_down_link)
                 (struct lpfc_hba *, uint32_t);
+        int (*lpfc_selective_reset)
+                (struct lpfc_hba *);
 
         /* SLI4 specific HBA data structure */
         struct lpfc_sli4_hba sli4_hba;
@@ -895,7 +897,18 @@ lpfc_worker_wake_up(struct lpfc_hba *phba)
         return;
 }
 
-static inline void
+static inline int
+lpfc_readl(void __iomem *addr, uint32_t *data)
+{
+        uint32_t temp;
+        temp = readl(addr);
+        if (temp == 0xffffffff)
+                return -EIO;
+        *data = temp;
+        return 0;
+}
+
+static inline int
 lpfc_sli_read_hs(struct lpfc_hba *phba)
 {
         /*
@@ -904,15 +917,17 @@ lpfc_sli_read_hs(struct lpfc_hba *phba)
          */
         phba->sli.slistat.err_attn_event++;
 
-        /* Save status info */
-        phba->work_hs = readl(phba->HSregaddr);
-        phba->work_status[0] = readl(phba->MBslimaddr + 0xa8);
-        phba->work_status[1] = readl(phba->MBslimaddr + 0xac);
+        /* Save status info and check for unplug error */
+        if (lpfc_readl(phba->HSregaddr, &phba->work_hs) ||
+                lpfc_readl(phba->MBslimaddr + 0xa8, &phba->work_status[0]) ||
+                lpfc_readl(phba->MBslimaddr + 0xac, &phba->work_status[1])) {
+                return -EIO;
+        }
 
         /* Clear chip Host Attention error bit */
         writel(HA_ERATT, phba->HAregaddr);
         readl(phba->HAregaddr); /* flush */
         phba->pport->stopped = 1;
 
-        return;
+        return 0;
 }
diff --git a/drivers/scsi/lpfc/lpfc_attr.c b/drivers/scsi/lpfc/lpfc_attr.c
index e7c020df12fa..17d789325f40 100644
--- a/drivers/scsi/lpfc/lpfc_attr.c
+++ b/drivers/scsi/lpfc/lpfc_attr.c
@@ -685,7 +685,7 @@ lpfc_do_offline(struct lpfc_hba *phba, uint32_t type)
  * -EIO reset not configured or error posting the event
  * zero for success
  **/
-static int
+int
 lpfc_selective_reset(struct lpfc_hba *phba)
 {
         struct completion online_compl;
@@ -746,7 +746,7 @@ lpfc_issue_reset(struct device *dev, struct device_attribute *attr,
         int status = -EINVAL;
 
         if (strncmp(buf, "selective", sizeof("selective") - 1) == 0)
-                status = lpfc_selective_reset(phba);
+                status = phba->lpfc_selective_reset(phba);
 
         if (status == 0)
                 return strlen(buf);
@@ -1224,7 +1224,10 @@ lpfc_poll_store(struct device *dev, struct device_attribute *attr,
         if (val & ENABLE_FCP_RING_POLLING) {
                 if ((val & DISABLE_FCP_RING_INT) &&
                     !(old_val & DISABLE_FCP_RING_INT)) {
-                        creg_val = readl(phba->HCregaddr);
+                        if (lpfc_readl(phba->HCregaddr, &creg_val)) {
+                                spin_unlock_irq(&phba->hbalock);
+                                return -EINVAL;
+                        }
                         creg_val &= ~(HC_R0INT_ENA << LPFC_FCP_RING);
                         writel(creg_val, phba->HCregaddr);
                         readl(phba->HCregaddr); /* flush */
@@ -1242,7 +1245,10 @@ lpfc_poll_store(struct device *dev, struct device_attribute *attr,
                 spin_unlock_irq(&phba->hbalock);
                 del_timer(&phba->fcp_poll_timer);
                 spin_lock_irq(&phba->hbalock);
-                creg_val = readl(phba->HCregaddr);
+                if (lpfc_readl(phba->HCregaddr, &creg_val)) {
+                        spin_unlock_irq(&phba->hbalock);
+                        return -EINVAL;
+                }
                 creg_val |= (HC_R0INT_ENA << LPFC_FCP_RING);
                 writel(creg_val, phba->HCregaddr);
                 readl(phba->HCregaddr); /* flush */
@@ -4509,7 +4515,7 @@ static FC_RPORT_ATTR(field, S_IRUGO, lpfc_show_rport_##field, NULL)
  * Description:
  * This function is called by the transport after the @fc_vport's symbolic name
  * has been changed. This function re-registers the symbolic name with the
- * switch to propogate the change into the fabric if the vport is active.
+ * switch to propagate the change into the fabric if the vport is active.
  **/
 static void
 lpfc_set_vport_symbolic_name(struct fc_vport *fc_vport)
diff --git a/drivers/scsi/lpfc/lpfc_bsg.c b/drivers/scsi/lpfc/lpfc_bsg.c
index 04fef038b1ff..3811ea9ce8e4 100644
--- a/drivers/scsi/lpfc/lpfc_bsg.c
+++ b/drivers/scsi/lpfc/lpfc_bsg.c
@@ -1,7 +1,7 @@
 /*******************************************************************
  * This file is part of the Emulex Linux Device Driver for         *
  * Fibre Channel Host Bus Adapters.                                *
- * Copyright (C) 2009-2010 Emulex.  All rights reserved.                *
+ * Copyright (C) 2009-2011 Emulex.  All rights reserved.           *
  * EMULEX and SLI are trademarks of Emulex.                        *
  * www.emulex.com                                                  *
  *                                                                 *
@@ -348,7 +348,10 @@ lpfc_bsg_send_mgmt_cmd(struct fc_bsg_job *job)
         dd_data->context_un.iocb.bmp = bmp;
 
         if (phba->cfg_poll & DISABLE_FCP_RING_INT) {
-                creg_val = readl(phba->HCregaddr);
+                if (lpfc_readl(phba->HCregaddr, &creg_val)) {
+                        rc = -EIO ;
+                        goto free_cmdiocbq;
+                }
                 creg_val |= (HC_R0INT_ENA << LPFC_FCP_RING);
                 writel(creg_val, phba->HCregaddr);
                 readl(phba->HCregaddr); /* flush */
@@ -599,7 +602,10 @@ lpfc_bsg_rport_els(struct fc_bsg_job *job)
         dd_data->context_un.iocb.ndlp = ndlp;
 
         if (phba->cfg_poll & DISABLE_FCP_RING_INT) {
-                creg_val = readl(phba->HCregaddr);
+                if (lpfc_readl(phba->HCregaddr, &creg_val)) {
+                        rc = -EIO;
+                        goto linkdown_err;
+                }
                 creg_val |= (HC_R0INT_ENA << LPFC_FCP_RING);
                 writel(creg_val, phba->HCregaddr);
                 readl(phba->HCregaddr); /* flush */
@@ -613,6 +619,7 @@ lpfc_bsg_rport_els(struct fc_bsg_job *job)
         else
                 rc = -EIO;
 
+linkdown_err:
         pci_unmap_sg(phba->pcidev, job->request_payload.sg_list,
                      job->request_payload.sg_cnt, DMA_TO_DEVICE);
         pci_unmap_sg(phba->pcidev, job->reply_payload.sg_list,
@@ -1357,7 +1364,10 @@ lpfc_issue_ct_rsp(struct lpfc_hba *phba, struct fc_bsg_job *job, uint32_t tag,
         dd_data->context_un.iocb.ndlp = ndlp;
 
         if (phba->cfg_poll & DISABLE_FCP_RING_INT) {
-                creg_val = readl(phba->HCregaddr);
+                if (lpfc_readl(phba->HCregaddr, &creg_val)) {
+                        rc = -IOCB_ERROR;
+                        goto issue_ct_rsp_exit;
+                }
                 creg_val |= (HC_R0INT_ENA << LPFC_FCP_RING);
                 writel(creg_val, phba->HCregaddr);
                 readl(phba->HCregaddr); /* flush */
@@ -1929,7 +1939,7 @@ out:
  * @rxxri: Receive exchange id
  * @len: Number of data bytes
  *
- * This function allocates and posts a data buffer of sufficient size to recieve
+ * This function allocates and posts a data buffer of sufficient size to receive
  * an unsolicted CT command.
  **/
 static int lpfcdiag_loop_post_rxbufs(struct lpfc_hba *phba, uint16_t rxxri,
@@ -2479,16 +2489,18 @@ lpfc_bsg_wake_mbox_wait(struct lpfc_hba *phba, LPFC_MBOXQ_t *pmboxq)
 
         from = (uint8_t *)dd_data->context_un.mbox.mb;
         job = dd_data->context_un.mbox.set_job;
-        size = job->reply_payload.payload_len;
-        job->reply->reply_payload_rcv_len =
-                sg_copy_from_buffer(job->reply_payload.sg_list,
-                                job->reply_payload.sg_cnt,
-                                from, size);
-        job->reply->result = 0;
+        if (job) {
+                size = job->reply_payload.payload_len;
+                job->reply->reply_payload_rcv_len =
+                        sg_copy_from_buffer(job->reply_payload.sg_list,
+                                        job->reply_payload.sg_cnt,
+                                        from, size);
+                job->reply->result = 0;
 
+                job->dd_data = NULL;
+                job->job_done(job);
+        }
         dd_data->context_un.mbox.set_job = NULL;
-        job->dd_data = NULL;
-        job->job_done(job);
         /* need to hold the lock until we call job done to hold off
          * the timeout handler returning to the midlayer while
          * we are stillprocessing the job
diff --git a/drivers/scsi/lpfc/lpfc_crtn.h b/drivers/scsi/lpfc/lpfc_crtn.h
index 3d40023f4804..f0b332f4eedb 100644
--- a/drivers/scsi/lpfc/lpfc_crtn.h
+++ b/drivers/scsi/lpfc/lpfc_crtn.h
@@ -1,7 +1,7 @@
 /*******************************************************************
  * This file is part of the Emulex Linux Device Driver for         *
  * Fibre Channel Host Bus Adapters.                                *
- * Copyright (C) 2004-2010 Emulex.  All rights reserved.           *
+ * Copyright (C) 2004-2011 Emulex.  All rights reserved.           *
  * EMULEX and SLI are trademarks of Emulex.                        *
  * www.emulex.com                                                  *
  *                                                                 *
@@ -254,8 +254,8 @@ uint16_t lpfc_sli_next_iotag(struct lpfc_hba *, struct lpfc_iocbq *);
 void lpfc_sli_cancel_iocbs(struct lpfc_hba *, struct list_head *, uint32_t,
                            uint32_t);
 void lpfc_sli_wake_mbox_wait(struct lpfc_hba *, LPFC_MBOXQ_t *);
-
-void lpfc_reset_barrier(struct lpfc_hba * phba);
+int lpfc_selective_reset(struct lpfc_hba *);
+void lpfc_reset_barrier(struct lpfc_hba *);
 int lpfc_sli_brdready(struct lpfc_hba *, uint32_t);
 int lpfc_sli_brdkill(struct lpfc_hba *);
 int lpfc_sli_brdreset(struct lpfc_hba *);
diff --git a/drivers/scsi/lpfc/lpfc_debugfs.c b/drivers/scsi/lpfc/lpfc_debugfs.c
index a753581509d6..3d967741c708 100644
--- a/drivers/scsi/lpfc/lpfc_debugfs.c
+++ b/drivers/scsi/lpfc/lpfc_debugfs.c
@@ -908,7 +908,7 @@ lpfc_debugfs_dumpData_open(struct inode *inode, struct file *file)
         if (!debug)
                 goto out;
 
-        /* Round to page boundry */
+        /* Round to page boundary */
         printk(KERN_ERR "9059 BLKGRD:  %s: _dump_buf_data=0x%p\n",
                         __func__, _dump_buf_data);
         debug->buffer = _dump_buf_data;
@@ -938,7 +938,7 @@ lpfc_debugfs_dumpDif_open(struct inode *inode, struct file *file)
         if (!debug)
                 goto out;
 
-        /* Round to page boundry */
+        /* Round to page boundary */
         printk(KERN_ERR "9060 BLKGRD: %s: _dump_buf_dif=0x%p file=%s\n",
                 __func__, _dump_buf_dif, file->f_dentry->d_name.name);
         debug->buffer = _dump_buf_dif;
@@ -2158,7 +2158,7 @@ lpfc_debugfs_initialize(struct lpfc_vport *vport)
                         debugfs_create_dir(name, phba->hba_debugfs_root);
                 if (!vport->vport_debugfs_root) {
                         lpfc_printf_vlog(vport, KERN_ERR, LOG_INIT,
-                                         "0417 Cant create debugfs\n");
+                                         "0417 Can't create debugfs\n");
                         goto debug_failed;
                 }
                 atomic_inc(&phba->debugfs_vport_count);
@@ -2211,7 +2211,7 @@ lpfc_debugfs_initialize(struct lpfc_vport *vport)
                                  vport, &lpfc_debugfs_op_nodelist);
         if (!vport->debug_nodelist) {
                 lpfc_printf_vlog(vport, KERN_ERR, LOG_INIT,
-                                 "0409 Cant create debugfs nodelist\n");
+                                 "0409 Can't create debugfs nodelist\n");
                 goto debug_failed;
         }
 
diff --git a/drivers/scsi/lpfc/lpfc_els.c b/drivers/scsi/lpfc/lpfc_els.c
index 8e28edf9801e..d34b69f9cdb1 100644
--- a/drivers/scsi/lpfc/lpfc_els.c
+++ b/drivers/scsi/lpfc/lpfc_els.c
@@ -89,7 +89,8 @@ lpfc_els_chk_latt(struct lpfc_vport *vport)
                 return 0;
 
         /* Read the HBA Host Attention Register */
-        ha_copy = readl(phba->HAregaddr);
+        if (lpfc_readl(phba->HAregaddr, &ha_copy))
+                return 1;
 
         if (!(ha_copy & HA_LATT))
                 return 0;
@@ -101,7 +102,7 @@ lpfc_els_chk_latt(struct lpfc_vport *vport)
                          phba->pport->port_state);
 
         /* CLEAR_LA should re-enable link attention events and
-         * we should then imediately take a LATT event. The
+         * we should then immediately take a LATT event. The
          * LATT processing should call lpfc_linkdown() which
          * will cleanup any left over in-progress discovery
          * events.
@@ -1598,7 +1599,7 @@ out:
  * This routine is the completion callback function for issuing the Port
  * Login (PLOGI) command. For PLOGI completion, there must be an active
  * ndlp on the vport node list that matches the remote node ID from the
- * PLOGI reponse IOCB. If such ndlp does not exist, the PLOGI is simply
+ * PLOGI response IOCB. If such ndlp does not exist, the PLOGI is simply
  * ignored and command IOCB released. The PLOGI response IOCB status is
  * checked for error conditons. If there is error status reported, PLOGI
  * retry shall be attempted by invoking the lpfc_els_retry() routine.
diff --git a/drivers/scsi/lpfc/lpfc_hbadisc.c b/drivers/scsi/lpfc/lpfc_hbadisc.c
index 154c715fb3af..301498301a8f 100644
--- a/drivers/scsi/lpfc/lpfc_hbadisc.c
+++ b/drivers/scsi/lpfc/lpfc_hbadisc.c
@@ -739,7 +739,7 @@ lpfc_do_work(void *p)
 
 /*
  * This is only called to handle FC worker events. Since this a rare
- * occurance, we allocate a struct lpfc_work_evt structure here instead of
+ * occurrence, we allocate a struct lpfc_work_evt structure here instead of
  * embedding it in the IOCB.
  */
 int
@@ -1348,7 +1348,7 @@ lpfc_register_fcf(struct lpfc_hba *phba)
         int rc;
 
         spin_lock_irq(&phba->hbalock);
-        /* If the FCF is not availabe do nothing. */
+        /* If the FCF is not available do nothing. */
         if (!(phba->fcf.fcf_flag & FCF_AVAILABLE)) {
                 phba->hba_flag &= ~(FCF_TS_INPROG | FCF_RR_INPROG);
                 spin_unlock_irq(&phba->hbalock);
@@ -1538,7 +1538,7 @@ lpfc_match_fcf_conn_list(struct lpfc_hba *phba,
 
                 /*
                  * If user did not specify any addressing mode, or if the
-                 * prefered addressing mode specified by user is not supported
+                 * preferred addressing mode specified by user is not supported
                  * by FCF, allow fabric to pick the addressing mode.
                  */
                 *addr_mode = bf_get(lpfc_fcf_record_mac_addr_prov,
@@ -1553,7 +1553,7 @@ lpfc_match_fcf_conn_list(struct lpfc_hba *phba,
                                 FCFCNCT_AM_SPMA) ?
                                 LPFC_FCF_SPMA : LPFC_FCF_FPMA;
                 /*
-                 * If the user specified a prefered address mode, use the
+                 * If the user specified a preferred address mode, use the
                  * addr mode only if FCF support the addr_mode.
                  */
                 else if ((conn_entry->conn_rec.flags & FCFCNCT_AM_VALID) &&
@@ -3117,7 +3117,7 @@ lpfc_mbx_cmpl_reg_login(struct lpfc_hba *phba, LPFC_MBOXQ_t *pmb)
                  * back at reg login state so this
                  * mbox needs to be ignored becase
                  * there is another reg login in
-                 * proccess.
+                 * process.
                  */
                 spin_lock_irq(shost->host_lock);
                 ndlp->nlp_flag &= ~NLP_IGNR_REG_CMPL;
@@ -4477,7 +4477,7 @@ lpfc_setup_disc_node(struct lpfc_vport *vport, uint32_t did)
         if ((vport->fc_flag & FC_RSCN_MODE) &&
             !(vport->fc_flag & FC_NDISC_ACTIVE)) {
                 if (lpfc_rscn_payload_check(vport, did)) {
-                        /* If we've already recieved a PLOGI from this NPort
+                        /* If we've already received a PLOGI from this NPort
                          * we don't need to try to discover it again.
                          */
                         if (ndlp->nlp_flag & NLP_RCV_PLOGI)
@@ -4493,7 +4493,7 @@ lpfc_setup_disc_node(struct lpfc_vport *vport, uint32_t did)
                 } else
                         ndlp = NULL;
         } else {
-                /* If we've already recieved a PLOGI from this NPort,
+                /* If we've already received a PLOGI from this NPort,
                  * or we are already in the process of discovery on it,
                  * we don't need to try to discover it again.
                  */
@@ -5756,7 +5756,7 @@ lpfc_read_fcoe_param(struct lpfc_hba *phba,
  * @size: Size of the data buffer.
  * @rec_type: Record type to be searched.
  *
- * This function searches config region data to find the begining
+ * This function searches config region data to find the beginning
  * of the record specified by record_type. If record found, this
  * function return pointer to the record else return NULL.
  */
diff --git a/drivers/scsi/lpfc/lpfc_hw.h b/drivers/scsi/lpfc/lpfc_hw.h
index 94ae37c5111a..95f11ed79463 100644
--- a/drivers/scsi/lpfc/lpfc_hw.h
+++ b/drivers/scsi/lpfc/lpfc_hw.h
@@ -1344,7 +1344,7 @@ typedef struct {		/* FireFly BIU registers */
 #define HS_FFER1       0x80000000       /* Bit 31 */
 #define HS_CRIT_TEMP   0x00000100       /* Bit 8  */
 #define HS_FFERM       0xFF000100       /* Mask for error bits 31:24 and 8 */
-
+#define UNPLUG_ERR     0x00000001       /* Indicate pci hot unplug */
 /* Host Control Register */
 
 #define HC_REG_OFFSET  12       /* Byte offset from register base address */
@@ -1713,6 +1713,17 @@ struct lpfc_pde6 {
 #define pde6_apptagval_WORD     word2
 };
 
+struct lpfc_pde7 {
+        uint32_t word0;
+#define pde7_type_SHIFT         24
+#define pde7_type_MASK          0x000000ff
+#define pde7_type_WORD          word0
+#define pde7_rsvd0_SHIFT        0
+#define pde7_rsvd0_MASK         0x00ffffff
+#define pde7_rsvd0_WORD         word0
+        uint32_t addrHigh;
+        uint32_t addrLow;
+};
 
 /* Structure for MB Command LOAD_SM and DOWN_LOAD */
 
@@ -3621,7 +3632,7 @@ typedef struct _IOCB {	/* IOCB structure */
                 ASYNCSTAT_FIELDS asyncstat; /* async_status iocb */
                 QUE_XRI64_CX_FIELDS quexri64cx; /* que_xri64_cx fields */
                 struct rcv_seq64 rcvseq64;      /* RCV_SEQ64 and RCV_CONT64 */
-                struct sli4_bls_acc bls_acc; /* UNSOL ABTS BLS_ACC params */
+                struct sli4_bls_rsp bls_rsp; /* UNSOL ABTS BLS_RSP params */
                 uint32_t ulpWord[IOCB_WORD_SZ - 2];     /* generic 6 'words' */
         } un;
         union {
diff --git a/drivers/scsi/lpfc/lpfc_hw4.h b/drivers/scsi/lpfc/lpfc_hw4.h
index c7178d60c7bf..8433ac0d9fb4 100644
--- a/drivers/scsi/lpfc/lpfc_hw4.h
+++ b/drivers/scsi/lpfc/lpfc_hw4.h
@@ -215,7 +215,7 @@ struct lpfc_sli4_flags {
 #define lpfc_fip_flag_WORD word0
 };
 
-struct sli4_bls_acc {
+struct sli4_bls_rsp {
         uint32_t word0_rsvd;      /* Word0 must be reserved */
         uint32_t word1;
 #define lpfc_abts_orig_SHIFT      0
@@ -231,6 +231,16 @@ struct sli4_bls_acc {
 #define lpfc_abts_oxid_MASK       0x0000FFFF
 #define lpfc_abts_oxid_WORD       word2
         uint32_t word3;
+#define lpfc_vndr_code_SHIFT    0
+#define lpfc_vndr_code_MASK     0x000000FF
+#define lpfc_vndr_code_WORD     word3
+#define lpfc_rsn_expln_SHIFT    8
+#define lpfc_rsn_expln_MASK     0x000000FF
+#define lpfc_rsn_expln_WORD     word3
+#define lpfc_rsn_code_SHIFT     16
+#define lpfc_rsn_code_MASK      0x000000FF
+#define lpfc_rsn_code_WORD      word3
+
         uint32_t word4;
         uint32_t word5_rsvd;    /* Word5 must be reserved */
 };
@@ -711,21 +721,27 @@ struct lpfc_sli4_cfg_mhdr {
 union lpfc_sli4_cfg_shdr {
         struct {
                 uint32_t word6;
-#define lpfc_mbox_hdr_opcode_SHIFT              0
-#define lpfc_mbox_hdr_opcode_MASK               0x000000FF
-#define lpfc_mbox_hdr_opcode_WORD               word6
-#define lpfc_mbox_hdr_subsystem_SHIFT           8
-#define lpfc_mbox_hdr_subsystem_MASK            0x000000FF
-#define lpfc_mbox_hdr_subsystem_WORD            word6
-#define lpfc_mbox_hdr_port_number_SHIFT         16
-#define lpfc_mbox_hdr_port_number_MASK          0x000000FF
-#define lpfc_mbox_hdr_port_number_WORD          word6
-#define lpfc_mbox_hdr_domain_SHIFT              24
-#define lpfc_mbox_hdr_domain_MASK               0x000000FF
-#define lpfc_mbox_hdr_domain_WORD               word6
+#define lpfc_mbox_hdr_opcode_SHIFT      0
+#define lpfc_mbox_hdr_opcode_MASK       0x000000FF
+#define lpfc_mbox_hdr_opcode_WORD       word6
+#define lpfc_mbox_hdr_subsystem_SHIFT   8
+#define lpfc_mbox_hdr_subsystem_MASK    0x000000FF
+#define lpfc_mbox_hdr_subsystem_WORD    word6
+#define lpfc_mbox_hdr_port_number_SHIFT 16
+#define lpfc_mbox_hdr_port_number_MASK  0x000000FF
+#define lpfc_mbox_hdr_port_number_WORD  word6
+#define lpfc_mbox_hdr_domain_SHIFT      24
+#define lpfc_mbox_hdr_domain_MASK       0x000000FF
+#define lpfc_mbox_hdr_domain_WORD       word6
                 uint32_t timeout;
                 uint32_t request_length;
-                uint32_t reserved9;
+                uint32_t word9;
+#define lpfc_mbox_hdr_version_SHIFT     0
+#define lpfc_mbox_hdr_version_MASK      0x000000FF
+#define lpfc_mbox_hdr_version_WORD      word9
+#define LPFC_Q_CREATE_VERSION_2 2
+#define LPFC_Q_CREATE_VERSION_1 1
+#define LPFC_Q_CREATE_VERSION_0 0
         } request;
         struct {
                 uint32_t word6;
@@ -917,9 +933,12 @@ struct cq_context {
 #define LPFC_CQ_CNT_512         0x1
 #define LPFC_CQ_CNT_1024        0x2
         uint32_t word1;
-#define lpfc_cq_eq_id_SHIFT             22
+#define lpfc_cq_eq_id_SHIFT             22      /* Version 0 Only */
 #define lpfc_cq_eq_id_MASK              0x000000FF
 #define lpfc_cq_eq_id_WORD              word1
+#define lpfc_cq_eq_id_2_SHIFT           0       /* Version 2 Only */
+#define lpfc_cq_eq_id_2_MASK            0x0000FFFF
+#define lpfc_cq_eq_id_2_WORD            word1
         uint32_t reserved0;
         uint32_t reserved1;
 };
@@ -929,6 +948,9 @@ struct lpfc_mbx_cq_create {
         union {
                 struct {
                         uint32_t word0;
+#define lpfc_mbx_cq_create_page_size_SHIFT      16      /* Version 2 Only */
+#define lpfc_mbx_cq_create_page_size_MASK       0x000000FF
+#define lpfc_mbx_cq_create_page_size_WORD       word0
 #define lpfc_mbx_cq_create_num_pages_SHIFT      0
 #define lpfc_mbx_cq_create_num_pages_MASK       0x0000FFFF
 #define lpfc_mbx_cq_create_num_pages_WORD       word0
@@ -969,7 +991,7 @@ struct wq_context {
 struct lpfc_mbx_wq_create {
         struct mbox_header header;
         union {
-                struct {
+                struct {        /* Version 0 Request */
                         uint32_t word0;
 #define lpfc_mbx_wq_create_num_pages_SHIFT      0
 #define lpfc_mbx_wq_create_num_pages_MASK       0x0000FFFF
@@ -979,6 +1001,23 @@ struct lpfc_mbx_wq_create {
 #define lpfc_mbx_wq_create_cq_id_WORD           word0
                         struct dma_address page[LPFC_MAX_WQ_PAGE];
                 } request;
+                struct {        /* Version 1 Request */
+                        uint32_t word0; /* Word 0 is the same as in v0 */
+                        uint32_t word1;
+#define lpfc_mbx_wq_create_page_size_SHIFT      0
+#define lpfc_mbx_wq_create_page_size_MASK       0x000000FF
+#define lpfc_mbx_wq_create_page_size_WORD       word1
+#define lpfc_mbx_wq_create_wqe_size_SHIFT       8
+#define lpfc_mbx_wq_create_wqe_size_MASK        0x0000000F
+#define lpfc_mbx_wq_create_wqe_size_WORD        word1
+#define LPFC_WQ_WQE_SIZE_64     0x5
+#define LPFC_WQ_WQE_SIZE_128    0x6
+#define lpfc_mbx_wq_create_wqe_count_SHIFT      16
+#define lpfc_mbx_wq_create_wqe_count_MASK       0x0000FFFF
+#define lpfc_mbx_wq_create_wqe_count_WORD       word1
+                        uint32_t word2;
+                        struct dma_address page[LPFC_MAX_WQ_PAGE-1];
+                } request_1;
                 struct {
                         uint32_t word0;
 #define lpfc_mbx_wq_create_q_id_SHIFT   0
@@ -1007,13 +1046,22 @@ struct lpfc_mbx_wq_destroy {
 #define LPFC_DATA_BUF_SIZE 2048
 struct rq_context {
         uint32_t word0;
-#define lpfc_rq_context_rq_size_SHIFT   16
-#define lpfc_rq_context_rq_size_MASK    0x0000000F
-#define lpfc_rq_context_rq_size_WORD    word0
+#define lpfc_rq_context_rqe_count_SHIFT 16      /* Version 0 Only */
+#define lpfc_rq_context_rqe_count_MASK  0x0000000F
+#define lpfc_rq_context_rqe_count_WORD  word0
 #define LPFC_RQ_RING_SIZE_512           9       /* 512 entries */
 #define LPFC_RQ_RING_SIZE_1024          10      /* 1024 entries */
 #define LPFC_RQ_RING_SIZE_2048          11      /* 2048 entries */
 #define LPFC_RQ_RING_SIZE_4096          12      /* 4096 entries */
+#define lpfc_rq_context_rqe_count_1_SHIFT       16      /* Version 1 Only */
+#define lpfc_rq_context_rqe_count_1_MASK        0x0000FFFF
+#define lpfc_rq_context_rqe_count_1_WORD        word0
+#define lpfc_rq_context_rqe_size_SHIFT  8               /* Version 1 Only */
+#define lpfc_rq_context_rqe_size_MASK   0x0000000F
+#define lpfc_rq_context_rqe_size_WORD   word0
+#define lpfc_rq_context_page_size_SHIFT 0               /* Version 1 Only */
+#define lpfc_rq_context_page_size_MASK  0x000000FF
+#define lpfc_rq_context_page_size_WORD  word0
         uint32_t reserved1;
         uint32_t word2;
 #define lpfc_rq_context_cq_id_SHIFT     16
@@ -1022,7 +1070,7 @@ struct rq_context {
 #define lpfc_rq_context_buf_size_SHIFT  0
 #define lpfc_rq_context_buf_size_MASK   0x0000FFFF
 #define lpfc_rq_context_buf_size_WORD   word2
-        uint32_t reserved3;
+        uint32_t buffer_size;                           /* Version 1 Only */
 };
 
 struct lpfc_mbx_rq_create {
@@ -1062,16 +1110,16 @@ struct lpfc_mbx_rq_destroy {
 
 struct mq_context {
         uint32_t word0;
-#define lpfc_mq_context_cq_id_SHIFT     22
+#define lpfc_mq_context_cq_id_SHIFT     22      /* Version 0 Only */
 #define lpfc_mq_context_cq_id_MASK      0x000003FF
 #define lpfc_mq_context_cq_id_WORD      word0
-#define lpfc_mq_context_count_SHIFT     16
-#define lpfc_mq_context_count_MASK      0x0000000F
-#define lpfc_mq_context_count_WORD      word0
-#define LPFC_MQ_CNT_16          0x5
-#define LPFC_MQ_CNT_32          0x6
-#define LPFC_MQ_CNT_64          0x7
-#define LPFC_MQ_CNT_128         0x8
+#define lpfc_mq_context_ring_size_SHIFT 16
+#define lpfc_mq_context_ring_size_MASK  0x0000000F
+#define lpfc_mq_context_ring_size_WORD  word0
+#define LPFC_MQ_RING_SIZE_16            0x5
+#define LPFC_MQ_RING_SIZE_32            0x6
+#define LPFC_MQ_RING_SIZE_64            0x7
+#define LPFC_MQ_RING_SIZE_128           0x8
         uint32_t word1;
 #define lpfc_mq_context_valid_SHIFT     31
 #define lpfc_mq_context_valid_MASK      0x00000001
@@ -1105,9 +1153,12 @@ struct lpfc_mbx_mq_create_ext {
         union {
                 struct {
                         uint32_t word0;
-#define lpfc_mbx_mq_create_ext_num_pages_SHIFT          0
-#define lpfc_mbx_mq_create_ext_num_pages_MASK           0x0000FFFF
-#define lpfc_mbx_mq_create_ext_num_pages_WORD           word0
+#define lpfc_mbx_mq_create_ext_num_pages_SHIFT  0
+#define lpfc_mbx_mq_create_ext_num_pages_MASK   0x0000FFFF
+#define lpfc_mbx_mq_create_ext_num_pages_WORD   word0
+#define lpfc_mbx_mq_create_ext_cq_id_SHIFT      16      /* Version 1 Only */
+#define lpfc_mbx_mq_create_ext_cq_id_MASK       0x0000FFFF
+#define lpfc_mbx_mq_create_ext_cq_id_WORD       word0
                         uint32_t async_evt_bmap;
 #define lpfc_mbx_mq_create_ext_async_evt_link_SHIFT     LPFC_TRAILER_CODE_LINK
 #define lpfc_mbx_mq_create_ext_async_evt_link_MASK      0x00000001
diff --git a/drivers/scsi/lpfc/lpfc_init.c b/drivers/scsi/lpfc/lpfc_init.c
index 35665cfb5689..505f88443b5c 100644
--- a/drivers/scsi/lpfc/lpfc_init.c
+++ b/drivers/scsi/lpfc/lpfc_init.c
@@ -1,7 +1,7 @@
 /*******************************************************************
  * This file is part of the Emulex Linux Device Driver for         *
  * Fibre Channel Host Bus Adapters.                                *
- * Copyright (C) 2004-2010 Emulex.  All rights reserved.           *
+ * Copyright (C) 2004-2011 Emulex.  All rights reserved.           *
  * EMULEX and SLI are trademarks of Emulex.                        *
  * www.emulex.com                                                  *
  * Portions Copyright (C) 2004-2005 Christoph Hellwig              *
@@ -507,7 +507,10 @@ lpfc_config_port_post(struct lpfc_hba *phba)
         phba->hba_flag &= ~HBA_ERATT_HANDLED;
 
         /* Enable appropriate host interrupts */
-        status = readl(phba->HCregaddr);
+        if (lpfc_readl(phba->HCregaddr, &status)) {
+                spin_unlock_irq(&phba->hbalock);
+                return -EIO;
+        }
         status |= HC_MBINT_ENA | HC_ERINT_ENA | HC_LAINT_ENA;
         if (psli->num_rings > 0)
                 status |= HC_R0INT_ENA;
@@ -1222,7 +1225,10 @@ lpfc_handle_deferred_eratt(struct lpfc_hba *phba)
         /* Wait for the ER1 bit to clear.*/
         while (phba->work_hs & HS_FFER1) {
                 msleep(100);
-                phba->work_hs = readl(phba->HSregaddr);
+                if (lpfc_readl(phba->HSregaddr, &phba->work_hs)) {
+                        phba->work_hs = UNPLUG_ERR ;
+                        break;
+                }
                 /* If driver is unloading let the worker thread continue */
                 if (phba->pport->load_flag & FC_UNLOADING) {
                         phba->work_hs = 0;
@@ -4460,7 +4466,7 @@ lpfc_sli4_driver_resource_unset(struct lpfc_hba *phba)
 }
 
 /**
- * lpfc_init_api_table_setup - Set up init api fucntion jump table
+ * lpfc_init_api_table_setup - Set up init api function jump table
  * @phba: The hba struct for which this call is being executed.
  * @dev_grp: The HBA PCI-Device group number.
  *
@@ -4474,6 +4480,7 @@ lpfc_init_api_table_setup(struct lpfc_hba *phba, uint8_t dev_grp)
 {
         phba->lpfc_hba_init_link = lpfc_hba_init_link;
         phba->lpfc_hba_down_link = lpfc_hba_down_link;
+        phba->lpfc_selective_reset = lpfc_selective_reset;
         switch (dev_grp) {
         case LPFC_PCI_DEV_LP:
                 phba->lpfc_hba_down_post = lpfc_hba_down_post_s3;
@@ -4843,7 +4850,7 @@ out_free_mem:
  *
  * Return codes
  *      0 - successful
- *      -ENOMEM - No availble memory
+ *      -ENOMEM - No available memory
  *      -EIO - The mailbox failed to complete successfully.
  **/
 int
@@ -5385,13 +5392,16 @@ lpfc_sli4_post_status_check(struct lpfc_hba *phba)
         int i, port_error = 0;
         uint32_t if_type;
 
+        memset(&portsmphr_reg, 0, sizeof(portsmphr_reg));
+        memset(&reg_data, 0, sizeof(reg_data));
         if (!phba->sli4_hba.PSMPHRregaddr)
                 return -ENODEV;
 
         /* Wait up to 30 seconds for the SLI Port POST done and ready */
         for (i = 0; i < 3000; i++) {
-                portsmphr_reg.word0 = readl(phba->sli4_hba.PSMPHRregaddr);
-                if (bf_get(lpfc_port_smphr_perr, &portsmphr_reg)) {
+                if (lpfc_readl(phba->sli4_hba.PSMPHRregaddr,
+                        &portsmphr_reg.word0) ||
+                        (bf_get(lpfc_port_smphr_perr, &portsmphr_reg))) {
                         /* Port has a fatal POST error, break out */
                         port_error = -ENODEV;
                         break;
@@ -5472,9 +5482,9 @@ lpfc_sli4_post_status_check(struct lpfc_hba *phba)
                         break;
                 case LPFC_SLI_INTF_IF_TYPE_2:
                         /* Final checks.  The port status should be clean. */
-                        reg_data.word0 =
-                                readl(phba->sli4_hba.u.if_type2.STATUSregaddr);
-                        if (bf_get(lpfc_sliport_status_err, &reg_data)) {
+                        if (lpfc_readl(phba->sli4_hba.u.if_type2.STATUSregaddr,
+                                &reg_data.word0) ||
+                                bf_get(lpfc_sliport_status_err, &reg_data)) {
                                 phba->work_status[0] =
                                         readl(phba->sli4_hba.u.if_type2.
                                               ERR1regaddr);
@@ -5720,7 +5730,7 @@ lpfc_destroy_bootstrap_mbox(struct lpfc_hba *phba)
  *
  * Return codes
  *      0 - successful
- *      -ENOMEM - No availble memory
+ *      -ENOMEM - No available memory
  *      -EIO - The mailbox failed to complete successfully.
  **/
 static int
@@ -5825,7 +5835,7 @@ lpfc_sli4_read_config(struct lpfc_hba *phba)
  *
  * Return codes
  *      0 - successful
- *      -ENOMEM - No availble memory
+ *      -ENOMEM - No available memory
  *      -EIO - The mailbox failed to complete successfully.
  **/
 static int
@@ -5884,7 +5894,7 @@ lpfc_setup_endian_order(struct lpfc_hba *phba)
  *
  * Return codes
  *      0 - successful
- *      -ENOMEM - No availble memory
+ *      -ENOMEM - No available memory
  *      -EIO - The mailbox failed to complete successfully.
  **/
 static int
@@ -6179,7 +6189,7 @@ out_error:
  *
  * Return codes
  *      0 - successful
- *      -ENOMEM - No availble memory
+ *      -ENOMEM - No available memory
  *      -EIO - The mailbox failed to complete successfully.
  **/
 static void
@@ -6243,7 +6253,7 @@ lpfc_sli4_queue_destroy(struct lpfc_hba *phba)
  *
  * Return codes
  *      0 - successful
- *      -ENOMEM - No availble memory
+ *      -ENOMEM - No available memory
  *      -EIO - The mailbox failed to complete successfully.
  **/
 int
@@ -6488,7 +6498,7 @@ out_error:
  *
  * Return codes
  *      0 - successful
- *      -ENOMEM - No availble memory
+ *      -ENOMEM - No available memory
  *      -EIO - The mailbox failed to complete successfully.
  **/
 void
@@ -6533,7 +6543,7 @@ lpfc_sli4_queue_unset(struct lpfc_hba *phba)
  *
  * Return codes
  *      0 - successful
- *      -ENOMEM - No availble memory
+ *      -ENOMEM - No available memory
  **/
 static int
 lpfc_sli4_cq_event_pool_create(struct lpfc_hba *phba)
@@ -6694,7 +6704,7 @@ lpfc_sli4_cq_event_release_all(struct lpfc_hba *phba)
  *
  * Return codes
  *      0 - successful
- *      -ENOMEM - No availble memory
+ *      -ENOMEM - No available memory
  *      -EIO - The mailbox failed to complete successfully.
  **/
 int
@@ -6760,9 +6770,11 @@ lpfc_pci_function_reset(struct lpfc_hba *phba)
                          * the loop again.
                          */
                         for (rdy_chk = 0; rdy_chk < 1000; rdy_chk++) {
-                                reg_data.word0 =
-                                        readl(phba->sli4_hba.u.if_type2.
-                                              STATUSregaddr);
+                                if (lpfc_readl(phba->sli4_hba.u.if_type2.
+                                              STATUSregaddr, &reg_data.word0)) {
+                                        rc = -ENODEV;
+                                        break;
+                                }
                                 if (bf_get(lpfc_sliport_status_rdy, &reg_data))
                                         break;
                                 if (bf_get(lpfc_sliport_status_rn, &reg_data)) {
@@ -6783,8 +6795,11 @@ lpfc_pci_function_reset(struct lpfc_hba *phba)
                         }
 
                         /* Detect any port errors. */
-                        reg_data.word0 = readl(phba->sli4_hba.u.if_type2.
-                                               STATUSregaddr);
+                        if (lpfc_readl(phba->sli4_hba.u.if_type2.STATUSregaddr,
+                                 &reg_data.word0)) {
+                                rc = -ENODEV;
+                                break;
+                        }
                         if ((bf_get(lpfc_sliport_status_err, &reg_data)) ||
                             (rdy_chk >= 1000)) {
                                 phba->work_status[0] = readl(
diff --git a/drivers/scsi/lpfc/lpfc_mbox.c b/drivers/scsi/lpfc/lpfc_mbox.c
index dba32dfdb59b..fbab9734e9b4 100644
--- a/drivers/scsi/lpfc/lpfc_mbox.c
+++ b/drivers/scsi/lpfc/lpfc_mbox.c
@@ -1834,7 +1834,7 @@ lpfc_sli4_mbox_opcode_get(struct lpfc_hba *phba, struct lpfcMboxq *mbox)
  * @fcf_index: index to fcf table.
  *
  * This routine routine allocates and constructs non-embedded mailbox command
- * for reading a FCF table entry refered by @fcf_index.
+ * for reading a FCF table entry referred by @fcf_index.
  *
  * Return: pointer to the mailbox command constructed if successful, otherwise
  * NULL.
diff --git a/drivers/scsi/lpfc/lpfc_nl.h b/drivers/scsi/lpfc/lpfc_nl.h
index f3cfbe2ce986..f2b1bbcb196f 100644
--- a/drivers/scsi/lpfc/lpfc_nl.h
+++ b/drivers/scsi/lpfc/lpfc_nl.h
@@ -50,7 +50,7 @@
  * and subcategory. The event type must come first.
  * The subcategory further defines the data that follows in the rest
  * of the payload. Each category will have its own unique header plus
- * any addtional data unique to the subcategory.
+ * any additional data unique to the subcategory.
  * The payload sent via the fc transport is one-way driver->application.
  */
 
diff --git a/drivers/scsi/lpfc/lpfc_nportdisc.c b/drivers/scsi/lpfc/lpfc_nportdisc.c
index 52b35159fc35..0d92d4205ea6 100644
--- a/drivers/scsi/lpfc/lpfc_nportdisc.c
+++ b/drivers/scsi/lpfc/lpfc_nportdisc.c
@@ -658,7 +658,7 @@ lpfc_disc_set_adisc(struct lpfc_vport *vport, struct lpfc_nodelist *ndlp)
         return 0;
 }
 /**
- * lpfc_release_rpi - Release a RPI by issueing unreg_login mailbox cmd.
+ * lpfc_release_rpi - Release a RPI by issuing unreg_login mailbox cmd.
  * @phba : Pointer to lpfc_hba structure.
  * @vport: Pointer to lpfc_vport structure.
  * @rpi  : rpi to be release.
diff --git a/drivers/scsi/lpfc/lpfc_scsi.c b/drivers/scsi/lpfc/lpfc_scsi.c
index bf34178b80bf..fe7cc84e773b 100644
--- a/drivers/scsi/lpfc/lpfc_scsi.c
+++ b/drivers/scsi/lpfc/lpfc_scsi.c
@@ -1,7 +1,7 @@
 /*******************************************************************
  * This file is part of the Emulex Linux Device Driver for         *
  * Fibre Channel Host Bus Adapters.                                *
- * Copyright (C) 2004-2009 Emulex.  All rights reserved.           *
+ * Copyright (C) 2004-2011 Emulex.  All rights reserved.           *
  * EMULEX and SLI are trademarks of Emulex.                        *
  * www.emulex.com                                                  *
  * Portions Copyright (C) 2004-2005 Christoph Hellwig              *
@@ -577,7 +577,7 @@ lpfc_new_scsi_buf_s3(struct lpfc_vport *vport, int num_to_alloc)
                         iocb->un.fcpi64.bdl.addrHigh = 0;
                         iocb->ulpBdeCount = 0;
                         iocb->ulpLe = 0;
-                        /* fill in responce BDE */
+                        /* fill in response BDE */
                         iocb->unsli3.fcp_ext.rbde.tus.f.bdeFlags =
                                                         BUFF_TYPE_BDE_64;
                         iocb->unsli3.fcp_ext.rbde.tus.f.bdeSize =
@@ -1217,10 +1217,10 @@ lpfc_scsi_prep_dma_buf_s3(struct lpfc_hba *phba, struct lpfc_scsi_buf *lpfc_cmd)
                                      (2 * sizeof(struct ulp_bde64)));
                         data_bde->addrHigh = putPaddrHigh(physaddr);
                         data_bde->addrLow = putPaddrLow(physaddr);
-                        /* ebde count includes the responce bde and data bpl */
+                        /* ebde count includes the response bde and data bpl */
                         iocb_cmd->unsli3.fcp_ext.ebde_count = 2;
                 } else {
-                        /* ebde count includes the responce bde and data bdes */
+                        /* ebde count includes the response bde and data bdes */
                         iocb_cmd->unsli3.fcp_ext.ebde_count = (num_bde + 1);
                 }
         } else {
@@ -1514,10 +1514,11 @@ lpfc_bg_setup_bpl_prot(struct lpfc_hba *phba, struct scsi_cmnd *sc,
         struct scatterlist *sgpe = NULL; /* s/g prot entry */
         struct lpfc_pde5 *pde5 = NULL;
         struct lpfc_pde6 *pde6 = NULL;
-        struct ulp_bde64 *prot_bde = NULL;
+        struct lpfc_pde7 *pde7 = NULL;
         dma_addr_t dataphysaddr, protphysaddr;
         unsigned short curr_data = 0, curr_prot = 0;
-        unsigned int split_offset, protgroup_len;
+        unsigned int split_offset;
+        unsigned int protgroup_len, protgroup_offset = 0, protgroup_remainder;
         unsigned int protgrp_blks, protgrp_bytes;
         unsigned int remainder, subtotal;
         int status;
@@ -1585,23 +1586,33 @@ lpfc_bg_setup_bpl_prot(struct lpfc_hba *phba, struct scsi_cmnd *sc,
                 bpl++;
 
                 /* setup the first BDE that points to protection buffer */
-                prot_bde = (struct ulp_bde64 *) bpl;
-                protphysaddr = sg_dma_address(sgpe);
-                prot_bde->addrHigh = le32_to_cpu(putPaddrLow(protphysaddr));
-                prot_bde->addrLow = le32_to_cpu(putPaddrHigh(protphysaddr));
-                protgroup_len = sg_dma_len(sgpe);
+                protphysaddr = sg_dma_address(sgpe) + protgroup_offset;
+                protgroup_len = sg_dma_len(sgpe) - protgroup_offset;
 
                 /* must be integer multiple of the DIF block length */
                 BUG_ON(protgroup_len % 8);
 
+                pde7 = (struct lpfc_pde7 *) bpl;
+                memset(pde7, 0, sizeof(struct lpfc_pde7));
+                bf_set(pde7_type, pde7, LPFC_PDE7_DESCRIPTOR);
+
+                pde7->addrHigh = le32_to_cpu(putPaddrLow(protphysaddr));
+                pde7->addrLow = le32_to_cpu(putPaddrHigh(protphysaddr));
+
                 protgrp_blks = protgroup_len / 8;
                 protgrp_bytes = protgrp_blks * blksize;
 
-                prot_bde->tus.f.bdeSize = protgroup_len;
-                prot_bde->tus.f.bdeFlags = LPFC_PDE7_DESCRIPTOR;
-                prot_bde->tus.w = le32_to_cpu(bpl->tus.w);
+                /* check if this pde is crossing the 4K boundary; if so split */
+                if ((pde7->addrLow & 0xfff) + protgroup_len > 0x1000) {
+                        protgroup_remainder = 0x1000 - (pde7->addrLow & 0xfff);
+                        protgroup_offset += protgroup_remainder;
+                        protgrp_blks = protgroup_remainder / 8;
+                        protgrp_bytes = protgroup_remainder * blksize;
+                } else {
+                        protgroup_offset = 0;
+                        curr_prot++;
+                }
 
-                curr_prot++;
                 num_bde++;
 
                 /* setup BDE's for data blocks associated with DIF data */
@@ -1653,6 +1664,13 @@ lpfc_bg_setup_bpl_prot(struct lpfc_hba *phba, struct scsi_cmnd *sc,
 
                 }
 
+                if (protgroup_offset) {
+                        /* update the reference tag */
+                        reftag += protgrp_blks;
+                        bpl++;
+                        continue;
+                }
+
                 /* are we done ? */
                 if (curr_prot == protcnt) {
                         alldone = 1;
@@ -1675,6 +1693,7 @@ out:
 
         return num_bde;
 }
+
 /*
  * Given a SCSI command that supports DIF, determine composition of protection
  * groups involved in setting up buffer lists
@@ -2361,7 +2380,7 @@ lpfc_handle_fcp_err(struct lpfc_vport *vport, struct lpfc_scsi_buf *lpfc_cmd,
                 }
                 /*
                  * The cmnd->underflow is the minimum number of bytes that must
-                 * be transfered for this command.  Provided a sense condition
+                 * be transferred for this command.  Provided a sense condition
                  * is not present, make sure the actual amount transferred is at
                  * least the underflow value or fail.
                  */
@@ -2854,7 +2873,7 @@ lpfc_scsi_prep_task_mgmt_cmd(struct lpfc_vport *vport,
 }
 
 /**
- * lpfc_scsi_api_table_setup - Set up scsi api fucntion jump table
+ * lpfc_scsi_api_table_setup - Set up scsi api function jump table
  * @phba: The hba struct for which this call is being executed.
  * @dev_grp: The HBA PCI-Device group number.
  *
diff --git a/drivers/scsi/lpfc/lpfc_scsi.h b/drivers/scsi/lpfc/lpfc_scsi.h
index 5932273870a5..ce645b20a6ad 100644
--- a/drivers/scsi/lpfc/lpfc_scsi.h
+++ b/drivers/scsi/lpfc/lpfc_scsi.h
@@ -130,7 +130,7 @@ struct lpfc_scsi_buf {
         dma_addr_t nonsg_phys;  /* Non scatter-gather physical address. */
 
         /*
-         * data and dma_handle are the kernel virutal and bus address of the
+         * data and dma_handle are the kernel virtual and bus address of the
          * dma-able buffer containing the fcp_cmd, fcp_rsp and a scatter
          * gather bde list that supports the sg_tablesize value.
          */
diff --git a/drivers/scsi/lpfc/lpfc_sli.c b/drivers/scsi/lpfc/lpfc_sli.c
index 2ee0374a9908..dacabbe0a586 100644
--- a/drivers/scsi/lpfc/lpfc_sli.c
+++ b/drivers/scsi/lpfc/lpfc_sli.c
@@ -1,7 +1,7 @@
 /*******************************************************************
  * This file is part of the Emulex Linux Device Driver for         *
  * Fibre Channel Host Bus Adapters.                                *
- * Copyright (C) 2004-2009 Emulex.  All rights reserved.           *
+ * Copyright (C) 2004-2011 Emulex.  All rights reserved.           *
  * EMULEX and SLI are trademarks of Emulex.                        *
  * www.emulex.com                                                  *
  * Portions Copyright (C) 2004-2005 Christoph Hellwig              *
@@ -2817,7 +2817,7 @@ void lpfc_poll_eratt(unsigned long ptr)
  * This function is called from the interrupt context when there is a ring
  * event for the fcp ring. The caller does not hold any lock.
  * The function processes each response iocb in the response ring until it
- * finds an iocb with LE bit set and chains all the iocbs upto the iocb with
+ * finds an iocb with LE bit set and chains all the iocbs up to the iocb with
  * LE bit set. The function will call the completion handler of the command iocb
  * if the response iocb indicates a completion for a command iocb or it is
  * an abort completion. The function will call lpfc_sli_process_unsol_iocb
@@ -3477,7 +3477,8 @@ lpfc_sli_brdready_s3(struct lpfc_hba *phba, uint32_t mask)
         int retval = 0;
 
         /* Read the HBA Host Status Register */
-        status = readl(phba->HSregaddr);
+        if (lpfc_readl(phba->HSregaddr, &status))
+                return 1;
 
         /*
          * Check status register every 100ms for 5 retries, then every
@@ -3502,7 +3503,10 @@ lpfc_sli_brdready_s3(struct lpfc_hba *phba, uint32_t mask)
                         lpfc_sli_brdrestart(phba);
                 }
                 /* Read the HBA Host Status Register */
-                status = readl(phba->HSregaddr);
+                if (lpfc_readl(phba->HSregaddr, &status)) {
+                        retval = 1;
+                        break;
+                }
         }
 
         /* Check to see if any errors occurred during init */
@@ -3584,7 +3588,7 @@ void lpfc_reset_barrier(struct lpfc_hba *phba)
         uint32_t __iomem *resp_buf;
         uint32_t __iomem *mbox_buf;
         volatile uint32_t mbox;
-        uint32_t hc_copy;
+        uint32_t hc_copy, ha_copy, resp_data;
         int  i;
         uint8_t hdrtype;
 
@@ -3601,12 +3605,15 @@ void lpfc_reset_barrier(struct lpfc_hba *phba)
         resp_buf = phba->MBslimaddr;
 
         /* Disable the error attention */
-        hc_copy = readl(phba->HCregaddr);
+        if (lpfc_readl(phba->HCregaddr, &hc_copy))
+                return;
         writel((hc_copy & ~HC_ERINT_ENA), phba->HCregaddr);
         readl(phba->HCregaddr); /* flush */
         phba->link_flag |= LS_IGNORE_ERATT;
 
-        if (readl(phba->HAregaddr) & HA_ERATT) {
+        if (lpfc_readl(phba->HAregaddr, &ha_copy))
+                return;
+        if (ha_copy & HA_ERATT) {
                 /* Clear Chip error bit */
                 writel(HA_ERATT, phba->HAregaddr);
                 phba->pport->stopped = 1;
@@ -3620,11 +3627,18 @@ void lpfc_reset_barrier(struct lpfc_hba *phba)
         mbox_buf = phba->MBslimaddr;
         writel(mbox, mbox_buf);
 
-        for (i = 0;
-             readl(resp_buf + 1) != ~(BARRIER_TEST_PATTERN) && i < 50; i++)
-                mdelay(1);
-
-        if (readl(resp_buf + 1) != ~(BARRIER_TEST_PATTERN)) {
+        for (i = 0; i < 50; i++) {
+                if (lpfc_readl((resp_buf + 1), &resp_data))
+                        return;
+                if (resp_data != ~(BARRIER_TEST_PATTERN))
+                        mdelay(1);
+                else
+                        break;
+        }
+        resp_data = 0;
+        if (lpfc_readl((resp_buf + 1), &resp_data))
+                return;
+        if (resp_data  != ~(BARRIER_TEST_PATTERN)) {
                 if (phba->sli.sli_flag & LPFC_SLI_ACTIVE ||
                     phba->pport->stopped)
                         goto restore_hc;
@@ -3633,13 +3647,26 @@ void lpfc_reset_barrier(struct lpfc_hba *phba)
         }
 
         ((MAILBOX_t *)&mbox)->mbxOwner = OWN_HOST;
-        for (i = 0; readl(resp_buf) != mbox &&  i < 500; i++)
-                mdelay(1);
+        resp_data = 0;
+        for (i = 0; i < 500; i++) {
+                if (lpfc_readl(resp_buf, &resp_data))
+                        return;
+                if (resp_data != mbox)
+                        mdelay(1);
+                else
+                        break;
+        }
 
 clear_errat:
 
-        while (!(readl(phba->HAregaddr) & HA_ERATT) && ++i < 500)
-                mdelay(1);
+        while (++i < 500) {
+                if (lpfc_readl(phba->HAregaddr, &ha_copy))
+                        return;
+                if (!(ha_copy & HA_ERATT))
+                        mdelay(1);
+                else
+                        break;
+        }
 
         if (readl(phba->HAregaddr) & HA_ERATT) {
                 writel(HA_ERATT, phba->HAregaddr);
@@ -3686,7 +3713,11 @@ lpfc_sli_brdkill(struct lpfc_hba *phba)
 
         /* Disable the error attention */
         spin_lock_irq(&phba->hbalock);
-        status = readl(phba->HCregaddr);
+        if (lpfc_readl(phba->HCregaddr, &status)) {
+                spin_unlock_irq(&phba->hbalock);
+                mempool_free(pmb, phba->mbox_mem_pool);
+                return 1;
+        }
         status &= ~HC_ERINT_ENA;
         writel(status, phba->HCregaddr);
         readl(phba->HCregaddr); /* flush */
@@ -3720,11 +3751,12 @@ lpfc_sli_brdkill(struct lpfc_hba *phba)
          * 3 seconds we still set HBA_ERROR state because the status of the
          * board is now undefined.
          */
-        ha_copy = readl(phba->HAregaddr);
-
+        if (lpfc_readl(phba->HAregaddr, &ha_copy))
+                return 1;
         while ((i++ < 30) && !(ha_copy & HA_ERATT)) {
                 mdelay(100);
-                ha_copy = readl(phba->HAregaddr);
+                if (lpfc_readl(phba->HAregaddr, &ha_copy))
+                        return 1;
         }
 
         del_timer_sync(&psli->mbox_tmo);
@@ -4018,7 +4050,8 @@ lpfc_sli_chipset_init(struct lpfc_hba *phba)
         uint32_t status, i = 0;
 
         /* Read the HBA Host Status Register */
-        status = readl(phba->HSregaddr);
+        if (lpfc_readl(phba->HSregaddr, &status))
+                return -EIO;
 
         /* Check status register to see what current state is */
         i = 0;
@@ -4073,7 +4106,8 @@ lpfc_sli_chipset_init(struct lpfc_hba *phba)
                         lpfc_sli_brdrestart(phba);
                 }
                 /* Read the HBA Host Status Register */
-                status = readl(phba->HSregaddr);
+                if (lpfc_readl(phba->HSregaddr, &status))
+                        return -EIO;
         }
 
         /* Check to see if any errors occurred during init */
@@ -5083,7 +5117,7 @@ lpfc_mbox_timeout_handler(struct lpfc_hba *phba)
 
         /* Setting state unknown so lpfc_sli_abort_iocb_ring
          * would get IOCB_ERROR from lpfc_sli_issue_iocb, allowing
-         * it to fail all oustanding SCSI IO.
+         * it to fail all outstanding SCSI IO.
          */
         spin_lock_irq(&phba->pport->work_port_lock);
         phba->pport->work_port_events &= ~WORKER_MBOX_TMO;
@@ -5136,7 +5170,7 @@ lpfc_sli_issue_mbox_s3(struct lpfc_hba *phba, LPFC_MBOXQ_t *pmbox,
         MAILBOX_t *mb;
         struct lpfc_sli *psli = &phba->sli;
         uint32_t status, evtctr;
-        uint32_t ha_copy;
+        uint32_t ha_copy, hc_copy;
         int i;
         unsigned long timeout;
         unsigned long drvr_flag = 0;
@@ -5202,15 +5236,17 @@ lpfc_sli_issue_mbox_s3(struct lpfc_hba *phba, LPFC_MBOXQ_t *pmbox,
                 goto out_not_finished;
         }
 
-        if (mb->mbxCommand != MBX_KILL_BOARD && flag & MBX_NOWAIT &&
-            !(readl(phba->HCregaddr) & HC_MBINT_ENA)) {
-                spin_unlock_irqrestore(&phba->hbalock, drvr_flag);
-                lpfc_printf_log(phba, KERN_ERR, LOG_MBOX | LOG_SLI,
+        if (mb->mbxCommand != MBX_KILL_BOARD && flag & MBX_NOWAIT) {
+                if (lpfc_readl(phba->HCregaddr, &hc_copy) ||
+                        !(hc_copy & HC_MBINT_ENA)) {
+                        spin_unlock_irqrestore(&phba->hbalock, drvr_flag);
+                        lpfc_printf_log(phba, KERN_ERR, LOG_MBOX | LOG_SLI,
                                 "(%d):2528 Mailbox command x%x cannot "
                                 "issue Data: x%x x%x\n",
                                 pmbox->vport ? pmbox->vport->vpi : 0,
                                 pmbox->u.mb.mbxCommand, psli->sli_flag, flag);
-                goto out_not_finished;
+                        goto out_not_finished;
+                }
         }
 
         if (psli->sli_flag & LPFC_SLI_MBOX_ACTIVE) {
@@ -5408,11 +5444,19 @@ lpfc_sli_issue_mbox_s3(struct lpfc_hba *phba, LPFC_MBOXQ_t *pmbox,
                         word0 = le32_to_cpu(word0);
                 } else {
                         /* First read mbox status word */
-                        word0 = readl(phba->MBslimaddr);
+                        if (lpfc_readl(phba->MBslimaddr, &word0)) {
+                                spin_unlock_irqrestore(&phba->hbalock,
+                                                       drvr_flag);
+                                goto out_not_finished;
+                        }
                 }
 
                 /* Read the HBA Host Attention Register */
-                ha_copy = readl(phba->HAregaddr);
+                if (lpfc_readl(phba->HAregaddr, &ha_copy)) {
+                        spin_unlock_irqrestore(&phba->hbalock,
+                                                       drvr_flag);
+                        goto out_not_finished;
+                }
                 timeout = msecs_to_jiffies(lpfc_mbox_tmo_val(phba,
                                                              mb->mbxCommand) *
                                            1000) + jiffies;
@@ -5463,7 +5507,11 @@ lpfc_sli_issue_mbox_s3(struct lpfc_hba *phba, LPFC_MBOXQ_t *pmbox,
                                 word0 = readl(phba->MBslimaddr);
                         }
                         /* Read the HBA Host Attention Register */
-                        ha_copy = readl(phba->HAregaddr);
+                        if (lpfc_readl(phba->HAregaddr, &ha_copy)) {
+                                spin_unlock_irqrestore(&phba->hbalock,
+                                                       drvr_flag);
+                                goto out_not_finished;
+                        }
                 }
 
                 if (psli->sli_flag & LPFC_SLI_ACTIVE) {
@@ -5983,7 +6031,7 @@ lpfc_sli_issue_mbox(struct lpfc_hba *phba, LPFC_MBOXQ_t *pmbox, uint32_t flag)
 }
 
 /**
- * lpfc_mbox_api_table_setup - Set up mbox api fucntion jump table
+ * lpfc_mbox_api_table_setup - Set up mbox api function jump table
  * @phba: The hba struct for which this call is being executed.
  * @dev_grp: The HBA PCI-Device group number.
  *
@@ -6263,7 +6311,6 @@ lpfc_sli4_bpl2sgl(struct lpfc_hba *phba, struct lpfc_iocbq *piocbq,
                                 bf_set(lpfc_sli4_sge_last, sgl, 1);
                         else
                                 bf_set(lpfc_sli4_sge_last, sgl, 0);
-                        sgl->word2 = cpu_to_le32(sgl->word2);
                         /* swap the size field back to the cpu so we
                          * can assign it to the sgl.
                          */
@@ -6283,6 +6330,7 @@ lpfc_sli4_bpl2sgl(struct lpfc_hba *phba, struct lpfc_iocbq *piocbq,
                                 bf_set(lpfc_sli4_sge_offset, sgl, offset);
                                 offset += bde.tus.f.bdeSize;
                         }
+                        sgl->word2 = cpu_to_le32(sgl->word2);
                         bpl++;
                         sgl++;
                 }
@@ -6528,9 +6576,9 @@ lpfc_sli4_iocb2wqe(struct lpfc_hba *phba, struct lpfc_iocbq *iocbq,
                 numBdes = iocbq->iocb.un.genreq64.bdl.bdeSize /
                         sizeof(struct ulp_bde64);
                 for (i = 0; i < numBdes; i++) {
-                        if (bpl[i].tus.f.bdeFlags != BUFF_TYPE_BDE_64)
-                                break;
                         bde.tus.w = le32_to_cpu(bpl[i].tus.w);
+                        if (bde.tus.f.bdeFlags != BUFF_TYPE_BDE_64)
+                                break;
                         xmit_len += bde.tus.f.bdeSize;
                 }
                 /* word3 iocb=IO_TAG wqe=request_payload_len */
@@ -6620,15 +6668,15 @@ lpfc_sli4_iocb2wqe(struct lpfc_hba *phba, struct lpfc_iocbq *iocbq,
                 xritag = 0;
         break;
         case CMD_XMIT_BLS_RSP64_CX:
-                /* As BLS ABTS-ACC WQE is very different from other WQEs,
+                /* As BLS ABTS RSP WQE is very different from other WQEs,
                  * we re-construct this WQE here based on information in
                  * iocbq from scratch.
                  */
                 memset(wqe, 0, sizeof(union lpfc_wqe));
                 /* OX_ID is invariable to who sent ABTS to CT exchange */
                 bf_set(xmit_bls_rsp64_oxid, &wqe->xmit_bls_rsp,
-                       bf_get(lpfc_abts_oxid, &iocbq->iocb.un.bls_acc));
-                if (bf_get(lpfc_abts_orig, &iocbq->iocb.un.bls_acc) ==
+                       bf_get(lpfc_abts_oxid, &iocbq->iocb.un.bls_rsp));
+                if (bf_get(lpfc_abts_orig, &iocbq->iocb.un.bls_rsp) ==
                     LPFC_ABTS_UNSOL_INT) {
                         /* ABTS sent by initiator to CT exchange, the
                          * RX_ID field will be filled with the newly
@@ -6642,7 +6690,7 @@ lpfc_sli4_iocb2wqe(struct lpfc_hba *phba, struct lpfc_iocbq *iocbq,
                          * RX_ID from ABTS.
                          */
                         bf_set(xmit_bls_rsp64_rxid, &wqe->xmit_bls_rsp,
-                               bf_get(lpfc_abts_rxid, &iocbq->iocb.un.bls_acc));
+                               bf_get(lpfc_abts_rxid, &iocbq->iocb.un.bls_rsp));
                 }
                 bf_set(xmit_bls_rsp64_seqcnthi, &wqe->xmit_bls_rsp, 0xffff);
                 bf_set(wqe_xmit_bls_pt, &wqe->xmit_bls_rsp.wqe_dest, 0x1);
@@ -6653,6 +6701,15 @@ lpfc_sli4_iocb2wqe(struct lpfc_hba *phba, struct lpfc_iocbq *iocbq,
                        LPFC_WQE_LENLOC_NONE);
                 /* Overwrite the pre-set comnd type with OTHER_COMMAND */
                 command_type = OTHER_COMMAND;
+                if (iocbq->iocb.un.xseq64.w5.hcsw.Rctl == FC_RCTL_BA_RJT) {
+                        bf_set(xmit_bls_rsp64_rjt_vspec, &wqe->xmit_bls_rsp,
+                               bf_get(lpfc_vndr_code, &iocbq->iocb.un.bls_rsp));
+                        bf_set(xmit_bls_rsp64_rjt_expc, &wqe->xmit_bls_rsp,
+                               bf_get(lpfc_rsn_expln, &iocbq->iocb.un.bls_rsp));
+                        bf_set(xmit_bls_rsp64_rjt_rsnc, &wqe->xmit_bls_rsp,
+                               bf_get(lpfc_rsn_code, &iocbq->iocb.un.bls_rsp));
+                }
+
         break;
         case CMD_XRI_ABORTED_CX:
         case CMD_CREATE_XRI_CR: /* Do we expect to use this? */
@@ -6701,7 +6758,8 @@ __lpfc_sli_issue_iocb_s4(struct lpfc_hba *phba, uint32_t ring_number,
 
         if (piocb->sli4_xritag == NO_XRI) {
                 if (piocb->iocb.ulpCommand == CMD_ABORT_XRI_CN ||
-                    piocb->iocb.ulpCommand == CMD_CLOSE_XRI_CN)
+                    piocb->iocb.ulpCommand == CMD_CLOSE_XRI_CN ||
+                    piocb->iocb.ulpCommand == CMD_XMIT_BLS_RSP64_CX)
                         sglq = NULL;
                 else {
                         if (pring->txq_cnt) {
@@ -6789,7 +6847,7 @@ __lpfc_sli_issue_iocb(struct lpfc_hba *phba, uint32_t ring_number,
 }
 
 /**
- * lpfc_sli_api_table_setup - Set up sli api fucntion jump table
+ * lpfc_sli_api_table_setup - Set up sli api function jump table
  * @phba: The hba struct for which this call is being executed.
  * @dev_grp: The HBA PCI-Device group number.
  *
@@ -7463,7 +7521,7 @@ lpfc_sli_ring_taggedbuf_get(struct lpfc_hba *phba, struct lpfc_sli_ring *pring,
         struct lpfc_dmabuf *mp, *next_mp;
         struct list_head *slp = &pring->postbufq;
 
-        /* Search postbufq, from the begining, looking for a match on tag */
+        /* Search postbufq, from the beginning, looking for a match on tag */
         spin_lock_irq(&phba->hbalock);
         list_for_each_entry_safe(mp, next_mp, &pring->postbufq, list) {
                 if (mp->buffer_tag == tag) {
@@ -7507,7 +7565,7 @@ lpfc_sli_ringpostbuf_get(struct lpfc_hba *phba, struct lpfc_sli_ring *pring,
         struct lpfc_dmabuf *mp, *next_mp;
         struct list_head *slp = &pring->postbufq;
 
-        /* Search postbufq, from the begining, looking for a match on phys */
+        /* Search postbufq, from the beginning, looking for a match on phys */
         spin_lock_irq(&phba->hbalock);
         list_for_each_entry_safe(mp, next_mp, &pring->postbufq, list) {
                 if (mp->phys == phys) {
@@ -8194,7 +8252,8 @@ lpfc_sli_issue_iocb_wait(struct lpfc_hba *phba,
         piocb->iocb_flag &= ~LPFC_IO_WAKE;
 
         if (phba->cfg_poll & DISABLE_FCP_RING_INT) {
-                creg_val = readl(phba->HCregaddr);
+                if (lpfc_readl(phba->HCregaddr, &creg_val))
+                        return IOCB_ERROR;
                 creg_val |= (HC_R0INT_ENA << LPFC_FCP_RING);
                 writel(creg_val, phba->HCregaddr);
                 readl(phba->HCregaddr); /* flush */
@@ -8236,7 +8295,8 @@ lpfc_sli_issue_iocb_wait(struct lpfc_hba *phba,
         }
 
         if (phba->cfg_poll & DISABLE_FCP_RING_INT) {
-                creg_val = readl(phba->HCregaddr);
+                if (lpfc_readl(phba->HCregaddr, &creg_val))
+                        return IOCB_ERROR;
                 creg_val &= ~(HC_R0INT_ENA << LPFC_FCP_RING);
                 writel(creg_val, phba->HCregaddr);
                 readl(phba->HCregaddr); /* flush */
@@ -8378,7 +8438,7 @@ lpfc_sli_mbox_sys_shutdown(struct lpfc_hba *phba)
  * for possible error attention events. The caller must hold the hostlock
  * with spin_lock_irq().
  *
- * This fucntion returns 1 when there is Error Attention in the Host Attention
+ * This function returns 1 when there is Error Attention in the Host Attention
  * Register and returns 0 otherwise.
  **/
 static int
@@ -8387,10 +8447,13 @@ lpfc_sli_eratt_read(struct lpfc_hba *phba)
         uint32_t ha_copy;
 
         /* Read chip Host Attention (HA) register */
-        ha_copy = readl(phba->HAregaddr);
+        if (lpfc_readl(phba->HAregaddr, &ha_copy))
+                goto unplug_err;
+
         if (ha_copy & HA_ERATT) {
                 /* Read host status register to retrieve error event */
-                lpfc_sli_read_hs(phba);
+                if (lpfc_sli_read_hs(phba))
+                        goto unplug_err;
 
                 /* Check if there is a deferred error condition is active */
                 if ((HS_FFER1 & phba->work_hs) &&
@@ -8409,6 +8472,15 @@ lpfc_sli_eratt_read(struct lpfc_hba *phba)
                 return 1;
         }
         return 0;
+
+unplug_err:
+        /* Set the driver HS work bitmap */
+        phba->work_hs |= UNPLUG_ERR;
+        /* Set the driver HA work bitmap */
+        phba->work_ha |= HA_ERATT;
+        /* Indicate polling handles this ERATT */
+        phba->hba_flag |= HBA_ERATT_HANDLED;
+        return 1;
 }
 
 /**
@@ -8419,7 +8491,7 @@ lpfc_sli_eratt_read(struct lpfc_hba *phba)
  * for possible error attention events. The caller must hold the hostlock
  * with spin_lock_irq().
  *
- * This fucntion returns 1 when there is Error Attention in the Host Attention
+ * This function returns 1 when there is Error Attention in the Host Attention
  * Register and returns 0 otherwise.
  **/
 static int
@@ -8436,8 +8508,15 @@ lpfc_sli4_eratt_read(struct lpfc_hba *phba)
         if_type = bf_get(lpfc_sli_intf_if_type, &phba->sli4_hba.sli_intf);
         switch (if_type) {
         case LPFC_SLI_INTF_IF_TYPE_0:
-                uerr_sta_lo = readl(phba->sli4_hba.u.if_type0.UERRLOregaddr);
-                uerr_sta_hi = readl(phba->sli4_hba.u.if_type0.UERRHIregaddr);
+                if (lpfc_readl(phba->sli4_hba.u.if_type0.UERRLOregaddr,
+                        &uerr_sta_lo) ||
+                        lpfc_readl(phba->sli4_hba.u.if_type0.UERRHIregaddr,
+                        &uerr_sta_hi)) {
+                        phba->work_hs |= UNPLUG_ERR;
+                        phba->work_ha |= HA_ERATT;
+                        phba->hba_flag |= HBA_ERATT_HANDLED;
+                        return 1;
+                }
                 if ((~phba->sli4_hba.ue_mask_lo & uerr_sta_lo) ||
                     (~phba->sli4_hba.ue_mask_hi & uerr_sta_hi)) {
                         lpfc_printf_log(phba, KERN_ERR, LOG_INIT,
@@ -8456,9 +8535,15 @@ lpfc_sli4_eratt_read(struct lpfc_hba *phba)
                 }
                 break;
         case LPFC_SLI_INTF_IF_TYPE_2:
-                portstat_reg.word0 =
-                        readl(phba->sli4_hba.u.if_type2.STATUSregaddr);
-                portsmphr = readl(phba->sli4_hba.PSMPHRregaddr);
+                if (lpfc_readl(phba->sli4_hba.u.if_type2.STATUSregaddr,
+                        &portstat_reg.word0) ||
+                        lpfc_readl(phba->sli4_hba.PSMPHRregaddr,
+                        &portsmphr)){
+                        phba->work_hs |= UNPLUG_ERR;
+                        phba->work_ha |= HA_ERATT;
+                        phba->hba_flag |= HBA_ERATT_HANDLED;
+                        return 1;
+                }
                 if (bf_get(lpfc_sliport_status_err, &portstat_reg)) {
                         phba->work_status[0] =
                                 readl(phba->sli4_hba.u.if_type2.ERR1regaddr);
@@ -8496,7 +8581,7 @@ lpfc_sli4_eratt_read(struct lpfc_hba *phba)
  * This function is called from timer soft interrupt context to check HBA's
  * error attention register bit for error attention events.
  *
- * This fucntion returns 1 when there is Error Attention in the Host Attention
+ * This function returns 1 when there is Error Attention in the Host Attention
  * Register and returns 0 otherwise.
  **/
 int
@@ -8639,7 +8724,8 @@ lpfc_sli_sp_intr_handler(int irq, void *dev_id)
                         return IRQ_NONE;
                 /* Need to read HA REG for slow-path events */
                 spin_lock_irqsave(&phba->hbalock, iflag);
-                ha_copy = readl(phba->HAregaddr);
+                if (lpfc_readl(phba->HAregaddr, &ha_copy))
+                        goto unplug_error;
                 /* If somebody is waiting to handle an eratt don't process it
                  * here. The brdkill function will do this.
                  */
@@ -8665,7 +8751,9 @@ lpfc_sli_sp_intr_handler(int irq, void *dev_id)
                 }
 
                 /* Clear up only attention source related to slow-path */
-                hc_copy = readl(phba->HCregaddr);
+                if (lpfc_readl(phba->HCregaddr, &hc_copy))
+                        goto unplug_error;
+
                 writel(hc_copy & ~(HC_MBINT_ENA | HC_R2INT_ENA |
                         HC_LAINT_ENA | HC_ERINT_ENA),
                         phba->HCregaddr);
@@ -8688,7 +8776,8 @@ lpfc_sli_sp_intr_handler(int irq, void *dev_id)
                                  */
                                 spin_lock_irqsave(&phba->hbalock, iflag);
                                 phba->sli.sli_flag &= ~LPFC_PROCESS_LA;
-                                control = readl(phba->HCregaddr);
+                                if (lpfc_readl(phba->HCregaddr, &control))
+                                        goto unplug_error;
                                 control &= ~HC_LAINT_ENA;
                                 writel(control, phba->HCregaddr);
                                 readl(phba->HCregaddr); /* flush */
@@ -8708,7 +8797,8 @@ lpfc_sli_sp_intr_handler(int irq, void *dev_id)
                         status >>= (4*LPFC_ELS_RING);
                         if (status & HA_RXMASK) {
                                 spin_lock_irqsave(&phba->hbalock, iflag);
-                                control = readl(phba->HCregaddr);
+                                if (lpfc_readl(phba->HCregaddr, &control))
+                                        goto unplug_error;
 
                                 lpfc_debugfs_slow_ring_trc(phba,
                                 "ISR slow ring:   ctl:x%x stat:x%x isrcnt:x%x",
@@ -8741,7 +8831,8 @@ lpfc_sli_sp_intr_handler(int irq, void *dev_id)
                 }
                 spin_lock_irqsave(&phba->hbalock, iflag);
                 if (work_ha_copy & HA_ERATT) {
-                        lpfc_sli_read_hs(phba);
+                        if (lpfc_sli_read_hs(phba))
+                                goto unplug_error;
                         /*
                          * Check if there is a deferred error condition
                          * is active
@@ -8872,6 +8963,9 @@ send_current_mbox:
                 lpfc_worker_wake_up(phba);
         }
         return IRQ_HANDLED;
+unplug_error:
+        spin_unlock_irqrestore(&phba->hbalock, iflag);
+        return IRQ_HANDLED;
 
 } /* lpfc_sli_sp_intr_handler */
 
@@ -8919,7 +9013,8 @@ lpfc_sli_fp_intr_handler(int irq, void *dev_id)
                 if (lpfc_intr_state_check(phba))
                         return IRQ_NONE;
                 /* Need to read HA REG for FCP ring and other ring events */
-                ha_copy = readl(phba->HAregaddr);
+                if (lpfc_readl(phba->HAregaddr, &ha_copy))
+                        return IRQ_HANDLED;
                 /* Clear up only attention source related to fast-path */
                 spin_lock_irqsave(&phba->hbalock, iflag);
                 /*
@@ -9004,7 +9099,11 @@ lpfc_sli_intr_handler(int irq, void *dev_id)
                 return IRQ_NONE;
 
         spin_lock(&phba->hbalock);
-        phba->ha_copy = readl(phba->HAregaddr);
+        if (lpfc_readl(phba->HAregaddr, &phba->ha_copy)) {
+                spin_unlock(&phba->hbalock);
+                return IRQ_HANDLED;
+        }
+
         if (unlikely(!phba->ha_copy)) {
                 spin_unlock(&phba->hbalock);
                 return IRQ_NONE;
@@ -9026,7 +9125,10 @@ lpfc_sli_intr_handler(int irq, void *dev_id)
         }
 
         /* Clear attention sources except link and error attentions */
-        hc_copy = readl(phba->HCregaddr);
+        if (lpfc_readl(phba->HCregaddr, &hc_copy)) {
+                spin_unlock(&phba->hbalock);
+                return IRQ_HANDLED;
+        }
         writel(hc_copy & ~(HC_MBINT_ENA | HC_R0INT_ENA | HC_R1INT_ENA
                 | HC_R2INT_ENA | HC_LAINT_ENA | HC_ERINT_ENA),
                 phba->HCregaddr);
@@ -9582,7 +9684,7 @@ out:
  * @cq: Pointer to the completion queue.
  * @wcqe: Pointer to a completion queue entry.
  *
- * This routine process a slow-path work-queue or recieve queue completion queue
+ * This routine process a slow-path work-queue or receive queue completion queue
  * entry.
  *
  * Return: true if work posted to worker thread, otherwise false.
@@ -10403,7 +10505,6 @@ lpfc_cq_create(struct lpfc_hba *phba, struct lpfc_queue *cq,
         if (!phba->sli4_hba.pc_sli4_params.supported)
                 hw_page_size = SLI4_PAGE_SIZE;
 
-
         mbox = mempool_alloc(phba->mbox_mem_pool, GFP_KERNEL);
         if (!mbox)
                 return -ENOMEM;
@@ -10413,11 +10514,22 @@ lpfc_cq_create(struct lpfc_hba *phba, struct lpfc_queue *cq,
                          LPFC_MBOX_OPCODE_CQ_CREATE,
                          length, LPFC_SLI4_MBX_EMBED);
         cq_create = &mbox->u.mqe.un.cq_create;
+        shdr = (union lpfc_sli4_cfg_shdr *) &cq_create->header.cfg_shdr;
         bf_set(lpfc_mbx_cq_create_num_pages, &cq_create->u.request,
                     cq->page_count);
         bf_set(lpfc_cq_context_event, &cq_create->u.request.context, 1);
         bf_set(lpfc_cq_context_valid, &cq_create->u.request.context, 1);
-        bf_set(lpfc_cq_eq_id, &cq_create->u.request.context, eq->queue_id);
+        bf_set(lpfc_mbox_hdr_version, &shdr->request,
+               phba->sli4_hba.pc_sli4_params.cqv);
+        if (phba->sli4_hba.pc_sli4_params.cqv == LPFC_Q_CREATE_VERSION_2) {
+                bf_set(lpfc_mbx_cq_create_page_size, &cq_create->u.request,
+                       (PAGE_SIZE/SLI4_PAGE_SIZE));
+                bf_set(lpfc_cq_eq_id_2, &cq_create->u.request.context,
+                       eq->queue_id);
+        } else {
+                bf_set(lpfc_cq_eq_id, &cq_create->u.request.context,
+                       eq->queue_id);
+        }
         switch (cq->entry_count) {
         default:
                 lpfc_printf_log(phba, KERN_ERR, LOG_SLI,
@@ -10449,7 +10561,6 @@ lpfc_cq_create(struct lpfc_hba *phba, struct lpfc_queue *cq,
         rc = lpfc_sli_issue_mbox(phba, mbox, MBX_POLL);
 
         /* The IOCTL status is embedded in the mailbox subheader. */
-        shdr = (union lpfc_sli4_cfg_shdr *) &cq_create->header.cfg_shdr;
         shdr_status = bf_get(lpfc_mbox_hdr_status, &shdr->response);
         shdr_add_status = bf_get(lpfc_mbox_hdr_add_status, &shdr->response);
         if (shdr_status || shdr_add_status || rc) {
@@ -10515,20 +10626,20 @@ lpfc_mq_create_fb_init(struct lpfc_hba *phba, struct lpfc_queue *mq,
         bf_set(lpfc_mq_context_valid, &mq_create->u.request.context, 1);
         switch (mq->entry_count) {
         case 16:
-                bf_set(lpfc_mq_context_count, &mq_create->u.request.context,
-                       LPFC_MQ_CNT_16);
+                bf_set(lpfc_mq_context_ring_size, &mq_create->u.request.context,
+                       LPFC_MQ_RING_SIZE_16);
                 break;
         case 32:
-                bf_set(lpfc_mq_context_count, &mq_create->u.request.context,
-                       LPFC_MQ_CNT_32);
+                bf_set(lpfc_mq_context_ring_size, &mq_create->u.request.context,
+                       LPFC_MQ_RING_SIZE_32);
                 break;
         case 64:
-                bf_set(lpfc_mq_context_count, &mq_create->u.request.context,
-                       LPFC_MQ_CNT_64);
+                bf_set(lpfc_mq_context_ring_size, &mq_create->u.request.context,
+                       LPFC_MQ_RING_SIZE_64);
                 break;
         case 128:
-                bf_set(lpfc_mq_context_count, &mq_create->u.request.context,
-                       LPFC_MQ_CNT_128);
+                bf_set(lpfc_mq_context_ring_size, &mq_create->u.request.context,
+                       LPFC_MQ_RING_SIZE_128);
                 break;
         }
         list_for_each_entry(dmabuf, &mq->page_list, list) {
@@ -10586,6 +10697,7 @@ lpfc_mq_create(struct lpfc_hba *phba, struct lpfc_queue *mq,
                          length, LPFC_SLI4_MBX_EMBED);
 
         mq_create_ext = &mbox->u.mqe.un.mq_create_ext;
+        shdr = (union lpfc_sli4_cfg_shdr *) &mq_create_ext->header.cfg_shdr;
         bf_set(lpfc_mbx_mq_create_ext_num_pages,
                &mq_create_ext->u.request, mq->page_count);
         bf_set(lpfc_mbx_mq_create_ext_async_evt_link,
@@ -10598,9 +10710,15 @@ lpfc_mq_create(struct lpfc_hba *phba, struct lpfc_queue *mq,
                &mq_create_ext->u.request, 1);
         bf_set(lpfc_mbx_mq_create_ext_async_evt_sli,
                &mq_create_ext->u.request, 1);
-        bf_set(lpfc_mq_context_cq_id,
-               &mq_create_ext->u.request.context, cq->queue_id);
         bf_set(lpfc_mq_context_valid, &mq_create_ext->u.request.context, 1);
+        bf_set(lpfc_mbox_hdr_version, &shdr->request,
+               phba->sli4_hba.pc_sli4_params.mqv);
+        if (phba->sli4_hba.pc_sli4_params.mqv == LPFC_Q_CREATE_VERSION_1)
+                bf_set(lpfc_mbx_mq_create_ext_cq_id, &mq_create_ext->u.request,
+                       cq->queue_id);
+        else
+                bf_set(lpfc_mq_context_cq_id, &mq_create_ext->u.request.context,
+                       cq->queue_id);
         switch (mq->entry_count) {
         default:
                 lpfc_printf_log(phba, KERN_ERR, LOG_SLI,
@@ -10610,20 +10728,24 @@ lpfc_mq_create(struct lpfc_hba *phba, struct lpfc_queue *mq,
                         return -EINVAL;
                 /* otherwise default to smallest count (drop through) */
         case 16:
-                bf_set(lpfc_mq_context_count, &mq_create_ext->u.request.context,
-                       LPFC_MQ_CNT_16);
+                bf_set(lpfc_mq_context_ring_size,
+                       &mq_create_ext->u.request.context,
+                       LPFC_MQ_RING_SIZE_16);
                 break;
         case 32:
-                bf_set(lpfc_mq_context_count, &mq_create_ext->u.request.context,
-                       LPFC_MQ_CNT_32);
+                bf_set(lpfc_mq_context_ring_size,
+                       &mq_create_ext->u.request.context,
+                       LPFC_MQ_RING_SIZE_32);
                 break;
         case 64:
-                bf_set(lpfc_mq_context_count, &mq_create_ext->u.request.context,
-                       LPFC_MQ_CNT_64);
+                bf_set(lpfc_mq_context_ring_size,
+                       &mq_create_ext->u.request.context,
+                       LPFC_MQ_RING_SIZE_64);
                 break;
         case 128:
-                bf_set(lpfc_mq_context_count, &mq_create_ext->u.request.context,
-                       LPFC_MQ_CNT_128);
+                bf_set(lpfc_mq_context_ring_size,
+                       &mq_create_ext->u.request.context,
+                       LPFC_MQ_RING_SIZE_128);
                 break;
         }
         list_for_each_entry(dmabuf, &mq->page_list, list) {
@@ -10634,7 +10756,6 @@ lpfc_mq_create(struct lpfc_hba *phba, struct lpfc_queue *mq,
                                         putPaddrHigh(dmabuf->phys);
         }
         rc = lpfc_sli_issue_mbox(phba, mbox, MBX_POLL);
-        shdr = (union lpfc_sli4_cfg_shdr *) &mq_create_ext->header.cfg_shdr;
         mq->queue_id = bf_get(lpfc_mbx_mq_create_q_id,
                               &mq_create_ext->u.response);
         if (rc != MBX_SUCCESS) {
@@ -10711,6 +10832,7 @@ lpfc_wq_create(struct lpfc_hba *phba, struct lpfc_queue *wq,
         uint32_t shdr_status, shdr_add_status;
         union lpfc_sli4_cfg_shdr *shdr;
         uint32_t hw_page_size = phba->sli4_hba.pc_sli4_params.if_page_sz;
+        struct dma_address *page;
 
         if (!phba->sli4_hba.pc_sli4_params.supported)
                 hw_page_size = SLI4_PAGE_SIZE;
@@ -10724,20 +10846,42 @@ lpfc_wq_create(struct lpfc_hba *phba, struct lpfc_queue *wq,
                          LPFC_MBOX_OPCODE_FCOE_WQ_CREATE,
                          length, LPFC_SLI4_MBX_EMBED);
         wq_create = &mbox->u.mqe.un.wq_create;
+        shdr = (union lpfc_sli4_cfg_shdr *) &wq_create->header.cfg_shdr;
         bf_set(lpfc_mbx_wq_create_num_pages, &wq_create->u.request,
                     wq->page_count);
         bf_set(lpfc_mbx_wq_create_cq_id, &wq_create->u.request,
                     cq->queue_id);
+        bf_set(lpfc_mbox_hdr_version, &shdr->request,
+               phba->sli4_hba.pc_sli4_params.wqv);
+        if (phba->sli4_hba.pc_sli4_params.wqv == LPFC_Q_CREATE_VERSION_1) {
+                bf_set(lpfc_mbx_wq_create_wqe_count, &wq_create->u.request_1,
+                       wq->entry_count);
+                switch (wq->entry_size) {
+                default:
+                case 64:
+                        bf_set(lpfc_mbx_wq_create_wqe_size,
+                               &wq_create->u.request_1,
+                               LPFC_WQ_WQE_SIZE_64);
+                        break;
+                case 128:
+                        bf_set(lpfc_mbx_wq_create_wqe_size,
+                               &wq_create->u.request_1,
+                               LPFC_WQ_WQE_SIZE_128);
+                        break;
+                }
+                bf_set(lpfc_mbx_wq_create_page_size, &wq_create->u.request_1,
+                       (PAGE_SIZE/SLI4_PAGE_SIZE));
+                page = wq_create->u.request_1.page;
+        } else {
+                page = wq_create->u.request.page;
+        }
         list_for_each_entry(dmabuf, &wq->page_list, list) {
                 memset(dmabuf->virt, 0, hw_page_size);
-                wq_create->u.request.page[dmabuf->buffer_tag].addr_lo =
-                                        putPaddrLow(dmabuf->phys);
-                wq_create->u.request.page[dmabuf->buffer_tag].addr_hi =
-                                        putPaddrHigh(dmabuf->phys);
+                page[dmabuf->buffer_tag].addr_lo = putPaddrLow(dmabuf->phys);
+                page[dmabuf->buffer_tag].addr_hi = putPaddrHigh(dmabuf->phys);
         }
         rc = lpfc_sli_issue_mbox(phba, mbox, MBX_POLL);
         /* The IOCTL status is embedded in the mailbox subheader. */
-        shdr = (union lpfc_sli4_cfg_shdr *) &wq_create->header.cfg_shdr;
         shdr_status = bf_get(lpfc_mbox_hdr_status, &shdr->response);
         shdr_add_status = bf_get(lpfc_mbox_hdr_add_status, &shdr->response);
         if (shdr_status || shdr_add_status || rc) {
@@ -10815,37 +10959,51 @@ lpfc_rq_create(struct lpfc_hba *phba, struct lpfc_queue *hrq,
                          LPFC_MBOX_OPCODE_FCOE_RQ_CREATE,
                          length, LPFC_SLI4_MBX_EMBED);
         rq_create = &mbox->u.mqe.un.rq_create;
-        switch (hrq->entry_count) {
-        default:
-                lpfc_printf_log(phba, KERN_ERR, LOG_SLI,
-                                "2535 Unsupported RQ count. (%d)\n",
-                                hrq->entry_count);
-                if (hrq->entry_count < 512)
-                        return -EINVAL;
-                /* otherwise default to smallest count (drop through) */
-        case 512:
-                bf_set(lpfc_rq_context_rq_size, &rq_create->u.request.context,
-                       LPFC_RQ_RING_SIZE_512);
-                break;
-        case 1024:
-                bf_set(lpfc_rq_context_rq_size, &rq_create->u.request.context,
-                       LPFC_RQ_RING_SIZE_1024);
-                break;
-        case 2048:
-                bf_set(lpfc_rq_context_rq_size, &rq_create->u.request.context,
-                       LPFC_RQ_RING_SIZE_2048);
-                break;
-        case 4096:
-                bf_set(lpfc_rq_context_rq_size, &rq_create->u.request.context,
-                       LPFC_RQ_RING_SIZE_4096);
-                break;
+        shdr = (union lpfc_sli4_cfg_shdr *) &rq_create->header.cfg_shdr;
+        bf_set(lpfc_mbox_hdr_version, &shdr->request,
+               phba->sli4_hba.pc_sli4_params.rqv);
+        if (phba->sli4_hba.pc_sli4_params.rqv == LPFC_Q_CREATE_VERSION_1) {
+                bf_set(lpfc_rq_context_rqe_count_1,
+                       &rq_create->u.request.context,
+                       hrq->entry_count);
+                rq_create->u.request.context.buffer_size = LPFC_HDR_BUF_SIZE;
+        } else {
+                switch (hrq->entry_count) {
+                default:
+                        lpfc_printf_log(phba, KERN_ERR, LOG_SLI,
+                                        "2535 Unsupported RQ count. (%d)\n",
+                                        hrq->entry_count);
+                        if (hrq->entry_count < 512)
+                                return -EINVAL;
+                        /* otherwise default to smallest count (drop through) */
+                case 512:
+                        bf_set(lpfc_rq_context_rqe_count,
+                               &rq_create->u.request.context,
+                               LPFC_RQ_RING_SIZE_512);
+                        break;
+                case 1024:
+                        bf_set(lpfc_rq_context_rqe_count,
+                               &rq_create->u.request.context,
+                               LPFC_RQ_RING_SIZE_1024);
+                        break;
+                case 2048:
+                        bf_set(lpfc_rq_context_rqe_count,
+                               &rq_create->u.request.context,
+                               LPFC_RQ_RING_SIZE_2048);
+                        break;
+                case 4096:
+                        bf_set(lpfc_rq_context_rqe_count,
+                               &rq_create->u.request.context,
+                               LPFC_RQ_RING_SIZE_4096);
+                        break;
+                }
+                bf_set(lpfc_rq_context_buf_size, &rq_create->u.request.context,
+                       LPFC_HDR_BUF_SIZE);
         }
         bf_set(lpfc_rq_context_cq_id, &rq_create->u.request.context,
                cq->queue_id);
         bf_set(lpfc_mbx_rq_create_num_pages, &rq_create->u.request,
                hrq->page_count);
-        bf_set(lpfc_rq_context_buf_size, &rq_create->u.request.context,
-               LPFC_HDR_BUF_SIZE);
         list_for_each_entry(dmabuf, &hrq->page_list, list) {
                 memset(dmabuf->virt, 0, hw_page_size);
                 rq_create->u.request.page[dmabuf->buffer_tag].addr_lo =
@@ -10855,7 +11013,6 @@ lpfc_rq_create(struct lpfc_hba *phba, struct lpfc_queue *hrq,
         }
         rc = lpfc_sli_issue_mbox(phba, mbox, MBX_POLL);
         /* The IOCTL status is embedded in the mailbox subheader. */
-        shdr = (union lpfc_sli4_cfg_shdr *) &rq_create->header.cfg_shdr;
         shdr_status = bf_get(lpfc_mbox_hdr_status, &shdr->response);
         shdr_add_status = bf_get(lpfc_mbox_hdr_add_status, &shdr->response);
         if (shdr_status || shdr_add_status || rc) {
@@ -10881,37 +11038,50 @@ lpfc_rq_create(struct lpfc_hba *phba, struct lpfc_queue *hrq,
         lpfc_sli4_config(phba, mbox, LPFC_MBOX_SUBSYSTEM_FCOE,
                          LPFC_MBOX_OPCODE_FCOE_RQ_CREATE,
                          length, LPFC_SLI4_MBX_EMBED);
-        switch (drq->entry_count) {
-        default:
-                lpfc_printf_log(phba, KERN_ERR, LOG_SLI,
-                                "2536 Unsupported RQ count. (%d)\n",
-                                drq->entry_count);
-                if (drq->entry_count < 512)
-                        return -EINVAL;
-                /* otherwise default to smallest count (drop through) */
-        case 512:
-                bf_set(lpfc_rq_context_rq_size, &rq_create->u.request.context,
-                       LPFC_RQ_RING_SIZE_512);
-                break;
-        case 1024:
-                bf_set(lpfc_rq_context_rq_size, &rq_create->u.request.context,
-                       LPFC_RQ_RING_SIZE_1024);
-                break;
-        case 2048:
-                bf_set(lpfc_rq_context_rq_size, &rq_create->u.request.context,
-                       LPFC_RQ_RING_SIZE_2048);
-                break;
-        case 4096:
-                bf_set(lpfc_rq_context_rq_size, &rq_create->u.request.context,
-                       LPFC_RQ_RING_SIZE_4096);
-                break;
+        bf_set(lpfc_mbox_hdr_version, &shdr->request,
+               phba->sli4_hba.pc_sli4_params.rqv);
+        if (phba->sli4_hba.pc_sli4_params.rqv == LPFC_Q_CREATE_VERSION_1) {
+                bf_set(lpfc_rq_context_rqe_count_1,
+                       &rq_create->u.request.context,
+                       hrq->entry_count);
+                rq_create->u.request.context.buffer_size = LPFC_DATA_BUF_SIZE;
+        } else {
+                switch (drq->entry_count) {
+                default:
+                        lpfc_printf_log(phba, KERN_ERR, LOG_SLI,
+                                        "2536 Unsupported RQ count. (%d)\n",
+                                        drq->entry_count);
+                        if (drq->entry_count < 512)
+                                return -EINVAL;
+                        /* otherwise default to smallest count (drop through) */
+                case 512:
+                        bf_set(lpfc_rq_context_rqe_count,
+                               &rq_create->u.request.context,
+                               LPFC_RQ_RING_SIZE_512);
+                        break;
+                case 1024:
+                        bf_set(lpfc_rq_context_rqe_count,
+                               &rq_create->u.request.context,
+                               LPFC_RQ_RING_SIZE_1024);
+                        break;
+                case 2048:
+                        bf_set(lpfc_rq_context_rqe_count,
+                               &rq_create->u.request.context,
+                               LPFC_RQ_RING_SIZE_2048);
+                        break;
+                case 4096:
+                        bf_set(lpfc_rq_context_rqe_count,
+                               &rq_create->u.request.context,
+                               LPFC_RQ_RING_SIZE_4096);
+                        break;
+                }
+                bf_set(lpfc_rq_context_buf_size, &rq_create->u.request.context,
+                       LPFC_DATA_BUF_SIZE);
         }
         bf_set(lpfc_rq_context_cq_id, &rq_create->u.request.context,
                cq->queue_id);
         bf_set(lpfc_mbx_rq_create_num_pages, &rq_create->u.request,
                drq->page_count);
-        bf_set(lpfc_rq_context_buf_size, &rq_create->u.request.context,
-               LPFC_DATA_BUF_SIZE);
         list_for_each_entry(dmabuf, &drq->page_list, list) {
                 rq_create->u.request.page[dmabuf->buffer_tag].addr_lo =
                                         putPaddrLow(dmabuf->phys);
@@ -11580,6 +11750,7 @@ lpfc_fc_frame_check(struct lpfc_hba *phba, struct fc_frame_header *fc_hdr)
         static char *rctl_names[] = FC_RCTL_NAMES_INIT;
         char *type_names[] = FC_TYPE_NAMES_INIT;
         struct fc_vft_header *fc_vft_hdr;
+        uint32_t *header = (uint32_t *) fc_hdr;
 
         switch (fc_hdr->fh_r_ctl) {
         case FC_RCTL_DD_UNCAT:          /* uncategorized information */
@@ -11628,10 +11799,15 @@ lpfc_fc_frame_check(struct lpfc_hba *phba, struct fc_frame_header *fc_hdr)
         default:
                 goto drop;
         }
+
         lpfc_printf_log(phba, KERN_INFO, LOG_ELS,
-                        "2538 Received frame rctl:%s type:%s\n",
+                        "2538 Received frame rctl:%s type:%s "
+                        "Frame Data:%08x %08x %08x %08x %08x %08x\n",
                         rctl_names[fc_hdr->fh_r_ctl],
-                        type_names[fc_hdr->fh_type]);
+                        type_names[fc_hdr->fh_type],
+                        be32_to_cpu(header[0]), be32_to_cpu(header[1]),
+                        be32_to_cpu(header[2]), be32_to_cpu(header[3]),
+                        be32_to_cpu(header[4]), be32_to_cpu(header[5]));
         return 0;
 drop:
         lpfc_printf_log(phba, KERN_WARNING, LOG_ELS,
@@ -11928,17 +12104,17 @@ lpfc_sli4_abort_partial_seq(struct lpfc_vport *vport,
 }
 
 /**
- * lpfc_sli4_seq_abort_acc_cmpl - Accept seq abort iocb complete handler
+ * lpfc_sli4_seq_abort_rsp_cmpl - BLS ABORT RSP seq abort iocb complete handler
  * @phba: Pointer to HBA context object.
  * @cmd_iocbq: pointer to the command iocbq structure.
  * @rsp_iocbq: pointer to the response iocbq structure.
  *
- * This function handles the sequence abort accept iocb command complete
+ * This function handles the sequence abort response iocb command complete
  * event. It properly releases the memory allocated to the sequence abort
  * accept iocb.
  **/
 static void
-lpfc_sli4_seq_abort_acc_cmpl(struct lpfc_hba *phba,
+lpfc_sli4_seq_abort_rsp_cmpl(struct lpfc_hba *phba,
                              struct lpfc_iocbq *cmd_iocbq,
                              struct lpfc_iocbq *rsp_iocbq)
 {
@@ -11947,15 +12123,15 @@ lpfc_sli4_seq_abort_acc_cmpl(struct lpfc_hba *phba,
 }
 
 /**
- * lpfc_sli4_seq_abort_acc - Accept sequence abort
+ * lpfc_sli4_seq_abort_rsp - bls rsp to sequence abort
  * @phba: Pointer to HBA context object.
  * @fc_hdr: pointer to a FC frame header.
  *
- * This function sends a basic accept to a previous unsol sequence abort
+ * This function sends a basic response to a previous unsol sequence abort
  * event after aborting the sequence handling.
  **/
 static void
-lpfc_sli4_seq_abort_acc(struct lpfc_hba *phba,
+lpfc_sli4_seq_abort_rsp(struct lpfc_hba *phba,
                         struct fc_frame_header *fc_hdr)
 {
         struct lpfc_iocbq *ctiocb = NULL;
@@ -11963,6 +12139,7 @@ lpfc_sli4_seq_abort_acc(struct lpfc_hba *phba,
         uint16_t oxid, rxid;
         uint32_t sid, fctl;
         IOCB_t *icmd;
+        int rc;
 
         if (!lpfc_is_link_up(phba))
                 return;
@@ -11983,7 +12160,7 @@ lpfc_sli4_seq_abort_acc(struct lpfc_hba *phba,
                 + phba->sli4_hba.max_cfg_param.xri_base))
                 lpfc_set_rrq_active(phba, ndlp, rxid, oxid, 0);
 
-        /* Allocate buffer for acc iocb */
+        /* Allocate buffer for rsp iocb */
         ctiocb = lpfc_sli_get_iocbq(phba);
         if (!ctiocb)
                 return;
@@ -12008,32 +12185,54 @@ lpfc_sli4_seq_abort_acc(struct lpfc_hba *phba,
 
         ctiocb->iocb_cmpl = NULL;
         ctiocb->vport = phba->pport;
-        ctiocb->iocb_cmpl = lpfc_sli4_seq_abort_acc_cmpl;
+        ctiocb->iocb_cmpl = lpfc_sli4_seq_abort_rsp_cmpl;
+        ctiocb->sli4_xritag = NO_XRI;
+
+        /* If the oxid maps to the FCP XRI range or if it is out of range,
+         * send a BLS_RJT.  The driver no longer has that exchange.
+         * Override the IOCB for a BA_RJT.
+         */
+        if (oxid > (phba->sli4_hba.max_cfg_param.max_xri +
+                    phba->sli4_hba.max_cfg_param.xri_base) ||
+            oxid > (lpfc_sli4_get_els_iocb_cnt(phba) +
+                    phba->sli4_hba.max_cfg_param.xri_base)) {
+                icmd->un.xseq64.w5.hcsw.Rctl = FC_RCTL_BA_RJT;
+                bf_set(lpfc_vndr_code, &icmd->un.bls_rsp, 0);
+                bf_set(lpfc_rsn_expln, &icmd->un.bls_rsp, FC_BA_RJT_INV_XID);
+                bf_set(lpfc_rsn_code, &icmd->un.bls_rsp, FC_BA_RJT_UNABLE);
+        }
 
         if (fctl & FC_FC_EX_CTX) {
                 /* ABTS sent by responder to CT exchange, construction
                  * of BA_ACC will use OX_ID from ABTS for the XRI_TAG
                  * field and RX_ID from ABTS for RX_ID field.
                  */
-                bf_set(lpfc_abts_orig, &icmd->un.bls_acc, LPFC_ABTS_UNSOL_RSP);
-                bf_set(lpfc_abts_rxid, &icmd->un.bls_acc, rxid);
-                ctiocb->sli4_xritag = oxid;
+                bf_set(lpfc_abts_orig, &icmd->un.bls_rsp, LPFC_ABTS_UNSOL_RSP);
+                bf_set(lpfc_abts_rxid, &icmd->un.bls_rsp, rxid);
         } else {
                 /* ABTS sent by initiator to CT exchange, construction
                  * of BA_ACC will need to allocate a new XRI as for the
                  * XRI_TAG and RX_ID fields.
                  */
-                bf_set(lpfc_abts_orig, &icmd->un.bls_acc, LPFC_ABTS_UNSOL_INT);
-                bf_set(lpfc_abts_rxid, &icmd->un.bls_acc, NO_XRI);
-                ctiocb->sli4_xritag = NO_XRI;
+                bf_set(lpfc_abts_orig, &icmd->un.bls_rsp, LPFC_ABTS_UNSOL_INT);
+                bf_set(lpfc_abts_rxid, &icmd->un.bls_rsp, NO_XRI);
         }
-        bf_set(lpfc_abts_oxid, &icmd->un.bls_acc, oxid);
+        bf_set(lpfc_abts_oxid, &icmd->un.bls_rsp, oxid);
 
-        /* Xmit CT abts accept on exchange <xid> */
+        /* Xmit CT abts response on exchange <xid> */
         lpfc_printf_log(phba, KERN_INFO, LOG_ELS,
-                        "1200 Xmit CT ABTS ACC on exchange x%x Data: x%x\n",
-                        CMD_XMIT_BLS_RSP64_CX, phba->link_state);
-        lpfc_sli_issue_iocb(phba, LPFC_ELS_RING, ctiocb, 0);
+                        "1200 Send BLS cmd x%x on oxid x%x Data: x%x\n",
+                        icmd->un.xseq64.w5.hcsw.Rctl, oxid, phba->link_state);
+
+        rc = lpfc_sli_issue_iocb(phba, LPFC_ELS_RING, ctiocb, 0);
+        if (rc == IOCB_ERROR) {
+                lpfc_printf_log(phba, KERN_ERR, LOG_ELS,
+                                "2925 Failed to issue CT ABTS RSP x%x on "
+                                "xri x%x, Data x%x\n",
+                                icmd->un.xseq64.w5.hcsw.Rctl, oxid,
+                                phba->link_state);
+                lpfc_sli_release_iocbq(phba, ctiocb);
+        }
 }
 
 /**
@@ -12081,7 +12280,7 @@ lpfc_sli4_handle_unsol_abort(struct lpfc_vport *vport,
                         lpfc_in_buf_free(phba, &dmabuf->dbuf);
         }
         /* Send basic accept (BA_ACC) to the abort requester */
-        lpfc_sli4_seq_abort_acc(phba, &fc_hdr);
+        lpfc_sli4_seq_abort_rsp(phba, &fc_hdr);
 }
 
 /**
@@ -12772,7 +12971,7 @@ lpfc_sli4_build_dflt_fcf_record(struct lpfc_hba *phba,
  * record and processing it one at a time starting from the @fcf_index
  * for initial FCF discovery or fast FCF failover rediscovery.
  *
- * Return 0 if the mailbox command is submitted sucessfully, none 0
+ * Return 0 if the mailbox command is submitted successfully, none 0
  * otherwise.
  **/
 int
@@ -12833,7 +13032,7 @@ fail_fcf_scan:
  * This routine is invoked to read an FCF record indicated by @fcf_index
  * and to use it for FLOGI roundrobin FCF failover.
  *
- * Return 0 if the mailbox command is submitted sucessfully, none 0
+ * Return 0 if the mailbox command is submitted successfully, none 0
  * otherwise.
  **/
 int
@@ -12879,7 +13078,7 @@ fail_fcf_read:
  * This routine is invoked to read an FCF record indicated by @fcf_index to
  * determine whether it's eligible for FLOGI roundrobin failover list.
  *
- * Return 0 if the mailbox command is submitted sucessfully, none 0
+ * Return 0 if the mailbox command is submitted successfully, none 0
  * otherwise.
  **/
 int
diff --git a/drivers/scsi/lpfc/lpfc_sli4.h b/drivers/scsi/lpfc/lpfc_sli4.h
index 595056b89608..1a3cbf88f2ce 100644
--- a/drivers/scsi/lpfc/lpfc_sli4.h
+++ b/drivers/scsi/lpfc/lpfc_sli4.h
@@ -1,7 +1,7 @@
 /*******************************************************************
  * This file is part of the Emulex Linux Device Driver for         *
  * Fibre Channel Host Bus Adapters.                                *
- * Copyright (C) 2009 Emulex.  All rights reserved.                *
+ * Copyright (C) 2009-2011 Emulex.  All rights reserved.           *
  * EMULEX and SLI are trademarks of Emulex.                        *
  * www.emulex.com                                                  *
  *                                                                 *
diff --git a/drivers/scsi/lpfc/lpfc_version.h b/drivers/scsi/lpfc/lpfc_version.h
index 0a4d376dbca5..2404d1d65563 100644
--- a/drivers/scsi/lpfc/lpfc_version.h
+++ b/drivers/scsi/lpfc/lpfc_version.h
@@ -18,7 +18,7 @@
  * included with this package.                                     *
  *******************************************************************/
 
-#define LPFC_DRIVER_VERSION "8.3.21"
+#define LPFC_DRIVER_VERSION "8.3.22"
 #define LPFC_DRIVER_NAME                "lpfc"
 #define LPFC_SP_DRIVER_HANDLER_NAME     "lpfc:sp"
 #define LPFC_FP_DRIVER_HANDLER_NAME     "lpfc:fp"
diff --git a/drivers/scsi/megaraid.c b/drivers/scsi/megaraid.c
index c212694a9714..f2684dd09ed0 100644
--- a/drivers/scsi/megaraid.c
+++ b/drivers/scsi/megaraid.c
@@ -284,7 +284,7 @@ mega_query_adapter(adapter_t *adapter)
 
         adapter->host->max_id = 16;     /* max targets per channel */
 
-        adapter->host->max_lun = 7;     /* Upto 7 luns for non disk devices */
+        adapter->host->max_lun = 7;     /* Up to 7 luns for non disk devices */
 
         adapter->host->cmd_per_lun = max_cmd_per_lun;
 
@@ -3734,7 +3734,7 @@ mega_m_to_n(void __user *arg, nitioctl_t *uioc)
          * check is the application conforms to NIT. We do not have to do much
          * in that case.
          * We exploit the fact that the signature is stored in the very
-         * begining of the structure.
+         * beginning of the structure.
          */
 
         if( copy_from_user(signature, arg, 7) )
diff --git a/drivers/scsi/megaraid.h b/drivers/scsi/megaraid.h
index 853411911b2e..9a7897f8ca43 100644
--- a/drivers/scsi/megaraid.h
+++ b/drivers/scsi/megaraid.h
@@ -532,9 +532,9 @@ struct uioctl_t {
 
 /*
  * struct mcontroller is used to pass information about the controllers in the
- * system. Its upto the application how to use the information. We are passing
+ * system. Its up to the application how to use the information. We are passing
  * as much info about the cards as possible and useful. Before issuing the
- * call to find information about the cards, the applicaiton needs to issue a
+ * call to find information about the cards, the application needs to issue a
  * ioctl first to find out the number of controllers in the system.
  */
 #define MAX_CONTROLLERS 32
@@ -804,7 +804,7 @@ typedef struct {
         unsigned long           base;
         void __iomem            *mmio_base;
 
-        /* mbox64 with mbox not aligned on 16-byte boundry */
+        /* mbox64 with mbox not aligned on 16-byte boundary */
         mbox64_t        *una_mbox64;
         dma_addr_t      una_mbox64_dma;
 
diff --git a/drivers/scsi/megaraid/mbox_defs.h b/drivers/scsi/megaraid/mbox_defs.h
index ce2487a888ed..e01c6f7c2cac 100644
--- a/drivers/scsi/megaraid/mbox_defs.h
+++ b/drivers/scsi/megaraid/mbox_defs.h
@@ -660,7 +660,7 @@ typedef struct {
  * @lparam      : logical drives parameters
  * @span        : span
  *
- * 8-LD logical drive with upto 8 spans
+ * 8-LD logical drive with up to 8 spans
  */
 typedef struct {
         logdrv_param_t  lparam;
@@ -673,7 +673,7 @@ typedef struct {
  * @lparam      : logical drives parameters
  * @span        : span
  *
- * 8-LD logical drive with upto 4 spans
+ * 8-LD logical drive with up to 4 spans
  */
 typedef struct {
         logdrv_param_t  lparam;
@@ -720,7 +720,7 @@ typedef struct {
  * @ldrv        : logical drives information
  * @pdrv        : physical drives information
  *
- * Disk array for 8LD logical drives with upto 8 spans
+ * Disk array for 8LD logical drives with up to 8 spans
  */
 typedef struct {
         uint8_t                 numldrv;
@@ -737,7 +737,7 @@ typedef struct {
  * @ldrv        : logical drives information
  * @pdrv        : physical drives information
  *
- * Disk array for 8LD logical drives with upto 4 spans
+ * Disk array for 8LD logical drives with up to 4 spans
  */
 typedef struct {
         uint8_t                 numldrv;
diff --git a/drivers/scsi/megaraid/megaraid_mbox.c b/drivers/scsi/megaraid/megaraid_mbox.c
index 5708cb27d078..1dba32870b4c 100644
--- a/drivers/scsi/megaraid/megaraid_mbox.c
+++ b/drivers/scsi/megaraid/megaraid_mbox.c
@@ -2689,7 +2689,7 @@ megaraid_reset_handler(struct scsi_cmnd *scp)
                                 (MBOX_RESET_WAIT + MBOX_RESET_EXT_WAIT) - i));
                 }
 
-                // bailout if no recovery happended in reset time
+                // bailout if no recovery happened in reset time
                 if (adapter->outstanding_cmds == 0) {
                         break;
                 }
@@ -3452,7 +3452,7 @@ megaraid_mbox_display_scb(adapter_t *adapter, scb_t *scb)
  * megaraid_mbox_setup_device_map - manage device ids
  * @adapter     : Driver's soft state
  *
- * Manange the device ids to have an appropraite mapping between the kernel
+ * Manange the device ids to have an appropriate mapping between the kernel
  * scsi addresses and megaraid scsi and logical drive addresses. We export
  * scsi devices on their actual addresses, whereas the logical drives are
  * exported on a virtual scsi channel.
@@ -3973,7 +3973,7 @@ megaraid_sysfs_get_ldmap_timeout(unsigned long data)
  * NOTE: The commands issuance functionality is not generalized and
  * implemented in context of "get ld map" command only. If required, the
  * command issuance logical can be trivially pulled out and implemented as a
- * standalone libary. For now, this should suffice since there is no other
+ * standalone library. For now, this should suffice since there is no other
  * user of this interface.
  *
  * Return 0 on success.
diff --git a/drivers/scsi/megaraid/megaraid_sas.h b/drivers/scsi/megaraid/megaraid_sas.h
index 635b228c3ead..046dcc672ec1 100644
--- a/drivers/scsi/megaraid/megaraid_sas.h
+++ b/drivers/scsi/megaraid/megaraid_sas.h
@@ -1347,7 +1347,7 @@ struct megasas_instance {
         struct timer_list io_completion_timer;
         struct list_head internal_reset_pending_q;
 
-        /* Ptr to hba specfic information */
+        /* Ptr to hba specific information */
         void *ctrl_context;
         u8      msi_flag;
         struct msix_entry msixentry;
diff --git a/drivers/scsi/megaraid/megaraid_sas_base.c b/drivers/scsi/megaraid/megaraid_sas_base.c
index bbd10c81fd9c..66d4cea4df98 100644
--- a/drivers/scsi/megaraid/megaraid_sas_base.c
+++ b/drivers/scsi/megaraid/megaraid_sas_base.c
@@ -1698,7 +1698,7 @@ void megasas_do_ocr(struct megasas_instance *instance)
  * megasas_wait_for_outstanding -       Wait for all outstanding cmds
  * @instance:                           Adapter soft state
  *
- * This function waits for upto MEGASAS_RESET_WAIT_TIME seconds for FW to
+ * This function waits for up to MEGASAS_RESET_WAIT_TIME seconds for FW to
  * complete all its outstanding commands. Returns error if one or more IOs
  * are pending after this time period. It also marks the controller dead.
  */
diff --git a/drivers/scsi/mpt2sas/mpi/mpi2_init.h b/drivers/scsi/mpt2sas/mpi/mpi2_init.h
index 20e6b8869341..165454d52591 100644
--- a/drivers/scsi/mpt2sas/mpi/mpi2_init.h
+++ b/drivers/scsi/mpt2sas/mpi/mpi2_init.h
@@ -21,7 +21,7 @@
  *  05-21-08  02.00.05  Fixed typo in name of Mpi2SepRequest_t.
  *  10-02-08  02.00.06  Removed Untagged and No Disconnect values from SCSI IO
  *                      Control field Task Attribute flags.
- *                      Moved LUN field defines to mpi2.h becasue they are
+ *                      Moved LUN field defines to mpi2.h because they are
  *                      common to many structures.
  *  05-06-09  02.00.07  Changed task management type of Query Unit Attention to
  *                      Query Asynchronous Event.
diff --git a/drivers/scsi/mpt2sas/mpt2sas_base.c b/drivers/scsi/mpt2sas/mpt2sas_base.c
index e8a6f1cf1e4b..3346357031e9 100644
--- a/drivers/scsi/mpt2sas/mpt2sas_base.c
+++ b/drivers/scsi/mpt2sas/mpt2sas_base.c
@@ -925,7 +925,7 @@ _base_interrupt(int irq, void *bus_id)
 }
 
 /**
- * mpt2sas_base_release_callback_handler - clear interupt callback handler
+ * mpt2sas_base_release_callback_handler - clear interrupt callback handler
  * @cb_idx: callback index
  *
  * Return nothing.
@@ -1113,7 +1113,7 @@ _base_restore_msix_table(struct MPT2SAS_ADAPTER *ioc)
  * @ioc: per adapter object
  *
  * Check to see if card is capable of MSIX, and set number
- * of avaliable msix vectors
+ * of available msix vectors
  */
 static int
 _base_check_enable_msix(struct MPT2SAS_ADAPTER *ioc)
@@ -1595,7 +1595,7 @@ mpt2sas_base_put_smid_scsi_io(struct MPT2SAS_ADAPTER *ioc, u16 smid, u16 handle)
 
 
 /**
- * mpt2sas_base_put_smid_hi_priority - send Task Managment request to firmware
+ * mpt2sas_base_put_smid_hi_priority - send Task Management request to firmware
  * @ioc: per adapter object
  * @smid: system request message index
  *
@@ -1748,6 +1748,54 @@ _base_display_intel_branding(struct MPT2SAS_ADAPTER *ioc)
 }
 
 /**
+ * _base_display_hp_branding - Display branding string
+ * @ioc: per adapter object
+ *
+ * Return nothing.
+ */
+static void
+_base_display_hp_branding(struct MPT2SAS_ADAPTER *ioc)
+{
+        if (ioc->pdev->subsystem_vendor != MPT2SAS_HP_3PAR_SSVID)
+                return;
+
+        switch (ioc->pdev->device) {
+        case MPI2_MFGPAGE_DEVID_SAS2004:
+                switch (ioc->pdev->subsystem_device) {
+                case MPT2SAS_HP_DAUGHTER_2_4_INTERNAL_SSDID:
+                        printk(MPT2SAS_INFO_FMT "%s\n", ioc->name,
+                            MPT2SAS_HP_DAUGHTER_2_4_INTERNAL_BRANDING);
+                        break;
+                default:
+                        break;
+                }
+        case MPI2_MFGPAGE_DEVID_SAS2308_2:
+                switch (ioc->pdev->subsystem_device) {
+                case MPT2SAS_HP_2_4_INTERNAL_SSDID:
+                        printk(MPT2SAS_INFO_FMT "%s\n", ioc->name,
+                            MPT2SAS_HP_2_4_INTERNAL_BRANDING);
+                        break;
+                case MPT2SAS_HP_2_4_EXTERNAL_SSDID:
+                        printk(MPT2SAS_INFO_FMT "%s\n", ioc->name,
+                            MPT2SAS_HP_2_4_EXTERNAL_BRANDING);
+                        break;
+                case MPT2SAS_HP_1_4_INTERNAL_1_4_EXTERNAL_SSDID:
+                        printk(MPT2SAS_INFO_FMT "%s\n", ioc->name,
+                            MPT2SAS_HP_1_4_INTERNAL_1_4_EXTERNAL_BRANDING);
+                        break;
+                case MPT2SAS_HP_EMBEDDED_2_4_INTERNAL_SSDID:
+                        printk(MPT2SAS_INFO_FMT "%s\n", ioc->name,
+                            MPT2SAS_HP_EMBEDDED_2_4_INTERNAL_BRANDING);
+                        break;
+                default:
+                        break;
+                }
+        default:
+                break;
+        }
+}
+
+/**
  * _base_display_ioc_capabilities - Disply IOC's capabilities.
  * @ioc: per adapter object
  *
@@ -1778,6 +1826,7 @@ _base_display_ioc_capabilities(struct MPT2SAS_ADAPTER *ioc)
 
         _base_display_dell_branding(ioc);
         _base_display_intel_branding(ioc);
+        _base_display_hp_branding(ioc);
 
         printk(MPT2SAS_INFO_FMT "Protocol=(", ioc->name);
 
@@ -2550,7 +2599,7 @@ _base_wait_for_doorbell_int(struct MPT2SAS_ADAPTER *ioc, int timeout,
                 int_status = readl(&ioc->chip->HostInterruptStatus);
                 if (int_status & MPI2_HIS_IOC2SYS_DB_STATUS) {
                         dhsprintk(ioc, printk(MPT2SAS_INFO_FMT "%s: "
-                            "successfull count(%d), timeout(%d)\n", ioc->name,
+                            "successful count(%d), timeout(%d)\n", ioc->name,
                             __func__, count, timeout));
                         return 0;
                 }
@@ -2591,7 +2640,7 @@ _base_wait_for_doorbell_ack(struct MPT2SAS_ADAPTER *ioc, int timeout,
                 int_status = readl(&ioc->chip->HostInterruptStatus);
                 if (!(int_status & MPI2_HIS_SYS2IOC_DB_STATUS)) {
                         dhsprintk(ioc, printk(MPT2SAS_INFO_FMT "%s: "
-                            "successfull count(%d), timeout(%d)\n", ioc->name,
+                            "successful count(%d), timeout(%d)\n", ioc->name,
                             __func__, count, timeout));
                         return 0;
                 } else if (int_status & MPI2_HIS_IOC2SYS_DB_STATUS) {
@@ -2639,7 +2688,7 @@ _base_wait_for_doorbell_not_used(struct MPT2SAS_ADAPTER *ioc, int timeout,
                 doorbell_reg = readl(&ioc->chip->Doorbell);
                 if (!(doorbell_reg & MPI2_DOORBELL_USED)) {
                         dhsprintk(ioc, printk(MPT2SAS_INFO_FMT "%s: "
-                            "successfull count(%d), timeout(%d)\n", ioc->name,
+                            "successful count(%d), timeout(%d)\n", ioc->name,
                             __func__, count, timeout));
                         return 0;
                 }
diff --git a/drivers/scsi/mpt2sas/mpt2sas_base.h b/drivers/scsi/mpt2sas/mpt2sas_base.h
index a3f8aa9baea4..500328245f61 100644
--- a/drivers/scsi/mpt2sas/mpt2sas_base.h
+++ b/drivers/scsi/mpt2sas/mpt2sas_base.h
@@ -168,6 +168,26 @@
 #define MPT2SAS_INTEL_RMS2LL080_SSDID          0x350E
 #define MPT2SAS_INTEL_RMS2LL040_SSDID          0x350F
 
+
+/*
+ * HP HBA branding
+ */
+#define MPT2SAS_HP_3PAR_SSVID                0x1590
+#define MPT2SAS_HP_2_4_INTERNAL_BRANDING        "HP H220 Host Bus Adapter"
+#define MPT2SAS_HP_2_4_EXTERNAL_BRANDING        "HP H221 Host Bus Adapter"
+#define MPT2SAS_HP_1_4_INTERNAL_1_4_EXTERNAL_BRANDING "HP H222 Host Bus Adapter"
+#define MPT2SAS_HP_EMBEDDED_2_4_INTERNAL_BRANDING    "HP H220i Host Bus Adapter"
+#define MPT2SAS_HP_DAUGHTER_2_4_INTERNAL_BRANDING    "HP H210i Host Bus Adapter"
+
+/*
+ * HO HBA SSDIDs
+ */
+#define MPT2SAS_HP_2_4_INTERNAL_SSDID            0x0041
+#define MPT2SAS_HP_2_4_EXTERNAL_SSDID            0x0042
+#define MPT2SAS_HP_1_4_INTERNAL_1_4_EXTERNAL_SSDID    0x0043
+#define MPT2SAS_HP_EMBEDDED_2_4_INTERNAL_SSDID        0x0044
+#define MPT2SAS_HP_DAUGHTER_2_4_INTERNAL_SSDID        0x0046
+
 /*
  * per target private data
  */
diff --git a/drivers/scsi/mpt2sas/mpt2sas_config.c b/drivers/scsi/mpt2sas/mpt2sas_config.c
index 6afd67b324fe..6861244249a3 100644
--- a/drivers/scsi/mpt2sas/mpt2sas_config.c
+++ b/drivers/scsi/mpt2sas/mpt2sas_config.c
@@ -93,7 +93,7 @@ struct config_request{
  * @mpi_reply: reply message frame
  * Context: none.
  *
- * Function for displaying debug info helpfull when debugging issues
+ * Function for displaying debug info helpful when debugging issues
  * in this module.
  */
 static void
diff --git a/drivers/scsi/mpt2sas/mpt2sas_ctl.c b/drivers/scsi/mpt2sas/mpt2sas_ctl.c
index e92b77af5484..1c6d2b405eef 100644
--- a/drivers/scsi/mpt2sas/mpt2sas_ctl.c
+++ b/drivers/scsi/mpt2sas/mpt2sas_ctl.c
@@ -116,7 +116,7 @@ _ctl_sas_device_find_by_handle(struct MPT2SAS_ADAPTER *ioc, u16 handle)
  * @mpi_reply: reply message frame
  * Context: none.
  *
- * Function for displaying debug info helpfull when debugging issues
+ * Function for displaying debug info helpful when debugging issues
  * in this module.
  */
 static void
diff --git a/drivers/scsi/mpt2sas/mpt2sas_scsih.c b/drivers/scsi/mpt2sas/mpt2sas_scsih.c
index 6ceb7759bfe5..d2064a0533ae 100644
--- a/drivers/scsi/mpt2sas/mpt2sas_scsih.c
+++ b/drivers/scsi/mpt2sas/mpt2sas_scsih.c
@@ -397,7 +397,7 @@ _scsih_get_sas_address(struct MPT2SAS_ADAPTER *ioc, u16 handle,
  * @is_raid: [flag] 1 = raid object, 0 = sas object
  *
  * Determines whether this device should be first reported device to
- * to scsi-ml or sas transport, this purpose is for persistant boot device.
+ * to scsi-ml or sas transport, this purpose is for persistent boot device.
  * There are primary, alternate, and current entries in bios page 2. The order
  * priority is primary, alternate, then current.  This routine saves
  * the corresponding device object and is_raid flag in the ioc object.
@@ -2671,10 +2671,10 @@ _scsih_block_io_to_children_attached_directly(struct MPT2SAS_ADAPTER *ioc,
  * @handle: device handle
  * Context: interrupt time.
  *
- * This code is to initiate the device removal handshake protocal
+ * This code is to initiate the device removal handshake protocol
  * with controller firmware.  This function will issue target reset
  * using high priority request queue.  It will send a sas iounit
- * controll request (MPI2_SAS_OP_REMOVE_DEVICE) from this completion.
+ * control request (MPI2_SAS_OP_REMOVE_DEVICE) from this completion.
  *
  * This is designed to send muliple task management request at the same
  * time to the fifo. If the fifo is full, we will append the request,
@@ -2749,9 +2749,9 @@ _scsih_tm_tr_send(struct MPT2SAS_ADAPTER *ioc, u16 handle)
  * @reply: reply message frame(lower 32bit addr)
  * Context: interrupt time.
  *
- * This is the sas iounit controll completion routine.
+ * This is the sas iounit control completion routine.
  * This code is part of the code to initiate the device removal
- * handshake protocal with controller firmware.
+ * handshake protocol with controller firmware.
  *
  * Return 1 meaning mf should be freed from _base_interrupt
  *        0 means the mf is freed from this function.
@@ -2878,8 +2878,8 @@ _scsih_tm_volume_tr_complete(struct MPT2SAS_ADAPTER *ioc, u16 smid,
  *
  * This is the target reset completion routine.
  * This code is part of the code to initiate the device removal
- * handshake protocal with controller firmware.
- * It will send a sas iounit controll request (MPI2_SAS_OP_REMOVE_DEVICE)
+ * handshake protocol with controller firmware.
+ * It will send a sas iounit control request (MPI2_SAS_OP_REMOVE_DEVICE)
  *
  * Return 1 meaning mf should be freed from _base_interrupt
  *        0 means the mf is freed from this function.
@@ -2984,7 +2984,7 @@ _scsih_check_for_pending_tm(struct MPT2SAS_ADAPTER *ioc, u16 smid)
  *
  * This routine added to better handle cable breaker.
  *
- * This handles the case where driver recieves multiple expander
+ * This handles the case where driver receives multiple expander
  * add and delete events in a single shot.  When there is a delete event
  * the routine will void any pending add events waiting in the event queue.
  *
@@ -3511,7 +3511,7 @@ _scsih_normalize_sense(char *sense_buffer, struct sense_info *data)
 
 #ifdef CONFIG_SCSI_MPT2SAS_LOGGING
 /**
- * _scsih_scsi_ioc_info - translated non-successfull SCSI_IO request
+ * _scsih_scsi_ioc_info - translated non-successful SCSI_IO request
  * @ioc: per adapter object
  * @scmd: pointer to scsi command object
  * @mpi_reply: reply mf payload returned from firmware
@@ -5138,7 +5138,7 @@ _scsih_sas_broadcast_primative_event(struct MPT2SAS_ADAPTER *ioc,
         unsigned long flags;
         int r;
 
-        dewtprintk(ioc, printk(MPT2SAS_INFO_FMT "broadcast primative: "
+        dewtprintk(ioc, printk(MPT2SAS_INFO_FMT "broadcast primitive: "
             "phy number(%d), width(%d)\n", ioc->name, event_data->PhyNum,
             event_data->PortWidth));
         dtmprintk(ioc, printk(MPT2SAS_INFO_FMT "%s: enter\n", ioc->name,
diff --git a/drivers/scsi/mvsas/Makefile b/drivers/scsi/mvsas/Makefile
index 52ac4264677d..ffbf759e46f1 100644
--- a/drivers/scsi/mvsas/Makefile
+++ b/drivers/scsi/mvsas/Makefile
@@ -21,9 +21,7 @@
 # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
 # USA
 
-ifeq ($(CONFIG_SCSI_MVSAS_DEBUG),y)
-        EXTRA_CFLAGS += -DMV_DEBUG
-endif
+ccflags-$(CONFIG_SCSI_MVSAS_DEBUG) := -DMV_DEBUG
 
 obj-$(CONFIG_SCSI_MVSAS) += mvsas.o
 mvsas-y +=  mv_init.o  \
diff --git a/drivers/scsi/mvsas/mv_init.c b/drivers/scsi/mvsas/mv_init.c
index 19ad34f381a5..938d045e4180 100644
--- a/drivers/scsi/mvsas/mv_init.c
+++ b/drivers/scsi/mvsas/mv_init.c
@@ -663,6 +663,13 @@ static struct pci_device_id __devinitdata mvs_pci_table[] = {
         { PCI_VDEVICE(ARECA, PCI_DEVICE_ID_ARECA_1300), chip_1300 },
         { PCI_VDEVICE(ARECA, PCI_DEVICE_ID_ARECA_1320), chip_1320 },
         { PCI_VDEVICE(ADAPTEC2, 0x0450), chip_6440 },
+        { PCI_VDEVICE(TTI, 0x2710), chip_9480 },
+        { PCI_VDEVICE(TTI, 0x2720), chip_9480 },
+        { PCI_VDEVICE(TTI, 0x2721), chip_9480 },
+        { PCI_VDEVICE(TTI, 0x2722), chip_9480 },
+        { PCI_VDEVICE(TTI, 0x2740), chip_9480 },
+        { PCI_VDEVICE(TTI, 0x2744), chip_9480 },
+        { PCI_VDEVICE(TTI, 0x2760), chip_9480 },
 
         { }     /* terminate list */
 };
diff --git a/drivers/scsi/ncr53c8xx.c b/drivers/scsi/ncr53c8xx.c
index 46cc3825638d..835d8d66e696 100644
--- a/drivers/scsi/ncr53c8xx.c
+++ b/drivers/scsi/ncr53c8xx.c
@@ -2679,7 +2679,7 @@ static	struct script script0 __initdata = {
 }/*-------------------------< RESEL_TAG >-------------------*/,{
         /*
         **      Read IDENTIFY + SIMPLE + TAG using a single MOVE.
-        **      Agressive optimization, is'nt it?
+        **      Aggressive optimization, is'nt it?
         **      No need to test the SIMPLE TAG message, since the 
         **      driver only supports conformant devices for tags. ;-)
         */
diff --git a/drivers/scsi/nsp32.c b/drivers/scsi/nsp32.c
index 6b8b021400f8..f6a50c98c36f 100644
--- a/drivers/scsi/nsp32.c
+++ b/drivers/scsi/nsp32.c
@@ -1288,7 +1288,7 @@ static irqreturn_t do_nsp32_isr(int irq, void *dev_id)
                         nsp32_dbg(NSP32_DEBUG_INTR, "SSACK=0x%lx", 
                                     nsp32_read4(base, SAVED_SACK_CNT));
 
-                        scsi_set_resid(SCpnt, 0); /* all data transfered! */
+                        scsi_set_resid(SCpnt, 0); /* all data transferred! */
                 }
 
                 /*
@@ -1630,7 +1630,7 @@ static int nsp32_busfree_occur(struct scsi_cmnd *SCpnt, unsigned short execph)
 
                         /*
                          * If SAVEDSACKCNT == 0, it means SavedDataPointer is
-                         * come after data transfering.
+                         * come after data transferring.
                          */
                         if (s_sacklen > 0) {
                                 /*
@@ -1785,7 +1785,7 @@ static void nsp32_adjust_busfree(struct scsi_cmnd *SCpnt, unsigned int s_sacklen
                    the head element of the sg. restlen is correctly calculated. */
         }
 
-        /* calculate the rest length for transfering */
+        /* calculate the rest length for transferring */
         restlen = sentlen - s_sacklen;
 
         /* update adjusting current SG table entry */
diff --git a/drivers/scsi/nsp32.h b/drivers/scsi/nsp32.h
index 9565acf1aa72..c0221829069c 100644
--- a/drivers/scsi/nsp32.h
+++ b/drivers/scsi/nsp32.h
@@ -507,7 +507,7 @@ typedef struct _nsp32_lunt {
 /*
  * SCSI TARGET/LUN definition
  */
-#define NSP32_HOST_SCSIID    7  /* SCSI initiator is everytime defined as 7 */
+#define NSP32_HOST_SCSIID    7  /* SCSI initiator is every time defined as 7 */
 #define MAX_TARGET           8
 #define MAX_LUN              8  /* XXX: In SPI3, max number of LUN is 64. */
 
diff --git a/drivers/scsi/osst.c b/drivers/scsi/osst.c
index 521e2182d45b..58f5be4740e9 100644
--- a/drivers/scsi/osst.c
+++ b/drivers/scsi/osst.c
@@ -1366,7 +1366,7 @@ error:
 /* The values below are based on the OnStream frame payload size of 32K == 2**15,
  * that is, OSST_FRAME_SHIFT + OSST_SECTOR_SHIFT must be 15. With a minimum block
  * size of 512 bytes, we need to be able to resolve 32K/512 == 64 == 2**6 positions
- * inside each frame. Finaly, OSST_SECTOR_MASK == 2**OSST_FRAME_SHIFT - 1.
+ * inside each frame. Finally, OSST_SECTOR_MASK == 2**OSST_FRAME_SHIFT - 1.
  */
 #define OSST_FRAME_SHIFT  6
 #define OSST_SECTOR_SHIFT 9
@@ -3131,7 +3131,7 @@ static int osst_flush_write_buffer(struct osst_tape *STp, struct osst_request **
                 }
 #if DEBUG
                 if (debugging)
-                        printk(OSST_DEB_MSG "%s:D: Flushing %d bytes, Transfering %d bytes in %d lblocks.\n",
+                        printk(OSST_DEB_MSG "%s:D: Flushing %d bytes, Transferring %d bytes in %d lblocks.\n",
                                                  name, offset, transfer, blks);
 #endif
 
@@ -3811,7 +3811,7 @@ static ssize_t osst_read(struct file * filp, char __user * buf, size_t count, lo
 
                         if (transfer == 0) {
                                 printk(KERN_WARNING
-                                  "%s:W: Nothing can be transfered, requested %Zd, tape block size (%d%c).\n",
+                                  "%s:W: Nothing can be transferred, requested %Zd, tape block size (%d%c).\n",
                                         name, count, STp->block_size < 1024?
                                         STp->block_size:STp->block_size/1024,
                                         STp->block_size<1024?'b':'k');
diff --git a/drivers/scsi/osst.h b/drivers/scsi/osst.h
index 11d26c57f3f8..b4fea98ba276 100644
--- a/drivers/scsi/osst.h
+++ b/drivers/scsi/osst.h
@@ -413,7 +413,7 @@ typedef struct os_dat_s {
  * AUX
  */
 typedef struct os_aux_s {
-        __be32          format_id;              /* hardware compability AUX is based on */
+        __be32          format_id;              /* hardware compatibility AUX is based on */
         char            application_sig[4];     /* driver used to write this media */
         __be32          hdwr;                   /* reserved */
         __be32          update_frame_cntr;      /* for configuration frame */
diff --git a/drivers/scsi/pcmcia/Makefile b/drivers/scsi/pcmcia/Makefile
index eca379059db6..683bf148b5b7 100644
--- a/drivers/scsi/pcmcia/Makefile
+++ b/drivers/scsi/pcmcia/Makefile
@@ -1,5 +1,5 @@
 
-EXTRA_CFLAGS            += -Idrivers/scsi
+ccflags-y               := -Idrivers/scsi
 
 # 16-bit client drivers
 obj-$(CONFIG_PCMCIA_QLOGIC)     += qlogic_cs.o
diff --git a/drivers/scsi/pcmcia/nsp_cs.c b/drivers/scsi/pcmcia/nsp_cs.c
index be3f33d31a99..54bdf6d85c6d 100644
--- a/drivers/scsi/pcmcia/nsp_cs.c
+++ b/drivers/scsi/pcmcia/nsp_cs.c
@@ -742,7 +742,7 @@ static void nsp_pio_read(struct scsi_cmnd *SCpnt)
 
                 res = nsp_fifo_count(SCpnt) - ocount;
                 //nsp_dbg(NSP_DEBUG_DATA_IO, "ptr=0x%p this=0x%x ocount=0x%x res=0x%x", SCpnt->SCp.ptr, SCpnt->SCp.this_residual, ocount, res);
-                if (res == 0) { /* if some data avilable ? */
+                if (res == 0) { /* if some data available ? */
                         if (stat == BUSPHASE_DATA_IN) { /* phase changed? */
                                 //nsp_dbg(NSP_DEBUG_DATA_IO, " wait for data this=%d", SCpnt->SCp.this_residual);
                                 continue;
diff --git a/drivers/scsi/pm8001/pm8001_hwi.c b/drivers/scsi/pm8001/pm8001_hwi.c
index 18b6c55cd08c..8b7db1e53c10 100644
--- a/drivers/scsi/pm8001/pm8001_hwi.c
+++ b/drivers/scsi/pm8001/pm8001_hwi.c
@@ -339,7 +339,7 @@ update_outbnd_queue_table(struct pm8001_hba_info *pm8001_ha, int number)
 
 /**
  * bar4_shift - function is called to shift BAR base address
- * @pm8001_ha : our hba card infomation
+ * @pm8001_ha : our hba card information
  * @shiftValue : shifting value in memory bar.
  */
 static int bar4_shift(struct pm8001_hba_info *pm8001_ha, u32 shiftValue)
diff --git a/drivers/scsi/pm8001/pm8001_hwi.h b/drivers/scsi/pm8001/pm8001_hwi.h
index 833a5201eda4..909132041c07 100644
--- a/drivers/scsi/pm8001/pm8001_hwi.h
+++ b/drivers/scsi/pm8001/pm8001_hwi.h
@@ -209,7 +209,7 @@ struct  pio_setup_fis {
 
 /*
  * brief the data structure of SATA Completion Response
- * use to discribe the sata task response (64 bytes)
+ * use to describe the sata task response (64 bytes)
  */
 struct sata_completion_resp {
         __le32  tag;
@@ -951,7 +951,7 @@ struct set_dev_state_resp {
 #define PCIE_EVENT_INTERRUPT            0x003044
 #define PCIE_ERROR_INTERRUPT_ENABLE     0x003048
 #define PCIE_ERROR_INTERRUPT            0x00304C
-/* signature defintion for host scratch pad0 register */
+/* signature definition for host scratch pad0 register */
 #define SPC_SOFT_RESET_SIGNATURE        0x252acbcd
 /* Signature for Soft Reset */
 
diff --git a/drivers/scsi/pm8001/pm8001_sas.h b/drivers/scsi/pm8001/pm8001_sas.h
index bdb6b27dedd6..aa05e661d113 100644
--- a/drivers/scsi/pm8001/pm8001_sas.h
+++ b/drivers/scsi/pm8001/pm8001_sas.h
@@ -445,7 +445,7 @@ struct fw_control_info {
 struct fw_control_ex {
         struct fw_control_info *fw_control;
         void                    *buffer;/* keep buffer pointer to be
-        freed when the responce comes*/
+        freed when the response comes*/
         void                    *virtAddr;/* keep virtual address of the data */
         void                    *usrAddr;/* keep virtual address of the
         user data */
diff --git a/drivers/scsi/pmcraid.c b/drivers/scsi/pmcraid.c
index bcf858e88c64..96d5ad0c1e42 100644
--- a/drivers/scsi/pmcraid.c
+++ b/drivers/scsi/pmcraid.c
@@ -213,7 +213,7 @@ static int pmcraid_slave_alloc(struct scsi_device *scsi_dev)
  * pmcraid_slave_configure - Configures a SCSI device
  * @scsi_dev: scsi device struct
  *
- * This fucntion is executed by SCSI mid layer just after a device is first
+ * This function is executed by SCSI mid layer just after a device is first
  * scanned (i.e. it has responded to an INQUIRY). For VSET resources, the
  * timeout value (default 30s) will be over-written to a higher value (60s)
  * and max_sectors value will be over-written to 512. It also sets queue depth
@@ -2122,7 +2122,7 @@ static void pmcraid_fail_outstanding_cmds(struct pmcraid_instance *pinstance)
  *
  * This function executes most of the steps required for IOA reset. This gets
  * called by user threads (modprobe/insmod/rmmod) timer, tasklet and midlayer's
- * 'eh_' thread. Access to variables used for controling the reset sequence is
+ * 'eh_' thread. Access to variables used for controlling the reset sequence is
  * synchronized using host lock. Various functions called during reset process
  * would make use of a single command block, pointer to which is also stored in
  * adapter instance structure.
@@ -2994,7 +2994,7 @@ static int pmcraid_abort_complete(struct pmcraid_cmd *cancel_cmd)
 
         /* If the abort task is not timed out we will get a Good completion
          * as sense_key, otherwise we may get one the following responses
-         * due to subsquent bus reset or device reset. In case IOASC is
+         * due to subsequent bus reset or device reset. In case IOASC is
          * NR_SYNC_REQUIRED, set sync_reqd flag for the corresponding resource
          */
         if (ioasc == PMCRAID_IOASC_UA_BUS_WAS_RESET ||
@@ -3933,7 +3933,7 @@ static long pmcraid_ioctl_passthrough(
 
                         /* if abort task couldn't find the command i.e it got
                          * completed prior to aborting, return good completion.
-                         * if command got aborted succesfully or there was IOA
+                         * if command got aborted successfully or there was IOA
                          * reset due to abort task itself getting timedout then
                          * return -ETIMEDOUT
                          */
@@ -5932,7 +5932,7 @@ static int __devinit pmcraid_probe(
          * However, firmware supports 64-bit streaming DMA buffers, whereas
          * coherent buffers are to be 32-bit. Since pci_alloc_consistent always
          * returns memory within 4GB (if not, change this logic), coherent
-         * buffers are within firmware acceptible address ranges.
+         * buffers are within firmware acceptable address ranges.
          */
         if ((sizeof(dma_addr_t) == 4) ||
             pci_set_dma_mask(pdev, DMA_BIT_MASK(64)))
diff --git a/drivers/scsi/pmcraid.h b/drivers/scsi/pmcraid.h
index 4db210d93947..34e4c915002e 100644
--- a/drivers/scsi/pmcraid.h
+++ b/drivers/scsi/pmcraid.h
@@ -1024,7 +1024,7 @@ static struct pmcraid_ioasc_error pmcraid_ioasc_error_table[] = {
 
 
 /*
- * pmcraid_ioctl_header - definition of header structure that preceeds all the
+ * pmcraid_ioctl_header - definition of header structure that precedes all the
  * buffers given as ioctl arguments.
  *
  * .signature           : always ASCII string, "PMCRAID"
diff --git a/drivers/scsi/qla1280.c b/drivers/scsi/qla1280.c
index 5dec684bf010..8ba5744c267e 100644
--- a/drivers/scsi/qla1280.c
+++ b/drivers/scsi/qla1280.c
@@ -78,7 +78,7 @@
         - Clean up vchan handling
     Rev  3.23.33 July 3, 2003, Jes Sorensen
         - Don't define register access macros before define determining MMIO.
-          This just happend to work out on ia64 but not elsewhere.
+          This just happened to work out on ia64 but not elsewhere.
         - Don't try and read from the card while it is in reset as
           it won't respond and causes an MCA
     Rev  3.23.32 June 23, 2003, Jes Sorensen
diff --git a/drivers/scsi/qla2xxx/qla_def.h b/drivers/scsi/qla2xxx/qla_def.h
index 6c51c0a35b9e..ee20353c8550 100644
--- a/drivers/scsi/qla2xxx/qla_def.h
+++ b/drivers/scsi/qla2xxx/qla_def.h
@@ -2086,7 +2086,7 @@ struct ct_sns_pkt {
 };
 
 /*
- * SNS command structures -- for 2200 compatability.
+ * SNS command structures -- for 2200 compatibility.
  */
 #define RFT_ID_SNS_SCMD_LEN     22
 #define RFT_ID_SNS_CMD_SIZE     60
diff --git a/drivers/scsi/qla2xxx/qla_fw.h b/drivers/scsi/qla2xxx/qla_fw.h
index 631fefc8482d..f5ba09c8a663 100644
--- a/drivers/scsi/qla2xxx/qla_fw.h
+++ b/drivers/scsi/qla2xxx/qla_fw.h
@@ -539,7 +539,7 @@ struct sts_entry_24xx {
          * If DIF Error is set in comp_status, these additional fields are
          * defined:
          * &data[10] : uint8_t report_runt_bg[2];       - computed guard
-         * &data[12] : uint8_t actual_dif[8];           - DIF Data recieved
+         * &data[12] : uint8_t actual_dif[8];           - DIF Data received
          * &data[20] : uint8_t expected_dif[8];         - DIF Data computed
         */
 };
diff --git a/drivers/scsi/qla2xxx/qla_isr.c b/drivers/scsi/qla2xxx/qla_isr.c
index 8b4d99a224f3..6c55c3ca8e05 100644
--- a/drivers/scsi/qla2xxx/qla_isr.c
+++ b/drivers/scsi/qla2xxx/qla_isr.c
@@ -414,7 +414,7 @@ skip_rio:
                                     "marked OFFLINE!\n");
                                 vha->flags.online = 0;
                         } else {
-                                /* Check to see if MPI timeout occured */
+                                /* Check to see if MPI timeout occurred */
                                 if ((mbx & MBX_3) && (ha->flags.port0))
                                         set_bit(MPI_RESET_NEEDED,
                                             &vha->dpc_flags);
diff --git a/drivers/scsi/qla2xxx/qla_mbx.c b/drivers/scsi/qla2xxx/qla_mbx.c
index 7a7c0ecfe7dd..34893397ac84 100644
--- a/drivers/scsi/qla2xxx/qla_mbx.c
+++ b/drivers/scsi/qla2xxx/qla_mbx.c
@@ -303,7 +303,7 @@ qla2x00_mailbox_command(scsi_qla_host_t *vha, mbx_cmd_t *mcp)
                             !test_bit(ISP_ABORT_RETRY, &vha->dpc_flags)) {
 
                                 qla_printk(KERN_WARNING, ha,
-                                    "Mailbox command timeout occured. "
+                                    "Mailbox command timeout occurred. "
                                     "Scheduling ISP " "abort. eeh_busy: 0x%x\n",
                                     ha->flags.eeh_busy);
                                 set_bit(ISP_ABORT_NEEDED, &vha->dpc_flags);
@@ -321,7 +321,7 @@ qla2x00_mailbox_command(scsi_qla_host_t *vha, mbx_cmd_t *mcp)
                             !test_bit(ISP_ABORT_RETRY, &vha->dpc_flags)) {
 
                                 qla_printk(KERN_WARNING, ha,
-                                    "Mailbox command timeout occured. "
+                                    "Mailbox command timeout occurred. "
                                     "Issuing ISP abort.\n");
 
                                 set_bit(ABORT_ISP_ACTIVE, &vha->dpc_flags);
@@ -3789,7 +3789,7 @@ qla2x00_loopback_test(scsi_qla_host_t *vha, struct msg_echo_lb *mreq,
         mcp->mb[20] = LSW(MSD(mreq->send_dma));
         mcp->mb[21] = MSW(MSD(mreq->send_dma));
 
-        /* recieve data address */
+        /* receive data address */
         mcp->mb[16] = LSW(mreq->rcv_dma);
         mcp->mb[17] = MSW(mreq->rcv_dma);
         mcp->mb[6] = LSW(MSD(mreq->rcv_dma));
diff --git a/drivers/scsi/qla2xxx/qla_nx.c b/drivers/scsi/qla2xxx/qla_nx.c
index 76ec876e6b21..455fe134d31d 100644
--- a/drivers/scsi/qla2xxx/qla_nx.c
+++ b/drivers/scsi/qla2xxx/qla_nx.c
@@ -2598,7 +2598,7 @@ qla82xx_calc_dsd_lists(uint16_t dsds)
  * qla82xx_start_scsi() - Send a SCSI command to the ISP
  * @sp: command to send to the ISP
  *
- * Returns non-zero if a failure occured, else zero.
+ * Returns non-zero if a failure occurred, else zero.
  */
 int
 qla82xx_start_scsi(srb_t *sp)
diff --git a/drivers/scsi/qla2xxx/qla_os.c b/drivers/scsi/qla2xxx/qla_os.c
index 75a966c94860..aa7747529165 100644
--- a/drivers/scsi/qla2xxx/qla_os.c
+++ b/drivers/scsi/qla2xxx/qla_os.c
@@ -1046,7 +1046,7 @@ qla2xxx_eh_bus_reset(struct scsi_cmnd *cmd)
 
 eh_bus_reset_done:
         qla_printk(KERN_INFO, vha->hw, "%s: reset %s\n", __func__,
-            (ret == FAILED) ? "failed" : "succeded");
+            (ret == FAILED) ? "failed" : "succeeded");
 
         return ret;
 }
@@ -1136,7 +1136,7 @@ qla2xxx_eh_host_reset(struct scsi_cmnd *cmd)
 
 eh_host_reset_lock:
         qla_printk(KERN_INFO, ha, "%s: reset %s\n", __func__,
-            (ret == FAILED) ? "failed" : "succeded");
+            (ret == FAILED) ? "failed" : "succeeded");
 
         return ret;
 }
@@ -3902,7 +3902,7 @@ uint32_t qla82xx_error_recovery(scsi_qla_host_t *base_vha)
                         continue;
                 if (atomic_read(&other_pdev->enable_cnt)) {
                         DEBUG17(qla_printk(KERN_INFO, ha,
-                            "Found PCI func availabe and enabled at 0x%x\n",
+                            "Found PCI func available and enabled at 0x%x\n",
                             fn));
                         pci_dev_put(other_pdev);
                         break;
diff --git a/drivers/scsi/qla4xxx/ql4_def.h b/drivers/scsi/qla4xxx/ql4_def.h
index 2fc0045b1a52..4757878d59dd 100644
--- a/drivers/scsi/qla4xxx/ql4_def.h
+++ b/drivers/scsi/qla4xxx/ql4_def.h
@@ -53,6 +53,9 @@
 #define PCI_DEVICE_ID_QLOGIC_ISP8022    0x8022
 #endif
 
+#define ISP4XXX_PCI_FN_1        0x1
+#define ISP4XXX_PCI_FN_2        0x3
+
 #define QLA_SUCCESS                     0
 #define QLA_ERROR                       1
 
@@ -179,7 +182,7 @@ struct srb {
         uint16_t flags;         /* (1) Status flags. */
 
 #define SRB_DMA_VALID           BIT_3   /* DMA Buffer mapped. */
-#define SRB_GOT_SENSE           BIT_4   /* sense data recieved. */
+#define SRB_GOT_SENSE           BIT_4   /* sense data received. */
         uint8_t state;          /* (1) Status flags. */
 
 #define SRB_NO_QUEUE_STATE       0      /* Request is in between states */
@@ -233,9 +236,6 @@ struct ddb_entry {
 
         unsigned long flags;    /* DDB Flags */
 
-        unsigned long dev_scan_wait_to_start_relogin;
-        unsigned long dev_scan_wait_to_complete_relogin;
-
         uint16_t fw_ddb_index;  /* DDB firmware index */
         uint16_t options;
         uint32_t fw_ddb_device_state; /* F/W Device State  -- see ql4_fw.h */
@@ -289,8 +289,6 @@ struct ddb_entry {
  * DDB flags.
  */
 #define DF_RELOGIN              0       /* Relogin to device */
-#define DF_NO_RELOGIN           1       /* Do not relogin if IOCTL
-                                         * logged it out */
 #define DF_ISNS_DISCOVERED      2       /* Device was discovered via iSNS */
 #define DF_FO_MASKED            3
 
@@ -376,7 +374,7 @@ struct scsi_qla_host {
 #define AF_LINK_UP                      8 /* 0x00000100 */
 #define AF_IRQ_ATTACHED                 10 /* 0x00000400 */
 #define AF_DISABLE_ACB_COMPLETE         11 /* 0x00000800 */
-#define AF_HBA_GOING_AWAY               12 /* 0x00001000 */
+#define AF_HA_REMOVAL                   12 /* 0x00001000 */
 #define AF_INTx_ENABLED                 15 /* 0x00008000 */
 #define AF_MSI_ENABLED                  16 /* 0x00010000 */
 #define AF_MSIX_ENABLED                 17 /* 0x00020000 */
@@ -479,7 +477,6 @@ struct scsi_qla_host {
         uint32_t timer_active;
 
         /* Recovery Timers */
-        uint32_t discovery_wait;
         atomic_t check_relogin_timeouts;
         uint32_t retry_reset_ha_cnt;
         uint32_t isp_reset_timer;       /* reset test timer */
@@ -765,6 +762,5 @@ static inline void ql4xxx_unlock_drvr(struct scsi_qla_host *a)
 /* Defines for process_aen() */
 #define PROCESS_ALL_AENS         0
 #define FLUSH_DDB_CHANGED_AENS   1
-#define RELOGIN_DDB_CHANGED_AENS 2
 
 #endif  /*_QLA4XXX_H */
diff --git a/drivers/scsi/qla4xxx/ql4_fw.h b/drivers/scsi/qla4xxx/ql4_fw.h
index c1985792f034..31e2bf97198c 100644
--- a/drivers/scsi/qla4xxx/ql4_fw.h
+++ b/drivers/scsi/qla4xxx/ql4_fw.h
@@ -455,6 +455,7 @@ struct addr_ctrl_blk {
         uint8_t res0;   /* 07 */
         uint16_t eth_mtu_size;  /* 08-09 */
         uint16_t add_fw_options;        /* 0A-0B */
+#define SERIALIZE_TASK_MGMT             0x0400
 
         uint8_t hb_interval;    /* 0C */
         uint8_t inst_num; /* 0D */
diff --git a/drivers/scsi/qla4xxx/ql4_glbl.h b/drivers/scsi/qla4xxx/ql4_glbl.h
index 8fad99b7eef4..cc53e3fbd78c 100644
--- a/drivers/scsi/qla4xxx/ql4_glbl.h
+++ b/drivers/scsi/qla4xxx/ql4_glbl.h
@@ -136,7 +136,6 @@ void qla4_8xxx_clear_drv_active(struct scsi_qla_host *ha);
 void qla4_8xxx_set_drv_active(struct scsi_qla_host *ha);
 
 extern int ql4xextended_error_logging;
-extern int ql4xdiscoverywait;
 extern int ql4xdontresethba;
 extern int ql4xenablemsix;
 
diff --git a/drivers/scsi/qla4xxx/ql4_init.c b/drivers/scsi/qla4xxx/ql4_init.c
index 1629c48c35ef..48e2241ddaf4 100644
--- a/drivers/scsi/qla4xxx/ql4_init.c
+++ b/drivers/scsi/qla4xxx/ql4_init.c
@@ -723,13 +723,38 @@ int qla4_is_relogin_allowed(struct scsi_qla_host *ha, uint32_t conn_err)
         return relogin;
 }
 
+static void qla4xxx_flush_AENS(struct scsi_qla_host *ha)
+{
+        unsigned long wtime;
+
+        /* Flush the 0x8014 AEN from the firmware as a result of
+         * Auto connect. We are basically doing get_firmware_ddb()
+         * to determine whether we need to log back in or not.
+         * Trying to do a set ddb before we have processed 0x8014
+         * will result in another set_ddb() for the same ddb. In other
+         * words there will be stale entries in the aen_q.
+         */
+        wtime = jiffies + (2 * HZ);
+        do {
+                if (qla4xxx_get_firmware_state(ha) == QLA_SUCCESS)
+                        if (ha->firmware_state & (BIT_2 | BIT_0))
+                                return;
+
+                if (test_and_clear_bit(DPC_AEN, &ha->dpc_flags))
+                        qla4xxx_process_aen(ha, FLUSH_DDB_CHANGED_AENS);
+
+                msleep(1000);
+        } while (!time_after_eq(jiffies, wtime));
+}
+
 /**
- * qla4xxx_configure_ddbs - builds driver ddb list
+ * qla4xxx_build_ddb_list - builds driver ddb list
  * @ha: Pointer to host adapter structure.
  *
  * This routine searches for all valid firmware ddb entries and builds
  * an internal ddb list. Ddbs that are considered valid are those with
  * a device state of SESSION_ACTIVE.
+ * A relogin (set_ddb) is issued for DDBs that are not online.
  **/
 static int qla4xxx_build_ddb_list(struct scsi_qla_host *ha)
 {
@@ -744,6 +769,8 @@ static int qla4xxx_build_ddb_list(struct scsi_qla_host *ha)
         uint32_t ipv6_device;
         uint32_t new_tgt;
 
+        qla4xxx_flush_AENS(ha);
+
         fw_ddb_entry = dma_alloc_coherent(&ha->pdev->dev, sizeof(*fw_ddb_entry),
                         &fw_ddb_entry_dma, GFP_KERNEL);
         if (fw_ddb_entry == NULL) {
@@ -847,144 +874,6 @@ exit_build_ddb_list_no_free:
         return status;
 }
 
-struct qla4_relog_scan {
-        int halt_wait;
-        uint32_t conn_err;
-        uint32_t fw_ddb_index;
-        uint32_t next_fw_ddb_index;
-        uint32_t fw_ddb_device_state;
-};
-
-static int qla4_test_rdy(struct scsi_qla_host *ha, struct qla4_relog_scan *rs)
-{
-        struct ddb_entry *ddb_entry;
-
-        if (qla4_is_relogin_allowed(ha, rs->conn_err)) {
-                /* We either have a device that is in
-                 * the process of relogging in or a
-                 * device that is waiting to be
-                 * relogged in */
-                rs->halt_wait = 0;
-
-                ddb_entry = qla4xxx_lookup_ddb_by_fw_index(ha,
-                                                           rs->fw_ddb_index);
-                if (ddb_entry == NULL)
-                        return QLA_ERROR;
-
-                if (ddb_entry->dev_scan_wait_to_start_relogin != 0
-                    && time_after_eq(jiffies,
-                                     ddb_entry->
-                                     dev_scan_wait_to_start_relogin))
-                {
-                        ddb_entry->dev_scan_wait_to_start_relogin = 0;
-                        qla4xxx_set_ddb_entry(ha, rs->fw_ddb_index, 0);
-                }
-        }
-        return QLA_SUCCESS;
-}
-
-static int qla4_scan_for_relogin(struct scsi_qla_host *ha,
-                                 struct qla4_relog_scan *rs)
-{
-        int error;
-
-        /* scan for relogins
-         * ----------------- */
-        for (rs->fw_ddb_index = 0; rs->fw_ddb_index < MAX_DDB_ENTRIES;
-             rs->fw_ddb_index = rs->next_fw_ddb_index) {
-                if (qla4xxx_get_fwddb_entry(ha, rs->fw_ddb_index, NULL, 0,
-                                            NULL, &rs->next_fw_ddb_index,
-                                            &rs->fw_ddb_device_state,
-                                            &rs->conn_err, NULL, NULL)
-                    == QLA_ERROR)
-                        return QLA_ERROR;
-
-                if (rs->fw_ddb_device_state == DDB_DS_LOGIN_IN_PROCESS)
-                        rs->halt_wait = 0;
-
-                if (rs->fw_ddb_device_state == DDB_DS_SESSION_FAILED ||
-                    rs->fw_ddb_device_state == DDB_DS_NO_CONNECTION_ACTIVE) {
-                        error = qla4_test_rdy(ha, rs);
-                        if (error)
-                                return error;
-                }
-
-                /* We know we've reached the last device when
-                 * next_fw_ddb_index is 0 */
-                if (rs->next_fw_ddb_index == 0)
-                        break;
-        }
-        return QLA_SUCCESS;
-}
-
-/**
- * qla4xxx_devices_ready - wait for target devices to be logged in
- * @ha: pointer to adapter structure
- *
- * This routine waits up to ql4xdiscoverywait seconds
- * F/W database during driver load time.
- **/
-static int qla4xxx_devices_ready(struct scsi_qla_host *ha)
-{
-        int error;
-        unsigned long discovery_wtime;
-        struct qla4_relog_scan rs;
-
-        discovery_wtime = jiffies + (ql4xdiscoverywait * HZ);
-
-        DEBUG(printk("Waiting (%d) for devices ...\n", ql4xdiscoverywait));
-        do {
-                /* poll for AEN. */
-                qla4xxx_get_firmware_state(ha);
-                if (test_and_clear_bit(DPC_AEN, &ha->dpc_flags)) {
-                        /* Set time-between-relogin timer */
-                        qla4xxx_process_aen(ha, RELOGIN_DDB_CHANGED_AENS);
-                }
-
-                /* if no relogins active or needed, halt discvery wait */
-                rs.halt_wait = 1;
-
-                error = qla4_scan_for_relogin(ha, &rs);
-
-                if (rs.halt_wait) {
-                        DEBUG2(printk("scsi%ld: %s: Delay halted.  Devices "
-                                      "Ready.\n", ha->host_no, __func__));
-                        return QLA_SUCCESS;
-                }
-
-                msleep(2000);
-        } while (!time_after_eq(jiffies, discovery_wtime));
-
-        DEBUG3(qla4xxx_get_conn_event_log(ha));
-
-        return QLA_SUCCESS;
-}
-
-static void qla4xxx_flush_AENS(struct scsi_qla_host *ha)
-{
-        unsigned long wtime;
-
-        /* Flush the 0x8014 AEN from the firmware as a result of
-         * Auto connect. We are basically doing get_firmware_ddb()
-         * to determine whether we need to log back in or not.
-         *  Trying to do a set ddb before we have processed 0x8014
-         *  will result in another set_ddb() for the same ddb. In other
-         *  words there will be stale entries in the aen_q.
-         */
-        wtime = jiffies + (2 * HZ);
-        do {
-                if (qla4xxx_get_firmware_state(ha) == QLA_SUCCESS)
-                        if (ha->firmware_state & (BIT_2 | BIT_0))
-                                return;
-
-                if (test_and_clear_bit(DPC_AEN, &ha->dpc_flags))
-                        qla4xxx_process_aen(ha, FLUSH_DDB_CHANGED_AENS);
-
-                msleep(1000);
-        } while (!time_after_eq(jiffies, wtime));
-
-}
-
 static int qla4xxx_initialize_ddb_list(struct scsi_qla_host *ha)
 {
         uint16_t fw_ddb_index;
@@ -996,29 +885,12 @@ static int qla4xxx_initialize_ddb_list(struct scsi_qla_host *ha)
 
         for (fw_ddb_index = 0; fw_ddb_index < MAX_DDB_ENTRIES; fw_ddb_index++)
                 ha->fw_ddb_index_map[fw_ddb_index] =
-                        (struct ddb_entry *)INVALID_ENTRY;
+                    (struct ddb_entry *)INVALID_ENTRY;
 
         ha->tot_ddbs = 0;
 
-        qla4xxx_flush_AENS(ha);
-
-        /* Wait for an AEN */
-        qla4xxx_devices_ready(ha);
-
-        /*
-         * First perform device discovery for active
-         * fw ddb indexes and build
-         * ddb list.
-         */
-        if ((status = qla4xxx_build_ddb_list(ha)) == QLA_ERROR)
-                return status;
-
-        /*
-         * Targets can come online after the inital discovery, so processing
-         * the aens here will catch them.
-         */
-        if (test_and_clear_bit(DPC_AEN, &ha->dpc_flags))
-                qla4xxx_process_aen(ha, PROCESS_ALL_AENS);
+        /* Perform device discovery and build ddb list. */
+        status = qla4xxx_build_ddb_list(ha);
 
         return status;
 }
@@ -1466,7 +1338,7 @@ exit_init_hba:
         }
 
         DEBUG2(printk("scsi%ld: initialize adapter: %s\n", ha->host_no,
-            status == QLA_ERROR ? "FAILED" : "SUCCEDED"));
+            status == QLA_ERROR ? "FAILED" : "SUCCEEDED"));
         return status;
 }
 
@@ -1537,7 +1409,6 @@ int qla4xxx_process_ddb_changed(struct scsi_qla_host *ha, uint32_t fw_ddb_index,
                 uint32_t state, uint32_t conn_err)
 {
         struct ddb_entry * ddb_entry;
-        uint32_t old_fw_ddb_device_state;
 
         /* check for out of range index */
         if (fw_ddb_index >= MAX_DDB_ENTRIES)
@@ -1553,27 +1424,18 @@ int qla4xxx_process_ddb_changed(struct scsi_qla_host *ha, uint32_t fw_ddb_index,
         }
 
         /* Device already exists in our database. */
-        old_fw_ddb_device_state = ddb_entry->fw_ddb_device_state;
         DEBUG2(printk("scsi%ld: %s DDB - old state= 0x%x, new state=0x%x for "
                       "index [%d]\n", ha->host_no, __func__,
                       ddb_entry->fw_ddb_device_state, state, fw_ddb_index));
-        if (old_fw_ddb_device_state == state &&
-            state == DDB_DS_SESSION_ACTIVE) {
-                if (atomic_read(&ddb_entry->state) != DDB_STATE_ONLINE) {
-                        atomic_set(&ddb_entry->state, DDB_STATE_ONLINE);
-                        iscsi_unblock_session(ddb_entry->sess);
-                }
-                return QLA_SUCCESS;
-        }
 
         ddb_entry->fw_ddb_device_state = state;
         /* Device is back online. */
-        if (ddb_entry->fw_ddb_device_state == DDB_DS_SESSION_ACTIVE) {
+        if ((ddb_entry->fw_ddb_device_state == DDB_DS_SESSION_ACTIVE) &&
+           (atomic_read(&ddb_entry->state) != DDB_STATE_ONLINE)) {
                 atomic_set(&ddb_entry->state, DDB_STATE_ONLINE);
                 atomic_set(&ddb_entry->relogin_retry_count, 0);
                 atomic_set(&ddb_entry->relogin_timer, 0);
                 clear_bit(DF_RELOGIN, &ddb_entry->flags);
-                clear_bit(DF_NO_RELOGIN, &ddb_entry->flags);
                 iscsi_unblock_session(ddb_entry->sess);
                 iscsi_session_event(ddb_entry->sess,
                                     ISCSI_KEVENT_CREATE_SESSION);
@@ -1581,7 +1443,7 @@ int qla4xxx_process_ddb_changed(struct scsi_qla_host *ha, uint32_t fw_ddb_index,
                  * Change the lun state to READY in case the lun TIMEOUT before
                  * the device came back.
                  */
-        } else {
+        } else if (ddb_entry->fw_ddb_device_state != DDB_DS_SESSION_ACTIVE) {
                 /* Device went away, mark device missing */
                 if (atomic_read(&ddb_entry->state) == DDB_STATE_ONLINE) {
                         DEBUG2(ql4_printk(KERN_INFO, ha, "%s mark missing "
@@ -1598,7 +1460,6 @@ int qla4xxx_process_ddb_changed(struct scsi_qla_host *ha, uint32_t fw_ddb_index,
                  */
                 if (ddb_entry->fw_ddb_device_state == DDB_DS_SESSION_FAILED &&
                     !test_bit(DF_RELOGIN, &ddb_entry->flags) &&
-                    !test_bit(DF_NO_RELOGIN, &ddb_entry->flags) &&
                     qla4_is_relogin_allowed(ha, conn_err)) {
                         /*
                          * This triggers a relogin.  After the relogin_timer
diff --git a/drivers/scsi/qla4xxx/ql4_isr.c b/drivers/scsi/qla4xxx/ql4_isr.c
index 03e028e6e809..2f40ac761cd4 100644
--- a/drivers/scsi/qla4xxx/ql4_isr.c
+++ b/drivers/scsi/qla4xxx/ql4_isr.c
@@ -801,7 +801,7 @@ irqreturn_t qla4xxx_intr_handler(int irq, void *dev_id)
                                &ha->reg->ctrl_status);
                         readl(&ha->reg->ctrl_status);
 
-                        if (!test_bit(AF_HBA_GOING_AWAY, &ha->flags))
+                        if (!test_bit(AF_HA_REMOVAL, &ha->flags))
                                 set_bit(DPC_RESET_HA_INTR, &ha->dpc_flags);
 
                         break;
@@ -1008,34 +1008,9 @@ void qla4xxx_process_aen(struct scsi_qla_host * ha, uint8_t process_aen)
                                               mbox_sts[0], mbox_sts[2],
                                               mbox_sts[3]));
                                 break;
-                        } else if (process_aen == RELOGIN_DDB_CHANGED_AENS) {
-                                /* for use during init time, we only want to
-                                 * relogin non-active ddbs */
-                                struct ddb_entry *ddb_entry;
-
-                                ddb_entry =
-                                        /* FIXME: name length? */
-                                        qla4xxx_lookup_ddb_by_fw_index(ha,
-                                                                       mbox_sts[2]);
-                                if (!ddb_entry)
-                                        break;
-
-                                ddb_entry->dev_scan_wait_to_complete_relogin =
-                                        0;
-                                ddb_entry->dev_scan_wait_to_start_relogin =
-                                        jiffies +
-                                        ((ddb_entry->default_time2wait +
-                                          4) * HZ);
-
-                                DEBUG2(printk("scsi%ld: ddb [%d] initiate"
-                                              " RELOGIN after %d seconds\n",
-                                              ha->host_no,
-                                              ddb_entry->fw_ddb_index,
-                                              ddb_entry->default_time2wait +
-                                              4));
-                                break;
                         }
-
+                case PROCESS_ALL_AENS:
+                default:
                         if (mbox_sts[1] == 0) { /* Global DB change. */
                                 qla4xxx_reinitialize_ddb_list(ha);
                         } else if (mbox_sts[1] == 1) {  /* Specific device. */
diff --git a/drivers/scsi/qla4xxx/ql4_mbx.c b/drivers/scsi/qla4xxx/ql4_mbx.c
index f65626aec7c1..f9d81c8372c3 100644
--- a/drivers/scsi/qla4xxx/ql4_mbx.c
+++ b/drivers/scsi/qla4xxx/ql4_mbx.c
@@ -32,6 +32,7 @@ int qla4xxx_mailbox_command(struct scsi_qla_host *ha, uint8_t inCount,
         u_long wait_count;
         uint32_t intr_status;
         unsigned long flags = 0;
+        uint32_t dev_state;
 
         /* Make sure that pointers are valid */
         if (!mbx_cmd || !mbx_sts) {
@@ -40,12 +41,23 @@ int qla4xxx_mailbox_command(struct scsi_qla_host *ha, uint8_t inCount,
                 return status;
         }
 
-        if (is_qla8022(ha) &&
-            test_bit(AF_FW_RECOVERY, &ha->flags)) {
-                DEBUG2(ql4_printk(KERN_WARNING, ha, "scsi%ld: %s: prematurely "
-                    "completing mbx cmd as firmware recovery detected\n",
-                    ha->host_no, __func__));
-                return status;
+        if (is_qla8022(ha)) {
+                if (test_bit(AF_FW_RECOVERY, &ha->flags)) {
+                        DEBUG2(ql4_printk(KERN_WARNING, ha, "scsi%ld: %s: "
+                            "prematurely completing mbx cmd as firmware "
+                            "recovery detected\n", ha->host_no, __func__));
+                        return status;
+                }
+                /* Do not send any mbx cmd if h/w is in failed state*/
+                qla4_8xxx_idc_lock(ha);
+                dev_state = qla4_8xxx_rd_32(ha, QLA82XX_CRB_DEV_STATE);
+                qla4_8xxx_idc_unlock(ha);
+                if (dev_state == QLA82XX_DEV_FAILED) {
+                        ql4_printk(KERN_WARNING, ha, "scsi%ld: %s: H/W is in "
+                            "failed state, do not send any mailbox commands\n",
+                            ha->host_no, __func__);
+                        return status;
+                }
         }
 
         if ((is_aer_supported(ha)) &&
@@ -139,7 +151,7 @@ int qla4xxx_mailbox_command(struct scsi_qla_host *ha, uint8_t inCount,
         if (test_bit(AF_IRQ_ATTACHED, &ha->flags) &&
             test_bit(AF_INTERRUPTS_ON, &ha->flags) &&
             test_bit(AF_ONLINE, &ha->flags) &&
-            !test_bit(AF_HBA_GOING_AWAY, &ha->flags)) {
+            !test_bit(AF_HA_REMOVAL, &ha->flags)) {
                 /* Do not poll for completion. Use completion queue */
                 set_bit(AF_MBOX_COMMAND_NOPOLL, &ha->flags);
                 wait_for_completion_timeout(&ha->mbx_intr_comp, MBOX_TOV * HZ);
@@ -395,9 +407,6 @@ qla4xxx_update_local_ifcb(struct scsi_qla_host *ha,
         /*memcpy(ha->alias, init_fw_cb->Alias,
                min(sizeof(ha->alias), sizeof(init_fw_cb->Alias)));*/
 
-        /* Save Command Line Paramater info */
-        ha->discovery_wait = ql4xdiscoverywait;
-
         if (ha->acb_version == ACB_SUPPORTED) {
                 ha->ipv6_options = init_fw_cb->ipv6_opts;
                 ha->ipv6_addl_options = init_fw_cb->ipv6_addtl_opts;
@@ -467,6 +476,11 @@ int qla4xxx_initialize_fw_cb(struct scsi_qla_host * ha)
 
         init_fw_cb->fw_options &= __constant_cpu_to_le16(~FWOPT_TARGET_MODE);
 
+        /* Set bit for "serialize task mgmt" all other bits need to be zero */
+        init_fw_cb->add_fw_options = 0;
+        init_fw_cb->add_fw_options |=
+            __constant_cpu_to_le16(SERIALIZE_TASK_MGMT);
+
         if (qla4xxx_set_ifcb(ha, &mbox_cmd[0], &mbox_sts[0], init_fw_cb_dma)
                 != QLA_SUCCESS) {
                 DEBUG2(printk(KERN_WARNING
diff --git a/drivers/scsi/qla4xxx/ql4_nvram.h b/drivers/scsi/qla4xxx/ql4_nvram.h
index b3831bd29479..945cc328f57f 100644
--- a/drivers/scsi/qla4xxx/ql4_nvram.h
+++ b/drivers/scsi/qla4xxx/ql4_nvram.h
@@ -28,7 +28,7 @@
 #define  FM93C56A_ERASE       0x3
 #define  FM93C56A_ERASE_ALL   0x0
 
-/* Command Extentions */
+/* Command Extensions */
 #define  FM93C56A_WEN_EXT        0x3
 #define  FM93C56A_WRITE_ALL_EXT  0x1
 #define  FM93C56A_WDS_EXT        0x0
diff --git a/drivers/scsi/qla4xxx/ql4_nx.c b/drivers/scsi/qla4xxx/ql4_nx.c
index 3d5ef2df4134..35381cb0936e 100644
--- a/drivers/scsi/qla4xxx/ql4_nx.c
+++ b/drivers/scsi/qla4xxx/ql4_nx.c
@@ -2304,14 +2304,13 @@ qla4_8xxx_enable_intrs(struct scsi_qla_host *ha)
 void
 qla4_8xxx_disable_intrs(struct scsi_qla_host *ha)
 {
-        if (test_bit(AF_INTERRUPTS_ON, &ha->flags))
+        if (test_and_clear_bit(AF_INTERRUPTS_ON, &ha->flags))
                 qla4_8xxx_mbx_intr_disable(ha);
 
         spin_lock_irq(&ha->hardware_lock);
         /* BIT 10 - set */
         qla4_8xxx_wr_32(ha, ha->nx_legacy_intr.tgt_mask_reg, 0x0400);
         spin_unlock_irq(&ha->hardware_lock);
-        clear_bit(AF_INTERRUPTS_ON, &ha->flags);
 }
 
 struct ql4_init_msix_entry {
diff --git a/drivers/scsi/qla4xxx/ql4_os.c b/drivers/scsi/qla4xxx/ql4_os.c
index 967836ef5ab2..230ba097d28c 100644
--- a/drivers/scsi/qla4xxx/ql4_os.c
+++ b/drivers/scsi/qla4xxx/ql4_os.c
@@ -29,10 +29,6 @@ static struct kmem_cache *srb_cachep;
 /*
  * Module parameter information and variables
  */
-int ql4xdiscoverywait = 60;
-module_param(ql4xdiscoverywait, int, S_IRUGO | S_IWUSR);
-MODULE_PARM_DESC(ql4xdiscoverywait, "Discovery wait time");
-
 int ql4xdontresethba = 0;
 module_param(ql4xdontresethba, int, S_IRUGO | S_IWUSR);
 MODULE_PARM_DESC(ql4xdontresethba,
@@ -55,6 +51,17 @@ MODULE_PARM_DESC(ql4xenablemsix,
                 " 2 = enable MSI interrupt mechanism.");
 
 #define QL4_DEF_QDEPTH 32
+static int ql4xmaxqdepth = QL4_DEF_QDEPTH;
+module_param(ql4xmaxqdepth, int, S_IRUGO | S_IWUSR);
+MODULE_PARM_DESC(ql4xmaxqdepth,
+                "Maximum queue depth to report for target devices.\n"
+                " Default: 32.");
+
+static int ql4xsess_recovery_tmo = QL4_SESS_RECOVERY_TMO;
+module_param(ql4xsess_recovery_tmo, int, S_IRUGO);
+MODULE_PARM_DESC(ql4xsess_recovery_tmo,
+                "Target Session Recovery Timeout.\n"
+                " Default: 30 sec.");
 
 /*
  * SCSI host template entry points
@@ -165,7 +172,7 @@ static void qla4xxx_recovery_timedout(struct iscsi_cls_session *session)
                 DEBUG2(printk("scsi%ld: %s: ddb [%d] session recovery timeout "
                               "of (%d) secs exhausted, marking device DEAD.\n",
                               ha->host_no, __func__, ddb_entry->fw_ddb_index,
-                              QL4_SESS_RECOVERY_TMO));
+                              ddb_entry->sess->recovery_tmo));
         }
 }
 
@@ -295,7 +302,7 @@ int qla4xxx_add_sess(struct ddb_entry *ddb_entry)
 {
         int err;
 
-        ddb_entry->sess->recovery_tmo = QL4_SESS_RECOVERY_TMO;
+        ddb_entry->sess->recovery_tmo = ql4xsess_recovery_tmo;
 
         err = iscsi_add_session(ddb_entry->sess, ddb_entry->fw_ddb_index);
         if (err) {
@@ -753,12 +760,6 @@ static void qla4xxx_timer(struct scsi_qla_host *ha)
         if (!pci_channel_offline(ha->pdev))
                 pci_read_config_word(ha->pdev, PCI_VENDOR_ID, &w);
 
-        if (test_bit(AF_HBA_GOING_AWAY, &ha->flags)) {
-                DEBUG2(ql4_printk(KERN_INFO, ha, "%s exited. HBA GOING AWAY\n",
-                    __func__));
-                return;
-        }
-
         if (is_qla8022(ha)) {
                 qla4_8xxx_watchdog(ha);
         }
@@ -1067,7 +1068,6 @@ void qla4xxx_dead_adapter_cleanup(struct scsi_qla_host *ha)
 
         /* Disable the board */
         ql4_printk(KERN_INFO, ha, "Disabling the board\n");
-        set_bit(AF_HBA_GOING_AWAY, &ha->flags);
 
         qla4xxx_abort_active_cmds(ha, DID_NO_CONNECT << 16);
         qla4xxx_mark_all_devices_missing(ha);
@@ -1213,11 +1213,32 @@ recover_ha_init_adapter:
 
         clear_bit(DPC_RESET_ACTIVE, &ha->dpc_flags);
         DEBUG2(printk("scsi%ld: recover adapter: %s\n", ha->host_no,
-            status == QLA_ERROR ? "FAILED" : "SUCCEDED"));
+            status == QLA_ERROR ? "FAILED" : "SUCCEEDED"));
 
         return status;
 }
 
+static void qla4xxx_relogin_all_devices(struct scsi_qla_host *ha)
+{
+        struct ddb_entry *ddb_entry, *dtemp;
+
+        list_for_each_entry_safe(ddb_entry, dtemp, &ha->ddb_list, list) {
+                if ((atomic_read(&ddb_entry->state) == DDB_STATE_MISSING) ||
+                    (atomic_read(&ddb_entry->state) == DDB_STATE_DEAD)) {
+                        if (ddb_entry->fw_ddb_device_state ==
+                            DDB_DS_SESSION_ACTIVE) {
+                                atomic_set(&ddb_entry->state, DDB_STATE_ONLINE);
+                                ql4_printk(KERN_INFO, ha, "scsi%ld: %s: ddb[%d]"
+                                    " marked ONLINE\n", ha->host_no, __func__,
+                                    ddb_entry->fw_ddb_index);
+
+                                iscsi_unblock_session(ddb_entry->sess);
+                        } else
+                                qla4xxx_relogin_device(ha, ddb_entry);
+                }
+        }
+}
+
 void qla4xxx_wake_dpc(struct scsi_qla_host *ha)
 {
         if (ha->dpc_thread &&
@@ -1259,11 +1280,6 @@ static void qla4xxx_do_dpc(struct work_struct *work)
                 goto do_dpc_exit;
         }
 
-        /* HBA is in the process of being permanently disabled.
-         * Don't process anything */
-        if (test_bit(AF_HBA_GOING_AWAY, &ha->flags))
-                return;
-
         if (is_qla8022(ha)) {
                 if (test_bit(DPC_HA_UNRECOVERABLE, &ha->dpc_flags)) {
                         qla4_8xxx_idc_lock(ha);
@@ -1331,13 +1347,7 @@ dpc_post_reset_ha:
         if (test_and_clear_bit(DPC_LINK_CHANGED, &ha->dpc_flags)) {
                 if (!test_bit(AF_LINK_UP, &ha->flags)) {
                         /* ---- link down? --- */
-                        list_for_each_entry_safe(ddb_entry, dtemp,
-                                                 &ha->ddb_list, list) {
-                                if (atomic_read(&ddb_entry->state) ==
-                                                DDB_STATE_ONLINE)
-                                        qla4xxx_mark_device_missing(ha,
-                                                        ddb_entry);
-                        }
+                        qla4xxx_mark_all_devices_missing(ha);
                 } else {
                         /* ---- link up? --- *
                          * F/W will auto login to all devices ONLY ONCE after
@@ -1346,30 +1356,7 @@ dpc_post_reset_ha:
                          * manually relogin to devices when recovering from
                          * connection failures, logouts, expired KATO, etc. */
 
-                        list_for_each_entry_safe(ddb_entry, dtemp,
-                                                        &ha->ddb_list, list) {
-                                if ((atomic_read(&ddb_entry->state) ==
-                                                 DDB_STATE_MISSING) ||
-                                    (atomic_read(&ddb_entry->state) ==
-                                                 DDB_STATE_DEAD)) {
-                                        if (ddb_entry->fw_ddb_device_state ==
-                                            DDB_DS_SESSION_ACTIVE) {
-                                                atomic_set(&ddb_entry->state,
-                                                           DDB_STATE_ONLINE);
-                                                ql4_printk(KERN_INFO, ha,
-                                                    "scsi%ld: %s: ddb[%d]"
-                                                    " marked ONLINE\n",
-                                                    ha->host_no, __func__,
-                                                    ddb_entry->fw_ddb_index);
-
-                                                iscsi_unblock_session(
-                                                    ddb_entry->sess);
-                                        } else
-                                                qla4xxx_relogin_device(
-                                                    ha, ddb_entry);
-                                }
-
-                        }
+                        qla4xxx_relogin_all_devices(ha);
                 }
         }
 
@@ -1630,6 +1617,7 @@ static int __devinit qla4xxx_probe_adapter(struct pci_dev *pdev,
         uint8_t init_retry_count = 0;
         char buf[34];
         struct qla4_8xxx_legacy_intr_set *nx_legacy_intr;
+        uint32_t dev_state;
 
         if (pci_enable_device(pdev))
                 return -1;
@@ -1713,6 +1701,18 @@ static int __devinit qla4xxx_probe_adapter(struct pci_dev *pdev,
         status = qla4xxx_initialize_adapter(ha, REBUILD_DDB_LIST);
         while ((!test_bit(AF_ONLINE, &ha->flags)) &&
             init_retry_count++ < MAX_INIT_RETRIES) {
+
+                if (is_qla8022(ha)) {
+                        qla4_8xxx_idc_lock(ha);
+                        dev_state = qla4_8xxx_rd_32(ha, QLA82XX_CRB_DEV_STATE);
+                        qla4_8xxx_idc_unlock(ha);
+                        if (dev_state == QLA82XX_DEV_FAILED) {
+                                ql4_printk(KERN_WARNING, ha, "%s: don't retry "
+                                    "initialize adapter. H/W is in failed state\n",
+                                    __func__);
+                                break;
+                        }
+                }
                 DEBUG2(printk("scsi: %s: retrying adapter initialization "
                               "(%d)\n", __func__, init_retry_count));
 
@@ -1815,6 +1815,44 @@ probe_disable_device:
 }
 
 /**
+ * qla4xxx_prevent_other_port_reinit - prevent other port from re-initialize
+ * @ha: pointer to adapter structure
+ *
+ * Mark the other ISP-4xxx port to indicate that the driver is being removed,
+ * so that the other port will not re-initialize while in the process of
+ * removing the ha due to driver unload or hba hotplug.
+ **/
+static void qla4xxx_prevent_other_port_reinit(struct scsi_qla_host *ha)
+{
+        struct scsi_qla_host *other_ha = NULL;
+        struct pci_dev *other_pdev = NULL;
+        int fn = ISP4XXX_PCI_FN_2;
+
+        /*iscsi function numbers for ISP4xxx is 1 and 3*/
+        if (PCI_FUNC(ha->pdev->devfn) & BIT_1)
+                fn = ISP4XXX_PCI_FN_1;
+
+        other_pdev =
+                pci_get_domain_bus_and_slot(pci_domain_nr(ha->pdev->bus),
+                ha->pdev->bus->number, PCI_DEVFN(PCI_SLOT(ha->pdev->devfn),
+                fn));
+
+        /* Get other_ha if other_pdev is valid and state is enable*/
+        if (other_pdev) {
+                if (atomic_read(&other_pdev->enable_cnt)) {
+                        other_ha = pci_get_drvdata(other_pdev);
+                        if (other_ha) {
+                                set_bit(AF_HA_REMOVAL, &other_ha->flags);
+                                DEBUG2(ql4_printk(KERN_INFO, ha, "%s: "
+                                    "Prevent %s reinit\n", __func__,
+                                    dev_name(&other_ha->pdev->dev)));
+                        }
+                }
+                pci_dev_put(other_pdev);
+        }
+}
+
+/**
  * qla4xxx_remove_adapter - calback function to remove adapter.
  * @pci_dev: PCI device pointer
  **/
@@ -1824,7 +1862,8 @@ static void __devexit qla4xxx_remove_adapter(struct pci_dev *pdev)
 
         ha = pci_get_drvdata(pdev);
 
-        set_bit(AF_HBA_GOING_AWAY, &ha->flags);
+        if (!is_qla8022(ha))
+                qla4xxx_prevent_other_port_reinit(ha);
 
         /* remove devs from iscsi_sessions to scsi_devices */
         qla4xxx_free_ddb_list(ha);
@@ -1868,10 +1907,15 @@ static int qla4xxx_slave_alloc(struct scsi_device *sdev)
 {
         struct iscsi_cls_session *sess = starget_to_session(sdev->sdev_target);
         struct ddb_entry *ddb = sess->dd_data;
+        int queue_depth = QL4_DEF_QDEPTH;
 
         sdev->hostdata = ddb;
         sdev->tagged_supported = 1;
-        scsi_activate_tcq(sdev, QL4_DEF_QDEPTH);
+
+        if (ql4xmaxqdepth != 0 && ql4xmaxqdepth <= 0xffffU)
+                queue_depth = ql4xmaxqdepth;
+
+        scsi_activate_tcq(sdev, queue_depth);
         return 0;
 }
 
@@ -2066,7 +2110,7 @@ static int qla4xxx_eh_abort(struct scsi_cmnd *cmd)
 
         ql4_printk(KERN_INFO, ha,
             "scsi%ld:%d:%d: Abort command - %s\n",
-            ha->host_no, id, lun, (ret == SUCCESS) ? "succeded" : "failed");
+            ha->host_no, id, lun, (ret == SUCCESS) ? "succeeded" : "failed");
 
         return ret;
 }
@@ -2234,7 +2278,7 @@ static int qla4xxx_eh_host_reset(struct scsi_cmnd *cmd)
                 return_status = SUCCESS;
 
         ql4_printk(KERN_INFO, ha, "HOST RESET %s.\n",
-                   return_status == FAILED ? "FAILED" : "SUCCEDED");
+                   return_status == FAILED ? "FAILED" : "SUCCEEDED");
 
         return return_status;
 }
@@ -2448,7 +2492,7 @@ qla4xxx_pci_slot_reset(struct pci_dev *pdev)
         /* Initialize device or resume if in suspended state */
         rc = pci_enable_device(pdev);
         if (rc) {
-                ql4_printk(KERN_WARNING, ha, "scsi%ld: %s: Cant re-enable "
+                ql4_printk(KERN_WARNING, ha, "scsi%ld: %s: Can't re-enable "
                     "device after reset\n", ha->host_no, __func__);
                 goto exit_slot_reset;
         }
diff --git a/drivers/scsi/qla4xxx/ql4_version.h b/drivers/scsi/qla4xxx/ql4_version.h
index 8475b308e01b..603155769407 100644
--- a/drivers/scsi/qla4xxx/ql4_version.h
+++ b/drivers/scsi/qla4xxx/ql4_version.h
@@ -5,4 +5,4 @@
  * See LICENSE.qla4xxx for copyright and licensing details.
  */
 
-#define QLA4XXX_DRIVER_VERSION  "5.02.00-k5"
+#define QLA4XXX_DRIVER_VERSION  "5.02.00-k6"
diff --git a/drivers/scsi/scsi_debug.c b/drivers/scsi/scsi_debug.c
index fa5758cbdedb..6888b2ca5bfc 100644
--- a/drivers/scsi/scsi_debug.c
+++ b/drivers/scsi/scsi_debug.c
@@ -2454,7 +2454,7 @@ static void scsi_debug_slave_destroy(struct scsi_device *sdp)
                 printk(KERN_INFO "scsi_debug: slave_destroy <%u %u %u %u>\n",
                        sdp->host->host_no, sdp->channel, sdp->id, sdp->lun);
         if (devip) {
-                /* make this slot avaliable for re-use */
+                /* make this slot available for re-use */
                 devip->used = 0;
                 sdp->hostdata = NULL;
         }
diff --git a/drivers/scsi/scsi_error.c b/drivers/scsi/scsi_error.c
index 991de3c15cfc..633c2395a92a 100644
--- a/drivers/scsi/scsi_error.c
+++ b/drivers/scsi/scsi_error.c
@@ -3,14 +3,14 @@
  *
  *  SCSI error/timeout handling
  *      Initial versions: Eric Youngdale.  Based upon conversations with
- *                        Leonard Zubkoff and David Miller at Linux Expo, 
+ *                        Leonard Zubkoff and David Miller at Linux Expo,
  *                        ideas originating from all over the place.
  *
  *      Restructured scsi_unjam_host and associated functions.
  *      September 04, 2002 Mike Anderson (andmike@us.ibm.com)
  *
  *      Forward port of Russell King's (rmk@arm.linux.org.uk) changes and
- *      minor  cleanups.
+ *      minor cleanups.
  *      September 30, 2002 Mike Anderson (andmike@us.ibm.com)
  */
 
@@ -129,14 +129,15 @@ enum blk_eh_timer_return scsi_times_out(struct request *req)
 {
         struct scsi_cmnd *scmd = req->special;
         enum blk_eh_timer_return rtn = BLK_EH_NOT_HANDLED;
+        struct Scsi_Host *host = scmd->device->host;
 
         trace_scsi_dispatch_cmd_timeout(scmd);
         scsi_log_completion(scmd, TIMEOUT_ERROR);
 
-        if (scmd->device->host->transportt->eh_timed_out)
-                rtn = scmd->device->host->transportt->eh_timed_out(scmd);
-        else if (scmd->device->host->hostt->eh_timed_out)
-                rtn = scmd->device->host->hostt->eh_timed_out(scmd);
+        if (host->transportt->eh_timed_out)
+                rtn = host->transportt->eh_timed_out(scmd);
+        else if (host->hostt->eh_timed_out)
+                rtn = host->hostt->eh_timed_out(scmd);
 
         if (unlikely(rtn == BLK_EH_NOT_HANDLED &&
                      !scsi_eh_scmd_add(scmd, SCSI_EH_CANCEL_CMD))) {
@@ -195,7 +196,7 @@ static inline void scsi_eh_prt_fail_stats(struct Scsi_Host *shost,
                                 ++total_failures;
                                 if (scmd->eh_eflags & SCSI_EH_CANCEL_CMD)
                                         ++cmd_cancel;
-                                else 
+                                else
                                         ++cmd_failed;
                         }
                 }
@@ -214,7 +215,7 @@ static inline void scsi_eh_prt_fail_stats(struct Scsi_Host *shost,
 
         SCSI_LOG_ERROR_RECOVERY(2, printk("Total of %d commands on %d"
                                           " devices require eh work\n",
-                                  total_failures, devices_failed));
+                                   total_failures, devices_failed));
 }
 #endif
 
@@ -294,7 +295,7 @@ static int scsi_check_sense(struct scsi_cmnd *scmd)
                         return NEEDS_RETRY;
                 }
                 /*
-                 * if the device is in the process of becoming ready, we 
+                 * if the device is in the process of becoming ready, we
                  * should retry.
                  */
                 if ((sshdr.asc == 0x04) && (sshdr.ascq == 0x01))
@@ -488,7 +489,7 @@ static int scsi_eh_completed_normally(struct scsi_cmnd *scmd)
  */
 static void scsi_eh_done(struct scsi_cmnd *scmd)
 {
-        struct completion     *eh_action;
+        struct completion *eh_action;
 
         SCSI_LOG_ERROR_RECOVERY(3,
                 printk("%s scmd: %p result: %x\n",
@@ -507,22 +508,23 @@ static int scsi_try_host_reset(struct scsi_cmnd *scmd)
 {
         unsigned long flags;
         int rtn;
+        struct Scsi_Host *host = scmd->device->host;
+        struct scsi_host_template *hostt = host->hostt;
 
         SCSI_LOG_ERROR_RECOVERY(3, printk("%s: Snd Host RST\n",
                                           __func__));
 
-        if (!scmd->device->host->hostt->eh_host_reset_handler)
+        if (!hostt->eh_host_reset_handler)
                 return FAILED;
 
-        rtn = scmd->device->host->hostt->eh_host_reset_handler(scmd);
+        rtn = hostt->eh_host_reset_handler(scmd);
 
         if (rtn == SUCCESS) {
-                if (!scmd->device->host->hostt->skip_settle_delay)
+                if (!hostt->skip_settle_delay)
                         ssleep(HOST_RESET_SETTLE_TIME);
-                spin_lock_irqsave(scmd->device->host->host_lock, flags);
-                scsi_report_bus_reset(scmd->device->host,
-                                      scmd_channel(scmd));
-                spin_unlock_irqrestore(scmd->device->host->host_lock, flags);
+                spin_lock_irqsave(host->host_lock, flags);
+                scsi_report_bus_reset(host, scmd_channel(scmd));
+                spin_unlock_irqrestore(host->host_lock, flags);
         }
 
         return rtn;
@@ -536,22 +538,23 @@ static int scsi_try_bus_reset(struct scsi_cmnd *scmd)
 {
         unsigned long flags;
         int rtn;
+        struct Scsi_Host *host = scmd->device->host;
+        struct scsi_host_template *hostt = host->hostt;
 
         SCSI_LOG_ERROR_RECOVERY(3, printk("%s: Snd Bus RST\n",
                                           __func__));
 
-        if (!scmd->device->host->hostt->eh_bus_reset_handler)
+        if (!hostt->eh_bus_reset_handler)
                 return FAILED;
 
-        rtn = scmd->device->host->hostt->eh_bus_reset_handler(scmd);
+        rtn = hostt->eh_bus_reset_handler(scmd);
 
         if (rtn == SUCCESS) {
-                if (!scmd->device->host->hostt->skip_settle_delay)
+                if (!hostt->skip_settle_delay)
                         ssleep(BUS_RESET_SETTLE_TIME);
-                spin_lock_irqsave(scmd->device->host->host_lock, flags);
-                scsi_report_bus_reset(scmd->device->host,
-                                      scmd_channel(scmd));
-                spin_unlock_irqrestore(scmd->device->host->host_lock, flags);
+                spin_lock_irqsave(host->host_lock, flags);
+                scsi_report_bus_reset(host, scmd_channel(scmd));
+                spin_unlock_irqrestore(host->host_lock, flags);
         }
 
         return rtn;
@@ -577,16 +580,18 @@ static int scsi_try_target_reset(struct scsi_cmnd *scmd)
 {
         unsigned long flags;
         int rtn;
+        struct Scsi_Host *host = scmd->device->host;
+        struct scsi_host_template *hostt = host->hostt;
 
-        if (!scmd->device->host->hostt->eh_target_reset_handler)
+        if (!hostt->eh_target_reset_handler)
                 return FAILED;
 
-        rtn = scmd->device->host->hostt->eh_target_reset_handler(scmd);
+        rtn = hostt->eh_target_reset_handler(scmd);
         if (rtn == SUCCESS) {
-                spin_lock_irqsave(scmd->device->host->host_lock, flags);
+                spin_lock_irqsave(host->host_lock, flags);
                 __starget_for_each_device(scsi_target(scmd->device), NULL,
                                           __scsi_report_device_reset);
-                spin_unlock_irqrestore(scmd->device->host->host_lock, flags);
+                spin_unlock_irqrestore(host->host_lock, flags);
         }
 
         return rtn;
@@ -605,27 +610,28 @@ static int scsi_try_target_reset(struct scsi_cmnd *scmd)
 static int scsi_try_bus_device_reset(struct scsi_cmnd *scmd)
 {
         int rtn;
+        struct scsi_host_template *hostt = scmd->device->host->hostt;
 
-        if (!scmd->device->host->hostt->eh_device_reset_handler)
+        if (!hostt->eh_device_reset_handler)
                 return FAILED;
 
-        rtn = scmd->device->host->hostt->eh_device_reset_handler(scmd);
+        rtn = hostt->eh_device_reset_handler(scmd);
         if (rtn == SUCCESS)
                 __scsi_report_device_reset(scmd->device, NULL);
         return rtn;
 }
 
-static int scsi_try_to_abort_cmd(struct scsi_cmnd *scmd)
+static int scsi_try_to_abort_cmd(struct scsi_host_template *hostt, struct scsi_cmnd *scmd)
 {
-        if (!scmd->device->host->hostt->eh_abort_handler)
+        if (!hostt->eh_abort_handler)
                 return FAILED;
 
-        return scmd->device->host->hostt->eh_abort_handler(scmd);
+        return hostt->eh_abort_handler(scmd);
 }
 
 static void scsi_abort_eh_cmnd(struct scsi_cmnd *scmd)
 {
-        if (scsi_try_to_abort_cmd(scmd) != SUCCESS)
+        if (scsi_try_to_abort_cmd(scmd->device->host->hostt, scmd) != SUCCESS)
                 if (scsi_try_bus_device_reset(scmd) != SUCCESS)
                         if (scsi_try_target_reset(scmd) != SUCCESS)
                                 if (scsi_try_bus_reset(scmd) != SUCCESS)
@@ -846,7 +852,7 @@ EXPORT_SYMBOL(scsi_eh_finish_cmd);
  *
  * Description:
  *    See if we need to request sense information.  if so, then get it
- *    now, so we have a better idea of what to do.  
+ *    now, so we have a better idea of what to do.
  *
  * Notes:
  *    This has the unfortunate side effect that if a shost adapter does
@@ -958,7 +964,7 @@ static int scsi_eh_abort_cmds(struct list_head *work_q,
                 SCSI_LOG_ERROR_RECOVERY(3, printk("%s: aborting cmd:"
                                                   "0x%p\n", current->comm,
                                                   scmd));
-                rtn = scsi_try_to_abort_cmd(scmd);
+                rtn = scsi_try_to_abort_cmd(scmd->device->host->hostt, scmd);
                 if (rtn == SUCCESS || rtn == FAST_IO_FAIL) {
                         scmd->eh_eflags &= ~SCSI_EH_CANCEL_CMD;
                         if (!scsi_device_online(scmd->device) ||
@@ -966,7 +972,6 @@ static int scsi_eh_abort_cmds(struct list_head *work_q,
                             !scsi_eh_tur(scmd)) {
                                 scsi_eh_finish_cmd(scmd, done_q);
                         }
-                                
                 } else
                         SCSI_LOG_ERROR_RECOVERY(3, printk("%s: aborting"
                                                           " cmd failed:"
@@ -1010,7 +1015,7 @@ static int scsi_eh_try_stu(struct scsi_cmnd *scmd)
  *
  * Notes:
  *    If commands are failing due to not ready, initializing command required,
- *      try revalidating the device, which will end up sending a start unit. 
+ *      try revalidating the device, which will end up sending a start unit.
  */
 static int scsi_eh_stu(struct Scsi_Host *shost,
                               struct list_head *work_q,
@@ -1064,7 +1069,7 @@ static int scsi_eh_stu(struct Scsi_Host *shost,
  *    Try a bus device reset.  Still, look to see whether we have multiple
  *    devices that are jammed or not - if we have multiple devices, it
  *    makes no sense to try bus_device_reset - we really would need to try
- *    a bus_reset instead. 
+ *    a bus_reset instead.
  */
 static int scsi_eh_bus_device_reset(struct Scsi_Host *shost,
                                     struct list_head *work_q,
@@ -1164,7 +1169,7 @@ static int scsi_eh_target_reset(struct Scsi_Host *shost,
 }
 
 /**
- * scsi_eh_bus_reset - send a bus reset 
+ * scsi_eh_bus_reset - send a bus reset
  * @shost:      &scsi host being recovered.
  * @work_q:     &list_head for pending commands.
  * @done_q:     &list_head for processed commands.
@@ -1181,7 +1186,7 @@ static int scsi_eh_bus_reset(struct Scsi_Host *shost,
          * we really want to loop over the various channels, and do this on
          * a channel by channel basis.  we should also check to see if any
          * of the failed commands are on soft_reset devices, and if so, skip
-         * the reset.  
+         * the reset.
          */
 
         for (channel = 0; channel <= shost->max_channel; channel++) {
@@ -1223,7 +1228,7 @@ static int scsi_eh_bus_reset(struct Scsi_Host *shost,
 }
 
 /**
- * scsi_eh_host_reset - send a host reset 
+ * scsi_eh_host_reset - send a host reset
  * @work_q:     list_head for processed commands.
  * @done_q:     list_head for processed commands.
  */
@@ -1376,7 +1381,7 @@ int scsi_decide_disposition(struct scsi_cmnd *scmd)
                 return SUCCESS;
                 /*
                  * when the low level driver returns did_soft_error,
-                 * it is responsible for keeping an internal retry counter 
+                 * it is responsible for keeping an internal retry counter
                  * in order to avoid endless loops (db)
                  *
                  * actually this is a bug in this function here.  we should
@@ -1414,7 +1419,6 @@ int scsi_decide_disposition(struct scsi_cmnd *scmd)
                          */
                         break;
                 /* fallthrough */
-
         case DID_BUS_BUSY:
         case DID_PARITY:
                 goto maybe_retry;
@@ -1982,7 +1986,7 @@ int scsi_normalize_sense(const u8 *sense_buffer, int sb_len,
                 if (sb_len > 7)
                         sshdr->additional_length = sense_buffer[7];
         } else {
-                /* 
+                /*
                  * fixed format
                  */
                 if (sb_len > 2)
diff --git a/drivers/scsi/scsi_lib.c b/drivers/scsi/scsi_lib.c
index 2d63c8ad1442..e9901b8f8443 100644
--- a/drivers/scsi/scsi_lib.c
+++ b/drivers/scsi/scsi_lib.c
@@ -67,6 +67,13 @@ static struct scsi_host_sg_pool scsi_sg_pools[] = {
 
 struct kmem_cache *scsi_sdb_cache;
 
+/*
+ * When to reinvoke queueing after a resource shortage. It's 3 msecs to
+ * not change behaviour from the previous unplug mechanism, experimentation
+ * may prove this needs changing.
+ */
+#define SCSI_QUEUE_DELAY        3
+
 static void scsi_run_queue(struct request_queue *q);
 
 /*
@@ -149,14 +156,7 @@ static int __scsi_queue_insert(struct scsi_cmnd *cmd, int reason, int unbusy)
         /*
          * Requeue this command.  It will go before all other commands
          * that are already in the queue.
-         *
-         * NOTE: there is magic here about the way the queue is plugged if
-         * we have no outstanding commands.
-         * 
-         * Although we *don't* plug the queue, we call the request
-         * function.  The SCSI request function detects the blocked condition
-         * and plugs the queue appropriately.
-         */
+         */
         spin_lock_irqsave(q->queue_lock, flags);
         blk_requeue_request(q, cmd->request);
         spin_unlock_irqrestore(q->queue_lock, flags);
@@ -411,8 +411,6 @@ static void scsi_run_queue(struct request_queue *q)
         list_splice_init(&shost->starved_list, &starved_list);
 
         while (!list_empty(&starved_list)) {
-                int flagset;
-
                 /*
                  * As long as shost is accepting commands and we have
                  * starved queues, call blk_run_queue. scsi_request_fn
@@ -435,20 +433,7 @@ static void scsi_run_queue(struct request_queue *q)
                         continue;
                 }
 
-                spin_unlock(shost->host_lock);
-
-                spin_lock(sdev->request_queue->queue_lock);
-                flagset = test_bit(QUEUE_FLAG_REENTER, &q->queue_flags) &&
-                                !test_bit(QUEUE_FLAG_REENTER,
-                                        &sdev->request_queue->queue_flags);
-                if (flagset)
-                        queue_flag_set(QUEUE_FLAG_REENTER, sdev->request_queue);
-                __blk_run_queue(sdev->request_queue, false);
-                if (flagset)
-                        queue_flag_clear(QUEUE_FLAG_REENTER, sdev->request_queue);
-                spin_unlock(sdev->request_queue->queue_lock);
-
-                spin_lock(shost->host_lock);
+                blk_run_queue_async(sdev->request_queue);
         }
         /* put any unprocessed entries back */
         list_splice(&starved_list, &shost->starved_list);
@@ -1226,11 +1211,11 @@ int scsi_prep_return(struct request_queue *q, struct request *req, int ret)
         case BLKPREP_DEFER:
                 /*
                  * If we defer, the blk_peek_request() returns NULL, but the
-                 * queue must be restarted, so we plug here if no returning
-                 * command will automatically do that.
+                 * queue must be restarted, so we schedule a callback to happen
+                 * shortly.
                  */
                 if (sdev->device_busy == 0)
-                        blk_plug_device(q);
+                        blk_delay_queue(q, SCSI_QUEUE_DELAY);
                 break;
         default:
                 req->cmd_flags |= REQ_DONTPREP;
@@ -1269,7 +1254,7 @@ static inline int scsi_dev_queue_ready(struct request_queue *q,
                                    sdev_printk(KERN_INFO, sdev,
                                    "unblocking device at zero depth\n"));
                 } else {
-                        blk_plug_device(q);
+                        blk_delay_queue(q, SCSI_QUEUE_DELAY);
                         return 0;
                 }
         }
@@ -1499,7 +1484,7 @@ static void scsi_request_fn(struct request_queue *q)
          * the host is no longer able to accept any more requests.
          */
         shost = sdev->host;
-        while (!blk_queue_plugged(q)) {
+        for (;;) {
                 int rtn;
                 /*
                  * get next queueable request.  We do this early to make sure
@@ -1578,15 +1563,8 @@ static void scsi_request_fn(struct request_queue *q)
                  */
                 rtn = scsi_dispatch_cmd(cmd);
                 spin_lock_irq(q->queue_lock);
-                if(rtn) {
-                        /* we're refusing the command; because of
-                         * the way locks get dropped, we need to 
-                         * check here if plugging is required */
-                        if(sdev->device_busy == 0)
-                                blk_plug_device(q);
-
-                        break;
-                }
+                if (rtn)
+                        goto out_delay;
         }
 
         goto out;
@@ -1605,9 +1583,10 @@ static void scsi_request_fn(struct request_queue *q)
         spin_lock_irq(q->queue_lock);
         blk_requeue_request(q, req);
         sdev->device_busy--;
-        if(sdev->device_busy == 0)
-                blk_plug_device(q);
- out:
+out_delay:
+        if (sdev->device_busy == 0)
+                blk_delay_queue(q, SCSI_QUEUE_DELAY);
+out:
         /* must be careful here...if we trigger the ->remove() function
          * we cannot be holding the q lock */
         spin_unlock_irq(q->queue_lock);
diff --git a/drivers/scsi/scsi_netlink.c b/drivers/scsi/scsi_netlink.c
index a2ed201885ae..26a8a45584ef 100644
--- a/drivers/scsi/scsi_netlink.c
+++ b/drivers/scsi/scsi_netlink.c
@@ -499,7 +499,7 @@ scsi_netlink_init(void)
                                 SCSI_NL_GRP_CNT, scsi_nl_rcv_msg, NULL,
                                 THIS_MODULE);
         if (!scsi_nl_sock) {
-                printk(KERN_ERR "%s: register of recieve handler failed\n",
+                printk(KERN_ERR "%s: register of receive handler failed\n",
                                 __func__);
                 netlink_unregister_notifier(&scsi_netlink_notifier);
                 return;
diff --git a/drivers/scsi/scsi_tgt_lib.c b/drivers/scsi/scsi_tgt_lib.c
index f67282058ba1..8bca8c25ba69 100644
--- a/drivers/scsi/scsi_tgt_lib.c
+++ b/drivers/scsi/scsi_tgt_lib.c
@@ -93,7 +93,7 @@ struct scsi_cmnd *scsi_host_get_command(struct Scsi_Host *shost,
 
         /*
          * The blk helpers are used to the READ/WRITE requests
-         * transfering data from a initiator point of view. Since
+         * transferring data from a initiator point of view. Since
          * we are in target mode we want the opposite.
          */
         rq = blk_get_request(shost->uspace_req_q, !write, gfp_mask);
diff --git a/drivers/scsi/scsi_transport_fc.c b/drivers/scsi/scsi_transport_fc.c
index 5c3ccfc6b622..815069d13f9b 100644
--- a/drivers/scsi/scsi_transport_fc.c
+++ b/drivers/scsi/scsi_transport_fc.c
@@ -2378,7 +2378,7 @@ fc_flush_devloss(struct Scsi_Host *shost)
  * fc_remove_host - called to terminate any fc_transport-related elements for a scsi host.
  * @shost:      Which &Scsi_Host
  *
- * This routine is expected to be called immediately preceeding the
+ * This routine is expected to be called immediately preceding the
  * a driver's call to scsi_remove_host().
  *
  * WARNING: A driver utilizing the fc_transport, which fails to call
@@ -2458,7 +2458,7 @@ static void fc_terminate_rport_io(struct fc_rport *rport)
 }
 
 /**
- * fc_starget_delete - called to delete the scsi decendents of an rport
+ * fc_starget_delete - called to delete the scsi descendants of an rport
  * @work:       remote port to be operated on.
  *
  * Deletes target and all sdevs.
@@ -3816,28 +3816,17 @@ fail_host_msg:
 static void
 fc_bsg_goose_queue(struct fc_rport *rport)
 {
-        int flagset;
-        unsigned long flags;
-
         if (!rport->rqst_q)
                 return;
 
+        /*
+         * This get/put dance makes no sense
+         */
         get_device(&rport->dev);
-
-        spin_lock_irqsave(rport->rqst_q->queue_lock, flags);
-        flagset = test_bit(QUEUE_FLAG_REENTER, &rport->rqst_q->queue_flags) &&
-                  !test_bit(QUEUE_FLAG_REENTER, &rport->rqst_q->queue_flags);
-        if (flagset)
-                queue_flag_set(QUEUE_FLAG_REENTER, rport->rqst_q);
-        __blk_run_queue(rport->rqst_q, false);
-        if (flagset)
-                queue_flag_clear(QUEUE_FLAG_REENTER, rport->rqst_q);
-        spin_unlock_irqrestore(rport->rqst_q->queue_lock, flags);
-
+        blk_run_queue_async(rport->rqst_q);
         put_device(&rport->dev);
 }
 
-
 /**
  * fc_bsg_rport_dispatch - process rport bsg requests and dispatch to LLDD
  * @q:          rport request queue
@@ -3913,7 +3902,7 @@ fc_bsg_request_handler(struct request_queue *q, struct Scsi_Host *shost,
         if (!get_device(dev))
                 return;
 
-        while (!blk_queue_plugged(q)) {
+        while (1) {
                 if (rport && (rport->port_state == FC_PORTSTATE_BLOCKED) &&
                     !(rport->flags & FC_RPORT_FAST_FAIL_TIMEDOUT))
                         break;
diff --git a/drivers/scsi/scsi_transport_iscsi.c b/drivers/scsi/scsi_transport_iscsi.c
index b4218390941e..3fd16d7212de 100644
--- a/drivers/scsi/scsi_transport_iscsi.c
+++ b/drivers/scsi/scsi_transport_iscsi.c
@@ -1917,7 +1917,7 @@ store_priv_session_##field(struct device *dev,				\
 #define iscsi_priv_session_rw_attr(field, format)                       \
         iscsi_priv_session_attr_show(field, format)                     \
         iscsi_priv_session_attr_store(field)                            \
-static ISCSI_CLASS_ATTR(priv_sess, field, S_IRUGO | S_IWUGO,            \
+static ISCSI_CLASS_ATTR(priv_sess, field, S_IRUGO | S_IWUSR,            \
                         show_priv_session_##field,                      \
                         store_priv_session_##field)
 iscsi_priv_session_rw_attr(recovery_tmo, "%d");
diff --git a/drivers/scsi/scsi_transport_sas.c b/drivers/scsi/scsi_transport_sas.c
index 927e99cb7225..c6fcf76cade5 100644
--- a/drivers/scsi/scsi_transport_sas.c
+++ b/drivers/scsi/scsi_transport_sas.c
@@ -173,11 +173,7 @@ static void sas_smp_request(struct request_queue *q, struct Scsi_Host *shost,
         int ret;
         int (*handler)(struct Scsi_Host *, struct sas_rphy *, struct request *);
 
-        while (!blk_queue_plugged(q)) {
-                req = blk_fetch_request(q);
-                if (!req)
-                        break;
-
+        while ((req = blk_fetch_request(q)) != NULL) {
                 spin_unlock_irq(q->queue_lock);
 
                 handler = to_sas_internal(shost->transportt)->f->smp_handler;
diff --git a/drivers/scsi/sd.c b/drivers/scsi/sd.c
index 3be5db5d6343..bd0806e64e85 100644
--- a/drivers/scsi/sd.c
+++ b/drivers/scsi/sd.c
@@ -597,6 +597,7 @@ static int scsi_setup_discard_cmnd(struct scsi_device *sdp, struct request *rq)
                 break;
 
         default:
+                ret = BLKPREP_KILL;
                 goto out;
         }
 
@@ -1054,7 +1055,7 @@ static int sd_getgeo(struct block_device *bdev, struct hd_geometry *geo)
  *      @arg: this is third argument given to ioctl(2) system call.
  *      Often contains a pointer.
  *
- *      Returns 0 if successful (some ioctls return postive numbers on
+ *      Returns 0 if successful (some ioctls return positive numbers on
  *      success as well). Returns a negated errno value in case of error.
  *
  *      Note: most ioctls are forward onto the block subsystem or further
@@ -2026,14 +2027,10 @@ sd_read_cache_type(struct scsi_disk *sdkp, unsigned char *buffer)
         int old_rcd = sdkp->RCD;
         int old_dpofua = sdkp->DPOFUA;
 
-        if (sdp->skip_ms_page_8) {
-                if (sdp->type == TYPE_RBC)
-                        goto defaults;
-                else {
-                        modepage = 0x3F;
-                        dbd = 0;
-                }
-        } else if (sdp->type == TYPE_RBC) {
+        if (sdp->skip_ms_page_8)
+                goto defaults;
+
+        if (sdp->type == TYPE_RBC) {
                 modepage = 6;
                 dbd = 8;
         } else {
@@ -2061,11 +2058,13 @@ sd_read_cache_type(struct scsi_disk *sdkp, unsigned char *buffer)
          */
         if (len < 3)
                 goto bad_sense;
-        else if (len > SD_BUF_SIZE) {
-                sd_printk(KERN_NOTICE, sdkp, "Truncating mode parameter "
-                          "data from %d to %d bytes\n", len, SD_BUF_SIZE);
-                len = SD_BUF_SIZE;
-        }
+        if (len > 20)
+                len = 20;
+
+        /* Take headers and block descriptors into account */
+        len += data.header_length + data.block_descriptor_length;
+        if (len > SD_BUF_SIZE)
+                goto bad_sense;
 
         /* Get the data */
         res = sd_do_mode_sense(sdp, dbd, modepage, buffer, len, &data, &sshdr);
@@ -2073,45 +2072,16 @@ sd_read_cache_type(struct scsi_disk *sdkp, unsigned char *buffer)
         if (scsi_status_is_good(res)) {
                 int offset = data.header_length + data.block_descriptor_length;
 
-                while (offset < len) {
-                        u8 page_code = buffer[offset] & 0x3F;
-                        u8 spf       = buffer[offset] & 0x40;
-
-                        if (page_code == 8 || page_code == 6) {
-                                /* We're interested only in the first 3 bytes.
-                                 */
-                                if (len - offset <= 2) {
-                                        sd_printk(KERN_ERR, sdkp, "Incomplete "
-                                                  "mode parameter data\n");
-                                        goto defaults;
-                                } else {
-                                        modepage = page_code;
-                                        goto Page_found;
-                                }
-                        } else {
-                                /* Go to the next page */
-                                if (spf && len - offset > 3)
-                                        offset += 4 + (buffer[offset+2] << 8) +
-                                                buffer[offset+3];
-                                else if (!spf && len - offset > 1)
-                                        offset += 2 + buffer[offset+1];
-                                else {
-                                        sd_printk(KERN_ERR, sdkp, "Incomplete "
-                                                  "mode parameter data\n");
-                                        goto defaults;
-                                }
-                        }
+                if (offset >= SD_BUF_SIZE - 2) {
+                        sd_printk(KERN_ERR, sdkp, "Malformed MODE SENSE response\n");
+                        goto defaults;
                 }
 
-                if (modepage == 0x3F) {
-                        sd_printk(KERN_ERR, sdkp, "No Caching mode page "
-                                  "present\n");
-                        goto defaults;
-                } else if ((buffer[offset] & 0x3f) != modepage) {
+                if ((buffer[offset] & 0x3f) != modepage) {
                         sd_printk(KERN_ERR, sdkp, "Got wrong page\n");
                         goto defaults;
                 }
-        Page_found:
+
                 if (modepage == 8) {
                         sdkp->WCE = ((buffer[offset + 2] & 0x04) != 0);
                         sdkp->RCD = ((buffer[offset + 2] & 0x01) != 0);
diff --git a/drivers/scsi/ses.c b/drivers/scsi/ses.c
index 7f5a6a86f820..eb7a3e85304f 100644
--- a/drivers/scsi/ses.c
+++ b/drivers/scsi/ses.c
@@ -35,9 +35,11 @@
 
 struct ses_device {
         unsigned char *page1;
+        unsigned char *page1_types;
         unsigned char *page2;
         unsigned char *page10;
         short page1_len;
+        short page1_num_types;
         short page2_len;
         short page10_len;
 };
@@ -110,12 +112,12 @@ static int ses_set_page2_descriptor(struct enclosure_device *edev,
         int i, j, count = 0, descriptor = ecomp->number;
         struct scsi_device *sdev = to_scsi_device(edev->edev.parent);
         struct ses_device *ses_dev = edev->scratch;
-        unsigned char *type_ptr = ses_dev->page1 + 12 + ses_dev->page1[11];
+        unsigned char *type_ptr = ses_dev->page1_types;
         unsigned char *desc_ptr = ses_dev->page2 + 8;
 
         /* Clear everything */
         memset(desc_ptr, 0, ses_dev->page2_len - 8);
-        for (i = 0; i < ses_dev->page1[10]; i++, type_ptr += 4) {
+        for (i = 0; i < ses_dev->page1_num_types; i++, type_ptr += 4) {
                 for (j = 0; j < type_ptr[1]; j++) {
                         desc_ptr += 4;
                         if (type_ptr[0] != ENCLOSURE_COMPONENT_DEVICE &&
@@ -140,12 +142,12 @@ static unsigned char *ses_get_page2_descriptor(struct enclosure_device *edev,
         int i, j, count = 0, descriptor = ecomp->number;
         struct scsi_device *sdev = to_scsi_device(edev->edev.parent);
         struct ses_device *ses_dev = edev->scratch;
-        unsigned char *type_ptr = ses_dev->page1 + 12 + ses_dev->page1[11];
+        unsigned char *type_ptr = ses_dev->page1_types;
         unsigned char *desc_ptr = ses_dev->page2 + 8;
 
         ses_recv_diag(sdev, 2, ses_dev->page2, ses_dev->page2_len);
 
-        for (i = 0; i < ses_dev->page1[10]; i++, type_ptr += 4) {
+        for (i = 0; i < ses_dev->page1_num_types; i++, type_ptr += 4) {
                 for (j = 0; j < type_ptr[1]; j++) {
                         desc_ptr += 4;
                         if (type_ptr[0] != ENCLOSURE_COMPONENT_DEVICE &&
@@ -358,7 +360,7 @@ static void ses_enclosure_data_process(struct enclosure_device *edev,
         unsigned char *buf = NULL, *type_ptr, *desc_ptr, *addl_desc_ptr = NULL;
         int i, j, page7_len, len, components;
         struct ses_device *ses_dev = edev->scratch;
-        int types = ses_dev->page1[10];
+        int types = ses_dev->page1_num_types;
         unsigned char *hdr_buf = kzalloc(INIT_ALLOC_SIZE, GFP_KERNEL);
 
         if (!hdr_buf)
@@ -390,10 +392,10 @@ static void ses_enclosure_data_process(struct enclosure_device *edev,
                 len = (desc_ptr[2] << 8) + desc_ptr[3];
                 /* skip past overall descriptor */
                 desc_ptr += len + 4;
-                if (ses_dev->page10)
-                        addl_desc_ptr = ses_dev->page10 + 8;
         }
-        type_ptr = ses_dev->page1 + 12 + ses_dev->page1[11];
+        if (ses_dev->page10)
+                addl_desc_ptr = ses_dev->page10 + 8;
+        type_ptr = ses_dev->page1_types;
         components = 0;
         for (i = 0; i < types; i++, type_ptr += 4) {
                 for (j = 0; j < type_ptr[1]; j++) {
@@ -503,6 +505,7 @@ static int ses_intf_add(struct device *cdev,
         u32 result;
         int i, types, len, components = 0;
         int err = -ENOMEM;
+        int num_enclosures;
         struct enclosure_device *edev;
         struct ses_component *scomp = NULL;
 
@@ -530,16 +533,6 @@ static int ses_intf_add(struct device *cdev,
         if (result)
                 goto recv_failed;
 
-        if (hdr_buf[1] != 0) {
-                /* FIXME: need subenclosure support; I've just never
-                 * seen a device with subenclosures and it makes the
-                 * traversal routines more complex */
-                sdev_printk(KERN_ERR, sdev,
-                        "FIXME driver has no support for subenclosures (%d)\n",
-                        hdr_buf[1]);
-                goto err_free;
-        }
-
         len = (hdr_buf[2] << 8) + hdr_buf[3] + 4;
         buf = kzalloc(len, GFP_KERNEL);
         if (!buf)
@@ -549,11 +542,24 @@ static int ses_intf_add(struct device *cdev,
         if (result)
                 goto recv_failed;
 
-        types = buf[10];
+        types = 0;
 
-        type_ptr = buf + 12 + buf[11];
+        /* we always have one main enclosure and the rest are referred
+         * to as secondary subenclosures */
+        num_enclosures = buf[1] + 1;
 
-        for (i = 0; i < types; i++, type_ptr += 4) {
+        /* begin at the enclosure descriptor */
+        type_ptr = buf + 8;
+        /* skip all the enclosure descriptors */
+        for (i = 0; i < num_enclosures && type_ptr < buf + len; i++) {
+                types += type_ptr[2];
+                type_ptr += type_ptr[3] + 4;
+        }
+
+        ses_dev->page1_types = type_ptr;
+        ses_dev->page1_num_types = types;
+
+        for (i = 0; i < types && type_ptr < buf + len; i++, type_ptr += 4) {
                 if (type_ptr[0] == ENCLOSURE_COMPONENT_DEVICE ||
                     type_ptr[0] == ENCLOSURE_COMPONENT_ARRAY_DEVICE)
                         components += type_ptr[1];
diff --git a/drivers/scsi/sr.c b/drivers/scsi/sr.c
index aefadc6a1607..95019c747cc1 100644
--- a/drivers/scsi/sr.c
+++ b/drivers/scsi/sr.c
@@ -567,7 +567,7 @@ static const struct block_device_operations sr_bdops =
         .revalidate_disk = sr_block_revalidate_disk,
         /* 
          * No compat_ioctl for now because sr_block_ioctl never
-         * seems to pass arbitary ioctls down to host drivers.
+         * seems to pass arbitrary ioctls down to host drivers.
          */
 };
 
diff --git a/drivers/scsi/sun3_NCR5380.c b/drivers/scsi/sun3_NCR5380.c
index 4f0e5485ffde..07eaef1c722b 100644
--- a/drivers/scsi/sun3_NCR5380.c
+++ b/drivers/scsi/sun3_NCR5380.c
@@ -467,7 +467,7 @@ static void free_all_tags( void )
  *
  * Parameters: struct scsi_cmnd *cmd
  *    The command to work on. The first scatter buffer's data are
- *    assumed to be already transfered into ptr/this_residual.
+ *    assumed to be already transferred into ptr/this_residual.
  */
 
 static void merge_contiguous_buffers(struct scsi_cmnd *cmd)
@@ -1717,7 +1717,7 @@ static int NCR5380_select(struct Scsi_Host *instance, struct scsi_cmnd *cmd,
  *      bytes to transfer, **data - pointer to data pointer.
  * 
  * Returns : -1 when different phase is entered without transferring
- *      maximum number of bytes, 0 if all bytes are transfered or exit
+ *      maximum number of bytes, 0 if all bytes are transferred or exit
  *      is in same phase.
  *
  *      Also, *phase, *count, *data are modified in place.
@@ -1904,7 +1904,7 @@ static int do_abort (struct Scsi_Host *host)
  *      bytes to transfer, **data - pointer to data pointer.
  * 
  * Returns : -1 when different phase is entered without transferring
- *      maximum number of bytes, 0 if all bytes or transfered or exit
+ *      maximum number of bytes, 0 if all bytes or transferred or exit
  *      is in same phase.
  *
  *      Also, *phase, *count, *data are modified in place.
diff --git a/drivers/scsi/sym53c416.c b/drivers/scsi/sym53c416.c
index 190107ae120b..012c86edd59f 100644
--- a/drivers/scsi/sym53c416.c
+++ b/drivers/scsi/sym53c416.c
@@ -774,7 +774,7 @@ static int sym53c416_host_reset(Scsi_Cmnd *SCpnt)
 
         /* printk("sym53c416_reset\n"); */
         base = SCpnt->device->host->io_port;
-        /* search scsi_id - fixme, we shouldnt need to iterate for this! */
+        /* search scsi_id - fixme, we shouldn't need to iterate for this! */
         for(i = 0; i < host_index && scsi_id == -1; i++)
                 if(hosts[i].base == base)
                         scsi_id = hosts[i].scsi_id;
diff --git a/drivers/scsi/sym53c8xx_2/sym_fw1.h b/drivers/scsi/sym53c8xx_2/sym_fw1.h
index 7b08d6caaa99..63952ee300b5 100644
--- a/drivers/scsi/sym53c8xx_2/sym_fw1.h
+++ b/drivers/scsi/sym53c8xx_2/sym_fw1.h
@@ -1449,7 +1449,7 @@ static struct SYM_FWB_SCR SYM_FWB_SCR = {
                 PADDR_B (msg_weird_seen),
         /*
          *  We donnot handle extended messages from SCRIPTS.
-         *  Read the amount of data correponding to the 
+         *  Read the amount of data corresponding to the 
          *  message length and call the C code.
          */
         SCR_COPY (1),
diff --git a/drivers/scsi/sym53c8xx_2/sym_fw2.h b/drivers/scsi/sym53c8xx_2/sym_fw2.h
index ae1fb179b88e..c87d72443a16 100644
--- a/drivers/scsi/sym53c8xx_2/sym_fw2.h
+++ b/drivers/scsi/sym53c8xx_2/sym_fw2.h
@@ -1326,7 +1326,7 @@ static struct SYM_FWB_SCR SYM_FWB_SCR = {
                 PADDR_B (msg_weird_seen),
         /*
          *  We donnot handle extended messages from SCRIPTS.
-         *  Read the amount of data correponding to the 
+         *  Read the amount of data corresponding to the 
          *  message length and call the C code.
          */
         SCR_STORE_REL (scratcha, 1),
diff --git a/drivers/scsi/sym53c8xx_2/sym_hipd.c b/drivers/scsi/sym53c8xx_2/sym_hipd.c
index 2c3e89ddf069..d92fe4037e94 100644
--- a/drivers/scsi/sym53c8xx_2/sym_hipd.c
+++ b/drivers/scsi/sym53c8xx_2/sym_hipd.c
@@ -2457,7 +2457,7 @@ static void sym_int_ma (struct sym_hcb *np)
                 }
 
                 /*
-                 *  The data in the dma fifo has not been transfered to
+                 *  The data in the dma fifo has not been transferred to
                  *  the target -> add the amount to the rest
                  *  and clear the data.
                  *  Check the sstat2 register in case of wide transfer.
@@ -5094,7 +5094,7 @@ fail:
 }
 
 /*
- *  Lun control block deallocation. Returns the number of valid remaing LCBs
+ *  Lun control block deallocation. Returns the number of valid remaining LCBs
  *  for the target.
  */
 int sym_free_lcb(struct sym_hcb *np, u_char tn, u_char ln)
diff --git a/drivers/scsi/sym53c8xx_2/sym_malloc.c b/drivers/scsi/sym53c8xx_2/sym_malloc.c
index 883cac10daf9..6f9af0de7ec3 100644
--- a/drivers/scsi/sym53c8xx_2/sym_malloc.c
+++ b/drivers/scsi/sym53c8xx_2/sym_malloc.c
@@ -50,7 +50,7 @@
  *  from the SCRIPTS code. In addition, cache line alignment 
  *  is guaranteed for power of 2 cache line size.
  *
- *  This allocator has been developped for the Linux sym53c8xx  
+ *  This allocator has been developed for the Linux sym53c8xx  
  *  driver, since this O/S does not provide naturally aligned 
  *  allocations.
  *  It has the advantage of allowing the driver to use private 
diff --git a/drivers/scsi/ultrastor.c b/drivers/scsi/ultrastor.c
index 0571ef9639cb..9f4b58b7daad 100644
--- a/drivers/scsi/ultrastor.c
+++ b/drivers/scsi/ultrastor.c
@@ -138,6 +138,7 @@
 #include <linux/spinlock.h>
 #include <linux/stat.h>
 #include <linux/bitops.h>
+#include <linux/delay.h>
 
 #include <asm/io.h>
 #include <asm/system.h>
diff --git a/drivers/scsi/wd33c93.c b/drivers/scsi/wd33c93.c
index 5f697e0bd009..4468ae3610f7 100644
--- a/drivers/scsi/wd33c93.c
+++ b/drivers/scsi/wd33c93.c
@@ -1843,7 +1843,7 @@ check_setup_args(char *key, int *flags, int *val, char *buf)
  *
  * The original driver used to rely on a fixed sx_table, containing periods
  * for (only) the lower limits of the respective input-clock-frequency ranges
- * (8-10/12-15/16-20 MHz). Although it seems, that no problems ocurred with
+ * (8-10/12-15/16-20 MHz). Although it seems, that no problems occurred with
  * this setting so far, it might be desirable to adjust the transfer periods
  * closer to the really attached, possibly 25% higher, input-clock, since
  * - the wd33c93 may really use a significant shorter period, than it has
diff --git a/drivers/scsi/wd7000.c b/drivers/scsi/wd7000.c
index db451ae0a368..9ee0afef2d16 100644
--- a/drivers/scsi/wd7000.c
+++ b/drivers/scsi/wd7000.c
@@ -837,7 +837,7 @@ static inline Scb *alloc_scbs(struct Scsi_Host *host, int needed)
                 }
         }
 
-        /* Take the lock, then check we didnt get beaten, if so try again */
+        /* Take the lock, then check we didn't get beaten, if so try again */
         spin_lock_irqsave(&scbpool_lock, flags);
         if (freescbs < needed) {
                 spin_unlock_irqrestore(&scbpool_lock, flags);