117 files changed, 10501 insertions, 7555 deletions
diff --git a/drivers/scsi/3w-9xxx.c b/drivers/scsi/3w-9xxx.c
index b92c19bb6876..5311317c2e4c 100644
--- a/drivers/scsi/3w-9xxx.c
+++ b/drivers/scsi/3w-9xxx.c
@@ -1924,12 +1924,9 @@ static void twa_scsiop_execute_scsi_complete(TW_Device_Extension *tw_dev, int re
            (cmd->sc_data_direction == DMA_FROM_DEVICE ||
             cmd->sc_data_direction == DMA_BIDIRECTIONAL)) {
                if (scsi_sg_count(cmd) == 1) {
-                        unsigned long flags;
                        void *buf = tw_dev->generic_buffer_virt[request_id];
-                        local_irq_save(flags);
                        scsi_sg_copy_from_buffer(cmd, buf, TW_SECTOR_SIZE);
-                        local_irq_restore(flags);
                }
        }
 } /* End twa_scsiop_execute_scsi_complete() */
diff --git a/drivers/scsi/3w-xxxx.c b/drivers/scsi/3w-xxxx.c
index a0537f09aa21..c03f1d2c9e2e 100644
--- a/drivers/scsi/3w-xxxx.c
+++ b/drivers/scsi/3w-xxxx.c
@@ -1466,12 +1466,7 @@ static int tw_scsiop_inquiry(TW_Device_Extension *tw_dev, int request_id)
 static void tw_transfer_internal(TW_Device_Extension *tw_dev, int request_id,
                                 void *data, unsigned int len)
 {
-        struct scsi_cmnd *cmd = tw_dev->srb[request_id];
+        scsi_sg_copy_from_buffer(tw_dev->srb[request_id], data, len);
-        unsigned long flags;
-        local_irq_save(flags);
-        scsi_sg_copy_from_buffer(cmd, data, len);
-        local_irq_restore(flags);
 }
 /* This function is called by the isr to complete an inquiry command */
diff --git a/drivers/scsi/Kconfig b/drivers/scsi/Kconfig
index 4e0322b1c1ea..403ecad48d4b 100644
--- a/drivers/scsi/Kconfig
+++ b/drivers/scsi/Kconfig
@@ -1325,14 +1325,6 @@ config SCSI_QLOGIC_FAS
          To compile this driver as a module, choose M here: the
          module will be called qlogicfas.
-config SCSI_QLOGIC_FC_FIRMWARE
-        bool "Include loadable firmware in driver"
-        depends on SCSI_QLOGIC_FC
-        help
-          Say Y to include ISP2X00 Fabric Initiator/Target Firmware, with
-          expanded LUN addressing and FcTape (FCP-2) support, in the
-          qlogicfc driver. This is required on some platforms.
 config SCSI_QLOGIC_1280
        tristate "Qlogic QLA 1240/1x80/1x160 SCSI support"
        depends on PCI && SCSI
@@ -1648,6 +1640,7 @@ config ATARI_SCSI
        tristate "Atari native SCSI support"
        depends on ATARI && SCSI
        select SCSI_SPI_ATTRS
+        select NVRAM
        ---help---
          If you have an Atari with built-in NCR5380 SCSI controller (TT,
          Falcon, ...) say Y to get it supported. Of course also, if you have
@@ -1678,14 +1671,6 @@ config ATARI_SCSI_RESET_BOOT
          boot process fractionally longer but may assist recovery from errors
          that leave the devices with SCSI operations partway completed.
-config TT_DMA_EMUL
-        bool "Hades SCSI DMA emulator"
-        depends on ATARI_SCSI && HADES
-        help
-          This option enables code which emulates the TT SCSI DMA chip on the
-          Hades. This increases the SCSI transfer rates at least ten times
-          compared to PIO transfers.
 config MAC_SCSI
        bool "Macintosh NCR5380 SCSI"
        depends on MAC && SCSI=y
diff --git a/drivers/scsi/aacraid/aachba.c b/drivers/scsi/aacraid/aachba.c
index aa4e77c25273..8abfd06b5a72 100644
--- a/drivers/scsi/aacraid/aachba.c
+++ b/drivers/scsi/aacraid/aachba.c
@@ -1139,7 +1139,7 @@ static struct aac_srb * aac_scsi_common(struct fib * fib, struct scsi_cmnd * cmd
        srbcmd->id       = cpu_to_le32(scmd_id(cmd));
        srbcmd->lun      = cpu_to_le32(cmd->device->lun);
        srbcmd->flags    = cpu_to_le32(flag);
-        timeout = cmd->timeout_per_command/HZ;
+        timeout = cmd->request->timeout/HZ;
        if (timeout == 0)
                timeout = 1;
        srbcmd->timeout  = cpu_to_le32(timeout);  // timeout in seconds
diff --git a/drivers/scsi/aha152x.c b/drivers/scsi/aha152x.c
index b5a868d85eb4..1e5478abd90e 100644
--- a/drivers/scsi/aha152x.c
+++ b/drivers/scsi/aha152x.c
@@ -337,7 +337,7 @@ CMD_INC_RESID(struct scsi_cmnd *cmd, int inc)
 #else
 #define IRQ_MIN 9
 #if defined(__PPC)
-#define IRQ_MAX (NR_IRQS-1)
+#define IRQ_MAX (nr_irqs-1)
 #else
 #define IRQ_MAX 12
 #endif
diff --git a/drivers/scsi/aic7xxx/aic79xx.reg b/drivers/scsi/aic7xxx/aic79xx.reg
index cca16fc5b4ad..0666c22ab55b 100644
--- a/drivers/scsi/aic7xxx/aic79xx.reg
+++ b/drivers/scsi/aic7xxx/aic79xx.reg
@@ -80,6 +80,17 @@ VERSION = "$Id: //depot/aic7xxx/aic7xxx/aic79xx.reg#77 $"
        }
 /*
+ * Registers marked "dont_generate_debug_code" are not (yet) referenced
+ * from the driver code, and this keyword inhibit generation
+ * of debug code for them.
+ *
+ * REG_PRETTY_PRINT config will complain if dont_generate_debug_code
+ * is added to the register which is referenced in the driver.
+ * Unreferenced register with no dont_generate_debug_code will result
+ * in dead code. No warning is issued.
+ */
+/*
 * Mode Pointer
 * Controls which of the 5, 512byte, address spaces should be used
 * as the source and destination of any register accesses in our
@@ -91,6 +102,7 @@ register MODE_PTR {
        field   DST_MODE        0x70
        field   SRC_MODE        0x07
        mode_pointer
+        dont_generate_debug_code
 }
 const SRC_MODE_SHIFT    0
@@ -190,6 +202,7 @@ register SEQINTCODE {
                SAW_HWERR,
                BAD_SCB_STATUS
        }
+        dont_generate_debug_code
 }
 /*
@@ -207,6 +220,7 @@ register CLRINT {
        field   CLRSEQINT       0x04
        field   CLRCMDINT       0x02
        field   CLRSPLTINT      0x01
+        dont_generate_debug_code
 }
 /*
@@ -222,6 +236,7 @@ register ERROR {
        field   SQPARERR        0x08
        field   ILLOPCODE       0x04
        field   DSCTMOUT        0x02
+        dont_generate_debug_code
 }
 /*
@@ -255,6 +270,7 @@ register HCNTRL {
        field   INTEN           0x02
        field   CHIPRST         0x01
        field   CHIPRSTACK      0x01
+        dont_generate_debug_code
 }
 /*
@@ -265,6 +281,7 @@ register HNSCB_QOFF {
        access_mode     RW
        size            2
        count           2
+        dont_generate_debug_code
 }
 /*
@@ -274,6 +291,7 @@ register HESCB_QOFF {
        address                 0x008
        access_mode     RW
        count           2
+        dont_generate_debug_code
 }
 /*
@@ -311,6 +329,7 @@ register CLRSEQINTSTAT {
        field   CLRSEQ_SCSIINT  0x04
        field   CLRSEQ_PCIINT   0x02
        field   CLRSEQ_SPLTINT  0x01
+        dont_generate_debug_code
 }
 /*
@@ -320,6 +339,7 @@ register SWTIMER {
        address                 0x00E
        access_mode     RW
        size            2
+        dont_generate_debug_code
 }
 /*
@@ -330,6 +350,7 @@ register SNSCB_QOFF {
        access_mode     RW
        size            2
        modes           M_CCHAN
+        dont_generate_debug_code
 }
 /*
@@ -340,6 +361,7 @@ register SESCB_QOFF {
        count           2
        access_mode     RW
        modes           M_CCHAN
+        dont_generate_debug_code
 }
 /*
@@ -350,6 +372,7 @@ register SDSCB_QOFF {
        access_mode     RW
        modes           M_CCHAN
        size            2
+        dont_generate_debug_code
 }
 /*
@@ -378,6 +401,7 @@ register QOFF_CTLSTA {
                SCB_QSIZE_8192,
                SCB_QSIZE_16384
        }
+        dont_generate_debug_code
 }
 /*
@@ -431,6 +455,7 @@ register DSCOMMAND0 {
        field   EXTREQLCK       0x10    /* External Request Lock */
        field   DISABLE_TWATE   0x02    /* Rev B or greater */
        field   CIOPARCKEN      0x01    /* Internal bus parity error enable */
+        dont_generate_debug_code
 }
 /*
@@ -459,6 +484,7 @@ register SG_CACHE_PRE {
        field   SG_ADDR_MASK    0xf8
        field   ODD_SEG         0x04
        field   LAST_SEG        0x02
+        dont_generate_debug_code
 }
 register SG_CACHE_SHADOW {
@@ -491,6 +517,7 @@ register HADDR {
        access_mode     RW
        size            8
        modes           M_DFF0, M_DFF1
+        dont_generate_debug_code
 }
 /*
@@ -522,6 +549,7 @@ register HCNT {
        access_mode     RW
        size            3
        modes           M_DFF0, M_DFF1
+        dont_generate_debug_code
 }
 /*
@@ -551,6 +579,7 @@ register SGHADDR {
        access_mode     RW
        size            8
        modes           M_DFF0, M_DFF1
+        dont_generate_debug_code
 }
 /*
@@ -561,6 +590,7 @@ register SCBHADDR {
        access_mode     RW
        size            8
        modes           M_CCHAN
+        dont_generate_debug_code
 }
 /*
@@ -570,6 +600,7 @@ register SGHCNT {
        address                 0x084
        access_mode     RW
        modes           M_DFF0, M_DFF1
+        dont_generate_debug_code
 }
 /*
@@ -579,6 +610,7 @@ register SCBHCNT {
        address                 0x084
        access_mode     RW
        modes           M_CCHAN
+        dont_generate_debug_code
 }
 /*
@@ -609,6 +641,7 @@ register DFF_THRSH {
                RD_DFTHRSH_90,
                RD_DFTHRSH_MAX
        }
+        dont_generate_debug_code
 }
 /*
@@ -817,6 +850,7 @@ register PCIXCTL {
        field   SRSPDPEEN       0x04
        field   TSCSERREN       0x02
        field   CMPABCDIS       0x01
+        dont_generate_debug_code
 }
 /*
@@ -863,6 +897,7 @@ register DCHSPLTSTAT0 {
        field   RXOVRUN         0x04
        field   RXSCEMSG        0x02
        field   RXSPLTRSP       0x01
+        dont_generate_debug_code
 }
 /*
@@ -908,6 +943,7 @@ register DCHSPLTSTAT1 {
        modes           M_DFF0, M_DFF1
        count           2
        field   RXDATABUCKET    0x01
+        dont_generate_debug_code
 }
 /*
@@ -1069,6 +1105,7 @@ register SGSPLTSTAT0 {
        field   RXOVRUN         0x04
        field   RXSCEMSG        0x02
        field   RXSPLTRSP       0x01
+        dont_generate_debug_code
 }
 /*
@@ -1080,6 +1117,7 @@ register SGSPLTSTAT1 {
        modes           M_DFF0, M_DFF1
        count           2
        field   RXDATABUCKET    0x01
+        dont_generate_debug_code
 }
 /*
@@ -1091,6 +1129,7 @@ register SFUNCT {
        modes           M_CFG
        field   TEST_GROUP      0xF0
        field   TEST_NUM        0x0F
+        dont_generate_debug_code
 }
 /*
@@ -1109,6 +1148,7 @@ register DF0PCISTAT {
        field   RDPERR          0x04
        field   TWATERR         0x02
        field   DPR             0x01
+        dont_generate_debug_code
 }
 /*
@@ -1204,6 +1244,7 @@ register TARGPCISTAT {
        field   SSE             0x40
        field   STA             0x08
        field   TWATERR         0x02
+        dont_generate_debug_code
 }
 /*
@@ -1216,6 +1257,7 @@ register LQIN {
        size            20
        count           2
        modes           M_DFF0, M_DFF1, M_SCSI
+        dont_generate_debug_code
 }
 /*
@@ -1247,6 +1289,7 @@ register LUNPTR {
        access_mode     RW
        modes           M_CFG
        count           2
+        dont_generate_debug_code
 }
 /*
@@ -1278,6 +1321,7 @@ register CMDLENPTR {
        access_mode     RW
        modes           M_CFG
        count           1
+        dont_generate_debug_code
 }
 /*
@@ -1290,6 +1334,7 @@ register ATTRPTR {
        access_mode     RW
        modes           M_CFG
        count           1
+        dont_generate_debug_code
 }
 /*
@@ -1302,6 +1347,7 @@ register FLAGPTR {
        access_mode     RW
        modes           M_CFG
        count           1
+        dont_generate_debug_code
 }
 /*
@@ -1313,6 +1359,7 @@ register CMDPTR {
        access_mode     RW
        modes           M_CFG
        count           1
+        dont_generate_debug_code
 }
 /*
@@ -1324,6 +1371,7 @@ register QNEXTPTR {
        access_mode     RW
        modes           M_CFG
        count           1
+        dont_generate_debug_code
 }
 /*
@@ -1347,6 +1395,7 @@ register ABRTBYTEPTR {
        access_mode     RW
        modes           M_CFG
        count           1
+        dont_generate_debug_code
 }
 /*
@@ -1358,6 +1407,7 @@ register ABRTBITPTR {
        access_mode     RW
        modes           M_CFG
        count           1
+        dont_generate_debug_code
 }
 /*
@@ -1398,6 +1448,7 @@ register LUNLEN {
        count           2
        mask            ILUNLEN 0x0F
        mask            TLUNLEN 0xF0
+        dont_generate_debug_code
 }
 const LUNLEN_SINGLE_LEVEL_LUN 0xF
@@ -1410,6 +1461,7 @@ register CDBLIMIT {
        access_mode     RW
        modes           M_CFG
        count           1
+        dont_generate_debug_code
 }
 /*
@@ -1422,6 +1474,7 @@ register MAXCMD {
        access_mode     RW
        modes           M_CFG
        count           9
+        dont_generate_debug_code
 }
 /*
@@ -1432,6 +1485,7 @@ register MAXCMDCNT {
        address                 0x033
        access_mode     RW
        modes           M_CFG
+        dont_generate_debug_code
 }
 /*
@@ -1490,6 +1544,7 @@ register LQCTL1 {
        field   PCI2PCI         0x04
        field   SINGLECMD       0x02
        field   ABORTPENDING    0x01
+        dont_generate_debug_code
 }
 /*
@@ -1508,6 +1563,7 @@ register LQCTL2 {
        field   LQOCONTINUE     0x04
        field   LQOTOIDLE       0x02
        field   LQOPAUSE        0x01
+        dont_generate_debug_code
 }
 /*
@@ -1578,6 +1634,7 @@ register SXFRCTL0 {
        field   DFPEXP          0x40
        field   BIOSCANCELEN    0x10
        field   SPIOEN          0x08
+        dont_generate_debug_code
 }
 /*
@@ -1594,6 +1651,7 @@ register SXFRCTL1 {
        field   ENSTIMER        0x04
        field   ACTNEGEN        0x02
        field   STPWEN          0x01
+        dont_generate_debug_code
 }
 /*
@@ -1696,6 +1754,7 @@ register SCSISIGO {
                P_STATUS        CDO|IOO,
                P_MESGIN        CDO|IOO|MSGO
        }
+        dont_generate_debug_code
 }
 /*
@@ -1738,6 +1797,7 @@ register MULTARGID {
        modes           M_CFG
        size            2
        count           2
+        dont_generate_debug_code
 }
 /*
@@ -1774,6 +1834,7 @@ register SCSIDAT {
        access_mode     RW
        modes           M_DFF0, M_DFF1, M_SCSI
        size            2
+        dont_generate_debug_code
 }
 /*
@@ -1796,6 +1857,7 @@ register TARGIDIN {
        count           2
        field   CLKOUT          0x80
        field   TARGID          0x0F
+        dont_generate_debug_code
 }
 /*
@@ -1825,6 +1887,7 @@ register SBLKCTL {
        field   ENAB40          0x08    /* LVD transceiver active */
        field   ENAB20          0x04    /* SE/HVD transceiver active */
        field   SELWIDE         0x02
+        dont_generate_debug_code
 }
 /*
@@ -1842,6 +1905,7 @@ register OPTIONMODE {
        field   ENDGFORMCHK             0x04
        field   AUTO_MSGOUT_DE          0x02
        mask    OPTIONMODE_DEFAULTS     AUTO_MSGOUT_DE
+        dont_generate_debug_code
 }
 /*
@@ -1876,6 +1940,7 @@ register CLRSINT0 {
        field   CLROVERRUN      0x04
        field   CLRSPIORDY      0x02
        field   CLRARBDO        0x01
+        dont_generate_debug_code
 }
 /*
@@ -1929,6 +1994,7 @@ register CLRSINT1 {
        field   CLRSCSIPERR     0x04
        field   CLRSTRB2FAST    0x02
        field   CLRREQINIT      0x01
+        dont_generate_debug_code
 }
 /*
@@ -1962,6 +2028,7 @@ register CLRSINT2 {
        field   CLRWIDE_RES     0x04    /* Modes 0 and 1 only */
        field   CLRSDONE        0x02    /* Modes 0 and 1 only */
        field   CLRDMADONE      0x01    /* Modes 0 and 1 only */
+        dont_generate_debug_code
 }
 /*
@@ -2002,6 +2069,7 @@ register LQISTATE {
        access_mode     RO
        modes           M_CFG
        count           6
+        dont_generate_debug_code
 }
 /*
@@ -2022,6 +2090,7 @@ register LQOSTATE {
        access_mode     RO
        modes           M_CFG
        count           2
+        dont_generate_debug_code
 }
 /*
@@ -2054,6 +2123,7 @@ register CLRLQIINT0 {
        field   CLRLQIBADLQT    0x04
        field   CLRLQIATNLQ     0x02
        field   CLRLQIATNCMD    0x01
+        dont_generate_debug_code
 }
 /*
@@ -2070,6 +2140,7 @@ register LQIMODE0 {
        field   ENLQIBADLQT     0x04
        field   ENLQIATNLQ      0x02
        field   ENLQIATNCMD     0x01
+        dont_generate_debug_code
 }
 /*
@@ -2106,6 +2177,7 @@ register CLRLQIINT1 {
        field   CLRLQIBADLQI    0x04
        field   CLRLQIOVERI_LQ  0x02
        field   CLRLQIOVERI_NLQ 0x01
+        dont_generate_debug_code
 }
 /*
@@ -2124,6 +2196,7 @@ register LQIMODE1 {
        field   ENLQIBADLQI     0x04
        field   ENLQIOVERI_LQ   0x02    /* LQIOVERI1 */
        field   ENLQIOVERI_NLQ  0x01    /* LQIOVERI2 */
+        dont_generate_debug_code
 }
 /*
@@ -2165,6 +2238,7 @@ register CLRSINT3 {
        count           3
        field   CLRNTRAMPERR    0x02
        field   CLROSRAMPERR    0x01
+        dont_generate_debug_code
 }
 /*
@@ -2177,6 +2251,7 @@ register SIMODE3 {
        count           4
        field   ENNTRAMPERR     0x02
        field   ENOSRAMPERR     0x01
+        dont_generate_debug_code
 }
 /*
@@ -2207,6 +2282,7 @@ register CLRLQOINT0 {
        field   CLRLQOATNLQ             0x04
        field   CLRLQOATNPKT            0x02
        field   CLRLQOTCRC              0x01
+        dont_generate_debug_code
 }
 /*
@@ -2222,6 +2298,7 @@ register LQOMODE0 {
        field   ENLQOATNLQ              0x04
        field   ENLQOATNPKT             0x02
        field   ENLQOTCRC               0x01
+        dont_generate_debug_code
 }
 /*
@@ -2251,6 +2328,7 @@ register CLRLQOINT1 {
        field   CLRLQOBADQAS            0x04
        field   CLRLQOBUSFREE           0x02
        field   CLRLQOPHACHGINPKT       0x01
+        dont_generate_debug_code
 }
 /*
@@ -2266,6 +2344,7 @@ register LQOMODE1 {
        field   ENLQOBADQAS             0x04
        field   ENLQOBUSFREE            0x02
        field   ENLQOPHACHGINPKT        0x01
+        dont_generate_debug_code
 }
 /*
@@ -2289,6 +2368,7 @@ register OS_SPACE_CNT {
        access_mode     RO
        modes           M_CFG
        count           2
+        dont_generate_debug_code
 }
 /*
@@ -2318,6 +2398,7 @@ register GSFIFO {
        access_mode     RO
        size            2
        modes           M_DFF0, M_DFF1, M_SCSI
+        dont_generate_debug_code
 }
 /*
@@ -2341,6 +2422,7 @@ register NEXTSCB {
        access_mode     RW
        size            2
        modes           M_SCSI
+        dont_generate_debug_code
 }
 /*
@@ -2357,6 +2439,7 @@ register LQOSCSCTL {
        field           LQOBUSETDLY     0x40
        field           LQONOHOLDLACK   0x02
        field           LQONOCHKOVER    0x01
+        dont_generate_debug_code
 }
 /*
@@ -2389,6 +2472,7 @@ register CLRSEQINTSRC {
        field   CLRCFG4TSTAT    0x04
        field   CLRCFG4ICMD     0x02
        field   CLRCFG4TCMD     0x01
+        dont_generate_debug_code
 }
 /*
@@ -2415,6 +2499,7 @@ register CURRSCB {
        access_mode     RW
        size            2
        modes           M_SCSI
+        dont_generate_debug_code
 }
 /*
@@ -2472,6 +2557,7 @@ register LASTSCB {
        access_mode     RW
        size            2
        modes           M_SCSI
+        dont_generate_debug_code
 }
 /*
@@ -2494,6 +2580,7 @@ register SHADDR {
        access_mode     RO
        size            8
        modes           M_DFF0, M_DFF1
+        dont_generate_debug_code
 }
 /*
@@ -2513,6 +2600,7 @@ register NEGOADDR {
        address                 0x060
        access_mode     RW
        modes           M_SCSI
+        dont_generate_debug_code
 }
 /*
@@ -2523,6 +2611,7 @@ register NEGPERIOD {
        access_mode     RW
        modes           M_SCSI
        count           1
+        dont_generate_debug_code
 }
 /*
@@ -2543,6 +2632,7 @@ register NEGOFFSET {
        access_mode     RW
        modes           M_SCSI
        count           1
+        dont_generate_debug_code
 }
 /*
@@ -2557,6 +2647,7 @@ register NEGPPROPTS {
        field   PPROPT_QAS      0x04
        field   PPROPT_DT       0x02
        field   PPROPT_IUT      0x01
+        dont_generate_debug_code
 }
 /*
@@ -2573,6 +2664,7 @@ register NEGCONOPTS {
        field   ENAUTOATNI      0x04
        field   ENAUTOATNO      0x02
        field   WIDEXFER        0x01
+        dont_generate_debug_code
 }
 /*
@@ -2583,6 +2675,7 @@ register ANNEXCOL {
        access_mode     RW
        modes           M_SCSI
        count           7
+        dont_generate_debug_code
 }
 /*
@@ -2602,6 +2695,7 @@ register SCSCHKN {
        field   DFFACTCLR       0x04
        field   SHVALIDSTDIS    0x02
        field   LSTSGCLRDIS     0x01
+        dont_generate_debug_code
 }
 const AHD_ANNEXCOL_PER_DEV0     4
@@ -2635,6 +2729,7 @@ register ANNEXDAT {
        access_mode     RW
        modes           M_SCSI
        count           3
+        dont_generate_debug_code
 }
 /*
@@ -2645,6 +2740,7 @@ register IOWNID {
        address                 0x067
        access_mode     RW
        modes           M_SCSI
+        dont_generate_debug_code
 }
 /*
@@ -2671,6 +2767,7 @@ register TOWNID {
        access_mode     RW
        modes           M_SCSI
        count           2
+        dont_generate_debug_code
 }
 /*
@@ -2702,6 +2799,7 @@ register SHCNT {
        access_mode     RW
        size            3
        modes           M_DFF0, M_DFF1
+        dont_generate_debug_code
 }
 /*
@@ -2789,6 +2887,7 @@ register SCBPTR {
        access_mode     RW
        size            2
        modes           M_DFF0, M_DFF1, M_CCHAN, M_SCSI
+        dont_generate_debug_code
 }
 /*
@@ -2816,6 +2915,7 @@ register SCBAUTOPTR {
        field   AUSCBPTR_EN     0x80
        field   SCBPTR_ADDR     0x38
        field   SCBPTR_OFF      0x07
+        dont_generate_debug_code
 }
 /*
@@ -2825,6 +2925,7 @@ register CCSGADDR {
        address                 0x0AC
        access_mode     RW
        modes           M_DFF0, M_DFF1
+        dont_generate_debug_code
 }
 /*
@@ -2834,6 +2935,7 @@ register CCSCBADDR {
        address                 0x0AC
        access_mode     RW
        modes           M_CCHAN
+        dont_generate_debug_code
 }
 /*
@@ -2899,6 +3001,7 @@ register CCSGRAM {
        address                 0x0B0
        access_mode     RW
        modes           M_DFF0, M_DFF1
+        dont_generate_debug_code
 }
 /*
@@ -2908,6 +3011,7 @@ register CCSCBRAM {
        address                 0x0B0
        access_mode     RW
        modes           M_CCHAN
+        dont_generate_debug_code
 }
 /*
@@ -2958,6 +3062,7 @@ register BRDDAT {
        access_mode     RW
        modes           M_SCSI
        count           2
+        dont_generate_debug_code
 }
 /*
@@ -2974,6 +3079,7 @@ register BRDCTL {
        field   BRDEN           0x04
        field   BRDRW           0x02
        field   BRDSTB          0x01
+        dont_generate_debug_code
 }
 /*
@@ -2984,6 +3090,7 @@ register SEEADR {
        access_mode     RW
        modes           M_SCSI
        count           4
+        dont_generate_debug_code
 }
 /*
@@ -2995,6 +3102,7 @@ register SEEDAT {
        size            2
        modes           M_SCSI
        count           4
+        dont_generate_debug_code
 }
 /*
@@ -3011,6 +3119,7 @@ register SEESTAT {
        field   SEEARBACK       0x04
        field   SEEBUSY         0x02
        field   SEESTART        0x01
+        dont_generate_debug_code
 }
 /*
@@ -3036,6 +3145,7 @@ register SEECTL {
        mask    SEEOP_EWDS      0x40
        field   SEERST          0x02
        field   SEESTART        0x01
+        dont_generate_debug_code
 }
 const SEEOP_ERAL_ADDR   0x80
@@ -3050,6 +3160,7 @@ register SCBCNT {
        address                 0x0BF
        access_mode     RW
        modes           M_SCSI
+        dont_generate_debug_code
 }
 /*
@@ -3061,6 +3172,7 @@ register DFWADDR {
        access_mode     RW
        size            2
        modes           M_DFF0, M_DFF1
+        dont_generate_debug_code
 }
 /*
@@ -3087,6 +3199,7 @@ register DSPDATACTL {
        field   DESQDIS         0x10
        field   RCVROFFSTDIS    0x04
        field   XMITOFFSTDIS    0x02
+        dont_generate_debug_code
 }
 /*
@@ -3132,6 +3245,7 @@ register DFDAT {
        address                 0x0C4
        access_mode     RW
        modes           M_DFF0, M_DFF1
+        dont_generate_debug_code
 }
 /*
@@ -3144,6 +3258,7 @@ register DSPSELECT {
        count           1
        field   AUTOINCEN       0x80
        field   DSPSEL          0x1F
+        dont_generate_debug_code
 }
 const NUMDSPS 0x14
@@ -3158,6 +3273,7 @@ register WRTBIASCTL {
        count           3
        field   AUTOXBCDIS      0x80
        field   XMITMANVAL      0x3F
+        dont_generate_debug_code
 }
 /*
@@ -3316,6 +3432,7 @@ register FLAGS {
        count           23
        field   ZERO            0x02
        field   CARRY           0x01
+        dont_generate_debug_code
 }
 /*
@@ -3344,6 +3461,7 @@ register SEQRAM {
        address                 0x0DA
        access_mode     RW
        count           2
+        dont_generate_debug_code
 }
 /*
@@ -3355,6 +3473,7 @@ register PRGMCNT {
        access_mode     RW
        size            2
        count           5
+        dont_generate_debug_code
 }
 /*
@@ -3364,6 +3483,7 @@ register ACCUM {
        address                 0x0E0
        access_mode     RW
        accumulator
+        dont_generate_debug_code
 }
 /*
@@ -3380,6 +3500,7 @@ register SINDEX	{
        access_mode     RW
        size            2
        sindex
+        dont_generate_debug_code
 }
 /*
@@ -3390,6 +3511,7 @@ register DINDEX {
        address                 0x0E4
        access_mode     RW
        size            2
+        dont_generate_debug_code
 }
 /*
@@ -3415,6 +3537,7 @@ register ALLONES {
        address                 0x0E8
        access_mode RO
        allones
+        dont_generate_debug_code
 }
 /*
@@ -3425,6 +3548,7 @@ register ALLZEROS {
        address                 0x0EA
        access_mode RO
        allzeros
+        dont_generate_debug_code
 }
 /*
@@ -3435,6 +3559,7 @@ register NONE {
        address                 0x0EA
        access_mode WO
        none
+        dont_generate_debug_code
 }
 /*
@@ -3445,6 +3570,7 @@ register NONE {
 register SINDIR {
        address                 0x0EC
        access_mode RO
+        dont_generate_debug_code
 }
 /*
@@ -3455,6 +3581,7 @@ register SINDIR	{
 register DINDIR  {
        address                 0x0ED
        access_mode WO
+        dont_generate_debug_code
 }
 /*
@@ -3479,6 +3606,7 @@ register FUNCTION1 {
 register STACK {
        address                 0x0F2
        access_mode RW
+        dont_generate_debug_code
 }
 /*
@@ -3491,6 +3619,7 @@ register INTVEC1_ADDR {
        size            2
        modes           M_CFG
        count           1
+        dont_generate_debug_code
 }
 /*
@@ -3503,6 +3632,7 @@ register CURADDR {
        size            2
        modes           M_SCSI
        count           2
+        dont_generate_debug_code
 }
 /*
@@ -3515,6 +3645,7 @@ register INTVEC2_ADDR {
        size            2
        modes           M_CFG
        count           1
+        dont_generate_debug_code
 }
 /*
@@ -3543,12 +3674,14 @@ scratch_ram {
        modes   0, 1, 2, 3
        REG0 {
                size            2
+                dont_generate_debug_code
        }
        REG1 {
                size            2
        }
        REG_ISR {
                size            2
+                dont_generate_debug_code
        }
        SG_STATE {
                size            1
@@ -3572,9 +3705,11 @@ scratch_ram {
        modes   0, 1, 2, 3
        LONGJMP_ADDR {
                size            2
+                dont_generate_debug_code
        }
        ACCUM_SAVE {
                size            1
+                dont_generate_debug_code
        }
 }
@@ -3591,18 +3726,22 @@ scratch_ram {
         */
        WAITING_SCB_TAILS {
                size            32
+                dont_generate_debug_code
        }
        WAITING_TID_HEAD {
                size            2
+                dont_generate_debug_code
        }
        WAITING_TID_TAIL {
                size            2
+                dont_generate_debug_code
        }
        /*
         * SCBID of the next SCB in the new SCB queue.
         */
        NEXT_QUEUED_SCB_ADDR {
                size            4
+                dont_generate_debug_code
        }
        /*
         * head of list of SCBs that have
@@ -3611,6 +3750,7 @@ scratch_ram {
         */
        COMPLETE_SCB_HEAD {
                size            2
+                dont_generate_debug_code
        }
        /*
         * The list of completed SCBs in
@@ -3618,6 +3758,7 @@ scratch_ram {
         */
        COMPLETE_SCB_DMAINPROG_HEAD {
                size            2
+                dont_generate_debug_code
        }
        /*
         * head of list of SCBs that have
@@ -3626,6 +3767,7 @@ scratch_ram {
         */
        COMPLETE_DMA_SCB_HEAD {
                size            2
+                dont_generate_debug_code
        }
        /*
         * tail of list of SCBs that have
@@ -3634,6 +3776,7 @@ scratch_ram {
         */
        COMPLETE_DMA_SCB_TAIL {
                size            2
+                dont_generate_debug_code
        }
        /*
         * head of list of SCBs that have
@@ -3643,6 +3786,7 @@ scratch_ram {
         */
        COMPLETE_ON_QFREEZE_HEAD {
                size            2
+                dont_generate_debug_code
        }
        /*
         * Counting semaphore to prevent new select-outs
@@ -3667,6 +3811,7 @@ scratch_ram {
         */
        MSG_OUT {
                size            1
+                dont_generate_debug_code
        }
        /* Parameters for DMA Logic */
        DMAPARAMS {
@@ -3682,6 +3827,7 @@ scratch_ram {
                field   DIRECTION       0x04    /* Set indicates PCI->SCSI */
                field   FIFOFLUSH       0x02
                field   FIFORESET       0x01
+                dont_generate_debug_code
        }
        SEQ_FLAGS {
                size            1
@@ -3703,9 +3849,11 @@ scratch_ram {
         */
        SAVED_SCSIID {
                size            1
+                dont_generate_debug_code
        }
        SAVED_LUN {
                size            1
+                dont_generate_debug_code
        }
        /*
         * The last bus phase as seen by the sequencer. 
@@ -3733,6 +3881,7 @@ scratch_ram {
         */
        QOUTFIFO_ENTRY_VALID_TAG {
                size            1
+                dont_generate_debug_code
        }
        /*
         * Kernel and sequencer offsets into the queue of
@@ -3742,10 +3891,12 @@ scratch_ram {
        KERNEL_TQINPOS {
                size            1
                count           1
+                dont_generate_debug_code
        }
        TQINPOS {
                size            1
                count           8
+                dont_generate_debug_code
        }
        /*
         * Base address of our shared data with the kernel driver in host
@@ -3754,6 +3905,7 @@ scratch_ram {
         */
        SHARED_DATA_ADDR {
                size            4
+                dont_generate_debug_code
        }
        /*
         * Pointer to location in host memory for next
@@ -3761,6 +3913,7 @@ scratch_ram {
         */
        QOUTFIFO_NEXT_ADDR {
                size            4
+                dont_generate_debug_code
        }
        ARG_1 {
                size            1
@@ -3773,11 +3926,13 @@ scratch_ram {
                mask    CONT_MSG_LOOP_READ      0x03
                mask    CONT_MSG_LOOP_TARG      0x02
                alias   RETURN_1
+                dont_generate_debug_code
        }
        ARG_2 {
                size            1
                count           1
                alias   RETURN_2
+                dont_generate_debug_code
        }
        /*
@@ -3785,6 +3940,7 @@ scratch_ram {
         */
        LAST_MSG {
                size            1
+                dont_generate_debug_code
        }
        /*
@@ -3801,6 +3957,7 @@ scratch_ram {
                field   MANUALP         0x0C
                field   ENAUTOATNP      0x02
                field   ALTSTIM         0x01
+                dont_generate_debug_code
        }
        /*
@@ -3809,6 +3966,7 @@ scratch_ram {
        INITIATOR_TAG {
                size            1
                count           1
+                dont_generate_debug_code
        }
        SEQ_FLAGS2 {
@@ -3820,6 +3978,7 @@ scratch_ram {
        ALLOCFIFO_SCBPTR {
                size            2
+                dont_generate_debug_code
        }
        /*
@@ -3829,6 +3988,7 @@ scratch_ram {
         */
        INT_COALESCING_TIMER {
                size            2
+                dont_generate_debug_code
        }
        /*
@@ -3838,6 +3998,7 @@ scratch_ram {
         */
        INT_COALESCING_MAXCMDS {
                size            1
+                dont_generate_debug_code
        }
        /*
@@ -3846,6 +4007,7 @@ scratch_ram {
         */
        INT_COALESCING_MINCMDS {
                size            1
+                dont_generate_debug_code
        }
        /*
@@ -3853,6 +4015,7 @@ scratch_ram {
         */
        CMDS_PENDING {
                size            2
+                dont_generate_debug_code
        }
        /*
@@ -3860,6 +4023,7 @@ scratch_ram {
         */
        INT_COALESCING_CMDCOUNT {
                size            1
+                dont_generate_debug_code
        }
        /*
@@ -3868,6 +4032,7 @@ scratch_ram {
         */
        LOCAL_HS_MAILBOX {
                size            1
+                dont_generate_debug_code
        }
        /*
         * Target-mode CDB type to CDB length table used
@@ -3876,6 +4041,7 @@ scratch_ram {
        CMDSIZE_TABLE {
                size            8
                count           8
+                dont_generate_debug_code
        }
        /*
         * When an SCB with the MK_MESSAGE flag is
@@ -3908,25 +4074,31 @@ scb {
                size    4
                alias   SCB_CDB_STORE
                alias   SCB_HOST_CDB_PTR
+                dont_generate_debug_code
        }
        SCB_RESIDUAL_SGPTR {
                size    4
                field   SG_ADDR_MASK            0xf8    /* In the last byte */
                field   SG_OVERRUN_RESID        0x02    /* In the first byte */
                field   SG_LIST_NULL            0x01    /* In the first byte */
+                dont_generate_debug_code
        }
        SCB_SCSI_STATUS {
                size    1
                alias   SCB_HOST_CDB_LEN
+                dont_generate_debug_code
        }
        SCB_TARGET_PHASES {
                size    1
+                dont_generate_debug_code
        }
        SCB_TARGET_DATA_DIR {
                size    1
+                dont_generate_debug_code
        }
        SCB_TARGET_ITAG {
                size    1
+                dont_generate_debug_code
        }
        SCB_SENSE_BUSADDR {
                /*
@@ -3936,10 +4108,12 @@ scb {
                 */
                size    4
                alias   SCB_NEXT_COMPLETE
+                dont_generate_debug_code
        }
        SCB_TAG {
                alias   SCB_FIFO_USE_COUNT
                size    2
+                dont_generate_debug_code
        }
        SCB_CONTROL {
                size    1
@@ -3959,6 +4133,7 @@ scb {
        SCB_LUN {
                size    1
                field   LID     0xff
+                dont_generate_debug_code
        }
        SCB_TASK_ATTRIBUTE {
                size    1
@@ -3967,16 +4142,20 @@ scb {
                 * ignore wide residue message handling.
                 */
                field   SCB_XFERLEN_ODD 0x01
+                dont_generate_debug_code
        }
        SCB_CDB_LEN {
                size    1
                field   SCB_CDB_LEN_PTR 0x80    /* CDB in host memory */
+                dont_generate_debug_code
        }
        SCB_TASK_MANAGEMENT {
                size    1
+                dont_generate_debug_code
        }
        SCB_DATAPTR {
                size    8
+                dont_generate_debug_code
        }
        SCB_DATACNT {
                /*
@@ -3986,22 +4165,27 @@ scb {
                size    4
                field   SG_LAST_SEG             0x80    /* In the fourth byte */
                field   SG_HIGH_ADDR_BITS       0x7F    /* In the fourth byte */
+                dont_generate_debug_code
        }
        SCB_SGPTR {
                size    4
                field   SG_STATUS_VALID 0x04    /* In the first byte */
                field   SG_FULL_RESID   0x02    /* In the first byte */
                field   SG_LIST_NULL    0x01    /* In the first byte */
+                dont_generate_debug_code
        }
        SCB_BUSADDR {
                size    4
+                dont_generate_debug_code
        }
        SCB_NEXT {
                alias   SCB_NEXT_SCB_BUSADDR
                size    2
+                dont_generate_debug_code
        }
        SCB_NEXT2 {
                size    2
+                dont_generate_debug_code
        }
        SCB_SPARE {
                size    8
@@ -4009,6 +4193,7 @@ scb {
        }
        SCB_DISCONNECTED_LISTS {
                size    8
+                dont_generate_debug_code
        }
 }
diff --git a/drivers/scsi/aic7xxx/aic79xx_core.c b/drivers/scsi/aic7xxx/aic79xx_core.c
index 55508b0fcec4..bdad54ec088c 100644
--- a/drivers/scsi/aic7xxx/aic79xx_core.c
+++ b/drivers/scsi/aic7xxx/aic79xx_core.c
@@ -2472,8 +2472,6 @@ ahd_handle_scsiint(struct ahd_softc *ahd, u_int intstat)
                if ((ahd->bugs & AHD_CLRLQO_AUTOCLR_BUG) != 0)
                        ahd_outb(ahd, CLRLQOINT1, 0);
        } else if ((status & SELTO) != 0) {
-                u_int  scbid;
                /* Stop the selection */
                ahd_outb(ahd, SCSISEQ0, 0);
@@ -2583,9 +2581,6 @@ ahd_handle_scsiint(struct ahd_softc *ahd, u_int intstat)
                case BUSFREE_DFF0:
                case BUSFREE_DFF1:
                {
-                        u_int   scbid;
-                        struct  scb *scb;
                        mode = busfreetime == BUSFREE_DFF0
                             ? AHD_MODE_DFF0 : AHD_MODE_DFF1;
                        ahd_set_modes(ahd, mode, mode);
@@ -3689,7 +3684,7 @@ ahd_free_tstate(struct ahd_softc *ahd, u_int scsi_id, char channel, int force)
 * by the capabilities of the bus connectivity of and sync settings for
 * the target.
 */
-void
+static void
 ahd_devlimited_syncrate(struct ahd_softc *ahd,
                        struct ahd_initiator_tinfo *tinfo,
                        u_int *period, u_int *ppr_options, role_t role)
@@ -4136,7 +4131,7 @@ ahd_update_neg_table(struct ahd_softc *ahd, struct ahd_devinfo *devinfo,
                        /*
                         * Harpoon2A assumed that there would be a
-                         * fallback rate between 160MHz and 80Mhz,
+                         * fallback rate between 160MHz and 80MHz,
                         * so 7 is used as the period factor rather
                         * than 8 for 160MHz.
                         */
@@ -8708,7 +8703,7 @@ ahd_reset_current_bus(struct ahd_softc *ahd)
 int
 ahd_reset_channel(struct ahd_softc *ahd, char channel, int initiate_reset)
 {
-        struct  ahd_devinfo devinfo;
+        struct  ahd_devinfo caminfo;
        u_int   initiator;
        u_int   target;
        u_int   max_scsiid;
@@ -8729,7 +8724,7 @@ ahd_reset_channel(struct ahd_softc *ahd, char channel, int initiate_reset)
        ahd->pending_device = NULL;
-        ahd_compile_devinfo(&devinfo,
+        ahd_compile_devinfo(&caminfo,
                            CAM_TARGET_WILDCARD,
                            CAM_TARGET_WILDCARD,
                            CAM_LUN_WILDCARD,
@@ -8868,7 +8863,7 @@ ahd_reset_channel(struct ahd_softc *ahd, char channel, int initiate_reset)
        }
        /* Notify the XPT that a bus reset occurred */
-        ahd_send_async(ahd, devinfo.channel, CAM_TARGET_WILDCARD,
+        ahd_send_async(ahd, caminfo.channel, CAM_TARGET_WILDCARD,
                       CAM_LUN_WILDCARD, AC_BUS_RESET);
        ahd_restart(ahd);
diff --git a/drivers/scsi/aic7xxx/aic79xx_pci.c b/drivers/scsi/aic7xxx/aic79xx_pci.c
index c25b6adffbf9..a734d77e880e 100644
--- a/drivers/scsi/aic7xxx/aic79xx_pci.c
+++ b/drivers/scsi/aic7xxx/aic79xx_pci.c
@@ -223,10 +223,10 @@ static const char *pci_bus_modes[] =
        "PCI bus mode unknown",
        "PCI bus mode unknown",
        "PCI bus mode unknown",
-        "PCI-X 101-133Mhz",
+        "PCI-X 101-133MHz",
-        "PCI-X 67-100Mhz",
+        "PCI-X 67-100MHz",
-        "PCI-X 50-66Mhz",
+        "PCI-X 50-66MHz",
-        "PCI 33 or 66Mhz"
+        "PCI 33 or 66MHz"
 };
 #define         TESTMODE        0x00000800ul
@@ -337,8 +337,6 @@ ahd_pci_config(struct ahd_softc *ahd, const struct ahd_pci_identity *entry)
         * 64bit bus (PCI64BIT set in devconfig).
         */
        if ((ahd->flags & (AHD_39BIT_ADDRESSING|AHD_64BIT_ADDRESSING)) != 0) {
-                uint32_t devconfig;
                if (bootverbose)
                        printf("%s: Enabling 39Bit Addressing\n",
                               ahd_name(ahd));
@@ -483,8 +481,6 @@ ahd_pci_test_register_access(struct ahd_softc *ahd)
                goto fail;
        if ((ahd_inb(ahd, INTSTAT) & PCIINT) != 0) {
-                u_int targpcistat;
                ahd_set_modes(ahd, AHD_MODE_CFG, AHD_MODE_CFG);
                targpcistat = ahd_inb(ahd, TARGPCISTAT);
                if ((targpcistat & STA) != 0)
diff --git a/drivers/scsi/aic7xxx/aic79xx_reg.h_shipped b/drivers/scsi/aic7xxx/aic79xx_reg.h_shipped
index c21ceab8e913..cdcead071ef6 100644
--- a/drivers/scsi/aic7xxx/aic79xx_reg.h_shipped
+++ b/drivers/scsi/aic7xxx/aic79xx_reg.h_shipped
@@ -34,13 +34,6 @@ ahd_reg_print_t ahd_seqintcode_print;
 #endif
 #if AIC_DEBUG_REGISTERS
-ahd_reg_print_t ahd_clrint_print;
-#else
-#define ahd_clrint_print(regvalue, cur_col, wrap) \
-    ahd_print_register(NULL, 0, "CLRINT", 0x03, regvalue, cur_col, wrap)
-#endif
-#if AIC_DEBUG_REGISTERS
 ahd_reg_print_t ahd_error_print;
 #else
 #define ahd_error_print(regvalue, cur_col, wrap) \
@@ -48,20 +41,6 @@ ahd_reg_print_t ahd_error_print;
 #endif
 #if AIC_DEBUG_REGISTERS
-ahd_reg_print_t ahd_hcntrl_print;
-#else
-#define ahd_hcntrl_print(regvalue, cur_col, wrap) \
-    ahd_print_register(NULL, 0, "HCNTRL", 0x05, regvalue, cur_col, wrap)
-#endif
-#if AIC_DEBUG_REGISTERS
-ahd_reg_print_t ahd_hnscb_qoff_print;
-#else
-#define ahd_hnscb_qoff_print(regvalue, cur_col, wrap) \
-    ahd_print_register(NULL, 0, "HNSCB_QOFF", 0x06, regvalue, cur_col, wrap)
-#endif
-#if AIC_DEBUG_REGISTERS
 ahd_reg_print_t ahd_hescb_qoff_print;
 #else
 #define ahd_hescb_qoff_print(regvalue, cur_col, wrap) \
@@ -97,13 +76,6 @@ ahd_reg_print_t ahd_swtimer_print;
 #endif
 #if AIC_DEBUG_REGISTERS
-ahd_reg_print_t ahd_snscb_qoff_print;
-#else
-#define ahd_snscb_qoff_print(regvalue, cur_col, wrap) \
-    ahd_print_register(NULL, 0, "SNSCB_QOFF", 0x10, regvalue, cur_col, wrap)
-#endif
-#if AIC_DEBUG_REGISTERS
 ahd_reg_print_t ahd_sescb_qoff_print;
 #else
 #define ahd_sescb_qoff_print(regvalue, cur_col, wrap) \
@@ -111,20 +83,6 @@ ahd_reg_print_t ahd_sescb_qoff_print;
 #endif
 #if AIC_DEBUG_REGISTERS
-ahd_reg_print_t ahd_sdscb_qoff_print;
-#else
-#define ahd_sdscb_qoff_print(regvalue, cur_col, wrap) \
-    ahd_print_register(NULL, 0, "SDSCB_QOFF", 0x14, regvalue, cur_col, wrap)
-#endif
-#if AIC_DEBUG_REGISTERS
-ahd_reg_print_t ahd_qoff_ctlsta_print;
-#else
-#define ahd_qoff_ctlsta_print(regvalue, cur_col, wrap) \
-    ahd_print_register(NULL, 0, "QOFF_CTLSTA", 0x16, regvalue, cur_col, wrap)
-#endif
-#if AIC_DEBUG_REGISTERS
 ahd_reg_print_t ahd_intctl_print;
 #else
 #define ahd_intctl_print(regvalue, cur_col, wrap) \
@@ -139,13 +97,6 @@ ahd_reg_print_t ahd_dfcntrl_print;
 #endif
 #if AIC_DEBUG_REGISTERS
-ahd_reg_print_t ahd_dscommand0_print;
-#else
-#define ahd_dscommand0_print(regvalue, cur_col, wrap) \
-    ahd_print_register(NULL, 0, "DSCOMMAND0", 0x19, regvalue, cur_col, wrap)
-#endif
-#if AIC_DEBUG_REGISTERS
 ahd_reg_print_t ahd_dfstatus_print;
 #else
 #define ahd_dfstatus_print(regvalue, cur_col, wrap) \
@@ -160,13 +111,6 @@ ahd_reg_print_t ahd_sg_cache_shadow_print;
 #endif
 #if AIC_DEBUG_REGISTERS
-ahd_reg_print_t ahd_sg_cache_pre_print;
-#else
-#define ahd_sg_cache_pre_print(regvalue, cur_col, wrap) \
-    ahd_print_register(NULL, 0, "SG_CACHE_PRE", 0x1b, regvalue, cur_col, wrap)
-#endif
-#if AIC_DEBUG_REGISTERS
 ahd_reg_print_t ahd_lqin_print;
 #else
 #define ahd_lqin_print(regvalue, cur_col, wrap) \
@@ -293,13 +237,6 @@ ahd_reg_print_t ahd_sxfrctl0_print;
 #endif
 #if AIC_DEBUG_REGISTERS
-ahd_reg_print_t ahd_sxfrctl1_print;
-#else
-#define ahd_sxfrctl1_print(regvalue, cur_col, wrap) \
-    ahd_print_register(NULL, 0, "SXFRCTL1", 0x3d, regvalue, cur_col, wrap)
-#endif
-#if AIC_DEBUG_REGISTERS
 ahd_reg_print_t ahd_dffstat_print;
 #else
 #define ahd_dffstat_print(regvalue, cur_col, wrap) \
@@ -314,13 +251,6 @@ ahd_reg_print_t ahd_multargid_print;
 #endif
 #if AIC_DEBUG_REGISTERS
-ahd_reg_print_t ahd_scsisigo_print;
-#else
-#define ahd_scsisigo_print(regvalue, cur_col, wrap) \
-    ahd_print_register(NULL, 0, "SCSISIGO", 0x40, regvalue, cur_col, wrap)
-#endif
-#if AIC_DEBUG_REGISTERS
 ahd_reg_print_t ahd_scsisigi_print;
 #else
 #define ahd_scsisigi_print(regvalue, cur_col, wrap) \
@@ -363,13 +293,6 @@ ahd_reg_print_t ahd_selid_print;
 #endif
 #if AIC_DEBUG_REGISTERS
-ahd_reg_print_t ahd_optionmode_print;
-#else
-#define ahd_optionmode_print(regvalue, cur_col, wrap) \
-    ahd_print_register(NULL, 0, "OPTIONMODE", 0x4a, regvalue, cur_col, wrap)
-#endif
-#if AIC_DEBUG_REGISTERS
 ahd_reg_print_t ahd_sblkctl_print;
 #else
 #define ahd_sblkctl_print(regvalue, cur_col, wrap) \
@@ -391,13 +314,6 @@ ahd_reg_print_t ahd_simode0_print;
 #endif
 #if AIC_DEBUG_REGISTERS
-ahd_reg_print_t ahd_clrsint0_print;
-#else
-#define ahd_clrsint0_print(regvalue, cur_col, wrap) \
-    ahd_print_register(NULL, 0, "CLRSINT0", 0x4b, regvalue, cur_col, wrap)
-#endif
-#if AIC_DEBUG_REGISTERS
 ahd_reg_print_t ahd_sstat1_print;
 #else
 #define ahd_sstat1_print(regvalue, cur_col, wrap) \
@@ -405,13 +321,6 @@ ahd_reg_print_t ahd_sstat1_print;
 #endif
 #if AIC_DEBUG_REGISTERS
-ahd_reg_print_t ahd_clrsint1_print;
-#else
-#define ahd_clrsint1_print(regvalue, cur_col, wrap) \
-    ahd_print_register(NULL, 0, "CLRSINT1", 0x4c, regvalue, cur_col, wrap)
-#endif
-#if AIC_DEBUG_REGISTERS
 ahd_reg_print_t ahd_sstat2_print;
 #else
 #define ahd_sstat2_print(regvalue, cur_col, wrap) \
@@ -461,17 +370,17 @@ ahd_reg_print_t ahd_lqistat0_print;
 #endif
 #if AIC_DEBUG_REGISTERS
-ahd_reg_print_t ahd_lqimode0_print;
+ahd_reg_print_t ahd_clrlqiint0_print;
 #else
-#define ahd_lqimode0_print(regvalue, cur_col, wrap) \
+#define ahd_clrlqiint0_print(regvalue, cur_col, wrap) \
-    ahd_print_register(NULL, 0, "LQIMODE0", 0x50, regvalue, cur_col, wrap)
+    ahd_print_register(NULL, 0, "CLRLQIINT0", 0x50, regvalue, cur_col, wrap)
 #endif
 #if AIC_DEBUG_REGISTERS
-ahd_reg_print_t ahd_clrlqiint0_print;
+ahd_reg_print_t ahd_lqimode0_print;
 #else
-#define ahd_clrlqiint0_print(regvalue, cur_col, wrap) \
+#define ahd_lqimode0_print(regvalue, cur_col, wrap) \
-    ahd_print_register(NULL, 0, "CLRLQIINT0", 0x50, regvalue, cur_col, wrap)
+    ahd_print_register(NULL, 0, "LQIMODE0", 0x50, regvalue, cur_col, wrap)
 #endif
 #if AIC_DEBUG_REGISTERS
@@ -629,17 +538,17 @@ ahd_reg_print_t ahd_seqintsrc_print;
 #endif
 #if AIC_DEBUG_REGISTERS
-ahd_reg_print_t ahd_seqimode_print;
+ahd_reg_print_t ahd_currscb_print;
 #else
-#define ahd_seqimode_print(regvalue, cur_col, wrap) \
+#define ahd_currscb_print(regvalue, cur_col, wrap) \
-    ahd_print_register(NULL, 0, "SEQIMODE", 0x5c, regvalue, cur_col, wrap)
+    ahd_print_register(NULL, 0, "CURRSCB", 0x5c, regvalue, cur_col, wrap)
 #endif
 #if AIC_DEBUG_REGISTERS
-ahd_reg_print_t ahd_currscb_print;
+ahd_reg_print_t ahd_seqimode_print;
 #else
-#define ahd_currscb_print(regvalue, cur_col, wrap) \
+#define ahd_seqimode_print(regvalue, cur_col, wrap) \
-    ahd_print_register(NULL, 0, "CURRSCB", 0x5c, regvalue, cur_col, wrap)
+    ahd_print_register(NULL, 0, "SEQIMODE", 0x5c, regvalue, cur_col, wrap)
 #endif
 #if AIC_DEBUG_REGISTERS
@@ -657,13 +566,6 @@ ahd_reg_print_t ahd_lastscb_print;
 #endif
 #if AIC_DEBUG_REGISTERS
-ahd_reg_print_t ahd_shaddr_print;
-#else
-#define ahd_shaddr_print(regvalue, cur_col, wrap) \
-    ahd_print_register(NULL, 0, "SHADDR", 0x60, regvalue, cur_col, wrap)
-#endif
-#if AIC_DEBUG_REGISTERS
 ahd_reg_print_t ahd_negoaddr_print;
 #else
 #define ahd_negoaddr_print(regvalue, cur_col, wrap) \
@@ -748,27 +650,6 @@ ahd_reg_print_t ahd_seloid_print;
 #endif
 #if AIC_DEBUG_REGISTERS
-ahd_reg_print_t ahd_haddr_print;
-#else
-#define ahd_haddr_print(regvalue, cur_col, wrap) \
-    ahd_print_register(NULL, 0, "HADDR", 0x70, regvalue, cur_col, wrap)
-#endif
-#if AIC_DEBUG_REGISTERS
-ahd_reg_print_t ahd_hcnt_print;
-#else
-#define ahd_hcnt_print(regvalue, cur_col, wrap) \
-    ahd_print_register(NULL, 0, "HCNT", 0x78, regvalue, cur_col, wrap)
-#endif
-#if AIC_DEBUG_REGISTERS
-ahd_reg_print_t ahd_sghaddr_print;
-#else
-#define ahd_sghaddr_print(regvalue, cur_col, wrap) \
-    ahd_print_register(NULL, 0, "SGHADDR", 0x7c, regvalue, cur_col, wrap)
-#endif
-#if AIC_DEBUG_REGISTERS
 ahd_reg_print_t ahd_scbhaddr_print;
 #else
 #define ahd_scbhaddr_print(regvalue, cur_col, wrap) \
@@ -776,10 +657,10 @@ ahd_reg_print_t ahd_scbhaddr_print;
 #endif
 #if AIC_DEBUG_REGISTERS
-ahd_reg_print_t ahd_sghcnt_print;
+ahd_reg_print_t ahd_sghaddr_print;
 #else
-#define ahd_sghcnt_print(regvalue, cur_col, wrap) \
+#define ahd_sghaddr_print(regvalue, cur_col, wrap) \
-    ahd_print_register(NULL, 0, "SGHCNT", 0x84, regvalue, cur_col, wrap)
+    ahd_print_register(NULL, 0, "SGHADDR", 0x7c, regvalue, cur_col, wrap)
 #endif
 #if AIC_DEBUG_REGISTERS
@@ -790,10 +671,10 @@ ahd_reg_print_t ahd_scbhcnt_print;
 #endif
 #if AIC_DEBUG_REGISTERS
-ahd_reg_print_t ahd_dff_thrsh_print;
+ahd_reg_print_t ahd_sghcnt_print;
 #else
-#define ahd_dff_thrsh_print(regvalue, cur_col, wrap) \
+#define ahd_sghcnt_print(regvalue, cur_col, wrap) \
-    ahd_print_register(NULL, 0, "DFF_THRSH", 0x88, regvalue, cur_col, wrap)
+    ahd_print_register(NULL, 0, "SGHCNT", 0x84, regvalue, cur_col, wrap)
 #endif
 #if AIC_DEBUG_REGISTERS
@@ -867,13 +748,6 @@ ahd_reg_print_t ahd_targpcistat_print;
 #endif
 #if AIC_DEBUG_REGISTERS
-ahd_reg_print_t ahd_scbptr_print;
-#else
-#define ahd_scbptr_print(regvalue, cur_col, wrap) \
-    ahd_print_register(NULL, 0, "SCBPTR", 0xa8, regvalue, cur_col, wrap)
-#endif
-#if AIC_DEBUG_REGISTERS
 ahd_reg_print_t ahd_scbautoptr_print;
 #else
 #define ahd_scbautoptr_print(regvalue, cur_col, wrap) \
@@ -881,13 +755,6 @@ ahd_reg_print_t ahd_scbautoptr_print;
 #endif
 #if AIC_DEBUG_REGISTERS
-ahd_reg_print_t ahd_ccsgaddr_print;
-#else
-#define ahd_ccsgaddr_print(regvalue, cur_col, wrap) \
-    ahd_print_register(NULL, 0, "CCSGADDR", 0xac, regvalue, cur_col, wrap)
-#endif
-#if AIC_DEBUG_REGISTERS
 ahd_reg_print_t ahd_ccscbaddr_print;
 #else
 #define ahd_ccscbaddr_print(regvalue, cur_col, wrap) \
@@ -909,13 +776,6 @@ ahd_reg_print_t ahd_ccsgctl_print;
 #endif
 #if AIC_DEBUG_REGISTERS
-ahd_reg_print_t ahd_ccsgram_print;
-#else
-#define ahd_ccsgram_print(regvalue, cur_col, wrap) \
-    ahd_print_register(NULL, 0, "CCSGRAM", 0xb0, regvalue, cur_col, wrap)
-#endif
-#if AIC_DEBUG_REGISTERS
 ahd_reg_print_t ahd_ccscbram_print;
 #else
 #define ahd_ccscbram_print(regvalue, cur_col, wrap) \
@@ -930,13 +790,6 @@ ahd_reg_print_t ahd_brddat_print;
 #endif
 #if AIC_DEBUG_REGISTERS
-ahd_reg_print_t ahd_brdctl_print;
-#else
-#define ahd_brdctl_print(regvalue, cur_col, wrap) \
-    ahd_print_register(NULL, 0, "BRDCTL", 0xb9, regvalue, cur_col, wrap)
-#endif
-#if AIC_DEBUG_REGISTERS
 ahd_reg_print_t ahd_seeadr_print;
 #else
 #define ahd_seeadr_print(regvalue, cur_col, wrap) \
@@ -972,13 +825,6 @@ ahd_reg_print_t ahd_dspdatactl_print;
 #endif
 #if AIC_DEBUG_REGISTERS
-ahd_reg_print_t ahd_dfdat_print;
-#else
-#define ahd_dfdat_print(regvalue, cur_col, wrap) \
-    ahd_print_register(NULL, 0, "DFDAT", 0xc4, regvalue, cur_col, wrap)
-#endif
-#if AIC_DEBUG_REGISTERS
 ahd_reg_print_t ahd_dspselect_print;
 #else
 #define ahd_dspselect_print(regvalue, cur_col, wrap) \
@@ -1000,13 +846,6 @@ ahd_reg_print_t ahd_seqctl0_print;
 #endif
 #if AIC_DEBUG_REGISTERS
-ahd_reg_print_t ahd_flags_print;
-#else
-#define ahd_flags_print(regvalue, cur_col, wrap) \
-    ahd_print_register(NULL, 0, "FLAGS", 0xd8, regvalue, cur_col, wrap)
-#endif
-#if AIC_DEBUG_REGISTERS
 ahd_reg_print_t ahd_seqintctl_print;
 #else
 #define ahd_seqintctl_print(regvalue, cur_col, wrap) \
@@ -1014,13 +853,6 @@ ahd_reg_print_t ahd_seqintctl_print;
 #endif
 #if AIC_DEBUG_REGISTERS
-ahd_reg_print_t ahd_seqram_print;
-#else
-#define ahd_seqram_print(regvalue, cur_col, wrap) \
-    ahd_print_register(NULL, 0, "SEQRAM", 0xda, regvalue, cur_col, wrap)
-#endif
-#if AIC_DEBUG_REGISTERS
 ahd_reg_print_t ahd_prgmcnt_print;
 #else
 #define ahd_prgmcnt_print(regvalue, cur_col, wrap) \
@@ -1028,41 +860,6 @@ ahd_reg_print_t ahd_prgmcnt_print;
 #endif
 #if AIC_DEBUG_REGISTERS
-ahd_reg_print_t ahd_accum_print;
-#else
-#define ahd_accum_print(regvalue, cur_col, wrap) \
-    ahd_print_register(NULL, 0, "ACCUM", 0xe0, regvalue, cur_col, wrap)
-#endif
-#if AIC_DEBUG_REGISTERS
-ahd_reg_print_t ahd_sindex_print;
-#else
-#define ahd_sindex_print(regvalue, cur_col, wrap) \
-    ahd_print_register(NULL, 0, "SINDEX", 0xe2, regvalue, cur_col, wrap)
-#endif
-#if AIC_DEBUG_REGISTERS
-ahd_reg_print_t ahd_dindex_print;
-#else
-#define ahd_dindex_print(regvalue, cur_col, wrap) \
-    ahd_print_register(NULL, 0, "DINDEX", 0xe4, regvalue, cur_col, wrap)
-#endif
-#if AIC_DEBUG_REGISTERS
-ahd_reg_print_t ahd_allones_print;
-#else
-#define ahd_allones_print(regvalue, cur_col, wrap) \
-    ahd_print_register(NULL, 0, "ALLONES", 0xe8, regvalue, cur_col, wrap)
-#endif
-#if AIC_DEBUG_REGISTERS
-ahd_reg_print_t ahd_allzeros_print;
-#else
-#define ahd_allzeros_print(regvalue, cur_col, wrap) \
-    ahd_print_register(NULL, 0, "ALLZEROS", 0xea, regvalue, cur_col, wrap)
-#endif
-#if AIC_DEBUG_REGISTERS
 ahd_reg_print_t ahd_none_print;
 #else
 #define ahd_none_print(regvalue, cur_col, wrap) \
@@ -1070,27 +867,6 @@ ahd_reg_print_t ahd_none_print;
 #endif
 #if AIC_DEBUG_REGISTERS
-ahd_reg_print_t ahd_sindir_print;
-#else
-#define ahd_sindir_print(regvalue, cur_col, wrap) \
-    ahd_print_register(NULL, 0, "SINDIR", 0xec, regvalue, cur_col, wrap)
-#endif
-#if AIC_DEBUG_REGISTERS
-ahd_reg_print_t ahd_dindir_print;
-#else
-#define ahd_dindir_print(regvalue, cur_col, wrap) \
-    ahd_print_register(NULL, 0, "DINDIR", 0xed, regvalue, cur_col, wrap)
-#endif
-#if AIC_DEBUG_REGISTERS
-ahd_reg_print_t ahd_stack_print;
-#else
-#define ahd_stack_print(regvalue, cur_col, wrap) \
-    ahd_print_register(NULL, 0, "STACK", 0xf2, regvalue, cur_col, wrap)
-#endif
-#if AIC_DEBUG_REGISTERS
 ahd_reg_print_t ahd_intvec1_addr_print;
 #else
 #define ahd_intvec1_addr_print(regvalue, cur_col, wrap) \
@@ -1126,17 +902,17 @@ ahd_reg_print_t ahd_accum_save_print;
 #endif
 #if AIC_DEBUG_REGISTERS
-ahd_reg_print_t ahd_sram_base_print;
+ahd_reg_print_t ahd_waiting_scb_tails_print;
 #else
-#define ahd_sram_base_print(regvalue, cur_col, wrap) \
+#define ahd_waiting_scb_tails_print(regvalue, cur_col, wrap) \
-    ahd_print_register(NULL, 0, "SRAM_BASE", 0x100, regvalue, cur_col, wrap)
+    ahd_print_register(NULL, 0, "WAITING_SCB_TAILS", 0x100, regvalue, cur_col, wrap)
 #endif
 #if AIC_DEBUG_REGISTERS
-ahd_reg_print_t ahd_waiting_scb_tails_print;
+ahd_reg_print_t ahd_sram_base_print;
 #else
-#define ahd_waiting_scb_tails_print(regvalue, cur_col, wrap) \
+#define ahd_sram_base_print(regvalue, cur_col, wrap) \
-    ahd_print_register(NULL, 0, "WAITING_SCB_TAILS", 0x100, regvalue, cur_col, wrap)
+    ahd_print_register(NULL, 0, "SRAM_BASE", 0x100, regvalue, cur_col, wrap)
 #endif
 #if AIC_DEBUG_REGISTERS
@@ -1224,13 +1000,6 @@ ahd_reg_print_t ahd_msg_out_print;
 #endif
 #if AIC_DEBUG_REGISTERS
-ahd_reg_print_t ahd_dmaparams_print;
-#else
-#define ahd_dmaparams_print(regvalue, cur_col, wrap) \
-    ahd_print_register(NULL, 0, "DMAPARAMS", 0x138, regvalue, cur_col, wrap)
-#endif
-#if AIC_DEBUG_REGISTERS
 ahd_reg_print_t ahd_seq_flags_print;
 #else
 #define ahd_seq_flags_print(regvalue, cur_col, wrap) \
@@ -1238,20 +1007,6 @@ ahd_reg_print_t ahd_seq_flags_print;
 #endif
 #if AIC_DEBUG_REGISTERS
-ahd_reg_print_t ahd_saved_scsiid_print;
-#else
-#define ahd_saved_scsiid_print(regvalue, cur_col, wrap) \
-    ahd_print_register(NULL, 0, "SAVED_SCSIID", 0x13a, regvalue, cur_col, wrap)
-#endif
-#if AIC_DEBUG_REGISTERS
-ahd_reg_print_t ahd_saved_lun_print;
-#else
-#define ahd_saved_lun_print(regvalue, cur_col, wrap) \
-    ahd_print_register(NULL, 0, "SAVED_LUN", 0x13b, regvalue, cur_col, wrap)
-#endif
-#if AIC_DEBUG_REGISTERS
 ahd_reg_print_t ahd_lastphase_print;
 #else
 #define ahd_lastphase_print(regvalue, cur_col, wrap) \
@@ -1273,20 +1028,6 @@ ahd_reg_print_t ahd_kernel_tqinpos_print;
 #endif
 #if AIC_DEBUG_REGISTERS
-ahd_reg_print_t ahd_tqinpos_print;
-#else
-#define ahd_tqinpos_print(regvalue, cur_col, wrap) \
-    ahd_print_register(NULL, 0, "TQINPOS", 0x13f, regvalue, cur_col, wrap)
-#endif
-#if AIC_DEBUG_REGISTERS
-ahd_reg_print_t ahd_shared_data_addr_print;
-#else
-#define ahd_shared_data_addr_print(regvalue, cur_col, wrap) \
-    ahd_print_register(NULL, 0, "SHARED_DATA_ADDR", 0x140, regvalue, cur_col, wrap)
-#endif
-#if AIC_DEBUG_REGISTERS
 ahd_reg_print_t ahd_qoutfifo_next_addr_print;
 #else
 #define ahd_qoutfifo_next_addr_print(regvalue, cur_col, wrap) \
@@ -1294,20 +1035,6 @@ ahd_reg_print_t ahd_qoutfifo_next_addr_print;
 #endif
 #if AIC_DEBUG_REGISTERS
-ahd_reg_print_t ahd_arg_1_print;
-#else
-#define ahd_arg_1_print(regvalue, cur_col, wrap) \
-    ahd_print_register(NULL, 0, "ARG_1", 0x148, regvalue, cur_col, wrap)
-#endif
-#if AIC_DEBUG_REGISTERS
-ahd_reg_print_t ahd_arg_2_print;
-#else
-#define ahd_arg_2_print(regvalue, cur_col, wrap) \
-    ahd_print_register(NULL, 0, "ARG_2", 0x149, regvalue, cur_col, wrap)
-#endif
-#if AIC_DEBUG_REGISTERS
 ahd_reg_print_t ahd_last_msg_print;
 #else
 #define ahd_last_msg_print(regvalue, cur_col, wrap) \
@@ -1406,13 +1133,6 @@ ahd_reg_print_t ahd_mk_message_scsiid_print;
 #endif
 #if AIC_DEBUG_REGISTERS
-ahd_reg_print_t ahd_scb_residual_datacnt_print;
-#else
-#define ahd_scb_residual_datacnt_print(regvalue, cur_col, wrap) \
-    ahd_print_register(NULL, 0, "SCB_RESIDUAL_DATACNT", 0x180, regvalue, cur_col, wrap)
-#endif
-#if AIC_DEBUG_REGISTERS
 ahd_reg_print_t ahd_scb_base_print;
 #else
 #define ahd_scb_base_print(regvalue, cur_col, wrap) \
@@ -1420,17 +1140,10 @@ ahd_reg_print_t ahd_scb_base_print;
 #endif
 #if AIC_DEBUG_REGISTERS
-ahd_reg_print_t ahd_scb_residual_sgptr_print;
+ahd_reg_print_t ahd_scb_residual_datacnt_print;
-#else
-#define ahd_scb_residual_sgptr_print(regvalue, cur_col, wrap) \
-    ahd_print_register(NULL, 0, "SCB_RESIDUAL_SGPTR", 0x184, regvalue, cur_col, wrap)
-#endif
-#if AIC_DEBUG_REGISTERS
-ahd_reg_print_t ahd_scb_scsi_status_print;
 #else
-#define ahd_scb_scsi_status_print(regvalue, cur_col, wrap) \
+#define ahd_scb_residual_datacnt_print(regvalue, cur_col, wrap) \
-    ahd_print_register(NULL, 0, "SCB_SCSI_STATUS", 0x188, regvalue, cur_col, wrap)
+    ahd_print_register(NULL, 0, "SCB_RESIDUAL_DATACNT", 0x180, regvalue, cur_col, wrap)
 #endif
 #if AIC_DEBUG_REGISTERS
@@ -1476,13 +1189,6 @@ ahd_reg_print_t ahd_scb_task_attribute_print;
 #endif
 #if AIC_DEBUG_REGISTERS
-ahd_reg_print_t ahd_scb_cdb_len_print;
-#else
-#define ahd_scb_cdb_len_print(regvalue, cur_col, wrap) \
-    ahd_print_register(NULL, 0, "SCB_CDB_LEN", 0x196, regvalue, cur_col, wrap)
-#endif
-#if AIC_DEBUG_REGISTERS
 ahd_reg_print_t ahd_scb_task_management_print;
 #else
 #define ahd_scb_task_management_print(regvalue, cur_col, wrap) \
@@ -1518,13 +1224,6 @@ ahd_reg_print_t ahd_scb_busaddr_print;
 #endif
 #if AIC_DEBUG_REGISTERS
-ahd_reg_print_t ahd_scb_next_print;
-#else
-#define ahd_scb_next_print(regvalue, cur_col, wrap) \
-    ahd_print_register(NULL, 0, "SCB_NEXT", 0x1ac, regvalue, cur_col, wrap)
-#endif
-#if AIC_DEBUG_REGISTERS
 ahd_reg_print_t ahd_scb_next2_print;
 #else
 #define ahd_scb_next2_print(regvalue, cur_col, wrap) \
@@ -1717,10 +1416,10 @@ ahd_reg_print_t ahd_scb_disconnected_lists_print;
 #define SG_CACHE_PRE                    0x1b
-#define TYPEPTR                         0x20
 #define LQIN                            0x20
+#define TYPEPTR                         0x20
 #define TAGPTR                          0x21
 #define LUNPTR                          0x22
@@ -1780,6 +1479,14 @@ ahd_reg_print_t ahd_scb_disconnected_lists_print;
 #define         SINGLECMD               0x02
 #define         ABORTPENDING            0x01
+#define SCSBIST0                        0x39
+#define         GSBISTERR               0x40
+#define         GSBISTDONE              0x20
+#define         GSBISTRUN               0x10
+#define         OSBISTERR               0x04
+#define         OSBISTDONE              0x02
+#define         OSBISTRUN               0x01
 #define LQCTL2                          0x39
 #define         LQIRETRY                0x80
 #define         LQICONTINUE             0x40
@@ -1790,13 +1497,10 @@ ahd_reg_print_t ahd_scb_disconnected_lists_print;
 #define         LQOTOIDLE               0x02
 #define         LQOPAUSE                0x01
-#define SCSBIST0                        0x39
+#define SCSBIST1                        0x3a
-#define         GSBISTERR               0x40
+#define         NTBISTERR               0x04
-#define         GSBISTDONE              0x20
+#define         NTBISTDONE              0x02
-#define         GSBISTRUN               0x10
+#define         NTBISTRUN               0x01
-#define         OSBISTERR               0x04
-#define         OSBISTDONE              0x02
-#define         OSBISTRUN               0x01
 #define SCSISEQ0                        0x3a
 #define         TEMODEO                 0x80
@@ -1805,15 +1509,8 @@ ahd_reg_print_t ahd_scb_disconnected_lists_print;
 #define         FORCEBUSFREE            0x10
 #define         SCSIRSTO                0x01
-#define SCSBIST1                        0x3a
-#define         NTBISTERR               0x04
-#define         NTBISTDONE              0x02
-#define         NTBISTRUN               0x01
 #define SCSISEQ1                        0x3b
-#define BUSINITID                       0x3c
 #define SXFRCTL0                        0x3c
 #define         DFON                    0x80
 #define         DFPEXP                  0x40
@@ -1822,6 +1519,8 @@ ahd_reg_print_t ahd_scb_disconnected_lists_print;
 #define DLCOUNT                         0x3c
+#define BUSINITID                       0x3c
 #define SXFRCTL1                        0x3d
 #define         BITBUCKET               0x80
 #define         ENSACHK                 0x40
@@ -1846,8 +1545,6 @@ ahd_reg_print_t ahd_scb_disconnected_lists_print;
 #define         CURRFIFO_1              0x01
 #define         CURRFIFO_0              0x00
-#define MULTARGID                       0x40
 #define SCSISIGO                        0x40
 #define         CDO                     0x80
 #define         IOO                     0x40
@@ -1858,6 +1555,8 @@ ahd_reg_print_t ahd_scb_disconnected_lists_print;
 #define         REQO                    0x02
 #define         ACKO                    0x01
+#define MULTARGID                       0x40
 #define SCSISIGI                        0x41
 #define         ATNI                    0x10
 #define         SELI                    0x08
@@ -1904,6 +1603,15 @@ ahd_reg_print_t ahd_scb_disconnected_lists_print;
 #define         ENAB20                  0x04
 #define         SELWIDE                 0x02
+#define CLRSINT0                        0x4b
+#define         CLRSELDO                0x40
+#define         CLRSELDI                0x20
+#define         CLRSELINGO              0x10
+#define         CLRIOERR                0x08
+#define         CLROVERRUN              0x04
+#define         CLRSPIORDY              0x02
+#define         CLRARBDO                0x01
 #define SSTAT0                          0x4b
 #define         TARGET                  0x80
 #define         SELDO                   0x40
@@ -1923,14 +1631,14 @@ ahd_reg_print_t ahd_scb_disconnected_lists_print;
 #define         ENSPIORDY               0x02
 #define         ENARBDO                 0x01
-#define CLRSINT0                        0x4b
+#define CLRSINT1                        0x4c
-#define         CLRSELDO                0x40
+#define         CLRSELTIMEO             0x80
-#define         CLRSELDI                0x20
+#define         CLRATNO                 0x40
-#define         CLRSELINGO              0x10
+#define         CLRSCSIRSTI             0x20
-#define         CLRIOERR                0x08
+#define         CLRBUSFREE              0x08
-#define         CLROVERRUN              0x04
+#define         CLRSCSIPERR             0x04
-#define         CLRSPIORDY              0x02
+#define         CLRSTRB2FAST            0x02
-#define         CLRARBDO                0x01
+#define         CLRREQINIT              0x01
 #define SSTAT1                          0x4c
 #define         SELTO                   0x80
@@ -1942,15 +1650,6 @@ ahd_reg_print_t ahd_scb_disconnected_lists_print;
 #define         STRB2FAST               0x02
 #define         REQINIT                 0x01
-#define CLRSINT1                        0x4c
-#define         CLRSELTIMEO             0x80
-#define         CLRATNO                 0x40
-#define         CLRSCSIRSTI             0x20
-#define         CLRBUSFREE              0x08
-#define         CLRSCSIPERR             0x04
-#define         CLRSTRB2FAST            0x02
-#define         CLRREQINIT              0x01
 #define SSTAT2                          0x4d
 #define         BUSFREETIME             0xc0
 #define         NONPACKREQ              0x20
@@ -1998,14 +1697,6 @@ ahd_reg_print_t ahd_scb_disconnected_lists_print;
 #define         LQIATNLQ                0x02
 #define         LQIATNCMD               0x01
-#define LQIMODE0                        0x50
-#define         ENLQIATNQASK            0x20
-#define         ENLQICRCT1              0x10
-#define         ENLQICRCT2              0x08
-#define         ENLQIBADLQT             0x04
-#define         ENLQIATNLQ              0x02
-#define         ENLQIATNCMD             0x01
 #define CLRLQIINT0                      0x50
 #define         CLRLQIATNQAS            0x20
 #define         CLRLQICRCT1             0x10
@@ -2014,6 +1705,14 @@ ahd_reg_print_t ahd_scb_disconnected_lists_print;
 #define         CLRLQIATNLQ             0x02
 #define         CLRLQIATNCMD            0x01
+#define LQIMODE0                        0x50
+#define         ENLQIATNQASK            0x20
+#define         ENLQICRCT1              0x10
+#define         ENLQICRCT2              0x08
+#define         ENLQIBADLQT             0x04
+#define         ENLQIATNLQ              0x02
+#define         ENLQIATNCMD             0x01
 #define LQIMODE1                        0x51
 #define         ENLQIPHASE_LQ           0x80
 #define         ENLQIPHASE_NLQ          0x40
@@ -2160,6 +1859,8 @@ ahd_reg_print_t ahd_scb_disconnected_lists_print;
 #define         CFG4ICMD                0x02
 #define         CFG4TCMD                0x01
+#define CURRSCB                         0x5c
 #define SEQIMODE                        0x5c
 #define         ENCTXTDONE              0x40
 #define         ENSAVEPTRS              0x20
@@ -2169,8 +1870,6 @@ ahd_reg_print_t ahd_scb_disconnected_lists_print;
 #define         ENCFG4ICMD              0x02
 #define         ENCFG4TCMD              0x01
-#define CURRSCB                         0x5c
 #define MDFFSTAT                        0x5d
 #define         SHCNTNEGATIVE           0x40
 #define         SHCNTMINUS1             0x20
@@ -2185,29 +1884,29 @@ ahd_reg_print_t ahd_scb_disconnected_lists_print;
 #define DFFTAG                          0x5e
+#define LASTSCB                         0x5e
 #define SCSITEST                        0x5e
 #define         CNTRTEST                0x08
 #define         SEL_TXPLL_DEBUG         0x04
-#define LASTSCB                         0x5e
 #define IOPDNCTL                        0x5f
 #define         DISABLE_OE              0x80
 #define         PDN_IDIST               0x04
 #define         PDN_DIFFSENSE           0x01
-#define DGRPCRCI                        0x60
 #define SHADDR                          0x60
 #define NEGOADDR                        0x60
-#define NEGPERIOD                       0x61
+#define DGRPCRCI                        0x60
-#define NEGOFFSET                       0x62
+#define NEGPERIOD                       0x61
 #define PACKCRCI                        0x62
+#define NEGOFFSET                       0x62
 #define NEGPPROPTS                      0x63
 #define         PPROPT_PACE             0x08
 #define         PPROPT_QAS              0x04
@@ -2253,8 +1952,6 @@ ahd_reg_print_t ahd_scb_disconnected_lists_print;
 #define SELOID                          0x6b
-#define FAIRNESS                        0x6c
 #define PLL400CTL0                      0x6c
 #define         PLL_VCOSEL              0x80
 #define         PLL_PWDN                0x40
@@ -2264,6 +1961,8 @@ ahd_reg_print_t ahd_scb_disconnected_lists_print;
 #define         PLL_DLPF                0x02
 #define         PLL_ENFBM               0x01
+#define FAIRNESS                        0x6c
 #define PLL400CTL1                      0x6d
 #define         PLL_CNTEN               0x80
 #define         PLL_CNTCLR              0x40
@@ -2275,25 +1974,25 @@ ahd_reg_print_t ahd_scb_disconnected_lists_print;
 #define HADDR                           0x70
-#define HODMAADR                        0x70
 #define PLLDELAY                        0x70
 #define         SPLIT_DROP_REQ          0x80
-#define HCNT                            0x78
+#define HODMAADR                        0x70
 #define HODMACNT                        0x78
-#define HODMAEN                         0x7a
+#define HCNT                            0x78
-#define SGHADDR                         0x7c
+#define HODMAEN                         0x7a
 #define SCBHADDR                        0x7c
-#define SGHCNT                          0x84
+#define SGHADDR                         0x7c
 #define SCBHCNT                         0x84
+#define SGHCNT                          0x84
 #define DFF_THRSH                       0x88
 #define         WR_DFTHRSH              0x70
 #define         RD_DFTHRSH              0x07
@@ -2326,10 +2025,6 @@ ahd_reg_print_t ahd_scb_disconnected_lists_print;
 #define CMCRXMSG0                       0x90
-#define OVLYRXMSG0                      0x90
-#define DCHRXMSG0                       0x90
 #define ROENABLE                        0x90
 #define         MSIROEN                 0x20
 #define         OVLYROEN                0x10
@@ -2338,11 +2033,11 @@ ahd_reg_print_t ahd_scb_disconnected_lists_print;
 #define         DCH1ROEN                0x02
 #define         DCH0ROEN                0x01
-#define OVLYRXMSG1                      0x91
+#define OVLYRXMSG0                      0x90
-#define CMCRXMSG1                       0x91
+#define DCHRXMSG0                       0x90
-#define DCHRXMSG1                       0x91
+#define OVLYRXMSG1                      0x91
 #define NSENABLE                        0x91
 #define         MSINSEN                 0x20
@@ -2352,6 +2047,10 @@ ahd_reg_print_t ahd_scb_disconnected_lists_print;
 #define         DCH1NSEN                0x02
 #define         DCH0NSEN                0x01
+#define CMCRXMSG1                       0x91
+#define DCHRXMSG1                       0x91
 #define DCHRXMSG2                       0x92
 #define CMCRXMSG2                       0x92
@@ -2375,24 +2074,24 @@ ahd_reg_print_t ahd_scb_disconnected_lists_print;
 #define         TSCSERREN               0x02
 #define         CMPABCDIS               0x01
-#define CMCSEQBCNT                      0x94
 #define OVLYSEQBCNT                     0x94
 #define DCHSEQBCNT                      0x94
+#define CMCSEQBCNT                      0x94
+#define CMCSPLTSTAT0                    0x96
 #define DCHSPLTSTAT0                    0x96
 #define OVLYSPLTSTAT0                   0x96
-#define CMCSPLTSTAT0                    0x96
+#define CMCSPLTSTAT1                    0x97
 #define OVLYSPLTSTAT1                   0x97
 #define DCHSPLTSTAT1                    0x97
-#define CMCSPLTSTAT1                    0x97
 #define SGRXMSG0                        0x98
 #define         CDNUM                   0xf8
 #define         CFNUM                   0x07
@@ -2420,15 +2119,18 @@ ahd_reg_print_t ahd_scb_disconnected_lists_print;
 #define         TAG_NUM                 0x1f
 #define         RLXORD                  0x10
+#define SGSEQBCNT                       0x9c
 #define SLVSPLTOUTATTR0                 0x9c
 #define         LOWER_BCNT              0xff
-#define SGSEQBCNT                       0x9c
 #define SLVSPLTOUTATTR1                 0x9d
 #define         CMPLT_DNUM              0xf8
 #define         CMPLT_FNUM              0x07
+#define SLVSPLTOUTATTR2                 0x9e
+#define         CMPLT_BNUM              0xff
 #define SGSPLTSTAT0                     0x9e
 #define         STAETERM                0x80
 #define         SCBCERR                 0x40
@@ -2439,9 +2141,6 @@ ahd_reg_print_t ahd_scb_disconnected_lists_print;
 #define         RXSCEMSG                0x02
 #define         RXSPLTRSP               0x01
-#define SLVSPLTOUTATTR2                 0x9e
-#define         CMPLT_BNUM              0xff
 #define SGSPLTSTAT1                     0x9f
 #define         RXDATABUCKET            0x01
@@ -2497,10 +2196,10 @@ ahd_reg_print_t ahd_scb_disconnected_lists_print;
 #define CCSGADDR                        0xac
-#define CCSCBADDR                       0xac
 #define CCSCBADR_BK                     0xac
+#define CCSCBADDR                       0xac
 #define CMC_RAMBIST                     0xad
 #define         SG_ELEMENT_SIZE         0x80
 #define         SCBRAMBIST_FAIL         0x40
@@ -2554,9 +2253,9 @@ ahd_reg_print_t ahd_scb_disconnected_lists_print;
 #define SEEDAT                          0xbc
 #define SEECTL                          0xbe
-#define         SEEOP_EWDS              0x40
 #define         SEEOP_WALL              0x40
 #define         SEEOP_EWEN              0x40
+#define         SEEOP_EWDS              0x40
 #define         SEEOPCODE               0x70
 #define         SEERST                  0x02
 #define         SEESTART                0x01
@@ -2573,25 +2272,25 @@ ahd_reg_print_t ahd_scb_disconnected_lists_print;
 #define SCBCNT                          0xbf
+#define DFWADDR                         0xc0
 #define DSPFLTRCTL                      0xc0
 #define         FLTRDISABLE             0x20
 #define         EDGESENSE               0x10
 #define         DSPFCNTSEL              0x0f
-#define DFWADDR                         0xc0
 #define DSPDATACTL                      0xc1
 #define         BYPASSENAB              0x80
 #define         DESQDIS                 0x10
 #define         RCVROFFSTDIS            0x04
 #define         XMITOFFSTDIS            0x02
+#define DFRADDR                         0xc2
 #define DSPREQCTL                       0xc2
 #define         MANREQCTL               0xc0
 #define         MANREQDLY               0x3f
-#define DFRADDR                         0xc2
 #define DSPACKCTL                       0xc3
 #define         MANACKCTL               0xc0
 #define         MANACKDLY               0x3f
@@ -2612,14 +2311,14 @@ ahd_reg_print_t ahd_scb_disconnected_lists_print;
 #define WRTBIASCALC                     0xc7
-#define DFPTRS                          0xc8
 #define RCVRBIASCALC                    0xc8
-#define DFBKPTR                         0xc9
+#define DFPTRS                          0xc8
 #define SKEWCALC                        0xc9
+#define DFBKPTR                         0xc9
 #define DFDBCTL                         0xcb
 #define         DFF_CIO_WR_RDY          0x20
 #define         DFF_CIO_RD_RDY          0x10
@@ -2704,12 +2403,12 @@ ahd_reg_print_t ahd_scb_disconnected_lists_print;
 #define ACCUM_SAVE                      0xfa
+#define WAITING_SCB_TAILS               0x100
 #define AHD_PCI_CONFIG_BASE             0x100
 #define SRAM_BASE                       0x100
-#define WAITING_SCB_TAILS               0x100
 #define WAITING_TID_HEAD                0x120
 #define WAITING_TID_TAIL                0x122
@@ -2738,8 +2437,8 @@ ahd_reg_print_t ahd_scb_disconnected_lists_print;
 #define         PRELOADEN               0x80
 #define         WIDEODD                 0x40
 #define         SCSIEN                  0x20
-#define         SDMAENACK               0x10
 #define         SDMAEN                  0x10
+#define         SDMAENACK               0x10
 #define         HDMAEN                  0x08
 #define         HDMAENACK               0x08
 #define         DIRECTION               0x04
@@ -2837,12 +2536,12 @@ ahd_reg_print_t ahd_scb_disconnected_lists_print;
 #define MK_MESSAGE_SCSIID               0x162
+#define SCB_BASE                        0x180
 #define SCB_RESIDUAL_DATACNT            0x180
 #define SCB_CDB_STORE                   0x180
 #define SCB_HOST_CDB_PTR                0x180
-#define SCB_BASE                        0x180
 #define SCB_RESIDUAL_SGPTR              0x184
 #define         SG_ADDR_MASK            0xf8
 #define         SG_OVERRUN_RESID        0x02
@@ -2910,17 +2609,6 @@ ahd_reg_print_t ahd_scb_disconnected_lists_print;
 #define SCB_DISCONNECTED_LISTS          0x1b8
-#define CMD_GROUP_CODE_SHIFT    0x05
-#define STIMESEL_MIN    0x18
-#define STIMESEL_SHIFT  0x03
-#define INVALID_ADDR    0x80
-#define AHD_PRECOMP_MASK        0x07
-#define TARGET_DATA_IN  0x01
-#define CCSCBADDR_MAX   0x80
-#define NUMDSPS         0x14
-#define SEEOP_EWEN_ADDR 0xc0
-#define AHD_ANNEXCOL_PER_DEV0   0x04
-#define DST_MODE_SHIFT  0x04
 #define AHD_TIMER_MAX_US        0x18ffe7
 #define AHD_TIMER_MAX_TICKS     0xffff
 #define AHD_SENSE_BUFSIZE       0x100
@@ -2955,32 +2643,43 @@ ahd_reg_print_t ahd_scb_disconnected_lists_print;
 #define LUNLEN_SINGLE_LEVEL_LUN 0x0f
 #define NVRAM_SCB_OFFSET        0x2c
 #define STATUS_PKT_SENSE        0xff
+#define CMD_GROUP_CODE_SHIFT    0x05
 #define MAX_OFFSET_PACED_BUG    0x7f
 #define STIMESEL_BUG_ADJ        0x08
+#define STIMESEL_MIN    0x18
+#define STIMESEL_SHIFT  0x03
 #define CCSGRAM_MAXSEGS 0x10
+#define INVALID_ADDR    0x80
 #define SEEOP_ERAL_ADDR 0x80
 #define AHD_SLEWRATE_DEF_REVB   0x08
 #define AHD_PRECOMP_CUTBACK_17  0x04
+#define AHD_PRECOMP_MASK        0x07
 #define SRC_MODE_SHIFT  0x00
 #define PKT_OVERRUN_BUFSIZE     0x200
 #define SCB_TRANSFER_SIZE_1BYTE_LUN     0x30
+#define TARGET_DATA_IN  0x01
 #define HOST_MSG        0xff
 #define MAX_OFFSET      0xfe
 #define BUS_16_BIT      0x01
+#define CCSCBADDR_MAX   0x80
+#define NUMDSPS         0x14
+#define SEEOP_EWEN_ADDR 0xc0
+#define AHD_ANNEXCOL_PER_DEV0   0x04
+#define DST_MODE_SHIFT  0x04
 /* Downloaded Constant Definitions */
-#define SG_SIZEOF       0x04
-#define SG_PREFETCH_ALIGN_MASK  0x02
-#define SG_PREFETCH_CNT_LIMIT   0x01
 #define CACHELINE_MASK  0x07
 #define SCB_TRANSFER_SIZE       0x06
 #define PKT_OVERRUN_BUFOFFSET   0x05
+#define SG_SIZEOF       0x04
 #define SG_PREFETCH_ADDR_MASK   0x03
+#define SG_PREFETCH_ALIGN_MASK  0x02
+#define SG_PREFETCH_CNT_LIMIT   0x01
 #define SG_PREFETCH_CNT 0x00
 #define DOWNLOAD_CONST_COUNT    0x08
 /* Exported Labels */
-#define LABEL_timer_isr 0x28b
 #define LABEL_seq_isr   0x28f
+#define LABEL_timer_isr 0x28b
diff --git a/drivers/scsi/aic7xxx/aic79xx_reg_print.c_shipped b/drivers/scsi/aic7xxx/aic79xx_reg_print.c_shipped
index c4c8a96bf5a3..f5ea715d6ac3 100644
--- a/drivers/scsi/aic7xxx/aic79xx_reg_print.c_shipped
+++ b/drivers/scsi/aic7xxx/aic79xx_reg_print.c_shipped
@@ -8,18 +8,6 @@
 #include "aic79xx_osm.h"
-static const ahd_reg_parse_entry_t MODE_PTR_parse_table[] = {
-        { "SRC_MODE",           0x07, 0x07 },
-        { "DST_MODE",           0x70, 0x70 }
-};
-int
-ahd_mode_ptr_print(u_int regvalue, u_int *cur_col, u_int wrap)
-{
-        return (ahd_print_register(MODE_PTR_parse_table, 2, "MODE_PTR",
-            0x00, regvalue, cur_col, wrap));
-}
 static const ahd_reg_parse_entry_t INTSTAT_parse_table[] = {
        { "SPLTINT",            0x01, 0x01 },
        { "CMDCMPLT",           0x02, 0x02 },
@@ -39,110 +27,6 @@ ahd_intstat_print(u_int regvalue, u_int *cur_col, u_int wrap)
            0x01, regvalue, cur_col, wrap));
 }
-static const ahd_reg_parse_entry_t SEQINTCODE_parse_table[] = {
-        { "NO_SEQINT",          0x00, 0xff },
-        { "BAD_PHASE",          0x01, 0xff },
-        { "SEND_REJECT",        0x02, 0xff },
-        { "PROTO_VIOLATION",    0x03, 0xff },
-        { "NO_MATCH",           0x04, 0xff },
-        { "IGN_WIDE_RES",       0x05, 0xff },
-        { "PDATA_REINIT",       0x06, 0xff },
-        { "HOST_MSG_LOOP",      0x07, 0xff },
-        { "BAD_STATUS",         0x08, 0xff },
-        { "DATA_OVERRUN",       0x09, 0xff },
-        { "MKMSG_FAILED",       0x0a, 0xff },
-        { "MISSED_BUSFREE",     0x0b, 0xff },
-        { "DUMP_CARD_STATE",    0x0c, 0xff },
-        { "ILLEGAL_PHASE",      0x0d, 0xff },
-        { "INVALID_SEQINT",     0x0e, 0xff },
-        { "CFG4ISTAT_INTR",     0x0f, 0xff },
-        { "STATUS_OVERRUN",     0x10, 0xff },
-        { "CFG4OVERRUN",        0x11, 0xff },
-        { "ENTERING_NONPACK",   0x12, 0xff },
-        { "TASKMGMT_FUNC_COMPLETE",0x13, 0xff },
-        { "TASKMGMT_CMD_CMPLT_OKAY",0x14, 0xff },
-        { "TRACEPOINT0",        0x15, 0xff },
-        { "TRACEPOINT1",        0x16, 0xff },
-        { "TRACEPOINT2",        0x17, 0xff },
-        { "TRACEPOINT3",        0x18, 0xff },
-        { "SAW_HWERR",          0x19, 0xff },
-        { "BAD_SCB_STATUS",     0x1a, 0xff }
-};
-int
-ahd_seqintcode_print(u_int regvalue, u_int *cur_col, u_int wrap)
-{
-        return (ahd_print_register(SEQINTCODE_parse_table, 27, "SEQINTCODE",
-            0x02, regvalue, cur_col, wrap));
-}
-static const ahd_reg_parse_entry_t CLRINT_parse_table[] = {
-        { "CLRSPLTINT",         0x01, 0x01 },
-        { "CLRCMDINT",          0x02, 0x02 },
-        { "CLRSEQINT",          0x04, 0x04 },
-        { "CLRSCSIINT",         0x08, 0x08 },
-        { "CLRPCIINT",          0x10, 0x10 },
-        { "CLRSWTMINT",         0x20, 0x20 },
-        { "CLRBRKADRINT",       0x40, 0x40 },
-        { "CLRHWERRINT",        0x80, 0x80 }
-};
-int
-ahd_clrint_print(u_int regvalue, u_int *cur_col, u_int wrap)
-{
-        return (ahd_print_register(CLRINT_parse_table, 8, "CLRINT",
-            0x03, regvalue, cur_col, wrap));
-}
-static const ahd_reg_parse_entry_t ERROR_parse_table[] = {
-        { "DSCTMOUT",           0x02, 0x02 },
-        { "ILLOPCODE",          0x04, 0x04 },
-        { "SQPARERR",           0x08, 0x08 },
-        { "DPARERR",            0x10, 0x10 },
-        { "MPARERR",            0x20, 0x20 },
-        { "CIOACCESFAIL",       0x40, 0x40 },
-        { "CIOPARERR",          0x80, 0x80 }
-};
-int
-ahd_error_print(u_int regvalue, u_int *cur_col, u_int wrap)
-{
-        return (ahd_print_register(ERROR_parse_table, 7, "ERROR",
-            0x04, regvalue, cur_col, wrap));
-}
-static const ahd_reg_parse_entry_t HCNTRL_parse_table[] = {
-        { "CHIPRST",            0x01, 0x01 },
-        { "CHIPRSTACK",         0x01, 0x01 },
-        { "INTEN",              0x02, 0x02 },
-        { "PAUSE",              0x04, 0x04 },
-        { "SWTIMER_START_B",    0x08, 0x08 },
-        { "SWINT",              0x10, 0x10 },
-        { "POWRDN",             0x40, 0x40 },
-        { "SEQ_RESET",          0x80, 0x80 }
-};
-int
-ahd_hcntrl_print(u_int regvalue, u_int *cur_col, u_int wrap)
-{
-        return (ahd_print_register(HCNTRL_parse_table, 8, "HCNTRL",
-            0x05, regvalue, cur_col, wrap));
-}
-int
-ahd_hnscb_qoff_print(u_int regvalue, u_int *cur_col, u_int wrap)
-{
-        return (ahd_print_register(NULL, 0, "HNSCB_QOFF",
-            0x06, regvalue, cur_col, wrap));
-}
-int
-ahd_hescb_qoff_print(u_int regvalue, u_int *cur_col, u_int wrap)
-{
-        return (ahd_print_register(NULL, 0, "HESCB_QOFF",
-            0x08, regvalue, cur_col, wrap));
-}
 static const ahd_reg_parse_entry_t HS_MAILBOX_parse_table[] = {
        { "ENINT_COALESCE",     0x40, 0x40 },
        { "HOST_TQINPOS",       0x80, 0x80 }
@@ -170,77 +54,6 @@ ahd_seqintstat_print(u_int regvalue, u_int *cur_col, u_int wrap)
            0x0c, regvalue, cur_col, wrap));
 }
-static const ahd_reg_parse_entry_t CLRSEQINTSTAT_parse_table[] = {
-        { "CLRSEQ_SPLTINT",     0x01, 0x01 },
-        { "CLRSEQ_PCIINT",      0x02, 0x02 },
-        { "CLRSEQ_SCSIINT",     0x04, 0x04 },
-        { "CLRSEQ_SEQINT",      0x08, 0x08 },
-        { "CLRSEQ_SWTMRTO",     0x10, 0x10 }
-};
-int
-ahd_clrseqintstat_print(u_int regvalue, u_int *cur_col, u_int wrap)
-{
-        return (ahd_print_register(CLRSEQINTSTAT_parse_table, 5, "CLRSEQINTSTAT",
-            0x0c, regvalue, cur_col, wrap));
-}
-int
-ahd_swtimer_print(u_int regvalue, u_int *cur_col, u_int wrap)
-{
-        return (ahd_print_register(NULL, 0, "SWTIMER",
-            0x0e, regvalue, cur_col, wrap));
-}
-int
-ahd_snscb_qoff_print(u_int regvalue, u_int *cur_col, u_int wrap)
-{
-        return (ahd_print_register(NULL, 0, "SNSCB_QOFF",
-            0x10, regvalue, cur_col, wrap));
-}
-int
-ahd_sescb_qoff_print(u_int regvalue, u_int *cur_col, u_int wrap)
-{
-        return (ahd_print_register(NULL, 0, "SESCB_QOFF",
-            0x12, regvalue, cur_col, wrap));
-}
-int
-ahd_sdscb_qoff_print(u_int regvalue, u_int *cur_col, u_int wrap)
-{
-        return (ahd_print_register(NULL, 0, "SDSCB_QOFF",
-            0x14, regvalue, cur_col, wrap));
-}
-static const ahd_reg_parse_entry_t QOFF_CTLSTA_parse_table[] = {
-        { "SCB_QSIZE_4",        0x00, 0x0f },
-        { "SCB_QSIZE_8",        0x01, 0x0f },
-        { "SCB_QSIZE_16",       0x02, 0x0f },
-        { "SCB_QSIZE_32",       0x03, 0x0f },
-        { "SCB_QSIZE_64",       0x04, 0x0f },
-        { "SCB_QSIZE_128",      0x05, 0x0f },
-        { "SCB_QSIZE_256",      0x06, 0x0f },
-        { "SCB_QSIZE_512",      0x07, 0x0f },
-        { "SCB_QSIZE_1024",     0x08, 0x0f },
-        { "SCB_QSIZE_2048",     0x09, 0x0f },
-        { "SCB_QSIZE_4096",     0x0a, 0x0f },
-        { "SCB_QSIZE_8192",     0x0b, 0x0f },
-        { "SCB_QSIZE_16384",    0x0c, 0x0f },
-        { "SCB_QSIZE",          0x0f, 0x0f },
-        { "HS_MAILBOX_ACT",     0x10, 0x10 },
-        { "SDSCB_ROLLOVR",      0x20, 0x20 },
-        { "NEW_SCB_AVAIL",      0x40, 0x40 },
-        { "EMPTY_SCB_AVAIL",    0x80, 0x80 }
-};
-int
-ahd_qoff_ctlsta_print(u_int regvalue, u_int *cur_col, u_int wrap)
-{
-        return (ahd_print_register(QOFF_CTLSTA_parse_table, 18, "QOFF_CTLSTA",
-            0x16, regvalue, cur_col, wrap));
-}
 static const ahd_reg_parse_entry_t INTCTL_parse_table[] = {
        { "SPLTINTEN",          0x01, 0x01 },
        { "SEQINTEN",           0x02, 0x02 },
@@ -280,22 +93,6 @@ ahd_dfcntrl_print(u_int regvalue, u_int *cur_col, u_int wrap)
            0x19, regvalue, cur_col, wrap));
 }
-static const ahd_reg_parse_entry_t DSCOMMAND0_parse_table[] = {
-        { "CIOPARCKEN",         0x01, 0x01 },
-        { "DISABLE_TWATE",      0x02, 0x02 },
-        { "EXTREQLCK",          0x10, 0x10 },
-        { "MPARCKEN",           0x20, 0x20 },
-        { "DPARCKEN",           0x40, 0x40 },
-        { "CACHETHEN",          0x80, 0x80 }
-};
-int
-ahd_dscommand0_print(u_int regvalue, u_int *cur_col, u_int wrap)
-{
-        return (ahd_print_register(DSCOMMAND0_parse_table, 6, "DSCOMMAND0",
-            0x19, regvalue, cur_col, wrap));
-}
 static const ahd_reg_parse_entry_t DFSTATUS_parse_table[] = {
        { "FIFOEMP",            0x01, 0x01 },
        { "FIFOFULL",           0x02, 0x02 },
@@ -327,146 +124,6 @@ ahd_sg_cache_shadow_print(u_int regvalue, u_int *cur_col, u_int wrap)
            0x1b, regvalue, cur_col, wrap));
 }
-static const ahd_reg_parse_entry_t SG_CACHE_PRE_parse_table[] = {
-        { "LAST_SEG",           0x02, 0x02 },
-        { "ODD_SEG",            0x04, 0x04 },
-        { "SG_ADDR_MASK",       0xf8, 0xf8 }
-};
-int
-ahd_sg_cache_pre_print(u_int regvalue, u_int *cur_col, u_int wrap)
-{
-        return (ahd_print_register(SG_CACHE_PRE_parse_table, 3, "SG_CACHE_PRE",
-            0x1b, regvalue, cur_col, wrap));
-}
-int
-ahd_lqin_print(u_int regvalue, u_int *cur_col, u_int wrap)
-{
-        return (ahd_print_register(NULL, 0, "LQIN",
-            0x20, regvalue, cur_col, wrap));
-}
-int
-ahd_lunptr_print(u_int regvalue, u_int *cur_col, u_int wrap)
-{
-        return (ahd_print_register(NULL, 0, "LUNPTR",
-            0x22, regvalue, cur_col, wrap));
-}
-int
-ahd_cmdlenptr_print(u_int regvalue, u_int *cur_col, u_int wrap)
-{
-        return (ahd_print_register(NULL, 0, "CMDLENPTR",
-            0x25, regvalue, cur_col, wrap));
-}
-int
-ahd_attrptr_print(u_int regvalue, u_int *cur_col, u_int wrap)
-{
-        return (ahd_print_register(NULL, 0, "ATTRPTR",
-            0x26, regvalue, cur_col, wrap));
-}
-int
-ahd_flagptr_print(u_int regvalue, u_int *cur_col, u_int wrap)
-{
-        return (ahd_print_register(NULL, 0, "FLAGPTR",
-            0x27, regvalue, cur_col, wrap));
-}
-int
-ahd_cmdptr_print(u_int regvalue, u_int *cur_col, u_int wrap)
-{
-        return (ahd_print_register(NULL, 0, "CMDPTR",
-            0x28, regvalue, cur_col, wrap));
-}
-int
-ahd_qnextptr_print(u_int regvalue, u_int *cur_col, u_int wrap)
-{
-        return (ahd_print_register(NULL, 0, "QNEXTPTR",
-            0x29, regvalue, cur_col, wrap));
-}
-int
-ahd_abrtbyteptr_print(u_int regvalue, u_int *cur_col, u_int wrap)
-{
-        return (ahd_print_register(NULL, 0, "ABRTBYTEPTR",
-            0x2b, regvalue, cur_col, wrap));
-}
-int
-ahd_abrtbitptr_print(u_int regvalue, u_int *cur_col, u_int wrap)
-{
-        return (ahd_print_register(NULL, 0, "ABRTBITPTR",
-            0x2c, regvalue, cur_col, wrap));
-}
-static const ahd_reg_parse_entry_t LUNLEN_parse_table[] = {
-        { "ILUNLEN",            0x0f, 0x0f },
-        { "TLUNLEN",            0xf0, 0xf0 }
-};
-int
-ahd_lunlen_print(u_int regvalue, u_int *cur_col, u_int wrap)
-{
-        return (ahd_print_register(LUNLEN_parse_table, 2, "LUNLEN",
-            0x30, regvalue, cur_col, wrap));
-}
-int
-ahd_cdblimit_print(u_int regvalue, u_int *cur_col, u_int wrap)
-{
-        return (ahd_print_register(NULL, 0, "CDBLIMIT",
-            0x31, regvalue, cur_col, wrap));
-}
-int
-ahd_maxcmd_print(u_int regvalue, u_int *cur_col, u_int wrap)
-{
-        return (ahd_print_register(NULL, 0, "MAXCMD",
-            0x32, regvalue, cur_col, wrap));
-}
-int
-ahd_maxcmdcnt_print(u_int regvalue, u_int *cur_col, u_int wrap)
-{
-        return (ahd_print_register(NULL, 0, "MAXCMDCNT",
-            0x33, regvalue, cur_col, wrap));
-}
-static const ahd_reg_parse_entry_t LQCTL1_parse_table[] = {
-        { "ABORTPENDING",       0x01, 0x01 },
-        { "SINGLECMD",          0x02, 0x02 },
-        { "PCI2PCI",            0x04, 0x04 }
-};
-int
-ahd_lqctl1_print(u_int regvalue, u_int *cur_col, u_int wrap)
-{
-        return (ahd_print_register(LQCTL1_parse_table, 3, "LQCTL1",
-            0x38, regvalue, cur_col, wrap));
-}
-static const ahd_reg_parse_entry_t LQCTL2_parse_table[] = {
-        { "LQOPAUSE",           0x01, 0x01 },
-        { "LQOTOIDLE",          0x02, 0x02 },
-        { "LQOCONTINUE",        0x04, 0x04 },
-        { "LQORETRY",           0x08, 0x08 },
-        { "LQIPAUSE",           0x10, 0x10 },
-        { "LQITOIDLE",          0x20, 0x20 },
-        { "LQICONTINUE",        0x40, 0x40 },
-        { "LQIRETRY",           0x80, 0x80 }
-};
-int
-ahd_lqctl2_print(u_int regvalue, u_int *cur_col, u_int wrap)
-{
-        return (ahd_print_register(LQCTL2_parse_table, 8, "LQCTL2",
-            0x39, regvalue, cur_col, wrap));
-}
 static const ahd_reg_parse_entry_t SCSISEQ0_parse_table[] = {
        { "SCSIRSTO",           0x01, 0x01 },
        { "FORCEBUSFREE",       0x10, 0x10 },
@@ -498,37 +155,6 @@ ahd_scsiseq1_print(u_int regvalue, u_int *cur_col, u_int wrap)
            0x3b, regvalue, cur_col, wrap));
 }
-static const ahd_reg_parse_entry_t SXFRCTL0_parse_table[] = {
-        { "SPIOEN",             0x08, 0x08 },
-        { "BIOSCANCELEN",       0x10, 0x10 },
-        { "DFPEXP",             0x40, 0x40 },
-        { "DFON",               0x80, 0x80 }
-};
-int
-ahd_sxfrctl0_print(u_int regvalue, u_int *cur_col, u_int wrap)
-{
-        return (ahd_print_register(SXFRCTL0_parse_table, 4, "SXFRCTL0",
-            0x3c, regvalue, cur_col, wrap));
-}
-static const ahd_reg_parse_entry_t SXFRCTL1_parse_table[] = {
-        { "STPWEN",             0x01, 0x01 },
-        { "ACTNEGEN",           0x02, 0x02 },
-        { "ENSTIMER",           0x04, 0x04 },
-        { "STIMESEL",           0x18, 0x18 },
-        { "ENSPCHK",            0x20, 0x20 },
-        { "ENSACHK",            0x40, 0x40 },
-        { "BITBUCKET",          0x80, 0x80 }
-};
-int
-ahd_sxfrctl1_print(u_int regvalue, u_int *cur_col, u_int wrap)
-{
-        return (ahd_print_register(SXFRCTL1_parse_table, 7, "SXFRCTL1",
-            0x3d, regvalue, cur_col, wrap));
-}
 static const ahd_reg_parse_entry_t DFFSTAT_parse_table[] = {
        { "CURRFIFO_0",         0x00, 0x03 },
        { "CURRFIFO_1",         0x01, 0x03 },
@@ -545,40 +171,6 @@ ahd_dffstat_print(u_int regvalue, u_int *cur_col, u_int wrap)
            0x3f, regvalue, cur_col, wrap));
 }
-int
-ahd_multargid_print(u_int regvalue, u_int *cur_col, u_int wrap)
-{
-        return (ahd_print_register(NULL, 0, "MULTARGID",
-            0x40, regvalue, cur_col, wrap));
-}
-static const ahd_reg_parse_entry_t SCSISIGO_parse_table[] = {
-        { "P_DATAOUT",          0x00, 0xe0 },
-        { "P_DATAOUT_DT",       0x20, 0xe0 },
-        { "P_DATAIN",           0x40, 0xe0 },
-        { "P_DATAIN_DT",        0x60, 0xe0 },
-        { "P_COMMAND",          0x80, 0xe0 },
-        { "P_MESGOUT",          0xa0, 0xe0 },
-        { "P_STATUS",           0xc0, 0xe0 },
-        { "P_MESGIN",           0xe0, 0xe0 },
-        { "ACKO",               0x01, 0x01 },
-        { "REQO",               0x02, 0x02 },
-        { "BSYO",               0x04, 0x04 },
-        { "SELO",               0x08, 0x08 },
-        { "ATNO",               0x10, 0x10 },
-        { "MSGO",               0x20, 0x20 },
-        { "IOO",                0x40, 0x40 },
-        { "CDO",                0x80, 0x80 },
-        { "PHASE_MASK",         0xe0, 0xe0 }
-};
-int
-ahd_scsisigo_print(u_int regvalue, u_int *cur_col, u_int wrap)
-{
-        return (ahd_print_register(SCSISIGO_parse_table, 17, "SCSISIGO",
-            0x40, regvalue, cur_col, wrap));
-}
 static const ahd_reg_parse_entry_t SCSISIGI_parse_table[] = {
        { "P_DATAOUT",          0x00, 0xe0 },
        { "P_DATAOUT_DT",       0x20, 0xe0 },
@@ -624,31 +216,12 @@ ahd_scsiphase_print(u_int regvalue, u_int *cur_col, u_int wrap)
 }
 int
-ahd_scsidat_print(u_int regvalue, u_int *cur_col, u_int wrap)
-{
-        return (ahd_print_register(NULL, 0, "SCSIDAT",
-            0x44, regvalue, cur_col, wrap));
-}
-int
 ahd_scsibus_print(u_int regvalue, u_int *cur_col, u_int wrap)
 {
        return (ahd_print_register(NULL, 0, "SCSIBUS",
            0x46, regvalue, cur_col, wrap));
 }
-static const ahd_reg_parse_entry_t TARGIDIN_parse_table[] = {
-        { "TARGID",             0x0f, 0x0f },
-        { "CLKOUT",             0x80, 0x80 }
-};
-int
-ahd_targidin_print(u_int regvalue, u_int *cur_col, u_int wrap)
-{
-        return (ahd_print_register(TARGIDIN_parse_table, 2, "TARGIDIN",
-            0x48, regvalue, cur_col, wrap));
-}
 static const ahd_reg_parse_entry_t SELID_parse_table[] = {
        { "ONEBIT",             0x08, 0x08 },
        { "SELID_MASK",         0xf0, 0xf0 }
@@ -661,38 +234,6 @@ ahd_selid_print(u_int regvalue, u_int *cur_col, u_int wrap)
            0x49, regvalue, cur_col, wrap));
 }
-static const ahd_reg_parse_entry_t OPTIONMODE_parse_table[] = {
-        { "AUTO_MSGOUT_DE",     0x02, 0x02 },
-        { "ENDGFORMCHK",        0x04, 0x04 },
-        { "BUSFREEREV",         0x10, 0x10 },
-        { "BIASCANCTL",         0x20, 0x20 },
-        { "AUTOACKEN",          0x40, 0x40 },
-        { "BIOSCANCTL",         0x80, 0x80 },
-        { "OPTIONMODE_DEFAULTS",0x02, 0x02 }
-};
-int
-ahd_optionmode_print(u_int regvalue, u_int *cur_col, u_int wrap)
-{
-        return (ahd_print_register(OPTIONMODE_parse_table, 7, "OPTIONMODE",
-            0x4a, regvalue, cur_col, wrap));
-}
-static const ahd_reg_parse_entry_t SBLKCTL_parse_table[] = {
-        { "SELWIDE",            0x02, 0x02 },
-        { "ENAB20",             0x04, 0x04 },
-        { "ENAB40",             0x08, 0x08 },
-        { "DIAGLEDON",          0x40, 0x40 },
-        { "DIAGLEDEN",          0x80, 0x80 }
-};
-int
-ahd_sblkctl_print(u_int regvalue, u_int *cur_col, u_int wrap)
-{
-        return (ahd_print_register(SBLKCTL_parse_table, 5, "SBLKCTL",
-            0x4a, regvalue, cur_col, wrap));
-}
 static const ahd_reg_parse_entry_t SSTAT0_parse_table[] = {
        { "ARBDO",              0x01, 0x01 },
        { "SPIORDY",            0x02, 0x02 },
@@ -728,23 +269,6 @@ ahd_simode0_print(u_int regvalue, u_int *cur_col, u_int wrap)
            0x4b, regvalue, cur_col, wrap));
 }
-static const ahd_reg_parse_entry_t CLRSINT0_parse_table[] = {
-        { "CLRARBDO",           0x01, 0x01 },
-        { "CLRSPIORDY",         0x02, 0x02 },
-        { "CLROVERRUN",         0x04, 0x04 },
-        { "CLRIOERR",           0x08, 0x08 },
-        { "CLRSELINGO",         0x10, 0x10 },
-        { "CLRSELDI",           0x20, 0x20 },
-        { "CLRSELDO",           0x40, 0x40 }
-};
-int
-ahd_clrsint0_print(u_int regvalue, u_int *cur_col, u_int wrap)
-{
-        return (ahd_print_register(CLRSINT0_parse_table, 7, "CLRSINT0",
-            0x4b, regvalue, cur_col, wrap));
-}
 static const ahd_reg_parse_entry_t SSTAT1_parse_table[] = {
        { "REQINIT",            0x01, 0x01 },
        { "STRB2FAST",          0x02, 0x02 },
@@ -763,23 +287,6 @@ ahd_sstat1_print(u_int regvalue, u_int *cur_col, u_int wrap)
            0x4c, regvalue, cur_col, wrap));
 }
-static const ahd_reg_parse_entry_t CLRSINT1_parse_table[] = {
-        { "CLRREQINIT",         0x01, 0x01 },
-        { "CLRSTRB2FAST",       0x02, 0x02 },
-        { "CLRSCSIPERR",        0x04, 0x04 },
-        { "CLRBUSFREE",         0x08, 0x08 },
-        { "CLRSCSIRSTI",        0x20, 0x20 },
-        { "CLRATNO",            0x40, 0x40 },
-        { "CLRSELTIMEO",        0x80, 0x80 }
-};
-int
-ahd_clrsint1_print(u_int regvalue, u_int *cur_col, u_int wrap)
-{
-        return (ahd_print_register(CLRSINT1_parse_table, 7, "CLRSINT1",
-            0x4c, regvalue, cur_col, wrap));
-}
 static const ahd_reg_parse_entry_t SSTAT2_parse_table[] = {
        { "BUSFREE_LQO",        0x40, 0xc0 },
        { "BUSFREE_DFF0",       0x80, 0xc0 },
@@ -800,20 +307,6 @@ ahd_sstat2_print(u_int regvalue, u_int *cur_col, u_int wrap)
            0x4d, regvalue, cur_col, wrap));
 }
-static const ahd_reg_parse_entry_t CLRSINT2_parse_table[] = {
-        { "CLRDMADONE",         0x01, 0x01 },
-        { "CLRSDONE",           0x02, 0x02 },
-        { "CLRWIDE_RES",        0x04, 0x04 },
-        { "CLRNONPACKREQ",      0x20, 0x20 }
-};
-int
-ahd_clrsint2_print(u_int regvalue, u_int *cur_col, u_int wrap)
-{
-        return (ahd_print_register(CLRSINT2_parse_table, 4, "CLRSINT2",
-            0x4d, regvalue, cur_col, wrap));
-}
 static const ahd_reg_parse_entry_t PERRDIAG_parse_table[] = {
        { "DTERR",              0x01, 0x01 },
        { "DGFORMERR",          0x02, 0x02 },
@@ -833,26 +326,12 @@ ahd_perrdiag_print(u_int regvalue, u_int *cur_col, u_int wrap)
 }
 int
-ahd_lqistate_print(u_int regvalue, u_int *cur_col, u_int wrap)
-{
-        return (ahd_print_register(NULL, 0, "LQISTATE",
-            0x4e, regvalue, cur_col, wrap));
-}
-int
 ahd_soffcnt_print(u_int regvalue, u_int *cur_col, u_int wrap)
 {
        return (ahd_print_register(NULL, 0, "SOFFCNT",
            0x4f, regvalue, cur_col, wrap));
 }
-int
-ahd_lqostate_print(u_int regvalue, u_int *cur_col, u_int wrap)
-{
-        return (ahd_print_register(NULL, 0, "LQOSTATE",
-            0x4f, regvalue, cur_col, wrap));
-}
 static const ahd_reg_parse_entry_t LQISTAT0_parse_table[] = {
        { "LQIATNCMD",          0x01, 0x01 },
        { "LQIATNLQ",           0x02, 0x02 },
@@ -869,56 +348,6 @@ ahd_lqistat0_print(u_int regvalue, u_int *cur_col, u_int wrap)
            0x50, regvalue, cur_col, wrap));
 }
-static const ahd_reg_parse_entry_t LQIMODE0_parse_table[] = {
-        { "ENLQIATNCMD",        0x01, 0x01 },
-        { "ENLQIATNLQ",         0x02, 0x02 },
-        { "ENLQIBADLQT",        0x04, 0x04 },
-        { "ENLQICRCT2",         0x08, 0x08 },
-        { "ENLQICRCT1",         0x10, 0x10 },
-        { "ENLQIATNQASK",       0x20, 0x20 }
-};
-int
-ahd_lqimode0_print(u_int regvalue, u_int *cur_col, u_int wrap)
-{
-        return (ahd_print_register(LQIMODE0_parse_table, 6, "LQIMODE0",
-            0x50, regvalue, cur_col, wrap));
-}
-static const ahd_reg_parse_entry_t CLRLQIINT0_parse_table[] = {
-        { "CLRLQIATNCMD",       0x01, 0x01 },
-        { "CLRLQIATNLQ",        0x02, 0x02 },
-        { "CLRLQIBADLQT",       0x04, 0x04 },
-        { "CLRLQICRCT2",        0x08, 0x08 },
-        { "CLRLQICRCT1",        0x10, 0x10 },
-        { "CLRLQIATNQAS",       0x20, 0x20 }
-};
-int
-ahd_clrlqiint0_print(u_int regvalue, u_int *cur_col, u_int wrap)
-{
-        return (ahd_print_register(CLRLQIINT0_parse_table, 6, "CLRLQIINT0",
-            0x50, regvalue, cur_col, wrap));
-}
-static const ahd_reg_parse_entry_t LQIMODE1_parse_table[] = {
-        { "ENLQIOVERI_NLQ",     0x01, 0x01 },
-        { "ENLQIOVERI_LQ",      0x02, 0x02 },
-        { "ENLQIBADLQI",        0x04, 0x04 },
-        { "ENLQICRCI_NLQ",      0x08, 0x08 },
-        { "ENLQICRCI_LQ",       0x10, 0x10 },
-        { "ENLIQABORT",         0x20, 0x20 },
-        { "ENLQIPHASE_NLQ",     0x40, 0x40 },
-        { "ENLQIPHASE_LQ",      0x80, 0x80 }
-};
-int
-ahd_lqimode1_print(u_int regvalue, u_int *cur_col, u_int wrap)
-{
-        return (ahd_print_register(LQIMODE1_parse_table, 8, "LQIMODE1",
-            0x51, regvalue, cur_col, wrap));
-}
 static const ahd_reg_parse_entry_t LQISTAT1_parse_table[] = {
        { "LQIOVERI_NLQ",       0x01, 0x01 },
        { "LQIOVERI_LQ",        0x02, 0x02 },
@@ -937,24 +366,6 @@ ahd_lqistat1_print(u_int regvalue, u_int *cur_col, u_int wrap)
            0x51, regvalue, cur_col, wrap));
 }
-static const ahd_reg_parse_entry_t CLRLQIINT1_parse_table[] = {
-        { "CLRLQIOVERI_NLQ",    0x01, 0x01 },
-        { "CLRLQIOVERI_LQ",     0x02, 0x02 },
-        { "CLRLQIBADLQI",       0x04, 0x04 },
-        { "CLRLQICRCI_NLQ",     0x08, 0x08 },
-        { "CLRLQICRCI_LQ",      0x10, 0x10 },
-        { "CLRLIQABORT",        0x20, 0x20 },
-        { "CLRLQIPHASE_NLQ",    0x40, 0x40 },
-        { "CLRLQIPHASE_LQ",     0x80, 0x80 }
-};
-int
-ahd_clrlqiint1_print(u_int regvalue, u_int *cur_col, u_int wrap)
-{
-        return (ahd_print_register(CLRLQIINT1_parse_table, 8, "CLRLQIINT1",
-            0x51, regvalue, cur_col, wrap));
-}
 static const ahd_reg_parse_entry_t LQISTAT2_parse_table[] = {
        { "LQIGSAVAIL",         0x01, 0x01 },
        { "LQISTOPCMD",         0x02, 0x02 },
@@ -985,30 +396,6 @@ ahd_sstat3_print(u_int regvalue, u_int *cur_col, u_int wrap)
            0x53, regvalue, cur_col, wrap));
 }
-static const ahd_reg_parse_entry_t SIMODE3_parse_table[] = {
-        { "ENOSRAMPERR",        0x01, 0x01 },
-        { "ENNTRAMPERR",        0x02, 0x02 }
-};
-int
-ahd_simode3_print(u_int regvalue, u_int *cur_col, u_int wrap)
-{
-        return (ahd_print_register(SIMODE3_parse_table, 2, "SIMODE3",
-            0x53, regvalue, cur_col, wrap));
-}
-static const ahd_reg_parse_entry_t CLRSINT3_parse_table[] = {
-        { "CLROSRAMPERR",       0x01, 0x01 },
-        { "CLRNTRAMPERR",       0x02, 0x02 }
-};
-int
-ahd_clrsint3_print(u_int regvalue, u_int *cur_col, u_int wrap)
-{
-        return (ahd_print_register(CLRSINT3_parse_table, 2, "CLRSINT3",
-            0x53, regvalue, cur_col, wrap));
-}
 static const ahd_reg_parse_entry_t LQOSTAT0_parse_table[] = {
        { "LQOTCRC",            0x01, 0x01 },
        { "LQOATNPKT",          0x02, 0x02 },
@@ -1024,51 +411,6 @@ ahd_lqostat0_print(u_int regvalue, u_int *cur_col, u_int wrap)
            0x54, regvalue, cur_col, wrap));
 }
-static const ahd_reg_parse_entry_t CLRLQOINT0_parse_table[] = {
-        { "CLRLQOTCRC",         0x01, 0x01 },
-        { "CLRLQOATNPKT",       0x02, 0x02 },
-        { "CLRLQOATNLQ",        0x04, 0x04 },
-        { "CLRLQOSTOPT2",       0x08, 0x08 },
-        { "CLRLQOTARGSCBPERR",  0x10, 0x10 }
-};
-int
-ahd_clrlqoint0_print(u_int regvalue, u_int *cur_col, u_int wrap)
-{
-        return (ahd_print_register(CLRLQOINT0_parse_table, 5, "CLRLQOINT0",
-            0x54, regvalue, cur_col, wrap));
-}
-static const ahd_reg_parse_entry_t LQOMODE0_parse_table[] = {
-        { "ENLQOTCRC",          0x01, 0x01 },
-        { "ENLQOATNPKT",        0x02, 0x02 },
-        { "ENLQOATNLQ",         0x04, 0x04 },
-        { "ENLQOSTOPT2",        0x08, 0x08 },
-        { "ENLQOTARGSCBPERR",   0x10, 0x10 }
-};
-int
-ahd_lqomode0_print(u_int regvalue, u_int *cur_col, u_int wrap)
-{
-        return (ahd_print_register(LQOMODE0_parse_table, 5, "LQOMODE0",
-            0x54, regvalue, cur_col, wrap));
-}
-static const ahd_reg_parse_entry_t LQOMODE1_parse_table[] = {
-        { "ENLQOPHACHGINPKT",   0x01, 0x01 },
-        { "ENLQOBUSFREE",       0x02, 0x02 },
-        { "ENLQOBADQAS",        0x04, 0x04 },
-        { "ENLQOSTOPI2",        0x08, 0x08 },
-        { "ENLQOINITSCBPERR",   0x10, 0x10 }
-};
-int
-ahd_lqomode1_print(u_int regvalue, u_int *cur_col, u_int wrap)
-{
-        return (ahd_print_register(LQOMODE1_parse_table, 5, "LQOMODE1",
-            0x55, regvalue, cur_col, wrap));
-}
 static const ahd_reg_parse_entry_t LQOSTAT1_parse_table[] = {
        { "LQOPHACHGINPKT",     0x01, 0x01 },
        { "LQOBUSFREE",         0x02, 0x02 },
@@ -1084,21 +426,6 @@ ahd_lqostat1_print(u_int regvalue, u_int *cur_col, u_int wrap)
            0x55, regvalue, cur_col, wrap));
 }
-static const ahd_reg_parse_entry_t CLRLQOINT1_parse_table[] = {
-        { "CLRLQOPHACHGINPKT",  0x01, 0x01 },
-        { "CLRLQOBUSFREE",      0x02, 0x02 },
-        { "CLRLQOBADQAS",       0x04, 0x04 },
-        { "CLRLQOSTOPI2",       0x08, 0x08 },
-        { "CLRLQOINITSCBPERR",  0x10, 0x10 }
-};
-int
-ahd_clrlqoint1_print(u_int regvalue, u_int *cur_col, u_int wrap)
-{
-        return (ahd_print_register(CLRLQOINT1_parse_table, 5, "CLRLQOINT1",
-            0x55, regvalue, cur_col, wrap));
-}
 static const ahd_reg_parse_entry_t LQOSTAT2_parse_table[] = {
        { "LQOSTOP0",           0x01, 0x01 },
        { "LQOPHACHGOUTPKT",    0x02, 0x02 },
@@ -1113,13 +440,6 @@ ahd_lqostat2_print(u_int regvalue, u_int *cur_col, u_int wrap)
            0x56, regvalue, cur_col, wrap));
 }
-int
-ahd_os_space_cnt_print(u_int regvalue, u_int *cur_col, u_int wrap)
-{
-        return (ahd_print_register(NULL, 0, "OS_SPACE_CNT",
-            0x56, regvalue, cur_col, wrap));
-}
 static const ahd_reg_parse_entry_t SIMODE1_parse_table[] = {
        { "ENREQINIT",          0x01, 0x01 },
        { "ENSTRB2FAST",        0x02, 0x02 },
@@ -1138,13 +458,6 @@ ahd_simode1_print(u_int regvalue, u_int *cur_col, u_int wrap)
            0x57, regvalue, cur_col, wrap));
 }
-int
-ahd_gsfifo_print(u_int regvalue, u_int *cur_col, u_int wrap)
-{
-        return (ahd_print_register(NULL, 0, "GSFIFO",
-            0x58, regvalue, cur_col, wrap));
-}
 static const ahd_reg_parse_entry_t DFFSXFRCTL_parse_table[] = {
        { "RSTCHN",             0x01, 0x01 },
        { "CLRCHN",             0x02, 0x02 },
@@ -1159,44 +472,6 @@ ahd_dffsxfrctl_print(u_int regvalue, u_int *cur_col, u_int wrap)
            0x5a, regvalue, cur_col, wrap));
 }
-static const ahd_reg_parse_entry_t LQOSCSCTL_parse_table[] = {
-        { "LQONOCHKOVER",       0x01, 0x01 },
-        { "LQONOHOLDLACK",      0x02, 0x02 },
-        { "LQOBUSETDLY",        0x40, 0x40 },
-        { "LQOH2A_VERSION",     0x80, 0x80 }
-};
-int
-ahd_lqoscsctl_print(u_int regvalue, u_int *cur_col, u_int wrap)
-{
-        return (ahd_print_register(LQOSCSCTL_parse_table, 4, "LQOSCSCTL",
-            0x5a, regvalue, cur_col, wrap));
-}
-int
-ahd_nextscb_print(u_int regvalue, u_int *cur_col, u_int wrap)
-{
-        return (ahd_print_register(NULL, 0, "NEXTSCB",
-            0x5a, regvalue, cur_col, wrap));
-}
-static const ahd_reg_parse_entry_t CLRSEQINTSRC_parse_table[] = {
-        { "CLRCFG4TCMD",        0x01, 0x01 },
-        { "CLRCFG4ICMD",        0x02, 0x02 },
-        { "CLRCFG4TSTAT",       0x04, 0x04 },
-        { "CLRCFG4ISTAT",       0x08, 0x08 },
-        { "CLRCFG4DATA",        0x10, 0x10 },
-        { "CLRSAVEPTRS",        0x20, 0x20 },
-        { "CLRCTXTDONE",        0x40, 0x40 }
-};
-int
-ahd_clrseqintsrc_print(u_int regvalue, u_int *cur_col, u_int wrap)
-{
-        return (ahd_print_register(CLRSEQINTSRC_parse_table, 7, "CLRSEQINTSRC",
-            0x5b, regvalue, cur_col, wrap));
-}
 static const ahd_reg_parse_entry_t SEQINTSRC_parse_table[] = {
        { "CFG4TCMD",           0x01, 0x01 },
        { "CFG4ICMD",           0x02, 0x02 },
@@ -1231,13 +506,6 @@ ahd_seqimode_print(u_int regvalue, u_int *cur_col, u_int wrap)
            0x5c, regvalue, cur_col, wrap));
 }
-int
-ahd_currscb_print(u_int regvalue, u_int *cur_col, u_int wrap)
-{
-        return (ahd_print_register(NULL, 0, "CURRSCB",
-            0x5c, regvalue, cur_col, wrap));
-}
 static const ahd_reg_parse_entry_t MDFFSTAT_parse_table[] = {
        { "FIFOFREE",           0x01, 0x01 },
        { "DATAINFIFO",         0x02, 0x02 },
@@ -1256,308 +524,12 @@ ahd_mdffstat_print(u_int regvalue, u_int *cur_col, u_int wrap)
 }
 int
-ahd_lastscb_print(u_int regvalue, u_int *cur_col, u_int wrap)
-{
-        return (ahd_print_register(NULL, 0, "LASTSCB",
-            0x5e, regvalue, cur_col, wrap));
-}
-int
-ahd_shaddr_print(u_int regvalue, u_int *cur_col, u_int wrap)
-{
-        return (ahd_print_register(NULL, 0, "SHADDR",
-            0x60, regvalue, cur_col, wrap));
-}
-int
-ahd_negoaddr_print(u_int regvalue, u_int *cur_col, u_int wrap)
-{
-        return (ahd_print_register(NULL, 0, "NEGOADDR",
-            0x60, regvalue, cur_col, wrap));
-}
-int
-ahd_negperiod_print(u_int regvalue, u_int *cur_col, u_int wrap)
-{
-        return (ahd_print_register(NULL, 0, "NEGPERIOD",
-            0x61, regvalue, cur_col, wrap));
-}
-int
-ahd_negoffset_print(u_int regvalue, u_int *cur_col, u_int wrap)
-{
-        return (ahd_print_register(NULL, 0, "NEGOFFSET",
-            0x62, regvalue, cur_col, wrap));
-}
-static const ahd_reg_parse_entry_t NEGPPROPTS_parse_table[] = {
-        { "PPROPT_IUT",         0x01, 0x01 },
-        { "PPROPT_DT",          0x02, 0x02 },
-        { "PPROPT_QAS",         0x04, 0x04 },
-        { "PPROPT_PACE",        0x08, 0x08 }
-};
-int
-ahd_negppropts_print(u_int regvalue, u_int *cur_col, u_int wrap)
-{
-        return (ahd_print_register(NEGPPROPTS_parse_table, 4, "NEGPPROPTS",
-            0x63, regvalue, cur_col, wrap));
-}
-static const ahd_reg_parse_entry_t NEGCONOPTS_parse_table[] = {
-        { "WIDEXFER",           0x01, 0x01 },
-        { "ENAUTOATNO",         0x02, 0x02 },
-        { "ENAUTOATNI",         0x04, 0x04 },
-        { "ENSLOWCRC",          0x08, 0x08 },
-        { "RTI_OVRDTRN",        0x10, 0x10 },
-        { "RTI_WRTDIS",         0x20, 0x20 },
-        { "ENSNAPSHOT",         0x40, 0x40 }
-};
-int
-ahd_negconopts_print(u_int regvalue, u_int *cur_col, u_int wrap)
-{
-        return (ahd_print_register(NEGCONOPTS_parse_table, 7, "NEGCONOPTS",
-            0x64, regvalue, cur_col, wrap));
-}
-int
-ahd_annexcol_print(u_int regvalue, u_int *cur_col, u_int wrap)
-{
-        return (ahd_print_register(NULL, 0, "ANNEXCOL",
-            0x65, regvalue, cur_col, wrap));
-}
-int
-ahd_annexdat_print(u_int regvalue, u_int *cur_col, u_int wrap)
-{
-        return (ahd_print_register(NULL, 0, "ANNEXDAT",
-            0x66, regvalue, cur_col, wrap));
-}
-static const ahd_reg_parse_entry_t SCSCHKN_parse_table[] = {
-        { "LSTSGCLRDIS",        0x01, 0x01 },
-        { "SHVALIDSTDIS",       0x02, 0x02 },
-        { "DFFACTCLR",          0x04, 0x04 },
-        { "SDONEMSKDIS",        0x08, 0x08 },
-        { "WIDERESEN",          0x10, 0x10 },
-        { "CURRFIFODEF",        0x20, 0x20 },
-        { "STSELSKIDDIS",       0x40, 0x40 },
-        { "BIDICHKDIS",         0x80, 0x80 }
-};
-int
-ahd_scschkn_print(u_int regvalue, u_int *cur_col, u_int wrap)
-{
-        return (ahd_print_register(SCSCHKN_parse_table, 8, "SCSCHKN",
-            0x66, regvalue, cur_col, wrap));
-}
-int
-ahd_iownid_print(u_int regvalue, u_int *cur_col, u_int wrap)
-{
-        return (ahd_print_register(NULL, 0, "IOWNID",
-            0x67, regvalue, cur_col, wrap));
-}
-int
-ahd_shcnt_print(u_int regvalue, u_int *cur_col, u_int wrap)
-{
-        return (ahd_print_register(NULL, 0, "SHCNT",
-            0x68, regvalue, cur_col, wrap));
-}
-int
-ahd_townid_print(u_int regvalue, u_int *cur_col, u_int wrap)
-{
-        return (ahd_print_register(NULL, 0, "TOWNID",
-            0x69, regvalue, cur_col, wrap));
-}
-int
 ahd_seloid_print(u_int regvalue, u_int *cur_col, u_int wrap)
 {
        return (ahd_print_register(NULL, 0, "SELOID",
            0x6b, regvalue, cur_col, wrap));
 }
-int
-ahd_haddr_print(u_int regvalue, u_int *cur_col, u_int wrap)
-{
-        return (ahd_print_register(NULL, 0, "HADDR",
-            0x70, regvalue, cur_col, wrap));
-}
-int
-ahd_hcnt_print(u_int regvalue, u_int *cur_col, u_int wrap)
-{
-        return (ahd_print_register(NULL, 0, "HCNT",
-            0x78, regvalue, cur_col, wrap));
-}
-int
-ahd_sghaddr_print(u_int regvalue, u_int *cur_col, u_int wrap)
-{
-        return (ahd_print_register(NULL, 0, "SGHADDR",
-            0x7c, regvalue, cur_col, wrap));
-}
-int
-ahd_scbhaddr_print(u_int regvalue, u_int *cur_col, u_int wrap)
-{
-        return (ahd_print_register(NULL, 0, "SCBHADDR",
-            0x7c, regvalue, cur_col, wrap));
-}
-int
-ahd_sghcnt_print(u_int regvalue, u_int *cur_col, u_int wrap)
-{
-        return (ahd_print_register(NULL, 0, "SGHCNT",
-            0x84, regvalue, cur_col, wrap));
-}
-int
-ahd_scbhcnt_print(u_int regvalue, u_int *cur_col, u_int wrap)
-{
-        return (ahd_print_register(NULL, 0, "SCBHCNT",
-            0x84, regvalue, cur_col, wrap));
-}
-static const ahd_reg_parse_entry_t DFF_THRSH_parse_table[] = {
-        { "WR_DFTHRSH_MIN",     0x00, 0x70 },
-        { "RD_DFTHRSH_MIN",     0x00, 0x07 },
-        { "RD_DFTHRSH_25",      0x01, 0x07 },
-        { "RD_DFTHRSH_50",      0x02, 0x07 },
-        { "RD_DFTHRSH_63",      0x03, 0x07 },
-        { "RD_DFTHRSH_75",      0x04, 0x07 },
-        { "RD_DFTHRSH_85",      0x05, 0x07 },
-        { "RD_DFTHRSH_90",      0x06, 0x07 },
-        { "RD_DFTHRSH_MAX",     0x07, 0x07 },
-        { "WR_DFTHRSH_25",      0x10, 0x70 },
-        { "WR_DFTHRSH_50",      0x20, 0x70 },
-        { "WR_DFTHRSH_63",      0x30, 0x70 },
-        { "WR_DFTHRSH_75",      0x40, 0x70 },
-        { "WR_DFTHRSH_85",      0x50, 0x70 },
-        { "WR_DFTHRSH_90",      0x60, 0x70 },
-        { "WR_DFTHRSH_MAX",     0x70, 0x70 },
-        { "RD_DFTHRSH",         0x07, 0x07 },
-        { "WR_DFTHRSH",         0x70, 0x70 }
-};
-int
-ahd_dff_thrsh_print(u_int regvalue, u_int *cur_col, u_int wrap)
-{
-        return (ahd_print_register(DFF_THRSH_parse_table, 18, "DFF_THRSH",
-            0x88, regvalue, cur_col, wrap));
-}
-static const ahd_reg_parse_entry_t PCIXCTL_parse_table[] = {
-        { "CMPABCDIS",          0x01, 0x01 },
-        { "TSCSERREN",          0x02, 0x02 },
-        { "SRSPDPEEN",          0x04, 0x04 },
-        { "SPLTSTADIS",         0x08, 0x08 },
-        { "SPLTSMADIS",         0x10, 0x10 },
-        { "UNEXPSCIEN",         0x20, 0x20 },
-        { "SERRPULSE",          0x80, 0x80 }
-};
-int
-ahd_pcixctl_print(u_int regvalue, u_int *cur_col, u_int wrap)
-{
-        return (ahd_print_register(PCIXCTL_parse_table, 7, "PCIXCTL",
-            0x93, regvalue, cur_col, wrap));
-}
-static const ahd_reg_parse_entry_t DCHSPLTSTAT0_parse_table[] = {
-        { "RXSPLTRSP",          0x01, 0x01 },
-        { "RXSCEMSG",           0x02, 0x02 },
-        { "RXOVRUN",            0x04, 0x04 },
-        { "CNTNOTCMPLT",        0x08, 0x08 },
-        { "SCDATBUCKET",        0x10, 0x10 },
-        { "SCADERR",            0x20, 0x20 },
-        { "SCBCERR",            0x40, 0x40 },
-        { "STAETERM",           0x80, 0x80 }
-};
-int
-ahd_dchspltstat0_print(u_int regvalue, u_int *cur_col, u_int wrap)
-{
-        return (ahd_print_register(DCHSPLTSTAT0_parse_table, 8, "DCHSPLTSTAT0",
-            0x96, regvalue, cur_col, wrap));
-}
-static const ahd_reg_parse_entry_t DCHSPLTSTAT1_parse_table[] = {
-        { "RXDATABUCKET",       0x01, 0x01 }
-};
-int
-ahd_dchspltstat1_print(u_int regvalue, u_int *cur_col, u_int wrap)
-{
-        return (ahd_print_register(DCHSPLTSTAT1_parse_table, 1, "DCHSPLTSTAT1",
-            0x97, regvalue, cur_col, wrap));
-}
-static const ahd_reg_parse_entry_t SGSPLTSTAT0_parse_table[] = {
-        { "RXSPLTRSP",          0x01, 0x01 },
-        { "RXSCEMSG",           0x02, 0x02 },
-        { "RXOVRUN",            0x04, 0x04 },
-        { "CNTNOTCMPLT",        0x08, 0x08 },
-        { "SCDATBUCKET",        0x10, 0x10 },
-        { "SCADERR",            0x20, 0x20 },
-        { "SCBCERR",            0x40, 0x40 },
-        { "STAETERM",           0x80, 0x80 }
-};
-int
-ahd_sgspltstat0_print(u_int regvalue, u_int *cur_col, u_int wrap)
-{
-        return (ahd_print_register(SGSPLTSTAT0_parse_table, 8, "SGSPLTSTAT0",
-            0x9e, regvalue, cur_col, wrap));
-}
-static const ahd_reg_parse_entry_t SGSPLTSTAT1_parse_table[] = {
-        { "RXDATABUCKET",       0x01, 0x01 }
-};
-int
-ahd_sgspltstat1_print(u_int regvalue, u_int *cur_col, u_int wrap)
-{
-        return (ahd_print_register(SGSPLTSTAT1_parse_table, 1, "SGSPLTSTAT1",
-            0x9f, regvalue, cur_col, wrap));
-}
-static const ahd_reg_parse_entry_t DF0PCISTAT_parse_table[] = {
-        { "DPR",                0x01, 0x01 },
-        { "TWATERR",            0x02, 0x02 },
-        { "RDPERR",             0x04, 0x04 },
-        { "SCAAPERR",           0x08, 0x08 },
-        { "RTA",                0x10, 0x10 },
-        { "RMA",                0x20, 0x20 },
-        { "SSE",                0x40, 0x40 },
-        { "DPE",                0x80, 0x80 }
-};
-int
-ahd_df0pcistat_print(u_int regvalue, u_int *cur_col, u_int wrap)
-{
-        return (ahd_print_register(DF0PCISTAT_parse_table, 8, "DF0PCISTAT",
-            0xa0, regvalue, cur_col, wrap));
-}
-int
-ahd_reg0_print(u_int regvalue, u_int *cur_col, u_int wrap)
-{
-        return (ahd_print_register(NULL, 0, "REG0",
-            0xa0, regvalue, cur_col, wrap));
-}
-int
-ahd_reg_isr_print(u_int regvalue, u_int *cur_col, u_int wrap)
-{
-        return (ahd_print_register(NULL, 0, "REG_ISR",
-            0xa4, regvalue, cur_col, wrap));
-}
 static const ahd_reg_parse_entry_t SG_STATE_parse_table[] = {
        { "SEGS_AVAIL",         0x01, 0x01 },
        { "LOADING_NEEDED",     0x02, 0x02 },
@@ -1571,54 +543,6 @@ ahd_sg_state_print(u_int regvalue, u_int *cur_col, u_int wrap)
            0xa6, regvalue, cur_col, wrap));
 }
-static const ahd_reg_parse_entry_t TARGPCISTAT_parse_table[] = {
-        { "TWATERR",            0x02, 0x02 },
-        { "STA",                0x08, 0x08 },
-        { "SSE",                0x40, 0x40 },
-        { "DPE",                0x80, 0x80 }
-};
-int
-ahd_targpcistat_print(u_int regvalue, u_int *cur_col, u_int wrap)
-{
-        return (ahd_print_register(TARGPCISTAT_parse_table, 4, "TARGPCISTAT",
-            0xa7, regvalue, cur_col, wrap));
-}
-int
-ahd_scbptr_print(u_int regvalue, u_int *cur_col, u_int wrap)
-{
-        return (ahd_print_register(NULL, 0, "SCBPTR",
-            0xa8, regvalue, cur_col, wrap));
-}
-static const ahd_reg_parse_entry_t SCBAUTOPTR_parse_table[] = {
-        { "SCBPTR_OFF",         0x07, 0x07 },
-        { "SCBPTR_ADDR",        0x38, 0x38 },
-        { "AUSCBPTR_EN",        0x80, 0x80 }
-};
-int
-ahd_scbautoptr_print(u_int regvalue, u_int *cur_col, u_int wrap)
-{
-        return (ahd_print_register(SCBAUTOPTR_parse_table, 3, "SCBAUTOPTR",
-            0xab, regvalue, cur_col, wrap));
-}
-int
-ahd_ccsgaddr_print(u_int regvalue, u_int *cur_col, u_int wrap)
-{
-        return (ahd_print_register(NULL, 0, "CCSGADDR",
-            0xac, regvalue, cur_col, wrap));
-}
-int
-ahd_ccscbaddr_print(u_int regvalue, u_int *cur_col, u_int wrap)
-{
-        return (ahd_print_register(NULL, 0, "CCSCBADDR",
-            0xac, regvalue, cur_col, wrap));
-}
 static const ahd_reg_parse_entry_t CCSCBCTL_parse_table[] = {
        { "CCSCBRESET",         0x01, 0x01 },
        { "CCSCBDIR",           0x04, 0x04 },
@@ -1651,138 +575,6 @@ ahd_ccsgctl_print(u_int regvalue, u_int *cur_col, u_int wrap)
            0xad, regvalue, cur_col, wrap));
 }
-int
-ahd_ccsgram_print(u_int regvalue, u_int *cur_col, u_int wrap)
-{
-        return (ahd_print_register(NULL, 0, "CCSGRAM",
-            0xb0, regvalue, cur_col, wrap));
-}
-int
-ahd_ccscbram_print(u_int regvalue, u_int *cur_col, u_int wrap)
-{
-        return (ahd_print_register(NULL, 0, "CCSCBRAM",
-            0xb0, regvalue, cur_col, wrap));
-}
-int
-ahd_brddat_print(u_int regvalue, u_int *cur_col, u_int wrap)
-{
-        return (ahd_print_register(NULL, 0, "BRDDAT",
-            0xb8, regvalue, cur_col, wrap));
-}
-static const ahd_reg_parse_entry_t BRDCTL_parse_table[] = {
-        { "BRDSTB",             0x01, 0x01 },
-        { "BRDRW",              0x02, 0x02 },
-        { "BRDEN",              0x04, 0x04 },
-        { "BRDADDR",            0x38, 0x38 },
-        { "FLXARBREQ",          0x40, 0x40 },
-        { "FLXARBACK",          0x80, 0x80 }
-};
-int
-ahd_brdctl_print(u_int regvalue, u_int *cur_col, u_int wrap)
-{
-        return (ahd_print_register(BRDCTL_parse_table, 6, "BRDCTL",
-            0xb9, regvalue, cur_col, wrap));
-}
-int
-ahd_seeadr_print(u_int regvalue, u_int *cur_col, u_int wrap)
-{
-        return (ahd_print_register(NULL, 0, "SEEADR",
-            0xba, regvalue, cur_col, wrap));
-}
-int
-ahd_seedat_print(u_int regvalue, u_int *cur_col, u_int wrap)
-{
-        return (ahd_print_register(NULL, 0, "SEEDAT",
-            0xbc, regvalue, cur_col, wrap));
-}
-static const ahd_reg_parse_entry_t SEECTL_parse_table[] = {
-        { "SEEOP_ERAL",         0x40, 0x70 },
-        { "SEEOP_WRITE",        0x50, 0x70 },
-        { "SEEOP_READ",         0x60, 0x70 },
-        { "SEEOP_ERASE",        0x70, 0x70 },
-        { "SEESTART",           0x01, 0x01 },
-        { "SEERST",             0x02, 0x02 },
-        { "SEEOPCODE",          0x70, 0x70 },
-        { "SEEOP_EWEN",         0x40, 0x40 },
-        { "SEEOP_WALL",         0x40, 0x40 },
-        { "SEEOP_EWDS",         0x40, 0x40 }
-};
-int
-ahd_seectl_print(u_int regvalue, u_int *cur_col, u_int wrap)
-{
-        return (ahd_print_register(SEECTL_parse_table, 10, "SEECTL",
-            0xbe, regvalue, cur_col, wrap));
-}
-static const ahd_reg_parse_entry_t SEESTAT_parse_table[] = {
-        { "SEESTART",           0x01, 0x01 },
-        { "SEEBUSY",            0x02, 0x02 },
-        { "SEEARBACK",          0x04, 0x04 },
-        { "LDALTID_L",          0x08, 0x08 },
-        { "SEEOPCODE",          0x70, 0x70 },
-        { "INIT_DONE",          0x80, 0x80 }
-};
-int
-ahd_seestat_print(u_int regvalue, u_int *cur_col, u_int wrap)
-{
-        return (ahd_print_register(SEESTAT_parse_table, 6, "SEESTAT",
-            0xbe, regvalue, cur_col, wrap));
-}
-static const ahd_reg_parse_entry_t DSPDATACTL_parse_table[] = {
-        { "XMITOFFSTDIS",       0x02, 0x02 },
-        { "RCVROFFSTDIS",       0x04, 0x04 },
-        { "DESQDIS",            0x10, 0x10 },
-        { "BYPASSENAB",         0x80, 0x80 }
-};
-int
-ahd_dspdatactl_print(u_int regvalue, u_int *cur_col, u_int wrap)
-{
-        return (ahd_print_register(DSPDATACTL_parse_table, 4, "DSPDATACTL",
-            0xc1, regvalue, cur_col, wrap));
-}
-int
-ahd_dfdat_print(u_int regvalue, u_int *cur_col, u_int wrap)
-{
-        return (ahd_print_register(NULL, 0, "DFDAT",
-            0xc4, regvalue, cur_col, wrap));
-}
-static const ahd_reg_parse_entry_t DSPSELECT_parse_table[] = {
-        { "DSPSEL",             0x1f, 0x1f },
-        { "AUTOINCEN",          0x80, 0x80 }
-};
-int
-ahd_dspselect_print(u_int regvalue, u_int *cur_col, u_int wrap)
-{
-        return (ahd_print_register(DSPSELECT_parse_table, 2, "DSPSELECT",
-            0xc4, regvalue, cur_col, wrap));
-}
-static const ahd_reg_parse_entry_t WRTBIASCTL_parse_table[] = {
-        { "XMITMANVAL",         0x3f, 0x3f },
-        { "AUTOXBCDIS",         0x80, 0x80 }
-};
-int
-ahd_wrtbiasctl_print(u_int regvalue, u_int *cur_col, u_int wrap)
-{
-        return (ahd_print_register(WRTBIASCTL_parse_table, 2, "WRTBIASCTL",
-            0xc5, regvalue, cur_col, wrap));
-}
 static const ahd_reg_parse_entry_t SEQCTL0_parse_table[] = {
        { "LOADRAM",            0x01, 0x01 },
        { "SEQRESET",           0x02, 0x02 },
@@ -1801,18 +593,6 @@ ahd_seqctl0_print(u_int regvalue, u_int *cur_col, u_int wrap)
            0xd6, regvalue, cur_col, wrap));
 }
-static const ahd_reg_parse_entry_t FLAGS_parse_table[] = {
-        { "CARRY",              0x01, 0x01 },
-        { "ZERO",               0x02, 0x02 }
-};
-int
-ahd_flags_print(u_int regvalue, u_int *cur_col, u_int wrap)
-{
-        return (ahd_print_register(FLAGS_parse_table, 2, "FLAGS",
-            0xd8, regvalue, cur_col, wrap));
-}
 static const ahd_reg_parse_entry_t SEQINTCTL_parse_table[] = {
        { "IRET",               0x01, 0x01 },
        { "INTMASK1",           0x02, 0x02 },
@@ -1831,118 +611,6 @@ ahd_seqintctl_print(u_int regvalue, u_int *cur_col, u_int wrap)
 }
 int
-ahd_seqram_print(u_int regvalue, u_int *cur_col, u_int wrap)
-{
-        return (ahd_print_register(NULL, 0, "SEQRAM",
-            0xda, regvalue, cur_col, wrap));
-}
-int
-ahd_prgmcnt_print(u_int regvalue, u_int *cur_col, u_int wrap)
-{
-        return (ahd_print_register(NULL, 0, "PRGMCNT",
-            0xde, regvalue, cur_col, wrap));
-}
-int
-ahd_accum_print(u_int regvalue, u_int *cur_col, u_int wrap)
-{
-        return (ahd_print_register(NULL, 0, "ACCUM",
-            0xe0, regvalue, cur_col, wrap));
-}
-int
-ahd_sindex_print(u_int regvalue, u_int *cur_col, u_int wrap)
-{
-        return (ahd_print_register(NULL, 0, "SINDEX",
-            0xe2, regvalue, cur_col, wrap));
-}
-int
-ahd_dindex_print(u_int regvalue, u_int *cur_col, u_int wrap)
-{
-        return (ahd_print_register(NULL, 0, "DINDEX",
-            0xe4, regvalue, cur_col, wrap));
-}
-int
-ahd_allones_print(u_int regvalue, u_int *cur_col, u_int wrap)
-{
-        return (ahd_print_register(NULL, 0, "ALLONES",
-            0xe8, regvalue, cur_col, wrap));
-}
-int
-ahd_allzeros_print(u_int regvalue, u_int *cur_col, u_int wrap)
-{
-        return (ahd_print_register(NULL, 0, "ALLZEROS",
-            0xea, regvalue, cur_col, wrap));
-}
-int
-ahd_none_print(u_int regvalue, u_int *cur_col, u_int wrap)
-{
-        return (ahd_print_register(NULL, 0, "NONE",
-            0xea, regvalue, cur_col, wrap));
-}
-int
-ahd_sindir_print(u_int regvalue, u_int *cur_col, u_int wrap)
-{
-        return (ahd_print_register(NULL, 0, "SINDIR",
-            0xec, regvalue, cur_col, wrap));
-}
-int
-ahd_dindir_print(u_int regvalue, u_int *cur_col, u_int wrap)
-{
-        return (ahd_print_register(NULL, 0, "DINDIR",
-            0xed, regvalue, cur_col, wrap));
-}
-int
-ahd_stack_print(u_int regvalue, u_int *cur_col, u_int wrap)
-{
-        return (ahd_print_register(NULL, 0, "STACK",
-            0xf2, regvalue, cur_col, wrap));
-}
-int
-ahd_intvec1_addr_print(u_int regvalue, u_int *cur_col, u_int wrap)
-{
-        return (ahd_print_register(NULL, 0, "INTVEC1_ADDR",
-            0xf4, regvalue, cur_col, wrap));
-}
-int
-ahd_curaddr_print(u_int regvalue, u_int *cur_col, u_int wrap)
-{
-        return (ahd_print_register(NULL, 0, "CURADDR",
-            0xf4, regvalue, cur_col, wrap));
-}
-int
-ahd_intvec2_addr_print(u_int regvalue, u_int *cur_col, u_int wrap)
-{
-        return (ahd_print_register(NULL, 0, "INTVEC2_ADDR",
-            0xf6, regvalue, cur_col, wrap));
-}
-int
-ahd_longjmp_addr_print(u_int regvalue, u_int *cur_col, u_int wrap)
-{
-        return (ahd_print_register(NULL, 0, "LONGJMP_ADDR",
-            0xf8, regvalue, cur_col, wrap));
-}
-int
-ahd_accum_save_print(u_int regvalue, u_int *cur_col, u_int wrap)
-{
-        return (ahd_print_register(NULL, 0, "ACCUM_SAVE",
-            0xfa, regvalue, cur_col, wrap));
-}
-int
 ahd_sram_base_print(u_int regvalue, u_int *cur_col, u_int wrap)
 {
        return (ahd_print_register(NULL, 0, "SRAM_BASE",
@@ -1950,69 +618,6 @@ ahd_sram_base_print(u_int regvalue, u_int *cur_col, u_int wrap)
 }
 int
-ahd_waiting_scb_tails_print(u_int regvalue, u_int *cur_col, u_int wrap)
-{
-        return (ahd_print_register(NULL, 0, "WAITING_SCB_TAILS",
-            0x100, regvalue, cur_col, wrap));
-}
-int
-ahd_waiting_tid_head_print(u_int regvalue, u_int *cur_col, u_int wrap)
-{
-        return (ahd_print_register(NULL, 0, "WAITING_TID_HEAD",
-            0x120, regvalue, cur_col, wrap));
-}
-int
-ahd_waiting_tid_tail_print(u_int regvalue, u_int *cur_col, u_int wrap)
-{
-        return (ahd_print_register(NULL, 0, "WAITING_TID_TAIL",
-            0x122, regvalue, cur_col, wrap));
-}
-int
-ahd_next_queued_scb_addr_print(u_int regvalue, u_int *cur_col, u_int wrap)
-{
-        return (ahd_print_register(NULL, 0, "NEXT_QUEUED_SCB_ADDR",
-            0x124, regvalue, cur_col, wrap));
-}
-int
-ahd_complete_scb_head_print(u_int regvalue, u_int *cur_col, u_int wrap)
-{
-        return (ahd_print_register(NULL, 0, "COMPLETE_SCB_HEAD",
-            0x128, regvalue, cur_col, wrap));
-}
-int
-ahd_complete_scb_dmainprog_head_print(u_int regvalue, u_int *cur_col, u_int wrap)
-{
-        return (ahd_print_register(NULL, 0, "COMPLETE_SCB_DMAINPROG_HEAD",
-            0x12a, regvalue, cur_col, wrap));
-}
-int
-ahd_complete_dma_scb_head_print(u_int regvalue, u_int *cur_col, u_int wrap)
-{
-        return (ahd_print_register(NULL, 0, "COMPLETE_DMA_SCB_HEAD",
-            0x12c, regvalue, cur_col, wrap));
-}
-int
-ahd_complete_dma_scb_tail_print(u_int regvalue, u_int *cur_col, u_int wrap)
-{
-        return (ahd_print_register(NULL, 0, "COMPLETE_DMA_SCB_TAIL",
-            0x12e, regvalue, cur_col, wrap));
-}
-int
-ahd_complete_on_qfreeze_head_print(u_int regvalue, u_int *cur_col, u_int wrap)
-{
-        return (ahd_print_register(NULL, 0, "COMPLETE_ON_QFREEZE_HEAD",
-            0x130, regvalue, cur_col, wrap));
-}
-int
 ahd_qfreeze_count_print(u_int regvalue, u_int *cur_col, u_int wrap)
 {
        return (ahd_print_register(NULL, 0, "QFREEZE_COUNT",
@@ -2033,33 +638,6 @@ ahd_saved_mode_print(u_int regvalue, u_int *cur_col, u_int wrap)
            0x136, regvalue, cur_col, wrap));
 }
-int
-ahd_msg_out_print(u_int regvalue, u_int *cur_col, u_int wrap)
-{
-        return (ahd_print_register(NULL, 0, "MSG_OUT",
-            0x137, regvalue, cur_col, wrap));
-}
-static const ahd_reg_parse_entry_t DMAPARAMS_parse_table[] = {
-        { "FIFORESET",          0x01, 0x01 },
-        { "FIFOFLUSH",          0x02, 0x02 },
-        { "DIRECTION",          0x04, 0x04 },
-        { "HDMAEN",             0x08, 0x08 },
-        { "HDMAENACK",          0x08, 0x08 },
-        { "SDMAEN",             0x10, 0x10 },
-        { "SDMAENACK",          0x10, 0x10 },
-        { "SCSIEN",             0x20, 0x20 },
-        { "WIDEODD",            0x40, 0x40 },
-        { "PRELOADEN",          0x80, 0x80 }
-};
-int
-ahd_dmaparams_print(u_int regvalue, u_int *cur_col, u_int wrap)
-{
-        return (ahd_print_register(DMAPARAMS_parse_table, 10, "DMAPARAMS",
-            0x138, regvalue, cur_col, wrap));
-}
 static const ahd_reg_parse_entry_t SEQ_FLAGS_parse_table[] = {
        { "NO_DISCONNECT",      0x01, 0x01 },
        { "SPHASE_PENDING",     0x02, 0x02 },
@@ -2079,20 +657,6 @@ ahd_seq_flags_print(u_int regvalue, u_int *cur_col, u_int wrap)
            0x139, regvalue, cur_col, wrap));
 }
-int
-ahd_saved_scsiid_print(u_int regvalue, u_int *cur_col, u_int wrap)
-{
-        return (ahd_print_register(NULL, 0, "SAVED_SCSIID",
-            0x13a, regvalue, cur_col, wrap));
-}
-int
-ahd_saved_lun_print(u_int regvalue, u_int *cur_col, u_int wrap)
-{
-        return (ahd_print_register(NULL, 0, "SAVED_LUN",
-            0x13b, regvalue, cur_col, wrap));
-}
 static const ahd_reg_parse_entry_t LASTPHASE_parse_table[] = {
        { "P_DATAOUT",          0x00, 0xe0 },
        { "P_DATAOUT_DT",       0x20, 0xe0 },
@@ -2116,96 +680,6 @@ ahd_lastphase_print(u_int regvalue, u_int *cur_col, u_int wrap)
            0x13c, regvalue, cur_col, wrap));
 }
-int
-ahd_qoutfifo_entry_valid_tag_print(u_int regvalue, u_int *cur_col, u_int wrap)
-{
-        return (ahd_print_register(NULL, 0, "QOUTFIFO_ENTRY_VALID_TAG",
-            0x13d, regvalue, cur_col, wrap));
-}
-int
-ahd_kernel_tqinpos_print(u_int regvalue, u_int *cur_col, u_int wrap)
-{
-        return (ahd_print_register(NULL, 0, "KERNEL_TQINPOS",
-            0x13e, regvalue, cur_col, wrap));
-}
-int
-ahd_tqinpos_print(u_int regvalue, u_int *cur_col, u_int wrap)
-{
-        return (ahd_print_register(NULL, 0, "TQINPOS",
-            0x13f, regvalue, cur_col, wrap));
-}
-int
-ahd_shared_data_addr_print(u_int regvalue, u_int *cur_col, u_int wrap)
-{
-        return (ahd_print_register(NULL, 0, "SHARED_DATA_ADDR",
-            0x140, regvalue, cur_col, wrap));
-}
-int
-ahd_qoutfifo_next_addr_print(u_int regvalue, u_int *cur_col, u_int wrap)
-{
-        return (ahd_print_register(NULL, 0, "QOUTFIFO_NEXT_ADDR",
-            0x144, regvalue, cur_col, wrap));
-}
-static const ahd_reg_parse_entry_t ARG_1_parse_table[] = {
-        { "CONT_MSG_LOOP_TARG", 0x02, 0x02 },
-        { "CONT_MSG_LOOP_READ", 0x03, 0x03 },
-        { "CONT_MSG_LOOP_WRITE",0x04, 0x04 },
-        { "EXIT_MSG_LOOP",      0x08, 0x08 },
-        { "MSGOUT_PHASEMIS",    0x10, 0x10 },
-        { "SEND_REJ",           0x20, 0x20 },
-        { "SEND_SENSE",         0x40, 0x40 },
-        { "SEND_MSG",           0x80, 0x80 }
-};
-int
-ahd_arg_1_print(u_int regvalue, u_int *cur_col, u_int wrap)
-{
-        return (ahd_print_register(ARG_1_parse_table, 8, "ARG_1",
-            0x148, regvalue, cur_col, wrap));
-}
-int
-ahd_arg_2_print(u_int regvalue, u_int *cur_col, u_int wrap)
-{
-        return (ahd_print_register(NULL, 0, "ARG_2",
-            0x149, regvalue, cur_col, wrap));
-}
-int
-ahd_last_msg_print(u_int regvalue, u_int *cur_col, u_int wrap)
-{
-        return (ahd_print_register(NULL, 0, "LAST_MSG",
-            0x14a, regvalue, cur_col, wrap));
-}
-static const ahd_reg_parse_entry_t SCSISEQ_TEMPLATE_parse_table[] = {
-        { "ALTSTIM",            0x01, 0x01 },
-        { "ENAUTOATNP",         0x02, 0x02 },
-        { "MANUALP",            0x0c, 0x0c },
-        { "ENRSELI",            0x10, 0x10 },
-        { "ENSELI",             0x20, 0x20 },
-        { "MANUALCTL",          0x40, 0x40 }
-};
-int
-ahd_scsiseq_template_print(u_int regvalue, u_int *cur_col, u_int wrap)
-{
-        return (ahd_print_register(SCSISEQ_TEMPLATE_parse_table, 6, "SCSISEQ_TEMPLATE",
-            0x14b, regvalue, cur_col, wrap));
-}
-int
-ahd_initiator_tag_print(u_int regvalue, u_int *cur_col, u_int wrap)
-{
-        return (ahd_print_register(NULL, 0, "INITIATOR_TAG",
-            0x14c, regvalue, cur_col, wrap));
-}
 static const ahd_reg_parse_entry_t SEQ_FLAGS2_parse_table[] = {
        { "PENDING_MK_MESSAGE", 0x01, 0x01 },
        { "TARGET_MSG_PENDING", 0x02, 0x02 },
@@ -2220,62 +694,6 @@ ahd_seq_flags2_print(u_int regvalue, u_int *cur_col, u_int wrap)
 }
 int
-ahd_allocfifo_scbptr_print(u_int regvalue, u_int *cur_col, u_int wrap)
-{
-        return (ahd_print_register(NULL, 0, "ALLOCFIFO_SCBPTR",
-            0x14e, regvalue, cur_col, wrap));
-}
-int
-ahd_int_coalescing_timer_print(u_int regvalue, u_int *cur_col, u_int wrap)
-{
-        return (ahd_print_register(NULL, 0, "INT_COALESCING_TIMER",
-            0x150, regvalue, cur_col, wrap));
-}
-int
-ahd_int_coalescing_maxcmds_print(u_int regvalue, u_int *cur_col, u_int wrap)
-{
-        return (ahd_print_register(NULL, 0, "INT_COALESCING_MAXCMDS",
-            0x152, regvalue, cur_col, wrap));
-}
-int
-ahd_int_coalescing_mincmds_print(u_int regvalue, u_int *cur_col, u_int wrap)
-{
-        return (ahd_print_register(NULL, 0, "INT_COALESCING_MINCMDS",
-            0x153, regvalue, cur_col, wrap));
-}
-int
-ahd_cmds_pending_print(u_int regvalue, u_int *cur_col, u_int wrap)
-{
-        return (ahd_print_register(NULL, 0, "CMDS_PENDING",
-            0x154, regvalue, cur_col, wrap));
-}
-int
-ahd_int_coalescing_cmdcount_print(u_int regvalue, u_int *cur_col, u_int wrap)
-{
-        return (ahd_print_register(NULL, 0, "INT_COALESCING_CMDCOUNT",
-            0x156, regvalue, cur_col, wrap));
-}
-int
-ahd_local_hs_mailbox_print(u_int regvalue, u_int *cur_col, u_int wrap)
-{
-        return (ahd_print_register(NULL, 0, "LOCAL_HS_MAILBOX",
-            0x157, regvalue, cur_col, wrap));
-}
-int
-ahd_cmdsize_table_print(u_int regvalue, u_int *cur_col, u_int wrap)
-{
-        return (ahd_print_register(NULL, 0, "CMDSIZE_TABLE",
-            0x158, regvalue, cur_col, wrap));
-}
-int
 ahd_mk_message_scb_print(u_int regvalue, u_int *cur_col, u_int wrap)
 {
        return (ahd_print_register(NULL, 0, "MK_MESSAGE_SCB",
@@ -2290,53 +708,12 @@ ahd_mk_message_scsiid_print(u_int regvalue, u_int *cur_col, u_int wrap)
 }
 int
-ahd_scb_residual_datacnt_print(u_int regvalue, u_int *cur_col, u_int wrap)
-{
-        return (ahd_print_register(NULL, 0, "SCB_RESIDUAL_DATACNT",
-            0x180, regvalue, cur_col, wrap));
-}
-int
 ahd_scb_base_print(u_int regvalue, u_int *cur_col, u_int wrap)
 {
        return (ahd_print_register(NULL, 0, "SCB_BASE",
            0x180, regvalue, cur_col, wrap));
 }
-static const ahd_reg_parse_entry_t SCB_RESIDUAL_SGPTR_parse_table[] = {
-        { "SG_LIST_NULL",       0x01, 0x01 },
-        { "SG_OVERRUN_RESID",   0x02, 0x02 },
-        { "SG_ADDR_MASK",       0xf8, 0xf8 }
-};
-int
-ahd_scb_residual_sgptr_print(u_int regvalue, u_int *cur_col, u_int wrap)
-{
-        return (ahd_print_register(SCB_RESIDUAL_SGPTR_parse_table, 3, "SCB_RESIDUAL_SGPTR",
-            0x184, regvalue, cur_col, wrap));
-}
-int
-ahd_scb_scsi_status_print(u_int regvalue, u_int *cur_col, u_int wrap)
-{
-        return (ahd_print_register(NULL, 0, "SCB_SCSI_STATUS",
-            0x188, regvalue, cur_col, wrap));
-}
-int
-ahd_scb_sense_busaddr_print(u_int regvalue, u_int *cur_col, u_int wrap)
-{
-        return (ahd_print_register(NULL, 0, "SCB_SENSE_BUSADDR",
-            0x18c, regvalue, cur_col, wrap));
-}
-int
-ahd_scb_tag_print(u_int regvalue, u_int *cur_col, u_int wrap)
-{
-        return (ahd_print_register(NULL, 0, "SCB_TAG",
-            0x190, regvalue, cur_col, wrap));
-}
 static const ahd_reg_parse_entry_t SCB_CONTROL_parse_table[] = {
        { "SCB_TAG_TYPE",       0x03, 0x03 },
        { "DISCONNECTED",       0x04, 0x04 },
@@ -2366,103 +743,3 @@ ahd_scb_scsiid_print(u_int regvalue, u_int *cur_col, u_int wrap)
            0x193, regvalue, cur_col, wrap));
 }
-static const ahd_reg_parse_entry_t SCB_LUN_parse_table[] = {
-        { "LID",                0xff, 0xff }
-};
-int
-ahd_scb_lun_print(u_int regvalue, u_int *cur_col, u_int wrap)
-{
-        return (ahd_print_register(SCB_LUN_parse_table, 1, "SCB_LUN",
-            0x194, regvalue, cur_col, wrap));
-}
-static const ahd_reg_parse_entry_t SCB_TASK_ATTRIBUTE_parse_table[] = {
-        { "SCB_XFERLEN_ODD",    0x01, 0x01 }
-};
-int
-ahd_scb_task_attribute_print(u_int regvalue, u_int *cur_col, u_int wrap)
-{
-        return (ahd_print_register(SCB_TASK_ATTRIBUTE_parse_table, 1, "SCB_TASK_ATTRIBUTE",
-            0x195, regvalue, cur_col, wrap));
-}
-static const ahd_reg_parse_entry_t SCB_CDB_LEN_parse_table[] = {
-        { "SCB_CDB_LEN_PTR",    0x80, 0x80 }
-};
-int
-ahd_scb_cdb_len_print(u_int regvalue, u_int *cur_col, u_int wrap)
-{
-        return (ahd_print_register(SCB_CDB_LEN_parse_table, 1, "SCB_CDB_LEN",
-            0x196, regvalue, cur_col, wrap));
-}
-int
-ahd_scb_task_management_print(u_int regvalue, u_int *cur_col, u_int wrap)
-{
-        return (ahd_print_register(NULL, 0, "SCB_TASK_MANAGEMENT",
-            0x197, regvalue, cur_col, wrap));
-}
-int
-ahd_scb_dataptr_print(u_int regvalue, u_int *cur_col, u_int wrap)
-{
-        return (ahd_print_register(NULL, 0, "SCB_DATAPTR",
-            0x198, regvalue, cur_col, wrap));
-}
-static const ahd_reg_parse_entry_t SCB_DATACNT_parse_table[] = {
-        { "SG_HIGH_ADDR_BITS",  0x7f, 0x7f },
-        { "SG_LAST_SEG",        0x80, 0x80 }
-};
-int
-ahd_scb_datacnt_print(u_int regvalue, u_int *cur_col, u_int wrap)
-{
-        return (ahd_print_register(SCB_DATACNT_parse_table, 2, "SCB_DATACNT",
-            0x1a0, regvalue, cur_col, wrap));
-}
-static const ahd_reg_parse_entry_t SCB_SGPTR_parse_table[] = {
-        { "SG_LIST_NULL",       0x01, 0x01 },
-        { "SG_FULL_RESID",      0x02, 0x02 },
-        { "SG_STATUS_VALID",    0x04, 0x04 }
-};
-int
-ahd_scb_sgptr_print(u_int regvalue, u_int *cur_col, u_int wrap)
-{
-        return (ahd_print_register(SCB_SGPTR_parse_table, 3, "SCB_SGPTR",
-            0x1a4, regvalue, cur_col, wrap));
-}
-int
-ahd_scb_busaddr_print(u_int regvalue, u_int *cur_col, u_int wrap)
-{
-        return (ahd_print_register(NULL, 0, "SCB_BUSADDR",
-            0x1a8, regvalue, cur_col, wrap));
-}
-int
-ahd_scb_next_print(u_int regvalue, u_int *cur_col, u_int wrap)
-{
-        return (ahd_print_register(NULL, 0, "SCB_NEXT",
-            0x1ac, regvalue, cur_col, wrap));
-}
-int
-ahd_scb_next2_print(u_int regvalue, u_int *cur_col, u_int wrap)
-{
-        return (ahd_print_register(NULL, 0, "SCB_NEXT2",
-            0x1ae, regvalue, cur_col, wrap));
-}
-int
-ahd_scb_disconnected_lists_print(u_int regvalue, u_int *cur_col, u_int wrap)
-{
-        return (ahd_print_register(NULL, 0, "SCB_DISCONNECTED_LISTS",
-            0x1b8, regvalue, cur_col, wrap));
-}
diff --git a/drivers/scsi/aic7xxx/aic7xxx.reg b/drivers/scsi/aic7xxx/aic7xxx.reg
index 0d2f763c3427..9a96e55da39a 100644
--- a/drivers/scsi/aic7xxx/aic7xxx.reg
+++ b/drivers/scsi/aic7xxx/aic7xxx.reg
@@ -51,6 +51,17 @@ VERSION = "$Id: //depot/aic7xxx/aic7xxx/aic7xxx.reg#40 $"
 */
 /*
+ * Registers marked "dont_generate_debug_code" are not (yet) referenced
+ * from the driver code, and this keyword inhibit generation
+ * of debug code for them.
+ *
+ * REG_PRETTY_PRINT config will complain if dont_generate_debug_code
+ * is added to the register which is referenced in the driver.
+ * Unreferenced register with no dont_generate_debug_code will result
+ * in dead code. No warning is issued.
+ */
+/*
 * SCSI Sequence Control (p. 3-11).
 * Each bit, when set starts a specific SCSI sequence on the bus
 */
@@ -97,6 +108,7 @@ register SXFRCTL1 {
        field   ENSTIMER        0x04
        field   ACTNEGEN        0x02
        field   STPWEN          0x01    /* Powered Termination */
+        dont_generate_debug_code
 }
 /*
@@ -155,6 +167,7 @@ register SCSISIGO {
        mask    P_MESGOUT       CDI|MSGI
        mask    P_STATUS        CDI|IOI
        mask    P_MESGIN        CDI|IOI|MSGI
+        dont_generate_debug_code
 }
 /* 
@@ -194,6 +207,7 @@ register SCSIID	{
         */
        alias   SCSIOFFSET
        mask    SOFS_ULTRA2     0x7f            /* Sync offset U2 chips */
+        dont_generate_debug_code
 }
 /*
@@ -205,6 +219,7 @@ register SCSIID	{
 register SCSIDATL {
        address                 0x006
        access_mode RW
+        dont_generate_debug_code
 }
 register SCSIDATH {
@@ -223,6 +238,7 @@ register STCNT {
        address                 0x008
        size    3
        access_mode RW
+        dont_generate_debug_code
 }
 /* ALT_MODE registers (Ultra2 and Ultra160 chips) */
@@ -248,6 +264,7 @@ register OPTIONMODE {
        field   AUTO_MSGOUT_DE          0x02
        field   DIS_MSGIN_DUALEDGE      0x01
        mask    OPTIONMODE_DEFAULTS     AUTO_MSGOUT_DE|DIS_MSGIN_DUALEDGE
+        dont_generate_debug_code
 }
 /* ALT_MODE register on Ultra160 chips */
@@ -256,6 +273,7 @@ register TARGCRCCNT {
        size    2
        access_mode RW
        count           2
+        dont_generate_debug_code
 }
 /*
@@ -271,6 +289,7 @@ register CLRSINT0 {
        field   CLRSWRAP        0x08
        field   CLRIOERR        0x08    /* Ultra2 Only */
        field   CLRSPIORDY      0x02
+        dont_generate_debug_code
 }
 /*
@@ -306,6 +325,7 @@ register CLRSINT1 {
        field   CLRSCSIPERR     0x04
        field   CLRPHASECHG     0x02
        field   CLRREQINIT      0x01
+        dont_generate_debug_code
 }
 /*
@@ -360,6 +380,7 @@ register SCSIID_ULTRA2 {
        access_mode RW
        mask    TID             0xf0            /* Target ID mask */
        mask    OID             0x0f            /* Our ID mask */
+        dont_generate_debug_code
 }
 /*
@@ -425,6 +446,7 @@ register SHADDR {
        address                 0x014
        size    4
        access_mode RO
+        dont_generate_debug_code
 }
 /*
@@ -441,6 +463,7 @@ register SELTIMER {
        field   STAGE2          0x02
        field   STAGE1          0x01
        alias   TARGIDIN
+        dont_generate_debug_code
 }
 /*
@@ -453,6 +476,7 @@ register SELID {
        access_mode RW
        mask    SELID_MASK      0xf0
        field   ONEBIT          0x08
+        dont_generate_debug_code
 }
 register SCAMCTL {
@@ -473,6 +497,7 @@ register TARGID {
        size                    2
        access_mode RW
        count           14
+        dont_generate_debug_code
 }
 /*
@@ -495,6 +520,7 @@ register SPIOCAP {
        field   EEPROM          0x04    /* Writable external BIOS ROM */
        field   ROM             0x02    /* Logic for accessing external ROM */
        field   SSPIOCPS        0x01    /* Termination and cable detection */
+        dont_generate_debug_code
 }
 register BRDCTL {
@@ -514,6 +540,7 @@ register BRDCTL	{
        field   BRDDAT2         0x04
        field   BRDRW_ULTRA2    0x02
        field   BRDSTB_ULTRA2   0x01
+        dont_generate_debug_code
 }
 /*
@@ -551,6 +578,7 @@ register SEECTL {
        field   SEECK           0x04
        field   SEEDO           0x02
        field   SEEDI           0x01
+        dont_generate_debug_code
 }
 /*
 * SCSI Block Control (p. 3-32)
@@ -601,6 +629,7 @@ register SEQRAM {
        address                 0x061
        access_mode RW
        count           2
+        dont_generate_debug_code
 }
 /*
@@ -610,6 +639,7 @@ register SEQRAM {
 register SEQADDR0 {
        address                 0x062
        access_mode RW
+        dont_generate_debug_code
 }
 register SEQADDR1 {
@@ -617,6 +647,7 @@ register SEQADDR1 {
        access_mode RW
        count           8
        mask    SEQADDR1_MASK   0x01
+        dont_generate_debug_code
 }
 /*
@@ -627,35 +658,41 @@ register ACCUM {
        address                 0x064
        access_mode RW
        accumulator
+        dont_generate_debug_code
 }
 register SINDEX {
        address                 0x065
        access_mode RW
        sindex
+        dont_generate_debug_code
 }
 register DINDEX {
        address                 0x066
        access_mode RW
+        dont_generate_debug_code
 }
 register ALLONES {
        address                 0x069
        access_mode RO
        allones
+        dont_generate_debug_code
 }
 register ALLZEROS {
        address                 0x06a
        access_mode RO
        allzeros
+        dont_generate_debug_code
 }
 register NONE {
        address                 0x06a
        access_mode WO
        none
+        dont_generate_debug_code
 }
 register FLAGS {
@@ -664,16 +701,19 @@ register FLAGS {
        count           18
        field   ZERO            0x02
        field   CARRY           0x01
+        dont_generate_debug_code
 }
 register SINDIR {
        address                 0x06c
        access_mode RO
+        dont_generate_debug_code
 }
 register DINDIR  {
        address                 0x06d
        access_mode WO
+        dont_generate_debug_code
 }
 register FUNCTION1 {
@@ -685,6 +725,7 @@ register STACK {
        address                 0x06f
        access_mode RO
        count           5
+        dont_generate_debug_code
 }
 const   STACK_SIZE      4
@@ -716,6 +757,7 @@ register DSCOMMAND0 {
        field   RAMPS           0x04    /* External SCB RAM Present */
        field   USCBSIZE32      0x02    /* Use 32byte SCB Page Size */
        field   CIOPARCKEN      0x01    /* Internal bus parity error enable */
+        dont_generate_debug_code
 }
 register DSCOMMAND1 {
@@ -724,6 +766,7 @@ register DSCOMMAND1 {
        mask    DSLATT          0xfc    /* PCI latency timer (non-ultra2) */
        field   HADDLDSEL1      0x02    /* Host Address Load Select Bits */
        field   HADDLDSEL0      0x01
+        dont_generate_debug_code
 }
 /*
@@ -735,6 +778,7 @@ register BUSTIME {
        count           2
        mask    BOFF            0xf0
        mask    BON             0x0f
+        dont_generate_debug_code
 }
 /*
@@ -749,6 +793,7 @@ register BUSSPD {
        mask    STBON           0x07
        mask    DFTHRSH_100     0xc0
        mask    DFTHRSH_75      0x80
+        dont_generate_debug_code
 }
 /* aic7850/55/60/70/80/95 only */
@@ -756,6 +801,7 @@ register DSPCISTATUS {
        address                 0x086
        count           4
        mask    DFTHRSH_100     0xc0
+        dont_generate_debug_code
 }
 /* aic7890/91/96/97 only */
@@ -764,6 +810,7 @@ register HS_MAILBOX {
        mask    HOST_MAILBOX    0xF0
        mask    SEQ_MAILBOX     0x0F
        mask    HOST_TQINPOS    0x80    /* Boundary at either 0 or 128 */
+        dont_generate_debug_code
 }
 const   HOST_MAILBOX_SHIFT      4
@@ -784,6 +831,7 @@ register HCNTRL {
        field   INTEN           0x02
        field   CHIPRST         0x01
        field   CHIPRSTACK      0x01
+        dont_generate_debug_code
 }
 /*
@@ -795,12 +843,14 @@ register HADDR {
        address                 0x088
        size    4
        access_mode RW
+        dont_generate_debug_code
 }
 register HCNT {
        address                 0x08c
        size    3
        access_mode RW
+        dont_generate_debug_code
 }
 /*
@@ -810,6 +860,7 @@ register HCNT {
 register SCBPTR {
        address                 0x090
        access_mode RW
+        dont_generate_debug_code
 }
 /*
@@ -878,6 +929,7 @@ register INTSTAT {
        mask    SEQINT_MASK     0xf0|SEQINT     /* SEQINT Status Codes */
        mask    INT_PEND  (BRKADRINT|SEQINT|SCSIINT|CMDCMPLT)
+        dont_generate_debug_code
 }
 /*
@@ -911,6 +963,7 @@ register CLRINT {
        field   CLRSCSIINT      0x04
        field   CLRCMDINT       0x02
        field   CLRSEQINT       0x01
+        dont_generate_debug_code
 }
 register DFCNTRL {
@@ -944,6 +997,7 @@ register DFSTATUS {
 register DFWADDR {
        address                 0x95
        access_mode RW
+        dont_generate_debug_code
 }
 register DFRADDR {
@@ -954,6 +1008,7 @@ register DFRADDR {
 register DFDAT {
        address                 0x099
        access_mode RW
+        dont_generate_debug_code
 }
 /*
@@ -967,6 +1022,7 @@ register SCBCNT {
        count           1
        field   SCBAUTO         0x80
        mask    SCBCNT_MASK     0x1f
+        dont_generate_debug_code
 }
 /*
@@ -977,6 +1033,7 @@ register QINFIFO {
        address                 0x09b
        access_mode RW
        count           12
+        dont_generate_debug_code
 }
 /*
@@ -996,6 +1053,7 @@ register QOUTFIFO {
        address                 0x09d
        access_mode WO
        count           7
+        dont_generate_debug_code
 }
 register CRCCONTROL1 {
@@ -1008,6 +1066,7 @@ register CRCCONTROL1 {
        field   CRCREQCHKEN             0x10
        field   TARGCRCENDEN            0x08
        field   TARGCRCCNTEN            0x04
+        dont_generate_debug_code
 }
@@ -1040,6 +1099,7 @@ register SFUNCT {
        access_mode RW
        count       4
        field   ALT_MODE        0x80
+        dont_generate_debug_code
 }
 /*
@@ -1053,24 +1113,31 @@ scb {
                size    4
                alias   SCB_RESIDUAL_DATACNT
                alias   SCB_CDB_STORE
+                dont_generate_debug_code
        }
        SCB_RESIDUAL_SGPTR {
                size    4
+                dont_generate_debug_code
        }
        SCB_SCSI_STATUS {
                size    1
+                dont_generate_debug_code
        }
        SCB_TARGET_PHASES {
                size    1
+                dont_generate_debug_code
        }
        SCB_TARGET_DATA_DIR {
                size    1
+                dont_generate_debug_code
        }
        SCB_TARGET_ITAG {
                size    1
+                dont_generate_debug_code
        }
        SCB_DATAPTR {
                size    4
+                dont_generate_debug_code
        }
        SCB_DATACNT {
                /*
@@ -1080,12 +1147,14 @@ scb {
                size    4
                field   SG_LAST_SEG             0x80    /* In the fourth byte */
                mask    SG_HIGH_ADDR_BITS       0x7F    /* In the fourth byte */
+                dont_generate_debug_code
        }
        SCB_SGPTR {
                size    4
                field   SG_RESID_VALID  0x04    /* In the first byte */
                field   SG_FULL_RESID   0x02    /* In the first byte */
                field   SG_LIST_NULL    0x01    /* In the first byte */
+                dont_generate_debug_code
        }
        SCB_CONTROL {
                size    1
@@ -1115,22 +1184,27 @@ scb {
        }
        SCB_CDB_LEN {
                size    1
+                dont_generate_debug_code
        }
        SCB_SCSIRATE {
                size    1
+                dont_generate_debug_code
        }
        SCB_SCSIOFFSET {
                size    1
                count   1
+                dont_generate_debug_code
        }
        SCB_NEXT {
                size    1
+                dont_generate_debug_code
        }
        SCB_64_SPARE {
                size    16
        }
        SCB_64_BTT {
                size    16
+                dont_generate_debug_code
        }
 }
@@ -1149,6 +1223,7 @@ register SEECTL_2840 {
        field   CS_2840         0x04
        field   CK_2840         0x02
        field   DO_2840         0x01
+        dont_generate_debug_code
 }
 register STATUS_2840 {
@@ -1159,6 +1234,7 @@ register STATUS_2840 {
        mask    BIOS_SEL        0x60
        mask    ADSEL           0x1e
        field   DI_2840         0x01
+        dont_generate_debug_code
 }
 /* --------------------- AIC-7870-only definitions -------------------- */
@@ -1166,18 +1242,22 @@ register STATUS_2840 {
 register CCHADDR {
        address                 0x0E0
        size 8
+        dont_generate_debug_code
 }
 register CCHCNT {
        address                 0x0E8
+        dont_generate_debug_code
 }
 register CCSGRAM {
        address                 0x0E9
+        dont_generate_debug_code
 }
 register CCSGADDR {
        address                 0x0EA
+        dont_generate_debug_code
 }
 register CCSGCTL {
@@ -1186,11 +1266,13 @@ register CCSGCTL {
        field   CCSGEN          0x08
        field   SG_FETCH_NEEDED 0x02    /* Bit used for software state */
        field   CCSGRESET       0x01
+        dont_generate_debug_code
 }
 register CCSCBCNT {
        address                 0xEF
        count           1
+        dont_generate_debug_code
 }
 register CCSCBCTL {
@@ -1201,14 +1283,17 @@ register CCSCBCTL {
        field   CCSCBEN         0x08
        field   CCSCBDIR        0x04
        field   CCSCBRESET      0x01
+        dont_generate_debug_code
 }
 register CCSCBADDR {
        address                 0x0ED
+        dont_generate_debug_code
 }
 register CCSCBRAM {
        address                 0xEC
+        dont_generate_debug_code
 }
 /*
@@ -1218,23 +1303,28 @@ register SCBBADDR {
        address                 0x0F0
        access_mode RW
        count           3
+        dont_generate_debug_code
 }
 register CCSCBPTR {
        address                 0x0F1
+        dont_generate_debug_code
 }
 register HNSCB_QOFF {
        address                 0x0F4
        count           4
+        dont_generate_debug_code
 }
 register SNSCB_QOFF {
        address                 0x0F6
+        dont_generate_debug_code
 }
 register SDSCB_QOFF {
        address                 0x0F8
+        dont_generate_debug_code
 }
 register QOFF_CTLSTA {
@@ -1244,6 +1334,7 @@ register QOFF_CTLSTA {
        field   SDSCB_ROLLOVER  0x10
        mask    SCB_QSIZE       0x07
        mask    SCB_QSIZE_256   0x06
+        dont_generate_debug_code
 }
 register DFF_THRSH {
@@ -1267,6 +1358,7 @@ register DFF_THRSH {
        mask    WR_DFTHRSH_90   0x60
        mask    WR_DFTHRSH_MAX  0x70
        count   4
+        dont_generate_debug_code
 }
 register SG_CACHE_PRE {
@@ -1275,6 +1367,7 @@ register SG_CACHE_PRE {
        mask    SG_ADDR_MASK    0xf8
        field   LAST_SEG        0x02
        field   LAST_SEG_DONE   0x01
+        dont_generate_debug_code
 }
 register SG_CACHE_SHADOW {
@@ -1283,6 +1376,7 @@ register SG_CACHE_SHADOW {
        mask    SG_ADDR_MASK    0xf8
        field   LAST_SEG        0x02
        field   LAST_SEG_DONE   0x01
+        dont_generate_debug_code
 }
 /* ---------------------- Scratch RAM Offsets ------------------------- */
 /* These offsets are either to values that are initialized by the board's
@@ -1309,6 +1403,7 @@ scratch_ram {
        BUSY_TARGETS {
                alias           TARG_SCSIRATE
                size            16
+                dont_generate_debug_code
        }
        /*
         * Bit vector of targets that have ULTRA enabled as set by
@@ -1321,6 +1416,7 @@ scratch_ram {
                alias           CMDSIZE_TABLE
                size            2
                count           2
+                dont_generate_debug_code
        }
        /*
         * Bit vector of targets that have disconnection disabled as set by
@@ -1331,6 +1427,7 @@ scratch_ram {
        DISC_DSB {
                size            2
                count           6
+                dont_generate_debug_code
        }
        CMDSIZE_TABLE_TAIL {
                size            4
@@ -1341,12 +1438,14 @@ scratch_ram {
         */
        MWI_RESIDUAL {
                size            1
+                dont_generate_debug_code
        }
        /*
         * SCBID of the next SCB to be started by the controller.
         */
        NEXT_QUEUED_SCB {
                size            1
+                dont_generate_debug_code
        }
        /*
         * Single byte buffer used to designate the type or message
@@ -1354,6 +1453,7 @@ scratch_ram {
         */
        MSG_OUT {
                size            1
+                dont_generate_debug_code
        }
        /* Parameters for DMA Logic */
        DMAPARAMS {
@@ -1369,6 +1469,7 @@ scratch_ram {
                field   DIRECTION       0x04    /* Set indicates PCI->SCSI */
                field   FIFOFLUSH       0x02
                field   FIFORESET       0x01
+                dont_generate_debug_code
        }
        SEQ_FLAGS {
                size            1
@@ -1390,9 +1491,11 @@ scratch_ram {
         */
        SAVED_SCSIID {
                size            1
+                dont_generate_debug_code
        }
        SAVED_LUN {
                size            1
+                dont_generate_debug_code
        }
        /*
         * The last bus phase as seen by the sequencer. 
@@ -1417,6 +1520,7 @@ scratch_ram {
         */
        WAITING_SCBH {
                size            1
+                dont_generate_debug_code
        }
        /*
         * head of list of SCBs that are
@@ -1425,6 +1529,7 @@ scratch_ram {
         */
        DISCONNECTED_SCBH {
                size            1
+                dont_generate_debug_code
        }
        /*
         * head of list of SCBs that are
@@ -1432,6 +1537,7 @@ scratch_ram {
         */
        FREE_SCBH {
                size            1
+                dont_generate_debug_code
        }
        /*
         * head of list of SCBs that have
@@ -1446,6 +1552,7 @@ scratch_ram {
         */
        HSCB_ADDR {
                size            4
+                dont_generate_debug_code
        }
        /*
         * Base address of our shared data with the kernel driver in host
@@ -1454,15 +1561,19 @@ scratch_ram {
         */
        SHARED_DATA_ADDR {
                size            4
+                dont_generate_debug_code
        }
        KERNEL_QINPOS {
                size            1
+                dont_generate_debug_code
        }
        QINPOS {
                size            1
+                dont_generate_debug_code
        }
        QOUTPOS {
                size            1
+                dont_generate_debug_code
        }
        /*
         * Kernel and sequencer offsets into the queue of
@@ -1471,9 +1582,11 @@ scratch_ram {
         */
        KERNEL_TQINPOS {
                size            1
+                dont_generate_debug_code
        }
        TQINPOS {
                size            1
+                dont_generate_debug_code
        }
        ARG_1 {
                size            1
@@ -1486,10 +1599,12 @@ scratch_ram {
                mask    CONT_MSG_LOOP           0x04
                mask    CONT_TARG_SESSION       0x02
                alias   RETURN_1
+                dont_generate_debug_code
        }
        ARG_2 {
                size            1
                alias   RETURN_2
+                dont_generate_debug_code
        }
        /*
@@ -1498,6 +1613,7 @@ scratch_ram {
        LAST_MSG {
                size            1
                alias   TARG_IMMEDIATE_SCB
+                dont_generate_debug_code
        }
        /*
@@ -1513,6 +1629,7 @@ scratch_ram {
                field   ENAUTOATNO      0x08
                field   ENAUTOATNI      0x04
                field   ENAUTOATNP      0x02
+                dont_generate_debug_code
        }
 }
@@ -1533,12 +1650,14 @@ scratch_ram {
                field   HA_274_EXTENDED_TRANS   0x01
                alias   INITIATOR_TAG
                count           1
+                dont_generate_debug_code
        }
        SEQ_FLAGS2 {
                size    1
                field   SCB_DMA                 0x01
                field   TARGET_MSG_PENDING      0x02
+                dont_generate_debug_code
        }
 }
@@ -1562,6 +1681,7 @@ scratch_ram {
                field   ENSPCHK         0x20
                mask    HSCSIID         0x07    /* our SCSI ID */
                mask    HWSCSIID        0x0f    /* our SCSI ID if Wide Bus */
+                dont_generate_debug_code
        }
        INTDEF {
                address         0x05c
@@ -1569,11 +1689,13 @@ scratch_ram {
                count           1
                field   EDGE_TRIG       0x80
                mask    VECTOR          0x0f
+                dont_generate_debug_code
        }
        HOSTCONF {
                address         0x05d
                size            1
                count           1
+                dont_generate_debug_code
        }
        HA_274_BIOSCTRL {
                address         0x05f
@@ -1582,6 +1704,7 @@ scratch_ram {
                mask    BIOSMODE                0x30
                mask    BIOSDISABLED            0x30    
                field   CHANNEL_B_PRIMARY       0x08
+                dont_generate_debug_code
        }
 }
@@ -1595,6 +1718,7 @@ scratch_ram {
        TARG_OFFSET {
                size            16
                count           1
+                dont_generate_debug_code
        }
 }
diff --git a/drivers/scsi/aic7xxx/aic7xxx_core.c b/drivers/scsi/aic7xxx/aic7xxx_core.c
index 0ae2b4605d09..e6f2bb7365e6 100644
--- a/drivers/scsi/aic7xxx/aic7xxx_core.c
+++ b/drivers/scsi/aic7xxx/aic7xxx_core.c
@@ -814,6 +814,7 @@ ahc_intr(struct ahc_softc *ahc)
 static void
 ahc_restart(struct ahc_softc *ahc)
 {
+        uint8_t sblkctl;
        ahc_pause(ahc);
@@ -868,6 +869,12 @@ ahc_restart(struct ahc_softc *ahc)
        ahc_outb(ahc, SEQADDR0, 0);
        ahc_outb(ahc, SEQADDR1, 0);
+        /*
+         * Take the LED out of diagnostic mode on PM resume, too
+         */
+        sblkctl = ahc_inb(ahc, SBLKCTL);
+        ahc_outb(ahc, SBLKCTL, (sblkctl & ~(DIAGLEDEN|DIAGLEDON)));
        ahc_unpause(ahc);
 }
diff --git a/drivers/scsi/aic7xxx/aic7xxx_reg.h_shipped b/drivers/scsi/aic7xxx/aic7xxx_reg.h_shipped
index 2ce1febca207..e821082a4f47 100644
--- a/drivers/scsi/aic7xxx/aic7xxx_reg.h_shipped
+++ b/drivers/scsi/aic7xxx/aic7xxx_reg.h_shipped
@@ -27,20 +27,6 @@ ahc_reg_print_t ahc_sxfrctl0_print;
 #endif
 #if AIC_DEBUG_REGISTERS
-ahc_reg_print_t ahc_sxfrctl1_print;
-#else
-#define ahc_sxfrctl1_print(regvalue, cur_col, wrap) \
-    ahc_print_register(NULL, 0, "SXFRCTL1", 0x02, regvalue, cur_col, wrap)
-#endif
-#if AIC_DEBUG_REGISTERS
-ahc_reg_print_t ahc_scsisigo_print;
-#else
-#define ahc_scsisigo_print(regvalue, cur_col, wrap) \
-    ahc_print_register(NULL, 0, "SCSISIGO", 0x03, regvalue, cur_col, wrap)
-#endif
-#if AIC_DEBUG_REGISTERS
 ahc_reg_print_t ahc_scsisigi_print;
 #else
 #define ahc_scsisigi_print(regvalue, cur_col, wrap) \
@@ -55,55 +41,6 @@ ahc_reg_print_t ahc_scsirate_print;
 #endif
 #if AIC_DEBUG_REGISTERS
-ahc_reg_print_t ahc_scsiid_print;
-#else
-#define ahc_scsiid_print(regvalue, cur_col, wrap) \
-    ahc_print_register(NULL, 0, "SCSIID", 0x05, regvalue, cur_col, wrap)
-#endif
-#if AIC_DEBUG_REGISTERS
-ahc_reg_print_t ahc_scsidatl_print;
-#else
-#define ahc_scsidatl_print(regvalue, cur_col, wrap) \
-    ahc_print_register(NULL, 0, "SCSIDATL", 0x06, regvalue, cur_col, wrap)
-#endif
-#if AIC_DEBUG_REGISTERS
-ahc_reg_print_t ahc_scsidath_print;
-#else
-#define ahc_scsidath_print(regvalue, cur_col, wrap) \
-    ahc_print_register(NULL, 0, "SCSIDATH", 0x07, regvalue, cur_col, wrap)
-#endif
-#if AIC_DEBUG_REGISTERS
-ahc_reg_print_t ahc_stcnt_print;
-#else
-#define ahc_stcnt_print(regvalue, cur_col, wrap) \
-    ahc_print_register(NULL, 0, "STCNT", 0x08, regvalue, cur_col, wrap)
-#endif
-#if AIC_DEBUG_REGISTERS
-ahc_reg_print_t ahc_optionmode_print;
-#else
-#define ahc_optionmode_print(regvalue, cur_col, wrap) \
-    ahc_print_register(NULL, 0, "OPTIONMODE", 0x08, regvalue, cur_col, wrap)
-#endif
-#if AIC_DEBUG_REGISTERS
-ahc_reg_print_t ahc_targcrccnt_print;
-#else
-#define ahc_targcrccnt_print(regvalue, cur_col, wrap) \
-    ahc_print_register(NULL, 0, "TARGCRCCNT", 0x0a, regvalue, cur_col, wrap)
-#endif
-#if AIC_DEBUG_REGISTERS
-ahc_reg_print_t ahc_clrsint0_print;
-#else
-#define ahc_clrsint0_print(regvalue, cur_col, wrap) \
-    ahc_print_register(NULL, 0, "CLRSINT0", 0x0b, regvalue, cur_col, wrap)
-#endif
-#if AIC_DEBUG_REGISTERS
 ahc_reg_print_t ahc_sstat0_print;
 #else
 #define ahc_sstat0_print(regvalue, cur_col, wrap) \
@@ -111,13 +48,6 @@ ahc_reg_print_t ahc_sstat0_print;
 #endif
 #if AIC_DEBUG_REGISTERS
-ahc_reg_print_t ahc_clrsint1_print;
-#else
-#define ahc_clrsint1_print(regvalue, cur_col, wrap) \
-    ahc_print_register(NULL, 0, "CLRSINT1", 0x0c, regvalue, cur_col, wrap)
-#endif
-#if AIC_DEBUG_REGISTERS
 ahc_reg_print_t ahc_sstat1_print;
 #else
 #define ahc_sstat1_print(regvalue, cur_col, wrap) \
@@ -139,13 +69,6 @@ ahc_reg_print_t ahc_sstat3_print;
 #endif
 #if AIC_DEBUG_REGISTERS
-ahc_reg_print_t ahc_scsiid_ultra2_print;
-#else
-#define ahc_scsiid_ultra2_print(regvalue, cur_col, wrap) \
-    ahc_print_register(NULL, 0, "SCSIID_ULTRA2", 0x0f, regvalue, cur_col, wrap)
-#endif
-#if AIC_DEBUG_REGISTERS
 ahc_reg_print_t ahc_simode0_print;
 #else
 #define ahc_simode0_print(regvalue, cur_col, wrap) \
@@ -167,76 +90,6 @@ ahc_reg_print_t ahc_scsibusl_print;
 #endif
 #if AIC_DEBUG_REGISTERS
-ahc_reg_print_t ahc_scsibush_print;
-#else
-#define ahc_scsibush_print(regvalue, cur_col, wrap) \
-    ahc_print_register(NULL, 0, "SCSIBUSH", 0x13, regvalue, cur_col, wrap)
-#endif
-#if AIC_DEBUG_REGISTERS
-ahc_reg_print_t ahc_sxfrctl2_print;
-#else
-#define ahc_sxfrctl2_print(regvalue, cur_col, wrap) \
-    ahc_print_register(NULL, 0, "SXFRCTL2", 0x13, regvalue, cur_col, wrap)
-#endif
-#if AIC_DEBUG_REGISTERS
-ahc_reg_print_t ahc_shaddr_print;
-#else
-#define ahc_shaddr_print(regvalue, cur_col, wrap) \
-    ahc_print_register(NULL, 0, "SHADDR", 0x14, regvalue, cur_col, wrap)
-#endif
-#if AIC_DEBUG_REGISTERS
-ahc_reg_print_t ahc_seltimer_print;
-#else
-#define ahc_seltimer_print(regvalue, cur_col, wrap) \
-    ahc_print_register(NULL, 0, "SELTIMER", 0x18, regvalue, cur_col, wrap)
-#endif
-#if AIC_DEBUG_REGISTERS
-ahc_reg_print_t ahc_selid_print;
-#else
-#define ahc_selid_print(regvalue, cur_col, wrap) \
-    ahc_print_register(NULL, 0, "SELID", 0x19, regvalue, cur_col, wrap)
-#endif
-#if AIC_DEBUG_REGISTERS
-ahc_reg_print_t ahc_scamctl_print;
-#else
-#define ahc_scamctl_print(regvalue, cur_col, wrap) \
-    ahc_print_register(NULL, 0, "SCAMCTL", 0x1a, regvalue, cur_col, wrap)
-#endif
-#if AIC_DEBUG_REGISTERS
-ahc_reg_print_t ahc_targid_print;
-#else
-#define ahc_targid_print(regvalue, cur_col, wrap) \
-    ahc_print_register(NULL, 0, "TARGID", 0x1b, regvalue, cur_col, wrap)
-#endif
-#if AIC_DEBUG_REGISTERS
-ahc_reg_print_t ahc_spiocap_print;
-#else
-#define ahc_spiocap_print(regvalue, cur_col, wrap) \
-    ahc_print_register(NULL, 0, "SPIOCAP", 0x1b, regvalue, cur_col, wrap)
-#endif
-#if AIC_DEBUG_REGISTERS
-ahc_reg_print_t ahc_brdctl_print;
-#else
-#define ahc_brdctl_print(regvalue, cur_col, wrap) \
-    ahc_print_register(NULL, 0, "BRDCTL", 0x1d, regvalue, cur_col, wrap)
-#endif
-#if AIC_DEBUG_REGISTERS
-ahc_reg_print_t ahc_seectl_print;
-#else
-#define ahc_seectl_print(regvalue, cur_col, wrap) \
-    ahc_print_register(NULL, 0, "SEECTL", 0x1e, regvalue, cur_col, wrap)
-#endif
-#if AIC_DEBUG_REGISTERS
 ahc_reg_print_t ahc_sblkctl_print;
 #else
 #define ahc_sblkctl_print(regvalue, cur_col, wrap) \
@@ -244,62 +97,6 @@ ahc_reg_print_t ahc_sblkctl_print;
 #endif
 #if AIC_DEBUG_REGISTERS
-ahc_reg_print_t ahc_busy_targets_print;
-#else
-#define ahc_busy_targets_print(regvalue, cur_col, wrap) \
-    ahc_print_register(NULL, 0, "BUSY_TARGETS", 0x20, regvalue, cur_col, wrap)
-#endif
-#if AIC_DEBUG_REGISTERS
-ahc_reg_print_t ahc_ultra_enb_print;
-#else
-#define ahc_ultra_enb_print(regvalue, cur_col, wrap) \
-    ahc_print_register(NULL, 0, "ULTRA_ENB", 0x30, regvalue, cur_col, wrap)
-#endif
-#if AIC_DEBUG_REGISTERS
-ahc_reg_print_t ahc_disc_dsb_print;
-#else
-#define ahc_disc_dsb_print(regvalue, cur_col, wrap) \
-    ahc_print_register(NULL, 0, "DISC_DSB", 0x32, regvalue, cur_col, wrap)
-#endif
-#if AIC_DEBUG_REGISTERS
-ahc_reg_print_t ahc_cmdsize_table_tail_print;
-#else
-#define ahc_cmdsize_table_tail_print(regvalue, cur_col, wrap) \
-    ahc_print_register(NULL, 0, "CMDSIZE_TABLE_TAIL", 0x34, regvalue, cur_col, wrap)
-#endif
-#if AIC_DEBUG_REGISTERS
-ahc_reg_print_t ahc_mwi_residual_print;
-#else
-#define ahc_mwi_residual_print(regvalue, cur_col, wrap) \
-    ahc_print_register(NULL, 0, "MWI_RESIDUAL", 0x38, regvalue, cur_col, wrap)
-#endif
-#if AIC_DEBUG_REGISTERS
-ahc_reg_print_t ahc_next_queued_scb_print;
-#else
-#define ahc_next_queued_scb_print(regvalue, cur_col, wrap) \
-    ahc_print_register(NULL, 0, "NEXT_QUEUED_SCB", 0x39, regvalue, cur_col, wrap)
-#endif
-#if AIC_DEBUG_REGISTERS
-ahc_reg_print_t ahc_msg_out_print;
-#else
-#define ahc_msg_out_print(regvalue, cur_col, wrap) \
-    ahc_print_register(NULL, 0, "MSG_OUT", 0x3a, regvalue, cur_col, wrap)
-#endif
-#if AIC_DEBUG_REGISTERS
-ahc_reg_print_t ahc_dmaparams_print;
-#else
-#define ahc_dmaparams_print(regvalue, cur_col, wrap) \
-    ahc_print_register(NULL, 0, "DMAPARAMS", 0x3b, regvalue, cur_col, wrap)
-#endif
-#if AIC_DEBUG_REGISTERS
 ahc_reg_print_t ahc_seq_flags_print;
 #else
 #define ahc_seq_flags_print(regvalue, cur_col, wrap) \
@@ -307,20 +104,6 @@ ahc_reg_print_t ahc_seq_flags_print;
 #endif
 #if AIC_DEBUG_REGISTERS
-ahc_reg_print_t ahc_saved_scsiid_print;
-#else
-#define ahc_saved_scsiid_print(regvalue, cur_col, wrap) \
-    ahc_print_register(NULL, 0, "SAVED_SCSIID", 0x3d, regvalue, cur_col, wrap)
-#endif
-#if AIC_DEBUG_REGISTERS
-ahc_reg_print_t ahc_saved_lun_print;
-#else
-#define ahc_saved_lun_print(regvalue, cur_col, wrap) \
-    ahc_print_register(NULL, 0, "SAVED_LUN", 0x3e, regvalue, cur_col, wrap)
-#endif
-#if AIC_DEBUG_REGISTERS
 ahc_reg_print_t ahc_lastphase_print;
 #else
 #define ahc_lastphase_print(regvalue, cur_col, wrap) \
@@ -328,153 +111,6 @@ ahc_reg_print_t ahc_lastphase_print;
 #endif
 #if AIC_DEBUG_REGISTERS
-ahc_reg_print_t ahc_waiting_scbh_print;
-#else
-#define ahc_waiting_scbh_print(regvalue, cur_col, wrap) \
-    ahc_print_register(NULL, 0, "WAITING_SCBH", 0x40, regvalue, cur_col, wrap)
-#endif
-#if AIC_DEBUG_REGISTERS
-ahc_reg_print_t ahc_disconnected_scbh_print;
-#else
-#define ahc_disconnected_scbh_print(regvalue, cur_col, wrap) \
-    ahc_print_register(NULL, 0, "DISCONNECTED_SCBH", 0x41, regvalue, cur_col, wrap)
-#endif
-#if AIC_DEBUG_REGISTERS
-ahc_reg_print_t ahc_free_scbh_print;
-#else
-#define ahc_free_scbh_print(regvalue, cur_col, wrap) \
-    ahc_print_register(NULL, 0, "FREE_SCBH", 0x42, regvalue, cur_col, wrap)
-#endif
-#if AIC_DEBUG_REGISTERS
-ahc_reg_print_t ahc_complete_scbh_print;
-#else
-#define ahc_complete_scbh_print(regvalue, cur_col, wrap) \
-    ahc_print_register(NULL, 0, "COMPLETE_SCBH", 0x43, regvalue, cur_col, wrap)
-#endif
-#if AIC_DEBUG_REGISTERS
-ahc_reg_print_t ahc_hscb_addr_print;
-#else
-#define ahc_hscb_addr_print(regvalue, cur_col, wrap) \
-    ahc_print_register(NULL, 0, "HSCB_ADDR", 0x44, regvalue, cur_col, wrap)
-#endif
-#if AIC_DEBUG_REGISTERS
-ahc_reg_print_t ahc_shared_data_addr_print;
-#else
-#define ahc_shared_data_addr_print(regvalue, cur_col, wrap) \
-    ahc_print_register(NULL, 0, "SHARED_DATA_ADDR", 0x48, regvalue, cur_col, wrap)
-#endif
-#if AIC_DEBUG_REGISTERS
-ahc_reg_print_t ahc_kernel_qinpos_print;
-#else
-#define ahc_kernel_qinpos_print(regvalue, cur_col, wrap) \
-    ahc_print_register(NULL, 0, "KERNEL_QINPOS", 0x4c, regvalue, cur_col, wrap)
-#endif
-#if AIC_DEBUG_REGISTERS
-ahc_reg_print_t ahc_qinpos_print;
-#else
-#define ahc_qinpos_print(regvalue, cur_col, wrap) \
-    ahc_print_register(NULL, 0, "QINPOS", 0x4d, regvalue, cur_col, wrap)
-#endif
-#if AIC_DEBUG_REGISTERS
-ahc_reg_print_t ahc_qoutpos_print;
-#else
-#define ahc_qoutpos_print(regvalue, cur_col, wrap) \
-    ahc_print_register(NULL, 0, "QOUTPOS", 0x4e, regvalue, cur_col, wrap)
-#endif
-#if AIC_DEBUG_REGISTERS
-ahc_reg_print_t ahc_kernel_tqinpos_print;
-#else
-#define ahc_kernel_tqinpos_print(regvalue, cur_col, wrap) \
-    ahc_print_register(NULL, 0, "KERNEL_TQINPOS", 0x4f, regvalue, cur_col, wrap)
-#endif
-#if AIC_DEBUG_REGISTERS
-ahc_reg_print_t ahc_tqinpos_print;
-#else
-#define ahc_tqinpos_print(regvalue, cur_col, wrap) \
-    ahc_print_register(NULL, 0, "TQINPOS", 0x50, regvalue, cur_col, wrap)
-#endif
-#if AIC_DEBUG_REGISTERS
-ahc_reg_print_t ahc_arg_1_print;
-#else
-#define ahc_arg_1_print(regvalue, cur_col, wrap) \
-    ahc_print_register(NULL, 0, "ARG_1", 0x51, regvalue, cur_col, wrap)
-#endif
-#if AIC_DEBUG_REGISTERS
-ahc_reg_print_t ahc_arg_2_print;
-#else
-#define ahc_arg_2_print(regvalue, cur_col, wrap) \
-    ahc_print_register(NULL, 0, "ARG_2", 0x52, regvalue, cur_col, wrap)
-#endif
-#if AIC_DEBUG_REGISTERS
-ahc_reg_print_t ahc_last_msg_print;
-#else
-#define ahc_last_msg_print(regvalue, cur_col, wrap) \
-    ahc_print_register(NULL, 0, "LAST_MSG", 0x53, regvalue, cur_col, wrap)
-#endif
-#if AIC_DEBUG_REGISTERS
-ahc_reg_print_t ahc_scsiseq_template_print;
-#else
-#define ahc_scsiseq_template_print(regvalue, cur_col, wrap) \
-    ahc_print_register(NULL, 0, "SCSISEQ_TEMPLATE", 0x54, regvalue, cur_col, wrap)
-#endif
-#if AIC_DEBUG_REGISTERS
-ahc_reg_print_t ahc_ha_274_biosglobal_print;
-#else
-#define ahc_ha_274_biosglobal_print(regvalue, cur_col, wrap) \
-    ahc_print_register(NULL, 0, "HA_274_BIOSGLOBAL", 0x56, regvalue, cur_col, wrap)
-#endif
-#if AIC_DEBUG_REGISTERS
-ahc_reg_print_t ahc_seq_flags2_print;
-#else
-#define ahc_seq_flags2_print(regvalue, cur_col, wrap) \
-    ahc_print_register(NULL, 0, "SEQ_FLAGS2", 0x57, regvalue, cur_col, wrap)
-#endif
-#if AIC_DEBUG_REGISTERS
-ahc_reg_print_t ahc_scsiconf_print;
-#else
-#define ahc_scsiconf_print(regvalue, cur_col, wrap) \
-    ahc_print_register(NULL, 0, "SCSICONF", 0x5a, regvalue, cur_col, wrap)
-#endif
-#if AIC_DEBUG_REGISTERS
-ahc_reg_print_t ahc_intdef_print;
-#else
-#define ahc_intdef_print(regvalue, cur_col, wrap) \
-    ahc_print_register(NULL, 0, "INTDEF", 0x5c, regvalue, cur_col, wrap)
-#endif
-#if AIC_DEBUG_REGISTERS
-ahc_reg_print_t ahc_hostconf_print;
-#else
-#define ahc_hostconf_print(regvalue, cur_col, wrap) \
-    ahc_print_register(NULL, 0, "HOSTCONF", 0x5d, regvalue, cur_col, wrap)
-#endif
-#if AIC_DEBUG_REGISTERS
-ahc_reg_print_t ahc_ha_274_biosctrl_print;
-#else
-#define ahc_ha_274_biosctrl_print(regvalue, cur_col, wrap) \
-    ahc_print_register(NULL, 0, "HA_274_BIOSCTRL", 0x5f, regvalue, cur_col, wrap)
-#endif
-#if AIC_DEBUG_REGISTERS
 ahc_reg_print_t ahc_seqctl_print;
 #else
 #define ahc_seqctl_print(regvalue, cur_col, wrap) \
@@ -482,111 +118,6 @@ ahc_reg_print_t ahc_seqctl_print;
 #endif
 #if AIC_DEBUG_REGISTERS
-ahc_reg_print_t ahc_seqram_print;
-#else
-#define ahc_seqram_print(regvalue, cur_col, wrap) \
-    ahc_print_register(NULL, 0, "SEQRAM", 0x61, regvalue, cur_col, wrap)
-#endif
-#if AIC_DEBUG_REGISTERS
-ahc_reg_print_t ahc_seqaddr0_print;
-#else
-#define ahc_seqaddr0_print(regvalue, cur_col, wrap) \
-    ahc_print_register(NULL, 0, "SEQADDR0", 0x62, regvalue, cur_col, wrap)
-#endif
-#if AIC_DEBUG_REGISTERS
-ahc_reg_print_t ahc_seqaddr1_print;
-#else
-#define ahc_seqaddr1_print(regvalue, cur_col, wrap) \
-    ahc_print_register(NULL, 0, "SEQADDR1", 0x63, regvalue, cur_col, wrap)
-#endif
-#if AIC_DEBUG_REGISTERS
-ahc_reg_print_t ahc_accum_print;
-#else
-#define ahc_accum_print(regvalue, cur_col, wrap) \
-    ahc_print_register(NULL, 0, "ACCUM", 0x64, regvalue, cur_col, wrap)
-#endif
-#if AIC_DEBUG_REGISTERS
-ahc_reg_print_t ahc_sindex_print;
-#else
-#define ahc_sindex_print(regvalue, cur_col, wrap) \
-    ahc_print_register(NULL, 0, "SINDEX", 0x65, regvalue, cur_col, wrap)
-#endif
-#if AIC_DEBUG_REGISTERS
-ahc_reg_print_t ahc_dindex_print;
-#else
-#define ahc_dindex_print(regvalue, cur_col, wrap) \
-    ahc_print_register(NULL, 0, "DINDEX", 0x66, regvalue, cur_col, wrap)
-#endif
-#if AIC_DEBUG_REGISTERS
-ahc_reg_print_t ahc_allones_print;
-#else
-#define ahc_allones_print(regvalue, cur_col, wrap) \
-    ahc_print_register(NULL, 0, "ALLONES", 0x69, regvalue, cur_col, wrap)
-#endif
-#if AIC_DEBUG_REGISTERS
-ahc_reg_print_t ahc_allzeros_print;
-#else
-#define ahc_allzeros_print(regvalue, cur_col, wrap) \
-    ahc_print_register(NULL, 0, "ALLZEROS", 0x6a, regvalue, cur_col, wrap)
-#endif
-#if AIC_DEBUG_REGISTERS
-ahc_reg_print_t ahc_none_print;
-#else
-#define ahc_none_print(regvalue, cur_col, wrap) \
-    ahc_print_register(NULL, 0, "NONE", 0x6a, regvalue, cur_col, wrap)
-#endif
-#if AIC_DEBUG_REGISTERS
-ahc_reg_print_t ahc_flags_print;
-#else
-#define ahc_flags_print(regvalue, cur_col, wrap) \
-    ahc_print_register(NULL, 0, "FLAGS", 0x6b, regvalue, cur_col, wrap)
-#endif
-#if AIC_DEBUG_REGISTERS
-ahc_reg_print_t ahc_sindir_print;
-#else
-#define ahc_sindir_print(regvalue, cur_col, wrap) \
-    ahc_print_register(NULL, 0, "SINDIR", 0x6c, regvalue, cur_col, wrap)
-#endif
-#if AIC_DEBUG_REGISTERS
-ahc_reg_print_t ahc_dindir_print;
-#else
-#define ahc_dindir_print(regvalue, cur_col, wrap) \
-    ahc_print_register(NULL, 0, "DINDIR", 0x6d, regvalue, cur_col, wrap)
-#endif
-#if AIC_DEBUG_REGISTERS
-ahc_reg_print_t ahc_function1_print;
-#else
-#define ahc_function1_print(regvalue, cur_col, wrap) \
-    ahc_print_register(NULL, 0, "FUNCTION1", 0x6e, regvalue, cur_col, wrap)
-#endif
-#if AIC_DEBUG_REGISTERS
-ahc_reg_print_t ahc_stack_print;
-#else
-#define ahc_stack_print(regvalue, cur_col, wrap) \
-    ahc_print_register(NULL, 0, "STACK", 0x6f, regvalue, cur_col, wrap)
-#endif
-#if AIC_DEBUG_REGISTERS
-ahc_reg_print_t ahc_targ_offset_print;
-#else
-#define ahc_targ_offset_print(regvalue, cur_col, wrap) \
-    ahc_print_register(NULL, 0, "TARG_OFFSET", 0x70, regvalue, cur_col, wrap)
-#endif
-#if AIC_DEBUG_REGISTERS
 ahc_reg_print_t ahc_sram_base_print;
 #else
 #define ahc_sram_base_print(regvalue, cur_col, wrap) \
@@ -594,97 +125,6 @@ ahc_reg_print_t ahc_sram_base_print;
 #endif
 #if AIC_DEBUG_REGISTERS
-ahc_reg_print_t ahc_bctl_print;
-#else
-#define ahc_bctl_print(regvalue, cur_col, wrap) \
-    ahc_print_register(NULL, 0, "BCTL", 0x84, regvalue, cur_col, wrap)
-#endif
-#if AIC_DEBUG_REGISTERS
-ahc_reg_print_t ahc_dscommand0_print;
-#else
-#define ahc_dscommand0_print(regvalue, cur_col, wrap) \
-    ahc_print_register(NULL, 0, "DSCOMMAND0", 0x84, regvalue, cur_col, wrap)
-#endif
-#if AIC_DEBUG_REGISTERS
-ahc_reg_print_t ahc_bustime_print;
-#else
-#define ahc_bustime_print(regvalue, cur_col, wrap) \
-    ahc_print_register(NULL, 0, "BUSTIME", 0x85, regvalue, cur_col, wrap)
-#endif
-#if AIC_DEBUG_REGISTERS
-ahc_reg_print_t ahc_dscommand1_print;
-#else
-#define ahc_dscommand1_print(regvalue, cur_col, wrap) \
-    ahc_print_register(NULL, 0, "DSCOMMAND1", 0x85, regvalue, cur_col, wrap)
-#endif
-#if AIC_DEBUG_REGISTERS
-ahc_reg_print_t ahc_busspd_print;
-#else
-#define ahc_busspd_print(regvalue, cur_col, wrap) \
-    ahc_print_register(NULL, 0, "BUSSPD", 0x86, regvalue, cur_col, wrap)
-#endif
-#if AIC_DEBUG_REGISTERS
-ahc_reg_print_t ahc_hs_mailbox_print;
-#else
-#define ahc_hs_mailbox_print(regvalue, cur_col, wrap) \
-    ahc_print_register(NULL, 0, "HS_MAILBOX", 0x86, regvalue, cur_col, wrap)
-#endif
-#if AIC_DEBUG_REGISTERS
-ahc_reg_print_t ahc_dspcistatus_print;
-#else
-#define ahc_dspcistatus_print(regvalue, cur_col, wrap) \
-    ahc_print_register(NULL, 0, "DSPCISTATUS", 0x86, regvalue, cur_col, wrap)
-#endif
-#if AIC_DEBUG_REGISTERS
-ahc_reg_print_t ahc_hcntrl_print;
-#else
-#define ahc_hcntrl_print(regvalue, cur_col, wrap) \
-    ahc_print_register(NULL, 0, "HCNTRL", 0x87, regvalue, cur_col, wrap)
-#endif
-#if AIC_DEBUG_REGISTERS
-ahc_reg_print_t ahc_haddr_print;
-#else
-#define ahc_haddr_print(regvalue, cur_col, wrap) \
-    ahc_print_register(NULL, 0, "HADDR", 0x88, regvalue, cur_col, wrap)
-#endif
-#if AIC_DEBUG_REGISTERS
-ahc_reg_print_t ahc_hcnt_print;
-#else
-#define ahc_hcnt_print(regvalue, cur_col, wrap) \
-    ahc_print_register(NULL, 0, "HCNT", 0x8c, regvalue, cur_col, wrap)
-#endif
-#if AIC_DEBUG_REGISTERS
-ahc_reg_print_t ahc_scbptr_print;
-#else
-#define ahc_scbptr_print(regvalue, cur_col, wrap) \
-    ahc_print_register(NULL, 0, "SCBPTR", 0x90, regvalue, cur_col, wrap)
-#endif
-#if AIC_DEBUG_REGISTERS
-ahc_reg_print_t ahc_intstat_print;
-#else
-#define ahc_intstat_print(regvalue, cur_col, wrap) \
-    ahc_print_register(NULL, 0, "INTSTAT", 0x91, regvalue, cur_col, wrap)
-#endif
-#if AIC_DEBUG_REGISTERS
-ahc_reg_print_t ahc_clrint_print;
-#else
-#define ahc_clrint_print(regvalue, cur_col, wrap) \
-    ahc_print_register(NULL, 0, "CLRINT", 0x92, regvalue, cur_col, wrap)
-#endif
-#if AIC_DEBUG_REGISTERS
 ahc_reg_print_t ahc_error_print;
 #else
 #define ahc_error_print(regvalue, cur_col, wrap) \
@@ -706,69 +146,6 @@ ahc_reg_print_t ahc_dfstatus_print;
 #endif
 #if AIC_DEBUG_REGISTERS
-ahc_reg_print_t ahc_dfwaddr_print;
-#else
-#define ahc_dfwaddr_print(regvalue, cur_col, wrap) \
-    ahc_print_register(NULL, 0, "DFWADDR", 0x95, regvalue, cur_col, wrap)
-#endif
-#if AIC_DEBUG_REGISTERS
-ahc_reg_print_t ahc_dfraddr_print;
-#else
-#define ahc_dfraddr_print(regvalue, cur_col, wrap) \
-    ahc_print_register(NULL, 0, "DFRADDR", 0x97, regvalue, cur_col, wrap)
-#endif
-#if AIC_DEBUG_REGISTERS
-ahc_reg_print_t ahc_dfdat_print;
-#else
-#define ahc_dfdat_print(regvalue, cur_col, wrap) \
-    ahc_print_register(NULL, 0, "DFDAT", 0x99, regvalue, cur_col, wrap)
-#endif
-#if AIC_DEBUG_REGISTERS
-ahc_reg_print_t ahc_scbcnt_print;
-#else
-#define ahc_scbcnt_print(regvalue, cur_col, wrap) \
-    ahc_print_register(NULL, 0, "SCBCNT", 0x9a, regvalue, cur_col, wrap)
-#endif
-#if AIC_DEBUG_REGISTERS
-ahc_reg_print_t ahc_qinfifo_print;
-#else
-#define ahc_qinfifo_print(regvalue, cur_col, wrap) \
-    ahc_print_register(NULL, 0, "QINFIFO", 0x9b, regvalue, cur_col, wrap)
-#endif
-#if AIC_DEBUG_REGISTERS
-ahc_reg_print_t ahc_qincnt_print;
-#else
-#define ahc_qincnt_print(regvalue, cur_col, wrap) \
-    ahc_print_register(NULL, 0, "QINCNT", 0x9c, regvalue, cur_col, wrap)
-#endif
-#if AIC_DEBUG_REGISTERS
-ahc_reg_print_t ahc_qoutfifo_print;
-#else
-#define ahc_qoutfifo_print(regvalue, cur_col, wrap) \
-    ahc_print_register(NULL, 0, "QOUTFIFO", 0x9d, regvalue, cur_col, wrap)
-#endif
-#if AIC_DEBUG_REGISTERS
-ahc_reg_print_t ahc_crccontrol1_print;
-#else
-#define ahc_crccontrol1_print(regvalue, cur_col, wrap) \
-    ahc_print_register(NULL, 0, "CRCCONTROL1", 0x9d, regvalue, cur_col, wrap)
-#endif
-#if AIC_DEBUG_REGISTERS
-ahc_reg_print_t ahc_qoutcnt_print;
-#else
-#define ahc_qoutcnt_print(regvalue, cur_col, wrap) \
-    ahc_print_register(NULL, 0, "QOUTCNT", 0x9e, regvalue, cur_col, wrap)
-#endif
-#if AIC_DEBUG_REGISTERS
 ahc_reg_print_t ahc_scsiphase_print;
 #else
 #define ahc_scsiphase_print(regvalue, cur_col, wrap) \
@@ -776,13 +153,6 @@ ahc_reg_print_t ahc_scsiphase_print;
 #endif
 #if AIC_DEBUG_REGISTERS
-ahc_reg_print_t ahc_sfunct_print;
-#else
-#define ahc_sfunct_print(regvalue, cur_col, wrap) \
-    ahc_print_register(NULL, 0, "SFUNCT", 0x9f, regvalue, cur_col, wrap)
-#endif
-#if AIC_DEBUG_REGISTERS
 ahc_reg_print_t ahc_scb_base_print;
 #else
 #define ahc_scb_base_print(regvalue, cur_col, wrap) \
@@ -790,69 +160,6 @@ ahc_reg_print_t ahc_scb_base_print;
 #endif
 #if AIC_DEBUG_REGISTERS
-ahc_reg_print_t ahc_scb_cdb_ptr_print;
-#else
-#define ahc_scb_cdb_ptr_print(regvalue, cur_col, wrap) \
-    ahc_print_register(NULL, 0, "SCB_CDB_PTR", 0xa0, regvalue, cur_col, wrap)
-#endif
-#if AIC_DEBUG_REGISTERS
-ahc_reg_print_t ahc_scb_residual_sgptr_print;
-#else
-#define ahc_scb_residual_sgptr_print(regvalue, cur_col, wrap) \
-    ahc_print_register(NULL, 0, "SCB_RESIDUAL_SGPTR", 0xa4, regvalue, cur_col, wrap)
-#endif
-#if AIC_DEBUG_REGISTERS
-ahc_reg_print_t ahc_scb_scsi_status_print;
-#else
-#define ahc_scb_scsi_status_print(regvalue, cur_col, wrap) \
-    ahc_print_register(NULL, 0, "SCB_SCSI_STATUS", 0xa8, regvalue, cur_col, wrap)
-#endif
-#if AIC_DEBUG_REGISTERS
-ahc_reg_print_t ahc_scb_target_phases_print;
-#else
-#define ahc_scb_target_phases_print(regvalue, cur_col, wrap) \
-    ahc_print_register(NULL, 0, "SCB_TARGET_PHASES", 0xa9, regvalue, cur_col, wrap)
-#endif
-#if AIC_DEBUG_REGISTERS
-ahc_reg_print_t ahc_scb_target_data_dir_print;
-#else
-#define ahc_scb_target_data_dir_print(regvalue, cur_col, wrap) \
-    ahc_print_register(NULL, 0, "SCB_TARGET_DATA_DIR", 0xaa, regvalue, cur_col, wrap)
-#endif
-#if AIC_DEBUG_REGISTERS
-ahc_reg_print_t ahc_scb_target_itag_print;
-#else
-#define ahc_scb_target_itag_print(regvalue, cur_col, wrap) \
-    ahc_print_register(NULL, 0, "SCB_TARGET_ITAG", 0xab, regvalue, cur_col, wrap)
-#endif
-#if AIC_DEBUG_REGISTERS
-ahc_reg_print_t ahc_scb_dataptr_print;
-#else
-#define ahc_scb_dataptr_print(regvalue, cur_col, wrap) \
-    ahc_print_register(NULL, 0, "SCB_DATAPTR", 0xac, regvalue, cur_col, wrap)
-#endif
-#if AIC_DEBUG_REGISTERS
-ahc_reg_print_t ahc_scb_datacnt_print;
-#else
-#define ahc_scb_datacnt_print(regvalue, cur_col, wrap) \
-    ahc_print_register(NULL, 0, "SCB_DATACNT", 0xb0, regvalue, cur_col, wrap)
-#endif
-#if AIC_DEBUG_REGISTERS
-ahc_reg_print_t ahc_scb_sgptr_print;
-#else
-#define ahc_scb_sgptr_print(regvalue, cur_col, wrap) \
-    ahc_print_register(NULL, 0, "SCB_SGPTR", 0xb4, regvalue, cur_col, wrap)
-#endif
-#if AIC_DEBUG_REGISTERS
 ahc_reg_print_t ahc_scb_control_print;
 #else
 #define ahc_scb_control_print(regvalue, cur_col, wrap) \
@@ -880,188 +187,6 @@ ahc_reg_print_t ahc_scb_tag_print;
    ahc_print_register(NULL, 0, "SCB_TAG", 0xbb, regvalue, cur_col, wrap)
 #endif
-#if AIC_DEBUG_REGISTERS
-ahc_reg_print_t ahc_scb_cdb_len_print;
-#else
-#define ahc_scb_cdb_len_print(regvalue, cur_col, wrap) \
-    ahc_print_register(NULL, 0, "SCB_CDB_LEN", 0xbc, regvalue, cur_col, wrap)
-#endif
-#if AIC_DEBUG_REGISTERS
-ahc_reg_print_t ahc_scb_scsirate_print;
-#else
-#define ahc_scb_scsirate_print(regvalue, cur_col, wrap) \
-    ahc_print_register(NULL, 0, "SCB_SCSIRATE", 0xbd, regvalue, cur_col, wrap)
-#endif
-#if AIC_DEBUG_REGISTERS
-ahc_reg_print_t ahc_scb_scsioffset_print;
-#else
-#define ahc_scb_scsioffset_print(regvalue, cur_col, wrap) \
-    ahc_print_register(NULL, 0, "SCB_SCSIOFFSET", 0xbe, regvalue, cur_col, wrap)
-#endif
-#if AIC_DEBUG_REGISTERS
-ahc_reg_print_t ahc_scb_next_print;
-#else
-#define ahc_scb_next_print(regvalue, cur_col, wrap) \
-    ahc_print_register(NULL, 0, "SCB_NEXT", 0xbf, regvalue, cur_col, wrap)
-#endif
-#if AIC_DEBUG_REGISTERS
-ahc_reg_print_t ahc_scb_64_spare_print;
-#else
-#define ahc_scb_64_spare_print(regvalue, cur_col, wrap) \
-    ahc_print_register(NULL, 0, "SCB_64_SPARE", 0xc0, regvalue, cur_col, wrap)
-#endif
-#if AIC_DEBUG_REGISTERS
-ahc_reg_print_t ahc_seectl_2840_print;
-#else
-#define ahc_seectl_2840_print(regvalue, cur_col, wrap) \
-    ahc_print_register(NULL, 0, "SEECTL_2840", 0xc0, regvalue, cur_col, wrap)
-#endif
-#if AIC_DEBUG_REGISTERS
-ahc_reg_print_t ahc_status_2840_print;
-#else
-#define ahc_status_2840_print(regvalue, cur_col, wrap) \
-    ahc_print_register(NULL, 0, "STATUS_2840", 0xc1, regvalue, cur_col, wrap)
-#endif
-#if AIC_DEBUG_REGISTERS
-ahc_reg_print_t ahc_scb_64_btt_print;
-#else
-#define ahc_scb_64_btt_print(regvalue, cur_col, wrap) \
-    ahc_print_register(NULL, 0, "SCB_64_BTT", 0xd0, regvalue, cur_col, wrap)
-#endif
-#if AIC_DEBUG_REGISTERS
-ahc_reg_print_t ahc_cchaddr_print;
-#else
-#define ahc_cchaddr_print(regvalue, cur_col, wrap) \
-    ahc_print_register(NULL, 0, "CCHADDR", 0xe0, regvalue, cur_col, wrap)
-#endif
-#if AIC_DEBUG_REGISTERS
-ahc_reg_print_t ahc_cchcnt_print;
-#else
-#define ahc_cchcnt_print(regvalue, cur_col, wrap) \
-    ahc_print_register(NULL, 0, "CCHCNT", 0xe8, regvalue, cur_col, wrap)
-#endif
-#if AIC_DEBUG_REGISTERS
-ahc_reg_print_t ahc_ccsgram_print;
-#else
-#define ahc_ccsgram_print(regvalue, cur_col, wrap) \
-    ahc_print_register(NULL, 0, "CCSGRAM", 0xe9, regvalue, cur_col, wrap)
-#endif
-#if AIC_DEBUG_REGISTERS
-ahc_reg_print_t ahc_ccsgaddr_print;
-#else
-#define ahc_ccsgaddr_print(regvalue, cur_col, wrap) \
-    ahc_print_register(NULL, 0, "CCSGADDR", 0xea, regvalue, cur_col, wrap)
-#endif
-#if AIC_DEBUG_REGISTERS
-ahc_reg_print_t ahc_ccsgctl_print;
-#else
-#define ahc_ccsgctl_print(regvalue, cur_col, wrap) \
-    ahc_print_register(NULL, 0, "CCSGCTL", 0xeb, regvalue, cur_col, wrap)
-#endif
-#if AIC_DEBUG_REGISTERS
-ahc_reg_print_t ahc_ccscbram_print;
-#else
-#define ahc_ccscbram_print(regvalue, cur_col, wrap) \
-    ahc_print_register(NULL, 0, "CCSCBRAM", 0xec, regvalue, cur_col, wrap)
-#endif
-#if AIC_DEBUG_REGISTERS
-ahc_reg_print_t ahc_ccscbaddr_print;
-#else
-#define ahc_ccscbaddr_print(regvalue, cur_col, wrap) \
-    ahc_print_register(NULL, 0, "CCSCBADDR", 0xed, regvalue, cur_col, wrap)
-#endif
-#if AIC_DEBUG_REGISTERS
-ahc_reg_print_t ahc_ccscbctl_print;
-#else
-#define ahc_ccscbctl_print(regvalue, cur_col, wrap) \
-    ahc_print_register(NULL, 0, "CCSCBCTL", 0xee, regvalue, cur_col, wrap)
-#endif
-#if AIC_DEBUG_REGISTERS
-ahc_reg_print_t ahc_ccscbcnt_print;
-#else
-#define ahc_ccscbcnt_print(regvalue, cur_col, wrap) \
-    ahc_print_register(NULL, 0, "CCSCBCNT", 0xef, regvalue, cur_col, wrap)
-#endif
-#if AIC_DEBUG_REGISTERS
-ahc_reg_print_t ahc_scbbaddr_print;
-#else
-#define ahc_scbbaddr_print(regvalue, cur_col, wrap) \
-    ahc_print_register(NULL, 0, "SCBBADDR", 0xf0, regvalue, cur_col, wrap)
-#endif
-#if AIC_DEBUG_REGISTERS
-ahc_reg_print_t ahc_ccscbptr_print;
-#else
-#define ahc_ccscbptr_print(regvalue, cur_col, wrap) \
-    ahc_print_register(NULL, 0, "CCSCBPTR", 0xf1, regvalue, cur_col, wrap)
-#endif
-#if AIC_DEBUG_REGISTERS
-ahc_reg_print_t ahc_hnscb_qoff_print;
-#else
-#define ahc_hnscb_qoff_print(regvalue, cur_col, wrap) \
-    ahc_print_register(NULL, 0, "HNSCB_QOFF", 0xf4, regvalue, cur_col, wrap)
-#endif
-#if AIC_DEBUG_REGISTERS
-ahc_reg_print_t ahc_snscb_qoff_print;
-#else
-#define ahc_snscb_qoff_print(regvalue, cur_col, wrap) \
-    ahc_print_register(NULL, 0, "SNSCB_QOFF", 0xf6, regvalue, cur_col, wrap)
-#endif
-#if AIC_DEBUG_REGISTERS
-ahc_reg_print_t ahc_sdscb_qoff_print;
-#else
-#define ahc_sdscb_qoff_print(regvalue, cur_col, wrap) \
-    ahc_print_register(NULL, 0, "SDSCB_QOFF", 0xf8, regvalue, cur_col, wrap)
-#endif
-#if AIC_DEBUG_REGISTERS
-ahc_reg_print_t ahc_qoff_ctlsta_print;
-#else
-#define ahc_qoff_ctlsta_print(regvalue, cur_col, wrap) \
-    ahc_print_register(NULL, 0, "QOFF_CTLSTA", 0xfa, regvalue, cur_col, wrap)
-#endif
-#if AIC_DEBUG_REGISTERS
-ahc_reg_print_t ahc_dff_thrsh_print;
-#else
-#define ahc_dff_thrsh_print(regvalue, cur_col, wrap) \
-    ahc_print_register(NULL, 0, "DFF_THRSH", 0xfb, regvalue, cur_col, wrap)
-#endif
-#if AIC_DEBUG_REGISTERS
-ahc_reg_print_t ahc_sg_cache_shadow_print;
-#else
-#define ahc_sg_cache_shadow_print(regvalue, cur_col, wrap) \
-    ahc_print_register(NULL, 0, "SG_CACHE_SHADOW", 0xfc, regvalue, cur_col, wrap)
-#endif
-#if AIC_DEBUG_REGISTERS
-ahc_reg_print_t ahc_sg_cache_pre_print;
-#else
-#define ahc_sg_cache_pre_print(regvalue, cur_col, wrap) \
-    ahc_print_register(NULL, 0, "SG_CACHE_PRE", 0xfc, regvalue, cur_col, wrap)
-#endif
 #define SCSISEQ                         0x00
 #define         TEMODE                  0x80
diff --git a/drivers/scsi/aic7xxx/aic7xxx_reg_print.c_shipped b/drivers/scsi/aic7xxx/aic7xxx_reg_print.c_shipped
index 309a562b009e..9f9b88047d0c 100644
--- a/drivers/scsi/aic7xxx/aic7xxx_reg_print.c_shipped
+++ b/drivers/scsi/aic7xxx/aic7xxx_reg_print.c_shipped
@@ -43,48 +43,6 @@ ahc_sxfrctl0_print(u_int regvalue, u_int *cur_col, u_int wrap)
            0x01, regvalue, cur_col, wrap));
 }
-static const ahc_reg_parse_entry_t SXFRCTL1_parse_table[] = {
-        { "STPWEN",             0x01, 0x01 },
-        { "ACTNEGEN",           0x02, 0x02 },
-        { "ENSTIMER",           0x04, 0x04 },
-        { "ENSPCHK",            0x20, 0x20 },
-        { "SWRAPEN",            0x40, 0x40 },
-        { "BITBUCKET",          0x80, 0x80 },
-        { "STIMESEL",           0x18, 0x18 }
-};
-int
-ahc_sxfrctl1_print(u_int regvalue, u_int *cur_col, u_int wrap)
-{
-        return (ahc_print_register(SXFRCTL1_parse_table, 7, "SXFRCTL1",
-            0x02, regvalue, cur_col, wrap));
-}
-static const ahc_reg_parse_entry_t SCSISIGO_parse_table[] = {
-        { "ACKO",               0x01, 0x01 },
-        { "REQO",               0x02, 0x02 },
-        { "BSYO",               0x04, 0x04 },
-        { "SELO",               0x08, 0x08 },
-        { "ATNO",               0x10, 0x10 },
-        { "MSGO",               0x20, 0x20 },
-        { "IOO",                0x40, 0x40 },
-        { "CDO",                0x80, 0x80 },
-        { "P_DATAOUT",          0x00, 0x00 },
-        { "P_DATAIN",           0x40, 0x40 },
-        { "P_COMMAND",          0x80, 0x80 },
-        { "P_MESGOUT",          0xa0, 0xa0 },
-        { "P_STATUS",           0xc0, 0xc0 },
-        { "PHASE_MASK",         0xe0, 0xe0 },
-        { "P_MESGIN",           0xe0, 0xe0 }
-};
-int
-ahc_scsisigo_print(u_int regvalue, u_int *cur_col, u_int wrap)
-{
-        return (ahc_print_register(SCSISIGO_parse_table, 15, "SCSISIGO",
-            0x03, regvalue, cur_col, wrap));
-}
 static const ahc_reg_parse_entry_t SCSISIGI_parse_table[] = {
        { "ACKI",               0x01, 0x01 },
        { "REQI",               0x02, 0x02 },
@@ -128,77 +86,6 @@ ahc_scsirate_print(u_int regvalue, u_int *cur_col, u_int wrap)
            0x04, regvalue, cur_col, wrap));
 }
-static const ahc_reg_parse_entry_t SCSIID_parse_table[] = {
-        { "TWIN_CHNLB",         0x80, 0x80 },
-        { "OID",                0x0f, 0x0f },
-        { "TWIN_TID",           0x70, 0x70 },
-        { "SOFS_ULTRA2",        0x7f, 0x7f },
-        { "TID",                0xf0, 0xf0 }
-};
-int
-ahc_scsiid_print(u_int regvalue, u_int *cur_col, u_int wrap)
-{
-        return (ahc_print_register(SCSIID_parse_table, 5, "SCSIID",
-            0x05, regvalue, cur_col, wrap));
-}
-int
-ahc_scsidatl_print(u_int regvalue, u_int *cur_col, u_int wrap)
-{
-        return (ahc_print_register(NULL, 0, "SCSIDATL",
-            0x06, regvalue, cur_col, wrap));
-}
-int
-ahc_stcnt_print(u_int regvalue, u_int *cur_col, u_int wrap)
-{
-        return (ahc_print_register(NULL, 0, "STCNT",
-            0x08, regvalue, cur_col, wrap));
-}
-static const ahc_reg_parse_entry_t OPTIONMODE_parse_table[] = {
-        { "DIS_MSGIN_DUALEDGE", 0x01, 0x01 },
-        { "AUTO_MSGOUT_DE",     0x02, 0x02 },
-        { "SCSIDATL_IMGEN",     0x04, 0x04 },
-        { "EXPPHASEDIS",        0x08, 0x08 },
-        { "BUSFREEREV",         0x10, 0x10 },
-        { "ATNMGMNTEN",         0x20, 0x20 },
-        { "AUTOACKEN",          0x40, 0x40 },
-        { "AUTORATEEN",         0x80, 0x80 },
-        { "OPTIONMODE_DEFAULTS",0x03, 0x03 }
-};
-int
-ahc_optionmode_print(u_int regvalue, u_int *cur_col, u_int wrap)
-{
-        return (ahc_print_register(OPTIONMODE_parse_table, 9, "OPTIONMODE",
-            0x08, regvalue, cur_col, wrap));
-}
-int
-ahc_targcrccnt_print(u_int regvalue, u_int *cur_col, u_int wrap)
-{
-        return (ahc_print_register(NULL, 0, "TARGCRCCNT",
-            0x0a, regvalue, cur_col, wrap));
-}
-static const ahc_reg_parse_entry_t CLRSINT0_parse_table[] = {
-        { "CLRSPIORDY",         0x02, 0x02 },
-        { "CLRSWRAP",           0x08, 0x08 },
-        { "CLRIOERR",           0x08, 0x08 },
-        { "CLRSELINGO",         0x10, 0x10 },
-        { "CLRSELDI",           0x20, 0x20 },
-        { "CLRSELDO",           0x40, 0x40 }
-};
-int
-ahc_clrsint0_print(u_int regvalue, u_int *cur_col, u_int wrap)
-{
-        return (ahc_print_register(CLRSINT0_parse_table, 6, "CLRSINT0",
-            0x0b, regvalue, cur_col, wrap));
-}
 static const ahc_reg_parse_entry_t SSTAT0_parse_table[] = {
        { "DMADONE",            0x01, 0x01 },
        { "SPIORDY",            0x02, 0x02 },
@@ -218,23 +105,6 @@ ahc_sstat0_print(u_int regvalue, u_int *cur_col, u_int wrap)
            0x0b, regvalue, cur_col, wrap));
 }
-static const ahc_reg_parse_entry_t CLRSINT1_parse_table[] = {
-        { "CLRREQINIT",         0x01, 0x01 },
-        { "CLRPHASECHG",        0x02, 0x02 },
-        { "CLRSCSIPERR",        0x04, 0x04 },
-        { "CLRBUSFREE",         0x08, 0x08 },
-        { "CLRSCSIRSTI",        0x20, 0x20 },
-        { "CLRATNO",            0x40, 0x40 },
-        { "CLRSELTIMEO",        0x80, 0x80 }
-};
-int
-ahc_clrsint1_print(u_int regvalue, u_int *cur_col, u_int wrap)
-{
-        return (ahc_print_register(CLRSINT1_parse_table, 7, "CLRSINT1",
-            0x0c, regvalue, cur_col, wrap));
-}
 static const ahc_reg_parse_entry_t SSTAT1_parse_table[] = {
        { "REQINIT",            0x01, 0x01 },
        { "PHASECHG",           0x02, 0x02 },
@@ -284,18 +154,6 @@ ahc_sstat3_print(u_int regvalue, u_int *cur_col, u_int wrap)
            0x0e, regvalue, cur_col, wrap));
 }
-static const ahc_reg_parse_entry_t SCSIID_ULTRA2_parse_table[] = {
-        { "OID",                0x0f, 0x0f },
-        { "TID",                0xf0, 0xf0 }
-};
-int
-ahc_scsiid_ultra2_print(u_int regvalue, u_int *cur_col, u_int wrap)
-{
-        return (ahc_print_register(SCSIID_ULTRA2_parse_table, 2, "SCSIID_ULTRA2",
-            0x0f, regvalue, cur_col, wrap));
-}
 static const ahc_reg_parse_entry_t SIMODE0_parse_table[] = {
        { "ENDMADONE",          0x01, 0x01 },
        { "ENSPIORDY",          0x02, 0x02 },
@@ -339,107 +197,6 @@ ahc_scsibusl_print(u_int regvalue, u_int *cur_col, u_int wrap)
            0x12, regvalue, cur_col, wrap));
 }
-int
-ahc_shaddr_print(u_int regvalue, u_int *cur_col, u_int wrap)
-{
-        return (ahc_print_register(NULL, 0, "SHADDR",
-            0x14, regvalue, cur_col, wrap));
-}
-static const ahc_reg_parse_entry_t SELTIMER_parse_table[] = {
-        { "STAGE1",             0x01, 0x01 },
-        { "STAGE2",             0x02, 0x02 },
-        { "STAGE3",             0x04, 0x04 },
-        { "STAGE4",             0x08, 0x08 },
-        { "STAGE5",             0x10, 0x10 },
-        { "STAGE6",             0x20, 0x20 }
-};
-int
-ahc_seltimer_print(u_int regvalue, u_int *cur_col, u_int wrap)
-{
-        return (ahc_print_register(SELTIMER_parse_table, 6, "SELTIMER",
-            0x18, regvalue, cur_col, wrap));
-}
-static const ahc_reg_parse_entry_t SELID_parse_table[] = {
-        { "ONEBIT",             0x08, 0x08 },
-        { "SELID_MASK",         0xf0, 0xf0 }
-};
-int
-ahc_selid_print(u_int regvalue, u_int *cur_col, u_int wrap)
-{
-        return (ahc_print_register(SELID_parse_table, 2, "SELID",
-            0x19, regvalue, cur_col, wrap));
-}
-int
-ahc_targid_print(u_int regvalue, u_int *cur_col, u_int wrap)
-{
-        return (ahc_print_register(NULL, 0, "TARGID",
-            0x1b, regvalue, cur_col, wrap));
-}
-static const ahc_reg_parse_entry_t SPIOCAP_parse_table[] = {
-        { "SSPIOCPS",           0x01, 0x01 },
-        { "ROM",                0x02, 0x02 },
-        { "EEPROM",             0x04, 0x04 },
-        { "SEEPROM",            0x08, 0x08 },
-        { "EXT_BRDCTL",         0x10, 0x10 },
-        { "SOFTCMDEN",          0x20, 0x20 },
-        { "SOFT0",              0x40, 0x40 },
-        { "SOFT1",              0x80, 0x80 }
-};
-int
-ahc_spiocap_print(u_int regvalue, u_int *cur_col, u_int wrap)
-{
-        return (ahc_print_register(SPIOCAP_parse_table, 8, "SPIOCAP",
-            0x1b, regvalue, cur_col, wrap));
-}
-static const ahc_reg_parse_entry_t BRDCTL_parse_table[] = {
-        { "BRDCTL0",            0x01, 0x01 },
-        { "BRDSTB_ULTRA2",      0x01, 0x01 },
-        { "BRDCTL1",            0x02, 0x02 },
-        { "BRDRW_ULTRA2",       0x02, 0x02 },
-        { "BRDRW",              0x04, 0x04 },
-        { "BRDDAT2",            0x04, 0x04 },
-        { "BRDCS",              0x08, 0x08 },
-        { "BRDDAT3",            0x08, 0x08 },
-        { "BRDSTB",             0x10, 0x10 },
-        { "BRDDAT4",            0x10, 0x10 },
-        { "BRDDAT5",            0x20, 0x20 },
-        { "BRDDAT6",            0x40, 0x40 },
-        { "BRDDAT7",            0x80, 0x80 }
-};
-int
-ahc_brdctl_print(u_int regvalue, u_int *cur_col, u_int wrap)
-{
-        return (ahc_print_register(BRDCTL_parse_table, 13, "BRDCTL",
-            0x1d, regvalue, cur_col, wrap));
-}
-static const ahc_reg_parse_entry_t SEECTL_parse_table[] = {
-        { "SEEDI",              0x01, 0x01 },
-        { "SEEDO",              0x02, 0x02 },
-        { "SEECK",              0x04, 0x04 },
-        { "SEECS",              0x08, 0x08 },
-        { "SEERDY",             0x10, 0x10 },
-        { "SEEMS",              0x20, 0x20 },
-        { "EXTARBREQ",          0x40, 0x40 },
-        { "EXTARBACK",          0x80, 0x80 }
-};
-int
-ahc_seectl_print(u_int regvalue, u_int *cur_col, u_int wrap)
-{
-        return (ahc_print_register(SEECTL_parse_table, 8, "SEECTL",
-            0x1e, regvalue, cur_col, wrap));
-}
 static const ahc_reg_parse_entry_t SBLKCTL_parse_table[] = {
        { "XCVR",               0x01, 0x01 },
        { "SELWIDE",            0x02, 0x02 },
@@ -458,68 +215,6 @@ ahc_sblkctl_print(u_int regvalue, u_int *cur_col, u_int wrap)
            0x1f, regvalue, cur_col, wrap));
 }
-int
-ahc_busy_targets_print(u_int regvalue, u_int *cur_col, u_int wrap)
-{
-        return (ahc_print_register(NULL, 0, "BUSY_TARGETS",
-            0x20, regvalue, cur_col, wrap));
-}
-int
-ahc_ultra_enb_print(u_int regvalue, u_int *cur_col, u_int wrap)
-{
-        return (ahc_print_register(NULL, 0, "ULTRA_ENB",
-            0x30, regvalue, cur_col, wrap));
-}
-int
-ahc_disc_dsb_print(u_int regvalue, u_int *cur_col, u_int wrap)
-{
-        return (ahc_print_register(NULL, 0, "DISC_DSB",
-            0x32, regvalue, cur_col, wrap));
-}
-int
-ahc_mwi_residual_print(u_int regvalue, u_int *cur_col, u_int wrap)
-{
-        return (ahc_print_register(NULL, 0, "MWI_RESIDUAL",
-            0x38, regvalue, cur_col, wrap));
-}
-int
-ahc_next_queued_scb_print(u_int regvalue, u_int *cur_col, u_int wrap)
-{
-        return (ahc_print_register(NULL, 0, "NEXT_QUEUED_SCB",
-            0x39, regvalue, cur_col, wrap));
-}
-int
-ahc_msg_out_print(u_int regvalue, u_int *cur_col, u_int wrap)
-{
-        return (ahc_print_register(NULL, 0, "MSG_OUT",
-            0x3a, regvalue, cur_col, wrap));
-}
-static const ahc_reg_parse_entry_t DMAPARAMS_parse_table[] = {
-        { "FIFORESET",          0x01, 0x01 },
-        { "FIFOFLUSH",          0x02, 0x02 },
-        { "DIRECTION",          0x04, 0x04 },
-        { "HDMAEN",             0x08, 0x08 },
-        { "HDMAENACK",          0x08, 0x08 },
-        { "SDMAEN",             0x10, 0x10 },
-        { "SDMAENACK",          0x10, 0x10 },
-        { "SCSIEN",             0x20, 0x20 },
-        { "WIDEODD",            0x40, 0x40 },
-        { "PRELOADEN",          0x80, 0x80 }
-};
-int
-ahc_dmaparams_print(u_int regvalue, u_int *cur_col, u_int wrap)
-{
-        return (ahc_print_register(DMAPARAMS_parse_table, 10, "DMAPARAMS",
-            0x3b, regvalue, cur_col, wrap));
-}
 static const ahc_reg_parse_entry_t SEQ_FLAGS_parse_table[] = {
        { "NO_DISCONNECT",      0x01, 0x01 },
        { "SPHASE_PENDING",     0x02, 0x02 },
@@ -539,20 +234,6 @@ ahc_seq_flags_print(u_int regvalue, u_int *cur_col, u_int wrap)
            0x3c, regvalue, cur_col, wrap));
 }
-int
-ahc_saved_scsiid_print(u_int regvalue, u_int *cur_col, u_int wrap)
-{
-        return (ahc_print_register(NULL, 0, "SAVED_SCSIID",
-            0x3d, regvalue, cur_col, wrap));
-}
-int
-ahc_saved_lun_print(u_int regvalue, u_int *cur_col, u_int wrap)
-{
-        return (ahc_print_register(NULL, 0, "SAVED_LUN",
-            0x3e, regvalue, cur_col, wrap));
-}
 static const ahc_reg_parse_entry_t LASTPHASE_parse_table[] = {
        { "MSGI",               0x20, 0x20 },
        { "IOI",                0x40, 0x40 },
@@ -574,193 +255,6 @@ ahc_lastphase_print(u_int regvalue, u_int *cur_col, u_int wrap)
            0x3f, regvalue, cur_col, wrap));
 }
-int
-ahc_waiting_scbh_print(u_int regvalue, u_int *cur_col, u_int wrap)
-{
-        return (ahc_print_register(NULL, 0, "WAITING_SCBH",
-            0x40, regvalue, cur_col, wrap));
-}
-int
-ahc_disconnected_scbh_print(u_int regvalue, u_int *cur_col, u_int wrap)
-{
-        return (ahc_print_register(NULL, 0, "DISCONNECTED_SCBH",
-            0x41, regvalue, cur_col, wrap));
-}
-int
-ahc_free_scbh_print(u_int regvalue, u_int *cur_col, u_int wrap)
-{
-        return (ahc_print_register(NULL, 0, "FREE_SCBH",
-            0x42, regvalue, cur_col, wrap));
-}
-int
-ahc_hscb_addr_print(u_int regvalue, u_int *cur_col, u_int wrap)
-{
-        return (ahc_print_register(NULL, 0, "HSCB_ADDR",
-            0x44, regvalue, cur_col, wrap));
-}
-int
-ahc_shared_data_addr_print(u_int regvalue, u_int *cur_col, u_int wrap)
-{
-        return (ahc_print_register(NULL, 0, "SHARED_DATA_ADDR",
-            0x48, regvalue, cur_col, wrap));
-}
-int
-ahc_kernel_qinpos_print(u_int regvalue, u_int *cur_col, u_int wrap)
-{
-        return (ahc_print_register(NULL, 0, "KERNEL_QINPOS",
-            0x4c, regvalue, cur_col, wrap));
-}
-int
-ahc_qinpos_print(u_int regvalue, u_int *cur_col, u_int wrap)
-{
-        return (ahc_print_register(NULL, 0, "QINPOS",
-            0x4d, regvalue, cur_col, wrap));
-}
-int
-ahc_qoutpos_print(u_int regvalue, u_int *cur_col, u_int wrap)
-{
-        return (ahc_print_register(NULL, 0, "QOUTPOS",
-            0x4e, regvalue, cur_col, wrap));
-}
-int
-ahc_kernel_tqinpos_print(u_int regvalue, u_int *cur_col, u_int wrap)
-{
-        return (ahc_print_register(NULL, 0, "KERNEL_TQINPOS",
-            0x4f, regvalue, cur_col, wrap));
-}
-int
-ahc_tqinpos_print(u_int regvalue, u_int *cur_col, u_int wrap)
-{
-        return (ahc_print_register(NULL, 0, "TQINPOS",
-            0x50, regvalue, cur_col, wrap));
-}
-static const ahc_reg_parse_entry_t ARG_1_parse_table[] = {
-        { "CONT_TARG_SESSION",  0x02, 0x02 },
-        { "CONT_MSG_LOOP",      0x04, 0x04 },
-        { "EXIT_MSG_LOOP",      0x08, 0x08 },
-        { "MSGOUT_PHASEMIS",    0x10, 0x10 },
-        { "SEND_REJ",           0x20, 0x20 },
-        { "SEND_SENSE",         0x40, 0x40 },
-        { "SEND_MSG",           0x80, 0x80 }
-};
-int
-ahc_arg_1_print(u_int regvalue, u_int *cur_col, u_int wrap)
-{
-        return (ahc_print_register(ARG_1_parse_table, 7, "ARG_1",
-            0x51, regvalue, cur_col, wrap));
-}
-int
-ahc_arg_2_print(u_int regvalue, u_int *cur_col, u_int wrap)
-{
-        return (ahc_print_register(NULL, 0, "ARG_2",
-            0x52, regvalue, cur_col, wrap));
-}
-int
-ahc_last_msg_print(u_int regvalue, u_int *cur_col, u_int wrap)
-{
-        return (ahc_print_register(NULL, 0, "LAST_MSG",
-            0x53, regvalue, cur_col, wrap));
-}
-static const ahc_reg_parse_entry_t SCSISEQ_TEMPLATE_parse_table[] = {
-        { "ENAUTOATNP",         0x02, 0x02 },
-        { "ENAUTOATNI",         0x04, 0x04 },
-        { "ENAUTOATNO",         0x08, 0x08 },
-        { "ENRSELI",            0x10, 0x10 },
-        { "ENSELI",             0x20, 0x20 },
-        { "ENSELO",             0x40, 0x40 }
-};
-int
-ahc_scsiseq_template_print(u_int regvalue, u_int *cur_col, u_int wrap)
-{
-        return (ahc_print_register(SCSISEQ_TEMPLATE_parse_table, 6, "SCSISEQ_TEMPLATE",
-            0x54, regvalue, cur_col, wrap));
-}
-static const ahc_reg_parse_entry_t HA_274_BIOSGLOBAL_parse_table[] = {
-        { "HA_274_EXTENDED_TRANS",0x01, 0x01 }
-};
-int
-ahc_ha_274_biosglobal_print(u_int regvalue, u_int *cur_col, u_int wrap)
-{
-        return (ahc_print_register(HA_274_BIOSGLOBAL_parse_table, 1, "HA_274_BIOSGLOBAL",
-            0x56, regvalue, cur_col, wrap));
-}
-static const ahc_reg_parse_entry_t SEQ_FLAGS2_parse_table[] = {
-        { "SCB_DMA",            0x01, 0x01 },
-        { "TARGET_MSG_PENDING", 0x02, 0x02 }
-};
-int
-ahc_seq_flags2_print(u_int regvalue, u_int *cur_col, u_int wrap)
-{
-        return (ahc_print_register(SEQ_FLAGS2_parse_table, 2, "SEQ_FLAGS2",
-            0x57, regvalue, cur_col, wrap));
-}
-static const ahc_reg_parse_entry_t SCSICONF_parse_table[] = {
-        { "ENSPCHK",            0x20, 0x20 },
-        { "RESET_SCSI",         0x40, 0x40 },
-        { "TERM_ENB",           0x80, 0x80 },
-        { "HSCSIID",            0x07, 0x07 },
-        { "HWSCSIID",           0x0f, 0x0f }
-};
-int
-ahc_scsiconf_print(u_int regvalue, u_int *cur_col, u_int wrap)
-{
-        return (ahc_print_register(SCSICONF_parse_table, 5, "SCSICONF",
-            0x5a, regvalue, cur_col, wrap));
-}
-static const ahc_reg_parse_entry_t INTDEF_parse_table[] = {
-        { "EDGE_TRIG",          0x80, 0x80 },
-        { "VECTOR",             0x0f, 0x0f }
-};
-int
-ahc_intdef_print(u_int regvalue, u_int *cur_col, u_int wrap)
-{
-        return (ahc_print_register(INTDEF_parse_table, 2, "INTDEF",
-            0x5c, regvalue, cur_col, wrap));
-}
-int
-ahc_hostconf_print(u_int regvalue, u_int *cur_col, u_int wrap)
-{
-        return (ahc_print_register(NULL, 0, "HOSTCONF",
-            0x5d, regvalue, cur_col, wrap));
-}
-static const ahc_reg_parse_entry_t HA_274_BIOSCTRL_parse_table[] = {
-        { "CHANNEL_B_PRIMARY",  0x08, 0x08 },
-        { "BIOSMODE",           0x30, 0x30 },
-        { "BIOSDISABLED",       0x30, 0x30 }
-};
-int
-ahc_ha_274_biosctrl_print(u_int regvalue, u_int *cur_col, u_int wrap)
-{
-        return (ahc_print_register(HA_274_BIOSCTRL_parse_table, 3, "HA_274_BIOSCTRL",
-            0x5f, regvalue, cur_col, wrap));
-}
 static const ahc_reg_parse_entry_t SEQCTL_parse_table[] = {
        { "LOADRAM",            0x01, 0x01 },
        { "SEQRESET",           0x02, 0x02 },
@@ -780,285 +274,12 @@ ahc_seqctl_print(u_int regvalue, u_int *cur_col, u_int wrap)
 }
 int
-ahc_seqram_print(u_int regvalue, u_int *cur_col, u_int wrap)
-{
-        return (ahc_print_register(NULL, 0, "SEQRAM",
-            0x61, regvalue, cur_col, wrap));
-}
-int
-ahc_seqaddr0_print(u_int regvalue, u_int *cur_col, u_int wrap)
-{
-        return (ahc_print_register(NULL, 0, "SEQADDR0",
-            0x62, regvalue, cur_col, wrap));
-}
-static const ahc_reg_parse_entry_t SEQADDR1_parse_table[] = {
-        { "SEQADDR1_MASK",      0x01, 0x01 }
-};
-int
-ahc_seqaddr1_print(u_int regvalue, u_int *cur_col, u_int wrap)
-{
-        return (ahc_print_register(SEQADDR1_parse_table, 1, "SEQADDR1",
-            0x63, regvalue, cur_col, wrap));
-}
-int
-ahc_accum_print(u_int regvalue, u_int *cur_col, u_int wrap)
-{
-        return (ahc_print_register(NULL, 0, "ACCUM",
-            0x64, regvalue, cur_col, wrap));
-}
-int
-ahc_sindex_print(u_int regvalue, u_int *cur_col, u_int wrap)
-{
-        return (ahc_print_register(NULL, 0, "SINDEX",
-            0x65, regvalue, cur_col, wrap));
-}
-int
-ahc_dindex_print(u_int regvalue, u_int *cur_col, u_int wrap)
-{
-        return (ahc_print_register(NULL, 0, "DINDEX",
-            0x66, regvalue, cur_col, wrap));
-}
-int
-ahc_allones_print(u_int regvalue, u_int *cur_col, u_int wrap)
-{
-        return (ahc_print_register(NULL, 0, "ALLONES",
-            0x69, regvalue, cur_col, wrap));
-}
-int
-ahc_allzeros_print(u_int regvalue, u_int *cur_col, u_int wrap)
-{
-        return (ahc_print_register(NULL, 0, "ALLZEROS",
-            0x6a, regvalue, cur_col, wrap));
-}
-int
-ahc_none_print(u_int regvalue, u_int *cur_col, u_int wrap)
-{
-        return (ahc_print_register(NULL, 0, "NONE",
-            0x6a, regvalue, cur_col, wrap));
-}
-static const ahc_reg_parse_entry_t FLAGS_parse_table[] = {
-        { "CARRY",              0x01, 0x01 },
-        { "ZERO",               0x02, 0x02 }
-};
-int
-ahc_flags_print(u_int regvalue, u_int *cur_col, u_int wrap)
-{
-        return (ahc_print_register(FLAGS_parse_table, 2, "FLAGS",
-            0x6b, regvalue, cur_col, wrap));
-}
-int
-ahc_sindir_print(u_int regvalue, u_int *cur_col, u_int wrap)
-{
-        return (ahc_print_register(NULL, 0, "SINDIR",
-            0x6c, regvalue, cur_col, wrap));
-}
-int
-ahc_dindir_print(u_int regvalue, u_int *cur_col, u_int wrap)
-{
-        return (ahc_print_register(NULL, 0, "DINDIR",
-            0x6d, regvalue, cur_col, wrap));
-}
-int
-ahc_stack_print(u_int regvalue, u_int *cur_col, u_int wrap)
-{
-        return (ahc_print_register(NULL, 0, "STACK",
-            0x6f, regvalue, cur_col, wrap));
-}
-int
-ahc_targ_offset_print(u_int regvalue, u_int *cur_col, u_int wrap)
-{
-        return (ahc_print_register(NULL, 0, "TARG_OFFSET",
-            0x70, regvalue, cur_col, wrap));
-}
-int
 ahc_sram_base_print(u_int regvalue, u_int *cur_col, u_int wrap)
 {
        return (ahc_print_register(NULL, 0, "SRAM_BASE",
            0x70, regvalue, cur_col, wrap));
 }
-static const ahc_reg_parse_entry_t DSCOMMAND0_parse_table[] = {
-        { "CIOPARCKEN",         0x01, 0x01 },
-        { "USCBSIZE32",         0x02, 0x02 },
-        { "RAMPS",              0x04, 0x04 },
-        { "INTSCBRAMSEL",       0x08, 0x08 },
-        { "EXTREQLCK",          0x10, 0x10 },
-        { "MPARCKEN",           0x20, 0x20 },
-        { "DPARCKEN",           0x40, 0x40 },
-        { "CACHETHEN",          0x80, 0x80 }
-};
-int
-ahc_dscommand0_print(u_int regvalue, u_int *cur_col, u_int wrap)
-{
-        return (ahc_print_register(DSCOMMAND0_parse_table, 8, "DSCOMMAND0",
-            0x84, regvalue, cur_col, wrap));
-}
-static const ahc_reg_parse_entry_t BUSTIME_parse_table[] = {
-        { "BON",                0x0f, 0x0f },
-        { "BOFF",               0xf0, 0xf0 }
-};
-int
-ahc_bustime_print(u_int regvalue, u_int *cur_col, u_int wrap)
-{
-        return (ahc_print_register(BUSTIME_parse_table, 2, "BUSTIME",
-            0x85, regvalue, cur_col, wrap));
-}
-static const ahc_reg_parse_entry_t DSCOMMAND1_parse_table[] = {
-        { "HADDLDSEL0",         0x01, 0x01 },
-        { "HADDLDSEL1",         0x02, 0x02 },
-        { "DSLATT",             0xfc, 0xfc }
-};
-int
-ahc_dscommand1_print(u_int regvalue, u_int *cur_col, u_int wrap)
-{
-        return (ahc_print_register(DSCOMMAND1_parse_table, 3, "DSCOMMAND1",
-            0x85, regvalue, cur_col, wrap));
-}
-static const ahc_reg_parse_entry_t BUSSPD_parse_table[] = {
-        { "STBON",              0x07, 0x07 },
-        { "STBOFF",             0x38, 0x38 },
-        { "DFTHRSH_75",         0x80, 0x80 },
-        { "DFTHRSH",            0xc0, 0xc0 },
-        { "DFTHRSH_100",        0xc0, 0xc0 }
-};
-int
-ahc_busspd_print(u_int regvalue, u_int *cur_col, u_int wrap)
-{
-        return (ahc_print_register(BUSSPD_parse_table, 5, "BUSSPD",
-            0x86, regvalue, cur_col, wrap));
-}
-static const ahc_reg_parse_entry_t HS_MAILBOX_parse_table[] = {
-        { "SEQ_MAILBOX",        0x0f, 0x0f },
-        { "HOST_TQINPOS",       0x80, 0x80 },
-        { "HOST_MAILBOX",       0xf0, 0xf0 }
-};
-int
-ahc_hs_mailbox_print(u_int regvalue, u_int *cur_col, u_int wrap)
-{
-        return (ahc_print_register(HS_MAILBOX_parse_table, 3, "HS_MAILBOX",
-            0x86, regvalue, cur_col, wrap));
-}
-static const ahc_reg_parse_entry_t DSPCISTATUS_parse_table[] = {
-        { "DFTHRSH_100",        0xc0, 0xc0 }
-};
-int
-ahc_dspcistatus_print(u_int regvalue, u_int *cur_col, u_int wrap)
-{
-        return (ahc_print_register(DSPCISTATUS_parse_table, 1, "DSPCISTATUS",
-            0x86, regvalue, cur_col, wrap));
-}
-static const ahc_reg_parse_entry_t HCNTRL_parse_table[] = {
-        { "CHIPRST",            0x01, 0x01 },
-        { "CHIPRSTACK",         0x01, 0x01 },
-        { "INTEN",              0x02, 0x02 },
-        { "PAUSE",              0x04, 0x04 },
-        { "IRQMS",              0x08, 0x08 },
-        { "SWINT",              0x10, 0x10 },
-        { "POWRDN",             0x40, 0x40 }
-};
-int
-ahc_hcntrl_print(u_int regvalue, u_int *cur_col, u_int wrap)
-{
-        return (ahc_print_register(HCNTRL_parse_table, 7, "HCNTRL",
-            0x87, regvalue, cur_col, wrap));
-}
-int
-ahc_haddr_print(u_int regvalue, u_int *cur_col, u_int wrap)
-{
-        return (ahc_print_register(NULL, 0, "HADDR",
-            0x88, regvalue, cur_col, wrap));
-}
-int
-ahc_hcnt_print(u_int regvalue, u_int *cur_col, u_int wrap)
-{
-        return (ahc_print_register(NULL, 0, "HCNT",
-            0x8c, regvalue, cur_col, wrap));
-}
-int
-ahc_scbptr_print(u_int regvalue, u_int *cur_col, u_int wrap)
-{
-        return (ahc_print_register(NULL, 0, "SCBPTR",
-            0x90, regvalue, cur_col, wrap));
-}
-static const ahc_reg_parse_entry_t INTSTAT_parse_table[] = {
-        { "SEQINT",             0x01, 0x01 },
-        { "CMDCMPLT",           0x02, 0x02 },
-        { "SCSIINT",            0x04, 0x04 },
-        { "BRKADRINT",          0x08, 0x08 },
-        { "BAD_PHASE",          0x01, 0x01 },
-        { "INT_PEND",           0x0f, 0x0f },
-        { "SEND_REJECT",        0x11, 0x11 },
-        { "PROTO_VIOLATION",    0x21, 0x21 },
-        { "NO_MATCH",           0x31, 0x31 },
-        { "IGN_WIDE_RES",       0x41, 0x41 },
-        { "PDATA_REINIT",       0x51, 0x51 },
-        { "HOST_MSG_LOOP",      0x61, 0x61 },
-        { "BAD_STATUS",         0x71, 0x71 },
-        { "PERR_DETECTED",      0x81, 0x81 },
-        { "DATA_OVERRUN",       0x91, 0x91 },
-        { "MKMSG_FAILED",       0xa1, 0xa1 },
-        { "MISSED_BUSFREE",     0xb1, 0xb1 },
-        { "SCB_MISMATCH",       0xc1, 0xc1 },
-        { "NO_FREE_SCB",        0xd1, 0xd1 },
-        { "OUT_OF_RANGE",       0xe1, 0xe1 },
-        { "SEQINT_MASK",        0xf1, 0xf1 }
-};
-int
-ahc_intstat_print(u_int regvalue, u_int *cur_col, u_int wrap)
-{
-        return (ahc_print_register(INTSTAT_parse_table, 21, "INTSTAT",
-            0x91, regvalue, cur_col, wrap));
-}
-static const ahc_reg_parse_entry_t CLRINT_parse_table[] = {
-        { "CLRSEQINT",          0x01, 0x01 },
-        { "CLRCMDINT",          0x02, 0x02 },
-        { "CLRSCSIINT",         0x04, 0x04 },
-        { "CLRBRKADRINT",       0x08, 0x08 },
-        { "CLRPARERR",          0x10, 0x10 }
-};
-int
-ahc_clrint_print(u_int regvalue, u_int *cur_col, u_int wrap)
-{
-        return (ahc_print_register(CLRINT_parse_table, 5, "CLRINT",
-            0x92, regvalue, cur_col, wrap));
-}
 static const ahc_reg_parse_entry_t ERROR_parse_table[] = {
        { "ILLHADDR",           0x01, 0x01 },
        { "ILLSADDR",           0x02, 0x02 },
@@ -1115,62 +336,6 @@ ahc_dfstatus_print(u_int regvalue, u_int *cur_col, u_int wrap)
            0x94, regvalue, cur_col, wrap));
 }
-int
-ahc_dfwaddr_print(u_int regvalue, u_int *cur_col, u_int wrap)
-{
-        return (ahc_print_register(NULL, 0, "DFWADDR",
-            0x95, regvalue, cur_col, wrap));
-}
-int
-ahc_dfdat_print(u_int regvalue, u_int *cur_col, u_int wrap)
-{
-        return (ahc_print_register(NULL, 0, "DFDAT",
-            0x99, regvalue, cur_col, wrap));
-}
-static const ahc_reg_parse_entry_t SCBCNT_parse_table[] = {
-        { "SCBAUTO",            0x80, 0x80 },
-        { "SCBCNT_MASK",        0x1f, 0x1f }
-};
-int
-ahc_scbcnt_print(u_int regvalue, u_int *cur_col, u_int wrap)
-{
-        return (ahc_print_register(SCBCNT_parse_table, 2, "SCBCNT",
-            0x9a, regvalue, cur_col, wrap));
-}
-int
-ahc_qinfifo_print(u_int regvalue, u_int *cur_col, u_int wrap)
-{
-        return (ahc_print_register(NULL, 0, "QINFIFO",
-            0x9b, regvalue, cur_col, wrap));
-}
-int
-ahc_qoutfifo_print(u_int regvalue, u_int *cur_col, u_int wrap)
-{
-        return (ahc_print_register(NULL, 0, "QOUTFIFO",
-            0x9d, regvalue, cur_col, wrap));
-}
-static const ahc_reg_parse_entry_t CRCCONTROL1_parse_table[] = {
-        { "TARGCRCCNTEN",       0x04, 0x04 },
-        { "TARGCRCENDEN",       0x08, 0x08 },
-        { "CRCREQCHKEN",        0x10, 0x10 },
-        { "CRCENDCHKEN",        0x20, 0x20 },
-        { "CRCVALCHKEN",        0x40, 0x40 },
-        { "CRCONSEEN",          0x80, 0x80 }
-};
-int
-ahc_crccontrol1_print(u_int regvalue, u_int *cur_col, u_int wrap)
-{
-        return (ahc_print_register(CRCCONTROL1_parse_table, 6, "CRCCONTROL1",
-            0x9d, regvalue, cur_col, wrap));
-}
 static const ahc_reg_parse_entry_t SCSIPHASE_parse_table[] = {
        { "DATA_OUT_PHASE",     0x01, 0x01 },
        { "DATA_IN_PHASE",      0x02, 0x02 },
@@ -1188,17 +353,6 @@ ahc_scsiphase_print(u_int regvalue, u_int *cur_col, u_int wrap)
            0x9e, regvalue, cur_col, wrap));
 }
-static const ahc_reg_parse_entry_t SFUNCT_parse_table[] = {
-        { "ALT_MODE",           0x80, 0x80 }
-};
-int
-ahc_sfunct_print(u_int regvalue, u_int *cur_col, u_int wrap)
-{
-        return (ahc_print_register(SFUNCT_parse_table, 1, "SFUNCT",
-            0x9f, regvalue, cur_col, wrap));
-}
 int
 ahc_scb_base_print(u_int regvalue, u_int *cur_col, u_int wrap)
 {
@@ -1206,80 +360,6 @@ ahc_scb_base_print(u_int regvalue, u_int *cur_col, u_int wrap)
            0xa0, regvalue, cur_col, wrap));
 }
-int
-ahc_scb_cdb_ptr_print(u_int regvalue, u_int *cur_col, u_int wrap)
-{
-        return (ahc_print_register(NULL, 0, "SCB_CDB_PTR",
-            0xa0, regvalue, cur_col, wrap));
-}
-int
-ahc_scb_residual_sgptr_print(u_int regvalue, u_int *cur_col, u_int wrap)
-{
-        return (ahc_print_register(NULL, 0, "SCB_RESIDUAL_SGPTR",
-            0xa4, regvalue, cur_col, wrap));
-}
-int
-ahc_scb_scsi_status_print(u_int regvalue, u_int *cur_col, u_int wrap)
-{
-        return (ahc_print_register(NULL, 0, "SCB_SCSI_STATUS",
-            0xa8, regvalue, cur_col, wrap));
-}
-int
-ahc_scb_target_phases_print(u_int regvalue, u_int *cur_col, u_int wrap)
-{
-        return (ahc_print_register(NULL, 0, "SCB_TARGET_PHASES",
-            0xa9, regvalue, cur_col, wrap));
-}
-int
-ahc_scb_target_data_dir_print(u_int regvalue, u_int *cur_col, u_int wrap)
-{
-        return (ahc_print_register(NULL, 0, "SCB_TARGET_DATA_DIR",
-            0xaa, regvalue, cur_col, wrap));
-}
-int
-ahc_scb_target_itag_print(u_int regvalue, u_int *cur_col, u_int wrap)
-{
-        return (ahc_print_register(NULL, 0, "SCB_TARGET_ITAG",
-            0xab, regvalue, cur_col, wrap));
-}
-int
-ahc_scb_dataptr_print(u_int regvalue, u_int *cur_col, u_int wrap)
-{
-        return (ahc_print_register(NULL, 0, "SCB_DATAPTR",
-            0xac, regvalue, cur_col, wrap));
-}
-static const ahc_reg_parse_entry_t SCB_DATACNT_parse_table[] = {
-        { "SG_LAST_SEG",        0x80, 0x80 },
-        { "SG_HIGH_ADDR_BITS",  0x7f, 0x7f }
-};
-int
-ahc_scb_datacnt_print(u_int regvalue, u_int *cur_col, u_int wrap)
-{
-        return (ahc_print_register(SCB_DATACNT_parse_table, 2, "SCB_DATACNT",
-            0xb0, regvalue, cur_col, wrap));
-}
-static const ahc_reg_parse_entry_t SCB_SGPTR_parse_table[] = {
-        { "SG_LIST_NULL",       0x01, 0x01 },
-        { "SG_FULL_RESID",      0x02, 0x02 },
-        { "SG_RESID_VALID",     0x04, 0x04 }
-};
-int
-ahc_scb_sgptr_print(u_int regvalue, u_int *cur_col, u_int wrap)
-{
-        return (ahc_print_register(SCB_SGPTR_parse_table, 3, "SCB_SGPTR",
-            0xb4, regvalue, cur_col, wrap));
-}
 static const ahc_reg_parse_entry_t SCB_CONTROL_parse_table[] = {
        { "DISCONNECTED",       0x04, 0x04 },
        { "ULTRAENB",           0x08, 0x08 },
@@ -1331,248 +411,3 @@ ahc_scb_tag_print(u_int regvalue, u_int *cur_col, u_int wrap)
            0xbb, regvalue, cur_col, wrap));
 }
-int
-ahc_scb_cdb_len_print(u_int regvalue, u_int *cur_col, u_int wrap)
-{
-        return (ahc_print_register(NULL, 0, "SCB_CDB_LEN",
-            0xbc, regvalue, cur_col, wrap));
-}
-int
-ahc_scb_scsirate_print(u_int regvalue, u_int *cur_col, u_int wrap)
-{
-        return (ahc_print_register(NULL, 0, "SCB_SCSIRATE",
-            0xbd, regvalue, cur_col, wrap));
-}
-int
-ahc_scb_scsioffset_print(u_int regvalue, u_int *cur_col, u_int wrap)
-{
-        return (ahc_print_register(NULL, 0, "SCB_SCSIOFFSET",
-            0xbe, regvalue, cur_col, wrap));
-}
-int
-ahc_scb_next_print(u_int regvalue, u_int *cur_col, u_int wrap)
-{
-        return (ahc_print_register(NULL, 0, "SCB_NEXT",
-            0xbf, regvalue, cur_col, wrap));
-}
-static const ahc_reg_parse_entry_t SEECTL_2840_parse_table[] = {
-        { "DO_2840",            0x01, 0x01 },
-        { "CK_2840",            0x02, 0x02 },
-        { "CS_2840",            0x04, 0x04 }
-};
-int
-ahc_seectl_2840_print(u_int regvalue, u_int *cur_col, u_int wrap)
-{
-        return (ahc_print_register(SEECTL_2840_parse_table, 3, "SEECTL_2840",
-            0xc0, regvalue, cur_col, wrap));
-}
-static const ahc_reg_parse_entry_t STATUS_2840_parse_table[] = {
-        { "DI_2840",            0x01, 0x01 },
-        { "EEPROM_TF",          0x80, 0x80 },
-        { "ADSEL",              0x1e, 0x1e },
-        { "BIOS_SEL",           0x60, 0x60 }
-};
-int
-ahc_status_2840_print(u_int regvalue, u_int *cur_col, u_int wrap)
-{
-        return (ahc_print_register(STATUS_2840_parse_table, 4, "STATUS_2840",
-            0xc1, regvalue, cur_col, wrap));
-}
-int
-ahc_scb_64_btt_print(u_int regvalue, u_int *cur_col, u_int wrap)
-{
-        return (ahc_print_register(NULL, 0, "SCB_64_BTT",
-            0xd0, regvalue, cur_col, wrap));
-}
-int
-ahc_cchaddr_print(u_int regvalue, u_int *cur_col, u_int wrap)
-{
-        return (ahc_print_register(NULL, 0, "CCHADDR",
-            0xe0, regvalue, cur_col, wrap));
-}
-int
-ahc_cchcnt_print(u_int regvalue, u_int *cur_col, u_int wrap)
-{
-        return (ahc_print_register(NULL, 0, "CCHCNT",
-            0xe8, regvalue, cur_col, wrap));
-}
-int
-ahc_ccsgram_print(u_int regvalue, u_int *cur_col, u_int wrap)
-{
-        return (ahc_print_register(NULL, 0, "CCSGRAM",
-            0xe9, regvalue, cur_col, wrap));
-}
-int
-ahc_ccsgaddr_print(u_int regvalue, u_int *cur_col, u_int wrap)
-{
-        return (ahc_print_register(NULL, 0, "CCSGADDR",
-            0xea, regvalue, cur_col, wrap));
-}
-static const ahc_reg_parse_entry_t CCSGCTL_parse_table[] = {
-        { "CCSGRESET",          0x01, 0x01 },
-        { "SG_FETCH_NEEDED",    0x02, 0x02 },
-        { "CCSGEN",             0x08, 0x08 },
-        { "CCSGDONE",           0x80, 0x80 }
-};
-int
-ahc_ccsgctl_print(u_int regvalue, u_int *cur_col, u_int wrap)
-{
-        return (ahc_print_register(CCSGCTL_parse_table, 4, "CCSGCTL",
-            0xeb, regvalue, cur_col, wrap));
-}
-int
-ahc_ccscbram_print(u_int regvalue, u_int *cur_col, u_int wrap)
-{
-        return (ahc_print_register(NULL, 0, "CCSCBRAM",
-            0xec, regvalue, cur_col, wrap));
-}
-int
-ahc_ccscbaddr_print(u_int regvalue, u_int *cur_col, u_int wrap)
-{
-        return (ahc_print_register(NULL, 0, "CCSCBADDR",
-            0xed, regvalue, cur_col, wrap));
-}
-static const ahc_reg_parse_entry_t CCSCBCTL_parse_table[] = {
-        { "CCSCBRESET",         0x01, 0x01 },
-        { "CCSCBDIR",           0x04, 0x04 },
-        { "CCSCBEN",            0x08, 0x08 },
-        { "CCARREN",            0x10, 0x10 },
-        { "ARRDONE",            0x40, 0x40 },
-        { "CCSCBDONE",          0x80, 0x80 }
-};
-int
-ahc_ccscbctl_print(u_int regvalue, u_int *cur_col, u_int wrap)
-{
-        return (ahc_print_register(CCSCBCTL_parse_table, 6, "CCSCBCTL",
-            0xee, regvalue, cur_col, wrap));
-}
-int
-ahc_ccscbcnt_print(u_int regvalue, u_int *cur_col, u_int wrap)
-{
-        return (ahc_print_register(NULL, 0, "CCSCBCNT",
-            0xef, regvalue, cur_col, wrap));
-}
-int
-ahc_scbbaddr_print(u_int regvalue, u_int *cur_col, u_int wrap)
-{
-        return (ahc_print_register(NULL, 0, "SCBBADDR",
-            0xf0, regvalue, cur_col, wrap));
-}
-int
-ahc_ccscbptr_print(u_int regvalue, u_int *cur_col, u_int wrap)
-{
-        return (ahc_print_register(NULL, 0, "CCSCBPTR",
-            0xf1, regvalue, cur_col, wrap));
-}
-int
-ahc_hnscb_qoff_print(u_int regvalue, u_int *cur_col, u_int wrap)
-{
-        return (ahc_print_register(NULL, 0, "HNSCB_QOFF",
-            0xf4, regvalue, cur_col, wrap));
-}
-int
-ahc_snscb_qoff_print(u_int regvalue, u_int *cur_col, u_int wrap)
-{
-        return (ahc_print_register(NULL, 0, "SNSCB_QOFF",
-            0xf6, regvalue, cur_col, wrap));
-}
-int
-ahc_sdscb_qoff_print(u_int regvalue, u_int *cur_col, u_int wrap)
-{
-        return (ahc_print_register(NULL, 0, "SDSCB_QOFF",
-            0xf8, regvalue, cur_col, wrap));
-}
-static const ahc_reg_parse_entry_t QOFF_CTLSTA_parse_table[] = {
-        { "SDSCB_ROLLOVER",     0x10, 0x10 },
-        { "SNSCB_ROLLOVER",     0x20, 0x20 },
-        { "SCB_AVAIL",          0x40, 0x40 },
-        { "SCB_QSIZE_256",      0x06, 0x06 },
-        { "SCB_QSIZE",          0x07, 0x07 }
-};
-int
-ahc_qoff_ctlsta_print(u_int regvalue, u_int *cur_col, u_int wrap)
-{
-        return (ahc_print_register(QOFF_CTLSTA_parse_table, 5, "QOFF_CTLSTA",
-            0xfa, regvalue, cur_col, wrap));
-}
-static const ahc_reg_parse_entry_t DFF_THRSH_parse_table[] = {
-        { "RD_DFTHRSH_MIN",     0x00, 0x00 },
-        { "WR_DFTHRSH_MIN",     0x00, 0x00 },
-        { "RD_DFTHRSH_25",      0x01, 0x01 },
-        { "RD_DFTHRSH_50",      0x02, 0x02 },
-        { "RD_DFTHRSH_63",      0x03, 0x03 },
-        { "RD_DFTHRSH_75",      0x04, 0x04 },
-        { "RD_DFTHRSH_85",      0x05, 0x05 },
-        { "RD_DFTHRSH_90",      0x06, 0x06 },
-        { "RD_DFTHRSH",         0x07, 0x07 },
-        { "RD_DFTHRSH_MAX",     0x07, 0x07 },
-        { "WR_DFTHRSH_25",      0x10, 0x10 },
-        { "WR_DFTHRSH_50",      0x20, 0x20 },
-        { "WR_DFTHRSH_63",      0x30, 0x30 },
-        { "WR_DFTHRSH_75",      0x40, 0x40 },
-        { "WR_DFTHRSH_85",      0x50, 0x50 },
-        { "WR_DFTHRSH_90",      0x60, 0x60 },
-        { "WR_DFTHRSH",         0x70, 0x70 },
-        { "WR_DFTHRSH_MAX",     0x70, 0x70 }
-};
-int
-ahc_dff_thrsh_print(u_int regvalue, u_int *cur_col, u_int wrap)
-{
-        return (ahc_print_register(DFF_THRSH_parse_table, 18, "DFF_THRSH",
-            0xfb, regvalue, cur_col, wrap));
-}
-static const ahc_reg_parse_entry_t SG_CACHE_SHADOW_parse_table[] = {
-        { "LAST_SEG_DONE",      0x01, 0x01 },
-        { "LAST_SEG",           0x02, 0x02 },
-        { "SG_ADDR_MASK",       0xf8, 0xf8 }
-};
-int
-ahc_sg_cache_shadow_print(u_int regvalue, u_int *cur_col, u_int wrap)
-{
-        return (ahc_print_register(SG_CACHE_SHADOW_parse_table, 3, "SG_CACHE_SHADOW",
-            0xfc, regvalue, cur_col, wrap));
-}
-static const ahc_reg_parse_entry_t SG_CACHE_PRE_parse_table[] = {
-        { "LAST_SEG_DONE",      0x01, 0x01 },
-        { "LAST_SEG",           0x02, 0x02 },
-        { "SG_ADDR_MASK",       0xf8, 0xf8 }
-};
-int
-ahc_sg_cache_pre_print(u_int regvalue, u_int *cur_col, u_int wrap)
-{
-        return (ahc_print_register(SG_CACHE_PRE_parse_table, 3, "SG_CACHE_PRE",
-            0xfc, regvalue, cur_col, wrap));
-}
diff --git a/drivers/scsi/aic7xxx/aicasm/aicasm_gram.y b/drivers/scsi/aic7xxx/aicasm/aicasm_gram.y
index 81be6a261cc8..e4064433842e 100644
--- a/drivers/scsi/aic7xxx/aicasm/aicasm_gram.y
+++ b/drivers/scsi/aic7xxx/aicasm/aicasm_gram.y
@@ -147,6 +147,8 @@ void yyerror(const char *string);
 %token T_ACCESS_MODE
+%token T_DONT_GENERATE_DEBUG_CODE
 %token T_MODES
 %token T_DEFINE
@@ -357,6 +359,7 @@ reg_attribute:
 |       size
 |       count
 |       access_mode
+|       dont_generate_debug_code
 |       modes
 |       field_defn
 |       enum_defn
@@ -410,6 +413,13 @@ access_mode:
        }
 ;
+dont_generate_debug_code:
+        T_DONT_GENERATE_DEBUG_CODE
+        {
+                cur_symbol->dont_generate_debug_code = 1;
+        }
+;
 modes:
        T_MODES mode_list
        {
diff --git a/drivers/scsi/aic7xxx/aicasm/aicasm_scan.l b/drivers/scsi/aic7xxx/aicasm/aicasm_scan.l
index 2c7f02daf88d..93c8667cd704 100644
--- a/drivers/scsi/aic7xxx/aicasm/aicasm_scan.l
+++ b/drivers/scsi/aic7xxx/aicasm/aicasm_scan.l
@@ -164,6 +164,7 @@ download		{ return T_DOWNLOAD; }
 address                 { return T_ADDRESS; }
 count                   { return T_COUNT; }
 access_mode             { return T_ACCESS_MODE; }
+dont_generate_debug_code { return T_DONT_GENERATE_DEBUG_CODE; }
 modes                   { return T_MODES; }
 RW|RO|WO                {
                                 if (strcmp(yytext, "RW") == 0)
diff --git a/drivers/scsi/aic7xxx/aicasm/aicasm_symbol.c b/drivers/scsi/aic7xxx/aicasm/aicasm_symbol.c
index fcd357872b43..078ed600f47a 100644
--- a/drivers/scsi/aic7xxx/aicasm/aicasm_symbol.c
+++ b/drivers/scsi/aic7xxx/aicasm/aicasm_symbol.c
@@ -539,6 +539,9 @@ symtable_dump(FILE *ofile, FILE *dfile)
        aic_print_include(dfile, stock_include_file);
        SLIST_FOREACH(curnode, &registers, links) {
+                if (curnode->symbol->dont_generate_debug_code)
+                        continue;
                switch(curnode->symbol->type) {
                case REGISTER:
                case SCBLOC:
diff --git a/drivers/scsi/aic7xxx/aicasm/aicasm_symbol.h b/drivers/scsi/aic7xxx/aicasm/aicasm_symbol.h
index 05190c1a2fb7..2ba73ae7c777 100644
--- a/drivers/scsi/aic7xxx/aicasm/aicasm_symbol.h
+++ b/drivers/scsi/aic7xxx/aicasm/aicasm_symbol.h
@@ -137,7 +137,8 @@ typedef struct symbol {
                struct label_info *linfo;
                struct cond_info  *condinfo;
                struct macro_info *macroinfo;
-        }info;
+        } info;
+        int     dont_generate_debug_code;
 } symbol_t;
 typedef struct symbol_ref {
diff --git a/drivers/scsi/arcmsr/arcmsr_attr.c b/drivers/scsi/arcmsr/arcmsr_attr.c
index 69f8346aa288..5877f29a6005 100644
--- a/drivers/scsi/arcmsr/arcmsr_attr.c
+++ b/drivers/scsi/arcmsr/arcmsr_attr.c
@@ -189,7 +189,6 @@ static struct bin_attribute arcmsr_sysfs_message_read_attr = {
        .attr = {
                .name = "mu_read",
                .mode = S_IRUSR ,
-                .owner = THIS_MODULE,
        },
        .size = 1032,
        .read = arcmsr_sysfs_iop_message_read,
@@ -199,7 +198,6 @@ static struct bin_attribute arcmsr_sysfs_message_write_attr = {
        .attr = {
                .name = "mu_write",
                .mode = S_IWUSR,
-                .owner = THIS_MODULE,
        },
        .size = 1032,
        .write = arcmsr_sysfs_iop_message_write,
@@ -209,7 +207,6 @@ static struct bin_attribute arcmsr_sysfs_message_clear_attr = {
        .attr = {
                .name = "mu_clear",
                .mode = S_IWUSR,
-                .owner = THIS_MODULE,
        },
        .size = 1,
        .write = arcmsr_sysfs_iop_message_clear,
diff --git a/drivers/scsi/atari_dma_emul.c b/drivers/scsi/atari_dma_emul.c
deleted file mode 100644
index cdc710ea00fa..000000000000
--- a/drivers/scsi/atari_dma_emul.c
+++ /dev/null
@@ -1,468 +0,0 @@
-/*
- * atari_dma_emul.c -- TT SCSI DMA emulator for the Hades.
- *
- * Copyright 1997 Wout Klaren <W.Klaren@inter.nl.net>
- *
- * This file is subject to the terms and conditions of the GNU General Public
- * License.  See the file COPYING in the main directory of this archive
- * for more details.
- *
- * This code was written using the Hades TOS source code as a
- * reference. This source code can be found on the home page
- * of Medusa Computer Systems.
- *
- * Version 0.1, 1997-09-24.
- * 
- * This code should be considered experimental. It has only been
- * tested on a Hades with a 68060. It might not work on a Hades
- * with a 68040. Make backups of your hard drives before using
- * this code.
- */
-#include <linux/compiler.h>
-#include <asm/thread_info.h>
-#include <asm/uaccess.h>
-#define hades_dma_ctrl          (*(unsigned char *) 0xffff8717)
-#define hades_psdm_reg          (*(unsigned char *) 0xffff8741)
-#define TRANSFER_SIZE           16
-struct m68040_frame {
-        unsigned long  effaddr;  /* effective address */
-        unsigned short ssw;      /* special status word */
-        unsigned short wb3s;     /* write back 3 status */
-        unsigned short wb2s;     /* write back 2 status */
-        unsigned short wb1s;     /* write back 1 status */
-        unsigned long  faddr;    /* fault address */
-        unsigned long  wb3a;     /* write back 3 address */
-        unsigned long  wb3d;     /* write back 3 data */
-        unsigned long  wb2a;     /* write back 2 address */
-        unsigned long  wb2d;     /* write back 2 data */
-        unsigned long  wb1a;     /* write back 1 address */
-        unsigned long  wb1dpd0;  /* write back 1 data/push data 0*/
-        unsigned long  pd1;      /* push data 1*/
-        unsigned long  pd2;      /* push data 2*/
-        unsigned long  pd3;      /* push data 3*/
-};
-static void writeback (unsigned short wbs, unsigned long wba,
-                       unsigned long wbd, void *old_buserr)
-{
-        mm_segment_t fs = get_fs();
-        static void *save_buserr;
-        __asm__ __volatile__ ("movec.l  %%vbr,%%a0\n\t"
-                              "move.l   %0,8(%%a0)\n\t"
-                              :
-                              : "r" (&&bus_error)
-                              : "a0" );
-        save_buserr = old_buserr;
-        set_fs (MAKE_MM_SEG(wbs & WBTM_040));
-        switch (wbs & WBSIZ_040) {
-            case BA_SIZE_BYTE:
-                put_user (wbd & 0xff, (char *)wba);
-                break;
-            case BA_SIZE_WORD:
-                put_user (wbd & 0xffff, (short *)wba);
-                break;
-            case BA_SIZE_LONG:
-                put_user (wbd, (int *)wba);
-                break;
-        }
-        set_fs (fs);
-        return;
-bus_error:
-        __asm__ __volatile__ ("cmp.l    %0,2(%%sp)\n\t"
-                              "bcs.s    .jump_old\n\t"
-                              "cmp.l    %1,2(%%sp)\n\t"
-                              "bls.s    .restore_old\n"
-                        ".jump_old:\n\t"
-                              "move.l   %2,-(%%sp)\n\t"
-                              "rts\n"
-                        ".restore_old:\n\t"
-                              "move.l   %%a0,-(%%sp)\n\t"
-                              "movec.l  %%vbr,%%a0\n\t"
-                              "move.l   %2,8(%%a0)\n\t"
-                              "move.l   (%%sp)+,%%a0\n\t"
-                              "rte\n\t"
-                              :
-                              : "i" (writeback), "i" (&&bus_error),
-                                "m" (save_buserr) );
-}
-/*
- * static inline void set_restdata_reg(unsigned char *cur_addr)
- *
- * Set the rest data register if necessary.
- */
-static inline void set_restdata_reg(unsigned char *cur_addr)
-{
-        if (((long) cur_addr & ~3) != 0)
-                tt_scsi_dma.dma_restdata =
-                        *((unsigned long *) ((long) cur_addr & ~3));
-}
-/*
- * void hades_dma_emulator(int irq, void *dummy)
- * 
- * This code emulates TT SCSI DMA on the Hades.
- * 
- * Note the following:
- * 
- * 1. When there is no byte available to read from the SCSI bus, or
- *    when a byte cannot yet bet written to the SCSI bus, a bus
- *    error occurs when reading or writing the pseudo DMA data
- *    register (hades_psdm_reg). We have to catch this bus error
- *    and try again to read or write the byte. If after several tries
- *    we still get a bus error, the interrupt handler is left. When
- *    the byte can be read or written, the interrupt handler is
- *    called again.
- * 
- * 2. The SCSI interrupt must be disabled in this interrupt handler.
- * 
- * 3. If we set the EOP signal, the SCSI controller still expects one
- *    byte to be read or written. Therefore the last byte is transferred
- *    separately, after setting the EOP signal.
- * 
- * 4. When this function is left, the address pointer (start_addr) is
- *    converted to a physical address. Because it points one byte
- *    further than the last transferred byte, it can point outside the
- *    current page. If virt_to_phys() is called with this address we
- *    might get an access error. Therefore virt_to_phys() is called with
- *    start_addr - 1 if the count has reached zero. The result is
- *    increased with one.
- */
-static irqreturn_t hades_dma_emulator(int irq, void *dummy)
-{
-        unsigned long dma_base;
-        register unsigned long dma_cnt asm ("d3");
-        static long save_buserr;
-        register unsigned long save_sp asm ("d4");
-        register int tries asm ("d5");
-        register unsigned char *start_addr asm ("a3"), *end_addr asm ("a4");
-        register unsigned char *eff_addr;
-        register unsigned char *psdm_reg;
-        unsigned long rem;
-        atari_disable_irq(IRQ_TT_MFP_SCSI);
-        /*
-         * Read the dma address and count registers.
-         */
-        dma_base = SCSI_DMA_READ_P(dma_addr);
-        dma_cnt = SCSI_DMA_READ_P(dma_cnt);
-        /*
-         * Check if DMA is still enabled.
-         */
-        if ((tt_scsi_dma.dma_ctrl & 2) == 0)
-        {
-                atari_enable_irq(IRQ_TT_MFP_SCSI);
-                return IRQ_HANDLED;
-        }
-        if (dma_cnt == 0)
-        {
-                printk(KERN_NOTICE "DMA emulation: count is zero.\n");
-                tt_scsi_dma.dma_ctrl &= 0xfd;   /* DMA ready. */
-                atari_enable_irq(IRQ_TT_MFP_SCSI);
-                return IRQ_HANDLED;
-        }
-        /*
-         * Install new bus error routine.
-         */
-        __asm__ __volatile__ ("movec.l  %%vbr,%%a0\n\t"
-                              "move.l   8(%%a0),%0\n\t"
-                              "move.l   %1,8(%%a0)\n\t"
-                              : "=&r" (save_buserr)
-                              : "r" (&&scsi_bus_error)
-                              : "a0" );
-        hades_dma_ctrl &= 0xfc;         /* Bus error and EOP off. */
-        /*
-         * Save the stack pointer.
-         */
-        __asm__ __volatile__ ("move.l   %%sp,%0\n\t"
-                              : "=&r" (save_sp) );
-        tries = 100;                    /* Maximum number of bus errors. */
-        start_addr = phys_to_virt(dma_base);
-        end_addr = start_addr + dma_cnt;
-scsi_loop:
-        dma_cnt--;
-        rem = dma_cnt & (TRANSFER_SIZE - 1);
-        dma_cnt &= ~(TRANSFER_SIZE - 1);
-        psdm_reg = &hades_psdm_reg;
-        if (tt_scsi_dma.dma_ctrl & 1)   /* Read or write? */
-        {
-                /*
-                 * SCSI write. Abort when count is zero.
-                 */
-                switch (rem)
-                {
-                case 0:
-                        while (dma_cnt > 0)
-                        {
-                                dma_cnt -= TRANSFER_SIZE;
-                                *psdm_reg = *start_addr++;
-                case 15:
-                                *psdm_reg = *start_addr++;
-                case 14:
-                                *psdm_reg = *start_addr++;
-                case 13:
-                                *psdm_reg = *start_addr++;
-                case 12:
-                                *psdm_reg = *start_addr++;
-                case 11:
-                                *psdm_reg = *start_addr++;
-                case 10:
-                                *psdm_reg = *start_addr++;
-                case 9:
-                                *psdm_reg = *start_addr++;
-                case 8:
-                                *psdm_reg = *start_addr++;
-                case 7:
-                                *psdm_reg = *start_addr++;
-                case 6:
-                                *psdm_reg = *start_addr++;
-                case 5:
-                                *psdm_reg = *start_addr++;
-                case 4:
-                                *psdm_reg = *start_addr++;
-                case 3:
-                                *psdm_reg = *start_addr++;
-                case 2:
-                                *psdm_reg = *start_addr++;
-                case 1:
-                                *psdm_reg = *start_addr++;
-                        }
-                }
-                hades_dma_ctrl |= 1;    /* Set EOP. */
-                udelay(10);
-                *psdm_reg = *start_addr++;      /* Dummy byte. */
-                tt_scsi_dma.dma_ctrl &= 0xfd;   /* DMA ready. */
-        }
-        else
-        {
-                /*
-                 * SCSI read. Abort when count is zero.
-                 */
-                switch (rem)
-                {
-                case 0:
-                        while (dma_cnt > 0)
-                        {
-                                dma_cnt -= TRANSFER_SIZE;
-                                *start_addr++ = *psdm_reg;
-                case 15:
-                                *start_addr++ = *psdm_reg;
-                case 14:
-                                *start_addr++ = *psdm_reg;
-                case 13:
-                                *start_addr++ = *psdm_reg;
-                case 12:
-                                *start_addr++ = *psdm_reg;
-                case 11:
-                                *start_addr++ = *psdm_reg;
-                case 10:
-                                *start_addr++ = *psdm_reg;
-                case 9:
-                                *start_addr++ = *psdm_reg;
-                case 8:
-                                *start_addr++ = *psdm_reg;
-                case 7:
-                                *start_addr++ = *psdm_reg;
-                case 6:
-                                *start_addr++ = *psdm_reg;
-                case 5:
-                                *start_addr++ = *psdm_reg;
-                case 4:
-                                *start_addr++ = *psdm_reg;
-                case 3:
-                                *start_addr++ = *psdm_reg;
-                case 2:
-                                *start_addr++ = *psdm_reg;
-                case 1:
-                                *start_addr++ = *psdm_reg;
-                        }
-                }
-                hades_dma_ctrl |= 1;    /* Set EOP. */
-                udelay(10);
-                *start_addr++ = *psdm_reg;
-                tt_scsi_dma.dma_ctrl &= 0xfd;   /* DMA ready. */
-                set_restdata_reg(start_addr);
-        }
-        if (start_addr != end_addr)
-                printk(KERN_CRIT "DMA emulation: FATAL: Count is not zero at end of transfer.\n");
-        dma_cnt = end_addr - start_addr;
-scsi_end:
-        dma_base = (dma_cnt == 0) ? virt_to_phys(start_addr - 1) + 1 :  
-                                    virt_to_phys(start_addr);
-        SCSI_DMA_WRITE_P(dma_addr, dma_base);
-        SCSI_DMA_WRITE_P(dma_cnt, dma_cnt);
-        /*
-         * Restore old bus error routine.
-         */
-        __asm__ __volatile__ ("movec.l  %%vbr,%%a0\n\t"
-                              "move.l   %0,8(%%a0)\n\t"
-                              :
-                              : "r" (save_buserr)
-                              : "a0" );
-        atari_enable_irq(IRQ_TT_MFP_SCSI);
-        return IRQ_HANDLED;
-scsi_bus_error:
-        /*
-         * First check if the bus error is caused by our code.
-         * If not, call the original handler.
-         */
-        __asm__ __volatile__ ("cmp.l    %0,2(%%sp)\n\t"
-                              "bcs.s    .old_vector\n\t"
-                              "cmp.l    %1,2(%%sp)\n\t"
-                              "bls.s    .scsi_buserr\n"
-                        ".old_vector:\n\t"
-                              "move.l   %2,-(%%sp)\n\t"
-                              "rts\n"
-                        ".scsi_buserr:\n\t"
-                              :
-                              : "i" (&&scsi_loop), "i" (&&scsi_end),
-                                "m" (save_buserr) );
-        if (CPU_IS_060)
-        {
-                /*
-                 * Get effective address and restore the stack.
-                 */
-                __asm__ __volatile__ ("move.l   8(%%sp),%0\n\t"
-                                      "move.l   %1,%%sp\n\t"
-                                      : "=a&" (eff_addr)
-                                      : "r" (save_sp) );
-        }
-        else
-        {
-                register struct m68040_frame *frame;
-                __asm__ __volatile__ ("lea      8(%%sp),%0\n\t"
-                                      : "=a&" (frame) );
-                if (tt_scsi_dma.dma_ctrl & 1)
-                {
-                        /*
-                         * Bus error while writing.
-                         */
-                        if (frame->wb3s & WBV_040)
-                        {
-                                if (frame->wb3a == (long) &hades_psdm_reg)
-                                        start_addr--;
-                                else
-                                        writeback(frame->wb3s, frame->wb3a,
-                                                  frame->wb3d, &&scsi_bus_error);
-                        }
-                        if (frame->wb2s & WBV_040)
-                        {
-                                if (frame->wb2a == (long) &hades_psdm_reg)
-                                        start_addr--;
-                                else
-                                        writeback(frame->wb2s, frame->wb2a,
-                                                  frame->wb2d, &&scsi_bus_error);
-                        }
-                        if (frame->wb1s & WBV_040)
-                        {
-                                if (frame->wb1a == (long) &hades_psdm_reg)
-                                        start_addr--;
-                        }
-                }
-                else
-                {
-                        /*
-                         * Bus error while reading.
-                         */
-                        if (frame->wb3s & WBV_040)
-                                writeback(frame->wb3s, frame->wb3a,
-                                          frame->wb3d, &&scsi_bus_error);
-                }
-                eff_addr = (unsigned char *) frame->faddr;
-                __asm__ __volatile__ ("move.l   %0,%%sp\n\t"
-                                      :
-                                      : "r" (save_sp) );
-        }
-        dma_cnt = end_addr - start_addr;
-        if (eff_addr == &hades_psdm_reg)
-        {
-                /*
-                 * Bus error occurred while reading the pseudo
-                 * DMA register. Time out.
-                 */
-                tries--;
-                if (tries <= 0)
-                {
-                        if ((tt_scsi_dma.dma_ctrl & 1) == 0)    /* Read or write? */
-                                set_restdata_reg(start_addr);
-                        if (dma_cnt <= 1)
-                                printk(KERN_CRIT "DMA emulation: Fatal "
-                                       "error while %s the last byte.\n",
-                                       (tt_scsi_dma.dma_ctrl & 1)
-                                       ? "writing" : "reading");
-                        goto scsi_end;
-                }
-                else
-                        goto scsi_loop;
-        }
-        else
-        {
-                /*
-                 * Bus error during pseudo DMA transfer.
-                 * Terminate the DMA transfer.
-                 */
-                hades_dma_ctrl |= 3;    /* Set EOP and bus error. */
-                if ((tt_scsi_dma.dma_ctrl & 1) == 0)    /* Read or write? */
-                        set_restdata_reg(start_addr);
-                goto scsi_end;
-        }
-}
diff --git a/drivers/scsi/atari_scsi.c b/drivers/scsi/atari_scsi.c
index f5732d8f67fe..21fe07f9df87 100644
--- a/drivers/scsi/atari_scsi.c
+++ b/drivers/scsi/atari_scsi.c
@@ -249,10 +249,6 @@ static int setup_hostid = -1;
 module_param(setup_hostid, int, 0);
-#if defined(CONFIG_TT_DMA_EMUL)
-#include "atari_dma_emul.c"
-#endif
 #if defined(REAL_DMA)
 static int scsi_dma_is_ignored_buserr(unsigned char dma_stat)
@@ -695,21 +691,8 @@ int atari_scsi_detect(struct scsi_host_template *host)
 #ifdef REAL_DMA
                tt_scsi_dma.dma_ctrl = 0;
                atari_dma_residual = 0;
-#ifdef CONFIG_TT_DMA_EMUL
-                if (MACH_IS_HADES) {
+                if (MACH_IS_MEDUSA) {
-                        if (request_irq(IRQ_AUTO_2, hades_dma_emulator,
-                                         IRQ_TYPE_PRIO, "Hades DMA emulator",
-                                         hades_dma_emulator)) {
-                                printk(KERN_ERR "atari_scsi_detect: cannot allocate irq %d, aborting (MACH_IS_HADES)",IRQ_AUTO_2);
-                                free_irq(IRQ_TT_MFP_SCSI, instance);
-                                scsi_unregister(atari_scsi_host);
-                                atari_stram_free(atari_dma_buffer);
-                                atari_dma_buffer = 0;
-                                return 0;
-                        }
-                }
-#endif
-                if (MACH_IS_MEDUSA || MACH_IS_HADES) {
                        /* While the read overruns (described by Drew Eckhardt in
                         * NCR5380.c) never happened on TTs, they do in fact on the Medusa
                         * (This was the cause why SCSI didn't work right for so long
@@ -1007,11 +990,7 @@ static unsigned long atari_dma_xfer_len(unsigned long wanted_len,
                                        Scsi_Cmnd *cmd, int write_flag)
 {
        unsigned long   possible_len, limit;
-#ifndef CONFIG_TT_DMA_EMUL
-        if (MACH_IS_HADES)
-                /* Hades has no SCSI DMA at all :-( Always force use of PIO */
-                return 0;
-#endif
        if (IS_A_TT())
                /* TT SCSI DMA can transfer arbitrary #bytes */
                return wanted_len;
diff --git a/drivers/scsi/ch.c b/drivers/scsi/ch.c
index 3c257fe0893e..88ecf94ad979 100644
--- a/drivers/scsi/ch.c
+++ b/drivers/scsi/ch.c
@@ -914,9 +914,9 @@ static int ch_probe(struct device *dev)
        ch->minor = minor;
        sprintf(ch->name,"ch%d",ch->minor);
-        class_dev = device_create_drvdata(ch_sysfs_class, dev,
+        class_dev = device_create(ch_sysfs_class, dev,
-                                          MKDEV(SCSI_CHANGER_MAJOR, ch->minor),
+                                  MKDEV(SCSI_CHANGER_MAJOR, ch->minor), ch,
-                                          ch, "s%s", ch->name);
+                                  "s%s", ch->name);
        if (IS_ERR(class_dev)) {
                printk(KERN_WARNING "ch%d: device_create failed\n",
                       ch->minor);
diff --git a/drivers/scsi/constants.c b/drivers/scsi/constants.c
index 9785d7384199..4003deefb7d8 100644
--- a/drivers/scsi/constants.c
+++ b/drivers/scsi/constants.c
@@ -1364,7 +1364,8 @@ EXPORT_SYMBOL(scsi_print_sense);
 static const char * const hostbyte_table[]={
 "DID_OK", "DID_NO_CONNECT", "DID_BUS_BUSY", "DID_TIME_OUT", "DID_BAD_TARGET",
 "DID_ABORT", "DID_PARITY", "DID_ERROR", "DID_RESET", "DID_BAD_INTR",
-"DID_PASSTHROUGH", "DID_SOFT_ERROR", "DID_IMM_RETRY", "DID_REQUEUE"};
+"DID_PASSTHROUGH", "DID_SOFT_ERROR", "DID_IMM_RETRY", "DID_REQUEUE",
+"DID_TRANSPORT_DISRUPTED", "DID_TRANSPORT_FAILFAST" };
 #define NUM_HOSTBYTE_STRS ARRAY_SIZE(hostbyte_table)
 static const char * const driverbyte_table[]={
diff --git a/drivers/scsi/device_handler/scsi_dh_alua.c b/drivers/scsi/device_handler/scsi_dh_alua.c
index 708e475896b9..e356b43753ff 100644
--- a/drivers/scsi/device_handler/scsi_dh_alua.c
+++ b/drivers/scsi/device_handler/scsi_dh_alua.c
@@ -109,7 +109,8 @@ static struct request *get_alua_req(struct scsi_device *sdev,
        }
        rq->cmd_type = REQ_TYPE_BLOCK_PC;
-        rq->cmd_flags |= REQ_FAILFAST | REQ_NOMERGE;
+        rq->cmd_flags |= REQ_FAILFAST_DEV | REQ_FAILFAST_TRANSPORT |
+                         REQ_FAILFAST_DRIVER;
        rq->retries = ALUA_FAILOVER_RETRIES;
        rq->timeout = ALUA_FAILOVER_TIMEOUT;
diff --git a/drivers/scsi/device_handler/scsi_dh_emc.c b/drivers/scsi/device_handler/scsi_dh_emc.c
index ef693e8412e9..0e572d2c5b0a 100644
--- a/drivers/scsi/device_handler/scsi_dh_emc.c
+++ b/drivers/scsi/device_handler/scsi_dh_emc.c
@@ -84,7 +84,7 @@ struct clariion_dh_data {
        /*
         * I/O buffer for both MODE_SELECT and INQUIRY commands.
         */
-        char buffer[CLARIION_BUFFER_SIZE];
+        unsigned char buffer[CLARIION_BUFFER_SIZE];
        /*
         * SCSI sense buffer for commands -- assumes serial issuance
         * and completion sequence of all commands for same multipath.
@@ -176,7 +176,7 @@ static int parse_sp_info_reply(struct scsi_device *sdev,
                err = SCSI_DH_DEV_TEMP_BUSY;
                goto out;
        }
-        if (csdev->buffer[4] < 0 || csdev->buffer[4] > 2) {
+        if (csdev->buffer[4] > 2) {
                /* Invalid buffer format */
                sdev_printk(KERN_NOTICE, sdev,
                            "%s: invalid VPD page 0xC0 format\n",
@@ -278,7 +278,6 @@ static struct request *get_req(struct scsi_device *sdev, int cmd,
                return NULL;
        }
-        memset(rq->cmd, 0, BLK_MAX_CDB);
        rq->cmd_len = COMMAND_SIZE(cmd);
        rq->cmd[0] = cmd;
@@ -304,7 +303,8 @@ static struct request *get_req(struct scsi_device *sdev, int cmd,
        rq->cmd[4] = len;
        rq->cmd_type = REQ_TYPE_BLOCK_PC;
-        rq->cmd_flags |= REQ_FAILFAST;
+        rq->cmd_flags |= REQ_FAILFAST_DEV | REQ_FAILFAST_TRANSPORT |
+                         REQ_FAILFAST_DRIVER;
        rq->timeout = CLARIION_TIMEOUT;
        rq->retries = CLARIION_RETRIES;
diff --git a/drivers/scsi/device_handler/scsi_dh_hp_sw.c b/drivers/scsi/device_handler/scsi_dh_hp_sw.c
index a6a4ef3ad51c..9aec4ca64e56 100644
--- a/drivers/scsi/device_handler/scsi_dh_hp_sw.c
+++ b/drivers/scsi/device_handler/scsi_dh_hp_sw.c
@@ -112,9 +112,9 @@ static int hp_sw_tur(struct scsi_device *sdev, struct hp_sw_dh_data *h)
                return SCSI_DH_RES_TEMP_UNAVAIL;
        req->cmd_type = REQ_TYPE_BLOCK_PC;
-        req->cmd_flags |= REQ_FAILFAST;
+        req->cmd_flags |= REQ_FAILFAST_DEV | REQ_FAILFAST_TRANSPORT |
+                          REQ_FAILFAST_DRIVER;
        req->cmd_len = COMMAND_SIZE(TEST_UNIT_READY);
-        memset(req->cmd, 0, MAX_COMMAND_SIZE);
        req->cmd[0] = TEST_UNIT_READY;
        req->timeout = HP_SW_TIMEOUT;
        req->sense = h->sense;
@@ -205,9 +205,9 @@ static int hp_sw_start_stop(struct scsi_device *sdev, struct hp_sw_dh_data *h)
                return SCSI_DH_RES_TEMP_UNAVAIL;
        req->cmd_type = REQ_TYPE_BLOCK_PC;
-        req->cmd_flags |= REQ_FAILFAST;
+        req->cmd_flags |= REQ_FAILFAST_DEV | REQ_FAILFAST_TRANSPORT |
+                          REQ_FAILFAST_DRIVER;
        req->cmd_len = COMMAND_SIZE(START_STOP);
-        memset(req->cmd, 0, MAX_COMMAND_SIZE);
        req->cmd[0] = START_STOP;
        req->cmd[4] = 1;        /* Start spin cycle */
        req->timeout = HP_SW_TIMEOUT;
diff --git a/drivers/scsi/device_handler/scsi_dh_rdac.c b/drivers/scsi/device_handler/scsi_dh_rdac.c
index 6e2f130d56de..3d50cabca7ee 100644
--- a/drivers/scsi/device_handler/scsi_dh_rdac.c
+++ b/drivers/scsi/device_handler/scsi_dh_rdac.c
@@ -225,10 +225,9 @@ static struct request *get_rdac_req(struct scsi_device *sdev,
                return NULL;
        }
-        memset(rq->cmd, 0, BLK_MAX_CDB);
        rq->cmd_type = REQ_TYPE_BLOCK_PC;
-        rq->cmd_flags |= REQ_FAILFAST | REQ_NOMERGE;
+        rq->cmd_flags |= REQ_FAILFAST_DEV | REQ_FAILFAST_TRANSPORT |
+                         REQ_FAILFAST_DRIVER;
        rq->retries = RDAC_RETRIES;
        rq->timeout = RDAC_TIMEOUT;
@@ -402,6 +401,9 @@ static int check_ownership(struct scsi_device *sdev, struct rdac_dh_data *h)
                }
        }
+        if (h->lun_state == RDAC_LUN_UNOWNED)
+                h->state = RDAC_STATE_PASSIVE;
        return err;
 }
@@ -590,6 +592,8 @@ static const struct scsi_dh_devlist rdac_dev_list[] = {
        {"STK", "OPENstorage D280"},
        {"SUN", "CSM200_R"},
        {"SUN", "LCSM100_F"},
+        {"DELL", "MD3000"},
+        {"DELL", "MD3000i"},
        {NULL, NULL},
 };
diff --git a/drivers/scsi/dpt_i2o.c b/drivers/scsi/dpt_i2o.c
index 1fe0901e8119..6194ed5d02c4 100644
--- a/drivers/scsi/dpt_i2o.c
+++ b/drivers/scsi/dpt_i2o.c
@@ -271,7 +271,7 @@ rebuild_sys_tab:
                pHba->initialized = TRUE;
                pHba->state &= ~DPTI_STATE_RESET;
                if (adpt_sysfs_class) {
-                        struct device *dev = device_create_drvdata(adpt_sysfs_class,
+                        struct device *dev = device_create(adpt_sysfs_class,
                                NULL, MKDEV(DPTI_I2O_MAJOR, pHba->unit), NULL,
                                "dpti%d", pHba->unit);
                        if (IS_ERR(dev)) {
@@ -2445,7 +2445,7 @@ static s32 adpt_i2o_to_scsi(void __iomem *reply, struct scsi_cmnd* cmd)
        hba_status = detailed_status >> 8;
        // calculate resid for sg 
-        scsi_set_resid(cmd, scsi_bufflen(cmd) - readl(reply+5));
+        scsi_set_resid(cmd, scsi_bufflen(cmd) - readl(reply+20));
        pHba = (adpt_hba*) cmd->device->host->hostdata[0];
@@ -2456,7 +2456,7 @@ static s32 adpt_i2o_to_scsi(void __iomem *reply, struct scsi_cmnd* cmd)
                case I2O_SCSI_DSC_SUCCESS:
                        cmd->result = (DID_OK << 16);
                        // handle underflow
-                        if(readl(reply+5) < cmd->underflow ) {
+                        if (readl(reply+20) < cmd->underflow) {
                                cmd->result = (DID_ERROR <<16);
                                printk(KERN_WARNING"%s: SCSI CMD underflow\n",pHba->name);
                        }
diff --git a/drivers/scsi/esp_scsi.h b/drivers/scsi/esp_scsi.h
index bb43a1388188..28e22acf87ea 100644
--- a/drivers/scsi/esp_scsi.h
+++ b/drivers/scsi/esp_scsi.h
@@ -521,7 +521,8 @@ struct esp {
        struct completion       *eh_reset;
-        struct sbus_dma         *dma;
+        void                    *dma;
+        int                     dmarev;
 };
 /* A front-end driver for the ESP chip should do the following in
diff --git a/drivers/scsi/fdomain.c b/drivers/scsi/fdomain.c
index c33bcb284df7..56f4e6bffc21 100644
--- a/drivers/scsi/fdomain.c
+++ b/drivers/scsi/fdomain.c
@@ -290,9 +290,11 @@
 #include <scsi/scsi_ioctl.h>
 #include "fdomain.h"
+#ifndef PCMCIA
 MODULE_AUTHOR("Rickard E. Faith");
 MODULE_DESCRIPTION("Future domain SCSI driver");
 MODULE_LICENSE("GPL");
+#endif
  
 #define VERSION          "$Revision: 5.51 $"
diff --git a/drivers/scsi/gdth.c b/drivers/scsi/gdth.c
index 822d5214692b..c387c15a2128 100644
--- a/drivers/scsi/gdth.c
+++ b/drivers/scsi/gdth.c
@@ -464,7 +464,6 @@ int __gdth_execute(struct scsi_device *sdev, gdth_cmd_str *gdtcmd, char *cmnd,
    /* use request field to save the ptr. to completion struct. */
    scp->request = (struct request *)&wait;
-    scp->timeout_per_command = timeout*HZ;
    scp->cmd_len = 12;
    scp->cmnd = cmnd;
    cmndinfo.priority = IOCTL_PRI;
@@ -1995,23 +1994,12 @@ static void gdth_putq(gdth_ha_str *ha, Scsi_Cmnd *scp, unchar priority)
    register Scsi_Cmnd *pscp;
    register Scsi_Cmnd *nscp;
    ulong flags;
-    unchar b, t;
    TRACE(("gdth_putq() priority %d\n",priority));
    spin_lock_irqsave(&ha->smp_lock, flags);
-    if (!cmndinfo->internal_command) {
+    if (!cmndinfo->internal_command)
        cmndinfo->priority = priority;
-        b = scp->device->channel;
-        t = scp->device->id;
-        if (priority >= DEFAULT_PRI) {
-            if ((b != ha->virt_bus && ha->raw[BUS_L2P(ha,b)].lock) ||
-                (b==ha->virt_bus && t<MAX_HDRIVES && ha->hdr[t].lock)) {
-                TRACE2(("gdth_putq(): locked IO ->update_timeout()\n"));
-                cmndinfo->timeout = gdth_update_timeout(scp, 0);
-            }
-        }
-    }
    if (ha->req_first==NULL) {
        ha->req_first = scp;                    /* queue was empty */
@@ -3899,6 +3887,39 @@ static const char *gdth_info(struct Scsi_Host *shp)
    return ((const char *)ha->binfo.type_string);
 }
+static enum blk_eh_timer_return gdth_timed_out(struct scsi_cmnd *scp)
+{
+        gdth_ha_str *ha = shost_priv(scp->device->host);
+        struct gdth_cmndinfo *cmndinfo = gdth_cmnd_priv(scp);
+        unchar b, t;
+        ulong flags;
+        enum blk_eh_timer_return retval = BLK_EH_NOT_HANDLED;
+        TRACE(("%s() cmd 0x%x\n", scp->cmnd[0], __func__));
+        b = scp->device->channel;
+        t = scp->device->id;
+        /*
+         * We don't really honor the command timeout, but we try to
+         * honor 6 times of the actual command timeout! So reset the
+         * timer if this is less than 6th timeout on this command!
+         */
+        if (++cmndinfo->timeout_count < 6)
+                retval = BLK_EH_RESET_TIMER;
+        /* Reset the timeout if it is locked IO */
+        spin_lock_irqsave(&ha->smp_lock, flags);
+        if ((b != ha->virt_bus && ha->raw[BUS_L2P(ha, b)].lock) ||
+            (b == ha->virt_bus && t < MAX_HDRIVES && ha->hdr[t].lock)) {
+                TRACE2(("%s(): locked IO, reset timeout\n", __func__));
+                retval = BLK_EH_RESET_TIMER;
+        }
+        spin_unlock_irqrestore(&ha->smp_lock, flags);
+        return retval;
+}
 static int gdth_eh_bus_reset(Scsi_Cmnd *scp)
 {
    gdth_ha_str *ha = shost_priv(scp->device->host);
@@ -3992,7 +4013,7 @@ static int gdth_queuecommand(struct scsi_cmnd *scp,
    BUG_ON(!cmndinfo);
    scp->scsi_done = done;
-    gdth_update_timeout(scp, scp->timeout_per_command * 6);
+    cmndinfo->timeout_count = 0;
    cmndinfo->priority = DEFAULT_PRI;
    return __gdth_queuecommand(ha, scp, cmndinfo);
@@ -4096,12 +4117,10 @@ static int ioc_lockdrv(void __user *arg)
            ha->hdr[j].lock = 1;
            spin_unlock_irqrestore(&ha->smp_lock, flags);
            gdth_wait_completion(ha, ha->bus_cnt, j);
-            gdth_stop_timeout(ha, ha->bus_cnt, j);
        } else {
            spin_lock_irqsave(&ha->smp_lock, flags);
            ha->hdr[j].lock = 0;
            spin_unlock_irqrestore(&ha->smp_lock, flags);
-            gdth_start_timeout(ha, ha->bus_cnt, j);
            gdth_next(ha);
        }
    } 
@@ -4539,18 +4558,14 @@ static int gdth_ioctl(struct inode *inode, struct file *filep,
                spin_lock_irqsave(&ha->smp_lock, flags);
                ha->raw[i].lock = 1;
                spin_unlock_irqrestore(&ha->smp_lock, flags);
-                for (j = 0; j < ha->tid_cnt; ++j) {
+                for (j = 0; j < ha->tid_cnt; ++j)
                    gdth_wait_completion(ha, i, j);
-                    gdth_stop_timeout(ha, i, j);
-                }
            } else {
                spin_lock_irqsave(&ha->smp_lock, flags);
                ha->raw[i].lock = 0;
                spin_unlock_irqrestore(&ha->smp_lock, flags);
-                for (j = 0; j < ha->tid_cnt; ++j) {
+                for (j = 0; j < ha->tid_cnt; ++j)
-                    gdth_start_timeout(ha, i, j);
                    gdth_next(ha);
-                }
            }
        } 
        break;
@@ -4644,6 +4659,7 @@ static struct scsi_host_template gdth_template = {
        .slave_configure        = gdth_slave_configure,
        .bios_param             = gdth_bios_param,
        .proc_info              = gdth_proc_info,
+        .eh_timed_out           = gdth_timed_out,
        .proc_name              = "gdth",
        .can_queue              = GDTH_MAXCMDS,
        .this_id                = -1,
diff --git a/drivers/scsi/gdth.h b/drivers/scsi/gdth.h
index ca92476727cf..1646444e9bd5 100644
--- a/drivers/scsi/gdth.h
+++ b/drivers/scsi/gdth.h
@@ -916,7 +916,7 @@ typedef struct {
        gdth_cmd_str *internal_cmd_str;         /* crier for internal messages*/
        dma_addr_t sense_paddr;                 /* sense dma-addr */
        unchar priority;
-        int timeout;
+        int timeout_count;                      /* # of timeout calls */
        volatile int wait_for_completion;
        ushort status;
        ulong32 info;
diff --git a/drivers/scsi/gdth_proc.c b/drivers/scsi/gdth_proc.c
index ce0228e26aec..59349a316e13 100644
--- a/drivers/scsi/gdth_proc.c
+++ b/drivers/scsi/gdth_proc.c
@@ -748,69 +748,3 @@ static void gdth_wait_completion(gdth_ha_str *ha, int busnum, int id)
    }
    spin_unlock_irqrestore(&ha->smp_lock, flags);
 }
-static void gdth_stop_timeout(gdth_ha_str *ha, int busnum, int id)
-{
-    ulong flags;
-    Scsi_Cmnd *scp;
-    unchar b, t;
-    spin_lock_irqsave(&ha->smp_lock, flags);
-    for (scp = ha->req_first; scp; scp = (Scsi_Cmnd *)scp->SCp.ptr) {
-        struct gdth_cmndinfo *cmndinfo = gdth_cmnd_priv(scp);
-        if (!cmndinfo->internal_command) {
-            b = scp->device->channel;
-            t = scp->device->id;
-            if (t == (unchar)id && b == (unchar)busnum) {
-                TRACE2(("gdth_stop_timeout(): update_timeout()\n"));
-                cmndinfo->timeout = gdth_update_timeout(scp, 0);
-            }
-        }
-    }
-    spin_unlock_irqrestore(&ha->smp_lock, flags);
-}
-static void gdth_start_timeout(gdth_ha_str *ha, int busnum, int id)
-{
-    ulong flags;
-    Scsi_Cmnd *scp;
-    unchar b, t;
-    spin_lock_irqsave(&ha->smp_lock, flags);
-    for (scp = ha->req_first; scp; scp = (Scsi_Cmnd *)scp->SCp.ptr) {
-        struct gdth_cmndinfo *cmndinfo = gdth_cmnd_priv(scp);
-        if (!cmndinfo->internal_command) {
-            b = scp->device->channel;
-            t = scp->device->id;
-            if (t == (unchar)id && b == (unchar)busnum) {
-                TRACE2(("gdth_start_timeout(): update_timeout()\n"));
-                gdth_update_timeout(scp, cmndinfo->timeout);
-            }
-        }
-    }
-    spin_unlock_irqrestore(&ha->smp_lock, flags);
-}
-static int gdth_update_timeout(Scsi_Cmnd *scp, int timeout)
-{
-    int oldto;
-    oldto = scp->timeout_per_command;
-    scp->timeout_per_command = timeout;
-    if (timeout == 0) {
-        del_timer(&scp->eh_timeout);
-        scp->eh_timeout.data = (unsigned long) NULL;
-        scp->eh_timeout.expires = 0;
-    } else {
-        if (scp->eh_timeout.data != (unsigned long) NULL) 
-            del_timer(&scp->eh_timeout);
-        scp->eh_timeout.data = (unsigned long) scp;
-        scp->eh_timeout.expires = jiffies + timeout;
-        add_timer(&scp->eh_timeout);
-    }
-    return oldto;
-}
diff --git a/drivers/scsi/gdth_proc.h b/drivers/scsi/gdth_proc.h
index 45e6fdacf36e..9b900cc9ebe8 100644
--- a/drivers/scsi/gdth_proc.h
+++ b/drivers/scsi/gdth_proc.h
@@ -20,9 +20,6 @@ static char *gdth_ioctl_alloc(gdth_ha_str *ha, int size, int scratch,
                              ulong64 *paddr);
 static void gdth_ioctl_free(gdth_ha_str *ha, int size, char *buf, ulong64 paddr);
 static void gdth_wait_completion(gdth_ha_str *ha, int busnum, int id);
-static void gdth_stop_timeout(gdth_ha_str *ha, int busnum, int id);
-static void gdth_start_timeout(gdth_ha_str *ha, int busnum, int id);
-static int gdth_update_timeout(Scsi_Cmnd *scp, int timeout);
 #endif
diff --git a/drivers/scsi/hosts.c b/drivers/scsi/hosts.c
index fed0b02ebc1d..3fdbb13e80a8 100644
--- a/drivers/scsi/hosts.c
+++ b/drivers/scsi/hosts.c
@@ -464,7 +464,7 @@ static int __scsi_host_match(struct device *dev, void *data)
 struct Scsi_Host *scsi_host_lookup(unsigned short hostnum)
 {
        struct device *cdev;
-        struct Scsi_Host *shost = ERR_PTR(-ENXIO);
+        struct Scsi_Host *shost = NULL;
        cdev = class_find_device(&shost_class, NULL, &hostnum,
                                 __scsi_host_match);
diff --git a/drivers/scsi/ibmvscsi/ibmvfc.c b/drivers/scsi/ibmvscsi/ibmvfc.c
index 4e0b7c8eb32e..7650707a40de 100644
--- a/drivers/scsi/ibmvscsi/ibmvfc.c
+++ b/drivers/scsi/ibmvscsi/ibmvfc.c
@@ -2031,8 +2031,6 @@ static void ibmvfc_terminate_rport_io(struct fc_rport *rport)
                spin_unlock_irqrestore(shost->host_lock, flags);
        } else
                ibmvfc_issue_fc_host_lip(shost);
-        scsi_target_unblock(&rport->dev);
        LEAVE;
 }
diff --git a/drivers/scsi/ibmvscsi/ibmvscsi.c b/drivers/scsi/ibmvscsi/ibmvscsi.c
index 7b1502c0ab6e..87e09f35d3d4 100644
--- a/drivers/scsi/ibmvscsi/ibmvscsi.c
+++ b/drivers/scsi/ibmvscsi/ibmvscsi.c
@@ -756,7 +756,7 @@ static int ibmvscsi_queuecommand(struct scsi_cmnd *cmnd,
        init_event_struct(evt_struct,
                          handle_cmd_rsp,
                          VIOSRP_SRP_FORMAT,
-                          cmnd->timeout_per_command/HZ);
+                          cmnd->request->timeout/HZ);
        evt_struct->cmnd = cmnd;
        evt_struct->cmnd_done = done;
diff --git a/drivers/scsi/ide-scsi.c b/drivers/scsi/ide-scsi.c
index 461331d3dc45..2370fd82ebfe 100644
--- a/drivers/scsi/ide-scsi.c
+++ b/drivers/scsi/ide-scsi.c
@@ -40,7 +40,6 @@
 #include <linux/ioport.h>
 #include <linux/blkdev.h>
 #include <linux/errno.h>
-#include <linux/hdreg.h>
 #include <linux/slab.h>
 #include <linux/ide.h>
 #include <linux/scatterlist.h>
@@ -83,7 +82,6 @@ typedef struct ide_scsi_obj {
        struct gendisk          *disk;
        struct Scsi_Host        *host;
-        struct ide_atapi_pc *pc;                /* Current packet command */
        unsigned long transform;                /* SCSI cmd translation layer */
        unsigned long log;                      /* log flags */
 } idescsi_scsi_t;
@@ -131,50 +129,6 @@ static inline idescsi_scsi_t *drive_to_idescsi(ide_drive_t *ide_drive)
        return scsihost_to_idescsi(ide_drive->driver_data);
 }
-/*
- *      PIO data transfer routine using the scatter gather table.
- */
-static void ide_scsi_io_buffers(ide_drive_t *drive, struct ide_atapi_pc *pc,
-                                unsigned int bcount, int write)
-{
-        ide_hwif_t *hwif = drive->hwif;
-        const struct ide_tp_ops *tp_ops = hwif->tp_ops;
-        xfer_func_t *xf = write ? tp_ops->output_data : tp_ops->input_data;
-        char *buf;
-        int count;
-        while (bcount) {
-                count = min(pc->sg->length - pc->b_count, bcount);
-                if (PageHighMem(sg_page(pc->sg))) {
-                        unsigned long flags;
-                        local_irq_save(flags);
-                        buf = kmap_atomic(sg_page(pc->sg), KM_IRQ0) +
-                                          pc->sg->offset;
-                        xf(drive, NULL, buf + pc->b_count, count);
-                        kunmap_atomic(buf - pc->sg->offset, KM_IRQ0);
-                        local_irq_restore(flags);
-                } else {
-                        buf = sg_virt(pc->sg);
-                        xf(drive, NULL, buf + pc->b_count, count);
-                }
-                bcount -= count; pc->b_count += count;
-                if (pc->b_count == pc->sg->length) {
-                        if (!--pc->sg_cnt)
-                                break;
-                        pc->sg = sg_next(pc->sg);
-                        pc->b_count = 0;
-                }
-        }
-        if (bcount) {
-                printk(KERN_ERR "%s: scatter gather table too small, %s\n",
-                                drive->name, write ? "padding with zeros"
-                                                   : "discarding data");
-                ide_pad_transfer(drive, write, bcount);
-        }
-}
 static void ide_scsi_hex_dump(u8 *data, int len)
 {
        print_hex_dump(KERN_CONT, "", DUMP_PREFIX_NONE, 16, 1, data, len, 0);
@@ -182,10 +136,10 @@ static void ide_scsi_hex_dump(u8 *data, int len)
 static int idescsi_end_request(ide_drive_t *, int, int);
-static void ide_scsi_callback(ide_drive_t *drive)
+static void ide_scsi_callback(ide_drive_t *drive, int dsc)
 {
        idescsi_scsi_t *scsi = drive_to_idescsi(drive);
-        struct ide_atapi_pc *pc = scsi->pc;
+        struct ide_atapi_pc *pc = drive->pc;
        if (pc->flags & PC_FLAG_TIMEDOUT)
                debug_log("%s: got timed out packet %lu at %lu\n", __func__,
@@ -244,9 +198,9 @@ idescsi_atapi_error(ide_drive_t *drive, struct request *rq, u8 stat, u8 err)
 {
        ide_hwif_t *hwif = drive->hwif;
-        if (hwif->tp_ops->read_status(hwif) & (BUSY_STAT | DRQ_STAT))
+        if (hwif->tp_ops->read_status(hwif) & (ATA_BUSY | ATA_DRQ))
                /* force an abort */
-                hwif->tp_ops->exec_command(hwif, WIN_IDLEIMMEDIATE);
+                hwif->tp_ops->exec_command(hwif, ATA_CMD_IDLEIMMEDIATE);
        rq->errors++;
@@ -312,49 +266,10 @@ static int idescsi_end_request (ide_drive_t *drive, int uptodate, int nrsecs)
        spin_unlock_irqrestore(host->host_lock, flags);
        kfree(pc);
        blk_put_request(rq);
-        scsi->pc = NULL;
+        drive->pc = NULL;
        return 0;
 }
-static inline unsigned long get_timeout(struct ide_atapi_pc *pc)
-{
-        return max_t(unsigned long, WAIT_CMD, pc->timeout - jiffies);
-}
-static int idescsi_expiry(ide_drive_t *drive)
-{
-        idescsi_scsi_t *scsi = drive_to_idescsi(drive);
-        struct ide_atapi_pc   *pc   = scsi->pc;
-        debug_log("%s called for %lu at %lu\n", __func__,
-                  pc->scsi_cmd->serial_number, jiffies);
-        pc->flags |= PC_FLAG_TIMEDOUT;
-        return 0;                                       /* we do not want the ide subsystem to retry */
-}
-/*
- *      Our interrupt handler.
- */
-static ide_startstop_t idescsi_pc_intr (ide_drive_t *drive)
-{
-        idescsi_scsi_t *scsi = drive_to_idescsi(drive);
-        struct ide_atapi_pc *pc = scsi->pc;
-        return ide_pc_intr(drive, pc, idescsi_pc_intr, get_timeout(pc),
-                           idescsi_expiry, NULL, NULL, NULL,
-                           ide_scsi_io_buffers);
-}
-static ide_startstop_t idescsi_transfer_pc(ide_drive_t *drive)
-{
-        idescsi_scsi_t *scsi = drive_to_idescsi(drive);
-        return ide_transfer_pc(drive, scsi->pc, idescsi_pc_intr,
-                               get_timeout(scsi->pc), idescsi_expiry);
-}
 static inline int idescsi_set_direction(struct ide_atapi_pc *pc)
 {
        switch (pc->c[0]) {
@@ -397,13 +312,10 @@ static int idescsi_map_sg(ide_drive_t *drive, struct ide_atapi_pc *pc)
 static ide_startstop_t idescsi_issue_pc(ide_drive_t *drive,
                struct ide_atapi_pc *pc)
 {
-        idescsi_scsi_t *scsi = drive_to_idescsi(drive);
        /* Set the current packet command */
-        scsi->pc = pc;
+        drive->pc = pc;
-        return ide_issue_pc(drive, pc, idescsi_transfer_pc,
+        return ide_issue_pc(drive, ide_scsi_get_timeout(pc), ide_scsi_expiry);
-                            get_timeout(pc), idescsi_expiry);
 }
 /*
@@ -419,7 +331,8 @@ static ide_startstop_t idescsi_do_request (ide_drive_t *drive, struct request *r
        if (blk_sense_request(rq) || blk_special_request(rq)) {
                struct ide_atapi_pc *pc = (struct ide_atapi_pc *)rq->special;
-                if (drive->using_dma && !idescsi_map_sg(drive, pc))
+                if ((drive->dev_flags & IDE_DFLAG_USING_DMA) &&
+                    idescsi_map_sg(drive, pc) == 0)
                        pc->flags |= PC_FLAG_DMA_OK;
                return idescsi_issue_pc(drive, pc);
@@ -430,21 +343,56 @@ static ide_startstop_t idescsi_do_request (ide_drive_t *drive, struct request *r
 }
 #ifdef CONFIG_IDE_PROC_FS
-static void idescsi_add_settings(ide_drive_t *drive)
+static ide_proc_entry_t idescsi_proc[] = {
+        { "capacity", S_IFREG|S_IRUGO, proc_ide_read_capacity, NULL },
+        { NULL, 0, NULL, NULL }
+};
+#define ide_scsi_devset_get(name, field) \
+static int get_##name(ide_drive_t *drive) \
+{ \
+        idescsi_scsi_t *scsi = drive_to_idescsi(drive); \
+        return scsi->field; \
+}
+#define ide_scsi_devset_set(name, field) \
+static int set_##name(ide_drive_t *drive, int arg) \
+{ \
+        idescsi_scsi_t *scsi = drive_to_idescsi(drive); \
+        scsi->field = arg; \
+        return 0; \
+}
+#define ide_scsi_devset_rw_field(_name, _field) \
+ide_scsi_devset_get(_name, _field); \
+ide_scsi_devset_set(_name, _field); \
+IDE_DEVSET(_name, DS_SYNC, get_##_name, set_##_name);
+ide_devset_rw_field(bios_cyl, bios_cyl);
+ide_devset_rw_field(bios_head, bios_head);
+ide_devset_rw_field(bios_sect, bios_sect);
+ide_scsi_devset_rw_field(transform, transform);
+ide_scsi_devset_rw_field(log, log);
+static const struct ide_proc_devset idescsi_settings[] = {
+        IDE_PROC_DEVSET(bios_cyl,  0, 1023),
+        IDE_PROC_DEVSET(bios_head, 0,  255),
+        IDE_PROC_DEVSET(bios_sect, 0,   63),
+        IDE_PROC_DEVSET(log,       0,    1),
+        IDE_PROC_DEVSET(transform, 0,    3),
+        { 0 },
+};
+static ide_proc_entry_t *ide_scsi_proc_entries(ide_drive_t *drive)
 {
-        idescsi_scsi_t *scsi = drive_to_idescsi(drive);
+        return idescsi_proc;
+}
-/*
+static const struct ide_proc_devset *ide_scsi_proc_devsets(ide_drive_t *drive)
- *                      drive   setting name    read/write      data type       min     max     mul_factor      div_factor      data pointer            set function
+{
- */
+        return idescsi_settings;
-        ide_add_setting(drive,  "bios_cyl",     SETTING_RW,     TYPE_INT,       0,      1023,   1,              1,              &drive->bios_cyl,       NULL);
-        ide_add_setting(drive,  "bios_head",    SETTING_RW,     TYPE_BYTE,      0,      255,    1,              1,              &drive->bios_head,      NULL);
-        ide_add_setting(drive,  "bios_sect",    SETTING_RW,     TYPE_BYTE,      0,      63,     1,              1,              &drive->bios_sect,      NULL);
-        ide_add_setting(drive,  "transform",    SETTING_RW,     TYPE_INT,       0,      3,      1,              1,              &scsi->transform,       NULL);
-        ide_add_setting(drive,  "log",          SETTING_RW,     TYPE_INT,       0,      1,      1,              1,              &scsi->log,             NULL);
 }
-#else
-static inline void idescsi_add_settings(ide_drive_t *drive) { ; }
 #endif
 /*
@@ -452,16 +400,16 @@ static inline void idescsi_add_settings(ide_drive_t *drive) { ; }
 */
 static void idescsi_setup (ide_drive_t *drive, idescsi_scsi_t *scsi)
 {
-        if (drive->id && (drive->id->config & 0x0060) == 0x20)
-                set_bit(IDE_AFLAG_DRQ_INTERRUPT, &drive->atapi_flags);
        clear_bit(IDESCSI_SG_TRANSFORM, &scsi->transform);
 #if IDESCSI_DEBUG_LOG
        set_bit(IDESCSI_LOG_CMD, &scsi->log);
 #endif /* IDESCSI_DEBUG_LOG */
-        drive->pc_callback = ide_scsi_callback;
+        drive->pc_callback       = ide_scsi_callback;
+        drive->pc_update_buffers = NULL;
+        drive->pc_io_buffers     = ide_io_buffers;
-        idescsi_add_settings(drive);
+        ide_proc_register_driver(drive, scsi->driver);
 }
 static void ide_scsi_remove(ide_drive_t *drive)
@@ -481,18 +429,11 @@ static void ide_scsi_remove(ide_drive_t *drive)
        ide_scsi_put(scsi);
-        drive->scsi = 0;
+        drive->dev_flags &= ~IDE_DFLAG_SCSI;
 }
 static int ide_scsi_probe(ide_drive_t *);
-#ifdef CONFIG_IDE_PROC_FS
-static ide_proc_entry_t idescsi_proc[] = {
-        { "capacity", S_IFREG|S_IRUGO, proc_ide_read_capacity, NULL },
-        { NULL, 0, NULL, NULL }
-};
-#endif
 static ide_driver_t idescsi_driver = {
        .gen_driver = {
                .owner          = THIS_MODULE,
@@ -502,50 +443,43 @@ static ide_driver_t idescsi_driver = {
        .probe                  = ide_scsi_probe,
        .remove                 = ide_scsi_remove,
        .version                = IDESCSI_VERSION,
-        .media                  = ide_scsi,
-        .supports_dsc_overlap   = 0,
        .do_request             = idescsi_do_request,
        .end_request            = idescsi_end_request,
        .error                  = idescsi_atapi_error,
 #ifdef CONFIG_IDE_PROC_FS
-        .proc                   = idescsi_proc,
+        .proc_entries           = ide_scsi_proc_entries,
+        .proc_devsets           = ide_scsi_proc_devsets,
 #endif
 };
-static int idescsi_ide_open(struct inode *inode, struct file *filp)
+static int idescsi_ide_open(struct block_device *bdev, fmode_t mode)
 {
-        struct gendisk *disk = inode->i_bdev->bd_disk;
+        struct ide_scsi_obj *scsi = ide_scsi_get(bdev->bd_disk);
-        struct ide_scsi_obj *scsi;
-        if (!(scsi = ide_scsi_get(disk)))
+        if (!scsi)
                return -ENXIO;
        return 0;
 }
-static int idescsi_ide_release(struct inode *inode, struct file *filp)
+static int idescsi_ide_release(struct gendisk *disk, fmode_t mode)
 {
-        struct gendisk *disk = inode->i_bdev->bd_disk;
+        ide_scsi_put(ide_scsi_g(disk));
-        struct ide_scsi_obj *scsi = ide_scsi_g(disk);
-        ide_scsi_put(scsi);
        return 0;
 }
-static int idescsi_ide_ioctl(struct inode *inode, struct file *file,
+static int idescsi_ide_ioctl(struct block_device *bdev, fmode_t mode,
                        unsigned int cmd, unsigned long arg)
 {
-        struct block_device *bdev = inode->i_bdev;
        struct ide_scsi_obj *scsi = ide_scsi_g(bdev->bd_disk);
-        return generic_ide_ioctl(scsi->drive, file, bdev, cmd, arg);
+        return generic_ide_ioctl(scsi->drive, bdev, cmd, arg);
 }
 static struct block_device_operations idescsi_ops = {
        .owner          = THIS_MODULE,
        .open           = idescsi_ide_open,
        .release        = idescsi_ide_release,
-        .ioctl          = idescsi_ide_ioctl,
+        .locked_ioctl   = idescsi_ide_ioctl,
 };
 static int idescsi_slave_configure(struct scsi_device * sdp)
@@ -612,7 +546,7 @@ static int idescsi_queue (struct scsi_cmnd *cmd,
        pc->req_xfer = pc->buf_size = scsi_bufflen(cmd);
        pc->scsi_cmd = cmd;
        pc->done = done;
-        pc->timeout = jiffies + cmd->timeout_per_command;
+        pc->timeout = jiffies + cmd->request->timeout;
        if (test_bit(IDESCSI_LOG_CMD, &scsi->log)) {
                printk ("ide-scsi: %s: que %lu, cmd = ", drive->name, cmd->serial_number);
@@ -647,6 +581,8 @@ static int idescsi_eh_abort (struct scsi_cmnd *cmd)
        int             busy;
        int             ret   = FAILED;
+        struct ide_atapi_pc *pc;
        /* In idescsi_eh_abort we try to gently pry our command from the ide subsystem */
        if (test_bit(IDESCSI_LOG_CMD, &scsi->log))
@@ -667,26 +603,27 @@ static int idescsi_eh_abort (struct scsi_cmnd *cmd)
        spin_lock_irq(&ide_lock);
        /* If there is no pc running we're done (our interrupt took care of it) */
-        if (!scsi->pc) {
+        pc = drive->pc;
+        if (pc == NULL) {
                ret = SUCCESS;
                goto ide_unlock;
        }
        /* It's somewhere in flight. Does ide subsystem agree? */
-        if (scsi->pc->scsi_cmd->serial_number == cmd->serial_number && !busy &&
+        if (pc->scsi_cmd->serial_number == cmd->serial_number && !busy &&
-            elv_queue_empty(drive->queue) && HWGROUP(drive)->rq != scsi->pc->rq) {
+            elv_queue_empty(drive->queue) && HWGROUP(drive)->rq != pc->rq) {
                /*
                 * FIXME - not sure this condition can ever occur
                 */
                printk (KERN_ERR "ide-scsi: cmd aborted!\n");
-                if (blk_sense_request(scsi->pc->rq))
+                if (blk_sense_request(pc->rq))
-                        kfree(scsi->pc->buf);
+                        kfree(pc->buf);
                /* we need to call blk_put_request twice. */
-                blk_put_request(scsi->pc->rq);
+                blk_put_request(pc->rq);
-                blk_put_request(scsi->pc->rq);
+                blk_put_request(pc->rq);
-                kfree(scsi->pc);
+                kfree(pc);
-                scsi->pc = NULL;
+                drive->pc = NULL;
                ret = SUCCESS;
        }
@@ -708,6 +645,8 @@ static int idescsi_eh_reset (struct scsi_cmnd *cmd)
        int             ready = 0;
        int             ret   = SUCCESS;
+        struct ide_atapi_pc *pc;
        /* In idescsi_eh_reset we forcefully remove the command from the ide subsystem and reset the device. */
        if (test_bit(IDESCSI_LOG_CMD, &scsi->log))
@@ -722,7 +661,9 @@ static int idescsi_eh_reset (struct scsi_cmnd *cmd)
        spin_lock_irq(cmd->device->host->host_lock);
        spin_lock(&ide_lock);
-        if (!scsi->pc || (req = scsi->pc->rq) != HWGROUP(drive)->rq || !HWGROUP(drive)->handler) {
+        pc = drive->pc;
+        if (pc == NULL || (req = pc->rq) != HWGROUP(drive)->rq || !HWGROUP(drive)->handler) {
                printk (KERN_WARNING "ide-scsi: No active request in idescsi_eh_reset\n");
                spin_unlock(&ide_lock);
                spin_unlock_irq(cmd->device->host->host_lock);
@@ -733,9 +674,9 @@ static int idescsi_eh_reset (struct scsi_cmnd *cmd)
        if (__blk_end_request(req, -EIO, 0))
                BUG();
        if (blk_sense_request(req))
-                kfree(scsi->pc->buf);
+                kfree(pc->buf);
-        kfree(scsi->pc);
+        kfree(pc);
-        scsi->pc = NULL;
+        drive->pc = NULL;
        blk_put_request(req);
        /* now nuke the drive queue */
@@ -811,6 +752,7 @@ static int ide_scsi_probe(ide_drive_t *drive)
        struct gendisk *g;
        static int warned;
        int err = -ENOMEM;
+        u16 last_lun;
        if (!warned && drive->media == ide_cdrom) {
                printk(KERN_WARNING "ide-scsi is deprecated for cd burning! Use ide-cd and give dev=/dev/hdX as device\n");
@@ -821,12 +763,11 @@ static int ide_scsi_probe(ide_drive_t *drive)
                return -ENODEV;
        if (!strstr("ide-scsi", drive->driver_req) ||
-            !drive->present ||
            drive->media == ide_disk ||
            !(host = scsi_host_alloc(&idescsi_template,sizeof(idescsi_scsi_t))))
                return -ENODEV;
-        drive->scsi = 1;
+        drive->dev_flags |= IDE_DFLAG_SCSI;
        g = alloc_disk(1 << PARTN_BITS);
        if (!g)
@@ -836,12 +777,12 @@ static int ide_scsi_probe(ide_drive_t *drive)
        host->max_id = 1;
-        if (drive->id->last_lun)
+        last_lun = drive->id[ATA_ID_LAST_LUN];
-                debug_log("%s: id->last_lun=%u\n", drive->name,
+        if (last_lun)
-                          drive->id->last_lun);
+                debug_log("%s: last_lun=%u\n", drive->name, last_lun);
-        if ((drive->id->last_lun & 0x7) != 7)
+        if ((last_lun & 7) != 7)
-                host->max_lun = (drive->id->last_lun & 0x7) + 1;
+                host->max_lun = (last_lun & 7) + 1;
        else
                host->max_lun = 1;
@@ -852,7 +793,6 @@ static int ide_scsi_probe(ide_drive_t *drive)
        idescsi->host = host;
        idescsi->disk = g;
        g->private_data = &idescsi->driver;
-        ide_proc_register_driver(drive, &idescsi_driver);
        err = 0;
        idescsi_setup(drive, idescsi);
        g->fops = &idescsi_ops;
@@ -868,7 +808,7 @@ static int ide_scsi_probe(ide_drive_t *drive)
        put_disk(g);
 out_host_put:
-        drive->scsi = 0;
+        drive->dev_flags &= ~IDE_DFLAG_SCSI;
        scsi_host_put(host);
        return err;
 }
diff --git a/drivers/scsi/ipr.c b/drivers/scsi/ipr.c
index e7a3a6554425..ded854a6dd35 100644
--- a/drivers/scsi/ipr.c
+++ b/drivers/scsi/ipr.c
@@ -2456,20 +2456,14 @@ static ssize_t ipr_read_trace(struct kobject *kobj,
        struct Scsi_Host *shost = class_to_shost(dev);
        struct ipr_ioa_cfg *ioa_cfg = (struct ipr_ioa_cfg *)shost->hostdata;
        unsigned long lock_flags = 0;
-        int size = IPR_TRACE_SIZE;
+        ssize_t ret;
-        char *src = (char *)ioa_cfg->trace;
-        if (off > size)
-                return 0;
-        if (off + count > size) {
-                size -= off;
-                count = size;
-        }
        spin_lock_irqsave(ioa_cfg->host->host_lock, lock_flags);
-        memcpy(buf, &src[off], count);
+        ret = memory_read_from_buffer(buf, count, &off, ioa_cfg->trace,
+                                IPR_TRACE_SIZE);
        spin_unlock_irqrestore(ioa_cfg->host->host_lock, lock_flags);
-        return count;
+        return ret;
 }
 static struct bin_attribute ipr_trace_attr = {
@@ -3670,7 +3664,8 @@ static int ipr_slave_configure(struct scsi_device *sdev)
                        sdev->no_uld_attach = 1;
                }
                if (ipr_is_vset_device(res)) {
-                        sdev->timeout = IPR_VSET_RW_TIMEOUT;
+                        blk_queue_rq_timeout(sdev->request_queue,
+                                             IPR_VSET_RW_TIMEOUT);
                        blk_queue_max_sectors(sdev->request_queue, IPR_VSET_MAX_SECTORS);
                }
                if (ipr_is_vset_device(res) || ipr_is_scsi_disk(res))
@@ -7858,7 +7853,6 @@ static struct pci_driver ipr_driver = {
        .remove = ipr_remove,
        .shutdown = ipr_shutdown,
        .err_handler = &ipr_err_handler,
-        .dynids.use_driver_data = 1
 };
 /**
diff --git a/drivers/scsi/ips.c b/drivers/scsi/ips.c
index bc9e6ddf41df..ef683f0d2b5a 100644
--- a/drivers/scsi/ips.c
+++ b/drivers/scsi/ips.c
@@ -3818,7 +3818,7 @@ ips_send_cmd(ips_ha_t * ha, ips_scb_t * scb)
                scb->cmd.dcdb.segment_4G = 0;
                scb->cmd.dcdb.enhanced_sg = 0;
-                TimeOut = scb->scsi_cmd->timeout_per_command;
+                TimeOut = scb->scsi_cmd->request->timeout;
                if (ha->subsys->param[4] & 0x00100000) {        /* If NEW Tape DCDB is Supported */
                        if (!scb->sg_len) {
diff --git a/drivers/scsi/iscsi_tcp.c b/drivers/scsi/iscsi_tcp.c
index 2a2f0094570f..ed6c54cae7b1 100644
--- a/drivers/scsi/iscsi_tcp.c
+++ b/drivers/scsi/iscsi_tcp.c
@@ -523,22 +523,20 @@ iscsi_tcp_cleanup_task(struct iscsi_conn *conn, struct iscsi_task *task)
 }
 /**
- * iscsi_data_rsp - SCSI Data-In Response processing
+ * iscsi_data_in - SCSI Data-In Response processing
 * @conn: iscsi connection
 * @task: scsi command task
 **/
 static int
-iscsi_data_rsp(struct iscsi_conn *conn, struct iscsi_task *task)
+iscsi_data_in(struct iscsi_conn *conn, struct iscsi_task *task)
 {
        struct iscsi_tcp_conn *tcp_conn = conn->dd_data;
        struct iscsi_tcp_task *tcp_task = task->dd_data;
        struct iscsi_data_rsp *rhdr = (struct iscsi_data_rsp *)tcp_conn->in.hdr;
-        struct iscsi_session *session = conn->session;
-        struct scsi_cmnd *sc = task->sc;
        int datasn = be32_to_cpu(rhdr->datasn);
-        unsigned total_in_length = scsi_in(sc)->length;
+        unsigned total_in_length = scsi_in(task->sc)->length;
-        iscsi_update_cmdsn(session, (struct iscsi_nopin*)rhdr);
+        iscsi_update_cmdsn(conn->session, (struct iscsi_nopin*)rhdr);
        if (tcp_conn->in.datalen == 0)
                return 0;
@@ -558,23 +556,6 @@ iscsi_data_rsp(struct iscsi_conn *conn, struct iscsi_task *task)
                return ISCSI_ERR_DATA_OFFSET;
        }
-        if (rhdr->flags & ISCSI_FLAG_DATA_STATUS) {
-                sc->result = (DID_OK << 16) | rhdr->cmd_status;
-                conn->exp_statsn = be32_to_cpu(rhdr->statsn) + 1;
-                if (rhdr->flags & (ISCSI_FLAG_DATA_UNDERFLOW |
-                                   ISCSI_FLAG_DATA_OVERFLOW)) {
-                        int res_count = be32_to_cpu(rhdr->residual_count);
-                        if (res_count > 0 &&
-                            (rhdr->flags & ISCSI_FLAG_CMD_OVERFLOW ||
-                             res_count <= total_in_length))
-                                scsi_in(sc)->resid = res_count;
-                        else
-                                sc->result = (DID_BAD_TARGET << 16) |
-                                        rhdr->cmd_status;
-                }
-        }
        conn->datain_pdus_cnt++;
        return 0;
 }
@@ -774,7 +755,7 @@ iscsi_tcp_hdr_dissect(struct iscsi_conn *conn, struct iscsi_hdr *hdr)
                if (!task)
                        rc = ISCSI_ERR_BAD_ITT;
                else
-                        rc = iscsi_data_rsp(conn, task);
+                        rc = iscsi_data_in(conn, task);
                if (rc) {
                        spin_unlock(&conn->session->lock);
                        break;
@@ -998,7 +979,7 @@ iscsi_tcp_recv(read_descriptor_t *rd_desc, struct sk_buff *skb,
 error:
        debug_tcp("Error receiving PDU, errno=%d\n", rc);
-        iscsi_conn_failure(conn, ISCSI_ERR_CONN_FAILED);
+        iscsi_conn_failure(conn, rc);
        return 0;
 }
@@ -1117,8 +1098,10 @@ iscsi_xmit(struct iscsi_conn *conn)
        while (1) {
                rc = iscsi_tcp_xmit_segment(tcp_conn, segment);
-                if (rc < 0)
+                if (rc < 0) {
+                        rc = ISCSI_ERR_XMIT_FAILED;
                        goto error;
+                }
                if (rc == 0)
                        break;
@@ -1127,7 +1110,7 @@ iscsi_xmit(struct iscsi_conn *conn)
                if (segment->total_copied >= segment->total_size) {
                        if (segment->done != NULL) {
                                rc = segment->done(tcp_conn, segment);
-                                if (rc < 0)
+                                if (rc != 0)
                                        goto error;
                        }
                }
@@ -1142,8 +1125,8 @@ error:
        /* Transmit error. We could initiate error recovery
         * here. */
        debug_tcp("Error sending PDU, errno=%d\n", rc);
-        iscsi_conn_failure(conn, ISCSI_ERR_CONN_FAILED);
+        iscsi_conn_failure(conn, rc);
-        return rc;
+        return -EIO;
 }
 /**
@@ -1904,6 +1887,7 @@ static void iscsi_tcp_session_destroy(struct iscsi_cls_session *cls_session)
        struct Scsi_Host *shost = iscsi_session_to_shost(cls_session);
        iscsi_r2tpool_free(cls_session->dd_data);
+        iscsi_session_teardown(cls_session);
        iscsi_host_remove(shost);
        iscsi_host_free(shost);
@@ -1927,7 +1911,7 @@ static struct scsi_host_template iscsi_sht = {
        .cmd_per_lun            = ISCSI_DEF_CMD_PER_LUN,
        .eh_abort_handler       = iscsi_eh_abort,
        .eh_device_reset_handler= iscsi_eh_device_reset,
-        .eh_host_reset_handler  = iscsi_eh_host_reset,
+        .eh_target_reset_handler= iscsi_eh_target_reset,
        .use_clustering         = DISABLE_CLUSTERING,
        .slave_configure        = iscsi_tcp_slave_configure,
        .proc_name              = "iscsi_tcp",
diff --git a/drivers/scsi/libiscsi.c b/drivers/scsi/libiscsi.c
index 299e075a7b34..801c7cf54d2e 100644
--- a/drivers/scsi/libiscsi.c
+++ b/drivers/scsi/libiscsi.c
@@ -404,11 +404,6 @@ static void fail_command(struct iscsi_conn *conn, struct iscsi_task *task,
                conn->session->queued_cmdsn--;
        else
                conn->session->tt->cleanup_task(conn, task);
-        /*
-         * Check if cleanup_task dropped the lock and the command completed,
-         */
-        if (!task->sc)
-                return;
        sc->result = err;
        if (!scsi_bidi_cmnd(sc))
@@ -633,6 +628,40 @@ out:
        __iscsi_put_task(task);
 }
+/**
+ * iscsi_data_in_rsp - SCSI Data-In Response processing
+ * @conn: iscsi connection
+ * @hdr:  iscsi pdu
+ * @task: scsi command task
+ **/
+static void
+iscsi_data_in_rsp(struct iscsi_conn *conn, struct iscsi_hdr *hdr,
+                  struct iscsi_task *task)
+{
+        struct iscsi_data_rsp *rhdr = (struct iscsi_data_rsp *)hdr;
+        struct scsi_cmnd *sc = task->sc;
+        if (!(rhdr->flags & ISCSI_FLAG_DATA_STATUS))
+                return;
+        sc->result = (DID_OK << 16) | rhdr->cmd_status;
+        conn->exp_statsn = be32_to_cpu(rhdr->statsn) + 1;
+        if (rhdr->flags & (ISCSI_FLAG_DATA_UNDERFLOW |
+                           ISCSI_FLAG_DATA_OVERFLOW)) {
+                int res_count = be32_to_cpu(rhdr->residual_count);
+                if (res_count > 0 &&
+                    (rhdr->flags & ISCSI_FLAG_CMD_OVERFLOW ||
+                     res_count <= scsi_in(sc)->length))
+                        scsi_in(sc)->resid = res_count;
+                else
+                        sc->result = (DID_BAD_TARGET << 16) | rhdr->cmd_status;
+        }
+        conn->scsirsp_pdus_cnt++;
+        __iscsi_put_task(task);
+}
 static void iscsi_tmf_rsp(struct iscsi_conn *conn, struct iscsi_hdr *hdr)
 {
        struct iscsi_tm_rsp *tmf = (struct iscsi_tm_rsp *)hdr;
@@ -818,12 +847,7 @@ int __iscsi_complete_pdu(struct iscsi_conn *conn, struct iscsi_hdr *hdr,
                iscsi_scsi_cmd_rsp(conn, hdr, task, data, datalen);
                break;
        case ISCSI_OP_SCSI_DATA_IN:
-                if (hdr->flags & ISCSI_FLAG_DATA_STATUS) {
+                iscsi_data_in_rsp(conn, hdr, task);
-                        conn->scsirsp_pdus_cnt++;
-                        iscsi_update_cmdsn(session,
-                                           (struct iscsi_nopin*) hdr);
-                        __iscsi_put_task(task);
-                }
                break;
        case ISCSI_OP_LOGOUT_RSP:
                iscsi_update_cmdsn(session, (struct iscsi_nopin*)hdr);
@@ -954,6 +978,38 @@ struct iscsi_task *iscsi_itt_to_ctask(struct iscsi_conn *conn, itt_t itt)
 }
 EXPORT_SYMBOL_GPL(iscsi_itt_to_ctask);
+void iscsi_session_failure(struct iscsi_cls_session *cls_session,
+                           enum iscsi_err err)
+{
+        struct iscsi_session *session = cls_session->dd_data;
+        struct iscsi_conn *conn;
+        struct device *dev;
+        unsigned long flags;
+        spin_lock_irqsave(&session->lock, flags);
+        conn = session->leadconn;
+        if (session->state == ISCSI_STATE_TERMINATE || !conn) {
+                spin_unlock_irqrestore(&session->lock, flags);
+                return;
+        }
+        dev = get_device(&conn->cls_conn->dev);
+        spin_unlock_irqrestore(&session->lock, flags);
+        if (!dev)
+                return;
+        /*
+         * if the host is being removed bypass the connection
+         * recovery initialization because we are going to kill
+         * the session.
+         */
+        if (err == ISCSI_ERR_INVALID_HOST)
+                iscsi_conn_error_event(conn->cls_conn, err);
+        else
+                iscsi_conn_failure(conn, err);
+        put_device(dev);
+}
+EXPORT_SYMBOL_GPL(iscsi_session_failure);
 void iscsi_conn_failure(struct iscsi_conn *conn, enum iscsi_err err)
 {
        struct iscsi_session *session = conn->session;
@@ -968,9 +1024,10 @@ void iscsi_conn_failure(struct iscsi_conn *conn, enum iscsi_err err)
        if (conn->stop_stage == 0)
                session->state = ISCSI_STATE_FAILED;
        spin_unlock_irqrestore(&session->lock, flags);
        set_bit(ISCSI_SUSPEND_BIT, &conn->suspend_tx);
        set_bit(ISCSI_SUSPEND_BIT, &conn->suspend_rx);
-        iscsi_conn_error(conn->cls_conn, err);
+        iscsi_conn_error_event(conn->cls_conn, err);
 }
 EXPORT_SYMBOL_GPL(iscsi_conn_failure);
@@ -1194,15 +1251,13 @@ int iscsi_queuecommand(struct scsi_cmnd *sc, void (*done)(struct scsi_cmnd *))
                switch (session->state) {
                case ISCSI_STATE_IN_RECOVERY:
                        reason = FAILURE_SESSION_IN_RECOVERY;
-                        sc->result = DID_IMM_RETRY << 16;
+                        goto reject;
-                        break;
                case ISCSI_STATE_LOGGING_OUT:
                        reason = FAILURE_SESSION_LOGGING_OUT;
-                        sc->result = DID_IMM_RETRY << 16;
+                        goto reject;
-                        break;
                case ISCSI_STATE_RECOVERY_FAILED:
                        reason = FAILURE_SESSION_RECOVERY_TIMEOUT;
-                        sc->result = DID_NO_CONNECT << 16;
+                        sc->result = DID_TRANSPORT_FAILFAST << 16;
                        break;
                case ISCSI_STATE_TERMINATE:
                        reason = FAILURE_SESSION_TERMINATE;
@@ -1267,7 +1322,7 @@ reject:
        spin_unlock(&session->lock);
        debug_scsi("cmd 0x%x rejected (%d)\n", sc->cmnd[0], reason);
        spin_lock(host->host_lock);
-        return SCSI_MLQUEUE_HOST_BUSY;
+        return SCSI_MLQUEUE_TARGET_BUSY;
 fault:
        spin_unlock(&session->lock);
@@ -1307,7 +1362,7 @@ void iscsi_session_recovery_timedout(struct iscsi_cls_session *cls_session)
 }
 EXPORT_SYMBOL_GPL(iscsi_session_recovery_timedout);
-int iscsi_eh_host_reset(struct scsi_cmnd *sc)
+int iscsi_eh_target_reset(struct scsi_cmnd *sc)
 {
        struct iscsi_cls_session *cls_session;
        struct iscsi_session *session;
@@ -1321,7 +1376,7 @@ int iscsi_eh_host_reset(struct scsi_cmnd *sc)
        spin_lock_bh(&session->lock);
        if (session->state == ISCSI_STATE_TERMINATE) {
 failed:
-                debug_scsi("failing host reset: session terminated "
+                debug_scsi("failing target reset: session terminated "
                           "[CID %d age %d]\n", conn->id, session->age);
                spin_unlock_bh(&session->lock);
                mutex_unlock(&session->eh_mutex);
@@ -1336,7 +1391,7 @@ failed:
         */
        iscsi_conn_failure(conn, ISCSI_ERR_CONN_FAILED);
-        debug_scsi("iscsi_eh_host_reset wait for relogin\n");
+        debug_scsi("iscsi_eh_target_reset wait for relogin\n");
        wait_event_interruptible(conn->ehwait,
                                 session->state == ISCSI_STATE_TERMINATE ||
                                 session->state == ISCSI_STATE_LOGGED_IN ||
@@ -1348,14 +1403,14 @@ failed:
        spin_lock_bh(&session->lock);
        if (session->state == ISCSI_STATE_LOGGED_IN)
                iscsi_session_printk(KERN_INFO, session,
-                                     "host reset succeeded\n");
+                                     "target reset succeeded\n");
        else
                goto failed;
        spin_unlock_bh(&session->lock);
        mutex_unlock(&session->eh_mutex);
        return SUCCESS;
 }
-EXPORT_SYMBOL_GPL(iscsi_eh_host_reset);
+EXPORT_SYMBOL_GPL(iscsi_eh_target_reset);
 static void iscsi_tmf_timedout(unsigned long data)
 {
@@ -1456,7 +1511,7 @@ static void fail_all_commands(struct iscsi_conn *conn, unsigned lun,
                if (lun == task->sc->device->lun || lun == -1) {
                        debug_scsi("failing in progress sc %p itt 0x%x\n",
                                   task->sc, task->itt);
-                        fail_command(conn, task, DID_BUS_BUSY << 16);
+                        fail_command(conn, task, error << 16);
                }
        }
 }
@@ -1476,12 +1531,12 @@ static void iscsi_start_tx(struct iscsi_conn *conn)
                scsi_queue_work(conn->session->host, &conn->xmitwork);
 }
-static enum scsi_eh_timer_return iscsi_eh_cmd_timed_out(struct scsi_cmnd *scmd)
+static enum blk_eh_timer_return iscsi_eh_cmd_timed_out(struct scsi_cmnd *scmd)
 {
        struct iscsi_cls_session *cls_session;
        struct iscsi_session *session;
        struct iscsi_conn *conn;
-        enum scsi_eh_timer_return rc = EH_NOT_HANDLED;
+        enum blk_eh_timer_return rc = BLK_EH_NOT_HANDLED;
        cls_session = starget_to_session(scsi_target(scmd->device));
        session = cls_session->dd_data;
@@ -1494,14 +1549,14 @@ static enum scsi_eh_timer_return iscsi_eh_cmd_timed_out(struct scsi_cmnd *scmd)
                 * We are probably in the middle of iscsi recovery so let
                 * that complete and handle the error.
                 */
-                rc = EH_RESET_TIMER;
+                rc = BLK_EH_RESET_TIMER;
                goto done;
        }
        conn = session->leadconn;
        if (!conn) {
                /* In the middle of shuting down */
-                rc = EH_RESET_TIMER;
+                rc = BLK_EH_RESET_TIMER;
                goto done;
        }
@@ -1513,20 +1568,21 @@ static enum scsi_eh_timer_return iscsi_eh_cmd_timed_out(struct scsi_cmnd *scmd)
         */
        if (time_before_eq(conn->last_recv + (conn->recv_timeout * HZ) +
                            (conn->ping_timeout * HZ), jiffies))
-                rc = EH_RESET_TIMER;
+                rc = BLK_EH_RESET_TIMER;
        /*
         * if we are about to check the transport then give the command
         * more time
         */
        if (time_before_eq(conn->last_recv + (conn->recv_timeout * HZ),
                           jiffies))
-                rc = EH_RESET_TIMER;
+                rc = BLK_EH_RESET_TIMER;
        /* if in the middle of checking the transport then give us more time */
        if (conn->ping_task)
-                rc = EH_RESET_TIMER;
+                rc = BLK_EH_RESET_TIMER;
 done:
        spin_unlock(&session->lock);
-        debug_scsi("return %s\n", rc == EH_RESET_TIMER ? "timer reset" : "nh");
+        debug_scsi("return %s\n", rc == BLK_EH_RESET_TIMER ?
+                                        "timer reset" : "nh");
        return rc;
 }
@@ -1768,10 +1824,10 @@ int iscsi_eh_device_reset(struct scsi_cmnd *sc)
        iscsi_suspend_tx(conn);
-        spin_lock(&session->lock);
+        spin_lock_bh(&session->lock);
        fail_all_commands(conn, sc->device->lun, DID_ERROR);
        conn->tmf_state = TMF_INITIAL;
-        spin_unlock(&session->lock);
+        spin_unlock_bh(&session->lock);
        iscsi_start_tx(conn);
        goto done;
@@ -1877,6 +1933,7 @@ struct Scsi_Host *iscsi_host_alloc(struct scsi_host_template *sht,
                                   int dd_data_size, uint16_t qdepth)
 {
        struct Scsi_Host *shost;
+        struct iscsi_host *ihost;
        shost = scsi_host_alloc(sht, sizeof(struct iscsi_host) + dd_data_size);
        if (!shost)
@@ -1891,22 +1948,43 @@ struct Scsi_Host *iscsi_host_alloc(struct scsi_host_template *sht,
                qdepth = ISCSI_DEF_CMD_PER_LUN;
        }
        shost->cmd_per_lun = qdepth;
+        ihost = shost_priv(shost);
+        spin_lock_init(&ihost->lock);
+        ihost->state = ISCSI_HOST_SETUP;
+        ihost->num_sessions = 0;
+        init_waitqueue_head(&ihost->session_removal_wq);
        return shost;
 }
 EXPORT_SYMBOL_GPL(iscsi_host_alloc);
+static void iscsi_notify_host_removed(struct iscsi_cls_session *cls_session)
+{
+        iscsi_session_failure(cls_session, ISCSI_ERR_INVALID_HOST);
+}
 /**
 * iscsi_host_remove - remove host and sessions
 * @shost: scsi host
 *
- * This will also remove any sessions attached to the host, but if userspace
+ * If there are any sessions left, this will initiate the removal and wait
- * is managing the session at the same time this will break. TODO: add
+ * for the completion.
- * refcounting to the netlink iscsi interface so a rmmod or host hot unplug
- * does not remove the memory from under us.
 */
 void iscsi_host_remove(struct Scsi_Host *shost)
 {
-        iscsi_host_for_each_session(shost, iscsi_session_teardown);
+        struct iscsi_host *ihost = shost_priv(shost);
+        unsigned long flags;
+        spin_lock_irqsave(&ihost->lock, flags);
+        ihost->state = ISCSI_HOST_REMOVED;
+        spin_unlock_irqrestore(&ihost->lock, flags);
+        iscsi_host_for_each_session(shost, iscsi_notify_host_removed);
+        wait_event_interruptible(ihost->session_removal_wq,
+                                 ihost->num_sessions == 0);
+        if (signal_pending(current))
+                flush_signals(current);
        scsi_remove_host(shost);
 }
 EXPORT_SYMBOL_GPL(iscsi_host_remove);
@@ -1922,6 +2000,27 @@ void iscsi_host_free(struct Scsi_Host *shost)
 }
 EXPORT_SYMBOL_GPL(iscsi_host_free);
+static void iscsi_host_dec_session_cnt(struct Scsi_Host *shost)
+{
+        struct iscsi_host *ihost = shost_priv(shost);
+        unsigned long flags;
+        shost = scsi_host_get(shost);
+        if (!shost) {
+                printk(KERN_ERR "Invalid state. Cannot notify host removal "
+                      "of session teardown event because host already "
+                      "removed.\n");
+                return;
+        }
+        spin_lock_irqsave(&ihost->lock, flags);
+        ihost->num_sessions--;
+        if (ihost->num_sessions == 0)
+                wake_up(&ihost->session_removal_wq);
+        spin_unlock_irqrestore(&ihost->lock, flags);
+        scsi_host_put(shost);
+}
 /**
 * iscsi_session_setup - create iscsi cls session and host and session
 * @iscsit: iscsi transport template
@@ -1942,9 +2041,19 @@ iscsi_session_setup(struct iscsi_transport *iscsit, struct Scsi_Host *shost,
                    uint16_t cmds_max, int cmd_task_size,
                    uint32_t initial_cmdsn, unsigned int id)
 {
+        struct iscsi_host *ihost = shost_priv(shost);
        struct iscsi_session *session;
        struct iscsi_cls_session *cls_session;
        int cmd_i, scsi_cmds, total_cmds = cmds_max;
+        unsigned long flags;
+        spin_lock_irqsave(&ihost->lock, flags);
+        if (ihost->state == ISCSI_HOST_REMOVED) {
+                spin_unlock_irqrestore(&ihost->lock, flags);
+                return NULL;
+        }
+        ihost->num_sessions++;
+        spin_unlock_irqrestore(&ihost->lock, flags);
        if (!total_cmds)
                total_cmds = ISCSI_DEF_XMIT_CMDS_MAX;
@@ -1957,7 +2066,7 @@ iscsi_session_setup(struct iscsi_transport *iscsit, struct Scsi_Host *shost,
                printk(KERN_ERR "iscsi: invalid can_queue of %d. can_queue "
                       "must be a power of two that is at least %d.\n",
                       total_cmds, ISCSI_TOTAL_CMDS_MIN);
-                return NULL;
+                goto dec_session_count;
        }
        if (total_cmds > ISCSI_TOTAL_CMDS_MAX) {
@@ -1981,7 +2090,7 @@ iscsi_session_setup(struct iscsi_transport *iscsit, struct Scsi_Host *shost,
        cls_session = iscsi_alloc_session(shost, iscsit,
                                          sizeof(struct iscsi_session));
        if (!cls_session)
-                return NULL;
+                goto dec_session_count;
        session = cls_session->dd_data;
        session->cls_session = cls_session;
        session->host = shost;
@@ -2020,6 +2129,7 @@ iscsi_session_setup(struct iscsi_transport *iscsit, struct Scsi_Host *shost,
        if (iscsi_add_session(cls_session, id))
                goto cls_session_fail;
        return cls_session;
 cls_session_fail:
@@ -2028,6 +2138,8 @@ module_get_fail:
        iscsi_pool_free(&session->cmdpool);
 cmdpool_alloc_fail:
        iscsi_free_session(cls_session);
+dec_session_count:
+        iscsi_host_dec_session_cnt(shost);
        return NULL;
 }
 EXPORT_SYMBOL_GPL(iscsi_session_setup);
@@ -2043,6 +2155,7 @@ void iscsi_session_teardown(struct iscsi_cls_session *cls_session)
 {
        struct iscsi_session *session = cls_session->dd_data;
        struct module *owner = cls_session->transport->owner;
+        struct Scsi_Host *shost = session->host;
        iscsi_pool_free(&session->cmdpool);
@@ -2055,6 +2168,7 @@ void iscsi_session_teardown(struct iscsi_cls_session *cls_session)
        kfree(session->ifacename);
        iscsi_destroy_session(cls_session);
+        iscsi_host_dec_session_cnt(shost);
        module_put(owner);
 }
 EXPORT_SYMBOL_GPL(iscsi_session_teardown);
@@ -2334,8 +2448,10 @@ static void iscsi_start_session_recovery(struct iscsi_session *session,
         * flush queues.
         */
        spin_lock_bh(&session->lock);
-        fail_all_commands(conn, -1,
+        if (flag == STOP_CONN_RECOVER)
-                        STOP_CONN_RECOVER ? DID_BUS_BUSY : DID_ERROR);
+                fail_all_commands(conn, -1, DID_TRANSPORT_DISRUPTED);
+        else
+                fail_all_commands(conn, -1, DID_ERROR);
        flush_control_queues(session, conn);
        spin_unlock_bh(&session->lock);
        mutex_unlock(&session->eh_mutex);
diff --git a/drivers/scsi/libsas/sas_ata.c b/drivers/scsi/libsas/sas_ata.c
index 48ee8c7f5bdd..e15501170698 100644
--- a/drivers/scsi/libsas/sas_ata.c
+++ b/drivers/scsi/libsas/sas_ata.c
@@ -294,10 +294,10 @@ static void sas_ata_post_internal(struct ata_queued_cmd *qc)
        }
 }
-static int sas_ata_scr_write(struct ata_port *ap, unsigned int sc_reg_in,
+static int sas_ata_scr_write(struct ata_link *link, unsigned int sc_reg_in,
                              u32 val)
 {
-        struct domain_device *dev = ap->private_data;
+        struct domain_device *dev = link->ap->private_data;
        SAS_DPRINTK("STUB %s\n", __func__);
        switch (sc_reg_in) {
@@ -319,10 +319,10 @@ static int sas_ata_scr_write(struct ata_port *ap, unsigned int sc_reg_in,
        return 0;
 }
-static int sas_ata_scr_read(struct ata_port *ap, unsigned int sc_reg_in,
+static int sas_ata_scr_read(struct ata_link *link, unsigned int sc_reg_in,
                            u32 *val)
 {
-        struct domain_device *dev = ap->private_data;
+        struct domain_device *dev = link->ap->private_data;
        SAS_DPRINTK("STUB %s\n", __func__);
        switch (sc_reg_in) {
@@ -398,7 +398,7 @@ void sas_ata_task_abort(struct sas_task *task)
        /* Bounce SCSI-initiated commands to the SCSI EH */
        if (qc->scsicmd) {
-                scsi_req_abort_cmd(qc->scsicmd);
+                blk_abort_request(qc->scsicmd->request);
                scsi_schedule_eh(qc->scsicmd->device->host);
                return;
        }
diff --git a/drivers/scsi/libsas/sas_internal.h b/drivers/scsi/libsas/sas_internal.h
index b4f9368f116a..0001374bd6b2 100644
--- a/drivers/scsi/libsas/sas_internal.h
+++ b/drivers/scsi/libsas/sas_internal.h
@@ -55,7 +55,7 @@ void sas_unregister_phys(struct sas_ha_struct *sas_ha);
 int  sas_register_ports(struct sas_ha_struct *sas_ha);
 void sas_unregister_ports(struct sas_ha_struct *sas_ha);
-enum scsi_eh_timer_return sas_scsi_timed_out(struct scsi_cmnd *);
+enum blk_eh_timer_return sas_scsi_timed_out(struct scsi_cmnd *);
 int  sas_init_queue(struct sas_ha_struct *sas_ha);
 int  sas_init_events(struct sas_ha_struct *sas_ha);
diff --git a/drivers/scsi/libsas/sas_scsi_host.c b/drivers/scsi/libsas/sas_scsi_host.c
index a8e3ef309070..744838780ada 100644
--- a/drivers/scsi/libsas/sas_scsi_host.c
+++ b/drivers/scsi/libsas/sas_scsi_host.c
@@ -673,43 +673,43 @@ out:
        return;
 }
-enum scsi_eh_timer_return sas_scsi_timed_out(struct scsi_cmnd *cmd)
+enum blk_eh_timer_return sas_scsi_timed_out(struct scsi_cmnd *cmd)
 {
        struct sas_task *task = TO_SAS_TASK(cmd);
        unsigned long flags;
        if (!task) {
-                cmd->timeout_per_command /= 2;
+                cmd->request->timeout /= 2;
                SAS_DPRINTK("command 0x%p, task 0x%p, gone: %s\n",
-                            cmd, task, (cmd->timeout_per_command ?
+                            cmd, task, (cmd->request->timeout ?
-                            "EH_RESET_TIMER" : "EH_NOT_HANDLED"));
+                            "BLK_EH_RESET_TIMER" : "BLK_EH_NOT_HANDLED"));
-                if (!cmd->timeout_per_command)
+                if (!cmd->request->timeout)
-                        return EH_NOT_HANDLED;
+                        return BLK_EH_NOT_HANDLED;
-                return EH_RESET_TIMER;
+                return BLK_EH_RESET_TIMER;
        }
        spin_lock_irqsave(&task->task_state_lock, flags);
        BUG_ON(task->task_state_flags & SAS_TASK_STATE_ABORTED);
        if (task->task_state_flags & SAS_TASK_STATE_DONE) {
                spin_unlock_irqrestore(&task->task_state_lock, flags);
-                SAS_DPRINTK("command 0x%p, task 0x%p, timed out: EH_HANDLED\n",
+                SAS_DPRINTK("command 0x%p, task 0x%p, timed out: "
-                            cmd, task);
+                            "BLK_EH_HANDLED\n", cmd, task);
-                return EH_HANDLED;
+                return BLK_EH_HANDLED;
        }
        if (!(task->task_state_flags & SAS_TASK_AT_INITIATOR)) {
                spin_unlock_irqrestore(&task->task_state_lock, flags);
                SAS_DPRINTK("command 0x%p, task 0x%p, not at initiator: "
-                            "EH_RESET_TIMER\n",
+                            "BLK_EH_RESET_TIMER\n",
                            cmd, task);
-                return EH_RESET_TIMER;
+                return BLK_EH_RESET_TIMER;
        }
        task->task_state_flags |= SAS_TASK_STATE_ABORTED;
        spin_unlock_irqrestore(&task->task_state_lock, flags);
-        SAS_DPRINTK("command 0x%p, task 0x%p, timed out: EH_NOT_HANDLED\n",
+        SAS_DPRINTK("command 0x%p, task 0x%p, timed out: BLK_EH_NOT_HANDLED\n",
                    cmd, task);
-        return EH_NOT_HANDLED;
+        return BLK_EH_NOT_HANDLED;
 }
 int sas_ioctl(struct scsi_device *sdev, int cmd, void __user *arg)
@@ -1039,7 +1039,7 @@ void sas_task_abort(struct sas_task *task)
                return;
        }
-        scsi_req_abort_cmd(sc);
+        blk_abort_request(sc->request);
        scsi_schedule_eh(sc->device->host);
 }
diff --git a/drivers/scsi/lpfc/lpfc.h b/drivers/scsi/lpfc/lpfc.h
index e0e018d12653..60a9e6e9384b 100644
--- a/drivers/scsi/lpfc/lpfc.h
+++ b/drivers/scsi/lpfc/lpfc.h
@@ -34,7 +34,14 @@ struct lpfc_sli2_slim;
 #define LPFC_IOCB_LIST_CNT      2250    /* list of IOCBs for fast-path usage. */
 #define LPFC_Q_RAMP_UP_INTERVAL 120     /* lun q_depth ramp up interval */
 #define LPFC_VNAME_LEN          100     /* vport symbolic name length */
+#define LPFC_TGTQ_INTERVAL      40000   /* Min amount of time between tgt
+                                           queue depth change in millisecs */
+#define LPFC_TGTQ_RAMPUP_PCENT  5       /* Target queue rampup in percentage */
+#define LPFC_MIN_TGT_QDEPTH     100
+#define LPFC_MAX_TGT_QDEPTH     0xFFFF
+#define  LPFC_MAX_BUCKET_COUNT 20       /* Maximum no. of buckets for stat data
+                                           collection. */
 /*
 * Following time intervals are used of adjusting SCSI device
 * queue depths when there are driver resource error or Firmware
@@ -49,6 +56,9 @@ struct lpfc_sli2_slim;
 #define LPFC_HB_MBOX_INTERVAL   5       /* Heart beat interval in seconds. */
 #define LPFC_HB_MBOX_TIMEOUT    30      /* Heart beat timeout  in seconds. */
+/* Error Attention event polling interval */
+#define LPFC_ERATT_POLL_INTERVAL        5 /* EATT poll interval in seconds */
 /* Define macros for 64 bit support */
 #define putPaddrLow(addr)    ((uint32_t) (0xffffffff & (u64)(addr)))
 #define putPaddrHigh(addr)   ((uint32_t) (0xffffffff & (((u64)(addr))>>32)))
@@ -60,6 +70,9 @@ struct lpfc_sli2_slim;
 #define MAX_HBAEVT      32
+/* Number of MSI-X vectors the driver uses */
+#define LPFC_MSIX_VECTORS       2
 /* lpfc wait event data ready flag */
 #define LPFC_DATA_READY         (1<<0)
@@ -357,6 +370,7 @@ struct lpfc_vport {
        uint32_t cfg_log_verbose;
        uint32_t cfg_max_luns;
        uint32_t cfg_enable_da_id;
+        uint32_t cfg_max_scsicmpl_time;
        uint32_t dev_loss_tmo_changed;
@@ -369,6 +383,8 @@ struct lpfc_vport {
        struct lpfc_debugfs_trc *disc_trc;
        atomic_t disc_trc_cnt;
 #endif
+        uint8_t stat_data_enabled;
+        uint8_t stat_data_blocked;
 };
 struct hbq_s {
@@ -407,10 +423,11 @@ struct lpfc_hba {
        struct lpfc_sli sli;
        uint32_t sli_rev;               /* SLI2 or SLI3 */
        uint32_t sli3_options;          /* Mask of enabled SLI3 options */
-#define LPFC_SLI3_ENABLED        0x01
+#define LPFC_SLI3_HBQ_ENABLED           0x01
-#define LPFC_SLI3_HBQ_ENABLED    0x02
+#define LPFC_SLI3_NPIV_ENABLED          0x02
-#define LPFC_SLI3_NPIV_ENABLED   0x04
+#define LPFC_SLI3_VPORT_TEARDOWN        0x04
-#define LPFC_SLI3_VPORT_TEARDOWN 0x08
+#define LPFC_SLI3_CRP_ENABLED           0x08
+#define LPFC_SLI3_INB_ENABLED           0x10
        uint32_t iocb_cmd_size;
        uint32_t iocb_rsp_size;
@@ -422,10 +439,20 @@ struct lpfc_hba {
 #define LS_NPIV_FAB_SUPPORTED 0x2       /* Fabric supports NPIV */
 #define LS_IGNORE_ERATT       0x4       /* intr handler should ignore ERATT */
-        struct lpfc_sli2_slim *slim2p;
+        uint32_t hba_flag;      /* hba generic flags */
-        struct lpfc_dmabuf hbqslimp;
+#define HBA_ERATT_HANDLED       0x1 /* This flag is set when eratt handled */
+        struct lpfc_dmabuf slim2p;
-        dma_addr_t slim2p_mapping;
+        MAILBOX_t *mbox;
+        uint32_t *inb_ha_copy;
+        uint32_t *inb_counter;
+        uint32_t inb_last_counter;
+        uint32_t ha_copy;
+        struct _PCB *pcb;
+        struct _IOCB *IOCBs;
+        struct lpfc_dmabuf hbqslimp;
        uint16_t pci_cfg_value;
@@ -492,7 +519,7 @@ struct lpfc_hba {
        wait_queue_head_t    work_waitq;
        struct task_struct   *worker_thread;
-        long data_flags;
+        unsigned long data_flags;
        uint32_t hbq_in_use;            /* HBQs in use flag */
        struct list_head hbqbuf_in_list;  /* in-fly hbq buffer list */
@@ -514,6 +541,7 @@ struct lpfc_hba {
        void __iomem *HCregaddr;        /* virtual address for host ctl reg */
        struct lpfc_hgp __iomem *host_gp; /* Host side get/put pointers */
+        struct lpfc_pgp   *port_gp;
        uint32_t __iomem  *hbq_put;     /* Address in SLIM to HBQ put ptrs */
        uint32_t          *hbq_get;     /* Host mem address of HBQ get ptrs */
@@ -536,6 +564,7 @@ struct lpfc_hba {
        uint8_t soft_wwn_enable;
        struct timer_list fcp_poll_timer;
+        struct timer_list eratt_poll;
        /*
         * stat  counters
@@ -565,7 +594,7 @@ struct lpfc_hba {
        struct fc_host_statistics link_stats;
        enum intr_type_t intr_type;
-        struct msix_entry msix_entries[1];
+        struct msix_entry msix_entries[LPFC_MSIX_VECTORS];
        struct list_head port_list;
        struct lpfc_vport *pport;       /* physical lpfc_vport pointer */
@@ -605,6 +634,7 @@ struct lpfc_hba {
        unsigned long last_completion_time;
        struct timer_list hb_tmofunc;
        uint8_t hb_outstanding;
+        enum hba_temp_state over_temp_state;
        /* ndlp reference management */
        spinlock_t ndlp_lock;
        /*
@@ -613,7 +643,19 @@ struct lpfc_hba {
         */
 #define QUE_BUFTAG_BIT  (1<<31)
        uint32_t buffer_tag_count;
-        enum hba_temp_state over_temp_state;
+        int wait_4_mlo_maint_flg;
+        wait_queue_head_t wait_4_mlo_m_q;
+        /* data structure used for latency data collection */
+#define LPFC_NO_BUCKET     0
+#define LPFC_LINEAR_BUCKET 1
+#define LPFC_POWER2_BUCKET 2
+        uint8_t  bucket_type;
+        uint32_t bucket_base;
+        uint32_t bucket_step;
+/* Maximum number of events that can be outstanding at any time*/
+#define LPFC_MAX_EVT_COUNT 512
+        atomic_t fast_event_count;
 };
 static inline struct Scsi_Host *
@@ -650,15 +692,25 @@ lpfc_worker_wake_up(struct lpfc_hba *phba)
        return;
 }
-#define FC_REG_DUMP_EVENT               0x10    /* Register for Dump events */
+static inline void
-#define FC_REG_TEMPERATURE_EVENT        0x20    /* Register for temperature
+lpfc_sli_read_hs(struct lpfc_hba *phba)
-                                                   event */
+{
+        /*
+         * There was a link/board error. Read the status register to retrieve
+         * the error event and process it.
+         */
+        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);
+        /* Clear chip Host Attention error bit */
+        writel(HA_ERATT, phba->HAregaddr);
+        readl(phba->HAregaddr); /* flush */
+        phba->pport->stopped = 1;
+        return;
+}
-struct temp_event {
-        uint32_t event_type;
-        uint32_t event_code;
-        uint32_t data;
-};
-#define LPFC_CRIT_TEMP          0x1
-#define LPFC_THRESHOLD_TEMP     0x2
-#define LPFC_NORMAL_TEMP        0x3
diff --git a/drivers/scsi/lpfc/lpfc_attr.c b/drivers/scsi/lpfc/lpfc_attr.c
index 37bfa0bd1dae..aa3d6277581d 100644
--- a/drivers/scsi/lpfc/lpfc_attr.c
+++ b/drivers/scsi/lpfc/lpfc_attr.c
@@ -32,6 +32,7 @@
 #include "lpfc_hw.h"
 #include "lpfc_sli.h"
+#include "lpfc_nl.h"
 #include "lpfc_disc.h"
 #include "lpfc_scsi.h"
 #include "lpfc.h"
@@ -49,6 +50,21 @@
 #define LPFC_LINK_SPEED_BITMAP 0x00000117
 #define LPFC_LINK_SPEED_STRING "0, 1, 2, 4, 8"
+/**
+ * lpfc_jedec_to_ascii: Hex to ascii convertor according to JEDEC rules.
+ * @incr: integer to convert.
+ * @hdw: ascii string holding converted integer plus a string terminator.
+ *
+ * Description:
+ * JEDEC Joint Electron Device Engineering Council.
+ * Convert a 32 bit integer composed of 8 nibbles into an 8 byte ascii
+ * character string. The string is then terminated with a NULL in byte 9.
+ * Hex 0-9 becomes ascii '0' to '9'.
+ * Hex a-f becomes ascii '=' to 'B' capital B.
+ *
+ * Notes:
+ * Coded for 32 bit integers only.
+ **/
 static void
 lpfc_jedec_to_ascii(int incr, char hdw[])
 {
@@ -65,6 +81,14 @@ lpfc_jedec_to_ascii(int incr, char hdw[])
        return;
 }
+/**
+ * lpfc_drvr_version_show: Return the Emulex driver string with version number.
+ * @dev: class unused variable.
+ * @attr: device attribute, not used.
+ * @buf: on return contains the module description text.
+ *
+ * Returns: size of formatted string.
+ **/
 static ssize_t
 lpfc_drvr_version_show(struct device *dev, struct device_attribute *attr,
                       char *buf)
@@ -72,6 +96,14 @@ lpfc_drvr_version_show(struct device *dev, struct device_attribute *attr,
        return snprintf(buf, PAGE_SIZE, LPFC_MODULE_DESC "\n");
 }
+/**
+ * lpfc_info_show: Return some pci info about the host in ascii.
+ * @dev: class converted to a Scsi_host structure.
+ * @attr: device attribute, not used.
+ * @buf: on return contains the formatted text from lpfc_info().
+ *
+ * Returns: size of formatted string.
+ **/
 static ssize_t
 lpfc_info_show(struct device *dev, struct device_attribute *attr,
               char *buf)
@@ -81,6 +113,14 @@ lpfc_info_show(struct device *dev, struct device_attribute *attr,
        return snprintf(buf, PAGE_SIZE, "%s\n",lpfc_info(host));
 }
+/**
+ * lpfc_serialnum_show: Return the hba serial number in ascii.
+ * @dev: class converted to a Scsi_host structure.
+ * @attr: device attribute, not used.
+ * @buf: on return contains the formatted text serial number.
+ *
+ * Returns: size of formatted string.
+ **/
 static ssize_t
 lpfc_serialnum_show(struct device *dev, struct device_attribute *attr,
                    char *buf)
@@ -92,6 +132,18 @@ lpfc_serialnum_show(struct device *dev, struct device_attribute *attr,
        return snprintf(buf, PAGE_SIZE, "%s\n",phba->SerialNumber);
 }
+/**
+ * lpfc_temp_sensor_show: Return the temperature sensor level.
+ * @dev: class converted to a Scsi_host structure.
+ * @attr: device attribute, not used.
+ * @buf: on return contains the formatted support level.
+ *
+ * Description:
+ * Returns a number indicating the temperature sensor level currently
+ * supported, zero or one in ascii.
+ *
+ * Returns: size of formatted string.
+ **/
 static ssize_t
 lpfc_temp_sensor_show(struct device *dev, struct device_attribute *attr,
                      char *buf)
@@ -102,6 +154,14 @@ lpfc_temp_sensor_show(struct device *dev, struct device_attribute *attr,
        return snprintf(buf, PAGE_SIZE, "%d\n",phba->temp_sensor_support);
 }
+/**
+ * lpfc_modeldesc_show: Return the model description of the hba.
+ * @dev: class converted to a Scsi_host structure.
+ * @attr: device attribute, not used.
+ * @buf: on return contains the scsi vpd model description.
+ *
+ * Returns: size of formatted string.
+ **/
 static ssize_t
 lpfc_modeldesc_show(struct device *dev, struct device_attribute *attr,
                    char *buf)
@@ -113,6 +173,14 @@ lpfc_modeldesc_show(struct device *dev, struct device_attribute *attr,
        return snprintf(buf, PAGE_SIZE, "%s\n",phba->ModelDesc);
 }
+/**
+ * lpfc_modelname_show: Return the model name of the hba.
+ * @dev: class converted to a Scsi_host structure.
+ * @attr: device attribute, not used.
+ * @buf: on return contains the scsi vpd model name.
+ *
+ * Returns: size of formatted string.
+ **/
 static ssize_t
 lpfc_modelname_show(struct device *dev, struct device_attribute *attr,
                    char *buf)
@@ -124,6 +192,14 @@ lpfc_modelname_show(struct device *dev, struct device_attribute *attr,
        return snprintf(buf, PAGE_SIZE, "%s\n",phba->ModelName);
 }
+/**
+ * lpfc_programtype_show: Return the program type of the hba.
+ * @dev: class converted to a Scsi_host structure.
+ * @attr: device attribute, not used.
+ * @buf: on return contains the scsi vpd program type.
+ *
+ * Returns: size of formatted string.
+ **/
 static ssize_t
 lpfc_programtype_show(struct device *dev, struct device_attribute *attr,
                      char *buf)
@@ -135,6 +211,33 @@ lpfc_programtype_show(struct device *dev, struct device_attribute *attr,
        return snprintf(buf, PAGE_SIZE, "%s\n",phba->ProgramType);
 }
+/**
+ * lpfc_mlomgmt_show: Return the Menlo Maintenance sli flag.
+ * @dev: class converted to a Scsi_host structure.
+ * @attr: device attribute, not used.
+ * @buf: on return contains the Menlo Maintenance sli flag.
+ *
+ * Returns: size of formatted string.
+ **/
+static ssize_t
+lpfc_mlomgmt_show(struct device *dev, struct device_attribute *attr, char *buf)
+{
+        struct Scsi_Host  *shost = class_to_shost(dev);
+        struct lpfc_vport *vport = (struct lpfc_vport *)shost->hostdata;
+        struct lpfc_hba   *phba = vport->phba;
+        return snprintf(buf, PAGE_SIZE, "%d\n",
+                (phba->sli.sli_flag & LPFC_MENLO_MAINT));
+}
+/**
+ * lpfc_vportnum_show: Return the port number in ascii of the hba.
+ * @dev: class converted to a Scsi_host structure.
+ * @attr: device attribute, not used.
+ * @buf: on return contains scsi vpd program type.
+ *
+ * Returns: size of formatted string.
+ **/
 static ssize_t
 lpfc_vportnum_show(struct device *dev, struct device_attribute *attr,
                   char *buf)
@@ -146,6 +249,14 @@ lpfc_vportnum_show(struct device *dev, struct device_attribute *attr,
        return snprintf(buf, PAGE_SIZE, "%s\n",phba->Port);
 }
+/**
+ * lpfc_fwrev_show: Return the firmware rev running in the hba.
+ * @dev: class converted to a Scsi_host structure.
+ * @attr: device attribute, not used.
+ * @buf: on return contains the scsi vpd program type.
+ *
+ * Returns: size of formatted string.
+ **/
 static ssize_t
 lpfc_fwrev_show(struct device *dev, struct device_attribute *attr,
                char *buf)
@@ -159,6 +270,14 @@ lpfc_fwrev_show(struct device *dev, struct device_attribute *attr,
        return snprintf(buf, PAGE_SIZE, "%s, sli-%d\n", fwrev, phba->sli_rev);
 }
+/**
+ * lpfc_hdw_show: Return the jedec information about the hba.
+ * @dev: class converted to a Scsi_host structure.
+ * @attr: device attribute, not used.
+ * @buf: on return contains the scsi vpd program type.
+ *
+ * Returns: size of formatted string.
+ **/
 static ssize_t
 lpfc_hdw_show(struct device *dev, struct device_attribute *attr, char *buf)
 {
@@ -171,6 +290,15 @@ lpfc_hdw_show(struct device *dev, struct device_attribute *attr, char *buf)
        lpfc_jedec_to_ascii(vp->rev.biuRev, hdw);
        return snprintf(buf, PAGE_SIZE, "%s\n", hdw);
 }
+/**
+ * lpfc_option_rom_version_show: Return the adapter ROM FCode version.
+ * @dev: class converted to a Scsi_host structure.
+ * @attr: device attribute, not used.
+ * @buf: on return contains the ROM and FCode ascii strings.
+ *
+ * Returns: size of formatted string.
+ **/
 static ssize_t
 lpfc_option_rom_version_show(struct device *dev, struct device_attribute *attr,
                             char *buf)
@@ -181,6 +309,18 @@ lpfc_option_rom_version_show(struct device *dev, struct device_attribute *attr,
        return snprintf(buf, PAGE_SIZE, "%s\n", phba->OptionROMVersion);
 }
+/**
+ * lpfc_state_show: Return the link state of the port.
+ * @dev: class converted to a Scsi_host structure.
+ * @attr: device attribute, not used.
+ * @buf: on return contains text describing the state of the link.
+ *
+ * Notes:
+ * The switch statement has no default so zero will be returned.
+ *
+ * Returns: size of formatted string.
+ **/
 static ssize_t
 lpfc_link_state_show(struct device *dev, struct device_attribute *attr,
                     char *buf)
@@ -232,8 +372,10 @@ lpfc_link_state_show(struct device *dev, struct device_attribute *attr,
                                        "Unknown\n");
                        break;
                }
+                if (phba->sli.sli_flag & LPFC_MENLO_MAINT)
-                if (phba->fc_topology == TOPOLOGY_LOOP) {
+                        len += snprintf(buf + len, PAGE_SIZE-len,
+                                        "   Menlo Maint Mode\n");
+                else if (phba->fc_topology == TOPOLOGY_LOOP) {
                        if (vport->fc_flag & FC_PUBLIC_LOOP)
                                len += snprintf(buf + len, PAGE_SIZE-len,
                                                "   Public Loop\n");
@@ -253,6 +395,18 @@ lpfc_link_state_show(struct device *dev, struct device_attribute *attr,
        return len;
 }
+/**
+ * lpfc_num_discovered_ports_show: Return sum of mapped and unmapped vports.
+ * @dev: class device that is converted into a Scsi_host.
+ * @attr: device attribute, not used.
+ * @buf: on return contains the sum of fc mapped and unmapped.
+ *
+ * Description:
+ * Returns the ascii text number of the sum of the fc mapped and unmapped
+ * vport counts.
+ *
+ * Returns: size of formatted string.
+ **/
 static ssize_t
 lpfc_num_discovered_ports_show(struct device *dev,
                               struct device_attribute *attr, char *buf)
@@ -264,7 +418,20 @@ lpfc_num_discovered_ports_show(struct device *dev,
                        vport->fc_map_cnt + vport->fc_unmap_cnt);
 }
+/**
+ * lpfc_issue_lip: Misnomer, name carried over from long ago.
+ * @shost: Scsi_Host pointer.
+ *
+ * Description:
+ * Bring the link down gracefully then re-init the link. The firmware will
+ * re-init the fiber channel interface as required. Does not issue a LIP.
+ *
+ * Returns:
+ * -EPERM port offline or management commands are being blocked
+ * -ENOMEM cannot allocate memory for the mailbox command
+ * -EIO error sending the mailbox command
+ * zero for success
+ **/
 static int
 lpfc_issue_lip(struct Scsi_Host *shost)
 {
@@ -306,6 +473,21 @@ lpfc_issue_lip(struct Scsi_Host *shost)
        return 0;
 }
+/**
+ * lpfc_do_offline: Issues a mailbox command to bring the link down.
+ * @phba: lpfc_hba pointer.
+ * @type: LPFC_EVT_OFFLINE, LPFC_EVT_WARM_START, LPFC_EVT_KILL.
+ *
+ * Notes:
+ * Assumes any error from lpfc_do_offline() will be negative.
+ * Can wait up to 5 seconds for the port ring buffers count
+ * to reach zero, prints a warning if it is not zero and continues.
+ * lpfc_workq_post_event() returns a non-zero return coce if call fails.
+ *
+ * Returns:
+ * -EIO error posting the event
+ * zero for success
+ **/
 static int
 lpfc_do_offline(struct lpfc_hba *phba, uint32_t type)
 {
@@ -353,6 +535,22 @@ lpfc_do_offline(struct lpfc_hba *phba, uint32_t type)
        return 0;
 }
+/**
+ * lpfc_selective_reset: Offline then onlines the port.
+ * @phba: lpfc_hba pointer.
+ *
+ * Description:
+ * If the port is configured to allow a reset then the hba is brought
+ * offline then online.
+ *
+ * Notes:
+ * Assumes any error from lpfc_do_offline() will be negative.
+ *
+ * Returns:
+ * lpfc_do_offline() return code if not zero
+ * -EIO reset not configured or error posting the event
+ * zero for success
+ **/
 static int
 lpfc_selective_reset(struct lpfc_hba *phba)
 {
@@ -378,6 +576,27 @@ lpfc_selective_reset(struct lpfc_hba *phba)
        return 0;
 }
+/**
+ * lpfc_issue_reset: Selectively resets an adapter.
+ * @dev: class device that is converted into a Scsi_host.
+ * @attr: device attribute, not used.
+ * @buf: containing the string "selective".
+ * @count: unused variable.
+ *
+ * Description:
+ * If the buf contains the string "selective" then lpfc_selective_reset()
+ * is called to perform the reset.
+ *
+ * Notes:
+ * Assumes any error from lpfc_selective_reset() will be negative.
+ * If lpfc_selective_reset() returns zero then the length of the buffer
+ * is returned which indicates succcess
+ *
+ * Returns:
+ * -EINVAL if the buffer does not contain the string "selective"
+ * length of buf if lpfc-selective_reset() if the call succeeds
+ * return value of lpfc_selective_reset() if the call fails
+**/
 static ssize_t
 lpfc_issue_reset(struct device *dev, struct device_attribute *attr,
                 const char *buf, size_t count)
@@ -397,6 +616,14 @@ lpfc_issue_reset(struct device *dev, struct device_attribute *attr,
                return status;
 }
+/**
+ * lpfc_nport_evt_cnt_show: Return the number of nport events.
+ * @dev: class device that is converted into a Scsi_host.
+ * @attr: device attribute, not used.
+ * @buf: on return contains the ascii number of nport events.
+ *
+ * Returns: size of formatted string.
+ **/
 static ssize_t
 lpfc_nport_evt_cnt_show(struct device *dev, struct device_attribute *attr,
                        char *buf)
@@ -408,6 +635,14 @@ lpfc_nport_evt_cnt_show(struct device *dev, struct device_attribute *attr,
        return snprintf(buf, PAGE_SIZE, "%d\n", phba->nport_event_cnt);
 }
+/**
+ * lpfc_board_mode_show: Return the state of the board.
+ * @dev: class device that is converted into a Scsi_host.
+ * @attr: device attribute, not used.
+ * @buf: on return contains the state of the adapter.
+ *
+ * Returns: size of formatted string.
+ **/
 static ssize_t
 lpfc_board_mode_show(struct device *dev, struct device_attribute *attr,
                     char *buf)
@@ -429,6 +664,19 @@ lpfc_board_mode_show(struct device *dev, struct device_attribute *attr,
        return snprintf(buf, PAGE_SIZE, "%s\n", state);
 }
+/**
+ * lpfc_board_mode_store: Puts the hba in online, offline, warm or error state.
+ * @dev: class device that is converted into a Scsi_host.
+ * @attr: device attribute, not used.
+ * @buf: containing one of the strings "online", "offline", "warm" or "error".
+ * @count: unused variable.
+ *
+ * Returns:
+ * -EACCES if enable hba reset not enabled
+ * -EINVAL if the buffer does not contain a valid string (see above)
+ * -EIO if lpfc_workq_post_event() or lpfc_do_offline() fails
+ * buf length greater than zero indicates success
+ **/
 static ssize_t
 lpfc_board_mode_store(struct device *dev, struct device_attribute *attr,
                      const char *buf, size_t count)
@@ -462,6 +710,24 @@ lpfc_board_mode_store(struct device *dev, struct device_attribute *attr,
                return -EIO;
 }
+/**
+ * lpfc_get_hba_info: Return various bits of informaton about the adapter.
+ * @phba: pointer to the adapter structure.
+ * @mxri max xri count.
+ * @axri available xri count.
+ * @mrpi max rpi count.
+ * @arpi available rpi count.
+ * @mvpi max vpi count.
+ * @avpi available vpi count.
+ *
+ * Description:
+ * If an integer pointer for an count is not null then the value for the
+ * count is returned.
+ *
+ * Returns:
+ * zero on error
+ * one for success
+ **/
 static int
 lpfc_get_hba_info(struct lpfc_hba *phba,
                  uint32_t *mxri, uint32_t *axri,
@@ -524,6 +790,20 @@ lpfc_get_hba_info(struct lpfc_hba *phba,
        return 1;
 }
+/**
+ * lpfc_max_rpi_show: Return maximum rpi.
+ * @dev: class device that is converted into a Scsi_host.
+ * @attr: device attribute, not used.
+ * @buf: on return contains the maximum rpi count in decimal or "Unknown".
+ *
+ * Description:
+ * Calls lpfc_get_hba_info() asking for just the mrpi count.
+ * If lpfc_get_hba_info() returns zero (failure) the buffer text is set
+ * to "Unknown" and the buffer length is returned, therefore the caller
+ * must check for "Unknown" in the buffer to detect a failure.
+ *
+ * Returns: size of formatted string.
+ **/
 static ssize_t
 lpfc_max_rpi_show(struct device *dev, struct device_attribute *attr,
                  char *buf)
@@ -538,6 +818,20 @@ lpfc_max_rpi_show(struct device *dev, struct device_attribute *attr,
        return snprintf(buf, PAGE_SIZE, "Unknown\n");
 }
+/**
+ * lpfc_used_rpi_show: Return maximum rpi minus available rpi.
+ * @dev: class device that is converted into a Scsi_host.
+ * @attr: device attribute, not used.
+ * @buf: containing the used rpi count in decimal or "Unknown".
+ *
+ * Description:
+ * Calls lpfc_get_hba_info() asking for just the mrpi and arpi counts.
+ * If lpfc_get_hba_info() returns zero (failure) the buffer text is set
+ * to "Unknown" and the buffer length is returned, therefore the caller
+ * must check for "Unknown" in the buffer to detect a failure.
+ *
+ * Returns: size of formatted string.
+ **/
 static ssize_t
 lpfc_used_rpi_show(struct device *dev, struct device_attribute *attr,
                   char *buf)
@@ -552,6 +846,20 @@ lpfc_used_rpi_show(struct device *dev, struct device_attribute *attr,
        return snprintf(buf, PAGE_SIZE, "Unknown\n");
 }
+/**
+ * lpfc_max_xri_show: Return maximum xri.
+ * @dev: class device that is converted into a Scsi_host.
+ * @attr: device attribute, not used.
+ * @buf: on return contains the maximum xri count in decimal or "Unknown".
+ *
+ * Description:
+ * Calls lpfc_get_hba_info() asking for just the mrpi count.
+ * If lpfc_get_hba_info() returns zero (failure) the buffer text is set
+ * to "Unknown" and the buffer length is returned, therefore the caller
+ * must check for "Unknown" in the buffer to detect a failure.
+ *
+ * Returns: size of formatted string.
+ **/
 static ssize_t
 lpfc_max_xri_show(struct device *dev, struct device_attribute *attr,
                  char *buf)
@@ -566,6 +874,20 @@ lpfc_max_xri_show(struct device *dev, struct device_attribute *attr,
        return snprintf(buf, PAGE_SIZE, "Unknown\n");
 }
+/**
+ * lpfc_used_xri_show: Return maximum xpi minus the available xpi.
+ * @dev: class device that is converted into a Scsi_host.
+ * @attr: device attribute, not used.
+ * @buf: on return contains the used xri count in decimal or "Unknown".
+ *
+ * Description:
+ * Calls lpfc_get_hba_info() asking for just the mxri and axri counts.
+ * If lpfc_get_hba_info() returns zero (failure) the buffer text is set
+ * to "Unknown" and the buffer length is returned, therefore the caller
+ * must check for "Unknown" in the buffer to detect a failure.
+ *
+ * Returns: size of formatted string.
+ **/
 static ssize_t
 lpfc_used_xri_show(struct device *dev, struct device_attribute *attr,
                   char *buf)
@@ -580,6 +902,20 @@ lpfc_used_xri_show(struct device *dev, struct device_attribute *attr,
        return snprintf(buf, PAGE_SIZE, "Unknown\n");
 }
+/**
+ * lpfc_max_vpi_show: Return maximum vpi.
+ * @dev: class device that is converted into a Scsi_host.
+ * @attr: device attribute, not used.
+ * @buf: on return contains the maximum vpi count in decimal or "Unknown".
+ *
+ * Description:
+ * Calls lpfc_get_hba_info() asking for just the mvpi count.
+ * If lpfc_get_hba_info() returns zero (failure) the buffer text is set
+ * to "Unknown" and the buffer length is returned, therefore the caller
+ * must check for "Unknown" in the buffer to detect a failure.
+ *
+ * Returns: size of formatted string.
+ **/
 static ssize_t
 lpfc_max_vpi_show(struct device *dev, struct device_attribute *attr,
                  char *buf)
@@ -594,6 +930,20 @@ lpfc_max_vpi_show(struct device *dev, struct device_attribute *attr,
        return snprintf(buf, PAGE_SIZE, "Unknown\n");
 }
+/**
+ * lpfc_used_vpi_show: Return maximum vpi minus the available vpi.
+ * @dev: class device that is converted into a Scsi_host.
+ * @attr: device attribute, not used.
+ * @buf: on return contains the used vpi count in decimal or "Unknown".
+ *
+ * Description:
+ * Calls lpfc_get_hba_info() asking for just the mvpi and avpi counts.
+ * If lpfc_get_hba_info() returns zero (failure) the buffer text is set
+ * to "Unknown" and the buffer length is returned, therefore the caller
+ * must check for "Unknown" in the buffer to detect a failure.
+ *
+ * Returns: size of formatted string.
+ **/
 static ssize_t
 lpfc_used_vpi_show(struct device *dev, struct device_attribute *attr,
                   char *buf)
@@ -608,6 +958,19 @@ lpfc_used_vpi_show(struct device *dev, struct device_attribute *attr,
        return snprintf(buf, PAGE_SIZE, "Unknown\n");
 }
+/**
+ * lpfc_npiv_info_show: Return text about NPIV support for the adapter.
+ * @dev: class device that is converted into a Scsi_host.
+ * @attr: device attribute, not used.
+ * @buf: text that must be interpreted to determine if npiv is supported.
+ *
+ * Description:
+ * Buffer will contain text indicating npiv is not suppoerted on the port,
+ * the port is an NPIV physical port, or it is an npiv virtual port with
+ * the id of the vport.
+ *
+ * Returns: size of formatted string.
+ **/
 static ssize_t
 lpfc_npiv_info_show(struct device *dev, struct device_attribute *attr,
                    char *buf)
@@ -623,6 +986,17 @@ lpfc_npiv_info_show(struct device *dev, struct device_attribute *attr,
        return snprintf(buf, PAGE_SIZE, "NPIV Virtual (VPI %d)\n", vport->vpi);
 }
+/**
+ * lpfc_poll_show: Return text about poll support for the adapter.
+ * @dev: class device that is converted into a Scsi_host.
+ * @attr: device attribute, not used.
+ * @buf: on return contains the cfg_poll in hex.
+ *
+ * Notes:
+ * cfg_poll should be a lpfc_polling_flags type.
+ *
+ * Returns: size of formatted string.
+ **/
 static ssize_t
 lpfc_poll_show(struct device *dev, struct device_attribute *attr,
               char *buf)
@@ -634,6 +1008,20 @@ lpfc_poll_show(struct device *dev, struct device_attribute *attr,
        return snprintf(buf, PAGE_SIZE, "%#x\n", phba->cfg_poll);
 }
+/**
+ * lpfc_poll_store: Set the value of cfg_poll for the adapter.
+ * @dev: class device that is converted into a Scsi_host.
+ * @attr: device attribute, not used.
+ * @buf: one or more lpfc_polling_flags values.
+ * @count: not used.
+ *
+ * Notes:
+ * buf contents converted to integer and checked for a valid value.
+ *
+ * Returns:
+ * -EINVAL if the buffer connot be converted or is out of range
+ * length of the buf on success
+ **/
 static ssize_t
 lpfc_poll_store(struct device *dev, struct device_attribute *attr,
                const char *buf, size_t count)
@@ -692,6 +1080,20 @@ lpfc_poll_store(struct device *dev, struct device_attribute *attr,
        return strlen(buf);
 }
+/**
+ * lpfc_param_show: Return a cfg attribute value in decimal.
+ *
+ * Description:
+ * Macro that given an attr e.g. hba_queue_depth expands
+ * into a function with the name lpfc_hba_queue_depth_show.
+ *
+ * lpfc_##attr##_show: Return the decimal value of an adapters cfg_xxx field.
+ * @dev: class device that is converted into a Scsi_host.
+ * @attr: device attribute, not used.
+ * @buf: on return contains the attribute value in decimal.
+ *
+ * Returns: size of formatted string.
+ **/
 #define lpfc_param_show(attr)   \
 static ssize_t \
 lpfc_##attr##_show(struct device *dev, struct device_attribute *attr, \
@@ -706,6 +1108,20 @@ lpfc_##attr##_show(struct device *dev, struct device_attribute *attr, \
                        phba->cfg_##attr);\
 }
+/**
+ * lpfc_param_hex_show: Return a cfg attribute value in hex.
+ *
+ * Description:
+ * Macro that given an attr e.g. hba_queue_depth expands
+ * into a function with the name lpfc_hba_queue_depth_show
+ *
+ * lpfc_##attr##_show: Return the hex value of an adapters cfg_xxx field.
+ * @dev: class device that is converted into a Scsi_host.
+ * @attr: device attribute, not used.
+ * @buf: on return contains the attribute value in hexidecimal.
+ *
+ * Returns: size of formatted string.
+ **/
 #define lpfc_param_hex_show(attr)       \
 static ssize_t \
 lpfc_##attr##_show(struct device *dev, struct device_attribute *attr, \
@@ -720,6 +1136,25 @@ lpfc_##attr##_show(struct device *dev, struct device_attribute *attr, \
                        phba->cfg_##attr);\
 }
+/**
+ * lpfc_param_init: Intializes a cfg attribute.
+ *
+ * Description:
+ * Macro that given an attr e.g. hba_queue_depth expands
+ * into a function with the name lpfc_hba_queue_depth_init. The macro also
+ * takes a default argument, a minimum and maximum argument.
+ *
+ * lpfc_##attr##_init: Initializes an attribute.
+ * @phba: pointer the the adapter structure.
+ * @val: integer attribute value.
+ *
+ * Validates the min and max values then sets the adapter config field
+ * accordingly, or uses the default if out of range and prints an error message.
+ *
+ * Returns:
+ * zero on success
+ * -EINVAL if default used
+ **/
 #define lpfc_param_init(attr, default, minval, maxval)  \
 static int \
 lpfc_##attr##_init(struct lpfc_hba *phba, int val) \
@@ -735,6 +1170,26 @@ lpfc_##attr##_init(struct lpfc_hba *phba, int val) \
        return -EINVAL;\
 }
+/**
+ * lpfc_param_set: Set a cfg attribute value.
+ *
+ * Description:
+ * Macro that given an attr e.g. hba_queue_depth expands
+ * into a function with the name lpfc_hba_queue_depth_set
+ *
+ * lpfc_##attr##_set: Sets an attribute value.
+ * @phba: pointer the the adapter structure.
+ * @val: integer attribute value.
+ *
+ * Description:
+ * Validates the min and max values then sets the
+ * adapter config field if in the valid range. prints error message
+ * and does not set the parameter if invalid.
+ *
+ * Returns:
+ * zero on success
+ * -EINVAL if val is invalid
+ **/
 #define lpfc_param_set(attr, default, minval, maxval)   \
 static int \
 lpfc_##attr##_set(struct lpfc_hba *phba, int val) \
@@ -749,6 +1204,27 @@ lpfc_##attr##_set(struct lpfc_hba *phba, int val) \
        return -EINVAL;\
 }
+/**
+ * lpfc_param_store: Set a vport attribute value.
+ *
+ * Description:
+ * Macro that given an attr e.g. hba_queue_depth expands
+ * into a function with the name lpfc_hba_queue_depth_store.
+ *
+ * lpfc_##attr##_store: Set an sttribute value.
+ * @dev: class device that is converted into a Scsi_host.
+ * @attr: device attribute, not used.
+ * @buf: contains the attribute value in ascii.
+ * @count: not used.
+ *
+ * Description:
+ * Convert the ascii text number to an integer, then
+ * use the lpfc_##attr##_set function to set the value.
+ *
+ * Returns:
+ * -EINVAL if val is invalid or lpfc_##attr##_set() fails
+ * length of buffer upon success.
+ **/
 #define lpfc_param_store(attr)  \
 static ssize_t \
 lpfc_##attr##_store(struct device *dev, struct device_attribute *attr, \
@@ -768,6 +1244,20 @@ lpfc_##attr##_store(struct device *dev, struct device_attribute *attr, \
                return -EINVAL;\
 }
+/**
+ * lpfc_vport_param_show: Return decimal formatted cfg attribute value.
+ *
+ * Description:
+ * Macro that given an attr e.g. hba_queue_depth expands
+ * into a function with the name lpfc_hba_queue_depth_show
+ *
+ * lpfc_##attr##_show: prints the attribute value in decimal.
+ * @dev: class device that is converted into a Scsi_host.
+ * @attr: device attribute, not used.
+ * @buf: on return contains the attribute value in decimal.
+ *
+ * Returns: length of formatted string.
+ **/
 #define lpfc_vport_param_show(attr)     \
 static ssize_t \
 lpfc_##attr##_show(struct device *dev, struct device_attribute *attr, \
@@ -780,6 +1270,21 @@ lpfc_##attr##_show(struct device *dev, struct device_attribute *attr, \
        return snprintf(buf, PAGE_SIZE, "%d\n", vport->cfg_##attr);\
 }
+/**
+ * lpfc_vport_param_hex_show: Return hex formatted attribute value.
+ *
+ * Description:
+ * Macro that given an attr e.g.
+ * hba_queue_depth expands into a function with the name
+ * lpfc_hba_queue_depth_show
+ *
+ * lpfc_##attr##_show: prints the attribute value in hexidecimal.
+ * @dev: class device that is converted into a Scsi_host.
+ * @attr: device attribute, not used.
+ * @buf: on return contains the attribute value in hexidecimal.
+ *
+ * Returns: length of formatted string.
+ **/
 #define lpfc_vport_param_hex_show(attr) \
 static ssize_t \
 lpfc_##attr##_show(struct device *dev, struct device_attribute *attr, \
@@ -792,6 +1297,24 @@ lpfc_##attr##_show(struct device *dev, struct device_attribute *attr, \
        return snprintf(buf, PAGE_SIZE, "%#x\n", vport->cfg_##attr);\
 }
+/**
+ * lpfc_vport_param_init: Initialize a vport cfg attribute.
+ *
+ * Description:
+ * Macro that given an attr e.g. hba_queue_depth expands
+ * into a function with the name lpfc_hba_queue_depth_init. The macro also
+ * takes a default argument, a minimum and maximum argument.
+ *
+ * lpfc_##attr##_init: validates the min and max values then sets the
+ * adapter config field accordingly, or uses the default if out of range
+ * and prints an error message.
+ * @phba: pointer the the adapter structure.
+ * @val: integer attribute value.
+ *
+ * Returns:
+ * zero on success
+ * -EINVAL if default used
+ **/
 #define lpfc_vport_param_init(attr, default, minval, maxval)    \
 static int \
 lpfc_##attr##_init(struct lpfc_vport *vport, int val) \
@@ -801,12 +1324,29 @@ lpfc_##attr##_init(struct lpfc_vport *vport, int val) \
                return 0;\
        }\
        lpfc_printf_vlog(vport, KERN_ERR, LOG_INIT, \
-                         "0449 lpfc_"#attr" attribute cannot be set to %d, "\
+                         "0423 lpfc_"#attr" attribute cannot be set to %d, "\
                         "allowed range is ["#minval", "#maxval"]\n", val); \
        vport->cfg_##attr = default;\
        return -EINVAL;\
 }
+/**
+ * lpfc_vport_param_set: Set a vport cfg attribute.
+ *
+ * Description:
+ * Macro that given an attr e.g. hba_queue_depth expands
+ * into a function with the name lpfc_hba_queue_depth_set
+ *
+ * lpfc_##attr##_set: validates the min and max values then sets the
+ * adapter config field if in the valid range. prints error message
+ * and does not set the parameter if invalid.
+ * @phba: pointer the the adapter structure.
+ * @val:        integer attribute value.
+ *
+ * Returns:
+ * zero on success
+ * -EINVAL if val is invalid
+ **/
 #define lpfc_vport_param_set(attr, default, minval, maxval)     \
 static int \
 lpfc_##attr##_set(struct lpfc_vport *vport, int val) \
@@ -816,11 +1356,28 @@ lpfc_##attr##_set(struct lpfc_vport *vport, int val) \
                return 0;\
        }\
        lpfc_printf_vlog(vport, KERN_ERR, LOG_INIT, \
-                         "0450 lpfc_"#attr" attribute cannot be set to %d, "\
+                         "0424 lpfc_"#attr" attribute cannot be set to %d, "\
                         "allowed range is ["#minval", "#maxval"]\n", val); \
        return -EINVAL;\
 }
+/**
+ * lpfc_vport_param_store: Set a vport attribute.
+ *
+ * Description:
+ * Macro that given an attr e.g. hba_queue_depth
+ * expands into a function with the name lpfc_hba_queue_depth_store
+ *
+ * lpfc_##attr##_store: convert the ascii text number to an integer, then
+ * use the lpfc_##attr##_set function to set the value.
+ * @cdev: class device that is converted into a Scsi_host.
+ * @buf:        contains the attribute value in decimal.
+ * @count: not used.
+ *
+ * Returns:
+ * -EINVAL if val is invalid or lpfc_##attr##_set() fails
+ * length of buffer upon success.
+ **/
 #define lpfc_vport_param_store(attr)    \
 static ssize_t \
 lpfc_##attr##_store(struct device *dev, struct device_attribute *attr, \
@@ -941,6 +1498,7 @@ static DEVICE_ATTR(option_rom_version, S_IRUGO,
                   lpfc_option_rom_version_show, NULL);
 static DEVICE_ATTR(num_discovered_ports, S_IRUGO,
                   lpfc_num_discovered_ports_show, NULL);
+static DEVICE_ATTR(menlo_mgmt_mode, S_IRUGO, lpfc_mlomgmt_show, NULL);
 static DEVICE_ATTR(nport_evt_cnt, S_IRUGO, lpfc_nport_evt_cnt_show, NULL);
 static DEVICE_ATTR(lpfc_drvr_version, S_IRUGO, lpfc_drvr_version_show, NULL);
 static DEVICE_ATTR(board_mode, S_IRUGO | S_IWUSR,
@@ -958,6 +1516,17 @@ static DEVICE_ATTR(lpfc_temp_sensor, S_IRUGO, lpfc_temp_sensor_show, NULL);
 static char *lpfc_soft_wwn_key = "C99G71SL8032A";
+/**
+ * lpfc_soft_wwn_enable_store: Allows setting of the wwn if the key is valid.
+ * @dev: class device that is converted into a Scsi_host.
+ * @attr: device attribute, not used.
+ * @buf: containing the string lpfc_soft_wwn_key.
+ * @count: must be size of lpfc_soft_wwn_key.
+ *
+ * Returns:
+ * -EINVAL if the buffer does not contain lpfc_soft_wwn_key
+ * length of buf indicates success
+ **/
 static ssize_t
 lpfc_soft_wwn_enable_store(struct device *dev, struct device_attribute *attr,
                           const char *buf, size_t count)
@@ -994,6 +1563,14 @@ lpfc_soft_wwn_enable_store(struct device *dev, struct device_attribute *attr,
 static DEVICE_ATTR(lpfc_soft_wwn_enable, S_IWUSR, NULL,
                   lpfc_soft_wwn_enable_store);
+/**
+ * lpfc_soft_wwpn_show: Return the cfg soft ww port name of the adapter.
+ * @dev: class device that is converted into a Scsi_host.
+ * @attr: device attribute, not used.
+ * @buf: on return contains the wwpn in hexidecimal.
+ *
+ * Returns: size of formatted string.
+ **/
 static ssize_t
 lpfc_soft_wwpn_show(struct device *dev, struct device_attribute *attr,
                    char *buf)
@@ -1006,7 +1583,19 @@ lpfc_soft_wwpn_show(struct device *dev, struct device_attribute *attr,
                        (unsigned long long)phba->cfg_soft_wwpn);
 }
+/**
+ * lpfc_soft_wwpn_store: Set the ww port name of the adapter.
+ * @dev class device that is converted into a Scsi_host.
+ * @attr: device attribute, not used.
+ * @buf: contains the wwpn in hexidecimal.
+ * @count: number of wwpn bytes in buf
+ *
+ * Returns:
+ * -EACCES hba reset not enabled, adapter over temp
+ * -EINVAL soft wwn not enabled, count is invalid, invalid wwpn byte invalid
+ * -EIO error taking adapter offline or online
+ * value of count on success
+ **/
 static ssize_t
 lpfc_soft_wwpn_store(struct device *dev, struct device_attribute *attr,
                     const char *buf, size_t count)
@@ -1080,6 +1669,14 @@ lpfc_soft_wwpn_store(struct device *dev, struct device_attribute *attr,
 static DEVICE_ATTR(lpfc_soft_wwpn, S_IRUGO | S_IWUSR,\
                   lpfc_soft_wwpn_show, lpfc_soft_wwpn_store);
+/**
+ * lpfc_soft_wwnn_show: Return the cfg soft ww node name for the adapter.
+ * @dev: class device that is converted into a Scsi_host.
+ * @attr: device attribute, not used.
+ * @buf: on return contains the wwnn in hexidecimal.
+ *
+ * Returns: size of formatted string.
+ **/
 static ssize_t
 lpfc_soft_wwnn_show(struct device *dev, struct device_attribute *attr,
                    char *buf)
@@ -1090,7 +1687,16 @@ lpfc_soft_wwnn_show(struct device *dev, struct device_attribute *attr,
                        (unsigned long long)phba->cfg_soft_wwnn);
 }
+/**
+ * lpfc_soft_wwnn_store: sets the ww node name of the adapter.
+ * @cdev: class device that is converted into a Scsi_host.
+ * @buf: contains the ww node name in hexidecimal.
+ * @count: number of wwnn bytes in buf.
+ *
+ * Returns:
+ * -EINVAL soft wwn not enabled, count is invalid, invalid wwnn byte invalid
+ * value of count on success
+ **/
 static ssize_t
 lpfc_soft_wwnn_store(struct device *dev, struct device_attribute *attr,
                     const char *buf, size_t count)
@@ -1178,6 +1784,15 @@ module_param(lpfc_nodev_tmo, int, 0);
 MODULE_PARM_DESC(lpfc_nodev_tmo,
                 "Seconds driver will hold I/O waiting "
                 "for a device to come back");
+/**
+ * lpfc_nodev_tmo_show: Return the hba dev loss timeout value.
+ * @dev: class converted to a Scsi_host structure.
+ * @attr: device attribute, not used.
+ * @buf: on return contains the dev loss timeout in decimal.
+ *
+ * Returns: size of formatted string.
+ **/
 static ssize_t
 lpfc_nodev_tmo_show(struct device *dev, struct device_attribute *attr,
                    char *buf)
@@ -1189,6 +1804,21 @@ lpfc_nodev_tmo_show(struct device *dev, struct device_attribute *attr,
        return snprintf(buf, PAGE_SIZE, "%d\n", vport->cfg_devloss_tmo);
 }
+/**
+ * lpfc_nodev_tmo_init: Set the hba nodev timeout value.
+ * @vport: lpfc vport structure pointer.
+ * @val: contains the nodev timeout value.
+ *
+ * Description:
+ * If the devloss tmo is already set then nodev tmo is set to devloss tmo,
+ * a kernel error message is printed and zero is returned.
+ * Else if val is in range then nodev tmo and devloss tmo are set to val.
+ * Otherwise nodev tmo is set to the default value.
+ *
+ * Returns:
+ * zero if already set or if val is in range
+ * -EINVAL val out of range
+ **/
 static int
 lpfc_nodev_tmo_init(struct lpfc_vport *vport, int val)
 {
@@ -1196,7 +1826,7 @@ lpfc_nodev_tmo_init(struct lpfc_vport *vport, int val)
                vport->cfg_nodev_tmo = vport->cfg_devloss_tmo;
                if (val != LPFC_DEF_DEVLOSS_TMO)
                        lpfc_printf_vlog(vport, KERN_ERR, LOG_INIT,
-                                         "0402 Ignoring nodev_tmo module "
+                                         "0407 Ignoring nodev_tmo module "
                                         "parameter because devloss_tmo is "
                                         "set.\n");
                return 0;
@@ -1215,6 +1845,13 @@ lpfc_nodev_tmo_init(struct lpfc_vport *vport, int val)
        return -EINVAL;
 }
+/**
+ * lpfc_update_rport_devloss_tmo: Update dev loss tmo value.
+ * @vport: lpfc vport structure pointer.
+ *
+ * Description:
+ * Update all the ndlp's dev loss tmo with the vport devloss tmo value.
+ **/
 static void
 lpfc_update_rport_devloss_tmo(struct lpfc_vport *vport)
 {
@@ -1229,6 +1866,21 @@ lpfc_update_rport_devloss_tmo(struct lpfc_vport *vport)
        spin_unlock_irq(shost->host_lock);
 }
+/**
+ * lpfc_nodev_tmo_set: Set the vport nodev tmo and devloss tmo values.
+ * @vport: lpfc vport structure pointer.
+ * @val: contains the tmo value.
+ *
+ * Description:
+ * If the devloss tmo is already set or the vport dev loss tmo has changed
+ * then a kernel error message is printed and zero is returned.
+ * Else if val is in range then nodev tmo and devloss tmo are set to val.
+ * Otherwise nodev tmo is set to the default value.
+ *
+ * Returns:
+ * zero if already set or if val is in range
+ * -EINVAL val out of range
+ **/
 static int
 lpfc_nodev_tmo_set(struct lpfc_vport *vport, int val)
 {
@@ -1269,6 +1921,21 @@ MODULE_PARM_DESC(lpfc_devloss_tmo,
 lpfc_vport_param_init(devloss_tmo, LPFC_DEF_DEVLOSS_TMO,
                      LPFC_MIN_DEVLOSS_TMO, LPFC_MAX_DEVLOSS_TMO)
 lpfc_vport_param_show(devloss_tmo)
+/**
+ * lpfc_devloss_tmo_set: Sets vport nodev tmo, devloss tmo values, changed bit.
+ * @vport: lpfc vport structure pointer.
+ * @val: contains the tmo value.
+ *
+ * Description:
+ * If val is in a valid range then set the vport nodev tmo,
+ * devloss tmo, also set the vport dev loss tmo changed flag.
+ * Else a kernel error message is printed.
+ *
+ * Returns:
+ * zero if val is in range
+ * -EINVAL val out of range
+ **/
 static int
 lpfc_devloss_tmo_set(struct lpfc_vport *vport, int val)
 {
@@ -1366,12 +2033,27 @@ MODULE_PARM_DESC(lpfc_restrict_login,
                 "Restrict virtual ports login to remote initiators.");
 lpfc_vport_param_show(restrict_login);
+/**
+ * lpfc_restrict_login_init: Set the vport restrict login flag.
+ * @vport: lpfc vport structure pointer.
+ * @val: contains the restrict login value.
+ *
+ * Description:
+ * If val is not in a valid range then log a kernel error message and set
+ * the vport restrict login to one.
+ * If the port type is physical clear the restrict login flag and return.
+ * Else set the restrict login flag to val.
+ *
+ * Returns:
+ * zero if val is in range
+ * -EINVAL val out of range
+ **/
 static int
 lpfc_restrict_login_init(struct lpfc_vport *vport, int val)
 {
        if (val < 0 || val > 1) {
                lpfc_printf_vlog(vport, KERN_ERR, LOG_INIT,
-                                 "0449 lpfc_restrict_login attribute cannot "
+                                 "0422 lpfc_restrict_login attribute cannot "
                                 "be set to %d, allowed range is [0, 1]\n",
                                 val);
                vport->cfg_restrict_login = 1;
@@ -1385,12 +2067,28 @@ lpfc_restrict_login_init(struct lpfc_vport *vport, int val)
        return 0;
 }
+/**
+ * lpfc_restrict_login_set: Set the vport restrict login flag.
+ * @vport: lpfc vport structure pointer.
+ * @val: contains the restrict login value.
+ *
+ * Description:
+ * If val is not in a valid range then log a kernel error message and set
+ * the vport restrict login to one.
+ * If the port type is physical and the val is not zero log a kernel
+ * error message, clear the restrict login flag and return zero.
+ * Else set the restrict login flag to val.
+ *
+ * Returns:
+ * zero if val is in range
+ * -EINVAL val out of range
+ **/
 static int
 lpfc_restrict_login_set(struct lpfc_vport *vport, int val)
 {
        if (val < 0 || val > 1) {
                lpfc_printf_vlog(vport, KERN_ERR, LOG_INIT,
-                                 "0450 lpfc_restrict_login attribute cannot "
+                                 "0425 lpfc_restrict_login attribute cannot "
                                 "be set to %d, allowed range is [0, 1]\n",
                                 val);
                vport->cfg_restrict_login = 1;
@@ -1441,6 +2139,23 @@ LPFC_VPORT_ATTR_R(scan_down, 1, 0, 1,
 # Set loop mode if you want to run as an NL_Port. Value range is [0,0x6].
 # Default value is 0.
 */
+/**
+ * lpfc_topology_set: Set the adapters topology field.
+ * @phba: lpfc_hba pointer.
+ * @val: topology value.
+ *
+ * Description:
+ * If val is in a valid range then set the adapter's topology field and
+ * issue a lip; if the lip fails reset the topology to the old value.
+ *
+ * If the value is not in range log a kernel error message and return an error.
+ *
+ * Returns:
+ * zero if val is in range and lip okay
+ * non-zero return value from lpfc_issue_lip()
+ * -EINVAL val out of range
+ **/
 static int
 lpfc_topology_set(struct lpfc_hba *phba, int val)
 {
@@ -1469,6 +2184,335 @@ lpfc_param_store(topology)
 static DEVICE_ATTR(lpfc_topology, S_IRUGO | S_IWUSR,
                lpfc_topology_show, lpfc_topology_store);
+/**
+ * lpfc_stat_data_ctrl_store: write call back for lpfc_stat_data_ctrl
+ *  sysfs file.
+ * @dev: Pointer to class device.
+ * @buf: Data buffer.
+ * @count: Size of the data buffer.
+ *
+ * This function get called when an user write to the lpfc_stat_data_ctrl
+ * sysfs file. This function parse the command written to the sysfs file
+ * and take appropriate action. These commands are used for controlling
+ * driver statistical data collection.
+ * Following are the command this function handles.
+ *
+ *    setbucket <bucket_type> <base> <step>
+ *                             = Set the latency buckets.
+ *    destroybucket            = destroy all the buckets.
+ *    start                    = start data collection
+ *    stop                     = stop data collection
+ *    reset                    = reset the collected data
+ **/
+static ssize_t
+lpfc_stat_data_ctrl_store(struct device *dev, struct device_attribute *attr,
+                          const char *buf, size_t count)
+{
+        struct Scsi_Host  *shost = class_to_shost(dev);
+        struct lpfc_vport *vport = (struct lpfc_vport *) shost->hostdata;
+        struct lpfc_hba   *phba = vport->phba;
+#define LPFC_MAX_DATA_CTRL_LEN 1024
+        static char bucket_data[LPFC_MAX_DATA_CTRL_LEN];
+        unsigned long i;
+        char *str_ptr, *token;
+        struct lpfc_vport **vports;
+        struct Scsi_Host *v_shost;
+        char *bucket_type_str, *base_str, *step_str;
+        unsigned long base, step, bucket_type;
+        if (!strncmp(buf, "setbucket", strlen("setbucket"))) {
+                if (strlen(buf) > LPFC_MAX_DATA_CTRL_LEN)
+                        return -EINVAL;
+                strcpy(bucket_data, buf);
+                str_ptr = &bucket_data[0];
+                /* Ignore this token - this is command token */
+                token = strsep(&str_ptr, "\t ");
+                if (!token)
+                        return -EINVAL;
+                bucket_type_str = strsep(&str_ptr, "\t ");
+                if (!bucket_type_str)
+                        return -EINVAL;
+                if (!strncmp(bucket_type_str, "linear", strlen("linear")))
+                        bucket_type = LPFC_LINEAR_BUCKET;
+                else if (!strncmp(bucket_type_str, "power2", strlen("power2")))
+                        bucket_type = LPFC_POWER2_BUCKET;
+                else
+                        return -EINVAL;
+                base_str = strsep(&str_ptr, "\t ");
+                if (!base_str)
+                        return -EINVAL;
+                base = simple_strtoul(base_str, NULL, 0);
+                step_str = strsep(&str_ptr, "\t ");
+                if (!step_str)
+                        return -EINVAL;
+                step = simple_strtoul(step_str, NULL, 0);
+                if (!step)
+                        return -EINVAL;
+                /* Block the data collection for every vport */
+                vports = lpfc_create_vport_work_array(phba);
+                if (vports == NULL)
+                        return -ENOMEM;
+                for (i = 0; i <= phba->max_vpi && vports[i] != NULL; i++) {
+                        v_shost = lpfc_shost_from_vport(vports[i]);
+                        spin_lock_irq(v_shost->host_lock);
+                        /* Block and reset data collection */
+                        vports[i]->stat_data_blocked = 1;
+                        if (vports[i]->stat_data_enabled)
+                                lpfc_vport_reset_stat_data(vports[i]);
+                        spin_unlock_irq(v_shost->host_lock);
+                }
+                /* Set the bucket attributes */
+                phba->bucket_type = bucket_type;
+                phba->bucket_base = base;
+                phba->bucket_step = step;
+                for (i = 0; i <= phba->max_vpi && vports[i] != NULL; i++) {
+                        v_shost = lpfc_shost_from_vport(vports[i]);
+                        /* Unblock data collection */
+                        spin_lock_irq(v_shost->host_lock);
+                        vports[i]->stat_data_blocked = 0;
+                        spin_unlock_irq(v_shost->host_lock);
+                }
+                lpfc_destroy_vport_work_array(phba, vports);
+                return strlen(buf);
+        }
+        if (!strncmp(buf, "destroybucket", strlen("destroybucket"))) {
+                vports = lpfc_create_vport_work_array(phba);
+                if (vports == NULL)
+                        return -ENOMEM;
+                for (i = 0; i <= phba->max_vpi && vports[i] != NULL; i++) {
+                        v_shost = lpfc_shost_from_vport(vports[i]);
+                        spin_lock_irq(shost->host_lock);
+                        vports[i]->stat_data_blocked = 1;
+                        lpfc_free_bucket(vport);
+                        vport->stat_data_enabled = 0;
+                        vports[i]->stat_data_blocked = 0;
+                        spin_unlock_irq(shost->host_lock);
+                }
+                lpfc_destroy_vport_work_array(phba, vports);
+                phba->bucket_type = LPFC_NO_BUCKET;
+                phba->bucket_base = 0;
+                phba->bucket_step = 0;
+                return strlen(buf);
+        }
+        if (!strncmp(buf, "start", strlen("start"))) {
+                /* If no buckets configured return error */
+                if (phba->bucket_type == LPFC_NO_BUCKET)
+                        return -EINVAL;
+                spin_lock_irq(shost->host_lock);
+                if (vport->stat_data_enabled) {
+                        spin_unlock_irq(shost->host_lock);
+                        return strlen(buf);
+                }
+                lpfc_alloc_bucket(vport);
+                vport->stat_data_enabled = 1;
+                spin_unlock_irq(shost->host_lock);
+                return strlen(buf);
+        }
+        if (!strncmp(buf, "stop", strlen("stop"))) {
+                spin_lock_irq(shost->host_lock);
+                if (vport->stat_data_enabled == 0) {
+                        spin_unlock_irq(shost->host_lock);
+                        return strlen(buf);
+                }
+                lpfc_free_bucket(vport);
+                vport->stat_data_enabled = 0;
+                spin_unlock_irq(shost->host_lock);
+                return strlen(buf);
+        }
+        if (!strncmp(buf, "reset", strlen("reset"))) {
+                if ((phba->bucket_type == LPFC_NO_BUCKET)
+                        || !vport->stat_data_enabled)
+                        return strlen(buf);
+                spin_lock_irq(shost->host_lock);
+                vport->stat_data_blocked = 1;
+                lpfc_vport_reset_stat_data(vport);
+                vport->stat_data_blocked = 0;
+                spin_unlock_irq(shost->host_lock);
+                return strlen(buf);
+        }
+        return -EINVAL;
+}
+/**
+ * lpfc_stat_data_ctrl_show: Read callback function for
+ *   lpfc_stat_data_ctrl sysfs file.
+ * @dev: Pointer to class device object.
+ * @buf: Data buffer.
+ *
+ * This function is the read call back function for
+ * lpfc_stat_data_ctrl sysfs file. This function report the
+ * current statistical data collection state.
+ **/
+static ssize_t
+lpfc_stat_data_ctrl_show(struct device *dev, struct device_attribute *attr,
+                         char *buf)
+{
+        struct Scsi_Host  *shost = class_to_shost(dev);
+        struct lpfc_vport *vport = (struct lpfc_vport *) shost->hostdata;
+        struct lpfc_hba   *phba = vport->phba;
+        int index = 0;
+        int i;
+        char *bucket_type;
+        unsigned long bucket_value;
+        switch (phba->bucket_type) {
+        case LPFC_LINEAR_BUCKET:
+                bucket_type = "linear";
+                break;
+        case LPFC_POWER2_BUCKET:
+                bucket_type = "power2";
+                break;
+        default:
+                bucket_type = "No Bucket";
+                break;
+        }
+        sprintf(&buf[index], "Statistical Data enabled :%d, "
+                "blocked :%d, Bucket type :%s, Bucket base :%d,"
+                " Bucket step :%d\nLatency Ranges :",
+                vport->stat_data_enabled, vport->stat_data_blocked,
+                bucket_type, phba->bucket_base, phba->bucket_step);
+        index = strlen(buf);
+        if (phba->bucket_type != LPFC_NO_BUCKET) {
+                for (i = 0; i < LPFC_MAX_BUCKET_COUNT; i++) {
+                        if (phba->bucket_type == LPFC_LINEAR_BUCKET)
+                                bucket_value = phba->bucket_base +
+                                        phba->bucket_step * i;
+                        else
+                                bucket_value = phba->bucket_base +
+                                (1 << i) * phba->bucket_step;
+                        if (index + 10 > PAGE_SIZE)
+                                break;
+                        sprintf(&buf[index], "%08ld ", bucket_value);
+                        index = strlen(buf);
+                }
+        }
+        sprintf(&buf[index], "\n");
+        return strlen(buf);
+}
+/*
+ * Sysfs attribute to control the statistical data collection.
+ */
+static DEVICE_ATTR(lpfc_stat_data_ctrl, S_IRUGO | S_IWUSR,
+                   lpfc_stat_data_ctrl_show, lpfc_stat_data_ctrl_store);
+/*
+ * lpfc_drvr_stat_data: sysfs attr to get driver statistical data.
+ */
+/*
+ * Each Bucket takes 11 characters and 1 new line + 17 bytes WWN
+ * for each target.
+ */
+#define STAT_DATA_SIZE_PER_TARGET(NUM_BUCKETS) ((NUM_BUCKETS) * 11 + 18)
+#define MAX_STAT_DATA_SIZE_PER_TARGET \
+        STAT_DATA_SIZE_PER_TARGET(LPFC_MAX_BUCKET_COUNT)
+/**
+ * sysfs_drvr_stat_data_read: Read callback function for lpfc_drvr_stat_data
+ *  sysfs attribute.
+ * @kobj: Pointer to the kernel object
+ * @bin_attr: Attribute object
+ * @buff: Buffer pointer
+ * @off: File offset
+ * @count: Buffer size
+ *
+ * This function is the read call back function for lpfc_drvr_stat_data
+ * sysfs file. This function export the statistical data to user
+ * applications.
+ **/
+static ssize_t
+sysfs_drvr_stat_data_read(struct kobject *kobj, struct bin_attribute *bin_attr,
+                char *buf, loff_t off, size_t count)
+{
+        struct device *dev = container_of(kobj, struct device,
+                kobj);
+        struct Scsi_Host  *shost = class_to_shost(dev);
+        struct lpfc_vport *vport = (struct lpfc_vport *) shost->hostdata;
+        struct lpfc_hba   *phba = vport->phba;
+        int i = 0, index = 0;
+        unsigned long nport_index;
+        struct lpfc_nodelist *ndlp = NULL;
+        nport_index = (unsigned long)off /
+                MAX_STAT_DATA_SIZE_PER_TARGET;
+        if (!vport->stat_data_enabled || vport->stat_data_blocked
+                || (phba->bucket_type == LPFC_NO_BUCKET))
+                return 0;
+        spin_lock_irq(shost->host_lock);
+        list_for_each_entry(ndlp, &vport->fc_nodes, nlp_listp) {
+                if (!NLP_CHK_NODE_ACT(ndlp) || !ndlp->lat_data)
+                        continue;
+                if (nport_index > 0) {
+                        nport_index--;
+                        continue;
+                }
+                if ((index + MAX_STAT_DATA_SIZE_PER_TARGET)
+                        > count)
+                        break;
+                if (!ndlp->lat_data)
+                        continue;
+                /* Print the WWN */
+                sprintf(&buf[index], "%02x%02x%02x%02x%02x%02x%02x%02x:",
+                        ndlp->nlp_portname.u.wwn[0],
+                        ndlp->nlp_portname.u.wwn[1],
+                        ndlp->nlp_portname.u.wwn[2],
+                        ndlp->nlp_portname.u.wwn[3],
+                        ndlp->nlp_portname.u.wwn[4],
+                        ndlp->nlp_portname.u.wwn[5],
+                        ndlp->nlp_portname.u.wwn[6],
+                        ndlp->nlp_portname.u.wwn[7]);
+                index = strlen(buf);
+                for (i = 0; i < LPFC_MAX_BUCKET_COUNT; i++) {
+                        sprintf(&buf[index], "%010u,",
+                                ndlp->lat_data[i].cmd_count);
+                        index = strlen(buf);
+                }
+                sprintf(&buf[index], "\n");
+                index = strlen(buf);
+        }
+        spin_unlock_irq(shost->host_lock);
+        return index;
+}
+static struct bin_attribute sysfs_drvr_stat_data_attr = {
+        .attr = {
+                .name = "lpfc_drvr_stat_data",
+                .mode = S_IRUSR,
+                .owner = THIS_MODULE,
+        },
+        .size = LPFC_MAX_TARGET * MAX_STAT_DATA_SIZE_PER_TARGET,
+        .read = sysfs_drvr_stat_data_read,
+        .write = NULL,
+};
 /*
 # lpfc_link_speed: Link speed selection for initializing the Fibre Channel
 # connection.
@@ -1479,6 +2523,24 @@ static DEVICE_ATTR(lpfc_topology, S_IRUGO | S_IWUSR,
 #       8  = 8 Gigabaud
 # Value range is [0,8]. Default value is 0.
 */
+/**
+ * lpfc_link_speed_set: Set the adapters link speed.
+ * @phba: lpfc_hba pointer.
+ * @val: link speed value.
+ *
+ * Description:
+ * If val is in a valid range then set the adapter's link speed field and
+ * issue a lip; if the lip fails reset the link speed to the old value.
+ *
+ * Notes:
+ * If the value is not in range log a kernel error message and return an error.
+ *
+ * Returns:
+ * zero if val is in range and lip okay.
+ * non-zero return value from lpfc_issue_lip()
+ * -EINVAL val out of range
+ **/
 static int
 lpfc_link_speed_set(struct lpfc_hba *phba, int val)
 {
@@ -1513,6 +2575,23 @@ static int lpfc_link_speed = 0;
 module_param(lpfc_link_speed, int, 0);
 MODULE_PARM_DESC(lpfc_link_speed, "Select link speed");
 lpfc_param_show(link_speed)
+/**
+ * lpfc_link_speed_init: Set the adapters link speed.
+ * @phba: lpfc_hba pointer.
+ * @val: link speed value.
+ *
+ * Description:
+ * If val is in a valid range then set the adapter's link speed field.
+ *
+ * Notes:
+ * If the value is not in range log a kernel error message, clear the link
+ * speed and return an error.
+ *
+ * Returns:
+ * zero if val saved.
+ * -EINVAL val out of range
+ **/
 static int
 lpfc_link_speed_init(struct lpfc_hba *phba, int val)
 {
@@ -1522,7 +2601,7 @@ lpfc_link_speed_init(struct lpfc_hba *phba, int val)
                return 0;
        }
        lpfc_printf_log(phba, KERN_ERR, LOG_INIT,
-                        "0454 lpfc_link_speed attribute cannot "
+                        "0405 lpfc_link_speed attribute cannot "
                        "be set to %d, allowed values are "
                        "["LPFC_LINK_SPEED_STRING"]\n", val);
        phba->cfg_link_speed = 0;
@@ -1548,6 +2627,48 @@ LPFC_VPORT_ATTR_RW(use_adisc, 0, 0, 1,
                   "Use ADISC on rediscovery to authenticate FCP devices");
 /*
+# lpfc_max_scsicmpl_time: Use scsi command completion time to control I/O queue
+# depth. Default value is 0. When the value of this parameter is zero the
+# SCSI command completion time is not used for controlling I/O queue depth. When
+# the parameter is set to a non-zero value, the I/O queue depth is controlled
+# to limit the I/O completion time to the parameter value.
+# The value is set in milliseconds.
+*/
+static int lpfc_max_scsicmpl_time;
+module_param(lpfc_max_scsicmpl_time, int, 0);
+MODULE_PARM_DESC(lpfc_max_scsicmpl_time,
+        "Use command completion time to control queue depth");
+lpfc_vport_param_show(max_scsicmpl_time);
+lpfc_vport_param_init(max_scsicmpl_time, 0, 0, 60000);
+static int
+lpfc_max_scsicmpl_time_set(struct lpfc_vport *vport, int val)
+{
+        struct Scsi_Host *shost = lpfc_shost_from_vport(vport);
+        struct lpfc_nodelist *ndlp, *next_ndlp;
+        if (val == vport->cfg_max_scsicmpl_time)
+                return 0;
+        if ((val < 0) || (val > 60000))
+                return -EINVAL;
+        vport->cfg_max_scsicmpl_time = val;
+        spin_lock_irq(shost->host_lock);
+        list_for_each_entry_safe(ndlp, next_ndlp, &vport->fc_nodes, nlp_listp) {
+                if (!NLP_CHK_NODE_ACT(ndlp))
+                        continue;
+                if (ndlp->nlp_state == NLP_STE_UNUSED_NODE)
+                        continue;
+                ndlp->cmd_qdepth = LPFC_MAX_TGT_QDEPTH;
+        }
+        spin_unlock_irq(shost->host_lock);
+        return 0;
+}
+lpfc_vport_param_store(max_scsicmpl_time);
+static DEVICE_ATTR(lpfc_max_scsicmpl_time, S_IRUGO | S_IWUSR,
+                   lpfc_max_scsicmpl_time_show,
+                   lpfc_max_scsicmpl_time_store);
+/*
 # lpfc_ack0: Use ACK0, instead of ACK1 for class 2 acknowledgement. Value
 # range is [0,1]. Default value is 0.
 */
@@ -1623,12 +2744,12 @@ LPFC_ATTR_RW(poll_tmo, 10, 1, 255,
 /*
 # lpfc_use_msi: Use MSI (Message Signaled Interrupts) in systems that
 #               support this feature
-#       0  = MSI disabled (default)
+#       0  = MSI disabled
 #       1  = MSI enabled
-#       2  = MSI-X enabled
+#       2  = MSI-X enabled (default)
-# Value range is [0,2]. Default value is 0.
+# Value range is [0,2]. Default value is 2.
 */
-LPFC_ATTR_R(use_msi, 0, 0, 2, "Use Message Signaled Interrupts (1) or "
+LPFC_ATTR_R(use_msi, 2, 0, 2, "Use Message Signaled Interrupts (1) or "
            "MSI-X (2), if possible");
 /*
@@ -1668,6 +2789,7 @@ struct device_attribute *lpfc_hba_attrs[] = {
        &dev_attr_option_rom_version,
        &dev_attr_link_state,
        &dev_attr_num_discovered_ports,
+        &dev_attr_menlo_mgmt_mode,
        &dev_attr_lpfc_drvr_version,
        &dev_attr_lpfc_temp_sensor,
        &dev_attr_lpfc_log_verbose,
@@ -1709,6 +2831,8 @@ struct device_attribute *lpfc_hba_attrs[] = {
        &dev_attr_lpfc_enable_hba_reset,
        &dev_attr_lpfc_enable_hba_heartbeat,
        &dev_attr_lpfc_sg_seg_cnt,
+        &dev_attr_lpfc_max_scsicmpl_time,
+        &dev_attr_lpfc_stat_data_ctrl,
        NULL,
 };
@@ -1731,9 +2855,29 @@ struct device_attribute *lpfc_vport_attrs[] = {
        &dev_attr_nport_evt_cnt,
        &dev_attr_npiv_info,
        &dev_attr_lpfc_enable_da_id,
+        &dev_attr_lpfc_max_scsicmpl_time,
+        &dev_attr_lpfc_stat_data_ctrl,
        NULL,
 };
+/**
+ * sysfs_ctlreg_write: Write method for writing to ctlreg.
+ * @kobj: kernel kobject that contains the kernel class device.
+ * @bin_attr: kernel attributes passed to us.
+ * @buf: contains the data to be written to the adapter IOREG space.
+ * @off: offset into buffer to beginning of data.
+ * @count: bytes to transfer.
+ *
+ * Description:
+ * Accessed via /sys/class/scsi_host/hostxxx/ctlreg.
+ * Uses the adapter io control registers to send buf contents to the adapter.
+ *
+ * Returns:
+ * -ERANGE off and count combo out of range
+ * -EINVAL off, count or buff address invalid
+ * -EPERM adapter is offline
+ * value of count, buf contents written
+ **/
 static ssize_t
 sysfs_ctlreg_write(struct kobject *kobj, struct bin_attribute *bin_attr,
                   char *buf, loff_t off, size_t count)
@@ -1766,6 +2910,23 @@ sysfs_ctlreg_write(struct kobject *kobj, struct bin_attribute *bin_attr,
        return count;
 }
+/**
+ * sysfs_ctlreg_read: Read method for reading from ctlreg.
+ * @kobj: kernel kobject that contains the kernel class device.
+ * @bin_attr: kernel attributes passed to us.
+ * @buf: if succesful contains the data from the adapter IOREG space.
+ * @off: offset into buffer to beginning of data.
+ * @count: bytes to transfer.
+ *
+ * Description:
+ * Accessed via /sys/class/scsi_host/hostxxx/ctlreg.
+ * Uses the adapter io control registers to read data into buf.
+ *
+ * Returns:
+ * -ERANGE off and count combo out of range
+ * -EINVAL off, count or buff address invalid
+ * value of count, buf contents read
+ **/
 static ssize_t
 sysfs_ctlreg_read(struct kobject *kobj, struct bin_attribute *bin_attr,
                  char *buf, loff_t off, size_t count)
@@ -1810,7 +2971,10 @@ static struct bin_attribute sysfs_ctlreg_attr = {
        .write = sysfs_ctlreg_write,
 };
+/**
+ * sysfs_mbox_idle: frees the sysfs mailbox.
+ * @phba: lpfc_hba pointer
+ **/
 static void
 sysfs_mbox_idle(struct lpfc_hba *phba)
 {
@@ -1824,6 +2988,27 @@ sysfs_mbox_idle(struct lpfc_hba *phba)
        }
 }
+/**
+ * sysfs_mbox_write: Write method for writing information via mbox.
+ * @kobj: kernel kobject that contains the kernel class device.
+ * @bin_attr: kernel attributes passed to us.
+ * @buf: contains the data to be written to sysfs mbox.
+ * @off: offset into buffer to beginning of data.
+ * @count: bytes to transfer.
+ *
+ * Description:
+ * Accessed via /sys/class/scsi_host/hostxxx/mbox.
+ * Uses the sysfs mbox to send buf contents to the adapter.
+ *
+ * Returns:
+ * -ERANGE off and count combo out of range
+ * -EINVAL off, count or buff address invalid
+ * zero if count is zero
+ * -EPERM adapter is offline
+ * -ENOMEM failed to allocate memory for the mail box
+ * -EAGAIN offset, state or mbox is NULL
+ * count number of bytes transferred
+ **/
 static ssize_t
 sysfs_mbox_write(struct kobject *kobj, struct bin_attribute *bin_attr,
                 char *buf, loff_t off, size_t count)
@@ -1878,6 +3063,29 @@ sysfs_mbox_write(struct kobject *kobj, struct bin_attribute *bin_attr,
        return count;
 }
+/**
+ * sysfs_mbox_read: Read method for reading information via mbox.
+ * @kobj: kernel kobject that contains the kernel class device.
+ * @bin_attr: kernel attributes passed to us.
+ * @buf: contains the data to be read from sysfs mbox.
+ * @off: offset into buffer to beginning of data.
+ * @count: bytes to transfer.
+ *
+ * Description:
+ * Accessed via /sys/class/scsi_host/hostxxx/mbox.
+ * Uses the sysfs mbox to receive data from to the adapter.
+ *
+ * Returns:
+ * -ERANGE off greater than mailbox command size
+ * -EINVAL off, count or buff address invalid
+ * zero if off and count are zero
+ * -EACCES adapter over temp
+ * -EPERM garbage can value to catch a multitude of errors
+ * -EAGAIN management IO not permitted, state or off error
+ * -ETIME mailbox timeout
+ * -ENODEV mailbox error
+ * count number of bytes transferred
+ **/
 static ssize_t
 sysfs_mbox_read(struct kobject *kobj, struct bin_attribute *bin_attr,
                char *buf, loff_t off, size_t count)
@@ -1954,6 +3162,8 @@ sysfs_mbox_read(struct kobject *kobj, struct bin_attribute *bin_attr,
                case MBX_DEL_LD_ENTRY:
                case MBX_SET_VARIABLE:
                case MBX_WRITE_WWN:
+                case MBX_PORT_CAPABILITIES:
+                case MBX_PORT_IOV_CONTROL:
                        break;
                case MBX_READ_SPARM64:
                case MBX_READ_LA:
@@ -1978,17 +3188,15 @@ sysfs_mbox_read(struct kobject *kobj, struct bin_attribute *bin_attr,
                /* If HBA encountered an error attention, allow only DUMP
                 * or RESTART mailbox commands until the HBA is restarted.
                 */
-                if ((phba->pport->stopped) &&
+                if (phba->pport->stopped &&
-                        (phba->sysfs_mbox.mbox->mb.mbxCommand !=
+                    phba->sysfs_mbox.mbox->mb.mbxCommand != MBX_DUMP_MEMORY &&
-                                MBX_DUMP_MEMORY &&
+                    phba->sysfs_mbox.mbox->mb.mbxCommand != MBX_RESTART &&
-                         phba->sysfs_mbox.mbox->mb.mbxCommand !=
+                    phba->sysfs_mbox.mbox->mb.mbxCommand != MBX_WRITE_VPARMS &&
-                                MBX_RESTART &&
+                    phba->sysfs_mbox.mbox->mb.mbxCommand != MBX_WRITE_WWN)
-                         phba->sysfs_mbox.mbox->mb.mbxCommand !=
+                        lpfc_printf_log(phba, KERN_WARNING, LOG_MBOX,
-                                MBX_WRITE_VPARMS)) {
+                                        "1259 mbox: Issued mailbox cmd "
-                        sysfs_mbox_idle(phba);
+                                        "0x%x while in stopped state.\n",
-                        spin_unlock_irq(&phba->hbalock);
+                                        phba->sysfs_mbox.mbox->mb.mbxCommand);
-                        return -EPERM;
-                }
                phba->sysfs_mbox.mbox->vport = vport;
@@ -2059,6 +3267,14 @@ static struct bin_attribute sysfs_mbox_attr = {
        .write = sysfs_mbox_write,
 };
+/**
+ * lpfc_alloc_sysfs_attr: Creates the ctlreg and mbox entries.
+ * @vport: address of lpfc vport structure.
+ *
+ * Return codes:
+ * zero on success
+ * error return code from sysfs_create_bin_file()
+ **/
 int
 lpfc_alloc_sysfs_attr(struct lpfc_vport *vport)
 {
@@ -2075,18 +3291,30 @@ lpfc_alloc_sysfs_attr(struct lpfc_vport *vport)
        if (error)
                goto out_remove_ctlreg_attr;
+        error = sysfs_create_bin_file(&shost->shost_dev.kobj,
+                                      &sysfs_drvr_stat_data_attr);
+        if (error)
+                goto out_remove_mbox_attr;
        return 0;
+out_remove_mbox_attr:
+        sysfs_remove_bin_file(&shost->shost_dev.kobj, &sysfs_mbox_attr);
 out_remove_ctlreg_attr:
        sysfs_remove_bin_file(&shost->shost_dev.kobj, &sysfs_ctlreg_attr);
 out:
        return error;
 }
+/**
+ * lpfc_free_sysfs_attr: Removes the ctlreg and mbox entries.
+ * @vport: address of lpfc vport structure.
+ **/
 void
 lpfc_free_sysfs_attr(struct lpfc_vport *vport)
 {
        struct Scsi_Host *shost = lpfc_shost_from_vport(vport);
+        sysfs_remove_bin_file(&shost->shost_dev.kobj,
+                &sysfs_drvr_stat_data_attr);
        sysfs_remove_bin_file(&shost->shost_dev.kobj, &sysfs_mbox_attr);
        sysfs_remove_bin_file(&shost->shost_dev.kobj, &sysfs_ctlreg_attr);
 }
@@ -2096,6 +3324,10 @@ lpfc_free_sysfs_attr(struct lpfc_vport *vport)
 * Dynamic FC Host Attributes Support
 */
+/**
+ * lpfc_get_host_port_id: Copy the vport DID into the scsi host port id.
+ * @shost: kernel scsi host pointer.
+ **/
 static void
 lpfc_get_host_port_id(struct Scsi_Host *shost)
 {
@@ -2105,6 +3337,10 @@ lpfc_get_host_port_id(struct Scsi_Host *shost)
        fc_host_port_id(shost) = vport->fc_myDID;
 }
+/**
+ * lpfc_get_host_port_type: Set the value of the scsi host port type.
+ * @shost: kernel scsi host pointer.
+ **/
 static void
 lpfc_get_host_port_type(struct Scsi_Host *shost)
 {
@@ -2133,6 +3369,10 @@ lpfc_get_host_port_type(struct Scsi_Host *shost)
        spin_unlock_irq(shost->host_lock);
 }
+/**
+ * lpfc_get_host_port_state: Set the value of the scsi host port state.
+ * @shost: kernel scsi host pointer.
+ **/
 static void
 lpfc_get_host_port_state(struct Scsi_Host *shost)
 {
@@ -2167,6 +3407,10 @@ lpfc_get_host_port_state(struct Scsi_Host *shost)
        spin_unlock_irq(shost->host_lock);
 }
+/**
+ * lpfc_get_host_speed: Set the value of the scsi host speed.
+ * @shost: kernel scsi host pointer.
+ **/
 static void
 lpfc_get_host_speed(struct Scsi_Host *shost)
 {
@@ -2199,6 +3443,10 @@ lpfc_get_host_speed(struct Scsi_Host *shost)
        spin_unlock_irq(shost->host_lock);
 }
+/**
+ * lpfc_get_host_fabric_name: Set the value of the scsi host fabric name.
+ * @shost: kernel scsi host pointer.
+ **/
 static void
 lpfc_get_host_fabric_name (struct Scsi_Host *shost)
 {
@@ -2221,6 +3469,18 @@ lpfc_get_host_fabric_name (struct Scsi_Host *shost)
        fc_host_fabric_name(shost) = node_name;
 }
+/**
+ * lpfc_get_stats: Return statistical information about the adapter.
+ * @shost: kernel scsi host pointer.
+ *
+ * Notes:
+ * NULL on error for link down, no mbox pool, sli2 active,
+ * management not allowed, memory allocation error, or mbox error.
+ *
+ * Returns:
+ * NULL for error
+ * address of the adapter host statistics
+ **/
 static struct fc_host_statistics *
 lpfc_get_stats(struct Scsi_Host *shost)
 {
@@ -2334,6 +3594,10 @@ lpfc_get_stats(struct Scsi_Host *shost)
        return hs;
 }
+/**
+ * lpfc_reset_stats: Copy the adapter link stats information.
+ * @shost: kernel scsi host pointer.
+ **/
 static void
 lpfc_reset_stats(struct Scsi_Host *shost)
 {
@@ -2411,6 +3675,14 @@ lpfc_reset_stats(struct Scsi_Host *shost)
 * are no sysfs handlers for link_down_tmo.
 */
+/**
+ * lpfc_get_node_by_target: Return the nodelist for a target.
+ * @starget: kernel scsi target pointer.
+ *
+ * Returns:
+ * address of the node list if found
+ * NULL target not found
+ **/
 static struct lpfc_nodelist *
 lpfc_get_node_by_target(struct scsi_target *starget)
 {
@@ -2432,6 +3704,10 @@ lpfc_get_node_by_target(struct scsi_target *starget)
        return NULL;
 }
+/**
+ * lpfc_get_starget_port_id: Set the target port id to the ndlp DID or -1.
+ * @starget: kernel scsi target pointer.
+ **/
 static void
 lpfc_get_starget_port_id(struct scsi_target *starget)
 {
@@ -2440,6 +3716,12 @@ lpfc_get_starget_port_id(struct scsi_target *starget)
        fc_starget_port_id(starget) = ndlp ? ndlp->nlp_DID : -1;
 }
+/**
+ * lpfc_get_starget_node_name: Set the target node name.
+ * @starget: kernel scsi target pointer.
+ *
+ * Description: Set the target node name to the ndlp node name wwn or zero.
+ **/
 static void
 lpfc_get_starget_node_name(struct scsi_target *starget)
 {
@@ -2449,6 +3731,12 @@ lpfc_get_starget_node_name(struct scsi_target *starget)
                ndlp ? wwn_to_u64(ndlp->nlp_nodename.u.wwn) : 0;
 }
+/**
+ * lpfc_get_starget_port_name: Set the target port name.
+ * @starget: kernel scsi target pointer.
+ *
+ * Description:  set the target port name to the ndlp port name wwn or zero.
+ **/
 static void
 lpfc_get_starget_port_name(struct scsi_target *starget)
 {
@@ -2458,6 +3746,15 @@ lpfc_get_starget_port_name(struct scsi_target *starget)
                ndlp ? wwn_to_u64(ndlp->nlp_portname.u.wwn) : 0;
 }
+/**
+ * lpfc_set_rport_loss_tmo: Set the rport dev loss tmo.
+ * @rport: fc rport address.
+ * @timeout: new value for dev loss tmo.
+ *
+ * Description:
+ * If timeout is non zero set the dev_loss_tmo to timeout, else set
+ * dev_loss_tmo to one.
+ **/
 static void
 lpfc_set_rport_loss_tmo(struct fc_rport *rport, uint32_t timeout)
 {
@@ -2467,7 +3764,18 @@ lpfc_set_rport_loss_tmo(struct fc_rport *rport, uint32_t timeout)
                rport->dev_loss_tmo = 1;
 }
+/**
+ * lpfc_rport_show_function: Return rport target information.
+ *
+ * Description:
+ * Macro that uses field to generate a function with the name lpfc_show_rport_
+ *
+ * lpfc_show_rport_##field: returns the bytes formatted in buf
+ * @cdev: class converted to an fc_rport.
+ * @buf: on return contains the target_field or zero.
+ *
+ * Returns: size of formatted string.
+ **/
 #define lpfc_rport_show_function(field, format_string, sz, cast)        \
 static ssize_t                                                          \
 lpfc_show_rport_##field (struct device *dev,                            \
@@ -2602,6 +3910,10 @@ struct fc_function_template lpfc_vport_transport_functions = {
        .vport_disable = lpfc_vport_disable,
 };
+/**
+ * lpfc_get_cfgparam: Used during probe_one to init the adapter structure.
+ * @phba: lpfc_hba pointer.
+ **/
 void
 lpfc_get_cfgparam(struct lpfc_hba *phba)
 {
@@ -2637,6 +3949,10 @@ lpfc_get_cfgparam(struct lpfc_hba *phba)
        return;
 }
+/**
+ * lpfc_get_vport_cfgparam: Used during port create, init the vport structure.
+ * @vport: lpfc_vport pointer.
+ **/
 void
 lpfc_get_vport_cfgparam(struct lpfc_vport *vport)
 {
@@ -2648,6 +3964,7 @@ lpfc_get_vport_cfgparam(struct lpfc_vport *vport)
        lpfc_restrict_login_init(vport, lpfc_restrict_login);
        lpfc_fcp_class_init(vport, lpfc_fcp_class);
        lpfc_use_adisc_init(vport, lpfc_use_adisc);
+        lpfc_max_scsicmpl_time_init(vport, lpfc_max_scsicmpl_time);
        lpfc_fdmi_on_init(vport, lpfc_fdmi_on);
        lpfc_discovery_threads_init(vport, lpfc_discovery_threads);
        lpfc_max_luns_init(vport, lpfc_max_luns);
diff --git a/drivers/scsi/lpfc/lpfc_crtn.h b/drivers/scsi/lpfc/lpfc_crtn.h
index 1b8245213b83..044ef4057d28 100644
--- a/drivers/scsi/lpfc/lpfc_crtn.h
+++ b/drivers/scsi/lpfc/lpfc_crtn.h
@@ -18,7 +18,7 @@
 * included with this package.                                     *
 *******************************************************************/
-typedef int (*node_filter)(struct lpfc_nodelist *ndlp, void *param);
+typedef int (*node_filter)(struct lpfc_nodelist *, void *);
 struct fc_rport;
 void lpfc_dump_mem(struct lpfc_hba *, LPFC_MBOXQ_t *, uint16_t);
@@ -26,11 +26,11 @@ void lpfc_read_nv(struct lpfc_hba *, LPFC_MBOXQ_t *);
 void lpfc_config_async(struct lpfc_hba *, LPFC_MBOXQ_t *, uint32_t);
 void lpfc_heart_beat(struct lpfc_hba *, LPFC_MBOXQ_t *);
-int lpfc_read_la(struct lpfc_hba * phba, LPFC_MBOXQ_t * pmb,
+int lpfc_read_la(struct lpfc_hba *, LPFC_MBOXQ_t *, struct lpfc_dmabuf *);
-                 struct lpfc_dmabuf *mp);
 void lpfc_clear_la(struct lpfc_hba *, LPFC_MBOXQ_t *);
-void lpfc_issue_clear_la(struct lpfc_hba *phba, struct lpfc_vport *vport);
+void lpfc_issue_clear_la(struct lpfc_hba *, struct lpfc_vport *);
 void lpfc_config_link(struct lpfc_hba *, LPFC_MBOXQ_t *);
+int lpfc_config_msi(struct lpfc_hba *, LPFC_MBOXQ_t *);
 int lpfc_read_sparam(struct lpfc_hba *, LPFC_MBOXQ_t *, int);
 void lpfc_read_config(struct lpfc_hba *, LPFC_MBOXQ_t *);
 void lpfc_read_lnk_stat(struct lpfc_hba *, LPFC_MBOXQ_t *);
@@ -43,7 +43,7 @@ void lpfc_unreg_vpi(struct lpfc_hba *, uint16_t, LPFC_MBOXQ_t *);
 void lpfc_init_link(struct lpfc_hba *, LPFC_MBOXQ_t *, uint32_t, uint32_t);
 struct lpfc_vport *lpfc_find_vport_by_did(struct lpfc_hba *, uint32_t);
-void lpfc_cleanup_rpis(struct lpfc_vport *vport, int remove);
+void lpfc_cleanup_rpis(struct lpfc_vport *, int);
 int lpfc_linkdown(struct lpfc_hba *);
 void lpfc_port_link_failure(struct lpfc_vport *);
 void lpfc_mbx_cmpl_read_la(struct lpfc_hba *, LPFC_MBOXQ_t *);
@@ -135,7 +135,7 @@ void lpfc_ct_unsol_event(struct lpfc_hba *, struct lpfc_sli_ring *,
 int lpfc_ns_cmd(struct lpfc_vport *, int, uint8_t, uint32_t);
 int lpfc_fdmi_cmd(struct lpfc_vport *, struct lpfc_nodelist *, int);
 void lpfc_fdmi_tmo(unsigned long);
-void lpfc_fdmi_timeout_handler(struct lpfc_vport *vport);
+void lpfc_fdmi_timeout_handler(struct lpfc_vport *);
 int lpfc_config_port_prep(struct lpfc_hba *);
 int lpfc_config_port_post(struct lpfc_hba *);
@@ -155,6 +155,8 @@ int lpfc_sli_queue_setup(struct lpfc_hba *);
 void lpfc_handle_eratt(struct lpfc_hba *);
 void lpfc_handle_latt(struct lpfc_hba *);
 irqreturn_t lpfc_intr_handler(int, void *);
+irqreturn_t lpfc_sp_intr_handler(int, void *);
+irqreturn_t lpfc_fp_intr_handler(int, void *);
 void lpfc_read_rev(struct lpfc_hba *, LPFC_MBOXQ_t *);
 void lpfc_config_ring(struct lpfc_hba *, int, LPFC_MBOXQ_t *);
@@ -175,11 +177,12 @@ void lpfc_mem_free(struct lpfc_hba *);
 void lpfc_stop_vport_timers(struct lpfc_vport *);
 void lpfc_poll_timeout(unsigned long ptr);
-void lpfc_poll_start_timer(struct lpfc_hba * phba);
+void lpfc_poll_start_timer(struct lpfc_hba *);
-void lpfc_sli_poll_fcp_ring(struct lpfc_hba * hba);
+void lpfc_poll_eratt(unsigned long);
+void lpfc_sli_poll_fcp_ring(struct lpfc_hba *);
 struct lpfc_iocbq * lpfc_sli_get_iocbq(struct lpfc_hba *);
-void lpfc_sli_release_iocbq(struct lpfc_hba * phba, struct lpfc_iocbq * iocb);
+void lpfc_sli_release_iocbq(struct lpfc_hba *, struct lpfc_iocbq *);
-uint16_t lpfc_sli_next_iotag(struct lpfc_hba * phba, struct lpfc_iocbq * iocb);
+uint16_t lpfc_sli_next_iotag(struct lpfc_hba *, struct lpfc_iocbq *);
 void lpfc_reset_barrier(struct lpfc_hba * phba);
 int lpfc_sli_brdready(struct lpfc_hba *, uint32_t);
@@ -187,11 +190,13 @@ int lpfc_sli_brdkill(struct lpfc_hba *);
 int lpfc_sli_brdreset(struct lpfc_hba *);
 int lpfc_sli_brdrestart(struct lpfc_hba *);
 int lpfc_sli_hba_setup(struct lpfc_hba *);
+int lpfc_sli_config_port(struct lpfc_hba *, int);
 int lpfc_sli_host_down(struct lpfc_vport *);
 int lpfc_sli_hba_down(struct lpfc_hba *);
 int lpfc_sli_issue_mbox(struct lpfc_hba *, LPFC_MBOXQ_t *, uint32_t);
 int lpfc_sli_handle_mb_event(struct lpfc_hba *);
 int lpfc_sli_flush_mbox_queue(struct lpfc_hba *);
+int lpfc_sli_check_eratt(struct lpfc_hba *);
 int lpfc_sli_handle_slow_ring_event(struct lpfc_hba *,
                                    struct lpfc_sli_ring *, uint32_t);
 void lpfc_sli_def_mbox_cmpl(struct lpfc_hba *, LPFC_MBOXQ_t *);
@@ -199,6 +204,7 @@ int lpfc_sli_issue_iocb(struct lpfc_hba *, struct lpfc_sli_ring *,
                        struct lpfc_iocbq *, uint32_t);
 void lpfc_sli_pcimem_bcopy(void *, void *, uint32_t);
 void lpfc_sli_abort_iocb_ring(struct lpfc_hba *, struct lpfc_sli_ring *);
+void lpfc_sli_flush_fcp_rings(struct lpfc_hba *);
 int lpfc_sli_ringpostbuf_put(struct lpfc_hba *, struct lpfc_sli_ring *,
                             struct lpfc_dmabuf *);
 struct lpfc_dmabuf *lpfc_sli_ringpostbuf_get(struct lpfc_hba *,
@@ -226,17 +232,13 @@ struct lpfc_nodelist *lpfc_findnode_did(struct lpfc_vport *, uint32_t);
 struct lpfc_nodelist *lpfc_findnode_wwpn(struct lpfc_vport *,
                                         struct lpfc_name *);
-int lpfc_sli_issue_mbox_wait(struct lpfc_hba * phba, LPFC_MBOXQ_t * pmboxq,
+int lpfc_sli_issue_mbox_wait(struct lpfc_hba *, LPFC_MBOXQ_t *, uint32_t);
-                             uint32_t timeout);
-int lpfc_sli_issue_iocb_wait(struct lpfc_hba * phba,
+int lpfc_sli_issue_iocb_wait(struct lpfc_hba *, struct lpfc_sli_ring *,
-                             struct lpfc_sli_ring * pring,
+                             struct lpfc_iocbq *, struct lpfc_iocbq *,
-                             struct lpfc_iocbq * piocb,
+                             uint32_t);
-                             struct lpfc_iocbq * prspiocbq,
+void lpfc_sli_abort_fcp_cmpl(struct lpfc_hba *, struct lpfc_iocbq *,
-                             uint32_t timeout);
+                             struct lpfc_iocbq *);
-void lpfc_sli_abort_fcp_cmpl(struct lpfc_hba * phba,
-                             struct lpfc_iocbq * cmdiocb,
-                             struct lpfc_iocbq * rspiocb);
 void lpfc_sli_free_hbq(struct lpfc_hba *, struct hbq_dmabuf *);
@@ -269,7 +271,7 @@ void lpfc_dev_loss_tmo_callbk(struct fc_rport *rport);
 struct lpfc_vport *lpfc_create_port(struct lpfc_hba *, int, struct device *);
 int  lpfc_vport_disable(struct fc_vport *fc_vport, bool disable);
-void lpfc_mbx_unreg_vpi(struct lpfc_vport *);
+int lpfc_mbx_unreg_vpi(struct lpfc_vport *);
 void destroy_port(struct lpfc_vport *);
 int lpfc_get_instance(void);
 void lpfc_host_attrib_init(struct Scsi_Host *);
@@ -290,6 +292,13 @@ void lpfc_unblock_fabric_iocbs(struct lpfc_hba *);
 void lpfc_adjust_queue_depth(struct lpfc_hba *);
 void lpfc_ramp_down_queue_handler(struct lpfc_hba *);
 void lpfc_ramp_up_queue_handler(struct lpfc_hba *);
+void lpfc_scsi_dev_block(struct lpfc_hba *);
+void
+lpfc_send_els_failure_event(struct lpfc_hba *, struct lpfc_iocbq *,
+                                struct lpfc_iocbq *);
+struct lpfc_fast_path_event *lpfc_alloc_fast_evt(struct lpfc_hba *);
+void lpfc_free_fast_evt(struct lpfc_hba *, struct lpfc_fast_path_event *);
 #define ScsiResult(host_code, scsi_code) (((host_code) << 16) | scsi_code)
 #define HBA_EVENT_RSCN                   5
diff --git a/drivers/scsi/lpfc/lpfc_ct.c b/drivers/scsi/lpfc/lpfc_ct.c
index 7fc74cf5823b..26dae8bae2d1 100644
--- a/drivers/scsi/lpfc/lpfc_ct.c
+++ b/drivers/scsi/lpfc/lpfc_ct.c
@@ -34,6 +34,7 @@
 #include "lpfc_hw.h"
 #include "lpfc_sli.h"
+#include "lpfc_nl.h"
 #include "lpfc_disc.h"
 #include "lpfc_scsi.h"
 #include "lpfc.h"
@@ -134,25 +135,24 @@ lpfc_ct_unsol_event(struct lpfc_hba *phba, struct lpfc_sli_ring *pring,
                }
                list_del(&head);
        } else {
-                struct lpfc_iocbq  *next;
+                INIT_LIST_HEAD(&head);
+                list_add_tail(&head, &piocbq->list);
-                list_for_each_entry_safe(iocbq, next, &piocbq->list, list) {
+                list_for_each_entry(iocbq, &head, list) {
                        icmd = &iocbq->iocb;
                        if (icmd->ulpBdeCount == 0)
-                                lpfc_ct_unsol_buffer(phba, piocbq, NULL, 0);
+                                lpfc_ct_unsol_buffer(phba, iocbq, NULL, 0);
                        for (i = 0; i < icmd->ulpBdeCount; i++) {
                                paddr = getPaddr(icmd->un.cont64[i].addrHigh,
                                                 icmd->un.cont64[i].addrLow);
                                mp = lpfc_sli_ringpostbuf_get(phba, pring,
                                                              paddr);
                                size = icmd->un.cont64[i].tus.f.bdeSize;
-                                lpfc_ct_unsol_buffer(phba, piocbq, mp, size);
+                                lpfc_ct_unsol_buffer(phba, iocbq, mp, size);
                                lpfc_in_buf_free(phba, mp);
                        }
-                        list_del(&iocbq->list);
-                        lpfc_sli_release_iocbq(phba, iocbq);
                        lpfc_post_buffer(phba, pring, i);
                }
+                list_del(&head);
        }
 }
@@ -212,7 +212,7 @@ lpfc_alloc_ct_rsp(struct lpfc_hba *phba, int cmdcode, struct ulp_bde64 *bpl,
                else
                        list_add_tail(&mp->list, &mlist->list);
-                bpl->tus.f.bdeFlags = BUFF_USE_RCV;
+                bpl->tus.f.bdeFlags = BUFF_TYPE_BDE_64I;
                /* build buffer ptr list for IOCB */
                bpl->addrLow = le32_to_cpu(putPaddrLow(mp->phys) );
                bpl->addrHigh = le32_to_cpu(putPaddrHigh(mp->phys) );
@@ -283,7 +283,7 @@ lpfc_gen_req(struct lpfc_vport *vport, struct lpfc_dmabuf *bmp,
        icmd->un.genreq64.bdl.ulpIoTag32 = 0;
        icmd->un.genreq64.bdl.addrHigh = putPaddrHigh(bmp->phys);
        icmd->un.genreq64.bdl.addrLow = putPaddrLow(bmp->phys);
-        icmd->un.genreq64.bdl.bdeFlags = BUFF_TYPE_BDL;
+        icmd->un.genreq64.bdl.bdeFlags = BUFF_TYPE_BLP_64;
        icmd->un.genreq64.bdl.bdeSize = (num_entry * sizeof (struct ulp_bde64));
        if (usr_flg)
@@ -861,7 +861,7 @@ lpfc_cmpl_ct(struct lpfc_hba *phba, struct lpfc_iocbq *cmdiocb,
                retry++;
                lpfc_printf_vlog(vport, KERN_INFO, LOG_DISCOVERY,
-                                 "0216 Retrying NS cmd %x\n", cmdcode);
+                                 "0250 Retrying NS cmd %x\n", cmdcode);
                rc = lpfc_ns_cmd(vport, cmdcode, retry, 0);
                if (rc == 0)
                        goto out;
diff --git a/drivers/scsi/lpfc/lpfc_debugfs.c b/drivers/scsi/lpfc/lpfc_debugfs.c
index 094b47e94b29..771920bdde44 100644
--- a/drivers/scsi/lpfc/lpfc_debugfs.c
+++ b/drivers/scsi/lpfc/lpfc_debugfs.c
@@ -1,7 +1,7 @@
 /*******************************************************************
 * This file is part of the Emulex Linux Device Driver for         *
 * Fibre Channel Host Bus Adapters.                                *
- * Copyright (C) 2007 Emulex.  All rights reserved.                *
+ * Copyright (C) 2007-2008 Emulex.  All rights reserved.           *
 * EMULEX and SLI are trademarks of Emulex.                        *
 * www.emulex.com                                                  *
 *                                                                 *
@@ -35,6 +35,7 @@
 #include "lpfc_hw.h"
 #include "lpfc_sli.h"
+#include "lpfc_nl.h"
 #include "lpfc_disc.h"
 #include "lpfc_scsi.h"
 #include "lpfc.h"
@@ -46,13 +47,14 @@
 #include "lpfc_debugfs.h"
 #ifdef CONFIG_LPFC_DEBUG_FS
-/* debugfs interface
+/**
+ * debugfs interface
 *
 * To access this interface the user should:
 * # mkdir /debug
 * # mount -t debugfs none /debug
 *
- * The lpfc debugfs directory hierachy is:
+ * The lpfc debugfs directory hierarchy is:
 * lpfc/lpfcX/vportY
 * where X is the lpfc hba unique_id
 * where Y is the vport VPI on that hba
@@ -61,14 +63,21 @@
 * discovery_trace
 * This is an ACSII readable file that contains a trace of the last
 * lpfc_debugfs_max_disc_trc events that happened on a specific vport.
- * See lpfc_debugfs.h for different categories of
+ * See lpfc_debugfs.h for different categories of  discovery events.
- * discovery events. To enable the discovery trace, the following
+ * To enable the discovery trace, the following module parameters must be set:
- * module parameters must be set:
 * lpfc_debugfs_enable=1         Turns on lpfc debugfs filesystem support
 * lpfc_debugfs_max_disc_trc=X   Where X is the event trace depth for
 *                               EACH vport. X MUST also be a power of 2.
 * lpfc_debugfs_mask_disc_trc=Y  Where Y is an event mask as defined in
 *                               lpfc_debugfs.h .
+ *
+ * slow_ring_trace
+ * This is an ACSII readable file that contains a trace of the last
+ * lpfc_debugfs_max_slow_ring_trc events that happened on a specific HBA.
+ * To enable the slow ring trace, the following module parameters must be set:
+ * lpfc_debugfs_enable=1         Turns on lpfc debugfs filesystem support
+ * lpfc_debugfs_max_slow_ring_trc=X   Where X is the event trace depth for
+ *                               the HBA. X MUST also be a power of 2.
 */
 static int lpfc_debugfs_enable = 1;
 module_param(lpfc_debugfs_enable, int, 0);
@@ -117,6 +126,25 @@ struct lpfc_debug {
 static atomic_t lpfc_debugfs_seq_trc_cnt = ATOMIC_INIT(0);
 static unsigned long lpfc_debugfs_start_time = 0L;
+/**
+ * lpfc_debugfs_disc_trc_data - Dump discovery logging to a buffer.
+ * @vport: The vport to gather the log info from.
+ * @buf: The buffer to dump log into.
+ * @size: The maximum amount of data to process.
+ *
+ * Description:
+ * This routine gathers the lpfc discovery debugfs data from the @vport and
+ * dumps it to @buf up to @size number of bytes. It will start at the next entry
+ * in the log and process the log until the end of the buffer. Then it will
+ * gather from the beginning of the log and process until the current entry.
+ *
+ * Notes:
+ * Discovery logging will be disabled while while this routine dumps the log.
+ *
+ * Return Value:
+ * This routine returns the amount of bytes that were dumped into @buf and will
+ * not exceed @size.
+ **/
 static int
 lpfc_debugfs_disc_trc_data(struct lpfc_vport *vport, char *buf, int size)
 {
@@ -125,7 +153,6 @@ lpfc_debugfs_disc_trc_data(struct lpfc_vport *vport, char *buf, int size)
        struct lpfc_debugfs_trc *dtp;
        char buffer[LPFC_DEBUG_TRC_ENTRY_SIZE];
        enable = lpfc_debugfs_enable;
        lpfc_debugfs_enable = 0;
@@ -159,6 +186,25 @@ lpfc_debugfs_disc_trc_data(struct lpfc_vport *vport, char *buf, int size)
        return len;
 }
+/**
+ * lpfc_debugfs_slow_ring_trc_data - Dump slow ring logging to a buffer.
+ * @phba: The HBA to gather the log info from.
+ * @buf: The buffer to dump log into.
+ * @size: The maximum amount of data to process.
+ *
+ * Description:
+ * This routine gathers the lpfc slow ring debugfs data from the @phba and
+ * dumps it to @buf up to @size number of bytes. It will start at the next entry
+ * in the log and process the log until the end of the buffer. Then it will
+ * gather from the beginning of the log and process until the current entry.
+ *
+ * Notes:
+ * Slow ring logging will be disabled while while this routine dumps the log.
+ *
+ * Return Value:
+ * This routine returns the amount of bytes that were dumped into @buf and will
+ * not exceed @size.
+ **/
 static int
 lpfc_debugfs_slow_ring_trc_data(struct lpfc_hba *phba, char *buf, int size)
 {
@@ -203,6 +249,25 @@ lpfc_debugfs_slow_ring_trc_data(struct lpfc_hba *phba, char *buf, int size)
 static int lpfc_debugfs_last_hbq = -1;
+/**
+ * lpfc_debugfs_hbqinfo_data - Dump host buffer queue info to a buffer.
+ * @phba: The HBA to gather host buffer info from.
+ * @buf: The buffer to dump log into.
+ * @size: The maximum amount of data to process.
+ *
+ * Description:
+ * This routine dumps the host buffer queue info from the @phba to @buf up to
+ * @size number of bytes. A header that describes the current hbq state will be
+ * dumped to @buf first and then info on each hbq entry will be dumped to @buf
+ * until @size bytes have been dumped or all the hbq info has been dumped.
+ *
+ * Notes:
+ * This routine will rotate through each configured HBQ each time called.
+ *
+ * Return Value:
+ * This routine returns the amount of bytes that were dumped into @buf and will
+ * not exceed @size.
+ **/
 static int
 lpfc_debugfs_hbqinfo_data(struct lpfc_hba *phba, char *buf, int size)
 {
@@ -303,6 +368,24 @@ skipit:
 static int lpfc_debugfs_last_hba_slim_off;
+/**
+ * lpfc_debugfs_dumpHBASlim_data - Dump HBA SLIM info to a buffer.
+ * @phba: The HBA to gather SLIM info from.
+ * @buf: The buffer to dump log into.
+ * @size: The maximum amount of data to process.
+ *
+ * Description:
+ * This routine dumps the current contents of HBA SLIM for the HBA associated
+ * with @phba to @buf up to @size bytes of data. This is the raw HBA SLIM data.
+ *
+ * Notes:
+ * This routine will only dump up to 1024 bytes of data each time called and
+ * should be called multiple times to dump the entire HBA SLIM.
+ *
+ * Return Value:
+ * This routine returns the amount of bytes that were dumped into @buf and will
+ * not exceed @size.
+ **/
 static int
 lpfc_debugfs_dumpHBASlim_data(struct lpfc_hba *phba, char *buf, int size)
 {
@@ -342,6 +425,21 @@ lpfc_debugfs_dumpHBASlim_data(struct lpfc_hba *phba, char *buf, int size)
        return len;
 }
+/**
+ * lpfc_debugfs_dumpHostSlim_data - Dump host SLIM info to a buffer.
+ * @phba: The HBA to gather Host SLIM info from.
+ * @buf: The buffer to dump log into.
+ * @size: The maximum amount of data to process.
+ *
+ * Description:
+ * This routine dumps the current contents of host SLIM for the host associated
+ * with @phba to @buf up to @size bytes of data. The dump will contain the
+ * Mailbox, PCB, Rings, and Registers that are located in host memory.
+ *
+ * Return Value:
+ * This routine returns the amount of bytes that were dumped into @buf and will
+ * not exceed @size.
+ **/
 static int
 lpfc_debugfs_dumpHostSlim_data(struct lpfc_hba *phba, char *buf, int size)
 {
@@ -357,7 +455,7 @@ lpfc_debugfs_dumpHostSlim_data(struct lpfc_hba *phba, char *buf, int size)
        spin_lock_irq(&phba->hbalock);
        len +=  snprintf(buf+len, size-len, "SLIM Mailbox\n");
-        ptr = (uint32_t *)phba->slim2p;
+        ptr = (uint32_t *)phba->slim2p.virt;
        i = sizeof(MAILBOX_t);
        while (i > 0) {
                len +=  snprintf(buf+len, size-len,
@@ -370,7 +468,7 @@ lpfc_debugfs_dumpHostSlim_data(struct lpfc_hba *phba, char *buf, int size)
        }
        len +=  snprintf(buf+len, size-len, "SLIM PCB\n");
-        ptr = (uint32_t *)&phba->slim2p->pcb;
+        ptr = (uint32_t *)phba->pcb;
        i = sizeof(PCB_t);
        while (i > 0) {
                len +=  snprintf(buf+len, size-len,
@@ -382,44 +480,16 @@ lpfc_debugfs_dumpHostSlim_data(struct lpfc_hba *phba, char *buf, int size)
                off += (8 * sizeof(uint32_t));
        }
-        pgpp = (struct lpfc_pgp *)&phba->slim2p->mbx.us.s3_pgp.port;
+        for (i = 0; i < 4; i++) {
-        pring = &psli->ring[0];
+                pgpp = &phba->port_gp[i];
-        len +=  snprintf(buf+len, size-len,
+                pring = &psli->ring[i];
-                "Ring 0: CMD GetInx:%d (Max:%d Next:%d Local:%d flg:x%x)  "
+                len +=  snprintf(buf+len, size-len,
-                "RSP PutInx:%d Max:%d\n",
+                                 "Ring %d: CMD GetInx:%d (Max:%d Next:%d "
-                pgpp->cmdGetInx, pring->numCiocb,
+                                 "Local:%d flg:x%x)  RSP PutInx:%d Max:%d\n",
-                pring->next_cmdidx, pring->local_getidx, pring->flag,
+                                 i, pgpp->cmdGetInx, pring->numCiocb,
-                pgpp->rspPutInx, pring->numRiocb);
+                                 pring->next_cmdidx, pring->local_getidx,
-        pgpp++;
+                                 pring->flag, pgpp->rspPutInx, pring->numRiocb);
+        }
-        pring = &psli->ring[1];
-        len +=  snprintf(buf+len, size-len,
-                "Ring 1: CMD GetInx:%d (Max:%d Next:%d Local:%d flg:x%x)  "
-                "RSP PutInx:%d Max:%d\n",
-                pgpp->cmdGetInx, pring->numCiocb,
-                pring->next_cmdidx, pring->local_getidx, pring->flag,
-                pgpp->rspPutInx, pring->numRiocb);
-        pgpp++;
-        pring = &psli->ring[2];
-        len +=  snprintf(buf+len, size-len,
-                "Ring 2: CMD GetInx:%d (Max:%d Next:%d Local:%d flg:x%x)  "
-                "RSP PutInx:%d Max:%d\n",
-                pgpp->cmdGetInx, pring->numCiocb,
-                pring->next_cmdidx, pring->local_getidx, pring->flag,
-                pgpp->rspPutInx, pring->numRiocb);
-        pgpp++;
-        pring = &psli->ring[3];
-        len +=  snprintf(buf+len, size-len,
-                "Ring 3: CMD GetInx:%d (Max:%d Next:%d Local:%d flg:x%x)  "
-                "RSP PutInx:%d Max:%d\n",
-                pgpp->cmdGetInx, pring->numCiocb,
-                pring->next_cmdidx, pring->local_getidx, pring->flag,
-                pgpp->rspPutInx, pring->numRiocb);
-        ptr = (uint32_t *)&phba->slim2p->mbx.us.s3_pgp.hbq_get;
        word0 = readl(phba->HAregaddr);
        word1 = readl(phba->CAregaddr);
        word2 = readl(phba->HSregaddr);
@@ -430,6 +500,21 @@ lpfc_debugfs_dumpHostSlim_data(struct lpfc_hba *phba, char *buf, int size)
        return len;
 }
+/**
+ * lpfc_debugfs_nodelist_data - Dump target node list to a buffer.
+ * @vport: The vport to gather target node info from.
+ * @buf: The buffer to dump log into.
+ * @size: The maximum amount of data to process.
+ *
+ * Description:
+ * This routine dumps the current target node list associated with @vport to
+ * @buf up to @size bytes of data. Each node entry in the dump will contain a
+ * node state, DID, WWPN, WWNN, RPI, flags, type, and other useful fields.
+ *
+ * Return Value:
+ * This routine returns the amount of bytes that were dumped into @buf and will
+ * not exceed @size.
+ **/
 static int
 lpfc_debugfs_nodelist_data(struct lpfc_vport *vport, char *buf, int size)
 {
@@ -513,7 +598,22 @@ lpfc_debugfs_nodelist_data(struct lpfc_vport *vport, char *buf, int size)
 }
 #endif
+/**
+ * lpfc_debugfs_disc_trc - Store discovery trace log.
+ * @vport: The vport to associate this trace string with for retrieval.
+ * @mask: Log entry classification.
+ * @fmt: Format string to be displayed when dumping the log.
+ * @data1: 1st data parameter to be applied to @fmt.
+ * @data2: 2nd data parameter to be applied to @fmt.
+ * @data3: 3rd data parameter to be applied to @fmt.
+ *
+ * Description:
+ * This routine is used by the driver code to add a debugfs log entry to the
+ * discovery trace buffer associated with @vport. Only entries with a @mask that
+ * match the current debugfs discovery mask will be saved. Entries that do not
+ * match will be thrown away. @fmt, @data1, @data2, and @data3 are used like
+ * printf when displaying the log.
+ **/
 inline void
 lpfc_debugfs_disc_trc(struct lpfc_vport *vport, int mask, char *fmt,
        uint32_t data1, uint32_t data2, uint32_t data3)
@@ -542,6 +642,19 @@ lpfc_debugfs_disc_trc(struct lpfc_vport *vport, int mask, char *fmt,
        return;
 }
+/**
+ * lpfc_debugfs_slow_ring_trc - Store slow ring trace log.
+ * @phba: The phba to associate this trace string with for retrieval.
+ * @fmt: Format string to be displayed when dumping the log.
+ * @data1: 1st data parameter to be applied to @fmt.
+ * @data2: 2nd data parameter to be applied to @fmt.
+ * @data3: 3rd data parameter to be applied to @fmt.
+ *
+ * Description:
+ * This routine is used by the driver code to add a debugfs log entry to the
+ * discovery trace buffer associated with @vport. @fmt, @data1, @data2, and
+ * @data3 are used like printf when displaying the log.
+ **/
 inline void
 lpfc_debugfs_slow_ring_trc(struct lpfc_hba *phba, char *fmt,
        uint32_t data1, uint32_t data2, uint32_t data3)
@@ -568,6 +681,21 @@ lpfc_debugfs_slow_ring_trc(struct lpfc_hba *phba, char *fmt,
 }
 #ifdef CONFIG_LPFC_DEBUG_FS
+/**
+ * lpfc_debugfs_disc_trc_open - Open the discovery trace log.
+ * @inode: The inode pointer that contains a vport pointer.
+ * @file: The file pointer to attach the log output.
+ *
+ * Description:
+ * This routine is the entry point for the debugfs open file operation. It gets
+ * the vport from the i_private field in @inode, allocates the necessary buffer
+ * for the log, fills the buffer from the in-memory log for this vport, and then
+ * returns a pointer to that log in the private_data field in @file.
+ *
+ * Returns:
+ * This function returns zero if successful. On error it will return an negative
+ * error value.
+ **/
 static int
 lpfc_debugfs_disc_trc_open(struct inode *inode, struct file *file)
 {
@@ -585,7 +713,7 @@ lpfc_debugfs_disc_trc_open(struct inode *inode, struct file *file)
        if (!debug)
                goto out;
-        /* Round to page boundry */
+        /* Round to page boundary */
        size =  (lpfc_debugfs_max_disc_trc * LPFC_DEBUG_TRC_ENTRY_SIZE);
        size = PAGE_ALIGN(size);
@@ -603,6 +731,21 @@ out:
        return rc;
 }
+/**
+ * lpfc_debugfs_slow_ring_trc_open - Open the Slow Ring trace log.
+ * @inode: The inode pointer that contains a vport pointer.
+ * @file: The file pointer to attach the log output.
+ *
+ * Description:
+ * This routine is the entry point for the debugfs open file operation. It gets
+ * the vport from the i_private field in @inode, allocates the necessary buffer
+ * for the log, fills the buffer from the in-memory log for this vport, and then
+ * returns a pointer to that log in the private_data field in @file.
+ *
+ * Returns:
+ * This function returns zero if successful. On error it will return an negative
+ * error value.
+ **/
 static int
 lpfc_debugfs_slow_ring_trc_open(struct inode *inode, struct file *file)
 {
@@ -620,7 +763,7 @@ lpfc_debugfs_slow_ring_trc_open(struct inode *inode, struct file *file)
        if (!debug)
                goto out;
-        /* Round to page boundry */
+        /* Round to page boundary */
        size =  (lpfc_debugfs_max_slow_ring_trc * LPFC_DEBUG_TRC_ENTRY_SIZE);
        size = PAGE_ALIGN(size);
@@ -638,6 +781,21 @@ out:
        return rc;
 }
+/**
+ * lpfc_debugfs_hbqinfo_open - Open the hbqinfo debugfs buffer.
+ * @inode: The inode pointer that contains a vport pointer.
+ * @file: The file pointer to attach the log output.
+ *
+ * Description:
+ * This routine is the entry point for the debugfs open file operation. It gets
+ * the vport from the i_private field in @inode, allocates the necessary buffer
+ * for the log, fills the buffer from the in-memory log for this vport, and then
+ * returns a pointer to that log in the private_data field in @file.
+ *
+ * Returns:
+ * This function returns zero if successful. On error it will return an negative
+ * error value.
+ **/
 static int
 lpfc_debugfs_hbqinfo_open(struct inode *inode, struct file *file)
 {
@@ -649,7 +807,7 @@ lpfc_debugfs_hbqinfo_open(struct inode *inode, struct file *file)
        if (!debug)
                goto out;
-        /* Round to page boundry */
+        /* Round to page boundary */
        debug->buffer = kmalloc(LPFC_HBQINFO_SIZE, GFP_KERNEL);
        if (!debug->buffer) {
                kfree(debug);
@@ -665,6 +823,21 @@ out:
        return rc;
 }
+/**
+ * lpfc_debugfs_dumpHBASlim_open - Open the Dump HBA SLIM debugfs buffer.
+ * @inode: The inode pointer that contains a vport pointer.
+ * @file: The file pointer to attach the log output.
+ *
+ * Description:
+ * This routine is the entry point for the debugfs open file operation. It gets
+ * the vport from the i_private field in @inode, allocates the necessary buffer
+ * for the log, fills the buffer from the in-memory log for this vport, and then
+ * returns a pointer to that log in the private_data field in @file.
+ *
+ * Returns:
+ * This function returns zero if successful. On error it will return an negative
+ * error value.
+ **/
 static int
 lpfc_debugfs_dumpHBASlim_open(struct inode *inode, struct file *file)
 {
@@ -676,7 +849,7 @@ lpfc_debugfs_dumpHBASlim_open(struct inode *inode, struct file *file)
        if (!debug)
                goto out;
-        /* Round to page boundry */
+        /* Round to page boundary */
        debug->buffer = kmalloc(LPFC_DUMPHBASLIM_SIZE, GFP_KERNEL);
        if (!debug->buffer) {
                kfree(debug);
@@ -692,6 +865,21 @@ out:
        return rc;
 }
+/**
+ * lpfc_debugfs_dumpHostSlim_open - Open the Dump Host SLIM debugfs buffer.
+ * @inode: The inode pointer that contains a vport pointer.
+ * @file: The file pointer to attach the log output.
+ *
+ * Description:
+ * This routine is the entry point for the debugfs open file operation. It gets
+ * the vport from the i_private field in @inode, allocates the necessary buffer
+ * for the log, fills the buffer from the in-memory log for this vport, and then
+ * returns a pointer to that log in the private_data field in @file.
+ *
+ * Returns:
+ * This function returns zero if successful. On error it will return an negative
+ * error value.
+ **/
 static int
 lpfc_debugfs_dumpHostSlim_open(struct inode *inode, struct file *file)
 {
@@ -703,7 +891,7 @@ lpfc_debugfs_dumpHostSlim_open(struct inode *inode, struct file *file)
        if (!debug)
                goto out;
-        /* Round to page boundry */
+        /* Round to page boundary */
        debug->buffer = kmalloc(LPFC_DUMPHOSTSLIM_SIZE, GFP_KERNEL);
        if (!debug->buffer) {
                kfree(debug);
@@ -719,6 +907,21 @@ out:
        return rc;
 }
+/**
+ * lpfc_debugfs_nodelist_open - Open the nodelist debugfs file.
+ * @inode: The inode pointer that contains a vport pointer.
+ * @file: The file pointer to attach the log output.
+ *
+ * Description:
+ * This routine is the entry point for the debugfs open file operation. It gets
+ * the vport from the i_private field in @inode, allocates the necessary buffer
+ * for the log, fills the buffer from the in-memory log for this vport, and then
+ * returns a pointer to that log in the private_data field in @file.
+ *
+ * Returns:
+ * This function returns zero if successful. On error it will return an negative
+ * error value.
+ **/
 static int
 lpfc_debugfs_nodelist_open(struct inode *inode, struct file *file)
 {
@@ -730,7 +933,7 @@ lpfc_debugfs_nodelist_open(struct inode *inode, struct file *file)
        if (!debug)
                goto out;
-        /* Round to page boundry */
+        /* Round to page boundary */
        debug->buffer = kmalloc(LPFC_NODELIST_SIZE, GFP_KERNEL);
        if (!debug->buffer) {
                kfree(debug);
@@ -746,6 +949,23 @@ out:
        return rc;
 }
+/**
+ * lpfc_debugfs_lseek - Seek through a debugfs file.
+ * @file: The file pointer to seek through.
+ * @off: The offset to seek to or the amount to seek by.
+ * @whence: Indicates how to seek.
+ *
+ * Description:
+ * This routine is the entry point for the debugfs lseek file operation. The
+ * @whence parameter indicates whether @off is the offset to directly seek to,
+ * or if it is a value to seek forward or reverse by. This function figures out
+ * what the new offset of the debugfs file will be and assigns that value to the
+ * f_pos field of @file.
+ *
+ * Returns:
+ * This function returns the new offset if successful and returns a negative
+ * error if unable to process the seek.
+ **/
 static loff_t
 lpfc_debugfs_lseek(struct file *file, loff_t off, int whence)
 {
@@ -767,6 +987,22 @@ lpfc_debugfs_lseek(struct file *file, loff_t off, int whence)
        return (pos < 0 || pos > debug->len) ? -EINVAL : (file->f_pos = pos);
 }
+/**
+ * lpfc_debugfs_read - Read a debugfs file.
+ * @file: The file pointer to read from.
+ * @buf: The buffer to copy the data to.
+ * @nbytes: The number of bytes to read.
+ * @ppos: The position in the file to start reading from.
+ *
+ * Description:
+ * This routine reads data from from the buffer indicated in the private_data
+ * field of @file. It will start reading at @ppos and copy up to @nbytes of
+ * data to @buf.
+ *
+ * Returns:
+ * This function returns the amount of data that was read (this could be less
+ * than @nbytes if the end of the file was reached) or a negative error value.
+ **/
 static ssize_t
 lpfc_debugfs_read(struct file *file, char __user *buf,
                  size_t nbytes, loff_t *ppos)
@@ -776,6 +1012,18 @@ lpfc_debugfs_read(struct file *file, char __user *buf,
                                       debug->len);
 }
+/**
+ * lpfc_debugfs_release - Release the buffer used to store debugfs file data.
+ * @inode: The inode pointer that contains a vport pointer. (unused)
+ * @file: The file pointer that contains the buffer to release.
+ *
+ * Description:
+ * This routine frees the buffer that was allocated when the debugfs file was
+ * opened.
+ *
+ * Returns:
+ * This function returns zero.
+ **/
 static int
 lpfc_debugfs_release(struct inode *inode, struct file *file)
 {
@@ -845,6 +1093,16 @@ static struct dentry *lpfc_debugfs_root = NULL;
 static atomic_t lpfc_debugfs_hba_count;
 #endif
+/**
+ * lpfc_debugfs_initialize - Initialize debugfs for a vport.
+ * @vport: The vport pointer to initialize.
+ *
+ * Description:
+ * When Debugfs is configured this routine sets up the lpfc debugfs file system.
+ * If not already created, this routine will create the lpfc directory, and
+ * lpfcX directory (for this HBA), and vportX directory for this vport. It will
+ * also create each file used to access lpfc specific debugfs information.
+ **/
 inline void
 lpfc_debugfs_initialize(struct lpfc_vport *vport)
 {
@@ -862,7 +1120,7 @@ lpfc_debugfs_initialize(struct lpfc_vport *vport)
                atomic_set(&lpfc_debugfs_hba_count, 0);
                if (!lpfc_debugfs_root) {
                        lpfc_printf_vlog(vport, KERN_ERR, LOG_INIT,
-                                         "0409 Cannot create debugfs root\n");
+                                         "0408 Cannot create debugfs root\n");
                        goto debug_failed;
                }
        }
@@ -876,7 +1134,7 @@ lpfc_debugfs_initialize(struct lpfc_vport *vport)
                        debugfs_create_dir(name, lpfc_debugfs_root);
                if (!phba->hba_debugfs_root) {
                        lpfc_printf_vlog(vport, KERN_ERR, LOG_INIT,
-                                         "0409 Cannot create debugfs hba\n");
+                                         "0412 Cannot create debugfs hba\n");
                        goto debug_failed;
                }
                atomic_inc(&lpfc_debugfs_hba_count);
@@ -890,7 +1148,7 @@ lpfc_debugfs_initialize(struct lpfc_vport *vport)
                                 phba, &lpfc_debugfs_op_hbqinfo);
                if (!phba->debug_hbqinfo) {
                        lpfc_printf_vlog(vport, KERN_ERR, LOG_INIT,
-                                "0409 Cannot create debugfs hbqinfo\n");
+                                "0411 Cannot create debugfs hbqinfo\n");
                        goto debug_failed;
                }
@@ -902,7 +1160,7 @@ lpfc_debugfs_initialize(struct lpfc_vport *vport)
                                 phba, &lpfc_debugfs_op_dumpHBASlim);
                if (!phba->debug_dumpHBASlim) {
                        lpfc_printf_vlog(vport, KERN_ERR, LOG_INIT,
-                                "0409 Cannot create debugfs dumpHBASlim\n");
+                                "0413 Cannot create debugfs dumpHBASlim\n");
                        goto debug_failed;
                }
@@ -914,7 +1172,7 @@ lpfc_debugfs_initialize(struct lpfc_vport *vport)
                                 phba, &lpfc_debugfs_op_dumpHostSlim);
                if (!phba->debug_dumpHostSlim) {
                        lpfc_printf_vlog(vport, KERN_ERR, LOG_INIT,
-                                "0409 Cannot create debugfs dumpHostSlim\n");
+                                "0414 Cannot create debugfs dumpHostSlim\n");
                        goto debug_failed;
                }
@@ -944,7 +1202,7 @@ lpfc_debugfs_initialize(struct lpfc_vport *vport)
                                 phba, &lpfc_debugfs_op_slow_ring_trc);
                if (!phba->debug_slow_ring_trc) {
                        lpfc_printf_vlog(vport, KERN_ERR, LOG_INIT,
-                                         "0409 Cannot create debugfs "
+                                         "0415 Cannot create debugfs "
                                         "slow_ring_trace\n");
                        goto debug_failed;
                }
@@ -955,7 +1213,7 @@ lpfc_debugfs_initialize(struct lpfc_vport *vport)
                                GFP_KERNEL);
                        if (!phba->slow_ring_trc) {
                                lpfc_printf_vlog(vport, KERN_ERR, LOG_INIT,
-                                                 "0409 Cannot create debugfs "
+                                                 "0416 Cannot create debugfs "
                                                 "slow_ring buffer\n");
                                goto debug_failed;
                        }
@@ -972,7 +1230,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,
-                                         "0409 Cant create debugfs");
+                                         "0417 Cant create debugfs");
                        goto debug_failed;
                }
                atomic_inc(&phba->debugfs_vport_count);
@@ -1001,7 +1259,7 @@ lpfc_debugfs_initialize(struct lpfc_vport *vport)
        if (!vport->disc_trc) {
                lpfc_printf_vlog(vport, KERN_ERR, LOG_INIT,
-                                 "0409 Cannot create debugfs disc trace "
+                                 "0418 Cannot create debugfs disc trace "
                                 "buffer\n");
                goto debug_failed;
        }
@@ -1014,7 +1272,7 @@ lpfc_debugfs_initialize(struct lpfc_vport *vport)
                                 vport, &lpfc_debugfs_op_disc_trc);
        if (!vport->debug_disc_trc) {
                lpfc_printf_vlog(vport, KERN_ERR, LOG_INIT,
-                                 "0409 Cannot create debugfs "
+                                 "0419 Cannot create debugfs "
                                 "discovery_trace\n");
                goto debug_failed;
        }
@@ -1033,7 +1291,17 @@ debug_failed:
 #endif
 }
+/**
+ * lpfc_debugfs_terminate -  Tear down debugfs infrastructure for this vport.
+ * @vport: The vport pointer to remove from debugfs.
+ *
+ * Description:
+ * When Debugfs is configured this routine removes debugfs file system elements
+ * that are specific to this vport. It also checks to see if there are any
+ * users left for the debugfs directories associated with the HBA and driver. If
+ * this is the last user of the HBA directory or driver directory then it will
+ * remove those from the debugfs infrastructure as well.
+ **/
 inline void
 lpfc_debugfs_terminate(struct lpfc_vport *vport)
 {
@@ -1096,5 +1364,3 @@ lpfc_debugfs_terminate(struct lpfc_vport *vport)
 #endif
        return;
 }
diff --git a/drivers/scsi/lpfc/lpfc_disc.h b/drivers/scsi/lpfc/lpfc_disc.h
index 2db0b74b6fad..f29e548a90d1 100644
--- a/drivers/scsi/lpfc/lpfc_disc.h
+++ b/drivers/scsi/lpfc/lpfc_disc.h
@@ -37,6 +37,7 @@ enum lpfc_work_type {
        LPFC_EVT_KILL,
        LPFC_EVT_ELS_RETRY,
        LPFC_EVT_DEV_LOSS,
+        LPFC_EVT_FASTPATH_MGMT_EVT,
 };
 /* structure used to queue event to the discovery tasklet */
@@ -47,6 +48,24 @@ struct lpfc_work_evt {
        enum lpfc_work_type   evt;
 };
+struct lpfc_scsi_check_condition_event;
+struct lpfc_scsi_varqueuedepth_event;
+struct lpfc_scsi_event_header;
+struct lpfc_fabric_event_header;
+struct lpfc_fcprdchkerr_event;
+/* structure used for sending events from fast path */
+struct lpfc_fast_path_event {
+        struct lpfc_work_evt work_evt;
+        struct lpfc_vport     *vport;
+        union {
+                struct lpfc_scsi_check_condition_event check_cond_evt;
+                struct lpfc_scsi_varqueuedepth_event queue_depth_evt;
+                struct lpfc_scsi_event_header scsi_evt;
+                struct lpfc_fabric_event_header fabric_evt;
+                struct lpfc_fcprdchkerr_event read_check_error;
+        } un;
+};
 struct lpfc_nodelist {
        struct list_head nlp_listp;
@@ -88,6 +107,10 @@ struct lpfc_nodelist {
        unsigned long last_ramp_up_time;        /* jiffy of last ramp up */
        unsigned long last_q_full_time;         /* jiffy of last queue full */
        struct kref     kref;
+        atomic_t cmd_pending;
+        uint32_t cmd_qdepth;
+        unsigned long last_change_time;
+        struct lpfc_scsicmd_bkt *lat_data;      /* Latency data */
 };
 /* Defines for nlp_flag (uint32) */
diff --git a/drivers/scsi/lpfc/lpfc_els.c b/drivers/scsi/lpfc/lpfc_els.c
index f54e0f7eaee3..630bd28fb997 100644
--- a/drivers/scsi/lpfc/lpfc_els.c
+++ b/drivers/scsi/lpfc/lpfc_els.c
@@ -30,6 +30,7 @@
 #include "lpfc_hw.h"
 #include "lpfc_sli.h"
+#include "lpfc_nl.h"
 #include "lpfc_disc.h"
 #include "lpfc_scsi.h"
 #include "lpfc.h"
@@ -53,6 +54,28 @@ static void lpfc_register_new_vport(struct lpfc_hba *phba,
 static int lpfc_max_els_tries = 3;
+/**
+ * lpfc_els_chk_latt: Check host link attention event for a vport.
+ * @vport: pointer to a host virtual N_Port data structure.
+ *
+ * This routine checks whether there is an outstanding host link
+ * attention event during the discovery process with the @vport. It is done
+ * by reading the HBA's Host Attention (HA) register. If there is any host
+ * link attention events during this @vport's discovery process, the @vport
+ * shall be marked as FC_ABORT_DISCOVERY, a host link attention clear shall
+ * be issued if the link state is not already in host link cleared state,
+ * and a return code shall indicate whether the host link attention event
+ * had happened.
+ *
+ * Note that, if either the host link is in state LPFC_LINK_DOWN or @vport
+ * state in LPFC_VPORT_READY, the request for checking host link attention
+ * event will be ignored and a return code shall indicate no host link
+ * attention event had happened.
+ *
+ * Return codes
+ *   0 - no host link attention event happened
+ *   1 - host link attention event happened
+ **/
 int
 lpfc_els_chk_latt(struct lpfc_vport *vport)
 {
@@ -92,6 +115,34 @@ lpfc_els_chk_latt(struct lpfc_vport *vport)
        return 1;
 }
+/**
+ * lpfc_prep_els_iocb: Allocate and prepare a lpfc iocb data structure.
+ * @vport: pointer to a host virtual N_Port data structure.
+ * @expectRsp: flag indicating whether response is expected.
+ * @cmdSize: size of the ELS command.
+ * @retry: number of retries to the command IOCB when it fails.
+ * @ndlp: pointer to a node-list data structure.
+ * @did: destination identifier.
+ * @elscmd: the ELS command code.
+ *
+ * This routine is used for allocating a lpfc-IOCB data structure from
+ * the driver lpfc-IOCB free-list and prepare the IOCB with the parameters
+ * passed into the routine for discovery state machine to issue an Extended
+ * Link Service (ELS) commands. It is a generic lpfc-IOCB allocation
+ * and preparation routine that is used by all the discovery state machine
+ * routines and the ELS command-specific fields will be later set up by
+ * the individual discovery machine routines after calling this routine
+ * allocating and preparing a generic IOCB data structure. It fills in the
+ * Buffer Descriptor Entries (BDEs), allocates buffers for both command
+ * payload and response payload (if expected). The reference count on the
+ * ndlp is incremented by 1 and the reference to the ndlp is put into
+ * context1 of the IOCB data structure for this IOCB to hold the ndlp
+ * reference for the command's callback function to access later.
+ *
+ * Return code
+ *   Pointer to the newly allocated/prepared els iocb data structure
+ *   NULL - when els iocb data structure allocation/preparation failed
+ **/
 static struct lpfc_iocbq *
 lpfc_prep_els_iocb(struct lpfc_vport *vport, uint8_t expectRsp,
                   uint16_t cmdSize, uint8_t retry,
@@ -150,7 +201,7 @@ lpfc_prep_els_iocb(struct lpfc_vport *vport, uint8_t expectRsp,
        icmd->un.elsreq64.bdl.addrHigh = putPaddrHigh(pbuflist->phys);
        icmd->un.elsreq64.bdl.addrLow = putPaddrLow(pbuflist->phys);
-        icmd->un.elsreq64.bdl.bdeFlags = BUFF_TYPE_BDL;
+        icmd->un.elsreq64.bdl.bdeFlags = BUFF_TYPE_BLP_64;
        icmd->un.elsreq64.remoteID = did;       /* DID */
        if (expectRsp) {
                icmd->un.elsreq64.bdl.bdeSize = (2 * sizeof(struct ulp_bde64));
@@ -185,7 +236,7 @@ lpfc_prep_els_iocb(struct lpfc_vport *vport, uint8_t expectRsp,
                bpl->addrLow = le32_to_cpu(putPaddrLow(prsp->phys));
                bpl->addrHigh = le32_to_cpu(putPaddrHigh(prsp->phys));
                bpl->tus.f.bdeSize = FCELSSIZE;
-                bpl->tus.f.bdeFlags = BUFF_USE_RCV;
+                bpl->tus.f.bdeFlags = BUFF_TYPE_BDE_64;
                bpl->tus.w = le32_to_cpu(bpl->tus.w);
        }
@@ -233,6 +284,22 @@ els_iocb_free_pcmb_exit:
        return NULL;
 }
+/**
+ * lpfc_issue_fabric_reglogin: Issue fabric registration login for a vport.
+ * @vport: pointer to a host virtual N_Port data structure.
+ *
+ * This routine issues a fabric registration login for a @vport. An
+ * active ndlp node with Fabric_DID must already exist for this @vport.
+ * The routine invokes two mailbox commands to carry out fabric registration
+ * login through the HBA firmware: the first mailbox command requests the
+ * HBA to perform link configuration for the @vport; and the second mailbox
+ * command requests the HBA to perform the actual fabric registration login
+ * with the @vport.
+ *
+ * Return code
+ *   0 - successfully issued fabric registration login for @vport
+ *   -ENXIO -- failed to issue fabric registration login for @vport
+ **/
 static int
 lpfc_issue_fabric_reglogin(struct lpfc_vport *vport)
 {
@@ -313,6 +380,26 @@ fail:
        return -ENXIO;
 }
+/**
+ * lpfc_cmpl_els_flogi_fabric: Completion function for flogi to a fabric port.
+ * @vport: pointer to a host virtual N_Port data structure.
+ * @ndlp: pointer to a node-list data structure.
+ * @sp: pointer to service parameter data structure.
+ * @irsp: pointer to the IOCB within the lpfc response IOCB.
+ *
+ * This routine is invoked by the lpfc_cmpl_els_flogi() completion callback
+ * function to handle the completion of a Fabric Login (FLOGI) into a fabric
+ * port in a fabric topology. It properly sets up the parameters to the @ndlp
+ * from the IOCB response. It also check the newly assigned N_Port ID to the
+ * @vport against the previously assigned N_Port ID. If it is different from
+ * the previously assigned Destination ID (DID), the lpfc_unreg_rpi() routine
+ * is invoked on all the remaining nodes with the @vport to unregister the
+ * Remote Port Indicators (RPIs). Finally, the lpfc_issue_fabric_reglogin()
+ * is invoked to register login to the fabric.
+ *
+ * Return code
+ *   0 - Success (currently, always return 0)
+ **/
 static int
 lpfc_cmpl_els_flogi_fabric(struct lpfc_vport *vport, struct lpfc_nodelist *ndlp,
                           struct serv_parm *sp, IOCB_t *irsp)
@@ -387,7 +474,7 @@ lpfc_cmpl_els_flogi_fabric(struct lpfc_vport *vport, struct lpfc_nodelist *ndlp,
                 */
                list_for_each_entry_safe(np, next_np,
                                        &vport->fc_nodes, nlp_listp) {
-                        if (!NLP_CHK_NODE_ACT(ndlp))
+                        if (!NLP_CHK_NODE_ACT(np))
                                continue;
                        if ((np->nlp_state != NLP_STE_NPR_NODE) ||
                                   !(np->nlp_flag & NLP_NPR_ADISC))
@@ -416,9 +503,26 @@ lpfc_cmpl_els_flogi_fabric(struct lpfc_vport *vport, struct lpfc_nodelist *ndlp,
        return 0;
 }
-/*
+/**
- * We FLOGIed into an NPort, initiate pt2pt protocol
+ * lpfc_cmpl_els_flogi_nport: Completion function for flogi to an N_Port.
- */
+ * @vport: pointer to a host virtual N_Port data structure.
+ * @ndlp: pointer to a node-list data structure.
+ * @sp: pointer to service parameter data structure.
+ *
+ * This routine is invoked by the lpfc_cmpl_els_flogi() completion callback
+ * function to handle the completion of a Fabric Login (FLOGI) into an N_Port
+ * in a point-to-point topology. First, the @vport's N_Port Name is compared
+ * with the received N_Port Name: if the @vport's N_Port Name is greater than
+ * the received N_Port Name lexicographically, this node shall assign local
+ * N_Port ID (PT2PT_LocalID: 1) and remote N_Port ID (PT2PT_RemoteID: 2) and
+ * will send out Port Login (PLOGI) with the N_Port IDs assigned. Otherwise,
+ * this node shall just wait for the remote node to issue PLOGI and assign
+ * N_Port IDs.
+ *
+ * Return code
+ *   0 - Success
+ *   -ENXIO - Fail
+ **/
 static int
 lpfc_cmpl_els_flogi_nport(struct lpfc_vport *vport, struct lpfc_nodelist *ndlp,
                          struct serv_parm *sp)
@@ -516,6 +620,29 @@ fail:
        return -ENXIO;
 }
+/**
+ * lpfc_cmpl_els_flogi: Completion callback function for flogi.
+ * @phba: pointer to lpfc hba data structure.
+ * @cmdiocb: pointer to lpfc command iocb data structure.
+ * @rspiocb: pointer to lpfc response iocb data structure.
+ *
+ * This routine is the top-level completion callback function for issuing
+ * a Fabric Login (FLOGI) command. If the response IOCB reported error,
+ * the lpfc_els_retry() routine shall be invoked to retry the FLOGI. If
+ * retry has been made (either immediately or delayed with lpfc_els_retry()
+ * returning 1), the command IOCB will be released and function returned.
+ * If the retry attempt has been given up (possibly reach the maximum
+ * number of retries), one additional decrement of ndlp reference shall be
+ * invoked before going out after releasing the command IOCB. This will
+ * actually release the remote node (Note, lpfc_els_free_iocb() will also
+ * invoke one decrement of ndlp reference count). If no error reported in
+ * the IOCB status, the command Port ID field is used to determine whether
+ * this is a point-to-point topology or a fabric topology: if the Port ID
+ * field is assigned, it is a fabric topology; otherwise, it is a
+ * point-to-point topology. The routine lpfc_cmpl_els_flogi_fabric() or
+ * lpfc_cmpl_els_flogi_nport() shall be invoked accordingly to handle the
+ * specific topology completion conditions.
+ **/
 static void
 lpfc_cmpl_els_flogi(struct lpfc_hba *phba, struct lpfc_iocbq *cmdiocb,
                    struct lpfc_iocbq *rspiocb)
@@ -618,6 +745,28 @@ out:
        lpfc_els_free_iocb(phba, cmdiocb);
 }
+/**
+ * lpfc_issue_els_flogi: Issue an flogi iocb command for a vport.
+ * @vport: pointer to a host virtual N_Port data structure.
+ * @ndlp: pointer to a node-list data structure.
+ * @retry: number of retries to the command IOCB.
+ *
+ * This routine issues a Fabric Login (FLOGI) Request ELS command
+ * for a @vport. The initiator service parameters are put into the payload
+ * of the FLOGI Request IOCB and the top-level callback function pointer
+ * to lpfc_cmpl_els_flogi() routine is put to the IOCB completion callback
+ * function field. The lpfc_issue_fabric_iocb routine is invoked to send
+ * out FLOGI ELS command with one outstanding fabric IOCB at a time.
+ *
+ * Note that, in lpfc_prep_els_iocb() routine, the reference count of ndlp
+ * will be incremented by 1 for holding the ndlp and the reference to ndlp
+ * will be stored into the context1 field of the IOCB for the completion
+ * callback function to the FLOGI ELS command.
+ *
+ * Return code
+ *   0 - successfully issued flogi iocb for @vport
+ *   1 - failed to issue flogi iocb for @vport
+ **/
 static int
 lpfc_issue_els_flogi(struct lpfc_vport *vport, struct lpfc_nodelist *ndlp,
                     uint8_t retry)
@@ -694,6 +843,20 @@ lpfc_issue_els_flogi(struct lpfc_vport *vport, struct lpfc_nodelist *ndlp,
        return 0;
 }
+/**
+ * lpfc_els_abort_flogi: Abort all outstanding flogi iocbs.
+ * @phba: pointer to lpfc hba data structure.
+ *
+ * This routine aborts all the outstanding Fabric Login (FLOGI) IOCBs
+ * with a @phba. This routine walks all the outstanding IOCBs on the txcmplq
+ * list and issues an abort IOCB commond on each outstanding IOCB that
+ * contains a active Fabric_DID ndlp. Note that this function is to issue
+ * the abort IOCB command on all the outstanding IOCBs, thus when this
+ * function returns, it does not guarantee all the IOCBs are actually aborted.
+ *
+ * Return code
+ *   0 - Sucessfully issued abort iocb on all outstanding flogis (Always 0)
+ **/
 int
 lpfc_els_abort_flogi(struct lpfc_hba *phba)
 {
@@ -729,6 +892,22 @@ lpfc_els_abort_flogi(struct lpfc_hba *phba)
        return 0;
 }
+/**
+ * lpfc_initial_flogi: Issue an initial fabric login for a vport.
+ * @vport: pointer to a host virtual N_Port data structure.
+ *
+ * This routine issues an initial Fabric Login (FLOGI) for the @vport
+ * specified. It first searches the ndlp with the Fabric_DID (0xfffffe) from
+ * the @vport's ndlp list. If no such ndlp found, it will create an ndlp and
+ * put it into the @vport's ndlp list. If an inactive ndlp found on the list,
+ * it will just be enabled and made active. The lpfc_issue_els_flogi() routine
+ * is then invoked with the @vport and the ndlp to perform the FLOGI for the
+ * @vport.
+ *
+ * Return code
+ *   0 - failed to issue initial flogi for @vport
+ *   1 - successfully issued initial flogi for @vport
+ **/
 int
 lpfc_initial_flogi(struct lpfc_vport *vport)
 {
@@ -764,6 +943,22 @@ lpfc_initial_flogi(struct lpfc_vport *vport)
        return 1;
 }
+/**
+ * lpfc_initial_fdisc: Issue an initial fabric discovery for a vport.
+ * @vport: pointer to a host virtual N_Port data structure.
+ *
+ * This routine issues an initial Fabric Discover (FDISC) for the @vport
+ * specified. It first searches the ndlp with the Fabric_DID (0xfffffe) from
+ * the @vport's ndlp list. If no such ndlp found, it will create an ndlp and
+ * put it into the @vport's ndlp list. If an inactive ndlp found on the list,
+ * it will just be enabled and made active. The lpfc_issue_els_fdisc() routine
+ * is then invoked with the @vport and the ndlp to perform the FDISC for the
+ * @vport.
+ *
+ * Return code
+ *   0 - failed to issue initial fdisc for @vport
+ *   1 - successfully issued initial fdisc for @vport
+ **/
 int
 lpfc_initial_fdisc(struct lpfc_vport *vport)
 {
@@ -797,6 +992,17 @@ lpfc_initial_fdisc(struct lpfc_vport *vport)
        return 1;
 }
+/**
+ * lpfc_more_plogi: Check and issue remaining plogis for a vport.
+ * @vport: pointer to a host virtual N_Port data structure.
+ *
+ * This routine checks whether there are more remaining Port Logins
+ * (PLOGI) to be issued for the @vport. If so, it will invoke the routine
+ * lpfc_els_disc_plogi() to go through the Node Port Recovery (NPR) nodes
+ * to issue ELS PLOGIs up to the configured discover threads with the
+ * @vport (@vport->cfg_discovery_threads). The function also decrement
+ * the @vport's num_disc_node by 1 if it is not already 0.
+ **/
 void
 lpfc_more_plogi(struct lpfc_vport *vport)
 {
@@ -819,6 +1025,37 @@ lpfc_more_plogi(struct lpfc_vport *vport)
        return;
 }
+/**
+ * lpfc_plogi_confirm_nport: Confirm pologi wwpn matches stored ndlp.
+ * @phba: pointer to lpfc hba data structure.
+ * @prsp: pointer to response IOCB payload.
+ * @ndlp: pointer to a node-list data structure.
+ *
+ * This routine checks and indicates whether the WWPN of an N_Port, retrieved
+ * from a PLOGI, matches the WWPN that is stored in the @ndlp for that N_POrt.
+ * The following cases are considered N_Port confirmed:
+ * 1) The N_Port is a Fabric ndlp; 2) The @ndlp is on vport list and matches
+ * the WWPN of the N_Port logged into; 3) The @ndlp is not on vport list but
+ * it does not have WWPN assigned either. If the WWPN is confirmed, the
+ * pointer to the @ndlp will be returned. If the WWPN is not confirmed:
+ * 1) if there is a node on vport list other than the @ndlp with the same
+ * WWPN of the N_Port PLOGI logged into, the lpfc_unreg_rpi() will be invoked
+ * on that node to release the RPI associated with the node; 2) if there is
+ * no node found on vport list with the same WWPN of the N_Port PLOGI logged
+ * into, a new node shall be allocated (or activated). In either case, the
+ * parameters of the @ndlp shall be copied to the new_ndlp, the @ndlp shall
+ * be released and the new_ndlp shall be put on to the vport node list and
+ * its pointer returned as the confirmed node.
+ *
+ * Note that before the @ndlp got "released", the keepDID from not-matching
+ * or inactive "new_ndlp" on the vport node list is assigned to the nlp_DID
+ * of the @ndlp. This is because the release of @ndlp is actually to put it
+ * into an inactive state on the vport node list and the vport node list
+ * management algorithm does not allow two node with a same DID.
+ *
+ * Return code
+ *   pointer to the PLOGI N_Port @ndlp
+ **/
 static struct lpfc_nodelist *
 lpfc_plogi_confirm_nport(struct lpfc_hba *phba, uint32_t *prsp,
                         struct lpfc_nodelist *ndlp)
@@ -922,6 +1159,17 @@ lpfc_plogi_confirm_nport(struct lpfc_hba *phba, uint32_t *prsp,
        return new_ndlp;
 }
+/**
+ * lpfc_end_rscn: Check and handle more rscn for a vport.
+ * @vport: pointer to a host virtual N_Port data structure.
+ *
+ * This routine checks whether more Registration State Change
+ * Notifications (RSCNs) came in while the discovery state machine was in
+ * the FC_RSCN_MODE. If so, the lpfc_els_handle_rscn() routine will be
+ * invoked to handle the additional RSCNs for the @vport. Otherwise, the
+ * FC_RSCN_MODE bit will be cleared with the @vport to mark as the end of
+ * handling the RSCNs.
+ **/
 void
 lpfc_end_rscn(struct lpfc_vport *vport)
 {
@@ -943,6 +1191,26 @@ lpfc_end_rscn(struct lpfc_vport *vport)
        }
 }
+/**
+ * lpfc_cmpl_els_plogi: Completion callback function for plogi.
+ * @phba: pointer to lpfc hba data structure.
+ * @cmdiocb: pointer to lpfc command iocb data structure.
+ * @rspiocb: pointer to lpfc response iocb data structure.
+ *
+ * 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
+ * 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.
+ * Otherwise, the lpfc_plogi_confirm_nport() routine shall be invoked on
+ * the ndlp and the NLP_EVT_CMPL_PLOGI state to the Discover State Machine
+ * (DSM) is set for this PLOGI completion. Finally, it checks whether
+ * there are additional N_Port nodes with the vport that need to perform
+ * PLOGI. If so, the lpfc_more_plogi() routine is invoked to issue addition
+ * PLOGIs.
+ **/
 static void
 lpfc_cmpl_els_plogi(struct lpfc_hba *phba, struct lpfc_iocbq *cmdiocb,
                    struct lpfc_iocbq *rspiocb)
@@ -1048,6 +1316,27 @@ out:
        return;
 }
+/**
+ * lpfc_issue_els_plogi: Issue an plogi iocb command for a vport.
+ * @vport: pointer to a host virtual N_Port data structure.
+ * @did: destination port identifier.
+ * @retry: number of retries to the command IOCB.
+ *
+ * This routine issues a Port Login (PLOGI) command to a remote N_Port
+ * (with the @did) for a @vport. Before issuing a PLOGI to a remote N_Port,
+ * the ndlp with the remote N_Port DID must exist on the @vport's ndlp list.
+ * This routine constructs the proper feilds of the PLOGI IOCB and invokes
+ * the lpfc_sli_issue_iocb() routine to send out PLOGI ELS command.
+ *
+ * Note that, in lpfc_prep_els_iocb() routine, the reference count of ndlp
+ * will be incremented by 1 for holding the ndlp and the reference to ndlp
+ * will be stored into the context1 field of the IOCB for the completion
+ * callback function to the PLOGI ELS command.
+ *
+ * Return code
+ *   0 - Successfully issued a plogi for @vport
+ *   1 - failed to issue a plogi for @vport
+ **/
 int
 lpfc_issue_els_plogi(struct lpfc_vport *vport, uint32_t did, uint8_t retry)
 {
@@ -1106,6 +1395,19 @@ lpfc_issue_els_plogi(struct lpfc_vport *vport, uint32_t did, uint8_t retry)
        return 0;
 }
+/**
+ * lpfc_cmpl_els_prli: Completion callback function for prli.
+ * @phba: pointer to lpfc hba data structure.
+ * @cmdiocb: pointer to lpfc command iocb data structure.
+ * @rspiocb: pointer to lpfc response iocb data structure.
+ *
+ * This routine is the completion callback function for a Process Login
+ * (PRLI) ELS command. The PRLI response IOCB status is checked for error
+ * status. If there is error status reported, PRLI retry shall be attempted
+ * by invoking the lpfc_els_retry() routine. Otherwise, the state
+ * NLP_EVT_CMPL_PRLI is sent to the Discover State Machine (DSM) for this
+ * ndlp to mark the PRLI completion.
+ **/
 static void
 lpfc_cmpl_els_prli(struct lpfc_hba *phba, struct lpfc_iocbq *cmdiocb,
                   struct lpfc_iocbq *rspiocb)
@@ -1164,6 +1466,27 @@ out:
        return;
 }
+/**
+ * lpfc_issue_els_prli: Issue a prli iocb command for a vport.
+ * @vport: pointer to a host virtual N_Port data structure.
+ * @ndlp: pointer to a node-list data structure.
+ * @retry: number of retries to the command IOCB.
+ *
+ * This routine issues a Process Login (PRLI) ELS command for the
+ * @vport. The PRLI service parameters are set up in the payload of the
+ * PRLI Request command and the pointer to lpfc_cmpl_els_prli() routine
+ * is put to the IOCB completion callback func field before invoking the
+ * routine lpfc_sli_issue_iocb() to send out PRLI command.
+ *
+ * Note that, in lpfc_prep_els_iocb() routine, the reference count of ndlp
+ * will be incremented by 1 for holding the ndlp and the reference to ndlp
+ * will be stored into the context1 field of the IOCB for the completion
+ * callback function to the PRLI ELS command.
+ *
+ * Return code
+ *   0 - successfully issued prli iocb command for @vport
+ *   1 - failed to issue prli iocb command for @vport
+ **/
 int
 lpfc_issue_els_prli(struct lpfc_vport *vport, struct lpfc_nodelist *ndlp,
                    uint8_t retry)
@@ -1233,6 +1556,92 @@ lpfc_issue_els_prli(struct lpfc_vport *vport, struct lpfc_nodelist *ndlp,
        return 0;
 }
+/**
+ * lpfc_rscn_disc: Perform rscn discovery for a vport.
+ * @vport: pointer to a host virtual N_Port data structure.
+ *
+ * This routine performs Registration State Change Notification (RSCN)
+ * discovery for a @vport. If the @vport's node port recovery count is not
+ * zero, it will invoke the lpfc_els_disc_plogi() to perform PLOGI for all
+ * the nodes that need recovery. If none of the PLOGI were needed through
+ * the lpfc_els_disc_plogi() routine, the lpfc_end_rscn() routine shall be
+ * invoked to check and handle possible more RSCN came in during the period
+ * of processing the current ones.
+ **/
+static void
+lpfc_rscn_disc(struct lpfc_vport *vport)
+{
+        lpfc_can_disctmo(vport);
+        /* RSCN discovery */
+        /* go thru NPR nodes and issue ELS PLOGIs */
+        if (vport->fc_npr_cnt)
+                if (lpfc_els_disc_plogi(vport))
+                        return;
+        lpfc_end_rscn(vport);
+}
+/**
+ * lpfc_adisc_done: Complete the adisc phase of discovery.
+ * @vport: pointer to lpfc_vport hba data structure that finished all ADISCs.
+ *
+ * This function is called when the final ADISC is completed during discovery.
+ * This function handles clearing link attention or issuing reg_vpi depending
+ * on whether npiv is enabled. This function also kicks off the PLOGI phase of
+ * discovery.
+ * This function is called with no locks held.
+ **/
+static void
+lpfc_adisc_done(struct lpfc_vport *vport)
+{
+        struct Scsi_Host   *shost = lpfc_shost_from_vport(vport);
+        struct lpfc_hba   *phba = vport->phba;
+        /*
+         * For NPIV, cmpl_reg_vpi will set port_state to READY,
+         * and continue discovery.
+         */
+        if ((phba->sli3_options & LPFC_SLI3_NPIV_ENABLED) &&
+            !(vport->fc_flag & FC_RSCN_MODE)) {
+                lpfc_issue_reg_vpi(phba, vport);
+                return;
+        }
+        /*
+        * For SLI2, we need to set port_state to READY
+        * and continue discovery.
+        */
+        if (vport->port_state < LPFC_VPORT_READY) {
+                /* If we get here, there is nothing to ADISC */
+                if (vport->port_type == LPFC_PHYSICAL_PORT)
+                        lpfc_issue_clear_la(phba, vport);
+                if (!(vport->fc_flag & FC_ABORT_DISCOVERY)) {
+                        vport->num_disc_nodes = 0;
+                        /* go thru NPR list, issue ELS PLOGIs */
+                        if (vport->fc_npr_cnt)
+                                lpfc_els_disc_plogi(vport);
+                        if (!vport->num_disc_nodes) {
+                                spin_lock_irq(shost->host_lock);
+                                vport->fc_flag &= ~FC_NDISC_ACTIVE;
+                                spin_unlock_irq(shost->host_lock);
+                                lpfc_can_disctmo(vport);
+                                lpfc_end_rscn(vport);
+                        }
+                }
+                vport->port_state = LPFC_VPORT_READY;
+        } else
+                lpfc_rscn_disc(vport);
+}
+/**
+ * lpfc_more_adisc: Issue more adisc as needed.
+ * @vport: pointer to a host virtual N_Port data structure.
+ *
+ * This routine determines whether there are more ndlps on a @vport
+ * node list need to have Address Discover (ADISC) issued. If so, it will
+ * invoke the lpfc_els_disc_adisc() routine to issue ADISC on the @vport's
+ * remaining nodes which need to have ADISC sent.
+ **/
 void
 lpfc_more_adisc(struct lpfc_vport *vport)
 {
@@ -1252,23 +1661,27 @@ lpfc_more_adisc(struct lpfc_vport *vport)
                /* go thru NPR nodes and issue any remaining ELS ADISCs */
                sentadisc = lpfc_els_disc_adisc(vport);
        }
+        if (!vport->num_disc_nodes)
+                lpfc_adisc_done(vport);
        return;
 }
-static void
+/**
-lpfc_rscn_disc(struct lpfc_vport *vport)
+ * lpfc_cmpl_els_adisc: Completion callback function for adisc.
-{
+ * @phba: pointer to lpfc hba data structure.
-        lpfc_can_disctmo(vport);
+ * @cmdiocb: pointer to lpfc command iocb data structure.
+ * @rspiocb: pointer to lpfc response iocb data structure.
-        /* RSCN discovery */
+ *
-        /* go thru NPR nodes and issue ELS PLOGIs */
+ * This routine is the completion function for issuing the Address Discover
-        if (vport->fc_npr_cnt)
+ * (ADISC) command. It first checks to see whether link went down during
-                if (lpfc_els_disc_plogi(vport))
+ * the discovery process. If so, the node will be marked as node port
-                        return;
+ * recovery for issuing discover IOCB by the link attention handler and
+ * exit. Otherwise, the response status is checked. If error was reported
-        lpfc_end_rscn(vport);
+ * in the response status, the ADISC command shall be retried by invoking
-}
+ * the lpfc_els_retry() routine. Otherwise, if no error was reported in
+ * the response status, the state machine is invoked to set transition
+ * with respect to NLP_EVT_CMPL_ADISC event.
+ **/
 static void
 lpfc_cmpl_els_adisc(struct lpfc_hba *phba, struct lpfc_iocbq *cmdiocb,
                    struct lpfc_iocbq *rspiocb)
@@ -1333,57 +1746,34 @@ lpfc_cmpl_els_adisc(struct lpfc_hba *phba, struct lpfc_iocbq *cmdiocb,
                lpfc_disc_state_machine(vport, ndlp, cmdiocb,
                                        NLP_EVT_CMPL_ADISC);
-        if (disc && vport->num_disc_nodes) {
+        /* Check to see if there are more ADISCs to be sent */
-                /* Check to see if there are more ADISCs to be sent */
+        if (disc && vport->num_disc_nodes)
                lpfc_more_adisc(vport);
-                /* Check to see if we are done with ADISC authentication */
-                if (vport->num_disc_nodes == 0) {
-                        /* If we get here, there is nothing left to ADISC */
-                        /*
-                         * For NPIV, cmpl_reg_vpi will set port_state to READY,
-                         * and continue discovery.
-                         */
-                        if ((phba->sli3_options & LPFC_SLI3_NPIV_ENABLED) &&
-                           !(vport->fc_flag & FC_RSCN_MODE)) {
-                                lpfc_issue_reg_vpi(phba, vport);
-                                goto out;
-                        }
-                        /*
-                         * For SLI2, we need to set port_state to READY
-                         * and continue discovery.
-                         */
-                        if (vport->port_state < LPFC_VPORT_READY) {
-                                /* If we get here, there is nothing to ADISC */
-                                if (vport->port_type == LPFC_PHYSICAL_PORT)
-                                        lpfc_issue_clear_la(phba, vport);
-                                if (!(vport->fc_flag & FC_ABORT_DISCOVERY)) {
-                                        vport->num_disc_nodes = 0;
-                                        /* go thru NPR list, issue ELS PLOGIs */
-                                        if (vport->fc_npr_cnt)
-                                                lpfc_els_disc_plogi(vport);
-                                        if (!vport->num_disc_nodes) {
-                                                spin_lock_irq(shost->host_lock);
-                                                vport->fc_flag &=
-                                                        ~FC_NDISC_ACTIVE;
-                                                spin_unlock_irq(
-                                                        shost->host_lock);
-                                                lpfc_can_disctmo(vport);
-                                        }
-                                }
-                                vport->port_state = LPFC_VPORT_READY;
-                        } else {
-                                lpfc_rscn_disc(vport);
-                        }
-                }
-        }
 out:
        lpfc_els_free_iocb(phba, cmdiocb);
        return;
 }
+/**
+ * lpfc_issue_els_adisc: Issue an address discover iocb to an node on a vport.
+ * @vport: pointer to a virtual N_Port data structure.
+ * @ndlp: pointer to a node-list data structure.
+ * @retry: number of retries to the command IOCB.
+ *
+ * This routine issues an Address Discover (ADISC) for an @ndlp on a
+ * @vport. It prepares the payload of the ADISC ELS command, updates the
+ * and states of the ndlp, and invokes the lpfc_sli_issue_iocb() routine
+ * to issue the ADISC ELS command.
+ *
+ * Note that, in lpfc_prep_els_iocb() routine, the reference count of ndlp
+ * will be incremented by 1 for holding the ndlp and the reference to ndlp
+ * will be stored into the context1 field of the IOCB for the completion
+ * callback function to the ADISC ELS command.
+ *
+ * Return code
+ *   0 - successfully issued adisc
+ *   1 - failed to issue adisc
+ **/
 int
 lpfc_issue_els_adisc(struct lpfc_vport *vport, struct lpfc_nodelist *ndlp,
                     uint8_t retry)
@@ -1437,6 +1827,18 @@ lpfc_issue_els_adisc(struct lpfc_vport *vport, struct lpfc_nodelist *ndlp,
        return 0;
 }
+/**
+ * lpfc_cmpl_els_logo: Completion callback function for logo.
+ * @phba: pointer to lpfc hba data structure.
+ * @cmdiocb: pointer to lpfc command iocb data structure.
+ * @rspiocb: pointer to lpfc response iocb data structure.
+ *
+ * This routine is the completion function for issuing the ELS Logout (LOGO)
+ * command. If no error status was reported from the LOGO response, the
+ * state machine of the associated ndlp shall be invoked for transition with
+ * respect to NLP_EVT_CMPL_LOGO event. Otherwise, if error status was reported,
+ * the lpfc_els_retry() routine will be invoked to retry the LOGO command.
+ **/
 static void
 lpfc_cmpl_els_logo(struct lpfc_hba *phba, struct lpfc_iocbq *cmdiocb,
                   struct lpfc_iocbq *rspiocb)
@@ -1502,6 +1904,26 @@ out:
        return;
 }
+/**
+ * lpfc_issue_els_logo: Issue a logo to an node on a vport.
+ * @vport: pointer to a virtual N_Port data structure.
+ * @ndlp: pointer to a node-list data structure.
+ * @retry: number of retries to the command IOCB.
+ *
+ * This routine constructs and issues an ELS Logout (LOGO) iocb command
+ * to a remote node, referred by an @ndlp on a @vport. It constructs the
+ * payload of the IOCB, properly sets up the @ndlp state, and invokes the
+ * lpfc_sli_issue_iocb() routine to send out the LOGO ELS command.
+ *
+ * Note that, in lpfc_prep_els_iocb() routine, the reference count of ndlp
+ * will be incremented by 1 for holding the ndlp and the reference to ndlp
+ * will be stored into the context1 field of the IOCB for the completion
+ * callback function to the LOGO ELS command.
+ *
+ * Return code
+ *   0 - successfully issued logo
+ *   1 - failed to issue logo
+ **/
 int
 lpfc_issue_els_logo(struct lpfc_vport *vport, struct lpfc_nodelist *ndlp,
                    uint8_t retry)
@@ -1563,6 +1985,22 @@ lpfc_issue_els_logo(struct lpfc_vport *vport, struct lpfc_nodelist *ndlp,
        return 0;
 }
+/**
+ * lpfc_cmpl_els_cmd: Completion callback function for generic els command.
+ * @phba: pointer to lpfc hba data structure.
+ * @cmdiocb: pointer to lpfc command iocb data structure.
+ * @rspiocb: pointer to lpfc response iocb data structure.
+ *
+ * This routine is a generic completion callback function for ELS commands.
+ * Specifically, it is the callback function which does not need to perform
+ * any command specific operations. It is currently used by the ELS command
+ * issuing routines for the ELS State Change  Request (SCR),
+ * lpfc_issue_els_scr(), and the ELS Fibre Channel Address Resolution
+ * Protocol Response (FARPR) routine, lpfc_issue_els_farpr(). Other than
+ * certain debug loggings, this callback function simply invokes the
+ * lpfc_els_chk_latt() routine to check whether link went down during the
+ * discovery process.
+ **/
 static void
 lpfc_cmpl_els_cmd(struct lpfc_hba *phba, struct lpfc_iocbq *cmdiocb,
                  struct lpfc_iocbq *rspiocb)
@@ -1587,6 +2025,28 @@ lpfc_cmpl_els_cmd(struct lpfc_hba *phba, struct lpfc_iocbq *cmdiocb,
        return;
 }
+/**
+ * lpfc_issue_els_scr: Issue a scr to an node on a vport.
+ * @vport: pointer to a host virtual N_Port data structure.
+ * @nportid: N_Port identifier to the remote node.
+ * @retry: number of retries to the command IOCB.
+ *
+ * This routine issues a State Change Request (SCR) to a fabric node
+ * on a @vport. The remote node @nportid is passed into the function. It
+ * first search the @vport node list to find the matching ndlp. If no such
+ * ndlp is found, a new ndlp shall be created for this (SCR) purpose. An
+ * IOCB is allocated, payload prepared, and the lpfc_sli_issue_iocb()
+ * routine is invoked to send the SCR IOCB.
+ *
+ * Note that, in lpfc_prep_els_iocb() routine, the reference count of ndlp
+ * will be incremented by 1 for holding the ndlp and the reference to ndlp
+ * will be stored into the context1 field of the IOCB for the completion
+ * callback function to the SCR ELS command.
+ *
+ * Return code
+ *   0 - Successfully issued scr command
+ *   1 - Failed to issue scr command
+ **/
 int
 lpfc_issue_els_scr(struct lpfc_vport *vport, uint32_t nportid, uint8_t retry)
 {
@@ -1659,6 +2119,28 @@ lpfc_issue_els_scr(struct lpfc_vport *vport, uint32_t nportid, uint8_t retry)
        return 0;
 }
+/**
+ * lpfc_issue_els_farpr: Issue a farp to an node on a vport.
+ * @vport: pointer to a host virtual N_Port data structure.
+ * @nportid: N_Port identifier to the remote node.
+ * @retry: number of retries to the command IOCB.
+ *
+ * This routine issues a Fibre Channel Address Resolution Response
+ * (FARPR) to a node on a vport. The remote node N_Port identifier (@nportid)
+ * is passed into the function. It first search the @vport node list to find
+ * the matching ndlp. If no such ndlp is found, a new ndlp shall be created
+ * for this (FARPR) purpose. An IOCB is allocated, payload prepared, and the
+ * lpfc_sli_issue_iocb() routine is invoked to send the FARPR ELS command.
+ *
+ * Note that, in lpfc_prep_els_iocb() routine, the reference count of ndlp
+ * will be incremented by 1 for holding the ndlp and the reference to ndlp
+ * will be stored into the context1 field of the IOCB for the completion
+ * callback function to the PARPR ELS command.
+ *
+ * Return code
+ *   0 - Successfully issued farpr command
+ *   1 - Failed to issue farpr command
+ **/
 static int
 lpfc_issue_els_farpr(struct lpfc_vport *vport, uint32_t nportid, uint8_t retry)
 {
@@ -1748,6 +2230,18 @@ lpfc_issue_els_farpr(struct lpfc_vport *vport, uint32_t nportid, uint8_t retry)
        return 0;
 }
+/**
+ * lpfc_cancel_retry_delay_tmo: Cancel the timer with delayed iocb-cmd retry.
+ * @vport: pointer to a host virtual N_Port data structure.
+ * @nlp: pointer to a node-list data structure.
+ *
+ * This routine cancels the timer with a delayed IOCB-command retry for
+ * a @vport's @ndlp. It stops the timer for the delayed function retrial and
+ * removes the ELS retry event if it presents. In addition, if the
+ * NLP_NPR_2B_DISC bit is set in the @nlp's nlp_flag bitmap, ADISC IOCB
+ * commands are sent for the @vport's nodes that require issuing discovery
+ * ADISC.
+ **/
 void
 lpfc_cancel_retry_delay_tmo(struct lpfc_vport *vport, struct lpfc_nodelist *nlp)
 {
@@ -1775,25 +2269,36 @@ lpfc_cancel_retry_delay_tmo(struct lpfc_vport *vport, struct lpfc_nodelist *nlp)
                        if (vport->port_state < LPFC_VPORT_READY) {
                                /* Check if there are more ADISCs to be sent */
                                lpfc_more_adisc(vport);
-                                if ((vport->num_disc_nodes == 0) &&
-                                    (vport->fc_npr_cnt))
-                                        lpfc_els_disc_plogi(vport);
                        } else {
                                /* Check if there are more PLOGIs to be sent */
                                lpfc_more_plogi(vport);
-                        }
+                                if (vport->num_disc_nodes == 0) {
-                        if (vport->num_disc_nodes == 0) {
+                                        spin_lock_irq(shost->host_lock);
-                                spin_lock_irq(shost->host_lock);
+                                        vport->fc_flag &= ~FC_NDISC_ACTIVE;
-                                vport->fc_flag &= ~FC_NDISC_ACTIVE;
+                                        spin_unlock_irq(shost->host_lock);
-                                spin_unlock_irq(shost->host_lock);
+                                        lpfc_can_disctmo(vport);
-                                lpfc_can_disctmo(vport);
+                                        lpfc_end_rscn(vport);
-                                lpfc_end_rscn(vport);
+                                }
                        }
                }
        }
        return;
 }
+/**
+ * lpfc_els_retry_delay: Timer function with a ndlp delayed function timer.
+ * @ptr: holder for the pointer to the timer function associated data (ndlp).
+ *
+ * This routine is invoked by the ndlp delayed-function timer to check
+ * whether there is any pending ELS retry event(s) with the node. If not, it
+ * simply returns. Otherwise, if there is at least one ELS delayed event, it
+ * adds the delayed events to the HBA work list and invokes the
+ * lpfc_worker_wake_up() routine to wake up worker thread to process the
+ * event. Note that lpfc_nlp_get() is called before posting the event to
+ * the work list to hold reference count of ndlp so that it guarantees the
+ * reference to ndlp will still be available when the worker thread gets
+ * to the event associated with the ndlp.
+ **/
 void
 lpfc_els_retry_delay(unsigned long ptr)
 {
@@ -1822,6 +2327,15 @@ lpfc_els_retry_delay(unsigned long ptr)
        return;
 }
+/**
+ * lpfc_els_retry_delay_handler: Work thread handler for ndlp delayed function.
+ * @ndlp: pointer to a node-list data structure.
+ *
+ * This routine is the worker-thread handler for processing the @ndlp delayed
+ * event(s), posted by the lpfc_els_retry_delay() routine. It simply retrieves
+ * the last ELS command from the associated ndlp and invokes the proper ELS
+ * function according to the delayed ELS command to retry the command.
+ **/
 void
 lpfc_els_retry_delay_handler(struct lpfc_nodelist *ndlp)
 {
@@ -1884,6 +2398,27 @@ lpfc_els_retry_delay_handler(struct lpfc_nodelist *ndlp)
        return;
 }
+/**
+ * lpfc_els_retry: Make retry decision on an els command iocb.
+ * @phba: pointer to lpfc hba data structure.
+ * @cmdiocb: pointer to lpfc command iocb data structure.
+ * @rspiocb: pointer to lpfc response iocb data structure.
+ *
+ * This routine makes a retry decision on an ELS command IOCB, which has
+ * failed. The following ELS IOCBs use this function for retrying the command
+ * when previously issued command responsed with error status: FLOGI, PLOGI,
+ * PRLI, ADISC, LOGO, and FDISC. Based on the ELS command type and the
+ * returned error status, it makes the decision whether a retry shall be
+ * issued for the command, and whether a retry shall be made immediately or
+ * delayed. In the former case, the corresponding ELS command issuing-function
+ * is called to retry the command. In the later case, the ELS command shall
+ * be posted to the ndlp delayed event and delayed function timer set to the
+ * ndlp for the delayed command issusing.
+ *
+ * Return code
+ *   0 - No retry of els command is made
+ *   1 - Immediate or delayed retry of els command is made
+ **/
 static int
 lpfc_els_retry(struct lpfc_hba *phba, struct lpfc_iocbq *cmdiocb,
               struct lpfc_iocbq *rspiocb)
@@ -2051,7 +2586,7 @@ lpfc_els_retry(struct lpfc_hba *phba, struct lpfc_iocbq *cmdiocb,
                          (stat.un.b.lsRjtRsnCodeExp == LSEXP_INVALID_NPORT_ID))
                          ) {
                                lpfc_printf_vlog(vport, KERN_ERR, LOG_ELS,
-                                                 "0123 FDISC Failed (x%x). "
+                                                 "0122 FDISC Failed (x%x). "
                                                 "Fabric Detected Bad WWN\n",
                                                 stat.un.lsRjtError);
                                lpfc_vport_set_state(vport,
@@ -2182,12 +2717,26 @@ lpfc_els_retry(struct lpfc_hba *phba, struct lpfc_iocbq *cmdiocb,
        return 0;
 }
+/**
+ * lpfc_els_free_data: Free lpfc dma buffer and data structure with an iocb.
+ * @phba: pointer to lpfc hba data structure.
+ * @buf_ptr1: pointer to the lpfc DMA buffer data structure.
+ *
+ * This routine releases the lpfc DMA (Direct Memory Access) buffer(s)
+ * associated with a command IOCB back to the lpfc DMA buffer pool. It first
+ * checks to see whether there is a lpfc DMA buffer associated with the
+ * response of the command IOCB. If so, it will be released before releasing
+ * the lpfc DMA buffer associated with the IOCB itself.
+ *
+ * Return code
+ *   0 - Successfully released lpfc DMA buffer (currently, always return 0)
+ **/
 static int
 lpfc_els_free_data(struct lpfc_hba *phba, struct lpfc_dmabuf *buf_ptr1)
 {
        struct lpfc_dmabuf *buf_ptr;
-        /* Free the response before processing the command.  */
+        /* Free the response before processing the command. */
        if (!list_empty(&buf_ptr1->list)) {
                list_remove_head(&buf_ptr1->list, buf_ptr,
                                 struct lpfc_dmabuf,
@@ -2200,6 +2749,18 @@ lpfc_els_free_data(struct lpfc_hba *phba, struct lpfc_dmabuf *buf_ptr1)
        return 0;
 }
+/**
+ * lpfc_els_free_bpl: Free lpfc dma buffer and data structure with bpl.
+ * @phba: pointer to lpfc hba data structure.
+ * @buf_ptr: pointer to the lpfc dma buffer data structure.
+ *
+ * This routine releases the lpfc Direct Memory Access (DMA) buffer
+ * associated with a Buffer Pointer List (BPL) back to the lpfc DMA buffer
+ * pool.
+ *
+ * Return code
+ *   0 - Successfully released lpfc DMA buffer (currently, always return 0)
+ **/
 static int
 lpfc_els_free_bpl(struct lpfc_hba *phba, struct lpfc_dmabuf *buf_ptr)
 {
@@ -2208,6 +2769,33 @@ lpfc_els_free_bpl(struct lpfc_hba *phba, struct lpfc_dmabuf *buf_ptr)
        return 0;
 }
+/**
+ * lpfc_els_free_iocb: Free a command iocb and its associated resources.
+ * @phba: pointer to lpfc hba data structure.
+ * @elsiocb: pointer to lpfc els command iocb data structure.
+ *
+ * This routine frees a command IOCB and its associated resources. The
+ * command IOCB data structure contains the reference to various associated
+ * resources, these fields must be set to NULL if the associated reference
+ * not present:
+ *   context1 - reference to ndlp
+ *   context2 - reference to cmd
+ *   context2->next - reference to rsp
+ *   context3 - reference to bpl
+ *
+ * It first properly decrements the reference count held on ndlp for the
+ * IOCB completion callback function. If LPFC_DELAY_MEM_FREE flag is not
+ * set, it invokes the lpfc_els_free_data() routine to release the Direct
+ * Memory Access (DMA) buffers associated with the IOCB. Otherwise, it
+ * adds the DMA buffer the @phba data structure for the delayed release.
+ * If reference to the Buffer Pointer List (BPL) is present, the
+ * lpfc_els_free_bpl() routine is invoked to release the DMA memory
+ * associated with BPL. Finally, the lpfc_sli_release_iocbq() routine is
+ * invoked to release the IOCB data structure back to @phba IOCBQ list.
+ *
+ * Return code
+ *   0 - Success (currently, always return 0)
+ **/
 int
 lpfc_els_free_iocb(struct lpfc_hba *phba, struct lpfc_iocbq *elsiocb)
 {
@@ -2274,6 +2862,23 @@ lpfc_els_free_iocb(struct lpfc_hba *phba, struct lpfc_iocbq *elsiocb)
        return 0;
 }
+/**
+ * lpfc_cmpl_els_logo_acc: Completion callback function to logo acc response.
+ * @phba: pointer to lpfc hba data structure.
+ * @cmdiocb: pointer to lpfc command iocb data structure.
+ * @rspiocb: pointer to lpfc response iocb data structure.
+ *
+ * This routine is the completion callback function to the Logout (LOGO)
+ * Accept (ACC) Response ELS command. This routine is invoked to indicate
+ * the completion of the LOGO process. It invokes the lpfc_nlp_not_used() to
+ * release the ndlp if it has the last reference remaining (reference count
+ * is 1). If succeeded (meaning ndlp released), it sets the IOCB context1
+ * field to NULL to inform the following lpfc_els_free_iocb() routine no
+ * ndlp reference count needs to be decremented. Otherwise, the ndlp
+ * reference use-count shall be decremented by the lpfc_els_free_iocb()
+ * routine. Finally, the lpfc_els_free_iocb() is invoked to release the
+ * IOCB data structure.
+ **/
 static void
 lpfc_cmpl_els_logo_acc(struct lpfc_hba *phba, struct lpfc_iocbq *cmdiocb,
                       struct lpfc_iocbq *rspiocb)
@@ -2311,6 +2916,19 @@ lpfc_cmpl_els_logo_acc(struct lpfc_hba *phba, struct lpfc_iocbq *cmdiocb,
        return;
 }
+/**
+ * lpfc_mbx_cmpl_dflt_rpi: Completion callbk func for unreg dflt rpi mbox cmd.
+ * @phba: pointer to lpfc hba data structure.
+ * @pmb: pointer to the driver internal queue element for mailbox command.
+ *
+ * This routine is the completion callback function for unregister default
+ * RPI (Remote Port Index) mailbox command to the @phba. It simply releases
+ * the associated lpfc Direct Memory Access (DMA) buffer back to the pool and
+ * decrements the ndlp reference count held for this completion callback
+ * function. After that, it invokes the lpfc_nlp_not_used() to check
+ * whether there is only one reference left on the ndlp. If so, it will
+ * perform one more decrement and trigger the release of the ndlp.
+ **/
 void
 lpfc_mbx_cmpl_dflt_rpi(struct lpfc_hba *phba, LPFC_MBOXQ_t *pmb)
 {
@@ -2332,6 +2950,22 @@ lpfc_mbx_cmpl_dflt_rpi(struct lpfc_hba *phba, LPFC_MBOXQ_t *pmb)
        return;
 }
+/**
+ * lpfc_cmpl_els_rsp: Completion callback function for els response iocb cmd.
+ * @phba: pointer to lpfc hba data structure.
+ * @cmdiocb: pointer to lpfc command iocb data structure.
+ * @rspiocb: pointer to lpfc response iocb data structure.
+ *
+ * This routine is the completion callback function for ELS Response IOCB
+ * command. In normal case, this callback function just properly sets the
+ * nlp_flag bitmap in the ndlp data structure, if the mbox command reference
+ * field in the command IOCB is not NULL, the referred mailbox command will
+ * be send out, and then invokes the lpfc_els_free_iocb() routine to release
+ * the IOCB. Under error conditions, such as when a LS_RJT is returned or a
+ * link down event occurred during the discovery, the lpfc_nlp_not_used()
+ * routine shall be invoked trying to release the ndlp if no other threads
+ * are currently referring it.
+ **/
 static void
 lpfc_cmpl_els_rsp(struct lpfc_hba *phba, struct lpfc_iocbq *cmdiocb,
                  struct lpfc_iocbq *rspiocb)
@@ -2487,6 +3121,31 @@ out:
        return;
 }
+/**
+ * lpfc_els_rsp_acc: Prepare and issue an acc response iocb command.
+ * @vport: pointer to a host virtual N_Port data structure.
+ * @flag: the els command code to be accepted.
+ * @oldiocb: pointer to the original lpfc command iocb data structure.
+ * @ndlp: pointer to a node-list data structure.
+ * @mbox: pointer to the driver internal queue element for mailbox command.
+ *
+ * This routine prepares and issues an Accept (ACC) response IOCB
+ * command. It uses the @flag to properly set up the IOCB field for the
+ * specific ACC response command to be issued and invokes the
+ * lpfc_sli_issue_iocb() routine to send out ACC response IOCB. If a
+ * @mbox pointer is passed in, it will be put into the context_un.mbox
+ * field of the IOCB for the completion callback function to issue the
+ * mailbox command to the HBA later when callback is invoked.
+ *
+ * Note that, in lpfc_prep_els_iocb() routine, the reference count of ndlp
+ * will be incremented by 1 for holding the ndlp and the reference to ndlp
+ * will be stored into the context1 field of the IOCB for the completion
+ * callback function to the corresponding response ELS IOCB command.
+ *
+ * Return code
+ *   0 - Successfully issued acc response
+ *   1 - Failed to issue acc response
+ **/
 int
 lpfc_els_rsp_acc(struct lpfc_vport *vport, uint32_t flag,
                 struct lpfc_iocbq *oldiocb, struct lpfc_nodelist *ndlp,
@@ -2601,6 +3260,28 @@ lpfc_els_rsp_acc(struct lpfc_vport *vport, uint32_t flag,
        return 0;
 }
+/**
+ * lpfc_els_rsp_reject: Propare and issue a rjt response iocb command.
+ * @vport: pointer to a virtual N_Port data structure.
+ * @rejectError:
+ * @oldiocb: pointer to the original lpfc command iocb data structure.
+ * @ndlp: pointer to a node-list data structure.
+ * @mbox: pointer to the driver internal queue element for mailbox command.
+ *
+ * This routine prepares and issue an Reject (RJT) response IOCB
+ * command. If a @mbox pointer is passed in, it will be put into the
+ * context_un.mbox field of the IOCB for the completion callback function
+ * to issue to the HBA later.
+ *
+ * Note that, in lpfc_prep_els_iocb() routine, the reference count of ndlp
+ * will be incremented by 1 for holding the ndlp and the reference to ndlp
+ * will be stored into the context1 field of the IOCB for the completion
+ * callback function to the reject response ELS IOCB command.
+ *
+ * Return code
+ *   0 - Successfully issued reject response
+ *   1 - Failed to issue reject response
+ **/
 int
 lpfc_els_rsp_reject(struct lpfc_vport *vport, uint32_t rejectError,
                    struct lpfc_iocbq *oldiocb, struct lpfc_nodelist *ndlp,
@@ -2660,6 +3341,25 @@ lpfc_els_rsp_reject(struct lpfc_vport *vport, uint32_t rejectError,
        return 0;
 }
+/**
+ * lpfc_els_rsp_adisc_acc: Prepare and issue acc response to adisc iocb cmd.
+ * @vport: pointer to a virtual N_Port data structure.
+ * @oldiocb: pointer to the original lpfc command iocb data structure.
+ * @ndlp: pointer to a node-list data structure.
+ *
+ * This routine prepares and issues an Accept (ACC) response to Address
+ * Discover (ADISC) ELS command. It simply prepares the payload of the IOCB
+ * and invokes the lpfc_sli_issue_iocb() routine to send out the command.
+ *
+ * Note that, in lpfc_prep_els_iocb() routine, the reference count of ndlp
+ * will be incremented by 1 for holding the ndlp and the reference to ndlp
+ * will be stored into the context1 field of the IOCB for the completion
+ * callback function to the ADISC Accept response ELS IOCB command.
+ *
+ * Return code
+ *   0 - Successfully issued acc adisc response
+ *   1 - Failed to issue adisc acc response
+ **/
 int
 lpfc_els_rsp_adisc_acc(struct lpfc_vport *vport, struct lpfc_iocbq *oldiocb,
                       struct lpfc_nodelist *ndlp)
@@ -2716,6 +3416,25 @@ lpfc_els_rsp_adisc_acc(struct lpfc_vport *vport, struct lpfc_iocbq *oldiocb,
        return 0;
 }
+/**
+ * lpfc_els_rsp_prli_acc: Prepare and issue acc response to prli iocb cmd.
+ * @vport: pointer to a virtual N_Port data structure.
+ * @oldiocb: pointer to the original lpfc command iocb data structure.
+ * @ndlp: pointer to a node-list data structure.
+ *
+ * This routine prepares and issues an Accept (ACC) response to Process
+ * Login (PRLI) ELS command. It simply prepares the payload of the IOCB
+ * and invokes the lpfc_sli_issue_iocb() routine to send out the command.
+ *
+ * Note that, in lpfc_prep_els_iocb() routine, the reference count of ndlp
+ * will be incremented by 1 for holding the ndlp and the reference to ndlp
+ * will be stored into the context1 field of the IOCB for the completion
+ * callback function to the PRLI Accept response ELS IOCB command.
+ *
+ * Return code
+ *   0 - Successfully issued acc prli response
+ *   1 - Failed to issue acc prli response
+ **/
 int
 lpfc_els_rsp_prli_acc(struct lpfc_vport *vport, struct lpfc_iocbq *oldiocb,
                      struct lpfc_nodelist *ndlp)
@@ -2795,6 +3514,32 @@ lpfc_els_rsp_prli_acc(struct lpfc_vport *vport, struct lpfc_iocbq *oldiocb,
        return 0;
 }
+/**
+ * lpfc_els_rsp_rnid_acc: Issue rnid acc response iocb command.
+ * @vport: pointer to a virtual N_Port data structure.
+ * @format: rnid command format.
+ * @oldiocb: pointer to the original lpfc command iocb data structure.
+ * @ndlp: pointer to a node-list data structure.
+ *
+ * This routine issues a Request Node Identification Data (RNID) Accept
+ * (ACC) response. It constructs the RNID ACC response command according to
+ * the proper @format and then calls the lpfc_sli_issue_iocb() routine to
+ * issue the response. Note that this command does not need to hold the ndlp
+ * reference count for the callback. So, the ndlp reference count taken by
+ * the lpfc_prep_els_iocb() routine is put back and the context1 field of
+ * IOCB is set to NULL to indicate to the lpfc_els_free_iocb() routine that
+ * there is no ndlp reference available.
+ *
+ * Note that, in lpfc_prep_els_iocb() routine, the reference count of ndlp
+ * will be incremented by 1 for holding the ndlp and the reference to ndlp
+ * will be stored into the context1 field of the IOCB for the completion
+ * callback function. However, for the RNID Accept Response ELS command,
+ * this is undone later by this routine after the IOCB is allocated.
+ *
+ * Return code
+ *   0 - Successfully issued acc rnid response
+ *   1 - Failed to issue acc rnid response
+ **/
 static int
 lpfc_els_rsp_rnid_acc(struct lpfc_vport *vport, uint8_t format,
                      struct lpfc_iocbq *oldiocb, struct lpfc_nodelist *ndlp)
@@ -2875,6 +3620,25 @@ lpfc_els_rsp_rnid_acc(struct lpfc_vport *vport, uint8_t format,
        return 0;
 }
+/**
+ * lpfc_els_disc_adisc: Issue remaining adisc iocbs to npr nodes of a vport.
+ * @vport: pointer to a host virtual N_Port data structure.
+ *
+ * This routine issues Address Discover (ADISC) ELS commands to those
+ * N_Ports which are in node port recovery state and ADISC has not been issued
+ * for the @vport. Each time an ELS ADISC IOCB is issued by invoking the
+ * lpfc_issue_els_adisc() routine, the per @vport number of discover count
+ * (num_disc_nodes) shall be incremented. If the num_disc_nodes reaches a
+ * pre-configured threshold (cfg_discovery_threads), the @vport fc_flag will
+ * be marked with FC_NLP_MORE bit and the process of issuing remaining ADISC
+ * IOCBs quit for later pick up. On the other hand, after walking through
+ * all the ndlps with the @vport and there is none ADISC IOCB issued, the
+ * @vport fc_flag shall be cleared with FC_NLP_MORE bit indicating there is
+ * no more ADISC need to be sent.
+ *
+ * Return code
+ *    The number of N_Ports with adisc issued.
+ **/
 int
 lpfc_els_disc_adisc(struct lpfc_vport *vport)
 {
@@ -2914,6 +3678,25 @@ lpfc_els_disc_adisc(struct lpfc_vport *vport)
        return sentadisc;
 }
+/**
+ * lpfc_els_disc_plogi: Issue plogi for all npr nodes of a vport before adisc.
+ * @vport: pointer to a host virtual N_Port data structure.
+ *
+ * This routine issues Port Login (PLOGI) ELS commands to all the N_Ports
+ * which are in node port recovery state, with a @vport. Each time an ELS
+ * ADISC PLOGI IOCB is issued by invoking the lpfc_issue_els_plogi() routine,
+ * the per @vport number of discover count (num_disc_nodes) shall be
+ * incremented. If the num_disc_nodes reaches a pre-configured threshold
+ * (cfg_discovery_threads), the @vport fc_flag will be marked with FC_NLP_MORE
+ * bit set and quit the process of issuing remaining ADISC PLOGIN IOCBs for
+ * later pick up. On the other hand, after walking through all the ndlps with
+ * the @vport and there is none ADISC PLOGI IOCB issued, the @vport fc_flag
+ * shall be cleared with the FC_NLP_MORE bit indicating there is no more ADISC
+ * PLOGI need to be sent.
+ *
+ * Return code
+ *   The number of N_Ports with plogi issued.
+ **/
 int
 lpfc_els_disc_plogi(struct lpfc_vport *vport)
 {
@@ -2954,6 +3737,15 @@ lpfc_els_disc_plogi(struct lpfc_vport *vport)
        return sentplogi;
 }
+/**
+ * lpfc_els_flush_rscn: Clean up any rscn activities with a vport.
+ * @vport: pointer to a host virtual N_Port data structure.
+ *
+ * This routine cleans up any Registration State Change Notification
+ * (RSCN) activity with a @vport. Note that the fc_rscn_flush flag of the
+ * @vport together with the host_lock is used to prevent multiple thread
+ * trying to access the RSCN array on a same @vport at the same time.
+ **/
 void
 lpfc_els_flush_rscn(struct lpfc_vport *vport)
 {
@@ -2984,6 +3776,18 @@ lpfc_els_flush_rscn(struct lpfc_vport *vport)
        vport->fc_rscn_flush = 0;
 }
+/**
+ * lpfc_rscn_payload_check: Check whether there is a pending rscn to a did.
+ * @vport: pointer to a host virtual N_Port data structure.
+ * @did: remote destination port identifier.
+ *
+ * This routine checks whether there is any pending Registration State
+ * Configuration Notification (RSCN) to a @did on @vport.
+ *
+ * Return code
+ *   None zero - The @did matched with a pending rscn
+ *   0 - not able to match @did with a pending rscn
+ **/
 int
 lpfc_rscn_payload_check(struct lpfc_vport *vport, uint32_t did)
 {
@@ -3053,6 +3857,17 @@ return_did_out:
        return did;
 }
+/**
+ * lpfc_rscn_recovery_check: Send recovery event to vport nodes matching rscn
+ * @vport: pointer to a host virtual N_Port data structure.
+ *
+ * This routine sends recovery (NLP_EVT_DEVICE_RECOVERY) event to the
+ * state machine for a @vport's nodes that are with pending RSCN (Registration
+ * State Change Notification).
+ *
+ * Return code
+ *   0 - Successful (currently alway return 0)
+ **/
 static int
 lpfc_rscn_recovery_check(struct lpfc_vport *vport)
 {
@@ -3071,6 +3886,28 @@ lpfc_rscn_recovery_check(struct lpfc_vport *vport)
        return 0;
 }
+/**
+ * lpfc_els_rcv_rscn: Process an unsolicited rscn iocb.
+ * @vport: pointer to a host virtual N_Port data structure.
+ * @cmdiocb: pointer to lpfc command iocb data structure.
+ * @ndlp: pointer to a node-list data structure.
+ *
+ * This routine processes an unsolicited RSCN (Registration State Change
+ * Notification) IOCB. First, the payload of the unsolicited RSCN is walked
+ * to invoke fc_host_post_event() routine to the FC transport layer. If the
+ * discover state machine is about to begin discovery, it just accepts the
+ * RSCN and the discovery process will satisfy the RSCN. If this RSCN only
+ * contains N_Port IDs for other vports on this HBA, it just accepts the
+ * RSCN and ignore processing it. If the state machine is in the recovery
+ * state, the fc_rscn_id_list of this @vport is walked and the
+ * lpfc_rscn_recovery_check() routine is invoked to send recovery event for
+ * all nodes that match RSCN payload. Otherwise, the lpfc_els_handle_rscn()
+ * routine is invoked to handle the RSCN event.
+ *
+ * Return code
+ *   0 - Just sent the acc response
+ *   1 - Sent the acc response and waited for name server completion
+ **/
 static int
 lpfc_els_rcv_rscn(struct lpfc_vport *vport, struct lpfc_iocbq *cmdiocb,
                  struct lpfc_nodelist *ndlp)
@@ -3130,7 +3967,7 @@ lpfc_els_rcv_rscn(struct lpfc_vport *vport, struct lpfc_iocbq *cmdiocb,
                if (rscn_id == hba_id) {
                        /* ALL NPortIDs in RSCN are on HBA */
                        lpfc_printf_vlog(vport, KERN_INFO, LOG_DISCOVERY,
-                                         "0214 Ignore RSCN "
+                                         "0219 Ignore RSCN "
                                         "Data: x%x x%x x%x x%x\n",
                                         vport->fc_flag, payload_len,
                                         *lp, vport->fc_rscn_id_cnt);
@@ -3241,6 +4078,22 @@ lpfc_els_rcv_rscn(struct lpfc_vport *vport, struct lpfc_iocbq *cmdiocb,
        return lpfc_els_handle_rscn(vport);
 }
+/**
+ * lpfc_els_handle_rscn: Handle rscn for a vport.
+ * @vport: pointer to a host virtual N_Port data structure.
+ *
+ * This routine handles the Registration State Configuration Notification
+ * (RSCN) for a @vport. If login to NameServer does not exist, a new ndlp shall
+ * be created and a Port Login (PLOGI) to the NameServer is issued. Otherwise,
+ * if the ndlp to NameServer exists, a Common Transport (CT) command to the
+ * NameServer shall be issued. If CT command to the NameServer fails to be
+ * issued, the lpfc_els_flush_rscn() routine shall be invoked to clean up any
+ * RSCN activities with the @vport.
+ *
+ * Return code
+ *   0 - Cleaned up rscn on the @vport
+ *   1 - Wait for plogi to name server before proceed
+ **/
 int
 lpfc_els_handle_rscn(struct lpfc_vport *vport)
 {
@@ -3313,6 +4166,31 @@ lpfc_els_handle_rscn(struct lpfc_vport *vport)
        return 0;
 }
+/**
+ * lpfc_els_rcv_flogi: Process an unsolicited flogi iocb.
+ * @vport: pointer to a host virtual N_Port data structure.
+ * @cmdiocb: pointer to lpfc command iocb data structure.
+ * @ndlp: pointer to a node-list data structure.
+ *
+ * This routine processes Fabric Login (FLOGI) IOCB received as an ELS
+ * unsolicited event. An unsolicited FLOGI can be received in a point-to-
+ * point topology. As an unsolicited FLOGI should not be received in a loop
+ * mode, any unsolicited FLOGI received in loop mode shall be ignored. The
+ * lpfc_check_sparm() routine is invoked to check the parameters in the
+ * unsolicited FLOGI. If parameters validation failed, the routine
+ * lpfc_els_rsp_reject() shall be called with reject reason code set to
+ * LSEXP_SPARM_OPTIONS to reject the FLOGI. Otherwise, the Port WWN in the
+ * FLOGI shall be compared with the Port WWN of the @vport to determine who
+ * will initiate PLOGI. The higher lexicographical value party shall has
+ * higher priority (as the winning port) and will initiate PLOGI and
+ * communicate Port_IDs (Addresses) for both nodes in PLOGI. The result
+ * of this will be marked in the @vport fc_flag field with FC_PT2PT_PLOGI
+ * and then the lpfc_els_rsp_acc() routine is invoked to accept the FLOGI.
+ *
+ * Return code
+ *   0 - Successfully processed the unsolicited flogi
+ *   1 - Failed to process the unsolicited flogi
+ **/
 static int
 lpfc_els_rcv_flogi(struct lpfc_vport *vport, struct lpfc_iocbq *cmdiocb,
                   struct lpfc_nodelist *ndlp)
@@ -3402,6 +4280,22 @@ lpfc_els_rcv_flogi(struct lpfc_vport *vport, struct lpfc_iocbq *cmdiocb,
        return 0;
 }
+/**
+ * lpfc_els_rcv_rnid: Process an unsolicited rnid iocb.
+ * @vport: pointer to a host virtual N_Port data structure.
+ * @cmdiocb: pointer to lpfc command iocb data structure.
+ * @ndlp: pointer to a node-list data structure.
+ *
+ * This routine processes Request Node Identification Data (RNID) IOCB
+ * received as an ELS unsolicited event. Only when the RNID specified format
+ * 0x0 or 0xDF (Topology Discovery Specific Node Identification Data)
+ * present, this routine will invoke the lpfc_els_rsp_rnid_acc() routine to
+ * Accept (ACC) the RNID ELS command. All the other RNID formats are
+ * rejected by invoking the lpfc_els_rsp_reject() routine.
+ *
+ * Return code
+ *   0 - Successfully processed rnid iocb (currently always return 0)
+ **/
 static int
 lpfc_els_rcv_rnid(struct lpfc_vport *vport, struct lpfc_iocbq *cmdiocb,
                  struct lpfc_nodelist *ndlp)
@@ -3441,6 +4335,19 @@ lpfc_els_rcv_rnid(struct lpfc_vport *vport, struct lpfc_iocbq *cmdiocb,
        return 0;
 }
+/**
+ * lpfc_els_rcv_lirr: Process an unsolicited lirr iocb.
+ * @vport: pointer to a host virtual N_Port data structure.
+ * @cmdiocb: pointer to lpfc command iocb data structure.
+ * @ndlp: pointer to a node-list data structure.
+ *
+ * This routine processes a Link Incident Report Registration(LIRR) IOCB
+ * received as an ELS unsolicited event. Currently, this function just invokes
+ * the lpfc_els_rsp_reject() routine to reject the LIRR IOCB unconditionally.
+ *
+ * Return code
+ *   0 - Successfully processed lirr iocb (currently always return 0)
+ **/
 static int
 lpfc_els_rcv_lirr(struct lpfc_vport *vport, struct lpfc_iocbq *cmdiocb,
                  struct lpfc_nodelist *ndlp)
@@ -3456,6 +4363,25 @@ lpfc_els_rcv_lirr(struct lpfc_vport *vport, struct lpfc_iocbq *cmdiocb,
        return 0;
 }
+/**
+ * lpfc_els_rsp_rps_acc: Completion callbk func for MBX_READ_LNK_STAT mbox cmd.
+ * @phba: pointer to lpfc hba data structure.
+ * @pmb: pointer to the driver internal queue element for mailbox command.
+ *
+ * This routine is the completion callback function for the MBX_READ_LNK_STAT
+ * mailbox command. This callback function is to actually send the Accept
+ * (ACC) response to a Read Port Status (RPS) unsolicited IOCB event. It
+ * collects the link statistics from the completion of the MBX_READ_LNK_STAT
+ * mailbox command, constructs the RPS response with the link statistics
+ * collected, and then invokes the lpfc_sli_issue_iocb() routine to send ACC
+ * response to the RPS.
+ *
+ * Note that, in lpfc_prep_els_iocb() routine, the reference count of ndlp
+ * will be incremented by 1 for holding the ndlp and the reference to ndlp
+ * will be stored into the context1 field of the IOCB for the completion
+ * callback function to the RPS Accept Response ELS IOCB command.
+ *
+ **/
 static void
 lpfc_els_rsp_rps_acc(struct lpfc_hba *phba, LPFC_MBOXQ_t *pmb)
 {
@@ -3531,6 +4457,24 @@ lpfc_els_rsp_rps_acc(struct lpfc_hba *phba, LPFC_MBOXQ_t *pmb)
        return;
 }
+/**
+ * lpfc_els_rcv_rps: Process an unsolicited rps iocb.
+ * @vport: pointer to a host virtual N_Port data structure.
+ * @cmdiocb: pointer to lpfc command iocb data structure.
+ * @ndlp: pointer to a node-list data structure.
+ *
+ * This routine processes Read Port Status (RPS) IOCB received as an
+ * ELS unsolicited event. It first checks the remote port state. If the
+ * remote port is not in NLP_STE_UNMAPPED_NODE state or NLP_STE_MAPPED_NODE
+ * state, it invokes the lpfc_els_rsp_reject() routine to send the reject
+ * response. Otherwise, it issue the MBX_READ_LNK_STAT mailbox command
+ * for reading the HBA link statistics. It is for the callback function,
+ * lpfc_els_rsp_rps_acc(), set to the MBX_READ_LNK_STAT mailbox command
+ * to actually sending out RPS Accept (ACC) response.
+ *
+ * Return codes
+ *   0 - Successfully processed rps iocb (currently always return 0)
+ **/
 static int
 lpfc_els_rcv_rps(struct lpfc_vport *vport, struct lpfc_iocbq *cmdiocb,
                 struct lpfc_nodelist *ndlp)
@@ -3544,14 +4488,9 @@ lpfc_els_rcv_rps(struct lpfc_vport *vport, struct lpfc_iocbq *cmdiocb,
        struct ls_rjt stat;
        if ((ndlp->nlp_state != NLP_STE_UNMAPPED_NODE) &&
-            (ndlp->nlp_state != NLP_STE_MAPPED_NODE)) {
+            (ndlp->nlp_state != NLP_STE_MAPPED_NODE))
-                stat.un.b.lsRjtRsvd0 = 0;
+                /* reject the unsolicited RPS request and done with it */
-                stat.un.b.lsRjtRsnCode = LSRJT_UNABLE_TPC;
+                goto reject_out;
-                stat.un.b.lsRjtRsnCodeExp = LSEXP_CANT_GIVE_DATA;
-                stat.un.b.vendorUnique = 0;
-                lpfc_els_rsp_reject(vport, stat.un.lsRjtError, cmdiocb, ndlp,
-                        NULL);
-        }
        pcmd = (struct lpfc_dmabuf *) cmdiocb->context2;
        lp = (uint32_t *) pcmd->virt;
@@ -3584,6 +4523,9 @@ lpfc_els_rcv_rps(struct lpfc_vport *vport, struct lpfc_iocbq *cmdiocb,
                        mempool_free(mbox, phba->mbox_mem_pool);
                }
        }
+reject_out:
+        /* issue rejection response */
        stat.un.b.lsRjtRsvd0 = 0;
        stat.un.b.lsRjtRsnCode = LSRJT_UNABLE_TPC;
        stat.un.b.lsRjtRsnCodeExp = LSEXP_CANT_GIVE_DATA;
@@ -3592,6 +4534,25 @@ lpfc_els_rcv_rps(struct lpfc_vport *vport, struct lpfc_iocbq *cmdiocb,
        return 0;
 }
+/**
+ * lpfc_els_rsp_rpl_acc: Issue an accept rpl els command.
+ * @vport: pointer to a host virtual N_Port data structure.
+ * @cmdsize: size of the ELS command.
+ * @oldiocb: pointer to the original lpfc command iocb data structure.
+ * @ndlp: pointer to a node-list data structure.
+ *
+ * This routine issuees an Accept (ACC) Read Port List (RPL) ELS command.
+ * It is to be called by the lpfc_els_rcv_rpl() routine to accept the RPL.
+ *
+ * Note that, in lpfc_prep_els_iocb() routine, the reference count of ndlp
+ * will be incremented by 1 for holding the ndlp and the reference to ndlp
+ * will be stored into the context1 field of the IOCB for the completion
+ * callback function to the RPL Accept Response ELS command.
+ *
+ * Return code
+ *   0 - Successfully issued ACC RPL ELS command
+ *   1 - Failed to issue ACC RPL ELS command
+ **/
 static int
 lpfc_els_rsp_rpl_acc(struct lpfc_vport *vport, uint16_t cmdsize,
                     struct lpfc_iocbq *oldiocb, struct lpfc_nodelist *ndlp)
@@ -3645,6 +4606,22 @@ lpfc_els_rsp_rpl_acc(struct lpfc_vport *vport, uint16_t cmdsize,
        return 0;
 }
+/**
+ * lpfc_els_rcv_rpl: Process an unsolicited rpl iocb.
+ * @vport: pointer to a host virtual N_Port data structure.
+ * @cmdiocb: pointer to lpfc command iocb data structure.
+ * @ndlp: pointer to a node-list data structure.
+ *
+ * This routine processes Read Port List (RPL) IOCB received as an ELS
+ * unsolicited event. It first checks the remote port state. If the remote
+ * port is not in NLP_STE_UNMAPPED_NODE and NLP_STE_MAPPED_NODE states, it
+ * invokes the lpfc_els_rsp_reject() routine to send reject response.
+ * Otherwise, this routine then invokes the lpfc_els_rsp_rpl_acc() routine
+ * to accept the RPL.
+ *
+ * Return code
+ *   0 - Successfully processed rpl iocb (currently always return 0)
+ **/
 static int
 lpfc_els_rcv_rpl(struct lpfc_vport *vport, struct lpfc_iocbq *cmdiocb,
                 struct lpfc_nodelist *ndlp)
@@ -3658,12 +4635,15 @@ lpfc_els_rcv_rpl(struct lpfc_vport *vport, struct lpfc_iocbq *cmdiocb,
        if ((ndlp->nlp_state != NLP_STE_UNMAPPED_NODE) &&
            (ndlp->nlp_state != NLP_STE_MAPPED_NODE)) {
+                /* issue rejection response */
                stat.un.b.lsRjtRsvd0 = 0;
                stat.un.b.lsRjtRsnCode = LSRJT_UNABLE_TPC;
                stat.un.b.lsRjtRsnCodeExp = LSEXP_CANT_GIVE_DATA;
                stat.un.b.vendorUnique = 0;
                lpfc_els_rsp_reject(vport, stat.un.lsRjtError, cmdiocb, ndlp,
                        NULL);
+                /* rejected the unsolicited RPL request and done with it */
+                return 0;
        }
        pcmd = (struct lpfc_dmabuf *) cmdiocb->context2;
@@ -3685,6 +4665,30 @@ lpfc_els_rcv_rpl(struct lpfc_vport *vport, struct lpfc_iocbq *cmdiocb,
        return 0;
 }
+/**
+ * lpfc_els_rcv_farp: Process an unsolicited farp request els command.
+ * @vport: pointer to a virtual N_Port data structure.
+ * @cmdiocb: pointer to lpfc command iocb data structure.
+ * @ndlp: pointer to a node-list data structure.
+ *
+ * This routine processes Fibre Channel Address Resolution Protocol
+ * (FARP) Request IOCB received as an ELS unsolicited event. Currently,
+ * the lpfc driver only supports matching on WWPN or WWNN for FARP. As such,
+ * FARP_MATCH_PORT flag and FARP_MATCH_NODE flag are checked against the
+ * Match Flag in the FARP request IOCB: if FARP_MATCH_PORT flag is set, the
+ * remote PortName is compared against the FC PortName stored in the @vport
+ * data structure; if FARP_MATCH_NODE flag is set, the remote NodeName is
+ * compared against the FC NodeName stored in the @vport data structure.
+ * If any of these matches and the FARP_REQUEST_FARPR flag is set in the
+ * FARP request IOCB Response Flag, the lpfc_issue_els_farpr() routine is
+ * invoked to send out FARP Response to the remote node. Before sending the
+ * FARP Response, however, the FARP_REQUEST_PLOGI flag is check in the FARP
+ * request IOCB Response Flag and, if it is set, the lpfc_issue_els_plogi()
+ * routine is invoked to log into the remote port first.
+ *
+ * Return code
+ *   0 - Either the FARP Match Mode not supported or successfully processed
+ **/
 static int
 lpfc_els_rcv_farp(struct lpfc_vport *vport, struct lpfc_iocbq *cmdiocb,
                  struct lpfc_nodelist *ndlp)
@@ -3744,6 +4748,20 @@ lpfc_els_rcv_farp(struct lpfc_vport *vport, struct lpfc_iocbq *cmdiocb,
        return 0;
 }
+/**
+ * lpfc_els_rcv_farpr: Process an unsolicited farp response iocb.
+ * @vport: pointer to a host virtual N_Port data structure.
+ * @cmdiocb: pointer to lpfc command iocb data structure.
+ * @ndlp: pointer to a node-list data structure.
+ *
+ * This routine processes Fibre Channel Address Resolution Protocol
+ * Response (FARPR) IOCB received as an ELS unsolicited event. It simply
+ * invokes the lpfc_els_rsp_acc() routine to the remote node to accept
+ * the FARP response request.
+ *
+ * Return code
+ *   0 - Successfully processed FARPR IOCB (currently always return 0)
+ **/
 static int
 lpfc_els_rcv_farpr(struct lpfc_vport *vport, struct lpfc_iocbq *cmdiocb,
                   struct lpfc_nodelist  *ndlp)
@@ -3768,6 +4786,25 @@ lpfc_els_rcv_farpr(struct lpfc_vport *vport, struct lpfc_iocbq *cmdiocb,
        return 0;
 }
+/**
+ * lpfc_els_rcv_fan: Process an unsolicited fan iocb command.
+ * @vport: pointer to a host virtual N_Port data structure.
+ * @cmdiocb: pointer to lpfc command iocb data structure.
+ * @fan_ndlp: pointer to a node-list data structure.
+ *
+ * This routine processes a Fabric Address Notification (FAN) IOCB
+ * command received as an ELS unsolicited event. The FAN ELS command will
+ * only be processed on a physical port (i.e., the @vport represents the
+ * physical port). The fabric NodeName and PortName from the FAN IOCB are
+ * compared against those in the phba data structure. If any of those is
+ * different, the lpfc_initial_flogi() routine is invoked to initialize
+ * Fabric Login (FLOGI) to the fabric to start the discover over. Otherwise,
+ * if both of those are identical, the lpfc_issue_fabric_reglogin() routine
+ * is invoked to register login to the fabric.
+ *
+ * Return code
+ *   0 - Successfully processed fan iocb (currently always return 0).
+ **/
 static int
 lpfc_els_rcv_fan(struct lpfc_vport *vport, struct lpfc_iocbq *cmdiocb,
                 struct lpfc_nodelist *fan_ndlp)
@@ -3797,6 +4834,16 @@ lpfc_els_rcv_fan(struct lpfc_vport *vport, struct lpfc_iocbq *cmdiocb,
        return 0;
 }
+/**
+ * lpfc_els_timeout: Handler funciton to the els timer.
+ * @ptr: holder for the timer function associated data.
+ *
+ * This routine is invoked by the ELS timer after timeout. It posts the ELS
+ * timer timeout event by setting the WORKER_ELS_TMO bit to the work port
+ * event bitmap and then invokes the lpfc_worker_wake_up() routine to wake
+ * up the worker thread. It is for the worker thread to invoke the routine
+ * lpfc_els_timeout_handler() to work on the posted event WORKER_ELS_TMO.
+ **/
 void
 lpfc_els_timeout(unsigned long ptr)
 {
@@ -3816,6 +4863,15 @@ lpfc_els_timeout(unsigned long ptr)
        return;
 }
+/**
+ * lpfc_els_timeout_handler: Process an els timeout event.
+ * @vport: pointer to a virtual N_Port data structure.
+ *
+ * This routine is the actual handler function that processes an ELS timeout
+ * event. It walks the ELS ring to get and abort all the IOCBs (except the
+ * ABORT/CLOSE/FARP/FARPR/FDISC), which are associated with the @vport by
+ * invoking the lpfc_sli_issue_abort_iotag() routine.
+ **/
 void
 lpfc_els_timeout_handler(struct lpfc_vport *vport)
 {
@@ -3886,6 +4942,26 @@ lpfc_els_timeout_handler(struct lpfc_vport *vport)
                mod_timer(&vport->els_tmofunc, jiffies + HZ * timeout);
 }
+/**
+ * lpfc_els_flush_cmd: Clean up the outstanding els commands to a vport.
+ * @vport: pointer to a host virtual N_Port data structure.
+ *
+ * This routine is used to clean up all the outstanding ELS commands on a
+ * @vport. It first aborts the @vport by invoking lpfc_fabric_abort_vport()
+ * routine. After that, it walks the ELS transmit queue to remove all the
+ * IOCBs with the @vport other than the QUE_RING and ABORT/CLOSE IOCBs. For
+ * the IOCBs with a non-NULL completion callback function, the callback
+ * function will be invoked with the status set to IOSTAT_LOCAL_REJECT and
+ * un.ulpWord[4] set to IOERR_SLI_ABORTED. For IOCBs with a NULL completion
+ * callback function, the IOCB will simply be released. Finally, it walks
+ * the ELS transmit completion queue to issue an abort IOCB to any transmit
+ * completion queue IOCB that is associated with the @vport and is not
+ * an IOCB from libdfc (i.e., the management plane IOCBs that are not
+ * part of the discovery state machine) out to HBA by invoking the
+ * lpfc_sli_issue_abort_iotag() routine. Note that this function issues the
+ * abort IOCB to any transmit completion queueed IOCB, it does not guarantee
+ * the IOCBs are aborted when this function returns.
+ **/
 void
 lpfc_els_flush_cmd(struct lpfc_vport *vport)
 {
@@ -3948,6 +5024,23 @@ lpfc_els_flush_cmd(struct lpfc_vport *vport)
        return;
 }
+/**
+ * lpfc_els_flush_all_cmd: Clean up all the outstanding els commands to a HBA.
+ * @phba: pointer to lpfc hba data structure.
+ *
+ * This routine is used to clean up all the outstanding ELS commands on a
+ * @phba. It first aborts the @phba by invoking the lpfc_fabric_abort_hba()
+ * routine. After that, it walks the ELS transmit queue to remove all the
+ * IOCBs to the @phba other than the QUE_RING and ABORT/CLOSE IOCBs. For
+ * the IOCBs with the completion callback function associated, the callback
+ * function will be invoked with the status set to IOSTAT_LOCAL_REJECT and
+ * un.ulpWord[4] set to IOERR_SLI_ABORTED. For IOCBs without the completion
+ * callback function associated, the IOCB will simply be released. Finally,
+ * it walks the ELS transmit completion queue to issue an abort IOCB to any
+ * transmit completion queue IOCB that is not an IOCB from libdfc (i.e., the
+ * management plane IOCBs that are not part of the discovery state machine)
+ * out to HBA by invoking the lpfc_sli_issue_abort_iotag() routine.
+ **/
 void
 lpfc_els_flush_all_cmd(struct lpfc_hba  *phba)
 {
@@ -3992,6 +5085,130 @@ lpfc_els_flush_all_cmd(struct lpfc_hba  *phba)
        return;
 }
+/**
+ * lpfc_send_els_failure_event: Posts an ELS command failure event.
+ * @phba: Pointer to hba context object.
+ * @cmdiocbp: Pointer to command iocb which reported error.
+ * @rspiocbp: Pointer to response iocb which reported error.
+ *
+ * This function sends an event when there is an ELS command
+ * failure.
+ **/
+void
+lpfc_send_els_failure_event(struct lpfc_hba *phba,
+                        struct lpfc_iocbq *cmdiocbp,
+                        struct lpfc_iocbq *rspiocbp)
+{
+        struct lpfc_vport *vport = cmdiocbp->vport;
+        struct Scsi_Host *shost = lpfc_shost_from_vport(vport);
+        struct lpfc_lsrjt_event lsrjt_event;
+        struct lpfc_fabric_event_header fabric_event;
+        struct ls_rjt stat;
+        struct lpfc_nodelist *ndlp;
+        uint32_t *pcmd;
+        ndlp = cmdiocbp->context1;
+        if (!ndlp || !NLP_CHK_NODE_ACT(ndlp))
+                return;
+        if (rspiocbp->iocb.ulpStatus == IOSTAT_LS_RJT) {
+                lsrjt_event.header.event_type = FC_REG_ELS_EVENT;
+                lsrjt_event.header.subcategory = LPFC_EVENT_LSRJT_RCV;
+                memcpy(lsrjt_event.header.wwpn, &ndlp->nlp_portname,
+                        sizeof(struct lpfc_name));
+                memcpy(lsrjt_event.header.wwnn, &ndlp->nlp_nodename,
+                        sizeof(struct lpfc_name));
+                pcmd = (uint32_t *) (((struct lpfc_dmabuf *)
+                        cmdiocbp->context2)->virt);
+                lsrjt_event.command = *pcmd;
+                stat.un.lsRjtError = be32_to_cpu(rspiocbp->iocb.un.ulpWord[4]);
+                lsrjt_event.reason_code = stat.un.b.lsRjtRsnCode;
+                lsrjt_event.explanation = stat.un.b.lsRjtRsnCodeExp;
+                fc_host_post_vendor_event(shost,
+                        fc_get_event_number(),
+                        sizeof(lsrjt_event),
+                        (char *)&lsrjt_event,
+                        SCSI_NL_VID_TYPE_PCI | PCI_VENDOR_ID_EMULEX);
+                return;
+        }
+        if ((rspiocbp->iocb.ulpStatus == IOSTAT_NPORT_BSY) ||
+                (rspiocbp->iocb.ulpStatus == IOSTAT_FABRIC_BSY)) {
+                fabric_event.event_type = FC_REG_FABRIC_EVENT;
+                if (rspiocbp->iocb.ulpStatus == IOSTAT_NPORT_BSY)
+                        fabric_event.subcategory = LPFC_EVENT_PORT_BUSY;
+                else
+                        fabric_event.subcategory = LPFC_EVENT_FABRIC_BUSY;
+                memcpy(fabric_event.wwpn, &ndlp->nlp_portname,
+                        sizeof(struct lpfc_name));
+                memcpy(fabric_event.wwnn, &ndlp->nlp_nodename,
+                        sizeof(struct lpfc_name));
+                fc_host_post_vendor_event(shost,
+                        fc_get_event_number(),
+                        sizeof(fabric_event),
+                        (char *)&fabric_event,
+                        SCSI_NL_VID_TYPE_PCI | PCI_VENDOR_ID_EMULEX);
+                return;
+        }
+}
+/**
+ * lpfc_send_els_event: Posts unsolicited els event.
+ * @vport: Pointer to vport object.
+ * @ndlp: Pointer FC node object.
+ * @cmd: ELS command code.
+ *
+ * This function posts an event when there is an incoming
+ * unsolicited ELS command.
+ **/
+static void
+lpfc_send_els_event(struct lpfc_vport *vport,
+                    struct lpfc_nodelist *ndlp,
+                    uint32_t cmd)
+{
+        struct lpfc_els_event_header els_data;
+        struct Scsi_Host *shost = lpfc_shost_from_vport(vport);
+        els_data.event_type = FC_REG_ELS_EVENT;
+        switch (cmd) {
+        case ELS_CMD_PLOGI:
+                els_data.subcategory = LPFC_EVENT_PLOGI_RCV;
+                break;
+        case ELS_CMD_PRLO:
+                els_data.subcategory = LPFC_EVENT_PRLO_RCV;
+                break;
+        case ELS_CMD_ADISC:
+                els_data.subcategory = LPFC_EVENT_ADISC_RCV;
+                break;
+        default:
+                return;
+        }
+        memcpy(els_data.wwpn, &ndlp->nlp_portname, sizeof(struct lpfc_name));
+        memcpy(els_data.wwnn, &ndlp->nlp_nodename, sizeof(struct lpfc_name));
+        fc_host_post_vendor_event(shost,
+                fc_get_event_number(),
+                sizeof(els_data),
+                (char *)&els_data,
+                SCSI_NL_VID_TYPE_PCI | PCI_VENDOR_ID_EMULEX);
+        return;
+}
+/**
+ * lpfc_els_unsol_buffer: Process an unsolicited event data buffer.
+ * @phba: pointer to lpfc hba data structure.
+ * @pring: pointer to a SLI ring.
+ * @vport: pointer to a host virtual N_Port data structure.
+ * @elsiocb: pointer to lpfc els command iocb data structure.
+ *
+ * This routine is used for processing the IOCB associated with a unsolicited
+ * event. It first determines whether there is an existing ndlp that matches
+ * the DID from the unsolicited IOCB. If not, it will create a new one with
+ * the DID from the unsolicited IOCB. The ELS command from the unsolicited
+ * IOCB is then used to invoke the proper routine and to set up proper state
+ * of the discovery state machine.
+ **/
 static void
 lpfc_els_unsol_buffer(struct lpfc_hba *phba, struct lpfc_sli_ring *pring,
                      struct lpfc_vport *vport, struct lpfc_iocbq *elsiocb)
@@ -4059,8 +5276,6 @@ lpfc_els_unsol_buffer(struct lpfc_hba *phba, struct lpfc_sli_ring *pring,
        }
        phba->fc_stat.elsRcvFrame++;
-        if (elsiocb->context1)
-                lpfc_nlp_put(elsiocb->context1);
        elsiocb->context1 = lpfc_nlp_get(ndlp);
        elsiocb->vport = vport;
@@ -4081,6 +5296,7 @@ lpfc_els_unsol_buffer(struct lpfc_hba *phba, struct lpfc_sli_ring *pring,
                phba->fc_stat.elsRcvPLOGI++;
                ndlp = lpfc_plogi_confirm_nport(phba, payload, ndlp);
+                lpfc_send_els_event(vport, ndlp, cmd);
                if (vport->port_state < LPFC_DISC_AUTH) {
                        if (!(phba->pport->fc_flag & FC_PT2PT) ||
                                (phba->pport->fc_flag & FC_PT2PT_PLOGI)) {
@@ -4130,6 +5346,7 @@ lpfc_els_unsol_buffer(struct lpfc_hba *phba, struct lpfc_sli_ring *pring,
                        did, vport->port_state, ndlp->nlp_flag);
                phba->fc_stat.elsRcvPRLO++;
+                lpfc_send_els_event(vport, ndlp, cmd);
                if (vport->port_state < LPFC_DISC_AUTH) {
                        rjt_err = LSRJT_UNABLE_TPC;
                        break;
@@ -4147,6 +5364,7 @@ lpfc_els_unsol_buffer(struct lpfc_hba *phba, struct lpfc_sli_ring *pring,
                        "RCV ADISC:       did:x%x/ste:x%x flg:x%x",
                        did, vport->port_state, ndlp->nlp_flag);
+                lpfc_send_els_event(vport, ndlp, cmd);
                phba->fc_stat.elsRcvADISC++;
                if (vport->port_state < LPFC_DISC_AUTH) {
                        rjt_err = LSRJT_UNABLE_TPC;
@@ -4270,6 +5488,8 @@ lpfc_els_unsol_buffer(struct lpfc_hba *phba, struct lpfc_sli_ring *pring,
                        NULL);
        }
+        lpfc_nlp_put(elsiocb->context1);
+        elsiocb->context1 = NULL;
        return;
 dropit:
@@ -4282,6 +5502,19 @@ dropit:
        phba->fc_stat.elsRcvDrop++;
 }
+/**
+ * lpfc_find_vport_by_vpid: Find a vport on a HBA through vport identifier.
+ * @phba: pointer to lpfc hba data structure.
+ * @vpi: host virtual N_Port identifier.
+ *
+ * This routine finds a vport on a HBA (referred by @phba) through a
+ * @vpi. The function walks the HBA's vport list and returns the address
+ * of the vport with the matching @vpi.
+ *
+ * Return code
+ *    NULL - No vport with the matching @vpi found
+ *    Otherwise - Address to the vport with the matching @vpi.
+ **/
 static struct lpfc_vport *
 lpfc_find_vport_by_vpid(struct lpfc_hba *phba, uint16_t vpi)
 {
@@ -4299,6 +5532,18 @@ lpfc_find_vport_by_vpid(struct lpfc_hba *phba, uint16_t vpi)
        return NULL;
 }
+/**
+ * lpfc_els_unsol_event: Process an unsolicited event from an els sli ring.
+ * @phba: pointer to lpfc hba data structure.
+ * @pring: pointer to a SLI ring.
+ * @elsiocb: pointer to lpfc els iocb data structure.
+ *
+ * This routine is used to process an unsolicited event received from a SLI
+ * (Service Level Interface) ring. The actual processing of the data buffer
+ * associated with the unsolicited event is done by invoking the routine
+ * lpfc_els_unsol_buffer() after properly set up the iocb buffer from the
+ * SLI ring on which the unsolicited event was received.
+ **/
 void
 lpfc_els_unsol_event(struct lpfc_hba *phba, struct lpfc_sli_ring *pring,
                     struct lpfc_iocbq *elsiocb)
@@ -4309,6 +5554,7 @@ lpfc_els_unsol_event(struct lpfc_hba *phba, struct lpfc_sli_ring *pring,
        struct lpfc_dmabuf *bdeBuf1 = elsiocb->context2;
        struct lpfc_dmabuf *bdeBuf2 = elsiocb->context3;
+        elsiocb->context1 = NULL;
        elsiocb->context2 = NULL;
        elsiocb->context3 = NULL;
@@ -4356,8 +5602,6 @@ lpfc_els_unsol_event(struct lpfc_hba *phba, struct lpfc_sli_ring *pring,
         * The different unsolicited event handlers would tell us
         * if they are done with "mp" by setting context2 to NULL.
         */
-        lpfc_nlp_put(elsiocb->context1);
-        elsiocb->context1 = NULL;
        if (elsiocb->context2) {
                lpfc_in_buf_free(phba, (struct lpfc_dmabuf *)elsiocb->context2);
                elsiocb->context2 = NULL;
@@ -4376,6 +5620,19 @@ lpfc_els_unsol_event(struct lpfc_hba *phba, struct lpfc_sli_ring *pring,
        }
 }
+/**
+ * lpfc_do_scr_ns_plogi: Issue a plogi to the name server for scr.
+ * @phba: pointer to lpfc hba data structure.
+ * @vport: pointer to a virtual N_Port data structure.
+ *
+ * This routine issues a Port Login (PLOGI) to the Name Server with
+ * State Change Request (SCR) for a @vport. This routine will create an
+ * ndlp for the Name Server associated to the @vport if such node does
+ * not already exist. The PLOGI to Name Server is issued by invoking the
+ * lpfc_issue_els_plogi() routine. If Fabric-Device Management Interface
+ * (FDMI) is configured to the @vport, a FDMI node will be created and
+ * the PLOGI to FDMI is issued by invoking lpfc_issue_els_plogi() routine.
+ **/
 void
 lpfc_do_scr_ns_plogi(struct lpfc_hba *phba, struct lpfc_vport *vport)
 {
@@ -4434,6 +5691,18 @@ lpfc_do_scr_ns_plogi(struct lpfc_hba *phba, struct lpfc_vport *vport)
        return;
 }
+/**
+ * lpfc_cmpl_reg_new_vport: Completion callback function to register new vport.
+ * @phba: pointer to lpfc hba data structure.
+ * @pmb: pointer to the driver internal queue element for mailbox command.
+ *
+ * This routine is the completion callback function to register new vport
+ * mailbox command. If the new vport mailbox command completes successfully,
+ * the fabric registration login shall be performed on physical port (the
+ * new vport created is actually a physical port, with VPI 0) or the port
+ * login to Name Server for State Change Request (SCR) will be performed
+ * on virtual port (real virtual port, with VPI greater than 0).
+ **/
 static void
 lpfc_cmpl_reg_new_vport(struct lpfc_hba *phba, LPFC_MBOXQ_t *pmb)
 {
@@ -4491,6 +5760,15 @@ lpfc_cmpl_reg_new_vport(struct lpfc_hba *phba, LPFC_MBOXQ_t *pmb)
        return;
 }
+/**
+ * lpfc_register_new_vport: Register a new vport with a HBA.
+ * @phba: pointer to lpfc hba data structure.
+ * @vport: pointer to a host virtual N_Port data structure.
+ * @ndlp: pointer to a node-list data structure.
+ *
+ * This routine registers the @vport as a new virtual port with a HBA.
+ * It is done through a registering vpi mailbox command.
+ **/
 static void
 lpfc_register_new_vport(struct lpfc_hba *phba, struct lpfc_vport *vport,
                        struct lpfc_nodelist *ndlp)
@@ -4531,6 +5809,26 @@ mbox_err_exit:
        return;
 }
+/**
+ * lpfc_cmpl_els_fdisc: Completion function for fdisc iocb command.
+ * @phba: pointer to lpfc hba data structure.
+ * @cmdiocb: pointer to lpfc command iocb data structure.
+ * @rspiocb: pointer to lpfc response iocb data structure.
+ *
+ * This routine is the completion callback function to a Fabric Discover
+ * (FDISC) ELS command. Since all the FDISC ELS commands are issued
+ * single threaded, each FDISC completion callback function will reset
+ * the discovery timer for all vports such that the timers will not get
+ * unnecessary timeout. The function checks the FDISC IOCB status. If error
+ * detected, the vport will be set to FC_VPORT_FAILED state. Otherwise,the
+ * vport will set to FC_VPORT_ACTIVE state. It then checks whether the DID
+ * assigned to the vport has been changed with the completion of the FDISC
+ * command. If so, both RPI (Remote Port Index) and VPI (Virtual Port Index)
+ * are unregistered from the HBA, and then the lpfc_register_new_vport()
+ * routine is invoked to register new vport with the HBA. Otherwise, the
+ * lpfc_do_scr_ns_plogi() routine is invoked to issue a PLOGI to the Name
+ * Server for State Change Request (SCR).
+ **/
 static void
 lpfc_cmpl_els_fdisc(struct lpfc_hba *phba, struct lpfc_iocbq *cmdiocb,
                    struct lpfc_iocbq *rspiocb)
@@ -4565,58 +5863,80 @@ lpfc_cmpl_els_fdisc(struct lpfc_hba *phba, struct lpfc_iocbq *cmdiocb,
                        goto out;
                /* FDISC failed */
                lpfc_printf_vlog(vport, KERN_ERR, LOG_ELS,
-                                 "0124 FDISC failed. (%d/%d)\n",
+                                 "0126 FDISC failed. (%d/%d)\n",
                                 irsp->ulpStatus, irsp->un.ulpWord[4]);
+                goto fdisc_failed;
+        }
                if (vport->fc_vport->vport_state == FC_VPORT_INITIALIZING)
                        lpfc_vport_set_state(vport, FC_VPORT_FAILED);
                lpfc_nlp_put(ndlp);
                /* giving up on FDISC. Cancel discovery timer */
                lpfc_can_disctmo(vport);
-        } else {
+        spin_lock_irq(shost->host_lock);
-                spin_lock_irq(shost->host_lock);
+        vport->fc_flag |= FC_FABRIC;
-                vport->fc_flag |= FC_FABRIC;
+        if (vport->phba->fc_topology == TOPOLOGY_LOOP)
-                if (vport->phba->fc_topology == TOPOLOGY_LOOP)
+                vport->fc_flag |=  FC_PUBLIC_LOOP;
-                        vport->fc_flag |=  FC_PUBLIC_LOOP;
+        spin_unlock_irq(shost->host_lock);
-                spin_unlock_irq(shost->host_lock);
-                vport->fc_myDID = irsp->un.ulpWord[4] & Mask_DID;
+        vport->fc_myDID = irsp->un.ulpWord[4] & Mask_DID;
-                lpfc_vport_set_state(vport, FC_VPORT_ACTIVE);
+        lpfc_vport_set_state(vport, FC_VPORT_ACTIVE);
-                if ((vport->fc_prevDID != vport->fc_myDID) &&
+        if ((vport->fc_prevDID != vport->fc_myDID) &&
-                        !(vport->fc_flag & FC_VPORT_NEEDS_REG_VPI)) {
+                !(vport->fc_flag & FC_VPORT_NEEDS_REG_VPI)) {
-                        /* If our NportID changed, we need to ensure all
+                /* If our NportID changed, we need to ensure all
-                         * remaining NPORTs get unreg_login'ed so we can
+                 * remaining NPORTs get unreg_login'ed so we can
-                         * issue unreg_vpi.
+                 * issue unreg_vpi.
-                         */
+                 */
-                        list_for_each_entry_safe(np, next_np,
+                list_for_each_entry_safe(np, next_np,
-                                &vport->fc_nodes, nlp_listp) {
+                        &vport->fc_nodes, nlp_listp) {
-                                if (!NLP_CHK_NODE_ACT(ndlp) ||
+                        if (!NLP_CHK_NODE_ACT(ndlp) ||
-                                    (np->nlp_state != NLP_STE_NPR_NODE) ||
+                            (np->nlp_state != NLP_STE_NPR_NODE) ||
-                                    !(np->nlp_flag & NLP_NPR_ADISC))
+                            !(np->nlp_flag & NLP_NPR_ADISC))
-                                        continue;
+                                continue;
-                                spin_lock_irq(shost->host_lock);
-                                np->nlp_flag &= ~NLP_NPR_ADISC;
-                                spin_unlock_irq(shost->host_lock);
-                                lpfc_unreg_rpi(vport, np);
-                        }
-                        lpfc_mbx_unreg_vpi(vport);
                        spin_lock_irq(shost->host_lock);
-                        vport->fc_flag |= FC_VPORT_NEEDS_REG_VPI;
+                        np->nlp_flag &= ~NLP_NPR_ADISC;
                        spin_unlock_irq(shost->host_lock);
+                        lpfc_unreg_rpi(vport, np);
                }
+                lpfc_mbx_unreg_vpi(vport);
-                if (vport->fc_flag & FC_VPORT_NEEDS_REG_VPI)
+                spin_lock_irq(shost->host_lock);
-                        lpfc_register_new_vport(phba, vport, ndlp);
+                vport->fc_flag |= FC_VPORT_NEEDS_REG_VPI;
-                else
+                spin_unlock_irq(shost->host_lock);
-                        lpfc_do_scr_ns_plogi(phba, vport);
-                /* Unconditionaly kick off releasing fabric node for vports */
-                lpfc_nlp_put(ndlp);
        }
+        if (vport->fc_flag & FC_VPORT_NEEDS_REG_VPI)
+                lpfc_register_new_vport(phba, vport, ndlp);
+        else
+                lpfc_do_scr_ns_plogi(phba, vport);
+        goto out;
+fdisc_failed:
+        lpfc_vport_set_state(vport, FC_VPORT_FAILED);
+        /* Cancel discovery timer */
+        lpfc_can_disctmo(vport);
+        lpfc_nlp_put(ndlp);
 out:
        lpfc_els_free_iocb(phba, cmdiocb);
 }
+/**
+ * lpfc_issue_els_fdisc: Issue a fdisc iocb command.
+ * @vport: pointer to a virtual N_Port data structure.
+ * @ndlp: pointer to a node-list data structure.
+ * @retry: number of retries to the command IOCB.
+ *
+ * This routine prepares and issues a Fabric Discover (FDISC) IOCB to
+ * a remote node (@ndlp) off a @vport. It uses the lpfc_issue_fabric_iocb()
+ * routine to issue the IOCB, which makes sure only one outstanding fabric
+ * IOCB will be sent off HBA at any given time.
+ *
+ * Note that, in lpfc_prep_els_iocb() routine, the reference count of ndlp
+ * will be incremented by 1 for holding the ndlp and the reference to ndlp
+ * will be stored into the context1 field of the IOCB for the completion
+ * callback function to the FDISC ELS command.
+ *
+ * Return code
+ *   0 - Successfully issued fdisc iocb command
+ *   1 - Failed to issue fdisc iocb command
+ **/
 static int
 lpfc_issue_els_fdisc(struct lpfc_vport *vport, struct lpfc_nodelist *ndlp,
                     uint8_t retry)
@@ -4691,6 +6011,20 @@ lpfc_issue_els_fdisc(struct lpfc_vport *vport, struct lpfc_nodelist *ndlp,
        return 0;
 }
+/**
+ * lpfc_cmpl_els_npiv_logo: Completion function with vport logo.
+ * @phba: pointer to lpfc hba data structure.
+ * @cmdiocb: pointer to lpfc command iocb data structure.
+ * @rspiocb: pointer to lpfc response iocb data structure.
+ *
+ * This routine is the completion callback function to the issuing of a LOGO
+ * ELS command off a vport. It frees the command IOCB and then decrement the
+ * reference count held on ndlp for this completion function, indicating that
+ * the reference to the ndlp is no long needed. Note that the
+ * lpfc_els_free_iocb() routine decrements the ndlp reference held for this
+ * callback function and an additional explicit ndlp reference decrementation
+ * will trigger the actual release of the ndlp.
+ **/
 static void
 lpfc_cmpl_els_npiv_logo(struct lpfc_hba *phba, struct lpfc_iocbq *cmdiocb,
                        struct lpfc_iocbq *rspiocb)
@@ -4712,6 +6046,22 @@ lpfc_cmpl_els_npiv_logo(struct lpfc_hba *phba, struct lpfc_iocbq *cmdiocb,
        lpfc_nlp_put(ndlp);
 }
+/**
+ * lpfc_issue_els_npiv_logo: Issue a logo off a vport.
+ * @vport: pointer to a virtual N_Port data structure.
+ * @ndlp: pointer to a node-list data structure.
+ *
+ * This routine issues a LOGO ELS command to an @ndlp off a @vport.
+ *
+ * Note that, in lpfc_prep_els_iocb() routine, the reference count of ndlp
+ * will be incremented by 1 for holding the ndlp and the reference to ndlp
+ * will be stored into the context1 field of the IOCB for the completion
+ * callback function to the LOGO ELS command.
+ *
+ * Return codes
+ *   0 - Successfully issued logo off the @vport
+ *   1 - Failed to issue logo off the @vport
+ **/
 int
 lpfc_issue_els_npiv_logo(struct lpfc_vport *vport, struct lpfc_nodelist *ndlp)
 {
@@ -4757,6 +6107,17 @@ lpfc_issue_els_npiv_logo(struct lpfc_vport *vport, struct lpfc_nodelist *ndlp)
        return 0;
 }
+/**
+ * lpfc_fabric_block_timeout: Handler function to the fabric block timer.
+ * @ptr: holder for the timer function associated data.
+ *
+ * This routine is invoked by the fabric iocb block timer after
+ * timeout. It posts the fabric iocb block timeout event by setting the
+ * WORKER_FABRIC_BLOCK_TMO bit to work port event bitmap and then invokes
+ * lpfc_worker_wake_up() routine to wake up the worker thread. It is for
+ * the worker thread to invoke the lpfc_unblock_fabric_iocbs() on the
+ * posted event WORKER_FABRIC_BLOCK_TMO.
+ **/
 void
 lpfc_fabric_block_timeout(unsigned long ptr)
 {
@@ -4775,6 +6136,16 @@ lpfc_fabric_block_timeout(unsigned long ptr)
        return;
 }
+/**
+ * lpfc_resume_fabric_iocbs: Issue a fabric iocb from driver internal list.
+ * @phba: pointer to lpfc hba data structure.
+ *
+ * This routine issues one fabric iocb from the driver internal list to
+ * the HBA. It first checks whether it's ready to issue one fabric iocb to
+ * the HBA (whether there is no outstanding fabric iocb). If so, it shall
+ * remove one pending fabric iocb from the driver internal list and invokes
+ * lpfc_sli_issue_iocb() routine to send the fabric iocb to the HBA.
+ **/
 static void
 lpfc_resume_fabric_iocbs(struct lpfc_hba *phba)
 {
@@ -4824,6 +6195,15 @@ repeat:
        return;
 }
+/**
+ * lpfc_unblock_fabric_iocbs: Unblock issuing fabric iocb command.
+ * @phba: pointer to lpfc hba data structure.
+ *
+ * This routine unblocks the  issuing fabric iocb command. The function
+ * will clear the fabric iocb block bit and then invoke the routine
+ * lpfc_resume_fabric_iocbs() to issue one of the pending fabric iocb
+ * from the driver internal fabric iocb list.
+ **/
 void
 lpfc_unblock_fabric_iocbs(struct lpfc_hba *phba)
 {
@@ -4833,6 +6213,15 @@ lpfc_unblock_fabric_iocbs(struct lpfc_hba *phba)
        return;
 }
+/**
+ * lpfc_block_fabric_iocbs: Block issuing fabric iocb command.
+ * @phba: pointer to lpfc hba data structure.
+ *
+ * This routine blocks the issuing fabric iocb for a specified amount of
+ * time (currently 100 ms). This is done by set the fabric iocb block bit
+ * and set up a timeout timer for 100ms. When the block bit is set, no more
+ * fabric iocb will be issued out of the HBA.
+ **/
 static void
 lpfc_block_fabric_iocbs(struct lpfc_hba *phba)
 {
@@ -4846,6 +6235,19 @@ lpfc_block_fabric_iocbs(struct lpfc_hba *phba)
        return;
 }
+/**
+ * lpfc_cmpl_fabric_iocb: Completion callback function for fabric iocb.
+ * @phba: pointer to lpfc hba data structure.
+ * @cmdiocb: pointer to lpfc command iocb data structure.
+ * @rspiocb: pointer to lpfc response iocb data structure.
+ *
+ * This routine is the callback function that is put to the fabric iocb's
+ * callback function pointer (iocb->iocb_cmpl). The original iocb's callback
+ * function pointer has been stored in iocb->fabric_iocb_cmpl. This callback
+ * function first restores and invokes the original iocb's callback function
+ * and then invokes the lpfc_resume_fabric_iocbs() routine to issue the next
+ * fabric bound iocb from the driver internal fabric iocb list onto the wire.
+ **/
 static void
 lpfc_cmpl_fabric_iocb(struct lpfc_hba *phba, struct lpfc_iocbq *cmdiocb,
        struct lpfc_iocbq *rspiocb)
@@ -4892,6 +6294,30 @@ lpfc_cmpl_fabric_iocb(struct lpfc_hba *phba, struct lpfc_iocbq *cmdiocb,
        }
 }
+/**
+ * lpfc_issue_fabric_iocb: Issue a fabric iocb command.
+ * @phba: pointer to lpfc hba data structure.
+ * @iocb: pointer to lpfc command iocb data structure.
+ *
+ * This routine is used as the top-level API for issuing a fabric iocb command
+ * such as FLOGI and FDISC. To accommodate certain switch fabric, this driver
+ * function makes sure that only one fabric bound iocb will be outstanding at
+ * any given time. As such, this function will first check to see whether there
+ * is already an outstanding fabric iocb on the wire. If so, it will put the
+ * newly issued iocb onto the driver internal fabric iocb list, waiting to be
+ * issued later. Otherwise, it will issue the iocb on the wire and update the
+ * fabric iocb count it indicate that there is one fabric iocb on the wire.
+ *
+ * Note, this implementation has a potential sending out fabric IOCBs out of
+ * order. The problem is caused by the construction of the "ready" boolen does
+ * not include the condition that the internal fabric IOCB list is empty. As
+ * such, it is possible a fabric IOCB issued by this routine might be "jump"
+ * ahead of the fabric IOCBs in the internal list.
+ *
+ * Return code
+ *   IOCB_SUCCESS - either fabric iocb put on the list or issued successfully
+ *   IOCB_ERROR - failed to issue fabric iocb
+ **/
 static int
 lpfc_issue_fabric_iocb(struct lpfc_hba *phba, struct lpfc_iocbq *iocb)
 {
@@ -4937,7 +6363,17 @@ lpfc_issue_fabric_iocb(struct lpfc_hba *phba, struct lpfc_iocbq *iocb)
        return ret;
 }
+/**
+ * lpfc_fabric_abort_vport: Abort a vport's iocbs from driver fabric iocb list.
+ * @vport: pointer to a virtual N_Port data structure.
+ *
+ * This routine aborts all the IOCBs associated with a @vport from the
+ * driver internal fabric IOCB list. The list contains fabric IOCBs to be
+ * issued to the ELS IOCB ring. This abort function walks the fabric IOCB
+ * list, removes each IOCB associated with the @vport off the list, set the
+ * status feild to IOSTAT_LOCAL_REJECT, and invokes the callback function
+ * associated with the IOCB.
+ **/
 static void lpfc_fabric_abort_vport(struct lpfc_vport *vport)
 {
        LIST_HEAD(completions);
@@ -4967,6 +6403,17 @@ static void lpfc_fabric_abort_vport(struct lpfc_vport *vport)
        }
 }
+/**
+ * lpfc_fabric_abort_nport: Abort a ndlp's iocbs from driver fabric iocb list.
+ * @ndlp: pointer to a node-list data structure.
+ *
+ * This routine aborts all the IOCBs associated with an @ndlp from the
+ * driver internal fabric IOCB list. The list contains fabric IOCBs to be
+ * issued to the ELS IOCB ring. This abort function walks the fabric IOCB
+ * list, removes each IOCB associated with the @ndlp off the list, set the
+ * status feild to IOSTAT_LOCAL_REJECT, and invokes the callback function
+ * associated with the IOCB.
+ **/
 void lpfc_fabric_abort_nport(struct lpfc_nodelist *ndlp)
 {
        LIST_HEAD(completions);
@@ -4996,6 +6443,17 @@ void lpfc_fabric_abort_nport(struct lpfc_nodelist *ndlp)
        }
 }
+/**
+ * lpfc_fabric_abort_hba: Abort all iocbs on driver fabric iocb list.
+ * @phba: pointer to lpfc hba data structure.
+ *
+ * This routine aborts all the IOCBs currently on the driver internal
+ * fabric IOCB list. The list contains fabric IOCBs to be issued to the ELS
+ * IOCB ring. This function takes the entire IOCB list off the fabric IOCB
+ * list, removes IOCBs off the list, set the status feild to
+ * IOSTAT_LOCAL_REJECT, and invokes the callback function associated with
+ * the IOCB.
+ **/
 void lpfc_fabric_abort_hba(struct lpfc_hba *phba)
 {
        LIST_HEAD(completions);
diff --git a/drivers/scsi/lpfc/lpfc_hbadisc.c b/drivers/scsi/lpfc/lpfc_hbadisc.c
index a98d11bf3576..a1a70d9ffc2a 100644
--- a/drivers/scsi/lpfc/lpfc_hbadisc.c
+++ b/drivers/scsi/lpfc/lpfc_hbadisc.c
@@ -30,6 +30,7 @@
 #include <scsi/scsi_transport_fc.h>
 #include "lpfc_hw.h"
+#include "lpfc_nl.h"
 #include "lpfc_disc.h"
 #include "lpfc_sli.h"
 #include "lpfc_scsi.h"
@@ -88,14 +89,6 @@ lpfc_terminate_rport_io(struct fc_rport *rport)
                        &phba->sli.ring[phba->sli.fcp_ring],
                        ndlp->nlp_sid, 0, LPFC_CTX_TGT);
        }
-        /*
-         * A device is normally blocked for rediscovery and unblocked when
-         * devloss timeout happens.  In case a vport is removed or driver
-         * unloaded before devloss timeout happens, we need to unblock here.
-         */
-        scsi_target_unblock(&rport->dev);
-        return;
 }
 /*
@@ -215,8 +208,16 @@ lpfc_dev_loss_tmo_handler(struct lpfc_nodelist *ndlp)
                return;
        }
-        if (ndlp->nlp_state == NLP_STE_MAPPED_NODE)
+        if (ndlp->nlp_state == NLP_STE_MAPPED_NODE) {
+                lpfc_printf_vlog(vport, KERN_INFO, LOG_DISCOVERY,
+                                 "0284 Devloss timeout Ignored on "
+                                 "WWPN %x:%x:%x:%x:%x:%x:%x:%x "
+                                 "NPort x%x\n",
+                                 *name, *(name+1), *(name+2), *(name+3),
+                                 *(name+4), *(name+5), *(name+6), *(name+7),
+                                 ndlp->nlp_DID);
                return;
+        }
        if (ndlp->nlp_type & NLP_FABRIC) {
                /* We will clean up these Nodes in linkup */
@@ -237,8 +238,6 @@ lpfc_dev_loss_tmo_handler(struct lpfc_nodelist *ndlp)
                lpfc_sli_abort_iocb(vport, &phba->sli.ring[phba->sli.fcp_ring],
                                    ndlp->nlp_sid, 0, LPFC_CTX_TGT);
        }
-        if (vport->load_flag & FC_UNLOADING)
-                warn_on = 0;
        if (warn_on) {
                lpfc_printf_vlog(vport, KERN_ERR, LOG_DISCOVERY,
@@ -276,6 +275,124 @@ lpfc_dev_loss_tmo_handler(struct lpfc_nodelist *ndlp)
                lpfc_disc_state_machine(vport, ndlp, NULL, NLP_EVT_DEVICE_RM);
 }
+/**
+ * lpfc_alloc_fast_evt: Allocates data structure for posting event.
+ * @phba: Pointer to hba context object.
+ *
+ * This function is called from the functions which need to post
+ * events from interrupt context. This function allocates data
+ * structure required for posting event. It also keeps track of
+ * number of events pending and prevent event storm when there are
+ * too many events.
+ **/
+struct lpfc_fast_path_event *
+lpfc_alloc_fast_evt(struct lpfc_hba *phba) {
+        struct lpfc_fast_path_event *ret;
+        /* If there are lot of fast event do not exhaust memory due to this */
+        if (atomic_read(&phba->fast_event_count) > LPFC_MAX_EVT_COUNT)
+                return NULL;
+        ret = kzalloc(sizeof(struct lpfc_fast_path_event),
+                        GFP_ATOMIC);
+        if (ret)
+                atomic_inc(&phba->fast_event_count);
+        INIT_LIST_HEAD(&ret->work_evt.evt_listp);
+        ret->work_evt.evt = LPFC_EVT_FASTPATH_MGMT_EVT;
+        return ret;
+}
+/**
+ * lpfc_free_fast_evt: Frees event data structure.
+ * @phba: Pointer to hba context object.
+ * @evt:  Event object which need to be freed.
+ *
+ * This function frees the data structure required for posting
+ * events.
+ **/
+void
+lpfc_free_fast_evt(struct lpfc_hba *phba,
+                struct lpfc_fast_path_event *evt) {
+        atomic_dec(&phba->fast_event_count);
+        kfree(evt);
+}
+/**
+ * lpfc_send_fastpath_evt: Posts events generated from fast path.
+ * @phba: Pointer to hba context object.
+ * @evtp: Event data structure.
+ *
+ * This function is called from worker thread, when the interrupt
+ * context need to post an event. This function posts the event
+ * to fc transport netlink interface.
+ **/
+static void
+lpfc_send_fastpath_evt(struct lpfc_hba *phba,
+                struct lpfc_work_evt *evtp)
+{
+        unsigned long evt_category, evt_sub_category;
+        struct lpfc_fast_path_event *fast_evt_data;
+        char *evt_data;
+        uint32_t evt_data_size;
+        struct Scsi_Host *shost;
+        fast_evt_data = container_of(evtp, struct lpfc_fast_path_event,
+                work_evt);
+        evt_category = (unsigned long) fast_evt_data->un.fabric_evt.event_type;
+        evt_sub_category = (unsigned long) fast_evt_data->un.
+                        fabric_evt.subcategory;
+        shost = lpfc_shost_from_vport(fast_evt_data->vport);
+        if (evt_category == FC_REG_FABRIC_EVENT) {
+                if (evt_sub_category == LPFC_EVENT_FCPRDCHKERR) {
+                        evt_data = (char *) &fast_evt_data->un.read_check_error;
+                        evt_data_size = sizeof(fast_evt_data->un.
+                                read_check_error);
+                } else if ((evt_sub_category == LPFC_EVENT_FABRIC_BUSY) ||
+                        (evt_sub_category == IOSTAT_NPORT_BSY)) {
+                        evt_data = (char *) &fast_evt_data->un.fabric_evt;
+                        evt_data_size = sizeof(fast_evt_data->un.fabric_evt);
+                } else {
+                        lpfc_free_fast_evt(phba, fast_evt_data);
+                        return;
+                }
+        } else if (evt_category == FC_REG_SCSI_EVENT) {
+                switch (evt_sub_category) {
+                case LPFC_EVENT_QFULL:
+                case LPFC_EVENT_DEVBSY:
+                        evt_data = (char *) &fast_evt_data->un.scsi_evt;
+                        evt_data_size = sizeof(fast_evt_data->un.scsi_evt);
+                        break;
+                case LPFC_EVENT_CHECK_COND:
+                        evt_data = (char *) &fast_evt_data->un.check_cond_evt;
+                        evt_data_size =  sizeof(fast_evt_data->un.
+                                check_cond_evt);
+                        break;
+                case LPFC_EVENT_VARQUEDEPTH:
+                        evt_data = (char *) &fast_evt_data->un.queue_depth_evt;
+                        evt_data_size = sizeof(fast_evt_data->un.
+                                queue_depth_evt);
+                        break;
+                default:
+                        lpfc_free_fast_evt(phba, fast_evt_data);
+                        return;
+                }
+        } else {
+                lpfc_free_fast_evt(phba, fast_evt_data);
+                return;
+        }
+        fc_host_post_vendor_event(shost,
+                fc_get_event_number(),
+                evt_data_size,
+                evt_data,
+                SCSI_NL_VID_TYPE_PCI | PCI_VENDOR_ID_EMULEX);
+        lpfc_free_fast_evt(phba, fast_evt_data);
+        return;
+}
 static void
 lpfc_work_list_done(struct lpfc_hba *phba)
 {
@@ -347,6 +464,10 @@ lpfc_work_list_done(struct lpfc_hba *phba)
                        lpfc_unblock_mgmt_io(phba);
                        complete((struct completion *)(evtp->evt_arg2));
                        break;
+                case LPFC_EVT_FASTPATH_MGMT_EVT:
+                        lpfc_send_fastpath_evt(phba, evtp);
+                        free_evt = 0;
+                        break;
                }
                if (free_evt)
                        kfree(evtp);
@@ -371,6 +492,7 @@ lpfc_work_done(struct lpfc_hba *phba)
        spin_unlock_irq(&phba->hbalock);
        if (ha_copy & HA_ERATT)
+                /* Handle the error attention event */
                lpfc_handle_eratt(phba);
        if (ha_copy & HA_MBATT)
@@ -378,6 +500,7 @@ lpfc_work_done(struct lpfc_hba *phba)
        if (ha_copy & HA_LATT)
                lpfc_handle_latt(phba);
        vports = lpfc_create_vport_work_array(phba);
        if (vports != NULL)
                for(i = 0; i <= phba->max_vpi; i++) {
@@ -1013,14 +1136,10 @@ out:
 }
 static void
-lpfc_mbx_issue_link_down(struct lpfc_hba *phba)
+lpfc_enable_la(struct lpfc_hba *phba)
 {
        uint32_t control;
        struct lpfc_sli *psli = &phba->sli;
-        lpfc_linkdown(phba);
-        /* turn on Link Attention interrupts - no CLEAR_LA needed */
        spin_lock_irq(&phba->hbalock);
        psli->sli_flag |= LPFC_PROCESS_LA;
        control = readl(phba->HCregaddr);
@@ -1030,6 +1149,15 @@ lpfc_mbx_issue_link_down(struct lpfc_hba *phba)
        spin_unlock_irq(&phba->hbalock);
 }
+static void
+lpfc_mbx_issue_link_down(struct lpfc_hba *phba)
+{
+        lpfc_linkdown(phba);
+        lpfc_enable_la(phba);
+        /* turn on Link Attention interrupts - no CLEAR_LA needed */
+}
 /*
 * This routine handles processing a READ_LA mailbox
 * command upon completion. It is setup in the LPFC_MBOXQ
@@ -1077,8 +1205,12 @@ lpfc_mbx_cmpl_read_la(struct lpfc_hba *phba, LPFC_MBOXQ_t *pmb)
        }
        phba->fc_eventTag = la->eventTag;
+        if (la->mm)
+                phba->sli.sli_flag |= LPFC_MENLO_MAINT;
+        else
+                phba->sli.sli_flag &= ~LPFC_MENLO_MAINT;
-        if (la->attType == AT_LINK_UP) {
+        if (la->attType == AT_LINK_UP && (!la->mm)) {
                phba->fc_stat.LinkUp++;
                if (phba->link_flag & LS_LOOPBACK_MODE) {
                        lpfc_printf_log(phba, KERN_ERR, LOG_LINK_EVENT,
@@ -1090,13 +1222,15 @@ lpfc_mbx_cmpl_read_la(struct lpfc_hba *phba, LPFC_MBOXQ_t *pmb)
                } else {
                        lpfc_printf_log(phba, KERN_ERR, LOG_LINK_EVENT,
                                        "1303 Link Up Event x%x received "
-                                        "Data: x%x x%x x%x x%x\n",
+                                        "Data: x%x x%x x%x x%x x%x x%x %d\n",
                                        la->eventTag, phba->fc_eventTag,
                                        la->granted_AL_PA, la->UlnkSpeed,
-                                        phba->alpa_map[0]);
+                                        phba->alpa_map[0],
+                                        la->mm, la->fa,
+                                        phba->wait_4_mlo_maint_flg);
                }
                lpfc_mbx_process_link_up(phba, la);
-        } else {
+        } else if (la->attType == AT_LINK_DOWN) {
                phba->fc_stat.LinkDown++;
                if (phba->link_flag & LS_LOOPBACK_MODE) {
                        lpfc_printf_log(phba, KERN_ERR, LOG_LINK_EVENT,
@@ -1109,11 +1243,46 @@ lpfc_mbx_cmpl_read_la(struct lpfc_hba *phba, LPFC_MBOXQ_t *pmb)
                else {
                        lpfc_printf_log(phba, KERN_ERR, LOG_LINK_EVENT,
                                "1305 Link Down Event x%x received "
+                                "Data: x%x x%x x%x x%x x%x\n",
+                                la->eventTag, phba->fc_eventTag,
+                                phba->pport->port_state, vport->fc_flag,
+                                la->mm, la->fa);
+                }
+                lpfc_mbx_issue_link_down(phba);
+        }
+        if (la->mm && la->attType == AT_LINK_UP) {
+                if (phba->link_state != LPFC_LINK_DOWN) {
+                        phba->fc_stat.LinkDown++;
+                        lpfc_printf_log(phba, KERN_ERR, LOG_LINK_EVENT,
+                                "1312 Link Down Event x%x received "
+                                "Data: x%x x%x x%x\n",
+                                la->eventTag, phba->fc_eventTag,
+                                phba->pport->port_state, vport->fc_flag);
+                        lpfc_mbx_issue_link_down(phba);
+                } else
+                        lpfc_enable_la(phba);
+                lpfc_printf_log(phba, KERN_ERR, LOG_LINK_EVENT,
+                                "1310 Menlo Maint Mode Link up Event x%x rcvd "
                                "Data: x%x x%x x%x\n",
                                la->eventTag, phba->fc_eventTag,
                                phba->pport->port_state, vport->fc_flag);
+                /*
+                 * The cmnd that triggered this will be waiting for this
+                 * signal.
+                 */
+                /* WAKEUP for MENLO_SET_MODE or MENLO_RESET command. */
+                if (phba->wait_4_mlo_maint_flg) {
+                        phba->wait_4_mlo_maint_flg = 0;
+                        wake_up_interruptible(&phba->wait_4_mlo_m_q);
                }
-                lpfc_mbx_issue_link_down(phba);
+        }
+        if (la->fa) {
+                if (la->mm)
+                        lpfc_issue_clear_la(phba, vport);
+                lpfc_printf_log(phba, KERN_INFO, LOG_LINK_EVENT,
+                                "1311 fa %d\n", la->fa);
        }
 lpfc_mbx_cmpl_read_la_free_mbuf:
@@ -1177,7 +1346,7 @@ lpfc_mbx_cmpl_unreg_vpi(struct lpfc_hba *phba, LPFC_MBOXQ_t *pmb)
                scsi_host_put(shost);
 }
-void
+int
 lpfc_mbx_unreg_vpi(struct lpfc_vport *vport)
 {
        struct lpfc_hba  *phba = vport->phba;
@@ -1186,7 +1355,7 @@ lpfc_mbx_unreg_vpi(struct lpfc_vport *vport)
        mbox = mempool_alloc(phba->mbox_mem_pool, GFP_KERNEL);
        if (!mbox)
-                return;
+                return 1;
        lpfc_unreg_vpi(phba, vport->vpi, mbox);
        mbox->vport = vport;
@@ -1197,7 +1366,9 @@ lpfc_mbx_unreg_vpi(struct lpfc_vport *vport)
                                 "1800 Could not issue unreg_vpi\n");
                mempool_free(mbox, phba->mbox_mem_pool);
                vport->unreg_vpi_cmpl = VPORT_ERROR;
+                return rc;
        }
+        return 0;
 }
 static void
@@ -1553,6 +1724,22 @@ lpfc_nlp_state_cleanup(struct lpfc_vport *vport, struct lpfc_nodelist *ndlp,
                 */
                lpfc_register_remote_port(vport, ndlp);
        }
+        if ((new_state ==  NLP_STE_MAPPED_NODE) &&
+                (vport->stat_data_enabled)) {
+                /*
+                 * A new target is discovered, if there is no buffer for
+                 * statistical data collection allocate buffer.
+                 */
+                ndlp->lat_data = kcalloc(LPFC_MAX_BUCKET_COUNT,
+                                         sizeof(struct lpfc_scsicmd_bkt),
+                                         GFP_KERNEL);
+                if (!ndlp->lat_data)
+                        lpfc_printf_vlog(vport, KERN_ERR, LOG_NODE,
+                                "0286 lpfc_nlp_state_cleanup failed to "
+                                "allocate statistical data buffer DID "
+                                "0x%x\n", ndlp->nlp_DID);
+        }
        /*
         * if we added to Mapped list, but the remote port
         * registration failed or assigned a target id outside
@@ -2786,7 +2973,7 @@ restart_disc:
        default:
                lpfc_printf_vlog(vport, KERN_ERR, LOG_DISCOVERY,
-                                 "0229 Unexpected discovery timeout, "
+                                 "0273 Unexpected discovery timeout, "
                                 "vport State x%x\n", vport->port_state);
                break;
        }
@@ -2940,6 +3127,8 @@ lpfc_nlp_init(struct lpfc_vport *vport, struct lpfc_nodelist *ndlp,
        INIT_LIST_HEAD(&ndlp->nlp_listp);
        kref_init(&ndlp->kref);
        NLP_INT_NODE_ACT(ndlp);
+        atomic_set(&ndlp->cmd_pending, 0);
+        ndlp->cmd_qdepth = LPFC_MAX_TGT_QDEPTH;
        lpfc_debugfs_disc_trc(vport, LPFC_DISC_TRC_NODE,
                "node init:       did:x%x",
@@ -2979,8 +3168,10 @@ lpfc_nlp_release(struct kref *kref)
        spin_unlock_irqrestore(&phba->ndlp_lock, flags);
        /* free ndlp memory for final ndlp release */
-        if (NLP_CHK_FREE_REQ(ndlp))
+        if (NLP_CHK_FREE_REQ(ndlp)) {
+                kfree(ndlp->lat_data);
                mempool_free(ndlp, ndlp->vport->phba->nlp_mem_pool);
+        }
 }
 /* This routine bumps the reference count for a ndlp structure to ensure
diff --git a/drivers/scsi/lpfc/lpfc_hw.h b/drivers/scsi/lpfc/lpfc_hw.h
index 7773b949aa7c..5de5dabbbee6 100644
--- a/drivers/scsi/lpfc/lpfc_hw.h
+++ b/drivers/scsi/lpfc/lpfc_hw.h
@@ -1107,6 +1107,8 @@ typedef struct {
 /* Start FireFly Register definitions */
 #define PCI_VENDOR_ID_EMULEX        0x10df
 #define PCI_DEVICE_ID_FIREFLY       0x1ae5
+#define PCI_DEVICE_ID_PROTEUS_VF    0xe100
+#define PCI_DEVICE_ID_PROTEUS_PF    0xe180
 #define PCI_DEVICE_ID_SAT_SMB       0xf011
 #define PCI_DEVICE_ID_SAT_MID       0xf015
 #define PCI_DEVICE_ID_RFLY          0xf095
@@ -1133,10 +1135,12 @@ typedef struct {
 #define PCI_DEVICE_ID_LP11000S      0xfc10
 #define PCI_DEVICE_ID_LPE11000S     0xfc20
 #define PCI_DEVICE_ID_SAT_S         0xfc40
+#define PCI_DEVICE_ID_PROTEUS_S     0xfc50
 #define PCI_DEVICE_ID_HELIOS        0xfd00
 #define PCI_DEVICE_ID_HELIOS_SCSP   0xfd11
 #define PCI_DEVICE_ID_HELIOS_DCSP   0xfd12
 #define PCI_DEVICE_ID_ZEPHYR        0xfe00
+#define PCI_DEVICE_ID_HORNET        0xfe05
 #define PCI_DEVICE_ID_ZEPHYR_SCSP   0xfe11
 #define PCI_DEVICE_ID_ZEPHYR_DCSP   0xfe12
@@ -1154,6 +1158,7 @@ typedef struct {
 #define ZEPHYR_JEDEC_ID             0x0577
 #define VIPER_JEDEC_ID              0x4838
 #define SATURN_JEDEC_ID             0x1004
+#define HORNET_JDEC_ID              0x2057706D
 #define JEDEC_ID_MASK               0x0FFFF000
 #define JEDEC_ID_SHIFT              12
@@ -1198,6 +1203,18 @@ typedef struct {		/* FireFly BIU registers */
 #define HA_RXATT       0x00000008       /* Bit  3 */
 #define HA_RXMASK      0x0000000f
+#define HA_R0_CLR_MSK   (HA_R0RE_REQ | HA_R0CE_RSP | HA_R0ATT)
+#define HA_R1_CLR_MSK   (HA_R1RE_REQ | HA_R1CE_RSP | HA_R1ATT)
+#define HA_R2_CLR_MSK   (HA_R2RE_REQ | HA_R2CE_RSP | HA_R2ATT)
+#define HA_R3_CLR_MSK   (HA_R3RE_REQ | HA_R3CE_RSP | HA_R3ATT)
+#define HA_R0_POS       3
+#define HA_R1_POS       7
+#define HA_R2_POS       11
+#define HA_R3_POS       15
+#define HA_LE_POS       29
+#define HA_MB_POS       30
+#define HA_ER_POS       31
 /* Chip Attention Register */
 #define CA_REG_OFFSET  4        /* Byte offset from register base address */
@@ -1235,7 +1252,7 @@ typedef struct {		/* FireFly BIU registers */
 /* Host Control Register */
-#define HC_REG_OFFSET  12       /* Word offset from register base address */
+#define HC_REG_OFFSET  12       /* Byte offset from register base address */
 #define HC_MBINT_ENA   0x00000001       /* Bit  0 */
 #define HC_R0INT_ENA   0x00000002       /* Bit  1 */
@@ -1248,6 +1265,19 @@ typedef struct {		/* FireFly BIU registers */
 #define HC_LAINT_ENA   0x20000000       /* Bit 29 */
 #define HC_ERINT_ENA   0x80000000       /* Bit 31 */
+/* Message Signaled Interrupt eXtension (MSI-X) message identifiers */
+#define MSIX_DFLT_ID    0
+#define MSIX_RNG0_ID    0
+#define MSIX_RNG1_ID    1
+#define MSIX_RNG2_ID    2
+#define MSIX_RNG3_ID    3
+#define MSIX_LINK_ID    4
+#define MSIX_MBOX_ID    5
+#define MSIX_SPARE0_ID  6
+#define MSIX_SPARE1_ID  7
 /* Mailbox Commands */
 #define MBX_SHUTDOWN        0x00        /* terminate testing */
 #define MBX_LOAD_SM         0x01
@@ -1285,10 +1315,14 @@ typedef struct {		/* FireFly BIU registers */
 #define MBX_KILL_BOARD      0x24
 #define MBX_CONFIG_FARP     0x25
 #define MBX_BEACON          0x2A
+#define MBX_CONFIG_MSI      0x30
 #define MBX_HEARTBEAT       0x31
 #define MBX_WRITE_VPARMS    0x32
 #define MBX_ASYNCEVT_ENABLE 0x33
+#define MBX_PORT_CAPABILITIES 0x3B
+#define MBX_PORT_IOV_CONTROL 0x3C
 #define MBX_CONFIG_HBQ      0x7C
 #define MBX_LOAD_AREA       0x81
 #define MBX_RUN_BIU_DIAG64  0x84
@@ -1474,24 +1508,18 @@ struct ulp_bde64 {	/* SLI-2 */
                        uint32_t bdeFlags:8;    /* BDE Flags 0 IS A SUPPORTED
                                                   VALUE !! */
 #endif
+#define BUFF_TYPE_BDE_64    0x00        /* BDE (Host_resident) */
-#define BUFF_USE_RSVD       0x01        /* bdeFlags */
+#define BUFF_TYPE_BDE_IMMED 0x01        /* Immediate Data BDE */
-#define BUFF_USE_INTRPT     0x02        /* Not Implemented with LP6000 */
+#define BUFF_TYPE_BDE_64P   0x02        /* BDE (Port-resident) */
-#define BUFF_USE_CMND       0x04        /* Optional, 1=cmd/rsp 0=data buffer */
+#define BUFF_TYPE_BDE_64I   0x08        /* Input BDE (Host-resident) */
-#define BUFF_USE_RCV        0x08        /*  "" "", 1=rcv buffer, 0=xmit
+#define BUFF_TYPE_BDE_64IP  0x0A        /* Input BDE (Port-resident) */
-                                            buffer */
+#define BUFF_TYPE_BLP_64    0x40        /* BLP (Host-resident) */
-#define BUFF_TYPE_32BIT     0x10        /*  "" "", 1=32 bit addr 0=64 bit
+#define BUFF_TYPE_BLP_64P   0x42        /* BLP (Port-resident) */
-                                            addr */
-#define BUFF_TYPE_SPECIAL   0x20        /* Not Implemented with LP6000  */
-#define BUFF_TYPE_BDL       0x40        /* Optional,  may be set in BDL */
-#define BUFF_TYPE_INVALID   0x80        /*  ""  "" */
                } f;
        } tus;
        uint32_t addrLow;
        uint32_t addrHigh;
 };
-#define BDE64_SIZE_WORD 0
-#define BPL64_SIZE_WORD 0x40
 typedef struct ULP_BDL {        /* SLI-2 */
 #ifdef __BIG_ENDIAN_BITFIELD
@@ -2201,7 +2229,10 @@ typedef struct {
 typedef struct {
        uint32_t eventTag;      /* Event tag */
 #ifdef __BIG_ENDIAN_BITFIELD
-        uint32_t rsvd1:22;
+        uint32_t rsvd1:19;
+        uint32_t fa:1;
+        uint32_t mm:1;          /* Menlo Maintenance mode enabled */
+        uint32_t rx:1;
        uint32_t pb:1;
        uint32_t il:1;
        uint32_t attType:8;
@@ -2209,7 +2240,10 @@ typedef struct {
        uint32_t attType:8;
        uint32_t il:1;
        uint32_t pb:1;
-        uint32_t rsvd1:22;
+        uint32_t rx:1;
+        uint32_t mm:1;
+        uint32_t fa:1;
+        uint32_t rsvd1:19;
 #endif
 #define AT_RESERVED    0x00     /* Reserved - attType */
@@ -2230,6 +2264,7 @@ typedef struct {
 #define TOPOLOGY_PT_PT 0x01     /* Topology is pt-pt / pt-fabric */
 #define TOPOLOGY_LOOP  0x02     /* Topology is FC-AL */
+#define TOPOLOGY_LNK_MENLO_MAINTENANCE 0x05 /* maint mode zephtr to menlo */
        union {
                struct ulp_bde lilpBde; /* This BDE points to a 128 byte buffer
@@ -2324,6 +2359,36 @@ typedef struct {
 #define  DMP_RSP_OFFSET          0x14   /* word 5 contains first word of rsp */
 #define  DMP_RSP_SIZE            0x6C   /* maximum of 27 words of rsp data */
+/* Structure for MB Command UPDATE_CFG (0x1B) */
+struct update_cfg_var {
+#ifdef __BIG_ENDIAN_BITFIELD
+        uint32_t rsvd2:16;
+        uint32_t type:8;
+        uint32_t rsvd:1;
+        uint32_t ra:1;
+        uint32_t co:1;
+        uint32_t cv:1;
+        uint32_t req:4;
+        uint32_t entry_length:16;
+        uint32_t region_id:16;
+#else  /*  __LITTLE_ENDIAN_BITFIELD */
+        uint32_t req:4;
+        uint32_t cv:1;
+        uint32_t co:1;
+        uint32_t ra:1;
+        uint32_t rsvd:1;
+        uint32_t type:8;
+        uint32_t rsvd2:16;
+        uint32_t region_id:16;
+        uint32_t entry_length:16;
+#endif
+        uint32_t resp_info;
+        uint32_t byte_cnt;
+        uint32_t data_offset;
+};
 struct hbq_mask {
 #ifdef __BIG_ENDIAN_BITFIELD
        uint8_t tmatch;
@@ -2560,6 +2625,40 @@ typedef struct {
 } CONFIG_PORT_VAR;
+/* Structure for MB Command CONFIG_MSI (0x30) */
+struct config_msi_var {
+#ifdef __BIG_ENDIAN_BITFIELD
+        uint32_t dfltMsgNum:8;  /* Default message number            */
+        uint32_t rsvd1:11;      /* Reserved                          */
+        uint32_t NID:5;         /* Number of secondary attention IDs */
+        uint32_t rsvd2:5;       /* Reserved                          */
+        uint32_t dfltPresent:1; /* Default message number present    */
+        uint32_t addFlag:1;     /* Add association flag              */
+        uint32_t reportFlag:1;  /* Report association flag           */
+#else   /*  __LITTLE_ENDIAN_BITFIELD */
+        uint32_t reportFlag:1;  /* Report association flag           */
+        uint32_t addFlag:1;     /* Add association flag              */
+        uint32_t dfltPresent:1; /* Default message number present    */
+        uint32_t rsvd2:5;       /* Reserved                          */
+        uint32_t NID:5;         /* Number of secondary attention IDs */
+        uint32_t rsvd1:11;      /* Reserved                          */
+        uint32_t dfltMsgNum:8;  /* Default message number            */
+#endif
+        uint32_t attentionConditions[2];
+        uint8_t  attentionId[16];
+        uint8_t  messageNumberByHA[64];
+        uint8_t  messageNumberByID[16];
+        uint32_t autoClearHA[2];
+#ifdef __BIG_ENDIAN_BITFIELD
+        uint32_t rsvd3:16;
+        uint32_t autoClearID:16;
+#else   /*  __LITTLE_ENDIAN_BITFIELD */
+        uint32_t autoClearID:16;
+        uint32_t rsvd3:16;
+#endif
+        uint32_t rsvd4;
+};
 /* SLI-2 Port Control Block */
 /* SLIM POINTER */
@@ -2678,10 +2777,12 @@ typedef union {
                                         * NEW_FEATURE
                                         */
        struct config_hbq_var varCfgHbq;/* cmd = 0x7c (CONFIG_HBQ)  */
+        struct update_cfg_var varUpdateCfg; /* cmd = 0x1B (UPDATE_CFG)*/
        CONFIG_PORT_VAR varCfgPort;     /* cmd = 0x88 (CONFIG_PORT)  */
        REG_VPI_VAR varRegVpi;          /* cmd = 0x96 (REG_VPI) */
        UNREG_VPI_VAR varUnregVpi;      /* cmd = 0x97 (UNREG_VPI) */
        ASYNCEVT_ENABLE_VAR varCfgAsyncEvent; /*cmd = x33 (CONFIG_ASYNC) */
+        struct config_msi_var varCfgMSI;/* cmd = x30 (CONFIG_MSI)     */
 } MAILVARIANTS;
 /*
@@ -2715,11 +2816,19 @@ struct sli3_pgp {
        uint32_t hbq_get[16];
 };
-typedef union {
+struct sli3_inb_pgp {
-        struct sli2_desc s2;
+        uint32_t ha_copy;
-        struct sli3_desc s3;
+        uint32_t counter;
-        struct sli3_pgp  s3_pgp;
+        struct lpfc_pgp port[MAX_RINGS];
-} SLI_VAR;
+        uint32_t hbq_get[16];
+};
+union sli_var {
+        struct sli2_desc        s2;
+        struct sli3_desc        s3;
+        struct sli3_pgp         s3_pgp;
+        struct sli3_inb_pgp     s3_inb_pgp;
+};
 typedef struct {
 #ifdef __BIG_ENDIAN_BITFIELD
@@ -2737,7 +2846,7 @@ typedef struct {
 #endif
        MAILVARIANTS un;
-        SLI_VAR us;
+        union sli_var us;
 } MAILBOX_t;
 /*
@@ -3105,6 +3214,27 @@ struct que_xri64cx_ext_fields {
        struct lpfc_hbq_entry   buff[5];
 };
+#define LPFC_EXT_DATA_BDE_COUNT 3
+struct fcp_irw_ext {
+        uint32_t        io_tag64_low;
+        uint32_t        io_tag64_high;
+#ifdef __BIG_ENDIAN_BITFIELD
+        uint8_t         reserved1;
+        uint8_t         reserved2;
+        uint8_t         reserved3;
+        uint8_t         ebde_count;
+#else  /* __LITTLE_ENDIAN */
+        uint8_t         ebde_count;
+        uint8_t         reserved3;
+        uint8_t         reserved2;
+        uint8_t         reserved1;
+#endif
+        uint32_t        reserved4;
+        struct ulp_bde64 rbde;          /* response bde */
+        struct ulp_bde64 dbde[LPFC_EXT_DATA_BDE_COUNT]; /* data BDE or BPL */
+        uint8_t icd[32];                /* immediate command data (32 bytes) */
+};
 typedef struct _IOCB {  /* IOCB structure */
        union {
                GENERIC_RSP grsp;       /* Generic response */
@@ -3190,7 +3320,7 @@ typedef struct _IOCB {	/* IOCB structure */
                /* words 8-31 used for que_xri_cx iocb */
                struct que_xri64cx_ext_fields que_xri64cx_ext_words;
+                struct fcp_irw_ext fcp_ext;
                uint32_t sli3Words[24]; /* 96 extra bytes for SLI-3 */
        } unsli3;
@@ -3292,3 +3422,10 @@ lpfc_error_lost_link(IOCB_t *iocbp)
                 iocbp->un.ulpWord[4] == IOERR_LINK_DOWN ||
                 iocbp->un.ulpWord[4] == IOERR_SLI_DOWN));
 }
+#define MENLO_TRANSPORT_TYPE 0xfe
+#define MENLO_CONTEXT 0
+#define MENLO_PU 3
+#define MENLO_TIMEOUT 30
+#define SETVAR_MLOMNT 0x103107
+#define SETVAR_MLORST 0x103007
diff --git a/drivers/scsi/lpfc/lpfc_init.c b/drivers/scsi/lpfc/lpfc_init.c
index d51a2a4b43eb..909be3301bba 100644
--- a/drivers/scsi/lpfc/lpfc_init.c
+++ b/drivers/scsi/lpfc/lpfc_init.c
@@ -36,6 +36,7 @@
 #include "lpfc_hw.h"
 #include "lpfc_sli.h"
+#include "lpfc_nl.h"
 #include "lpfc_disc.h"
 #include "lpfc_scsi.h"
 #include "lpfc.h"
@@ -52,17 +53,20 @@ static struct scsi_transport_template *lpfc_transport_template = NULL;
 static struct scsi_transport_template *lpfc_vport_transport_template = NULL;
 static DEFINE_IDR(lpfc_hba_index);
-/************************************************************************/
+/**
-/*                                                                      */
+ * lpfc_config_port_prep: Perform lpfc initialization prior to config port.
-/*    lpfc_config_port_prep                                             */
+ * @phba: pointer to lpfc hba data structure.
-/*    This routine will do LPFC initialization prior to the             */
+ *
-/*    CONFIG_PORT mailbox command. This will be initialized             */
+ * This routine will do LPFC initialization prior to issuing the CONFIG_PORT
-/*    as a SLI layer callback routine.                                  */
+ * mailbox command. It retrieves the revision information from the HBA and
-/*    This routine returns 0 on success or -ERESTART if it wants        */
+ * collects the Vital Product Data (VPD) about the HBA for preparing the
-/*    the SLI layer to reset the HBA and try again. Any                 */
+ * configuration of the HBA.
-/*    other return value indicates an error.                            */
+ *
-/*                                                                      */
+ * Return codes:
-/************************************************************************/
+ *   0 - success.
+ *   -ERESTART - requests the SLI layer to reset the HBA and try again.
+ *   Any other value - indicates an error.
+ **/
 int
 lpfc_config_port_prep(struct lpfc_hba *phba)
 {
@@ -180,12 +184,9 @@ lpfc_config_port_prep(struct lpfc_hba *phba)
                                                sizeof (phba->RandomData));
        /* Get adapter VPD information */
-        pmb->context2 = kmalloc(DMP_RSP_SIZE, GFP_KERNEL);
-        if (!pmb->context2)
-                goto out_free_mbox;
        lpfc_vpd_data = kmalloc(DMP_VPD_SIZE, GFP_KERNEL);
        if (!lpfc_vpd_data)
-                goto out_free_context2;
+                goto out_free_mbox;
        do {
                lpfc_dump_mem(phba, pmb, offset);
@@ -200,21 +201,29 @@ lpfc_config_port_prep(struct lpfc_hba *phba)
                }
                if (mb->un.varDmp.word_cnt > DMP_VPD_SIZE - offset)
                        mb->un.varDmp.word_cnt = DMP_VPD_SIZE - offset;
-                lpfc_sli_pcimem_bcopy(pmb->context2, lpfc_vpd_data + offset,
+                lpfc_sli_pcimem_bcopy(((uint8_t *)mb) + DMP_RSP_OFFSET,
+                                      lpfc_vpd_data + offset,
                                      mb->un.varDmp.word_cnt);
                offset += mb->un.varDmp.word_cnt;
        } while (mb->un.varDmp.word_cnt && offset < DMP_VPD_SIZE);
        lpfc_parse_vpd(phba, lpfc_vpd_data, offset);
        kfree(lpfc_vpd_data);
-out_free_context2:
-        kfree(pmb->context2);
 out_free_mbox:
        mempool_free(pmb, phba->mbox_mem_pool);
        return 0;
 }
-/* Completion handler for config async event mailbox command. */
+/**
+ * lpfc_config_async_cmpl: Completion handler for config async event mbox cmd.
+ * @phba: pointer to lpfc hba data structure.
+ * @pmboxq: pointer to the driver internal queue element for mailbox command.
+ *
+ * This is the completion handler for driver's configuring asynchronous event
+ * mailbox command to the device. If the mailbox command returns successfully,
+ * it will set internal async event support flag to 1; otherwise, it will
+ * set internal async event support flag to 0.
+ **/
 static void
 lpfc_config_async_cmpl(struct lpfc_hba * phba, LPFC_MBOXQ_t * pmboxq)
 {
@@ -226,16 +235,19 @@ lpfc_config_async_cmpl(struct lpfc_hba * phba, LPFC_MBOXQ_t * pmboxq)
        return;
 }
-/************************************************************************/
+/**
-/*                                                                      */
+ * lpfc_config_port_post: Perform lpfc initialization after config port.
-/*    lpfc_config_port_post                                             */
+ * @phba: pointer to lpfc hba data structure.
-/*    This routine will do LPFC initialization after the                */
+ *
-/*    CONFIG_PORT mailbox command. This will be initialized             */
+ * This routine will do LPFC initialization after the CONFIG_PORT mailbox
-/*    as a SLI layer callback routine.                                  */
+ * command call. It performs all internal resource and state setups on the
-/*    This routine returns 0 on success. Any other return value         */
+ * port: post IOCB buffers, enable appropriate host interrupt attentions,
-/*    indicates an error.                                               */
+ * ELS ring timers, etc.
-/*                                                                      */
+ *
-/************************************************************************/
+ * Return codes
+ *   0 - success.
+ *   Any other value - error.
+ **/
 int
 lpfc_config_port_post(struct lpfc_hba *phba)
 {
@@ -378,6 +390,29 @@ lpfc_config_port_post(struct lpfc_hba *phba)
        if (phba->sli_rev != 3)
                lpfc_post_rcv_buf(phba);
+        /*
+         * Configure HBA MSI-X attention conditions to messages if MSI-X mode
+         */
+        if (phba->intr_type == MSIX) {
+                rc = lpfc_config_msi(phba, pmb);
+                if (rc) {
+                        mempool_free(pmb, phba->mbox_mem_pool);
+                        return -EIO;
+                }
+                rc = lpfc_sli_issue_mbox(phba, pmb, MBX_POLL);
+                if (rc != MBX_SUCCESS) {
+                        lpfc_printf_log(phba, KERN_ERR, LOG_MBOX,
+                                        "0352 Config MSI mailbox command "
+                                        "failed, mbxCmd x%x, mbxStatus x%x\n",
+                                        pmb->mb.mbxCommand, pmb->mb.mbxStatus);
+                        mempool_free(pmb, phba->mbox_mem_pool);
+                        return -EIO;
+                }
+        }
+        /* Initialize ERATT handling flag */
+        phba->hba_flag &= ~HBA_ERATT_HANDLED;
        /* Enable appropriate host interrupts */
        spin_lock_irq(&phba->hbalock);
        status = readl(phba->HCregaddr);
@@ -393,26 +428,26 @@ lpfc_config_port_post(struct lpfc_hba *phba)
        if ((phba->cfg_poll & ENABLE_FCP_RING_POLLING) &&
            (phba->cfg_poll & DISABLE_FCP_RING_INT))
-                status &= ~(HC_R0INT_ENA << LPFC_FCP_RING);
+                status &= ~(HC_R0INT_ENA);
        writel(status, phba->HCregaddr);
        readl(phba->HCregaddr); /* flush */
        spin_unlock_irq(&phba->hbalock);
-        /*
+        /* Set up ring-0 (ELS) timer */
-         * Setup the ring 0 (els)  timeout handler
+        timeout = phba->fc_ratov * 2;
-         */
-        timeout = phba->fc_ratov << 1;
        mod_timer(&vport->els_tmofunc, jiffies + HZ * timeout);
+        /* Set up heart beat (HB) timer */
        mod_timer(&phba->hb_tmofunc, jiffies + HZ * LPFC_HB_MBOX_INTERVAL);
        phba->hb_outstanding = 0;
        phba->last_completion_time = jiffies;
+        /* Set up error attention (ERATT) polling timer */
+        mod_timer(&phba->eratt_poll, jiffies + HZ * LPFC_ERATT_POLL_INTERVAL);
        lpfc_init_link(phba, pmb, phba->cfg_topology, phba->cfg_link_speed);
        pmb->mbox_cmpl = lpfc_sli_def_mbox_cmpl;
-        pmb->vport = vport;
-        rc = lpfc_sli_issue_mbox(phba, pmb, MBX_NOWAIT);
        lpfc_set_loopback_flag(phba);
+        rc = lpfc_sli_issue_mbox(phba, pmb, MBX_NOWAIT);
        if (rc != MBX_SUCCESS) {
                lpfc_printf_log(phba, KERN_ERR, LOG_INIT,
                                "0454 Adapter failed to init, mbxCmd x%x "
@@ -447,19 +482,20 @@ lpfc_config_port_post(struct lpfc_hba *phba)
                                rc);
                mempool_free(pmb, phba->mbox_mem_pool);
        }
-        return (0);
+        return 0;
 }
-/************************************************************************/
+/**
-/*                                                                      */
+ * lpfc_hba_down_prep: Perform lpfc uninitialization prior to HBA reset.
-/*    lpfc_hba_down_prep                                                */
+ * @phba: pointer to lpfc HBA data structure.
-/*    This routine will do LPFC uninitialization before the             */
+ *
-/*    HBA is reset when bringing down the SLI Layer. This will be       */
+ * This routine will do LPFC uninitialization before the HBA is reset when
-/*    initialized as a SLI layer callback routine.                      */
+ * bringing down the SLI Layer.
-/*    This routine returns 0 on success. Any other return value         */
+ *
-/*    indicates an error.                                               */
+ * Return codes
-/*                                                                      */
+ *   0 - success.
-/************************************************************************/
+ *   Any other value - error.
+ **/
 int
 lpfc_hba_down_prep(struct lpfc_hba *phba)
 {
@@ -481,15 +517,17 @@ lpfc_hba_down_prep(struct lpfc_hba *phba)
        return 0;
 }
-/************************************************************************/
+/**
-/*                                                                      */
+ * lpfc_hba_down_post: Perform lpfc uninitialization after HBA reset.
-/*    lpfc_hba_down_post                                                */
+ * @phba: pointer to lpfc HBA data structure.
-/*    This routine will do uninitialization after the HBA is reset      */
+ *
-/*    when bringing down the SLI Layer.                                 */
+ * This routine will do uninitialization after the HBA is reset when bring
-/*    This routine returns 0 on success. Any other return value         */
+ * down the SLI Layer.
-/*    indicates an error.                                               */
+ *
-/*                                                                      */
+ * Return codes
-/************************************************************************/
+ *   0 - sucess.
+ *   Any other value - error.
+ **/
 int
 lpfc_hba_down_post(struct lpfc_hba *phba)
 {
@@ -548,7 +586,18 @@ lpfc_hba_down_post(struct lpfc_hba *phba)
        return 0;
 }
-/* HBA heart beat timeout handler */
+/**
+ * lpfc_hb_timeout: The HBA-timer timeout handler.
+ * @ptr: unsigned long holds the pointer to lpfc hba data structure.
+ *
+ * This is the HBA-timer timeout handler registered to the lpfc driver. When
+ * this timer fires, a HBA timeout event shall be posted to the lpfc driver
+ * work-port-events bitmap and the worker thread is notified. This timeout
+ * event will be used by the worker thread to invoke the actual timeout
+ * handler routine, lpfc_hb_timeout_handler. Any periodical operations will
+ * be performed in the timeout handler and the HBA timeout event bit shall
+ * be cleared by the worker thread after it has taken the event bitmap out.
+ **/
 static void
 lpfc_hb_timeout(unsigned long ptr)
 {
@@ -557,17 +606,36 @@ lpfc_hb_timeout(unsigned long ptr)
        unsigned long iflag;
        phba = (struct lpfc_hba *)ptr;
+        /* Check for heart beat timeout conditions */
        spin_lock_irqsave(&phba->pport->work_port_lock, iflag);
        tmo_posted = phba->pport->work_port_events & WORKER_HB_TMO;
        if (!tmo_posted)
                phba->pport->work_port_events |= WORKER_HB_TMO;
        spin_unlock_irqrestore(&phba->pport->work_port_lock, iflag);
+        /* Tell the worker thread there is work to do */
        if (!tmo_posted)
                lpfc_worker_wake_up(phba);
        return;
 }
+/**
+ * lpfc_hb_mbox_cmpl: The lpfc heart-beat mailbox command callback function.
+ * @phba: pointer to lpfc hba data structure.
+ * @pmboxq: pointer to the driver internal queue element for mailbox command.
+ *
+ * This is the callback function to the lpfc heart-beat mailbox command.
+ * If configured, the lpfc driver issues the heart-beat mailbox command to
+ * the HBA every LPFC_HB_MBOX_INTERVAL (current 5) seconds. At the time the
+ * heart-beat mailbox command is issued, the driver shall set up heart-beat
+ * timeout timer to LPFC_HB_MBOX_TIMEOUT (current 30) seconds and marks
+ * heart-beat outstanding state. Once the mailbox command comes back and
+ * no error conditions detected, the heart-beat mailbox command timer is
+ * reset to LPFC_HB_MBOX_INTERVAL seconds and the heart-beat outstanding
+ * state is cleared for the next heart-beat. If the timer expired with the
+ * heart-beat outstanding state set, the driver will put the HBA offline.
+ **/
 static void
 lpfc_hb_mbox_cmpl(struct lpfc_hba * phba, LPFC_MBOXQ_t * pmboxq)
 {
@@ -577,6 +645,7 @@ lpfc_hb_mbox_cmpl(struct lpfc_hba * phba, LPFC_MBOXQ_t * pmboxq)
        phba->hb_outstanding = 0;
        spin_unlock_irqrestore(&phba->hbalock, drvr_flag);
+        /* Check and reset heart-beat timer is necessary */
        mempool_free(pmboxq, phba->mbox_mem_pool);
        if (!(phba->pport->fc_flag & FC_OFFLINE_MODE) &&
                !(phba->link_state == LPFC_HBA_ERROR) &&
@@ -586,6 +655,22 @@ lpfc_hb_mbox_cmpl(struct lpfc_hba * phba, LPFC_MBOXQ_t * pmboxq)
        return;
 }
+/**
+ * lpfc_hb_timeout_handler: The HBA-timer timeout handler.
+ * @phba: pointer to lpfc hba data structure.
+ *
+ * This is the actual HBA-timer timeout handler to be invoked by the worker
+ * thread whenever the HBA timer fired and HBA-timeout event posted. This
+ * handler performs any periodic operations needed for the device. If such
+ * periodic event has already been attended to either in the interrupt handler
+ * or by processing slow-ring or fast-ring events within the HBA-timer
+ * timeout window (LPFC_HB_MBOX_INTERVAL), this handler just simply resets
+ * the timer for the next timeout period. If lpfc heart-beat mailbox command
+ * is configured and there is no heart-beat mailbox command outstanding, a
+ * heart-beat mailbox is issued and timer set properly. Otherwise, if there
+ * has been a heart-beat mailbox command outstanding, the HBA shall be put
+ * to offline.
+ **/
 void
 lpfc_hb_timeout_handler(struct lpfc_hba *phba)
 {
@@ -684,6 +769,13 @@ lpfc_hb_timeout_handler(struct lpfc_hba *phba)
        }
 }
+/**
+ * lpfc_offline_eratt: Bring lpfc offline on hardware error attention.
+ * @phba: pointer to lpfc hba data structure.
+ *
+ * This routine is called to bring the HBA offline when HBA hardware error
+ * other than Port Error 6 has been detected.
+ **/
 static void
 lpfc_offline_eratt(struct lpfc_hba *phba)
 {
@@ -704,14 +796,16 @@ lpfc_offline_eratt(struct lpfc_hba *phba)
        return;
 }
-/************************************************************************/
+/**
-/*                                                                      */
+ * lpfc_handle_eratt: The HBA hardware error handler.
-/*    lpfc_handle_eratt                                                 */
+ * @phba: pointer to lpfc hba data structure.
-/*    This routine will handle processing a Host Attention              */
+ *
-/*    Error Status event. This will be initialized                      */
+ * This routine is invoked to handle the following HBA hardware error
-/*    as a SLI layer callback routine.                                  */
+ * conditions:
-/*                                                                      */
+ * 1 - HBA error attention interrupt
-/************************************************************************/
+ * 2 - DMA ring index out of range
+ * 3 - Mailbox command came back as unknown
+ **/
 void
 lpfc_handle_eratt(struct lpfc_hba *phba)
 {
@@ -722,6 +816,7 @@ lpfc_handle_eratt(struct lpfc_hba *phba)
        unsigned long temperature;
        struct temp_event temp_event_data;
        struct Scsi_Host  *shost;
+        struct lpfc_board_event_header board_event;
        /* If the pci channel is offline, ignore possible errors,
         * since we cannot communicate with the pci card anyway. */
@@ -731,6 +826,16 @@ lpfc_handle_eratt(struct lpfc_hba *phba)
        if (!phba->cfg_enable_hba_reset)
                return;
+        /* Send an internal error event to mgmt application */
+        board_event.event_type = FC_REG_BOARD_EVENT;
+        board_event.subcategory = LPFC_EVENT_PORTINTERR;
+        shost = lpfc_shost_from_vport(phba->pport);
+        fc_host_post_vendor_event(shost, fc_get_event_number(),
+                                  sizeof(board_event),
+                                  (char *) &board_event,
+                                  SCSI_NL_VID_TYPE_PCI
+                                  | PCI_VENDOR_ID_EMULEX);
        if (phba->work_hs & HS_FFER6) {
                /* Re-establishing Link */
                lpfc_printf_log(phba, KERN_INFO, LOG_LINK_EVENT,
@@ -771,7 +876,7 @@ lpfc_handle_eratt(struct lpfc_hba *phba)
                temp_event_data.data = (uint32_t)temperature;
                lpfc_printf_log(phba, KERN_ERR, LOG_INIT,
-                                "0459 Adapter maximum temperature exceeded "
+                                "0406 Adapter maximum temperature exceeded "
                                "(%ld), taking this port offline "
                                "Data: x%x x%x x%x\n",
                                temperature, phba->work_hs,
@@ -791,8 +896,8 @@ lpfc_handle_eratt(struct lpfc_hba *phba)
        } else {
                /* The if clause above forces this code path when the status
-                 * failure is a value other than FFER6.  Do not call the offline
+                 * failure is a value other than FFER6. Do not call the offline
-                 *  twice. This is the adapter hardware error path.
+                 * twice. This is the adapter hardware error path.
                 */
                lpfc_printf_log(phba, KERN_ERR, LOG_INIT,
                                "0457 Adapter Hardware Error "
@@ -808,16 +913,16 @@ lpfc_handle_eratt(struct lpfc_hba *phba)
                lpfc_offline_eratt(phba);
        }
+        return;
 }
-/************************************************************************/
+/**
-/*                                                                      */
+ * lpfc_handle_latt: The HBA link event handler.
-/*    lpfc_handle_latt                                                  */
+ * @phba: pointer to lpfc hba data structure.
-/*    This routine will handle processing a Host Attention              */
+ *
-/*    Link Status event. This will be initialized                       */
+ * This routine is invoked from the worker thread to handle a HBA host
-/*    as a SLI layer callback routine.                                  */
+ * attention link event.
-/*                                                                      */
+ **/
-/************************************************************************/
 void
 lpfc_handle_latt(struct lpfc_hba *phba)
 {
@@ -898,12 +1003,20 @@ lpfc_handle_latt_err_exit:
        return;
 }
-/************************************************************************/
+/**
-/*                                                                      */
+ * lpfc_parse_vpd: Parse VPD (Vital Product Data).
-/*   lpfc_parse_vpd                                                     */
+ * @phba: pointer to lpfc hba data structure.
-/*   This routine will parse the VPD data                               */
+ * @vpd: pointer to the vital product data.
-/*                                                                      */
+ * @len: length of the vital product data in bytes.
-/************************************************************************/
+ *
+ * This routine parses the Vital Product Data (VPD). The VPD is treated as
+ * an array of characters. In this routine, the ModelName, ProgramType, and
+ * ModelDesc, etc. fields of the phba data structure will be populated.
+ *
+ * Return codes
+ *   0 - pointer to the VPD passed in is NULL
+ *   1 - success
+ **/
 static int
 lpfc_parse_vpd(struct lpfc_hba *phba, uint8_t *vpd, int len)
 {
@@ -1040,12 +1153,25 @@ lpfc_parse_vpd(struct lpfc_hba *phba, uint8_t *vpd, int len)
        return(1);
 }
+/**
+ * lpfc_get_hba_model_desc: Retrieve HBA device model name and description.
+ * @phba: pointer to lpfc hba data structure.
+ * @mdp: pointer to the data structure to hold the derived model name.
+ * @descp: pointer to the data structure to hold the derived description.
+ *
+ * This routine retrieves HBA's description based on its registered PCI device
+ * ID. The @descp passed into this function points to an array of 256 chars. It
+ * shall be returned with the model name, maximum speed, and the host bus type.
+ * The @mdp passed into this function points to an array of 80 chars. When the
+ * function returns, the @mdp will be filled with the model name.
+ **/
 static void
 lpfc_get_hba_model_desc(struct lpfc_hba *phba, uint8_t *mdp, uint8_t *descp)
 {
        lpfc_vpd_t *vp;
        uint16_t dev_id = phba->pcidev->device;
        int max_speed;
+        int GE = 0;
        struct {
                char * name;
                int    max_speed;
@@ -1177,6 +1303,19 @@ lpfc_get_hba_model_desc(struct lpfc_hba *phba, uint8_t *mdp, uint8_t *descp)
        case PCI_DEVICE_ID_SAT_S:
                m = (typeof(m)){"LPe12000-S", max_speed, "PCIe"};
                break;
+        case PCI_DEVICE_ID_HORNET:
+                m = (typeof(m)){"LP21000", max_speed, "PCIe"};
+                GE = 1;
+                break;
+        case PCI_DEVICE_ID_PROTEUS_VF:
+                m = (typeof(m)) {"LPev12000", max_speed, "PCIe IOV"};
+                break;
+        case PCI_DEVICE_ID_PROTEUS_PF:
+                m = (typeof(m)) {"LPev12000", max_speed, "PCIe IOV"};
+                break;
+        case PCI_DEVICE_ID_PROTEUS_S:
+                m = (typeof(m)) {"LPemv12002-S", max_speed, "PCIe IOV"};
+                break;
        default:
                m = (typeof(m)){ NULL };
                break;
@@ -1186,18 +1325,25 @@ lpfc_get_hba_model_desc(struct lpfc_hba *phba, uint8_t *mdp, uint8_t *descp)
                snprintf(mdp, 79,"%s", m.name);
        if (descp && descp[0] == '\0')
                snprintf(descp, 255,
-                         "Emulex %s %dGb %s Fibre Channel Adapter",
+                        "Emulex %s %d%s %s %s",
-                         m.name, m.max_speed, m.bus);
+                        m.name, m.max_speed,
+                        (GE) ? "GE" : "Gb",
+                        m.bus,
+                        (GE) ? "FCoE Adapter" : "Fibre Channel Adapter");
 }
-/**************************************************/
+/**
-/*   lpfc_post_buffer                             */
+ * lpfc_post_buffer: Post IOCB(s) with DMA buffer descriptor(s) to a IOCB ring.
-/*                                                */
+ * @phba: pointer to lpfc hba data structure.
-/*   This routine will post count buffers to the  */
+ * @pring: pointer to a IOCB ring.
-/*   ring with the QUE_RING_BUF_CN command. This  */
+ * @cnt: the number of IOCBs to be posted to the IOCB ring.
-/*   allows 3 buffers / command to be posted.     */
+ *
-/*   Returns the number of buffers NOT posted.    */
+ * This routine posts a given number of IOCBs with the associated DMA buffer
-/**************************************************/
+ * descriptors specified by the cnt argument to the given IOCB ring.
+ *
+ * Return codes
+ *   The number of IOCBs NOT able to be posted to the IOCB ring.
+ **/
 int
 lpfc_post_buffer(struct lpfc_hba *phba, struct lpfc_sli_ring *pring, int cnt)
 {
@@ -1287,12 +1433,17 @@ lpfc_post_buffer(struct lpfc_hba *phba, struct lpfc_sli_ring *pring, int cnt)
        return 0;
 }
-/************************************************************************/
+/**
-/*                                                                      */
+ * lpfc_post_rcv_buf: Post the initial receive IOCB buffers to ELS ring.
-/*   lpfc_post_rcv_buf                                                  */
+ * @phba: pointer to lpfc hba data structure.
-/*   This routine post initial rcv buffers to the configured rings      */
+ *
-/*                                                                      */
+ * This routine posts initial receive IOCB buffers to the ELS ring. The
-/************************************************************************/
+ * current number of initial IOCB buffers specified by LPFC_BUF_RING0 is
+ * set to 64 IOCBs.
+ *
+ * Return codes
+ *   0 - success (currently always success)
+ **/
 static int
 lpfc_post_rcv_buf(struct lpfc_hba *phba)
 {
@@ -1307,11 +1458,13 @@ lpfc_post_rcv_buf(struct lpfc_hba *phba)
 #define S(N,V) (((V)<<(N))|((V)>>(32-(N))))
-/************************************************************************/
+/**
-/*                                                                      */
+ * lpfc_sha_init: Set up initial array of hash table entries.
-/*   lpfc_sha_init                                                      */
+ * @HashResultPointer: pointer to an array as hash table.
-/*                                                                      */
+ *
-/************************************************************************/
+ * This routine sets up the initial values to the array of hash table entries
+ * for the LC HBAs.
+ **/
 static void
 lpfc_sha_init(uint32_t * HashResultPointer)
 {
@@ -1322,11 +1475,16 @@ lpfc_sha_init(uint32_t * HashResultPointer)
        HashResultPointer[4] = 0xC3D2E1F0;
 }
-/************************************************************************/
+/**
-/*                                                                      */
+ * lpfc_sha_iterate: Iterate initial hash table with the working hash table.
-/*   lpfc_sha_iterate                                                   */
+ * @HashResultPointer: pointer to an initial/result hash table.
-/*                                                                      */
+ * @HashWorkingPointer: pointer to an working hash table.
-/************************************************************************/
+ *
+ * This routine iterates an initial hash table pointed by @HashResultPointer
+ * with the values from the working hash table pointeed by @HashWorkingPointer.
+ * The results are putting back to the initial hash table, returned through
+ * the @HashResultPointer as the result hash table.
+ **/
 static void
 lpfc_sha_iterate(uint32_t * HashResultPointer, uint32_t * HashWorkingPointer)
 {
@@ -1374,22 +1532,29 @@ lpfc_sha_iterate(uint32_t * HashResultPointer, uint32_t * HashWorkingPointer)
 }
-/************************************************************************/
+/**
-/*                                                                      */
+ * lpfc_challenge_key: Create challenge key based on WWPN of the HBA.
-/*   lpfc_challenge_key                                                 */
+ * @RandomChallenge: pointer to the entry of host challenge random number array.
-/*                                                                      */
+ * @HashWorking: pointer to the entry of the working hash array.
-/************************************************************************/
+ *
+ * This routine calculates the working hash array referred by @HashWorking
+ * from the challenge random numbers associated with the host, referred by
+ * @RandomChallenge. The result is put into the entry of the working hash
+ * array and returned by reference through @HashWorking.
+ **/
 static void
 lpfc_challenge_key(uint32_t * RandomChallenge, uint32_t * HashWorking)
 {
        *HashWorking = (*RandomChallenge ^ *HashWorking);
 }
-/************************************************************************/
+/**
-/*                                                                      */
+ * lpfc_hba_init: Perform special handling for LC HBA initialization.
-/*   lpfc_hba_init                                                      */
+ * @phba: pointer to lpfc hba data structure.
-/*                                                                      */
+ * @hbainit: pointer to an array of unsigned 32-bit integers.
-/************************************************************************/
+ *
+ * This routine performs the special handling for LC HBA initialization.
+ **/
 void
 lpfc_hba_init(struct lpfc_hba *phba, uint32_t *hbainit)
 {
@@ -1412,6 +1577,15 @@ lpfc_hba_init(struct lpfc_hba *phba, uint32_t *hbainit)
        kfree(HashWorking);
 }
+/**
+ * lpfc_cleanup: Performs vport cleanups before deleting a vport.
+ * @vport: pointer to a virtual N_Port data structure.
+ *
+ * This routine performs the necessary cleanups before deleting the @vport.
+ * It invokes the discovery state machine to perform necessary state
+ * transitions and to release the ndlps associated with the @vport. Note,
+ * the physical port is treated as @vport 0.
+ **/
 void
 lpfc_cleanup(struct lpfc_vport *vport)
 {
@@ -1459,14 +1633,6 @@ lpfc_cleanup(struct lpfc_vport *vport)
                lpfc_disc_state_machine(vport, ndlp, NULL,
                                             NLP_EVT_DEVICE_RM);
-                /* nlp_type zero is not defined, nlp_flag zero also not defined,
-                 * nlp_state is unused, this happens when
-                 * an initiator has logged
-                 * into us so cleanup this ndlp.
-                 */
-                if ((ndlp->nlp_type == 0) && (ndlp->nlp_flag == 0) &&
-                        (ndlp->nlp_state == 0))
-                        lpfc_nlp_put(ndlp);
        }
        /* At this point, ALL ndlp's should be gone
@@ -1482,7 +1648,7 @@ lpfc_cleanup(struct lpfc_vport *vport)
                                                &vport->fc_nodes, nlp_listp) {
                                lpfc_printf_vlog(ndlp->vport, KERN_ERR,
                                                LOG_NODE,
-                                                "0282: did:x%x ndlp:x%p "
+                                                "0282 did:x%x ndlp:x%p "
                                                "usgmap:x%x refcnt:%d\n",
                                                ndlp->nlp_DID, (void *)ndlp,
                                                ndlp->nlp_usg_map,
@@ -1498,6 +1664,14 @@ lpfc_cleanup(struct lpfc_vport *vport)
        return;
 }
+/**
+ * lpfc_stop_vport_timers: Stop all the timers associated with a vport.
+ * @vport: pointer to a virtual N_Port data structure.
+ *
+ * This routine stops all the timers associated with a @vport. This function
+ * is invoked before disabling or deleting a @vport. Note that the physical
+ * port is treated as @vport 0.
+ **/
 void
 lpfc_stop_vport_timers(struct lpfc_vport *vport)
 {
@@ -1507,6 +1681,13 @@ lpfc_stop_vport_timers(struct lpfc_vport *vport)
        return;
 }
+/**
+ * lpfc_stop_phba_timers: Stop all the timers associated with an HBA.
+ * @phba: pointer to lpfc hba data structure.
+ *
+ * This routine stops all the timers associated with a HBA. This function is
+ * invoked before either putting a HBA offline or unloading the driver.
+ **/
 static void
 lpfc_stop_phba_timers(struct lpfc_hba *phba)
 {
@@ -1516,9 +1697,20 @@ lpfc_stop_phba_timers(struct lpfc_hba *phba)
        del_timer_sync(&phba->fabric_block_timer);
        phba->hb_outstanding = 0;
        del_timer_sync(&phba->hb_tmofunc);
+        del_timer_sync(&phba->eratt_poll);
        return;
 }
+/**
+ * lpfc_block_mgmt_io: Mark a HBA's management interface as blocked.
+ * @phba: pointer to lpfc hba data structure.
+ *
+ * This routine marks a HBA's management interface as blocked. Once the HBA's
+ * management interface is marked as blocked, all the user space access to
+ * the HBA, whether they are from sysfs interface or libdfc interface will
+ * all be blocked. The HBA is set to block the management interface when the
+ * driver prepares the HBA interface for online or offline.
+ **/
 static void
 lpfc_block_mgmt_io(struct lpfc_hba * phba)
 {
@@ -1529,6 +1721,18 @@ lpfc_block_mgmt_io(struct lpfc_hba * phba)
        spin_unlock_irqrestore(&phba->hbalock, iflag);
 }
+/**
+ * lpfc_online: Initialize and bring a HBA online.
+ * @phba: pointer to lpfc hba data structure.
+ *
+ * This routine initializes the HBA and brings a HBA online. During this
+ * process, the management interface is blocked to prevent user space access
+ * to the HBA interfering with the driver initialization.
+ *
+ * Return codes
+ *   0 - successful
+ *   1 - failed
+ **/
 int
 lpfc_online(struct lpfc_hba *phba)
 {
@@ -1574,6 +1778,17 @@ lpfc_online(struct lpfc_hba *phba)
        return 0;
 }
+/**
+ * lpfc_unblock_mgmt_io: Mark a HBA's management interface to be not blocked.
+ * @phba: pointer to lpfc hba data structure.
+ *
+ * This routine marks a HBA's management interface as not blocked. Once the
+ * HBA's management interface is marked as not blocked, all the user space
+ * access to the HBA, whether they are from sysfs interface or libdfc
+ * interface will be allowed. The HBA is set to block the management interface
+ * when the driver prepares the HBA interface for online or offline and then
+ * set to unblock the management interface afterwards.
+ **/
 void
 lpfc_unblock_mgmt_io(struct lpfc_hba * phba)
 {
@@ -1584,6 +1799,14 @@ lpfc_unblock_mgmt_io(struct lpfc_hba * phba)
        spin_unlock_irqrestore(&phba->hbalock, iflag);
 }
+/**
+ * lpfc_offline_prep: Prepare a HBA to be brought offline.
+ * @phba: pointer to lpfc hba data structure.
+ *
+ * This routine is invoked to prepare a HBA to be brought offline. It performs
+ * unregistration login to all the nodes on all vports and flushes the mailbox
+ * queue to make it ready to be brought offline.
+ **/
 void
 lpfc_offline_prep(struct lpfc_hba * phba)
 {
@@ -1633,6 +1856,14 @@ lpfc_offline_prep(struct lpfc_hba * phba)
        lpfc_sli_flush_mbox_queue(phba);
 }
+/**
+ * lpfc_offline: Bring a HBA offline.
+ * @phba: pointer to lpfc hba data structure.
+ *
+ * This routine actually brings a HBA offline. It stops all the timers
+ * associated with the HBA, brings down the SLI layer, and eventually
+ * marks the HBA as in offline state for the upper layer protocol.
+ **/
 void
 lpfc_offline(struct lpfc_hba *phba)
 {
@@ -1670,12 +1901,17 @@ lpfc_offline(struct lpfc_hba *phba)
        lpfc_destroy_vport_work_array(phba, vports);
 }
-/******************************************************************************
+/**
-* Function name: lpfc_scsi_free
+ * lpfc_scsi_free: Free all the SCSI buffers and IOCBs from driver lists.
-*
+ * @phba: pointer to lpfc hba data structure.
-* Description: Called from lpfc_pci_remove_one free internal driver resources
+ *
-*
+ * This routine is to free all the SCSI buffers and IOCBs from the driver
-******************************************************************************/
+ * list back to kernel. It is called from lpfc_pci_remove_one to free
+ * the internal resources before the device is removed from the system.
+ *
+ * Return codes
+ *   0 - successful (for now, it always returns 0)
+ **/
 static int
 lpfc_scsi_free(struct lpfc_hba *phba)
 {
@@ -1704,6 +1940,22 @@ lpfc_scsi_free(struct lpfc_hba *phba)
        return 0;
 }
+/**
+ * lpfc_create_port: Create an FC port.
+ * @phba: pointer to lpfc hba data structure.
+ * @instance: a unique integer ID to this FC port.
+ * @dev: pointer to the device data structure.
+ *
+ * This routine creates a FC port for the upper layer protocol. The FC port
+ * can be created on top of either a physical port or a virtual port provided
+ * by the HBA. This routine also allocates a SCSI host data structure (shost)
+ * and associates the FC port created before adding the shost into the SCSI
+ * layer.
+ *
+ * Return codes
+ *   @vport - pointer to the virtual N_Port data structure.
+ *   NULL - port create failed.
+ **/
 struct lpfc_vport *
 lpfc_create_port(struct lpfc_hba *phba, int instance, struct device *dev)
 {
@@ -1777,6 +2029,13 @@ out:
        return NULL;
 }
+/**
+ * destroy_port: Destroy an FC port.
+ * @vport: pointer to an lpfc virtual N_Port data structure.
+ *
+ * This routine destroys a FC port from the upper layer protocol. All the
+ * resources associated with the port are released.
+ **/
 void
 destroy_port(struct lpfc_vport *vport)
 {
@@ -1797,6 +2056,16 @@ destroy_port(struct lpfc_vport *vport)
        return;
 }
+/**
+ * lpfc_get_instance: Get a unique integer ID.
+ *
+ * This routine allocates a unique integer ID from lpfc_hba_index pool. It
+ * uses the kernel idr facility to perform the task.
+ *
+ * Return codes:
+ *   instance - a unique integer ID allocated as the new instance.
+ *   -1 - lpfc get instance failed.
+ **/
 int
 lpfc_get_instance(void)
 {
@@ -1810,11 +2079,21 @@ lpfc_get_instance(void)
        return instance;
 }
-/*
+/**
- * Note: there is no scan_start function as adapter initialization
+ * lpfc_scan_finished: method for SCSI layer to detect whether scan is done.
- * will have asynchronously kicked off the link initialization.
+ * @shost: pointer to SCSI host data structure.
- */
+ * @time: elapsed time of the scan in jiffies.
+ *
+ * This routine is called by the SCSI layer with a SCSI host to determine
+ * whether the scan host is finished.
+ *
+ * Note: there is no scan_start function as adapter initialization will have
+ * asynchronously kicked off the link initialization.
+ *
+ * Return codes
+ *   0 - SCSI host scan is not over yet.
+ *   1 - SCSI host scan is over.
+ **/
 int lpfc_scan_finished(struct Scsi_Host *shost, unsigned long time)
 {
        struct lpfc_vport *vport = (struct lpfc_vport *) shost->hostdata;
@@ -1858,6 +2137,13 @@ finished:
        return stat;
 }
+/**
+ * lpfc_host_attrib_init: Initialize SCSI host attributes on a FC port.
+ * @shost: pointer to SCSI host data structure.
+ *
+ * This routine initializes a given SCSI host attributes on a FC port. The
+ * SCSI host can be either on top of a physical port or a virtual port.
+ **/
 void lpfc_host_attrib_init(struct Scsi_Host *shost)
 {
        struct lpfc_vport *vport = (struct lpfc_vport *) shost->hostdata;
@@ -1906,42 +2192,157 @@ void lpfc_host_attrib_init(struct Scsi_Host *shost)
        spin_unlock_irq(shost->host_lock);
 }
+/**
+ * lpfc_enable_msix: Enable MSI-X interrupt mode.
+ * @phba: pointer to lpfc hba data structure.
+ *
+ * This routine is invoked to enable the MSI-X interrupt vectors. The kernel
+ * function pci_enable_msix() is called to enable the MSI-X vectors. Note that
+ * pci_enable_msix(), once invoked, enables either all or nothing, depending
+ * on the current availability of PCI vector resources. The device driver is
+ * responsible for calling the individual request_irq() to register each MSI-X
+ * vector with a interrupt handler, which is done in this function. Note that
+ * later when device is unloading, the driver should always call free_irq()
+ * on all MSI-X vectors it has done request_irq() on before calling
+ * pci_disable_msix(). Failure to do so results in a BUG_ON() and a device
+ * will be left with MSI-X enabled and leaks its vectors.
+ *
+ * Return codes
+ *   0 - sucessful
+ *   other values - error
+ **/
 static int
 lpfc_enable_msix(struct lpfc_hba *phba)
 {
-        int error;
+        int rc, i;
+        LPFC_MBOXQ_t *pmb;
-        phba->msix_entries[0].entry = 0;
+        /* Set up MSI-X multi-message vectors */
-        phba->msix_entries[0].vector = 0;
+        for (i = 0; i < LPFC_MSIX_VECTORS; i++)
+                phba->msix_entries[i].entry = i;
-        error = pci_enable_msix(phba->pcidev, phba->msix_entries,
+        /* Configure MSI-X capability structure */
+        rc = pci_enable_msix(phba->pcidev, phba->msix_entries,
                                ARRAY_SIZE(phba->msix_entries));
-        if (error) {
+        if (rc) {
                lpfc_printf_log(phba, KERN_INFO, LOG_INIT,
                                "0420 Enable MSI-X failed (%d), continuing "
-                                "with MSI\n", error);
+                                "with MSI\n", rc);
-                pci_disable_msix(phba->pcidev);
+                goto msi_fail_out;
-                return error;
+        } else
+                for (i = 0; i < LPFC_MSIX_VECTORS; i++)
+                        lpfc_printf_log(phba, KERN_INFO, LOG_INIT,
+                                        "0477 MSI-X entry[%d]: vector=x%x "
+                                        "message=%d\n", i,
+                                        phba->msix_entries[i].vector,
+                                        phba->msix_entries[i].entry);
+        /*
+         * Assign MSI-X vectors to interrupt handlers
+         */
+        /* vector-0 is associated to slow-path handler */
+        rc = request_irq(phba->msix_entries[0].vector, &lpfc_sp_intr_handler,
+                         IRQF_SHARED, LPFC_SP_DRIVER_HANDLER_NAME, phba);
+        if (rc) {
+                lpfc_printf_log(phba, KERN_ERR, LOG_INIT,
+                                "0421 MSI-X slow-path request_irq failed "
+                                "(%d), continuing with MSI\n", rc);
+                goto msi_fail_out;
        }
-        error = request_irq(phba->msix_entries[0].vector, lpfc_intr_handler, 0,
+        /* vector-1 is associated to fast-path handler */
-                            LPFC_DRIVER_NAME, phba);
+        rc = request_irq(phba->msix_entries[1].vector, &lpfc_fp_intr_handler,
-        if (error) {
+                         IRQF_SHARED, LPFC_FP_DRIVER_HANDLER_NAME, phba);
+        if (rc) {
                lpfc_printf_log(phba, KERN_ERR, LOG_INIT,
-                                "0421 MSI-X request_irq failed (%d), "
+                                "0429 MSI-X fast-path request_irq failed "
-                                "continuing with MSI\n", error);
+                                "(%d), continuing with MSI\n", rc);
-                pci_disable_msix(phba->pcidev);
+                goto irq_fail_out;
        }
-        return error;
+        /*
+         * Configure HBA MSI-X attention conditions to messages
+         */
+        pmb = (LPFC_MBOXQ_t *) mempool_alloc(phba->mbox_mem_pool, GFP_KERNEL);
+        if (!pmb) {
+                rc = -ENOMEM;
+                lpfc_printf_log(phba, KERN_ERR, LOG_INIT,
+                                "0474 Unable to allocate memory for issuing "
+                                "MBOX_CONFIG_MSI command\n");
+                goto mem_fail_out;
+        }
+        rc = lpfc_config_msi(phba, pmb);
+        if (rc)
+                goto mbx_fail_out;
+        rc = lpfc_sli_issue_mbox(phba, pmb, MBX_POLL);
+        if (rc != MBX_SUCCESS) {
+                lpfc_printf_log(phba, KERN_ERR, LOG_MBOX,
+                                "0351 Config MSI mailbox command failed, "
+                                "mbxCmd x%x, mbxStatus x%x\n",
+                                pmb->mb.mbxCommand, pmb->mb.mbxStatus);
+                goto mbx_fail_out;
+        }
+        /* Free memory allocated for mailbox command */
+        mempool_free(pmb, phba->mbox_mem_pool);
+        return rc;
+mbx_fail_out:
+        /* Free memory allocated for mailbox command */
+        mempool_free(pmb, phba->mbox_mem_pool);
+mem_fail_out:
+        /* free the irq already requested */
+        free_irq(phba->msix_entries[1].vector, phba);
+irq_fail_out:
+        /* free the irq already requested */
+        free_irq(phba->msix_entries[0].vector, phba);
+msi_fail_out:
+        /* Unconfigure MSI-X capability structure */
+        pci_disable_msix(phba->pcidev);
+        return rc;
 }
+/**
+ * lpfc_disable_msix: Disable MSI-X interrupt mode.
+ * @phba: pointer to lpfc hba data structure.
+ *
+ * This routine is invoked to release the MSI-X vectors and then disable the
+ * MSI-X interrupt mode.
+ **/
 static void
 lpfc_disable_msix(struct lpfc_hba *phba)
 {
-        free_irq(phba->msix_entries[0].vector, phba);
+        int i;
+        /* Free up MSI-X multi-message vectors */
+        for (i = 0; i < LPFC_MSIX_VECTORS; i++)
+                free_irq(phba->msix_entries[i].vector, phba);
+        /* Disable MSI-X */
        pci_disable_msix(phba->pcidev);
 }
+/**
+ * lpfc_pci_probe_one: lpfc PCI probe func to register device to PCI subsystem.
+ * @pdev: pointer to PCI device
+ * @pid: pointer to PCI device identifier
+ *
+ * This routine is to be registered to the kernel's PCI subsystem. When an
+ * Emulex HBA is presented in PCI bus, the kernel PCI subsystem looks at
+ * PCI device-specific information of the device and driver to see if the
+ * driver state that it can support this kind of device. If the match is
+ * successful, the driver core invokes this routine. If this routine
+ * determines it can claim the HBA, it does all the initialization that it
+ * needs to do to handle the HBA properly.
+ *
+ * Return code
+ *   0 - driver can claim the device
+ *   negative value - driver can not claim the device
+ **/
 static int __devinit
 lpfc_pci_probe_one(struct pci_dev *pdev, const struct pci_device_id *pid)
 {
@@ -1956,6 +2357,7 @@ lpfc_pci_probe_one(struct pci_dev *pdev, const struct pci_device_id *pid)
        int  i, hbq_count;
        uint16_t iotag;
        int bars = pci_select_bars(pdev, IORESOURCE_MEM);
+        struct lpfc_adapter_event_header adapter_event;
        if (pci_enable_device_mem(pdev))
                goto out;
@@ -1966,6 +2368,7 @@ lpfc_pci_probe_one(struct pci_dev *pdev, const struct pci_device_id *pid)
        if (!phba)
                goto out_release_regions;
+        atomic_set(&phba->fast_event_count, 0);
        spin_lock_init(&phba->hbalock);
        /* Initialize ndlp management spinlock */
@@ -1978,6 +2381,7 @@ lpfc_pci_probe_one(struct pci_dev *pdev, const struct pci_device_id *pid)
                goto out_free_phba;
        INIT_LIST_HEAD(&phba->port_list);
+        init_waitqueue_head(&phba->wait_4_mlo_m_q);
        /*
         * Get all the module params for configuring this host and then
         * establish the host.
@@ -2000,6 +2404,9 @@ lpfc_pci_probe_one(struct pci_dev *pdev, const struct pci_device_id *pid)
        init_timer(&phba->fabric_block_timer);
        phba->fabric_block_timer.function = lpfc_fabric_block_timeout;
        phba->fabric_block_timer.data = (unsigned long) phba;
+        init_timer(&phba->eratt_poll);
+        phba->eratt_poll.function = lpfc_poll_eratt;
+        phba->eratt_poll.data = (unsigned long) phba;
        pci_set_master(pdev);
        pci_try_set_mwi(pdev);
@@ -2019,7 +2426,7 @@ lpfc_pci_probe_one(struct pci_dev *pdev, const struct pci_device_id *pid)
        bar2map_len        = pci_resource_len(phba->pcidev, 2);
        /* Map HBA SLIM to a kernel virtual address. */
-        phba->slim_memmap_p      = ioremap(phba->pci_bar0_map, bar0map_len);
+        phba->slim_memmap_p = ioremap(phba->pci_bar0_map, bar0map_len);
        if (!phba->slim_memmap_p) {
                error = -ENODEV;
                dev_printk(KERN_ERR, &pdev->dev,
@@ -2037,12 +2444,18 @@ lpfc_pci_probe_one(struct pci_dev *pdev, const struct pci_device_id *pid)
        }
        /* Allocate memory for SLI-2 structures */
-        phba->slim2p = dma_alloc_coherent(&phba->pcidev->dev, SLI2_SLIM_SIZE,
+        phba->slim2p.virt = dma_alloc_coherent(&phba->pcidev->dev,
-                                          &phba->slim2p_mapping, GFP_KERNEL);
+                                               SLI2_SLIM_SIZE,
-        if (!phba->slim2p)
+                                               &phba->slim2p.phys,
+                                               GFP_KERNEL);
+        if (!phba->slim2p.virt)
                goto out_iounmap;
-        memset(phba->slim2p, 0, SLI2_SLIM_SIZE);
+        memset(phba->slim2p.virt, 0, SLI2_SLIM_SIZE);
+        phba->mbox = phba->slim2p.virt + offsetof(struct lpfc_sli2_slim, mbx);
+        phba->pcb = (phba->slim2p.virt + offsetof(struct lpfc_sli2_slim, pcb));
+        phba->IOCBs = (phba->slim2p.virt +
+                       offsetof(struct lpfc_sli2_slim, IOCBs));
        phba->hbqslimp.virt = dma_alloc_coherent(&phba->pcidev->dev,
                                                 lpfc_sli_hbq_size(),
@@ -2111,7 +2524,7 @@ lpfc_pci_probe_one(struct pci_dev *pdev, const struct pci_device_id *pid)
        phba->fc_arbtov = FF_DEF_ARBTOV;
        INIT_LIST_HEAD(&phba->work_list);
-        phba->work_ha_mask = (HA_ERATT|HA_MBATT|HA_LATT);
+        phba->work_ha_mask = (HA_ERATT | HA_MBATT | HA_LATT);
        phba->work_ha_mask |= (HA_RXMASK << (LPFC_ELS_RING * 4));
        /* Initialize the wait queue head for the kernel thread */
@@ -2146,21 +2559,42 @@ lpfc_pci_probe_one(struct pci_dev *pdev, const struct pci_device_id *pid)
        pci_set_drvdata(pdev, shost);
        phba->intr_type = NONE;
+        phba->MBslimaddr = phba->slim_memmap_p;
+        phba->HAregaddr = phba->ctrl_regs_memmap_p + HA_REG_OFFSET;
+        phba->CAregaddr = phba->ctrl_regs_memmap_p + CA_REG_OFFSET;
+        phba->HSregaddr = phba->ctrl_regs_memmap_p + HS_REG_OFFSET;
+        phba->HCregaddr = phba->ctrl_regs_memmap_p + HC_REG_OFFSET;
+        /* Configure and enable interrupt */
        if (phba->cfg_use_msi == 2) {
-                error = lpfc_enable_msix(phba);
+                /* Need to issue conf_port mbox cmd before conf_msi mbox cmd */
-                if (!error)
+                error = lpfc_sli_config_port(phba, 3);
-                        phba->intr_type = MSIX;
+                if (error)
+                        lpfc_printf_log(phba, KERN_INFO, LOG_INIT,
+                                "0427 Firmware not capable of SLI 3 mode.\n");
+                else {
+                        lpfc_printf_log(phba, KERN_INFO, LOG_INIT,
+                                "0426 Firmware capable of SLI 3 mode.\n");
+                        /* Now, try to enable MSI-X interrupt mode */
+                        error = lpfc_enable_msix(phba);
+                        if (!error) {
+                                phba->intr_type = MSIX;
+                                lpfc_printf_log(phba, KERN_INFO, LOG_INIT,
+                                                "0430 enable MSI-X mode.\n");
+                        }
+                }
        }
        /* Fallback to MSI if MSI-X initialization failed */
        if (phba->cfg_use_msi >= 1 && phba->intr_type == NONE) {
                retval = pci_enable_msi(phba->pcidev);
-                if (!retval)
+                if (!retval) {
                        phba->intr_type = MSI;
-                else
                        lpfc_printf_log(phba, KERN_INFO, LOG_INIT,
-                                        "0452 Enable MSI failed, continuing "
+                                        "0473 enable MSI mode.\n");
-                                        "with IRQ\n");
+                } else
+                        lpfc_printf_log(phba, KERN_INFO, LOG_INIT,
+                                        "0452 enable IRQ mode.\n");
        }
        /* MSI-X is the only case the doesn't need to call request_irq */
@@ -2176,18 +2610,16 @@ lpfc_pci_probe_one(struct pci_dev *pdev, const struct pci_device_id *pid)
                        phba->intr_type = INTx;
        }
-        phba->MBslimaddr = phba->slim_memmap_p;
-        phba->HAregaddr = phba->ctrl_regs_memmap_p + HA_REG_OFFSET;
-        phba->CAregaddr = phba->ctrl_regs_memmap_p + CA_REG_OFFSET;
-        phba->HSregaddr = phba->ctrl_regs_memmap_p + HS_REG_OFFSET;
-        phba->HCregaddr = phba->ctrl_regs_memmap_p + HC_REG_OFFSET;
        if (lpfc_alloc_sysfs_attr(vport)) {
+                lpfc_printf_log(phba, KERN_ERR, LOG_INIT,
+                                "1476 Failed to allocate sysfs attr\n");
                error = -ENOMEM;
                goto out_free_irq;
        }
        if (lpfc_sli_hba_setup(phba)) {
+                lpfc_printf_log(phba, KERN_ERR, LOG_INIT,
+                                "1477 Failed to set up hba\n");
                error = -ENODEV;
                goto out_remove_device;
        }
@@ -2206,6 +2638,16 @@ lpfc_pci_probe_one(struct pci_dev *pdev, const struct pci_device_id *pid)
                spin_unlock_irq(shost->host_lock);
        }
+        lpfc_printf_log(phba, KERN_INFO, LOG_INIT,
+                        "0428 Perform SCSI scan\n");
+        /* Send board arrival event to upper layer */
+        adapter_event.event_type = FC_REG_ADAPTER_EVENT;
+        adapter_event.subcategory = LPFC_EVENT_ARRIVAL;
+        fc_host_post_vendor_event(shost, fc_get_event_number(),
+                sizeof(adapter_event),
+                (char *) &adapter_event,
+                SCSI_NL_VID_TYPE_PCI | PCI_VENDOR_ID_EMULEX);
        scsi_scan_host(shost);
        return 0;
@@ -2238,11 +2680,11 @@ out_free_iocbq:
        }
        lpfc_mem_free(phba);
 out_free_hbqslimp:
-        dma_free_coherent(&pdev->dev, lpfc_sli_hbq_size(), phba->hbqslimp.virt,
+        dma_free_coherent(&pdev->dev, lpfc_sli_hbq_size(),
-                          phba->hbqslimp.phys);
+                          phba->hbqslimp.virt, phba->hbqslimp.phys);
 out_free_slim:
-        dma_free_coherent(&pdev->dev, SLI2_SLIM_SIZE, phba->slim2p,
+        dma_free_coherent(&pdev->dev, SLI2_SLIM_SIZE,
-                                                        phba->slim2p_mapping);
+                          phba->slim2p.virt, phba->slim2p.phys);
 out_iounmap:
        iounmap(phba->ctrl_regs_memmap_p);
 out_iounmap_slim:
@@ -2262,6 +2704,14 @@ out:
        return error;
 }
+/**
+ * lpfc_pci_remove_one: lpfc PCI func to unregister device from PCI subsystem.
+ * @pdev: pointer to PCI device
+ *
+ * This routine is to be registered to the kernel's PCI subsystem. When an
+ * Emulex HBA is removed from PCI bus. It perform all the necessary cleanup
+ * for the HBA device to be removed from the PCI subsystem properly.
+ **/
 static void __devexit
 lpfc_pci_remove_one(struct pci_dev *pdev)
 {
@@ -2316,12 +2766,12 @@ lpfc_pci_remove_one(struct pci_dev *pdev)
        lpfc_scsi_free(phba);
        lpfc_mem_free(phba);
-        dma_free_coherent(&pdev->dev, lpfc_sli_hbq_size(), phba->hbqslimp.virt,
+        dma_free_coherent(&pdev->dev, lpfc_sli_hbq_size(),
-                          phba->hbqslimp.phys);
+                          phba->hbqslimp.virt, phba->hbqslimp.phys);
        /* Free resources associated with SLI2 interface */
        dma_free_coherent(&pdev->dev, SLI2_SLIM_SIZE,
-                          phba->slim2p, phba->slim2p_mapping);
+                          phba->slim2p.virt, phba->slim2p.phys);
        /* unmap adapter SLIM and Control Registers */
        iounmap(phba->ctrl_regs_memmap_p);
@@ -2336,13 +2786,21 @@ lpfc_pci_remove_one(struct pci_dev *pdev)
 }
 /**
- * lpfc_io_error_detected - called when PCI error is detected
+ * lpfc_io_error_detected: Driver method for handling PCI I/O error detected.
- * @pdev: Pointer to PCI device
+ * @pdev: pointer to PCI device.
- * @state: The current pci conneection state
+ * @state: the current PCI connection state.
 *
- * This function is called after a PCI bus error affecting
+ * This routine is registered to the PCI subsystem for error handling. This
- * this device has been detected.
+ * function is called by the PCI subsystem after a PCI bus error affecting
- */
+ * this device has been detected. When this function is invoked, it will
+ * need to stop all the I/Os and interrupt(s) to the device. Once that is
+ * done, it will return PCI_ERS_RESULT_NEED_RESET for the PCI subsystem to
+ * perform proper recovery as desired.
+ *
+ * Return codes
+ *   PCI_ERS_RESULT_NEED_RESET - need to reset before recovery
+ *   PCI_ERS_RESULT_DISCONNECT - device could not be recovered
+ **/
 static pci_ers_result_t lpfc_io_error_detected(struct pci_dev *pdev,
                                pci_channel_state_t state)
 {
@@ -2351,8 +2809,15 @@ static pci_ers_result_t lpfc_io_error_detected(struct pci_dev *pdev,
        struct lpfc_sli *psli = &phba->sli;
        struct lpfc_sli_ring  *pring;
-        if (state == pci_channel_io_perm_failure)
+        if (state == pci_channel_io_perm_failure) {
+                lpfc_printf_log(phba, KERN_ERR, LOG_INIT,
+                                "0472 PCI channel I/O permanent failure\n");
+                /* Block all SCSI devices' I/Os on the host */
+                lpfc_scsi_dev_block(phba);
+                /* Clean up all driver's outstanding SCSI I/Os */
+                lpfc_sli_flush_fcp_rings(phba);
                return PCI_ERS_RESULT_DISCONNECT;
+        }
        pci_disable_device(pdev);
        /*
@@ -2376,10 +2841,21 @@ static pci_ers_result_t lpfc_io_error_detected(struct pci_dev *pdev,
 }
 /**
- * lpfc_io_slot_reset - called after the pci bus has been reset.
+ * lpfc_io_slot_reset: Restart a PCI device from scratch.
- * @pdev: Pointer to PCI device
+ * @pdev: pointer to PCI device.
+ *
+ * This routine is registered to the PCI subsystem for error handling. This is
+ * called after PCI bus has been reset to restart the PCI card from scratch,
+ * as if from a cold-boot. During the PCI subsystem error recovery, after the
+ * driver returns PCI_ERS_RESULT_NEED_RESET, the PCI subsystem will perform
+ * proper error recovery and then call this routine before calling the .resume
+ * method to recover the device. This function will initialize the HBA device,
+ * enable the interrupt, but it will just put the HBA to offline state without
+ * passing any I/O traffic.
 *
- * Restart the card from scratch, as if from a cold-boot.
+ * Return codes
+ *   PCI_ERS_RESULT_RECOVERED - the device has been recovered
+ *   PCI_ERS_RESULT_DISCONNECT - device could not be recovered
 */
 static pci_ers_result_t lpfc_io_slot_reset(struct pci_dev *pdev)
 {
@@ -2404,20 +2880,34 @@ static pci_ers_result_t lpfc_io_slot_reset(struct pci_dev *pdev)
        /* Enable configured interrupt method */
        phba->intr_type = NONE;
        if (phba->cfg_use_msi == 2) {
-                error = lpfc_enable_msix(phba);
+                /* Need to issue conf_port mbox cmd before conf_msi mbox cmd */
-                if (!error)
+                error = lpfc_sli_config_port(phba, 3);
-                        phba->intr_type = MSIX;
+                if (error)
+                        lpfc_printf_log(phba, KERN_INFO, LOG_INIT,
+                                "0478 Firmware not capable of SLI 3 mode.\n");
+                else {
+                        lpfc_printf_log(phba, KERN_INFO, LOG_INIT,
+                                "0479 Firmware capable of SLI 3 mode.\n");
+                        /* Now, try to enable MSI-X interrupt mode */
+                        error = lpfc_enable_msix(phba);
+                        if (!error) {
+                                phba->intr_type = MSIX;
+                                lpfc_printf_log(phba, KERN_INFO, LOG_INIT,
+                                                "0480 enable MSI-X mode.\n");
+                        }
+                }
        }
        /* Fallback to MSI if MSI-X initialization failed */
        if (phba->cfg_use_msi >= 1 && phba->intr_type == NONE) {
                retval = pci_enable_msi(phba->pcidev);
-                if (!retval)
+                if (!retval) {
                        phba->intr_type = MSI;
-                else
                        lpfc_printf_log(phba, KERN_INFO, LOG_INIT,
-                                        "0470 Enable MSI failed, continuing "
+                                        "0481 enable MSI mode.\n");
-                                        "with IRQ\n");
+                } else
+                        lpfc_printf_log(phba, KERN_INFO, LOG_INIT,
+                                        "0470 enable IRQ mode.\n");
        }
        /* MSI-X is the only case the doesn't need to call request_irq */
@@ -2440,11 +2930,13 @@ static pci_ers_result_t lpfc_io_slot_reset(struct pci_dev *pdev)
 }
 /**
- * lpfc_io_resume - called when traffic can start flowing again.
+ * lpfc_io_resume: Resume PCI I/O operation.
- * @pdev: Pointer to PCI device
+ * @pdev: pointer to PCI device
 *
- * This callback is called when the error recovery driver tells us that
+ * This routine is registered to the PCI subsystem for error handling. It is
- * its OK to resume normal operation.
+ * called when kernel error recovery tells the lpfc driver that it is ok to
+ * resume normal PCI operation after PCI bus error recovery. After this call,
+ * traffic can start to flow from this device again.
 */
 static void lpfc_io_resume(struct pci_dev *pdev)
 {
@@ -2491,6 +2983,8 @@ static struct pci_device_id lpfc_id_table[] = {
                PCI_ANY_ID, PCI_ANY_ID, },
        {PCI_VENDOR_ID_EMULEX, PCI_DEVICE_ID_ZEPHYR,
                PCI_ANY_ID, PCI_ANY_ID, },
+        {PCI_VENDOR_ID_EMULEX, PCI_DEVICE_ID_HORNET,
+                PCI_ANY_ID, PCI_ANY_ID, },
        {PCI_VENDOR_ID_EMULEX, PCI_DEVICE_ID_ZEPHYR_SCSP,
                PCI_ANY_ID, PCI_ANY_ID, },
        {PCI_VENDOR_ID_EMULEX, PCI_DEVICE_ID_ZEPHYR_DCSP,
@@ -2521,6 +3015,12 @@ static struct pci_device_id lpfc_id_table[] = {
                PCI_ANY_ID, PCI_ANY_ID, },
        {PCI_VENDOR_ID_EMULEX, PCI_DEVICE_ID_SAT_S,
                PCI_ANY_ID, PCI_ANY_ID, },
+        {PCI_VENDOR_ID_EMULEX, PCI_DEVICE_ID_PROTEUS_VF,
+                PCI_ANY_ID, PCI_ANY_ID, },
+        {PCI_VENDOR_ID_EMULEX, PCI_DEVICE_ID_PROTEUS_PF,
+                PCI_ANY_ID, PCI_ANY_ID, },
+        {PCI_VENDOR_ID_EMULEX, PCI_DEVICE_ID_PROTEUS_S,
+                PCI_ANY_ID, PCI_ANY_ID, },
        { 0 }
 };
@@ -2540,6 +3040,18 @@ static struct pci_driver lpfc_driver = {
        .err_handler    = &lpfc_err_handler,
 };
+/**
+ * lpfc_init: lpfc module initialization routine.
+ *
+ * This routine is to be invoked when the lpfc module is loaded into the
+ * kernel. The special kernel macro module_init() is used to indicate the
+ * role of this routine to the kernel as lpfc module entry point.
+ *
+ * Return codes
+ *   0 - successful
+ *   -ENOMEM - FC attach transport failed
+ *   all others - failed
+ */
 static int __init
 lpfc_init(void)
 {
@@ -2567,12 +3079,20 @@ lpfc_init(void)
        error = pci_register_driver(&lpfc_driver);
        if (error) {
                fc_release_transport(lpfc_transport_template);
-                fc_release_transport(lpfc_vport_transport_template);
+                if (lpfc_enable_npiv)
+                        fc_release_transport(lpfc_vport_transport_template);
        }
        return error;
 }
+/**
+ * lpfc_exit: lpfc module removal routine.
+ *
+ * This routine is invoked when the lpfc module is removed from the kernel.
+ * The special kernel macro module_exit() is used to indicate the role of
+ * this routine to the kernel as lpfc module exit point.
+ */
 static void __exit
 lpfc_exit(void)
 {
diff --git a/drivers/scsi/lpfc/lpfc_mbox.c b/drivers/scsi/lpfc/lpfc_mbox.c
index 7a9be4c5b7cb..7465fe746fe9 100644
--- a/drivers/scsi/lpfc/lpfc_mbox.c
+++ b/drivers/scsi/lpfc/lpfc_mbox.c
@@ -1,7 +1,7 @@
 /*******************************************************************
 * This file is part of the Emulex Linux Device Driver for         *
 * Fibre Channel Host Bus Adapters.                                *
- * Copyright (C) 2004-2007 Emulex.  All rights reserved.           *
+ * Copyright (C) 2004-2008 Emulex.  All rights reserved.           *
 * EMULEX and SLI are trademarks of Emulex.                        *
 * www.emulex.com                                                  *
 * Portions Copyright (C) 2004-2005 Christoph Hellwig              *
@@ -30,6 +30,7 @@
 #include "lpfc_hw.h"
 #include "lpfc_sli.h"
+#include "lpfc_nl.h"
 #include "lpfc_disc.h"
 #include "lpfc_scsi.h"
 #include "lpfc.h"
@@ -37,10 +38,20 @@
 #include "lpfc_crtn.h"
 #include "lpfc_compat.h"
-/**********************************************/
+/**
+ * lpfc_dump_mem: Prepare a mailbox command for retrieving HBA's VPD memory.
-/*                mailbox command             */
+ * @phba: pointer to lpfc hba data structure.
-/**********************************************/
+ * @pmb: pointer to the driver internal queue element for mailbox command.
+ * @offset: offset for dumping VPD memory mailbox command.
+ *
+ * The dump mailbox command provides a method for the device driver to obtain
+ * various types of information from the HBA device.
+ *
+ * This routine prepares the mailbox command for dumping HBA Vital Product
+ * Data (VPD) memory. This mailbox command is to be used for retrieving a
+ * portion (DMP_RSP_SIZE bytes) of a HBA's VPD from the HBA at an address
+ * offset specified by the offset parameter.
+ **/
 void
 lpfc_dump_mem(struct lpfc_hba * phba, LPFC_MBOXQ_t * pmb, uint16_t offset)
 {
@@ -65,10 +76,17 @@ lpfc_dump_mem(struct lpfc_hba * phba, LPFC_MBOXQ_t * pmb, uint16_t offset)
        return;
 }
-/**********************************************/
+/**
-/*  lpfc_read_nv  Issue a READ NVPARAM        */
+ * lpfc_read_nv: Prepare a mailbox command for reading HBA's NVRAM param.
-/*                mailbox command             */
+ * @phba: pointer to lpfc hba data structure.
-/**********************************************/
+ * @pmb: pointer to the driver internal queue element for mailbox command.
+ *
+ * The read NVRAM mailbox command returns the HBA's non-volatile parameters
+ * that are used as defaults when the Fibre Channel link is brought on-line.
+ *
+ * This routine prepares the mailbox command for reading information stored
+ * in the HBA's NVRAM. Specifically, the HBA's WWNN and WWPN.
+ **/
 void
 lpfc_read_nv(struct lpfc_hba * phba, LPFC_MBOXQ_t * pmb)
 {
@@ -81,10 +99,19 @@ lpfc_read_nv(struct lpfc_hba * phba, LPFC_MBOXQ_t * pmb)
        return;
 }
-/**********************************************/
+/**
-/*  lpfc_config_async  Issue a                */
+ * lpfc_config_async: Prepare a mailbox command for enabling HBA async event.
-/*  MBX_ASYNC_EVT_ENABLE mailbox command      */
+ * @phba: pointer to lpfc hba data structure.
-/**********************************************/
+ * @pmb: pointer to the driver internal queue element for mailbox command.
+ * @ring: ring number for the asynchronous event to be configured.
+ *
+ * The asynchronous event enable mailbox command is used to enable the
+ * asynchronous event posting via the ASYNC_STATUS_CN IOCB response and
+ * specifies the default ring to which events are posted.
+ *
+ * This routine prepares the mailbox command for enabling HBA asynchronous
+ * event support on a IOCB ring.
+ **/
 void
 lpfc_config_async(struct lpfc_hba * phba, LPFC_MBOXQ_t * pmb,
                uint32_t ring)
@@ -99,10 +126,19 @@ lpfc_config_async(struct lpfc_hba * phba, LPFC_MBOXQ_t * pmb,
        return;
 }
-/**********************************************/
+/**
-/*  lpfc_heart_beat  Issue a HEART_BEAT       */
+ * lpfc_heart_beat: Prepare a mailbox command for heart beat.
-/*                mailbox command             */
+ * @phba: pointer to lpfc hba data structure.
-/**********************************************/
+ * @pmb: pointer to the driver internal queue element for mailbox command.
+ *
+ * The heart beat mailbox command is used to detect an unresponsive HBA, which
+ * is defined as any device where no error attention is sent and both mailbox
+ * and rings are not processed.
+ *
+ * This routine prepares the mailbox command for issuing a heart beat in the
+ * form of mailbox command to the HBA. The timely completion of the heart
+ * beat mailbox command indicates the health of the HBA.
+ **/
 void
 lpfc_heart_beat(struct lpfc_hba * phba, LPFC_MBOXQ_t * pmb)
 {
@@ -115,10 +151,26 @@ lpfc_heart_beat(struct lpfc_hba * phba, LPFC_MBOXQ_t * pmb)
        return;
 }
-/**********************************************/
+/**
-/*  lpfc_read_la  Issue a READ LA             */
+ * lpfc_read_la: Prepare a mailbox command for reading HBA link attention.
-/*                mailbox command             */
+ * @phba: pointer to lpfc hba data structure.
-/**********************************************/
+ * @pmb: pointer to the driver internal queue element for mailbox command.
+ * @mp: DMA buffer memory for reading the link attention information into.
+ *
+ * The read link attention mailbox command is issued to read the Link Event
+ * Attention information indicated by the HBA port when the Link Event bit
+ * of the Host Attention (HSTATT) register is set to 1. A Link Event
+ * Attention occurs based on an exception detected at the Fibre Channel link
+ * interface.
+ *
+ * This routine prepares the mailbox command for reading HBA link attention
+ * information. A DMA memory has been set aside and address passed to the
+ * HBA through @mp for the HBA to DMA link attention information into the
+ * memory as part of the execution of the mailbox command.
+ *
+ * Return codes
+ *    0 - Success (currently always return 0)
+ **/
 int
 lpfc_read_la(struct lpfc_hba * phba, LPFC_MBOXQ_t * pmb, struct lpfc_dmabuf *mp)
 {
@@ -143,10 +195,21 @@ lpfc_read_la(struct lpfc_hba * phba, LPFC_MBOXQ_t * pmb, struct lpfc_dmabuf *mp)
        return (0);
 }
-/**********************************************/
+/**
-/*  lpfc_clear_la  Issue a CLEAR LA           */
+ * lpfc_clear_la: Prepare a mailbox command for clearing HBA link attention.
-/*                 mailbox command            */
+ * @phba: pointer to lpfc hba data structure.
-/**********************************************/
+ * @pmb: pointer to the driver internal queue element for mailbox command.
+ *
+ * The clear link attention mailbox command is issued to clear the link event
+ * attention condition indicated by the Link Event bit of the Host Attention
+ * (HSTATT) register. The link event attention condition is cleared only if
+ * the event tag specified matches that of the current link event counter.
+ * The current event tag is read using the read link attention event mailbox
+ * command.
+ *
+ * This routine prepares the mailbox command for clearing HBA link attention
+ * information.
+ **/
 void
 lpfc_clear_la(struct lpfc_hba * phba, LPFC_MBOXQ_t * pmb)
 {
@@ -161,10 +224,20 @@ lpfc_clear_la(struct lpfc_hba * phba, LPFC_MBOXQ_t * pmb)
        return;
 }
-/**************************************************/
+/**
-/*  lpfc_config_link  Issue a CONFIG LINK         */
+ * lpfc_config_link: Prepare a mailbox command for configuring link on a HBA.
-/*                    mailbox command             */
+ * @phba: pointer to lpfc hba data structure.
-/**************************************************/
+ * @pmb: pointer to the driver internal queue element for mailbox command.
+ *
+ * The configure link mailbox command is used before the initialize link
+ * mailbox command to override default value and to configure link-oriented
+ * parameters such as DID address and various timers. Typically, this
+ * command would be used after an F_Port login to set the returned DID address
+ * and the fabric timeout values. This command is not valid before a configure
+ * port command has configured the HBA port.
+ *
+ * This routine prepares the mailbox command for configuring link on a HBA.
+ **/
 void
 lpfc_config_link(struct lpfc_hba * phba, LPFC_MBOXQ_t * pmb)
 {
@@ -199,10 +272,98 @@ lpfc_config_link(struct lpfc_hba * phba, LPFC_MBOXQ_t * pmb)
        return;
 }
-/**********************************************/
+/**
-/*  lpfc_init_link  Issue an INIT LINK        */
+ * lpfc_config_msi: Prepare a mailbox command for configuring msi-x.
-/*                  mailbox command           */
+ * @phba: pointer to lpfc hba data structure.
-/**********************************************/
+ * @pmb: pointer to the driver internal queue element for mailbox command.
+ *
+ * The configure MSI-X mailbox command is used to configure the HBA's SLI-3
+ * MSI-X multi-message interrupt vector association to interrupt attention
+ * conditions.
+ *
+ * Return codes
+ *    0 - Success
+ *    -EINVAL - Failure
+ **/
+int
+lpfc_config_msi(struct lpfc_hba *phba, LPFC_MBOXQ_t *pmb)
+{
+        MAILBOX_t *mb = &pmb->mb;
+        uint32_t attentionConditions[2];
+        /* Sanity check */
+        if (phba->cfg_use_msi != 2) {
+                lpfc_printf_log(phba, KERN_ERR, LOG_INIT,
+                                "0475 Not configured for supporting MSI-X "
+                                "cfg_use_msi: 0x%x\n", phba->cfg_use_msi);
+                return -EINVAL;
+        }
+        if (phba->sli_rev < 3) {
+                lpfc_printf_log(phba, KERN_ERR, LOG_INIT,
+                                "0476 HBA not supporting SLI-3 or later "
+                                "SLI Revision: 0x%x\n", phba->sli_rev);
+                return -EINVAL;
+        }
+        /* Clear mailbox command fields */
+        memset(pmb, 0, sizeof(LPFC_MBOXQ_t));
+        /*
+         * SLI-3, Message Signaled Interrupt Fearure.
+         */
+        /* Multi-message attention configuration */
+        attentionConditions[0] = (HA_R0ATT | HA_R1ATT | HA_R2ATT | HA_ERATT |
+                                  HA_LATT | HA_MBATT);
+        attentionConditions[1] = 0;
+        mb->un.varCfgMSI.attentionConditions[0] = attentionConditions[0];
+        mb->un.varCfgMSI.attentionConditions[1] = attentionConditions[1];
+        /*
+         * Set up message number to HA bit association
+         */
+#ifdef __BIG_ENDIAN_BITFIELD
+        /* RA0 (FCP Ring) */
+        mb->un.varCfgMSI.messageNumberByHA[HA_R0_POS] = 1;
+        /* RA1 (Other Protocol Extra Ring) */
+        mb->un.varCfgMSI.messageNumberByHA[HA_R1_POS] = 1;
+#else   /*  __LITTLE_ENDIAN_BITFIELD */
+        /* RA0 (FCP Ring) */
+        mb->un.varCfgMSI.messageNumberByHA[HA_R0_POS^3] = 1;
+        /* RA1 (Other Protocol Extra Ring) */
+        mb->un.varCfgMSI.messageNumberByHA[HA_R1_POS^3] = 1;
+#endif
+        /* Multi-message interrupt autoclear configuration*/
+        mb->un.varCfgMSI.autoClearHA[0] = attentionConditions[0];
+        mb->un.varCfgMSI.autoClearHA[1] = attentionConditions[1];
+        /* For now, HBA autoclear does not work reliably, disable it */
+        mb->un.varCfgMSI.autoClearHA[0] = 0;
+        mb->un.varCfgMSI.autoClearHA[1] = 0;
+        /* Set command and owner bit */
+        mb->mbxCommand = MBX_CONFIG_MSI;
+        mb->mbxOwner = OWN_HOST;
+        return 0;
+}
+/**
+ * lpfc_init_link: Prepare a mailbox command for initialize link on a HBA.
+ * @phba: pointer to lpfc hba data structure.
+ * @pmb: pointer to the driver internal queue element for mailbox command.
+ * @topology: the link topology for the link to be initialized to.
+ * @linkspeed: the link speed for the link to be initialized to.
+ *
+ * The initialize link mailbox command is used to initialize the Fibre
+ * Channel link. This command must follow a configure port command that
+ * establishes the mode of operation.
+ *
+ * This routine prepares the mailbox command for initializing link on a HBA
+ * with the specified link topology and speed.
+ **/
 void
 lpfc_init_link(struct lpfc_hba * phba,
               LPFC_MBOXQ_t * pmb, uint32_t topology, uint32_t linkspeed)
@@ -269,10 +430,27 @@ lpfc_init_link(struct lpfc_hba * phba,
        return;
 }
-/**********************************************/
+/**
-/*  lpfc_read_sparam  Issue a READ SPARAM     */
+ * lpfc_read_sparam: Prepare a mailbox command for reading HBA parameters.
-/*                    mailbox command         */
+ * @phba: pointer to lpfc hba data structure.
-/**********************************************/
+ * @pmb: pointer to the driver internal queue element for mailbox command.
+ * @vpi: virtual N_Port identifier.
+ *
+ * The read service parameter mailbox command is used to read the HBA port
+ * service parameters. The service parameters are read into the buffer
+ * specified directly by a BDE in the mailbox command. These service
+ * parameters may then be used to build the payload of an N_Port/F_POrt
+ * login request and reply (LOGI/ACC).
+ *
+ * This routine prepares the mailbox command for reading HBA port service
+ * parameters. The DMA memory is allocated in this function and the addresses
+ * are populated into the mailbox command for the HBA to DMA the service
+ * parameters into.
+ *
+ * Return codes
+ *    0 - Success
+ *    1 - DMA memory allocation failed
+ **/
 int
 lpfc_read_sparam(struct lpfc_hba *phba, LPFC_MBOXQ_t *pmb, int vpi)
 {
@@ -312,10 +490,21 @@ lpfc_read_sparam(struct lpfc_hba *phba, LPFC_MBOXQ_t *pmb, int vpi)
        return (0);
 }
-/********************************************/
+/**
-/*  lpfc_unreg_did  Issue a UNREG_DID       */
+ * lpfc_unreg_did: Prepare a mailbox command for unregistering DID.
-/*                  mailbox command         */
+ * @phba: pointer to lpfc hba data structure.
-/********************************************/
+ * @vpi: virtual N_Port identifier.
+ * @did: remote port identifier.
+ * @pmb: pointer to the driver internal queue element for mailbox command.
+ *
+ * The unregister DID mailbox command is used to unregister an N_Port/F_Port
+ * login for an unknown RPI by specifying the DID of a remote port. This
+ * command frees an RPI context in the HBA port. This has the effect of
+ * performing an implicit N_Port/F_Port logout.
+ *
+ * This routine prepares the mailbox command for unregistering a remote
+ * N_Port/F_Port (DID) login.
+ **/
 void
 lpfc_unreg_did(struct lpfc_hba * phba, uint16_t vpi, uint32_t did,
               LPFC_MBOXQ_t * pmb)
@@ -333,10 +522,19 @@ lpfc_unreg_did(struct lpfc_hba * phba, uint16_t vpi, uint32_t did,
        return;
 }
-/**********************************************/
+/**
-/*  lpfc_read_nv  Issue a READ CONFIG         */
+ * lpfc_read_config: Prepare a mailbox command for reading HBA configuration.
-/*                mailbox command             */
+ * @phba: pointer to lpfc hba data structure.
-/**********************************************/
+ * @pmb: pointer to the driver internal queue element for mailbox command.
+ *
+ * The read configuration mailbox command is used to read the HBA port
+ * configuration parameters. This mailbox command provides a method for
+ * seeing any parameters that may have changed via various configuration
+ * mailbox commands.
+ *
+ * This routine prepares the mailbox command for reading out HBA configuration
+ * parameters.
+ **/
 void
 lpfc_read_config(struct lpfc_hba * phba, LPFC_MBOXQ_t * pmb)
 {
@@ -350,10 +548,18 @@ lpfc_read_config(struct lpfc_hba * phba, LPFC_MBOXQ_t * pmb)
        return;
 }
-/*************************************************/
+/**
-/*  lpfc_read_lnk_stat  Issue a READ LINK STATUS */
+ * lpfc_read_lnk_stat: Prepare a mailbox command for reading HBA link stats.
-/*                mailbox command                */
+ * @phba: pointer to lpfc hba data structure.
-/*************************************************/
+ * @pmb: pointer to the driver internal queue element for mailbox command.
+ *
+ * The read link status mailbox command is used to read the link status from
+ * the HBA. Link status includes all link-related error counters. These
+ * counters are maintained by the HBA and originated in the link hardware
+ * unit. Note that all of these counters wrap.
+ *
+ * This routine prepares the mailbox command for reading out HBA link status.
+ **/
 void
 lpfc_read_lnk_stat(struct lpfc_hba * phba, LPFC_MBOXQ_t * pmb)
 {
@@ -367,10 +573,30 @@ lpfc_read_lnk_stat(struct lpfc_hba * phba, LPFC_MBOXQ_t * pmb)
        return;
 }
-/********************************************/
+/**
-/*  lpfc_reg_login  Issue a REG_LOGIN       */
+ * lpfc_reg_login: Prepare a mailbox command for registering remote login.
-/*                  mailbox command         */
+ * @phba: pointer to lpfc hba data structure.
-/********************************************/
+ * @vpi: virtual N_Port identifier.
+ * @did: remote port identifier.
+ * @param: pointer to memory holding the server parameters.
+ * @pmb: pointer to the driver internal queue element for mailbox command.
+ * @flag: action flag to be passed back for the complete function.
+ *
+ * The registration login mailbox command is used to register an N_Port or
+ * F_Port login. This registration allows the HBA to cache the remote N_Port
+ * service parameters internally and thereby make the appropriate FC-2
+ * decisions. The remote port service parameters are handed off by the driver
+ * to the HBA using a descriptor entry that directly identifies a buffer in
+ * host memory. In exchange, the HBA returns an RPI identifier.
+ *
+ * This routine prepares the mailbox command for registering remote port login.
+ * The function allocates DMA buffer for passing the service parameters to the
+ * HBA with the mailbox command.
+ *
+ * Return codes
+ *    0 - Success
+ *    1 - DMA memory allocation failed
+ **/
 int
 lpfc_reg_login(struct lpfc_hba *phba, uint16_t vpi, uint32_t did,
               uint8_t *param, LPFC_MBOXQ_t *pmb, uint32_t flag)
@@ -418,10 +644,20 @@ lpfc_reg_login(struct lpfc_hba *phba, uint16_t vpi, uint32_t did,
        return (0);
 }
-/**********************************************/
+/**
-/*  lpfc_unreg_login  Issue a UNREG_LOGIN     */
+ * lpfc_unreg_login: Prepare a mailbox command for unregistering remote login.
-/*                    mailbox command         */
+ * @phba: pointer to lpfc hba data structure.
-/**********************************************/
+ * @vpi: virtual N_Port identifier.
+ * @rpi: remote port identifier
+ * @pmb: pointer to the driver internal queue element for mailbox command.
+ *
+ * The unregistration login mailbox command is used to unregister an N_Port
+ * or F_Port login. This command frees an RPI context in the HBA. It has the
+ * effect of performing an implicit N_Port/F_Port logout.
+ *
+ * This routine prepares the mailbox command for unregistering remote port
+ * login.
+ **/
 void
 lpfc_unreg_login(struct lpfc_hba *phba, uint16_t vpi, uint32_t rpi,
                 LPFC_MBOXQ_t * pmb)
@@ -440,10 +676,21 @@ lpfc_unreg_login(struct lpfc_hba *phba, uint16_t vpi, uint32_t rpi,
        return;
 }
-/**************************************************/
+/**
-/*  lpfc_reg_vpi   Issue a REG_VPI                */
+ * lpfc_reg_vpi: Prepare a mailbox command for registering vport identifier.
-/*                    mailbox command             */
+ * @phba: pointer to lpfc hba data structure.
-/**************************************************/
+ * @vpi: virtual N_Port identifier.
+ * @sid: Fibre Channel S_ID (N_Port_ID assigned to a virtual N_Port).
+ * @pmb: pointer to the driver internal queue element for mailbox command.
+ *
+ * The registration vport identifier mailbox command is used to activate a
+ * virtual N_Port after it has acquired an N_Port_ID. The HBA validates the
+ * N_Port_ID against the information in the selected virtual N_Port context
+ * block and marks it active to allow normal processing of IOCB commands and
+ * received unsolicited exchanges.
+ *
+ * This routine prepares the mailbox command for registering a virtual N_Port.
+ **/
 void
 lpfc_reg_vpi(struct lpfc_hba *phba, uint16_t vpi, uint32_t sid,
             LPFC_MBOXQ_t *pmb)
@@ -461,10 +708,22 @@ lpfc_reg_vpi(struct lpfc_hba *phba, uint16_t vpi, uint32_t sid,
 }
-/**************************************************/
+/**
-/*  lpfc_unreg_vpi   Issue a UNREG_VNPI           */
+ * lpfc_unreg_vpi: Prepare a mailbox command for unregistering vport id.
-/*                    mailbox command             */
+ * @phba: pointer to lpfc hba data structure.
-/**************************************************/
+ * @vpi: virtual N_Port identifier.
+ * @pmb: pointer to the driver internal queue element for mailbox command.
+ *
+ * The unregistration vport identifier mailbox command is used to inactivate
+ * a virtual N_Port. The driver must have logged out and unregistered all
+ * remote N_Ports to abort any activity on the virtual N_Port. The HBA will
+ * unregisters any default RPIs associated with the specified vpi, aborting
+ * any active exchanges. The HBA will post the mailbox response after making
+ * the virtual N_Port inactive.
+ *
+ * This routine prepares the mailbox command for unregistering a virtual
+ * N_Port.
+ **/
 void
 lpfc_unreg_vpi(struct lpfc_hba *phba, uint16_t vpi, LPFC_MBOXQ_t *pmb)
 {
@@ -479,12 +738,19 @@ lpfc_unreg_vpi(struct lpfc_hba *phba, uint16_t vpi, LPFC_MBOXQ_t *pmb)
 }
+/**
+ * lpfc_config_pcb_setup: Set up IOCB rings in the Port Control Block (PCB)
+ * @phba: pointer to lpfc hba data structure.
+ *
+ * This routine sets up and initializes the IOCB rings in the Port Control
+ * Block (PCB).
+ **/
 static void
 lpfc_config_pcb_setup(struct lpfc_hba * phba)
 {
        struct lpfc_sli *psli = &phba->sli;
        struct lpfc_sli_ring *pring;
-        PCB_t *pcbp = &phba->slim2p->pcb;
+        PCB_t *pcbp = phba->pcb;
        dma_addr_t pdma_addr;
        uint32_t offset;
        uint32_t iocbCnt = 0;
@@ -513,29 +779,43 @@ lpfc_config_pcb_setup(struct lpfc_hba * phba)
                        continue;
                }
                /* Command ring setup for ring */
-                pring->cmdringaddr = (void *) &phba->slim2p->IOCBs[iocbCnt];
+                pring->cmdringaddr = (void *)&phba->IOCBs[iocbCnt];
                pcbp->rdsc[i].cmdEntries = pring->numCiocb;
-                offset = (uint8_t *) &phba->slim2p->IOCBs[iocbCnt] -
+                offset = (uint8_t *) &phba->IOCBs[iocbCnt] -
-                         (uint8_t *) phba->slim2p;
+                         (uint8_t *) phba->slim2p.virt;
-                pdma_addr = phba->slim2p_mapping + offset;
+                pdma_addr = phba->slim2p.phys + offset;
                pcbp->rdsc[i].cmdAddrHigh = putPaddrHigh(pdma_addr);
                pcbp->rdsc[i].cmdAddrLow = putPaddrLow(pdma_addr);
                iocbCnt += pring->numCiocb;
                /* Response ring setup for ring */
-                pring->rspringaddr = (void *) &phba->slim2p->IOCBs[iocbCnt];
+                pring->rspringaddr = (void *) &phba->IOCBs[iocbCnt];
                pcbp->rdsc[i].rspEntries = pring->numRiocb;
-                offset = (uint8_t *)&phba->slim2p->IOCBs[iocbCnt] -
+                offset = (uint8_t *)&phba->IOCBs[iocbCnt] -
-                         (uint8_t *)phba->slim2p;
+                         (uint8_t *)phba->slim2p.virt;
-                pdma_addr = phba->slim2p_mapping + offset;
+                pdma_addr = phba->slim2p.phys + offset;
                pcbp->rdsc[i].rspAddrHigh = putPaddrHigh(pdma_addr);
                pcbp->rdsc[i].rspAddrLow = putPaddrLow(pdma_addr);
                iocbCnt += pring->numRiocb;
        }
 }
+/**
+ * lpfc_read_rev: Prepare a mailbox command for reading HBA revision.
+ * @phba: pointer to lpfc hba data structure.
+ * @pmb: pointer to the driver internal queue element for mailbox command.
+ *
+ * The read revision mailbox command is used to read the revision levels of
+ * the HBA components. These components include hardware units, resident
+ * firmware, and available firmware. HBAs that supports SLI-3 mode of
+ * operation provide different response information depending on the version
+ * requested by the driver.
+ *
+ * This routine prepares the mailbox command for reading HBA revision
+ * information.
+ **/
 void
 lpfc_read_rev(struct lpfc_hba * phba, LPFC_MBOXQ_t * pmb)
 {
@@ -548,6 +828,16 @@ lpfc_read_rev(struct lpfc_hba * phba, LPFC_MBOXQ_t * pmb)
        return;
 }
+/**
+ * lpfc_build_hbq_profile2: Set up the HBQ Selection Profile 2.
+ * @hbqmb: pointer to the HBQ configuration data structure in mailbox command.
+ * @hbq_desc: pointer to the HBQ selection profile descriptor.
+ *
+ * The Host Buffer Queue (HBQ) Selection Profile 2 specifies that the HBA
+ * tests the incoming frames' R_CTL/TYPE fields with works 10:15 and performs
+ * the Sequence Length Test using the fields in the Selection Profile 2
+ * extension in words 20:31.
+ **/
 static void
 lpfc_build_hbq_profile2(struct config_hbq_var *hbqmb,
                        struct lpfc_hbq_init  *hbq_desc)
@@ -557,6 +847,16 @@ lpfc_build_hbq_profile2(struct config_hbq_var *hbqmb,
        hbqmb->profiles.profile2.seqlenoff  = hbq_desc->seqlenoff;
 }
+/**
+ * lpfc_build_hbq_profile3: Set up the HBQ Selection Profile 3.
+ * @hbqmb: pointer to the HBQ configuration data structure in mailbox command.
+ * @hbq_desc: pointer to the HBQ selection profile descriptor.
+ *
+ * The Host Buffer Queue (HBQ) Selection Profile 3 specifies that the HBA
+ * tests the incoming frame's R_CTL/TYPE fields with words 10:15 and performs
+ * the Sequence Length Test and Byte Field Test using the fields in the
+ * Selection Profile 3 extension in words 20:31.
+ **/
 static void
 lpfc_build_hbq_profile3(struct config_hbq_var *hbqmb,
                        struct lpfc_hbq_init  *hbq_desc)
@@ -569,6 +869,17 @@ lpfc_build_hbq_profile3(struct config_hbq_var *hbqmb,
               sizeof(hbqmb->profiles.profile3.cmdmatch));
 }
+/**
+ * lpfc_build_hbq_profile5: Set up the HBQ Selection Profile 5.
+ * @hbqmb: pointer to the HBQ configuration data structure in mailbox command.
+ * @hbq_desc: pointer to the HBQ selection profile descriptor.
+ *
+ * The Host Buffer Queue (HBQ) Selection Profile 5 specifies a header HBQ. The
+ * HBA tests the initial frame of an incoming sequence using the frame's
+ * R_CTL/TYPE fields with words 10:15 and performs the Sequence Length Test
+ * and Byte Field Test using the fields in the Selection Profile 5 extension
+ * words 20:31.
+ **/
 static void
 lpfc_build_hbq_profile5(struct config_hbq_var *hbqmb,
                        struct lpfc_hbq_init  *hbq_desc)
@@ -581,6 +892,20 @@ lpfc_build_hbq_profile5(struct config_hbq_var *hbqmb,
               sizeof(hbqmb->profiles.profile5.cmdmatch));
 }
+/**
+ * lpfc_config_hbq: Prepare a mailbox command for configuring an HBQ.
+ * @phba: pointer to lpfc hba data structure.
+ * @id: HBQ identifier.
+ * @hbq_desc: pointer to the HBA descriptor data structure.
+ * @hbq_entry_index: index of the HBQ entry data structures.
+ * @pmb: pointer to the driver internal queue element for mailbox command.
+ *
+ * The configure HBQ (Host Buffer Queue) mailbox command is used to configure
+ * an HBQ. The configuration binds events that require buffers to a particular
+ * ring and HBQ based on a selection profile.
+ *
+ * This routine prepares the mailbox command for configuring an HBQ.
+ **/
 void
 lpfc_config_hbq(struct lpfc_hba *phba, uint32_t id,
                 struct lpfc_hbq_init *hbq_desc,
@@ -641,8 +966,23 @@ lpfc_config_hbq(struct lpfc_hba *phba, uint32_t id,
        return;
 }
+/**
+ * lpfc_config_ring: Prepare a mailbox command for configuring an IOCB ring.
+ * @phba: pointer to lpfc hba data structure.
+ * @ring:
+ * @pmb: pointer to the driver internal queue element for mailbox command.
+ *
+ * The configure ring mailbox command is used to configure an IOCB ring. This
+ * configuration binds from one to six of HBA RC_CTL/TYPE mask entries to the
+ * ring. This is used to map incoming sequences to a particular ring whose
+ * RC_CTL/TYPE mask entry matches that of the sequence. The driver should not
+ * attempt to configure a ring whose number is greater than the number
+ * specified in the Port Control Block (PCB). It is an error to issue the
+ * configure ring command more than once with the same ring number. The HBA
+ * returns an error if the driver attempts this.
+ *
+ * This routine prepares the mailbox command for configuring IOCB ring.
+ **/
 void
 lpfc_config_ring(struct lpfc_hba * phba, int ring, LPFC_MBOXQ_t * pmb)
 {
@@ -684,6 +1024,20 @@ lpfc_config_ring(struct lpfc_hba * phba, int ring, LPFC_MBOXQ_t * pmb)
        return;
 }
+/**
+ * lpfc_config_port: Prepare a mailbox command for configuring port.
+ * @phba: pointer to lpfc hba data structure.
+ * @pmb: pointer to the driver internal queue element for mailbox command.
+ *
+ * The configure port mailbox command is used to identify the Port Control
+ * Block (PCB) in the driver memory. After this command is issued, the
+ * driver must not access the mailbox in the HBA without first resetting
+ * the HBA. The HBA may copy the PCB information to internal storage for
+ * subsequent use; the driver can not change the PCB information unless it
+ * resets the HBA.
+ *
+ * This routine prepares the mailbox command for configuring port.
+ **/
 void
 lpfc_config_port(struct lpfc_hba *phba, LPFC_MBOXQ_t *pmb)
 {
@@ -702,8 +1056,8 @@ lpfc_config_port(struct lpfc_hba *phba, LPFC_MBOXQ_t *pmb)
        mb->un.varCfgPort.pcbLen = sizeof(PCB_t);
-        offset = (uint8_t *)&phba->slim2p->pcb - (uint8_t *)phba->slim2p;
+        offset = (uint8_t *)phba->pcb - (uint8_t *)phba->slim2p.virt;
-        pdma_addr = phba->slim2p_mapping + offset;
+        pdma_addr = phba->slim2p.phys + offset;
        mb->un.varCfgPort.pcbLow = putPaddrLow(pdma_addr);
        mb->un.varCfgPort.pcbHigh = putPaddrHigh(pdma_addr);
@@ -711,12 +1065,13 @@ lpfc_config_port(struct lpfc_hba *phba, LPFC_MBOXQ_t *pmb)
        if (phba->sli_rev == 3 && phba->vpd.sli3Feat.cerbm) {
                mb->un.varCfgPort.cerbm = 1; /* Request HBQs */
+                mb->un.varCfgPort.ccrp = 1; /* Command Ring Polling */
+                mb->un.varCfgPort.cinb = 1; /* Interrupt Notification Block */
                mb->un.varCfgPort.max_hbq = lpfc_sli_hbq_count();
                if (phba->max_vpi && phba->cfg_enable_npiv &&
                    phba->vpd.sli3Feat.cmv) {
                        mb->un.varCfgPort.max_vpi = phba->max_vpi;
                        mb->un.varCfgPort.cmv = 1;
-                        phba->sli3_options |= LPFC_SLI3_NPIV_ENABLED;
                } else
                        mb->un.varCfgPort.max_vpi = phba->max_vpi = 0;
        } else
@@ -724,16 +1079,15 @@ lpfc_config_port(struct lpfc_hba *phba, LPFC_MBOXQ_t *pmb)
        mb->un.varCfgPort.sli_mode = phba->sli_rev;
        /* Now setup pcb */
-        phba->slim2p->pcb.type = TYPE_NATIVE_SLI2;
+        phba->pcb->type = TYPE_NATIVE_SLI2;
-        phba->slim2p->pcb.feature = FEATURE_INITIAL_SLI2;
+        phba->pcb->feature = FEATURE_INITIAL_SLI2;
        /* Setup Mailbox pointers */
-        phba->slim2p->pcb.mailBoxSize = offsetof(MAILBOX_t, us) +
+        phba->pcb->mailBoxSize = sizeof(MAILBOX_t);
-                sizeof(struct sli2_desc);
+        offset = (uint8_t *)phba->mbox - (uint8_t *)phba->slim2p.virt;
-        offset = (uint8_t *)&phba->slim2p->mbx - (uint8_t *)phba->slim2p;
+        pdma_addr = phba->slim2p.phys + offset;
-        pdma_addr = phba->slim2p_mapping + offset;
+        phba->pcb->mbAddrHigh = putPaddrHigh(pdma_addr);
-        phba->slim2p->pcb.mbAddrHigh = putPaddrHigh(pdma_addr);
+        phba->pcb->mbAddrLow = putPaddrLow(pdma_addr);
-        phba->slim2p->pcb.mbAddrLow = putPaddrLow(pdma_addr);
        /*
         * Setup Host Group ring pointer.
@@ -794,13 +1148,13 @@ lpfc_config_port(struct lpfc_hba *phba, LPFC_MBOXQ_t *pmb)
        }
        /* mask off BAR0's flag bits 0 - 3 */
-        phba->slim2p->pcb.hgpAddrLow = (bar_low & PCI_BASE_ADDRESS_MEM_MASK) +
+        phba->pcb->hgpAddrLow = (bar_low & PCI_BASE_ADDRESS_MEM_MASK) +
-                (void __iomem *) phba->host_gp -
+                (void __iomem *)phba->host_gp -
                (void __iomem *)phba->MBslimaddr;
        if (bar_low & PCI_BASE_ADDRESS_MEM_TYPE_64)
-                phba->slim2p->pcb.hgpAddrHigh = bar_high;
+                phba->pcb->hgpAddrHigh = bar_high;
        else
-                phba->slim2p->pcb.hgpAddrHigh = 0;
+                phba->pcb->hgpAddrHigh = 0;
        /* write HGP data to SLIM at the required longword offset */
        memset(&hgp, 0, sizeof(struct lpfc_hgp));
@@ -810,17 +1164,19 @@ lpfc_config_port(struct lpfc_hba *phba, LPFC_MBOXQ_t *pmb)
        }
        /* Setup Port Group ring pointer */
-        if (phba->sli_rev == 3)
+        if (phba->sli3_options & LPFC_SLI3_INB_ENABLED) {
-                pgp_offset = (uint8_t *)&phba->slim2p->mbx.us.s3_pgp.port -
+                pgp_offset = offsetof(struct lpfc_sli2_slim,
-                        (uint8_t *)phba->slim2p;
+                                      mbx.us.s3_inb_pgp.port);
-        else
+                phba->hbq_get = phba->mbox->us.s3_inb_pgp.hbq_get;
-                pgp_offset = (uint8_t *)&phba->slim2p->mbx.us.s2.port -
+        } else if (phba->sli_rev == 3) {
-                        (uint8_t *)phba->slim2p;
+                pgp_offset = offsetof(struct lpfc_sli2_slim,
+                                      mbx.us.s3_pgp.port);
-        pdma_addr = phba->slim2p_mapping + pgp_offset;
+                phba->hbq_get = phba->mbox->us.s3_pgp.hbq_get;
-        phba->slim2p->pcb.pgpAddrHigh = putPaddrHigh(pdma_addr);
+        } else
-        phba->slim2p->pcb.pgpAddrLow = putPaddrLow(pdma_addr);
+                pgp_offset = offsetof(struct lpfc_sli2_slim, mbx.us.s2.port);
-        phba->hbq_get = &phba->slim2p->mbx.us.s3_pgp.hbq_get[0];
+        pdma_addr = phba->slim2p.phys + pgp_offset;
+        phba->pcb->pgpAddrHigh = putPaddrHigh(pdma_addr);
+        phba->pcb->pgpAddrLow = putPaddrLow(pdma_addr);
        /* Use callback routine to setp rings in the pcb */
        lpfc_config_pcb_setup(phba);
@@ -835,10 +1191,24 @@ lpfc_config_port(struct lpfc_hba *phba, LPFC_MBOXQ_t *pmb)
        }
        /* Swap PCB if needed */
-        lpfc_sli_pcimem_bcopy(&phba->slim2p->pcb, &phba->slim2p->pcb,
+        lpfc_sli_pcimem_bcopy(phba->pcb, phba->pcb, sizeof(PCB_t));
-                              sizeof(PCB_t));
 }
+/**
+ * lpfc_kill_board: Prepare a mailbox command for killing board.
+ * @phba: pointer to lpfc hba data structure.
+ * @pmb: pointer to the driver internal queue element for mailbox command.
+ *
+ * The kill board mailbox command is used to tell firmware to perform a
+ * graceful shutdown of a channel on a specified board to prepare for reset.
+ * When the kill board mailbox command is received, the ER3 bit is set to 1
+ * in the Host Status register and the ER Attention bit is set to 1 in the
+ * Host Attention register of the HBA function that received the kill board
+ * command.
+ *
+ * This routine prepares the mailbox command for killing the board in
+ * preparation for a graceful shutdown.
+ **/
 void
 lpfc_kill_board(struct lpfc_hba * phba, LPFC_MBOXQ_t * pmb)
 {
@@ -850,6 +1220,16 @@ lpfc_kill_board(struct lpfc_hba * phba, LPFC_MBOXQ_t * pmb)
        return;
 }
+/**
+ * lpfc_mbox_put: Put a mailbox cmd into the tail of driver's mailbox queue.
+ * @phba: pointer to lpfc hba data structure.
+ * @mbq: pointer to the driver internal queue element for mailbox command.
+ *
+ * Driver maintains a internal mailbox command queue implemented as a linked
+ * list. When a mailbox command is issued, it shall be put into the mailbox
+ * command queue such that they shall be processed orderly as HBA can process
+ * one mailbox command at a time.
+ **/
 void
 lpfc_mbox_put(struct lpfc_hba * phba, LPFC_MBOXQ_t * mbq)
 {
@@ -864,6 +1244,20 @@ lpfc_mbox_put(struct lpfc_hba * phba, LPFC_MBOXQ_t * mbq)
        return;
 }
+/**
+ * lpfc_mbox_get: Remove a mailbox cmd from the head of driver's mailbox queue.
+ * @phba: pointer to lpfc hba data structure.
+ *
+ * Driver maintains a internal mailbox command queue implemented as a linked
+ * list. When a mailbox command is issued, it shall be put into the mailbox
+ * command queue such that they shall be processed orderly as HBA can process
+ * one mailbox command at a time. After HBA finished processing a mailbox
+ * command, the driver will remove a pending mailbox command from the head of
+ * the mailbox command queue and send to the HBA for processing.
+ *
+ * Return codes
+ *    pointer to the driver internal queue element for mailbox command.
+ **/
 LPFC_MBOXQ_t *
 lpfc_mbox_get(struct lpfc_hba * phba)
 {
@@ -877,6 +1271,17 @@ lpfc_mbox_get(struct lpfc_hba * phba)
        return mbq;
 }
+/**
+ * lpfc_mbox_cmpl_put: Put mailbox command into mailbox command complete list.
+ * @phba: pointer to lpfc hba data structure.
+ * @mbq: pointer to the driver internal queue element for mailbox command.
+ *
+ * This routine put the completed mailbox command into the mailbox command
+ * complete list. This routine is called from driver interrupt handler
+ * context.The mailbox complete list is used by the driver worker thread
+ * to process mailbox complete callback functions outside the driver interrupt
+ * handler.
+ **/
 void
 lpfc_mbox_cmpl_put(struct lpfc_hba * phba, LPFC_MBOXQ_t * mbq)
 {
@@ -887,6 +1292,17 @@ lpfc_mbox_cmpl_put(struct lpfc_hba * phba, LPFC_MBOXQ_t * mbq)
        return;
 }
+/**
+ * lpfc_mbox_tmo_val: Retrieve mailbox command timeout value.
+ * @phba: pointer to lpfc hba data structure.
+ * @cmd: mailbox command code.
+ *
+ * This routine retrieves the proper timeout value according to the mailbox
+ * command code.
+ *
+ * Return codes
+ *    Timeout value to be used for the given mailbox command
+ **/
 int
 lpfc_mbox_tmo_val(struct lpfc_hba *phba, int cmd)
 {
diff --git a/drivers/scsi/lpfc/lpfc_mem.c b/drivers/scsi/lpfc/lpfc_mem.c
index 3c0cebc71800..a4bba2069248 100644
--- a/drivers/scsi/lpfc/lpfc_mem.c
+++ b/drivers/scsi/lpfc/lpfc_mem.c
@@ -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-2008 Emulex.  All rights reserved.           *
 * EMULEX and SLI are trademarks of Emulex.                        *
 * www.emulex.com                                                  *
 * Portions Copyright (C) 2004-2005 Christoph Hellwig              *
@@ -30,6 +30,7 @@
 #include "lpfc_hw.h"
 #include "lpfc_sli.h"
+#include "lpfc_nl.h"
 #include "lpfc_disc.h"
 #include "lpfc_scsi.h"
 #include "lpfc.h"
@@ -39,7 +40,21 @@
 #define LPFC_MEM_POOL_SIZE      64      /* max elem in non-DMA safety pool */
+/**
+ * lpfc_mem_alloc: create and allocate all PCI and memory pools
+ * @phba: HBA to allocate pools for
+ *
+ * Description: Creates and allocates PCI pools lpfc_scsi_dma_buf_pool,
+ * lpfc_mbuf_pool, lpfc_hbq_pool.  Creates and allocates kmalloc-backed mempools
+ * for LPFC_MBOXQ_t and lpfc_nodelist.  Also allocates the VPI bitmask.
+ *
+ * Notes: Not interrupt-safe.  Must be called with no locks held.  If any
+ * allocation fails, frees all successfully allocated memory before returning.
+ *
+ * Returns:
+ *   0 on success
+ *   -ENOMEM on failure (if any memory allocations fail)
+ **/
 int
 lpfc_mem_alloc(struct lpfc_hba * phba)
 {
@@ -120,6 +135,16 @@ lpfc_mem_alloc(struct lpfc_hba * phba)
        return -ENOMEM;
 }
+/**
+ * lpfc_mem_free: Frees all PCI and memory allocated by lpfc_mem_alloc
+ * @phba: HBA to free memory for
+ *
+ * Description: Frees PCI pools lpfc_scsi_dma_buf_pool, lpfc_mbuf_pool,
+ * lpfc_hbq_pool.  Frees kmalloc-backed mempools for LPFC_MBOXQ_t and
+ * lpfc_nodelist.  Also frees the VPI bitmask.
+ *
+ * Returns: None
+ **/
 void
 lpfc_mem_free(struct lpfc_hba * phba)
 {
@@ -181,12 +206,29 @@ lpfc_mem_free(struct lpfc_hba * phba)
        phba->lpfc_scsi_dma_buf_pool = NULL;
        phba->lpfc_mbuf_pool = NULL;
-                                /* Free the iocb lookup array */
+        /* Free the iocb lookup array */
        kfree(psli->iocbq_lookup);
        psli->iocbq_lookup = NULL;
 }
+/**
+ * lpfc_mbuf_alloc: Allocate an mbuf from the lpfc_mbuf_pool PCI pool
+ * @phba: HBA which owns the pool to allocate from
+ * @mem_flags: indicates if this is a priority (MEM_PRI) allocation
+ * @handle: used to return the DMA-mapped address of the mbuf
+ *
+ * Description: Allocates a DMA-mapped buffer from the lpfc_mbuf_pool PCI pool.
+ * Allocates from generic pci_pool_alloc function first and if that fails and
+ * mem_flags has MEM_PRI set (the only defined flag), returns an mbuf from the
+ * HBA's pool.
+ *
+ * Notes: Not interrupt-safe.  Must be called with no locks held.  Takes
+ * phba->hbalock.
+ *
+ * Returns:
+ *   pointer to the allocated mbuf on success
+ *   NULL on failure
+ **/
 void *
 lpfc_mbuf_alloc(struct lpfc_hba *phba, int mem_flags, dma_addr_t *handle)
 {
@@ -206,6 +248,20 @@ lpfc_mbuf_alloc(struct lpfc_hba *phba, int mem_flags, dma_addr_t *handle)
        return ret;
 }
+/**
+ * __lpfc_mem_free: Free an mbuf from the lpfc_mbuf_pool PCI pool (locked)
+ * @phba: HBA which owns the pool to return to
+ * @virt: mbuf to free
+ * @dma: the DMA-mapped address of the lpfc_mbuf_pool to be freed
+ *
+ * Description: Returns an mbuf lpfc_mbuf_pool to the lpfc_mbuf_safety_pool if
+ * it is below its max_count, frees the mbuf otherwise.
+ *
+ * Notes: Must be called with phba->hbalock held to synchronize access to
+ * lpfc_mbuf_safety_pool.
+ *
+ * Returns: None
+ **/
 void
 __lpfc_mbuf_free(struct lpfc_hba * phba, void *virt, dma_addr_t dma)
 {
@@ -221,7 +277,21 @@ __lpfc_mbuf_free(struct lpfc_hba * phba, void *virt, dma_addr_t dma)
        return;
 }
+/**
+ * lpfc_mem_free: Free an mbuf from the lpfc_mbuf_pool PCI pool (unlocked)
+ * @phba: HBA which owns the pool to return to
+ * @virt: mbuf to free
+ * @dma: the DMA-mapped address of the lpfc_mbuf_pool to be freed
+ *
+ * Description: Returns an mbuf lpfc_mbuf_pool to the lpfc_mbuf_safety_pool if
+ * it is below its max_count, frees the mbuf otherwise.
+ *
+ * Notes: Takes phba->hbalock.  Can be called with or without other locks held.
+ *
+ * Returns: None
+ **/
 void
 lpfc_mbuf_free(struct lpfc_hba * phba, void *virt, dma_addr_t dma)
 {
        unsigned long iflags;
@@ -232,6 +302,19 @@ lpfc_mbuf_free(struct lpfc_hba * phba, void *virt, dma_addr_t dma)
        return;
 }
+/**
+ * lpfc_els_hbq_alloc: Allocate an HBQ buffer
+ * @phba: HBA to allocate HBQ buffer for
+ *
+ * Description: Allocates a DMA-mapped HBQ buffer from the lpfc_hbq_pool PCI
+ * pool along a non-DMA-mapped container for it.
+ *
+ * Notes: Not interrupt-safe.  Must be called with no locks held.
+ *
+ * Returns:
+ *   pointer to HBQ on success
+ *   NULL on failure
+ **/
 struct hbq_dmabuf *
 lpfc_els_hbq_alloc(struct lpfc_hba *phba)
 {
@@ -251,6 +334,18 @@ lpfc_els_hbq_alloc(struct lpfc_hba *phba)
        return hbqbp;
 }
+/**
+ * lpfc_mem_hbq_free: Frees an HBQ buffer allocated with lpfc_els_hbq_alloc
+ * @phba: HBA buffer was allocated for
+ * @hbqbp: HBQ container returned by lpfc_els_hbq_alloc
+ *
+ * Description: Frees both the container and the DMA-mapped buffer returned by
+ * lpfc_els_hbq_alloc.
+ *
+ * Notes: Can be called with or without locks held.
+ *
+ * Returns: None
+ **/
 void
 lpfc_els_hbq_free(struct lpfc_hba *phba, struct hbq_dmabuf *hbqbp)
 {
@@ -259,7 +354,18 @@ lpfc_els_hbq_free(struct lpfc_hba *phba, struct hbq_dmabuf *hbqbp)
        return;
 }
-/* This is ONLY called for the LPFC_ELS_HBQ */
+/**
+ * lpfc_in_buf_free: Free a DMA buffer
+ * @phba: HBA buffer is associated with
+ * @mp: Buffer to free
+ *
+ * Description: Frees the given DMA buffer in the appropriate way given if the
+ * HBA is running in SLI3 mode with HBQs enabled.
+ *
+ * Notes: Takes phba->hbalock.  Can be called with or without other locks held.
+ *
+ * Returns: None
+ **/
 void
 lpfc_in_buf_free(struct lpfc_hba *phba, struct lpfc_dmabuf *mp)
 {
diff --git a/drivers/scsi/lpfc/lpfc_nl.h b/drivers/scsi/lpfc/lpfc_nl.h
new file mode 100644
index 000000000000..1accb5a9f4e6
--- /dev/null
+++ b/drivers/scsi/lpfc/lpfc_nl.h
@@ -0,0 +1,163 @@
+/*******************************************************************
+ * This file is part of the Emulex Linux Device Driver for         *
+ * Fibre Channel Host Bus Adapters.                                *
+ * Copyright (C) 2008 Emulex.  All rights reserved.                *
+ * EMULEX and SLI are trademarks of Emulex.                        *
+ * www.emulex.com                                                  *
+ *                                                                 *
+ * This program is free software; you can redistribute it and/or   *
+ * modify it under the terms of version 2 of the GNU General       *
+ * Public License as published by the Free Software Foundation.    *
+ * This program is distributed in the hope that it will be useful. *
+ * ALL EXPRESS OR IMPLIED CONDITIONS, REPRESENTATIONS AND          *
+ * WARRANTIES, INCLUDING ANY IMPLIED WARRANTY OF MERCHANTABILITY,  *
+ * FITNESS FOR A PARTICULAR PURPOSE, OR NON-INFRINGEMENT, ARE      *
+ * DISCLAIMED, EXCEPT TO THE EXTENT THAT SUCH DISCLAIMERS ARE HELD *
+ * TO BE LEGALLY INVALID.  See the GNU General Public License for  *
+ * more details, a copy of which can be found in the file COPYING  *
+ * included with this package.                                     *
+ *******************************************************************/
+/* Event definitions for RegisterForEvent */
+#define FC_REG_LINK_EVENT               0x0001  /* link up / down events */
+#define FC_REG_RSCN_EVENT               0x0002  /* RSCN events */
+#define FC_REG_CT_EVENT                 0x0004  /* CT request events */
+#define FC_REG_DUMP_EVENT               0x0008  /* Dump events */
+#define FC_REG_TEMPERATURE_EVENT        0x0010  /* temperature events */
+#define FC_REG_ELS_EVENT                0x0020  /* lpfc els events */
+#define FC_REG_FABRIC_EVENT             0x0040  /* lpfc fabric events */
+#define FC_REG_SCSI_EVENT               0x0080  /* lpfc scsi events */
+#define FC_REG_BOARD_EVENT              0x0100  /* lpfc board events */
+#define FC_REG_ADAPTER_EVENT            0x0200  /* lpfc adapter events */
+#define FC_REG_EVENT_MASK               (FC_REG_LINK_EVENT | \
+                                                FC_REG_RSCN_EVENT | \
+                                                FC_REG_CT_EVENT | \
+                                                FC_REG_DUMP_EVENT | \
+                                                FC_REG_TEMPERATURE_EVENT | \
+                                                FC_REG_ELS_EVENT | \
+                                                FC_REG_FABRIC_EVENT | \
+                                                FC_REG_SCSI_EVENT | \
+                                                FC_REG_BOARD_EVENT | \
+                                                FC_REG_ADAPTER_EVENT)
+/* Temperature events */
+#define LPFC_CRIT_TEMP          0x1
+#define LPFC_THRESHOLD_TEMP     0x2
+#define LPFC_NORMAL_TEMP        0x3
+/*
+ * All net link event payloads will begin with and event type
+ * 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.
+ * The payload sent via the fc transport is one-way driver->application.
+ */
+/* els event header */
+struct lpfc_els_event_header {
+        uint32_t event_type;
+        uint32_t subcategory;
+        uint8_t wwpn[8];
+        uint8_t wwnn[8];
+};
+/* subcategory codes for FC_REG_ELS_EVENT */
+#define LPFC_EVENT_PLOGI_RCV            0x01
+#define LPFC_EVENT_PRLO_RCV             0x02
+#define LPFC_EVENT_ADISC_RCV            0x04
+#define LPFC_EVENT_LSRJT_RCV            0x08
+/* special els lsrjt event */
+struct lpfc_lsrjt_event {
+        struct lpfc_els_event_header header;
+        uint32_t command;
+        uint32_t reason_code;
+        uint32_t explanation;
+};
+/* fabric event header */
+struct lpfc_fabric_event_header {
+        uint32_t event_type;
+        uint32_t subcategory;
+        uint8_t wwpn[8];
+        uint8_t wwnn[8];
+};
+/* subcategory codes for FC_REG_FABRIC_EVENT */
+#define LPFC_EVENT_FABRIC_BUSY          0x01
+#define LPFC_EVENT_PORT_BUSY            0x02
+#define LPFC_EVENT_FCPRDCHKERR          0x04
+/* special case fabric fcprdchkerr event */
+struct lpfc_fcprdchkerr_event {
+        struct lpfc_fabric_event_header header;
+        uint32_t lun;
+        uint32_t opcode;
+        uint32_t fcpiparam;
+};
+/* scsi event header */
+struct lpfc_scsi_event_header {
+        uint32_t event_type;
+        uint32_t subcategory;
+        uint32_t lun;
+        uint8_t wwpn[8];
+        uint8_t wwnn[8];
+};
+/* subcategory codes for FC_REG_SCSI_EVENT */
+#define LPFC_EVENT_QFULL        0x0001
+#define LPFC_EVENT_DEVBSY       0x0002
+#define LPFC_EVENT_CHECK_COND   0x0004
+#define LPFC_EVENT_LUNRESET     0x0008
+#define LPFC_EVENT_TGTRESET     0x0010
+#define LPFC_EVENT_BUSRESET     0x0020
+#define LPFC_EVENT_VARQUEDEPTH  0x0040
+/* special case scsi varqueuedepth event */
+struct lpfc_scsi_varqueuedepth_event {
+        struct lpfc_scsi_event_header scsi_event;
+        uint32_t oldval;
+        uint32_t newval;
+};
+/* special case scsi check condition event */
+struct lpfc_scsi_check_condition_event {
+        struct lpfc_scsi_event_header scsi_event;
+        uint8_t sense_key;
+        uint8_t asc;
+        uint8_t ascq;
+};
+/* event codes for FC_REG_BOARD_EVENT */
+#define LPFC_EVENT_PORTINTERR           0x01
+/* board event header */
+struct lpfc_board_event_header {
+        uint32_t event_type;
+        uint32_t subcategory;
+};
+/* event codes for FC_REG_ADAPTER_EVENT */
+#define LPFC_EVENT_ARRIVAL      0x01
+/* adapter event header */
+struct lpfc_adapter_event_header {
+        uint32_t event_type;
+        uint32_t subcategory;
+};
+/* event codes for temp_event */
+#define LPFC_CRIT_TEMP          0x1
+#define LPFC_THRESHOLD_TEMP     0x2
+#define LPFC_NORMAL_TEMP        0x3
+struct temp_event {
+        uint32_t event_type;
+        uint32_t event_code;
+        uint32_t data;
+};
diff --git a/drivers/scsi/lpfc/lpfc_nportdisc.c b/drivers/scsi/lpfc/lpfc_nportdisc.c
index 6688a8689b56..0c25d97acb42 100644
--- a/drivers/scsi/lpfc/lpfc_nportdisc.c
+++ b/drivers/scsi/lpfc/lpfc_nportdisc.c
@@ -30,6 +30,7 @@
 #include "lpfc_hw.h"
 #include "lpfc_sli.h"
+#include "lpfc_nl.h"
 #include "lpfc_disc.h"
 #include "lpfc_scsi.h"
 #include "lpfc.h"
@@ -1003,20 +1004,8 @@ lpfc_rcv_plogi_adisc_issue(struct lpfc_vport *vport, struct lpfc_nodelist *ndlp,
                        spin_lock_irq(shost->host_lock);
                        ndlp->nlp_flag &= ~NLP_NPR_2B_DISC;
                        spin_unlock_irq(shost->host_lock);
+                        if (vport->num_disc_nodes)
-                        if (vport->num_disc_nodes) {
                                lpfc_more_adisc(vport);
-                                if ((vport->num_disc_nodes == 0) &&
-                                    (vport->fc_npr_cnt))
-                                        lpfc_els_disc_plogi(vport);
-                                if (vport->num_disc_nodes == 0) {
-                                        spin_lock_irq(shost->host_lock);
-                                        vport->fc_flag &= ~FC_NDISC_ACTIVE;
-                                        spin_unlock_irq(shost->host_lock);
-                                        lpfc_can_disctmo(vport);
-                                        lpfc_end_rscn(vport);
-                                }
-                        }
                }
                return ndlp->nlp_state;
        }
@@ -1865,8 +1854,13 @@ static uint32_t
 lpfc_cmpl_logo_npr_node(struct lpfc_vport *vport, struct lpfc_nodelist *ndlp,
                        void *arg, uint32_t evt)
 {
+        struct Scsi_Host *shost = lpfc_shost_from_vport(vport);
+        if (ndlp->nlp_DID == Fabric_DID) {
+                spin_lock_irq(shost->host_lock);
+                vport->fc_flag &= ~(FC_FABRIC | FC_PUBLIC_LOOP);
+                spin_unlock_irq(shost->host_lock);
+        }
        lpfc_unreg_rpi(vport, ndlp);
-        /* This routine does nothing, just return the current state */
        return ndlp->nlp_state;
 }
@@ -2155,7 +2149,7 @@ lpfc_disc_state_machine(struct lpfc_vport *vport, struct lpfc_nodelist *ndlp,
                lpfc_nlp_put(ndlp);
        } else {
                lpfc_printf_vlog(vport, KERN_INFO, LOG_DISCOVERY,
-                        "0212 DSM out state %d on NPort free\n", rc);
+                        "0213 DSM out state %d on NPort free\n", rc);
                lpfc_debugfs_disc_trc(vport, LPFC_DISC_TRC_DSM,
                        "DSM out:         ste:%d did:x%x flg:x%x",
diff --git a/drivers/scsi/lpfc/lpfc_scsi.c b/drivers/scsi/lpfc/lpfc_scsi.c
index 1bcebbd3dfac..bd1867411821 100644
--- a/drivers/scsi/lpfc/lpfc_scsi.c
+++ b/drivers/scsi/lpfc/lpfc_scsi.c
@@ -32,6 +32,7 @@
 #include "lpfc_version.h"
 #include "lpfc_hw.h"
 #include "lpfc_sli.h"
+#include "lpfc_nl.h"
 #include "lpfc_disc.h"
 #include "lpfc_scsi.h"
 #include "lpfc.h"
@@ -42,6 +43,111 @@
 #define LPFC_RESET_WAIT  2
 #define LPFC_ABORT_WAIT  2
+/**
+ * lpfc_update_stats: Update statistical data for the command completion.
+ * @phba: Pointer to HBA object.
+ * @lpfc_cmd: lpfc scsi command object pointer.
+ *
+ * This function is called when there is a command completion and this
+ * function updates the statistical data for the command completion.
+ **/
+static void
+lpfc_update_stats(struct lpfc_hba *phba, struct  lpfc_scsi_buf *lpfc_cmd)
+{
+        struct lpfc_rport_data *rdata = lpfc_cmd->rdata;
+        struct lpfc_nodelist *pnode = rdata->pnode;
+        struct scsi_cmnd *cmd = lpfc_cmd->pCmd;
+        unsigned long flags;
+        struct Scsi_Host  *shost = cmd->device->host;
+        struct lpfc_vport *vport = (struct lpfc_vport *) shost->hostdata;
+        unsigned long latency;
+        int i;
+        if (cmd->result)
+                return;
+        spin_lock_irqsave(shost->host_lock, flags);
+        if (!vport->stat_data_enabled ||
+                vport->stat_data_blocked ||
+                !pnode->lat_data ||
+                (phba->bucket_type == LPFC_NO_BUCKET)) {
+                spin_unlock_irqrestore(shost->host_lock, flags);
+                return;
+        }
+        latency = jiffies_to_msecs(jiffies - lpfc_cmd->start_time);
+        if (phba->bucket_type == LPFC_LINEAR_BUCKET) {
+                i = (latency + phba->bucket_step - 1 - phba->bucket_base)/
+                        phba->bucket_step;
+                if (i >= LPFC_MAX_BUCKET_COUNT)
+                        i = LPFC_MAX_BUCKET_COUNT;
+        } else {
+                for (i = 0; i < LPFC_MAX_BUCKET_COUNT-1; i++)
+                        if (latency <= (phba->bucket_base +
+                                ((1<<i)*phba->bucket_step)))
+                                break;
+        }
+        pnode->lat_data[i].cmd_count++;
+        spin_unlock_irqrestore(shost->host_lock, flags);
+}
+/**
+ * lpfc_send_sdev_queuedepth_change_event: Posts a queuedepth change
+ *                   event.
+ * @phba: Pointer to HBA context object.
+ * @vport: Pointer to vport object.
+ * @ndlp: Pointer to FC node associated with the target.
+ * @lun: Lun number of the scsi device.
+ * @old_val: Old value of the queue depth.
+ * @new_val: New value of the queue depth.
+ *
+ * This function sends an event to the mgmt application indicating
+ * there is a change in the scsi device queue depth.
+ **/
+static void
+lpfc_send_sdev_queuedepth_change_event(struct lpfc_hba *phba,
+                struct lpfc_vport  *vport,
+                struct lpfc_nodelist *ndlp,
+                uint32_t lun,
+                uint32_t old_val,
+                uint32_t new_val)
+{
+        struct lpfc_fast_path_event *fast_path_evt;
+        unsigned long flags;
+        fast_path_evt = lpfc_alloc_fast_evt(phba);
+        if (!fast_path_evt)
+                return;
+        fast_path_evt->un.queue_depth_evt.scsi_event.event_type =
+                FC_REG_SCSI_EVENT;
+        fast_path_evt->un.queue_depth_evt.scsi_event.subcategory =
+                LPFC_EVENT_VARQUEDEPTH;
+        /* Report all luns with change in queue depth */
+        fast_path_evt->un.queue_depth_evt.scsi_event.lun = lun;
+        if (ndlp && NLP_CHK_NODE_ACT(ndlp)) {
+                memcpy(&fast_path_evt->un.queue_depth_evt.scsi_event.wwpn,
+                        &ndlp->nlp_portname, sizeof(struct lpfc_name));
+                memcpy(&fast_path_evt->un.queue_depth_evt.scsi_event.wwnn,
+                        &ndlp->nlp_nodename, sizeof(struct lpfc_name));
+        }
+        fast_path_evt->un.queue_depth_evt.oldval = old_val;
+        fast_path_evt->un.queue_depth_evt.newval = new_val;
+        fast_path_evt->vport = vport;
+        fast_path_evt->work_evt.evt = LPFC_EVT_FASTPATH_MGMT_EVT;
+        spin_lock_irqsave(&phba->hbalock, flags);
+        list_add_tail(&fast_path_evt->work_evt.evt_listp, &phba->work_list);
+        spin_unlock_irqrestore(&phba->hbalock, flags);
+        lpfc_worker_wake_up(phba);
+        return;
+}
 /*
 * This function is called with no lock held when there is a resource
 * error in driver or in firmware.
@@ -117,9 +223,10 @@ lpfc_ramp_down_queue_handler(struct lpfc_hba *phba)
        struct lpfc_vport **vports;
        struct Scsi_Host  *shost;
        struct scsi_device *sdev;
-        unsigned long new_queue_depth;
+        unsigned long new_queue_depth, old_queue_depth;
        unsigned long num_rsrc_err, num_cmd_success;
        int i;
+        struct lpfc_rport_data *rdata;
        num_rsrc_err = atomic_read(&phba->num_rsrc_err);
        num_cmd_success = atomic_read(&phba->num_cmd_success);
@@ -137,6 +244,7 @@ lpfc_ramp_down_queue_handler(struct lpfc_hba *phba)
                                else
                                        new_queue_depth = sdev->queue_depth -
                                                                new_queue_depth;
+                                old_queue_depth = sdev->queue_depth;
                                if (sdev->ordered_tags)
                                        scsi_adjust_queue_depth(sdev,
                                                        MSG_ORDERED_TAG,
@@ -145,6 +253,13 @@ lpfc_ramp_down_queue_handler(struct lpfc_hba *phba)
                                        scsi_adjust_queue_depth(sdev,
                                                        MSG_SIMPLE_TAG,
                                                        new_queue_depth);
+                                rdata = sdev->hostdata;
+                                if (rdata)
+                                        lpfc_send_sdev_queuedepth_change_event(
+                                                phba, vports[i],
+                                                rdata->pnode,
+                                                sdev->lun, old_queue_depth,
+                                                new_queue_depth);
                        }
                }
        lpfc_destroy_vport_work_array(phba, vports);
@@ -159,6 +274,7 @@ lpfc_ramp_up_queue_handler(struct lpfc_hba *phba)
        struct Scsi_Host  *shost;
        struct scsi_device *sdev;
        int i;
+        struct lpfc_rport_data *rdata;
        vports = lpfc_create_vport_work_array(phba);
        if (vports != NULL)
@@ -176,6 +292,14 @@ lpfc_ramp_up_queue_handler(struct lpfc_hba *phba)
                                        scsi_adjust_queue_depth(sdev,
                                                        MSG_SIMPLE_TAG,
                                                        sdev->queue_depth+1);
+                                rdata = sdev->hostdata;
+                                if (rdata)
+                                        lpfc_send_sdev_queuedepth_change_event(
+                                                phba, vports[i],
+                                                rdata->pnode,
+                                                sdev->lun,
+                                                sdev->queue_depth - 1,
+                                                sdev->queue_depth);
                        }
                }
        lpfc_destroy_vport_work_array(phba, vports);
@@ -183,6 +307,35 @@ lpfc_ramp_up_queue_handler(struct lpfc_hba *phba)
        atomic_set(&phba->num_cmd_success, 0);
 }
+/**
+ * lpfc_scsi_dev_block: set all scsi hosts to block state.
+ * @phba: Pointer to HBA context object.
+ *
+ * This function walks vport list and set each SCSI host to block state
+ * by invoking fc_remote_port_delete() routine. This function is invoked
+ * with EEH when device's PCI slot has been permanently disabled.
+ **/
+void
+lpfc_scsi_dev_block(struct lpfc_hba *phba)
+{
+        struct lpfc_vport **vports;
+        struct Scsi_Host  *shost;
+        struct scsi_device *sdev;
+        struct fc_rport *rport;
+        int i;
+        vports = lpfc_create_vport_work_array(phba);
+        if (vports != NULL)
+                for (i = 0; i <= phba->max_vpi && vports[i] != NULL; i++) {
+                        shost = lpfc_shost_from_vport(vports[i]);
+                        shost_for_each_device(sdev, shost) {
+                                rport = starget_to_rport(scsi_target(sdev));
+                                fc_remote_port_delete(rport);
+                        }
+                }
+        lpfc_destroy_vport_work_array(phba, vports);
+}
 /*
 * This routine allocates a scsi buffer, which contains all the necessary
 * information needed to initiate a SCSI I/O.  The non-DMAable buffer region
@@ -198,7 +351,9 @@ lpfc_new_scsi_buf(struct lpfc_vport *vport)
        struct lpfc_scsi_buf *psb;
        struct ulp_bde64 *bpl;
        IOCB_t *iocb;
-        dma_addr_t pdma_phys;
+        dma_addr_t pdma_phys_fcp_cmd;
+        dma_addr_t pdma_phys_fcp_rsp;
+        dma_addr_t pdma_phys_bpl;
        uint16_t iotag;
        psb = kzalloc(sizeof(struct lpfc_scsi_buf), GFP_KERNEL);
@@ -238,40 +393,60 @@ lpfc_new_scsi_buf(struct lpfc_vport *vport)
        /* Initialize local short-hand pointers. */
        bpl = psb->fcp_bpl;
-        pdma_phys = psb->dma_handle;
+        pdma_phys_fcp_cmd = psb->dma_handle;
+        pdma_phys_fcp_rsp = psb->dma_handle + sizeof(struct fcp_cmnd);
+        pdma_phys_bpl = psb->dma_handle + sizeof(struct fcp_cmnd) +
+                        sizeof(struct fcp_rsp);
        /*
         * The first two bdes are the FCP_CMD and FCP_RSP.  The balance are sg
         * list bdes.  Initialize the first two and leave the rest for
         * queuecommand.
         */
-        bpl->addrHigh = le32_to_cpu(putPaddrHigh(pdma_phys));
+        bpl[0].addrHigh = le32_to_cpu(putPaddrHigh(pdma_phys_fcp_cmd));
-        bpl->addrLow = le32_to_cpu(putPaddrLow(pdma_phys));
+        bpl[0].addrLow = le32_to_cpu(putPaddrLow(pdma_phys_fcp_cmd));
-        bpl->tus.f.bdeSize = sizeof (struct fcp_cmnd);
+        bpl[0].tus.f.bdeSize = sizeof(struct fcp_cmnd);
-        bpl->tus.f.bdeFlags = BUFF_USE_CMND;
+        bpl[0].tus.f.bdeFlags = BUFF_TYPE_BDE_64;
-        bpl->tus.w = le32_to_cpu(bpl->tus.w);
+        bpl[0].tus.w = le32_to_cpu(bpl->tus.w);
-        bpl++;
        /* Setup the physical region for the FCP RSP */
-        pdma_phys += sizeof (struct fcp_cmnd);
+        bpl[1].addrHigh = le32_to_cpu(putPaddrHigh(pdma_phys_fcp_rsp));
-        bpl->addrHigh = le32_to_cpu(putPaddrHigh(pdma_phys));
+        bpl[1].addrLow = le32_to_cpu(putPaddrLow(pdma_phys_fcp_rsp));
-        bpl->addrLow = le32_to_cpu(putPaddrLow(pdma_phys));
+        bpl[1].tus.f.bdeSize = sizeof(struct fcp_rsp);
-        bpl->tus.f.bdeSize = sizeof (struct fcp_rsp);
+        bpl[1].tus.f.bdeFlags = BUFF_TYPE_BDE_64;
-        bpl->tus.f.bdeFlags = (BUFF_USE_CMND | BUFF_USE_RCV);
+        bpl[1].tus.w = le32_to_cpu(bpl->tus.w);
-        bpl->tus.w = le32_to_cpu(bpl->tus.w);
        /*
         * Since the IOCB for the FCP I/O is built into this lpfc_scsi_buf,
         * initialize it with all known data now.
         */
-        pdma_phys += (sizeof (struct fcp_rsp));
        iocb = &psb->cur_iocbq.iocb;
        iocb->un.fcpi64.bdl.ulpIoTag32 = 0;
-        iocb->un.fcpi64.bdl.addrHigh = putPaddrHigh(pdma_phys);
+        if (phba->sli_rev == 3) {
-        iocb->un.fcpi64.bdl.addrLow = putPaddrLow(pdma_phys);
+                /* fill in immediate fcp command BDE */
-        iocb->un.fcpi64.bdl.bdeSize = (2 * sizeof (struct ulp_bde64));
+                iocb->un.fcpi64.bdl.bdeFlags = BUFF_TYPE_BDE_IMMED;
-        iocb->un.fcpi64.bdl.bdeFlags = BUFF_TYPE_BDL;
+                iocb->un.fcpi64.bdl.bdeSize = sizeof(struct fcp_cmnd);
-        iocb->ulpBdeCount = 1;
+                iocb->un.fcpi64.bdl.addrLow = offsetof(IOCB_t,
+                                                       unsli3.fcp_ext.icd);
+                iocb->un.fcpi64.bdl.addrHigh = 0;
+                iocb->ulpBdeCount = 0;
+                iocb->ulpLe = 0;
+                /* fill in responce BDE */
+                iocb->unsli3.fcp_ext.rbde.tus.f.bdeFlags = BUFF_TYPE_BDE_64;
+                iocb->unsli3.fcp_ext.rbde.tus.f.bdeSize =
+                                                sizeof(struct fcp_rsp);
+                iocb->unsli3.fcp_ext.rbde.addrLow =
+                                                putPaddrLow(pdma_phys_fcp_rsp);
+                iocb->unsli3.fcp_ext.rbde.addrHigh =
+                                                putPaddrHigh(pdma_phys_fcp_rsp);
+        } else {
+                iocb->un.fcpi64.bdl.bdeFlags = BUFF_TYPE_BLP_64;
+                iocb->un.fcpi64.bdl.bdeSize = (2 * sizeof(struct ulp_bde64));
+                iocb->un.fcpi64.bdl.addrLow = putPaddrLow(pdma_phys_bpl);
+                iocb->un.fcpi64.bdl.addrHigh = putPaddrHigh(pdma_phys_bpl);
+                iocb->ulpBdeCount = 1;
+                iocb->ulpLe = 1;
+        }
        iocb->ulpClass = CLASS3;
        return psb;
@@ -313,8 +488,9 @@ lpfc_scsi_prep_dma_buf(struct lpfc_hba *phba, struct lpfc_scsi_buf *lpfc_cmd)
        struct fcp_cmnd *fcp_cmnd = lpfc_cmd->fcp_cmnd;
        struct ulp_bde64 *bpl = lpfc_cmd->fcp_bpl;
        IOCB_t *iocb_cmd = &lpfc_cmd->cur_iocbq.iocb;
+        struct ulp_bde64 *data_bde = iocb_cmd->unsli3.fcp_ext.dbde;
        dma_addr_t physaddr;
-        uint32_t i, num_bde = 0;
+        uint32_t num_bde = 0;
        int nseg, datadir = scsi_cmnd->sc_data_direction;
        /*
@@ -352,37 +528,159 @@ lpfc_scsi_prep_dma_buf(struct lpfc_hba *phba, struct lpfc_scsi_buf *lpfc_cmd)
                 * during probe that limits the number of sg elements in any
                 * single scsi command.  Just run through the seg_cnt and format
                 * the bde's.
+                 * When using SLI-3 the driver will try to fit all the BDEs into
+                 * the IOCB. If it can't then the BDEs get added to a BPL as it
+                 * does for SLI-2 mode.
                 */
-                scsi_for_each_sg(scsi_cmnd, sgel, nseg, i) {
+                scsi_for_each_sg(scsi_cmnd, sgel, nseg, num_bde) {
                        physaddr = sg_dma_address(sgel);
-                        bpl->addrLow = le32_to_cpu(putPaddrLow(physaddr));
+                        if (phba->sli_rev == 3 &&
-                        bpl->addrHigh = le32_to_cpu(putPaddrHigh(physaddr));
+                            nseg <= LPFC_EXT_DATA_BDE_COUNT) {
-                        bpl->tus.f.bdeSize = sg_dma_len(sgel);
+                                data_bde->tus.f.bdeFlags = BUFF_TYPE_BDE_64;
-                        if (datadir == DMA_TO_DEVICE)
+                                data_bde->tus.f.bdeSize = sg_dma_len(sgel);
-                                bpl->tus.f.bdeFlags = 0;
+                                data_bde->addrLow = putPaddrLow(physaddr);
-                        else
+                                data_bde->addrHigh = putPaddrHigh(physaddr);
-                                bpl->tus.f.bdeFlags = BUFF_USE_RCV;
+                                data_bde++;
-                        bpl->tus.w = le32_to_cpu(bpl->tus.w);
+                        } else {
-                        bpl++;
+                                bpl->tus.f.bdeFlags = BUFF_TYPE_BDE_64;
-                        num_bde++;
+                                bpl->tus.f.bdeSize = sg_dma_len(sgel);
+                                bpl->tus.w = le32_to_cpu(bpl->tus.w);
+                                bpl->addrLow =
+                                        le32_to_cpu(putPaddrLow(physaddr));
+                                bpl->addrHigh =
+                                        le32_to_cpu(putPaddrHigh(physaddr));
+                                bpl++;
+                        }
                }
        }
        /*
         * Finish initializing those IOCB fields that are dependent on the
-         * scsi_cmnd request_buffer.  Note that the bdeSize is explicitly
+         * scsi_cmnd request_buffer.  Note that for SLI-2 the bdeSize is
-         * reinitialized since all iocb memory resources are used many times
+         * explicitly reinitialized and for SLI-3 the extended bde count is
-         * for transmit, receive, and continuation bpl's.
+         * explicitly reinitialized since all iocb memory resources are reused.
         */
-        iocb_cmd->un.fcpi64.bdl.bdeSize = (2 * sizeof (struct ulp_bde64));
+        if (phba->sli_rev == 3) {
-        iocb_cmd->un.fcpi64.bdl.bdeSize +=
+                if (num_bde > LPFC_EXT_DATA_BDE_COUNT) {
-                (num_bde * sizeof (struct ulp_bde64));
+                        /*
-        iocb_cmd->ulpBdeCount = 1;
+                         * The extended IOCB format can only fit 3 BDE or a BPL.
-        iocb_cmd->ulpLe = 1;
+                         * This I/O has more than 3 BDE so the 1st data bde will
+                         * be a BPL that is filled in here.
+                         */
+                        physaddr = lpfc_cmd->dma_handle;
+                        data_bde->tus.f.bdeFlags = BUFF_TYPE_BLP_64;
+                        data_bde->tus.f.bdeSize = (num_bde *
+                                                   sizeof(struct ulp_bde64));
+                        physaddr += (sizeof(struct fcp_cmnd) +
+                                     sizeof(struct fcp_rsp) +
+                                     (2 * sizeof(struct ulp_bde64)));
+                        data_bde->addrHigh = putPaddrHigh(physaddr);
+                        data_bde->addrLow = putPaddrLow(physaddr);
+                        /* ebde count includes the responce bde and data bpl */
+                        iocb_cmd->unsli3.fcp_ext.ebde_count = 2;
+                } else {
+                        /* ebde count includes the responce bde and data bdes */
+                        iocb_cmd->unsli3.fcp_ext.ebde_count = (num_bde + 1);
+                }
+        } else {
+                iocb_cmd->un.fcpi64.bdl.bdeSize =
+                        ((num_bde + 2) * sizeof(struct ulp_bde64));
+        }
        fcp_cmnd->fcpDl = cpu_to_be32(scsi_bufflen(scsi_cmnd));
        return 0;
 }
+/**
+ * lpfc_send_scsi_error_event: Posts an event when there is SCSI error.
+ * @phba: Pointer to hba context object.
+ * @vport: Pointer to vport object.
+ * @lpfc_cmd: Pointer to lpfc scsi command which reported the error.
+ * @rsp_iocb: Pointer to response iocb object which reported error.
+ *
+ * This function posts an event when there is a SCSI command reporting
+ * error from the scsi device.
+ **/
+static void
+lpfc_send_scsi_error_event(struct lpfc_hba *phba, struct lpfc_vport *vport,
+                struct lpfc_scsi_buf *lpfc_cmd, struct lpfc_iocbq *rsp_iocb) {
+        struct scsi_cmnd *cmnd = lpfc_cmd->pCmd;
+        struct fcp_rsp *fcprsp = lpfc_cmd->fcp_rsp;
+        uint32_t resp_info = fcprsp->rspStatus2;
+        uint32_t scsi_status = fcprsp->rspStatus3;
+        uint32_t fcpi_parm = rsp_iocb->iocb.un.fcpi.fcpi_parm;
+        struct lpfc_fast_path_event *fast_path_evt = NULL;
+        struct lpfc_nodelist *pnode = lpfc_cmd->rdata->pnode;
+        unsigned long flags;
+        /* If there is queuefull or busy condition send a scsi event */
+        if ((cmnd->result == SAM_STAT_TASK_SET_FULL) ||
+                (cmnd->result == SAM_STAT_BUSY)) {
+                fast_path_evt = lpfc_alloc_fast_evt(phba);
+                if (!fast_path_evt)
+                        return;
+                fast_path_evt->un.scsi_evt.event_type =
+                        FC_REG_SCSI_EVENT;
+                fast_path_evt->un.scsi_evt.subcategory =
+                (cmnd->result == SAM_STAT_TASK_SET_FULL) ?
+                LPFC_EVENT_QFULL : LPFC_EVENT_DEVBSY;
+                fast_path_evt->un.scsi_evt.lun = cmnd->device->lun;
+                memcpy(&fast_path_evt->un.scsi_evt.wwpn,
+                        &pnode->nlp_portname, sizeof(struct lpfc_name));
+                memcpy(&fast_path_evt->un.scsi_evt.wwnn,
+                        &pnode->nlp_nodename, sizeof(struct lpfc_name));
+        } else if ((resp_info & SNS_LEN_VALID) && fcprsp->rspSnsLen &&
+                ((cmnd->cmnd[0] == READ_10) || (cmnd->cmnd[0] == WRITE_10))) {
+                fast_path_evt = lpfc_alloc_fast_evt(phba);
+                if (!fast_path_evt)
+                        return;
+                fast_path_evt->un.check_cond_evt.scsi_event.event_type =
+                        FC_REG_SCSI_EVENT;
+                fast_path_evt->un.check_cond_evt.scsi_event.subcategory =
+                        LPFC_EVENT_CHECK_COND;
+                fast_path_evt->un.check_cond_evt.scsi_event.lun =
+                        cmnd->device->lun;
+                memcpy(&fast_path_evt->un.check_cond_evt.scsi_event.wwpn,
+                        &pnode->nlp_portname, sizeof(struct lpfc_name));
+                memcpy(&fast_path_evt->un.check_cond_evt.scsi_event.wwnn,
+                        &pnode->nlp_nodename, sizeof(struct lpfc_name));
+                fast_path_evt->un.check_cond_evt.sense_key =
+                        cmnd->sense_buffer[2] & 0xf;
+                fast_path_evt->un.check_cond_evt.asc = cmnd->sense_buffer[12];
+                fast_path_evt->un.check_cond_evt.ascq = cmnd->sense_buffer[13];
+        } else if ((cmnd->sc_data_direction == DMA_FROM_DEVICE) &&
+                     fcpi_parm &&
+                     ((be32_to_cpu(fcprsp->rspResId) != fcpi_parm) ||
+                        ((scsi_status == SAM_STAT_GOOD) &&
+                        !(resp_info & (RESID_UNDER | RESID_OVER))))) {
+                /*
+                 * If status is good or resid does not match with fcp_param and
+                 * there is valid fcpi_parm, then there is a read_check error
+                 */
+                fast_path_evt = lpfc_alloc_fast_evt(phba);
+                if (!fast_path_evt)
+                        return;
+                fast_path_evt->un.read_check_error.header.event_type =
+                        FC_REG_FABRIC_EVENT;
+                fast_path_evt->un.read_check_error.header.subcategory =
+                        LPFC_EVENT_FCPRDCHKERR;
+                memcpy(&fast_path_evt->un.read_check_error.header.wwpn,
+                        &pnode->nlp_portname, sizeof(struct lpfc_name));
+                memcpy(&fast_path_evt->un.read_check_error.header.wwnn,
+                        &pnode->nlp_nodename, sizeof(struct lpfc_name));
+                fast_path_evt->un.read_check_error.lun = cmnd->device->lun;
+                fast_path_evt->un.read_check_error.opcode = cmnd->cmnd[0];
+                fast_path_evt->un.read_check_error.fcpiparam =
+                        fcpi_parm;
+        } else
+                return;
+        fast_path_evt->vport = vport;
+        spin_lock_irqsave(&phba->hbalock, flags);
+        list_add_tail(&fast_path_evt->work_evt.evt_listp, &phba->work_list);
+        spin_unlock_irqrestore(&phba->hbalock, flags);
+        lpfc_worker_wake_up(phba);
+        return;
+}
 static void
 lpfc_scsi_unprep_dma_buf(struct lpfc_hba * phba, struct lpfc_scsi_buf * psb)
 {
@@ -411,6 +709,7 @@ lpfc_handle_fcp_err(struct lpfc_vport *vport, struct lpfc_scsi_buf *lpfc_cmd,
        uint32_t rsplen = 0;
        uint32_t logit = LOG_FCP | LOG_FCP_ERROR;
        /*
         *  If this is a task management command, there is no
         *  scsi packet associated with this lpfc_cmd.  The driver
@@ -526,6 +825,7 @@ lpfc_handle_fcp_err(struct lpfc_vport *vport, struct lpfc_scsi_buf *lpfc_cmd,
 out:
        cmnd->result = ScsiResult(host_status, scsi_status);
+        lpfc_send_scsi_error_event(vport->phba, vport, lpfc_cmd, rsp_iocb);
 }
 static void
@@ -542,9 +842,11 @@ lpfc_scsi_cmd_iocb_cmpl(struct lpfc_hba *phba, struct lpfc_iocbq *pIocbIn,
        struct scsi_device *sdev, *tmp_sdev;
        int depth = 0;
        unsigned long flags;
+        struct lpfc_fast_path_event *fast_path_evt;
        lpfc_cmd->result = pIocbOut->iocb.un.ulpWord[4];
        lpfc_cmd->status = pIocbOut->iocb.ulpStatus;
+        atomic_dec(&pnode->cmd_pending);
        if (lpfc_cmd->status) {
                if (lpfc_cmd->status == IOSTAT_LOCAL_REJECT &&
@@ -570,12 +872,36 @@ lpfc_scsi_cmd_iocb_cmpl(struct lpfc_hba *phba, struct lpfc_iocbq *pIocbIn,
                        break;
                case IOSTAT_NPORT_BSY:
                case IOSTAT_FABRIC_BSY:
-                        cmd->result = ScsiResult(DID_BUS_BUSY, 0);
+                        cmd->result = ScsiResult(DID_TRANSPORT_DISRUPTED, 0);
+                        fast_path_evt = lpfc_alloc_fast_evt(phba);
+                        if (!fast_path_evt)
+                                break;
+                        fast_path_evt->un.fabric_evt.event_type =
+                                FC_REG_FABRIC_EVENT;
+                        fast_path_evt->un.fabric_evt.subcategory =
+                                (lpfc_cmd->status == IOSTAT_NPORT_BSY) ?
+                                LPFC_EVENT_PORT_BUSY : LPFC_EVENT_FABRIC_BUSY;
+                        if (pnode && NLP_CHK_NODE_ACT(pnode)) {
+                                memcpy(&fast_path_evt->un.fabric_evt.wwpn,
+                                        &pnode->nlp_portname,
+                                        sizeof(struct lpfc_name));
+                                memcpy(&fast_path_evt->un.fabric_evt.wwnn,
+                                        &pnode->nlp_nodename,
+                                        sizeof(struct lpfc_name));
+                        }
+                        fast_path_evt->vport = vport;
+                        fast_path_evt->work_evt.evt =
+                                LPFC_EVT_FASTPATH_MGMT_EVT;
+                        spin_lock_irqsave(&phba->hbalock, flags);
+                        list_add_tail(&fast_path_evt->work_evt.evt_listp,
+                                &phba->work_list);
+                        spin_unlock_irqrestore(&phba->hbalock, flags);
+                        lpfc_worker_wake_up(phba);
                        break;
                case IOSTAT_LOCAL_REJECT:
-                        if (lpfc_cmd->result == RJT_UNAVAIL_PERM ||
+                        if (lpfc_cmd->result == IOERR_INVALID_RPI ||
                            lpfc_cmd->result == IOERR_NO_RESOURCES ||
-                            lpfc_cmd->result == RJT_LOGIN_REQUIRED) {
+                            lpfc_cmd->result == IOERR_ABORT_REQUESTED) {
                                cmd->result = ScsiResult(DID_REQUEUE, 0);
                                break;
                        } /* else: fall through */
@@ -586,7 +912,8 @@ lpfc_scsi_cmd_iocb_cmpl(struct lpfc_hba *phba, struct lpfc_iocbq *pIocbIn,
                if (!pnode || !NLP_CHK_NODE_ACT(pnode)
                    || (pnode->nlp_state != NLP_STE_MAPPED_NODE))
-                        cmd->result = ScsiResult(DID_BUS_BUSY, SAM_STAT_BUSY);
+                        cmd->result = ScsiResult(DID_TRANSPORT_DISRUPTED,
+                                                 SAM_STAT_BUSY);
        } else {
                cmd->result = ScsiResult(DID_OK, 0);
        }
@@ -602,8 +929,32 @@ lpfc_scsi_cmd_iocb_cmpl(struct lpfc_hba *phba, struct lpfc_iocbq *pIocbIn,
                                 scsi_get_resid(cmd));
        }
+        lpfc_update_stats(phba, lpfc_cmd);
        result = cmd->result;
        sdev = cmd->device;
+        if (vport->cfg_max_scsicmpl_time &&
+           time_after(jiffies, lpfc_cmd->start_time +
+                msecs_to_jiffies(vport->cfg_max_scsicmpl_time))) {
+                spin_lock_irqsave(sdev->host->host_lock, flags);
+                if ((pnode->cmd_qdepth > atomic_read(&pnode->cmd_pending) &&
+                    (atomic_read(&pnode->cmd_pending) > LPFC_MIN_TGT_QDEPTH) &&
+                    ((cmd->cmnd[0] == READ_10) || (cmd->cmnd[0] == WRITE_10))))
+                        pnode->cmd_qdepth = atomic_read(&pnode->cmd_pending);
+                pnode->last_change_time = jiffies;
+                spin_unlock_irqrestore(sdev->host->host_lock, flags);
+        } else if ((pnode->cmd_qdepth < LPFC_MAX_TGT_QDEPTH) &&
+                   time_after(jiffies, pnode->last_change_time +
+                        msecs_to_jiffies(LPFC_TGTQ_INTERVAL))) {
+                spin_lock_irqsave(sdev->host->host_lock, flags);
+                pnode->cmd_qdepth += pnode->cmd_qdepth *
+                        LPFC_TGTQ_RAMPUP_PCENT / 100;
+                if (pnode->cmd_qdepth > LPFC_MAX_TGT_QDEPTH)
+                        pnode->cmd_qdepth = LPFC_MAX_TGT_QDEPTH;
+                pnode->last_change_time = jiffies;
+                spin_unlock_irqrestore(sdev->host->host_lock, flags);
+        }
        lpfc_scsi_unprep_dma_buf(phba, lpfc_cmd);
        cmd->scsi_done(cmd);
@@ -647,6 +998,9 @@ lpfc_scsi_cmd_iocb_cmpl(struct lpfc_hba *phba, struct lpfc_iocbq *pIocbIn,
                                pnode->last_ramp_up_time = jiffies;
                        }
                }
+                lpfc_send_sdev_queuedepth_change_event(phba, vport, pnode,
+                        0xFFFFFFFF,
+                        sdev->queue_depth - 1, sdev->queue_depth);
        }
        /*
@@ -676,6 +1030,9 @@ lpfc_scsi_cmd_iocb_cmpl(struct lpfc_hba *phba, struct lpfc_iocbq *pIocbIn,
                        lpfc_printf_vlog(vport, KERN_WARNING, LOG_FCP,
                                         "0711 detected queue full - lun queue "
                                         "depth adjusted to %d.\n", depth);
+                        lpfc_send_sdev_queuedepth_change_event(phba, vport,
+                                pnode, 0xFFFFFFFF,
+                                depth+1, depth);
                }
        }
@@ -692,6 +1049,24 @@ lpfc_scsi_cmd_iocb_cmpl(struct lpfc_hba *phba, struct lpfc_iocbq *pIocbIn,
        lpfc_release_scsi_buf(phba, lpfc_cmd);
 }
+/**
+ * lpfc_fcpcmd_to_iocb - copy the fcp_cmd data into the IOCB.
+ * @data: A pointer to the immediate command data portion of the IOCB.
+ * @fcp_cmnd: The FCP Command that is provided by the SCSI layer.
+ *
+ * The routine copies the entire FCP command from @fcp_cmnd to @data while
+ * byte swapping the data to big endian format for transmission on the wire.
+ **/
+static void
+lpfc_fcpcmd_to_iocb(uint8_t *data, struct fcp_cmnd *fcp_cmnd)
+{
+        int i, j;
+        for (i = 0, j = 0; i < sizeof(struct fcp_cmnd);
+             i += sizeof(uint32_t), j++) {
+                ((uint32_t *)data)[j] = cpu_to_be32(((uint32_t *)fcp_cmnd)[j]);
+        }
+}
 static void
 lpfc_scsi_prep_cmnd(struct lpfc_vport *vport, struct lpfc_scsi_buf *lpfc_cmd,
                    struct lpfc_nodelist *pnode)
@@ -758,7 +1133,8 @@ lpfc_scsi_prep_cmnd(struct lpfc_vport *vport, struct lpfc_scsi_buf *lpfc_cmd,
                fcp_cmnd->fcpCntl3 = 0;
                phba->fc4ControlRequests++;
        }
+        if (phba->sli_rev == 3)
+                lpfc_fcpcmd_to_iocb(iocb_cmd->unsli3.fcp_ext.icd, fcp_cmnd);
        /*
         * Finish initializing those IOCB fields that are independent
         * of the scsi_cmnd request_buffer
@@ -798,11 +1174,13 @@ lpfc_scsi_prep_task_mgmt_cmd(struct lpfc_vport *vport,
        piocb = &piocbq->iocb;
        fcp_cmnd = lpfc_cmd->fcp_cmnd;
-        int_to_scsilun(lun, &lpfc_cmd->fcp_cmnd->fcp_lun);
+        /* Clear out any old data in the FCP command area */
+        memset(fcp_cmnd, 0, sizeof(struct fcp_cmnd));
+        int_to_scsilun(lun, &fcp_cmnd->fcp_lun);
        fcp_cmnd->fcpCntl2 = task_mgmt_cmd;
+        if (vport->phba->sli_rev == 3)
+                lpfc_fcpcmd_to_iocb(piocb->unsli3.fcp_ext.icd, fcp_cmnd);
        piocb->ulpCommand = CMD_FCP_ICMND64_CR;
        piocb->ulpContext = ndlp->nlp_rpi;
        if (ndlp->nlp_fcp_info & NLP_FCP_2_DEVICE) {
                piocb->ulpFCP2Rcvy = 1;
@@ -967,9 +1345,12 @@ lpfc_queuecommand(struct scsi_cmnd *cmnd, void (*done) (struct scsi_cmnd *))
         * transport is still transitioning.
         */
        if (!ndlp || !NLP_CHK_NODE_ACT(ndlp)) {
-                cmnd->result = ScsiResult(DID_BUS_BUSY, 0);
+                cmnd->result = ScsiResult(DID_TRANSPORT_DISRUPTED, 0);
                goto out_fail_command;
        }
+        if (atomic_read(&ndlp->cmd_pending) >= ndlp->cmd_qdepth)
+                goto out_host_busy;
        lpfc_cmd = lpfc_get_scsi_buf(phba);
        if (lpfc_cmd == NULL) {
                lpfc_adjust_queue_depth(phba);
@@ -980,6 +1361,7 @@ lpfc_queuecommand(struct scsi_cmnd *cmnd, void (*done) (struct scsi_cmnd *))
                goto out_host_busy;
        }
+        lpfc_cmd->start_time = jiffies;
        /*
         * Store the midlayer's command structure for the completion phase
         * and complete the command initialization.
@@ -987,6 +1369,7 @@ lpfc_queuecommand(struct scsi_cmnd *cmnd, void (*done) (struct scsi_cmnd *))
        lpfc_cmd->pCmd  = cmnd;
        lpfc_cmd->rdata = rdata;
        lpfc_cmd->timeout = 0;
+        lpfc_cmd->start_time = jiffies;
        cmnd->host_scribble = (unsigned char *)lpfc_cmd;
        cmnd->scsi_done = done;
@@ -996,6 +1379,7 @@ lpfc_queuecommand(struct scsi_cmnd *cmnd, void (*done) (struct scsi_cmnd *))
        lpfc_scsi_prep_cmnd(vport, lpfc_cmd, ndlp);
+        atomic_inc(&ndlp->cmd_pending);
        err = lpfc_sli_issue_iocb(phba, &phba->sli.ring[psli->fcp_ring],
                                  &lpfc_cmd->cur_iocbq, SLI_IOCB_RET_IOCB);
        if (err)
@@ -1010,6 +1394,7 @@ lpfc_queuecommand(struct scsi_cmnd *cmnd, void (*done) (struct scsi_cmnd *))
        return 0;
 out_host_busy_free_buf:
+        atomic_dec(&ndlp->cmd_pending);
        lpfc_scsi_unprep_dma_buf(phba, lpfc_cmd);
        lpfc_release_scsi_buf(phba, lpfc_cmd);
 out_host_busy:
@@ -1145,6 +1530,7 @@ lpfc_device_reset_handler(struct scsi_cmnd *cmnd)
        int ret = SUCCESS;
        int status;
        int cnt;
+        struct lpfc_scsi_event_header scsi_event;
        lpfc_block_error_handler(cmnd);
        /*
@@ -1163,6 +1549,19 @@ lpfc_device_reset_handler(struct scsi_cmnd *cmnd)
                        break;
                pnode = rdata->pnode;
        }
+        scsi_event.event_type = FC_REG_SCSI_EVENT;
+        scsi_event.subcategory = LPFC_EVENT_TGTRESET;
+        scsi_event.lun = 0;
+        memcpy(scsi_event.wwpn, &pnode->nlp_portname, sizeof(struct lpfc_name));
+        memcpy(scsi_event.wwnn, &pnode->nlp_nodename, sizeof(struct lpfc_name));
+        fc_host_post_vendor_event(shost,
+                fc_get_event_number(),
+                sizeof(scsi_event),
+                (char *)&scsi_event,
+                SCSI_NL_VID_TYPE_PCI | PCI_VENDOR_ID_EMULEX);
        if (!rdata || pnode->nlp_state != NLP_STE_MAPPED_NODE) {
                lpfc_printf_vlog(vport, KERN_ERR, LOG_FCP,
                                 "0721 LUN Reset rport "
@@ -1242,10 +1641,23 @@ lpfc_bus_reset_handler(struct scsi_cmnd *cmnd)
        struct lpfc_hba   *phba = vport->phba;
        struct lpfc_nodelist *ndlp = NULL;
        int match;
-        int ret = SUCCESS, status, i;
+        int ret = SUCCESS, status = SUCCESS, i;
        int cnt;
        struct lpfc_scsi_buf * lpfc_cmd;
        unsigned long later;
+        struct lpfc_scsi_event_header scsi_event;
+        scsi_event.event_type = FC_REG_SCSI_EVENT;
+        scsi_event.subcategory = LPFC_EVENT_BUSRESET;
+        scsi_event.lun = 0;
+        memcpy(scsi_event.wwpn, &vport->fc_portname, sizeof(struct lpfc_name));
+        memcpy(scsi_event.wwnn, &vport->fc_nodename, sizeof(struct lpfc_name));
+        fc_host_post_vendor_event(shost,
+                fc_get_event_number(),
+                sizeof(scsi_event),
+                (char *)&scsi_event,
+                SCSI_NL_VID_TYPE_PCI | PCI_VENDOR_ID_EMULEX);
        lpfc_block_error_handler(cmnd);
        /*
diff --git a/drivers/scsi/lpfc/lpfc_scsi.h b/drivers/scsi/lpfc/lpfc_scsi.h
index daba92374985..437f182e2322 100644
--- a/drivers/scsi/lpfc/lpfc_scsi.h
+++ b/drivers/scsi/lpfc/lpfc_scsi.h
@@ -107,6 +107,10 @@ struct fcp_cmnd {
 };
+struct lpfc_scsicmd_bkt {
+        uint32_t cmd_count;
+};
 struct lpfc_scsi_buf {
        struct list_head list;
        struct scsi_cmnd *pCmd;
@@ -139,6 +143,7 @@ struct lpfc_scsi_buf {
         */
        struct lpfc_iocbq cur_iocbq;
        wait_queue_head_t *waitq;
+        unsigned long start_time;
 };
 #define LPFC_SCSI_DMA_EXT_SIZE 264
diff --git a/drivers/scsi/lpfc/lpfc_sli.c b/drivers/scsi/lpfc/lpfc_sli.c
index 50fe07646738..8ab5babdeebc 100644
--- a/drivers/scsi/lpfc/lpfc_sli.c
+++ b/drivers/scsi/lpfc/lpfc_sli.c
@@ -32,6 +32,7 @@
 #include "lpfc_hw.h"
 #include "lpfc_sli.h"
+#include "lpfc_nl.h"
 #include "lpfc_disc.h"
 #include "lpfc_scsi.h"
 #include "lpfc.h"
@@ -66,10 +67,16 @@ typedef enum _lpfc_iocb_type {
        LPFC_ABORT_IOCB
 } lpfc_iocb_type;
-                /* SLI-2/SLI-3 provide different sized iocbs.  Given a pointer
+/**
-                 * to the start of the ring, and the slot number of the
+ * lpfc_cmd_iocb: Get next command iocb entry in the ring.
-                 * desired iocb entry, calc a pointer to that entry.
+ * @phba: Pointer to HBA context object.
-                 */
+ * @pring: Pointer to driver SLI ring object.
+ *
+ * This function returns pointer to next command iocb entry
+ * in the command ring. The caller must hold hbalock to prevent
+ * other threads consume the next command iocb.
+ * SLI-2/SLI-3 provide different sized iocbs.
+ **/
 static inline IOCB_t *
 lpfc_cmd_iocb(struct lpfc_hba *phba, struct lpfc_sli_ring *pring)
 {
@@ -77,6 +84,16 @@ lpfc_cmd_iocb(struct lpfc_hba *phba, struct lpfc_sli_ring *pring)
                           pring->cmdidx * phba->iocb_cmd_size);
 }
+/**
+ * lpfc_resp_iocb: Get next response iocb entry in the ring.
+ * @phba: Pointer to HBA context object.
+ * @pring: Pointer to driver SLI ring object.
+ *
+ * This function returns pointer to next response iocb entry
+ * in the response ring. The caller must hold hbalock to make sure
+ * that no other thread consume the next response iocb.
+ * SLI-2/SLI-3 provide different sized iocbs.
+ **/
 static inline IOCB_t *
 lpfc_resp_iocb(struct lpfc_hba *phba, struct lpfc_sli_ring *pring)
 {
@@ -84,6 +101,15 @@ lpfc_resp_iocb(struct lpfc_hba *phba, struct lpfc_sli_ring *pring)
                           pring->rspidx * phba->iocb_rsp_size);
 }
+/**
+ * __lpfc_sli_get_iocbq: Allocates an iocb object from iocb pool.
+ * @phba: Pointer to HBA context object.
+ *
+ * This function is called with hbalock held. This function
+ * allocates a new driver iocb object from the iocb pool. If the
+ * allocation is successful, it returns pointer to the newly
+ * allocated iocb object else it returns NULL.
+ **/
 static struct lpfc_iocbq *
 __lpfc_sli_get_iocbq(struct lpfc_hba *phba)
 {
@@ -94,6 +120,15 @@ __lpfc_sli_get_iocbq(struct lpfc_hba *phba)
        return iocbq;
 }
+/**
+ * lpfc_sli_get_iocbq: Allocates an iocb object from iocb pool.
+ * @phba: Pointer to HBA context object.
+ *
+ * This function is called with no lock held. This function
+ * allocates a new driver iocb object from the iocb pool. If the
+ * allocation is successful, it returns pointer to the newly
+ * allocated iocb object else it returns NULL.
+ **/
 struct lpfc_iocbq *
 lpfc_sli_get_iocbq(struct lpfc_hba *phba)
 {
@@ -106,6 +141,16 @@ lpfc_sli_get_iocbq(struct lpfc_hba *phba)
        return iocbq;
 }
+/**
+ * __lpfc_sli_release_iocbq: Release iocb to the iocb pool.
+ * @phba: Pointer to HBA context object.
+ * @iocbq: Pointer to driver iocb object.
+ *
+ * This function is called with hbalock held to release driver
+ * iocb object to the iocb pool. The iotag in the iocb object
+ * does not change for each use of the iocb object. This function
+ * clears all other fields of the iocb object when it is freed.
+ **/
 static void
 __lpfc_sli_release_iocbq(struct lpfc_hba *phba, struct lpfc_iocbq *iocbq)
 {
@@ -118,6 +163,14 @@ __lpfc_sli_release_iocbq(struct lpfc_hba *phba, struct lpfc_iocbq *iocbq)
        list_add_tail(&iocbq->list, &phba->lpfc_iocb_list);
 }
+/**
+ * lpfc_sli_release_iocbq: Release iocb to the iocb pool.
+ * @phba: Pointer to HBA context object.
+ * @iocbq: Pointer to driver iocb object.
+ *
+ * This function is called with no lock held to release the iocb to
+ * iocb pool.
+ **/
 void
 lpfc_sli_release_iocbq(struct lpfc_hba *phba, struct lpfc_iocbq *iocbq)
 {
@@ -131,10 +184,21 @@ lpfc_sli_release_iocbq(struct lpfc_hba *phba, struct lpfc_iocbq *iocbq)
        spin_unlock_irqrestore(&phba->hbalock, iflags);
 }
-/*
+/**
- * Translate the iocb command to an iocb command type used to decide the final
+ * lpfc_sli_iocb_cmd_type: Get the iocb type.
- * disposition of each completed IOCB.
+ * @iocb_cmnd : iocb command code.
- */
+ *
+ * This function is called by ring event handler function to get the iocb type.
+ * This function translates the iocb command to an iocb command type used to
+ * decide the final disposition of each completed IOCB.
+ * The function returns
+ * LPFC_UNKNOWN_IOCB if it is an unsupported iocb
+ * LPFC_SOL_IOCB     if it is a solicited iocb completion
+ * LPFC_ABORT_IOCB   if it is an abort iocb
+ * LPFC_UNSOL_IOCB   if it is an unsolicited iocb
+ *
+ * The caller is not required to hold any lock.
+ **/
 static lpfc_iocb_type
 lpfc_sli_iocb_cmd_type(uint8_t iocb_cmnd)
 {
@@ -230,6 +294,17 @@ lpfc_sli_iocb_cmd_type(uint8_t iocb_cmnd)
        return type;
 }
+/**
+ * lpfc_sli_ring_map: Issue config_ring mbox for all rings.
+ * @phba: Pointer to HBA context object.
+ *
+ * This function is called from SLI initialization code
+ * to configure every ring of the HBA's SLI interface. The
+ * caller is not required to hold any lock. This function issues
+ * a config_ring mailbox command for each ring.
+ * This function returns zero if successful else returns a negative
+ * error code.
+ **/
 static int
 lpfc_sli_ring_map(struct lpfc_hba *phba)
 {
@@ -262,6 +337,18 @@ lpfc_sli_ring_map(struct lpfc_hba *phba)
        return ret;
 }
+/**
+ * lpfc_sli_ringtxcmpl_put: Adds new iocb to the txcmplq.
+ * @phba: Pointer to HBA context object.
+ * @pring: Pointer to driver SLI ring object.
+ * @piocb: Pointer to the driver iocb object.
+ *
+ * This function is called with hbalock held. The function adds the
+ * new iocb to txcmplq of the given ring. This function always returns
+ * 0. If this function is called for ELS ring, this function checks if
+ * there is a vport associated with the ELS command. This function also
+ * starts els_tmofunc timer if this is an ELS command.
+ **/
 static int
 lpfc_sli_ringtxcmpl_put(struct lpfc_hba *phba, struct lpfc_sli_ring *pring,
                        struct lpfc_iocbq *piocb)
@@ -282,6 +369,16 @@ lpfc_sli_ringtxcmpl_put(struct lpfc_hba *phba, struct lpfc_sli_ring *pring,
        return 0;
 }
+/**
+ * lpfc_sli_ringtx_get: Get first element of the txq.
+ * @phba: Pointer to HBA context object.
+ * @pring: Pointer to driver SLI ring object.
+ *
+ * This function is called with hbalock held to get next
+ * iocb in txq of the given ring. If there is any iocb in
+ * the txq, the function returns first iocb in the list after
+ * removing the iocb from the list, else it returns NULL.
+ **/
 static struct lpfc_iocbq *
 lpfc_sli_ringtx_get(struct lpfc_hba *phba, struct lpfc_sli_ring *pring)
 {
@@ -293,14 +390,25 @@ lpfc_sli_ringtx_get(struct lpfc_hba *phba, struct lpfc_sli_ring *pring)
        return cmd_iocb;
 }
+/**
+ * lpfc_sli_next_iocb_slot: Get next iocb slot in the ring.
+ * @phba: Pointer to HBA context object.
+ * @pring: Pointer to driver SLI ring object.
+ *
+ * This function is called with hbalock held and the caller must post the
+ * iocb without releasing the lock. If the caller releases the lock,
+ * iocb slot returned by the function is not guaranteed to be available.
+ * The function returns pointer to the next available iocb slot if there
+ * is available slot in the ring, else it returns NULL.
+ * If the get index of the ring is ahead of the put index, the function
+ * will post an error attention event to the worker thread to take the
+ * HBA to offline state.
+ **/
 static IOCB_t *
 lpfc_sli_next_iocb_slot (struct lpfc_hba *phba, struct lpfc_sli_ring *pring)
 {
-        struct lpfc_pgp *pgp = (phba->sli_rev == 3) ?
+        struct lpfc_pgp *pgp = &phba->port_gp[pring->ringno];
-                &phba->slim2p->mbx.us.s3_pgp.port[pring->ringno] :
-                &phba->slim2p->mbx.us.s2.port[pring->ringno];
        uint32_t  max_cmd_idx = pring->numCiocb;
        if ((pring->next_cmdidx == pring->cmdidx) &&
           (++pring->next_cmdidx >= max_cmd_idx))
                pring->next_cmdidx = 0;
@@ -336,6 +444,18 @@ lpfc_sli_next_iocb_slot (struct lpfc_hba *phba, struct lpfc_sli_ring *pring)
        return lpfc_cmd_iocb(phba, pring);
 }
+/**
+ * lpfc_sli_next_iotag: Get an iotag for the iocb.
+ * @phba: Pointer to HBA context object.
+ * @iocbq: Pointer to driver iocb object.
+ *
+ * This function gets an iotag for the iocb. If there is no unused iotag and
+ * the iocbq_lookup_len < 0xffff, this function allocates a bigger iotag_lookup
+ * array and assigns a new iotag.
+ * The function returns the allocated iotag if successful, else returns zero.
+ * Zero is not a valid iotag.
+ * The caller is not required to hold any lock.
+ **/
 uint16_t
 lpfc_sli_next_iotag(struct lpfc_hba *phba, struct lpfc_iocbq *iocbq)
 {
@@ -399,6 +519,20 @@ lpfc_sli_next_iotag(struct lpfc_hba *phba, struct lpfc_iocbq *iocbq)
        return 0;
 }
+/**
+ * lpfc_sli_submit_iocb: Submit an iocb to the firmware.
+ * @phba: Pointer to HBA context object.
+ * @pring: Pointer to driver SLI ring object.
+ * @iocb: Pointer to iocb slot in the ring.
+ * @nextiocb: Pointer to driver iocb object which need to be
+ *            posted to firmware.
+ *
+ * This function is called with hbalock held to post a new iocb to
+ * the firmware. This function copies the new iocb to ring iocb slot and
+ * updates the ring pointers. It adds the new iocb to txcmplq if there is
+ * a completion call back for this iocb else the function will free the
+ * iocb object.
+ **/
 static void
 lpfc_sli_submit_iocb(struct lpfc_hba *phba, struct lpfc_sli_ring *pring,
                IOCB_t *iocb, struct lpfc_iocbq *nextiocb)
@@ -441,6 +575,18 @@ lpfc_sli_submit_iocb(struct lpfc_hba *phba, struct lpfc_sli_ring *pring,
        writel(pring->cmdidx, &phba->host_gp[pring->ringno].cmdPutInx);
 }
+/**
+ * lpfc_sli_update_full_ring: Update the chip attention register.
+ * @phba: Pointer to HBA context object.
+ * @pring: Pointer to driver SLI ring object.
+ *
+ * The caller is not required to hold any lock for calling this function.
+ * This function updates the chip attention bits for the ring to inform firmware
+ * that there are pending work to be done for this ring and requests an
+ * interrupt when there is space available in the ring. This function is
+ * called when the driver is unable to post more iocbs to the ring due
+ * to unavailability of space in the ring.
+ **/
 static void
 lpfc_sli_update_full_ring(struct lpfc_hba *phba, struct lpfc_sli_ring *pring)
 {
@@ -460,6 +606,15 @@ lpfc_sli_update_full_ring(struct lpfc_hba *phba, struct lpfc_sli_ring *pring)
        pring->stats.iocb_cmd_full++;
 }
+/**
+ * lpfc_sli_update_ring: Update chip attention register.
+ * @phba: Pointer to HBA context object.
+ * @pring: Pointer to driver SLI ring object.
+ *
+ * This function updates the chip attention register bit for the
+ * given ring to inform HBA that there is more work to be done
+ * in this ring. The caller is not required to hold any lock.
+ **/
 static void
 lpfc_sli_update_ring(struct lpfc_hba *phba, struct lpfc_sli_ring *pring)
 {
@@ -468,11 +623,22 @@ lpfc_sli_update_ring(struct lpfc_hba *phba, struct lpfc_sli_ring *pring)
        /*
         * Tell the HBA that there is work to do in this ring.
         */
-        wmb();
+        if (!(phba->sli3_options & LPFC_SLI3_CRP_ENABLED)) {
-        writel(CA_R0ATT << (ringno * 4), phba->CAregaddr);
+                wmb();
-        readl(phba->CAregaddr); /* flush */
+                writel(CA_R0ATT << (ringno * 4), phba->CAregaddr);
+                readl(phba->CAregaddr); /* flush */
+        }
 }
+/**
+ * lpfc_sli_resume_iocb: Process iocbs in the txq.
+ * @phba: Pointer to HBA context object.
+ * @pring: Pointer to driver SLI ring object.
+ *
+ * This function is called with hbalock held to post pending iocbs
+ * in the txq to the firmware. This function is called when driver
+ * detects space available in the ring.
+ **/
 static void
 lpfc_sli_resume_iocb(struct lpfc_hba *phba, struct lpfc_sli_ring *pring)
 {
@@ -504,6 +670,16 @@ lpfc_sli_resume_iocb(struct lpfc_hba *phba, struct lpfc_sli_ring *pring)
        return;
 }
+/**
+ * lpfc_sli_next_hbq_slot: Get next hbq entry for the HBQ.
+ * @phba: Pointer to HBA context object.
+ * @hbqno: HBQ number.
+ *
+ * This function is called with hbalock held to get the next
+ * available slot for the given HBQ. If there is free slot
+ * available for the HBQ it will return pointer to the next available
+ * HBQ entry else it will return NULL.
+ **/
 static struct lpfc_hbq_entry *
 lpfc_sli_next_hbq_slot(struct lpfc_hba *phba, uint32_t hbqno)
 {
@@ -539,6 +715,15 @@ lpfc_sli_next_hbq_slot(struct lpfc_hba *phba, uint32_t hbqno)
                        hbqp->hbqPutIdx;
 }
+/**
+ * lpfc_sli_hbqbuf_free_all: Free all the hbq buffers.
+ * @phba: Pointer to HBA context object.
+ *
+ * This function is called with no lock held to free all the
+ * hbq buffers while uninitializing the SLI interface. It also
+ * frees the HBQ buffers returned by the firmware but not yet
+ * processed by the upper layers.
+ **/
 void
 lpfc_sli_hbqbuf_free_all(struct lpfc_hba *phba)
 {
@@ -584,6 +769,18 @@ lpfc_sli_hbqbuf_free_all(struct lpfc_hba *phba)
        spin_unlock_irqrestore(&phba->hbalock, flags);
 }
+/**
+ * lpfc_sli_hbq_to_firmware: Post the hbq buffer to firmware.
+ * @phba: Pointer to HBA context object.
+ * @hbqno: HBQ number.
+ * @hbq_buf: Pointer to HBQ buffer.
+ *
+ * This function is called with the hbalock held to post a
+ * hbq buffer to the firmware. If the function finds an empty
+ * slot in the HBQ, it will post the buffer. The function will return
+ * pointer to the hbq entry if it successfully post the buffer
+ * else it will return NULL.
+ **/
 static struct lpfc_hbq_entry *
 lpfc_sli_hbq_to_firmware(struct lpfc_hba *phba, uint32_t hbqno,
                         struct hbq_dmabuf *hbq_buf)
@@ -612,6 +809,7 @@ lpfc_sli_hbq_to_firmware(struct lpfc_hba *phba, uint32_t hbqno,
        return hbqe;
 }
+/* HBQ for ELS and CT traffic. */
 static struct lpfc_hbq_init lpfc_els_hbq = {
        .rn = 1,
        .entry_count = 200,
@@ -623,6 +821,7 @@ static struct lpfc_hbq_init lpfc_els_hbq = {
        .add_count = 5,
 };
+/* HBQ for the extra ring if needed */
 static struct lpfc_hbq_init lpfc_extra_hbq = {
        .rn = 1,
        .entry_count = 200,
@@ -634,51 +833,81 @@ static struct lpfc_hbq_init lpfc_extra_hbq = {
        .add_count = 5,
 };
+/* Array of HBQs */
 struct lpfc_hbq_init *lpfc_hbq_defs[] = {
        &lpfc_els_hbq,
        &lpfc_extra_hbq,
 };
+/**
+ * lpfc_sli_hbqbuf_fill_hbqs: Post more hbq buffers to HBQ.
+ * @phba: Pointer to HBA context object.
+ * @hbqno: HBQ number.
+ * @count: Number of HBQ buffers to be posted.
+ *
+ * This function is called with no lock held to post more hbq buffers to the
+ * given HBQ. The function returns the number of HBQ buffers successfully
+ * posted.
+ **/
 static int
 lpfc_sli_hbqbuf_fill_hbqs(struct lpfc_hba *phba, uint32_t hbqno, uint32_t count)
 {
-        uint32_t i, start, end;
+        uint32_t i, posted = 0;
        unsigned long flags;
        struct hbq_dmabuf *hbq_buffer;
+        LIST_HEAD(hbq_buf_list);
        if (!phba->hbqs[hbqno].hbq_alloc_buffer)
                return 0;
-        start = phba->hbqs[hbqno].buffer_count;
+        if ((phba->hbqs[hbqno].buffer_count + count) >
-        end = count + start;
+            lpfc_hbq_defs[hbqno]->entry_count)
-        if (end > lpfc_hbq_defs[hbqno]->entry_count)
+                count = lpfc_hbq_defs[hbqno]->entry_count -
-                end = lpfc_hbq_defs[hbqno]->entry_count;
+                                        phba->hbqs[hbqno].buffer_count;
+        if (!count)
+                return 0;
+        /* Allocate HBQ entries */
+        for (i = 0; i < count; i++) {
+                hbq_buffer = (phba->hbqs[hbqno].hbq_alloc_buffer)(phba);
+                if (!hbq_buffer)
+                        break;
+                list_add_tail(&hbq_buffer->dbuf.list, &hbq_buf_list);
+        }
        /* Check whether HBQ is still in use */
        spin_lock_irqsave(&phba->hbalock, flags);
        if (!phba->hbq_in_use)
-                goto out;
+                goto err;
+        while (!list_empty(&hbq_buf_list)) {
-        /* Populate HBQ entries */
+                list_remove_head(&hbq_buf_list, hbq_buffer, struct hbq_dmabuf,
-        for (i = start; i < end; i++) {
+                                 dbuf.list);
-                hbq_buffer = (phba->hbqs[hbqno].hbq_alloc_buffer)(phba);
+                hbq_buffer->tag = (phba->hbqs[hbqno].buffer_count |
-                if (!hbq_buffer)
+                                      (hbqno << 16));
-                        goto err;
+                if (lpfc_sli_hbq_to_firmware(phba, hbqno, hbq_buffer)) {
-                hbq_buffer->tag = (i | (hbqno << 16));
-                if (lpfc_sli_hbq_to_firmware(phba, hbqno, hbq_buffer))
                        phba->hbqs[hbqno].buffer_count++;
-                else
+                        posted++;
+                } else
                        (phba->hbqs[hbqno].hbq_free_buffer)(phba, hbq_buffer);
        }
- out:
        spin_unlock_irqrestore(&phba->hbalock, flags);
-        return 0;
+        return posted;
- err:
+err:
        spin_unlock_irqrestore(&phba->hbalock, flags);
-        return 1;
+        while (!list_empty(&hbq_buf_list)) {
+                list_remove_head(&hbq_buf_list, hbq_buffer, struct hbq_dmabuf,
+                                 dbuf.list);
+                (phba->hbqs[hbqno].hbq_free_buffer)(phba, hbq_buffer);
+        }
+        return 0;
 }
+/**
+ * lpfc_sli_hbqbuf_add_hbqs: Post more HBQ buffers to firmware.
+ * @phba: Pointer to HBA context object.
+ * @qno: HBQ number.
+ *
+ * This function posts more buffers to the HBQ. This function
+ * is called with no lock held. The function returns the number of HBQ entries
+ * successfully allocated.
+ **/
 int
 lpfc_sli_hbqbuf_add_hbqs(struct lpfc_hba *phba, uint32_t qno)
 {
@@ -686,6 +915,15 @@ lpfc_sli_hbqbuf_add_hbqs(struct lpfc_hba *phba, uint32_t qno)
                                         lpfc_hbq_defs[qno]->add_count));
 }
+/**
+ * lpfc_sli_hbqbuf_init_hbqs: Post initial buffers to the HBQ.
+ * @phba: Pointer to HBA context object.
+ * @qno:  HBQ queue number.
+ *
+ * This function is called from SLI initialization code path with
+ * no lock held to post initial HBQ buffers to firmware. The
+ * function returns the number of HBQ entries successfully allocated.
+ **/
 static int
 lpfc_sli_hbqbuf_init_hbqs(struct lpfc_hba *phba, uint32_t qno)
 {
@@ -693,6 +931,16 @@ lpfc_sli_hbqbuf_init_hbqs(struct lpfc_hba *phba, uint32_t qno)
                                         lpfc_hbq_defs[qno]->init_count));
 }
+/**
+ * lpfc_sli_hbqbuf_find: Find the hbq buffer associated with a tag.
+ * @phba: Pointer to HBA context object.
+ * @tag: Tag of the hbq buffer.
+ *
+ * This function is called with hbalock held. This function searches
+ * for the hbq buffer associated with the given tag in the hbq buffer
+ * list. If it finds the hbq buffer, it returns the hbq_buffer other wise
+ * it returns NULL.
+ **/
 static struct hbq_dmabuf *
 lpfc_sli_hbqbuf_find(struct lpfc_hba *phba, uint32_t tag)
 {
@@ -716,6 +964,15 @@ lpfc_sli_hbqbuf_find(struct lpfc_hba *phba, uint32_t tag)
        return NULL;
 }
+/**
+ * lpfc_sli_free_hbq: Give back the hbq buffer to firmware.
+ * @phba: Pointer to HBA context object.
+ * @hbq_buffer: Pointer to HBQ buffer.
+ *
+ * This function is called with hbalock. This function gives back
+ * the hbq buffer to firmware. If the HBQ does not have space to
+ * post the buffer, it will free the buffer.
+ **/
 void
 lpfc_sli_free_hbq(struct lpfc_hba *phba, struct hbq_dmabuf *hbq_buffer)
 {
@@ -729,6 +986,15 @@ lpfc_sli_free_hbq(struct lpfc_hba *phba, struct hbq_dmabuf *hbq_buffer)
        }
 }
+/**
+ * lpfc_sli_chk_mbx_command: Check if the mailbox is a legitimate mailbox.
+ * @mbxCommand: mailbox command code.
+ *
+ * This function is called by the mailbox event handler function to verify
+ * that the completed mailbox command is a legitimate mailbox command. If the
+ * completed mailbox is not known to the function, it will return MBX_SHUTDOWN
+ * and the mailbox event handler will take the HBA offline.
+ **/
 static int
 lpfc_sli_chk_mbx_command(uint8_t mbxCommand)
 {
@@ -785,6 +1051,8 @@ lpfc_sli_chk_mbx_command(uint8_t mbxCommand)
        case MBX_REG_VPI:
        case MBX_UNREG_VPI:
        case MBX_HEARTBEAT:
+        case MBX_PORT_CAPABILITIES:
+        case MBX_PORT_IOV_CONTROL:
                ret = mbxCommand;
                break;
        default:
@@ -793,6 +1061,19 @@ lpfc_sli_chk_mbx_command(uint8_t mbxCommand)
        }
        return ret;
 }
+/**
+ * lpfc_sli_wake_mbox_wait: Completion handler for mbox issued from
+ *          lpfc_sli_issue_mbox_wait.
+ * @phba: Pointer to HBA context object.
+ * @pmboxq: Pointer to mailbox command.
+ *
+ * This is completion handler function for mailbox commands issued from
+ * lpfc_sli_issue_mbox_wait function. This function is called by the
+ * mailbox event handler function with no lock held. This function
+ * will wake up thread waiting on the wait queue pointed by context1
+ * of the mailbox.
+ **/
 static void
 lpfc_sli_wake_mbox_wait(struct lpfc_hba *phba, LPFC_MBOXQ_t *pmboxq)
 {
@@ -812,6 +1093,17 @@ lpfc_sli_wake_mbox_wait(struct lpfc_hba *phba, LPFC_MBOXQ_t *pmboxq)
        return;
 }
+/**
+ * lpfc_sli_def_mbox_cmpl: Default mailbox completion handler.
+ * @phba: Pointer to HBA context object.
+ * @pmb: Pointer to mailbox object.
+ *
+ * This function is the default mailbox completion handler. It
+ * frees the memory resources associated with the completed mailbox
+ * command. If the completed command is a REG_LOGIN mailbox command,
+ * this function will issue a UREG_LOGIN to re-claim the RPI.
+ **/
 void
 lpfc_sli_def_mbox_cmpl(struct lpfc_hba *phba, LPFC_MBOXQ_t *pmb)
 {
@@ -846,6 +1138,19 @@ lpfc_sli_def_mbox_cmpl(struct lpfc_hba *phba, LPFC_MBOXQ_t *pmb)
        return;
 }
+/**
+ * lpfc_sli_handle_mb_event: Handle mailbox completions from firmware.
+ * @phba: Pointer to HBA context object.
+ *
+ * This function is called with no lock held. This function processes all
+ * the completed mailbox commands and gives it to upper layers. The interrupt
+ * service routine processes mailbox completion interrupt and adds completed
+ * mailbox commands to the mboxq_cmpl queue and signals the worker thread.
+ * Worker thread call lpfc_sli_handle_mb_event, which will return the
+ * completed mailbox commands in mboxq_cmpl queue to the upper layers. This
+ * function returns the mailbox commands to the upper layer by calling the
+ * completion handler function of each mailbox.
+ **/
 int
 lpfc_sli_handle_mb_event(struct lpfc_hba *phba)
 {
@@ -953,6 +1258,18 @@ lpfc_sli_handle_mb_event(struct lpfc_hba *phba)
        return 0;
 }
+/**
+ * lpfc_sli_replace_hbqbuff: Replace the HBQ buffer with a new buffer.
+ * @phba: Pointer to HBA context object.
+ * @tag: Tag for the HBQ buffer.
+ *
+ * This function is called from unsolicited event handler code path to get the
+ * HBQ buffer associated with an unsolicited iocb. This function is called with
+ * no lock held. It returns the buffer associated with the given tag and posts
+ * another buffer to the firmware. Note that the new buffer must be allocated
+ * before taking the hbalock and that the hba lock must be held until it is
+ * finished with the hbq entry swap.
+ **/
 static struct lpfc_dmabuf *
 lpfc_sli_replace_hbqbuff(struct lpfc_hba *phba, uint32_t tag)
 {
@@ -962,22 +1279,28 @@ lpfc_sli_replace_hbqbuff(struct lpfc_hba *phba, uint32_t tag)
        dma_addr_t phys;        /* mapped address */
        unsigned long flags;
+        hbqno = tag >> 16;
+        new_hbq_entry = (phba->hbqs[hbqno].hbq_alloc_buffer)(phba);
        /* Check whether HBQ is still in use */
        spin_lock_irqsave(&phba->hbalock, flags);
        if (!phba->hbq_in_use) {
+                if (new_hbq_entry)
+                        (phba->hbqs[hbqno].hbq_free_buffer)(phba,
+                                                            new_hbq_entry);
                spin_unlock_irqrestore(&phba->hbalock, flags);
                return NULL;
        }
        hbq_entry = lpfc_sli_hbqbuf_find(phba, tag);
        if (hbq_entry == NULL) {
+                if (new_hbq_entry)
+                        (phba->hbqs[hbqno].hbq_free_buffer)(phba,
+                                                            new_hbq_entry);
                spin_unlock_irqrestore(&phba->hbalock, flags);
                return NULL;
        }
        list_del(&hbq_entry->dbuf.list);
-        hbqno = tag >> 16;
-        new_hbq_entry = (phba->hbqs[hbqno].hbq_alloc_buffer)(phba);
        if (new_hbq_entry == NULL) {
                list_add_tail(&hbq_entry->dbuf.list, &phba->hbqbuf_in_list);
                spin_unlock_irqrestore(&phba->hbalock, flags);
@@ -997,6 +1320,18 @@ lpfc_sli_replace_hbqbuff(struct lpfc_hba *phba, uint32_t tag)
        return &new_hbq_entry->dbuf;
 }
+/**
+ * lpfc_sli_get_buff: Get the buffer associated with the buffer tag.
+ * @phba: Pointer to HBA context object.
+ * @pring: Pointer to driver SLI ring object.
+ * @tag: buffer tag.
+ *
+ * This function is called with no lock held. When QUE_BUFTAG_BIT bit
+ * is set in the tag the buffer is posted for a particular exchange,
+ * the function will return the buffer without replacing the buffer.
+ * If the buffer is for unsolicited ELS or CT traffic, this function
+ * returns the buffer and also posts another buffer to the firmware.
+ **/
 static struct lpfc_dmabuf *
 lpfc_sli_get_buff(struct lpfc_hba *phba,
                        struct lpfc_sli_ring *pring,
@@ -1008,6 +1343,21 @@ lpfc_sli_get_buff(struct lpfc_hba *phba,
                return lpfc_sli_replace_hbqbuff(phba, tag);
 }
+/**
+ * lpfc_sli_process_unsol_iocb: Unsolicited iocb handler.
+ * @phba: Pointer to HBA context object.
+ * @pring: Pointer to driver SLI ring object.
+ * @saveq: Pointer to the unsolicited iocb.
+ *
+ * This function is called with no lock held by the ring event handler
+ * when there is an unsolicited iocb posted to the response ring by the
+ * firmware. This function gets the buffer associated with the iocbs
+ * and calls the event handler for the ring. This function handles both
+ * qring buffers and hbq buffers.
+ * When the function returns 1 the caller can free the iocb object otherwise
+ * upper layer functions will free the iocb objects.
+ **/
 static int
 lpfc_sli_process_unsol_iocb(struct lpfc_hba *phba, struct lpfc_sli_ring *pring,
                            struct lpfc_iocbq *saveq)
@@ -1192,6 +1542,18 @@ lpfc_sli_process_unsol_iocb(struct lpfc_hba *phba, struct lpfc_sli_ring *pring,
        return 1;
 }
+/**
+ * lpfc_sli_iocbq_lookup: Find command iocb for the given response iocb.
+ * @phba: Pointer to HBA context object.
+ * @pring: Pointer to driver SLI ring object.
+ * @prspiocb: Pointer to response iocb object.
+ *
+ * This function looks up the iocb_lookup table to get the command iocb
+ * corresponding to the given response iocb using the iotag of the
+ * response iocb. This function is called with the hbalock held.
+ * This function returns the command iocb object if it finds the command
+ * iocb else returns NULL.
+ **/
 static struct lpfc_iocbq *
 lpfc_sli_iocbq_lookup(struct lpfc_hba *phba,
                      struct lpfc_sli_ring *pring,
@@ -1217,6 +1579,23 @@ lpfc_sli_iocbq_lookup(struct lpfc_hba *phba,
        return NULL;
 }
+/**
+ * lpfc_sli_process_sol_iocb: process solicited iocb completion.
+ * @phba: Pointer to HBA context object.
+ * @pring: Pointer to driver SLI ring object.
+ * @saveq: Pointer to the response iocb to be processed.
+ *
+ * This function is called by the ring event handler for non-fcp
+ * rings when there is a new response iocb in the response ring.
+ * The caller is not required to hold any locks. This function
+ * gets the command iocb associated with the response iocb and
+ * calls the completion handler for the command iocb. If there
+ * is no completion handler, the function will free the resources
+ * associated with command iocb. If the response iocb is for
+ * an already aborted command iocb, the status of the completion
+ * is changed to IOSTAT_LOCAL_REJECT/IOERR_SLI_ABORTED.
+ * This function always returns 1.
+ **/
 static int
 lpfc_sli_process_sol_iocb(struct lpfc_hba *phba, struct lpfc_sli_ring *pring,
                          struct lpfc_iocbq *saveq)
@@ -1233,6 +1612,17 @@ lpfc_sli_process_sol_iocb(struct lpfc_hba *phba, struct lpfc_sli_ring *pring,
        if (cmdiocbp) {
                if (cmdiocbp->iocb_cmpl) {
                        /*
+                         * If an ELS command failed send an event to mgmt
+                         * application.
+                         */
+                        if (saveq->iocb.ulpStatus &&
+                             (pring->ringno == LPFC_ELS_RING) &&
+                             (cmdiocbp->iocb.ulpCommand ==
+                                CMD_ELS_REQUEST64_CR))
+                                lpfc_send_els_failure_event(phba,
+                                        cmdiocbp, saveq);
+                        /*
                         * Post all ELS completions to the worker thread.
                         * All other are passed to the completion callback.
                         */
@@ -1282,12 +1672,20 @@ lpfc_sli_process_sol_iocb(struct lpfc_hba *phba, struct lpfc_sli_ring *pring,
        return rc;
 }
+/**
+ * lpfc_sli_rsp_pointers_error: Response ring pointer error handler.
+ * @phba: Pointer to HBA context object.
+ * @pring: Pointer to driver SLI ring object.
+ *
+ * This function is called from the iocb ring event handlers when
+ * put pointer is ahead of the get pointer for a ring. This function signal
+ * an error attention condition to the worker thread and the worker
+ * thread will transition the HBA to offline state.
+ **/
 static void
 lpfc_sli_rsp_pointers_error(struct lpfc_hba *phba, struct lpfc_sli_ring *pring)
 {
-        struct lpfc_pgp *pgp = (phba->sli_rev == 3) ?
+        struct lpfc_pgp *pgp = &phba->port_gp[pring->ringno];
-                &phba->slim2p->mbx.us.s3_pgp.port[pring->ringno] :
-                &phba->slim2p->mbx.us.s2.port[pring->ringno];
        /*
         * Ring <ringno> handler: portRspPut <portRspPut> is bigger then
         * rsp ring <portRspMax>
@@ -1312,6 +1710,51 @@ lpfc_sli_rsp_pointers_error(struct lpfc_hba *phba, struct lpfc_sli_ring *pring)
        return;
 }
+/**
+ * lpfc_poll_eratt: Error attention polling timer timeout handler.
+ * @ptr: Pointer to address of HBA context object.
+ *
+ * This function is invoked by the Error Attention polling timer when the
+ * timer times out. It will check the SLI Error Attention register for
+ * possible attention events. If so, it will post an Error Attention event
+ * and wake up worker thread to process it. Otherwise, it will set up the
+ * Error Attention polling timer for the next poll.
+ **/
+void lpfc_poll_eratt(unsigned long ptr)
+{
+        struct lpfc_hba *phba;
+        uint32_t eratt = 0;
+        phba = (struct lpfc_hba *)ptr;
+        /* Check chip HA register for error event */
+        eratt = lpfc_sli_check_eratt(phba);
+        if (eratt)
+                /* Tell the worker thread there is work to do */
+                lpfc_worker_wake_up(phba);
+        else
+                /* Restart the timer for next eratt poll */
+                mod_timer(&phba->eratt_poll, jiffies +
+                                        HZ * LPFC_ERATT_POLL_INTERVAL);
+        return;
+}
+/**
+ * lpfc_sli_poll_fcp_ring: Handle FCP ring completion in polling mode.
+ * @phba: Pointer to HBA context object.
+ *
+ * This function is called from lpfc_queuecommand, lpfc_poll_timeout,
+ * lpfc_abort_handler and lpfc_slave_configure when FCP_RING_POLLING
+ * is enabled.
+ *
+ * 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
+ * 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.
+ **/
 void lpfc_sli_poll_fcp_ring(struct lpfc_hba *phba)
 {
        struct lpfc_sli      *psli  = &phba->sli;
@@ -1320,7 +1763,7 @@ void lpfc_sli_poll_fcp_ring(struct lpfc_hba *phba)
        IOCB_t *entry = NULL;
        struct lpfc_iocbq *cmdiocbq = NULL;
        struct lpfc_iocbq rspiocbq;
-        struct lpfc_pgp *pgp;
+        struct lpfc_pgp *pgp = &phba->port_gp[pring->ringno];
        uint32_t status;
        uint32_t portRspPut, portRspMax;
        int type;
@@ -1330,11 +1773,6 @@ void lpfc_sli_poll_fcp_ring(struct lpfc_hba *phba)
        pring->stats.iocb_event++;
-        pgp = (phba->sli_rev == 3) ?
-                &phba->slim2p->mbx.us.s3_pgp.port[pring->ringno] :
-                &phba->slim2p->mbx.us.s2.port[pring->ringno];
        /*
         * The next available response entry should never exceed the maximum
         * entries.  If it does, treat it as an adapter hardware error.
@@ -1372,8 +1810,8 @@ void lpfc_sli_poll_fcp_ring(struct lpfc_hba *phba)
                                        irsp->un.ulpWord[3],
                                        irsp->un.ulpWord[4],
                                        irsp->un.ulpWord[5],
-                                        *(((uint32_t *) irsp) + 6),
+                                        *(uint32_t *)&irsp->un1,
-                                        *(((uint32_t *) irsp) + 7));
+                                        *((uint32_t *)&irsp->un1 + 1));
                }
                switch (type) {
@@ -1465,17 +1903,28 @@ void lpfc_sli_poll_fcp_ring(struct lpfc_hba *phba)
        return;
 }
-/*
+/**
+ * lpfc_sli_handle_fast_ring_event: Handle ring events on FCP ring.
+ * @phba: Pointer to HBA context object.
+ * @pring: Pointer to driver SLI ring object.
+ * @mask: Host attention register mask for this ring.
+ *
+ * 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
+ * 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
+ * function if this is an unsolicited iocb.
 * This routine presumes LPFC_FCP_RING handling and doesn't bother
- * to check it explicitly.
+ * to check it explicitly. This function always returns 1.
- */
+ **/
 static int
 lpfc_sli_handle_fast_ring_event(struct lpfc_hba *phba,
                                struct lpfc_sli_ring *pring, uint32_t mask)
 {
-        struct lpfc_pgp *pgp = (phba->sli_rev == 3) ?
+        struct lpfc_pgp *pgp = &phba->port_gp[pring->ringno];
-                &phba->slim2p->mbx.us.s3_pgp.port[pring->ringno] :
-                &phba->slim2p->mbx.us.s2.port[pring->ringno];
        IOCB_t *irsp = NULL;
        IOCB_t *entry = NULL;
        struct lpfc_iocbq *cmdiocbq = NULL;
@@ -1548,8 +1997,8 @@ lpfc_sli_handle_fast_ring_event(struct lpfc_hba *phba,
                                        irsp->un.ulpWord[3],
                                        irsp->un.ulpWord[4],
                                        irsp->un.ulpWord[5],
-                                        *(((uint32_t *) irsp) + 6),
+                                        *(uint32_t *)&irsp->un1,
-                                        *(((uint32_t *) irsp) + 7));
+                                        *((uint32_t *)&irsp->un1 + 1));
                }
                switch (type) {
@@ -1646,13 +2095,28 @@ lpfc_sli_handle_fast_ring_event(struct lpfc_hba *phba,
        return rc;
 }
+/**
+ * lpfc_sli_handle_slow_ring_event: Handle ring events for non-FCP rings.
+ * @phba: Pointer to HBA context object.
+ * @pring: Pointer to driver SLI ring object.
+ * @mask: Host attention register mask for this ring.
+ *
+ * This function is called from the worker thread when there is a ring
+ * event for non-fcp rings. 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
+ * LE bit set. The function will call lpfc_sli_process_sol_iocb function if the
+ * response iocb indicates a completion of a command iocb. The function
+ * will call lpfc_sli_process_unsol_iocb function if this is an unsolicited
+ * iocb. The function frees the resources or calls the completion handler if
+ * this iocb is an abort completion. The function returns 0 when the allocated
+ * iocbs are not freed, otherwise returns 1.
+ **/
 int
 lpfc_sli_handle_slow_ring_event(struct lpfc_hba *phba,
                                struct lpfc_sli_ring *pring, uint32_t mask)
 {
-        struct lpfc_pgp *pgp = (phba->sli_rev == 3) ?
+        struct lpfc_pgp *pgp;
-                &phba->slim2p->mbx.us.s3_pgp.port[pring->ringno] :
-                &phba->slim2p->mbx.us.s2.port[pring->ringno];
        IOCB_t *entry;
        IOCB_t *irsp = NULL;
        struct lpfc_iocbq *rspiocbp = NULL;
@@ -1666,6 +2130,7 @@ lpfc_sli_handle_slow_ring_event(struct lpfc_hba *phba,
        int rc = 1;
        unsigned long iflag;
+        pgp = &phba->port_gp[pring->ringno];
        spin_lock_irqsave(&phba->hbalock, iflag);
        pring->stats.iocb_event++;
@@ -1904,6 +2369,16 @@ lpfc_sli_handle_slow_ring_event(struct lpfc_hba *phba,
        return rc;
 }
+/**
+ * lpfc_sli_abort_iocb_ring: Abort all iocbs in the ring.
+ * @phba: Pointer to HBA context object.
+ * @pring: Pointer to driver SLI ring object.
+ *
+ * This function aborts all iocbs in the given ring and frees all the iocb
+ * objects in txq. This function issues an abort iocb for all the iocb commands
+ * in txcmplq. The iocbs in the txcmplq is not guaranteed to complete before
+ * the return of this function. The caller is not required to hold any locks.
+ **/
 void
 lpfc_sli_abort_iocb_ring(struct lpfc_hba *phba, struct lpfc_sli_ring *pring)
 {
@@ -1943,6 +2418,83 @@ lpfc_sli_abort_iocb_ring(struct lpfc_hba *phba, struct lpfc_sli_ring *pring)
        }
 }
+/**
+ * lpfc_sli_flush_fcp_rings: flush all iocbs in the fcp ring.
+ * @phba: Pointer to HBA context object.
+ *
+ * This function flushes all iocbs in the fcp ring and frees all the iocb
+ * objects in txq and txcmplq. This function will not issue abort iocbs
+ * for all the iocb commands in txcmplq, they will just be returned with
+ * IOERR_SLI_DOWN. This function is invoked with EEH when device's PCI
+ * slot has been permanently disabled.
+ **/
+void
+lpfc_sli_flush_fcp_rings(struct lpfc_hba *phba)
+{
+        LIST_HEAD(txq);
+        LIST_HEAD(txcmplq);
+        struct lpfc_iocbq *iocb;
+        IOCB_t *cmd = NULL;
+        struct lpfc_sli *psli = &phba->sli;
+        struct lpfc_sli_ring  *pring;
+        /* Currently, only one fcp ring */
+        pring = &psli->ring[psli->fcp_ring];
+        spin_lock_irq(&phba->hbalock);
+        /* Retrieve everything on txq */
+        list_splice_init(&pring->txq, &txq);
+        pring->txq_cnt = 0;
+        /* Retrieve everything on the txcmplq */
+        list_splice_init(&pring->txcmplq, &txcmplq);
+        pring->txcmplq_cnt = 0;
+        spin_unlock_irq(&phba->hbalock);
+        /* Flush the txq */
+        while (!list_empty(&txq)) {
+                iocb = list_get_first(&txq, struct lpfc_iocbq, list);
+                cmd = &iocb->iocb;
+                list_del_init(&iocb->list);
+                if (!iocb->iocb_cmpl)
+                        lpfc_sli_release_iocbq(phba, iocb);
+                else {
+                        cmd->ulpStatus = IOSTAT_LOCAL_REJECT;
+                        cmd->un.ulpWord[4] = IOERR_SLI_DOWN;
+                        (iocb->iocb_cmpl) (phba, iocb, iocb);
+                }
+        }
+        /* Flush the txcmpq */
+        while (!list_empty(&txcmplq)) {
+                iocb = list_get_first(&txcmplq, struct lpfc_iocbq, list);
+                cmd = &iocb->iocb;
+                list_del_init(&iocb->list);
+                if (!iocb->iocb_cmpl)
+                        lpfc_sli_release_iocbq(phba, iocb);
+                else {
+                        cmd->ulpStatus = IOSTAT_LOCAL_REJECT;
+                        cmd->un.ulpWord[4] = IOERR_SLI_DOWN;
+                        (iocb->iocb_cmpl) (phba, iocb, iocb);
+                }
+        }
+}
+/**
+ * lpfc_sli_brdready: Check for host status bits.
+ * @phba: Pointer to HBA context object.
+ * @mask: Bit mask to be checked.
+ *
+ * This function reads the host status register and compares
+ * with the provided bit mask to check if HBA completed
+ * the restart. This function will wait in a loop for the
+ * HBA to complete restart. If the HBA does not restart within
+ * 15 iterations, the function will reset the HBA again. The
+ * function returns 1 when HBA fail to restart otherwise returns
+ * zero.
+ **/
 int
 lpfc_sli_brdready(struct lpfc_hba *phba, uint32_t mask)
 {
@@ -1990,6 +2542,13 @@ lpfc_sli_brdready(struct lpfc_hba *phba, uint32_t mask)
 #define BARRIER_TEST_PATTERN (0xdeadbeef)
+/**
+ * lpfc_reset_barrier: Make HBA ready for HBA reset.
+ * @phba: Pointer to HBA context object.
+ *
+ * This function is called before resetting an HBA. This
+ * function requests HBA to quiesce DMAs before a reset.
+ **/
 void lpfc_reset_barrier(struct lpfc_hba *phba)
 {
        uint32_t __iomem *resp_buf;
@@ -2063,6 +2622,17 @@ restore_hc:
        readl(phba->HCregaddr); /* flush */
 }
+/**
+ * lpfc_sli_brdkill: Issue a kill_board mailbox command.
+ * @phba: Pointer to HBA context object.
+ *
+ * This function issues a kill_board mailbox command and waits for
+ * the error attention interrupt. This function is called for stopping
+ * the firmware processing. The caller is not required to hold any
+ * locks. This function calls lpfc_hba_down_post function to free
+ * any pending commands after the kill. The function will return 1 when it
+ * fails to kill the board else will return 0.
+ **/
 int
 lpfc_sli_brdkill(struct lpfc_hba *phba)
 {
@@ -2139,6 +2709,17 @@ lpfc_sli_brdkill(struct lpfc_hba *phba)
        return ha_copy & HA_ERATT ? 0 : 1;
 }
+/**
+ * lpfc_sli_brdreset: Reset the HBA.
+ * @phba: Pointer to HBA context object.
+ *
+ * This function resets the HBA by writing HC_INITFF to the control
+ * register. After the HBA resets, this function resets all the iocb ring
+ * indices. This function disables PCI layer parity checking during
+ * the reset.
+ * This function returns 0 always.
+ * The caller is not required to hold any locks.
+ **/
 int
 lpfc_sli_brdreset(struct lpfc_hba *phba)
 {
@@ -2191,6 +2772,19 @@ lpfc_sli_brdreset(struct lpfc_hba *phba)
        return 0;
 }
+/**
+ * lpfc_sli_brdrestart: Restart the HBA.
+ * @phba: Pointer to HBA context object.
+ *
+ * This function is called in the SLI initialization code path to
+ * restart the HBA. The caller is not required to hold any lock.
+ * This function writes MBX_RESTART mailbox command to the SLIM and
+ * resets the HBA. At the end of the function, it calls lpfc_hba_down_post
+ * function to free any pending commands. The function enables
+ * POST only during the first initialization. The function returns zero.
+ * The function does not guarantee completion of MBX_RESTART mailbox
+ * command before the return of this function.
+ **/
 int
 lpfc_sli_brdrestart(struct lpfc_hba *phba)
 {
@@ -2251,6 +2845,16 @@ lpfc_sli_brdrestart(struct lpfc_hba *phba)
        return 0;
 }
+/**
+ * lpfc_sli_chipset_init: Wait for the restart of the HBA after a restart.
+ * @phba: Pointer to HBA context object.
+ *
+ * This function is called after a HBA restart to wait for successful
+ * restart of the HBA. Successful restart of the HBA is indicated by
+ * HS_FFRDY and HS_MBRDY bits. If the HBA fails to restart even after 15
+ * iteration, the function will restart the HBA again. The function returns
+ * zero if HBA successfully restarted else returns negative error code.
+ **/
 static int
 lpfc_sli_chipset_init(struct lpfc_hba *phba)
 {
@@ -2336,12 +2940,25 @@ lpfc_sli_chipset_init(struct lpfc_hba *phba)
        return 0;
 }
+/**
+ * lpfc_sli_hbq_count: Get the number of HBQs to be configured.
+ *
+ * This function calculates and returns the number of HBQs required to be
+ * configured.
+ **/
 int
 lpfc_sli_hbq_count(void)
 {
        return ARRAY_SIZE(lpfc_hbq_defs);
 }
+/**
+ * lpfc_sli_hbq_entry_count: Calculate total number of hbq entries.
+ *
+ * This function adds the number of hbq entries in every HBQ to get
+ * the total number of hbq entries required for the HBA and returns
+ * the total count.
+ **/
 static int
 lpfc_sli_hbq_entry_count(void)
 {
@@ -2354,12 +2971,27 @@ lpfc_sli_hbq_entry_count(void)
        return count;
 }
+/**
+ * lpfc_sli_hbq_size: Calculate memory required for all hbq entries.
+ *
+ * This function calculates amount of memory required for all hbq entries
+ * to be configured and returns the total memory required.
+ **/
 int
 lpfc_sli_hbq_size(void)
 {
        return lpfc_sli_hbq_entry_count() * sizeof(struct lpfc_hbq_entry);
 }
+/**
+ * lpfc_sli_hbq_setup: configure and initialize HBQs.
+ * @phba: Pointer to HBA context object.
+ *
+ * This function is called during the SLI initialization to configure
+ * all the HBQs and post buffers to the HBQ. The caller is not
+ * required to hold any locks. This function will return zero if successful
+ * else it will return negative error code.
+ **/
 static int
 lpfc_sli_hbq_setup(struct lpfc_hba *phba)
 {
@@ -2415,15 +3047,26 @@ lpfc_sli_hbq_setup(struct lpfc_hba *phba)
        mempool_free(pmb, phba->mbox_mem_pool);
        /* Initially populate or replenish the HBQs */
-        for (hbqno = 0; hbqno < hbq_count; ++hbqno) {
+        for (hbqno = 0; hbqno < hbq_count; ++hbqno)
-                if (lpfc_sli_hbqbuf_init_hbqs(phba, hbqno))
+                lpfc_sli_hbqbuf_init_hbqs(phba, hbqno);
-                        return -ENOMEM;
-        }
        return 0;
 }
-static int
+/**
-lpfc_do_config_port(struct lpfc_hba *phba, int sli_mode)
+ * lpfc_sli_config_port: Issue config port mailbox command.
+ * @phba: Pointer to HBA context object.
+ * @sli_mode: sli mode - 2/3
+ *
+ * This function is called by the sli intialization code path
+ * to issue config_port mailbox command. This function restarts the
+ * HBA firmware and issues a config_port mailbox command to configure
+ * the SLI interface in the sli mode specified by sli_mode
+ * variable. The caller is not required to hold any locks.
+ * The function returns 0 if successful, else returns negative error
+ * code.
+ **/
+int
+lpfc_sli_config_port(struct lpfc_hba *phba, int sli_mode)
 {
        LPFC_MBOXQ_t *pmb;
        uint32_t resetcount = 0, rc = 0, done = 0;
@@ -2460,13 +3103,15 @@ lpfc_do_config_port(struct lpfc_hba *phba, int sli_mode)
                if (rc == -ERESTART) {
                        phba->link_state = LPFC_LINK_UNKNOWN;
                        continue;
-                } else if (rc) {
+                } else if (rc)
                        break;
-                }
                phba->link_state = LPFC_INIT_MBX_CMDS;
                lpfc_config_port(phba, pmb);
                rc = lpfc_sli_issue_mbox(phba, pmb, MBX_POLL);
+                phba->sli3_options &= ~(LPFC_SLI3_NPIV_ENABLED |
+                                        LPFC_SLI3_HBQ_ENABLED |
+                                        LPFC_SLI3_CRP_ENABLED |
+                                        LPFC_SLI3_INB_ENABLED);
                if (rc != MBX_SUCCESS) {
                        lpfc_printf_log(phba, KERN_ERR, LOG_INIT,
                                "0442 Adapter failed to init, mbxCmd x%x "
@@ -2476,30 +3121,64 @@ lpfc_do_config_port(struct lpfc_hba *phba, int sli_mode)
                        phba->sli.sli_flag &= ~LPFC_SLI2_ACTIVE;
                        spin_unlock_irq(&phba->hbalock);
                        rc = -ENXIO;
-                } else {
+                } else
                        done = 1;
-                        phba->max_vpi = (phba->max_vpi &&
-                                         pmb->mb.un.varCfgPort.gmv) != 0
-                                ? pmb->mb.un.varCfgPort.max_vpi
-                                : 0;
-                }
        }
        if (!done) {
                rc = -EINVAL;
                goto do_prep_failed;
        }
+        if (pmb->mb.un.varCfgPort.sli_mode == 3) {
-        if ((pmb->mb.un.varCfgPort.sli_mode == 3) &&
+                if (!pmb->mb.un.varCfgPort.cMA) {
-                (!pmb->mb.un.varCfgPort.cMA)) {
+                        rc = -ENXIO;
-                rc = -ENXIO;
+                        goto do_prep_failed;
+                }
+                if (phba->max_vpi && pmb->mb.un.varCfgPort.gmv) {
+                        phba->sli3_options |= LPFC_SLI3_NPIV_ENABLED;
+                        phba->max_vpi = pmb->mb.un.varCfgPort.max_vpi;
+                } else
+                        phba->max_vpi = 0;
+                if (pmb->mb.un.varCfgPort.gerbm)
+                        phba->sli3_options |= LPFC_SLI3_HBQ_ENABLED;
+                if (pmb->mb.un.varCfgPort.gcrp)
+                        phba->sli3_options |= LPFC_SLI3_CRP_ENABLED;
+                if (pmb->mb.un.varCfgPort.ginb) {
+                        phba->sli3_options |= LPFC_SLI3_INB_ENABLED;
+                        phba->port_gp = phba->mbox->us.s3_inb_pgp.port;
+                        phba->inb_ha_copy = &phba->mbox->us.s3_inb_pgp.ha_copy;
+                        phba->inb_counter = &phba->mbox->us.s3_inb_pgp.counter;
+                        phba->inb_last_counter =
+                                        phba->mbox->us.s3_inb_pgp.counter;
+                } else {
+                        phba->port_gp = phba->mbox->us.s3_pgp.port;
+                        phba->inb_ha_copy = NULL;
+                        phba->inb_counter = NULL;
+                }
+        } else {
+                phba->port_gp = phba->mbox->us.s2.port;
+                phba->inb_ha_copy = NULL;
+                phba->inb_counter = NULL;
+                phba->max_vpi = 0;
        }
 do_prep_failed:
        mempool_free(pmb, phba->mbox_mem_pool);
        return rc;
 }
+/**
+ * lpfc_sli_hba_setup: SLI intialization function.
+ * @phba: Pointer to HBA context object.
+ *
+ * This function is the main SLI intialization function. This function
+ * is called by the HBA intialization code, HBA reset code and HBA
+ * error attention handler code. Caller is not required to hold any
+ * locks. This function issues config_port mailbox command to configure
+ * the SLI, setup iocb rings and HBQ rings. In the end the function
+ * calls the config_port_post function to issue init_link mailbox
+ * command and to start the discovery. The function will return zero
+ * if successful, else it will return negative error code.
+ **/
 int
 lpfc_sli_hba_setup(struct lpfc_hba *phba)
 {
@@ -2528,22 +3207,20 @@ lpfc_sli_hba_setup(struct lpfc_hba *phba)
                break;
        }
-        rc = lpfc_do_config_port(phba, mode);
+        rc = lpfc_sli_config_port(phba, mode);
        if (rc && lpfc_sli_mode == 3)
                lpfc_printf_log(phba, KERN_ERR, LOG_INIT | LOG_VPORT,
                                "1820 Unable to select SLI-3.  "
                                "Not supported by adapter.\n");
        if (rc && mode != 2)
-                rc = lpfc_do_config_port(phba, 2);
+                rc = lpfc_sli_config_port(phba, 2);
        if (rc)
                goto lpfc_sli_hba_setup_error;
        if (phba->sli_rev == 3) {
                phba->iocb_cmd_size = SLI3_IOCB_CMD_SIZE;
                phba->iocb_rsp_size = SLI3_IOCB_RSP_SIZE;
-                phba->sli3_options |= LPFC_SLI3_ENABLED;
-                phba->sli3_options |= LPFC_SLI3_HBQ_ENABLED;
        } else {
                phba->iocb_cmd_size = SLI2_IOCB_CMD_SIZE;
                phba->iocb_rsp_size = SLI2_IOCB_RSP_SIZE;
@@ -2558,8 +3235,7 @@ lpfc_sli_hba_setup(struct lpfc_hba *phba)
        if (rc)
                goto lpfc_sli_hba_setup_error;
-                                /* Init HBQs */
+        /* Init HBQs */
        if (phba->sli3_options & LPFC_SLI3_HBQ_ENABLED) {
                rc = lpfc_sli_hbq_setup(phba);
                if (rc)
@@ -2581,19 +3257,19 @@ lpfc_sli_hba_setup_error:
        return rc;
 }
-/*! lpfc_mbox_timeout
- *
+/**
- * \pre
+ * lpfc_mbox_timeout: Timeout call back function for mbox timer.
- * \post
+ * @ptr: context object - pointer to hba structure.
- * \param hba Pointer to per struct lpfc_hba structure
- * \param l1  Pointer to the driver's mailbox queue.
- * \return
- *   void
- *
- * \b Description:
 *
- * This routine handles mailbox timeout events at timer interrupt context.
+ * This is the callback function for mailbox timer. The mailbox
- */
+ * timer is armed when a new mailbox command is issued and the timer
+ * is deleted when the mailbox complete. The function is called by
+ * the kernel timer code when a mailbox does not complete within
+ * expected time. This function wakes up the worker thread to
+ * process the mailbox timeout and returns. All the processing is
+ * done by the worker thread function lpfc_mbox_timeout_handler.
+ **/
 void
 lpfc_mbox_timeout(unsigned long ptr)
 {
@@ -2612,6 +3288,15 @@ lpfc_mbox_timeout(unsigned long ptr)
        return;
 }
+/**
+ * lpfc_mbox_timeout_handler: Worker thread function to handle mailbox timeout.
+ * @phba: Pointer to HBA context object.
+ *
+ * This function is called from worker thread when a mailbox command times out.
+ * The caller is not required to hold any locks. This function will reset the
+ * HBA and recover all the pending commands.
+ **/
 void
 lpfc_mbox_timeout_handler(struct lpfc_hba *phba)
 {
@@ -2666,6 +3351,32 @@ lpfc_mbox_timeout_handler(struct lpfc_hba *phba)
        return;
 }
+/**
+ * lpfc_sli_issue_mbox: Issue a mailbox command to firmware.
+ * @phba: Pointer to HBA context object.
+ * @pmbox: Pointer to mailbox object.
+ * @flag: Flag indicating how the mailbox need to be processed.
+ *
+ * This function is called by discovery code and HBA management code
+ * to submit a mailbox command to firmware. This function gets the
+ * hbalock to protect the data structures.
+ * The mailbox command can be submitted in polling mode, in which case
+ * this function will wait in a polling loop for the completion of the
+ * mailbox.
+ * If the mailbox is submitted in no_wait mode (not polling) the
+ * function will submit the command and returns immediately without waiting
+ * for the mailbox completion. The no_wait is supported only when HBA
+ * is in SLI2/SLI3 mode - interrupts are enabled.
+ * The SLI interface allows only one mailbox pending at a time. If the
+ * mailbox is issued in polling mode and there is already a mailbox
+ * pending, then the function will return an error. If the mailbox is issued
+ * in NO_WAIT mode and there is a mailbox pending already, the function
+ * will return MBX_BUSY after queuing the mailbox into mailbox queue.
+ * The sli layer owns the mailbox object until the completion of mailbox
+ * command if this function return MBX_BUSY or MBX_SUCCESS. For all other
+ * return codes the caller owns the mailbox command after the return of
+ * the function.
+ **/
 int
 lpfc_sli_issue_mbox(struct lpfc_hba *phba, LPFC_MBOXQ_t *pmbox, uint32_t flag)
 {
@@ -2676,7 +3387,7 @@ lpfc_sli_issue_mbox(struct lpfc_hba *phba, LPFC_MBOXQ_t *pmbox, uint32_t flag)
        int i;
        unsigned long timeout;
        unsigned long drvr_flag = 0;
-        volatile uint32_t word0, ldata;
+        uint32_t word0, ldata;
        void __iomem *to_slim;
        int processing_queue = 0;
@@ -2836,12 +3547,11 @@ lpfc_sli_issue_mbox(struct lpfc_hba *phba, LPFC_MBOXQ_t *pmbox, uint32_t flag)
        if (psli->sli_flag & LPFC_SLI2_ACTIVE) {
                /* First copy command data to host SLIM area */
-                lpfc_sli_pcimem_bcopy(mb, &phba->slim2p->mbx, MAILBOX_CMD_SIZE);
+                lpfc_sli_pcimem_bcopy(mb, phba->mbox, MAILBOX_CMD_SIZE);
        } else {
                if (mb->mbxCommand == MBX_CONFIG_PORT) {
                        /* copy command data into host mbox for cmpl */
-                        lpfc_sli_pcimem_bcopy(mb, &phba->slim2p->mbx,
+                        lpfc_sli_pcimem_bcopy(mb, phba->mbox, MAILBOX_CMD_SIZE);
-                                              MAILBOX_CMD_SIZE);
                }
                /* First copy mbox command data to HBA SLIM, skip past first
@@ -2851,7 +3561,7 @@ lpfc_sli_issue_mbox(struct lpfc_hba *phba, LPFC_MBOXQ_t *pmbox, uint32_t flag)
                            MAILBOX_CMD_SIZE - sizeof (uint32_t));
                /* Next copy over first word, with mbxOwner set */
-                ldata = *((volatile uint32_t *)mb);
+                ldata = *((uint32_t *)mb);
                to_slim = phba->MBslimaddr;
                writel(ldata, to_slim);
                readl(to_slim); /* flush */
@@ -2883,7 +3593,7 @@ lpfc_sli_issue_mbox(struct lpfc_hba *phba, LPFC_MBOXQ_t *pmbox, uint32_t flag)
                if (psli->sli_flag & LPFC_SLI2_ACTIVE) {
                        /* First read mbox status word */
-                        word0 = *((volatile uint32_t *)&phba->slim2p->mbx);
+                        word0 = *((uint32_t *)phba->mbox);
                        word0 = le32_to_cpu(word0);
                } else {
                        /* First read mbox status word */
@@ -2922,12 +3632,11 @@ lpfc_sli_issue_mbox(struct lpfc_hba *phba, LPFC_MBOXQ_t *pmbox, uint32_t flag)
                        if (psli->sli_flag & LPFC_SLI2_ACTIVE) {
                                /* First copy command data */
-                                word0 = *((volatile uint32_t *)
+                                word0 = *((uint32_t *)phba->mbox);
-                                                &phba->slim2p->mbx);
                                word0 = le32_to_cpu(word0);
                                if (mb->mbxCommand == MBX_CONFIG_PORT) {
                                        MAILBOX_t *slimmb;
-                                        volatile uint32_t slimword0;
+                                        uint32_t slimword0;
                                        /* Check real SLIM for any errors */
                                        slimword0 = readl(phba->MBslimaddr);
                                        slimmb = (MAILBOX_t *) & slimword0;
@@ -2948,8 +3657,7 @@ lpfc_sli_issue_mbox(struct lpfc_hba *phba, LPFC_MBOXQ_t *pmbox, uint32_t flag)
                if (psli->sli_flag & LPFC_SLI2_ACTIVE) {
                        /* copy results back to user */
-                        lpfc_sli_pcimem_bcopy(&phba->slim2p->mbx, mb,
+                        lpfc_sli_pcimem_bcopy(phba->mbox, mb, MAILBOX_CMD_SIZE);
-                                              MAILBOX_CMD_SIZE);
                } else {
                        /* First copy command data */
                        lpfc_memcpy_from_slim(mb, phba->MBslimaddr,
@@ -2980,9 +3688,16 @@ out_not_finished:
        return MBX_NOT_FINISHED;
 }
-/*
+/**
- * Caller needs to hold lock.
+ * __lpfc_sli_ringtx_put: Add an iocb to the txq.
- */
+ * @phba: Pointer to HBA context object.
+ * @pring: Pointer to driver SLI ring object.
+ * @piocb: Pointer to address of newly added command iocb.
+ *
+ * This function is called with hbalock held to add a command
+ * iocb to the txq when SLI layer cannot submit the command iocb
+ * to the ring.
+ **/
 static void
 __lpfc_sli_ringtx_put(struct lpfc_hba *phba, struct lpfc_sli_ring *pring,
                    struct lpfc_iocbq *piocb)
@@ -2992,6 +3707,23 @@ __lpfc_sli_ringtx_put(struct lpfc_hba *phba, struct lpfc_sli_ring *pring,
        pring->txq_cnt++;
 }
+/**
+ * lpfc_sli_next_iocb: Get the next iocb in the txq.
+ * @phba: Pointer to HBA context object.
+ * @pring: Pointer to driver SLI ring object.
+ * @piocb: Pointer to address of newly added command iocb.
+ *
+ * This function is called with hbalock held before a new
+ * iocb is submitted to the firmware. This function checks
+ * txq to flush the iocbs in txq to Firmware before
+ * submitting new iocbs to the Firmware.
+ * If there are iocbs in the txq which need to be submitted
+ * to firmware, lpfc_sli_next_iocb returns the first element
+ * of the txq after dequeuing it from txq.
+ * If there is no iocb in the txq then the function will return
+ * *piocb and *piocb is set to NULL. Caller needs to check
+ * *piocb to find if there are more commands in the txq.
+ **/
 static struct lpfc_iocbq *
 lpfc_sli_next_iocb(struct lpfc_hba *phba, struct lpfc_sli_ring *pring,
                   struct lpfc_iocbq **piocb)
@@ -3007,9 +3739,30 @@ lpfc_sli_next_iocb(struct lpfc_hba *phba, struct lpfc_sli_ring *pring,
        return nextiocb;
 }
-/*
+/**
- * Lockless version of lpfc_sli_issue_iocb.
+ * __lpfc_sli_issue_iocb: Lockless version of lpfc_sli_issue_iocb.
- */
+ * @phba: Pointer to HBA context object.
+ * @pring: Pointer to driver SLI ring object.
+ * @piocb: Pointer to command iocb.
+ * @flag: Flag indicating if this command can be put into txq.
+ *
+ * __lpfc_sli_issue_iocb is used by other functions in the driver
+ * to issue an iocb command to the HBA. If the PCI slot is recovering
+ * from error state or if HBA is resetting or if LPFC_STOP_IOCB_EVENT
+ * flag is turned on, the function returns IOCB_ERROR.
+ * When the link is down, this function allows only iocbs for
+ * posting buffers.
+ * This function finds next available slot in the command ring and
+ * posts the command to the available slot and writes the port
+ * attention register to request HBA start processing new iocb.
+ * If there is no slot available in the ring and
+ * flag & SLI_IOCB_RET_IOCB is set, the new iocb is added to the
+ * txq, otherwise the function returns IOCB_BUSY.
+ *
+ * This function is called with hbalock held.
+ * The function will return success after it successfully submit the
+ * iocb to firmware or after adding to the txq.
+ **/
 static int
 __lpfc_sli_issue_iocb(struct lpfc_hba *phba, struct lpfc_sli_ring *pring,
                    struct lpfc_iocbq *piocb, uint32_t flag)
@@ -3052,6 +3805,16 @@ __lpfc_sli_issue_iocb(struct lpfc_hba *phba, struct lpfc_sli_ring *pring,
                 * can be issued if the link is not up.
                 */
                switch (piocb->iocb.ulpCommand) {
+                case CMD_GEN_REQUEST64_CR:
+                case CMD_GEN_REQUEST64_CX:
+                        if (!(phba->sli.sli_flag & LPFC_MENLO_MAINT) ||
+                                (piocb->iocb.un.genreq64.w5.hcsw.Rctl !=
+                                        FC_FCP_CMND) ||
+                                (piocb->iocb.un.genreq64.w5.hcsw.Type !=
+                                        MENLO_TRANSPORT_TYPE))
+                                goto iocb_busy;
+                        break;
                case CMD_QUE_RING_BUF_CN:
                case CMD_QUE_RING_BUF64_CN:
                        /*
@@ -3106,6 +3869,19 @@ __lpfc_sli_issue_iocb(struct lpfc_hba *phba, struct lpfc_sli_ring *pring,
 }
+/**
+ * lpfc_sli_issue_iocb: Wrapper function for __lpfc_sli_issue_iocb.
+ * @phba: Pointer to HBA context object.
+ * @pring: Pointer to driver SLI ring object.
+ * @piocb: Pointer to command iocb.
+ * @flag: Flag indicating if this command can be put into txq.
+ *
+ * lpfc_sli_issue_iocb is a wrapper around __lpfc_sli_issue_iocb
+ * function. This function gets the hbalock and calls
+ * __lpfc_sli_issue_iocb function and will return the error returned
+ * by __lpfc_sli_issue_iocb function. This wrapper is used by
+ * functions which do not hold hbalock.
+ **/
 int
 lpfc_sli_issue_iocb(struct lpfc_hba *phba, struct lpfc_sli_ring *pring,
                    struct lpfc_iocbq *piocb, uint32_t flag)
@@ -3120,6 +3896,17 @@ lpfc_sli_issue_iocb(struct lpfc_hba *phba, struct lpfc_sli_ring *pring,
        return rc;
 }
+/**
+ * lpfc_extra_ring_setup: Extra ring setup function.
+ * @phba: Pointer to HBA context object.
+ *
+ * This function is called while driver attaches with the
+ * HBA to setup the extra ring. The extra ring is used
+ * only when driver needs to support target mode functionality
+ * or IP over FC functionalities.
+ *
+ * This function is called with no lock held.
+ **/
 static int
 lpfc_extra_ring_setup( struct lpfc_hba *phba)
 {
@@ -3155,6 +3942,19 @@ lpfc_extra_ring_setup( struct lpfc_hba *phba)
        return 0;
 }
+/**
+ * lpfc_sli_async_event_handler: ASYNC iocb handler function.
+ * @phba: Pointer to HBA context object.
+ * @pring: Pointer to driver SLI ring object.
+ * @iocbq: Pointer to iocb object.
+ *
+ * This function is called by the slow ring event handler
+ * function when there is an ASYNC event iocb in the ring.
+ * This function is called with no lock held.
+ * Currently this function handles only temperature related
+ * ASYNC events. The function decodes the temperature sensor
+ * event message and posts events for the management applications.
+ **/
 static void
 lpfc_sli_async_event_handler(struct lpfc_hba * phba,
        struct lpfc_sli_ring * pring, struct lpfc_iocbq * iocbq)
@@ -3210,6 +4010,17 @@ lpfc_sli_async_event_handler(struct lpfc_hba * phba,
 }
+/**
+ * lpfc_sli_setup: SLI ring setup function.
+ * @phba: Pointer to HBA context object.
+ *
+ * lpfc_sli_setup sets up rings of the SLI interface with
+ * number of iocbs per ring and iotags. This function is
+ * called while driver attach to the HBA and before the
+ * interrupts are enabled. So there is no need for locking.
+ *
+ * This function always returns 0.
+ **/
 int
 lpfc_sli_setup(struct lpfc_hba *phba)
 {
@@ -3321,6 +4132,17 @@ lpfc_sli_setup(struct lpfc_hba *phba)
        return 0;
 }
+/**
+ * lpfc_sli_queue_setup: Queue initialization function.
+ * @phba: Pointer to HBA context object.
+ *
+ * lpfc_sli_queue_setup sets up mailbox queues and iocb queues for each
+ * ring. This function also initializes ring indices of each ring.
+ * This function is called during the initialization of the SLI
+ * interface of an HBA.
+ * This function is called with no lock held and always returns
+ * 1.
+ **/
 int
 lpfc_sli_queue_setup(struct lpfc_hba *phba)
 {
@@ -3349,6 +4171,23 @@ lpfc_sli_queue_setup(struct lpfc_hba *phba)
        return 1;
 }
+/**
+ * lpfc_sli_host_down: Vport cleanup function.
+ * @vport: Pointer to virtual port object.
+ *
+ * lpfc_sli_host_down is called to clean up the resources
+ * associated with a vport before destroying virtual
+ * port data structures.
+ * This function does following operations:
+ * - Free discovery resources associated with this virtual
+ *   port.
+ * - Free iocbs associated with this virtual port in
+ *   the txq.
+ * - Send abort for all iocb commands associated with this
+ *   vport in txcmplq.
+ *
+ * This function is called with no lock held and always returns 1.
+ **/
 int
 lpfc_sli_host_down(struct lpfc_vport *vport)
 {
@@ -3411,6 +4250,21 @@ lpfc_sli_host_down(struct lpfc_vport *vport)
        return 1;
 }
+/**
+ * lpfc_sli_hba_down: Resource cleanup function for the HBA.
+ * @phba: Pointer to HBA context object.
+ *
+ * This function cleans up all iocb, buffers, mailbox commands
+ * while shutting down the HBA. This function is called with no
+ * lock held and always returns 1.
+ * This function does the following to cleanup driver resources:
+ * - Free discovery resources for each virtual port
+ * - Cleanup any pending fabric iocbs
+ * - Iterate through the iocb txq and free each entry
+ *   in the list.
+ * - Free up any buffer posted to the HBA
+ * - Free mailbox commands in the mailbox queue.
+ **/
 int
 lpfc_sli_hba_down(struct lpfc_hba *phba)
 {
@@ -3501,6 +4355,18 @@ lpfc_sli_hba_down(struct lpfc_hba *phba)
        return 1;
 }
+/**
+ * lpfc_sli_pcimem_bcopy: SLI memory copy function.
+ * @srcp: Source memory pointer.
+ * @destp: Destination memory pointer.
+ * @cnt: Number of words required to be copied.
+ *
+ * This function is used for copying data between driver memory
+ * and the SLI memory. This function also changes the endianness
+ * of each word if native endianness is different from SLI
+ * endianness. This function can be called with or without
+ * lock.
+ **/
 void
 lpfc_sli_pcimem_bcopy(void *srcp, void *destp, uint32_t cnt)
 {
@@ -3518,6 +4384,17 @@ lpfc_sli_pcimem_bcopy(void *srcp, void *destp, uint32_t cnt)
        }
 }
+/**
+ * lpfc_sli_ringpostbuf_put: Function to add a buffer to postbufq.
+ * @phba: Pointer to HBA context object.
+ * @pring: Pointer to driver SLI ring object.
+ * @mp: Pointer to driver buffer object.
+ *
+ * This function is called with no lock held.
+ * It always return zero after adding the buffer to the postbufq
+ * buffer list.
+ **/
 int
 lpfc_sli_ringpostbuf_put(struct lpfc_hba *phba, struct lpfc_sli_ring *pring,
                         struct lpfc_dmabuf *mp)
@@ -3531,6 +4408,18 @@ lpfc_sli_ringpostbuf_put(struct lpfc_hba *phba, struct lpfc_sli_ring *pring,
        return 0;
 }
+/**
+ * lpfc_sli_get_buffer_tag: Tag allocation function for a buffer posted
+ *          using CMD_QUE_XRI64_CX iocb.
+ * @phba: Pointer to HBA context object.
+ *
+ * When HBQ is enabled, buffers are searched based on tags. This function
+ * allocates a tag for buffer posted using CMD_QUE_XRI64_CX iocb. The
+ * tag is bit wise or-ed with QUE_BUFTAG_BIT to make sure that the tag
+ * does not conflict with tags of buffer posted for unsolicited events.
+ * The function returns the allocated tag. The function is called with
+ * no locks held.
+ **/
 uint32_t
 lpfc_sli_get_buffer_tag(struct lpfc_hba *phba)
 {
@@ -3545,6 +4434,22 @@ lpfc_sli_get_buffer_tag(struct lpfc_hba *phba)
        return phba->buffer_tag_count;
 }
+/**
+ * lpfc_sli_ring_taggedbuf_get: Search HBQ buffer associated with
+ *              posted using CMD_QUE_XRI64_CX iocb.
+ * @phba: Pointer to HBA context object.
+ * @pring: Pointer to driver SLI ring object.
+ * @tag: Buffer tag.
+ *
+ * Buffers posted using CMD_QUE_XRI64_CX iocb are in pring->postbufq
+ * list. After HBA DMA data to these buffers, CMD_IOCB_RET_XRI64_CX
+ * iocb is posted to the response ring with the tag of the buffer.
+ * This function searches the pring->postbufq list using the tag
+ * to find buffer associated with CMD_IOCB_RET_XRI64_CX
+ * iocb. If the buffer is found then lpfc_dmabuf object of the
+ * buffer is returned to the caller else NULL is returned.
+ * This function is called with no lock held.
+ **/
 struct lpfc_dmabuf *
 lpfc_sli_ring_taggedbuf_get(struct lpfc_hba *phba, struct lpfc_sli_ring *pring,
                        uint32_t tag)
@@ -3565,7 +4470,7 @@ lpfc_sli_ring_taggedbuf_get(struct lpfc_hba *phba, struct lpfc_sli_ring *pring,
        spin_unlock_irq(&phba->hbalock);
        lpfc_printf_log(phba, KERN_ERR, LOG_INIT,
-                        "0410 Cannot find virtual addr for buffer tag on "
+                        "0402 Cannot find virtual addr for buffer tag on "
                        "ring %d Data x%lx x%p x%p x%x\n",
                        pring->ringno, (unsigned long) tag,
                        slp->next, slp->prev, pring->postbufq_cnt);
@@ -3573,6 +4478,23 @@ lpfc_sli_ring_taggedbuf_get(struct lpfc_hba *phba, struct lpfc_sli_ring *pring,
        return NULL;
 }
+/**
+ * lpfc_sli_ringpostbuf_get: SLI2 buffer search function for
+ *      unsolicited ct and els events.
+ * @phba: Pointer to HBA context object.
+ * @pring: Pointer to driver SLI ring object.
+ * @phys: DMA address of the buffer.
+ *
+ * This function searches the buffer list using the dma_address
+ * of unsolicited event to find the driver's lpfc_dmabuf object
+ * corresponding to the dma_address. The function returns the
+ * lpfc_dmabuf object if a buffer is found else it returns NULL.
+ * This function is called by the ct and els unsolicited event
+ * handlers to get the buffer associated with the unsolicited
+ * event.
+ *
+ * This function is called with no lock held.
+ **/
 struct lpfc_dmabuf *
 lpfc_sli_ringpostbuf_get(struct lpfc_hba *phba, struct lpfc_sli_ring *pring,
                         dma_addr_t phys)
@@ -3600,6 +4522,17 @@ lpfc_sli_ringpostbuf_get(struct lpfc_hba *phba, struct lpfc_sli_ring *pring,
        return NULL;
 }
+/**
+ * lpfc_sli_abort_els_cmpl: Completion handler for the els abort iocbs.
+ * @phba: Pointer to HBA context object.
+ * @cmdiocb: Pointer to driver command iocb object.
+ * @rspiocb: Pointer to driver response iocb object.
+ *
+ * This function is the completion handler for the abort iocbs for
+ * ELS commands. This function is called from the ELS ring event
+ * handler with no lock held. This function frees memory resources
+ * associated with the abort iocb.
+ **/
 static void
 lpfc_sli_abort_els_cmpl(struct lpfc_hba *phba, struct lpfc_iocbq *cmdiocb,
                        struct lpfc_iocbq *rspiocb)
@@ -3665,6 +4598,17 @@ lpfc_sli_abort_els_cmpl(struct lpfc_hba *phba, struct lpfc_iocbq *cmdiocb,
        return;
 }
+/**
+ * lpfc_ignore_els_cmpl: Completion handler for aborted ELS command.
+ * @phba: Pointer to HBA context object.
+ * @cmdiocb: Pointer to driver command iocb object.
+ * @rspiocb: Pointer to driver response iocb object.
+ *
+ * The function is called from SLI ring event handler with no
+ * lock held. This function is the completion handler for ELS commands
+ * which are aborted. The function frees memory resources used for
+ * the aborted ELS commands.
+ **/
 static void
 lpfc_ignore_els_cmpl(struct lpfc_hba *phba, struct lpfc_iocbq *cmdiocb,
                     struct lpfc_iocbq *rspiocb)
@@ -3673,7 +4617,7 @@ lpfc_ignore_els_cmpl(struct lpfc_hba *phba, struct lpfc_iocbq *cmdiocb,
        /* ELS cmd tag <ulpIoTag> completes */
        lpfc_printf_log(phba, KERN_INFO, LOG_ELS,
-                        "0133 Ignoring ELS cmd tag x%x completion Data: "
+                        "0139 Ignoring ELS cmd tag x%x completion Data: "
                        "x%x x%x x%x\n",
                        irsp->ulpIoTag, irsp->ulpStatus,
                        irsp->un.ulpWord[4], irsp->ulpTimeout);
@@ -3684,6 +4628,17 @@ lpfc_ignore_els_cmpl(struct lpfc_hba *phba, struct lpfc_iocbq *cmdiocb,
        return;
 }
+/**
+ * lpfc_sli_issue_abort_iotag: Abort function for a command iocb.
+ * @phba: Pointer to HBA context object.
+ * @pring: Pointer to driver SLI ring object.
+ * @cmdiocb: Pointer to driver command iocb object.
+ *
+ * This function issues an abort iocb for the provided command
+ * iocb. This function is called with hbalock held.
+ * The function returns 0 when it fails due to memory allocation
+ * failure or when the command iocb is an abort request.
+ **/
 int
 lpfc_sli_issue_abort_iotag(struct lpfc_hba *phba, struct lpfc_sli_ring *pring,
                           struct lpfc_iocbq *cmdiocb)
@@ -3748,6 +4703,8 @@ lpfc_sli_issue_abort_iotag(struct lpfc_hba *phba, struct lpfc_sli_ring *pring,
                         iabt->un.acxri.abortIoTag, abtsiocbp->iotag);
        retval = __lpfc_sli_issue_iocb(phba, pring, abtsiocbp, 0);
+        if (retval)
+                __lpfc_sli_release_iocbq(phba, abtsiocbp);
 abort_iotag_exit:
        /*
         * Caller to this routine should check for IOCB_ERROR
@@ -3757,6 +4714,29 @@ abort_iotag_exit:
        return retval;
 }
+/**
+ * lpfc_sli_validate_fcp_iocb: Filtering function, used to find commands
+ *                    associated with a vport/SCSI target/lun.
+ * @iocbq: Pointer to driver iocb object.
+ * @vport: Pointer to driver virtual port object.
+ * @tgt_id: SCSI ID of the target.
+ * @lun_id: LUN ID of the scsi device.
+ * @ctx_cmd: LPFC_CTX_LUN/LPFC_CTX_TGT/LPFC_CTX_HOST
+ *
+ * This function acts as iocb filter for functions which abort or count
+ * all FCP iocbs pending on a lun/SCSI target/SCSI host. It will return
+ * 0 if the filtering criteria is met for the given iocb and will return
+ * 1 if the filtering criteria is not met.
+ * If ctx_cmd == LPFC_CTX_LUN, the function returns 0 only if the
+ * given iocb is for the SCSI device specified by vport, tgt_id and
+ * lun_id parameter.
+ * If ctx_cmd == LPFC_CTX_TGT,  the function returns 0 only if the
+ * given iocb is for the SCSI target specified by vport and tgt_id
+ * parameters.
+ * If ctx_cmd == LPFC_CTX_HOST, the function returns 0 only if the
+ * given iocb is for the SCSI host associated with the given vport.
+ * This function is called with no locks held.
+ **/
 static int
 lpfc_sli_validate_fcp_iocb(struct lpfc_iocbq *iocbq, struct lpfc_vport *vport,
                           uint16_t tgt_id, uint64_t lun_id,
@@ -3800,6 +4780,25 @@ lpfc_sli_validate_fcp_iocb(struct lpfc_iocbq *iocbq, struct lpfc_vport *vport,
        return rc;
 }
+/**
+ * lpfc_sli_sum_iocb: Function to count the number of FCP iocbs pending.
+ * @vport: Pointer to virtual port.
+ * @tgt_id: SCSI ID of the target.
+ * @lun_id: LUN ID of the scsi device.
+ * @ctx_cmd: LPFC_CTX_LUN/LPFC_CTX_TGT/LPFC_CTX_HOST.
+ *
+ * This function returns number of FCP commands pending for the vport.
+ * When ctx_cmd == LPFC_CTX_LUN, the function returns number of FCP
+ * commands pending on the vport associated with SCSI device specified
+ * by tgt_id and lun_id parameters.
+ * When ctx_cmd == LPFC_CTX_TGT, the function returns number of FCP
+ * commands pending on the vport associated with SCSI target specified
+ * by tgt_id parameter.
+ * When ctx_cmd == LPFC_CTX_HOST, the function returns number of FCP
+ * commands pending on the vport.
+ * This function returns the number of iocbs which satisfy the filter.
+ * This function is called without any lock held.
+ **/
 int
 lpfc_sli_sum_iocb(struct lpfc_vport *vport, uint16_t tgt_id, uint64_t lun_id,
                  lpfc_ctx_cmd ctx_cmd)
@@ -3819,6 +4818,17 @@ lpfc_sli_sum_iocb(struct lpfc_vport *vport, uint16_t tgt_id, uint64_t lun_id,
        return sum;
 }
+/**
+ * lpfc_sli_abort_fcp_cmpl: Completion handler function for an aborted
+ *       FCP iocb.
+ * @phba: Pointer to HBA context object
+ * @cmdiocb: Pointer to command iocb object.
+ * @rspiocb: Pointer to response iocb object.
+ *
+ * This function is called when an aborted FCP iocb completes. This
+ * function is called by the ring event handler with no lock held.
+ * This function frees the iocb.
+ **/
 void
 lpfc_sli_abort_fcp_cmpl(struct lpfc_hba *phba, struct lpfc_iocbq *cmdiocb,
                        struct lpfc_iocbq *rspiocb)
@@ -3827,6 +4837,28 @@ lpfc_sli_abort_fcp_cmpl(struct lpfc_hba *phba, struct lpfc_iocbq *cmdiocb,
        return;
 }
+/**
+ * lpfc_sli_abort_iocb: This function issue abort for all SCSI commands
+ *          pending on a SCSI host(vport)/target/lun.
+ * @vport: Pointer to virtual port.
+ * @pring: Pointer to driver SLI ring object.
+ * @tgt_id: SCSI ID of the target.
+ * @lun_id: LUN ID of the scsi device.
+ * @abort_cmd: LPFC_CTX_LUN/LPFC_CTX_TGT/LPFC_CTX_HOST.
+ *
+ * This function sends an abort command for every SCSI command
+ * associated with the given virtual port pending on the ring
+ * filtered by lpfc_sli_validate_fcp_iocb function.
+ * When abort_cmd == LPFC_CTX_LUN, the function sends abort only to the
+ * FCP iocbs associated with lun specified by tgt_id and lun_id
+ * parameters
+ * When abort_cmd == LPFC_CTX_TGT, the function sends abort only to the
+ * FCP iocbs associated with SCSI target specified by tgt_id parameter.
+ * When abort_cmd == LPFC_CTX_HOST, the function sends abort to all
+ * FCP iocbs associated with virtual port.
+ * This function returns number of iocbs it failed to abort.
+ * This function is called with no locks held.
+ **/
 int
 lpfc_sli_abort_iocb(struct lpfc_vport *vport, struct lpfc_sli_ring *pring,
                    uint16_t tgt_id, uint64_t lun_id, lpfc_ctx_cmd abort_cmd)
@@ -3878,6 +4910,24 @@ lpfc_sli_abort_iocb(struct lpfc_vport *vport, struct lpfc_sli_ring *pring,
        return errcnt;
 }
+/**
+ * lpfc_sli_wake_iocb_wait: iocb completion handler for iocb issued using
+ *                          lpfc_sli_issue_iocb_wait.
+ * @phba: Pointer to HBA context object.
+ * @cmdiocbq: Pointer to command iocb.
+ * @rspiocbq: Pointer to response iocb.
+ *
+ * This function is the completion handler for iocbs issued using
+ * lpfc_sli_issue_iocb_wait function. This function is called by the
+ * ring event handler function without any lock held. This function
+ * can be called from both worker thread context and interrupt
+ * context. This function also can be called from other thread which
+ * cleans up the SLI layer objects.
+ * This function copy the contents of the response iocb to the
+ * response iocb memory object provided by the caller of
+ * lpfc_sli_issue_iocb_wait and then wakes up the thread which
+ * sleeps for the iocb completion.
+ **/
 static void
 lpfc_sli_wake_iocb_wait(struct lpfc_hba *phba,
                        struct lpfc_iocbq *cmdiocbq,
@@ -3899,13 +4949,36 @@ lpfc_sli_wake_iocb_wait(struct lpfc_hba *phba,
        return;
 }
-/*
+/**
- * Issue the caller's iocb and wait for its completion, but no longer than the
+ * lpfc_sli_issue_iocb_wait: Synchronous function to issue iocb commands.
- * caller's timeout.  Note that iocb_flags is cleared before the
+ * @phba: Pointer to HBA context object..
- * lpfc_sli_issue_call since the wake routine sets a unique value and by
+ * @pring: Pointer to sli ring.
- * definition this is a wait function.
+ * @piocb: Pointer to command iocb.
- */
+ * @prspiocbq: Pointer to response iocb.
+ * @timeout: Timeout in number of seconds.
+ *
+ * This function issues the iocb to firmware and waits for the
+ * iocb to complete. If the iocb command is not
+ * completed within timeout seconds, it returns IOCB_TIMEDOUT.
+ * Caller should not free the iocb resources if this function
+ * returns IOCB_TIMEDOUT.
+ * The function waits for the iocb completion using an
+ * non-interruptible wait.
+ * This function will sleep while waiting for iocb completion.
+ * So, this function should not be called from any context which
+ * does not allow sleeping. Due to the same reason, this function
+ * cannot be called with interrupt disabled.
+ * This function assumes that the iocb completions occur while
+ * this function sleep. So, this function cannot be called from
+ * the thread which process iocb completion for this ring.
+ * This function clears the iocb_flag of the iocb object before
+ * issuing the iocb and the iocb completion handler sets this
+ * flag and wakes this thread when the iocb completes.
+ * The contents of the response iocb will be copied to prspiocbq
+ * by the completion handler when the command completes.
+ * This function returns IOCB_SUCCESS when success.
+ * This function is called with no lock held.
+ **/
 int
 lpfc_sli_issue_iocb_wait(struct lpfc_hba *phba,
                         struct lpfc_sli_ring *pring,
@@ -3963,7 +5036,7 @@ lpfc_sli_issue_iocb_wait(struct lpfc_hba *phba,
                }
        } else {
                lpfc_printf_log(phba, KERN_INFO, LOG_SLI,
-                                ":0332 IOCB wait issue failed, Data x%x\n",
+                                "0332 IOCB wait issue failed, Data x%x\n",
                                retval);
                retval = IOCB_ERROR;
        }
@@ -3983,6 +5056,32 @@ lpfc_sli_issue_iocb_wait(struct lpfc_hba *phba,
        return retval;
 }
+/**
+ * lpfc_sli_issue_mbox_wait: Synchronous function to issue mailbox.
+ * @phba: Pointer to HBA context object.
+ * @pmboxq: Pointer to driver mailbox object.
+ * @timeout: Timeout in number of seconds.
+ *
+ * This function issues the mailbox to firmware and waits for the
+ * mailbox command to complete. If the mailbox command is not
+ * completed within timeout seconds, it returns MBX_TIMEOUT.
+ * The function waits for the mailbox completion using an
+ * interruptible wait. If the thread is woken up due to a
+ * signal, MBX_TIMEOUT error is returned to the caller. Caller
+ * should not free the mailbox resources, if this function returns
+ * MBX_TIMEOUT.
+ * This function will sleep while waiting for mailbox completion.
+ * So, this function should not be called from any context which
+ * does not allow sleeping. Due to the same reason, this function
+ * cannot be called with interrupt disabled.
+ * This function assumes that the mailbox completion occurs while
+ * this function sleep. So, this function cannot be called from
+ * the worker thread which processes mailbox completion.
+ * This function is called in the context of HBA management
+ * applications.
+ * This function returns MBX_SUCCESS when successful.
+ * This function is called with no lock held.
+ **/
 int
 lpfc_sli_issue_mbox_wait(struct lpfc_hba *phba, LPFC_MBOXQ_t *pmboxq,
                         uint32_t timeout)
@@ -4027,6 +5126,18 @@ lpfc_sli_issue_mbox_wait(struct lpfc_hba *phba, LPFC_MBOXQ_t *pmboxq,
        return retval;
 }
+/**
+ * lpfc_sli_flush_mbox_queue: mailbox queue cleanup function.
+ * @phba: Pointer to HBA context.
+ *
+ * This function is called to cleanup any pending mailbox
+ * objects in the driver queue before bringing the HBA offline.
+ * This function is called while resetting the HBA.
+ * The function is called without any lock held. The function
+ * takes hbalock to update SLI data structure.
+ * This function returns 1 when there is an active mailbox
+ * command pending else returns 0.
+ **/
 int
 lpfc_sli_flush_mbox_queue(struct lpfc_hba * phba)
 {
@@ -4058,8 +5169,74 @@ lpfc_sli_flush_mbox_queue(struct lpfc_hba * phba)
        return (phba->sli.sli_flag & LPFC_SLI_MBOX_ACTIVE) ? 1 : 0;
 }
+/**
+ * lpfc_sli_check_eratt: check error attention events
+ * @phba: Pointer to HBA context.
+ *
+ * This function is called form 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
+ * Register and returns 0 otherwise.
+ **/
+int
+lpfc_sli_check_eratt(struct lpfc_hba *phba)
+{
+        uint32_t ha_copy;
+        /* If somebody is waiting to handle an eratt, don't process it
+         * here. The brdkill function will do this.
+         */
+        if (phba->link_flag & LS_IGNORE_ERATT)
+                return 0;
+        /* Check if interrupt handler handles this ERATT */
+        spin_lock_irq(&phba->hbalock);
+        if (phba->hba_flag & HBA_ERATT_HANDLED) {
+                /* Interrupt handler has handled ERATT */
+                spin_unlock_irq(&phba->hbalock);
+                return 0;
+        }
+        /* Read chip Host Attention (HA) register */
+        ha_copy = readl(phba->HAregaddr);
+        if (ha_copy & HA_ERATT) {
+                /* Read host status register to retrieve error event */
+                lpfc_sli_read_hs(phba);
+                /* Set the driver HA work bitmap */
+                phba->work_ha |= HA_ERATT;
+                /* Indicate polling handles this ERATT */
+                phba->hba_flag |= HBA_ERATT_HANDLED;
+                spin_unlock_irq(&phba->hbalock);
+                return 1;
+        }
+        spin_unlock_irq(&phba->hbalock);
+        return 0;
+}
+/**
+ * lpfc_sp_intr_handler: The slow-path interrupt handler of lpfc driver.
+ * @irq: Interrupt number.
+ * @dev_id: The device context pointer.
+ *
+ * This function is directly called from the PCI layer as an interrupt
+ * service routine when the device is enabled with MSI-X multi-message
+ * interrupt mode and there are slow-path events in the HBA. However,
+ * when the device is enabled with either MSI or Pin-IRQ interrupt mode,
+ * this function is called as part of the device-level interrupt handler.
+ * When the PCI slot is in error recovery or the HBA is undergoing
+ * initialization, the interrupt handler will not process the interrupt.
+ * The link attention and ELS ring attention events are handled by the
+ * worker thread. The interrupt handler signals the worker thread and
+ * and returns for these events. This function is called without any
+ * lock held. It gets the hbalock to access and update SLI data
+ * structures.
+ *
+ * This function returns IRQ_HANDLED when interrupt is handled else it
+ * returns IRQ_NONE.
+ **/
 irqreturn_t
-lpfc_intr_handler(int irq, void *dev_id)
+lpfc_sp_intr_handler(int irq, void *dev_id)
 {
        struct lpfc_hba  *phba;
        uint32_t ha_copy;
@@ -4078,48 +5255,52 @@ lpfc_intr_handler(int irq, void *dev_id)
         * Get the driver's phba structure from the dev_id and
         * assume the HBA is not interrupting.
         */
-        phba = (struct lpfc_hba *) dev_id;
+        phba = (struct lpfc_hba *)dev_id;
        if (unlikely(!phba))
                return IRQ_NONE;
-        /* If the pci channel is offline, ignore all the interrupts. */
-        if (unlikely(pci_channel_offline(phba->pcidev)))
-                return IRQ_NONE;
-        phba->sli.slistat.sli_intr++;
        /*
-         * Call the HBA to see if it is interrupting.  If not, don't claim
+         * Stuff needs to be attented to when this function is invoked as an
-         * the interrupt
+         * individual interrupt handler in MSI-X multi-message interrupt mode
-         */
-        /* Ignore all interrupts during initialization. */
-        if (unlikely(phba->link_state < LPFC_LINK_DOWN))
-                return IRQ_NONE;
-        /*
-         * Read host attention register to determine interrupt source
-         * Clear Attention Sources, except Error Attention (to
-         * preserve status) and Link Attention
-         */
-        spin_lock(&phba->hbalock);
-        ha_copy = readl(phba->HAregaddr);
-        /* If somebody is waiting to handle an eratt don't process it
-         * here.  The brdkill function will do this.
         */
-        if (phba->link_flag & LS_IGNORE_ERATT)
+        if (phba->intr_type == MSIX) {
-                ha_copy &= ~HA_ERATT;
+                /* If the pci channel is offline, ignore all the interrupts */
-        writel((ha_copy & ~(HA_LATT | HA_ERATT)), phba->HAregaddr);
+                if (unlikely(pci_channel_offline(phba->pcidev)))
-        readl(phba->HAregaddr); /* flush */
+                        return IRQ_NONE;
-        spin_unlock(&phba->hbalock);
+                /* Update device-level interrupt statistics */
+                phba->sli.slistat.sli_intr++;
-        if (unlikely(!ha_copy))
+                /* Ignore all interrupts during initialization. */
-                return IRQ_NONE;
+                if (unlikely(phba->link_state < LPFC_LINK_DOWN))
+                        return IRQ_NONE;
+                /* Need to read HA REG for slow-path events */
+                spin_lock(&phba->hbalock);
+                ha_copy = readl(phba->HAregaddr);
+                /* If somebody is waiting to handle an eratt don't process it
+                 * here. The brdkill function will do this.
+                 */
+                if (phba->link_flag & LS_IGNORE_ERATT)
+                        ha_copy &= ~HA_ERATT;
+                /* Check the need for handling ERATT in interrupt handler */
+                if (ha_copy & HA_ERATT) {
+                        if (phba->hba_flag & HBA_ERATT_HANDLED)
+                                /* ERATT polling has handled ERATT */
+                                ha_copy &= ~HA_ERATT;
+                        else
+                                /* Indicate interrupt handler handles ERATT */
+                                phba->hba_flag |= HBA_ERATT_HANDLED;
+                }
+                /* Clear up only attention source related to slow-path */
+                writel((ha_copy & (HA_MBATT | HA_R2_CLR_MSK)),
+                        phba->HAregaddr);
+                readl(phba->HAregaddr); /* flush */
+                spin_unlock(&phba->hbalock);
+        } else
+                ha_copy = phba->ha_copy;
        work_ha_copy = ha_copy & phba->work_ha_mask;
-        if (unlikely(work_ha_copy)) {
+        if (work_ha_copy) {
                if (work_ha_copy & HA_LATT) {
                        if (phba->sli.sli_flag & LPFC_PROCESS_LA) {
                                /*
@@ -4138,7 +5319,7 @@ lpfc_intr_handler(int irq, void *dev_id)
                                work_ha_copy &= ~HA_LATT;
                }
-                if (work_ha_copy & ~(HA_ERATT|HA_MBATT|HA_LATT)) {
+                if (work_ha_copy & ~(HA_ERATT | HA_MBATT | HA_LATT)) {
                        /*
                         * Turn off Slow Rings interrupts, LPFC_ELS_RING is
                         * the only slow ring.
@@ -4179,31 +5360,13 @@ lpfc_intr_handler(int irq, void *dev_id)
                                spin_unlock(&phba->hbalock);
                        }
                }
-                if (work_ha_copy & HA_ERATT) {
-                        /*
-                         * There was a link/board error.  Read the
-                         * status register to retrieve the error event
-                         * and process it.
-                         */
-                        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);
-                        /* Clear Chip error bit */
-                        writel(HA_ERATT, phba->HAregaddr);
-                        readl(phba->HAregaddr); /* flush */
-                        phba->pport->stopped = 1;
-                }
                spin_lock(&phba->hbalock);
-                if ((work_ha_copy & HA_MBATT) &&
+                if (work_ha_copy & HA_ERATT)
-                    (phba->sli.mbox_active)) {
+                        lpfc_sli_read_hs(phba);
+                if ((work_ha_copy & HA_MBATT) && (phba->sli.mbox_active)) {
                        pmb = phba->sli.mbox_active;
                        pmbox = &pmb->mb;
-                        mbox = &phba->slim2p->mbx;
+                        mbox = phba->mbox;
                        vport = pmb->vport;
                        /* First check out the status word */
@@ -4270,7 +5433,7 @@ lpfc_intr_handler(int irq, void *dev_id)
                                                        lpfc_printf_log(phba,
                                                        KERN_ERR,
                                                        LOG_MBOX | LOG_SLI,
-                                                        "0306 rc should have"
+                                                        "0350 rc should have"
                                                        "been MBX_BUSY");
                                                goto send_current_mbox;
                                        }
@@ -4283,6 +5446,7 @@ lpfc_intr_handler(int irq, void *dev_id)
                        }
                } else
                        spin_unlock(&phba->hbalock);
                if ((work_ha_copy & HA_MBATT) &&
                    (phba->sli.mbox_active == NULL)) {
 send_current_mbox:
@@ -4302,15 +5466,74 @@ send_current_mbox:
                spin_unlock(&phba->hbalock);
                lpfc_worker_wake_up(phba);
        }
+        return IRQ_HANDLED;
-        ha_copy &= ~(phba->work_ha_mask);
+} /* lpfc_sp_intr_handler */
+/**
+ * lpfc_fp_intr_handler: The fast-path interrupt handler of lpfc driver.
+ * @irq: Interrupt number.
+ * @dev_id: The device context pointer.
+ *
+ * This function is directly called from the PCI layer as an interrupt
+ * service routine when the device is enabled with MSI-X multi-message
+ * interrupt mode and there is a fast-path FCP IOCB ring event in the
+ * HBA. However, when the device is enabled with either MSI or Pin-IRQ
+ * interrupt mode, this function is called as part of the device-level
+ * interrupt handler. When the PCI slot is in error recovery or the HBA
+ * is undergoing initialization, the interrupt handler will not process
+ * the interrupt. The SCSI FCP fast-path ring event are handled in the
+ * intrrupt context. This function is called without any lock held. It
+ * gets the hbalock to access and update SLI data structures.
+ *
+ * This function returns IRQ_HANDLED when interrupt is handled else it
+ * returns IRQ_NONE.
+ **/
+irqreturn_t
+lpfc_fp_intr_handler(int irq, void *dev_id)
+{
+        struct lpfc_hba  *phba;
+        uint32_t ha_copy;
+        unsigned long status;
+        /* Get the driver's phba structure from the dev_id and
+         * assume the HBA is not interrupting.
+         */
+        phba = (struct lpfc_hba *) dev_id;
+        if (unlikely(!phba))
+                return IRQ_NONE;
+        /*
+         * Stuff needs to be attented to when this function is invoked as an
+         * individual interrupt handler in MSI-X multi-message interrupt mode
+         */
+        if (phba->intr_type == MSIX) {
+                /* If pci channel is offline, ignore all the interrupts */
+                if (unlikely(pci_channel_offline(phba->pcidev)))
+                        return IRQ_NONE;
+                /* Update device-level interrupt statistics */
+                phba->sli.slistat.sli_intr++;
+                /* Ignore all interrupts during initialization. */
+                if (unlikely(phba->link_state < LPFC_LINK_DOWN))
+                        return IRQ_NONE;
+                /* Need to read HA REG for FCP ring and other ring events */
+                ha_copy = readl(phba->HAregaddr);
+                /* Clear up only attention source related to fast-path */
+                spin_lock(&phba->hbalock);
+                writel((ha_copy & (HA_R0_CLR_MSK | HA_R1_CLR_MSK)),
+                        phba->HAregaddr);
+                readl(phba->HAregaddr); /* flush */
+                spin_unlock(&phba->hbalock);
+        } else
+                ha_copy = phba->ha_copy;
        /*
-         * Process all events on FCP ring.  Take the optimized path for
+         * Process all events on FCP ring. Take the optimized path for FCP IO.
-         * FCP IO.  Any other IO is slow path and is handled by
-         * the worker thread.
         */
-        status = (ha_copy & (HA_RXMASK  << (4*LPFC_FCP_RING)));
+        ha_copy &= ~(phba->work_ha_mask);
+        status = (ha_copy & (HA_RXMASK << (4*LPFC_FCP_RING)));
        status >>= (4*LPFC_FCP_RING);
        if (status & HA_RXMASK)
                lpfc_sli_handle_fast_ring_event(phba,
@@ -4319,11 +5542,10 @@ send_current_mbox:
        if (phba->cfg_multi_ring_support == 2) {
                /*
-                 * Process all events on extra ring.  Take the optimized path
+                 * Process all events on extra ring. Take the optimized path
-                 * for extra ring IO.  Any other IO is slow path and is handled
+                 * for extra ring IO.
-                 * by the worker thread.
                 */
-                status = (ha_copy & (HA_RXMASK  << (4*LPFC_EXTRA_RING)));
+                status = (ha_copy & (HA_RXMASK << (4*LPFC_EXTRA_RING)));
                status >>= (4*LPFC_EXTRA_RING);
                if (status & HA_RXMASK) {
                        lpfc_sli_handle_fast_ring_event(phba,
@@ -4332,5 +5554,106 @@ send_current_mbox:
                }
        }
        return IRQ_HANDLED;
+}  /* lpfc_fp_intr_handler */
+/**
+ * lpfc_intr_handler: The device-level interrupt handler of lpfc driver.
+ * @irq: Interrupt number.
+ * @dev_id: The device context pointer.
+ *
+ * This function is the device-level interrupt handler called from the PCI
+ * layer when either MSI or Pin-IRQ interrupt mode is enabled and there is
+ * an event in the HBA which requires driver attention. This function
+ * invokes the slow-path interrupt attention handling function and fast-path
+ * interrupt attention handling function in turn to process the relevant
+ * HBA attention events. This function is called without any lock held. It
+ * gets the hbalock to access and update SLI data structures.
+ *
+ * This function returns IRQ_HANDLED when interrupt is handled, else it
+ * returns IRQ_NONE.
+ **/
+irqreturn_t
+lpfc_intr_handler(int irq, void *dev_id)
+{
+        struct lpfc_hba  *phba;
+        irqreturn_t sp_irq_rc, fp_irq_rc;
+        unsigned long status1, status2;
+        /*
+         * Get the driver's phba structure from the dev_id and
+         * assume the HBA is not interrupting.
+         */
+        phba = (struct lpfc_hba *) dev_id;
+        if (unlikely(!phba))
+                return IRQ_NONE;
+        /* If the pci channel is offline, ignore all the interrupts. */
+        if (unlikely(pci_channel_offline(phba->pcidev)))
+                return IRQ_NONE;
+        /* Update device level interrupt statistics */
+        phba->sli.slistat.sli_intr++;
+        /* Ignore all interrupts during initialization. */
+        if (unlikely(phba->link_state < LPFC_LINK_DOWN))
+                return IRQ_NONE;
+        spin_lock(&phba->hbalock);
+        phba->ha_copy = readl(phba->HAregaddr);
+        if (unlikely(!phba->ha_copy)) {
+                spin_unlock(&phba->hbalock);
+                return IRQ_NONE;
+        } else if (phba->ha_copy & HA_ERATT) {
+                if (phba->hba_flag & HBA_ERATT_HANDLED)
+                        /* ERATT polling has handled ERATT */
+                        phba->ha_copy &= ~HA_ERATT;
+                else
+                        /* Indicate interrupt handler handles ERATT */
+                        phba->hba_flag |= HBA_ERATT_HANDLED;
+        }
+        /* Clear attention sources except link and error attentions */
+        writel((phba->ha_copy & ~(HA_LATT | HA_ERATT)), phba->HAregaddr);
+        readl(phba->HAregaddr); /* flush */
+        spin_unlock(&phba->hbalock);
+        /*
+         * Invokes slow-path host attention interrupt handling as appropriate.
+         */
+        /* status of events with mailbox and link attention */
+        status1 = phba->ha_copy & (HA_MBATT | HA_LATT | HA_ERATT);
+        /* status of events with ELS ring */
+        status2 = (phba->ha_copy & (HA_RXMASK  << (4*LPFC_ELS_RING)));
+        status2 >>= (4*LPFC_ELS_RING);
+        if (status1 || (status2 & HA_RXMASK))
+                sp_irq_rc = lpfc_sp_intr_handler(irq, dev_id);
+        else
+                sp_irq_rc = IRQ_NONE;
+        /*
+         * Invoke fast-path host attention interrupt handling as appropriate.
+         */
+        /* status of events with FCP ring */
+        status1 = (phba->ha_copy & (HA_RXMASK << (4*LPFC_FCP_RING)));
+        status1 >>= (4*LPFC_FCP_RING);
+        /* status of events with extra ring */
+        if (phba->cfg_multi_ring_support == 2) {
+                status2 = (phba->ha_copy & (HA_RXMASK << (4*LPFC_EXTRA_RING)));
+                status2 >>= (4*LPFC_EXTRA_RING);
+        } else
+                status2 = 0;
+        if ((status1 & HA_RXMASK) || (status2 & HA_RXMASK))
+                fp_irq_rc = lpfc_fp_intr_handler(irq, dev_id);
+        else
+                fp_irq_rc = IRQ_NONE;
-} /* lpfc_intr_handler */
+        /* Return device-level interrupt handling status */
+        return (sp_irq_rc == IRQ_HANDLED) ? sp_irq_rc : fp_irq_rc;
+}  /* lpfc_intr_handler */
diff --git a/drivers/scsi/lpfc/lpfc_sli.h b/drivers/scsi/lpfc/lpfc_sli.h
index 7249fd252cbb..883938652a6a 100644
--- a/drivers/scsi/lpfc/lpfc_sli.h
+++ b/drivers/scsi/lpfc/lpfc_sli.h
@@ -233,6 +233,7 @@ struct lpfc_sli {
 #define LPFC_SLI2_ACTIVE          0x200 /* SLI2 overlay in firmware is active */
 #define LPFC_PROCESS_LA           0x400 /* Able to process link attention */
 #define LPFC_BLOCK_MGMT_IO        0x800 /* Don't allow mgmt mbx or iocb cmds */
+#define LPFC_MENLO_MAINT          0x1000 /* need for menl fw download */
        struct lpfc_sli_ring ring[LPFC_MAX_RING];
        int fcp_ring;           /* ring used for FCP initiator commands */
diff --git a/drivers/scsi/lpfc/lpfc_version.h b/drivers/scsi/lpfc/lpfc_version.h
index ad24cacfbe10..cc43e9de22cc 100644
--- a/drivers/scsi/lpfc/lpfc_version.h
+++ b/drivers/scsi/lpfc/lpfc_version.h
@@ -18,9 +18,11 @@
 * included with this package.                                     *
 *******************************************************************/
-#define LPFC_DRIVER_VERSION "8.2.7"
+#define LPFC_DRIVER_VERSION "8.2.8"
-#define LPFC_DRIVER_NAME "lpfc"
+#define LPFC_DRIVER_NAME                "lpfc"
+#define LPFC_SP_DRIVER_HANDLER_NAME     "lpfc:sp"
+#define LPFC_FP_DRIVER_HANDLER_NAME     "lpfc:fp"
 #define LPFC_MODULE_DESC "Emulex LightPulse Fibre Channel SCSI driver " \
                LPFC_DRIVER_VERSION
diff --git a/drivers/scsi/lpfc/lpfc_vport.c b/drivers/scsi/lpfc/lpfc_vport.c
index 109f89d98830..a7de1cc02b40 100644
--- a/drivers/scsi/lpfc/lpfc_vport.c
+++ b/drivers/scsi/lpfc/lpfc_vport.c
@@ -34,6 +34,7 @@
 #include <scsi/scsi_transport_fc.h>
 #include "lpfc_hw.h"
 #include "lpfc_sli.h"
+#include "lpfc_nl.h"
 #include "lpfc_disc.h"
 #include "lpfc_scsi.h"
 #include "lpfc.h"
@@ -204,6 +205,77 @@ lpfc_unique_wwpn(struct lpfc_hba *phba, struct lpfc_vport *new_vport)
        return 1;
 }
+/**
+ * lpfc_discovery_wait: Wait for driver discovery to quiesce.
+ * @vport: The virtual port for which this call is being executed.
+ *
+ * This driver calls this routine specifically from lpfc_vport_delete
+ * to enforce a synchronous execution of vport
+ * delete relative to discovery activities.  The
+ * lpfc_vport_delete routine should not return until it
+ * can reasonably guarantee that discovery has quiesced.
+ * Post FDISC LOGO, the driver must wait until its SAN teardown is
+ * complete and all resources recovered before allowing
+ * cleanup.
+ *
+ * This routine does not require any locks held.
+ **/
+static void lpfc_discovery_wait(struct lpfc_vport *vport)
+{
+        struct lpfc_hba *phba = vport->phba;
+        uint32_t wait_flags = 0;
+        unsigned long wait_time_max;
+        unsigned long start_time;
+        wait_flags = FC_RSCN_MODE | FC_RSCN_DISCOVERY | FC_NLP_MORE |
+                     FC_RSCN_DEFERRED | FC_NDISC_ACTIVE | FC_DISC_TMO;
+        /*
+         * The time constraint on this loop is a balance between the
+         * fabric RA_TOV value and dev_loss tmo.  The driver's
+         * devloss_tmo is 10 giving this loop a 3x multiplier minimally.
+         */
+        wait_time_max = msecs_to_jiffies(((phba->fc_ratov * 3) + 3) * 1000);
+        wait_time_max += jiffies;
+        start_time = jiffies;
+        while (time_before(jiffies, wait_time_max)) {
+                if ((vport->num_disc_nodes > 0)    ||
+                    (vport->fc_flag & wait_flags)  ||
+                    ((vport->port_state > LPFC_VPORT_FAILED) &&
+                     (vport->port_state < LPFC_VPORT_READY))) {
+                        lpfc_printf_log(phba, KERN_INFO, LOG_VPORT,
+                                        "1833 Vport discovery quiesce Wait:"
+                                        " vpi x%x state x%x fc_flags x%x"
+                                        " num_nodes x%x, waiting 1000 msecs"
+                                        " total wait msecs x%x\n",
+                                        vport->vpi, vport->port_state,
+                                        vport->fc_flag, vport->num_disc_nodes,
+                                        jiffies_to_msecs(jiffies - start_time));
+                        msleep(1000);
+                } else {
+                        /* Base case.  Wait variants satisfied.  Break out */
+                        lpfc_printf_log(phba, KERN_INFO, LOG_VPORT,
+                                         "1834 Vport discovery quiesced:"
+                                         " vpi x%x state x%x fc_flags x%x"
+                                         " wait msecs x%x\n",
+                                         vport->vpi, vport->port_state,
+                                         vport->fc_flag,
+                                         jiffies_to_msecs(jiffies
+                                                - start_time));
+                        break;
+                }
+        }
+        if (time_after(jiffies, wait_time_max))
+                lpfc_printf_log(phba, KERN_ERR, LOG_VPORT,
+                                "1835 Vport discovery quiesce failed:"
+                                " vpi x%x state x%x fc_flags x%x"
+                                " wait msecs x%x\n",
+                                vport->vpi, vport->port_state,
+                                vport->fc_flag,
+                                jiffies_to_msecs(jiffies - start_time));
+}
 int
 lpfc_vport_create(struct fc_vport *fc_vport, bool disable)
 {
@@ -506,8 +578,12 @@ lpfc_vport_delete(struct fc_vport *fc_vport)
         * initiated after we've disposed of all other resources associated
         * with the port.
         */
-        if (!scsi_host_get(shost) || !scsi_host_get(shost))
+        if (!scsi_host_get(shost))
+                return VPORT_INVAL;
+        if (!scsi_host_get(shost)) {
+                scsi_host_put(shost);
                return VPORT_INVAL;
+        }
        spin_lock_irq(&phba->hbalock);
        vport->load_flag |= FC_UNLOADING;
        spin_unlock_irq(&phba->hbalock);
@@ -597,11 +673,16 @@ lpfc_vport_delete(struct fc_vport *fc_vport)
                }
                vport->unreg_vpi_cmpl = VPORT_INVAL;
                timeout = msecs_to_jiffies(phba->fc_ratov * 2000);
+                if (ndlp->nlp_state == NLP_STE_UNUSED_NODE)
+                        goto skip_logo;
                if (!lpfc_issue_els_npiv_logo(vport, ndlp))
                        while (vport->unreg_vpi_cmpl == VPORT_INVAL && timeout)
                                timeout = schedule_timeout(timeout);
        }
+        if (!(phba->pport->load_flag & FC_UNLOADING))
+                lpfc_discovery_wait(vport);
 skip_logo:
        lpfc_cleanup(vport);
        lpfc_sli_host_down(vport);
@@ -615,8 +696,10 @@ skip_logo:
                 * Completion of unreg_vpi (lpfc_mbx_cmpl_unreg_vpi)
                 * does the scsi_host_put() to release the vport.
                 */
-                lpfc_mbx_unreg_vpi(vport);
+                if (lpfc_mbx_unreg_vpi(vport))
-        }
+                        scsi_host_put(shost);
+        } else
+                scsi_host_put(shost);
        lpfc_free_vpi(phba, vport->vpi);
        vport->work_port_events = 0;
@@ -663,3 +746,82 @@ lpfc_destroy_vport_work_array(struct lpfc_hba *phba, struct lpfc_vport **vports)
                scsi_host_put(lpfc_shost_from_vport(vports[i]));
        kfree(vports);
 }
+/**
+ * lpfc_vport_reset_stat_data: Reset the statistical data for the vport.
+ * @vport: Pointer to vport object.
+ *
+ * This function resets the statistical data for the vport. This function
+ * is called with the host_lock held
+ **/
+void
+lpfc_vport_reset_stat_data(struct lpfc_vport *vport)
+{
+        struct lpfc_nodelist *ndlp = NULL, *next_ndlp = NULL;
+        list_for_each_entry_safe(ndlp, next_ndlp, &vport->fc_nodes, nlp_listp) {
+                if (!NLP_CHK_NODE_ACT(ndlp))
+                        continue;
+                if (ndlp->lat_data)
+                        memset(ndlp->lat_data, 0, LPFC_MAX_BUCKET_COUNT *
+                                sizeof(struct lpfc_scsicmd_bkt));
+        }
+}
+/**
+ * lpfc_alloc_bucket: Allocate data buffer required for collecting
+ *  statistical data.
+ * @vport: Pointer to vport object.
+ *
+ * This function allocates data buffer required for all the FC
+ * nodes of the vport to collect statistical data.
+ **/
+void
+lpfc_alloc_bucket(struct lpfc_vport *vport)
+{
+        struct lpfc_nodelist *ndlp = NULL, *next_ndlp = NULL;
+        list_for_each_entry_safe(ndlp, next_ndlp, &vport->fc_nodes, nlp_listp) {
+                if (!NLP_CHK_NODE_ACT(ndlp))
+                        continue;
+                kfree(ndlp->lat_data);
+                ndlp->lat_data = NULL;
+                if (ndlp->nlp_state == NLP_STE_MAPPED_NODE) {
+                        ndlp->lat_data = kcalloc(LPFC_MAX_BUCKET_COUNT,
+                                         sizeof(struct lpfc_scsicmd_bkt),
+                                         GFP_ATOMIC);
+                        if (!ndlp->lat_data)
+                                lpfc_printf_vlog(vport, KERN_ERR, LOG_NODE,
+                                        "0287 lpfc_alloc_bucket failed to "
+                                        "allocate statistical data buffer DID "
+                                        "0x%x\n", ndlp->nlp_DID);
+                }
+        }
+}
+/**
+ * lpfc_free_bucket: Free data buffer required for collecting
+ *  statistical data.
+ * @vport: Pointer to vport object.
+ *
+ * Th function frees statistical data buffer of all the FC
+ * nodes of the vport.
+ **/
+void
+lpfc_free_bucket(struct lpfc_vport *vport)
+{
+        struct lpfc_nodelist *ndlp = NULL, *next_ndlp = NULL;
+        list_for_each_entry_safe(ndlp, next_ndlp, &vport->fc_nodes, nlp_listp) {
+                if (!NLP_CHK_NODE_ACT(ndlp))
+                        continue;
+                kfree(ndlp->lat_data);
+                ndlp->lat_data = NULL;
+        }
+}
diff --git a/drivers/scsi/lpfc/lpfc_vport.h b/drivers/scsi/lpfc/lpfc_vport.h
index 96c445333b69..90828340acea 100644
--- a/drivers/scsi/lpfc/lpfc_vport.h
+++ b/drivers/scsi/lpfc/lpfc_vport.h
@@ -112,4 +112,8 @@ struct vport_cmd_tag {
 void lpfc_vport_set_state(struct lpfc_vport *vport,
                          enum fc_vport_state new_state);
+void lpfc_vport_reset_stat_data(struct lpfc_vport *);
+void lpfc_alloc_bucket(struct lpfc_vport *);
+void lpfc_free_bucket(struct lpfc_vport *);
 #endif /* H_LPFC_VPORT */
diff --git a/drivers/scsi/megaraid.c b/drivers/scsi/megaraid.c
index 28c9da7d4a5c..7dc62deb4087 100644
--- a/drivers/scsi/megaraid.c
+++ b/drivers/scsi/megaraid.c
@@ -4402,6 +4402,10 @@ mega_internal_command(adapter_t *adapter, megacmd_t *mc, mega_passthru *pthru)
        scb_t   *scb;
        int     rval;
+        scmd = scsi_allocate_command(GFP_KERNEL);
+        if (!scmd)
+                return -ENOMEM;
        /*
         * The internal commands share one command id and hence are
         * serialized. This is so because we want to reserve maximum number of
@@ -4412,12 +4416,11 @@ mega_internal_command(adapter_t *adapter, megacmd_t *mc, mega_passthru *pthru)
        scb = &adapter->int_scb;
        memset(scb, 0, sizeof(scb_t));
-        scmd = &adapter->int_scmd;
-        memset(scmd, 0, sizeof(Scsi_Cmnd));
        sdev = kzalloc(sizeof(struct scsi_device), GFP_KERNEL);
        scmd->device = sdev;
+        memset(adapter->int_cdb, 0, sizeof(adapter->int_cdb));
+        scmd->cmnd = adapter->int_cdb;
        scmd->device->host = adapter->host;
        scmd->host_scribble = (void *)scb;
        scmd->cmnd[0] = MEGA_INTERNAL_CMD;
@@ -4456,6 +4459,8 @@ mega_internal_command(adapter_t *adapter, megacmd_t *mc, mega_passthru *pthru)
        mutex_unlock(&adapter->int_mtx);
+        scsi_free_command(GFP_KERNEL, scmd);
        return rval;
 }
diff --git a/drivers/scsi/megaraid.h b/drivers/scsi/megaraid.h
index ee70bd4ae4ba..795201fa0b48 100644
--- a/drivers/scsi/megaraid.h
+++ b/drivers/scsi/megaraid.h
@@ -888,8 +888,8 @@ typedef struct {
        u8      sglen;  /* f/w supported scatter-gather list length */
+        unsigned char int_cdb[MAX_COMMAND_SIZE];
        scb_t                   int_scb;
-        Scsi_Cmnd               int_scmd;
        struct mutex            int_mtx;        /* To synchronize the internal
                                                commands */
        struct completion       int_waitq;      /* wait queue for internal
diff --git a/drivers/scsi/megaraid/megaraid_sas.c b/drivers/scsi/megaraid/megaraid_sas.c
index 97b763378e7d..a454f94623d7 100644
--- a/drivers/scsi/megaraid/megaraid_sas.c
+++ b/drivers/scsi/megaraid/megaraid_sas.c
@@ -1167,7 +1167,7 @@ static int megasas_generic_reset(struct scsi_cmnd *scmd)
 * cmd has not been completed within the timeout period.
 */
 static enum
-scsi_eh_timer_return megasas_reset_timer(struct scsi_cmnd *scmd)
+blk_eh_timer_return megasas_reset_timer(struct scsi_cmnd *scmd)
 {
        struct megasas_cmd *cmd = (struct megasas_cmd *)scmd->SCp.ptr;
        struct megasas_instance *instance;
@@ -1175,7 +1175,7 @@ scsi_eh_timer_return megasas_reset_timer(struct scsi_cmnd *scmd)
        if (time_after(jiffies, scmd->jiffies_at_alloc +
                                (MEGASAS_DEFAULT_CMD_TIMEOUT * 2) * HZ)) {
-                return EH_NOT_HANDLED;
+                return BLK_EH_NOT_HANDLED;
        }
        instance = cmd->instance;
@@ -1189,7 +1189,7 @@ scsi_eh_timer_return megasas_reset_timer(struct scsi_cmnd *scmd)
                spin_unlock_irqrestore(instance->host->host_lock, flags);
        }
-        return EH_RESET_TIMER;
+        return BLK_EH_RESET_TIMER;
 }
 /**
@@ -2988,17 +2988,6 @@ static int megasas_mgmt_open(struct inode *inode, struct file *filep)
 }
 /**
- * megasas_mgmt_release - char node "release" entry point
- */
-static int megasas_mgmt_release(struct inode *inode, struct file *filep)
-{
-        filep->private_data = NULL;
-        fasync_helper(-1, filep, 0, &megasas_async_queue);
-        return 0;
-}
-/**
 * megasas_mgmt_fasync -        Async notifier registration from applications
 *
 * This function adds the calling process to a driver global queue. When an
@@ -3345,7 +3334,6 @@ megasas_mgmt_compat_ioctl(struct file *file, unsigned int cmd,
 static const struct file_operations megasas_mgmt_fops = {
        .owner = THIS_MODULE,
        .open = megasas_mgmt_open,
-        .release = megasas_mgmt_release,
        .fasync = megasas_mgmt_fasync,
        .unlocked_ioctl = megasas_mgmt_ioctl,
 #ifdef CONFIG_COMPAT
diff --git a/drivers/scsi/ncr53c8xx.c b/drivers/scsi/ncr53c8xx.c
index c57c94c0ffd2..3b7240e40819 100644
--- a/drivers/scsi/ncr53c8xx.c
+++ b/drivers/scsi/ncr53c8xx.c
@@ -4170,8 +4170,8 @@ static int ncr_queue_command (struct ncb *np, struct scsi_cmnd *cmd)
        **
        **----------------------------------------------------
        */
-        if (np->settle_time && cmd->timeout_per_command >= HZ) {
+        if (np->settle_time && cmd->request->timeout >= HZ) {
-                u_long tlimit = jiffies + cmd->timeout_per_command - HZ;
+                u_long tlimit = jiffies + cmd->request->timeout - HZ;
                if (time_after(np->settle_time, tlimit))
                        np->settle_time = tlimit;
        }
diff --git a/drivers/scsi/osst.c b/drivers/scsi/osst.c
index 1c79f9794f4e..0ea78d9a37db 100644
--- a/drivers/scsi/osst.c
+++ b/drivers/scsi/osst.c
@@ -5708,7 +5708,8 @@ static int osst_sysfs_add(dev_t dev, struct device *device, struct osst_tape * S
        struct device *osst_member;
        int err;
-        osst_member = device_create_drvdata(osst_sysfs_class, device, dev, STp, "%s", name);
+        osst_member = device_create(osst_sysfs_class, device, dev, STp,
+                                    "%s", name);
        if (IS_ERR(osst_member)) {
                printk(KERN_WARNING "osst :W: Unable to add sysfs class member %s\n", name);
                return PTR_ERR(osst_member);
diff --git a/drivers/scsi/pcmcia/aha152x_stub.c b/drivers/scsi/pcmcia/aha152x_stub.c
index 2dd0dc9a9aed..165ff884f48e 100644
--- a/drivers/scsi/pcmcia/aha152x_stub.c
+++ b/drivers/scsi/pcmcia/aha152x_stub.c
@@ -140,44 +140,41 @@ static void aha152x_detach(struct pcmcia_device *link)
 #define CS_CHECK(fn, ret) \
 do { last_fn = (fn); if ((last_ret = (ret)) != 0) goto cs_failed; } while (0)
+static int aha152x_config_check(struct pcmcia_device *p_dev,
+                                cistpl_cftable_entry_t *cfg,
+                                cistpl_cftable_entry_t *dflt,
+                                unsigned int vcc,
+                                void *priv_data)
+{
+        /* For New Media T&J, look for a SCSI window */
+        if (cfg->io.win[0].len >= 0x20)
+                p_dev->io.BasePort1 = cfg->io.win[0].base;
+        else if ((cfg->io.nwin > 1) &&
+                 (cfg->io.win[1].len >= 0x20))
+                p_dev->io.BasePort1 = cfg->io.win[1].base;
+        if ((cfg->io.nwin > 0) &&
+            (p_dev->io.BasePort1 < 0xffff)) {
+                if (!pcmcia_request_io(p_dev, &p_dev->io))
+                        return 0;
+        }
+        return -EINVAL;
+}
 static int aha152x_config_cs(struct pcmcia_device *link)
 {
    scsi_info_t *info = link->priv;
    struct aha152x_setup s;
-    tuple_t tuple;
+    int last_ret, last_fn;
-    cisparse_t parse;
-    int i, last_ret, last_fn;
-    u_char tuple_data[64];
    struct Scsi_Host *host;
-    
    DEBUG(0, "aha152x_config(0x%p)\n", link);
-    tuple.TupleData = tuple_data;
+    last_ret = pcmcia_loop_config(link, aha152x_config_check, NULL);
-    tuple.TupleDataMax = 64;
+    if (last_ret) {
-    tuple.TupleOffset = 0;
+        cs_error(link, RequestIO, last_ret);
-    tuple.DesiredTuple = CISTPL_CFTABLE_ENTRY;
+        goto failed;
-    tuple.Attributes = 0;
-    CS_CHECK(GetFirstTuple, pcmcia_get_first_tuple(link, &tuple));
-    while (1) {
-        if (pcmcia_get_tuple_data(link, &tuple) != 0 ||
-                pcmcia_parse_tuple(link, &tuple, &parse) != 0)
-            goto next_entry;
-        /* For New Media T&J, look for a SCSI window */
-        if (parse.cftable_entry.io.win[0].len >= 0x20)
-            link->io.BasePort1 = parse.cftable_entry.io.win[0].base;
-        else if ((parse.cftable_entry.io.nwin > 1) &&
-                 (parse.cftable_entry.io.win[1].len >= 0x20))
-            link->io.BasePort1 = parse.cftable_entry.io.win[1].base;
-        if ((parse.cftable_entry.io.nwin > 0) &&
-            (link->io.BasePort1 < 0xffff)) {
-            link->conf.ConfigIndex = parse.cftable_entry.index;
-            i = pcmcia_request_io(link, &link->io);
-            if (i == CS_SUCCESS) break;
-        }
-    next_entry:
-        CS_CHECK(GetNextTuple, pcmcia_get_next_tuple(link, &tuple));
    }
-    
    CS_CHECK(RequestIRQ, pcmcia_request_irq(link, &link->irq));
    CS_CHECK(RequestConfiguration, pcmcia_request_configuration(link, &link->conf));
    
@@ -208,6 +205,7 @@ static int aha152x_config_cs(struct pcmcia_device *link)
 cs_failed:
    cs_error(link, last_fn, last_ret);
+failed:
    aha152x_release_cs(link);
    return -ENODEV;
 }
diff --git a/drivers/scsi/pcmcia/fdomain_stub.c b/drivers/scsi/pcmcia/fdomain_stub.c
index d8b99351b053..06254f46a0dd 100644
--- a/drivers/scsi/pcmcia/fdomain_stub.c
+++ b/drivers/scsi/pcmcia/fdomain_stub.c
@@ -123,34 +123,30 @@ static void fdomain_detach(struct pcmcia_device *link)
 #define CS_CHECK(fn, ret) \
 do { last_fn = (fn); if ((last_ret = (ret)) != 0) goto cs_failed; } while (0)
+static int fdomain_config_check(struct pcmcia_device *p_dev,
+                                cistpl_cftable_entry_t *cfg,
+                                cistpl_cftable_entry_t *dflt,
+                                unsigned int vcc,
+                                void *priv_data)
+{
+        p_dev->io.BasePort1 = cfg->io.win[0].base;
+        return pcmcia_request_io(p_dev, &p_dev->io);
+}
 static int fdomain_config(struct pcmcia_device *link)
 {
    scsi_info_t *info = link->priv;
-    tuple_t tuple;
+    int last_ret, last_fn;
-    cisparse_t parse;
-    int i, last_ret, last_fn;
-    u_char tuple_data[64];
    char str[22];
    struct Scsi_Host *host;
    DEBUG(0, "fdomain_config(0x%p)\n", link);
-    tuple.TupleData = tuple_data;
+    last_ret = pcmcia_loop_config(link, fdomain_config_check, NULL);
-    tuple.TupleDataMax = 64;
+    if (last_ret) {
-    tuple.TupleOffset = 0;
+            cs_error(link, RequestIO, last_ret);
+            goto failed;
-    tuple.DesiredTuple = CISTPL_CFTABLE_ENTRY;
-    CS_CHECK(GetFirstTuple, pcmcia_get_first_tuple(link, &tuple));
-    while (1) {
-        if (pcmcia_get_tuple_data(link, &tuple) != 0 ||
-                pcmcia_parse_tuple(link, &tuple, &parse) != 0)
-            goto next_entry;
-        link->conf.ConfigIndex = parse.cftable_entry.index;
-        link->io.BasePort1 = parse.cftable_entry.io.win[0].base;
-        i = pcmcia_request_io(link, &link->io);
-        if (i == CS_SUCCESS) break;
-    next_entry:
-        CS_CHECK(GetNextTuple, pcmcia_get_next_tuple(link, &tuple));
    }
    CS_CHECK(RequestIRQ, pcmcia_request_irq(link, &link->irq));
@@ -181,6 +177,7 @@ static int fdomain_config(struct pcmcia_device *link)
 cs_failed:
    cs_error(link, last_fn, last_ret);
+failed:
    fdomain_release(link);
    return -ENODEV;
 } /* fdomain_config */
diff --git a/drivers/scsi/pcmcia/nsp_cs.c b/drivers/scsi/pcmcia/nsp_cs.c
index 24e6cb8396e3..11a61ea8d5d9 100644
--- a/drivers/scsi/pcmcia/nsp_cs.c
+++ b/drivers/scsi/pcmcia/nsp_cs.c
@@ -1606,133 +1606,129 @@ static void nsp_cs_detach(struct pcmcia_device *link)
    is received, to configure the PCMCIA socket, and to make the
    ethernet device available to the system.
 ======================================================================*/
-#define CS_CHECK(fn, ret) \
-do { last_fn = (fn); if ((last_ret = (ret)) != 0) goto cs_failed; } while (0)
-/*====================================================================*/
-static int nsp_cs_config(struct pcmcia_device *link)
-{
-        int               ret;
-        scsi_info_t      *info   = link->priv;
-        tuple_t           tuple;
-        cisparse_t        parse;
-        int               last_ret, last_fn;
-        unsigned char     tuple_data[64];
-        config_info_t     conf;
-        win_req_t         req;
-        memreq_t          map;
-        cistpl_cftable_entry_t dflt = { 0 };
-        struct Scsi_Host *host;
-        nsp_hw_data      *data = &nsp_data_base;
-        nsp_dbg(NSP_DEBUG_INIT, "in");
-        tuple.Attributes      = 0;
-        tuple.TupleData       = tuple_data;
-        tuple.TupleDataMax    = sizeof(tuple_data);
-        tuple.TupleOffset     = 0;
-        /* Look up the current Vcc */
-        CS_CHECK(GetConfigurationInfo, pcmcia_get_configuration_info(link, &conf));
-        tuple.DesiredTuple = CISTPL_CFTABLE_ENTRY;
+struct nsp_cs_configdata {
-        CS_CHECK(GetFirstTuple, pcmcia_get_first_tuple(link, &tuple));
+        nsp_hw_data             *data;
-        while (1) {
+        win_req_t               req;
-                cistpl_cftable_entry_t *cfg = &(parse.cftable_entry);
+};
-                if (pcmcia_get_tuple_data(link, &tuple) != 0 ||
+static int nsp_cs_config_check(struct pcmcia_device *p_dev,
-                                pcmcia_parse_tuple(link, &tuple, &parse) != 0)
+                               cistpl_cftable_entry_t *cfg,
-                        goto next_entry;
+                               cistpl_cftable_entry_t *dflt,
+                               unsigned int vcc,
+                               void *priv_data)
+{
+        struct nsp_cs_configdata *cfg_mem = priv_data;
-                if (cfg->flags & CISTPL_CFTABLE_DEFAULT) { dflt = *cfg; }
+        if (cfg->index == 0)
-                if (cfg->index == 0) { goto next_entry; }
+                return -ENODEV;
-                link->conf.ConfigIndex = cfg->index;
-                /* Does this card need audio output? */
+        /* Does this card need audio output? */
-                if (cfg->flags & CISTPL_CFTABLE_AUDIO) {
+        if (cfg->flags & CISTPL_CFTABLE_AUDIO) {
-                        link->conf.Attributes |= CONF_ENABLE_SPKR;
+                p_dev->conf.Attributes |= CONF_ENABLE_SPKR;
-                        link->conf.Status = CCSR_AUDIO_ENA;
+                p_dev->conf.Status = CCSR_AUDIO_ENA;
-                }
+        }
-                /* Use power settings for Vcc and Vpp if present */
+        /* Use power settings for Vcc and Vpp if present */
-                /*  Note that the CIS values need to be rescaled */
+        /*  Note that the CIS values need to be rescaled */
-                if (cfg->vcc.present & (1<<CISTPL_POWER_VNOM)) {
+        if (cfg->vcc.present & (1<<CISTPL_POWER_VNOM)) {
-                        if (conf.Vcc != cfg->vcc.param[CISTPL_POWER_VNOM]/10000) {
+                if (vcc != cfg->vcc.param[CISTPL_POWER_VNOM]/10000)
-                                goto next_entry;
+                        return -ENODEV;
-                        }
+                else if (dflt->vcc.present & (1<<CISTPL_POWER_VNOM)) {
-                } else if (dflt.vcc.present & (1<<CISTPL_POWER_VNOM)) {
+                        if (vcc != dflt->vcc.param[CISTPL_POWER_VNOM]/10000)
-                        if (conf.Vcc != dflt.vcc.param[CISTPL_POWER_VNOM]/10000) {
+                                return -ENODEV;
-                                goto next_entry;
-                        }
                }
                if (cfg->vpp1.present & (1 << CISTPL_POWER_VNOM)) {
-                        link->conf.Vpp =
+                        p_dev->conf.Vpp =
                                cfg->vpp1.param[CISTPL_POWER_VNOM] / 10000;
-                } else if (dflt.vpp1.present & (1 << CISTPL_POWER_VNOM)) {
+                } else if (dflt->vpp1.present & (1 << CISTPL_POWER_VNOM)) {
-                        link->conf.Vpp =
+                        p_dev->conf.Vpp =
-                                dflt.vpp1.param[CISTPL_POWER_VNOM] / 10000;
+                                dflt->vpp1.param[CISTPL_POWER_VNOM] / 10000;
                }
                /* Do we need to allocate an interrupt? */
-                if (cfg->irq.IRQInfo1 || dflt.irq.IRQInfo1) {
+                if (cfg->irq.IRQInfo1 || dflt->irq.IRQInfo1)
-                        link->conf.Attributes |= CONF_ENABLE_IRQ;
+                        p_dev->conf.Attributes |= CONF_ENABLE_IRQ;
-                }
                /* IO window settings */
-                link->io.NumPorts1 = link->io.NumPorts2 = 0;
+                p_dev->io.NumPorts1 = p_dev->io.NumPorts2 = 0;
-                if ((cfg->io.nwin > 0) || (dflt.io.nwin > 0)) {
+                if ((cfg->io.nwin > 0) || (dflt->io.nwin > 0)) {
-                        cistpl_io_t *io = (cfg->io.nwin) ? &cfg->io : &dflt.io;
+                        cistpl_io_t *io = (cfg->io.nwin) ? &cfg->io : &dflt->io;
-                        link->io.Attributes1 = IO_DATA_PATH_WIDTH_AUTO;
+                        p_dev->io.Attributes1 = IO_DATA_PATH_WIDTH_AUTO;
                        if (!(io->flags & CISTPL_IO_8BIT))
-                                link->io.Attributes1 = IO_DATA_PATH_WIDTH_16;
+                                p_dev->io.Attributes1 = IO_DATA_PATH_WIDTH_16;
                        if (!(io->flags & CISTPL_IO_16BIT))
-                                link->io.Attributes1 = IO_DATA_PATH_WIDTH_8;
+                                p_dev->io.Attributes1 = IO_DATA_PATH_WIDTH_8;
-                        link->io.IOAddrLines = io->flags & CISTPL_IO_LINES_MASK;
+                        p_dev->io.IOAddrLines = io->flags & CISTPL_IO_LINES_MASK;
-                        link->io.BasePort1 = io->win[0].base;
+                        p_dev->io.BasePort1 = io->win[0].base;
-                        link->io.NumPorts1 = io->win[0].len;
+                        p_dev->io.NumPorts1 = io->win[0].len;
                        if (io->nwin > 1) {
-                                link->io.Attributes2 = link->io.Attributes1;
+                                p_dev->io.Attributes2 = p_dev->io.Attributes1;
-                                link->io.BasePort2 = io->win[1].base;
+                                p_dev->io.BasePort2 = io->win[1].base;
-                                link->io.NumPorts2 = io->win[1].len;
+                                p_dev->io.NumPorts2 = io->win[1].len;
                        }
                        /* This reserves IO space but doesn't actually enable it */
-                        if (pcmcia_request_io(link, &link->io) != 0)
+                        if (pcmcia_request_io(p_dev, &p_dev->io) != 0)
                                goto next_entry;
                }
-                if ((cfg->mem.nwin > 0) || (dflt.mem.nwin > 0)) {
+                if ((cfg->mem.nwin > 0) || (dflt->mem.nwin > 0)) {
-                        cistpl_mem_t *mem =
+                        memreq_t        map;
-                                (cfg->mem.nwin) ? &cfg->mem : &dflt.mem;
+                        cistpl_mem_t    *mem =
-                        req.Attributes = WIN_DATA_WIDTH_16|WIN_MEMORY_TYPE_CM;
+                                (cfg->mem.nwin) ? &cfg->mem : &dflt->mem;
-                        req.Attributes |= WIN_ENABLE;
+                        cfg_mem->req.Attributes = WIN_DATA_WIDTH_16|WIN_MEMORY_TYPE_CM;
-                        req.Base = mem->win[0].host_addr;
+                        cfg_mem->req.Attributes |= WIN_ENABLE;
-                        req.Size = mem->win[0].len;
+                        cfg_mem->req.Base = mem->win[0].host_addr;
-                        if (req.Size < 0x1000) {
+                        cfg_mem->req.Size = mem->win[0].len;
-                                req.Size = 0x1000;
+                        if (cfg_mem->req.Size < 0x1000)
-                        }
+                                cfg_mem->req.Size = 0x1000;
-                        req.AccessSpeed = 0;
+                        cfg_mem->req.AccessSpeed = 0;
-                        if (pcmcia_request_window(&link, &req, &link->win) != 0)
+                        if (pcmcia_request_window(&p_dev, &cfg_mem->req, &p_dev->win) != 0)
                                goto next_entry;
                        map.Page = 0; map.CardOffset = mem->win[0].card_addr;
-                        if (pcmcia_map_mem_page(link->win, &map) != 0)
+                        if (pcmcia_map_mem_page(p_dev->win, &map) != 0)
                                goto next_entry;
-                        data->MmioAddress = (unsigned long)ioremap_nocache(req.Base, req.Size);
+                        cfg_mem->data->MmioAddress = (unsigned long) ioremap_nocache(cfg_mem->req.Base, cfg_mem->req.Size);
-                        data->MmioLength  = req.Size;
+                        cfg_mem->data->MmioLength  = cfg_mem->req.Size;
                }
                /* If we got this far, we're cool! */
-                break;
+                return 0;
-        next_entry:
-                nsp_dbg(NSP_DEBUG_INIT, "next");
-                pcmcia_disable_device(link);
-                CS_CHECK(GetNextTuple, pcmcia_get_next_tuple(link, &tuple));
        }
+next_entry:
+        nsp_dbg(NSP_DEBUG_INIT, "next");
+        pcmcia_disable_device(p_dev);
+        return -ENODEV;
+}
+static int nsp_cs_config(struct pcmcia_device *link)
+{
+        int               ret;
+        scsi_info_t      *info   = link->priv;
+        struct nsp_cs_configdata *cfg_mem;
+        struct Scsi_Host *host;
+        nsp_hw_data      *data = &nsp_data_base;
+        nsp_dbg(NSP_DEBUG_INIT, "in");
+        cfg_mem = kzalloc(sizeof(cfg_mem), GFP_KERNEL);
+        if (!cfg_mem)
+                return -ENOMEM;
+        cfg_mem->data = data;
+        ret = pcmcia_loop_config(link, nsp_cs_config_check, cfg_mem);
+                goto cs_failed;
        if (link->conf.Attributes & CONF_ENABLE_IRQ) {
-                CS_CHECK(RequestIRQ, pcmcia_request_irq(link, &link->irq));
+                if (pcmcia_request_irq(link, &link->irq))
+                        goto cs_failed;
        }
-        CS_CHECK(RequestConfiguration, pcmcia_request_configuration(link, &link->conf));
+        ret = pcmcia_request_configuration(link, &link->conf);
+        if (ret)
+                goto cs_failed;
        if (free_ports) {
                if (link->io.BasePort1) {
@@ -1790,20 +1786,20 @@ static int nsp_cs_config(struct pcmcia_device *link)
                printk(" & 0x%04x-0x%04x", link->io.BasePort2,
                       link->io.BasePort2+link->io.NumPorts2-1);
        if (link->win)
-                printk(", mem 0x%06lx-0x%06lx", req.Base,
+                printk(", mem 0x%06lx-0x%06lx", cfg_mem->req.Base,
-                       req.Base+req.Size-1);
+                       cfg_mem->req.Base+cfg_mem->req.Size-1);
        printk("\n");
+        kfree(cfg_mem);
        return 0;
 cs_failed:
        nsp_dbg(NSP_DEBUG_INIT, "config fail");
-        cs_error(link, last_fn, last_ret);
        nsp_cs_release(link);
+        kfree(cfg_mem);
        return -ENODEV;
 } /* nsp_cs_config */
-#undef CS_CHECK
 /*======================================================================
diff --git a/drivers/scsi/pcmcia/qlogic_stub.c b/drivers/scsi/pcmcia/qlogic_stub.c
index 67c5a58d17df..20c3e5e6d88a 100644
--- a/drivers/scsi/pcmcia/qlogic_stub.c
+++ b/drivers/scsi/pcmcia/qlogic_stub.c
@@ -195,39 +195,33 @@ static void qlogic_detach(struct pcmcia_device *link)
 #define CS_CHECK(fn, ret) \
 do { last_fn = (fn); if ((last_ret = (ret)) != 0) goto cs_failed; } while (0)
+static int qlogic_config_check(struct pcmcia_device *p_dev,
+                               cistpl_cftable_entry_t *cfg,
+                               cistpl_cftable_entry_t *dflt,
+                               unsigned int vcc,
+                               void *priv_data)
+{
+        p_dev->io.BasePort1 = cfg->io.win[0].base;
+        p_dev->io.NumPorts1 = cfg->io.win[0].len;
+        if (p_dev->io.BasePort1 == 0)
+                return -ENODEV;
+        return pcmcia_request_io(p_dev, &p_dev->io);
+}
 static int qlogic_config(struct pcmcia_device * link)
 {
        scsi_info_t *info = link->priv;
-        tuple_t tuple;
+        int last_ret, last_fn;
-        cisparse_t parse;
-        int i, last_ret, last_fn;
-        unsigned short tuple_data[32];
        struct Scsi_Host *host;
        DEBUG(0, "qlogic_config(0x%p)\n", link);
-        info->manf_id = link->manf_id;
+        last_ret = pcmcia_loop_config(link, qlogic_config_check, NULL);
+        if (last_ret) {
-        tuple.TupleData = (cisdata_t *) tuple_data;
+                cs_error(link, RequestIO, last_ret);
-        tuple.TupleDataMax = 64;
+                goto failed;
-        tuple.TupleOffset = 0;
-        tuple.DesiredTuple = CISTPL_CFTABLE_ENTRY;
-        CS_CHECK(GetFirstTuple, pcmcia_get_first_tuple(link, &tuple));
-        while (1) {
-                if (pcmcia_get_tuple_data(link, &tuple) != 0 ||
-                                pcmcia_parse_tuple(link, &tuple, &parse) != 0)
-                        goto next_entry;
-                link->conf.ConfigIndex = parse.cftable_entry.index;
-                link->io.BasePort1 = parse.cftable_entry.io.win[0].base;
-                link->io.NumPorts1 = parse.cftable_entry.io.win[0].len;
-                if (link->io.BasePort1 != 0) {
-                        i = pcmcia_request_io(link, &link->io);
-                        if (i == CS_SUCCESS)
-                                break;
-                }
-              next_entry:
-                CS_CHECK(GetNextTuple, pcmcia_get_next_tuple(link, &tuple));
        }
        CS_CHECK(RequestIRQ, pcmcia_request_irq(link, &link->irq));
@@ -262,6 +256,7 @@ static int qlogic_config(struct pcmcia_device * link)
 cs_failed:
        cs_error(link, last_fn, last_ret);
        pcmcia_disable_device(link);
+failed:
        return -ENODEV;
 }                               /* qlogic_config */
diff --git a/drivers/scsi/pcmcia/sym53c500_cs.c b/drivers/scsi/pcmcia/sym53c500_cs.c
index 0be232b58ffb..b330c11a1752 100644
--- a/drivers/scsi/pcmcia/sym53c500_cs.c
+++ b/drivers/scsi/pcmcia/sym53c500_cs.c
@@ -700,15 +700,27 @@ static struct scsi_host_template sym53c500_driver_template = {
 #define CS_CHECK(fn, ret) \
 do { last_fn = (fn); if ((last_ret = (ret)) != 0) goto cs_failed; } while (0)
+static int SYM53C500_config_check(struct pcmcia_device *p_dev,
+                                  cistpl_cftable_entry_t *cfg,
+                                  cistpl_cftable_entry_t *dflt,
+                                  unsigned int vcc,
+                                  void *priv_data)
+{
+        p_dev->io.BasePort1 = cfg->io.win[0].base;
+        p_dev->io.NumPorts1 = cfg->io.win[0].len;
+        if (p_dev->io.BasePort1 == 0)
+                return -ENODEV;
+        return pcmcia_request_io(p_dev, &p_dev->io);
+}
 static int
 SYM53C500_config(struct pcmcia_device *link)
 {
        struct scsi_info_t *info = link->priv;
-        tuple_t tuple;
+        int last_ret, last_fn;
-        cisparse_t parse;
-        int i, last_ret, last_fn;
        int irq_level, port_base;
-        unsigned short tuple_data[32];
        struct Scsi_Host *host;
        struct scsi_host_template *tpnt = &sym53c500_driver_template;
        struct sym53c500_data *data;
@@ -717,27 +729,10 @@ SYM53C500_config(struct pcmcia_device *link)
        info->manf_id = link->manf_id;
-        tuple.TupleData = (cisdata_t *)tuple_data;
+        last_ret = pcmcia_loop_config(link, SYM53C500_config_check, NULL);
-        tuple.TupleDataMax = 64;
+        if (last_ret) {
-        tuple.TupleOffset = 0;
+                cs_error(link, RequestIO, last_ret);
+                goto failed;
-        tuple.DesiredTuple = CISTPL_CFTABLE_ENTRY;
-        CS_CHECK(GetFirstTuple, pcmcia_get_first_tuple(link, &tuple));
-        while (1) {
-                if (pcmcia_get_tuple_data(link, &tuple) != 0 ||
-                    pcmcia_parse_tuple(link, &tuple, &parse) != 0)
-                        goto next_entry;
-                link->conf.ConfigIndex = parse.cftable_entry.index;
-                link->io.BasePort1 = parse.cftable_entry.io.win[0].base;
-                link->io.NumPorts1 = parse.cftable_entry.io.win[0].len;
-                if (link->io.BasePort1 != 0) {
-                        i = pcmcia_request_io(link, &link->io);
-                        if (i == CS_SUCCESS)
-                                break;
-                }
-next_entry:
-                CS_CHECK(GetNextTuple, pcmcia_get_next_tuple(link, &tuple));
        }
        CS_CHECK(RequestIRQ, pcmcia_request_irq(link, &link->irq));
@@ -831,6 +826,7 @@ err_release:
 cs_failed:
        cs_error(link, last_fn, last_ret);
+failed:
        SYM53C500_release(link);
        return -ENODEV;
 } /* SYM53C500_config */
diff --git a/drivers/scsi/qla1280.c b/drivers/scsi/qla1280.c
index 37f9ba0cd798..b6cd12b2e996 100644
--- a/drivers/scsi/qla1280.c
+++ b/drivers/scsi/qla1280.c
@@ -2845,7 +2845,7 @@ qla1280_64bit_start_scsi(struct scsi_qla_host *ha, struct srb * sp)
        memset(((char *)pkt + 8), 0, (REQUEST_ENTRY_SIZE - 8));
        /* Set ISP command timeout. */
-        pkt->timeout = cpu_to_le16(cmd->timeout_per_command/HZ);
+        pkt->timeout = cpu_to_le16(cmd->request->timeout/HZ);
        /* Set device target ID and LUN */
        pkt->lun = SCSI_LUN_32(cmd);
@@ -3114,7 +3114,7 @@ qla1280_32bit_start_scsi(struct scsi_qla_host *ha, struct srb * sp)
        memset(((char *)pkt + 8), 0, (REQUEST_ENTRY_SIZE - 8));
        /* Set ISP command timeout. */
-        pkt->timeout = cpu_to_le16(cmd->timeout_per_command/HZ);
+        pkt->timeout = cpu_to_le16(cmd->request->timeout/HZ);
        /* Set device target ID and LUN */
        pkt->lun = SCSI_LUN_32(cmd);
diff --git a/drivers/scsi/qla2xxx/qla_attr.c b/drivers/scsi/qla2xxx/qla_attr.c
index 45e7dcb4b34d..ed731968f15f 100644
--- a/drivers/scsi/qla2xxx/qla_attr.c
+++ b/drivers/scsi/qla2xxx/qla_attr.c
@@ -292,10 +292,11 @@ qla2x00_sysfs_write_optrom_ctl(struct kobject *kobj,
                valid = 0;
                if (ha->optrom_size == OPTROM_SIZE_2300 && start == 0)
                        valid = 1;
-                else if (start == (FA_BOOT_CODE_ADDR*4) ||
+                else if (start == (ha->flt_region_boot * 4) ||
-                    start == (FA_RISC_CODE_ADDR*4))
+                    start == (ha->flt_region_fw * 4))
                        valid = 1;
-                else if (IS_QLA25XX(ha) && start == (FA_VPD_NVRAM_ADDR*4))
+                else if (IS_QLA25XX(ha) &&
+                    start == (ha->flt_region_vpd_nvram * 4))
                    valid = 1;
                if (!valid) {
                        qla_printk(KERN_WARNING, ha,
@@ -1005,7 +1006,6 @@ qla2x00_terminate_rport_io(struct fc_rport *rport)
        }
        qla2x00_abort_fcport_cmds(fcport);
-        scsi_target_unblock(&rport->dev);
 }
 static int
@@ -1065,6 +1065,8 @@ qla2x00_get_fc_host_stats(struct Scsi_Host *shost)
                pfc_host_stat->dumped_frames = stats->dumped_frames;
                pfc_host_stat->nos_count = stats->nos_rcvd;
        }
+        pfc_host_stat->fcp_input_megabytes = ha->qla_stats.input_bytes >> 20;
+        pfc_host_stat->fcp_output_megabytes = ha->qla_stats.output_bytes >> 20;
 done_free:
        dma_pool_free(ha->s_dma_pool, stats, stats_dma);
diff --git a/drivers/scsi/qla2xxx/qla_def.h b/drivers/scsi/qla2xxx/qla_def.h
index 94a720eabfd8..b97194096d8e 100644
--- a/drivers/scsi/qla2xxx/qla_def.h
+++ b/drivers/scsi/qla2xxx/qla_def.h
@@ -25,7 +25,6 @@
 #include <linux/firmware.h>
 #include <linux/aer.h>
 #include <linux/mutex.h>
-#include <linux/semaphore.h>
 #include <scsi/scsi.h>
 #include <scsi/scsi_host.h>
@@ -2109,7 +2108,7 @@ struct scsi_qla_host;
 struct qla_msix_entry {
        int have_irq;
-        uint16_t msix_vector;
+        uint32_t msix_vector;
        uint16_t msix_entry;
 };
@@ -2157,6 +2156,8 @@ struct qla_chip_state_84xx {
 struct qla_statistics {
        uint32_t total_isp_aborts;
+        uint64_t input_bytes;
+        uint64_t output_bytes;
 };
 /*
@@ -2238,6 +2239,7 @@ typedef struct scsi_qla_host {
 #define FCPORT_UPDATE_NEEDED    27
 #define VP_DPC_NEEDED           28      /* wake up for VP dpc handling */
 #define UNLOADING               29
+#define NPIV_CONFIG_NEEDED      30
        uint32_t        device_flags;
 #define DFLG_LOCAL_DEVICES              BIT_0
@@ -2507,7 +2509,6 @@ typedef struct scsi_qla_host {
        uint64_t        fce_wr, fce_rd;
        struct mutex    fce_mutex;
-        uint32_t        hw_event_start;
        uint32_t        hw_event_ptr;
        uint32_t        hw_event_pause_errors;
@@ -2546,13 +2547,20 @@ typedef struct scsi_qla_host {
        uint8_t         fcode_revision[16];
        uint32_t        fw_revision[4];
-        uint16_t        fdt_odd_index;
        uint32_t        fdt_wrt_disable;
        uint32_t        fdt_erase_cmd;
        uint32_t        fdt_block_size;
        uint32_t        fdt_unprotect_sec_cmd;
        uint32_t        fdt_protect_sec_cmd;
+        uint32_t        flt_region_flt;
+        uint32_t        flt_region_fdt;
+        uint32_t        flt_region_boot;
+        uint32_t        flt_region_fw;
+        uint32_t        flt_region_vpd_nvram;
+        uint32_t        flt_region_hw_event;
+        uint32_t        flt_region_npiv_conf;
        /* Needed for BEACON */
        uint16_t        beacon_blink_led;
        uint8_t         beacon_color_state;
diff --git a/drivers/scsi/qla2xxx/qla_fw.h b/drivers/scsi/qla2xxx/qla_fw.h
index cf194517400d..d1d14202575a 100644
--- a/drivers/scsi/qla2xxx/qla_fw.h
+++ b/drivers/scsi/qla2xxx/qla_fw.h
@@ -789,14 +789,23 @@ struct device_reg_24xx {
 #define FA_RISC_CODE_ADDR       0x20000
 #define FA_RISC_CODE_SEGMENTS   2
+#define FA_FLASH_DESCR_ADDR_24  0x11000
+#define FA_FLASH_LAYOUT_ADDR_24 0x11400
+#define FA_NPIV_CONF0_ADDR_24   0x16000
+#define FA_NPIV_CONF1_ADDR_24   0x17000
 #define FA_FW_AREA_ADDR         0x40000
 #define FA_VPD_NVRAM_ADDR       0x48000
 #define FA_FEATURE_ADDR         0x4C000
 #define FA_FLASH_DESCR_ADDR     0x50000
+#define FA_FLASH_LAYOUT_ADDR    0x50400
 #define FA_HW_EVENT0_ADDR       0x54000
-#define FA_HW_EVENT1_ADDR       0x54200
+#define FA_HW_EVENT1_ADDR       0x54400
 #define FA_HW_EVENT_SIZE        0x200
 #define FA_HW_EVENT_ENTRY_SIZE  4
+#define FA_NPIV_CONF0_ADDR      0x5C000
+#define FA_NPIV_CONF1_ADDR      0x5D000
 /*
 * Flash Error Log Event Codes.
 */
@@ -806,10 +815,6 @@ struct device_reg_24xx {
 #define HW_EVENT_NVRAM_CHKSUM_ERR       0xF023
 #define HW_EVENT_FLASH_FW_ERR   0xF024
-#define FA_BOOT_LOG_ADDR        0x58000
-#define FA_FW_DUMP0_ADDR        0x60000
-#define FA_FW_DUMP1_ADDR        0x70000
        uint32_t flash_data;            /* Flash/NVRAM BIOS data. */
        uint32_t ctrl_status;           /* Control/Status. */
@@ -1203,6 +1208,62 @@ struct qla_fdt_layout {
        uint8_t unused2[65];
 };
+/* Flash Layout Table ********************************************************/
+struct qla_flt_location {
+        uint8_t sig[4];
+        uint32_t start_lo;
+        uint32_t start_hi;
+        uint16_t unused;
+        uint16_t checksum;
+};
+struct qla_flt_header {
+        uint16_t version;
+        uint16_t length;
+        uint16_t checksum;
+        uint16_t unused;
+};
+#define FLT_REG_FW              0x01
+#define FLT_REG_BOOT_CODE       0x07
+#define FLT_REG_VPD_0           0x14
+#define FLT_REG_NVRAM_0         0x15
+#define FLT_REG_VPD_1           0x16
+#define FLT_REG_NVRAM_1         0x17
+#define FLT_REG_FDT             0x1a
+#define FLT_REG_FLT             0x1c
+#define FLT_REG_HW_EVENT_0      0x1d
+#define FLT_REG_HW_EVENT_1      0x1f
+#define FLT_REG_NPIV_CONF_0     0x29
+#define FLT_REG_NPIV_CONF_1     0x2a
+struct qla_flt_region {
+        uint32_t code;
+        uint32_t size;
+        uint32_t start;
+        uint32_t end;
+};
+/* Flash NPIV Configuration Table ********************************************/
+struct qla_npiv_header {
+        uint8_t sig[2];
+        uint16_t version;
+        uint16_t entries;
+        uint16_t unused[4];
+        uint16_t checksum;
+};
+struct qla_npiv_entry {
+        uint16_t flags;
+        uint16_t vf_id;
+        uint16_t qos;
+        uint16_t unused1;
+        uint8_t port_name[WWN_SIZE];
+        uint8_t node_name[WWN_SIZE];
+};
 /* 84XX Support **************************************************************/
 #define MBA_ISP84XX_ALERT       0x800f  /* Alert Notification. */
diff --git a/drivers/scsi/qla2xxx/qla_gbl.h b/drivers/scsi/qla2xxx/qla_gbl.h
index 0b156735e9a6..753dbe6cce6e 100644
--- a/drivers/scsi/qla2xxx/qla_gbl.h
+++ b/drivers/scsi/qla2xxx/qla_gbl.h
@@ -313,9 +313,11 @@ extern int qla24xx_get_flash_version(scsi_qla_host_t *, void *);
 extern int qla2xxx_hw_event_log(scsi_qla_host_t *, uint16_t , uint16_t,
    uint16_t, uint16_t);
-extern void qla2xxx_get_flash_info(scsi_qla_host_t *);
+extern int qla2xxx_get_flash_info(scsi_qla_host_t *);
 extern int qla2xxx_get_vpd_field(scsi_qla_host_t *, char *, char *, size_t);
+extern void qla2xxx_flash_npiv_conf(scsi_qla_host_t *);
 /*
 * Global Function Prototypes in qla_dbg.c source file.
 */
diff --git a/drivers/scsi/qla2xxx/qla_init.c b/drivers/scsi/qla2xxx/qla_init.c
index ee89ddd64aae..4218f20f5ed5 100644
--- a/drivers/scsi/qla2xxx/qla_init.c
+++ b/drivers/scsi/qla2xxx/qla_init.c
@@ -83,6 +83,13 @@ qla2x00_initialize_adapter(scsi_qla_host_t *ha)
        ha->isp_ops->reset_chip(ha);
+        rval = qla2xxx_get_flash_info(ha);
+        if (rval) {
+                DEBUG2(printk("scsi(%ld): Unable to validate FLASH data.\n",
+                    ha->host_no));
+                return (rval);
+        }
        ha->isp_ops->get_flash_version(ha, ha->request_ring);
        qla_printk(KERN_INFO, ha, "Configure NVRAM parameters...\n");
@@ -109,7 +116,6 @@ qla2x00_initialize_adapter(scsi_qla_host_t *ha)
                rval = qla2x00_setup_chip(ha);
                if (rval)
                        return (rval);
-                qla2xxx_get_flash_info(ha);
        }
        if (IS_QLA84XX(ha)) {
                ha->cs84xx = qla84xx_get_chip(ha);
@@ -134,7 +140,6 @@ int
 qla2100_pci_config(scsi_qla_host_t *ha)
 {
        uint16_t w;
-        uint32_t d;
        unsigned long flags;
        struct device_reg_2xxx __iomem *reg = &ha->iobase->isp;
@@ -145,10 +150,7 @@ qla2100_pci_config(scsi_qla_host_t *ha)
        w |= (PCI_COMMAND_PARITY | PCI_COMMAND_SERR);
        pci_write_config_word(ha->pdev, PCI_COMMAND, w);
-        /* Reset expansion ROM address decode enable */
+        pci_disable_rom(ha->pdev);
-        pci_read_config_dword(ha->pdev, PCI_ROM_ADDRESS, &d);
-        d &= ~PCI_ROM_ADDRESS_ENABLE;
-        pci_write_config_dword(ha->pdev, PCI_ROM_ADDRESS, d);
        /* Get PCI bus information. */
        spin_lock_irqsave(&ha->hardware_lock, flags);
@@ -168,7 +170,6 @@ int
 qla2300_pci_config(scsi_qla_host_t *ha)
 {
        uint16_t        w;
-        uint32_t        d;
        unsigned long   flags = 0;
        uint32_t        cnt;
        struct device_reg_2xxx __iomem *reg = &ha->iobase->isp;
@@ -230,10 +231,7 @@ qla2300_pci_config(scsi_qla_host_t *ha)
        pci_write_config_byte(ha->pdev, PCI_LATENCY_TIMER, 0x80);
-        /* Reset expansion ROM address decode enable */
+        pci_disable_rom(ha->pdev);
-        pci_read_config_dword(ha->pdev, PCI_ROM_ADDRESS, &d);
-        d &= ~PCI_ROM_ADDRESS_ENABLE;
-        pci_write_config_dword(ha->pdev, PCI_ROM_ADDRESS, d);
        /* Get PCI bus information. */
        spin_lock_irqsave(&ha->hardware_lock, flags);
@@ -253,7 +251,6 @@ int
 qla24xx_pci_config(scsi_qla_host_t *ha)
 {
        uint16_t w;
-        uint32_t d;
        unsigned long flags = 0;
        struct device_reg_24xx __iomem *reg = &ha->iobase->isp24;
@@ -275,10 +272,7 @@ qla24xx_pci_config(scsi_qla_host_t *ha)
        if (pci_find_capability(ha->pdev, PCI_CAP_ID_EXP))
                pcie_set_readrq(ha->pdev, 2048);
-        /* Reset expansion ROM address decode enable */
+        pci_disable_rom(ha->pdev);
-        pci_read_config_dword(ha->pdev, PCI_ROM_ADDRESS, &d);
-        d &= ~PCI_ROM_ADDRESS_ENABLE;
-        pci_write_config_dword(ha->pdev, PCI_ROM_ADDRESS, d);
        ha->chip_revision = ha->pdev->revision;
@@ -300,7 +294,6 @@ int
 qla25xx_pci_config(scsi_qla_host_t *ha)
 {
        uint16_t w;
-        uint32_t d;
        pci_set_master(ha->pdev);
        pci_try_set_mwi(ha->pdev);
@@ -314,10 +307,7 @@ qla25xx_pci_config(scsi_qla_host_t *ha)
        if (pci_find_capability(ha->pdev, PCI_CAP_ID_EXP))
                pcie_set_readrq(ha->pdev, 2048);
-        /* Reset expansion ROM address decode enable */
+        pci_disable_rom(ha->pdev);
-        pci_read_config_dword(ha->pdev, PCI_ROM_ADDRESS, &d);
-        d &= ~PCI_ROM_ADDRESS_ENABLE;
-        pci_write_config_dword(ha->pdev, PCI_ROM_ADDRESS, d);
        ha->chip_revision = ha->pdev->revision;
@@ -974,7 +964,6 @@ qla2x00_setup_chip(scsi_qla_host_t *ha)
                                    &ha->fw_minor_version,
                                    &ha->fw_subminor_version,
                                    &ha->fw_attributes, &ha->fw_memory_size);
-                                qla2x00_resize_request_q(ha);
                                ha->flags.npiv_supported = 0;
                                if ((IS_QLA24XX(ha) || IS_QLA25XX(ha) ||
                                     IS_QLA84XX(ha)) &&
@@ -986,6 +975,7 @@ qla2x00_setup_chip(scsi_qla_host_t *ha)
                                                ha->max_npiv_vports =
                                                    MIN_MULTI_ID_FABRIC - 1;
                                }
+                                qla2x00_resize_request_q(ha);
                                if (ql2xallocfwdump)
                                        qla2x00_alloc_fw_dump(ha);
@@ -2016,7 +2006,7 @@ qla2x00_configure_loop(scsi_qla_host_t *ha)
                DEBUG3(printk("%s: exiting normally\n", __func__));
        }
-        /* Restore state if a resync event occured during processing */
+        /* Restore state if a resync event occurred during processing */
        if (test_bit(LOOP_RESYNC_NEEDED, &ha->dpc_flags)) {
                if (test_bit(LOCAL_LOOP_UPDATE, &save_flags))
                        set_bit(LOCAL_LOOP_UPDATE, &ha->dpc_flags);
@@ -2561,7 +2551,7 @@ qla2x00_find_all_fabric_devs(scsi_qla_host_t *ha, struct list_head *new_fcports)
        rval = QLA_SUCCESS;
        /* Try GID_PT to get device list, else GAN. */
-        swl = kcalloc(MAX_FIBRE_DEVICES, sizeof(sw_info_t), GFP_ATOMIC);
+        swl = kcalloc(MAX_FIBRE_DEVICES, sizeof(sw_info_t), GFP_KERNEL);
        if (!swl) {
                /*EMPTY*/
                DEBUG2(printk("scsi(%ld): GID_PT allocations failed, fallback "
@@ -3751,7 +3741,7 @@ qla24xx_load_risc_flash(scsi_qla_host_t *ha, uint32_t *srisc_addr)
        rval = QLA_SUCCESS;
        segments = FA_RISC_CODE_SEGMENTS;
-        faddr = FA_RISC_CODE_ADDR;
+        faddr = ha->flt_region_fw;
        dcode = (uint32_t *)ha->request_ring;
        *srisc_addr = 0;
diff --git a/drivers/scsi/qla2xxx/qla_inline.h b/drivers/scsi/qla2xxx/qla_inline.h
index 92fafbdbbaab..e90afad120ee 100644
--- a/drivers/scsi/qla2xxx/qla_inline.h
+++ b/drivers/scsi/qla2xxx/qla_inline.h
@@ -52,7 +52,7 @@ to_qla_parent(scsi_qla_host_t *ha)
 * @ha: HA context
 * @ha_locked: is function called with the hardware lock
 *
- * Returns non-zero if a failure occured, else zero.
+ * Returns non-zero if a failure occurred, else zero.
 */
 static inline int
 qla2x00_issue_marker(scsi_qla_host_t *ha, int ha_locked)
diff --git a/drivers/scsi/qla2xxx/qla_iocb.c b/drivers/scsi/qla2xxx/qla_iocb.c
index d57669aa4615..85bc0a48598b 100644
--- a/drivers/scsi/qla2xxx/qla_iocb.c
+++ b/drivers/scsi/qla2xxx/qla_iocb.c
@@ -21,17 +21,22 @@ static void qla2x00_isp_cmd(scsi_qla_host_t *ha);
 * Returns the proper CF_* direction based on CDB.
 */
 static inline uint16_t
-qla2x00_get_cmd_direction(struct scsi_cmnd *cmd)
+qla2x00_get_cmd_direction(srb_t *sp)
 {
        uint16_t cflags;
        cflags = 0;
        /* Set transfer direction */
-        if (cmd->sc_data_direction == DMA_TO_DEVICE)
+        if (sp->cmd->sc_data_direction == DMA_TO_DEVICE) {
                cflags = CF_WRITE;
-        else if (cmd->sc_data_direction == DMA_FROM_DEVICE)
+                sp->fcport->ha->qla_stats.output_bytes +=
+                    scsi_bufflen(sp->cmd);
+        } else if (sp->cmd->sc_data_direction == DMA_FROM_DEVICE) {
                cflags = CF_READ;
+                sp->fcport->ha->qla_stats.input_bytes +=
+                    scsi_bufflen(sp->cmd);
+        }
        return (cflags);
 }
@@ -169,7 +174,7 @@ void qla2x00_build_scsi_iocbs_32(srb_t *sp, cmd_entry_t *cmd_pkt,
        ha = sp->ha;
-        cmd_pkt->control_flags |= cpu_to_le16(qla2x00_get_cmd_direction(cmd));
+        cmd_pkt->control_flags |= cpu_to_le16(qla2x00_get_cmd_direction(sp));
        /* Three DSDs are available in the Command Type 2 IOCB */
        avail_dsds = 3;
@@ -228,7 +233,7 @@ void qla2x00_build_scsi_iocbs_64(srb_t *sp, cmd_entry_t *cmd_pkt,
        ha = sp->ha;
-        cmd_pkt->control_flags |= cpu_to_le16(qla2x00_get_cmd_direction(cmd));
+        cmd_pkt->control_flags |= cpu_to_le16(qla2x00_get_cmd_direction(sp));
        /* Two DSDs are available in the Command Type 3 IOCB */
        avail_dsds = 2;
@@ -262,7 +267,7 @@ void qla2x00_build_scsi_iocbs_64(srb_t *sp, cmd_entry_t *cmd_pkt,
 * qla2x00_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
 qla2x00_start_scsi(srb_t *sp)
@@ -407,7 +412,7 @@ queuing_error:
 *
 * Can be called from both normal and interrupt context.
 *
- * Returns non-zero if a failure occured, else zero.
+ * Returns non-zero if a failure occurred, else zero.
 */
 int
 __qla2x00_marker(scsi_qla_host_t *ha, uint16_t loop_id, uint16_t lun,
@@ -625,12 +630,17 @@ qla24xx_build_scsi_iocbs(srb_t *sp, struct cmd_type_7 *cmd_pkt,
        ha = sp->ha;
        /* Set transfer direction */
-        if (cmd->sc_data_direction == DMA_TO_DEVICE)
+        if (cmd->sc_data_direction == DMA_TO_DEVICE) {
                cmd_pkt->task_mgmt_flags =
                    __constant_cpu_to_le16(TMF_WRITE_DATA);
-        else if (cmd->sc_data_direction == DMA_FROM_DEVICE)
+                sp->fcport->ha->qla_stats.output_bytes +=
+                    scsi_bufflen(sp->cmd);
+        } else if (cmd->sc_data_direction == DMA_FROM_DEVICE) {
                cmd_pkt->task_mgmt_flags =
                    __constant_cpu_to_le16(TMF_READ_DATA);
+                sp->fcport->ha->qla_stats.input_bytes +=
+                    scsi_bufflen(sp->cmd);
+        }
        /* One DSD is available in the Command Type 3 IOCB */
        avail_dsds = 1;
@@ -666,7 +676,7 @@ qla24xx_build_scsi_iocbs(srb_t *sp, struct cmd_type_7 *cmd_pkt,
 * qla24xx_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
 qla24xx_start_scsi(srb_t *sp)
diff --git a/drivers/scsi/qla2xxx/qla_isr.c b/drivers/scsi/qla2xxx/qla_isr.c
index bf41887cdd65..a76efd99d007 100644
--- a/drivers/scsi/qla2xxx/qla_isr.c
+++ b/drivers/scsi/qla2xxx/qla_isr.c
@@ -391,9 +391,9 @@ qla2x00_async_event(scsi_qla_host_t *ha, uint16_t *mb)
                break;
        case MBA_LIP_OCCURRED:          /* Loop Initialization Procedure */
-                DEBUG2(printk("scsi(%ld): LIP occured (%x).\n", ha->host_no,
+                DEBUG2(printk("scsi(%ld): LIP occurred (%x).\n", ha->host_no,
                    mb[1]));
-                qla_printk(KERN_INFO, ha, "LIP occured (%x).\n", mb[1]);
+                qla_printk(KERN_INFO, ha, "LIP occurred (%x).\n", mb[1]);
                if (atomic_read(&ha->loop_state) != LOOP_DOWN) {
                        atomic_set(&ha->loop_state, LOOP_DOWN);
@@ -460,7 +460,7 @@ qla2x00_async_event(scsi_qla_host_t *ha, uint16_t *mb)
                DEBUG2(printk("scsi(%ld): Asynchronous LIP RESET (%x).\n",
                    ha->host_no, mb[1]));
                qla_printk(KERN_INFO, ha,
-                    "LIP reset occured (%x).\n", mb[1]);
+                    "LIP reset occurred (%x).\n", mb[1]);
                if (atomic_read(&ha->loop_state) != LOOP_DOWN) {
                        atomic_set(&ha->loop_state, LOOP_DOWN);
@@ -543,7 +543,7 @@ qla2x00_async_event(scsi_qla_host_t *ha, uint16_t *mb)
        case MBA_PORT_UPDATE:           /* Port database update */
                /*
-                 * If PORT UPDATE is global (recieved LIP_OCCURED/LIP_RESET
+                 * If PORT UPDATE is global (received LIP_OCCURRED/LIP_RESET
                 * event etc. earlier indicating loop is down) then process
                 * it.  Otherwise ignore it and Wait for RSCN to come in.
                 */
@@ -589,7 +589,7 @@ qla2x00_async_event(scsi_qla_host_t *ha, uint16_t *mb)
                    "scsi(%ld): RSCN database changed -- %04x %04x %04x.\n",
                    ha->host_no, mb[1], mb[2], mb[3]));
-                rscn_entry = (mb[1] << 16) | mb[2];
+                rscn_entry = ((mb[1] & 0xff) << 16) | mb[2];
                host_pid = (ha->d_id.b.domain << 16) | (ha->d_id.b.area << 8) |
                    ha->d_id.b.al_pa;
                if (rscn_entry == host_pid) {
@@ -600,6 +600,8 @@ qla2x00_async_event(scsi_qla_host_t *ha, uint16_t *mb)
                        break;
                }
+                /* Ignore reserved bits from RSCN-payload. */
+                rscn_entry = ((mb[1] & 0x3ff) << 16) | mb[2];
                rscn_queue_index = ha->rscn_in_ptr + 1;
                if (rscn_queue_index == MAX_RSCN_COUNT)
                        rscn_queue_index = 0;
@@ -1060,8 +1062,9 @@ qla2x00_status_entry(scsi_qla_host_t *ha, void *pkt)
                resid = resid_len;
                /* Use F/W calculated residual length. */
                if (IS_FWI2_CAPABLE(ha)) {
-                        if (scsi_status & SS_RESIDUAL_UNDER &&
+                        if (!(scsi_status & SS_RESIDUAL_UNDER)) {
-                            resid != fw_resid_len) {
+                                lscsi_status = 0;
+                        } else if (resid != fw_resid_len) {
                                scsi_status &= ~SS_RESIDUAL_UNDER;
                                lscsi_status = 0;
                        }
@@ -1184,7 +1187,12 @@ qla2x00_status_entry(scsi_qla_host_t *ha, void *pkt)
                    cp->serial_number, comp_status,
                    atomic_read(&fcport->state)));
-                cp->result = DID_BUS_BUSY << 16;
+                /*
+                 * We are going to have the fc class block the rport
+                 * while we try to recover so instruct the mid layer
+                 * to requeue until the class decides how to handle this.
+                 */
+                cp->result = DID_TRANSPORT_DISRUPTED << 16;
                if (atomic_read(&fcport->state) == FCS_ONLINE)
                        qla2x00_mark_device_lost(fcport->ha, fcport, 1, 1);
                break;
@@ -1211,7 +1219,12 @@ qla2x00_status_entry(scsi_qla_host_t *ha, void *pkt)
                break;
        case CS_TIMEOUT:
-                cp->result = DID_BUS_BUSY << 16;
+                /*
+                 * We are going to have the fc class block the rport
+                 * while we try to recover so instruct the mid layer
+                 * to requeue until the class decides how to handle this.
+                 */
+                cp->result = DID_TRANSPORT_DISRUPTED << 16;
                if (IS_FWI2_CAPABLE(ha)) {
                        DEBUG2(printk(KERN_INFO
diff --git a/drivers/scsi/qla2xxx/qla_mbx.c b/drivers/scsi/qla2xxx/qla_mbx.c
index 813bc7784c0a..3402746ec128 100644
--- a/drivers/scsi/qla2xxx/qla_mbx.c
+++ b/drivers/scsi/qla2xxx/qla_mbx.c
@@ -233,7 +233,7 @@ qla2x00_mailbox_command(scsi_qla_host_t *pvha, mbx_cmd_t *mcp)
                        DEBUG2_3_11(printk("%s(%ld): timeout schedule "
                            "isp_abort_needed.\n", __func__, ha->host_no));
                        qla_printk(KERN_WARNING, ha,
-                            "Mailbox command timeout occured. Scheduling ISP "
+                            "Mailbox command timeout occurred. Scheduling ISP "
                            "abort.\n");
                        set_bit(ISP_ABORT_NEEDED, &ha->dpc_flags);
                        qla2xxx_wake_dpc(ha);
@@ -244,7 +244,7 @@ qla2x00_mailbox_command(scsi_qla_host_t *pvha, mbx_cmd_t *mcp)
                        DEBUG2_3_11(printk("%s(%ld): timeout calling "
                            "abort_isp\n", __func__, ha->host_no));
                        qla_printk(KERN_WARNING, ha,
-                            "Mailbox command timeout occured. Issuing ISP "
+                            "Mailbox command timeout occurred. Issuing ISP "
                            "abort.\n");
                        set_bit(ABORT_ISP_ACTIVE, &ha->dpc_flags);
@@ -1964,7 +1964,7 @@ qla2x00_get_resource_cnts(scsi_qla_host_t *ha, uint16_t *cur_xchg_cnt,
                        *cur_iocb_cnt = mcp->mb[7];
                if (orig_iocb_cnt)
                        *orig_iocb_cnt = mcp->mb[10];
-                if (max_npiv_vports)
+                if (ha->flags.npiv_supported && max_npiv_vports)
                        *max_npiv_vports = mcp->mb[11];
        }
@@ -1995,7 +1995,7 @@ qla2x00_get_fcal_position_map(scsi_qla_host_t *ha, char *pos_map)
        char *pmap;
        dma_addr_t pmap_dma;
-        pmap = dma_pool_alloc(ha->s_dma_pool, GFP_ATOMIC, &pmap_dma);
+        pmap = dma_pool_alloc(ha->s_dma_pool, GFP_KERNEL, &pmap_dma);
        if (pmap  == NULL) {
                DEBUG2_3_11(printk("%s(%ld): **** Mem Alloc Failed ****",
                    __func__, ha->host_no));
diff --git a/drivers/scsi/qla2xxx/qla_os.c b/drivers/scsi/qla2xxx/qla_os.c
index 6d0f0e5f2827..35567203ef61 100644
--- a/drivers/scsi/qla2xxx/qla_os.c
+++ b/drivers/scsi/qla2xxx/qla_os.c
@@ -394,10 +394,8 @@ qla2x00_queuecommand(struct scsi_cmnd *cmd, void (*done)(struct scsi_cmnd *))
        }
        /* Close window on fcport/rport state-transitioning. */
-        if (fcport->drport) {
+        if (fcport->drport)
-                cmd->result = DID_IMM_RETRY << 16;
+                goto qc_target_busy;
-                goto qc_fail_command;
-        }
        if (atomic_read(&fcport->state) != FCS_ONLINE) {
                if (atomic_read(&fcport->state) == FCS_DEVICE_DEAD ||
@@ -405,7 +403,7 @@ qla2x00_queuecommand(struct scsi_cmnd *cmd, void (*done)(struct scsi_cmnd *))
                        cmd->result = DID_NO_CONNECT << 16;
                        goto qc_fail_command;
                }
-                goto qc_host_busy;
+                goto qc_target_busy;
        }
        spin_unlock_irq(ha->host->host_lock);
@@ -428,10 +426,11 @@ qc_host_busy_free_sp:
 qc_host_busy_lock:
        spin_lock_irq(ha->host->host_lock);
-qc_host_busy:
        return SCSI_MLQUEUE_HOST_BUSY;
+qc_target_busy:
+        return SCSI_MLQUEUE_TARGET_BUSY;
 qc_fail_command:
        done(cmd);
@@ -461,10 +460,8 @@ qla24xx_queuecommand(struct scsi_cmnd *cmd, void (*done)(struct scsi_cmnd *))
        }
        /* Close window on fcport/rport state-transitioning. */
-        if (fcport->drport) {
+        if (fcport->drport)
-                cmd->result = DID_IMM_RETRY << 16;
+                goto qc24_target_busy;
-                goto qc24_fail_command;
-        }
        if (atomic_read(&fcport->state) != FCS_ONLINE) {
                if (atomic_read(&fcport->state) == FCS_DEVICE_DEAD ||
@@ -472,7 +469,7 @@ qla24xx_queuecommand(struct scsi_cmnd *cmd, void (*done)(struct scsi_cmnd *))
                        cmd->result = DID_NO_CONNECT << 16;
                        goto qc24_fail_command;
                }
-                goto qc24_host_busy;
+                goto qc24_target_busy;
        }
        spin_unlock_irq(ha->host->host_lock);
@@ -495,10 +492,11 @@ qc24_host_busy_free_sp:
 qc24_host_busy_lock:
        spin_lock_irq(ha->host->host_lock);
-qc24_host_busy:
        return SCSI_MLQUEUE_HOST_BUSY;
+qc24_target_busy:
+        return SCSI_MLQUEUE_TARGET_BUSY;
 qc24_fail_command:
        done(cmd);
@@ -730,6 +728,7 @@ qla2xxx_eh_abort(struct scsi_cmnd *cmd)
                if (ha->isp_ops->abort_command(ha, sp)) {
                        DEBUG2(printk("%s(%ld): abort_command "
                            "mbx failed.\n", __func__, ha->host_no));
+                        ret = FAILED;
                } else {
                        DEBUG3(printk("%s(%ld): abort_command "
                            "mbx success.\n", __func__, ha->host_no));
@@ -1517,6 +1516,7 @@ qla2xxx_scan_start(struct Scsi_Host *shost)
        set_bit(LOOP_RESYNC_NEEDED, &ha->dpc_flags);
        set_bit(LOCAL_LOOP_UPDATE, &ha->dpc_flags);
        set_bit(RSCN_UPDATE, &ha->dpc_flags);
+        set_bit(NPIV_CONFIG_NEEDED, &ha->dpc_flags);
 }
 static int
@@ -1567,9 +1567,8 @@ qla2x00_probe_one(struct pci_dev *pdev, const struct pci_device_id *id)
                        goto probe_out;
        }
-        if (pci_find_aer_capability(pdev))
+        /* This may fail but that's ok */
-                if (pci_enable_pcie_error_reporting(pdev))
+        pci_enable_pcie_error_reporting(pdev);
-                        goto probe_out;
        host = scsi_host_alloc(sht, sizeof(scsi_qla_host_t));
        if (host == NULL) {
@@ -1663,8 +1662,6 @@ qla2x00_probe_one(struct pci_dev *pdev, const struct pci_device_id *id)
                ha->gid_list_info_size = 8;
                ha->optrom_size = OPTROM_SIZE_25XX;
                ha->isp_ops = &qla25xx_isp_ops;
-                ha->hw_event_start = PCI_FUNC(pdev->devfn) ?
-                    FA_HW_EVENT1_ADDR: FA_HW_EVENT0_ADDR;
        }
        host->can_queue = ha->request_q_length + 128;
@@ -2433,6 +2430,12 @@ qla2x00_do_dpc(void *data)
                            ha->host_no));
                }
+                if (test_bit(NPIV_CONFIG_NEEDED, &ha->dpc_flags) &&
+                    atomic_read(&ha->loop_state) == LOOP_READY) {
+                        clear_bit(NPIV_CONFIG_NEEDED, &ha->dpc_flags);
+                        qla2xxx_flash_npiv_conf(ha);
+                }
                if (!ha->interrupts_on)
                        ha->isp_ops->enable_intrs(ha);
diff --git a/drivers/scsi/qla2xxx/qla_sup.c b/drivers/scsi/qla2xxx/qla_sup.c
index 1bca74474935..e4af678eb2d6 100644
--- a/drivers/scsi/qla2xxx/qla_sup.c
+++ b/drivers/scsi/qla2xxx/qla_sup.c
@@ -543,23 +543,199 @@ qla24xx_get_flash_manufacturer(scsi_qla_host_t *ha, uint8_t *man_id,
        }
 }
-void
+static int
-qla2xxx_get_flash_info(scsi_qla_host_t *ha)
+qla2xxx_find_flt_start(scsi_qla_host_t *ha, uint32_t *start)
+{
+        const char *loc, *locations[] = { "DEF", "PCI" };
+        uint32_t pcihdr, pcids;
+        uint32_t *dcode;
+        uint8_t *buf, *bcode, last_image;
+        uint16_t cnt, chksum, *wptr;
+        struct qla_flt_location *fltl;
+        /*
+         * FLT-location structure resides after the last PCI region.
+         */
+        /* Begin with sane defaults. */
+        loc = locations[0];
+        *start = IS_QLA24XX_TYPE(ha) ? FA_FLASH_LAYOUT_ADDR_24:
+            FA_FLASH_LAYOUT_ADDR;
+        /* Begin with first PCI expansion ROM header. */
+        buf = (uint8_t *)ha->request_ring;
+        dcode = (uint32_t *)ha->request_ring;
+        pcihdr = 0;
+        last_image = 1;
+        do {
+                /* Verify PCI expansion ROM header. */
+                qla24xx_read_flash_data(ha, dcode, pcihdr >> 2, 0x20);
+                bcode = buf + (pcihdr % 4);
+                if (bcode[0x0] != 0x55 || bcode[0x1] != 0xaa)
+                        goto end;
+                /* Locate PCI data structure. */
+                pcids = pcihdr + ((bcode[0x19] << 8) | bcode[0x18]);
+                qla24xx_read_flash_data(ha, dcode, pcids >> 2, 0x20);
+                bcode = buf + (pcihdr % 4);
+                /* Validate signature of PCI data structure. */
+                if (bcode[0x0] != 'P' || bcode[0x1] != 'C' ||
+                    bcode[0x2] != 'I' || bcode[0x3] != 'R')
+                        goto end;
+                last_image = bcode[0x15] & BIT_7;
+                /* Locate next PCI expansion ROM. */
+                pcihdr += ((bcode[0x11] << 8) | bcode[0x10]) * 512;
+        } while (!last_image);
+        /* Now verify FLT-location structure. */
+        fltl = (struct qla_flt_location *)ha->request_ring;
+        qla24xx_read_flash_data(ha, dcode, pcihdr >> 2,
+            sizeof(struct qla_flt_location) >> 2);
+        if (fltl->sig[0] != 'Q' || fltl->sig[1] != 'F' ||
+            fltl->sig[2] != 'L' || fltl->sig[3] != 'T')
+                goto end;
+        wptr = (uint16_t *)ha->request_ring;
+        cnt = sizeof(struct qla_flt_location) >> 1;
+        for (chksum = 0; cnt; cnt--)
+                chksum += le16_to_cpu(*wptr++);
+        if (chksum) {
+                qla_printk(KERN_ERR, ha,
+                    "Inconsistent FLTL detected: checksum=0x%x.\n", chksum);
+                qla2x00_dump_buffer(buf, sizeof(struct qla_flt_location));
+                return QLA_FUNCTION_FAILED;
+        }
+        /* Good data.  Use specified location. */
+        loc = locations[1];
+        *start = le16_to_cpu(fltl->start_hi) << 16 |
+            le16_to_cpu(fltl->start_lo);
+end:
+        DEBUG2(qla_printk(KERN_DEBUG, ha, "FLTL[%s] = 0x%x.\n", loc, *start));
+        return QLA_SUCCESS;
+}
+static void
+qla2xxx_get_flt_info(scsi_qla_host_t *ha, uint32_t flt_addr)
+{
+        const char *loc, *locations[] = { "DEF", "FLT" };
+        uint16_t *wptr;
+        uint16_t cnt, chksum;
+        uint32_t start;
+        struct qla_flt_header *flt;
+        struct qla_flt_region *region;
+        ha->flt_region_flt = flt_addr;
+        wptr = (uint16_t *)ha->request_ring;
+        flt = (struct qla_flt_header *)ha->request_ring;
+        region = (struct qla_flt_region *)&flt[1];
+        ha->isp_ops->read_optrom(ha, (uint8_t *)ha->request_ring,
+            flt_addr << 2, OPTROM_BURST_SIZE);
+        if (*wptr == __constant_cpu_to_le16(0xffff))
+                goto no_flash_data;
+        if (flt->version != __constant_cpu_to_le16(1)) {
+                DEBUG2(qla_printk(KERN_INFO, ha, "Unsupported FLT detected: "
+                    "version=0x%x length=0x%x checksum=0x%x.\n",
+                    le16_to_cpu(flt->version), le16_to_cpu(flt->length),
+                    le16_to_cpu(flt->checksum)));
+                goto no_flash_data;
+        }
+        cnt = (sizeof(struct qla_flt_header) + le16_to_cpu(flt->length)) >> 1;
+        for (chksum = 0; cnt; cnt--)
+                chksum += le16_to_cpu(*wptr++);
+        if (chksum) {
+                DEBUG2(qla_printk(KERN_INFO, ha, "Inconsistent FLT detected: "
+                    "version=0x%x length=0x%x checksum=0x%x.\n",
+                    le16_to_cpu(flt->version), le16_to_cpu(flt->length),
+                    chksum));
+                goto no_flash_data;
+        }
+        loc = locations[1];
+        cnt = le16_to_cpu(flt->length) / sizeof(struct qla_flt_region);
+        for ( ; cnt; cnt--, region++) {
+                /* Store addresses as DWORD offsets. */
+                start = le32_to_cpu(region->start) >> 2;
+                DEBUG3(qla_printk(KERN_DEBUG, ha, "FLT[%02x]: start=0x%x "
+                    "end=0x%x size=0x%x.\n", le32_to_cpu(region->code), start,
+                    le32_to_cpu(region->end) >> 2, le32_to_cpu(region->size)));
+                switch (le32_to_cpu(region->code)) {
+                case FLT_REG_FW:
+                        ha->flt_region_fw = start;
+                        break;
+                case FLT_REG_BOOT_CODE:
+                        ha->flt_region_boot = start;
+                        break;
+                case FLT_REG_VPD_0:
+                        ha->flt_region_vpd_nvram = start;
+                        break;
+                case FLT_REG_FDT:
+                        ha->flt_region_fdt = start;
+                        break;
+                case FLT_REG_HW_EVENT_0:
+                        if (!PCI_FUNC(ha->pdev->devfn))
+                                ha->flt_region_hw_event = start;
+                        break;
+                case FLT_REG_HW_EVENT_1:
+                        if (PCI_FUNC(ha->pdev->devfn))
+                                ha->flt_region_hw_event = start;
+                        break;
+                case FLT_REG_NPIV_CONF_0:
+                        if (!PCI_FUNC(ha->pdev->devfn))
+                                ha->flt_region_npiv_conf = start;
+                        break;
+                case FLT_REG_NPIV_CONF_1:
+                        if (PCI_FUNC(ha->pdev->devfn))
+                                ha->flt_region_npiv_conf = start;
+                        break;
+                }
+        }
+        goto done;
+no_flash_data:
+        /* Use hardcoded defaults. */
+        loc = locations[0];
+        ha->flt_region_fw = FA_RISC_CODE_ADDR;
+        ha->flt_region_boot = FA_BOOT_CODE_ADDR;
+        ha->flt_region_vpd_nvram = FA_VPD_NVRAM_ADDR;
+        ha->flt_region_fdt = IS_QLA24XX_TYPE(ha) ? FA_FLASH_DESCR_ADDR_24:
+            FA_FLASH_DESCR_ADDR;
+        ha->flt_region_hw_event = !PCI_FUNC(ha->pdev->devfn) ?
+            FA_HW_EVENT0_ADDR: FA_HW_EVENT1_ADDR;
+        ha->flt_region_npiv_conf = !PCI_FUNC(ha->pdev->devfn) ?
+            (IS_QLA24XX_TYPE(ha) ? FA_NPIV_CONF0_ADDR_24: FA_NPIV_CONF0_ADDR):
+            (IS_QLA24XX_TYPE(ha) ? FA_NPIV_CONF1_ADDR_24: FA_NPIV_CONF1_ADDR);
+done:
+        DEBUG2(qla_printk(KERN_DEBUG, ha, "FLT[%s]: boot=0x%x fw=0x%x "
+            "vpd_nvram=0x%x fdt=0x%x flt=0x%x hwe=0x%x npiv=0x%x.\n", loc,
+            ha->flt_region_boot, ha->flt_region_fw, ha->flt_region_vpd_nvram,
+            ha->flt_region_fdt, ha->flt_region_flt, ha->flt_region_hw_event,
+            ha->flt_region_npiv_conf));
+}
+static void
+qla2xxx_get_fdt_info(scsi_qla_host_t *ha)
 {
+#define FLASH_BLK_SIZE_4K       0x1000
 #define FLASH_BLK_SIZE_32K      0x8000
 #define FLASH_BLK_SIZE_64K      0x10000
+        const char *loc, *locations[] = { "MID", "FDT" };
        uint16_t cnt, chksum;
        uint16_t *wptr;
        struct qla_fdt_layout *fdt;
        uint8_t man_id, flash_id;
+        uint16_t mid, fid;
-        if (!IS_QLA24XX_TYPE(ha) && !IS_QLA25XX(ha))
-                return;
        wptr = (uint16_t *)ha->request_ring;
        fdt = (struct qla_fdt_layout *)ha->request_ring;
        ha->isp_ops->read_optrom(ha, (uint8_t *)ha->request_ring,
-            FA_FLASH_DESCR_ADDR << 2, OPTROM_BURST_SIZE);
+            ha->flt_region_fdt << 2, OPTROM_BURST_SIZE);
        if (*wptr == __constant_cpu_to_le16(0xffff))
                goto no_flash_data;
        if (fdt->sig[0] != 'Q' || fdt->sig[1] != 'L' || fdt->sig[2] != 'I' ||
@@ -577,7 +753,9 @@ qla2xxx_get_flash_info(scsi_qla_host_t *ha)
                goto no_flash_data;
        }
-        ha->fdt_odd_index = le16_to_cpu(fdt->man_id) == 0x1f;
+        loc = locations[1];
+        mid = le16_to_cpu(fdt->man_id);
+        fid = le16_to_cpu(fdt->id);
        ha->fdt_wrt_disable = fdt->wrt_disable_bits;
        ha->fdt_erase_cmd = flash_conf_to_access_addr(0x0300 | fdt->erase_cmd);
        ha->fdt_block_size = le32_to_cpu(fdt->block_size);
@@ -588,16 +766,12 @@ qla2xxx_get_flash_info(scsi_qla_host_t *ha)
                    flash_conf_to_access_addr(0x0300 | fdt->protect_sec_cmd):
                    flash_conf_to_access_addr(0x0336);
        }
+        goto done;
-        DEBUG2(qla_printk(KERN_DEBUG, ha, "Flash[FDT]: (0x%x/0x%x) erase=0x%x "
-            "pro=%x upro=%x idx=%d wrtd=0x%x blk=0x%x.\n",
-            le16_to_cpu(fdt->man_id), le16_to_cpu(fdt->id), ha->fdt_erase_cmd,
-            ha->fdt_protect_sec_cmd, ha->fdt_unprotect_sec_cmd,
-            ha->fdt_odd_index, ha->fdt_wrt_disable, ha->fdt_block_size));
-        return;
 no_flash_data:
+        loc = locations[0];
        qla24xx_get_flash_manufacturer(ha, &man_id, &flash_id);
+        mid = man_id;
+        fid = flash_id;
        ha->fdt_wrt_disable = 0x9c;
        ha->fdt_erase_cmd = flash_conf_to_access_addr(0x03d8);
        switch (man_id) {
@@ -614,8 +788,7 @@ no_flash_data:
                ha->fdt_block_size = FLASH_BLK_SIZE_64K;
                break;
        case 0x1f: /* Atmel 26DF081A. */
-                ha->fdt_odd_index = 1;
+                ha->fdt_block_size = FLASH_BLK_SIZE_4K;
-                ha->fdt_block_size = FLASH_BLK_SIZE_64K;
                ha->fdt_erase_cmd = flash_conf_to_access_addr(0x0320);
                ha->fdt_unprotect_sec_cmd = flash_conf_to_access_addr(0x0339);
                ha->fdt_protect_sec_cmd = flash_conf_to_access_addr(0x0336);
@@ -625,14 +798,117 @@ no_flash_data:
                ha->fdt_block_size = FLASH_BLK_SIZE_64K;
                break;
        }
+done:
-        DEBUG2(qla_printk(KERN_DEBUG, ha, "Flash[MID]: (0x%x/0x%x) erase=0x%x "
+        DEBUG2(qla_printk(KERN_DEBUG, ha, "FDT[%s]: (0x%x/0x%x) erase=0x%x "
-            "pro=%x upro=%x idx=%d wrtd=0x%x blk=0x%x.\n", man_id, flash_id,
+            "pro=%x upro=%x wrtd=0x%x blk=0x%x.\n", loc, mid, fid,
            ha->fdt_erase_cmd, ha->fdt_protect_sec_cmd,
-            ha->fdt_unprotect_sec_cmd, ha->fdt_odd_index, ha->fdt_wrt_disable,
+            ha->fdt_unprotect_sec_cmd, ha->fdt_wrt_disable,
            ha->fdt_block_size));
 }
+int
+qla2xxx_get_flash_info(scsi_qla_host_t *ha)
+{
+        int ret;
+        uint32_t flt_addr;
+        if (!IS_QLA24XX_TYPE(ha) && !IS_QLA25XX(ha))
+                return QLA_SUCCESS;
+        ret = qla2xxx_find_flt_start(ha, &flt_addr);
+        if (ret != QLA_SUCCESS)
+                return ret;
+        qla2xxx_get_flt_info(ha, flt_addr);
+        qla2xxx_get_fdt_info(ha);
+        return QLA_SUCCESS;
+}
+void
+qla2xxx_flash_npiv_conf(scsi_qla_host_t *ha)
+{
+#define NPIV_CONFIG_SIZE        (16*1024)
+        void *data;
+        uint16_t *wptr;
+        uint16_t cnt, chksum;
+        struct qla_npiv_header hdr;
+        struct qla_npiv_entry *entry;
+        if (!IS_QLA24XX_TYPE(ha) && !IS_QLA25XX(ha))
+                return;
+        ha->isp_ops->read_optrom(ha, (uint8_t *)&hdr,
+            ha->flt_region_npiv_conf << 2, sizeof(struct qla_npiv_header));
+        if (hdr.version == __constant_cpu_to_le16(0xffff))
+                return;
+        if (hdr.version != __constant_cpu_to_le16(1)) {
+                DEBUG2(qla_printk(KERN_INFO, ha, "Unsupported NPIV-Config "
+                    "detected: version=0x%x entries=0x%x checksum=0x%x.\n",
+                    le16_to_cpu(hdr.version), le16_to_cpu(hdr.entries),
+                    le16_to_cpu(hdr.checksum)));
+                return;
+        }
+        data = kmalloc(NPIV_CONFIG_SIZE, GFP_KERNEL);
+        if (!data) {
+                DEBUG2(qla_printk(KERN_INFO, ha, "NPIV-Config: Unable to "
+                    "allocate memory.\n"));
+                return;
+        }
+        ha->isp_ops->read_optrom(ha, (uint8_t *)data,
+            ha->flt_region_npiv_conf << 2, NPIV_CONFIG_SIZE);
+        cnt = (sizeof(struct qla_npiv_header) + le16_to_cpu(hdr.entries) *
+            sizeof(struct qla_npiv_entry)) >> 1;
+        for (wptr = data, chksum = 0; cnt; cnt--)
+                chksum += le16_to_cpu(*wptr++);
+        if (chksum) {
+                DEBUG2(qla_printk(KERN_INFO, ha, "Inconsistent NPIV-Config "
+                    "detected: version=0x%x entries=0x%x checksum=0x%x.\n",
+                    le16_to_cpu(hdr.version), le16_to_cpu(hdr.entries),
+                    chksum));
+                goto done;
+        }
+        entry = data + sizeof(struct qla_npiv_header);
+        cnt = le16_to_cpu(hdr.entries);
+        for ( ; cnt; cnt--, entry++) {
+                uint16_t flags;
+                struct fc_vport_identifiers vid;
+                struct fc_vport *vport;
+                flags = le16_to_cpu(entry->flags);
+                if (flags == 0xffff)
+                        continue;
+                if ((flags & BIT_0) == 0)
+                        continue;
+                memset(&vid, 0, sizeof(vid));
+                vid.roles = FC_PORT_ROLE_FCP_INITIATOR;
+                vid.vport_type = FC_PORTTYPE_NPIV;
+                vid.disable = false;
+                vid.port_name = wwn_to_u64(entry->port_name);
+                vid.node_name = wwn_to_u64(entry->node_name);
+                DEBUG2(qla_printk(KERN_DEBUG, ha, "NPIV[%02x]: wwpn=%llx "
+                    "wwnn=%llx vf_id=0x%x qos=0x%x.\n", cnt,
+                    (unsigned long long)vid.port_name,
+                    (unsigned long long)vid.node_name,
+                    le16_to_cpu(entry->vf_id), le16_to_cpu(entry->qos)));
+                vport = fc_vport_create(ha->host, 0, &vid);
+                if (!vport)
+                        qla_printk(KERN_INFO, ha, "NPIV-Config: Failed to "
+                            "create vport [%02x]: wwpn=%llx wwnn=%llx.\n", cnt,
+                            (unsigned long long)vid.port_name,
+                            (unsigned long long)vid.node_name);
+        }
+done:
+        kfree(data);
+}
 static void
 qla24xx_unprotect_flash(scsi_qla_host_t *ha)
 {
@@ -710,13 +986,9 @@ qla24xx_write_flash_data(scsi_qla_host_t *ha, uint32_t *dwptr, uint32_t faddr,
        qla24xx_unprotect_flash(ha);
        for (liter = 0; liter < dwords; liter++, faddr++, dwptr++) {
-                if (ha->fdt_odd_index) {
-                        findex = faddr << 2;
+                findex = faddr;
-                        fdata = findex & sec_mask;
+                fdata = (findex & sec_mask) << 2;
-                } else {
-                        findex = faddr;
-                        fdata = (findex & sec_mask) << 2;
-                }
                /* Are we at the beginning of a sector? */
                if ((findex & rest_addr) == 0) {
@@ -920,7 +1192,8 @@ qla25xx_read_nvram_data(scsi_qla_host_t *ha, uint8_t *buf, uint32_t naddr,
        dwptr = (uint32_t *)buf;
        for (i = 0; i < bytes >> 2; i++, naddr++)
                dwptr[i] = cpu_to_le32(qla24xx_read_flash_dword(ha,
-                    flash_data_to_access_addr(FA_VPD_NVRAM_ADDR | naddr)));
+                    flash_data_to_access_addr(ha->flt_region_vpd_nvram |
+                    naddr)));
        return buf;
 }
@@ -935,10 +1208,10 @@ qla25xx_write_nvram_data(scsi_qla_host_t *ha, uint8_t *buf, uint32_t naddr,
        dbuf = vmalloc(RMW_BUFFER_SIZE);
        if (!dbuf)
                return QLA_MEMORY_ALLOC_FAILED;
-        ha->isp_ops->read_optrom(ha, dbuf, FA_VPD_NVRAM_ADDR << 2,
+        ha->isp_ops->read_optrom(ha, dbuf, ha->flt_region_vpd_nvram << 2,
            RMW_BUFFER_SIZE);
        memcpy(dbuf + (naddr << 2), buf, bytes);
-        ha->isp_ops->write_optrom(ha, dbuf, FA_VPD_NVRAM_ADDR << 2,
+        ha->isp_ops->write_optrom(ha, dbuf, ha->flt_region_vpd_nvram << 2,
            RMW_BUFFER_SIZE);
        vfree(dbuf);
@@ -2166,7 +2439,7 @@ qla2x00_get_flash_version(scsi_qla_host_t *ha, void *mbuf)
                memset(dbyte, 0, 8);
                dcode = (uint16_t *)dbyte;
-                qla2x00_read_flash_data(ha, dbyte, FA_RISC_CODE_ADDR * 4 + 10,
+                qla2x00_read_flash_data(ha, dbyte, ha->flt_region_fw * 4 + 10,
                    8);
                DEBUG3(printk("%s(%ld): dumping fw ver from flash:\n",
                    __func__, ha->host_no));
@@ -2177,7 +2450,7 @@ qla2x00_get_flash_version(scsi_qla_host_t *ha, void *mbuf)
                    (dcode[0] == 0 && dcode[1] == 0 && dcode[2] == 0 &&
                    dcode[3] == 0)) {
                        DEBUG2(printk("%s(): Unrecognized fw revision at "
-                            "%x.\n", __func__, FA_RISC_CODE_ADDR * 4));
+                            "%x.\n", __func__, ha->flt_region_fw * 4));
                } else {
                        /* values are in big endian */
                        ha->fw_revision[0] = dbyte[0] << 16 | dbyte[1];
@@ -2212,7 +2485,7 @@ qla24xx_get_flash_version(scsi_qla_host_t *ha, void *mbuf)
        dcode = mbuf;
        /* Begin with first PCI expansion ROM header. */
-        pcihdr = 0;
+        pcihdr = ha->flt_region_boot;
        last_image = 1;
        do {
                /* Verify PCI expansion ROM header. */
@@ -2282,7 +2555,7 @@ qla24xx_get_flash_version(scsi_qla_host_t *ha, void *mbuf)
        memset(ha->fw_revision, 0, sizeof(ha->fw_revision));
        dcode = mbuf;
-        qla24xx_read_flash_data(ha, dcode, FA_RISC_CODE_ADDR + 4, 4);
+        qla24xx_read_flash_data(ha, dcode, ha->flt_region_fw + 4, 4);
        for (i = 0; i < 4; i++)
                dcode[i] = be32_to_cpu(dcode[i]);
@@ -2291,7 +2564,7 @@ qla24xx_get_flash_version(scsi_qla_host_t *ha, void *mbuf)
            (dcode[0] == 0 && dcode[1] == 0 && dcode[2] == 0 &&
            dcode[3] == 0)) {
                DEBUG2(printk("%s(): Unrecognized fw version at %x.\n",
-                    __func__, FA_RISC_CODE_ADDR));
+                    __func__, ha->flt_region_fw));
        } else {
                ha->fw_revision[0] = dcode[0];
                ha->fw_revision[1] = dcode[1];
@@ -2355,7 +2628,7 @@ qla2xxx_hw_event_store(scsi_qla_host_t *ha, uint32_t *fdata)
        /* Locate first empty entry. */
        for (;;) {
                if (ha->hw_event_ptr >=
-                    ha->hw_event_start + FA_HW_EVENT_SIZE) {
+                    ha->flt_region_hw_event + FA_HW_EVENT_SIZE) {
                        DEBUG2(qla_printk(KERN_WARNING, ha,
                            "HW event -- Log Full!\n"));
                        return QLA_MEMORY_ALLOC_FAILED;
@@ -2391,7 +2664,7 @@ qla2xxx_hw_event_log(scsi_qla_host_t *ha, uint16_t code, uint16_t d1,
        int rval;
        uint32_t marker[2], fdata[4];
-        if (ha->hw_event_start == 0)
+        if (ha->flt_region_hw_event == 0)
                return QLA_FUNCTION_FAILED;
        DEBUG2(qla_printk(KERN_WARNING, ha,
@@ -2406,7 +2679,7 @@ qla2xxx_hw_event_log(scsi_qla_host_t *ha, uint16_t code, uint16_t d1,
                    QLA_DRIVER_PATCH_VER, QLA_DRIVER_BETA_VER);
                /* Locate marker. */
-                ha->hw_event_ptr = ha->hw_event_start;
+                ha->hw_event_ptr = ha->flt_region_hw_event;
                for (;;) {
                        qla24xx_read_flash_data(ha, fdata, ha->hw_event_ptr,
                            4);
@@ -2415,7 +2688,7 @@ qla2xxx_hw_event_log(scsi_qla_host_t *ha, uint16_t code, uint16_t d1,
                                break;
                        ha->hw_event_ptr += FA_HW_EVENT_ENTRY_SIZE;
                        if (ha->hw_event_ptr >=
-                            ha->hw_event_start + FA_HW_EVENT_SIZE) {
+                            ha->flt_region_hw_event + FA_HW_EVENT_SIZE) {
                                DEBUG2(qla_printk(KERN_WARNING, ha,
                                    "HW event -- Log Full!\n"));
                                return QLA_MEMORY_ALLOC_FAILED;
diff --git a/drivers/scsi/qla2xxx/qla_version.h b/drivers/scsi/qla2xxx/qla_version.h
index 4160e4caa7b9..eea6720adf16 100644
--- a/drivers/scsi/qla2xxx/qla_version.h
+++ b/drivers/scsi/qla2xxx/qla_version.h
@@ -7,7 +7,7 @@
 /*
 * Driver version
 */
-#define QLA2XXX_VERSION      "8.02.01-k7"
+#define QLA2XXX_VERSION      "8.02.01-k9"
 #define QLA_DRIVER_MAJOR_VER    8
 #define QLA_DRIVER_MINOR_VER    2
diff --git a/drivers/scsi/qla4xxx/ql4_isr.c b/drivers/scsi/qla4xxx/ql4_isr.c
index a91a57c57bff..799120fcb9be 100644
--- a/drivers/scsi/qla4xxx/ql4_isr.c
+++ b/drivers/scsi/qla4xxx/ql4_isr.c
@@ -139,7 +139,7 @@ static void qla4xxx_status_entry(struct scsi_qla_host *ha,
                              ha->host_no, cmd->device->channel,
                              cmd->device->id, cmd->device->lun));
-                cmd->result = DID_BUS_BUSY << 16;
+                cmd->result = DID_TRANSPORT_DISRUPTED << 16;
                /*
                 * Mark device missing so that we won't continue to send
@@ -243,7 +243,7 @@ static void qla4xxx_status_entry(struct scsi_qla_host *ha,
                if (atomic_read(&ddb_entry->state) == DDB_STATE_ONLINE)
                        qla4xxx_mark_device_missing(ha, ddb_entry);
-                cmd->result = DID_BUS_BUSY << 16;
+                cmd->result = DID_TRANSPORT_DISRUPTED << 16;
                break;
        case SCS_QUEUE_FULL:
diff --git a/drivers/scsi/qla4xxx/ql4_os.c b/drivers/scsi/qla4xxx/ql4_os.c
index 88bebb13bc52..db7ea3bb4e83 100644
--- a/drivers/scsi/qla4xxx/ql4_os.c
+++ b/drivers/scsi/qla4xxx/ql4_os.c
@@ -353,7 +353,7 @@ void qla4xxx_mark_device_missing(struct scsi_qla_host *ha,
                      ha->host_no, ddb_entry->bus, ddb_entry->target,
                      ddb_entry->fw_ddb_index));
        iscsi_block_session(ddb_entry->sess);
-        iscsi_conn_error(ddb_entry->conn, ISCSI_ERR_CONN_FAILED);
+        iscsi_conn_error_event(ddb_entry->conn, ISCSI_ERR_CONN_FAILED);
 }
 static struct srb* qla4xxx_get_new_srb(struct scsi_qla_host *ha,
@@ -439,7 +439,7 @@ static int qla4xxx_queuecommand(struct scsi_cmnd *cmd,
                        cmd->result = DID_NO_CONNECT << 16;
                        goto qc_fail_command;
                }
-                goto qc_host_busy;
+                return SCSI_MLQUEUE_TARGET_BUSY;
        }
        if (test_bit(DPC_RESET_HA_INTR, &ha->dpc_flags))
@@ -1542,7 +1542,7 @@ static int qla4xxx_eh_device_reset(struct scsi_cmnd *cmd)
        DEBUG2(printk(KERN_INFO
                      "scsi%ld: DEVICE_RESET cmd=%p jiffies = 0x%lx, to=%x,"
                      "dpc_flags=%lx, status=%x allowed=%d\n", ha->host_no,
-                      cmd, jiffies, cmd->timeout_per_command / HZ,
+                      cmd, jiffies, cmd->request->timeout / HZ,
                      ha->dpc_flags, cmd->result, cmd->allowed));
        /* FIXME: wait for hba to go online */
@@ -1598,7 +1598,7 @@ static int qla4xxx_eh_target_reset(struct scsi_cmnd *cmd)
        DEBUG2(printk(KERN_INFO
                      "scsi%ld: TARGET_DEVICE_RESET cmd=%p jiffies = 0x%lx, "
                      "to=%x,dpc_flags=%lx, status=%x allowed=%d\n",
-                      ha->host_no, cmd, jiffies, cmd->timeout_per_command / HZ,
+                      ha->host_no, cmd, jiffies, cmd->request->timeout / HZ,
                      ha->dpc_flags, cmd->result, cmd->allowed));
        stat = qla4xxx_reset_target(ha, ddb_entry);
diff --git a/drivers/scsi/qlogicpti.c b/drivers/scsi/qlogicpti.c
index 905350896725..69d6ad862b60 100644
--- a/drivers/scsi/qlogicpti.c
+++ b/drivers/scsi/qlogicpti.c
@@ -1,6 +1,6 @@
 /* qlogicpti.c: Performance Technologies QlogicISP sbus card driver.
 *
- * Copyright (C) 1996, 2006 David S. Miller (davem@davemloft.net)
+ * Copyright (C) 1996, 2006, 2008 David S. Miller (davem@davemloft.net)
 *
 * A lot of this driver was directly stolen from Erik H. Moe's PCI
 * Qlogic ISP driver.  Mucho kudos to him for this code.
@@ -25,12 +25,14 @@
 #include <linux/interrupt.h>
 #include <linux/module.h>
 #include <linux/jiffies.h>
+#include <linux/dma-mapping.h>
+#include <linux/of.h>
+#include <linux/of_device.h>
 #include <asm/byteorder.h>
 #include "qlogicpti.h"
-#include <asm/sbus.h>
 #include <asm/dma.h>
 #include <asm/system.h>
 #include <asm/ptrace.h>
@@ -157,7 +159,7 @@ static inline void set_sbus_cfg1(struct qlogicpti *qpti)
         * is a nop and the chip ends up using the smallest burst
         * size. -DaveM
         */
-        if (sbus_can_burst64(qpti->sdev) && (bursts & DMA_BURST64)) {
+        if (sbus_can_burst64() && (bursts & DMA_BURST64)) {
                val = (SBUS_CFG1_BENAB | SBUS_CFG1_B64);
        } else
 #endif
@@ -684,19 +686,19 @@ static void __devexit qpti_chain_del(struct qlogicpti *qpti)
 static int __devinit qpti_map_regs(struct qlogicpti *qpti)
 {
-        struct sbus_dev *sdev = qpti->sdev;
+        struct of_device *op = qpti->op;
-        qpti->qregs = sbus_ioremap(&sdev->resource[0], 0,
+        qpti->qregs = of_ioremap(&op->resource[0], 0,
-                                   sdev->reg_addrs[0].reg_size,
+                                 resource_size(&op->resource[0]),
-                                   "PTI Qlogic/ISP");
+                                 "PTI Qlogic/ISP");
        if (!qpti->qregs) {
                printk("PTI: Qlogic/ISP registers are unmappable\n");
                return -1;
        }
        if (qpti->is_pti) {
-                qpti->sreg = sbus_ioremap(&sdev->resource[0], (16 * 4096),
+                qpti->sreg = of_ioremap(&op->resource[0], (16 * 4096),
-                                          sizeof(unsigned char),
+                                        sizeof(unsigned char),
-                                          "PTI Qlogic/ISP statreg");
+                                        "PTI Qlogic/ISP statreg");
                if (!qpti->sreg) {
                        printk("PTI: Qlogic/ISP status register is unmappable\n");
                        return -1;
@@ -707,9 +709,9 @@ static int __devinit qpti_map_regs(struct qlogicpti *qpti)
 static int __devinit qpti_register_irq(struct qlogicpti *qpti)
 {
-        struct sbus_dev *sdev = qpti->sdev;
+        struct of_device *op = qpti->op;
-        qpti->qhost->irq = qpti->irq = sdev->irqs[0];
+        qpti->qhost->irq = qpti->irq = op->irqs[0];
        /* We used to try various overly-clever things to
         * reduce the interrupt processing overhead on
@@ -732,17 +734,19 @@ fail:
 static void __devinit qpti_get_scsi_id(struct qlogicpti *qpti)
 {
-        qpti->scsi_id = prom_getintdefault(qpti->prom_node,
+        struct of_device *op = qpti->op;
-                                           "initiator-id",
+        struct device_node *dp;
-                                           -1);
+        dp = op->node;
+        qpti->scsi_id = of_getintprop_default(dp, "initiator-id", -1);
        if (qpti->scsi_id == -1)
-                qpti->scsi_id = prom_getintdefault(qpti->prom_node,
+                qpti->scsi_id = of_getintprop_default(dp, "scsi-initiator-id",
-                                                   "scsi-initiator-id",
+                                                      -1);
-                                                   -1);
        if (qpti->scsi_id == -1)
                qpti->scsi_id =
-                        prom_getintdefault(qpti->sdev->bus->prom_node,
+                        of_getintprop_default(dp->parent,
-                                           "scsi-initiator-id", 7);
+                                              "scsi-initiator-id", 7);
        qpti->qhost->this_id = qpti->scsi_id;
        qpti->qhost->max_sectors = 64;
@@ -751,12 +755,11 @@ static void __devinit qpti_get_scsi_id(struct qlogicpti *qpti)
 static void qpti_get_bursts(struct qlogicpti *qpti)
 {
-        struct sbus_dev *sdev = qpti->sdev;
+        struct of_device *op = qpti->op;
        u8 bursts, bmask;
-        bursts = prom_getintdefault(qpti->prom_node, "burst-sizes", 0xff);
+        bursts = of_getintprop_default(op->node, "burst-sizes", 0xff);
-        bmask = prom_getintdefault(sdev->bus->prom_node,
+        bmask = of_getintprop_default(op->node->parent, "burst-sizes", 0xff);
-                                   "burst-sizes", 0xff);
        if (bmask != 0xff)
                bursts &= bmask;
        if (bursts == 0xff ||
@@ -785,25 +788,25 @@ static void qpti_get_clock(struct qlogicpti *qpti)
 */
 static int __devinit qpti_map_queues(struct qlogicpti *qpti)
 {
-        struct sbus_dev *sdev = qpti->sdev;
+        struct of_device *op = qpti->op;
 #define QSIZE(entries)  (((entries) + 1) * QUEUE_ENTRY_LEN)
-        qpti->res_cpu = sbus_alloc_consistent(sdev,
+        qpti->res_cpu = dma_alloc_coherent(&op->dev,
-                                              QSIZE(RES_QUEUE_LEN),
+                                           QSIZE(RES_QUEUE_LEN),
-                                              &qpti->res_dvma);
+                                           &qpti->res_dvma, GFP_ATOMIC);
        if (qpti->res_cpu == NULL ||
            qpti->res_dvma == 0) {
                printk("QPTI: Cannot map response queue.\n");
                return -1;
        }
-        qpti->req_cpu = sbus_alloc_consistent(sdev,
+        qpti->req_cpu = dma_alloc_coherent(&op->dev,
-                                              QSIZE(QLOGICPTI_REQ_QUEUE_LEN),
+                                           QSIZE(QLOGICPTI_REQ_QUEUE_LEN),
-                                              &qpti->req_dvma);
+                                           &qpti->req_dvma, GFP_ATOMIC);
        if (qpti->req_cpu == NULL ||
            qpti->req_dvma == 0) {
-                sbus_free_consistent(sdev, QSIZE(RES_QUEUE_LEN),
+                dma_free_coherent(&op->dev, QSIZE(RES_QUEUE_LEN),
-                                     qpti->res_cpu, qpti->res_dvma);
+                                  qpti->res_cpu, qpti->res_dvma);
                printk("QPTI: Cannot map request queue.\n");
                return -1;
        }
@@ -875,8 +878,9 @@ static inline int load_cmd(struct scsi_cmnd *Cmnd, struct Command_Entry *cmd,
                int sg_count;
                sg = scsi_sglist(Cmnd);
-                sg_count = sbus_map_sg(qpti->sdev, sg, scsi_sg_count(Cmnd),
+                sg_count = dma_map_sg(&qpti->op->dev, sg,
-                                                      Cmnd->sc_data_direction);
+                                      scsi_sg_count(Cmnd),
+                                      Cmnd->sc_data_direction);
                ds = cmd->dataseg;
                cmd->segment_cnt = sg_count;
@@ -1152,9 +1156,9 @@ static struct scsi_cmnd *qlogicpti_intr_handler(struct qlogicpti *qpti)
                        Cmnd->result = DID_ERROR << 16;
                if (scsi_bufflen(Cmnd))
-                        sbus_unmap_sg(qpti->sdev,
+                        dma_unmap_sg(&qpti->op->dev,
-                                      scsi_sglist(Cmnd), scsi_sg_count(Cmnd),
+                                     scsi_sglist(Cmnd), scsi_sg_count(Cmnd),
-                                      Cmnd->sc_data_direction);
+                                     Cmnd->sc_data_direction);
                qpti->cmd_count[Cmnd->device->id]--;
                sbus_writew(out_ptr, qpti->qregs + MBOX5);
@@ -1268,34 +1272,32 @@ static struct scsi_host_template qpti_template = {
        .use_clustering         = ENABLE_CLUSTERING,
 };
-static int __devinit qpti_sbus_probe(struct of_device *dev, const struct of_device_id *match)
+static int __devinit qpti_sbus_probe(struct of_device *op, const struct of_device_id *match)
 {
-        static int nqptis;
-        struct sbus_dev *sdev = to_sbus_device(&dev->dev);
-        struct device_node *dp = dev->node;
        struct scsi_host_template *tpnt = match->data;
+        struct device_node *dp = op->node;
        struct Scsi_Host *host;
        struct qlogicpti *qpti;
+        static int nqptis;
        const char *fcode;
        /* Sometimes Antares cards come up not completely
         * setup, and we get a report of a zero IRQ.
         */
-        if (sdev->irqs[0] == 0)
+        if (op->irqs[0] == 0)
                return -ENODEV;
        host = scsi_host_alloc(tpnt, sizeof(struct qlogicpti));
        if (!host)
                return -ENOMEM;
-        qpti = (struct qlogicpti *) host->hostdata;
+        qpti = shost_priv(host);
        host->max_id = MAX_TARGETS;
        qpti->qhost = host;
-        qpti->sdev = sdev;
+        qpti->op = op;
        qpti->qpti_id = nqptis;
-        qpti->prom_node = sdev->prom_node;
+        strcpy(qpti->prom_name, op->node->name);
-        strcpy(qpti->prom_name, sdev->ofdev.node->name);
        qpti->is_pti = strcmp(qpti->prom_name, "QLGC,isp");
        if (qpti_map_regs(qpti) < 0)
@@ -1341,12 +1343,12 @@ static int __devinit qpti_sbus_probe(struct of_device *dev, const struct of_devi
                (qpti->ultra ? "Ultra" : "Fast"),
                (qpti->differential ? "differential" : "single ended"));
-        if (scsi_add_host(host, &dev->dev)) {
+        if (scsi_add_host(host, &op->dev)) {
                printk("qlogicpti%d: Failed scsi_add_host\n", qpti->qpti_id);
                goto fail_unmap_queues;
        }
-        dev_set_drvdata(&sdev->ofdev.dev, qpti);
+        dev_set_drvdata(&op->dev, qpti);
        qpti_chain_add(qpti);
@@ -1357,19 +1359,20 @@ static int __devinit qpti_sbus_probe(struct of_device *dev, const struct of_devi
 fail_unmap_queues:
 #define QSIZE(entries)  (((entries) + 1) * QUEUE_ENTRY_LEN)
-        sbus_free_consistent(qpti->sdev,
+        dma_free_coherent(&op->dev,
-                             QSIZE(RES_QUEUE_LEN),
+                          QSIZE(RES_QUEUE_LEN),
-                             qpti->res_cpu, qpti->res_dvma);
+                          qpti->res_cpu, qpti->res_dvma);
-        sbus_free_consistent(qpti->sdev,
+        dma_free_coherent(&op->dev,
-                             QSIZE(QLOGICPTI_REQ_QUEUE_LEN),
+                          QSIZE(QLOGICPTI_REQ_QUEUE_LEN),
-                             qpti->req_cpu, qpti->req_dvma);
+                          qpti->req_cpu, qpti->req_dvma);
 #undef QSIZE
 fail_unmap_regs:
-        sbus_iounmap(qpti->qregs,
+        of_iounmap(&op->resource[0], qpti->qregs,
-                     qpti->sdev->reg_addrs[0].reg_size);
+                   resource_size(&op->resource[0]));
        if (qpti->is_pti)
-                sbus_iounmap(qpti->sreg, sizeof(unsigned char));
+                of_iounmap(&op->resource[0], qpti->sreg,
+                           sizeof(unsigned char));
 fail_free_irq:
        free_irq(qpti->irq, qpti);
@@ -1380,9 +1383,9 @@ fail_unlink:
        return -ENODEV;
 }
-static int __devexit qpti_sbus_remove(struct of_device *dev)
+static int __devexit qpti_sbus_remove(struct of_device *op)
 {
-        struct qlogicpti *qpti = dev_get_drvdata(&dev->dev);
+        struct qlogicpti *qpti = dev_get_drvdata(&op->dev);
        qpti_chain_del(qpti);
@@ -1395,24 +1398,25 @@ static int __devexit qpti_sbus_remove(struct of_device *dev)
        free_irq(qpti->irq, qpti);
 #define QSIZE(entries)  (((entries) + 1) * QUEUE_ENTRY_LEN)
-        sbus_free_consistent(qpti->sdev,
+        dma_free_coherent(&op->dev,
-                             QSIZE(RES_QUEUE_LEN),
+                          QSIZE(RES_QUEUE_LEN),
-                             qpti->res_cpu, qpti->res_dvma);
+                          qpti->res_cpu, qpti->res_dvma);
-        sbus_free_consistent(qpti->sdev,
+        dma_free_coherent(&op->dev,
-                             QSIZE(QLOGICPTI_REQ_QUEUE_LEN),
+                          QSIZE(QLOGICPTI_REQ_QUEUE_LEN),
-                             qpti->req_cpu, qpti->req_dvma);
+                          qpti->req_cpu, qpti->req_dvma);
 #undef QSIZE
-        sbus_iounmap(qpti->qregs, qpti->sdev->reg_addrs[0].reg_size);
+        of_iounmap(&op->resource[0], qpti->qregs,
+                   resource_size(&op->resource[0]));
        if (qpti->is_pti)
-                sbus_iounmap(qpti->sreg, sizeof(unsigned char));
+                of_iounmap(&op->resource[0], qpti->sreg, sizeof(unsigned char));
        scsi_host_put(qpti->qhost);
        return 0;
 }
-static struct of_device_id qpti_match[] = {
+static const struct of_device_id qpti_match[] = {
        {
                .name = "ptisp",
                .data = &qpti_template,
@@ -1442,7 +1446,7 @@ static struct of_platform_driver qpti_sbus_driver = {
 static int __init qpti_init(void)
 {
-        return of_register_driver(&qpti_sbus_driver, &sbus_bus_type);
+        return of_register_driver(&qpti_sbus_driver, &of_bus_type);
 }
 static void __exit qpti_exit(void)
@@ -1453,7 +1457,7 @@ static void __exit qpti_exit(void)
 MODULE_DESCRIPTION("QlogicISP SBUS driver");
 MODULE_AUTHOR("David S. Miller (davem@davemloft.net)");
 MODULE_LICENSE("GPL");
-MODULE_VERSION("2.0");
+MODULE_VERSION("2.1");
 module_init(qpti_init);
 module_exit(qpti_exit);
diff --git a/drivers/scsi/qlogicpti.h b/drivers/scsi/qlogicpti.h
index ef6da2df584b..9c053bbaa877 100644
--- a/drivers/scsi/qlogicpti.h
+++ b/drivers/scsi/qlogicpti.h
@@ -342,7 +342,7 @@ struct qlogicpti {
        u_int                     req_in_ptr;           /* index of next request slot */
        u_int                     res_out_ptr;          /* index of next result slot  */
        long                      send_marker;          /* must we send a marker?     */
-        struct sbus_dev          *sdev;
+        struct of_device         *op;
        unsigned long             __pad;
        int                       cmd_count[MAX_TARGETS];
diff --git a/drivers/scsi/scsi.c b/drivers/scsi/scsi.c
index ee6be596503d..f8b79d401d58 100644
--- a/drivers/scsi/scsi.c
+++ b/drivers/scsi/scsi.c
@@ -291,7 +291,6 @@ struct scsi_cmnd *scsi_get_command(struct scsi_device *dev, gfp_t gfp_mask)
                unsigned long flags;
                cmd->device = dev;
-                init_timer(&cmd->eh_timeout);
                INIT_LIST_HEAD(&cmd->list);
                spin_lock_irqsave(&dev->list_lock, flags);
                list_add_tail(&cmd->list, &dev->cmd_list);
@@ -652,26 +651,33 @@ int scsi_dispatch_cmd(struct scsi_cmnd *cmd)
        unsigned long timeout;
        int rtn = 0;
+        /*
+         * We will use a queued command if possible, otherwise we will
+         * emulate the queuing and calling of completion function ourselves.
+         */
+        atomic_inc(&cmd->device->iorequest_cnt);
        /* check if the device is still usable */
        if (unlikely(cmd->device->sdev_state == SDEV_DEL)) {
                /* in SDEV_DEL we error all commands. DID_NO_CONNECT
                 * returns an immediate error upwards, and signals
                 * that the device is no longer present */
                cmd->result = DID_NO_CONNECT << 16;
-                atomic_inc(&cmd->device->iorequest_cnt);
+                scsi_done(cmd);
-                __scsi_done(cmd);
                /* return 0 (because the command has been processed) */
                goto out;
        }
-        /* Check to see if the scsi lld put this device into state SDEV_BLOCK. */
+        /* Check to see if the scsi lld made this device blocked. */
-        if (unlikely(cmd->device->sdev_state == SDEV_BLOCK)) {
+        if (unlikely(scsi_device_blocked(cmd->device))) {
                /* 
-                 * in SDEV_BLOCK, the command is just put back on the device
+                 * in blocked state, the command is just put back on
-                 * queue.  The suspend state has already blocked the queue so
+                 * the device queue.  The suspend state has already
-                 * future requests should not occur until the device 
+                 * blocked the queue so future requests should not
-                 * transitions out of the suspend state.
+                 * occur until the device transitions out of the
+                 * suspend state.
                 */
                scsi_queue_insert(cmd, SCSI_MLQUEUE_DEVICE_BUSY);
                SCSI_LOG_MLQUEUE(3, printk("queuecommand : device blocked \n"));
@@ -714,21 +720,9 @@ int scsi_dispatch_cmd(struct scsi_cmnd *cmd)
                host->resetting = 0;
        }
-        /* 
-         * AK: unlikely race here: for some reason the timer could
-         * expire before the serial number is set up below.
-         */
-        scsi_add_timer(cmd, cmd->timeout_per_command, scsi_times_out);
        scsi_log_send(cmd);
        /*
-         * We will use a queued command if possible, otherwise we will
-         * emulate the queuing and calling of completion function ourselves.
-         */
-        atomic_inc(&cmd->device->iorequest_cnt);
-        /*
         * Before we queue this command, check if the command
         * length exceeds what the host adapter can handle.
         */
@@ -744,6 +738,12 @@ int scsi_dispatch_cmd(struct scsi_cmnd *cmd)
        }
        spin_lock_irqsave(host->host_lock, flags);
+        /*
+         * AK: unlikely race here: for some reason the timer could
+         * expire before the serial number is set up below.
+         *
+         * TODO: kill serial or move to blk layer
+         */
        scsi_cmd_get_serial(host, cmd); 
        if (unlikely(host->shost_state == SHOST_DEL)) {
@@ -754,12 +754,12 @@ int scsi_dispatch_cmd(struct scsi_cmnd *cmd)
        }
        spin_unlock_irqrestore(host->host_lock, flags);
        if (rtn) {
-                if (scsi_delete_timer(cmd)) {
+                if (rtn != SCSI_MLQUEUE_DEVICE_BUSY &&
-                        atomic_inc(&cmd->device->iodone_cnt);
+                    rtn != SCSI_MLQUEUE_TARGET_BUSY)
-                        scsi_queue_insert(cmd,
+                        rtn = SCSI_MLQUEUE_HOST_BUSY;
-                                          (rtn == SCSI_MLQUEUE_DEVICE_BUSY) ?
-                                          rtn : SCSI_MLQUEUE_HOST_BUSY);
+                scsi_queue_insert(cmd, rtn);
-                }
                SCSI_LOG_MLQUEUE(3,
                    printk("queuecommand : request rejected\n"));
        }
@@ -770,24 +770,6 @@ int scsi_dispatch_cmd(struct scsi_cmnd *cmd)
 }
 /**
- * scsi_req_abort_cmd -- Request command recovery for the specified command
- * @cmd: pointer to the SCSI command of interest
- *
- * This function requests that SCSI Core start recovery for the
- * command by deleting the timer and adding the command to the eh
- * queue.  It can be called by either LLDDs or SCSI Core.  LLDDs who
- * implement their own error recovery MAY ignore the timeout event if
- * they generated scsi_req_abort_cmd.
- */
-void scsi_req_abort_cmd(struct scsi_cmnd *cmd)
-{
-        if (!scsi_delete_timer(cmd))
-                return;
-        scsi_times_out(cmd);
-}
-EXPORT_SYMBOL(scsi_req_abort_cmd);
-/**
 * scsi_done - Enqueue the finished SCSI command into the done queue.
 * @cmd: The SCSI Command for which a low-level device driver (LLDD) gives
 * ownership back to SCSI Core -- i.e. the LLDD has finished with it.
@@ -802,42 +784,7 @@ EXPORT_SYMBOL(scsi_req_abort_cmd);
 */
 static void scsi_done(struct scsi_cmnd *cmd)
 {
-        /*
+        blk_complete_request(cmd->request);
-         * We don't have to worry about this one timing out anymore.
-         * If we are unable to remove the timer, then the command
-         * has already timed out.  In which case, we have no choice but to
-         * let the timeout function run, as we have no idea where in fact
-         * that function could really be.  It might be on another processor,
-         * etc, etc.
-         */
-        if (!scsi_delete_timer(cmd))
-                return;
-        __scsi_done(cmd);
-}
-/* Private entry to scsi_done() to complete a command when the timer
- * isn't running --- used by scsi_times_out */
-void __scsi_done(struct scsi_cmnd *cmd)
-{
-        struct request *rq = cmd->request;
-        /*
-         * Set the serial numbers back to zero
-         */
-        cmd->serial_number = 0;
-        atomic_inc(&cmd->device->iodone_cnt);
-        if (cmd->result)
-                atomic_inc(&cmd->device->ioerr_cnt);
-        BUG_ON(!rq);
-        /*
-         * The uptodate/nbytes values don't matter, as we allow partial
-         * completes and thus will check this in the softirq callback
-         */
-        rq->completion_data = cmd;
-        blk_complete_request(rq);
 }
 /* Move this to a header if it becomes more generally useful */
@@ -857,6 +804,7 @@ static struct scsi_driver *scsi_cmd_to_driver(struct scsi_cmnd *cmd)
 void scsi_finish_command(struct scsi_cmnd *cmd)
 {
        struct scsi_device *sdev = cmd->device;
+        struct scsi_target *starget = scsi_target(sdev);
        struct Scsi_Host *shost = sdev->host;
        struct scsi_driver *drv;
        unsigned int good_bytes;
@@ -872,6 +820,7 @@ void scsi_finish_command(struct scsi_cmnd *cmd)
         * XXX(hch): What about locking?
         */
        shost->host_blocked = 0;
+        starget->target_blocked = 0;
        sdev->device_blocked = 0;
        /*
diff --git a/drivers/scsi/scsi_error.c b/drivers/scsi/scsi_error.c
index 39ce3aba1dac..386361778ebb 100644
--- a/drivers/scsi/scsi_error.c
+++ b/drivers/scsi/scsi_error.c
@@ -112,69 +112,8 @@ int scsi_eh_scmd_add(struct scsi_cmnd *scmd, int eh_flag)
 }
 /**
- * scsi_add_timer - Start timeout timer for a single scsi command.
- * @scmd:       scsi command that is about to start running.
- * @timeout:    amount of time to allow this command to run.
- * @complete:   timeout function to call if timer isn't canceled.
- *
- * Notes:
- *    This should be turned into an inline function.  Each scsi command
- *    has its own timer, and as it is added to the queue, we set up the
- *    timer.  When the command completes, we cancel the timer.
- */
-void scsi_add_timer(struct scsi_cmnd *scmd, int timeout,
-                    void (*complete)(struct scsi_cmnd *))
-{
-        /*
-         * If the clock was already running for this command, then
-         * first delete the timer.  The timer handling code gets rather
-         * confused if we don't do this.
-         */
-        if (scmd->eh_timeout.function)
-                del_timer(&scmd->eh_timeout);
-        scmd->eh_timeout.data = (unsigned long)scmd;
-        scmd->eh_timeout.expires = jiffies + timeout;
-        scmd->eh_timeout.function = (void (*)(unsigned long)) complete;
-        SCSI_LOG_ERROR_RECOVERY(5, printk("%s: scmd: %p, time:"
-                                          " %d, (%p)\n", __func__,
-                                          scmd, timeout, complete));
-        add_timer(&scmd->eh_timeout);
-}
-/**
- * scsi_delete_timer - Delete/cancel timer for a given function.
- * @scmd:       Cmd that we are canceling timer for
- *
- * Notes:
- *     This should be turned into an inline function.
- *
- * Return value:
- *     1 if we were able to detach the timer.  0 if we blew it, and the
- *     timer function has already started to run.
- */
-int scsi_delete_timer(struct scsi_cmnd *scmd)
-{
-        int rtn;
-        rtn = del_timer(&scmd->eh_timeout);
-        SCSI_LOG_ERROR_RECOVERY(5, printk("%s: scmd: %p,"
-                                         " rtn: %d\n", __func__,
-                                         scmd, rtn));
-        scmd->eh_timeout.data = (unsigned long)NULL;
-        scmd->eh_timeout.function = NULL;
-        return rtn;
-}
-/**
 * scsi_times_out - Timeout function for normal scsi commands.
- * @scmd:       Cmd that is timing out.
+ * @req:        request that is timing out.
 *
 * Notes:
 *     We do not need to lock this.  There is the potential for a race
@@ -182,9 +121,11 @@ int scsi_delete_timer(struct scsi_cmnd *scmd)
 *     normal completion function determines that the timer has already
 *     fired, then it mustn't do anything.
 */
-void scsi_times_out(struct scsi_cmnd *scmd)
+enum blk_eh_timer_return scsi_times_out(struct request *req)
 {
-        enum scsi_eh_timer_return (* eh_timed_out)(struct scsi_cmnd *);
+        struct scsi_cmnd *scmd = req->special;
+        enum blk_eh_timer_return (*eh_timed_out)(struct scsi_cmnd *);
+        enum blk_eh_timer_return rtn = BLK_EH_NOT_HANDLED;
        scsi_log_completion(scmd, TIMEOUT_ERROR);
@@ -196,22 +137,20 @@ void scsi_times_out(struct scsi_cmnd *scmd)
                eh_timed_out = NULL;
        if (eh_timed_out)
-                switch (eh_timed_out(scmd)) {
+                rtn = eh_timed_out(scmd);
-                case EH_HANDLED:
+                switch (rtn) {
-                        __scsi_done(scmd);
+                case BLK_EH_NOT_HANDLED:
-                        return;
-                case EH_RESET_TIMER:
-                        scsi_add_timer(scmd, scmd->timeout_per_command,
-                                       scsi_times_out);
-                        return;
-                case EH_NOT_HANDLED:
                        break;
+                default:
+                        return rtn;
                }
        if (unlikely(!scsi_eh_scmd_add(scmd, SCSI_EH_CANCEL_CMD))) {
                scmd->result |= DID_TIME_OUT << 16;
-                __scsi_done(scmd);
+                return BLK_EH_HANDLED;
        }
+        return BLK_EH_NOT_HANDLED;
 }
 /**
@@ -1126,10 +1065,10 @@ static int scsi_eh_target_reset(struct Scsi_Host *shost,
                                struct list_head *done_q)
 {
        struct scsi_cmnd *scmd, *tgtr_scmd, *next;
-        unsigned int id;
+        unsigned int id = 0;
        int rtn;
-        for (id = 0; id <= shost->max_id; id++) {
+        do {
                tgtr_scmd = NULL;
                list_for_each_entry(scmd, work_q, eh_entry) {
                        if (id == scmd_id(scmd)) {
@@ -1137,8 +1076,18 @@ static int scsi_eh_target_reset(struct Scsi_Host *shost,
                                break;
                        }
                }
+                if (!tgtr_scmd) {
+                        /* not one exactly equal; find the next highest */
+                        list_for_each_entry(scmd, work_q, eh_entry) {
+                                if (scmd_id(scmd) > id &&
+                                    (!tgtr_scmd ||
+                                     scmd_id(tgtr_scmd) > scmd_id(scmd)))
+                                                tgtr_scmd = scmd;
+                        }
+                }
                if (!tgtr_scmd)
-                        continue;
+                        /* no more commands, that's it */
+                        break;
                SCSI_LOG_ERROR_RECOVERY(3, printk("%s: Sending target reset "
                                                  "to target %d\n",
@@ -1157,7 +1106,8 @@ static int scsi_eh_target_reset(struct Scsi_Host *shost,
                                                          " failed target: "
                                                          "%d\n",
                                                          current->comm, id));
-        }
+                id++;
+        } while(id != 0);
        return list_empty(work_q);
 }
@@ -1280,6 +1230,40 @@ static void scsi_eh_offline_sdevs(struct list_head *work_q,
 }
 /**
+ * scsi_noretry_cmd - determinte if command should be failed fast
+ * @scmd:       SCSI cmd to examine.
+ */
+int scsi_noretry_cmd(struct scsi_cmnd *scmd)
+{
+        switch (host_byte(scmd->result)) {
+        case DID_OK:
+                break;
+        case DID_BUS_BUSY:
+                return blk_failfast_transport(scmd->request);
+        case DID_PARITY:
+                return blk_failfast_dev(scmd->request);
+        case DID_ERROR:
+                if (msg_byte(scmd->result) == COMMAND_COMPLETE &&
+                    status_byte(scmd->result) == RESERVATION_CONFLICT)
+                        return 0;
+                /* fall through */
+        case DID_SOFT_ERROR:
+                return blk_failfast_driver(scmd->request);
+        }
+        switch (status_byte(scmd->result)) {
+        case CHECK_CONDITION:
+                /*
+                 * assume caller has checked sense and determinted
+                 * the check condition was retryable.
+                 */
+                return blk_failfast_dev(scmd->request);
+        }
+        return 0;
+}
+/**
 * scsi_decide_disposition - Disposition a cmd on return from LLD.
 * @scmd:       SCSI cmd to examine.
 *
@@ -1351,7 +1335,21 @@ int scsi_decide_disposition(struct scsi_cmnd *scmd)
        case DID_REQUEUE:
                return ADD_TO_MLQUEUE;
+        case DID_TRANSPORT_DISRUPTED:
+                /*
+                 * LLD/transport was disrupted during processing of the IO.
+                 * The transport class is now blocked/blocking,
+                 * and the transport will decide what to do with the IO
+                 * based on its timers and recovery capablilities if
+                 * there are enough retries.
+                 */
+                goto maybe_retry;
+        case DID_TRANSPORT_FAILFAST:
+                /*
+                 * The transport decided to failfast the IO (most likely
+                 * the fast io fail tmo fired), so send IO directly upwards.
+                 */
+                return SUCCESS;
        case DID_ERROR:
                if (msg_byte(scmd->result) == COMMAND_COMPLETE &&
                    status_byte(scmd->result) == RESERVATION_CONFLICT)
@@ -1444,7 +1442,7 @@ int scsi_decide_disposition(struct scsi_cmnd *scmd)
         * even if the request is marked fast fail, we still requeue
         * for queue congestion conditions (QUEUE_FULL or BUSY) */
        if ((++scmd->retries) <= scmd->allowed
-            && !blk_noretry_request(scmd->request)) {
+            && !scsi_noretry_cmd(scmd)) {
                return NEEDS_RETRY;
        } else {
                /*
@@ -1569,7 +1567,7 @@ void scsi_eh_flush_done_q(struct list_head *done_q)
        list_for_each_entry_safe(scmd, next, done_q, eh_entry) {
                list_del_init(&scmd->eh_entry);
                if (scsi_device_online(scmd->device) &&
-                    !blk_noretry_request(scmd->request) &&
+                    !scsi_noretry_cmd(scmd) &&
                    (++scmd->retries <= scmd->allowed)) {
                        SCSI_LOG_ERROR_RECOVERY(3, printk("%s: flush"
                                                          " retry cmd: %p\n",
@@ -1793,7 +1791,6 @@ scsi_reset_provider(struct scsi_device *dev, int flag)
        blk_rq_init(NULL, &req);
        scmd->request = &req;
-        memset(&scmd->eh_timeout, 0, sizeof(scmd->eh_timeout));
        scmd->cmnd = req.cmd;
@@ -1804,8 +1801,6 @@ scsi_reset_provider(struct scsi_device *dev, int flag)
        scmd->sc_data_direction         = DMA_BIDIRECTIONAL;
-        init_timer(&scmd->eh_timeout);
        spin_lock_irqsave(shost->host_lock, flags);
        shost->tmf_in_progress = 1;
        spin_unlock_irqrestore(shost->host_lock, flags);
diff --git a/drivers/scsi/scsi_ioctl.c b/drivers/scsi/scsi_ioctl.c
index 28b19ef26309..dc1cfb2fd76b 100644
--- a/drivers/scsi/scsi_ioctl.c
+++ b/drivers/scsi/scsi_ioctl.c
@@ -237,7 +237,7 @@ int scsi_ioctl(struct scsi_device *sdev, int cmd, void __user *arg)
        case SCSI_IOCTL_SEND_COMMAND:
                if (!capable(CAP_SYS_ADMIN) || !capable(CAP_SYS_RAWIO))
                        return -EACCES;
-                return sg_scsi_ioctl(NULL, sdev->request_queue, NULL, arg);
+                return sg_scsi_ioctl(sdev->request_queue, NULL, 0, arg);
        case SCSI_IOCTL_DOORLOCK:
                return scsi_set_medium_removal(sdev, SCSI_REMOVAL_PREVENT);
        case SCSI_IOCTL_DOORUNLOCK:
@@ -277,14 +277,14 @@ EXPORT_SYMBOL(scsi_ioctl);
 * @filp: either NULL or a &struct file which must have the O_NONBLOCK flag.
 */
 int scsi_nonblockable_ioctl(struct scsi_device *sdev, int cmd,
-                            void __user *arg, struct file *filp)
+                            void __user *arg, int ndelay)
 {
        int val, result;
        /* The first set of iocts may be executed even if we're doing
         * error processing, as long as the device was opened
         * non-blocking */
-        if (filp && (filp->f_flags & O_NONBLOCK)) {
+        if (ndelay) {
                if (scsi_host_in_recovery(sdev->host))
                        return -ENODEV;
        } else if (!scsi_block_when_processing_errors(sdev))
diff --git a/drivers/scsi/scsi_lib.c b/drivers/scsi/scsi_lib.c
index 62307bd794a9..f5d3b96890dc 100644
--- a/drivers/scsi/scsi_lib.c
+++ b/drivers/scsi/scsi_lib.c
@@ -114,6 +114,7 @@ int scsi_queue_insert(struct scsi_cmnd *cmd, int reason)
 {
        struct Scsi_Host *host = cmd->device->host;
        struct scsi_device *device = cmd->device;
+        struct scsi_target *starget = scsi_target(device);
        struct request_queue *q = device->request_queue;
        unsigned long flags;
@@ -133,10 +134,17 @@ int scsi_queue_insert(struct scsi_cmnd *cmd, int reason)
         * if a command is requeued with no other commands outstanding
         * either for the device or for the host.
         */
-        if (reason == SCSI_MLQUEUE_HOST_BUSY)
+        switch (reason) {
+        case SCSI_MLQUEUE_HOST_BUSY:
                host->host_blocked = host->max_host_blocked;
-        else if (reason == SCSI_MLQUEUE_DEVICE_BUSY)
+                break;
+        case SCSI_MLQUEUE_DEVICE_BUSY:
                device->device_blocked = device->max_device_blocked;
+                break;
+        case SCSI_MLQUEUE_TARGET_BUSY:
+                starget->target_blocked = starget->max_target_blocked;
+                break;
+        }
        /*
         * Decrement the counters, since these commands are no longer
@@ -460,10 +468,12 @@ static void scsi_init_cmd_errh(struct scsi_cmnd *cmd)
 void scsi_device_unbusy(struct scsi_device *sdev)
 {
        struct Scsi_Host *shost = sdev->host;
+        struct scsi_target *starget = scsi_target(sdev);
        unsigned long flags;
        spin_lock_irqsave(shost->host_lock, flags);
        shost->host_busy--;
+        starget->target_busy--;
        if (unlikely(scsi_host_in_recovery(shost) &&
                     (shost->host_failed || shost->host_eh_scheduled)))
                scsi_eh_wakeup(shost);
@@ -519,6 +529,30 @@ static void scsi_single_lun_run(struct scsi_device *current_sdev)
        spin_unlock_irqrestore(shost->host_lock, flags);
 }
+static inline int scsi_device_is_busy(struct scsi_device *sdev)
+{
+        if (sdev->device_busy >= sdev->queue_depth || sdev->device_blocked)
+                return 1;
+        return 0;
+}
+static inline int scsi_target_is_busy(struct scsi_target *starget)
+{
+        return ((starget->can_queue > 0 &&
+                 starget->target_busy >= starget->can_queue) ||
+                 starget->target_blocked);
+}
+static inline int scsi_host_is_busy(struct Scsi_Host *shost)
+{
+        if ((shost->can_queue > 0 && shost->host_busy >= shost->can_queue) ||
+            shost->host_blocked || shost->host_self_blocked)
+                return 1;
+        return 0;
+}
 /*
 * Function:    scsi_run_queue()
 *
@@ -533,7 +567,7 @@ static void scsi_single_lun_run(struct scsi_device *current_sdev)
 */
 static void scsi_run_queue(struct request_queue *q)
 {
-        struct scsi_device *sdev = q->queuedata;
+        struct scsi_device *starved_head = NULL, *sdev = q->queuedata;
        struct Scsi_Host *shost = sdev->host;
        unsigned long flags;
@@ -541,11 +575,7 @@ static void scsi_run_queue(struct request_queue *q)
                scsi_single_lun_run(sdev);
        spin_lock_irqsave(shost->host_lock, flags);
-        while (!list_empty(&shost->starved_list) &&
+        while (!list_empty(&shost->starved_list) && !scsi_host_is_busy(shost)) {
-               !shost->host_blocked && !shost->host_self_blocked &&
-                !((shost->can_queue > 0) &&
-                  (shost->host_busy >= shost->can_queue))) {
                int flagset;
                /*
@@ -560,6 +590,21 @@ static void scsi_run_queue(struct request_queue *q)
                 */
                sdev = list_entry(shost->starved_list.next,
                                          struct scsi_device, starved_entry);
+                /*
+                 * The *queue_ready functions can add a device back onto the
+                 * starved list's tail, so we must check for a infinite loop.
+                 */
+                if (sdev == starved_head)
+                        break;
+                if (!starved_head)
+                        starved_head = sdev;
+                if (scsi_target_is_busy(scsi_target(sdev))) {
+                        list_move_tail(&sdev->starved_entry,
+                                       &shost->starved_list);
+                        continue;
+                }
                list_del_init(&sdev->starved_entry);
                spin_unlock(shost->host_lock);
@@ -575,13 +620,6 @@ static void scsi_run_queue(struct request_queue *q)
                spin_unlock(sdev->request_queue->queue_lock);
                spin_lock(shost->host_lock);
-                if (unlikely(!list_empty(&sdev->starved_entry)))
-                        /*
-                         * sdev lost a race, and was put back on the
-                         * starved list. This is unlikely but without this
-                         * in theory we could loop forever.
-                         */
-                        break;
        }
        spin_unlock_irqrestore(shost->host_lock, flags);
@@ -681,7 +719,7 @@ static struct scsi_cmnd *scsi_end_request(struct scsi_cmnd *cmd, int error,
                        leftover = req->data_len;
                /* kill remainder if no retrys */
-                if (error && blk_noretry_request(req))
+                if (error && scsi_noretry_cmd(cmd))
                        blk_end_request(req, error, leftover);
                else {
                        if (requeue) {
@@ -1181,7 +1219,6 @@ int scsi_setup_blk_pc_cmnd(struct scsi_device *sdev, struct request *req)
        
        cmd->transfersize = req->data_len;
        cmd->allowed = req->retries;
-        cmd->timeout_per_command = req->timeout;
        return BLKPREP_OK;
 }
 EXPORT_SYMBOL(scsi_setup_blk_pc_cmnd);
@@ -1251,6 +1288,7 @@ int scsi_prep_state_check(struct scsi_device *sdev, struct request *req)
                        break;
                case SDEV_QUIESCE:
                case SDEV_BLOCK:
+                case SDEV_CREATED_BLOCK:
                        /*
                         * If the devices is blocked we defer normal commands.
                         */
@@ -1323,8 +1361,6 @@ int scsi_prep_fn(struct request_queue *q, struct request *req)
 static inline int scsi_dev_queue_ready(struct request_queue *q,
                                  struct scsi_device *sdev)
 {
-        if (sdev->device_busy >= sdev->queue_depth)
-                return 0;
        if (sdev->device_busy == 0 && sdev->device_blocked) {
                /*
                 * unblock after device_blocked iterates to zero
@@ -1338,12 +1374,58 @@ static inline int scsi_dev_queue_ready(struct request_queue *q,
                        return 0;
                }
        }
-        if (sdev->device_blocked)
+        if (scsi_device_is_busy(sdev))
                return 0;
        return 1;
 }
+/*
+ * scsi_target_queue_ready: checks if there we can send commands to target
+ * @sdev: scsi device on starget to check.
+ *
+ * Called with the host lock held.
+ */
+static inline int scsi_target_queue_ready(struct Scsi_Host *shost,
+                                           struct scsi_device *sdev)
+{
+        struct scsi_target *starget = scsi_target(sdev);
+        if (starget->single_lun) {
+                if (starget->starget_sdev_user &&
+                    starget->starget_sdev_user != sdev)
+                        return 0;
+                starget->starget_sdev_user = sdev;
+        }
+        if (starget->target_busy == 0 && starget->target_blocked) {
+                /*
+                 * unblock after target_blocked iterates to zero
+                 */
+                if (--starget->target_blocked == 0) {
+                        SCSI_LOG_MLQUEUE(3, starget_printk(KERN_INFO, starget,
+                                         "unblocking target at zero depth\n"));
+                } else {
+                        blk_plug_device(sdev->request_queue);
+                        return 0;
+                }
+        }
+        if (scsi_target_is_busy(starget)) {
+                if (list_empty(&sdev->starved_entry)) {
+                        list_add_tail(&sdev->starved_entry,
+                                      &shost->starved_list);
+                        return 0;
+                }
+        }
+        /* We're OK to process the command, so we can't be starved */
+        if (!list_empty(&sdev->starved_entry))
+                list_del_init(&sdev->starved_entry);
+        return 1;
+}
 /*
 * scsi_host_queue_ready: if we can send requests to shost, return 1 else
 * return 0. We must end up running the queue again whenever 0 is
@@ -1369,8 +1451,7 @@ static inline int scsi_host_queue_ready(struct request_queue *q,
                        return 0;
                }
        }
-        if ((shost->can_queue > 0 && shost->host_busy >= shost->can_queue) ||
+        if (scsi_host_is_busy(shost)) {
-            shost->host_blocked || shost->host_self_blocked) {
                if (list_empty(&sdev->starved_entry))
                        list_add_tail(&sdev->starved_entry, &shost->starved_list);
                return 0;
@@ -1384,12 +1465,44 @@ static inline int scsi_host_queue_ready(struct request_queue *q,
 }
 /*
+ * Busy state exporting function for request stacking drivers.
+ *
+ * For efficiency, no lock is taken to check the busy state of
+ * shost/starget/sdev, since the returned value is not guaranteed and
+ * may be changed after request stacking drivers call the function,
+ * regardless of taking lock or not.
+ *
+ * When scsi can't dispatch I/Os anymore and needs to kill I/Os
+ * (e.g. !sdev), scsi needs to return 'not busy'.
+ * Otherwise, request stacking drivers may hold requests forever.
+ */
+static int scsi_lld_busy(struct request_queue *q)
+{
+        struct scsi_device *sdev = q->queuedata;
+        struct Scsi_Host *shost;
+        struct scsi_target *starget;
+        if (!sdev)
+                return 0;
+        shost = sdev->host;
+        starget = scsi_target(sdev);
+        if (scsi_host_in_recovery(shost) || scsi_host_is_busy(shost) ||
+            scsi_target_is_busy(starget) || scsi_device_is_busy(sdev))
+                return 1;
+        return 0;
+}
+/*
 * Kill a request for a dead device
 */
 static void scsi_kill_request(struct request *req, struct request_queue *q)
 {
        struct scsi_cmnd *cmd = req->special;
        struct scsi_device *sdev = cmd->device;
+        struct scsi_target *starget = scsi_target(sdev);
        struct Scsi_Host *shost = sdev->host;
        blkdev_dequeue_request(req);
@@ -1413,20 +1526,30 @@ static void scsi_kill_request(struct request *req, struct request_queue *q)
        spin_unlock(sdev->request_queue->queue_lock);
        spin_lock(shost->host_lock);
        shost->host_busy++;
+        starget->target_busy++;
        spin_unlock(shost->host_lock);
        spin_lock(sdev->request_queue->queue_lock);
-        __scsi_done(cmd);
+        blk_complete_request(req);
 }
 static void scsi_softirq_done(struct request *rq)
 {
-        struct scsi_cmnd *cmd = rq->completion_data;
+        struct scsi_cmnd *cmd = rq->special;
-        unsigned long wait_for = (cmd->allowed + 1) * cmd->timeout_per_command;
+        unsigned long wait_for = (cmd->allowed + 1) * rq->timeout;
        int disposition;
        INIT_LIST_HEAD(&cmd->eh_entry);
+        /*
+         * Set the serial numbers back to zero
+         */
+        cmd->serial_number = 0;
+        atomic_inc(&cmd->device->iodone_cnt);
+        if (cmd->result)
+                atomic_inc(&cmd->device->ioerr_cnt);
        disposition = scsi_decide_disposition(cmd);
        if (disposition != SUCCESS &&
            time_before(cmd->jiffies_at_alloc + wait_for, jiffies)) {
@@ -1541,14 +1664,13 @@ static void scsi_request_fn(struct request_queue *q)
                        goto not_ready;
                }
+                if (!scsi_target_queue_ready(shost, sdev))
+                        goto not_ready;
                if (!scsi_host_queue_ready(q, shost, sdev))
                        goto not_ready;
-                if (scsi_target(sdev)->single_lun) {
-                        if (scsi_target(sdev)->starget_sdev_user &&
+                scsi_target(sdev)->target_busy++;
-                            scsi_target(sdev)->starget_sdev_user != sdev)
-                                goto not_ready;
-                        scsi_target(sdev)->starget_sdev_user = sdev;
-                }
                shost->host_busy++;
                /*
@@ -1675,6 +1797,8 @@ struct request_queue *scsi_alloc_queue(struct scsi_device *sdev)
        blk_queue_prep_rq(q, scsi_prep_fn);
        blk_queue_softirq_done(q, scsi_softirq_done);
+        blk_queue_rq_timed_out(q, scsi_times_out);
+        blk_queue_lld_busy(q, scsi_lld_busy);
        return q;
 }
@@ -2023,22 +2147,21 @@ scsi_test_unit_ready(struct scsi_device *sdev, int timeout, int retries,
        do {
                result = scsi_execute_req(sdev, cmd, DMA_NONE, NULL, 0, sshdr,
                                          timeout, retries);
-        } while ((driver_byte(result) & DRIVER_SENSE) &&
+                if (sdev->removable && scsi_sense_valid(sshdr) &&
-                 sshdr && sshdr->sense_key == UNIT_ATTENTION &&
+                    sshdr->sense_key == UNIT_ATTENTION)
-                 --retries);
+                        sdev->changed = 1;
+        } while (scsi_sense_valid(sshdr) &&
+                 sshdr->sense_key == UNIT_ATTENTION && --retries);
        if (!sshdr)
                /* could not allocate sense buffer, so can't process it */
                return result;
-        if ((driver_byte(result) & DRIVER_SENSE) && sdev->removable) {
+        if (sdev->removable && scsi_sense_valid(sshdr) &&
+            (sshdr->sense_key == UNIT_ATTENTION ||
-                if ((scsi_sense_valid(sshdr)) &&
+             sshdr->sense_key == NOT_READY)) {
-                    ((sshdr->sense_key == UNIT_ATTENTION) ||
+                sdev->changed = 1;
-                     (sshdr->sense_key == NOT_READY))) {
+                result = 0;
-                        sdev->changed = 1;
-                        result = 0;
-                }
        }
        if (!sshdr_external)
                kfree(sshdr);
@@ -2064,10 +2187,13 @@ scsi_device_set_state(struct scsi_device *sdev, enum scsi_device_state state)
        switch (state) {
        case SDEV_CREATED:
-                /* There are no legal states that come back to
+                switch (oldstate) {
-                 * created.  This is the manually initialised start
+                case SDEV_CREATED_BLOCK:
-                 * state */
+                        break;
-                goto illegal;
+                default:
+                        goto illegal;
+                }
+                break;
                        
        case SDEV_RUNNING:
                switch (oldstate) {
@@ -2105,8 +2231,17 @@ scsi_device_set_state(struct scsi_device *sdev, enum scsi_device_state state)
        case SDEV_BLOCK:
                switch (oldstate) {
-                case SDEV_CREATED:
                case SDEV_RUNNING:
+                case SDEV_CREATED_BLOCK:
+                        break;
+                default:
+                        goto illegal;
+                }
+                break;
+        case SDEV_CREATED_BLOCK:
+                switch (oldstate) {
+                case SDEV_CREATED:
                        break;
                default:
                        goto illegal;
@@ -2394,8 +2529,12 @@ scsi_internal_device_block(struct scsi_device *sdev)
        int err = 0;
        err = scsi_device_set_state(sdev, SDEV_BLOCK);
-        if (err)
+        if (err) {
-                return err;
+                err = scsi_device_set_state(sdev, SDEV_CREATED_BLOCK);
+                if (err)
+                        return err;
+        }
        /* 
         * The device has transitioned to SDEV_BLOCK.  Stop the
@@ -2438,8 +2577,12 @@ scsi_internal_device_unblock(struct scsi_device *sdev)
         * and goose the device queue if successful.  
         */
        err = scsi_device_set_state(sdev, SDEV_RUNNING);
-        if (err)
+        if (err) {
-                return err;
+                err = scsi_device_set_state(sdev, SDEV_CREATED);
+                if (err)
+                        return err;
+        }
        spin_lock_irqsave(q->queue_lock, flags);
        blk_start_queue(q);
diff --git a/drivers/scsi/scsi_netlink.c b/drivers/scsi/scsi_netlink.c
index ae7ed9a22662..723fdecd91bd 100644
--- a/drivers/scsi/scsi_netlink.c
+++ b/drivers/scsi/scsi_netlink.c
@@ -21,6 +21,7 @@
 #include <linux/time.h>
 #include <linux/jiffies.h>
 #include <linux/security.h>
+#include <linux/delay.h>
 #include <net/sock.h>
 #include <net/netlink.h>
@@ -30,6 +31,39 @@
 struct sock *scsi_nl_sock = NULL;
 EXPORT_SYMBOL_GPL(scsi_nl_sock);
+static DEFINE_SPINLOCK(scsi_nl_lock);
+static struct list_head scsi_nl_drivers;
+static u32      scsi_nl_state;
+#define STATE_EHANDLER_BSY              0x00000001
+struct scsi_nl_transport {
+        int (*msg_handler)(struct sk_buff *);
+        void (*event_handler)(struct notifier_block *, unsigned long, void *);
+        unsigned int refcnt;
+        int flags;
+};
+/* flags values (bit flags) */
+#define HANDLER_DELETING                0x1
+static struct scsi_nl_transport transports[SCSI_NL_MAX_TRANSPORTS] =
+        { {NULL, }, };
+struct scsi_nl_drvr {
+        struct list_head next;
+        int (*dmsg_handler)(struct Scsi_Host *shost, void *payload,
+                                 u32 len, u32 pid);
+        void (*devt_handler)(struct notifier_block *nb,
+                                 unsigned long event, void *notify_ptr);
+        struct scsi_host_template *hostt;
+        u64 vendor_id;
+        unsigned int refcnt;
+        int flags;
+};
 /**
 * scsi_nl_rcv_msg - Receive message handler.
@@ -45,8 +79,9 @@ scsi_nl_rcv_msg(struct sk_buff *skb)
 {
        struct nlmsghdr *nlh;
        struct scsi_nl_hdr *hdr;
-        uint32_t rlen;
+        unsigned long flags;
-        int err;
+        u32 rlen;
+        int err, tport;
        while (skb->len >= NLMSG_SPACE(0)) {
                err = 0;
@@ -65,7 +100,7 @@ scsi_nl_rcv_msg(struct sk_buff *skb)
                if (nlh->nlmsg_type != SCSI_TRANSPORT_MSG) {
                        err = -EBADMSG;
-                        return;
+                        goto next_msg;
                }
                hdr = NLMSG_DATA(nlh);
@@ -83,12 +118,27 @@ scsi_nl_rcv_msg(struct sk_buff *skb)
                if (nlh->nlmsg_len < (sizeof(*nlh) + hdr->msglen)) {
                        printk(KERN_WARNING "%s: discarding partial message\n",
                                 __func__);
-                        return;
+                        goto next_msg;
                }
                /*
-                 * We currently don't support anyone sending us a message
+                 * Deliver message to the appropriate transport
                 */
+                spin_lock_irqsave(&scsi_nl_lock, flags);
+                tport = hdr->transport;
+                if ((tport < SCSI_NL_MAX_TRANSPORTS) &&
+                    !(transports[tport].flags & HANDLER_DELETING) &&
+                    (transports[tport].msg_handler)) {
+                        transports[tport].refcnt++;
+                        spin_unlock_irqrestore(&scsi_nl_lock, flags);
+                        err = transports[tport].msg_handler(skb);
+                        spin_lock_irqsave(&scsi_nl_lock, flags);
+                        transports[tport].refcnt--;
+                } else
+                        err = -ENOENT;
+                spin_unlock_irqrestore(&scsi_nl_lock, flags);
 next_msg:
                if ((err) || (nlh->nlmsg_flags & NLM_F_ACK))
@@ -110,14 +160,42 @@ static int
 scsi_nl_rcv_event(struct notifier_block *this, unsigned long event, void *ptr)
 {
        struct netlink_notify *n = ptr;
+        struct scsi_nl_drvr *driver;
+        unsigned long flags;
+        int tport;
        if (n->protocol != NETLINK_SCSITRANSPORT)
                return NOTIFY_DONE;
+        spin_lock_irqsave(&scsi_nl_lock, flags);
+        scsi_nl_state |= STATE_EHANDLER_BSY;
+        /*
+         * Pass event on to any transports that may be listening
+         */
+        for (tport = 0; tport < SCSI_NL_MAX_TRANSPORTS; tport++) {
+                if (!(transports[tport].flags & HANDLER_DELETING) &&
+                    (transports[tport].event_handler)) {
+                        spin_unlock_irqrestore(&scsi_nl_lock, flags);
+                        transports[tport].event_handler(this, event, ptr);
+                        spin_lock_irqsave(&scsi_nl_lock, flags);
+                }
+        }
        /*
-         * Currently, we are not tracking PID's, etc. There is nothing
+         * Pass event on to any drivers that may be listening
-         * to handle.
         */
+        list_for_each_entry(driver, &scsi_nl_drivers, next) {
+                if (!(driver->flags & HANDLER_DELETING) &&
+                    (driver->devt_handler)) {
+                        spin_unlock_irqrestore(&scsi_nl_lock, flags);
+                        driver->devt_handler(this, event, ptr);
+                        spin_lock_irqsave(&scsi_nl_lock, flags);
+                }
+        }
+        scsi_nl_state &= ~STATE_EHANDLER_BSY;
+        spin_unlock_irqrestore(&scsi_nl_lock, flags);
        return NOTIFY_DONE;
 }
@@ -127,8 +205,279 @@ static struct notifier_block scsi_netlink_notifier = {
 };
+/*
+ * GENERIC SCSI transport receive and event handlers
+ */
+/**
+ * scsi_generic_msg_handler - receive message handler for GENERIC transport messages
+ * @skb:                socket receive buffer
+ **/
+static int
+scsi_generic_msg_handler(struct sk_buff *skb)
+{
+        struct nlmsghdr *nlh = nlmsg_hdr(skb);
+        struct scsi_nl_hdr *snlh = NLMSG_DATA(nlh);
+        struct scsi_nl_drvr *driver;
+        struct Scsi_Host *shost;
+        unsigned long flags;
+        int err = 0, match, pid;
+        pid = NETLINK_CREDS(skb)->pid;
+        switch (snlh->msgtype) {
+        case SCSI_NL_SHOST_VENDOR:
+                {
+                struct scsi_nl_host_vendor_msg *msg = NLMSG_DATA(nlh);
+                /* Locate the driver that corresponds to the message */
+                spin_lock_irqsave(&scsi_nl_lock, flags);
+                match = 0;
+                list_for_each_entry(driver, &scsi_nl_drivers, next) {
+                        if (driver->vendor_id == msg->vendor_id) {
+                                match = 1;
+                                break;
+                        }
+                }
+                if ((!match) || (!driver->dmsg_handler)) {
+                        spin_unlock_irqrestore(&scsi_nl_lock, flags);
+                        err = -ESRCH;
+                        goto rcv_exit;
+                }
+                if (driver->flags & HANDLER_DELETING) {
+                        spin_unlock_irqrestore(&scsi_nl_lock, flags);
+                        err = -ESHUTDOWN;
+                        goto rcv_exit;
+                }
+                driver->refcnt++;
+                spin_unlock_irqrestore(&scsi_nl_lock, flags);
+                /* if successful, scsi_host_lookup takes a shost reference */
+                shost = scsi_host_lookup(msg->host_no);
+                if (!shost) {
+                        err = -ENODEV;
+                        goto driver_exit;
+                }
+                /* is this host owned by the vendor ? */
+                if (shost->hostt != driver->hostt) {
+                        err = -EINVAL;
+                        goto vendormsg_put;
+                }
+                /* pass message on to the driver */
+                err = driver->dmsg_handler(shost, (void *)&msg[1],
+                                         msg->vmsg_datalen, pid);
+vendormsg_put:
+                /* release reference by scsi_host_lookup */
+                scsi_host_put(shost);
+driver_exit:
+                /* release our own reference on the registration object */
+                spin_lock_irqsave(&scsi_nl_lock, flags);
+                driver->refcnt--;
+                spin_unlock_irqrestore(&scsi_nl_lock, flags);
+                break;
+                }
+        default:
+                err = -EBADR;
+                break;
+        }
+rcv_exit:
+        if (err)
+                printk(KERN_WARNING "%s: Msgtype %d failed - err %d\n",
+                         __func__, snlh->msgtype, err);
+        return err;
+}
+/**
+ * scsi_nl_add_transport -
+ *    Registers message and event handlers for a transport. Enables
+ *    receipt of netlink messages and events to a transport.
+ *
+ * @tport:              transport registering handlers
+ * @msg_handler:        receive message handler callback
+ * @event_handler:      receive event handler callback
+ **/
+int
+scsi_nl_add_transport(u8 tport,
+        int (*msg_handler)(struct sk_buff *),
+        void (*event_handler)(struct notifier_block *, unsigned long, void *))
+{
+        unsigned long flags;
+        int err = 0;
+        if (tport >= SCSI_NL_MAX_TRANSPORTS)
+                return -EINVAL;
+        spin_lock_irqsave(&scsi_nl_lock, flags);
+        if (scsi_nl_state & STATE_EHANDLER_BSY) {
+                spin_unlock_irqrestore(&scsi_nl_lock, flags);
+                msleep(1);
+                spin_lock_irqsave(&scsi_nl_lock, flags);
+        }
+        if (transports[tport].msg_handler || transports[tport].event_handler) {
+                err = -EALREADY;
+                goto register_out;
+        }
+        transports[tport].msg_handler = msg_handler;
+        transports[tport].event_handler = event_handler;
+        transports[tport].flags = 0;
+        transports[tport].refcnt = 0;
+register_out:
+        spin_unlock_irqrestore(&scsi_nl_lock, flags);
+        return err;
+}
+EXPORT_SYMBOL_GPL(scsi_nl_add_transport);
 /**
- * scsi_netlink_init - Called by SCSI subsystem to intialize the SCSI transport netlink interface
+ * scsi_nl_remove_transport -
+ *    Disable transport receiption of messages and events
+ *
+ * @tport:              transport deregistering handlers
+ *
+ **/
+void
+scsi_nl_remove_transport(u8 tport)
+{
+        unsigned long flags;
+        spin_lock_irqsave(&scsi_nl_lock, flags);
+        if (scsi_nl_state & STATE_EHANDLER_BSY) {
+                spin_unlock_irqrestore(&scsi_nl_lock, flags);
+                msleep(1);
+                spin_lock_irqsave(&scsi_nl_lock, flags);
+        }
+        if (tport < SCSI_NL_MAX_TRANSPORTS) {
+                transports[tport].flags |= HANDLER_DELETING;
+                while (transports[tport].refcnt != 0) {
+                        spin_unlock_irqrestore(&scsi_nl_lock, flags);
+                        schedule_timeout_uninterruptible(HZ/4);
+                        spin_lock_irqsave(&scsi_nl_lock, flags);
+                }
+                transports[tport].msg_handler = NULL;
+                transports[tport].event_handler = NULL;
+                transports[tport].flags = 0;
+        }
+        spin_unlock_irqrestore(&scsi_nl_lock, flags);
+        return;
+}
+EXPORT_SYMBOL_GPL(scsi_nl_remove_transport);
+/**
+ * scsi_nl_add_driver -
+ *    A driver is registering its interfaces for SCSI netlink messages
+ *
+ * @vendor_id:          A unique identification value for the driver.
+ * @hostt:              address of the driver's host template. Used
+ *                      to verify an shost is bound to the driver
+ * @nlmsg_handler:      receive message handler callback
+ * @nlevt_handler:      receive event handler callback
+ *
+ * Returns:
+ *   0 on Success
+ *   error result otherwise
+ **/
+int
+scsi_nl_add_driver(u64 vendor_id, struct scsi_host_template *hostt,
+        int (*nlmsg_handler)(struct Scsi_Host *shost, void *payload,
+                                 u32 len, u32 pid),
+        void (*nlevt_handler)(struct notifier_block *nb,
+                                 unsigned long event, void *notify_ptr))
+{
+        struct scsi_nl_drvr *driver;
+        unsigned long flags;
+        driver = kzalloc(sizeof(*driver), GFP_KERNEL);
+        if (unlikely(!driver)) {
+                printk(KERN_ERR "%s: allocation failure\n", __func__);
+                return -ENOMEM;
+        }
+        driver->dmsg_handler = nlmsg_handler;
+        driver->devt_handler = nlevt_handler;
+        driver->hostt = hostt;
+        driver->vendor_id = vendor_id;
+        spin_lock_irqsave(&scsi_nl_lock, flags);
+        if (scsi_nl_state & STATE_EHANDLER_BSY) {
+                spin_unlock_irqrestore(&scsi_nl_lock, flags);
+                msleep(1);
+                spin_lock_irqsave(&scsi_nl_lock, flags);
+        }
+        list_add_tail(&driver->next, &scsi_nl_drivers);
+        spin_unlock_irqrestore(&scsi_nl_lock, flags);
+        return 0;
+}
+EXPORT_SYMBOL_GPL(scsi_nl_add_driver);
+/**
+ * scsi_nl_remove_driver -
+ *    An driver is unregistering with the SCSI netlink messages
+ *
+ * @vendor_id:          The unique identification value for the driver.
+ **/
+void
+scsi_nl_remove_driver(u64 vendor_id)
+{
+        struct scsi_nl_drvr *driver;
+        unsigned long flags;
+        spin_lock_irqsave(&scsi_nl_lock, flags);
+        if (scsi_nl_state & STATE_EHANDLER_BSY) {
+                spin_unlock_irqrestore(&scsi_nl_lock, flags);
+                msleep(1);
+                spin_lock_irqsave(&scsi_nl_lock, flags);
+        }
+        list_for_each_entry(driver, &scsi_nl_drivers, next) {
+                if (driver->vendor_id == vendor_id) {
+                        driver->flags |= HANDLER_DELETING;
+                        while (driver->refcnt != 0) {
+                                spin_unlock_irqrestore(&scsi_nl_lock, flags);
+                                schedule_timeout_uninterruptible(HZ/4);
+                                spin_lock_irqsave(&scsi_nl_lock, flags);
+                        }
+                        list_del(&driver->next);
+                        kfree(driver);
+                        spin_unlock_irqrestore(&scsi_nl_lock, flags);
+                        return;
+                }
+        }
+        spin_unlock_irqrestore(&scsi_nl_lock, flags);
+        printk(KERN_ERR "%s: removal of driver failed - vendor_id 0x%llx\n",
+               __func__, (unsigned long long)vendor_id);
+        return;
+}
+EXPORT_SYMBOL_GPL(scsi_nl_remove_driver);
+/**
+ * scsi_netlink_init - Called by SCSI subsystem to intialize
+ *      the SCSI transport netlink interface
 *
 **/
 void
@@ -136,6 +485,8 @@ scsi_netlink_init(void)
 {
        int error;
+        INIT_LIST_HEAD(&scsi_nl_drivers);
        error = netlink_register_notifier(&scsi_netlink_notifier);
        if (error) {
                printk(KERN_ERR "%s: register of event handler failed - %d\n",
@@ -150,8 +501,15 @@ scsi_netlink_init(void)
                printk(KERN_ERR "%s: register of recieve handler failed\n",
                                __func__);
                netlink_unregister_notifier(&scsi_netlink_notifier);
+                return;
        }
+        /* Register the entry points for the generic SCSI transport */
+        error = scsi_nl_add_transport(SCSI_NL_TRANSPORT,
+                                scsi_generic_msg_handler, NULL);
+        if (error)
+                printk(KERN_ERR "%s: register of GENERIC transport handler"
+                                "  failed - %d\n", __func__, error);
        return;
 }
@@ -163,6 +521,8 @@ scsi_netlink_init(void)
 void
 scsi_netlink_exit(void)
 {
+        scsi_nl_remove_transport(SCSI_NL_TRANSPORT);
        if (scsi_nl_sock) {
                netlink_kernel_release(scsi_nl_sock);
                netlink_unregister_notifier(&scsi_netlink_notifier);
@@ -172,3 +532,147 @@ scsi_netlink_exit(void)
 }
+/*
+ * Exported Interfaces
+ */
+/**
+ * scsi_nl_send_transport_msg -
+ *    Generic function to send a single message from a SCSI transport to
+ *    a single process
+ *
+ * @pid:                receiving pid
+ * @hdr:                message payload
+ *
+ **/
+void
+scsi_nl_send_transport_msg(u32 pid, struct scsi_nl_hdr *hdr)
+{
+        struct sk_buff *skb;
+        struct nlmsghdr *nlh;
+        const char *fn;
+        char *datab;
+        u32 len, skblen;
+        int err;
+        if (!scsi_nl_sock) {
+                err = -ENOENT;
+                fn = "netlink socket";
+                goto msg_fail;
+        }
+        len = NLMSG_SPACE(hdr->msglen);
+        skblen = NLMSG_SPACE(len);
+        skb = alloc_skb(skblen, GFP_KERNEL);
+        if (!skb) {
+                err = -ENOBUFS;
+                fn = "alloc_skb";
+                goto msg_fail;
+        }
+        nlh = nlmsg_put(skb, pid, 0, SCSI_TRANSPORT_MSG, len - sizeof(*nlh), 0);
+        if (!nlh) {
+                err = -ENOBUFS;
+                fn = "nlmsg_put";
+                goto msg_fail_skb;
+        }
+        datab = NLMSG_DATA(nlh);
+        memcpy(datab, hdr, hdr->msglen);
+        err = nlmsg_unicast(scsi_nl_sock, skb, pid);
+        if (err < 0) {
+                fn = "nlmsg_unicast";
+                /* nlmsg_unicast already kfree_skb'd */
+                goto msg_fail;
+        }
+        return;
+msg_fail_skb:
+        kfree_skb(skb);
+msg_fail:
+        printk(KERN_WARNING
+                "%s: Dropped Message : pid %d Transport %d, msgtype x%x, "
+                "msglen %d: %s : err %d\n",
+                __func__, pid, hdr->transport, hdr->msgtype, hdr->msglen,
+                fn, err);
+        return;
+}
+EXPORT_SYMBOL_GPL(scsi_nl_send_transport_msg);
+/**
+ * scsi_nl_send_vendor_msg - called to send a shost vendor unique message
+ *                      to a specific process id.
+ *
+ * @pid:                process id of the receiver
+ * @host_no:            host # sending the message
+ * @vendor_id:          unique identifier for the driver's vendor
+ * @data_len:           amount, in bytes, of vendor unique payload data
+ * @data_buf:           pointer to vendor unique data buffer
+ *
+ * Returns:
+ *   0 on succesful return
+ *   otherwise, failing error code
+ *
+ * Notes:
+ *      This routine assumes no locks are held on entry.
+ */
+int
+scsi_nl_send_vendor_msg(u32 pid, unsigned short host_no, u64 vendor_id,
+                         char *data_buf, u32 data_len)
+{
+        struct sk_buff *skb;
+        struct nlmsghdr *nlh;
+        struct scsi_nl_host_vendor_msg *msg;
+        u32 len, skblen;
+        int err;
+        if (!scsi_nl_sock) {
+                err = -ENOENT;
+                goto send_vendor_fail;
+        }
+        len = SCSI_NL_MSGALIGN(sizeof(*msg) + data_len);
+        skblen = NLMSG_SPACE(len);
+        skb = alloc_skb(skblen, GFP_KERNEL);
+        if (!skb) {
+                err = -ENOBUFS;
+                goto send_vendor_fail;
+        }
+        nlh = nlmsg_put(skb, 0, 0, SCSI_TRANSPORT_MSG,
+                                skblen - sizeof(*nlh), 0);
+        if (!nlh) {
+                err = -ENOBUFS;
+                goto send_vendor_fail_skb;
+        }
+        msg = NLMSG_DATA(nlh);
+        INIT_SCSI_NL_HDR(&msg->snlh, SCSI_NL_TRANSPORT,
+                                SCSI_NL_SHOST_VENDOR, len);
+        msg->vendor_id = vendor_id;
+        msg->host_no = host_no;
+        msg->vmsg_datalen = data_len;   /* bytes */
+        memcpy(&msg[1], data_buf, data_len);
+        err = nlmsg_unicast(scsi_nl_sock, skb, pid);
+        if (err)
+                /* nlmsg_multicast already kfree_skb'd */
+                goto send_vendor_fail;
+        return 0;
+send_vendor_fail_skb:
+        kfree_skb(skb);
+send_vendor_fail:
+        printk(KERN_WARNING
+                "%s: Dropped SCSI Msg : host %d vendor_unique - err %d\n",
+                __func__, host_no, err);
+        return err;
+}
+EXPORT_SYMBOL(scsi_nl_send_vendor_msg);
diff --git a/drivers/scsi/scsi_priv.h b/drivers/scsi/scsi_priv.h
index 79f0f7511204..e1850904ff73 100644
--- a/drivers/scsi/scsi_priv.h
+++ b/drivers/scsi/scsi_priv.h
@@ -4,6 +4,7 @@
 #include <linux/device.h>
 struct request_queue;
+struct request;
 struct scsi_cmnd;
 struct scsi_device;
 struct scsi_host_template;
@@ -27,7 +28,6 @@ extern void scsi_exit_hosts(void);
 extern int scsi_dispatch_cmd(struct scsi_cmnd *cmd);
 extern int scsi_setup_command_freelist(struct Scsi_Host *shost);
 extern void scsi_destroy_command_freelist(struct Scsi_Host *shost);
-extern void __scsi_done(struct scsi_cmnd *cmd);
 #ifdef CONFIG_SCSI_LOGGING
 void scsi_log_send(struct scsi_cmnd *cmd);
 void scsi_log_completion(struct scsi_cmnd *cmd, int disposition);
@@ -49,10 +49,7 @@ extern int __init scsi_init_devinfo(void);
 extern void scsi_exit_devinfo(void);
 /* scsi_error.c */
-extern void scsi_add_timer(struct scsi_cmnd *, int,
+extern enum blk_eh_timer_return scsi_times_out(struct request *req);
-                void (*)(struct scsi_cmnd *));
-extern int scsi_delete_timer(struct scsi_cmnd *);
-extern void scsi_times_out(struct scsi_cmnd *cmd);
 extern int scsi_error_handler(void *host);
 extern int scsi_decide_disposition(struct scsi_cmnd *cmd);
 extern void scsi_eh_wakeup(struct Scsi_Host *shost);
@@ -62,6 +59,7 @@ void scsi_eh_ready_devs(struct Scsi_Host *shost,
                        struct list_head *done_q);
 int scsi_eh_get_sense(struct list_head *work_q,
                      struct list_head *done_q);
+int scsi_noretry_cmd(struct scsi_cmnd *scmd);
 /* scsi_lib.c */
 extern int scsi_maybe_unblock_host(struct scsi_device *sdev);
diff --git a/drivers/scsi/scsi_proc.c b/drivers/scsi/scsi_proc.c
index c6a904a45bf9..82f7b2dd08a2 100644
--- a/drivers/scsi/scsi_proc.c
+++ b/drivers/scsi/scsi_proc.c
@@ -259,8 +259,8 @@ static int scsi_add_single_device(uint host, uint channel, uint id, uint lun)
        int error = -ENXIO;
        shost = scsi_host_lookup(host);
-        if (IS_ERR(shost))
+        if (!shost)
-                return PTR_ERR(shost);
+                return error;
        if (shost->transportt->user_scan)
                error = shost->transportt->user_scan(shost, channel, id, lun);
@@ -287,8 +287,8 @@ static int scsi_remove_single_device(uint host, uint channel, uint id, uint lun)
        int error = -ENXIO;
        shost = scsi_host_lookup(host);
-        if (IS_ERR(shost))
+        if (!shost)
-                return PTR_ERR(shost);
+                return error;
        sdev = scsi_device_lookup(shost, channel, id, lun);
        if (sdev) {
                scsi_remove_device(sdev);
diff --git a/drivers/scsi/scsi_scan.c b/drivers/scsi/scsi_scan.c
index 34d0de6cd511..b14dc02c3ded 100644
--- a/drivers/scsi/scsi_scan.c
+++ b/drivers/scsi/scsi_scan.c
@@ -419,6 +419,7 @@ static struct scsi_target *scsi_alloc_target(struct device *parent,
        dev->type = &scsi_target_type;
        starget->id = id;
        starget->channel = channel;
+        starget->can_queue = 0;
        INIT_LIST_HEAD(&starget->siblings);
        INIT_LIST_HEAD(&starget->devices);
        starget->state = STARGET_CREATED;
@@ -730,6 +731,8 @@ static int scsi_probe_lun(struct scsi_device *sdev, unsigned char *inq_result,
 static int scsi_add_lun(struct scsi_device *sdev, unsigned char *inq_result,
                int *bflags, int async)
 {
+        int ret;
        /*
         * XXX do not save the inquiry, since it can change underneath us,
         * save just vendor/model/rev.
@@ -885,7 +888,17 @@ static int scsi_add_lun(struct scsi_device *sdev, unsigned char *inq_result,
        /* set the device running here so that slave configure
         * may do I/O */
-        scsi_device_set_state(sdev, SDEV_RUNNING);
+        ret = scsi_device_set_state(sdev, SDEV_RUNNING);
+        if (ret) {
+                ret = scsi_device_set_state(sdev, SDEV_BLOCK);
+                if (ret) {
+                        sdev_printk(KERN_ERR, sdev,
+                                    "in wrong state %s to complete scan\n",
+                                    scsi_device_state_name(sdev->sdev_state));
+                        return SCSI_SCAN_NO_RESPONSE;
+                }
+        }
        if (*bflags & BLIST_MS_192_BYTES_FOR_3F)
                sdev->use_192_bytes_for_3f = 1;
@@ -899,7 +912,7 @@ static int scsi_add_lun(struct scsi_device *sdev, unsigned char *inq_result,
        transport_configure_device(&sdev->sdev_gendev);
        if (sdev->host->hostt->slave_configure) {
-                int ret = sdev->host->hostt->slave_configure(sdev);
+                ret = sdev->host->hostt->slave_configure(sdev);
                if (ret) {
                        /*
                         * if LLDD reports slave not present, don't clutter
@@ -994,7 +1007,7 @@ static int scsi_probe_and_add_lun(struct scsi_target *starget,
         */
        sdev = scsi_device_lookup_by_target(starget, lun);
        if (sdev) {
-                if (rescan || sdev->sdev_state != SDEV_CREATED) {
+                if (rescan || !scsi_device_created(sdev)) {
                        SCSI_LOG_SCAN_BUS(3, printk(KERN_INFO
                                "scsi scan: device exists on %s\n",
                                sdev->sdev_gendev.bus_id));
@@ -1467,7 +1480,7 @@ static int scsi_report_lun_scan(struct scsi_target *starget, int bflags,
        kfree(lun_data);
 out:
        scsi_device_put(sdev);
-        if (sdev->sdev_state == SDEV_CREATED)
+        if (scsi_device_created(sdev))
                /*
                 * the sdev we used didn't appear in the report luns scan
                 */
diff --git a/drivers/scsi/scsi_sysfs.c b/drivers/scsi/scsi_sysfs.c
index ab3c71869be5..93c28f30bbd7 100644
--- a/drivers/scsi/scsi_sysfs.c
+++ b/drivers/scsi/scsi_sysfs.c
@@ -34,6 +34,7 @@ static const struct {
        { SDEV_QUIESCE, "quiesce" },
        { SDEV_OFFLINE, "offline" },
        { SDEV_BLOCK,   "blocked" },
+        { SDEV_CREATED_BLOCK, "created-blocked" },
 };
 const char *scsi_device_state_name(enum scsi_device_state state)
@@ -560,12 +561,15 @@ sdev_rd_attr (vendor, "%.8s\n");
 sdev_rd_attr (model, "%.16s\n");
 sdev_rd_attr (rev, "%.4s\n");
+/*
+ * TODO: can we make these symlinks to the block layer ones?
+ */
 static ssize_t
 sdev_show_timeout (struct device *dev, struct device_attribute *attr, char *buf)
 {
        struct scsi_device *sdev;
        sdev = to_scsi_device(dev);
-        return snprintf (buf, 20, "%d\n", sdev->timeout / HZ);
+        return snprintf(buf, 20, "%d\n", sdev->request_queue->rq_timeout / HZ);
 }
 static ssize_t
@@ -576,7 +580,7 @@ sdev_store_timeout (struct device *dev, struct device_attribute *attr,
        int timeout;
        sdev = to_scsi_device(dev);
        sscanf (buf, "%d\n", &timeout);
-        sdev->timeout = timeout * HZ;
+        blk_queue_rq_timeout(sdev->request_queue, timeout * HZ);
        return count;
 }
 static DEVICE_ATTR(timeout, S_IRUGO | S_IWUSR, sdev_show_timeout, sdev_store_timeout);
diff --git a/drivers/scsi/scsi_tgt_lib.c b/drivers/scsi/scsi_tgt_lib.c
index 257e097c39af..48ba413f7f6a 100644
--- a/drivers/scsi/scsi_tgt_lib.c
+++ b/drivers/scsi/scsi_tgt_lib.c
@@ -362,7 +362,7 @@ static int scsi_map_user_pages(struct scsi_tgt_cmd *tcmd, struct scsi_cmnd *cmd,
        int err;
        dprintk("%lx %u\n", uaddr, len);
-        err = blk_rq_map_user(q, rq, (void *)uaddr, len);
+        err = blk_rq_map_user(q, rq, NULL, (void *)uaddr, len, GFP_KERNEL);
        if (err) {
                /*
                 * TODO: need to fixup sg_tablesize, max_segment_size,
@@ -460,7 +460,7 @@ int scsi_tgt_kspace_exec(int host_no, u64 itn_id, int result, u64 tag,
        /* TODO: replace with a O(1) alg */
        shost = scsi_host_lookup(host_no);
-        if (IS_ERR(shost)) {
+        if (!shost) {
                printk(KERN_ERR "Could not find host no %d\n", host_no);
                return -EINVAL;
        }
@@ -550,7 +550,7 @@ int scsi_tgt_kspace_tsk_mgmt(int host_no, u64 itn_id, u64 mid, int result)
        dprintk("%d %d %llx\n", host_no, result, (unsigned long long) mid);
        shost = scsi_host_lookup(host_no);
-        if (IS_ERR(shost)) {
+        if (!shost) {
                printk(KERN_ERR "Could not find host no %d\n", host_no);
                return err;
        }
@@ -603,7 +603,7 @@ int scsi_tgt_kspace_it_nexus_rsp(int host_no, u64 itn_id, int result)
        dprintk("%d %d%llx\n", host_no, result, (unsigned long long)itn_id);
        shost = scsi_host_lookup(host_no);
-        if (IS_ERR(shost)) {
+        if (!shost) {
                printk(KERN_ERR "Could not find host no %d\n", host_no);
                return err;
        }
diff --git a/drivers/scsi/scsi_transport_fc.c b/drivers/scsi/scsi_transport_fc.c
index 56823fd1fb84..1e71abf0607a 100644
--- a/drivers/scsi/scsi_transport_fc.c
+++ b/drivers/scsi/scsi_transport_fc.c
@@ -40,31 +40,7 @@
 static int fc_queue_work(struct Scsi_Host *, struct work_struct *);
 static void fc_vport_sched_delete(struct work_struct *work);
+static int fc_vport_setup(struct Scsi_Host *shost, int channel,
-/*
- * This is a temporary carrier for creating a vport. It will eventually
- * be replaced  by a real message definition for sgio or netlink.
- *
- * fc_vport_identifiers: This set of data contains all elements
- * to uniquely identify and instantiate a FC virtual port.
- *
- * Notes:
- *   symbolic_name: The driver is to append the symbolic_name string data
- *      to the symbolic_node_name data that it generates by default.
- *      the resulting combination should then be registered with the switch.
- *      It is expected that things like Xen may stuff a VM title into
- *      this field.
- */
-struct fc_vport_identifiers {
-        u64 node_name;
-        u64 port_name;
-        u32 roles;
-        bool disable;
-        enum fc_port_type vport_type;   /* only FC_PORTTYPE_NPIV allowed */
-        char symbolic_name[FC_VPORT_SYMBOLIC_NAMELEN];
-};
-static int fc_vport_create(struct Scsi_Host *shost, int channel,
        struct device *pdev, struct fc_vport_identifiers  *ids,
        struct fc_vport **vport);
@@ -1760,7 +1736,7 @@ store_fc_host_vport_create(struct device *dev, struct device_attribute *attr,
        vid.disable = false;            /* always enabled */
        /* we only allow support on Channel 0 !!! */
-        stat = fc_vport_create(shost, 0, &shost->shost_gendev, &vid, &vport);
+        stat = fc_vport_setup(shost, 0, &shost->shost_gendev, &vid, &vport);
        return stat ? stat : count;
 }
 static FC_DEVICE_ATTR(host, vport_create, S_IWUSR, NULL,
@@ -1950,15 +1926,15 @@ static int fc_vport_match(struct attribute_container *cont,
 * Notes:
 *      This routine assumes no locks are held on entry.
 */
-static enum scsi_eh_timer_return
+static enum blk_eh_timer_return
 fc_timed_out(struct scsi_cmnd *scmd)
 {
        struct fc_rport *rport = starget_to_rport(scsi_target(scmd->device));
        if (rport->port_state == FC_PORTSTATE_BLOCKED)
-                return EH_RESET_TIMER;
+                return BLK_EH_RESET_TIMER;
-        return EH_NOT_HANDLED;
+        return BLK_EH_NOT_HANDLED;
 }
 /*
@@ -2157,8 +2133,7 @@ fc_attach_transport(struct fc_function_template *ft)
        SETUP_PRIVATE_RPORT_ATTRIBUTE_RD(roles);
        SETUP_PRIVATE_RPORT_ATTRIBUTE_RD(port_state);
        SETUP_PRIVATE_RPORT_ATTRIBUTE_RD(scsi_target_id);
-        if (ft->terminate_rport_io)
+        SETUP_PRIVATE_RPORT_ATTRIBUTE_RW(fast_io_fail_tmo);
-                SETUP_PRIVATE_RPORT_ATTRIBUTE_RW(fast_io_fail_tmo);
        BUG_ON(count > FC_RPORT_NUM_ATTRS);
@@ -2352,6 +2327,22 @@ fc_remove_host(struct Scsi_Host *shost)
 }
 EXPORT_SYMBOL(fc_remove_host);
+static void fc_terminate_rport_io(struct fc_rport *rport)
+{
+        struct Scsi_Host *shost = rport_to_shost(rport);
+        struct fc_internal *i = to_fc_internal(shost->transportt);
+        /* Involve the LLDD if possible to terminate all io on the rport. */
+        if (i->f->terminate_rport_io)
+                i->f->terminate_rport_io(rport);
+        /*
+         * must unblock to flush queued IO. The caller will have set
+         * the port_state or flags, so that fc_remote_port_chkready will
+         * fail IO.
+         */
+        scsi_target_unblock(&rport->dev);
+}
 /**
 * fc_starget_delete - called to delete the scsi decendents of an rport
@@ -2364,13 +2355,8 @@ fc_starget_delete(struct work_struct *work)
 {
        struct fc_rport *rport =
                container_of(work, struct fc_rport, stgt_delete_work);
-        struct Scsi_Host *shost = rport_to_shost(rport);
-        struct fc_internal *i = to_fc_internal(shost->transportt);
-        /* Involve the LLDD if possible to terminate all io on the rport. */
-        if (i->f->terminate_rport_io)
-                i->f->terminate_rport_io(rport);
+        fc_terminate_rport_io(rport);
        scsi_remove_target(&rport->dev);
 }
@@ -2396,10 +2382,7 @@ fc_rport_final_delete(struct work_struct *work)
        if (rport->flags & FC_RPORT_SCAN_PENDING)
                scsi_flush_work(shost);
-        /* involve the LLDD to terminate all pending i/o */
+        fc_terminate_rport_io(rport);
-        if (i->f->terminate_rport_io)
-                i->f->terminate_rport_io(rport);
        /*
         * Cancel any outstanding timers. These should really exist
         * only when rmmod'ing the LLDD and we're asking for
@@ -2663,7 +2646,8 @@ fc_remote_port_add(struct Scsi_Host *shost, int channel,
                                spin_lock_irqsave(shost->host_lock, flags);
-                                rport->flags &= ~FC_RPORT_DEVLOSS_PENDING;
+                                rport->flags &= ~(FC_RPORT_FAST_FAIL_TIMEDOUT |
+                                                  FC_RPORT_DEVLOSS_PENDING);
                                /* if target, initiate a scan */
                                if (rport->scsi_target_id != -1) {
@@ -2726,6 +2710,7 @@ fc_remote_port_add(struct Scsi_Host *shost, int channel,
                        rport->port_id = ids->port_id;
                        rport->roles = ids->roles;
                        rport->port_state = FC_PORTSTATE_ONLINE;
+                        rport->flags &= ~FC_RPORT_FAST_FAIL_TIMEDOUT;
                        if (fci->f->dd_fcrport_size)
                                memset(rport->dd_data, 0,
@@ -2808,7 +2793,6 @@ void
 fc_remote_port_delete(struct fc_rport  *rport)
 {
        struct Scsi_Host *shost = rport_to_shost(rport);
-        struct fc_internal *i = to_fc_internal(shost->transportt);
        int timeout = rport->dev_loss_tmo;
        unsigned long flags;
@@ -2854,7 +2838,7 @@ fc_remote_port_delete(struct fc_rport  *rport)
        /* see if we need to kill io faster than waiting for device loss */
        if ((rport->fast_io_fail_tmo != -1) &&
-            (rport->fast_io_fail_tmo < timeout) && (i->f->terminate_rport_io))
+            (rport->fast_io_fail_tmo < timeout))
                fc_queue_devloss_work(shost, &rport->fail_io_work,
                                        rport->fast_io_fail_tmo * HZ);
@@ -2930,7 +2914,8 @@ fc_remote_port_rolechg(struct fc_rport  *rport, u32 roles)
                        fc_flush_devloss(shost);
                spin_lock_irqsave(shost->host_lock, flags);
-                rport->flags &= ~FC_RPORT_DEVLOSS_PENDING;
+                rport->flags &= ~(FC_RPORT_FAST_FAIL_TIMEDOUT |
+                                  FC_RPORT_DEVLOSS_PENDING);
                spin_unlock_irqrestore(shost->host_lock, flags);
                /* ensure any stgt delete functions are done */
@@ -3025,6 +3010,7 @@ fc_timeout_deleted_rport(struct work_struct *work)
        rport->supported_classes = FC_COS_UNSPECIFIED;
        rport->roles = FC_PORT_ROLE_UNKNOWN;
        rport->port_state = FC_PORTSTATE_NOTPRESENT;
+        rport->flags &= ~FC_RPORT_FAST_FAIL_TIMEDOUT;
        /* remove the identifiers that aren't used in the consisting binding */
        switch (fc_host->tgtid_bind_type) {
@@ -3067,13 +3053,12 @@ fc_timeout_fail_rport_io(struct work_struct *work)
 {
        struct fc_rport *rport =
                container_of(work, struct fc_rport, fail_io_work.work);
-        struct Scsi_Host *shost = rport_to_shost(rport);
-        struct fc_internal *i = to_fc_internal(shost->transportt);
        if (rport->port_state != FC_PORTSTATE_BLOCKED)
                return;
-        i->f->terminate_rport_io(rport);
+        rport->flags |= FC_RPORT_FAST_FAIL_TIMEDOUT;
+        fc_terminate_rport_io(rport);
 }
 /**
@@ -3103,7 +3088,7 @@ fc_scsi_scan_rport(struct work_struct *work)
 /**
- * fc_vport_create - allocates and creates a FC virtual port.
+ * fc_vport_setup - allocates and creates a FC virtual port.
 * @shost:      scsi host the virtual port is connected to.
 * @channel:    Channel on shost port connected to.
 * @pdev:       parent device for vport
@@ -3118,7 +3103,7 @@ fc_scsi_scan_rport(struct work_struct *work)
 *      This routine assumes no locks are held on entry.
 */
 static int
-fc_vport_create(struct Scsi_Host *shost, int channel, struct device *pdev,
+fc_vport_setup(struct Scsi_Host *shost, int channel, struct device *pdev,
        struct fc_vport_identifiers  *ids, struct fc_vport **ret_vport)
 {
        struct fc_host_attrs *fc_host = shost_to_fc_host(shost);
@@ -3231,6 +3216,28 @@ delete_vport:
        return error;
 }
+/**
+ * fc_vport_create - Admin App or LLDD requests creation of a vport
+ * @shost:      scsi host the virtual port is connected to.
+ * @channel:    channel on shost port connected to.
+ * @ids:        The world wide names, FC4 port roles, etc for
+ *              the virtual port.
+ *
+ * Notes:
+ *      This routine assumes no locks are held on entry.
+ */
+struct fc_vport *
+fc_vport_create(struct Scsi_Host *shost, int channel,
+        struct fc_vport_identifiers *ids)
+{
+        int stat;
+        struct fc_vport *vport;
+        stat = fc_vport_setup(shost, channel, &shost->shost_gendev,
+                 ids, &vport);
+        return stat ? NULL : vport;
+}
+EXPORT_SYMBOL(fc_vport_create);
 /**
 * fc_vport_terminate - Admin App or LLDD requests termination of a vport
diff --git a/drivers/scsi/scsi_transport_iscsi.c b/drivers/scsi/scsi_transport_iscsi.c
index 043c3921164f..4a803ebaf508 100644
--- a/drivers/scsi/scsi_transport_iscsi.c
+++ b/drivers/scsi/scsi_transport_iscsi.c
@@ -138,7 +138,7 @@ static ssize_t
 show_ep_handle(struct device *dev, struct device_attribute *attr, char *buf)
 {
        struct iscsi_endpoint *ep = iscsi_dev_to_endpoint(dev);
-        return sprintf(buf, "%u\n", ep->id);
+        return sprintf(buf, "%llu\n", (unsigned long long) ep->id);
 }
 static ISCSI_ATTR(ep, handle, S_IRUGO, show_ep_handle, NULL);
@@ -156,7 +156,7 @@ static struct attribute_group iscsi_endpoint_group = {
 static int iscsi_match_epid(struct device *dev, void *data)
 {
        struct iscsi_endpoint *ep = iscsi_dev_to_endpoint(dev);
-        unsigned int *epid = (unsigned int *) data;
+        uint64_t *epid = (uint64_t *) data;
        return *epid == ep->id;
 }
@@ -166,7 +166,7 @@ iscsi_create_endpoint(int dd_size)
 {
        struct device *dev;
        struct iscsi_endpoint *ep;
-        unsigned int id;
+        uint64_t id;
        int err;
        for (id = 1; id < ISCSI_MAX_EPID; id++) {
@@ -187,7 +187,8 @@ iscsi_create_endpoint(int dd_size)
        ep->id = id;
        ep->dev.class = &iscsi_endpoint_class;
-        snprintf(ep->dev.bus_id, BUS_ID_SIZE, "ep-%u", id);
+        snprintf(ep->dev.bus_id, BUS_ID_SIZE, "ep-%llu",
+                 (unsigned long long) id);
        err = device_register(&ep->dev);
        if (err)
                goto free_ep;
@@ -374,10 +375,10 @@ int iscsi_session_chkready(struct iscsi_cls_session *session)
                err = 0;
                break;
        case ISCSI_SESSION_FAILED:
-                err = DID_IMM_RETRY << 16;
+                err = DID_TRANSPORT_DISRUPTED << 16;
                break;
        case ISCSI_SESSION_FREE:
-                err = DID_NO_CONNECT << 16;
+                err = DID_TRANSPORT_FAILFAST << 16;
                break;
        default:
                err = DID_NO_CONNECT << 16;
@@ -1010,7 +1011,7 @@ int iscsi_recv_pdu(struct iscsi_cls_conn *conn, struct iscsi_hdr *hdr,
        skb = alloc_skb(len, GFP_ATOMIC);
        if (!skb) {
-                iscsi_conn_error(conn, ISCSI_ERR_CONN_FAILED);
+                iscsi_conn_error_event(conn, ISCSI_ERR_CONN_FAILED);
                iscsi_cls_conn_printk(KERN_ERR, conn, "can not deliver "
                                      "control PDU: OOM\n");
                return -ENOMEM;
@@ -1031,7 +1032,7 @@ int iscsi_recv_pdu(struct iscsi_cls_conn *conn, struct iscsi_hdr *hdr,
 }
 EXPORT_SYMBOL_GPL(iscsi_recv_pdu);
-void iscsi_conn_error(struct iscsi_cls_conn *conn, enum iscsi_err error)
+void iscsi_conn_error_event(struct iscsi_cls_conn *conn, enum iscsi_err error)
 {
        struct nlmsghdr *nlh;
        struct sk_buff  *skb;
@@ -1063,7 +1064,7 @@ void iscsi_conn_error(struct iscsi_cls_conn *conn, enum iscsi_err error)
        iscsi_cls_conn_printk(KERN_INFO, conn, "detected conn error (%d)\n",
                              error);
 }
-EXPORT_SYMBOL_GPL(iscsi_conn_error);
+EXPORT_SYMBOL_GPL(iscsi_conn_error_event);
 static int
 iscsi_if_send_reply(int pid, int seq, int type, int done, int multi,
@@ -1361,7 +1362,7 @@ iscsi_tgt_dscvr(struct iscsi_transport *transport,
                return -EINVAL;
        shost = scsi_host_lookup(ev->u.tgt_dscvr.host_no);
-        if (IS_ERR(shost)) {
+        if (!shost) {
                printk(KERN_ERR "target discovery could not find host no %u\n",
                       ev->u.tgt_dscvr.host_no);
                return -ENODEV;
@@ -1387,7 +1388,7 @@ iscsi_set_host_param(struct iscsi_transport *transport,
                return -ENOSYS;
        shost = scsi_host_lookup(ev->u.set_host_param.host_no);
-        if (IS_ERR(shost)) {
+        if (!shost) {
                printk(KERN_ERR "set_host_param could not find host no %u\n",
                       ev->u.set_host_param.host_no);
                return -ENODEV;
diff --git a/drivers/scsi/scsi_transport_spi.c b/drivers/scsi/scsi_transport_spi.c
index b29360ed0bdc..7c2d28924d2a 100644
--- a/drivers/scsi/scsi_transport_spi.c
+++ b/drivers/scsi/scsi_transport_spi.c
@@ -109,7 +109,9 @@ static int spi_execute(struct scsi_device *sdev, const void *cmd,
        for(i = 0; i < DV_RETRIES; i++) {
                result = scsi_execute(sdev, cmd, dir, buffer, bufflen,
                                      sense, DV_TIMEOUT, /* retries */ 1,
-                                      REQ_FAILFAST);
+                                      REQ_FAILFAST_DEV |
+                                      REQ_FAILFAST_TRANSPORT |
+                                      REQ_FAILFAST_DRIVER);
                if (result & DRIVER_SENSE) {
                        struct scsi_sense_hdr sshdr_tmp;
                        if (!sshdr)
diff --git a/drivers/scsi/sd.c b/drivers/scsi/sd.c
index e5e7d7856454..c9e1242eaf25 100644
--- a/drivers/scsi/sd.c
+++ b/drivers/scsi/sd.c
@@ -47,6 +47,7 @@
 #include <linux/blkpg.h>
 #include <linux/delay.h>
 #include <linux/mutex.h>
+#include <linux/string_helpers.h>
 #include <asm/uaccess.h>
 #include <scsi/scsi.h>
@@ -86,6 +87,12 @@ MODULE_ALIAS_SCSI_DEVICE(TYPE_DISK);
 MODULE_ALIAS_SCSI_DEVICE(TYPE_MOD);
 MODULE_ALIAS_SCSI_DEVICE(TYPE_RBC);
+#if !defined(CONFIG_DEBUG_BLOCK_EXT_DEVT)
+#define SD_MINORS       16
+#else
+#define SD_MINORS       0
+#endif
 static int  sd_revalidate_disk(struct gendisk *);
 static int  sd_probe(struct device *);
 static int  sd_remove(struct device *);
@@ -159,7 +166,7 @@ sd_store_cache_type(struct device *dev, struct device_attribute *attr,
                        sd_print_sense_hdr(sdkp, &sshdr);
                return -EINVAL;
        }
-        sd_revalidate_disk(sdkp->disk);
+        revalidate_disk(sdkp->disk);
        return count;
 }
@@ -377,8 +384,7 @@ static int sd_prep_fn(struct request_queue *q, struct request *rq)
        sector_t block = rq->sector;
        sector_t threshold;
        unsigned int this_count = rq->nr_sectors;
-        unsigned int timeout = sdp->timeout;
+        int ret, host_dif;
-        int ret;
        if (rq->cmd_type == REQ_TYPE_BLOCK_PC) {
                ret = scsi_setup_blk_pc_cmnd(sdp, rq);
@@ -509,7 +515,8 @@ static int sd_prep_fn(struct request_queue *q, struct request *rq)
                                        rq->nr_sectors));
        /* Set RDPROTECT/WRPROTECT if disk is formatted with DIF */
-        if (scsi_host_dif_capable(sdp->host, sdkp->protection_type))
+        host_dif = scsi_host_dif_capable(sdp->host, sdkp->protection_type);
+        if (host_dif)
                SCpnt->cmnd[1] = 1 << 5;
        else
                SCpnt->cmnd[1] = 0;
@@ -567,8 +574,9 @@ static int sd_prep_fn(struct request_queue *q, struct request *rq)
        SCpnt->sdb.length = this_count * sdp->sector_size;
        /* If DIF or DIX is enabled, tell HBA how to handle request */
-        if (sdkp->protection_type || scsi_prot_sg_count(SCpnt))
+        if (host_dif || scsi_prot_sg_count(SCpnt))
-                sd_dif_op(SCpnt, sdkp->protection_type, scsi_prot_sg_count(SCpnt));
+                sd_dif_op(SCpnt, host_dif, scsi_prot_sg_count(SCpnt),
+                          sdkp->protection_type);
        /*
         * We shouldn't disconnect in the middle of a sector, so with a dumb
@@ -578,7 +586,6 @@ static int sd_prep_fn(struct request_queue *q, struct request *rq)
        SCpnt->transfersize = sdp->sector_size;
        SCpnt->underflow = this_count << 9;
        SCpnt->allowed = SD_MAX_RETRIES;
-        SCpnt->timeout_per_command = timeout;
        /*
         * This indicates that the command is ready from our end to be
@@ -602,17 +609,15 @@ static int sd_prep_fn(struct request_queue *q, struct request *rq)
 *      In the latter case @inode and @filp carry an abridged amount
 *      of information as noted above.
 **/
-static int sd_open(struct inode *inode, struct file *filp)
+static int sd_open(struct block_device *bdev, fmode_t mode)
 {
-        struct gendisk *disk = inode->i_bdev->bd_disk;
+        struct scsi_disk *sdkp = scsi_disk_get(bdev->bd_disk);
-        struct scsi_disk *sdkp;
        struct scsi_device *sdev;
        int retval;
-        if (!(sdkp = scsi_disk_get(disk)))
+        if (!sdkp)
                return -ENXIO;
        SCSI_LOG_HLQUEUE(3, sd_printk(KERN_INFO, sdkp, "sd_open\n"));
        sdev = sdkp->device;
@@ -626,14 +631,13 @@ static int sd_open(struct inode *inode, struct file *filp)
                goto error_out;
        if (sdev->removable || sdkp->write_prot)
-                check_disk_change(inode->i_bdev);
+                check_disk_change(bdev);
        /*
         * If the drive is empty, just let the open fail.
         */
        retval = -ENOMEDIUM;
-        if (sdev->removable && !sdkp->media_present &&
+        if (sdev->removable && !sdkp->media_present && !(mode & FMODE_NDELAY))
-            !(filp->f_flags & O_NDELAY))
                goto error_out;
        /*
@@ -641,7 +645,7 @@ static int sd_open(struct inode *inode, struct file *filp)
         * if the user expects to be able to write to the thing.
         */
        retval = -EROFS;
-        if (sdkp->write_prot && (filp->f_mode & FMODE_WRITE))
+        if (sdkp->write_prot && (mode & FMODE_WRITE))
                goto error_out;
        /*
@@ -677,9 +681,8 @@ error_out:
 *      Note: may block (uninterruptible) if error recovery is underway
 *      on this disk.
 **/
-static int sd_release(struct inode *inode, struct file *filp)
+static int sd_release(struct gendisk *disk, fmode_t mode)
 {
-        struct gendisk *disk = inode->i_bdev->bd_disk;
        struct scsi_disk *sdkp = scsi_disk(disk);
        struct scsi_device *sdev = sdkp->device;
@@ -736,10 +739,9 @@ static int sd_getgeo(struct block_device *bdev, struct hd_geometry *geo)
 *      Note: most ioctls are forward onto the block subsystem or further
 *      down in the scsi subsystem.
 **/
-static int sd_ioctl(struct inode * inode, struct file * filp, 
+static int sd_ioctl(struct block_device *bdev, fmode_t mode,
                    unsigned int cmd, unsigned long arg)
 {
-        struct block_device *bdev = inode->i_bdev;
        struct gendisk *disk = bdev->bd_disk;
        struct scsi_device *sdp = scsi_disk(disk)->device;
        void __user *p = (void __user *)arg;
@@ -754,7 +756,8 @@ static int sd_ioctl(struct inode * inode, struct file * filp,
         * may try and take the device offline, in which case all further
         * access to the device is prohibited.
         */
-        error = scsi_nonblockable_ioctl(sdp, cmd, p, filp);
+        error = scsi_nonblockable_ioctl(sdp, cmd, p,
+                                        (mode & FMODE_NDELAY_NOW) != 0);
        if (!scsi_block_when_processing_errors(sdp) || !error)
                return error;
@@ -768,7 +771,7 @@ static int sd_ioctl(struct inode * inode, struct file * filp,
                case SCSI_IOCTL_GET_BUS_NUMBER:
                        return scsi_ioctl(sdp, cmd, p);
                default:
-                        error = scsi_cmd_ioctl(filp, disk->queue, disk, cmd, p);
+                        error = scsi_cmd_ioctl(disk->queue, disk, mode, cmd, p);
                        if (error != -ENOTTY)
                                return error;
        }
@@ -910,7 +913,7 @@ static void sd_rescan(struct device *dev)
        struct scsi_disk *sdkp = scsi_disk_get_from_dev(dev);
        if (sdkp) {
-                sd_revalidate_disk(sdkp->disk);
+                revalidate_disk(sdkp->disk);
                scsi_disk_put(sdkp);
        }
 }
@@ -921,11 +924,10 @@ static void sd_rescan(struct device *dev)
 * This gets directly called from VFS. When the ioctl 
 * is not recognized we go back to the other translation paths. 
 */
-static long sd_compat_ioctl(struct file *file, unsigned int cmd, unsigned long arg)
+static int sd_compat_ioctl(struct block_device *bdev, fmode_t mode,
+                           unsigned int cmd, unsigned long arg)
 {
-        struct block_device *bdev = file->f_path.dentry->d_inode->i_bdev;
+        struct scsi_device *sdev = scsi_disk(bdev->bd_disk)->device;
-        struct gendisk *disk = bdev->bd_disk;
-        struct scsi_device *sdev = scsi_disk(disk)->device;
        /*
         * If we are in the middle of error recovery, don't let anyone
@@ -955,7 +957,7 @@ static struct block_device_operations sd_fops = {
        .owner                  = THIS_MODULE,
        .open                   = sd_open,
        .release                = sd_release,
-        .ioctl                  = sd_ioctl,
+        .locked_ioctl           = sd_ioctl,
        .getgeo                 = sd_getgeo,
 #ifdef CONFIG_COMPAT
        .compat_ioctl           = sd_compat_ioctl,
@@ -1047,7 +1049,6 @@ static int sd_done(struct scsi_cmnd *SCpnt)
                good_bytes = sd_completed_bytes(SCpnt);
                break;
        case RECOVERED_ERROR:
-        case NO_SENSE:
                /* Inform the user, but make sure that it's not treated
                 * as a hard error.
                 */
@@ -1056,6 +1057,15 @@ static int sd_done(struct scsi_cmnd *SCpnt)
                memset(SCpnt->sense_buffer, 0, SCSI_SENSE_BUFFERSIZE);
                good_bytes = scsi_bufflen(SCpnt);
                break;
+        case NO_SENSE:
+                /* This indicates a false check condition, so ignore it.  An
+                 * unknown amount of data was transferred so treat it as an
+                 * error.
+                 */
+                scsi_print_sense("sd", SCpnt);
+                SCpnt->result = 0;
+                memset(SCpnt->sense_buffer, 0, SCSI_SENSE_BUFFERSIZE);
+                break;
        case ABORTED_COMMAND:
                if (sshdr.asc == 0x10) { /* DIF: Disk detected corruption */
                        scsi_print_result(SCpnt);
@@ -1069,15 +1079,6 @@ static int sd_done(struct scsi_cmnd *SCpnt)
                        scsi_print_sense("sd", SCpnt);
                        good_bytes = sd_completed_bytes(SCpnt);
                }
-                if (!scsi_device_protection(SCpnt->device) &&
-                    SCpnt->device->use_10_for_rw &&
-                    (SCpnt->cmnd[0] == READ_10 ||
-                     SCpnt->cmnd[0] == WRITE_10))
-                        SCpnt->device->use_10_for_rw = 0;
-                if (SCpnt->device->use_10_for_ms &&
-                    (SCpnt->cmnd[0] == MODE_SENSE_10 ||
-                     SCpnt->cmnd[0] == MODE_SELECT_10))
-                        SCpnt->device->use_10_for_ms = 0;
                break;
        default:
                break;
@@ -1247,14 +1248,12 @@ void sd_read_protection_type(struct scsi_disk *sdkp, unsigned char *buffer)
        else
                type = ((buffer[12] >> 1) & 7) + 1; /* P_TYPE 0 = Type 1 */
+        sdkp->protection_type = type;
        switch (type) {
        case SD_DIF_TYPE0_PROTECTION:
-                sdkp->protection_type = 0;
-                break;
        case SD_DIF_TYPE1_PROTECTION:
        case SD_DIF_TYPE3_PROTECTION:
-                sdkp->protection_type = type;
                break;
        case SD_DIF_TYPE2_PROTECTION:
@@ -1272,7 +1271,6 @@ void sd_read_protection_type(struct scsi_disk *sdkp, unsigned char *buffer)
        return;
 disable:
-        sdkp->protection_type = 0;
        sdkp->capacity = 0;
 }
@@ -1429,27 +1427,21 @@ got_data:
                 */
                sector_size = 512;
        }
+        blk_queue_hardsect_size(sdp->request_queue, sector_size);
        {
-                /*
+                char cap_str_2[10], cap_str_10[10];
-                 * The msdos fs needs to know the hardware sector size
+                u64 sz = (u64)sdkp->capacity << ilog2(sector_size);
-                 * So I have created this table. See ll_rw_blk.c
-                 * Jacques Gelinas (Jacques@solucorp.qc.ca)
-                 */
-                int hard_sector = sector_size;
-                sector_t sz = (sdkp->capacity/2) * (hard_sector/256);
-                struct request_queue *queue = sdp->request_queue;
-                sector_t mb = sz;
-                blk_queue_hardsect_size(queue, hard_sector);
+                string_get_size(sz, STRING_UNITS_2, cap_str_2,
-                /* avoid 64-bit division on 32-bit platforms */
+                                sizeof(cap_str_2));
-                sector_div(sz, 625);
+                string_get_size(sz, STRING_UNITS_10, cap_str_10,
-                mb -= sz - 974;
+                                sizeof(cap_str_10));
-                sector_div(mb, 1950);
                sd_printk(KERN_NOTICE, sdkp,
-                          "%llu %d-byte hardware sectors (%llu MB)\n",
+                          "%llu %d-byte hardware sectors: (%s/%s)\n",
                          (unsigned long long)sdkp->capacity,
-                          hard_sector, (unsigned long long)mb);
+                          sector_size, cap_str_10, cap_str_2);
        }
        /* Rescale capacity to 512-byte units */
@@ -1764,6 +1756,52 @@ static int sd_revalidate_disk(struct gendisk *disk)
 }
 /**
+ *      sd_format_disk_name - format disk name
+ *      @prefix: name prefix - ie. "sd" for SCSI disks
+ *      @index: index of the disk to format name for
+ *      @buf: output buffer
+ *      @buflen: length of the output buffer
+ *
+ *      SCSI disk names starts at sda.  The 26th device is sdz and the
+ *      27th is sdaa.  The last one for two lettered suffix is sdzz
+ *      which is followed by sdaaa.
+ *
+ *      This is basically 26 base counting with one extra 'nil' entry
+ *      at the beggining from the second digit on and can be
+ *      determined using similar method as 26 base conversion with the
+ *      index shifted -1 after each digit is computed.
+ *
+ *      CONTEXT:
+ *      Don't care.
+ *
+ *      RETURNS:
+ *      0 on success, -errno on failure.
+ */
+static int sd_format_disk_name(char *prefix, int index, char *buf, int buflen)
+{
+        const int base = 'z' - 'a' + 1;
+        char *begin = buf + strlen(prefix);
+        char *end = buf + buflen;
+        char *p;
+        int unit;
+        p = end - 1;
+        *p = '\0';
+        unit = base;
+        do {
+                if (p == begin)
+                        return -EINVAL;
+                *--p = 'a' + (index % unit);
+                index = (index / unit) - 1;
+        } while (index >= 0);
+        memmove(begin, p, end - p);
+        memcpy(buf, prefix, strlen(prefix));
+        return 0;
+}
+/**
 *      sd_probe - called during driver initialization and whenever a
 *      new scsi device is attached to the system. It is called once
 *      for each scsi device (not just disks) present.
@@ -1801,7 +1839,7 @@ static int sd_probe(struct device *dev)
        if (!sdkp)
                goto out;
-        gd = alloc_disk(16);
+        gd = alloc_disk(SD_MINORS);
        if (!gd)
                goto out_free;
@@ -1815,8 +1853,8 @@ static int sd_probe(struct device *dev)
        if (error)
                goto out_put;
-        error = -EBUSY;
+        error = sd_format_disk_name("sd", index, gd->disk_name, DISK_NAME_LEN);
-        if (index >= SD_MAX_DISKS)
+        if (error)
                goto out_free_index;
        sdkp->device = sdp;
@@ -1826,11 +1864,12 @@ static int sd_probe(struct device *dev)
        sdkp->openers = 0;
        sdkp->previous_state = 1;
-        if (!sdp->timeout) {
+        if (!sdp->request_queue->rq_timeout) {
                if (sdp->type != TYPE_MOD)
-                        sdp->timeout = SD_TIMEOUT;
+                        blk_queue_rq_timeout(sdp->request_queue, SD_TIMEOUT);
                else
-                        sdp->timeout = SD_MOD_TIMEOUT;
+                        blk_queue_rq_timeout(sdp->request_queue,
+                                             SD_MOD_TIMEOUT);
        }
        device_initialize(&sdkp->dev);
@@ -1843,24 +1882,12 @@ static int sd_probe(struct device *dev)
        get_device(&sdp->sdev_gendev);
-        gd->major = sd_major((index & 0xf0) >> 4);
+        if (index < SD_MAX_DISKS) {
-        gd->first_minor = ((index & 0xf) << 4) | (index & 0xfff00);
+                gd->major = sd_major((index & 0xf0) >> 4);
-        gd->minors = 16;
+                gd->first_minor = ((index & 0xf) << 4) | (index & 0xfff00);
-        gd->fops = &sd_fops;
+                gd->minors = SD_MINORS;
-        if (index < 26) {
-                sprintf(gd->disk_name, "sd%c", 'a' + index % 26);
-        } else if (index < (26 + 1) * 26) {
-                sprintf(gd->disk_name, "sd%c%c",
-                        'a' + index / 26 - 1,'a' + index % 26);
-        } else {
-                const unsigned int m1 = (index / 26 - 1) / 26 - 1;
-                const unsigned int m2 = (index / 26 - 1) % 26;
-                const unsigned int m3 =  index % 26;
-                sprintf(gd->disk_name, "sd%c%c%c",
-                        'a' + m1, 'a' + m2, 'a' + m3);
        }
+        gd->fops = &sd_fops;
        gd->private_data = &sdkp->driver;
        gd->queue = sdkp->device->request_queue;
@@ -1869,7 +1896,7 @@ static int sd_probe(struct device *dev)
        blk_queue_prep_rq(sdp->request_queue, sd_prep_fn);
        gd->driverfs_dev = &sdp->sdev_gendev;
-        gd->flags = GENHD_FL_DRIVERFS;
+        gd->flags = GENHD_FL_EXT_DEVT | GENHD_FL_DRIVERFS;
        if (sdp->removable)
                gd->flags |= GENHD_FL_REMOVABLE;
diff --git a/drivers/scsi/sd.h b/drivers/scsi/sd.h
index 95b9f06534d5..75638e7d3f66 100644
--- a/drivers/scsi/sd.h
+++ b/drivers/scsi/sd.h
@@ -97,19 +97,28 @@ struct sd_dif_tuple {
       __be32 ref_tag;          /* Target LBA or indirect LBA */
 };
-#if defined(CONFIG_BLK_DEV_INTEGRITY)
+#ifdef CONFIG_BLK_DEV_INTEGRITY
-extern void sd_dif_op(struct scsi_cmnd *, unsigned int, unsigned int);
+extern void sd_dif_op(struct scsi_cmnd *, unsigned int, unsigned int, unsigned int);
 extern void sd_dif_config_host(struct scsi_disk *);
 extern int sd_dif_prepare(struct request *rq, sector_t, unsigned int);
 extern void sd_dif_complete(struct scsi_cmnd *, unsigned int);
 #else /* CONFIG_BLK_DEV_INTEGRITY */
-#define sd_dif_op(a, b, c)                      do { } while (0)
+static inline void sd_dif_op(struct scsi_cmnd *cmd, unsigned int a, unsigned int b, unsigned int c)
-#define sd_dif_config_host(a)                   do { } while (0)
+{
-#define sd_dif_prepare(a, b, c)                 (0)
+}
-#define sd_dif_complete(a, b)                   (0)
+static inline void sd_dif_config_host(struct scsi_disk *disk)
+{
+}
+static inline int sd_dif_prepare(struct request *rq, sector_t s, unsigned int a)
+{
+        return 0;
+}
+static inline void sd_dif_complete(struct scsi_cmnd *cmd, unsigned int a)
+{
+}
 #endif /* CONFIG_BLK_DEV_INTEGRITY */
diff --git a/drivers/scsi/sd_dif.c b/drivers/scsi/sd_dif.c
index 4d17f3d35aac..3ebb1f289490 100644
--- a/drivers/scsi/sd_dif.c
+++ b/drivers/scsi/sd_dif.c
@@ -311,25 +311,26 @@ void sd_dif_config_host(struct scsi_disk *sdkp)
        struct scsi_device *sdp = sdkp->device;
        struct gendisk *disk = sdkp->disk;
        u8 type = sdkp->protection_type;
+        int dif, dix;
-        /* If this HBA doesn't support DIX, resort to normal I/O or DIF */
+        dif = scsi_host_dif_capable(sdp->host, type);
-        if (scsi_host_dix_capable(sdp->host, type) == 0) {
+        dix = scsi_host_dix_capable(sdp->host, type);
-                if (type == SD_DIF_TYPE0_PROTECTION)
+        if (!dix && scsi_host_dix_capable(sdp->host, 0)) {
-                        return;
+                dif = 0; dix = 1;
+        }
-                if (scsi_host_dif_capable(sdp->host, type) == 0) {
-                        sd_printk(KERN_INFO, sdkp, "Type %d protection " \
-                                  "unsupported by HBA. Disabling DIF.\n", type);
-                        sdkp->protection_type = 0;
-                        return;
-                }
-                sd_printk(KERN_INFO, sdkp, "Enabling DIF Type %d protection\n",
+        if (type) {
-                          type);
+                if (dif)
+                        sd_printk(KERN_NOTICE, sdkp,
+                                  "Enabling DIF Type %d protection\n", type);
+                else
+                        sd_printk(KERN_NOTICE, sdkp,
+                                  "Disabling DIF Type %d protection\n", type);
+        }
+        if (!dix)
                return;
-        }
        /* Enable DMA of protection information */
        if (scsi_host_get_guard(sdkp->device->host) & SHOST_DIX_GUARD_IP)
@@ -343,17 +344,17 @@ void sd_dif_config_host(struct scsi_disk *sdkp)
                else
                        blk_integrity_register(disk, &dif_type1_integrity_crc);
-        sd_printk(KERN_INFO, sdkp,
+        sd_printk(KERN_NOTICE, sdkp,
-                  "Enabling %s integrity protection\n", disk->integrity->name);
+                  "Enabling DIX %s protection\n", disk->integrity->name);
        /* Signal to block layer that we support sector tagging */
-        if (type && sdkp->ATO) {
+        if (dif && type && sdkp->ATO) {
                if (type == SD_DIF_TYPE3_PROTECTION)
                        disk->integrity->tag_size = sizeof(u16) + sizeof(u32);
                else
                        disk->integrity->tag_size = sizeof(u16);
-                sd_printk(KERN_INFO, sdkp, "DIF application tag size %u\n",
+                sd_printk(KERN_NOTICE, sdkp, "DIF application tag size %u\n",
                          disk->integrity->tag_size);
        }
 }
@@ -361,7 +362,7 @@ void sd_dif_config_host(struct scsi_disk *sdkp)
 /*
 * DIF DMA operation magic decoder ring.
 */
-void sd_dif_op(struct scsi_cmnd *scmd, unsigned int dif, unsigned int dix)
+void sd_dif_op(struct scsi_cmnd *scmd, unsigned int dif, unsigned int dix, unsigned int type)
 {
        int csum_convert, prot_op;
@@ -406,7 +407,8 @@ void sd_dif_op(struct scsi_cmnd *scmd, unsigned int dif, unsigned int dix)
        }
        scsi_set_prot_op(scmd, prot_op);
-        scsi_set_prot_type(scmd, dif);
+        if (dif)
+                scsi_set_prot_type(scmd, type);
 }
 /*
diff --git a/drivers/scsi/sg.c b/drivers/scsi/sg.c
index 661f9f21650a..5103855242ae 100644
--- a/drivers/scsi/sg.c
+++ b/drivers/scsi/sg.c
@@ -47,7 +47,6 @@ static int sg_version_num = 30534;	/* 2 digits for each component */
 #include <linux/seq_file.h>
 #include <linux/blkdev.h>
 #include <linux/delay.h>
-#include <linux/scatterlist.h>
 #include <linux/blktrace_api.h>
 #include <linux/smp_lock.h>
@@ -69,7 +68,6 @@ static void sg_proc_cleanup(void);
 #endif
 #define SG_ALLOW_DIO_DEF 0
-#define SG_ALLOW_DIO_CODE /* compile out by commenting this define */
 #define SG_MAX_DEVS 32768
@@ -118,8 +116,8 @@ typedef struct sg_scatter_hold { /* holding area for scsi scatter gather info */
        unsigned short k_use_sg; /* Count of kernel scatter-gather pieces */
        unsigned sglist_len; /* size of malloc'd scatter-gather list ++ */
        unsigned bufflen;       /* Size of (aggregate) data buffer */
-        unsigned b_malloc_len;  /* actual len malloc'ed in buffer */
+        struct page **pages;
-        struct scatterlist *buffer;/* scatter list */
+        int page_order;
        char dio_in_use;        /* 0->indirect IO (or mmap), 1->dio */
        unsigned char cmd_opcode; /* first byte of command */
 } Sg_scatter_hold;
@@ -137,6 +135,8 @@ typedef struct sg_request {	/* SG_MAX_QUEUE requests outstanding per file */
        char orphan;            /* 1 -> drop on sight, 0 -> normal */
        char sg_io_owned;       /* 1 -> packet belongs to SG_IO */
        volatile char done;     /* 0->before bh, 1->before read, 2->read */
+        struct request *rq;
+        struct bio *bio;
 } Sg_request;
 typedef struct sg_fd {          /* holds the state of a file descriptor */
@@ -175,8 +175,8 @@ typedef struct sg_device { /* holds the state of each scsi generic device */
 static int sg_fasync(int fd, struct file *filp, int mode);
 /* tasklet or soft irq callback */
-static void sg_cmd_done(void *data, char *sense, int result, int resid);
+static void sg_rq_end_io(struct request *rq, int uptodate);
-static int sg_start_req(Sg_request * srp);
+static int sg_start_req(Sg_request *srp, unsigned char *cmd);
 static void sg_finish_rem_req(Sg_request * srp);
 static int sg_build_indirect(Sg_scatter_hold * schp, Sg_fd * sfp, int buff_size);
 static int sg_build_sgat(Sg_scatter_hold * schp, const Sg_fd * sfp,
@@ -188,17 +188,11 @@ static ssize_t sg_new_write(Sg_fd *sfp, struct file *file,
                        int read_only, Sg_request **o_srp);
 static int sg_common_write(Sg_fd * sfp, Sg_request * srp,
                           unsigned char *cmnd, int timeout, int blocking);
-static int sg_u_iovec(sg_io_hdr_t * hp, int sg_num, int ind,
-                      int wr_xf, int *countp, unsigned char __user **up);
-static int sg_write_xfer(Sg_request * srp);
-static int sg_read_xfer(Sg_request * srp);
 static int sg_read_oxfer(Sg_request * srp, char __user *outp, int num_read_xfer);
 static void sg_remove_scat(Sg_scatter_hold * schp);
 static void sg_build_reserve(Sg_fd * sfp, int req_size);
 static void sg_link_reserve(Sg_fd * sfp, Sg_request * srp, int size);
 static void sg_unlink_reserve(Sg_fd * sfp, Sg_request * srp);
-static struct page *sg_page_malloc(int rqSz, int lowDma, int *retSzp);
-static void sg_page_free(struct page *page, int size);
 static Sg_fd *sg_add_sfp(Sg_device * sdp, int dev);
 static int sg_remove_sfp(Sg_device * sdp, Sg_fd * sfp);
 static void __sg_remove_sfp(Sg_device * sdp, Sg_fd * sfp);
@@ -206,7 +200,6 @@ static Sg_request *sg_get_rq_mark(Sg_fd * sfp, int pack_id);
 static Sg_request *sg_add_request(Sg_fd * sfp);
 static int sg_remove_request(Sg_fd * sfp, Sg_request * srp);
 static int sg_res_in_use(Sg_fd * sfp);
-static int sg_build_direct(Sg_request * srp, Sg_fd * sfp, int dxfer_len);
 static Sg_device *sg_get_dev(int dev);
 #ifdef CONFIG_SCSI_PROC_FS
 static int sg_last_dev(void);
@@ -334,7 +327,6 @@ sg_release(struct inode *inode, struct file *filp)
        if ((!(sfp = (Sg_fd *) filp->private_data)) || (!(sdp = sfp->parentdp)))
                return -ENXIO;
        SCSI_LOG_TIMEOUT(3, printk("sg_release: %s\n", sdp->disk->disk_name));
-        sg_fasync(-1, filp, 0); /* remove filp from async notification list */
        if (0 == sg_remove_sfp(sdp, sfp)) {     /* Returns 1 when sdp gone */
                if (!sdp->detached) {
                        scsi_device_put(sdp->device);
@@ -529,8 +521,7 @@ sg_new_read(Sg_fd * sfp, char __user *buf, size_t count, Sg_request * srp)
                err = -EFAULT;
                goto err_out;
        }
-        err = sg_read_xfer(srp);
+err_out:
-      err_out:
        sg_finish_rem_req(srp);
        return (0 == err) ? count : err;
 }
@@ -612,7 +603,10 @@ sg_write(struct file *filp, const char __user *buf, size_t count, loff_t * ppos)
        else
                hp->dxfer_direction = (mxsize > 0) ? SG_DXFER_FROM_DEV : SG_DXFER_NONE;
        hp->dxfer_len = mxsize;
-        hp->dxferp = (char __user *)buf + cmd_size;
+        if (hp->dxfer_direction == SG_DXFER_TO_DEV)
+                hp->dxferp = (char __user *)buf + cmd_size;
+        else
+                hp->dxferp = NULL;
        hp->sbp = NULL;
        hp->timeout = old_hdr.reply_len;        /* structure abuse ... */
        hp->flags = input_size; /* structure abuse ... */
@@ -732,16 +726,12 @@ sg_common_write(Sg_fd * sfp, Sg_request * srp,
        SCSI_LOG_TIMEOUT(4, printk("sg_common_write:  scsi opcode=0x%02x, cmd_size=%d\n",
                          (int) cmnd[0], (int) hp->cmd_len));
-        if ((k = sg_start_req(srp))) {
+        k = sg_start_req(srp, cmnd);
+        if (k) {
                SCSI_LOG_TIMEOUT(1, printk("sg_common_write: start_req err=%d\n", k));
                sg_finish_rem_req(srp);
                return k;       /* probably out of space --> ENOMEM */
        }
-        if ((k = sg_write_xfer(srp))) {
-                SCSI_LOG_TIMEOUT(1, printk("sg_common_write: write_xfer, bad address\n"));
-                sg_finish_rem_req(srp);
-                return k;
-        }
        if (sdp->detached) {
                sg_finish_rem_req(srp);
                return -ENODEV;
@@ -763,20 +753,11 @@ sg_common_write(Sg_fd * sfp, Sg_request * srp,
                break;
        }
        hp->duration = jiffies_to_msecs(jiffies);
-/* Now send everything of to mid-level. The next time we hear about this
-   packet is when sg_cmd_done() is called (i.e. a callback). */
+        srp->rq->timeout = timeout;
-        if (scsi_execute_async(sdp->device, cmnd, hp->cmd_len, data_dir, srp->data.buffer,
+        blk_execute_rq_nowait(sdp->device->request_queue, sdp->disk,
-                                hp->dxfer_len, srp->data.k_use_sg, timeout,
+                              srp->rq, 1, sg_rq_end_io);
-                                SG_DEFAULT_RETRIES, srp, sg_cmd_done,
+        return 0;
-                                GFP_ATOMIC)) {
-                SCSI_LOG_TIMEOUT(1, printk("sg_common_write: scsi_execute_async failed\n"));
-                /*
-                 * most likely out of mem, but could also be a bad map
-                 */
-                sg_finish_rem_req(srp);
-                return -ENOMEM;
-        } else
-                return 0;
 }
 static int
@@ -1077,7 +1058,7 @@ sg_ioctl(struct inode *inode, struct file *filp,
                        if (sg_allow_access(filp, &opcode))
                                return -EPERM;
                }
-                return sg_scsi_ioctl(filp, sdp->device->request_queue, NULL, p);
+                return sg_scsi_ioctl(sdp->device->request_queue, NULL, filp->f_mode, p);
        case SG_SET_DEBUG:
                result = get_user(val, ip);
                if (result)
@@ -1192,8 +1173,7 @@ sg_vma_fault(struct vm_area_struct *vma, struct vm_fault *vmf)
        Sg_fd *sfp;
        unsigned long offset, len, sa;
        Sg_scatter_hold *rsv_schp;
-        struct scatterlist *sg;
+        int k, length;
-        int k;
        if ((NULL == vma) || (!(sfp = (Sg_fd *) vma->vm_private_data)))
                return VM_FAULT_SIGBUS;
@@ -1203,15 +1183,14 @@ sg_vma_fault(struct vm_area_struct *vma, struct vm_fault *vmf)
                return VM_FAULT_SIGBUS;
        SCSI_LOG_TIMEOUT(3, printk("sg_vma_fault: offset=%lu, scatg=%d\n",
                                   offset, rsv_schp->k_use_sg));
-        sg = rsv_schp->buffer;
        sa = vma->vm_start;
-        for (k = 0; (k < rsv_schp->k_use_sg) && (sa < vma->vm_end);
+        length = 1 << (PAGE_SHIFT + rsv_schp->page_order);
-             ++k, sg = sg_next(sg)) {
+        for (k = 0; k < rsv_schp->k_use_sg && sa < vma->vm_end; k++) {
                len = vma->vm_end - sa;
-                len = (len < sg->length) ? len : sg->length;
+                len = (len < length) ? len : length;
                if (offset < len) {
-                        struct page *page;
+                        struct page *page = nth_page(rsv_schp->pages[k],
-                        page = virt_to_page(page_address(sg_page(sg)) + offset);
+                                                     offset >> PAGE_SHIFT);
                        get_page(page); /* increment page count */
                        vmf->page = page;
                        return 0; /* success */
@@ -1233,8 +1212,7 @@ sg_mmap(struct file *filp, struct vm_area_struct *vma)
        Sg_fd *sfp;
        unsigned long req_sz, len, sa;
        Sg_scatter_hold *rsv_schp;
-        int k;
+        int k, length;
-        struct scatterlist *sg;
        if ((!filp) || (!vma) || (!(sfp = (Sg_fd *) filp->private_data)))
                return -ENXIO;
@@ -1248,11 +1226,10 @@ sg_mmap(struct file *filp, struct vm_area_struct *vma)
                return -ENOMEM; /* cannot map more than reserved buffer */
        sa = vma->vm_start;
-        sg = rsv_schp->buffer;
+        length = 1 << (PAGE_SHIFT + rsv_schp->page_order);
-        for (k = 0; (k < rsv_schp->k_use_sg) && (sa < vma->vm_end);
+        for (k = 0; k < rsv_schp->k_use_sg && sa < vma->vm_end; k++) {
-             ++k, sg = sg_next(sg)) {
                len = vma->vm_end - sa;
-                len = (len < sg->length) ? len : sg->length;
+                len = (len < length) ? len : length;
                sa += len;
        }
@@ -1263,16 +1240,19 @@ sg_mmap(struct file *filp, struct vm_area_struct *vma)
        return 0;
 }
-/* This function is a "bottom half" handler that is called by the
+/*
- * mid level when a command is completed (or has failed). */
+ * This function is a "bottom half" handler that is called by the mid
-static void
+ * level when a command is completed (or has failed).
-sg_cmd_done(void *data, char *sense, int result, int resid)
+ */
+static void sg_rq_end_io(struct request *rq, int uptodate)
 {
-        Sg_request *srp = data;
+        struct sg_request *srp = rq->end_io_data;
        Sg_device *sdp = NULL;
        Sg_fd *sfp;
        unsigned long iflags;
        unsigned int ms;
+        char *sense;
+        int result, resid;
        if (NULL == srp) {
                printk(KERN_ERR "sg_cmd_done: NULL request\n");
@@ -1286,6 +1266,9 @@ sg_cmd_done(void *data, char *sense, int result, int resid)
                return;
        }
+        sense = rq->sense;
+        result = rq->errors;
+        resid = rq->data_len;
        SCSI_LOG_TIMEOUT(4, printk("sg_cmd_done: %s, pack_id=%d, res=0x%x\n",
                sdp->disk->disk_name, srp->header.pack_id, result));
@@ -1296,7 +1279,6 @@ sg_cmd_done(void *data, char *sense, int result, int resid)
        if (0 != result) {
                struct scsi_sense_hdr sshdr;
-                memcpy(srp->sense_b, sense, sizeof (srp->sense_b));
                srp->header.status = 0xff & result;
                srp->header.masked_status = status_byte(result);
                srp->header.msg_status = msg_byte(result);
@@ -1467,12 +1449,10 @@ sg_add(struct device *cl_dev, struct class_interface *cl_intf)
        if (sg_sysfs_valid) {
                struct device *sg_class_member;
-                sg_class_member = device_create_drvdata(sg_sysfs_class,
+                sg_class_member = device_create(sg_sysfs_class, cl_dev->parent,
-                                                        cl_dev->parent,
+                                                MKDEV(SCSI_GENERIC_MAJOR,
-                                                        MKDEV(SCSI_GENERIC_MAJOR,
+                                                      sdp->index),
-                                                              sdp->index),
+                                                sdp, "%s", disk->disk_name);
-                                                        sdp,
-                                                        "%s", disk->disk_name);
                if (IS_ERR(sg_class_member)) {
                        printk(KERN_ERR "sg_add: "
                               "device_create failed\n");
@@ -1634,37 +1614,79 @@ exit_sg(void)
        idr_destroy(&sg_index_idr);
 }
-static int
+static int sg_start_req(Sg_request *srp, unsigned char *cmd)
-sg_start_req(Sg_request * srp)
 {
        int res;
+        struct request *rq;
        Sg_fd *sfp = srp->parentfp;
        sg_io_hdr_t *hp = &srp->header;
        int dxfer_len = (int) hp->dxfer_len;
        int dxfer_dir = hp->dxfer_direction;
+        unsigned int iov_count = hp->iovec_count;
        Sg_scatter_hold *req_schp = &srp->data;
        Sg_scatter_hold *rsv_schp = &sfp->reserve;
+        struct request_queue *q = sfp->parentdp->device->request_queue;
+        struct rq_map_data *md, map_data;
+        int rw = hp->dxfer_direction == SG_DXFER_TO_DEV ? WRITE : READ;
+        SCSI_LOG_TIMEOUT(4, printk(KERN_INFO "sg_start_req: dxfer_len=%d\n",
+                                   dxfer_len));
+        rq = blk_get_request(q, rw, GFP_ATOMIC);
+        if (!rq)
+                return -ENOMEM;
+        memcpy(rq->cmd, cmd, hp->cmd_len);
+        rq->cmd_len = hp->cmd_len;
+        rq->cmd_type = REQ_TYPE_BLOCK_PC;
+        srp->rq = rq;
+        rq->end_io_data = srp;
+        rq->sense = srp->sense_b;
+        rq->retries = SG_DEFAULT_RETRIES;
-        SCSI_LOG_TIMEOUT(4, printk("sg_start_req: dxfer_len=%d\n", dxfer_len));
        if ((dxfer_len <= 0) || (dxfer_dir == SG_DXFER_NONE))
                return 0;
-        if (sg_allow_dio && (hp->flags & SG_FLAG_DIRECT_IO) &&
-            (dxfer_dir != SG_DXFER_UNKNOWN) && (0 == hp->iovec_count) &&
+        if (sg_allow_dio && hp->flags & SG_FLAG_DIRECT_IO &&
-            (!sfp->parentdp->device->host->unchecked_isa_dma)) {
+            dxfer_dir != SG_DXFER_UNKNOWN && !iov_count &&
-                res = sg_build_direct(srp, sfp, dxfer_len);
+            !sfp->parentdp->device->host->unchecked_isa_dma &&
-                if (res <= 0)   /* -ve -> error, 0 -> done, 1 -> try indirect */
+            blk_rq_aligned(q, hp->dxferp, dxfer_len))
-                        return res;
+                md = NULL;
-        }
+        else
-        if ((!sg_res_in_use(sfp)) && (dxfer_len <= rsv_schp->bufflen))
+                md = &map_data;
-                sg_link_reserve(sfp, srp, dxfer_len);
-        else {
+        if (md) {
-                res = sg_build_indirect(req_schp, sfp, dxfer_len);
+                if (!sg_res_in_use(sfp) && dxfer_len <= rsv_schp->bufflen)
-                if (res) {
+                        sg_link_reserve(sfp, srp, dxfer_len);
-                        sg_remove_scat(req_schp);
+                else {
-                        return res;
+                        res = sg_build_indirect(req_schp, sfp, dxfer_len);
+                        if (res)
+                                return res;
                }
+                md->pages = req_schp->pages;
+                md->page_order = req_schp->page_order;
+                md->nr_entries = req_schp->k_use_sg;
        }
-        return 0;
+        if (iov_count)
+                res = blk_rq_map_user_iov(q, rq, md, hp->dxferp, iov_count,
+                                          hp->dxfer_len, GFP_ATOMIC);
+        else
+                res = blk_rq_map_user(q, rq, md, hp->dxferp,
+                                      hp->dxfer_len, GFP_ATOMIC);
+        if (!res) {
+                srp->bio = rq->bio;
+                if (!md) {
+                        req_schp->dio_in_use = 1;
+                        hp->info |= SG_INFO_DIRECT_IO;
+                }
+        }
+        return res;
 }
 static void
@@ -1678,186 +1700,37 @@ sg_finish_rem_req(Sg_request * srp)
                sg_unlink_reserve(sfp, srp);
        else
                sg_remove_scat(req_schp);
+        if (srp->rq) {
+                if (srp->bio)
+                        blk_rq_unmap_user(srp->bio);
+                blk_put_request(srp->rq);
+        }
        sg_remove_request(sfp, srp);
 }
 static int
 sg_build_sgat(Sg_scatter_hold * schp, const Sg_fd * sfp, int tablesize)
 {
-        int sg_bufflen = tablesize * sizeof(struct scatterlist);
+        int sg_bufflen = tablesize * sizeof(struct page *);
        gfp_t gfp_flags = GFP_ATOMIC | __GFP_NOWARN;
-        /*
+        schp->pages = kzalloc(sg_bufflen, gfp_flags);
-         * TODO: test without low_dma, we should not need it since
+        if (!schp->pages)
-         * the block layer will bounce the buffer for us
-         *
-         * XXX(hch): we shouldn't need GFP_DMA for the actual S/G list.
-         */
-        if (sfp->low_dma)
-                 gfp_flags |= GFP_DMA;
-        schp->buffer = kzalloc(sg_bufflen, gfp_flags);
-        if (!schp->buffer)
                return -ENOMEM;
-        sg_init_table(schp->buffer, tablesize);
        schp->sglist_len = sg_bufflen;
        return tablesize;       /* number of scat_gath elements allocated */
 }
-#ifdef SG_ALLOW_DIO_CODE
-/* vvvvvvvv  following code borrowed from st driver's direct IO vvvvvvvvv */
-        /* TODO: hopefully we can use the generic block layer code */
-/* Pin down user pages and put them into a scatter gather list. Returns <= 0 if
-   - mapping of all pages not successful
-   (i.e., either completely successful or fails)
-*/
-static int 
-st_map_user_pages(struct scatterlist *sgl, const unsigned int max_pages, 
-                  unsigned long uaddr, size_t count, int rw)
-{
-        unsigned long end = (uaddr + count + PAGE_SIZE - 1) >> PAGE_SHIFT;
-        unsigned long start = uaddr >> PAGE_SHIFT;
-        const int nr_pages = end - start;
-        int res, i, j;
-        struct page **pages;
-        /* User attempted Overflow! */
-        if ((uaddr + count) < uaddr)
-                return -EINVAL;
-        /* Too big */
-        if (nr_pages > max_pages)
-                return -ENOMEM;
-        /* Hmm? */
-        if (count == 0)
-                return 0;
-        if ((pages = kmalloc(max_pages * sizeof(*pages), GFP_ATOMIC)) == NULL)
-                return -ENOMEM;
-        /* Try to fault in all of the necessary pages */
-        down_read(&current->mm->mmap_sem);
-        /* rw==READ means read from drive, write into memory area */
-        res = get_user_pages(
-                current,
-                current->mm,
-                uaddr,
-                nr_pages,
-                rw == READ,
-                0, /* don't force */
-                pages,
-                NULL);
-        up_read(&current->mm->mmap_sem);
-        /* Errors and no page mapped should return here */
-        if (res < nr_pages)
-                goto out_unmap;
-        for (i=0; i < nr_pages; i++) {
-                /* FIXME: flush superflous for rw==READ,
-                 * probably wrong function for rw==WRITE
-                 */
-                flush_dcache_page(pages[i]);
-                /* ?? Is locking needed? I don't think so */
-                /* if (!trylock_page(pages[i]))
-                   goto out_unlock; */
-        }
-        sg_set_page(sgl, pages[0], 0, uaddr & ~PAGE_MASK);
-        if (nr_pages > 1) {
-                sgl[0].length = PAGE_SIZE - sgl[0].offset;
-                count -= sgl[0].length;
-                for (i=1; i < nr_pages ; i++)
-                        sg_set_page(&sgl[i], pages[i], count < PAGE_SIZE ? count : PAGE_SIZE, 0);
-        }
-        else {
-                sgl[0].length = count;
-        }
-        kfree(pages);
-        return nr_pages;
- out_unmap:
-        if (res > 0) {
-                for (j=0; j < res; j++)
-                        page_cache_release(pages[j]);
-                res = 0;
-        }
-        kfree(pages);
-        return res;
-}
-/* And unmap them... */
-static int 
-st_unmap_user_pages(struct scatterlist *sgl, const unsigned int nr_pages,
-                    int dirtied)
-{
-        int i;
-        for (i=0; i < nr_pages; i++) {
-                struct page *page = sg_page(&sgl[i]);
-                if (dirtied)
-                        SetPageDirty(page);
-                /* unlock_page(page); */
-                /* FIXME: cache flush missing for rw==READ
-                 * FIXME: call the correct reference counting function
-                 */
-                page_cache_release(page);
-        }
-        return 0;
-}
-/* ^^^^^^^^  above code borrowed from st driver's direct IO ^^^^^^^^^ */
-#endif
-/* Returns: -ve -> error, 0 -> done, 1 -> try indirect */
-static int
-sg_build_direct(Sg_request * srp, Sg_fd * sfp, int dxfer_len)
-{
-#ifdef SG_ALLOW_DIO_CODE
-        sg_io_hdr_t *hp = &srp->header;
-        Sg_scatter_hold *schp = &srp->data;
-        int sg_tablesize = sfp->parentdp->sg_tablesize;
-        int mx_sc_elems, res;
-        struct scsi_device *sdev = sfp->parentdp->device;
-        if (((unsigned long)hp->dxferp &
-                        queue_dma_alignment(sdev->request_queue)) != 0)
-                return 1;
-        mx_sc_elems = sg_build_sgat(schp, sfp, sg_tablesize);
-        if (mx_sc_elems <= 0) {
-                return 1;
-        }
-        res = st_map_user_pages(schp->buffer, mx_sc_elems,
-                                (unsigned long)hp->dxferp, dxfer_len, 
-                                (SG_DXFER_TO_DEV == hp->dxfer_direction) ? 1 : 0);
-        if (res <= 0) {
-                sg_remove_scat(schp);
-                return 1;
-        }
-        schp->k_use_sg = res;
-        schp->dio_in_use = 1;
-        hp->info |= SG_INFO_DIRECT_IO;
-        return 0;
-#else
-        return 1;
-#endif
-}
 static int
 sg_build_indirect(Sg_scatter_hold * schp, Sg_fd * sfp, int buff_size)
 {
-        struct scatterlist *sg;
+        int ret_sz = 0, i, k, rem_sz, num, mx_sc_elems;
-        int ret_sz = 0, k, rem_sz, num, mx_sc_elems;
        int sg_tablesize = sfp->parentdp->sg_tablesize;
-        int blk_size = buff_size;
+        int blk_size = buff_size, order;
-        struct page *p = NULL;
+        gfp_t gfp_mask = GFP_ATOMIC | __GFP_COMP | __GFP_NOWARN;
        if (blk_size < 0)
                return -EFAULT;
@@ -1881,15 +1754,26 @@ sg_build_indirect(Sg_scatter_hold * schp, Sg_fd * sfp, int buff_size)
                } else
                        scatter_elem_sz_prev = num;
        }
-        for (k = 0, sg = schp->buffer, rem_sz = blk_size;
-             (rem_sz > 0) && (k < mx_sc_elems);
+        if (sfp->low_dma)
-             ++k, rem_sz -= ret_sz, sg = sg_next(sg)) {
+                gfp_mask |= GFP_DMA;
-                
+        if (!capable(CAP_SYS_ADMIN) || !capable(CAP_SYS_RAWIO))
+                gfp_mask |= __GFP_ZERO;
+        order = get_order(num);
+retry:
+        ret_sz = 1 << (PAGE_SHIFT + order);
+        for (k = 0, rem_sz = blk_size; rem_sz > 0 && k < mx_sc_elems;
+             k++, rem_sz -= ret_sz) {
                num = (rem_sz > scatter_elem_sz_prev) ?
-                      scatter_elem_sz_prev : rem_sz;
+                        scatter_elem_sz_prev : rem_sz;
-                p = sg_page_malloc(num, sfp->low_dma, &ret_sz);
-                if (!p)
+                schp->pages[k] = alloc_pages(gfp_mask, order);
-                        return -ENOMEM;
+                if (!schp->pages[k])
+                        goto out;
                if (num == scatter_elem_sz_prev) {
                        if (unlikely(ret_sz > scatter_elem_sz_prev)) {
@@ -1897,12 +1781,12 @@ sg_build_indirect(Sg_scatter_hold * schp, Sg_fd * sfp, int buff_size)
                                scatter_elem_sz_prev = ret_sz;
                        }
                }
-                sg_set_page(sg, p, (ret_sz > num) ? num : ret_sz, 0);
                SCSI_LOG_TIMEOUT(5, printk("sg_build_indirect: k=%d, num=%d, "
                                 "ret_sz=%d\n", k, num, ret_sz));
        }               /* end of for loop */
+        schp->page_order = order;
        schp->k_use_sg = k;
        SCSI_LOG_TIMEOUT(5, printk("sg_build_indirect: k_use_sg=%d, "
                         "rem_sz=%d\n", k, rem_sz));
@@ -1910,223 +1794,42 @@ sg_build_indirect(Sg_scatter_hold * schp, Sg_fd * sfp, int buff_size)
        schp->bufflen = blk_size;
        if (rem_sz > 0) /* must have failed */
                return -ENOMEM;
        return 0;
-}
+out:
+        for (i = 0; i < k; i++)
-static int
+                __free_pages(schp->pages[k], order);
-sg_write_xfer(Sg_request * srp)
-{
-        sg_io_hdr_t *hp = &srp->header;
-        Sg_scatter_hold *schp = &srp->data;
-        struct scatterlist *sg = schp->buffer;
-        int num_xfer = 0;
-        int j, k, onum, usglen, ksglen, res;
-        int iovec_count = (int) hp->iovec_count;
-        int dxfer_dir = hp->dxfer_direction;
-        unsigned char *p;
-        unsigned char __user *up;
-        int new_interface = ('\0' == hp->interface_id) ? 0 : 1;
-        if ((SG_DXFER_UNKNOWN == dxfer_dir) || (SG_DXFER_TO_DEV == dxfer_dir) ||
-            (SG_DXFER_TO_FROM_DEV == dxfer_dir)) {
-                num_xfer = (int) (new_interface ? hp->dxfer_len : hp->flags);
-                if (schp->bufflen < num_xfer)
-                        num_xfer = schp->bufflen;
-        }
-        if ((num_xfer <= 0) || (schp->dio_in_use) ||
-            (new_interface
-             && ((SG_FLAG_NO_DXFER | SG_FLAG_MMAP_IO) & hp->flags)))
-                return 0;
-        SCSI_LOG_TIMEOUT(4, printk("sg_write_xfer: num_xfer=%d, iovec_count=%d, k_use_sg=%d\n",
-                          num_xfer, iovec_count, schp->k_use_sg));
-        if (iovec_count) {
-                onum = iovec_count;
-                if (!access_ok(VERIFY_READ, hp->dxferp, SZ_SG_IOVEC * onum))
-                        return -EFAULT;
-        } else
-                onum = 1;
-        ksglen = sg->length;
-        p = page_address(sg_page(sg));
-        for (j = 0, k = 0; j < onum; ++j) {
-                res = sg_u_iovec(hp, iovec_count, j, 1, &usglen, &up);
-                if (res)
-                        return res;
-                for (; p; sg = sg_next(sg), ksglen = sg->length,
-                     p = page_address(sg_page(sg))) {
-                        if (usglen <= 0)
-                                break;
-                        if (ksglen > usglen) {
-                                if (usglen >= num_xfer) {
-                                        if (__copy_from_user(p, up, num_xfer))
-                                                return -EFAULT;
-                                        return 0;
-                                }
-                                if (__copy_from_user(p, up, usglen))
-                                        return -EFAULT;
-                                p += usglen;
-                                ksglen -= usglen;
-                                break;
-                        } else {
-                                if (ksglen >= num_xfer) {
-                                        if (__copy_from_user(p, up, num_xfer))
-                                                return -EFAULT;
-                                        return 0;
-                                }
-                                if (__copy_from_user(p, up, ksglen))
-                                        return -EFAULT;
-                                up += ksglen;
-                                usglen -= ksglen;
-                        }
-                        ++k;
-                        if (k >= schp->k_use_sg)
-                                return 0;
-                }
-        }
-        return 0;
-}
-static int
+        if (--order >= 0)
-sg_u_iovec(sg_io_hdr_t * hp, int sg_num, int ind,
+                goto retry;
-           int wr_xf, int *countp, unsigned char __user **up)
-{
-        int num_xfer = (int) hp->dxfer_len;
-        unsigned char __user *p = hp->dxferp;
-        int count;
-        if (0 == sg_num) {
+        return -ENOMEM;
-                if (wr_xf && ('\0' == hp->interface_id))
-                        count = (int) hp->flags;        /* holds "old" input_size */
-                else
-                        count = num_xfer;
-        } else {
-                sg_iovec_t iovec;
-                if (__copy_from_user(&iovec, p + ind*SZ_SG_IOVEC, SZ_SG_IOVEC))
-                        return -EFAULT;
-                p = iovec.iov_base;
-                count = (int) iovec.iov_len;
-        }
-        if (!access_ok(wr_xf ? VERIFY_READ : VERIFY_WRITE, p, count))
-                return -EFAULT;
-        if (up)
-                *up = p;
-        if (countp)
-                *countp = count;
-        return 0;
 }
 static void
 sg_remove_scat(Sg_scatter_hold * schp)
 {
        SCSI_LOG_TIMEOUT(4, printk("sg_remove_scat: k_use_sg=%d\n", schp->k_use_sg));
-        if (schp->buffer && (schp->sglist_len > 0)) {
+        if (schp->pages && schp->sglist_len > 0) {
-                struct scatterlist *sg = schp->buffer;
+                if (!schp->dio_in_use) {
-                if (schp->dio_in_use) {
-#ifdef SG_ALLOW_DIO_CODE
-                        st_unmap_user_pages(sg, schp->k_use_sg, TRUE);
-#endif
-                } else {
                        int k;
-                        for (k = 0; (k < schp->k_use_sg) && sg_page(sg);
+                        for (k = 0; k < schp->k_use_sg && schp->pages[k]; k++) {
-                             ++k, sg = sg_next(sg)) {
                                SCSI_LOG_TIMEOUT(5, printk(
-                                    "sg_remove_scat: k=%d, pg=0x%p, len=%d\n",
+                                    "sg_remove_scat: k=%d, pg=0x%p\n",
-                                    k, sg_page(sg), sg->length));
+                                    k, schp->pages[k]));
-                                sg_page_free(sg_page(sg), sg->length);
+                                __free_pages(schp->pages[k], schp->page_order);
                        }
-                }
-                kfree(schp->buffer);
-        }
-        memset(schp, 0, sizeof (*schp));
-}
-static int
+                        kfree(schp->pages);
-sg_read_xfer(Sg_request * srp)
-{
-        sg_io_hdr_t *hp = &srp->header;
-        Sg_scatter_hold *schp = &srp->data;
-        struct scatterlist *sg = schp->buffer;
-        int num_xfer = 0;
-        int j, k, onum, usglen, ksglen, res;
-        int iovec_count = (int) hp->iovec_count;
-        int dxfer_dir = hp->dxfer_direction;
-        unsigned char *p;
-        unsigned char __user *up;
-        int new_interface = ('\0' == hp->interface_id) ? 0 : 1;
-        if ((SG_DXFER_UNKNOWN == dxfer_dir) || (SG_DXFER_FROM_DEV == dxfer_dir)
-            || (SG_DXFER_TO_FROM_DEV == dxfer_dir)) {
-                num_xfer = hp->dxfer_len;
-                if (schp->bufflen < num_xfer)
-                        num_xfer = schp->bufflen;
-        }
-        if ((num_xfer <= 0) || (schp->dio_in_use) ||
-            (new_interface
-             && ((SG_FLAG_NO_DXFER | SG_FLAG_MMAP_IO) & hp->flags)))
-                return 0;
-        SCSI_LOG_TIMEOUT(4, printk("sg_read_xfer: num_xfer=%d, iovec_count=%d, k_use_sg=%d\n",
-                          num_xfer, iovec_count, schp->k_use_sg));
-        if (iovec_count) {
-                onum = iovec_count;
-                if (!access_ok(VERIFY_READ, hp->dxferp, SZ_SG_IOVEC * onum))
-                        return -EFAULT;
-        } else
-                onum = 1;
-        p = page_address(sg_page(sg));
-        ksglen = sg->length;
-        for (j = 0, k = 0; j < onum; ++j) {
-                res = sg_u_iovec(hp, iovec_count, j, 0, &usglen, &up);
-                if (res)
-                        return res;
-                for (; p; sg = sg_next(sg), ksglen = sg->length,
-                     p = page_address(sg_page(sg))) {
-                        if (usglen <= 0)
-                                break;
-                        if (ksglen > usglen) {
-                                if (usglen >= num_xfer) {
-                                        if (__copy_to_user(up, p, num_xfer))
-                                                return -EFAULT;
-                                        return 0;
-                                }
-                                if (__copy_to_user(up, p, usglen))
-                                        return -EFAULT;
-                                p += usglen;
-                                ksglen -= usglen;
-                                break;
-                        } else {
-                                if (ksglen >= num_xfer) {
-                                        if (__copy_to_user(up, p, num_xfer))
-                                                return -EFAULT;
-                                        return 0;
-                                }
-                                if (__copy_to_user(up, p, ksglen))
-                                        return -EFAULT;
-                                up += ksglen;
-                                usglen -= ksglen;
-                        }
-                        ++k;
-                        if (k >= schp->k_use_sg)
-                                return 0;
                }
        }
+        memset(schp, 0, sizeof (*schp));
-        return 0;
 }
 static int
 sg_read_oxfer(Sg_request * srp, char __user *outp, int num_read_xfer)
 {
        Sg_scatter_hold *schp = &srp->data;
-        struct scatterlist *sg = schp->buffer;
        int k, num;
        SCSI_LOG_TIMEOUT(4, printk("sg_read_oxfer: num_read_xfer=%d\n",
@@ -2134,15 +1837,15 @@ sg_read_oxfer(Sg_request * srp, char __user *outp, int num_read_xfer)
        if ((!outp) || (num_read_xfer <= 0))
                return 0;
-        for (k = 0; (k < schp->k_use_sg) && sg_page(sg); ++k, sg = sg_next(sg)) {
+        num = 1 << (PAGE_SHIFT + schp->page_order);
-                num = sg->length;
+        for (k = 0; k < schp->k_use_sg && schp->pages[k]; k++) {
                if (num > num_read_xfer) {
-                        if (__copy_to_user(outp, page_address(sg_page(sg)),
+                        if (__copy_to_user(outp, page_address(schp->pages[k]),
                                           num_read_xfer))
                                return -EFAULT;
                        break;
                } else {
-                        if (__copy_to_user(outp, page_address(sg_page(sg)),
+                        if (__copy_to_user(outp, page_address(schp->pages[k]),
                                           num))
                                return -EFAULT;
                        num_read_xfer -= num;
@@ -2177,24 +1880,21 @@ sg_link_reserve(Sg_fd * sfp, Sg_request * srp, int size)
 {
        Sg_scatter_hold *req_schp = &srp->data;
        Sg_scatter_hold *rsv_schp = &sfp->reserve;
-        struct scatterlist *sg = rsv_schp->buffer;
        int k, num, rem;
        srp->res_used = 1;
        SCSI_LOG_TIMEOUT(4, printk("sg_link_reserve: size=%d\n", size));
        rem = size;
-        for (k = 0; k < rsv_schp->k_use_sg; ++k, sg = sg_next(sg)) {
+        num = 1 << (PAGE_SHIFT + rsv_schp->page_order);
-                num = sg->length;
+        for (k = 0; k < rsv_schp->k_use_sg; k++) {
                if (rem <= num) {
-                        sfp->save_scat_len = num;
-                        sg->length = rem;
                        req_schp->k_use_sg = k + 1;
                        req_schp->sglist_len = rsv_schp->sglist_len;
-                        req_schp->buffer = rsv_schp->buffer;
+                        req_schp->pages = rsv_schp->pages;
                        req_schp->bufflen = size;
-                        req_schp->b_malloc_len = rsv_schp->b_malloc_len;
+                        req_schp->page_order = rsv_schp->page_order;
                        break;
                } else
                        rem -= num;
@@ -2208,22 +1908,13 @@ static void
 sg_unlink_reserve(Sg_fd * sfp, Sg_request * srp)
 {
        Sg_scatter_hold *req_schp = &srp->data;
-        Sg_scatter_hold *rsv_schp = &sfp->reserve;
        SCSI_LOG_TIMEOUT(4, printk("sg_unlink_reserve: req->k_use_sg=%d\n",
                                   (int) req_schp->k_use_sg));
-        if ((rsv_schp->k_use_sg > 0) && (req_schp->k_use_sg > 0)) {
-                struct scatterlist *sg = rsv_schp->buffer;
-                if (sfp->save_scat_len > 0)
-                        (sg + (req_schp->k_use_sg - 1))->length =
-                            (unsigned) sfp->save_scat_len;
-                else
-                        SCSI_LOG_TIMEOUT(1, printk ("sg_unlink_reserve: BAD save_scat_len\n"));
-        }
        req_schp->k_use_sg = 0;
        req_schp->bufflen = 0;
-        req_schp->buffer = NULL;
+        req_schp->pages = NULL;
+        req_schp->page_order = 0;
        req_schp->sglist_len = 0;
        sfp->save_scat_len = 0;
        srp->res_used = 0;
@@ -2481,53 +2172,6 @@ sg_res_in_use(Sg_fd * sfp)
        return srp ? 1 : 0;
 }
-/* The size fetched (value output via retSzp) set when non-NULL return */
-static struct page *
-sg_page_malloc(int rqSz, int lowDma, int *retSzp)
-{
-        struct page *resp = NULL;
-        gfp_t page_mask;
-        int order, a_size;
-        int resSz;
-        if ((rqSz <= 0) || (NULL == retSzp))
-                return resp;
-        if (lowDma)
-                page_mask = GFP_ATOMIC | GFP_DMA | __GFP_COMP | __GFP_NOWARN;
-        else
-                page_mask = GFP_ATOMIC | __GFP_COMP | __GFP_NOWARN;
-        for (order = 0, a_size = PAGE_SIZE; a_size < rqSz;
-             order++, a_size <<= 1) ;
-        resSz = a_size;         /* rounded up if necessary */
-        resp = alloc_pages(page_mask, order);
-        while ((!resp) && order) {
-                --order;
-                a_size >>= 1;   /* divide by 2, until PAGE_SIZE */
-                resp =  alloc_pages(page_mask, order);  /* try half */
-                resSz = a_size;
-        }
-        if (resp) {
-                if (!capable(CAP_SYS_ADMIN) || !capable(CAP_SYS_RAWIO))
-                        memset(page_address(resp), 0, resSz);
-                *retSzp = resSz;
-        }
-        return resp;
-}
-static void
-sg_page_free(struct page *page, int size)
-{
-        int order, a_size;
-        if (!page)
-                return;
-        for (order = 0, a_size = PAGE_SIZE; a_size < size;
-             order++, a_size <<= 1) ;
-        __free_pages(page, order);
-}
 #ifdef CONFIG_SCSI_PROC_FS
 static int
 sg_idr_max_id(int id, void *p, void *data)
diff --git a/drivers/scsi/sr.c b/drivers/scsi/sr.c
index 27f5bfd1def3..62b6633e3a97 100644
--- a/drivers/scsi/sr.c
+++ b/drivers/scsi/sr.c
@@ -331,7 +331,7 @@ static int sr_done(struct scsi_cmnd *SCpnt)
 static int sr_prep_fn(struct request_queue *q, struct request *rq)
 {
-        int block=0, this_count, s_size, timeout = SR_TIMEOUT;
+        int block = 0, this_count, s_size;
        struct scsi_cd *cd;
        struct scsi_cmnd *SCpnt;
        struct scsi_device *sdp = q->queuedata;
@@ -461,7 +461,6 @@ static int sr_prep_fn(struct request_queue *q, struct request *rq)
        SCpnt->transfersize = cd->device->sector_size;
        SCpnt->underflow = this_count << 9;
        SCpnt->allowed = MAX_RETRIES;
-        SCpnt->timeout_per_command = timeout;
        /*
         * This indicates that the command is ready from our end to be
@@ -472,38 +471,31 @@ static int sr_prep_fn(struct request_queue *q, struct request *rq)
        return scsi_prep_return(q, rq, ret);
 }
-static int sr_block_open(struct inode *inode, struct file *file)
+static int sr_block_open(struct block_device *bdev, fmode_t mode)
 {
-        struct gendisk *disk = inode->i_bdev->bd_disk;
+        struct scsi_cd *cd = scsi_cd_get(bdev->bd_disk);
-        struct scsi_cd *cd;
+        int ret = -ENXIO;
-        int ret = 0;
-        if(!(cd = scsi_cd_get(disk)))
-                return -ENXIO;
-        if((ret = cdrom_open(&cd->cdi, inode, file)) != 0)
-                scsi_cd_put(cd);
+        if (cd) {
+                ret = cdrom_open(&cd->cdi, bdev, mode);
+                if (ret)
+                        scsi_cd_put(cd);
+        }
        return ret;
 }
-static int sr_block_release(struct inode *inode, struct file *file)
+static int sr_block_release(struct gendisk *disk, fmode_t mode)
 {
-        int ret;
+        struct scsi_cd *cd = scsi_cd(disk);
-        struct scsi_cd *cd = scsi_cd(inode->i_bdev->bd_disk);
+        cdrom_release(&cd->cdi, mode);
-        ret = cdrom_release(&cd->cdi, file);
-        if(ret)
-                return ret;
-        
        scsi_cd_put(cd);
        return 0;
 }
-static int sr_block_ioctl(struct inode *inode, struct file *file, unsigned cmd,
+static int sr_block_ioctl(struct block_device *bdev, fmode_t mode, unsigned cmd,
                          unsigned long arg)
 {
-        struct scsi_cd *cd = scsi_cd(inode->i_bdev->bd_disk);
+        struct scsi_cd *cd = scsi_cd(bdev->bd_disk);
        struct scsi_device *sdev = cd->device;
        void __user *argp = (void __user *)arg;
        int ret;
@@ -518,7 +510,7 @@ static int sr_block_ioctl(struct inode *inode, struct file *file, unsigned cmd,
                return scsi_ioctl(sdev, cmd, argp);
        }
-        ret = cdrom_ioctl(file, &cd->cdi, inode, cmd, arg);
+        ret = cdrom_ioctl(&cd->cdi, bdev, mode, cmd, arg);
        if (ret != -ENOSYS)
                return ret;
@@ -528,7 +520,8 @@ static int sr_block_ioctl(struct inode *inode, struct file *file, unsigned cmd,
         * case fall through to scsi_ioctl, which will return ENDOEV again
         * if it doesn't recognise the ioctl
         */
-        ret = scsi_nonblockable_ioctl(sdev, cmd, argp, NULL);
+        ret = scsi_nonblockable_ioctl(sdev, cmd, argp,
+                                        (mode & FMODE_NDELAY_NOW) != 0);
        if (ret != -ENODEV)
                return ret;
        return scsi_ioctl(sdev, cmd, argp);
@@ -545,7 +538,7 @@ static struct block_device_operations sr_bdops =
        .owner          = THIS_MODULE,
        .open           = sr_block_open,
        .release        = sr_block_release,
-        .ioctl          = sr_block_ioctl,
+        .locked_ioctl   = sr_block_ioctl,
        .media_changed  = sr_block_media_changed,
        /* 
         * No compat_ioctl for now because sr_block_ioctl never
@@ -620,6 +613,8 @@ static int sr_probe(struct device *dev)
        disk->fops = &sr_bdops;
        disk->flags = GENHD_FL_CD;
+        blk_queue_rq_timeout(sdev->request_queue, SR_TIMEOUT);
        cd->device = sdev;
        cd->disk = disk;
        cd->driver = &sr_template;
@@ -878,7 +873,7 @@ static void sr_kref_release(struct kref *kref)
        struct gendisk *disk = cd->disk;
        spin_lock(&sr_index_lock);
-        clear_bit(disk->first_minor, sr_index_bits);
+        clear_bit(MINOR(disk_devt(disk)), sr_index_bits);
        spin_unlock(&sr_index_lock);
        unregister_cdrom(&cd->cdi);
diff --git a/drivers/scsi/sr_vendor.c b/drivers/scsi/sr_vendor.c
index 4eb3da996b36..4ad3e017213f 100644
--- a/drivers/scsi/sr_vendor.c
+++ b/drivers/scsi/sr_vendor.c
@@ -223,9 +223,9 @@ int sr_cd_check(struct cdrom_device_info *cdi)
                                no_multi = 1;
                                break;
                        }
-                        min = BCD2BIN(buffer[15]);
+                        min = bcd2bin(buffer[15]);
-                        sec = BCD2BIN(buffer[16]);
+                        sec = bcd2bin(buffer[16]);
-                        frame = BCD2BIN(buffer[17]);
+                        frame = bcd2bin(buffer[17]);
                        sector = min * CD_SECS * CD_FRAMES + sec * CD_FRAMES + frame;
                        break;
                }
@@ -252,9 +252,9 @@ int sr_cd_check(struct cdrom_device_info *cdi)
                        }
                        if (rc != 0)
                                break;
-                        min = BCD2BIN(buffer[1]);
+                        min = bcd2bin(buffer[1]);
-                        sec = BCD2BIN(buffer[2]);
+                        sec = bcd2bin(buffer[2]);
-                        frame = BCD2BIN(buffer[3]);
+                        frame = bcd2bin(buffer[3]);
                        sector = min * CD_SECS * CD_FRAMES + sec * CD_FRAMES + frame;
                        if (sector)
                                sector -= CD_MSF_OFFSET;
diff --git a/drivers/scsi/st.c b/drivers/scsi/st.c
index c2bb53e3d941..c959bdc55f4f 100644
--- a/drivers/scsi/st.c
+++ b/drivers/scsi/st.c
@@ -3263,7 +3263,8 @@ static long st_ioctl(struct file *file, unsigned int cmd_in, unsigned long arg)
         * may try and take the device offline, in which case all further
         * access to the device is prohibited.
         */
-        retval = scsi_nonblockable_ioctl(STp->device, cmd_in, p, file);
+        retval = scsi_nonblockable_ioctl(STp->device, cmd_in, p,
+                                        file->f_flags & O_NDELAY);
        if (!scsi_block_when_processing_errors(STp->device) || retval != -ENODEV)
                goto out;
        retval = 0;
@@ -3567,8 +3568,8 @@ static long st_ioctl(struct file *file, unsigned int cmd_in, unsigned long arg)
                            !capable(CAP_SYS_RAWIO))
                                i = -EPERM;
                        else
-                                i = scsi_cmd_ioctl(file, STp->disk->queue,
+                                i = scsi_cmd_ioctl(STp->disk->queue, STp->disk,
-                                                   STp->disk, cmd_in, p);
+                                                   file->f_mode, cmd_in, p);
                        if (i != -ENOTTY)
                                return i;
                        break;
@@ -4428,13 +4429,10 @@ static int do_create_class_files(struct scsi_tape *STp, int dev_num, int mode)
                snprintf(name, 10, "%s%s%s", rew ? "n" : "",
                         STp->disk->disk_name, st_formats[i]);
                st_class_member =
-                        device_create_drvdata(st_sysfs_class,
+                        device_create(st_sysfs_class, &STp->device->sdev_gendev,
-                                              &STp->device->sdev_gendev,
+                                      MKDEV(SCSI_TAPE_MAJOR,
-                                              MKDEV(SCSI_TAPE_MAJOR,
+                                            TAPE_MINOR(dev_num, mode, rew)),
-                                                    TAPE_MINOR(dev_num,
+                                      &STp->modes[mode], "%s", name);
-                                                              mode, rew)),
-                                              &STp->modes[mode],
-                                              "%s", name);
                if (IS_ERR(st_class_member)) {
                        printk(KERN_WARNING "st%d: device_create failed\n",
                               dev_num);
diff --git a/drivers/scsi/sun3x_esp.c b/drivers/scsi/sun3x_esp.c
index 7514b3a0390e..34a99620e5bd 100644
--- a/drivers/scsi/sun3x_esp.c
+++ b/drivers/scsi/sun3x_esp.c
@@ -213,7 +213,7 @@ static int __devinit esp_sun3x_probe(struct platform_device *dev)
        esp->ops = &sun3x_esp_ops;
        res = platform_get_resource(dev, IORESOURCE_MEM, 0);
-        if (!res && !res->start)
+        if (!res || !res->start)
                goto fail_unlink;
        esp->regs = ioremap_nocache(res->start, 0x20);
@@ -221,7 +221,7 @@ static int __devinit esp_sun3x_probe(struct platform_device *dev)
                goto fail_unmap_regs;
        res = platform_get_resource(dev, IORESOURCE_MEM, 1);
-        if (!res && !res->start)
+        if (!res || !res->start)
                goto fail_unmap_regs;
        esp->dma_regs = ioremap_nocache(res->start, 0x10);
diff --git a/drivers/scsi/sun_esp.c b/drivers/scsi/sun_esp.c
index f9cf70151366..3d73aad4bc82 100644
--- a/drivers/scsi/sun_esp.c
+++ b/drivers/scsi/sun_esp.c
@@ -1,6 +1,6 @@
 /* sun_esp.c: ESP front-end for Sparc SBUS systems.
 *
- * Copyright (C) 2007 David S. Miller (davem@davemloft.net)
+ * Copyright (C) 2007, 2008 David S. Miller (davem@davemloft.net)
 */
 #include <linux/kernel.h>
@@ -9,60 +9,70 @@
 #include <linux/module.h>
 #include <linux/mm.h>
 #include <linux/init.h>
+#include <linux/dma-mapping.h>
+#include <linux/of.h>
+#include <linux/of_device.h>
 #include <asm/irq.h>
 #include <asm/io.h>
 #include <asm/dma.h>
-#include <asm/sbus.h>
 #include <scsi/scsi_host.h>
 #include "esp_scsi.h"
 #define DRV_MODULE_NAME         "sun_esp"
 #define PFX DRV_MODULE_NAME     ": "
-#define DRV_VERSION             "1.000"
+#define DRV_VERSION             "1.100"
-#define DRV_MODULE_RELDATE      "April 19, 2007"
+#define DRV_MODULE_RELDATE      "August 27, 2008"
 #define dma_read32(REG) \
        sbus_readl(esp->dma_regs + (REG))
 #define dma_write32(VAL, REG) \
        sbus_writel((VAL), esp->dma_regs + (REG))
-static int __devinit esp_sbus_find_dma(struct esp *esp, struct sbus_dev *dma_sdev)
+/* DVMA chip revisions */
-{
+enum dvma_rev {
-        struct sbus_dev *sdev = esp->dev;
+        dvmarev0,
-        struct sbus_dma *dma;
+        dvmaesc1,
+        dvmarev1,
+        dvmarev2,
+        dvmarev3,
+        dvmarevplus,
+        dvmahme
+};
-        if (dma_sdev != NULL) {
+static int __devinit esp_sbus_setup_dma(struct esp *esp,
-                for_each_dvma(dma) {
+                                        struct of_device *dma_of)
-                        if (dma->sdev == dma_sdev)
+{
-                                break;
+        esp->dma = dma_of;
-                }
-        } else {
-                for_each_dvma(dma) {
-                        if (dma->sdev == NULL)
-                                break;
-                        /* If bus + slot are the same and it has the
+        esp->dma_regs = of_ioremap(&dma_of->resource[0], 0,
-                         * correct OBP name, it's ours.
+                                   resource_size(&dma_of->resource[0]),
-                         */
+                                   "espdma");
-                        if (sdev->bus == dma->sdev->bus &&
+        if (!esp->dma_regs)
-                            sdev->slot == dma->sdev->slot &&
+                return -ENOMEM;
-                            (!strcmp(dma->sdev->prom_name, "dma") ||
-                             !strcmp(dma->sdev->prom_name, "espdma")))
-                                break;
-                }
-        }
-        if (dma == NULL) {
+        switch (dma_read32(DMA_CSR) & DMA_DEVICE_ID) {
-                printk(KERN_ERR PFX "[%s] Cannot find dma.\n",
+        case DMA_VERS0:
-                       sdev->ofdev.node->full_name);
+                esp->dmarev = dvmarev0;
-                return -ENODEV;
+                break;
+        case DMA_ESCV1:
+                esp->dmarev = dvmaesc1;
+                break;
+        case DMA_VERS1:
+                esp->dmarev = dvmarev1;
+                break;
+        case DMA_VERS2:
+                esp->dmarev = dvmarev2;
+                break;
+        case DMA_VERHME:
+                esp->dmarev = dvmahme;
+                break;
+        case DMA_VERSPLUS:
+                esp->dmarev = dvmarevplus;
+                break;
        }
-        esp->dma = dma;
-        esp->dma_regs = dma->regs;
        return 0;
@@ -70,18 +80,18 @@ static int __devinit esp_sbus_find_dma(struct esp *esp, struct sbus_dev *dma_sde
 static int __devinit esp_sbus_map_regs(struct esp *esp, int hme)
 {
-        struct sbus_dev *sdev = esp->dev;
+        struct of_device *op = esp->dev;
        struct resource *res;
        /* On HME, two reg sets exist, first is DVMA,
         * second is ESP registers.
         */
        if (hme)
-                res = &sdev->resource[1];
+                res = &op->resource[1];
        else
-                res = &sdev->resource[0];
+                res = &op->resource[0];
-        esp->regs = sbus_ioremap(res, 0, SBUS_ESP_REG_SIZE, "ESP");
+        esp->regs = of_ioremap(res, 0, SBUS_ESP_REG_SIZE, "ESP");
        if (!esp->regs)
                return -ENOMEM;
@@ -90,10 +100,11 @@ static int __devinit esp_sbus_map_regs(struct esp *esp, int hme)
 static int __devinit esp_sbus_map_command_block(struct esp *esp)
 {
-        struct sbus_dev *sdev = esp->dev;
+        struct of_device *op = esp->dev;
-        esp->command_block = sbus_alloc_consistent(sdev, 16,
+        esp->command_block = dma_alloc_coherent(&op->dev, 16,
-                                                   &esp->command_block_dma);
+                                                &esp->command_block_dma,
+                                                GFP_ATOMIC);
        if (!esp->command_block)
                return -ENOMEM;
        return 0;
@@ -102,17 +113,18 @@ static int __devinit esp_sbus_map_command_block(struct esp *esp)
 static int __devinit esp_sbus_register_irq(struct esp *esp)
 {
        struct Scsi_Host *host = esp->host;
-        struct sbus_dev *sdev = esp->dev;
+        struct of_device *op = esp->dev;
-        host->irq = sdev->irqs[0];
+        host->irq = op->irqs[0];
        return request_irq(host->irq, scsi_esp_intr, IRQF_SHARED, "ESP", esp);
 }
-static void __devinit esp_get_scsi_id(struct esp *esp)
+static void __devinit esp_get_scsi_id(struct esp *esp, struct of_device *espdma)
 {
-        struct sbus_dev *sdev = esp->dev;
+        struct of_device *op = esp->dev;
-        struct device_node *dp = sdev->ofdev.node;
+        struct device_node *dp;
+        dp = op->node;
        esp->scsi_id = of_getintprop_default(dp, "initiator-id", 0xff);
        if (esp->scsi_id != 0xff)
                goto done;
@@ -121,13 +133,7 @@ static void __devinit esp_get_scsi_id(struct esp *esp)
        if (esp->scsi_id != 0xff)
                goto done;
-        if (!sdev->bus) {
+        esp->scsi_id = of_getintprop_default(espdma->node,
-                /* SUN4 */
-                esp->scsi_id = 7;
-                goto done;
-        }
-        esp->scsi_id = of_getintprop_default(sdev->bus->ofdev.node,
                                             "scsi-initiator-id", 7);
 done:
@@ -137,9 +143,10 @@ done:
 static void __devinit esp_get_differential(struct esp *esp)
 {
-        struct sbus_dev *sdev = esp->dev;
+        struct of_device *op = esp->dev;
-        struct device_node *dp = sdev->ofdev.node;
+        struct device_node *dp;
+        dp = op->node;
        if (of_find_property(dp, "differential", NULL))
                esp->flags |= ESP_FLAG_DIFFERENTIAL;
        else
@@ -148,43 +155,36 @@ static void __devinit esp_get_differential(struct esp *esp)
 static void __devinit esp_get_clock_params(struct esp *esp)
 {
-        struct sbus_dev *sdev = esp->dev;
+        struct of_device *op = esp->dev;
-        struct device_node *dp = sdev->ofdev.node;
+        struct device_node *bus_dp, *dp;
-        struct device_node *bus_dp;
        int fmhz;
-        bus_dp = NULL;
+        dp = op->node;
-        if (sdev != NULL && sdev->bus != NULL)
+        bus_dp = dp->parent;
-                bus_dp = sdev->bus->ofdev.node;
        fmhz = of_getintprop_default(dp, "clock-frequency", 0);
        if (fmhz == 0)
-                fmhz = (!bus_dp) ? 0 :
+                fmhz = of_getintprop_default(bus_dp, "clock-frequency", 0);
-                        of_getintprop_default(bus_dp, "clock-frequency", 0);
        esp->cfreq = fmhz;
 }
-static void __devinit esp_get_bursts(struct esp *esp, struct sbus_dev *dma)
+static void __devinit esp_get_bursts(struct esp *esp, struct of_device *dma_of)
 {
-        struct sbus_dev *sdev = esp->dev;
+        struct device_node *dma_dp = dma_of->node;
-        struct device_node *dp = sdev->ofdev.node;
+        struct of_device *op = esp->dev;
-        u8 bursts;
+        struct device_node *dp;
+        u8 bursts, val;
+        dp = op->node;
        bursts = of_getintprop_default(dp, "burst-sizes", 0xff);
-        if (dma) {
+        val = of_getintprop_default(dma_dp, "burst-sizes", 0xff);
-                struct device_node *dma_dp = dma->ofdev.node;
+        if (val != 0xff)
-                u8 val = of_getintprop_default(dma_dp, "burst-sizes", 0xff);
+                bursts &= val;
-                if (val != 0xff)
-                        bursts &= val;
-        }
-        if (sdev->bus) {
+        val = of_getintprop_default(dma_dp->parent, "burst-sizes", 0xff);
-                u8 val = of_getintprop_default(sdev->bus->ofdev.node,
+        if (val != 0xff)
-                                               "burst-sizes", 0xff);
+                bursts &= val;
-                if (val != 0xff)
-                        bursts &= val;
-        }
        if (bursts == 0xff ||
            (bursts & DMA_BURST16) == 0 ||
@@ -194,9 +194,9 @@ static void __devinit esp_get_bursts(struct esp *esp, struct sbus_dev *dma)
        esp->bursts = bursts;
 }
-static void __devinit esp_sbus_get_props(struct esp *esp, struct sbus_dev *espdma)
+static void __devinit esp_sbus_get_props(struct esp *esp, struct of_device *espdma)
 {
-        esp_get_scsi_id(esp);
+        esp_get_scsi_id(esp, espdma);
        esp_get_differential(esp);
        esp_get_clock_params(esp);
        esp_get_bursts(esp, espdma);
@@ -215,25 +215,33 @@ static u8 sbus_esp_read8(struct esp *esp, unsigned long reg)
 static dma_addr_t sbus_esp_map_single(struct esp *esp, void *buf,
                                      size_t sz, int dir)
 {
-        return sbus_map_single(esp->dev, buf, sz, dir);
+        struct of_device *op = esp->dev;
+        return dma_map_single(&op->dev, buf, sz, dir);
 }
 static int sbus_esp_map_sg(struct esp *esp, struct scatterlist *sg,
                                  int num_sg, int dir)
 {
-        return sbus_map_sg(esp->dev, sg, num_sg, dir);
+        struct of_device *op = esp->dev;
+        return dma_map_sg(&op->dev, sg, num_sg, dir);
 }
 static void sbus_esp_unmap_single(struct esp *esp, dma_addr_t addr,
                                  size_t sz, int dir)
 {
-        sbus_unmap_single(esp->dev, addr, sz, dir);
+        struct of_device *op = esp->dev;
+        dma_unmap_single(&op->dev, addr, sz, dir);
 }
 static void sbus_esp_unmap_sg(struct esp *esp, struct scatterlist *sg,
                              int num_sg, int dir)
 {
-        sbus_unmap_sg(esp->dev, sg, num_sg, dir);
+        struct of_device *op = esp->dev;
+        dma_unmap_sg(&op->dev, sg, num_sg, dir);
 }
 static int sbus_esp_irq_pending(struct esp *esp)
@@ -247,24 +255,26 @@ static void sbus_esp_reset_dma(struct esp *esp)
 {
        int can_do_burst16, can_do_burst32, can_do_burst64;
        int can_do_sbus64, lim;
+        struct of_device *op;
        u32 val;
        can_do_burst16 = (esp->bursts & DMA_BURST16) != 0;
        can_do_burst32 = (esp->bursts & DMA_BURST32) != 0;
        can_do_burst64 = 0;
        can_do_sbus64 = 0;
-        if (sbus_can_dma_64bit(esp->dev))
+        op = esp->dev;
+        if (sbus_can_dma_64bit())
                can_do_sbus64 = 1;
-        if (sbus_can_burst64(esp->sdev))
+        if (sbus_can_burst64())
                can_do_burst64 = (esp->bursts & DMA_BURST64) != 0;
        /* Put the DVMA into a known state. */
-        if (esp->dma->revision != dvmahme) {
+        if (esp->dmarev != dvmahme) {
                val = dma_read32(DMA_CSR);
                dma_write32(val | DMA_RST_SCSI, DMA_CSR);
                dma_write32(val & ~DMA_RST_SCSI, DMA_CSR);
        }
-        switch (esp->dma->revision) {
+        switch (esp->dmarev) {
        case dvmahme:
                dma_write32(DMA_RESET_FAS366, DMA_CSR);
                dma_write32(DMA_RST_SCSI, DMA_CSR);
@@ -282,7 +292,7 @@ static void sbus_esp_reset_dma(struct esp *esp)
                if (can_do_sbus64) {
                        esp->prev_hme_dmacsr |= DMA_SCSI_SBUS64;
-                        sbus_set_sbus64(esp->dev, esp->bursts);
+                        sbus_set_sbus64(&op->dev, esp->bursts);
                }
                lim = 1000;
@@ -346,14 +356,14 @@ static void sbus_esp_dma_drain(struct esp *esp)
        u32 csr;
        int lim;
-        if (esp->dma->revision == dvmahme)
+        if (esp->dmarev == dvmahme)
                return;
        csr = dma_read32(DMA_CSR);
        if (!(csr & DMA_FIFO_ISDRAIN))
                return;
-        if (esp->dma->revision != dvmarev3 && esp->dma->revision != dvmaesc1)
+        if (esp->dmarev != dvmarev3 && esp->dmarev != dvmaesc1)
                dma_write32(csr | DMA_FIFO_STDRAIN, DMA_CSR);
        lim = 1000;
@@ -369,7 +379,7 @@ static void sbus_esp_dma_drain(struct esp *esp)
 static void sbus_esp_dma_invalidate(struct esp *esp)
 {
-        if (esp->dma->revision == dvmahme) {
+        if (esp->dmarev == dvmahme) {
                dma_write32(DMA_RST_SCSI, DMA_CSR);
                esp->prev_hme_dmacsr = ((esp->prev_hme_dmacsr |
@@ -440,7 +450,7 @@ static void sbus_esp_send_dma_cmd(struct esp *esp, u32 addr, u32 esp_count,
                else
                        csr &= ~DMA_ST_WRITE;
                dma_write32(csr, DMA_CSR);
-                if (esp->dma->revision == dvmaesc1) {
+                if (esp->dmarev == dvmaesc1) {
                        u32 end = PAGE_ALIGN(addr + dma_count + 16U);
                        dma_write32(end - addr, DMA_COUNT);
                }
@@ -476,10 +486,8 @@ static const struct esp_driver_ops sbus_esp_ops = {
        .dma_error      =       sbus_esp_dma_error,
 };
-static int __devinit esp_sbus_probe_one(struct device *dev,
+static int __devinit esp_sbus_probe_one(struct of_device *op,
-                                        struct sbus_dev *esp_dev,
+                                        struct of_device *espdma,
-                                        struct sbus_dev *espdma,
-                                        struct sbus_bus *sbus,
                                        int hme)
 {
        struct scsi_host_template *tpnt = &scsi_esp_template;
@@ -497,13 +505,13 @@ static int __devinit esp_sbus_probe_one(struct device *dev,
        esp = shost_priv(host);
        esp->host = host;
-        esp->dev = esp_dev;
+        esp->dev = op;
        esp->ops = &sbus_esp_ops;
        if (hme)
                esp->flags |= ESP_FLAG_WIDE_CAPABLE;
-        err = esp_sbus_find_dma(esp, espdma);
+        err = esp_sbus_setup_dma(esp, espdma);
        if (err < 0)
                goto fail_unlink;
@@ -525,15 +533,15 @@ static int __devinit esp_sbus_probe_one(struct device *dev,
         * come up with the reset bit set, so make sure that
         * is clear first.
         */
-        if (esp->dma->revision == dvmaesc1) {
+        if (esp->dmarev == dvmaesc1) {
                u32 val = dma_read32(DMA_CSR);
                dma_write32(val & ~DMA_RST_SCSI, DMA_CSR);
        }
-        dev_set_drvdata(&esp_dev->ofdev.dev, esp);
+        dev_set_drvdata(&op->dev, esp);
-        err = scsi_esp_register(esp, dev);
+        err = scsi_esp_register(esp, &op->dev);
        if (err)
                goto fail_free_irq;
@@ -542,41 +550,46 @@ static int __devinit esp_sbus_probe_one(struct device *dev,
 fail_free_irq:
        free_irq(host->irq, esp);
 fail_unmap_command_block:
-        sbus_free_consistent(esp->dev, 16,
+        dma_free_coherent(&op->dev, 16,
-                             esp->command_block,
+                          esp->command_block,
-                             esp->command_block_dma);
+                          esp->command_block_dma);
 fail_unmap_regs:
-        sbus_iounmap(esp->regs, SBUS_ESP_REG_SIZE);
+        of_iounmap(&op->resource[(hme ? 1 : 0)], esp->regs, SBUS_ESP_REG_SIZE);
 fail_unlink:
        scsi_host_put(host);
 fail:
        return err;
 }
-static int __devinit esp_sbus_probe(struct of_device *dev, const struct of_device_id *match)
+static int __devinit esp_sbus_probe(struct of_device *op, const struct of_device_id *match)
 {
-        struct sbus_dev *sdev = to_sbus_device(&dev->dev);
+        struct device_node *dma_node = NULL;
-        struct device_node *dp = dev->node;
+        struct device_node *dp = op->node;
-        struct sbus_dev *dma_sdev = NULL;
+        struct of_device *dma_of = NULL;
        int hme = 0;
        if (dp->parent &&
            (!strcmp(dp->parent->name, "espdma") ||
             !strcmp(dp->parent->name, "dma")))
-                dma_sdev = sdev->parent;
+                dma_node = dp->parent;
        else if (!strcmp(dp->name, "SUNW,fas")) {
-                dma_sdev = sdev;
+                dma_node = op->node;
                hme = 1;
        }
+        if (dma_node)
+                dma_of = of_find_device_by_node(dma_node);
+        if (!dma_of)
+                return -ENODEV;
-        return esp_sbus_probe_one(&dev->dev, sdev, dma_sdev,
+        return esp_sbus_probe_one(op, dma_of, hme);
-                                  sdev->bus, hme);
 }
-static int __devexit esp_sbus_remove(struct of_device *dev)
+static int __devexit esp_sbus_remove(struct of_device *op)
 {
-        struct esp *esp = dev_get_drvdata(&dev->dev);
+        struct esp *esp = dev_get_drvdata(&op->dev);
+        struct of_device *dma_of = esp->dma;
        unsigned int irq = esp->host->irq;
+        bool is_hme;
        u32 val;
        scsi_esp_unregister(esp);
@@ -586,17 +599,25 @@ static int __devexit esp_sbus_remove(struct of_device *dev)
        dma_write32(val & ~DMA_INT_ENAB, DMA_CSR);
        free_irq(irq, esp);
-        sbus_free_consistent(esp->dev, 16,
-                             esp->command_block,
+        is_hme = (esp->dmarev == dvmahme);
-                             esp->command_block_dma);
-        sbus_iounmap(esp->regs, SBUS_ESP_REG_SIZE);
+        dma_free_coherent(&op->dev, 16,
+                          esp->command_block,
+                          esp->command_block_dma);
+        of_iounmap(&op->resource[(is_hme ? 1 : 0)], esp->regs,
+                   SBUS_ESP_REG_SIZE);
+        of_iounmap(&dma_of->resource[0], esp->dma_regs,
+                   resource_size(&dma_of->resource[0]));
        scsi_host_put(esp->host);
+        dev_set_drvdata(&op->dev, NULL);
        return 0;
 }
-static struct of_device_id esp_match[] = {
+static const struct of_device_id esp_match[] = {
        {
                .name = "SUNW,esp",
        },
@@ -619,7 +640,7 @@ static struct of_platform_driver esp_sbus_driver = {
 static int __init sunesp_init(void)
 {
-        return of_register_driver(&esp_sbus_driver, &sbus_bus_type);
+        return of_register_driver(&esp_sbus_driver, &of_bus_type);
 }
 static void __exit sunesp_exit(void)
diff --git a/drivers/scsi/sym53c8xx_2/sym_glue.c b/drivers/scsi/sym53c8xx_2/sym_glue.c
index d39107b7669b..f4e6cde1fd0d 100644
--- a/drivers/scsi/sym53c8xx_2/sym_glue.c
+++ b/drivers/scsi/sym53c8xx_2/sym_glue.c
@@ -519,8 +519,8 @@ static int sym53c8xx_queue_command(struct scsi_cmnd *cmd,
         *  Shorten our settle_time if needed for 
         *  this command not to time out.
         */
-        if (np->s.settle_time_valid && cmd->timeout_per_command) {
+        if (np->s.settle_time_valid && cmd->request->timeout) {
-                unsigned long tlimit = jiffies + cmd->timeout_per_command;
+                unsigned long tlimit = jiffies + cmd->request->timeout;
                tlimit -= SYM_CONF_TIMER_INTERVAL*2;
                if (time_after(np->s.settle_time, tlimit)) {
                        np->s.settle_time = tlimit;
diff --git a/drivers/scsi/tmscsim.c b/drivers/scsi/tmscsim.c
index 1723d71cbf3f..69ac6e590f1d 100644
--- a/drivers/scsi/tmscsim.c
+++ b/drivers/scsi/tmscsim.c
@@ -2573,8 +2573,8 @@ static struct pci_driver dc390_driver = {
 static int __init dc390_module_init(void)
 {
        if (!disable_clustering)
-                printk(KERN_INFO "DC390: clustering now enabled by default. If you get problems load\n"
+                printk(KERN_INFO "DC390: clustering now enabled by default. If you get problems load\n");
-                       "\twith \"disable_clustering=1\" and report to maintainers\n");
+                printk(KERN_INFO "       with \"disable_clustering=1\" and report to maintainers\n");
        if (tmscsim[0] == -1 || tmscsim[0] > 15) {
                tmscsim[0] = 7;