Merge branch 'master' into for-next

91 files changed, 4733 insertions, 17418 deletions

diff --git a/drivers/scsi/Kconfig b/drivers/scsi/Kconfig
index a2d61d061be7..c8bd092fc945 100644
--- a/drivers/scsi/Kconfig
+++ b/drivers/scsi/Kconfig
@@ -499,47 +499,6 @@ config SCSI_AACRAID
 
 
 source "drivers/scsi/aic7xxx/Kconfig.aic7xxx"
-
-config SCSI_AIC7XXX_OLD
-        tristate "Adaptec AIC7xxx support (old driver)"
-        depends on (ISA || EISA || PCI ) && SCSI
-        help
-          WARNING This driver is an older aic7xxx driver and is no longer
-          under active development.  Adaptec, Inc. is writing a new driver to
-          take the place of this one, and it is recommended that whenever
-          possible, people should use the new Adaptec written driver instead
-          of this one.  This driver will eventually be phased out entirely.
-
-          This is support for the various aic7xxx based Adaptec SCSI
-          controllers. These include the 274x EISA cards; 284x VLB cards;
-          2902, 2910, 293x, 294x, 394x, 3985 and several other PCI and
-          motherboard based SCSI controllers from Adaptec. It does not support
-          the AAA-13x RAID controllers from Adaptec, nor will it likely ever
-          support them. It does not support the 2920 cards from Adaptec that
-          use the Future Domain SCSI controller chip. For those cards, you
-          need the "Future Domain 16xx SCSI support" driver.
-
-          In general, if the controller is based on an Adaptec SCSI controller
-          chip from the aic777x series or the aic78xx series, this driver
-          should work. The only exception is the 7810 which is specifically
-          not supported (that's the RAID controller chip on the AAA-13x
-          cards).
-
-          Note that the AHA2920 SCSI host adapter is *not* supported by this
-          driver; choose "Future Domain 16xx SCSI support" instead if you have
-          one of those.
-
-          Information on the configuration options for this controller can be
-          found by checking the help file for each of the available
-          configuration options. You should read
-          <file:Documentation/scsi/aic7xxx_old.txt> at a minimum before
-          contacting the maintainer with any questions.  The SCSI-HOWTO,
-          available from <http://www.tldp.org/docs.html#howto>, can also
-          be of great help.
-
-          To compile this driver as a module, choose M here: the
-          module will be called aic7xxx_old.
-
 source "drivers/scsi/aic7xxx/Kconfig.aic79xx"
 source "drivers/scsi/aic94xx/Kconfig"
 source "drivers/scsi/mvsas/Kconfig"
diff --git a/drivers/scsi/Makefile b/drivers/scsi/Makefile
index 149bb6bf1849..e172d4f8e02f 100644
--- a/drivers/scsi/Makefile
+++ b/drivers/scsi/Makefile
@@ -70,7 +70,6 @@ obj-$(CONFIG_SCSI_AHA1740)	+= aha1740.o
 obj-$(CONFIG_SCSI_AIC7XXX)      += aic7xxx/
 obj-$(CONFIG_SCSI_AIC79XX)      += aic7xxx/
 obj-$(CONFIG_SCSI_AACRAID)      += aacraid/
-obj-$(CONFIG_SCSI_AIC7XXX_OLD)  += aic7xxx_old.o
 obj-$(CONFIG_SCSI_AIC94XX)      += aic94xx/
 obj-$(CONFIG_SCSI_PM8001)       += pm8001/
 obj-$(CONFIG_SCSI_ISCI)         += isci/
diff --git a/drivers/scsi/a2091.c b/drivers/scsi/a2091.c
index 30fa38a0ad39..9176bfbd5745 100644
--- a/drivers/scsi/a2091.c
+++ b/drivers/scsi/a2091.c
@@ -201,7 +201,7 @@ static int a2091_probe(struct zorro_dev *z, const struct zorro_device_id *ent)
         instance->irq = IRQ_AMIGA_PORTS;
         instance->unique_id = z->slotaddr;
 
-        regs = (struct a2091_scsiregs *)ZTWO_VADDR(z->resource.start);
+        regs = ZTWO_VADDR(z->resource.start);
         regs->DAWR = DAWR_A2091;
 
         wdregs.SASR = &regs->SASR;
diff --git a/drivers/scsi/a3000.c b/drivers/scsi/a3000.c
index c0f4f4290dd6..dd5b64726ddc 100644
--- a/drivers/scsi/a3000.c
+++ b/drivers/scsi/a3000.c
@@ -220,7 +220,7 @@ static int __init amiga_a3000_scsi_probe(struct platform_device *pdev)
 
         instance->irq = IRQ_AMIGA_PORTS;
 
-        regs = (struct a3000_scsiregs *)ZTWO_VADDR(res->start);
+        regs = ZTWO_VADDR(res->start);
         regs->DAWR = DAWR_A3000;
 
         wdregs.SASR = &regs->SASR;
diff --git a/drivers/scsi/a4000t.c b/drivers/scsi/a4000t.c
index 70c521f79f7c..f5a2ab41543b 100644
--- a/drivers/scsi/a4000t.c
+++ b/drivers/scsi/a4000t.c
@@ -56,7 +56,7 @@ static int __init amiga_a4000t_scsi_probe(struct platform_device *pdev)
         scsi_addr = res->start + A4000T_SCSI_OFFSET;
 
         /* Fill in the required pieces of hostdata */
-        hostdata->base = (void __iomem *)ZTWO_VADDR(scsi_addr);
+        hostdata->base = ZTWO_VADDR(scsi_addr);
         hostdata->clock = 50;
         hostdata->chip710 = 1;
         hostdata->dmode_extra = DMODE_FC2;
diff --git a/drivers/scsi/aic7xxx_old.c b/drivers/scsi/aic7xxx_old.c
deleted file mode 100644
index 33ec9c643400..000000000000
--- a/drivers/scsi/aic7xxx_old.c
+++ /dev/null
@@ -1,11149 +0,0 @@
-/*+M*************************************************************************
- * Adaptec AIC7xxx device driver for Linux.
- *
- * Copyright (c) 1994 John Aycock
- *   The University of Calgary Department of Computer Science.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2, or (at your option)
- * any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; see the file COPYING.  If not, write to
- * the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
- *
- * Sources include the Adaptec 1740 driver (aha1740.c), the Ultrastor 24F
- * driver (ultrastor.c), various Linux kernel source, the Adaptec EISA
- * config file (!adp7771.cfg), the Adaptec AHA-2740A Series User's Guide,
- * the Linux Kernel Hacker's Guide, Writing a SCSI Device Driver for Linux,
- * the Adaptec 1542 driver (aha1542.c), the Adaptec EISA overlay file
- * (adp7770.ovl), the Adaptec AHA-2740 Series Technical Reference Manual,
- * the Adaptec AIC-7770 Data Book, the ANSI SCSI specification, the
- * ANSI SCSI-2 specification (draft 10c), ...
- *
- * --------------------------------------------------------------------------
- *
- *  Modifications by Daniel M. Eischen (deischen@iworks.InterWorks.org):
- *
- *  Substantially modified to include support for wide and twin bus
- *  adapters, DMAing of SCBs, tagged queueing, IRQ sharing, bug fixes,
- *  SCB paging, and other rework of the code.
- *
- *  Parts of this driver were also based on the FreeBSD driver by
- *  Justin T. Gibbs.  His copyright follows:
- *
- * --------------------------------------------------------------------------  
- * Copyright (c) 1994-1997 Justin Gibbs.
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions, and the following disclaimer,
- *    without modification, immediately at the beginning of the file.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. The name of the author may not be used to endorse or promote products
- *    derived from this software without specific prior written permission.
- *
- * Where this Software is combined with software released under the terms of 
- * the GNU General Public License ("GPL") and the terms of the GPL would require the 
- * combined work to also be released under the terms of the GPL, the terms
- * and conditions of this License will apply in addition to those of the
- * GPL with the exception of any terms or conditions of this License that
- * conflict with, or are expressly prohibited by, the GPL.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE FOR
- * ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- *
- *      $Id: aic7xxx.c,v 1.119 1997/06/27 19:39:18 gibbs Exp $
- *---------------------------------------------------------------------------
- *
- *  Thanks also go to (in alphabetical order) the following:
- *
- *    Rory Bolt     - Sequencer bug fixes
- *    Jay Estabrook - Initial DEC Alpha support
- *    Doug Ledford  - Much needed abort/reset bug fixes
- *    Kai Makisara  - DMAing of SCBs
- *
- *  A Boot time option was also added for not resetting the scsi bus.
- *
- *    Form:  aic7xxx=extended
- *           aic7xxx=no_reset
- *           aic7xxx=ultra
- *           aic7xxx=irq_trigger:[0,1]  # 0 edge, 1 level
- *           aic7xxx=verbose
- *
- *  Daniel M. Eischen, deischen@iworks.InterWorks.org, 1/23/97
- *
- *  $Id: aic7xxx.c,v 4.1 1997/06/12 08:23:42 deang Exp $
- *-M*************************************************************************/
-
-/*+M**************************************************************************
- *
- * Further driver modifications made by Doug Ledford <dledford@redhat.com>
- *
- * Copyright (c) 1997-1999 Doug Ledford
- *
- * These changes are released under the same licensing terms as the FreeBSD
- * driver written by Justin Gibbs.  Please see his Copyright notice above
- * for the exact terms and conditions covering my changes as well as the
- * warranty statement.
- *
- * Modifications made to the aic7xxx.c,v 4.1 driver from Dan Eischen include
- * but are not limited to:
- *
- *  1: Import of the latest FreeBSD sequencer code for this driver
- *  2: Modification of kernel code to accommodate different sequencer semantics
- *  3: Extensive changes throughout kernel portion of driver to improve
- *     abort/reset processing and error hanndling
- *  4: Other work contributed by various people on the Internet
- *  5: Changes to printk information and verbosity selection code
- *  6: General reliability related changes, especially in IRQ management
- *  7: Modifications to the default probe/attach order for supported cards
- *  8: SMP friendliness has been improved
- *
- * Overall, this driver represents a significant departure from the official
- * aic7xxx driver released by Dan Eischen in two ways.  First, in the code
- * itself.  A diff between the two version of the driver is now a several
- * thousand line diff.  Second, in approach to solving the same problem.  The
- * problem is importing the FreeBSD aic7xxx driver code to linux can be a
- * difficult and time consuming process, that also can be error prone.  Dan
- * Eischen's official driver uses the approach that the linux and FreeBSD
- * drivers should be as identical as possible.  To that end, his next version
- * of this driver will be using a mid-layer code library that he is developing
- * to moderate communications between the linux mid-level SCSI code and the
- * low level FreeBSD driver.  He intends to be able to essentially drop the
- * FreeBSD driver into the linux kernel with only a few minor tweaks to some
- * include files and the like and get things working, making for fast easy
- * imports of the FreeBSD code into linux.
- *
- * I disagree with Dan's approach.  Not that I don't think his way of doing
- * things would be nice, easy to maintain, and create a more uniform driver
- * between FreeBSD and Linux.  I have no objection to those issues.  My
- * disagreement is on the needed functionality.  There simply are certain
- * things that are done differently in FreeBSD than linux that will cause
- * problems for this driver regardless of any middle ware Dan implements.
- * The biggest example of this at the moment is interrupt semantics.  Linux
- * doesn't provide the same protection techniques as FreeBSD does, nor can
- * they be easily implemented in any middle ware code since they would truly
- * belong in the kernel proper and would effect all drivers.  For the time
- * being, I see issues such as these as major stumbling blocks to the 
- * reliability of code based upon such middle ware.  Therefore, I choose to
- * use a different approach to importing the FreeBSD code that doesn't
- * involve any middle ware type code.  My approach is to import the sequencer
- * code from FreeBSD wholesale.  Then, to only make changes in the kernel
- * portion of the driver as they are needed for the new sequencer semantics.
- * In this way, the portion of the driver that speaks to the rest of the
- * linux kernel is fairly static and can be changed/modified to solve
- * any problems one might encounter without concern for the FreeBSD driver.
- *
- * Note: If time and experience should prove me wrong that the middle ware
- * code Dan writes is reliable in its operation, then I'll retract my above
- * statements.  But, for those that don't know, I'm from Missouri (in the US)
- * and our state motto is "The Show-Me State".  Well, before I will put
- * faith into it, you'll have to show me that it works :)
- *
- *_M*************************************************************************/
-
-/*
- * The next three defines are user configurable.  These should be the only
- * defines a user might need to get in here and change.  There are other
- * defines buried deeper in the code, but those really shouldn't need touched
- * under normal conditions.
- */
-
-/*
- * AIC7XXX_STRICT_PCI_SETUP
- *   Should we assume the PCI config options on our controllers are set with
- *   sane and proper values, or should we be anal about our PCI config
- *   registers and force them to what we want?  The main advantage to
- *   defining this option is on non-Intel hardware where the BIOS may not
- *   have been run to set things up, or if you have one of the BIOSless
- *   Adaptec controllers, such as a 2910, that don't get set up by the
- *   BIOS.  However, keep in mind that we really do set the most important
- *   items in the driver regardless of this setting, this only controls some
- *   of the more esoteric PCI options on these cards.  In that sense, I
- *   would default to leaving this off.  However, if people wish to try
- *   things both ways, that would also help me to know if there are some
- *   machines where it works one way but not another.
- *
- *   -- July 7, 17:09
- *     OK...I need this on my machine for testing, so the default is to
- *     leave it defined.
- *
- *   -- July 7, 18:49
- *     I needed it for testing, but it didn't make any difference, so back
- *     off she goes.
- *
- *   -- July 16, 23:04
- *     I turned it back on to try and compensate for the 2.1.x PCI code
- *     which no longer relies solely on the BIOS and now tries to set
- *     things itself.
- */
-
-#define AIC7XXX_STRICT_PCI_SETUP
-
-/*
- * AIC7XXX_VERBOSE_DEBUGGING
- *   This option enables a lot of extra printk();s in the code, surrounded
- *   by if (aic7xxx_verbose ...) statements.  Executing all of those if
- *   statements and the extra checks can get to where it actually does have
- *   an impact on CPU usage and such, as well as code size.  Disabling this
- *   define will keep some of those from becoming part of the code.
- *
- *   NOTE:  Currently, this option has no real effect, I will be adding the
- *   various #ifdef's in the code later when I've decided a section is
- *   complete and no longer needs debugging.  OK...a lot of things are now
- *   surrounded by this define, so turning this off does have an impact.
- */
- 
-/*
- * #define AIC7XXX_VERBOSE_DEBUGGING
- */
- 
-#include <linux/module.h>
-#include <stdarg.h>
-#include <asm/io.h>
-#include <asm/irq.h>
-#include <asm/byteorder.h>
-#include <linux/string.h>
-#include <linux/errno.h>
-#include <linux/kernel.h>
-#include <linux/ioport.h>
-#include <linux/delay.h>
-#include <linux/pci.h>
-#include <linux/proc_fs.h>
-#include <linux/blkdev.h>
-#include <linux/init.h>
-#include <linux/spinlock.h>
-#include <linux/smp.h>
-#include <linux/interrupt.h>
-#include "scsi.h"
-#include <scsi/scsi_host.h>
-#include "aic7xxx_old/aic7xxx.h"
-
-#include "aic7xxx_old/sequencer.h"
-#include "aic7xxx_old/scsi_message.h"
-#include "aic7xxx_old/aic7xxx_reg.h"
-#include <scsi/scsicam.h>
-
-#include <linux/stat.h>
-#include <linux/slab.h>        /* for kmalloc() */
-
-#define AIC7XXX_C_VERSION  "5.2.6"
-
-#define ALL_TARGETS -1
-#define ALL_CHANNELS -1
-#define ALL_LUNS -1
-#define MAX_TARGETS  16
-#define MAX_LUNS     8
-#ifndef TRUE
-#  define TRUE 1
-#endif
-#ifndef FALSE
-#  define FALSE 0
-#endif
-
-#if defined(__powerpc__) || defined(__i386__) || defined(__x86_64__)
-#  define MMAPIO
-#endif
-
-/*
- * You can try raising me for better performance or lowering me if you have
- * flaky devices that go off the scsi bus when hit with too many tagged
- * commands (like some IBM SCSI-3 LVD drives).
- */
-#define AIC7XXX_CMDS_PER_DEVICE 32
-
-typedef struct
-{
-  unsigned char tag_commands[16];   /* Allow for wide/twin adapters. */
-} adapter_tag_info_t;
-
-/*
- * Make a define that will tell the driver not to the default tag depth
- * everywhere.
- */
-#define DEFAULT_TAG_COMMANDS {0, 0, 0, 0, 0, 0, 0, 0,\
-                              0, 0, 0, 0, 0, 0, 0, 0}
-
-/*
- * Modify this as you see fit for your system.  By setting tag_commands
- * to 0, the driver will use it's own algorithm for determining the
- * number of commands to use (see above).  When 255, the driver will
- * not enable tagged queueing for that particular device.  When positive
- * (> 0) and (< 255) the values in the array are used for the queue_depth.
- * Note that the maximum value for an entry is 254, but you're insane if
- * you try to use that many commands on one device.
- *
- * In this example, the first line will disable tagged queueing for all
- * the devices on the first probed aic7xxx adapter.
- *
- * The second line enables tagged queueing with 4 commands/LUN for IDs
- * (1, 2-11, 13-15), disables tagged queueing for ID 12, and tells the
- * driver to use its own algorithm for ID 1.
- *
- * The third line is the same as the first line.
- *
- * The fourth line disables tagged queueing for devices 0 and 3.  It
- * enables tagged queueing for the other IDs, with 16 commands/LUN
- * for IDs 1 and 4, 127 commands/LUN for ID 8, and 4 commands/LUN for
- * IDs 2, 5-7, and 9-15.
- */
-
-/*
- * NOTE: The below structure is for reference only, the actual structure
- *       to modify in order to change things is found after this fake one.
- *
-adapter_tag_info_t aic7xxx_tag_info[] =
-{
-  {DEFAULT_TAG_COMMANDS},
-  {{4, 0, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 255, 4, 4, 4}},
-  {DEFAULT_TAG_COMMANDS},
-  {{255, 16, 4, 255, 16, 4, 4, 4, 127, 4, 4, 4, 4, 4, 4, 4}}
-};
-*/
-
-static adapter_tag_info_t aic7xxx_tag_info[] =
-{
-  {DEFAULT_TAG_COMMANDS},
-  {DEFAULT_TAG_COMMANDS},
-  {DEFAULT_TAG_COMMANDS},
-  {DEFAULT_TAG_COMMANDS},
-  {DEFAULT_TAG_COMMANDS},
-  {DEFAULT_TAG_COMMANDS},
-  {DEFAULT_TAG_COMMANDS},
-  {DEFAULT_TAG_COMMANDS},
-  {DEFAULT_TAG_COMMANDS},
-  {DEFAULT_TAG_COMMANDS},
-  {DEFAULT_TAG_COMMANDS},
-  {DEFAULT_TAG_COMMANDS},
-  {DEFAULT_TAG_COMMANDS},
-  {DEFAULT_TAG_COMMANDS},
-  {DEFAULT_TAG_COMMANDS},
-  {DEFAULT_TAG_COMMANDS}
-};
-
-
-/*
- * Define an array of board names that can be indexed by aha_type.
- * Don't forget to change this when changing the types!
- */
-static const char *board_names[] = {
-  "AIC-7xxx Unknown",                                   /* AIC_NONE */
-  "Adaptec AIC-7810 Hardware RAID Controller",          /* AIC_7810 */
-  "Adaptec AIC-7770 SCSI host adapter",                 /* AIC_7770 */
-  "Adaptec AHA-274X SCSI host adapter",                 /* AIC_7771 */
-  "Adaptec AHA-284X SCSI host adapter",                 /* AIC_284x */
-  "Adaptec AIC-7850 SCSI host adapter",                 /* AIC_7850 */
-  "Adaptec AIC-7855 SCSI host adapter",                 /* AIC_7855 */
-  "Adaptec AIC-7860 Ultra SCSI host adapter",           /* AIC_7860 */
-  "Adaptec AHA-2940A Ultra SCSI host adapter",          /* AIC_7861 */
-  "Adaptec AIC-7870 SCSI host adapter",                 /* AIC_7870 */
-  "Adaptec AHA-294X SCSI host adapter",                 /* AIC_7871 */
-  "Adaptec AHA-394X SCSI host adapter",                 /* AIC_7872 */
-  "Adaptec AHA-398X SCSI host adapter",                 /* AIC_7873 */
-  "Adaptec AHA-2944 SCSI host adapter",                 /* AIC_7874 */
-  "Adaptec AIC-7880 Ultra SCSI host adapter",           /* AIC_7880 */
-  "Adaptec AHA-294X Ultra SCSI host adapter",           /* AIC_7881 */
-  "Adaptec AHA-394X Ultra SCSI host adapter",           /* AIC_7882 */
-  "Adaptec AHA-398X Ultra SCSI host adapter",           /* AIC_7883 */
-  "Adaptec AHA-2944 Ultra SCSI host adapter",           /* AIC_7884 */
-  "Adaptec AHA-2940UW Pro Ultra SCSI host adapter",     /* AIC_7887 */
-  "Adaptec AIC-7895 Ultra SCSI host adapter",           /* AIC_7895 */
-  "Adaptec AIC-7890/1 Ultra2 SCSI host adapter",        /* AIC_7890 */
-  "Adaptec AHA-293X Ultra2 SCSI host adapter",          /* AIC_7890 */
-  "Adaptec AHA-294X Ultra2 SCSI host adapter",          /* AIC_7890 */
-  "Adaptec AIC-7896/7 Ultra2 SCSI host adapter",        /* AIC_7896 */
-  "Adaptec AHA-394X Ultra2 SCSI host adapter",          /* AIC_7897 */
-  "Adaptec AHA-395X Ultra2 SCSI host adapter",          /* AIC_7897 */
-  "Adaptec PCMCIA SCSI controller",                     /* card bus stuff */
-  "Adaptec AIC-7892 Ultra 160/m SCSI host adapter",     /* AIC_7892 */
-  "Adaptec AIC-7899 Ultra 160/m SCSI host adapter",     /* AIC_7899 */
-};
-
-/*
- * There should be a specific return value for this in scsi.h, but
- * it seems that most drivers ignore it.
- */
-#define DID_UNDERFLOW   DID_ERROR
-
-/*
- *  What we want to do is have the higher level scsi driver requeue
- *  the command to us. There is no specific driver status for this
- *  condition, but the higher level scsi driver will requeue the
- *  command on a DID_BUS_BUSY error.
- *
- *  Upon further inspection and testing, it seems that DID_BUS_BUSY
- *  will *always* retry the command.  We can get into an infinite loop
- *  if this happens when we really want some sort of counter that
- *  will automatically abort/reset the command after so many retries.
- *  Using DID_ERROR will do just that.  (Made by a suggestion by
- *  Doug Ledford 8/1/96)
- */
-#define DID_RETRY_COMMAND DID_ERROR
-
-#define HSCSIID        0x07
-#define SCSI_RESET     0x040
-
-/*
- * EISA/VL-bus stuff
- */
-#define MINSLOT                1
-#define MAXSLOT                15
-#define SLOTBASE(x)        ((x) << 12)
-#define BASE_TO_SLOT(x) ((x) >> 12)
-
-/*
- * Standard EISA Host ID regs  (Offset from slot base)
- */
-#define AHC_HID0              0x80   /* 0,1: msb of ID2, 2-7: ID1      */
-#define AHC_HID1              0x81   /* 0-4: ID3, 5-7: LSB ID2         */
-#define AHC_HID2              0x82   /* product                        */
-#define AHC_HID3              0x83   /* firmware revision              */
-
-/*
- * AIC-7770 I/O range to reserve for a card
- */
-#define MINREG                0xC00
-#define MAXREG                0xCFF
-
-#define INTDEF                0x5C      /* Interrupt Definition Register */
-
-/*
- * AIC-78X0 PCI registers
- */
-#define        CLASS_PROGIF_REVID        0x08
-#define                DEVREVID        0x000000FFul
-#define                PROGINFC        0x0000FF00ul
-#define                SUBCLASS        0x00FF0000ul
-#define                BASECLASS        0xFF000000ul
-
-#define        CSIZE_LATTIME                0x0C
-#define                CACHESIZE        0x0000003Ful        /* only 5 bits */
-#define                LATTIME                0x0000FF00ul
-
-#define        DEVCONFIG                0x40
-#define                SCBSIZE32        0x00010000ul        /* aic789X only */
-#define                MPORTMODE        0x00000400ul        /* aic7870 only */
-#define                RAMPSM           0x00000200ul        /* aic7870 only */
-#define                RAMPSM_ULTRA2    0x00000004
-#define                VOLSENSE         0x00000100ul
-#define                SCBRAMSEL        0x00000080ul
-#define                SCBRAMSEL_ULTRA2 0x00000008
-#define                MRDCEN           0x00000040ul
-#define                EXTSCBTIME       0x00000020ul        /* aic7870 only */
-#define                EXTSCBPEN        0x00000010ul        /* aic7870 only */
-#define                BERREN           0x00000008ul
-#define                DACEN            0x00000004ul
-#define                STPWLEVEL        0x00000002ul
-#define                DIFACTNEGEN      0x00000001ul        /* aic7870 only */
-
-#define        SCAMCTL                  0x1a                /* Ultra2 only  */
-#define        CCSCBBADDR               0xf0                /* aic7895/6/7  */
-
-/*
- * Define the different types of SEEPROMs on aic7xxx adapters
- * and make it also represent the address size used in accessing
- * its registers.  The 93C46 chips have 1024 bits organized into
- * 64 16-bit words, while the 93C56 chips have 2048 bits organized
- * into 128 16-bit words.  The C46 chips use 6 bits to address
- * each word, while the C56 and C66 (4096 bits) use 8 bits to
- * address each word.
- */
-typedef enum {C46 = 6, C56_66 = 8} seeprom_chip_type;
-
-/*
- *
- * Define the format of the SEEPROM registers (16 bits).
- *
- */
-struct seeprom_config {
-
-/*
- * SCSI ID Configuration Flags
- */
-#define CFXFER                0x0007      /* synchronous transfer rate */
-#define CFSYNCH               0x0008      /* enable synchronous transfer */
-#define CFDISC                0x0010      /* enable disconnection */
-#define CFWIDEB               0x0020      /* wide bus device (wide card) */
-#define CFSYNCHISULTRA        0x0040      /* CFSYNC is an ultra offset */
-#define CFNEWULTRAFORMAT      0x0080      /* Use the Ultra2 SEEPROM format */
-#define CFSTART               0x0100      /* send start unit SCSI command */
-#define CFINCBIOS             0x0200      /* include in BIOS scan */
-#define CFRNFOUND             0x0400      /* report even if not found */
-#define CFMULTILUN            0x0800      /* probe mult luns in BIOS scan */
-#define CFWBCACHEYES          0x4000      /* Enable W-Behind Cache on drive */
-#define CFWBCACHENC           0xc000      /* Don't change W-Behind Cache */
-/* UNUSED                0x3000 */
-  unsigned short device_flags[16];        /* words 0-15 */
-
-/*
- * BIOS Control Bits
- */
-#define CFSUPREM        0x0001  /* support all removable drives */
-#define CFSUPREMB       0x0002  /* support removable drives for boot only */
-#define CFBIOSEN        0x0004  /* BIOS enabled */
-/* UNUSED                0x0008 */
-#define CFSM2DRV        0x0010  /* support more than two drives */
-#define CF284XEXTEND    0x0020  /* extended translation (284x cards) */
-/* UNUSED                0x0040 */
-#define CFEXTEND        0x0080  /* extended translation enabled */
-/* UNUSED                0xFF00 */
-  unsigned short bios_control;  /* word 16 */
-
-/*
- * Host Adapter Control Bits
- */
-#define CFAUTOTERM      0x0001  /* Perform Auto termination */
-#define CFULTRAEN       0x0002  /* Ultra SCSI speed enable (Ultra cards) */
-#define CF284XSELTO     0x0003  /* Selection timeout (284x cards) */
-#define CF284XFIFO      0x000C  /* FIFO Threshold (284x cards) */
-#define CFSTERM         0x0004  /* SCSI low byte termination */
-#define CFWSTERM        0x0008  /* SCSI high byte termination (wide card) */
-#define CFSPARITY       0x0010  /* SCSI parity */
-#define CF284XSTERM     0x0020  /* SCSI low byte termination (284x cards) */
-#define CFRESETB        0x0040  /* reset SCSI bus at boot */
-#define CFBPRIMARY      0x0100  /* Channel B primary on 7895 chipsets */
-#define CFSEAUTOTERM    0x0400  /* aic7890 Perform SE Auto Term */
-#define CFLVDSTERM      0x0800  /* aic7890 LVD Termination */
-/* UNUSED                0xF280 */
-  unsigned short adapter_control;        /* word 17 */
-
-/*
- * Bus Release, Host Adapter ID
- */
-#define CFSCSIID        0x000F                /* host adapter SCSI ID */
-/* UNUSED                0x00F0 */
-#define CFBRTIME        0xFF00                /* bus release time */
-  unsigned short brtime_id;                /* word 18 */
-
-/*
- * Maximum targets
- */
-#define CFMAXTARG        0x00FF        /* maximum targets */
-/* UNUSED                0xFF00 */
-  unsigned short max_targets;                /* word 19 */
-
-  unsigned short res_1[11];                /* words 20-30 */
-  unsigned short checksum;                /* word 31 */
-};
-
-#define SELBUS_MASK                0x0a
-#define         SELNARROW        0x00
-#define         SELBUSB                0x08
-#define SINGLE_BUS                0x00
-
-#define SCB_TARGET(scb)         \
-       (((scb)->hscb->target_channel_lun & TID) >> 4)
-#define SCB_LUN(scb)            \
-       ((scb)->hscb->target_channel_lun & LID)
-#define SCB_IS_SCSIBUS_B(scb)   \
-       (((scb)->hscb->target_channel_lun & SELBUSB) != 0)
-
-/*
- * If an error occurs during a data transfer phase, run the command
- * to completion - it's easier that way - making a note of the error
- * condition in this location. This then will modify a DID_OK status
- * into an appropriate error for the higher-level SCSI code.
- */
-#define aic7xxx_error(cmd)        ((cmd)->SCp.Status)
-
-/*
- * Keep track of the targets returned status.
- */
-#define aic7xxx_status(cmd)        ((cmd)->SCp.sent_command)
-
-/*
- * The position of the SCSI commands scb within the scb array.
- */
-#define aic7xxx_position(cmd)        ((cmd)->SCp.have_data_in)
-
-/*
- * The stored DMA mapping for single-buffer data transfers.
- */
-#define aic7xxx_mapping(cmd)         ((cmd)->SCp.phase)
-
-/*
- * Get out private data area from a scsi cmd pointer
- */
-#define AIC_DEV(cmd)    ((struct aic_dev_data *)(cmd)->device->hostdata)
-
-/*
- * So we can keep track of our host structs
- */
-static struct aic7xxx_host *first_aic7xxx = NULL;
-
-/*
- * As of Linux 2.1, the mid-level SCSI code uses virtual addresses
- * in the scatter-gather lists.  We need to convert the virtual
- * addresses to physical addresses.
- */
-struct hw_scatterlist {
-  unsigned int address;
-  unsigned int length;
-};
-
-/*
- * Maximum number of SG segments these cards can support.
- */
-#define        AIC7XXX_MAX_SG 128
-
-/*
- * The maximum number of SCBs we could have for ANY type
- * of card. DON'T FORGET TO CHANGE THE SCB MASK IN THE
- * SEQUENCER CODE IF THIS IS MODIFIED!
- */
-#define AIC7XXX_MAXSCB        255
-
-
-struct aic7xxx_hwscb {
-/* ------------    Begin hardware supported fields    ---------------- */
-/* 0*/  unsigned char control;
-/* 1*/  unsigned char target_channel_lun;       /* 4/1/3 bits */
-/* 2*/  unsigned char target_status;
-/* 3*/  unsigned char SG_segment_count;
-/* 4*/  unsigned int  SG_list_pointer;
-/* 8*/  unsigned char residual_SG_segment_count;
-/* 9*/  unsigned char residual_data_count[3];
-/*12*/  unsigned int  data_pointer;
-/*16*/  unsigned int  data_count;
-/*20*/  unsigned int  SCSI_cmd_pointer;
-/*24*/  unsigned char SCSI_cmd_length;
-/*25*/  unsigned char tag;          /* Index into our kernel SCB array.
-                                     * Also used as the tag for tagged I/O
-                                     */
-#define SCB_PIO_TRANSFER_SIZE  26   /* amount we need to upload/download
-                                     * via PIO to initialize a transaction.
-                                     */
-/*26*/  unsigned char next;         /* Used to thread SCBs awaiting selection
-                                     * or disconnected down in the sequencer.
-                                     */
-/*27*/  unsigned char prev;
-/*28*/  unsigned int pad;           /*
-                                     * Unused by the kernel, but we require
-                                     * the padding so that the array of
-                                     * hardware SCBs is aligned on 32 byte
-                                     * boundaries so the sequencer can index
-                                     */
-};
-
-typedef enum {
-        SCB_FREE                = 0x0000,
-        SCB_DTR_SCB             = 0x0001,
-        SCB_WAITINGQ            = 0x0002,
-        SCB_ACTIVE              = 0x0004,
-        SCB_SENSE               = 0x0008,
-        SCB_ABORT               = 0x0010,
-        SCB_DEVICE_RESET        = 0x0020,
-        SCB_RESET               = 0x0040,
-        SCB_RECOVERY_SCB        = 0x0080,
-        SCB_MSGOUT_PPR          = 0x0100,
-        SCB_MSGOUT_SENT         = 0x0200,
-        SCB_MSGOUT_SDTR         = 0x0400,
-        SCB_MSGOUT_WDTR         = 0x0800,
-        SCB_MSGOUT_BITS         = SCB_MSGOUT_PPR |
-                                  SCB_MSGOUT_SENT | 
-                                  SCB_MSGOUT_SDTR |
-                                  SCB_MSGOUT_WDTR,
-        SCB_QUEUED_ABORT        = 0x1000,
-        SCB_QUEUED_FOR_DONE     = 0x2000,
-        SCB_WAS_BUSY            = 0x4000,
-        SCB_QUEUE_FULL          = 0x8000
-} scb_flag_type;
-
-typedef enum {
-        AHC_FNONE                 = 0x00000000,
-        AHC_PAGESCBS              = 0x00000001,
-        AHC_CHANNEL_B_PRIMARY     = 0x00000002,
-        AHC_USEDEFAULTS           = 0x00000004,
-        AHC_INDIRECT_PAGING       = 0x00000008,
-        AHC_CHNLB                 = 0x00000020,
-        AHC_CHNLC                 = 0x00000040,
-        AHC_EXTEND_TRANS_A        = 0x00000100,
-        AHC_EXTEND_TRANS_B        = 0x00000200,
-        AHC_TERM_ENB_A            = 0x00000400,
-        AHC_TERM_ENB_SE_LOW       = 0x00000400,
-        AHC_TERM_ENB_B            = 0x00000800,
-        AHC_TERM_ENB_SE_HIGH      = 0x00000800,
-        AHC_HANDLING_REQINITS     = 0x00001000,
-        AHC_TARGETMODE            = 0x00002000,
-        AHC_NEWEEPROM_FMT         = 0x00004000,
- /*
-  *  Here ends the FreeBSD defined flags and here begins the linux defined
-  *  flags.  NOTE: I did not preserve the old flag name during this change
-  *  specifically to force me to evaluate what flags were being used properly
-  *  and what flags weren't.  This way, I could clean up the flag usage on
-  *  a use by use basis.  Doug Ledford
-  */
-        AHC_MOTHERBOARD           = 0x00020000,
-        AHC_NO_STPWEN             = 0x00040000,
-        AHC_RESET_DELAY           = 0x00080000,
-        AHC_A_SCANNED             = 0x00100000,
-        AHC_B_SCANNED             = 0x00200000,
-        AHC_MULTI_CHANNEL         = 0x00400000,
-        AHC_BIOS_ENABLED          = 0x00800000,
-        AHC_SEEPROM_FOUND         = 0x01000000,
-        AHC_TERM_ENB_LVD          = 0x02000000,
-        AHC_ABORT_PENDING         = 0x04000000,
-        AHC_RESET_PENDING         = 0x08000000,
-#define AHC_IN_ISR_BIT              28
-        AHC_IN_ISR                = 0x10000000,
-        AHC_IN_ABORT              = 0x20000000,
-        AHC_IN_RESET              = 0x40000000,
-        AHC_EXTERNAL_SRAM         = 0x80000000
-} ahc_flag_type;
-
-typedef enum {
-  AHC_NONE             = 0x0000,
-  AHC_CHIPID_MASK      = 0x00ff,
-  AHC_AIC7770          = 0x0001,
-  AHC_AIC7850          = 0x0002,
-  AHC_AIC7860          = 0x0003,
-  AHC_AIC7870          = 0x0004,
-  AHC_AIC7880          = 0x0005,
-  AHC_AIC7890          = 0x0006,
-  AHC_AIC7895          = 0x0007,
-  AHC_AIC7896          = 0x0008,
-  AHC_AIC7892          = 0x0009,
-  AHC_AIC7899          = 0x000a,
-  AHC_VL               = 0x0100,
-  AHC_EISA             = 0x0200,
-  AHC_PCI              = 0x0400,
-} ahc_chip;
-
-typedef enum {
-  AHC_FENONE           = 0x0000,
-  AHC_ULTRA            = 0x0001,
-  AHC_ULTRA2           = 0x0002,
-  AHC_WIDE             = 0x0004,
-  AHC_TWIN             = 0x0008,
-  AHC_MORE_SRAM        = 0x0010,
-  AHC_CMD_CHAN         = 0x0020,
-  AHC_QUEUE_REGS       = 0x0040,
-  AHC_SG_PRELOAD       = 0x0080,
-  AHC_SPIOCAP          = 0x0100,
-  AHC_ULTRA3           = 0x0200,
-  AHC_NEW_AUTOTERM     = 0x0400,
-  AHC_AIC7770_FE       = AHC_FENONE,
-  AHC_AIC7850_FE       = AHC_SPIOCAP,
-  AHC_AIC7860_FE       = AHC_ULTRA|AHC_SPIOCAP,
-  AHC_AIC7870_FE       = AHC_FENONE,
-  AHC_AIC7880_FE       = AHC_ULTRA,
-  AHC_AIC7890_FE       = AHC_MORE_SRAM|AHC_CMD_CHAN|AHC_ULTRA2|
-                         AHC_QUEUE_REGS|AHC_SG_PRELOAD|AHC_NEW_AUTOTERM,
-  AHC_AIC7895_FE       = AHC_MORE_SRAM|AHC_CMD_CHAN|AHC_ULTRA,
-  AHC_AIC7896_FE       = AHC_AIC7890_FE,
-  AHC_AIC7892_FE       = AHC_AIC7890_FE|AHC_ULTRA3,
-  AHC_AIC7899_FE       = AHC_AIC7890_FE|AHC_ULTRA3,
-} ahc_feature;
-
-#define SCB_DMA_ADDR(scb, addr) ((unsigned long)(addr) + (scb)->scb_dma->dma_offset)
-
-struct aic7xxx_scb_dma {
-        unsigned long          dma_offset;    /* Correction you have to add
-                                               * to virtual address to get
-                                               * dma handle in this region */
-        dma_addr_t             dma_address;   /* DMA handle of the start,
-                                               * for unmap */
-        unsigned int           dma_len;       /* DMA length */
-};
-
-typedef enum {
-  AHC_BUG_NONE            = 0x0000,
-  AHC_BUG_TMODE_WIDEODD   = 0x0001,
-  AHC_BUG_AUTOFLUSH       = 0x0002,
-  AHC_BUG_CACHETHEN       = 0x0004,
-  AHC_BUG_CACHETHEN_DIS   = 0x0008,
-  AHC_BUG_PCI_2_1_RETRY   = 0x0010,
-  AHC_BUG_PCI_MWI         = 0x0020,
-  AHC_BUG_SCBCHAN_UPLOAD  = 0x0040,
-} ahc_bugs;
-
-struct aic7xxx_scb {
-        struct aic7xxx_hwscb    *hscb;          /* corresponding hardware scb */
-        struct scsi_cmnd        *cmd;           /* scsi_cmnd for this scb */
-        struct aic7xxx_scb      *q_next;        /* next scb in queue */
-        volatile scb_flag_type  flags;          /* current state of scb */
-        struct hw_scatterlist   *sg_list;       /* SG list in adapter format */
-        unsigned char           tag_action;
-        unsigned char           sg_count;
-        unsigned char           *sense_cmd;     /*
-                                                 * Allocate 6 characters for
-                                                 * sense command.
-                                                 */
-        unsigned char           *cmnd;
-        unsigned int            sg_length;      /*
-                                                 * We init this during
-                                                 * buildscb so we don't have
-                                                 * to calculate anything during
-                                                 * underflow/overflow/stat code
-                                                 */
-        void                    *kmalloc_ptr;
-        struct aic7xxx_scb_dma  *scb_dma;
-};
-
-/*
- * Define a linked list of SCBs.
- */
-typedef struct {
-  struct aic7xxx_scb *head;
-  struct aic7xxx_scb *tail;
-} scb_queue_type;
-
-static struct {
-  unsigned char errno;
-  const char *errmesg;
-} hard_error[] = {
-  { ILLHADDR,  "Illegal Host Access" },
-  { ILLSADDR,  "Illegal Sequencer Address referenced" },
-  { ILLOPCODE, "Illegal Opcode in sequencer program" },
-  { SQPARERR,  "Sequencer Ram Parity Error" },
-  { DPARERR,   "Data-Path Ram Parity Error" },
-  { MPARERR,   "Scratch Ram/SCB Array Ram Parity Error" },
-  { PCIERRSTAT,"PCI Error detected" },
-  { CIOPARERR, "CIOBUS Parity Error" }
-};
-
-static unsigned char
-generic_sense[] = { REQUEST_SENSE, 0, 0, 0, 255, 0 };
-
-typedef struct {
-  scb_queue_type free_scbs;        /*
-                                    * SCBs assigned to free slot on
-                                    * card (no paging required)
-                                    */
-  struct aic7xxx_scb   *scb_array[AIC7XXX_MAXSCB];
-  struct aic7xxx_hwscb *hscbs;
-  unsigned char  numscbs;          /* current number of scbs */
-  unsigned char  maxhscbs;         /* hardware scbs */
-  unsigned char  maxscbs;          /* max scbs including pageable scbs */
-  dma_addr_t     hscbs_dma;        /* DMA handle to hscbs */
-  unsigned int   hscbs_dma_len;    /* length of the above DMA area */
-  void          *hscb_kmalloc_ptr;
-} scb_data_type;
-
-struct target_cmd {
-  unsigned char mesg_bytes[4];
-  unsigned char command[28];
-};
-
-#define AHC_TRANS_CUR    0x0001
-#define AHC_TRANS_ACTIVE 0x0002
-#define AHC_TRANS_GOAL   0x0004
-#define AHC_TRANS_USER   0x0008
-#define AHC_TRANS_QUITE  0x0010
-typedef struct {
-  unsigned char width;
-  unsigned char period;
-  unsigned char offset;
-  unsigned char options;
-} transinfo_type;
-
-struct aic_dev_data {
-  volatile scb_queue_type  delayed_scbs;
-  volatile unsigned short  temp_q_depth;
-  unsigned short           max_q_depth;
-  volatile unsigned char   active_cmds;
-  /*
-   * Statistics Kept:
-   *
-   * Total Xfers (count for each command that has a data xfer),
-   * broken down by reads && writes.
-   *
-   * Further sorted into a few bins for keeping tabs on how many commands
-   * we get of various sizes.
-   *
-   */
-  long w_total;                          /* total writes */
-  long r_total;                          /* total reads */
-  long barrier_total;                    /* total num of REQ_BARRIER commands */
-  long ordered_total;                    /* How many REQ_BARRIER commands we
-                                            used ordered tags to satisfy */
-  long w_bins[6];                       /* binned write */
-  long r_bins[6];                       /* binned reads */
-  transinfo_type        cur;
-  transinfo_type        goal;
-#define  BUS_DEVICE_RESET_PENDING       0x01
-#define  DEVICE_RESET_DELAY             0x02
-#define  DEVICE_PRINT_DTR               0x04
-#define  DEVICE_WAS_BUSY                0x08
-#define  DEVICE_DTR_SCANNED             0x10
-#define  DEVICE_SCSI_3                  0x20
-  volatile unsigned char   flags;
-  unsigned needppr:1;
-  unsigned needppr_copy:1;
-  unsigned needsdtr:1;
-  unsigned needsdtr_copy:1;
-  unsigned needwdtr:1;
-  unsigned needwdtr_copy:1;
-  unsigned dtr_pending:1;
-  struct scsi_device *SDptr;
-  struct list_head list;
-};
-
-/*
- * Define a structure used for each host adapter.  Note, in order to avoid
- * problems with architectures I can't test on (because I don't have one,
- * such as the Alpha based systems) which happen to give faults for
- * non-aligned memory accesses, care was taken to align this structure
- * in a way that guaranteed all accesses larger than 8 bits were aligned
- * on the appropriate boundary.  It's also organized to try and be more
- * cache line efficient.  Be careful when changing this lest you might hurt
- * overall performance and bring down the wrath of the masses.
- */
-struct aic7xxx_host {
-  /*
-   *  This is the first 64 bytes in the host struct
-   */
-
-  /*
-   * We are grouping things here....first, items that get either read or
-   * written with nearly every interrupt
-   */
-        volatile long   flags;
-        ahc_feature     features;       /* chip features */
-        unsigned long   base;           /* card base address */
-        volatile unsigned char  __iomem *maddr; /* memory mapped address */
-        unsigned long   isr_count;      /* Interrupt count */
-        unsigned long   spurious_int;
-        scb_data_type   *scb_data;
-        struct aic7xxx_cmd_queue {
-                struct scsi_cmnd *head;
-                struct scsi_cmnd *tail;
-        } completeq;
-
-        /*
-        * Things read/written on nearly every entry into aic7xxx_queue()
-        */
-        volatile scb_queue_type waiting_scbs;
-        unsigned char   unpause;        /* unpause value for HCNTRL */
-        unsigned char   pause;          /* pause value for HCNTRL */
-        volatile unsigned char  qoutfifonext;
-        volatile unsigned char  activescbs;     /* active scbs */
-        volatile unsigned char  max_activescbs;
-        volatile unsigned char  qinfifonext;
-        volatile unsigned char  *untagged_scbs;
-        volatile unsigned char  *qoutfifo;
-        volatile unsigned char  *qinfifo;
-
-        unsigned char   dev_last_queue_full[MAX_TARGETS];
-        unsigned char   dev_last_queue_full_count[MAX_TARGETS];
-        unsigned short  ultraenb; /* Gets downloaded to card as a bitmap */
-        unsigned short  discenable; /* Gets downloaded to card as a bitmap */
-        transinfo_type  user[MAX_TARGETS];
-
-        unsigned char   msg_buf[13];    /* The message for the target */
-        unsigned char   msg_type;
-#define MSG_TYPE_NONE              0x00
-#define MSG_TYPE_INITIATOR_MSGOUT  0x01
-#define MSG_TYPE_INITIATOR_MSGIN   0x02
-        unsigned char   msg_len;        /* Length of message */
-        unsigned char   msg_index;      /* Index into msg_buf array */
-
-
-        /*
-         * We put the less frequently used host structure items
-         * after the more frequently used items to try and ease
-         * the burden on the cache subsystem.
-         * These entries are not *commonly* accessed, whereas
-         * the preceding entries are accessed very often.
-         */
-
-        unsigned int    irq;            /* IRQ for this adapter */
-        int             instance;       /* aic7xxx instance number */
-        int             scsi_id;        /* host adapter SCSI ID */
-        int             scsi_id_b;      /* channel B for twin adapters */
-        unsigned int    bios_address;
-        int             board_name_index;
-        unsigned short  bios_control;           /* bios control - SEEPROM */
-        unsigned short  adapter_control;        /* adapter control - SEEPROM */
-        struct pci_dev  *pdev;
-        unsigned char   pci_bus;
-        unsigned char   pci_device_fn;
-        struct seeprom_config   sc;
-        unsigned short  sc_type;
-        unsigned short  sc_size;
-        struct aic7xxx_host     *next;  /* allow for multiple IRQs */
-        struct Scsi_Host        *host;  /* pointer to scsi host */
-        struct list_head         aic_devs; /* all aic_dev structs on host */
-        int             host_no;        /* SCSI host number */
-        unsigned long   mbase;          /* I/O memory address */
-        ahc_chip        chip;           /* chip type */
-        ahc_bugs        bugs;
-        dma_addr_t      fifo_dma;       /* DMA handle for fifo arrays */
-};
-
-/*
- * Valid SCSIRATE values. (p. 3-17)
- * Provides a mapping of transfer periods in ns/4 to the proper value to
- * stick in the SCSIRATE reg to use that transfer rate.
- */
-#define AHC_SYNCRATE_ULTRA3 0
-#define AHC_SYNCRATE_ULTRA2 1
-#define AHC_SYNCRATE_ULTRA  3
-#define AHC_SYNCRATE_FAST   6
-#define AHC_SYNCRATE_CRC 0x40
-#define AHC_SYNCRATE_SE  0x10
-static struct aic7xxx_syncrate {
-  /* Rates in Ultra mode have bit 8 of sxfr set */
-#define                ULTRA_SXFR 0x100
-  int sxfr_ultra2;
-  int sxfr;
-  unsigned char period;
-  const char *rate[2];
-} aic7xxx_syncrates[] = {
-  { 0x42,  0x000,   9,  {"80.0", "160.0"} },
-  { 0x13,  0x000,  10,  {"40.0", "80.0"} },
-  { 0x14,  0x000,  11,  {"33.0", "66.6"} },
-  { 0x15,  0x100,  12,  {"20.0", "40.0"} },
-  { 0x16,  0x110,  15,  {"16.0", "32.0"} },
-  { 0x17,  0x120,  18,  {"13.4", "26.8"} },
-  { 0x18,  0x000,  25,  {"10.0", "20.0"} },
-  { 0x19,  0x010,  31,  {"8.0",  "16.0"} },
-  { 0x1a,  0x020,  37,  {"6.67", "13.3"} },
-  { 0x1b,  0x030,  43,  {"5.7",  "11.4"} },
-  { 0x10,  0x040,  50,  {"5.0",  "10.0"} },
-  { 0x00,  0x050,  56,  {"4.4",  "8.8" } },
-  { 0x00,  0x060,  62,  {"4.0",  "8.0" } },
-  { 0x00,  0x070,  68,  {"3.6",  "7.2" } },
-  { 0x00,  0x000,  0,   {NULL, NULL}   },
-};
-
-#define CTL_OF_SCB(scb) (((scb->hscb)->target_channel_lun >> 3) & 0x1),  \
-                        (((scb->hscb)->target_channel_lun >> 4) & 0xf), \
-                        ((scb->hscb)->target_channel_lun & 0x07)
-
-#define CTL_OF_CMD(cmd) ((cmd->device->channel) & 0x01),  \
-                        ((cmd->device->id) & 0x0f), \
-                        ((cmd->device->lun) & 0x07)
-
-#define TARGET_INDEX(cmd)  ((cmd)->device->id | ((cmd)->device->channel << 3))
-
-/*
- * A nice little define to make doing our printks a little easier
- */
-
-#define WARN_LEAD KERN_WARNING "(scsi%d:%d:%d:%d) "
-#define INFO_LEAD KERN_INFO "(scsi%d:%d:%d:%d) "
-
-/*
- * XXX - these options apply unilaterally to _all_ 274x/284x/294x
- *       cards in the system.  This should be fixed.  Exceptions to this
- *       rule are noted in the comments.
- */
-
-/*
- * Use this as the default queue depth when setting tagged queueing on.
- */
-static unsigned int aic7xxx_default_queue_depth = AIC7XXX_CMDS_PER_DEVICE;
-
-/*
- * Skip the scsi bus reset.  Non 0 make us skip the reset at startup.  This
- * has no effect on any later resets that might occur due to things like
- * SCSI bus timeouts.
- */
-static unsigned int aic7xxx_no_reset = 0;
-/*
- * Certain PCI motherboards will scan PCI devices from highest to lowest,
- * others scan from lowest to highest, and they tend to do all kinds of
- * strange things when they come into contact with PCI bridge chips.  The
- * net result of all this is that the PCI card that is actually used to boot
- * the machine is very hard to detect.  Most motherboards go from lowest
- * PCI slot number to highest, and the first SCSI controller found is the
- * one you boot from.  The only exceptions to this are when a controller
- * has its BIOS disabled.  So, we by default sort all of our SCSI controllers
- * from lowest PCI slot number to highest PCI slot number.  We also force
- * all controllers with their BIOS disabled to the end of the list.  This
- * works on *almost* all computers.  Where it doesn't work, we have this
- * option.  Setting this option to non-0 will reverse the order of the sort
- * to highest first, then lowest, but will still leave cards with their BIOS
- * disabled at the very end.  That should fix everyone up unless there are
- * really strange cirumstances.
- */
-static int aic7xxx_reverse_scan = 0;
-/*
- * Should we force EXTENDED translation on a controller.
- *     0 == Use whatever is in the SEEPROM or default to off
- *     1 == Use whatever is in the SEEPROM or default to on
- */
-static unsigned int aic7xxx_extended = 0;
-/*
- * The IRQ trigger method used on EISA controllers. Does not effect PCI cards.
- *   -1 = Use detected settings.
- *    0 = Force Edge triggered mode.
- *    1 = Force Level triggered mode.
- */
-static int aic7xxx_irq_trigger = -1;
-/*
- * This variable is used to override the termination settings on a controller.
- * This should not be used under normal conditions.  However, in the case
- * that a controller does not have a readable SEEPROM (so that we can't
- * read the SEEPROM settings directly) and that a controller has a buggered
- * version of the cable detection logic, this can be used to force the 
- * correct termination.  It is preferable to use the manual termination
- * settings in the BIOS if possible, but some motherboard controllers store
- * those settings in a format we can't read.  In other cases, auto term
- * should also work, but the chipset was put together with no auto term
- * logic (common on motherboard controllers).  In those cases, we have
- * 32 bits here to work with.  That's good for 8 controllers/channels.  The
- * bits are organized as 4 bits per channel, with scsi0 getting the lowest
- * 4 bits in the int.  A 1 in a bit position indicates the termination setting
- * that corresponds to that bit should be enabled, a 0 is disabled.
- * It looks something like this:
- *
- *    0x0f =  1111-Single Ended Low Byte Termination on/off
- *            ||\-Single Ended High Byte Termination on/off
- *            |\-LVD Low Byte Termination on/off
- *            \-LVD High Byte Termination on/off
- *
- * For non-Ultra2 controllers, the upper 2 bits are not important.  So, to
- * enable both high byte and low byte termination on scsi0, I would need to
- * make sure that the override_term variable was set to 0x03 (bits 0011).
- * To make sure that all termination is enabled on an Ultra2 controller at
- * scsi2 and only high byte termination on scsi1 and high and low byte
- * termination on scsi0, I would set override_term=0xf23 (bits 1111 0010 0011)
- *
- * For the most part, users should never have to use this, that's why I
- * left it fairly cryptic instead of easy to understand.  If you need it,
- * most likely someone will be telling you what your's needs to be set to.
- */
-static int aic7xxx_override_term = -1;
-/*
- * Certain motherboard chipset controllers tend to screw
- * up the polarity of the term enable output pin.  Use this variable
- * to force the correct polarity for your system.  This is a bitfield variable
- * similar to the previous one, but this one has one bit per channel instead
- * of four.
- *    0 = Force the setting to active low.
- *    1 = Force setting to active high.
- * Most Adaptec cards are active high, several motherboards are active low.
- * To force a 2940 card at SCSI 0 to active high and a motherboard 7895
- * controller at scsi1 and scsi2 to active low, and a 2910 card at scsi3
- * to active high, you would need to set stpwlev=0x9 (bits 1001).
- *
- * People shouldn't need to use this, but if you are experiencing lots of
- * SCSI timeout problems, this may help.  There is one sure way to test what
- * this option needs to be.  Using a boot floppy to boot the system, configure
- * your system to enable all SCSI termination (in the Adaptec SCSI BIOS) and
- * if needed then also pass a value to override_term to make sure that the
- * driver is enabling SCSI termination, then set this variable to either 0
- * or 1.  When the driver boots, make sure there are *NO* SCSI cables
- * connected to your controller.  If it finds and inits the controller
- * without problem, then the setting you passed to stpwlev was correct.  If
- * the driver goes into a reset loop and hangs the system, then you need the
- * other setting for this variable.  If neither setting lets the machine
- * boot then you have definite termination problems that may not be fixable.
- */
-static int aic7xxx_stpwlev = -1;
-/*
- * Set this to non-0 in order to force the driver to panic the kernel
- * and print out debugging info on a SCSI abort or reset cycle.
- */
-static int aic7xxx_panic_on_abort = 0;
-/*
- * PCI bus parity checking of the Adaptec controllers.  This is somewhat
- * dubious at best.  To my knowledge, this option has never actually
- * solved a PCI parity problem, but on certain machines with broken PCI
- * chipset configurations, it can generate tons of false error messages.
- * It's included in the driver for completeness.
- *   0 = Shut off PCI parity check
- *  -1 = Normal polarity pci parity checking
- *   1 = reverse polarity pci parity checking
- *
- * NOTE: you can't actually pass -1 on the lilo prompt.  So, to set this
- * variable to -1 you would actually want to simply pass the variable
- * name without a number.  That will invert the 0 which will result in
- * -1.
- */
-static int aic7xxx_pci_parity = 0;
-/*
- * Set this to any non-0 value to cause us to dump the contents of all
- * the card's registers in a hex dump format tailored to each model of
- * controller.
- * 
- * NOTE: THE CONTROLLER IS LEFT IN AN UNUSABLE STATE BY THIS OPTION.
- *       YOU CANNOT BOOT UP WITH THIS OPTION, IT IS FOR DEBUGGING PURPOSES
- *       ONLY
- */
-static int aic7xxx_dump_card = 0;
-/*
- * Set this to a non-0 value to make us dump out the 32 bit instruction
- * registers on the card after completing the sequencer download.  This
- * allows the actual sequencer download to be verified.  It is possible
- * to use this option and still boot up and run your system.  This is
- * only intended for debugging purposes.
- */
-static int aic7xxx_dump_sequencer = 0;
-/*
- * Certain newer motherboards have put new PCI based devices into the
- * IO spaces that used to typically be occupied by VLB or EISA cards.
- * This overlap can cause these newer motherboards to lock up when scanned
- * for older EISA and VLB devices.  Setting this option to non-0 will
- * cause the driver to skip scanning for any VLB or EISA controllers and
- * only support the PCI controllers.  NOTE: this means that if the kernel
- * os compiled with PCI support disabled, then setting this to non-0
- * would result in never finding any devices :)
- */
-static int aic7xxx_no_probe = 0;
-/*
- * On some machines, enabling the external SCB RAM isn't reliable yet.  I
- * haven't had time to make test patches for things like changing the
- * timing mode on that external RAM either.  Some of those changes may
- * fix the problem.  Until then though, we default to external SCB RAM
- * off and give a command line option to enable it.
- */
-static int aic7xxx_scbram = 0;
-/*
- * So that we can set how long each device is given as a selection timeout.
- * The table of values goes like this:
- *   0 - 256ms
- *   1 - 128ms
- *   2 - 64ms
- *   3 - 32ms
- * We default to 64ms because it's fast.  Some old SCSI-I devices need a
- * longer time.  The final value has to be left shifted by 3, hence 0x10
- * is the final value.
- */
-static int aic7xxx_seltime = 0x10;
-/*
- * So that insmod can find the variable and make it point to something
- */
-#ifdef MODULE
-static char * aic7xxx = NULL;
-module_param(aic7xxx, charp, 0);
-#endif
-
-#define VERBOSE_NORMAL         0x0000
-#define VERBOSE_NEGOTIATION    0x0001
-#define VERBOSE_SEQINT         0x0002
-#define VERBOSE_SCSIINT        0x0004
-#define VERBOSE_PROBE          0x0008
-#define VERBOSE_PROBE2         0x0010
-#define VERBOSE_NEGOTIATION2   0x0020
-#define VERBOSE_MINOR_ERROR    0x0040
-#define VERBOSE_TRACING        0x0080
-#define VERBOSE_ABORT          0x0f00
-#define VERBOSE_ABORT_MID      0x0100
-#define VERBOSE_ABORT_FIND     0x0200
-#define VERBOSE_ABORT_PROCESS  0x0400
-#define VERBOSE_ABORT_RETURN   0x0800
-#define VERBOSE_RESET          0xf000
-#define VERBOSE_RESET_MID      0x1000
-#define VERBOSE_RESET_FIND     0x2000
-#define VERBOSE_RESET_PROCESS  0x4000
-#define VERBOSE_RESET_RETURN   0x8000
-static int aic7xxx_verbose = VERBOSE_NORMAL | VERBOSE_NEGOTIATION |
-           VERBOSE_PROBE;                     /* verbose messages */
-
-
-/****************************************************************************
- *
- * We're going to start putting in function declarations so that order of
- * functions is no longer important.  As needed, they are added here.
- *
- ***************************************************************************/
-
-static int aic7xxx_release(struct Scsi_Host *host);
-static void aic7xxx_set_syncrate(struct aic7xxx_host *p, 
-                struct aic7xxx_syncrate *syncrate, int target, int channel,
-                unsigned int period, unsigned int offset, unsigned char options,
-                unsigned int type, struct aic_dev_data *aic_dev);
-static void aic7xxx_set_width(struct aic7xxx_host *p, int target, int channel,
-                int lun, unsigned int width, unsigned int type,
-                struct aic_dev_data *aic_dev);
-static void aic7xxx_panic_abort(struct aic7xxx_host *p, struct scsi_cmnd *cmd);
-static void aic7xxx_print_card(struct aic7xxx_host *p);
-static void aic7xxx_print_scratch_ram(struct aic7xxx_host *p);
-static void aic7xxx_print_sequencer(struct aic7xxx_host *p, int downloaded);
-#ifdef AIC7XXX_VERBOSE_DEBUGGING
-static void aic7xxx_check_scbs(struct aic7xxx_host *p, char *buffer);
-#endif
-
-/****************************************************************************
- *
- * These functions are now used.  They happen to be wrapped in useless
- * inb/outb port read/writes around the real reads and writes because it
- * seems that certain very fast CPUs have a problem dealing with us when
- * going at full speed.
- *
- ***************************************************************************/
-
-static unsigned char
-aic_inb(struct aic7xxx_host *p, long port)
-{
-#ifdef MMAPIO
-  unsigned char x;
-  if(p->maddr)
-  {
-    x = readb(p->maddr + port);
-  }
-  else
-  {
-    x = inb(p->base + port);
-  }
-  return(x);
-#else
-  return(inb(p->base + port));
-#endif
-}
-
-static void
-aic_outb(struct aic7xxx_host *p, unsigned char val, long port)
-{
-#ifdef MMAPIO
-  if(p->maddr)
-  {
-    writeb(val, p->maddr + port);
-    mb(); /* locked operation in order to force CPU ordering */
-    readb(p->maddr + HCNTRL); /* dummy read to flush the PCI write */
-  }
-  else
-  {
-    outb(val, p->base + port);
-    mb(); /* locked operation in order to force CPU ordering */
-  }
-#else
-  outb(val, p->base + port);
-  mb(); /* locked operation in order to force CPU ordering */
-#endif
-}
-
-/*+F*************************************************************************
- * Function:
- *   aic7xxx_setup
- *
- * Description:
- *   Handle Linux boot parameters. This routine allows for assigning a value
- *   to a parameter with a ':' between the parameter and the value.
- *   ie. aic7xxx=unpause:0x0A,extended
- *-F*************************************************************************/
-static int
-aic7xxx_setup(char *s)
-{
-  int   i, n;
-  char *p;
-  char *end;
-
-  static struct {
-    const char *name;
-    unsigned int *flag;
-  } options[] = {
-    { "extended",    &aic7xxx_extended },
-    { "no_reset",    &aic7xxx_no_reset },
-    { "irq_trigger", &aic7xxx_irq_trigger },
-    { "verbose",     &aic7xxx_verbose },
-    { "reverse_scan",&aic7xxx_reverse_scan },
-    { "override_term", &aic7xxx_override_term },
-    { "stpwlev", &aic7xxx_stpwlev },
-    { "no_probe", &aic7xxx_no_probe },
-    { "panic_on_abort", &aic7xxx_panic_on_abort },
-    { "pci_parity", &aic7xxx_pci_parity },
-    { "dump_card", &aic7xxx_dump_card },
-    { "dump_sequencer", &aic7xxx_dump_sequencer },
-    { "default_queue_depth", &aic7xxx_default_queue_depth },
-    { "scbram", &aic7xxx_scbram },
-    { "seltime", &aic7xxx_seltime },
-    { "tag_info",    NULL }
-  };
-
-  end = strchr(s, '\0');
-
-  while ((p = strsep(&s, ",.")) != NULL)
-  {
-    for (i = 0; i < ARRAY_SIZE(options); i++)
-    {
-      n = strlen(options[i].name);
-      if (!strncmp(options[i].name, p, n))
-      {
-        if (!strncmp(p, "tag_info", n))
-        {
-          if (p[n] == ':')
-          {
-            char *base;
-            char *tok, *tok_end, *tok_end2;
-            char tok_list[] = { '.', ',', '{', '}', '\0' };
-            int i, instance = -1, device = -1;
-            unsigned char done = FALSE;
-
-            base = p;
-            tok = base + n + 1;  /* Forward us just past the ':' */
-            tok_end = strchr(tok, '\0');
-            if (tok_end < end)
-              *tok_end = ',';
-            while(!done)
-            {
-              switch(*tok)
-              {
-                case '{':
-                  if (instance == -1)
-                    instance = 0;
-                  else if (device == -1)
-                    device = 0;
-                  tok++;
-                  break;
-                case '}':
-                  if (device != -1)
-                    device = -1;
-                  else if (instance != -1)
-                    instance = -1;
-                  tok++;
-                  break;
-                case ',':
-                case '.':
-                  if (instance == -1)
-                    done = TRUE;
-                  else if (device >= 0)
-                    device++;
-                  else if (instance >= 0)
-                    instance++;
-                  if ( (device >= MAX_TARGETS) || 
-                       (instance >= ARRAY_SIZE(aic7xxx_tag_info)) )
-                    done = TRUE;
-                  tok++;
-                  if (!done)
-                  {
-                    base = tok;
-                  }
-                  break;
-                case '\0':
-                  done = TRUE;
-                  break;
-                default:
-                  done = TRUE;
-                  tok_end = strchr(tok, '\0');
-                  for(i=0; tok_list[i]; i++)
-                  {
-                    tok_end2 = strchr(tok, tok_list[i]);
-                    if ( (tok_end2) && (tok_end2 < tok_end) )
-                    {
-                      tok_end = tok_end2;
-                      done = FALSE;
-                    }
-                  }
-                  if ( (instance >= 0) && (device >= 0) &&
-                       (instance < ARRAY_SIZE(aic7xxx_tag_info)) &&
-                       (device < MAX_TARGETS) )
-                    aic7xxx_tag_info[instance].tag_commands[device] =
-                      simple_strtoul(tok, NULL, 0) & 0xff;
-                  tok = tok_end;
-                  break;
-              }
-            }
-            while((p != base) && (p != NULL))
-              p = strsep(&s, ",.");
-          }
-        }
-        else if (p[n] == ':')
-        {
-          *(options[i].flag) = simple_strtoul(p + n + 1, NULL, 0);
-          if(!strncmp(p, "seltime", n))
-          {
-            *(options[i].flag) = (*(options[i].flag) % 4) << 3;
-          }
-        }
-        else if (!strncmp(p, "verbose", n))
-        {
-          *(options[i].flag) = 0xff29;
-        }
-        else
-        {
-          *(options[i].flag) = ~(*(options[i].flag));
-          if(!strncmp(p, "seltime", n))
-          {
-            *(options[i].flag) = (*(options[i].flag) % 4) << 3;
-          }
-        }
-      }
-    }
-  }
-  return 1;
-}
-
-__setup("aic7xxx=", aic7xxx_setup);
-
-/*+F*************************************************************************
- * Function:
- *   pause_sequencer
- *
- * Description:
- *   Pause the sequencer and wait for it to actually stop - this
- *   is important since the sequencer can disable pausing for critical
- *   sections.
- *-F*************************************************************************/
-static void
-pause_sequencer(struct aic7xxx_host *p)
-{
-  aic_outb(p, p->pause, HCNTRL);
-  while ((aic_inb(p, HCNTRL) & PAUSE) == 0)
-  {
-    ;
-  }
-  if(p->features & AHC_ULTRA2)
-  {
-    aic_inb(p, CCSCBCTL);
-  }
-}
-
-/*+F*************************************************************************
- * Function:
- *   unpause_sequencer
- *
- * Description:
- *   Unpause the sequencer. Unremarkable, yet done often enough to
- *   warrant an easy way to do it.
- *-F*************************************************************************/
-static void
-unpause_sequencer(struct aic7xxx_host *p, int unpause_always)
-{
-  if (unpause_always ||
-      ( !(aic_inb(p, INTSTAT) & (SCSIINT | SEQINT | BRKADRINT)) &&
-        !(p->flags & AHC_HANDLING_REQINITS) ) )
-  {
-    aic_outb(p, p->unpause, HCNTRL);
-  }
-}
-
-/*+F*************************************************************************
- * Function:
- *   restart_sequencer
- *
- * Description:
- *   Restart the sequencer program from address zero.  This assumes
- *   that the sequencer is already paused.
- *-F*************************************************************************/
-static void
-restart_sequencer(struct aic7xxx_host *p)
-{
-  aic_outb(p, 0, SEQADDR0);
-  aic_outb(p, 0, SEQADDR1);
-  aic_outb(p, FASTMODE, SEQCTL);
-}
-
-/*
- * We include the aic7xxx_seq.c file here so that the other defines have
- * already been made, and so that it comes before the code that actually
- * downloads the instructions (since we don't typically use function
- * prototype, our code has to be ordered that way, it's a left-over from
- * the original driver days.....I should fix it some time DL).
- */
-#include "aic7xxx_old/aic7xxx_seq.c"
-
-/*+F*************************************************************************
- * Function:
- *   aic7xxx_check_patch
- *
- * Description:
- *   See if the next patch to download should be downloaded.
- *-F*************************************************************************/
-static int
-aic7xxx_check_patch(struct aic7xxx_host *p,
-  struct sequencer_patch **start_patch, int start_instr, int *skip_addr)
-{
-  struct sequencer_patch *cur_patch;
-  struct sequencer_patch *last_patch;
-  int num_patches;
-
-  num_patches = ARRAY_SIZE(sequencer_patches);
-  last_patch = &sequencer_patches[num_patches];
-  cur_patch = *start_patch;
-
-  while ((cur_patch < last_patch) && (start_instr == cur_patch->begin))
-  {
-    if (cur_patch->patch_func(p) == 0)
-    {
-      /*
-       * Start rejecting code.
-       */
-      *skip_addr = start_instr + cur_patch->skip_instr;
-      cur_patch += cur_patch->skip_patch;
-    }
-    else
-    {
-      /*
-       * Found an OK patch.  Advance the patch pointer to the next patch
-       * and wait for our instruction pointer to get here.
-       */
-      cur_patch++;
-    }
-  }
-
-  *start_patch = cur_patch;
-  if (start_instr < *skip_addr)
-    /*
-     * Still skipping
-     */
-    return (0);
-  return(1);
-}
-
-
-/*+F*************************************************************************
- * Function:
- *   aic7xxx_download_instr
- *
- * Description:
- *   Find the next patch to download.
- *-F*************************************************************************/
-static void
-aic7xxx_download_instr(struct aic7xxx_host *p, int instrptr,
-  unsigned char *dconsts)
-{
-  union ins_formats instr;
-  struct ins_format1 *fmt1_ins;
-  struct ins_format3 *fmt3_ins;
-  unsigned char opcode;
-
-  instr = *(union ins_formats*) &seqprog[instrptr * 4];
-
-  instr.integer = le32_to_cpu(instr.integer);
-  
-  fmt1_ins = &instr.format1;
-  fmt3_ins = NULL;
-
-  /* Pull the opcode */
-  opcode = instr.format1.opcode;
-  switch (opcode)
-  {
-    case AIC_OP_JMP:
-    case AIC_OP_JC:
-    case AIC_OP_JNC:
-    case AIC_OP_CALL:
-    case AIC_OP_JNE:
-    case AIC_OP_JNZ:
-    case AIC_OP_JE:
-    case AIC_OP_JZ:
-    {
-      struct sequencer_patch *cur_patch;
-      int address_offset;
-      unsigned int address;
-      int skip_addr;
-      int i;
-
-      fmt3_ins = &instr.format3;
-      address_offset = 0;
-      address = fmt3_ins->address;
-      cur_patch = sequencer_patches;
-      skip_addr = 0;
-
-      for (i = 0; i < address;)
-      {
-        aic7xxx_check_patch(p, &cur_patch, i, &skip_addr);
-        if (skip_addr > i)
-        {
-          int end_addr;
-
-          end_addr = min_t(int, address, skip_addr);
-          address_offset += end_addr - i;
-          i = skip_addr;
-        }
-        else
-        {
-          i++;
-        }
-      }
-      address -= address_offset;
-      fmt3_ins->address = address;
-      /* Fall Through to the next code section */
-    }
-    case AIC_OP_OR:
-    case AIC_OP_AND:
-    case AIC_OP_XOR:
-    case AIC_OP_ADD:
-    case AIC_OP_ADC:
-    case AIC_OP_BMOV:
-      if (fmt1_ins->parity != 0)
-      {
-        fmt1_ins->immediate = dconsts[fmt1_ins->immediate];
-      }
-      fmt1_ins->parity = 0;
-      /* Fall Through to the next code section */
-    case AIC_OP_ROL:
-      if ((p->features & AHC_ULTRA2) != 0)
-      {
-        int i, count;
-
-        /* Calculate odd parity for the instruction */
-        for ( i=0, count=0; i < 31; i++)
-        {
-          unsigned int mask;
-
-          mask = 0x01 << i;
-          if ((instr.integer & mask) != 0)
-            count++;
-        }
-        if (!(count & 0x01))
-          instr.format1.parity = 1;
-      }
-      else
-      {
-        if (fmt3_ins != NULL)
-        {
-          instr.integer =  fmt3_ins->immediate |
-                          (fmt3_ins->source << 8) |
-                          (fmt3_ins->address << 16) |
-                          (fmt3_ins->opcode << 25);
-        }
-        else
-        {
-          instr.integer =  fmt1_ins->immediate |
-                          (fmt1_ins->source << 8) |
-                          (fmt1_ins->destination << 16) |
-                          (fmt1_ins->ret << 24) |
-                          (fmt1_ins->opcode << 25);
-        }
-      }
-      aic_outb(p, (instr.integer & 0xff), SEQRAM);
-      aic_outb(p, ((instr.integer >> 8) & 0xff), SEQRAM);
-      aic_outb(p, ((instr.integer >> 16) & 0xff), SEQRAM);
-      aic_outb(p, ((instr.integer >> 24) & 0xff), SEQRAM);
-      udelay(10);
-      break;
-
-    default:
-      panic("aic7xxx: Unknown opcode encountered in sequencer program.");
-      break;
-  }
-}
-
-
-/*+F*************************************************************************
- * Function:
- *   aic7xxx_loadseq
- *
- * Description:
- *   Load the sequencer code into the controller memory.
- *-F*************************************************************************/
-static void
-aic7xxx_loadseq(struct aic7xxx_host *p)
-{
-  struct sequencer_patch *cur_patch;
-  int i;
-  int downloaded;
-  int skip_addr;
-  unsigned char download_consts[4] = {0, 0, 0, 0};
-
-  if (aic7xxx_verbose & VERBOSE_PROBE)
-  {
-    printk(KERN_INFO "(scsi%d) Downloading sequencer code...", p->host_no);
-  }
-#if 0
-  download_consts[TMODE_NUMCMDS] = p->num_targetcmds;
-#endif
-  download_consts[TMODE_NUMCMDS] = 0;
-  cur_patch = &sequencer_patches[0];
-  downloaded = 0;
-  skip_addr = 0;
-
-  aic_outb(p, PERRORDIS|LOADRAM|FAILDIS|FASTMODE, SEQCTL);
-  aic_outb(p, 0, SEQADDR0);
-  aic_outb(p, 0, SEQADDR1);
-
-  for (i = 0; i < sizeof(seqprog) / 4;  i++)
-  {
-    if (aic7xxx_check_patch(p, &cur_patch, i, &skip_addr) == 0)
-    {
-      /* Skip this instruction for this configuration. */
-      continue;
-    }
-    aic7xxx_download_instr(p, i, &download_consts[0]);
-    downloaded++;
-  }
-
-  aic_outb(p, 0, SEQADDR0);
-  aic_outb(p, 0, SEQADDR1);
-  aic_outb(p, FASTMODE | FAILDIS, SEQCTL);
-  unpause_sequencer(p, TRUE);
-  mdelay(1);
-  pause_sequencer(p);
-  aic_outb(p, FASTMODE, SEQCTL);
-  if (aic7xxx_verbose & VERBOSE_PROBE)
-  {
-    printk(" %d instructions downloaded\n", downloaded);
-  }
-  if (aic7xxx_dump_sequencer)
-    aic7xxx_print_sequencer(p, downloaded);
-}
-
-/*+F*************************************************************************
- * Function:
- *   aic7xxx_print_sequencer
- *
- * Description:
- *   Print the contents of the sequencer memory to the screen.
- *-F*************************************************************************/
-static void
-aic7xxx_print_sequencer(struct aic7xxx_host *p, int downloaded)
-{
-  int i, k, temp;
-  
-  aic_outb(p, PERRORDIS|LOADRAM|FAILDIS|FASTMODE, SEQCTL);
-  aic_outb(p, 0, SEQADDR0);
-  aic_outb(p, 0, SEQADDR1);
-
-  k = 0;
-  for (i=0; i < downloaded; i++)
-  {
-    if ( k == 0 )
-      printk("%03x: ", i);
-    temp = aic_inb(p, SEQRAM);
-    temp |= (aic_inb(p, SEQRAM) << 8);
-    temp |= (aic_inb(p, SEQRAM) << 16);
-    temp |= (aic_inb(p, SEQRAM) << 24);
-    printk("%08x", temp);
-    if ( ++k == 8 )
-    {
-      printk("\n");
-      k = 0;
-    }
-    else
-      printk(" ");
-  }
-  aic_outb(p, 0, SEQADDR0);
-  aic_outb(p, 0, SEQADDR1);
-  aic_outb(p, FASTMODE | FAILDIS, SEQCTL);
-  unpause_sequencer(p, TRUE);
-  mdelay(1);
-  pause_sequencer(p);
-  aic_outb(p, FASTMODE, SEQCTL);
-  printk("\n");
-}
-
-/*+F*************************************************************************
- * Function:
- *   aic7xxx_info
- *
- * Description:
- *   Return a string describing the driver.
- *-F*************************************************************************/
-static const char *
-aic7xxx_info(struct Scsi_Host *dooh)
-{
-  static char buffer[256];
-  char *bp;
-  struct aic7xxx_host *p;
-
-  bp = &buffer[0];
-  p = (struct aic7xxx_host *)dooh->hostdata;
-  memset(bp, 0, sizeof(buffer));
-  strcpy(bp, "Adaptec AHA274x/284x/294x (EISA/VLB/PCI-Fast SCSI) ");
-  strcat(bp, AIC7XXX_C_VERSION);
-  strcat(bp, "/");
-  strcat(bp, AIC7XXX_H_VERSION);
-  strcat(bp, "\n");
-  strcat(bp, "       <");
-  strcat(bp, board_names[p->board_name_index]);
-  strcat(bp, ">");
-
-  return(bp);
-}
-
-/*+F*************************************************************************
- * Function:
- *   aic7xxx_find_syncrate
- *
- * Description:
- *   Look up the valid period to SCSIRATE conversion in our table
- *-F*************************************************************************/
-static struct aic7xxx_syncrate *
-aic7xxx_find_syncrate(struct aic7xxx_host *p, unsigned int *period,
-  unsigned int maxsync, unsigned char *options)
-{
-  struct aic7xxx_syncrate *syncrate;
-  int done = FALSE;
-
-  switch(*options)
-  {
-    case MSG_EXT_PPR_OPTION_DT_CRC:
-    case MSG_EXT_PPR_OPTION_DT_UNITS:
-      if(!(p->features & AHC_ULTRA3))
-      {
-        *options = 0;
-        maxsync = max_t(unsigned int, maxsync, AHC_SYNCRATE_ULTRA2);
-      }
-      break;
-    case MSG_EXT_PPR_OPTION_DT_CRC_QUICK:
-    case MSG_EXT_PPR_OPTION_DT_UNITS_QUICK:
-      if(!(p->features & AHC_ULTRA3))
-      {
-        *options = 0;
-        maxsync = max_t(unsigned int, maxsync, AHC_SYNCRATE_ULTRA2);
-      }
-      else
-      {
-        /*
-         * we don't support the Quick Arbitration variants of dual edge
-         * clocking.  As it turns out, we want to send back the
-         * same basic option, but without the QA attribute.
-         * We know that we are responding because we would never set
-         * these options ourself, we would only respond to them.
-         */
-        switch(*options)
-        {
-          case MSG_EXT_PPR_OPTION_DT_CRC_QUICK:
-            *options = MSG_EXT_PPR_OPTION_DT_CRC;
-            break;
-          case MSG_EXT_PPR_OPTION_DT_UNITS_QUICK:
-            *options = MSG_EXT_PPR_OPTION_DT_UNITS;
-            break;
-        }
-      }
-      break;
-    default:
-      *options = 0;
-      maxsync = max_t(unsigned int, maxsync, AHC_SYNCRATE_ULTRA2);
-      break;
-  }
-  syncrate = &aic7xxx_syncrates[maxsync];
-  while ( (syncrate->rate[0] != NULL) &&
-         (!(p->features & AHC_ULTRA2) || syncrate->sxfr_ultra2) )
-  {
-    if (*period <= syncrate->period) 
-    {
-      switch(*options)
-      {
-        case MSG_EXT_PPR_OPTION_DT_CRC:
-        case MSG_EXT_PPR_OPTION_DT_UNITS:
-          if(!(syncrate->sxfr_ultra2 & AHC_SYNCRATE_CRC))
-          {
-            done = TRUE;
-            /*
-             * oops, we went too low for the CRC/DualEdge signalling, so
-             * clear the options byte
-             */
-            *options = 0;
-            /*
-             * We'll be sending a reply to this packet to set the options
-             * properly, so unilaterally set the period as well.
-             */
-            *period = syncrate->period;
-          }
-          else
-          {
-            done = TRUE;
-            if(syncrate == &aic7xxx_syncrates[maxsync])
-            {
-              *period = syncrate->period;
-            }
-          }
-          break;
-        default:
-          if(!(syncrate->sxfr_ultra2 & AHC_SYNCRATE_CRC))
-          {
-            done = TRUE;
-            if(syncrate == &aic7xxx_syncrates[maxsync])
-            {
-              *period = syncrate->period;
-            }
-          }
-          break;
-      }
-      if(done)
-      {
-        break;
-      }
-    }
-    syncrate++;
-  }
-  if ( (*period == 0) || (syncrate->rate[0] == NULL) ||
-       ((p->features & AHC_ULTRA2) && (syncrate->sxfr_ultra2 == 0)) )
-  {
-    /*
-     * Use async transfers for this target
-     */
-    *options = 0;
-    *period = 255;
-    syncrate = NULL;
-  }
-  return (syncrate);
-}
-
-
-/*+F*************************************************************************
- * Function:
- *   aic7xxx_find_period
- *
- * Description:
- *   Look up the valid SCSIRATE to period conversion in our table
- *-F*************************************************************************/
-static unsigned int
-aic7xxx_find_period(struct aic7xxx_host *p, unsigned int scsirate,
-  unsigned int maxsync)
-{
-  struct aic7xxx_syncrate *syncrate;
-
-  if (p->features & AHC_ULTRA2)
-  {
-    scsirate &= SXFR_ULTRA2;
-  }
-  else
-  {
-    scsirate &= SXFR;
-  }
-
-  syncrate = &aic7xxx_syncrates[maxsync];
-  while (syncrate->rate[0] != NULL)
-  {
-    if (p->features & AHC_ULTRA2)
-    {
-      if (syncrate->sxfr_ultra2 == 0)
-        break;
-      else if (scsirate == syncrate->sxfr_ultra2)
-        return (syncrate->period);
-      else if (scsirate == (syncrate->sxfr_ultra2 & ~AHC_SYNCRATE_CRC))
-        return (syncrate->period);
-    }
-    else if (scsirate == (syncrate->sxfr & ~ULTRA_SXFR))
-    {
-      return (syncrate->period);
-    }
-    syncrate++;
-  }
-  return (0); /* async */
-}
-
-/*+F*************************************************************************
- * Function:
- *   aic7xxx_validate_offset
- *
- * Description:
- *   Set a valid offset value for a particular card in use and transfer
- *   settings in use.
- *-F*************************************************************************/
-static void
-aic7xxx_validate_offset(struct aic7xxx_host *p,
-  struct aic7xxx_syncrate *syncrate, unsigned int *offset, int wide)
-{
-  unsigned int maxoffset;
-
-  /* Limit offset to what the card (and device) can do */
-  if (syncrate == NULL)
-  {
-    maxoffset = 0;
-  }
-  else if (p->features & AHC_ULTRA2)
-  {
-    maxoffset = MAX_OFFSET_ULTRA2;
-  }
-  else
-  {
-    if (wide)
-      maxoffset = MAX_OFFSET_16BIT;
-    else
-      maxoffset = MAX_OFFSET_8BIT;
-  }
-  *offset = min(*offset, maxoffset);
-}
-
-/*+F*************************************************************************
- * Function:
- *   aic7xxx_set_syncrate
- *
- * Description:
- *   Set the actual syncrate down in the card and in our host structs
- *-F*************************************************************************/
-static void
-aic7xxx_set_syncrate(struct aic7xxx_host *p, struct aic7xxx_syncrate *syncrate,
-    int target, int channel, unsigned int period, unsigned int offset,
-    unsigned char options, unsigned int type, struct aic_dev_data *aic_dev)
-{
-  unsigned char tindex;
-  unsigned short target_mask;
-  unsigned char lun, old_options;
-  unsigned int old_period, old_offset;
-
-  tindex = target | (channel << 3);
-  target_mask = 0x01 << tindex;
-  lun = aic_inb(p, SCB_TCL) & 0x07;
-
-  if (syncrate == NULL)
-  {
-    period = 0;
-    offset = 0;
-  }
-
-  old_period = aic_dev->cur.period;
-  old_offset = aic_dev->cur.offset;
-  old_options = aic_dev->cur.options;
-
-  
-  if (type & AHC_TRANS_CUR)
-  {
-    unsigned int scsirate;
-
-    scsirate = aic_inb(p, TARG_SCSIRATE + tindex);
-    if (p->features & AHC_ULTRA2)
-    {
-      scsirate &= ~SXFR_ULTRA2;
-      if (syncrate != NULL)
-      {
-        switch(options)
-        {
-          case MSG_EXT_PPR_OPTION_DT_UNITS:
-            /*
-             * mask off the CRC bit in the xfer settings
-             */
-            scsirate |= (syncrate->sxfr_ultra2 & ~AHC_SYNCRATE_CRC);
-            break;
-          default:
-            scsirate |= syncrate->sxfr_ultra2;
-            break;
-        }
-      }
-      if (type & AHC_TRANS_ACTIVE)
-      {
-        aic_outb(p, offset, SCSIOFFSET);
-      }
-      aic_outb(p, offset, TARG_OFFSET + tindex);
-    }
-    else /* Not an Ultra2 controller */
-    {
-      scsirate &= ~(SXFR|SOFS);
-      p->ultraenb &= ~target_mask;
-      if (syncrate != NULL)
-      {
-        if (syncrate->sxfr & ULTRA_SXFR)
-        {
-          p->ultraenb |= target_mask;
-        }
-        scsirate |= (syncrate->sxfr & SXFR);
-        scsirate |= (offset & SOFS);
-      }
-      if (type & AHC_TRANS_ACTIVE)
-      {
-        unsigned char sxfrctl0;
-
-        sxfrctl0 = aic_inb(p, SXFRCTL0);
-        sxfrctl0 &= ~FAST20;
-        if (p->ultraenb & target_mask)
-          sxfrctl0 |= FAST20;
-        aic_outb(p, sxfrctl0, SXFRCTL0);
-      }
-      aic_outb(p, p->ultraenb & 0xff, ULTRA_ENB);
-      aic_outb(p, (p->ultraenb >> 8) & 0xff, ULTRA_ENB + 1 );
-    }
-    if (type & AHC_TRANS_ACTIVE)
-    {
-      aic_outb(p, scsirate, SCSIRATE);
-    }
-    aic_outb(p, scsirate, TARG_SCSIRATE + tindex);
-    aic_dev->cur.period = period;
-    aic_dev->cur.offset = offset;
-    aic_dev->cur.options = options;
-    if ( !(type & AHC_TRANS_QUITE) &&
-         (aic7xxx_verbose & VERBOSE_NEGOTIATION) &&
-         (aic_dev->flags & DEVICE_PRINT_DTR) )
-    {
-      if (offset)
-      {
-        int rate_mod = (scsirate & WIDEXFER) ? 1 : 0;
-      
-        printk(INFO_LEAD "Synchronous at %s Mbyte/sec, "
-               "offset %d.\n", p->host_no, channel, target, lun,
-               syncrate->rate[rate_mod], offset);
-      }
-      else
-      {
-        printk(INFO_LEAD "Using asynchronous transfers.\n",
-               p->host_no, channel, target, lun);
-      }
-      aic_dev->flags &= ~DEVICE_PRINT_DTR;
-    }
-  }
-
-  if (type & AHC_TRANS_GOAL)
-  {
-    aic_dev->goal.period = period;
-    aic_dev->goal.offset = offset;
-    aic_dev->goal.options = options;
-  }
-
-  if (type & AHC_TRANS_USER)
-  {
-    p->user[tindex].period = period;
-    p->user[tindex].offset = offset;
-    p->user[tindex].options = options;
-  }
-}
-
-/*+F*************************************************************************
- * Function:
- *   aic7xxx_set_width
- *
- * Description:
- *   Set the actual width down in the card and in our host structs
- *-F*************************************************************************/
-static void
-aic7xxx_set_width(struct aic7xxx_host *p, int target, int channel, int lun,
-    unsigned int width, unsigned int type, struct aic_dev_data *aic_dev)
-{
-  unsigned char tindex;
-  unsigned short target_mask;
-  unsigned int old_width;
-
-  tindex = target | (channel << 3);
-  target_mask = 1 << tindex;
-  
-  old_width = aic_dev->cur.width;
-
-  if (type & AHC_TRANS_CUR) 
-  {
-    unsigned char scsirate;
-
-    scsirate = aic_inb(p, TARG_SCSIRATE + tindex);
-
-    scsirate &= ~WIDEXFER;
-    if (width == MSG_EXT_WDTR_BUS_16_BIT)
-      scsirate |= WIDEXFER;
-
-    aic_outb(p, scsirate, TARG_SCSIRATE + tindex);
-
-    if (type & AHC_TRANS_ACTIVE)
-      aic_outb(p, scsirate, SCSIRATE);
-
-    aic_dev->cur.width = width;
-
-    if ( !(type & AHC_TRANS_QUITE) &&
-          (aic7xxx_verbose & VERBOSE_NEGOTIATION2) && 
-          (aic_dev->flags & DEVICE_PRINT_DTR) )
-    {
-      printk(INFO_LEAD "Using %s transfers\n", p->host_no, channel, target,
-        lun, (scsirate & WIDEXFER) ? "Wide(16bit)" : "Narrow(8bit)" );
-    }
-  }
-
-  if (type & AHC_TRANS_GOAL)
-    aic_dev->goal.width = width;
-  if (type & AHC_TRANS_USER)
-    p->user[tindex].width = width;
-
-  if (aic_dev->goal.offset)
-  {
-    if (p->features & AHC_ULTRA2)
-    {
-      aic_dev->goal.offset = MAX_OFFSET_ULTRA2;
-    }
-    else if (width == MSG_EXT_WDTR_BUS_16_BIT)
-    {
-      aic_dev->goal.offset = MAX_OFFSET_16BIT;
-    }
-    else
-    {
-      aic_dev->goal.offset = MAX_OFFSET_8BIT;
-    }
-  }
-}
-      
-/*+F*************************************************************************
- * Function:
- *   scbq_init
- *
- * Description:
- *   SCB queue initialization.
- *
- *-F*************************************************************************/
-static void
-scbq_init(volatile scb_queue_type *queue)
-{
-  queue->head = NULL;
-  queue->tail = NULL;
-}
-
-/*+F*************************************************************************
- * Function:
- *   scbq_insert_head
- *
- * Description:
- *   Add an SCB to the head of the list.
- *
- *-F*************************************************************************/
-static inline void
-scbq_insert_head(volatile scb_queue_type *queue, struct aic7xxx_scb *scb)
-{
-  scb->q_next = queue->head;
-  queue->head = scb;
-  if (queue->tail == NULL)       /* If list was empty, update tail. */
-    queue->tail = queue->head;
-}
-
-/*+F*************************************************************************
- * Function:
- *   scbq_remove_head
- *
- * Description:
- *   Remove an SCB from the head of the list.
- *
- *-F*************************************************************************/
-static inline struct aic7xxx_scb *
-scbq_remove_head(volatile scb_queue_type *queue)
-{
-  struct aic7xxx_scb * scbp;
-
-  scbp = queue->head;
-  if (queue->head != NULL)
-    queue->head = queue->head->q_next;
-  if (queue->head == NULL)       /* If list is now empty, update tail. */
-    queue->tail = NULL;
-  return(scbp);
-}
-
-/*+F*************************************************************************
- * Function:
- *   scbq_remove
- *
- * Description:
- *   Removes an SCB from the list.
- *
- *-F*************************************************************************/
-static inline void
-scbq_remove(volatile scb_queue_type *queue, struct aic7xxx_scb *scb)
-{
-  if (queue->head == scb)
-  {
-    /* At beginning of queue, remove from head. */
-    scbq_remove_head(queue);
-  }
-  else
-  {
-    struct aic7xxx_scb *curscb = queue->head;
-
-    /*
-     * Search until the next scb is the one we're looking for, or
-     * we run out of queue.
-     */
-    while ((curscb != NULL) && (curscb->q_next != scb))
-    {
-      curscb = curscb->q_next;
-    }
-    if (curscb != NULL)
-    {
-      /* Found it. */
-      curscb->q_next = scb->q_next;
-      if (scb->q_next == NULL)
-      {
-        /* Update the tail when removing the tail. */
-        queue->tail = curscb;
-      }
-    }
-  }
-}
-
-/*+F*************************************************************************
- * Function:
- *   scbq_insert_tail
- *
- * Description:
- *   Add an SCB at the tail of the list.
- *
- *-F*************************************************************************/
-static inline void
-scbq_insert_tail(volatile scb_queue_type *queue, struct aic7xxx_scb *scb)
-{
-  scb->q_next = NULL;
-  if (queue->tail != NULL)       /* Add the scb at the end of the list. */
-    queue->tail->q_next = scb;
-  queue->tail = scb;             /* Update the tail. */
-  if (queue->head == NULL)       /* If list was empty, update head. */
-    queue->head = queue->tail;
-}
-
-/*+F*************************************************************************
- * Function:
- *   aic7xxx_match_scb
- *
- * Description:
- *   Checks to see if an scb matches the target/channel as specified.
- *   If target is ALL_TARGETS (-1), then we're looking for any device
- *   on the specified channel; this happens when a channel is going
- *   to be reset and all devices on that channel must be aborted.
- *-F*************************************************************************/
-static int
-aic7xxx_match_scb(struct aic7xxx_host *p, struct aic7xxx_scb *scb,
-    int target, int channel, int lun, unsigned char tag)
-{
-  int targ = (scb->hscb->target_channel_lun >> 4) & 0x0F;
-  int chan = (scb->hscb->target_channel_lun >> 3) & 0x01;
-  int slun = scb->hscb->target_channel_lun & 0x07;
-  int match;
-
-  match = ((chan == channel) || (channel == ALL_CHANNELS));
-  if (match != 0)
-    match = ((targ == target) || (target == ALL_TARGETS));
-  if (match != 0)
-    match = ((lun == slun) || (lun == ALL_LUNS));
-  if (match != 0)
-    match = ((tag == scb->hscb->tag) || (tag == SCB_LIST_NULL));
-
-  return (match);
-}
-
-/*+F*************************************************************************
- * Function:
- *   aic7xxx_add_curscb_to_free_list
- *
- * Description:
- *   Adds the current scb (in SCBPTR) to the list of free SCBs.
- *-F*************************************************************************/
-static void
-aic7xxx_add_curscb_to_free_list(struct aic7xxx_host *p)
-{
-  /*
-   * Invalidate the tag so that aic7xxx_find_scb doesn't think
-   * it's active
-   */
-  aic_outb(p, SCB_LIST_NULL, SCB_TAG);
-  aic_outb(p, 0, SCB_CONTROL);
-
-  aic_outb(p, aic_inb(p, FREE_SCBH), SCB_NEXT);
-  aic_outb(p, aic_inb(p, SCBPTR), FREE_SCBH);
-}
-
-/*+F*************************************************************************
- * Function:
- *   aic7xxx_rem_scb_from_disc_list
- *
- * Description:
- *   Removes the current SCB from the disconnected list and adds it
- *   to the free list.
- *-F*************************************************************************/
-static unsigned char
-aic7xxx_rem_scb_from_disc_list(struct aic7xxx_host *p, unsigned char scbptr,
-                               unsigned char prev)
-{
-  unsigned char next;
-
-  aic_outb(p, scbptr, SCBPTR);
-  next = aic_inb(p, SCB_NEXT);
-  aic7xxx_add_curscb_to_free_list(p);
-
-  if (prev != SCB_LIST_NULL)
-  {
-    aic_outb(p, prev, SCBPTR);
-    aic_outb(p, next, SCB_NEXT);
-  }
-  else
-  {
-    aic_outb(p, next, DISCONNECTED_SCBH);
-  }
-
-  return next;
-}
-
-/*+F*************************************************************************
- * Function:
- *   aic7xxx_busy_target
- *
- * Description:
- *   Set the specified target busy.
- *-F*************************************************************************/
-static inline void
-aic7xxx_busy_target(struct aic7xxx_host *p, struct aic7xxx_scb *scb)
-{
-  p->untagged_scbs[scb->hscb->target_channel_lun] = scb->hscb->tag;
-}
-
-/*+F*************************************************************************
- * Function:
- *   aic7xxx_index_busy_target
- *
- * Description:
- *   Returns the index of the busy target, and optionally sets the
- *   target inactive.
- *-F*************************************************************************/
-static inline unsigned char
-aic7xxx_index_busy_target(struct aic7xxx_host *p, unsigned char tcl,
-    int unbusy)
-{
-  unsigned char busy_scbid;
-
-  busy_scbid = p->untagged_scbs[tcl];
-  if (unbusy)
-  {
-    p->untagged_scbs[tcl] = SCB_LIST_NULL;
-  }
-  return (busy_scbid);
-}
-
-/*+F*************************************************************************
- * Function:
- *   aic7xxx_find_scb
- *
- * Description:
- *   Look through the SCB array of the card and attempt to find the
- *   hardware SCB that corresponds to the passed in SCB.  Return
- *   SCB_LIST_NULL if unsuccessful.  This routine assumes that the
- *   card is already paused.
- *-F*************************************************************************/
-static unsigned char
-aic7xxx_find_scb(struct aic7xxx_host *p, struct aic7xxx_scb *scb)
-{
-  unsigned char saved_scbptr;
-  unsigned char curindex;
-
-  saved_scbptr = aic_inb(p, SCBPTR);
-  curindex = 0;
-  for (curindex = 0; curindex < p->scb_data->maxhscbs; curindex++)
-  {
-    aic_outb(p, curindex, SCBPTR);
-    if (aic_inb(p, SCB_TAG) == scb->hscb->tag)
-    {
-      break;
-    }
-  }
-  aic_outb(p, saved_scbptr, SCBPTR);
-  if (curindex >= p->scb_data->maxhscbs)
-  {
-    curindex = SCB_LIST_NULL;
-  }
-
-  return (curindex);
-}
-
-/*+F*************************************************************************
- * Function:
- *   aic7xxx_allocate_scb
- *
- * Description:
- *   Get an SCB from the free list or by allocating a new one.
- *-F*************************************************************************/
-static int
-aic7xxx_allocate_scb(struct aic7xxx_host *p)
-{
-  struct aic7xxx_scb   *scbp = NULL;
-  int scb_size = (sizeof (struct hw_scatterlist) * AIC7XXX_MAX_SG) + 12 + 6;
-  int i;
-  int step = PAGE_SIZE / 1024;
-  unsigned long scb_count = 0;
-  struct hw_scatterlist *hsgp;
-  struct aic7xxx_scb *scb_ap;
-  struct aic7xxx_scb_dma *scb_dma;
-  unsigned char *bufs;
-
-  if (p->scb_data->numscbs < p->scb_data->maxscbs)
-  {
-    /*
-     * Calculate the optimal number of SCBs to allocate.
-     *
-     * NOTE: This formula works because the sizeof(sg_array) is always
-     * 1024.  Therefore, scb_size * i would always be > PAGE_SIZE *
-     * (i/step).  The (i-1) allows the left hand side of the equation
-     * to grow into the right hand side to a point of near perfect
-     * efficiency since scb_size * (i -1) is growing slightly faster
-     * than the right hand side.  If the number of SG array elements
-     * is changed, this function may not be near so efficient any more.
-     *
-     * Since the DMA'able buffers are now allocated in a separate
-     * chunk this algorithm has been modified to match.  The '12'
-     * and '6' factors in scb_size are for the DMA'able command byte
-     * and sensebuffers respectively.  -DaveM
-     */
-    for ( i=step;; i *= 2 )
-    {
-      if ( (scb_size * (i-1)) >= ( (PAGE_SIZE * (i/step)) - 64 ) )
-      {
-        i /= 2;
-        break;
-      }
-    }
-    scb_count = min( (i-1), p->scb_data->maxscbs - p->scb_data->numscbs);
-    scb_ap = kmalloc(sizeof (struct aic7xxx_scb) * scb_count
-                                           + sizeof(struct aic7xxx_scb_dma), GFP_ATOMIC);
-    if (scb_ap == NULL)
-      return(0);
-    scb_dma = (struct aic7xxx_scb_dma *)&scb_ap[scb_count];
-    hsgp = (struct hw_scatterlist *)
-      pci_alloc_consistent(p->pdev, scb_size * scb_count,
-                           &scb_dma->dma_address);
-    if (hsgp == NULL)
-    {
-      kfree(scb_ap);
-      return(0);
-    }
-    bufs = (unsigned char *)&hsgp[scb_count * AIC7XXX_MAX_SG];
-#ifdef AIC7XXX_VERBOSE_DEBUGGING
-    if (aic7xxx_verbose > 0xffff)
-    {
-      if (p->scb_data->numscbs == 0)
-        printk(INFO_LEAD "Allocating initial %ld SCB structures.\n",
-          p->host_no, -1, -1, -1, scb_count);
-      else
-        printk(INFO_LEAD "Allocating %ld additional SCB structures.\n",
-          p->host_no, -1, -1, -1, scb_count);
-    }
-#endif
-    memset(scb_ap, 0, sizeof (struct aic7xxx_scb) * scb_count);
-    scb_dma->dma_offset = (unsigned long)scb_dma->dma_address
-                          - (unsigned long)hsgp;
-    scb_dma->dma_len = scb_size * scb_count;
-    for (i=0; i < scb_count; i++)
-    {
-      scbp = &scb_ap[i];
-      scbp->hscb = &p->scb_data->hscbs[p->scb_data->numscbs];
-      scbp->sg_list = &hsgp[i * AIC7XXX_MAX_SG];
-      scbp->sense_cmd = bufs;
-      scbp->cmnd = bufs + 6;
-      bufs += 12 + 6;
-      scbp->scb_dma = scb_dma;
-      memset(scbp->hscb, 0, sizeof(struct aic7xxx_hwscb));
-      scbp->hscb->tag = p->scb_data->numscbs;
-      /*
-       * Place in the scb array; never is removed
-       */
-      p->scb_data->scb_array[p->scb_data->numscbs++] = scbp;
-      scbq_insert_tail(&p->scb_data->free_scbs, scbp);
-    }
-    scbp->kmalloc_ptr = scb_ap;
-  }
-  return(scb_count);
-}
-
-/*+F*************************************************************************
- * Function:
- *   aic7xxx_queue_cmd_complete
- *
- * Description:
- *   Due to race conditions present in the SCSI subsystem, it is easier
- *   to queue completed commands, then call scsi_done() on them when
- *   we're finished.  This function queues the completed commands.
- *-F*************************************************************************/
-static void
-aic7xxx_queue_cmd_complete(struct aic7xxx_host *p, struct scsi_cmnd *cmd)
-{
-  aic7xxx_position(cmd) = SCB_LIST_NULL;
-  cmd->host_scribble = (char *)p->completeq.head;
-  p->completeq.head = cmd;
-}
-
-/*+F*************************************************************************
- * Function:
- *   aic7xxx_done_cmds_complete
- *
- * Description:
- *   Process the completed command queue.
- *-F*************************************************************************/
-static void aic7xxx_done_cmds_complete(struct aic7xxx_host *p)
-{
-        struct scsi_cmnd *cmd;
-
-        while (p->completeq.head != NULL) {
-                cmd = p->completeq.head;
-                p->completeq.head = (struct scsi_cmnd *) cmd->host_scribble;
-                cmd->host_scribble = NULL;
-                cmd->scsi_done(cmd);
-        }
-}
-
-/*+F*************************************************************************
- * Function:
- *   aic7xxx_free_scb
- *
- * Description:
- *   Free the scb and insert into the free scb list.
- *-F*************************************************************************/
-static void
-aic7xxx_free_scb(struct aic7xxx_host *p, struct aic7xxx_scb *scb)
-{
-
-  scb->flags = SCB_FREE;
-  scb->cmd = NULL;
-  scb->sg_count = 0;
-  scb->sg_length = 0;
-  scb->tag_action = 0;
-  scb->hscb->control = 0;
-  scb->hscb->target_status = 0;
-  scb->hscb->target_channel_lun = SCB_LIST_NULL;
-
-  scbq_insert_head(&p->scb_data->free_scbs, scb);
-}
-
-/*+F*************************************************************************
- * Function:
- *   aic7xxx_done
- *
- * Description:
- *   Calls the higher level scsi done function and frees the scb.
- *-F*************************************************************************/
-static void
-aic7xxx_done(struct aic7xxx_host *p, struct aic7xxx_scb *scb)
-{
-        struct scsi_cmnd *cmd = scb->cmd;
-        struct aic_dev_data *aic_dev = cmd->device->hostdata;
-        int tindex = TARGET_INDEX(cmd);
-        struct aic7xxx_scb *scbp;
-        unsigned char queue_depth;
-
-        scsi_dma_unmap(cmd);
-
-  if (scb->flags & SCB_SENSE)
-  {
-    pci_unmap_single(p->pdev,
-                     le32_to_cpu(scb->sg_list[0].address),
-                     SCSI_SENSE_BUFFERSIZE,
-                     PCI_DMA_FROMDEVICE);
-  }
-  if (scb->flags & SCB_RECOVERY_SCB)
-  {
-    p->flags &= ~AHC_ABORT_PENDING;
-  }
-  if (scb->flags & (SCB_RESET|SCB_ABORT))
-  {
-    cmd->result |= (DID_RESET << 16);
-  }
-
-  if ((scb->flags & SCB_MSGOUT_BITS) != 0)
-  {
-    unsigned short mask;
-    int message_error = FALSE;
-
-    mask = 0x01 << tindex;
- 
-    /*
-     * Check to see if we get an invalid message or a message error
-     * after failing to negotiate a wide or sync transfer message.
-     */
-    if ((scb->flags & SCB_SENSE) && 
-          ((scb->cmd->sense_buffer[12] == 0x43) ||  /* INVALID_MESSAGE */
-          (scb->cmd->sense_buffer[12] == 0x49))) /* MESSAGE_ERROR  */
-    {
-      message_error = TRUE;
-    }
-
-    if (scb->flags & SCB_MSGOUT_WDTR)
-    {
-      if (message_error)
-      {
-        if ( (aic7xxx_verbose & VERBOSE_NEGOTIATION2) &&
-             (aic_dev->flags & DEVICE_PRINT_DTR) )
-        {
-          printk(INFO_LEAD "Device failed to complete Wide Negotiation "
-            "processing and\n", p->host_no, CTL_OF_SCB(scb));
-          printk(INFO_LEAD "returned a sense error code for invalid message, "
-            "disabling future\n", p->host_no, CTL_OF_SCB(scb));
-          printk(INFO_LEAD "Wide negotiation to this device.\n", p->host_no,
-            CTL_OF_SCB(scb));
-        }
-        aic_dev->needwdtr = aic_dev->needwdtr_copy = 0;
-      }
-    }
-    if (scb->flags & SCB_MSGOUT_SDTR)
-    {
-      if (message_error)
-      {
-        if ( (aic7xxx_verbose & VERBOSE_NEGOTIATION2) &&
-             (aic_dev->flags & DEVICE_PRINT_DTR) )
-        {
-          printk(INFO_LEAD "Device failed to complete Sync Negotiation "
-            "processing and\n", p->host_no, CTL_OF_SCB(scb));
-          printk(INFO_LEAD "returned a sense error code for invalid message, "
-            "disabling future\n", p->host_no, CTL_OF_SCB(scb));
-          printk(INFO_LEAD "Sync negotiation to this device.\n", p->host_no,
-            CTL_OF_SCB(scb));
-          aic_dev->flags &= ~DEVICE_PRINT_DTR;
-        }
-        aic_dev->needsdtr = aic_dev->needsdtr_copy = 0;
-      }
-    }
-    if (scb->flags & SCB_MSGOUT_PPR)
-    {
-      if(message_error)
-      {
-        if ( (aic7xxx_verbose & VERBOSE_NEGOTIATION2) &&
-             (aic_dev->flags & DEVICE_PRINT_DTR) )
-        {
-          printk(INFO_LEAD "Device failed to complete Parallel Protocol "
-            "Request processing and\n", p->host_no, CTL_OF_SCB(scb));
-          printk(INFO_LEAD "returned a sense error code for invalid message, "
-            "disabling future\n", p->host_no, CTL_OF_SCB(scb));
-          printk(INFO_LEAD "Parallel Protocol Request negotiation to this "
-            "device.\n", p->host_no, CTL_OF_SCB(scb));
-        }
-        /*
-         * Disable PPR negotiation and revert back to WDTR and SDTR setup
-         */
-        aic_dev->needppr = aic_dev->needppr_copy = 0;
-        aic_dev->needsdtr = aic_dev->needsdtr_copy = 1;
-        aic_dev->needwdtr = aic_dev->needwdtr_copy = 1;
-      }
-    }
-  }
-
-  queue_depth = aic_dev->temp_q_depth;
-  if (queue_depth >= aic_dev->active_cmds)
-  {
-    scbp = scbq_remove_head(&aic_dev->delayed_scbs);
-    if (scbp)
-    {
-      if (queue_depth == 1)
-      {
-        /*
-         * Give extra preference to untagged devices, such as CD-R devices
-         * This makes it more likely that a drive *won't* stuff up while
-         * waiting on data at a critical time, such as CD-R writing and
-         * audio CD ripping operations.  Should also benefit tape drives.
-         */
-        scbq_insert_head(&p->waiting_scbs, scbp);
-      }
-      else
-      {
-        scbq_insert_tail(&p->waiting_scbs, scbp);
-      }
-#ifdef AIC7XXX_VERBOSE_DEBUGGING
-      if (aic7xxx_verbose > 0xffff)
-        printk(INFO_LEAD "Moving SCB from delayed to waiting queue.\n",
-               p->host_no, CTL_OF_SCB(scbp));
-#endif
-      if (queue_depth > aic_dev->active_cmds)
-      {
-        scbp = scbq_remove_head(&aic_dev->delayed_scbs);
-        if (scbp)
-          scbq_insert_tail(&p->waiting_scbs, scbp);
-      }
-    }
-  }
-  if (!(scb->tag_action))
-  {
-    aic7xxx_index_busy_target(p, scb->hscb->target_channel_lun,
-                              /* unbusy */ TRUE);
-    if (cmd->device->simple_tags)
-    {
-      aic_dev->temp_q_depth = aic_dev->max_q_depth;
-    }
-  }
-  if(scb->flags & SCB_DTR_SCB)
-  {
-    aic_dev->dtr_pending = 0;
-  }
-  aic_dev->active_cmds--;
-  p->activescbs--;
-
-  if ((scb->sg_length >= 512) && (((cmd->result >> 16) & 0xf) == DID_OK))
-  {
-    long *ptr;
-    int x, i;
-
-
-    if (rq_data_dir(cmd->request) == WRITE)
-    {
-      aic_dev->w_total++;
-      ptr = aic_dev->w_bins;
-    }
-    else
-    {
-      aic_dev->r_total++;
-      ptr = aic_dev->r_bins;
-    }
-    x = scb->sg_length;
-    x >>= 10;
-    for(i=0; i<6; i++)
-    {
-      x >>= 2;
-      if(!x) {
-        ptr[i]++;
-        break;
-      }
-    }
-    if(i == 6 && x)
-      ptr[5]++;
-  }
-  aic7xxx_free_scb(p, scb);
-  aic7xxx_queue_cmd_complete(p, cmd);
-
-}
-
-/*+F*************************************************************************
- * Function:
- *   aic7xxx_run_done_queue
- *
- * Description:
- *   Calls the aic7xxx_done() for the scsi_cmnd of each scb in the
- *   aborted list, and adds each scb to the free list.  If complete
- *   is TRUE, we also process the commands complete list.
- *-F*************************************************************************/
-static void
-aic7xxx_run_done_queue(struct aic7xxx_host *p, /*complete*/ int complete)
-{
-  struct aic7xxx_scb *scb;
-  int i, found = 0;
-
-  for (i = 0; i < p->scb_data->numscbs; i++)
-  {
-    scb = p->scb_data->scb_array[i];
-    if (scb->flags & SCB_QUEUED_FOR_DONE)
-    {
-      if (scb->flags & SCB_QUEUE_FULL)
-      {
-        scb->cmd->result = QUEUE_FULL << 1;
-      }
-      else
-      {
-        if (aic7xxx_verbose & (VERBOSE_ABORT_PROCESS | VERBOSE_RESET_PROCESS))
-          printk(INFO_LEAD "Aborting scb %d\n",
-               p->host_no, CTL_OF_SCB(scb), scb->hscb->tag);
-        /*
-         * Clear any residual information since the normal aic7xxx_done() path
-         * doesn't touch the residuals.
-         */
-        scb->hscb->residual_SG_segment_count = 0;
-        scb->hscb->residual_data_count[0] = 0;
-        scb->hscb->residual_data_count[1] = 0;
-        scb->hscb->residual_data_count[2] = 0;
-      }
-      found++;
-      aic7xxx_done(p, scb);
-    }
-  }
-  if (aic7xxx_verbose & (VERBOSE_ABORT_RETURN | VERBOSE_RESET_RETURN))
-  {
-    printk(INFO_LEAD "%d commands found and queued for "
-        "completion.\n", p->host_no, -1, -1, -1, found);
-  }
-  if (complete)
-  {
-    aic7xxx_done_cmds_complete(p);
-  }
-}
-
-/*+F*************************************************************************
- * Function:
- *   aic7xxx_abort_waiting_scb
- *
- * Description:
- *   Manipulate the waiting for selection list and return the
- *   scb that follows the one that we remove.
- *-F*************************************************************************/
-static unsigned char
-aic7xxx_abort_waiting_scb(struct aic7xxx_host *p, struct aic7xxx_scb *scb,
-    unsigned char scbpos, unsigned char prev)
-{
-  unsigned char curscb, next;
-
-  /*
-   * Select the SCB we want to abort and pull the next pointer out of it.
-   */
-  curscb = aic_inb(p, SCBPTR);
-  aic_outb(p, scbpos, SCBPTR);
-  next = aic_inb(p, SCB_NEXT);
-
-  aic7xxx_add_curscb_to_free_list(p);
-
-  /*
-   * Update the waiting list
-   */
-  if (prev == SCB_LIST_NULL)
-  {
-    /*
-     * First in the list
-     */
-    aic_outb(p, next, WAITING_SCBH);
-  }
-  else
-  {
-    /*
-     * Select the scb that pointed to us and update its next pointer.
-     */
-    aic_outb(p, prev, SCBPTR);
-    aic_outb(p, next, SCB_NEXT);
-  }
-  /*
-   * Point us back at the original scb position and inform the SCSI
-   * system that the command has been aborted.
-   */
-  aic_outb(p, curscb, SCBPTR);
-  return (next);
-}
-
-/*+F*************************************************************************
- * Function:
- *   aic7xxx_search_qinfifo
- *
- * Description:
- *   Search the queue-in FIFO for matching SCBs and conditionally
- *   requeue.  Returns the number of matching SCBs.
- *-F*************************************************************************/
-static int
-aic7xxx_search_qinfifo(struct aic7xxx_host *p, int target, int channel,
-    int lun, unsigned char tag, int flags, int requeue,
-    volatile scb_queue_type *queue)
-{
-  int      found;
-  unsigned char qinpos, qintail;
-  struct aic7xxx_scb *scbp;
-
-  found = 0;
-  qinpos = aic_inb(p, QINPOS);
-  qintail = p->qinfifonext;
-
-  p->qinfifonext = qinpos;
-
-  while (qinpos != qintail)
-  {
-    scbp = p->scb_data->scb_array[p->qinfifo[qinpos++]];
-    if (aic7xxx_match_scb(p, scbp, target, channel, lun, tag))
-    {
-       /*
-        * We found an scb that needs to be removed.
-        */
-       if (requeue && (queue != NULL))
-       {
-         if (scbp->flags & SCB_WAITINGQ)
-         {
-           scbq_remove(queue, scbp);
-           scbq_remove(&p->waiting_scbs, scbp);
-           scbq_remove(&AIC_DEV(scbp->cmd)->delayed_scbs, scbp);
-           AIC_DEV(scbp->cmd)->active_cmds++;
-           p->activescbs++;
-         }
-         scbq_insert_tail(queue, scbp);
-         AIC_DEV(scbp->cmd)->active_cmds--;
-         p->activescbs--;
-         scbp->flags |= SCB_WAITINGQ;
-         if ( !(scbp->tag_action & TAG_ENB) )
-         {
-           aic7xxx_index_busy_target(p, scbp->hscb->target_channel_lun,
-             TRUE);
-         }
-       }
-       else if (requeue)
-       {
-         p->qinfifo[p->qinfifonext++] = scbp->hscb->tag;
-       }
-       else
-       {
-        /*
-         * Preserve any SCB_RECOVERY_SCB flags on this scb then set the
-         * flags we were called with, presumeably so aic7xxx_run_done_queue
-         * can find this scb
-         */
-         scbp->flags = flags | (scbp->flags & SCB_RECOVERY_SCB);
-         if (aic7xxx_index_busy_target(p, scbp->hscb->target_channel_lun,
-                                       FALSE) == scbp->hscb->tag)
-         {
-           aic7xxx_index_busy_target(p, scbp->hscb->target_channel_lun,
-             TRUE);
-         }
-       }
-       found++;
-    }
-    else
-    {
-      p->qinfifo[p->qinfifonext++] = scbp->hscb->tag;
-    }
-  }
-  /*
-   * Now that we've done the work, clear out any left over commands in the
-   * qinfifo and update the KERNEL_QINPOS down on the card.
-   *
-   *  NOTE: This routine expect the sequencer to already be paused when
-   *        it is run....make sure it's that way!
-   */
-  qinpos = p->qinfifonext;
-  while(qinpos != qintail)
-  {
-    p->qinfifo[qinpos++] = SCB_LIST_NULL;
-  }
-  if (p->features & AHC_QUEUE_REGS)
-    aic_outb(p, p->qinfifonext, HNSCB_QOFF);
-  else
-    aic_outb(p, p->qinfifonext, KERNEL_QINPOS);
-
-  return (found);
-}
-
-/*+F*************************************************************************
- * Function:
- *   aic7xxx_scb_on_qoutfifo
- *
- * Description:
- *   Is the scb that was passed to us currently on the qoutfifo?
- *-F*************************************************************************/
-static int
-aic7xxx_scb_on_qoutfifo(struct aic7xxx_host *p, struct aic7xxx_scb *scb)
-{
-  int i=0;
-
-  while(p->qoutfifo[(p->qoutfifonext + i) & 0xff ] != SCB_LIST_NULL)
-  {
-    if(p->qoutfifo[(p->qoutfifonext + i) & 0xff ] == scb->hscb->tag)
-      return TRUE;
-    else
-      i++;
-  }
-  return FALSE;
-}
-
-
-/*+F*************************************************************************
- * Function:
- *   aic7xxx_reset_device
- *
- * Description:
- *   The device at the given target/channel has been reset.  Abort
- *   all active and queued scbs for that target/channel.  This function
- *   need not worry about linked next pointers because if was a MSG_ABORT_TAG
- *   then we had a tagged command (no linked next), if it was MSG_ABORT or
- *   MSG_BUS_DEV_RESET then the device won't know about any commands any more
- *   and no busy commands will exist, and if it was a bus reset, then nothing
- *   knows about any linked next commands any more.  In all cases, we don't
- *   need to worry about the linked next or busy scb, we just need to clear
- *   them.
- *-F*************************************************************************/
-static void
-aic7xxx_reset_device(struct aic7xxx_host *p, int target, int channel,
-                     int lun, unsigned char tag)
-{
-  struct aic7xxx_scb *scbp, *prev_scbp;
-  struct scsi_device *sd;
-  unsigned char active_scb, tcl, scb_tag;
-  int i = 0, init_lists = FALSE;
-  struct aic_dev_data *aic_dev;
-
-  /*
-   * Restore this when we're done
-   */
-  active_scb = aic_inb(p, SCBPTR);
-  scb_tag = aic_inb(p, SCB_TAG);
-
-  if (aic7xxx_verbose & (VERBOSE_RESET_PROCESS | VERBOSE_ABORT_PROCESS))
-  {
-    printk(INFO_LEAD "Reset device, hardware_scb %d,\n",
-         p->host_no, channel, target, lun, active_scb);
-    printk(INFO_LEAD "Current scb %d, SEQADDR 0x%x, LASTPHASE "
-           "0x%x\n",
-         p->host_no, channel, target, lun, scb_tag,
-         aic_inb(p, SEQADDR0) | (aic_inb(p, SEQADDR1) << 8),
-         aic_inb(p, LASTPHASE));
-    printk(INFO_LEAD "SG_CACHEPTR 0x%x, SG_COUNT %d, SCSISIGI 0x%x\n",
-         p->host_no, channel, target, lun,
-         (p->features & AHC_ULTRA2) ?  aic_inb(p, SG_CACHEPTR) : 0,
-         aic_inb(p, SG_COUNT), aic_inb(p, SCSISIGI));
-    printk(INFO_LEAD "SSTAT0 0x%x, SSTAT1 0x%x, SSTAT2 0x%x\n",
-         p->host_no, channel, target, lun, aic_inb(p, SSTAT0),
-         aic_inb(p, SSTAT1), aic_inb(p, SSTAT2));
-  }
-
-  /*
-   * Deal with the busy target and linked next issues.
-   */
-  list_for_each_entry(aic_dev, &p->aic_devs, list)
-  {
-    if (aic7xxx_verbose & (VERBOSE_RESET_PROCESS | VERBOSE_ABORT_PROCESS))
-      printk(INFO_LEAD "processing aic_dev %p\n", p->host_no, channel, target,
-                    lun, aic_dev);
-    sd = aic_dev->SDptr;
-
-    if((target != ALL_TARGETS && target != sd->id) ||
-       (channel != ALL_CHANNELS && channel != sd->channel))
-      continue;
-    if (aic7xxx_verbose & (VERBOSE_ABORT_PROCESS | VERBOSE_RESET_PROCESS))
-        printk(INFO_LEAD "Cleaning up status information "
-          "and delayed_scbs.\n", p->host_no, sd->channel, sd->id, sd->lun);
-    aic_dev->flags &= ~BUS_DEVICE_RESET_PENDING;
-    if ( tag == SCB_LIST_NULL )
-    {
-      aic_dev->dtr_pending = 0;
-      aic_dev->needppr = aic_dev->needppr_copy;
-      aic_dev->needsdtr = aic_dev->needsdtr_copy;
-      aic_dev->needwdtr = aic_dev->needwdtr_copy;
-      aic_dev->flags = DEVICE_PRINT_DTR;
-      aic_dev->temp_q_depth = aic_dev->max_q_depth;
-    }
-    tcl = (sd->id << 4) | (sd->channel << 3) | sd->lun;
-    if ( (aic7xxx_index_busy_target(p, tcl, FALSE) == tag) ||
-         (tag == SCB_LIST_NULL) )
-      aic7xxx_index_busy_target(p, tcl, /* unbusy */ TRUE);
-    prev_scbp = NULL; 
-    scbp = aic_dev->delayed_scbs.head;
-    while (scbp != NULL)
-    {
-      prev_scbp = scbp;
-      scbp = scbp->q_next;
-      if (aic7xxx_match_scb(p, prev_scbp, target, channel, lun, tag))
-      {
-        scbq_remove(&aic_dev->delayed_scbs, prev_scbp);
-        if (prev_scbp->flags & SCB_WAITINGQ)
-        {
-          aic_dev->active_cmds++;
-          p->activescbs++;
-        }
-        prev_scbp->flags &= ~(SCB_ACTIVE | SCB_WAITINGQ);
-        prev_scbp->flags |= SCB_RESET | SCB_QUEUED_FOR_DONE;
-      }
-    }
-  }
-
-  if (aic7xxx_verbose & (VERBOSE_ABORT_PROCESS | VERBOSE_RESET_PROCESS))
-    printk(INFO_LEAD "Cleaning QINFIFO.\n", p->host_no, channel, target, lun );
-  aic7xxx_search_qinfifo(p, target, channel, lun, tag,
-      SCB_RESET | SCB_QUEUED_FOR_DONE, /* requeue */ FALSE, NULL);
-
-/*
- *  Search the waiting_scbs queue for matches, this catches any SCB_QUEUED
- *  ABORT/RESET commands.
- */
-  if (aic7xxx_verbose & (VERBOSE_ABORT_PROCESS | VERBOSE_RESET_PROCESS))
-    printk(INFO_LEAD "Cleaning waiting_scbs.\n", p->host_no, channel,
-      target, lun );
-  {
-    struct aic7xxx_scb *scbp, *prev_scbp;
-
-    prev_scbp = NULL; 
-    scbp = p->waiting_scbs.head;
-    while (scbp != NULL)
-    {
-      prev_scbp = scbp;
-      scbp = scbp->q_next;
-      if (aic7xxx_match_scb(p, prev_scbp, target, channel, lun, tag))
-      {
-        scbq_remove(&p->waiting_scbs, prev_scbp);
-        if (prev_scbp->flags & SCB_WAITINGQ)
-        {
-          AIC_DEV(prev_scbp->cmd)->active_cmds++;
-          p->activescbs++;
-        }
-        prev_scbp->flags &= ~(SCB_ACTIVE | SCB_WAITINGQ);
-        prev_scbp->flags |= SCB_RESET | SCB_QUEUED_FOR_DONE;
-      }
-    }
-  }
-
-
-  /*
-   * Search waiting for selection list.
-   */
-  if (aic7xxx_verbose & (VERBOSE_ABORT_PROCESS | VERBOSE_RESET_PROCESS))
-    printk(INFO_LEAD "Cleaning waiting for selection "
-      "list.\n", p->host_no, channel, target, lun);
-  {
-    unsigned char next, prev, scb_index;
-
-    next = aic_inb(p, WAITING_SCBH);  /* Start at head of list. */
-    prev = SCB_LIST_NULL;
-    while (next != SCB_LIST_NULL)
-    {
-      aic_outb(p, next, SCBPTR);
-      scb_index = aic_inb(p, SCB_TAG);
-      if (scb_index >= p->scb_data->numscbs)
-      {
-       /*
-        * No aic7xxx_verbose check here.....we want to see this since it
-        * means either the kernel driver or the sequencer screwed things up
-        */
-        printk(WARN_LEAD "Waiting List inconsistency; SCB index=%d, "
-          "numscbs=%d\n", p->host_no, channel, target, lun, scb_index,
-          p->scb_data->numscbs);
-        next = aic_inb(p, SCB_NEXT);
-        aic7xxx_add_curscb_to_free_list(p);
-      }
-      else
-      {
-        scbp = p->scb_data->scb_array[scb_index];
-        if (aic7xxx_match_scb(p, scbp, target, channel, lun, tag))
-        {
-          next = aic7xxx_abort_waiting_scb(p, scbp, next, prev);
-          if (scbp->flags & SCB_WAITINGQ)
-          {
-            AIC_DEV(scbp->cmd)->active_cmds++;
-            p->activescbs++;
-          }
-          scbp->flags &= ~(SCB_ACTIVE | SCB_WAITINGQ);
-          scbp->flags |= SCB_RESET | SCB_QUEUED_FOR_DONE;
-          if (prev == SCB_LIST_NULL)
-          {
-            /*
-             * This is either the first scb on the waiting list, or we
-             * have already yanked the first and haven't left any behind.
-             * Either way, we need to turn off the selection hardware if
-             * it isn't already off.
-             */
-            aic_outb(p, aic_inb(p, SCSISEQ) & ~ENSELO, SCSISEQ);
-            aic_outb(p, CLRSELTIMEO, CLRSINT1);
-          }
-        }
-        else
-        {
-          prev = next;
-          next = aic_inb(p, SCB_NEXT);
-        }
-      }
-    }
-  }
-
-  /*
-   * Go through disconnected list and remove any entries we have queued
-   * for completion, zeroing their control byte too.
-   */
-  if (aic7xxx_verbose & (VERBOSE_ABORT_PROCESS | VERBOSE_RESET_PROCESS))
-    printk(INFO_LEAD "Cleaning disconnected scbs "
-      "list.\n", p->host_no, channel, target, lun);
-  if (p->flags & AHC_PAGESCBS)
-  {
-    unsigned char next, prev, scb_index;
-
-    next = aic_inb(p, DISCONNECTED_SCBH);
-    prev = SCB_LIST_NULL;
-    while (next != SCB_LIST_NULL)
-    {
-      aic_outb(p, next, SCBPTR);
-      scb_index = aic_inb(p, SCB_TAG);
-      if (scb_index > p->scb_data->numscbs)
-      {
-        printk(WARN_LEAD "Disconnected List inconsistency; SCB index=%d, "
-          "numscbs=%d\n", p->host_no, channel, target, lun, scb_index,
-          p->scb_data->numscbs);
-        next = aic7xxx_rem_scb_from_disc_list(p, next, prev);
-      }
-      else
-      {
-        scbp = p->scb_data->scb_array[scb_index];
-        if (aic7xxx_match_scb(p, scbp, target, channel, lun, tag))
-        {
-          next = aic7xxx_rem_scb_from_disc_list(p, next, prev);
-          if (scbp->flags & SCB_WAITINGQ)
-          {
-            AIC_DEV(scbp->cmd)->active_cmds++;
-            p->activescbs++;
-          }
-          scbp->flags &= ~(SCB_ACTIVE | SCB_WAITINGQ);
-          scbp->flags |= SCB_RESET | SCB_QUEUED_FOR_DONE;
-          scbp->hscb->control = 0;
-        }
-        else
-        {
-          prev = next;
-          next = aic_inb(p, SCB_NEXT);
-        }
-      }
-    }
-  }
-
-  /*
-   * Walk the free list making sure no entries on the free list have
-   * a valid SCB_TAG value or SCB_CONTROL byte.
-   */
-  if (p->flags & AHC_PAGESCBS)
-  {
-    unsigned char next;
-
-    next = aic_inb(p, FREE_SCBH);
-    while (next != SCB_LIST_NULL)
-    {
-      aic_outb(p, next, SCBPTR);
-      if (aic_inb(p, SCB_TAG) < p->scb_data->numscbs)
-      {
-        printk(WARN_LEAD "Free list inconsistency!.\n", p->host_no, channel,
-          target, lun);
-        init_lists = TRUE;
-        next = SCB_LIST_NULL;
-      }
-      else
-      {
-        aic_outb(p, SCB_LIST_NULL, SCB_TAG);
-        aic_outb(p, 0, SCB_CONTROL);
-        next = aic_inb(p, SCB_NEXT);
-      }
-    }
-  }
-
-  /*
-   * Go through the hardware SCB array looking for commands that
-   * were active but not on any list.
-   */
-  if (init_lists)
-  {
-    aic_outb(p, SCB_LIST_NULL, FREE_SCBH);
-    aic_outb(p, SCB_LIST_NULL, WAITING_SCBH);
-    aic_outb(p, SCB_LIST_NULL, DISCONNECTED_SCBH);
-  }
-  for (i = p->scb_data->maxhscbs - 1; i >= 0; i--)
-  {
-    unsigned char scbid;
-
-    aic_outb(p, i, SCBPTR);
-    if (init_lists)
-    {
-      aic_outb(p, SCB_LIST_NULL, SCB_TAG);
-      aic_outb(p, SCB_LIST_NULL, SCB_NEXT);
-      aic_outb(p, 0, SCB_CONTROL);
-      aic7xxx_add_curscb_to_free_list(p);
-    }
-    else
-    {
-      scbid = aic_inb(p, SCB_TAG);
-      if (scbid < p->scb_data->numscbs)
-      {
-        scbp = p->scb_data->scb_array[scbid];
-        if (aic7xxx_match_scb(p, scbp, target, channel, lun, tag))
-        {
-          aic_outb(p, 0, SCB_CONTROL);
-          aic_outb(p, SCB_LIST_NULL, SCB_TAG);
-          aic7xxx_add_curscb_to_free_list(p);
-        }
-      }
-    }
-  }
-
-  /*
-   * Go through the entire SCB array now and look for commands for
-   * for this target that are stillactive.  These are other (most likely
-   * tagged) commands that were disconnected when the reset occurred.
-   * Any commands we find here we know this about, it wasn't on any queue,
-   * it wasn't in the qinfifo, it wasn't in the disconnected or waiting
-   * lists, so it really must have been a paged out SCB.  In that case,
-   * we shouldn't need to bother with updating any counters, just mark
-   * the correct flags and go on.
-   */
-  for (i = 0; i < p->scb_data->numscbs; i++)
-  {
-    scbp = p->scb_data->scb_array[i];
-    if ((scbp->flags & SCB_ACTIVE) &&
-        aic7xxx_match_scb(p, scbp, target, channel, lun, tag) &&
-        !aic7xxx_scb_on_qoutfifo(p, scbp))
-    {
-      if (scbp->flags & SCB_WAITINGQ)
-      {
-        scbq_remove(&p->waiting_scbs, scbp);
-        scbq_remove(&AIC_DEV(scbp->cmd)->delayed_scbs, scbp);
-        AIC_DEV(scbp->cmd)->active_cmds++;
-        p->activescbs++;
-      }
-      scbp->flags |= SCB_RESET | SCB_QUEUED_FOR_DONE;
-      scbp->flags &= ~(SCB_ACTIVE | SCB_WAITINGQ);
-    }
-  }
-
-  aic_outb(p, active_scb, SCBPTR);
-}
-
-
-/*+F*************************************************************************
- * Function:
- *   aic7xxx_clear_intstat
- *
- * Description:
- *   Clears the interrupt status.
- *-F*************************************************************************/
-static void
-aic7xxx_clear_intstat(struct aic7xxx_host *p)
-{
-  /* Clear any interrupt conditions this may have caused. */
-  aic_outb(p, CLRSELDO | CLRSELDI | CLRSELINGO, CLRSINT0);
-  aic_outb(p, CLRSELTIMEO | CLRATNO | CLRSCSIRSTI | CLRBUSFREE | CLRSCSIPERR |
-       CLRPHASECHG | CLRREQINIT, CLRSINT1);
-  aic_outb(p, CLRSCSIINT | CLRSEQINT | CLRBRKADRINT | CLRPARERR, CLRINT);
-}
-
-/*+F*************************************************************************
- * Function:
- *   aic7xxx_reset_current_bus
- *
- * Description:
- *   Reset the current SCSI bus.
- *-F*************************************************************************/
-static void
-aic7xxx_reset_current_bus(struct aic7xxx_host *p)
-{
-
-  /* Disable reset interrupts. */
-  aic_outb(p, aic_inb(p, SIMODE1) & ~ENSCSIRST, SIMODE1);
-
-  /* Turn off the bus' current operations, after all, we shouldn't have any
-   * valid commands left to cause a RSELI and SELO once we've tossed the
-   * bus away with this reset, so we might as well shut down the sequencer
-   * until the bus is restarted as opposed to saving the current settings
-   * and restoring them (which makes no sense to me). */
-
-  /* Turn on the bus reset. */
-  aic_outb(p, aic_inb(p, SCSISEQ) | SCSIRSTO, SCSISEQ);
-  while ( (aic_inb(p, SCSISEQ) & SCSIRSTO) == 0)
-    mdelay(5);
-
-  /*
-   * Some of the new Ultra2 chipsets need a longer delay after a chip
-   * reset than just the init setup creates, so we have to delay here
-   * before we go into a reset in order to make the chips happy.
-   */
-  if (p->features & AHC_ULTRA2)
-    mdelay(250);
-  else
-    mdelay(50);
-
-  /* Turn off the bus reset. */
-  aic_outb(p, 0, SCSISEQ);
-  mdelay(10);
-
-  aic7xxx_clear_intstat(p);
-  /* Re-enable reset interrupts. */
-  aic_outb(p, aic_inb(p, SIMODE1) | ENSCSIRST, SIMODE1);
-
-}
-
-/*+F*************************************************************************
- * Function:
- *   aic7xxx_reset_channel
- *
- * Description:
- *   Reset the channel.
- *-F*************************************************************************/
-static void
-aic7xxx_reset_channel(struct aic7xxx_host *p, int channel, int initiate_reset)
-{
-  unsigned long offset_min, offset_max;
-  unsigned char sblkctl;
-  int cur_channel;
-
-  if (aic7xxx_verbose & VERBOSE_RESET_PROCESS)
-    printk(INFO_LEAD "Reset channel called, %s initiate reset.\n",
-      p->host_no, channel, -1, -1, (initiate_reset==TRUE) ? "will" : "won't" );
-
-
-  if (channel == 1)
-  {
-    offset_min = 8;
-    offset_max = 16;
-  }
-  else
-  {
-    if (p->features & AHC_TWIN)
-    {
-      /* Channel A */
-      offset_min = 0;
-      offset_max = 8;
-    }
-    else
-    {
-      offset_min = 0;
-      if (p->features & AHC_WIDE)
-      {
-        offset_max = 16;
-      }
-      else
-      {
-        offset_max = 8;
-      }
-    }
-  }
-
-  while (offset_min < offset_max)
-  {
-    /*
-     * Revert to async/narrow transfers until we renegotiate.
-     */
-    aic_outb(p, 0, TARG_SCSIRATE + offset_min);
-    if (p->features & AHC_ULTRA2)
-    {
-      aic_outb(p, 0, TARG_OFFSET + offset_min);
-    }
-    offset_min++;
-  }
-
-  /*
-   * Reset the bus and unpause/restart the controller
-   */
-  sblkctl = aic_inb(p, SBLKCTL);
-  if ( (p->chip & AHC_CHIPID_MASK) == AHC_AIC7770 )
-    cur_channel = (sblkctl & SELBUSB) >> 3;
-  else
-    cur_channel = 0;
-  if ( (cur_channel != channel) && (p->features & AHC_TWIN) )
-  {
-    /*
-     * Case 1: Command for another bus is active
-     */
-    if (aic7xxx_verbose & VERBOSE_RESET_PROCESS)
-      printk(INFO_LEAD "Stealthily resetting idle channel.\n", p->host_no,
-        channel, -1, -1);
-    /*
-     * Stealthily reset the other bus without upsetting the current bus.
-     */
-    aic_outb(p, sblkctl ^ SELBUSB, SBLKCTL);
-    aic_outb(p, aic_inb(p, SIMODE1) & ~ENBUSFREE, SIMODE1);
-    if (initiate_reset)
-    {
-      aic7xxx_reset_current_bus(p);
-    }
-    aic_outb(p, aic_inb(p, SCSISEQ) & (ENSELI|ENRSELI|ENAUTOATNP), SCSISEQ);
-    aic7xxx_clear_intstat(p);
-    aic_outb(p, sblkctl, SBLKCTL);
-  }
-  else
-  {
-    /*
-     * Case 2: A command from this bus is active or we're idle.
-     */
-    if (aic7xxx_verbose & VERBOSE_RESET_PROCESS)
-      printk(INFO_LEAD "Resetting currently active channel.\n", p->host_no,
-        channel, -1, -1);
-    aic_outb(p, aic_inb(p, SIMODE1) & ~(ENBUSFREE|ENREQINIT),
-      SIMODE1);
-    p->flags &= ~AHC_HANDLING_REQINITS;
-    p->msg_type = MSG_TYPE_NONE;
-    p->msg_len = 0;
-    if (initiate_reset)
-    {
-      aic7xxx_reset_current_bus(p);
-    }
-    aic_outb(p, aic_inb(p, SCSISEQ) & (ENSELI|ENRSELI|ENAUTOATNP), SCSISEQ);
-    aic7xxx_clear_intstat(p);
-  }
-  if (aic7xxx_verbose & VERBOSE_RESET_RETURN)
-    printk(INFO_LEAD "Channel reset\n", p->host_no, channel, -1, -1);
-  /*
-   * Clean up all the state information for the pending transactions
-   * on this bus.
-   */
-  aic7xxx_reset_device(p, ALL_TARGETS, channel, ALL_LUNS, SCB_LIST_NULL);
-
-  if ( !(p->features & AHC_TWIN) )
-  {
-    restart_sequencer(p);
-  }
-
-  return;
-}
-
-/*+F*************************************************************************
- * Function:
- *   aic7xxx_run_waiting_queues
- *
- * Description:
- *   Scan the awaiting_scbs queue downloading and starting as many
- *   scbs as we can.
- *-F*************************************************************************/
-static void
-aic7xxx_run_waiting_queues(struct aic7xxx_host *p)
-{
-  struct aic7xxx_scb *scb;
-  struct aic_dev_data *aic_dev;
-  int sent;
-
-
-  if (p->waiting_scbs.head == NULL)
-    return;
-
-  sent = 0;
-
-  /*
-   * First handle SCBs that are waiting but have been assigned a slot.
-   */
-  while ((scb = scbq_remove_head(&p->waiting_scbs)) != NULL)
-  {
-    aic_dev = scb->cmd->device->hostdata;
-    if ( !scb->tag_action )
-    {
-      aic_dev->temp_q_depth = 1;
-    }
-    if ( aic_dev->active_cmds >= aic_dev->temp_q_depth)
-    {
-      scbq_insert_tail(&aic_dev->delayed_scbs, scb);
-    }
-    else
-    {
-        scb->flags &= ~SCB_WAITINGQ;
-        aic_dev->active_cmds++;
-        p->activescbs++;
-        if ( !(scb->tag_action) )
-        {
-          aic7xxx_busy_target(p, scb);
-        }
-        p->qinfifo[p->qinfifonext++] = scb->hscb->tag;
-        sent++;
-    }
-  }
-  if (sent)
-  {
-    if (p->features & AHC_QUEUE_REGS)
-      aic_outb(p, p->qinfifonext, HNSCB_QOFF);
-    else
-    {
-      pause_sequencer(p);
-      aic_outb(p, p->qinfifonext, KERNEL_QINPOS);
-      unpause_sequencer(p, FALSE);
-    }
-    if (p->activescbs > p->max_activescbs)
-      p->max_activescbs = p->activescbs;
-  }
-}
-
-#ifdef CONFIG_PCI
-
-#define  DPE 0x80
-#define  SSE 0x40
-#define  RMA 0x20
-#define  RTA 0x10
-#define  STA 0x08
-#define  DPR 0x01
-
-/*+F*************************************************************************
- * Function:
- *   aic7xxx_pci_intr
- *
- * Description:
- *   Check the scsi card for PCI errors and clear the interrupt
- *
- *   NOTE: If you don't have this function and a 2940 card encounters
- *         a PCI error condition, the machine will end up locked as the
- *         interrupt handler gets slammed with non-stop PCI error interrupts
- *-F*************************************************************************/
-static void
-aic7xxx_pci_intr(struct aic7xxx_host *p)
-{
-  unsigned char status1;
-
-  pci_read_config_byte(p->pdev, PCI_STATUS + 1, &status1);
-
-  if ( (status1 & DPE) && (aic7xxx_verbose & VERBOSE_MINOR_ERROR) )
-    printk(WARN_LEAD "Data Parity Error during PCI address or PCI write"
-      "phase.\n", p->host_no, -1, -1, -1);
-  if ( (status1 & SSE) && (aic7xxx_verbose & VERBOSE_MINOR_ERROR) )
-    printk(WARN_LEAD "Signal System Error Detected\n", p->host_no,
-      -1, -1, -1);
-  if ( (status1 & RMA) && (aic7xxx_verbose & VERBOSE_MINOR_ERROR) )
-    printk(WARN_LEAD "Received a PCI Master Abort\n", p->host_no,
-      -1, -1, -1);
-  if ( (status1 & RTA) && (aic7xxx_verbose & VERBOSE_MINOR_ERROR) )
-    printk(WARN_LEAD "Received a PCI Target Abort\n", p->host_no,
-      -1, -1, -1);
-  if ( (status1 & STA) && (aic7xxx_verbose & VERBOSE_MINOR_ERROR) )
-    printk(WARN_LEAD "Signaled a PCI Target Abort\n", p->host_no,
-      -1, -1, -1);
-  if ( (status1 & DPR) && (aic7xxx_verbose & VERBOSE_MINOR_ERROR) )
-    printk(WARN_LEAD "Data Parity Error has been reported via PCI pin "
-      "PERR#\n", p->host_no, -1, -1, -1);
-  
-  pci_write_config_byte(p->pdev, PCI_STATUS + 1, status1);
-  if (status1 & (DPR|RMA|RTA))
-    aic_outb(p,  CLRPARERR, CLRINT);
-
-  if ( (aic7xxx_panic_on_abort) && (p->spurious_int > 500) )
-    aic7xxx_panic_abort(p, NULL);
-
-}
-#endif /* CONFIG_PCI */
-
-/*+F*************************************************************************
- * Function:
- *   aic7xxx_construct_ppr
- *
- * Description:
- *   Build up a Parallel Protocol Request message for use with SCSI-3
- *   devices.
- *-F*************************************************************************/
-static void
-aic7xxx_construct_ppr(struct aic7xxx_host *p, struct aic7xxx_scb *scb)
-{
-  p->msg_buf[p->msg_index++] = MSG_EXTENDED;
-  p->msg_buf[p->msg_index++] = MSG_EXT_PPR_LEN;
-  p->msg_buf[p->msg_index++] = MSG_EXT_PPR;
-  p->msg_buf[p->msg_index++] = AIC_DEV(scb->cmd)->goal.period;
-  p->msg_buf[p->msg_index++] = 0;
-  p->msg_buf[p->msg_index++] = AIC_DEV(scb->cmd)->goal.offset;
-  p->msg_buf[p->msg_index++] = AIC_DEV(scb->cmd)->goal.width;
-  p->msg_buf[p->msg_index++] = AIC_DEV(scb->cmd)->goal.options;
-  p->msg_len += 8;
-}
-
-/*+F*************************************************************************
- * Function:
- *   aic7xxx_construct_sdtr
- *
- * Description:
- *   Constucts a synchronous data transfer message in the message
- *   buffer on the sequencer.
- *-F*************************************************************************/
-static void
-aic7xxx_construct_sdtr(struct aic7xxx_host *p, unsigned char period,
-        unsigned char offset)
-{
-  p->msg_buf[p->msg_index++] = MSG_EXTENDED;
-  p->msg_buf[p->msg_index++] = MSG_EXT_SDTR_LEN;
-  p->msg_buf[p->msg_index++] = MSG_EXT_SDTR;
-  p->msg_buf[p->msg_index++] = period;
-  p->msg_buf[p->msg_index++] = offset;
-  p->msg_len += 5;
-}
-
-/*+F*************************************************************************
- * Function:
- *   aic7xxx_construct_wdtr
- *
- * Description:
- *   Constucts a wide data transfer message in the message buffer
- *   on the sequencer.
- *-F*************************************************************************/
-static void
-aic7xxx_construct_wdtr(struct aic7xxx_host *p, unsigned char bus_width)
-{
-  p->msg_buf[p->msg_index++] = MSG_EXTENDED;
-  p->msg_buf[p->msg_index++] = MSG_EXT_WDTR_LEN;
-  p->msg_buf[p->msg_index++] = MSG_EXT_WDTR;
-  p->msg_buf[p->msg_index++] = bus_width;
-  p->msg_len += 4;
-}
-
-/*+F*************************************************************************
- * Function:
- *   aic7xxx_calc_residual
- *
- * Description:
- *   Calculate the residual data not yet transferred.
- *-F*************************************************************************/
-static void
-aic7xxx_calculate_residual (struct aic7xxx_host *p, struct aic7xxx_scb *scb)
-{
-        struct aic7xxx_hwscb *hscb;
-        struct scsi_cmnd *cmd;
-        int actual, i;
-
-  cmd = scb->cmd;
-  hscb = scb->hscb;
-
-  /*
-   *  Don't destroy valid residual information with
-   *  residual coming from a check sense operation.
-   */
-  if (((scb->hscb->control & DISCONNECTED) == 0) &&
-      (scb->flags & SCB_SENSE) == 0)
-  {
-    /*
-     *  We had an underflow. At this time, there's only
-     *  one other driver that bothers to check for this,
-     *  and cmd->underflow seems to be set rather half-
-     *  heartedly in the higher-level SCSI code.
-     */
-    actual = scb->sg_length;
-    for (i=1; i < hscb->residual_SG_segment_count; i++)
-    {
-      actual -= scb->sg_list[scb->sg_count - i].length;
-    }
-    actual -= (hscb->residual_data_count[2] << 16) |
-              (hscb->residual_data_count[1] <<  8) |
-              hscb->residual_data_count[0];
-
-    if (actual < cmd->underflow)
-    {
-      if (aic7xxx_verbose & VERBOSE_MINOR_ERROR)
-      {
-        printk(INFO_LEAD "Underflow - Wanted %u, %s %u, residual SG "
-          "count %d.\n", p->host_no, CTL_OF_SCB(scb), cmd->underflow,
-          (rq_data_dir(cmd->request) == WRITE) ? "wrote" : "read", actual,
-          hscb->residual_SG_segment_count);
-        printk(INFO_LEAD "status 0x%x.\n", p->host_no, CTL_OF_SCB(scb),
-          hscb->target_status);
-      }
-      /*
-       * In 2.4, only send back the residual information, don't flag this
-       * as an error.  Before 2.4 we had to flag this as an error because
-       * the mid layer didn't check residual data counts to see if the
-       * command needs retried.
-       */
-      scsi_set_resid(cmd, scb->sg_length - actual);
-      aic7xxx_status(cmd) = hscb->target_status;
-    }
-  }
-
-  /*
-   * Clean out the residual information in the SCB for the
-   * next consumer.
-   */
-  hscb->residual_data_count[2] = 0;
-  hscb->residual_data_count[1] = 0;
-  hscb->residual_data_count[0] = 0;
-  hscb->residual_SG_segment_count = 0;
-}
-
-/*+F*************************************************************************
- * Function:
- *   aic7xxx_handle_device_reset
- *
- * Description:
- *   Interrupt handler for sequencer interrupts (SEQINT).
- *-F*************************************************************************/
-static void
-aic7xxx_handle_device_reset(struct aic7xxx_host *p, int target, int channel)
-{
-  unsigned char tindex = target;
-
-  tindex |= ((channel & 0x01) << 3);
-
-  /*
-   * Go back to async/narrow transfers and renegotiate.
-   */
-  aic_outb(p, 0, TARG_SCSIRATE + tindex);
-  if (p->features & AHC_ULTRA2)
-    aic_outb(p, 0, TARG_OFFSET + tindex);
-  aic7xxx_reset_device(p, target, channel, ALL_LUNS, SCB_LIST_NULL);
-  if (aic7xxx_verbose & VERBOSE_RESET_PROCESS)
-    printk(INFO_LEAD "Bus Device Reset delivered.\n", p->host_no, channel,
-      target, -1);
-  aic7xxx_run_done_queue(p, /*complete*/ TRUE);
-}
-
-/*+F*************************************************************************
- * Function:
- *   aic7xxx_handle_seqint
- *
- * Description:
- *   Interrupt handler for sequencer interrupts (SEQINT).
- *-F*************************************************************************/
-static void
-aic7xxx_handle_seqint(struct aic7xxx_host *p, unsigned char intstat)
-{
-  struct aic7xxx_scb *scb;
-  struct aic_dev_data *aic_dev;
-  unsigned short target_mask;
-  unsigned char target, lun, tindex;
-  unsigned char queue_flag = FALSE;
-  char channel;
-  int result;
-
-  target = ((aic_inb(p, SAVED_TCL) >> 4) & 0x0f);
-  if ( (p->chip & AHC_CHIPID_MASK) == AHC_AIC7770 )
-    channel = (aic_inb(p, SBLKCTL) & SELBUSB) >> 3;
-  else
-    channel = 0;
-  tindex = target + (channel << 3);
-  lun = aic_inb(p, SAVED_TCL) & 0x07;
-  target_mask = (0x01 << tindex);
-
-  /*
-   * Go ahead and clear the SEQINT now, that avoids any interrupt race
-   * conditions later on in case we enable some other interrupt.
-   */
-  aic_outb(p, CLRSEQINT, CLRINT);
-  switch (intstat & SEQINT_MASK)
-  {
-    case NO_MATCH:
-      {
-        aic_outb(p, aic_inb(p, SCSISEQ) & (ENSELI|ENRSELI|ENAUTOATNP),
-                 SCSISEQ);
-        printk(WARN_LEAD "No active SCB for reconnecting target - Issuing "
-               "BUS DEVICE RESET.\n", p->host_no, channel, target, lun);
-        printk(WARN_LEAD "      SAVED_TCL=0x%x, ARG_1=0x%x, SEQADDR=0x%x\n",
-               p->host_no, channel, target, lun,
-               aic_inb(p, SAVED_TCL), aic_inb(p, ARG_1),
-               (aic_inb(p, SEQADDR1) << 8) | aic_inb(p, SEQADDR0));
-        if (aic7xxx_panic_on_abort)
-          aic7xxx_panic_abort(p, NULL);
-      }
-      break;
-
-    case SEND_REJECT:
-      {
-        if (aic7xxx_verbose & VERBOSE_MINOR_ERROR)
-          printk(INFO_LEAD "Rejecting unknown message (0x%x) received from "
-            "target, SEQ_FLAGS=0x%x\n", p->host_no, channel, target, lun,
-            aic_inb(p, ACCUM), aic_inb(p, SEQ_FLAGS));
-      }
-      break;
-
-    case NO_IDENT:
-      {
-        /*
-         * The reconnecting target either did not send an identify
-         * message, or did, but we didn't find an SCB to match and
-         * before it could respond to our ATN/abort, it hit a dataphase.
-         * The only safe thing to do is to blow it away with a bus
-         * reset.
-         */
-        if (aic7xxx_verbose & (VERBOSE_SEQINT | VERBOSE_RESET_MID))
-          printk(INFO_LEAD "Target did not send an IDENTIFY message; "
-            "LASTPHASE 0x%x, SAVED_TCL 0x%x\n", p->host_no, channel, target,
-            lun, aic_inb(p, LASTPHASE), aic_inb(p, SAVED_TCL));
-
-        aic7xxx_reset_channel(p, channel, /*initiate reset*/ TRUE);
-        aic7xxx_run_done_queue(p, TRUE);
-
-      }
-      break;
-
-    case BAD_PHASE:
-      if (aic_inb(p, LASTPHASE) == P_BUSFREE)
-      {
-        if (aic7xxx_verbose & VERBOSE_SEQINT)
-          printk(INFO_LEAD "Missed busfree.\n", p->host_no, channel,
-            target, lun);
-        restart_sequencer(p);
-      }
-      else
-      {
-        if (aic7xxx_verbose & VERBOSE_SEQINT)
-          printk(INFO_LEAD "Unknown scsi bus phase, continuing\n", p->host_no,
-            channel, target, lun);
-      }
-      break;
-
-    case EXTENDED_MSG:
-      {
-        p->msg_type = MSG_TYPE_INITIATOR_MSGIN;
-        p->msg_len = 0;
-        p->msg_index = 0;
-
-#ifdef AIC7XXX_VERBOSE_DEBUGGING
-        if (aic7xxx_verbose > 0xffff)
-          printk(INFO_LEAD "Enabling REQINITs for MSG_IN\n", p->host_no,
-                 channel, target, lun);
-#endif
-
-       /*      
-        * To actually receive the message, simply turn on
-        * REQINIT interrupts and let our interrupt handler
-        * do the rest (REQINIT should already be true).
-        */
-        p->flags |= AHC_HANDLING_REQINITS;
-        aic_outb(p, aic_inb(p, SIMODE1) | ENREQINIT, SIMODE1);
-
-       /*
-        * We don't want the sequencer unpaused yet so we return early
-        */
-        return;
-      }
-
-    case REJECT_MSG:
-      {
-        /*
-         * What we care about here is if we had an outstanding SDTR
-         * or WDTR message for this target. If we did, this is a
-         * signal that the target is refusing negotiation.
-         */
-        unsigned char scb_index;
-        unsigned char last_msg;
-
-        scb_index = aic_inb(p, SCB_TAG);
-        scb = p->scb_data->scb_array[scb_index];
-        aic_dev = AIC_DEV(scb->cmd);
-        last_msg = aic_inb(p, LAST_MSG);
-
-        if ( (last_msg == MSG_IDENTIFYFLAG) &&
-             (scb->tag_action) &&
-            !(scb->flags & SCB_MSGOUT_BITS) )
-        {
-          if (scb->tag_action == MSG_ORDERED_Q_TAG)
-          {
-            /*
-             * OK...the device seems able to accept tagged commands, but
-             * not ordered tag commands, only simple tag commands.  So, we
-             * disable ordered tag commands and go on with life just like
-             * normal.
-             */
-            scsi_adjust_queue_depth(scb->cmd->device, MSG_SIMPLE_TAG,
-                            scb->cmd->device->queue_depth);
-            scb->tag_action = MSG_SIMPLE_Q_TAG;
-            scb->hscb->control &= ~SCB_TAG_TYPE;
-            scb->hscb->control |= MSG_SIMPLE_Q_TAG;
-            aic_outb(p, scb->hscb->control, SCB_CONTROL);
-            /*
-             * OK..we set the tag type to simple tag command, now we re-assert
-             * ATNO and hope this will take us into the identify phase again
-             * so we can resend the tag type and info to the device.
-             */
-            aic_outb(p, MSG_IDENTIFYFLAG, MSG_OUT);
-            aic_outb(p, aic_inb(p, SCSISIGI) | ATNO, SCSISIGO);
-          }
-          else if (scb->tag_action == MSG_SIMPLE_Q_TAG)
-          {
-            unsigned char i;
-            struct aic7xxx_scb *scbp;
-            int old_verbose;
-            /*
-             * Hmmmm....the device is flaking out on tagged commands.
-             */
-            scsi_adjust_queue_depth(scb->cmd->device, 0 /* untagged */,
-                            p->host->cmd_per_lun);
-            aic_dev->max_q_depth = aic_dev->temp_q_depth = 1;
-            /*
-             * We set this command up as a bus device reset.  However, we have
-             * to clear the tag type as it's causing us problems.  We shouldn't
-             * have to worry about any other commands being active, since if
-             * the device is refusing tagged commands, this should be the
-             * first tagged command sent to the device, however, we do have
-             * to worry about any other tagged commands that may already be
-             * in the qinfifo.  The easiest way to do this, is to issue a BDR,
-             * send all the commands back to the mid level code, then let them
-             * come back and get rebuilt as untagged commands.
-             */
-            scb->tag_action = 0;
-            scb->hscb->control &= ~(TAG_ENB | SCB_TAG_TYPE);
-            aic_outb(p,  scb->hscb->control, SCB_CONTROL);
-
-            old_verbose = aic7xxx_verbose;
-            aic7xxx_verbose &= ~(VERBOSE_RESET|VERBOSE_ABORT);
-            for (i=0; i < p->scb_data->numscbs; i++)
-            {
-              scbp = p->scb_data->scb_array[i];
-              if ((scbp->flags & SCB_ACTIVE) && (scbp != scb))
-              {
-                if (aic7xxx_match_scb(p, scbp, target, channel, lun, i))
-                {
-                  aic7xxx_reset_device(p, target, channel, lun, i);
-                }
-              }
-            }
-            aic7xxx_run_done_queue(p, TRUE);
-            aic7xxx_verbose = old_verbose;
-            /*
-             * Wait until after the for loop to set the busy index since
-             * aic7xxx_reset_device will clear the busy index during its
-             * operation.
-             */
-            aic7xxx_busy_target(p, scb);
-            printk(INFO_LEAD "Device is refusing tagged commands, using "
-              "untagged I/O.\n", p->host_no, channel, target, lun);
-            aic_outb(p, MSG_IDENTIFYFLAG, MSG_OUT);
-            aic_outb(p, aic_inb(p, SCSISIGI) | ATNO, SCSISIGO);
-          }
-        }
-        else if (scb->flags & SCB_MSGOUT_PPR)
-        {
-          /*
-           * As per the draft specs, any device capable of supporting any of
-           * the option values other than 0 are not allowed to reject the
-           * PPR message.  Instead, they must negotiate out what they do
-           * support instead of rejecting our offering or else they cause
-           * a parity error during msg_out phase to signal that they don't
-           * like our settings.
-           */
-          aic_dev->needppr = aic_dev->needppr_copy = 0;
-          aic7xxx_set_width(p, target, channel, lun, MSG_EXT_WDTR_BUS_8_BIT,
-            (AHC_TRANS_ACTIVE|AHC_TRANS_CUR|AHC_TRANS_QUITE), aic_dev);
-          aic7xxx_set_syncrate(p, NULL, target, channel, 0, 0, 0,
-                               AHC_TRANS_ACTIVE|AHC_TRANS_CUR|AHC_TRANS_QUITE,
-                               aic_dev);
-          aic_dev->goal.options = aic_dev->dtr_pending = 0;
-          scb->flags &= ~SCB_MSGOUT_BITS;
-          if(aic7xxx_verbose & VERBOSE_NEGOTIATION2)
-          {
-            printk(INFO_LEAD "Device is rejecting PPR messages, falling "
-              "back.\n", p->host_no, channel, target, lun);
-          }
-          if ( aic_dev->goal.width )
-          {
-            aic_dev->needwdtr = aic_dev->needwdtr_copy = 1;
-            aic_dev->dtr_pending = 1;
-            scb->flags |= SCB_MSGOUT_WDTR;
-          }
-          if ( aic_dev->goal.offset )
-          {
-            aic_dev->needsdtr = aic_dev->needsdtr_copy = 1;
-            if( !aic_dev->dtr_pending )
-            {
-              aic_dev->dtr_pending = 1;
-              scb->flags |= SCB_MSGOUT_SDTR;
-            }
-          }
-          if ( aic_dev->dtr_pending )
-          {
-            aic_outb(p, HOST_MSG, MSG_OUT);
-            aic_outb(p, aic_inb(p, SCSISIGI) | ATNO, SCSISIGO);
-          }
-        }
-        else if (scb->flags & SCB_MSGOUT_WDTR)
-        {
-          /*
-           * note 8bit xfers and clear flag
-           */
-          aic_dev->needwdtr = aic_dev->needwdtr_copy = 0;
-          scb->flags &= ~SCB_MSGOUT_BITS;
-          aic7xxx_set_width(p, target, channel, lun, MSG_EXT_WDTR_BUS_8_BIT,
-            (AHC_TRANS_ACTIVE|AHC_TRANS_GOAL|AHC_TRANS_CUR), aic_dev);
-          aic7xxx_set_syncrate(p, NULL, target, channel, 0, 0, 0,
-                               AHC_TRANS_ACTIVE|AHC_TRANS_CUR|AHC_TRANS_QUITE,
-                               aic_dev);
-          if(aic7xxx_verbose & VERBOSE_NEGOTIATION2)
-          {
-            printk(INFO_LEAD "Device is rejecting WDTR messages, using "
-              "narrow transfers.\n", p->host_no, channel, target, lun);
-          }
-          aic_dev->needsdtr = aic_dev->needsdtr_copy;
-        }
-        else if (scb->flags & SCB_MSGOUT_SDTR)
-        {
-         /*
-          * note asynch xfers and clear flag
-          */
-          aic_dev->needsdtr = aic_dev->needsdtr_copy = 0;
-          scb->flags &= ~SCB_MSGOUT_BITS;
-          aic7xxx_set_syncrate(p, NULL, target, channel, 0, 0, 0,
-            (AHC_TRANS_CUR|AHC_TRANS_ACTIVE|AHC_TRANS_GOAL), aic_dev);
-          if(aic7xxx_verbose & VERBOSE_NEGOTIATION2)
-          {
-            printk(INFO_LEAD "Device is rejecting SDTR messages, using "
-              "async transfers.\n", p->host_no, channel, target, lun);
-          }
-        }
-        else if (aic7xxx_verbose & VERBOSE_SEQINT)
-        {
-          /*
-           * Otherwise, we ignore it.
-           */
-          printk(INFO_LEAD "Received MESSAGE_REJECT for unknown cause.  "
-            "Ignoring.\n", p->host_no, channel, target, lun);
-        }
-      }
-      break;
-
-    case BAD_STATUS:
-      {
-        unsigned char scb_index;
-        struct aic7xxx_hwscb *hscb;
-        struct scsi_cmnd *cmd;
-
-        /* The sequencer will notify us when a command has an error that
-         * would be of interest to the kernel.  This allows us to leave
-         * the sequencer running in the common case of command completes
-         * without error.  The sequencer will have DMA'd the SCB back
-         * up to us, so we can reference the drivers SCB array.
-         *
-         * Set the default return value to 0 indicating not to send
-         * sense.  The sense code will change this if needed and this
-         * reduces code duplication.
-         */
-        aic_outb(p, 0, RETURN_1);
-        scb_index = aic_inb(p, SCB_TAG);
-        if (scb_index > p->scb_data->numscbs)
-        {
-          printk(WARN_LEAD "Invalid SCB during SEQINT 0x%02x, SCB_TAG %d.\n",
-            p->host_no, channel, target, lun, intstat, scb_index);
-          break;
-        }
-        scb = p->scb_data->scb_array[scb_index];
-        hscb = scb->hscb;
-
-        if (!(scb->flags & SCB_ACTIVE) || (scb->cmd == NULL))
-        {
-          printk(WARN_LEAD "Invalid SCB during SEQINT 0x%x, scb %d, flags 0x%x,"
-            " cmd 0x%lx.\n", p->host_no, channel, target, lun, intstat,
-            scb_index, scb->flags, (unsigned long) scb->cmd);
-        }
-        else
-        {
-          cmd = scb->cmd;
-          aic_dev = AIC_DEV(scb->cmd);
-          hscb->target_status = aic_inb(p, SCB_TARGET_STATUS);
-          aic7xxx_status(cmd) = hscb->target_status;
-
-          cmd->result = hscb->target_status;
-
-          switch (status_byte(hscb->target_status))
-          {
-            case GOOD:
-              if (aic7xxx_verbose & VERBOSE_SEQINT)
-                printk(INFO_LEAD "Interrupted for status of GOOD???\n",
-                  p->host_no, CTL_OF_SCB(scb));
-              break;
-
-            case COMMAND_TERMINATED:
-            case CHECK_CONDITION:
-              if ( !(scb->flags & SCB_SENSE) )
-              {
-                /*
-                 * Send a sense command to the requesting target.
-                 * XXX - revisit this and get rid of the memcopys.
-                 */
-                memcpy(scb->sense_cmd, &generic_sense[0],
-                       sizeof(generic_sense));
-
-                scb->sense_cmd[1] = (cmd->device->lun << 5);
-                scb->sense_cmd[4] = SCSI_SENSE_BUFFERSIZE;
-
-                scb->sg_list[0].length = 
-                  cpu_to_le32(SCSI_SENSE_BUFFERSIZE);
-                scb->sg_list[0].address =
-                        cpu_to_le32(pci_map_single(p->pdev, cmd->sense_buffer,
-                                                   SCSI_SENSE_BUFFERSIZE,
-                                                   PCI_DMA_FROMDEVICE));
-
-                /*
-                 * XXX - We should allow disconnection, but can't as it
-                 * might allow overlapped tagged commands.
-                 */
-                /* hscb->control &= DISCENB; */
-                hscb->control = 0;
-                hscb->target_status = 0;
-                hscb->SG_list_pointer = 
-                  cpu_to_le32(SCB_DMA_ADDR(scb, scb->sg_list));
-                hscb->SCSI_cmd_pointer = 
-                  cpu_to_le32(SCB_DMA_ADDR(scb, scb->sense_cmd));
-                hscb->data_count = scb->sg_list[0].length;
-                hscb->data_pointer = scb->sg_list[0].address;
-                hscb->SCSI_cmd_length = COMMAND_SIZE(scb->sense_cmd[0]);
-                hscb->residual_SG_segment_count = 0;
-                hscb->residual_data_count[0] = 0;
-                hscb->residual_data_count[1] = 0;
-                hscb->residual_data_count[2] = 0;
-
-                scb->sg_count = hscb->SG_segment_count = 1;
-                scb->sg_length = SCSI_SENSE_BUFFERSIZE;
-                scb->tag_action = 0;
-                scb->flags |= SCB_SENSE;
-                /*
-                 * Ensure the target is busy since this will be an
-                 * an untagged request.
-                 */
-#ifdef AIC7XXX_VERBOSE_DEBUGGING
-                if (aic7xxx_verbose & VERBOSE_NEGOTIATION2)
-                {
-                  if (scb->flags & SCB_MSGOUT_BITS)
-                    printk(INFO_LEAD "Requesting SENSE with %s\n", p->host_no,
-                           CTL_OF_SCB(scb), (scb->flags & SCB_MSGOUT_SDTR) ?
-                           "SDTR" : "WDTR");
-                  else
-                    printk(INFO_LEAD "Requesting SENSE, no MSG\n", p->host_no,
-                           CTL_OF_SCB(scb));
-                }
-#endif
-                aic7xxx_busy_target(p, scb);
-                aic_outb(p, SEND_SENSE, RETURN_1);
-                aic7xxx_error(cmd) = DID_OK;
-                break;
-              }  /* first time sense, no errors */
-              printk(INFO_LEAD "CHECK_CONDITION on REQUEST_SENSE, returning "
-                     "an error.\n", p->host_no, CTL_OF_SCB(scb));
-              aic7xxx_error(cmd) = DID_ERROR;
-              scb->flags &= ~SCB_SENSE;
-              break;
-
-            case QUEUE_FULL:
-              queue_flag = TRUE;    /* Mark that this is a QUEUE_FULL and */
-            case BUSY:              /* drop through to here */
-            {
-              struct aic7xxx_scb *next_scbp, *prev_scbp;
-              unsigned char active_hscb, next_hscb, prev_hscb, scb_index;
-              /*
-               * We have to look three places for queued commands:
-               *  1: p->waiting_scbs queue
-               *  2: QINFIFO
-               *  3: WAITING_SCBS list on card (for commands that are started
-               *     but haven't yet made it to the device)
-               *
-               * Of special note here is that commands on 2 or 3 above will
-               * have already been marked as active, while commands on 1 will
-               * not.  The aic7xxx_done() function will want to unmark them
-               * from active, so any commands we pull off of 1 need to
-               * up the active count.
-               */
-              next_scbp = p->waiting_scbs.head;
-              while ( next_scbp != NULL )
-              {
-                prev_scbp = next_scbp;
-                next_scbp = next_scbp->q_next;
-                if ( aic7xxx_match_scb(p, prev_scbp, target, channel, lun,
-                     SCB_LIST_NULL) )
-                {
-                  scbq_remove(&p->waiting_scbs, prev_scbp);
-                  scb->flags = SCB_QUEUED_FOR_DONE | SCB_QUEUE_FULL;
-                  p->activescbs++;
-                  aic_dev->active_cmds++;
-                }
-              }
-              aic7xxx_search_qinfifo(p, target, channel, lun,
-                SCB_LIST_NULL, SCB_QUEUED_FOR_DONE | SCB_QUEUE_FULL,
-                FALSE, NULL);
-              next_scbp = NULL;
-              active_hscb = aic_inb(p, SCBPTR);
-              prev_hscb = next_hscb = scb_index = SCB_LIST_NULL;
-              next_hscb = aic_inb(p, WAITING_SCBH);
-              while (next_hscb != SCB_LIST_NULL)
-              {
-                aic_outb(p, next_hscb, SCBPTR);
-                scb_index = aic_inb(p, SCB_TAG);
-                if (scb_index < p->scb_data->numscbs)
-                {
-                  next_scbp = p->scb_data->scb_array[scb_index];
-                  if (aic7xxx_match_scb(p, next_scbp, target, channel, lun,
-                      SCB_LIST_NULL) )
-                  {
-                    next_scbp->flags = SCB_QUEUED_FOR_DONE | SCB_QUEUE_FULL;
-                    next_hscb = aic_inb(p, SCB_NEXT);
-                    aic_outb(p, 0, SCB_CONTROL);
-                    aic_outb(p, SCB_LIST_NULL, SCB_TAG);
-                    aic7xxx_add_curscb_to_free_list(p);
-                    if (prev_hscb == SCB_LIST_NULL)
-                    {
-                      /* We were first on the list,
-                       * so we kill the selection
-                       * hardware.  Let the sequencer
-                       * re-init the hardware itself
-                       */
-                      aic_outb(p, aic_inb(p, SCSISEQ) & ~ENSELO, SCSISEQ);
-                      aic_outb(p, CLRSELTIMEO, CLRSINT1);
-                      aic_outb(p, next_hscb, WAITING_SCBH);
-                    }
-                    else
-                    {
-                      aic_outb(p, prev_hscb, SCBPTR);
-                      aic_outb(p, next_hscb, SCB_NEXT);
-                    }
-                  }
-                  else
-                  {
-                    prev_hscb = next_hscb;
-                    next_hscb = aic_inb(p, SCB_NEXT);
-                  }
-                } /* scb_index >= p->scb_data->numscbs */
-              }
-              aic_outb(p, active_hscb, SCBPTR);
-              aic7xxx_run_done_queue(p, FALSE);
-                  
-#ifdef AIC7XXX_VERBOSE_DEBUGGING
-              if( (aic7xxx_verbose & VERBOSE_MINOR_ERROR) ||
-                  (aic7xxx_verbose > 0xffff) )
-              {
-                if (queue_flag)
-                  printk(INFO_LEAD "Queue full received; queue depth %d, "
-                    "active %d\n", p->host_no, CTL_OF_SCB(scb),
-                    aic_dev->max_q_depth, aic_dev->active_cmds);
-                else
-                  printk(INFO_LEAD "Target busy\n", p->host_no, CTL_OF_SCB(scb));
-              }
-#endif
-              if (queue_flag)
-              {
-                int diff;
-                result = scsi_track_queue_full(cmd->device,
-                                aic_dev->active_cmds);
-                if ( result < 0 )
-                {
-                  if (aic7xxx_verbose & VERBOSE_NEGOTIATION2)
-                    printk(INFO_LEAD "Tagged Command Queueing disabled.\n",
-                        p->host_no, CTL_OF_SCB(scb));
-                  diff = aic_dev->max_q_depth - p->host->cmd_per_lun;
-                  aic_dev->temp_q_depth = 1;
-                  aic_dev->max_q_depth = 1;
-                }
-                else if ( result > 0 )
-                {
-                  if (aic7xxx_verbose & VERBOSE_NEGOTIATION2)
-                    printk(INFO_LEAD "Queue depth reduced to %d\n", p->host_no,
-                      CTL_OF_SCB(scb), result);
-                  diff = aic_dev->max_q_depth - result;
-                  aic_dev->max_q_depth = result;
-                  /* temp_q_depth could have been dropped to 1 for an untagged
-                   * command that might be coming up */
-                  if(aic_dev->temp_q_depth > result)
-                    aic_dev->temp_q_depth = result;
-                }
-                /* We should free up the no unused SCB entries.  But, that's
-                 * a difficult thing to do because we use a direct indexed
-                 * array, so we can't just take any entries and free them,
-                 * we *have* to free the ones at the end of the array, and
-                 * they very well could be in use right now, which means
-                 * in order to do this right, we have to add a delayed
-                 * freeing mechanism tied into the scb_free() code area.
-                 * We'll add that later.
-                 */
-              }
-              break;
-            }
-            
-            default:
-              if (aic7xxx_verbose & VERBOSE_SEQINT)
-                printk(INFO_LEAD "Unexpected target status 0x%x.\n", p->host_no,
-                     CTL_OF_SCB(scb), scb->hscb->target_status);
-              if (!aic7xxx_error(cmd))
-              {
-                aic7xxx_error(cmd) = DID_RETRY_COMMAND;
-              }
-              break;
-          }  /* end switch */
-        }  /* end else of */
-      }
-      break;
-
-    case AWAITING_MSG:
-      {
-        unsigned char scb_index, msg_out;
-
-        scb_index = aic_inb(p, SCB_TAG);
-        msg_out = aic_inb(p, MSG_OUT);
-        scb = p->scb_data->scb_array[scb_index];
-        aic_dev = AIC_DEV(scb->cmd);
-        p->msg_index = p->msg_len = 0;
-        /*
-         * This SCB had a MK_MESSAGE set in its control byte informing
-         * the sequencer that we wanted to send a special message to
-         * this target.
-         */
-
-        if ( !(scb->flags & SCB_DEVICE_RESET) &&
-              (msg_out == MSG_IDENTIFYFLAG) &&
-              (scb->hscb->control & TAG_ENB) )
-        {
-          p->msg_buf[p->msg_index++] = scb->tag_action;
-          p->msg_buf[p->msg_index++] = scb->hscb->tag;
-          p->msg_len += 2;
-        }
-
-        if (scb->flags & SCB_DEVICE_RESET)
-        {
-          p->msg_buf[p->msg_index++] = MSG_BUS_DEV_RESET;
-          p->msg_len++;
-          if (aic7xxx_verbose & VERBOSE_RESET_PROCESS)
-            printk(INFO_LEAD "Bus device reset mailed.\n",
-                 p->host_no, CTL_OF_SCB(scb));
-        }
-        else if (scb->flags & SCB_ABORT)
-        {
-          if (scb->tag_action)
-          {
-            p->msg_buf[p->msg_index++] = MSG_ABORT_TAG;
-          }
-          else
-          {
-            p->msg_buf[p->msg_index++] = MSG_ABORT;
-          }
-          p->msg_len++;
-          if (aic7xxx_verbose & VERBOSE_ABORT_PROCESS)
-            printk(INFO_LEAD "Abort message mailed.\n", p->host_no,
-              CTL_OF_SCB(scb));
-        }
-        else if (scb->flags & SCB_MSGOUT_PPR)
-        {
-          if (aic7xxx_verbose & VERBOSE_NEGOTIATION2)
-          {
-            printk(INFO_LEAD "Sending PPR (%d/%d/%d/%d) message.\n",
-                   p->host_no, CTL_OF_SCB(scb),
-                   aic_dev->goal.period,
-                   aic_dev->goal.offset,
-                   aic_dev->goal.width,
-                   aic_dev->goal.options);
-          }
-          aic7xxx_construct_ppr(p, scb);
-        }
-        else if (scb->flags & SCB_MSGOUT_WDTR)
-        {
-          if (aic7xxx_verbose & VERBOSE_NEGOTIATION2)
-          {
-            printk(INFO_LEAD "Sending WDTR message.\n", p->host_no,
-                   CTL_OF_SCB(scb));
-          }
-          aic7xxx_construct_wdtr(p, aic_dev->goal.width);
-        }
-        else if (scb->flags & SCB_MSGOUT_SDTR)
-        {
-          unsigned int max_sync, period;
-          unsigned char options = 0;
-          /*
-           * Now that the device is selected, use the bits in SBLKCTL and
-           * SSTAT2 to determine the max sync rate for this device.
-           */
-          if (p->features & AHC_ULTRA2)
-          {
-            if ( (aic_inb(p, SBLKCTL) & ENAB40) &&
-                !(aic_inb(p, SSTAT2) & EXP_ACTIVE) )
-            {
-              max_sync = AHC_SYNCRATE_ULTRA2;
-            }
-            else
-            {
-              max_sync = AHC_SYNCRATE_ULTRA;
-            }
-          }
-          else if (p->features & AHC_ULTRA)
-          {
-            max_sync = AHC_SYNCRATE_ULTRA;
-          }
-          else
-          {
-            max_sync = AHC_SYNCRATE_FAST;
-          }
-          period = aic_dev->goal.period;
-          aic7xxx_find_syncrate(p, &period, max_sync, &options);
-          if (aic7xxx_verbose & VERBOSE_NEGOTIATION2)
-          {
-            printk(INFO_LEAD "Sending SDTR %d/%d message.\n", p->host_no,
-                   CTL_OF_SCB(scb), period,
-                   aic_dev->goal.offset);
-          }
-          aic7xxx_construct_sdtr(p, period, aic_dev->goal.offset);
-        }
-        else 
-        {
-          panic("aic7xxx: AWAITING_MSG for an SCB that does "
-                "not have a waiting message.\n");
-        }
-        /*
-         * We've set everything up to send our message, now to actually do
-         * so we need to enable reqinit interrupts and let the interrupt
-         * handler do the rest.  We don't want to unpause the sequencer yet
-         * though so we'll return early.  We also have to make sure that
-         * we clear the SEQINT *BEFORE* we set the REQINIT handler active
-         * or else it's possible on VLB cards to lose the first REQINIT
-         * interrupt.  Edge triggered EISA cards could also lose this
-         * interrupt, although PCI and level triggered cards should not
-         * have this problem since they continually interrupt the kernel
-         * until we take care of the situation.
-         */
-        scb->flags |= SCB_MSGOUT_SENT;
-        p->msg_index = 0;
-        p->msg_type = MSG_TYPE_INITIATOR_MSGOUT;
-        p->flags |= AHC_HANDLING_REQINITS;
-        aic_outb(p, aic_inb(p, SIMODE1) | ENREQINIT, SIMODE1);
-        return;
-      }
-      break;
-
-    case DATA_OVERRUN:
-      {
-        unsigned char scb_index = aic_inb(p, SCB_TAG);
-        unsigned char lastphase = aic_inb(p, LASTPHASE);
-        unsigned int i;
-
-        scb = (p->scb_data->scb_array[scb_index]);
-        /*
-         * XXX - What do we really want to do on an overrun?  The
-         *       mid-level SCSI code should handle this, but for now,
-         *       we'll just indicate that the command should retried.
-         *    If we retrieved sense info on this target, then the 
-         *    base SENSE info should have been saved prior to the
-         *    overrun error.  In that case, we return DID_OK and let
-         *    the mid level code pick up on the sense info.  Otherwise
-         *    we return DID_ERROR so the command will get retried.
-         */
-        if ( !(scb->flags & SCB_SENSE) )
-        {
-          printk(WARN_LEAD "Data overrun detected in %s phase, tag %d;\n",
-            p->host_no, CTL_OF_SCB(scb), 
-            (lastphase == P_DATAIN) ? "Data-In" : "Data-Out", scb->hscb->tag);
-          printk(KERN_WARNING "  %s seen Data Phase. Length=%d, NumSGs=%d.\n",
-            (aic_inb(p, SEQ_FLAGS) & DPHASE) ? "Have" : "Haven't",
-            scb->sg_length, scb->sg_count);
-          printk(KERN_WARNING "  Raw SCSI Command: 0x");
-          for (i = 0; i < scb->hscb->SCSI_cmd_length; i++)
-          {
-            printk("%02x ", scb->cmd->cmnd[i]);
-          }
-          printk("\n");
-          if(aic7xxx_verbose > 0xffff)
-          {
-            for (i = 0; i < scb->sg_count; i++)
-            {
-              printk(KERN_WARNING "     sg[%d] - Addr 0x%x : Length %d\n",
-                 i, 
-                 le32_to_cpu(scb->sg_list[i].address),
-                 le32_to_cpu(scb->sg_list[i].length) );
-            }
-          }
-          aic7xxx_error(scb->cmd) = DID_ERROR;
-        }
-        else
-          printk(INFO_LEAD "Data Overrun during SEND_SENSE operation.\n",
-            p->host_no, CTL_OF_SCB(scb));
-      }
-      break;
-
-    case WIDE_RESIDUE:
-      {
-        unsigned char resid_sgcnt, index;
-        unsigned char scb_index = aic_inb(p, SCB_TAG);
-        unsigned int cur_addr, resid_dcnt;
-        unsigned int native_addr, native_length, sg_addr;
-        int i;
-
-        if(scb_index > p->scb_data->numscbs)
-        {
-          printk(WARN_LEAD "invalid scb_index during WIDE_RESIDUE.\n",
-            p->host_no, -1, -1, -1);
-          /*
-           * XXX: Add error handling here
-           */
-          break;
-        }
-        scb = p->scb_data->scb_array[scb_index];
-        if(!(scb->flags & SCB_ACTIVE) || (scb->cmd == NULL))
-        {
-          printk(WARN_LEAD "invalid scb during WIDE_RESIDUE flags:0x%x "
-                 "scb->cmd:0x%lx\n", p->host_no, CTL_OF_SCB(scb),
-                 scb->flags, (unsigned long)scb->cmd);
-          break;
-        }
-        if(aic7xxx_verbose & VERBOSE_MINOR_ERROR)
-          printk(INFO_LEAD "Got WIDE_RESIDUE message, patching up data "
-                 "pointer.\n", p->host_no, CTL_OF_SCB(scb));
-
-        /*
-         * We have a valid scb to use on this WIDE_RESIDUE message, so
-         * we need to walk the sg list looking for this particular sg
-         * segment, then see if we happen to be at the very beginning of
-         * the segment.  If we are, then we have to back things up to
-         * the previous segment.  If not, then we simply need to remove
-         * one byte from this segments address and add one to the byte
-         * count.
-         */
-        cur_addr = aic_inb(p, SHADDR) | (aic_inb(p, SHADDR + 1) << 8) |
-          (aic_inb(p, SHADDR + 2) << 16) | (aic_inb(p, SHADDR + 3) << 24);
-        sg_addr = aic_inb(p, SG_COUNT + 1) | (aic_inb(p, SG_COUNT + 2) << 8) |
-          (aic_inb(p, SG_COUNT + 3) << 16) | (aic_inb(p, SG_COUNT + 4) << 24);
-        resid_sgcnt = aic_inb(p, SCB_RESID_SGCNT);
-        resid_dcnt = aic_inb(p, SCB_RESID_DCNT) |
-          (aic_inb(p, SCB_RESID_DCNT + 1) << 8) |
-          (aic_inb(p, SCB_RESID_DCNT + 2) << 16);
-        index = scb->sg_count - ((resid_sgcnt) ? resid_sgcnt : 1);
-        native_addr = le32_to_cpu(scb->sg_list[index].address);
-        native_length = le32_to_cpu(scb->sg_list[index].length);
-        /*
-         * If resid_dcnt == native_length, then we just loaded this SG
-         * segment and we need to back it up one...
-         */
-        if(resid_dcnt == native_length)
-        {
-          if(index == 0)
-          {
-            /*
-             * Oops, this isn't right, we can't back up to before the
-             * beginning.  This must be a bogus message, ignore it.
-             */
-            break;
-          }
-          resid_dcnt = 1;
-          resid_sgcnt += 1;
-          native_addr = le32_to_cpu(scb->sg_list[index - 1].address);
-          native_length = le32_to_cpu(scb->sg_list[index - 1].length);
-          cur_addr = native_addr + (native_length - 1);
-          sg_addr -= sizeof(struct hw_scatterlist);
-        }
-        else
-        {
-          /*
-           * resid_dcnt != native_length, so we are in the middle of a SG
-           * element.  Back it up one byte and leave the rest alone.
-           */
-          resid_dcnt += 1;
-          cur_addr -= 1;
-        }
-        
-        /*
-         * Output the new addresses and counts to the right places on the
-         * card.
-         */
-        aic_outb(p, resid_sgcnt, SG_COUNT);
-        aic_outb(p, resid_sgcnt, SCB_RESID_SGCNT);
-        aic_outb(p, sg_addr & 0xff, SG_COUNT + 1);
-        aic_outb(p, (sg_addr >> 8) & 0xff, SG_COUNT + 2);
-        aic_outb(p, (sg_addr >> 16) & 0xff, SG_COUNT + 3);
-        aic_outb(p, (sg_addr >> 24) & 0xff, SG_COUNT + 4);
-        aic_outb(p, resid_dcnt & 0xff, SCB_RESID_DCNT);
-        aic_outb(p, (resid_dcnt >> 8) & 0xff, SCB_RESID_DCNT + 1);
-        aic_outb(p, (resid_dcnt >> 16) & 0xff, SCB_RESID_DCNT + 2);
-
-        /*
-         * The sequencer actually wants to find the new address
-         * in the SHADDR register set.  On the Ultra2 and later controllers
-         * this register set is readonly.  In order to get the right number
-         * into the register, you actually have to enter it in HADDR and then
-         * use the PRELOADEN bit of DFCNTRL to drop it through from the
-         * HADDR register to the SHADDR register.  On non-Ultra2 controllers,
-         * we simply write it direct.
-         */
-        if(p->features & AHC_ULTRA2)
-        {
-          /*
-           * We might as well be accurate and drop both the resid_dcnt and
-           * cur_addr into HCNT and HADDR and have both of them drop
-           * through to the shadow layer together.
-           */
-          aic_outb(p, resid_dcnt & 0xff, HCNT);
-          aic_outb(p, (resid_dcnt >> 8) & 0xff, HCNT + 1);
-          aic_outb(p, (resid_dcnt >> 16) & 0xff, HCNT + 2);
-          aic_outb(p, cur_addr & 0xff, HADDR);
-          aic_outb(p, (cur_addr >> 8) & 0xff, HADDR + 1);
-          aic_outb(p, (cur_addr >> 16) & 0xff, HADDR + 2);
-          aic_outb(p, (cur_addr >> 24) & 0xff, HADDR + 3);
-          aic_outb(p, aic_inb(p, DMAPARAMS) | PRELOADEN, DFCNTRL);
-          udelay(1);
-          aic_outb(p, aic_inb(p, DMAPARAMS) & ~(SCSIEN|HDMAEN), DFCNTRL);
-          i=0;
-          while(((aic_inb(p, DFCNTRL) & (SCSIEN|HDMAEN)) != 0) && (i++ < 1000))
-          {
-            udelay(1);
-          }
-        }
-        else
-        {
-          aic_outb(p, cur_addr & 0xff, SHADDR);
-          aic_outb(p, (cur_addr >> 8) & 0xff, SHADDR + 1);
-          aic_outb(p, (cur_addr >> 16) & 0xff, SHADDR + 2);
-          aic_outb(p, (cur_addr >> 24) & 0xff, SHADDR + 3);
-        }
-      }
-      break;
-
-    case SEQ_SG_FIXUP:
-    {
-      unsigned char scb_index, tmp;
-      int sg_addr, sg_length;
-
-      scb_index = aic_inb(p, SCB_TAG);
-
-      if(scb_index > p->scb_data->numscbs)
-      {
-        printk(WARN_LEAD "invalid scb_index during SEQ_SG_FIXUP.\n",
-          p->host_no, -1, -1, -1);
-        printk(INFO_LEAD "SCSISIGI 0x%x, SEQADDR 0x%x, SSTAT0 0x%x, SSTAT1 "
-           "0x%x\n", p->host_no, -1, -1, -1,
-           aic_inb(p, SCSISIGI),
-           aic_inb(p, SEQADDR0) | (aic_inb(p, SEQADDR1) << 8),
-           aic_inb(p, SSTAT0), aic_inb(p, SSTAT1));
-        printk(INFO_LEAD "SG_CACHEPTR 0x%x, SSTAT2 0x%x, STCNT 0x%x\n",
-           p->host_no, -1, -1, -1, aic_inb(p, SG_CACHEPTR),
-           aic_inb(p, SSTAT2), aic_inb(p, STCNT + 2) << 16 |
-           aic_inb(p, STCNT + 1) << 8 | aic_inb(p, STCNT));
-        /*
-         * XXX: Add error handling here
-         */
-        break;
-      }
-      scb = p->scb_data->scb_array[scb_index];
-      if(!(scb->flags & SCB_ACTIVE) || (scb->cmd == NULL))
-      {
-        printk(WARN_LEAD "invalid scb during SEQ_SG_FIXUP flags:0x%x "
-               "scb->cmd:0x%p\n", p->host_no, CTL_OF_SCB(scb),
-               scb->flags, scb->cmd);
-        printk(INFO_LEAD "SCSISIGI 0x%x, SEQADDR 0x%x, SSTAT0 0x%x, SSTAT1 "
-           "0x%x\n", p->host_no, CTL_OF_SCB(scb),
-           aic_inb(p, SCSISIGI),
-           aic_inb(p, SEQADDR0) | (aic_inb(p, SEQADDR1) << 8),
-           aic_inb(p, SSTAT0), aic_inb(p, SSTAT1));
-        printk(INFO_LEAD "SG_CACHEPTR 0x%x, SSTAT2 0x%x, STCNT 0x%x\n",
-           p->host_no, CTL_OF_SCB(scb), aic_inb(p, SG_CACHEPTR),
-           aic_inb(p, SSTAT2), aic_inb(p, STCNT + 2) << 16 |
-           aic_inb(p, STCNT + 1) << 8 | aic_inb(p, STCNT));
-        break;
-      }
-      if(aic7xxx_verbose & VERBOSE_MINOR_ERROR)
-        printk(INFO_LEAD "Fixing up SG address for sequencer.\n", p->host_no,
-               CTL_OF_SCB(scb));
-      /*
-       * Advance the SG pointer to the next element in the list
-       */
-      tmp = aic_inb(p, SG_NEXT);
-      tmp += SG_SIZEOF;
-      aic_outb(p, tmp, SG_NEXT);
-      if( tmp < SG_SIZEOF )
-        aic_outb(p, aic_inb(p, SG_NEXT + 1) + 1, SG_NEXT + 1);
-      tmp = aic_inb(p, SG_COUNT) - 1;
-      aic_outb(p, tmp, SG_COUNT);
-      sg_addr = le32_to_cpu(scb->sg_list[scb->sg_count - tmp].address);
-      sg_length = le32_to_cpu(scb->sg_list[scb->sg_count - tmp].length);
-      /*
-       * Now stuff the element we just advanced past down onto the
-       * card so it can be stored in the residual area.
-       */
-      aic_outb(p, sg_addr & 0xff, HADDR);
-      aic_outb(p, (sg_addr >> 8) & 0xff, HADDR + 1);
-      aic_outb(p, (sg_addr >> 16) & 0xff, HADDR + 2);
-      aic_outb(p, (sg_addr >> 24) & 0xff, HADDR + 3);
-      aic_outb(p, sg_length & 0xff, HCNT);
-      aic_outb(p, (sg_length >> 8) & 0xff, HCNT + 1);
-      aic_outb(p, (sg_length >> 16) & 0xff, HCNT + 2);
-      aic_outb(p, (tmp << 2) | ((tmp == 1) ? LAST_SEG : 0), SG_CACHEPTR);
-      aic_outb(p, aic_inb(p, DMAPARAMS), DFCNTRL);
-      while(aic_inb(p, SSTAT0) & SDONE) udelay(1);
-      while(aic_inb(p, DFCNTRL) & (HDMAEN|SCSIEN)) aic_outb(p, 0, DFCNTRL);
-    }
-    break;
-
-#ifdef AIC7XXX_NOT_YET 
-    case TRACEPOINT2:
-      {
-        printk(INFO_LEAD "Tracepoint #2 reached.\n", p->host_no,
-               channel, target, lun);
-      }
-      break;
-
-    /* XXX Fill these in later */
-    case MSG_BUFFER_BUSY:
-      printk("aic7xxx: Message buffer busy.\n");
-      break;
-    case MSGIN_PHASEMIS:
-      printk("aic7xxx: Message-in phasemis.\n");
-      break;
-#endif
-
-    default:                   /* unknown */
-      printk(WARN_LEAD "Unknown SEQINT, INTSTAT 0x%x, SCSISIGI 0x%x.\n",
-             p->host_no, channel, target, lun, intstat,
-             aic_inb(p, SCSISIGI));
-      break;
-  }
-
-  /*
-   * Clear the sequencer interrupt and unpause the sequencer.
-   */
-  unpause_sequencer(p, /* unpause always */ TRUE);
-}
-
-/*+F*************************************************************************
- * Function:
- *   aic7xxx_parse_msg
- *
- * Description:
- *   Parses incoming messages into actions on behalf of
- *   aic7xxx_handle_reqinit
- *_F*************************************************************************/
-static int
-aic7xxx_parse_msg(struct aic7xxx_host *p, struct aic7xxx_scb *scb)
-{
-  int reject, reply, done;
-  unsigned char target_scsirate, tindex;
-  unsigned short target_mask;
-  unsigned char target, channel, lun;
-  unsigned char bus_width, new_bus_width;
-  unsigned char trans_options, new_trans_options;
-  unsigned int period, new_period, offset, new_offset, maxsync;
-  struct aic7xxx_syncrate *syncrate;
-  struct aic_dev_data *aic_dev;
-
-  target = scb->cmd->device->id;
-  channel = scb->cmd->device->channel;
-  lun = scb->cmd->device->lun;
-  reply = reject = done = FALSE;
-  tindex = TARGET_INDEX(scb->cmd);
-  aic_dev = AIC_DEV(scb->cmd);
-  target_scsirate = aic_inb(p, TARG_SCSIRATE + tindex);
-  target_mask = (0x01 << tindex);
-
-  /*
-   * Parse as much of the message as is available,
-   * rejecting it if we don't support it.  When
-   * the entire message is available and has been
-   * handled, return TRUE indicating that we have
-   * parsed an entire message.
-   */
-
-  if (p->msg_buf[0] != MSG_EXTENDED)
-  {
-    reject = TRUE;
-  }
-
-  /*
-   * Even if we are an Ultra3 card, don't allow Ultra3 sync rates when
-   * using the SDTR messages.  We need the PPR messages to enable the
-   * higher speeds that include things like Dual Edge clocking.
-   */
-  if (p->features & AHC_ULTRA2)
-  {
-    if ( (aic_inb(p, SBLKCTL) & ENAB40) &&
-         !(aic_inb(p, SSTAT2) & EXP_ACTIVE) )
-    {
-      if (p->features & AHC_ULTRA3)
-        maxsync = AHC_SYNCRATE_ULTRA3;
-      else
-        maxsync = AHC_SYNCRATE_ULTRA2;
-    }
-    else
-    {
-      maxsync = AHC_SYNCRATE_ULTRA;
-    }
-  }
-  else if (p->features & AHC_ULTRA)
-  {
-    maxsync = AHC_SYNCRATE_ULTRA;
-  }
-  else
-  {
-    maxsync = AHC_SYNCRATE_FAST;
-  }
-
-  /*
-   * Just accept the length byte outright and perform
-   * more checking once we know the message type.
-   */
-
-  if ( !reject && (p->msg_len > 2) )
-  {
-    switch(p->msg_buf[2])
-    {
-      case MSG_EXT_SDTR:
-      {
-        
-        if (p->msg_buf[1] != MSG_EXT_SDTR_LEN)
-        {
-          reject = TRUE;
-          break;
-        }
-
-        if (p->msg_len < (MSG_EXT_SDTR_LEN + 2))
-        {
-          break;
-        }
-
-        period = new_period = p->msg_buf[3];
-        offset = new_offset = p->msg_buf[4];
-        trans_options = new_trans_options = 0;
-        bus_width = new_bus_width = target_scsirate & WIDEXFER;
-
-        /*
-         * If our current max syncrate is in the Ultra3 range, bump it back
-         * down to Ultra2 since we can't negotiate DT transfers using SDTR
-         */
-        if(maxsync == AHC_SYNCRATE_ULTRA3)
-          maxsync = AHC_SYNCRATE_ULTRA2;
-
-        /*
-         * We might have a device that is starting negotiation with us
-         * before we can start up negotiation with it....be prepared to
-         * have a device ask for a higher speed then we want to give it
-         * in that case
-         */
-        if ( (scb->flags & (SCB_MSGOUT_SENT|SCB_MSGOUT_SDTR)) !=
-             (SCB_MSGOUT_SENT|SCB_MSGOUT_SDTR) )
-        {
-          if (!(aic_dev->flags & DEVICE_DTR_SCANNED))
-          {
-            /*
-             * We shouldn't get here unless this is a narrow drive, wide
-             * devices should trigger this same section of code in the WDTR
-             * handler first instead.
-             */
-            aic_dev->goal.width = MSG_EXT_WDTR_BUS_8_BIT;
-            aic_dev->goal.options = 0;
-            if(p->user[tindex].offset)
-            {
-              aic_dev->needsdtr_copy = 1;
-              aic_dev->goal.period = max_t(unsigned char, 10,p->user[tindex].period);
-              if(p->features & AHC_ULTRA2)
-              {
-                aic_dev->goal.offset = MAX_OFFSET_ULTRA2;
-              }
-              else
-              {
-                aic_dev->goal.offset = MAX_OFFSET_8BIT;
-              }
-            }
-            else
-            {
-              aic_dev->needsdtr_copy = 0;
-              aic_dev->goal.period = 255;
-              aic_dev->goal.offset = 0;
-            }
-            aic_dev->flags |= DEVICE_DTR_SCANNED | DEVICE_PRINT_DTR;
-          }
-          else if (aic_dev->needsdtr_copy == 0)
-          {
-            /*
-             * This is a preemptive message from the target, we've already
-             * scanned this target and set our options for it, and we
-             * don't need a SDTR with this target (for whatever reason),
-             * so reject this incoming SDTR
-             */
-            reject = TRUE;
-            break;
-          }
-
-          /* The device is sending this message first and we have to reply */
-          reply = TRUE;
-          
-          if (aic7xxx_verbose & VERBOSE_NEGOTIATION2)
-          {
-            printk(INFO_LEAD "Received pre-emptive SDTR message from "
-                   "target.\n", p->host_no, CTL_OF_SCB(scb));
-          }
-          /*
-           * Validate the values the device passed to us against our SEEPROM
-           * settings.  We don't have to do this if we aren't replying since
-           * the device isn't allowed to send values greater than the ones
-           * we first sent to it.
-           */
-          new_period = max_t(unsigned int, period, aic_dev->goal.period);
-          new_offset = min_t(unsigned int, offset, aic_dev->goal.offset);
-        }
- 
-        /*
-         * Use our new_period, new_offset, bus_width, and card options
-         * to determine the actual syncrate settings
-         */
-        syncrate = aic7xxx_find_syncrate(p, &new_period, maxsync,
-                                         &trans_options);
-        aic7xxx_validate_offset(p, syncrate, &new_offset, bus_width);
-
-        /*
-         * Did we drop to async?  If so, send a reply regardless of whether
-         * or not we initiated this negotiation.
-         */
-        if ((new_offset == 0) && (new_offset != offset))
-        {
-          aic_dev->needsdtr_copy = 0;
-          reply = TRUE;
-        }
-        
-        /*
-         * Did we start this, if not, or if we went too low and had to
-         * go async, then send an SDTR back to the target
-         */
-        if(reply)
-        {
-          /* when sending a reply, make sure that the goal settings are
-           * updated along with current and active since the code that
-           * will actually build the message for the sequencer uses the
-           * goal settings as its guidelines.
-           */
-          aic7xxx_set_syncrate(p, syncrate, target, channel, new_period,
-                               new_offset, trans_options,
-                               AHC_TRANS_GOAL|AHC_TRANS_ACTIVE|AHC_TRANS_CUR,
-                               aic_dev);
-          scb->flags &= ~SCB_MSGOUT_BITS;
-          scb->flags |= SCB_MSGOUT_SDTR;
-          aic_outb(p, HOST_MSG, MSG_OUT);
-          aic_outb(p, aic_inb(p, SCSISIGO) | ATNO, SCSISIGO);
-        }
-        else
-        {
-          aic7xxx_set_syncrate(p, syncrate, target, channel, new_period,
-                               new_offset, trans_options,
-                               AHC_TRANS_ACTIVE|AHC_TRANS_CUR, aic_dev);
-          aic_dev->needsdtr = 0;
-        }
-        done = TRUE;
-        break;
-      }
-      case MSG_EXT_WDTR:
-      {
-          
-        if (p->msg_buf[1] != MSG_EXT_WDTR_LEN)
-        {
-          reject = TRUE;
-          break;
-        }
-
-        if (p->msg_len < (MSG_EXT_WDTR_LEN + 2))
-        {
-          break;
-        }
-
-        bus_width = new_bus_width = p->msg_buf[3];
-
-        if ( (scb->flags & (SCB_MSGOUT_SENT|SCB_MSGOUT_WDTR)) ==
-             (SCB_MSGOUT_SENT|SCB_MSGOUT_WDTR) )
-        {
-          switch(bus_width)
-          {
-            default:
-            {
-              reject = TRUE;
-              if ( (aic7xxx_verbose & VERBOSE_NEGOTIATION2) &&
-                   ((aic_dev->flags & DEVICE_PRINT_DTR) ||
-                    (aic7xxx_verbose > 0xffff)) )
-              {
-                printk(INFO_LEAD "Requesting %d bit transfers, rejecting.\n",
-                  p->host_no, CTL_OF_SCB(scb), 8 * (0x01 << bus_width));
-              }
-            } /* We fall through on purpose */
-            case MSG_EXT_WDTR_BUS_8_BIT:
-            {
-              aic_dev->goal.width = MSG_EXT_WDTR_BUS_8_BIT;
-              aic_dev->needwdtr_copy &= ~target_mask;
-              break;
-            }
-            case MSG_EXT_WDTR_BUS_16_BIT:
-            {
-              break;
-            }
-          }
-          aic_dev->needwdtr = 0;
-          aic7xxx_set_width(p, target, channel, lun, new_bus_width,
-                            AHC_TRANS_ACTIVE|AHC_TRANS_CUR, aic_dev);
-        }
-        else
-        {
-          if ( !(aic_dev->flags & DEVICE_DTR_SCANNED) )
-          {
-            /* 
-             * Well, we now know the WDTR and SYNC caps of this device since
-             * it contacted us first, mark it as such and copy the user stuff
-             * over to the goal stuff.
-             */
-            if( (p->features & AHC_WIDE) && p->user[tindex].width )
-            {
-              aic_dev->goal.width = MSG_EXT_WDTR_BUS_16_BIT;
-              aic_dev->needwdtr_copy = 1;
-            }
-            
-            /*
-             * Devices that support DT transfers don't start WDTR requests
-             */
-            aic_dev->goal.options = 0;
-
-            if(p->user[tindex].offset)
-            {
-              aic_dev->needsdtr_copy = 1;
-              aic_dev->goal.period = max_t(unsigned char, 10, p->user[tindex].period);
-              if(p->features & AHC_ULTRA2)
-              {
-                aic_dev->goal.offset = MAX_OFFSET_ULTRA2;
-              }
-              else if( aic_dev->goal.width )
-              {
-                aic_dev->goal.offset = MAX_OFFSET_16BIT;
-              }
-              else
-              {
-                aic_dev->goal.offset = MAX_OFFSET_8BIT;
-              }
-            } else {
-              aic_dev->needsdtr_copy = 0;
-              aic_dev->goal.period = 255;
-              aic_dev->goal.offset = 0;
-            }
-            
-            aic_dev->flags |= DEVICE_DTR_SCANNED | DEVICE_PRINT_DTR;
-          }
-          else if (aic_dev->needwdtr_copy == 0)
-          {
-            /*
-             * This is a preemptive message from the target, we've already
-             * scanned this target and set our options for it, and we
-             * don't need a WDTR with this target (for whatever reason),
-             * so reject this incoming WDTR
-             */
-            reject = TRUE;
-            break;
-          }
-
-          /* The device is sending this message first and we have to reply */
-          reply = TRUE;
-
-          if (aic7xxx_verbose & VERBOSE_NEGOTIATION2)
-          {
-            printk(INFO_LEAD "Received pre-emptive WDTR message from "
-                   "target.\n", p->host_no, CTL_OF_SCB(scb));
-          }
-          switch(bus_width)
-          {
-            case MSG_EXT_WDTR_BUS_16_BIT:
-            {
-              if ( (p->features & AHC_WIDE) &&
-                   (aic_dev->goal.width == MSG_EXT_WDTR_BUS_16_BIT) )
-              {
-                new_bus_width = MSG_EXT_WDTR_BUS_16_BIT;
-                break;
-              }
-            } /* Fall through if we aren't a wide card */
-            default:
-            case MSG_EXT_WDTR_BUS_8_BIT:
-            {
-              aic_dev->needwdtr_copy = 0;
-              new_bus_width = MSG_EXT_WDTR_BUS_8_BIT;
-              break;
-            }
-          }
-          scb->flags &= ~SCB_MSGOUT_BITS;
-          scb->flags |= SCB_MSGOUT_WDTR;
-          aic_dev->needwdtr = 0;
-          if(aic_dev->dtr_pending == 0)
-          {
-            /* there is no other command with SCB_DTR_SCB already set that will
-             * trigger the release of the dtr_pending bit.  Both set the bit
-             * and set scb->flags |= SCB_DTR_SCB
-             */
-            aic_dev->dtr_pending = 1;
-            scb->flags |= SCB_DTR_SCB;
-          }
-          aic_outb(p, HOST_MSG, MSG_OUT);
-          aic_outb(p, aic_inb(p, SCSISIGO) | ATNO, SCSISIGO);
-          /* when sending a reply, make sure that the goal settings are
-           * updated along with current and active since the code that
-           * will actually build the message for the sequencer uses the
-           * goal settings as its guidelines.
-           */
-          aic7xxx_set_width(p, target, channel, lun, new_bus_width,
-                          AHC_TRANS_GOAL|AHC_TRANS_ACTIVE|AHC_TRANS_CUR,
-                          aic_dev);
-        }
-        
-        /*
-         * By virtue of the SCSI spec, a WDTR message negates any existing
-         * SDTR negotiations.  So, even if needsdtr isn't marked for this
-         * device, we still have to do a new SDTR message if the device
-         * supports SDTR at all.  Therefore, we check needsdtr_copy instead
-         * of needstr.
-         */
-        aic7xxx_set_syncrate(p, NULL, target, channel, 0, 0, 0,
-                             AHC_TRANS_ACTIVE|AHC_TRANS_CUR|AHC_TRANS_QUITE,
-                             aic_dev);
-        aic_dev->needsdtr = aic_dev->needsdtr_copy;
-        done = TRUE;
-        break;
-      }
-      case MSG_EXT_PPR:
-      {
-        
-        if (p->msg_buf[1] != MSG_EXT_PPR_LEN)
-        {
-          reject = TRUE;
-          break;
-        }
-
-        if (p->msg_len < (MSG_EXT_PPR_LEN + 2))
-        {
-          break;
-        }
-
-        period = new_period = p->msg_buf[3];
-        offset = new_offset = p->msg_buf[5];
-        bus_width = new_bus_width = p->msg_buf[6];
-        trans_options = new_trans_options = p->msg_buf[7] & 0xf;
-
-        if(aic7xxx_verbose & VERBOSE_NEGOTIATION2)
-        {
-          printk(INFO_LEAD "Parsing PPR message (%d/%d/%d/%d)\n",
-                 p->host_no, CTL_OF_SCB(scb), period, offset, bus_width,
-                 trans_options);
-        }
-
-        /*
-         * We might have a device that is starting negotiation with us
-         * before we can start up negotiation with it....be prepared to
-         * have a device ask for a higher speed then we want to give it
-         * in that case
-         */
-        if ( (scb->flags & (SCB_MSGOUT_SENT|SCB_MSGOUT_PPR)) !=
-             (SCB_MSGOUT_SENT|SCB_MSGOUT_PPR) )
-        { 
-          /* Have we scanned the device yet? */
-          if (!(aic_dev->flags & DEVICE_DTR_SCANNED))
-          {
-            /* The device is electing to use PPR messages, so we will too until
-             * we know better */
-            aic_dev->needppr = aic_dev->needppr_copy = 1;
-            aic_dev->needsdtr = aic_dev->needsdtr_copy = 0;
-            aic_dev->needwdtr = aic_dev->needwdtr_copy = 0;
-          
-            /* We know the device is SCSI-3 compliant due to PPR */
-            aic_dev->flags |= DEVICE_SCSI_3;
-          
-            /*
-             * Not only is the device starting this up, but it also hasn't
-             * been scanned yet, so this would likely be our TUR or our
-             * INQUIRY command at scan time, so we need to use the
-             * settings from the SEEPROM if they existed.  Of course, even
-             * if we didn't find a SEEPROM, we stuffed default values into
-             * the user settings anyway, so use those in all cases.
-             */
-            aic_dev->goal.width = p->user[tindex].width;
-            if(p->user[tindex].offset)
-            {
-              aic_dev->goal.period = p->user[tindex].period;
-              aic_dev->goal.options = p->user[tindex].options;
-              if(p->features & AHC_ULTRA2)
-              {
-                aic_dev->goal.offset = MAX_OFFSET_ULTRA2;
-              }
-              else if( aic_dev->goal.width &&
-                       (bus_width == MSG_EXT_WDTR_BUS_16_BIT) &&
-                       p->features & AHC_WIDE )
-              {
-                aic_dev->goal.offset = MAX_OFFSET_16BIT;
-              }
-              else
-              {
-                aic_dev->goal.offset = MAX_OFFSET_8BIT;
-              }
-            }
-            else
-            {
-              aic_dev->goal.period = 255;
-              aic_dev->goal.offset = 0;
-              aic_dev->goal.options = 0;
-            }
-            aic_dev->flags |= DEVICE_DTR_SCANNED | DEVICE_PRINT_DTR;
-          }
-          else if (aic_dev->needppr_copy == 0)
-          {
-            /*
-             * This is a preemptive message from the target, we've already
-             * scanned this target and set our options for it, and we
-             * don't need a PPR with this target (for whatever reason),
-             * so reject this incoming PPR
-             */
-            reject = TRUE;
-            break;
-          }
-
-          /* The device is sending this message first and we have to reply */
-          reply = TRUE;
-          
-          if (aic7xxx_verbose & VERBOSE_NEGOTIATION2)
-          {
-            printk(INFO_LEAD "Received pre-emptive PPR message from "
-                   "target.\n", p->host_no, CTL_OF_SCB(scb));
-          }
-
-        }
-
-        switch(bus_width)
-        {
-          case MSG_EXT_WDTR_BUS_16_BIT:
-          {
-            if ( (aic_dev->goal.width == MSG_EXT_WDTR_BUS_16_BIT) &&
-                            p->features & AHC_WIDE)
-            {
-              break;
-            }
-          }
-          default:
-          {
-            if ( (aic7xxx_verbose & VERBOSE_NEGOTIATION2) &&
-                 ((aic_dev->flags & DEVICE_PRINT_DTR) ||
-                  (aic7xxx_verbose > 0xffff)) )
-            {
-              reply = TRUE;
-              printk(INFO_LEAD "Requesting %d bit transfers, rejecting.\n",
-                p->host_no, CTL_OF_SCB(scb), 8 * (0x01 << bus_width));
-            }
-          } /* We fall through on purpose */
-          case MSG_EXT_WDTR_BUS_8_BIT:
-          {
-            /*
-             * According to the spec, if we aren't wide, we also can't be
-             * Dual Edge so clear the options byte
-             */
-            new_trans_options = 0;
-            new_bus_width = MSG_EXT_WDTR_BUS_8_BIT;
-            break;
-          }
-        }
-
-        if(reply)
-        {
-          /* when sending a reply, make sure that the goal settings are
-           * updated along with current and active since the code that
-           * will actually build the message for the sequencer uses the
-           * goal settings as its guidelines.
-           */
-          aic7xxx_set_width(p, target, channel, lun, new_bus_width,
-                            AHC_TRANS_GOAL|AHC_TRANS_ACTIVE|AHC_TRANS_CUR,
-                            aic_dev);
-          syncrate = aic7xxx_find_syncrate(p, &new_period, maxsync,
-                                           &new_trans_options);
-          aic7xxx_validate_offset(p, syncrate, &new_offset, new_bus_width);
-          aic7xxx_set_syncrate(p, syncrate, target, channel, new_period,
-                               new_offset, new_trans_options,
-                               AHC_TRANS_GOAL|AHC_TRANS_ACTIVE|AHC_TRANS_CUR,
-                               aic_dev);
-        }
-        else
-        {
-          aic7xxx_set_width(p, target, channel, lun, new_bus_width,
-                            AHC_TRANS_ACTIVE|AHC_TRANS_CUR, aic_dev);
-          syncrate = aic7xxx_find_syncrate(p, &new_period, maxsync,
-                                           &new_trans_options);
-          aic7xxx_validate_offset(p, syncrate, &new_offset, new_bus_width);
-          aic7xxx_set_syncrate(p, syncrate, target, channel, new_period,
-                               new_offset, new_trans_options,
-                               AHC_TRANS_ACTIVE|AHC_TRANS_CUR, aic_dev);
-        }
-
-        /*
-         * As it turns out, if we don't *have* to have PPR messages, then
-         * configure ourselves not to use them since that makes some
-         * external drive chassis work (those chassis can't parse PPR
-         * messages and they mangle the SCSI bus until you send a WDTR
-         * and SDTR that they can understand).
-         */
-        if(new_trans_options == 0)
-        {
-          aic_dev->needppr = aic_dev->needppr_copy = 0;
-          if(new_offset)
-          {
-            aic_dev->needsdtr = aic_dev->needsdtr_copy = 1;
-          }
-          if (new_bus_width)
-          {
-            aic_dev->needwdtr = aic_dev->needwdtr_copy = 1;
-          }
-        }
-
-        if((new_offset == 0) && (offset != 0))
-        {
-          /*
-           * Oops, the syncrate went to low for this card and we fell off
-           * to async (should never happen with a device that uses PPR
-           * messages, but have to be complete)
-           */
-          reply = TRUE;
-        }
-
-        if(reply)
-        {
-          scb->flags &= ~SCB_MSGOUT_BITS;
-          scb->flags |= SCB_MSGOUT_PPR;
-          aic_outb(p, HOST_MSG, MSG_OUT);
-          aic_outb(p, aic_inb(p, SCSISIGO) | ATNO, SCSISIGO);
-        }
-        else
-        {
-          aic_dev->needppr = 0;
-        }
-        done = TRUE;
-        break;
-      }
-      default:
-      {
-        reject = TRUE;
-        break;
-      }
-    } /* end of switch(p->msg_type) */
-  } /* end of if (!reject && (p->msg_len > 2)) */
-
-  if (!reply && reject)
-  {
-    aic_outb(p, MSG_MESSAGE_REJECT, MSG_OUT);
-    aic_outb(p, aic_inb(p, SCSISIGO) | ATNO, SCSISIGO);
-    done = TRUE;
-  }
-  return(done);
-}
-
-
-/*+F*************************************************************************
- * Function:
- *   aic7xxx_handle_reqinit
- *
- * Description:
- *   Interrupt handler for REQINIT interrupts (used to transfer messages to
- *    and from devices).
- *_F*************************************************************************/
-static void
-aic7xxx_handle_reqinit(struct aic7xxx_host *p, struct aic7xxx_scb *scb)
-{
-  unsigned char lastbyte;
-  unsigned char phasemis;
-  int done = FALSE;
-
-  switch(p->msg_type)
-  {
-    case MSG_TYPE_INITIATOR_MSGOUT:
-      {
-        if (p->msg_len == 0)
-          panic("aic7xxx: REQINIT with no active message!\n");
-
-        lastbyte = (p->msg_index == (p->msg_len - 1));
-        phasemis = ( aic_inb(p, SCSISIGI) & PHASE_MASK) != P_MESGOUT;
-
-        if (lastbyte || phasemis)
-        {
-          /* Time to end the message */
-          p->msg_len = 0;
-          p->msg_type = MSG_TYPE_NONE;
-          /*
-           * NOTE-TO-MYSELF: If you clear the REQINIT after you
-           * disable REQINITs, then cases of REJECT_MSG stop working
-           * and hang the bus
-           */
-          aic_outb(p, aic_inb(p, SIMODE1) & ~ENREQINIT, SIMODE1);
-          aic_outb(p, CLRSCSIINT, CLRINT);
-          p->flags &= ~AHC_HANDLING_REQINITS;
-
-          if (phasemis == 0)
-          {
-            aic_outb(p, p->msg_buf[p->msg_index], SINDEX);
-            aic_outb(p, 0, RETURN_1);
-#ifdef AIC7XXX_VERBOSE_DEBUGGING
-            if (aic7xxx_verbose > 0xffff)
-              printk(INFO_LEAD "Completed sending of REQINIT message.\n",
-                     p->host_no, CTL_OF_SCB(scb));
-#endif
-          }
-          else
-          {
-            aic_outb(p, MSGOUT_PHASEMIS, RETURN_1);
-#ifdef AIC7XXX_VERBOSE_DEBUGGING
-            if (aic7xxx_verbose > 0xffff)
-              printk(INFO_LEAD "PHASEMIS while sending REQINIT message.\n",
-                     p->host_no, CTL_OF_SCB(scb));
-#endif
-          }
-          unpause_sequencer(p, TRUE);
-        }
-        else
-        {
-          /*
-           * Present the byte on the bus (clearing REQINIT) but don't
-           * unpause the sequencer.
-           */
-          aic_outb(p, CLRREQINIT, CLRSINT1);
-          aic_outb(p, CLRSCSIINT, CLRINT);
-          aic_outb(p,  p->msg_buf[p->msg_index++], SCSIDATL);
-        }
-        break;
-      }
-    case MSG_TYPE_INITIATOR_MSGIN:
-      {
-        phasemis = ( aic_inb(p, SCSISIGI) & PHASE_MASK ) != P_MESGIN;
-
-        if (phasemis == 0)
-        {
-          p->msg_len++;
-          /* Pull the byte in without acking it */
-          p->msg_buf[p->msg_index] = aic_inb(p, SCSIBUSL);
-          done = aic7xxx_parse_msg(p, scb);
-          /* Ack the byte */
-          aic_outb(p, CLRREQINIT, CLRSINT1);
-          aic_outb(p, CLRSCSIINT, CLRINT);
-          aic_inb(p, SCSIDATL);
-          p->msg_index++;
-        }
-        if (phasemis || done)
-        {
-#ifdef AIC7XXX_VERBOSE_DEBUGGING
-          if (aic7xxx_verbose > 0xffff)
-          {
-            if (phasemis)
-              printk(INFO_LEAD "PHASEMIS while receiving REQINIT message.\n",
-                     p->host_no, CTL_OF_SCB(scb));
-            else
-              printk(INFO_LEAD "Completed receipt of REQINIT message.\n",
-                     p->host_no, CTL_OF_SCB(scb));
-          }
-#endif
-          /* Time to end our message session */
-          p->msg_len = 0;
-          p->msg_type = MSG_TYPE_NONE;
-          aic_outb(p, aic_inb(p, SIMODE1) & ~ENREQINIT, SIMODE1);
-          aic_outb(p, CLRSCSIINT, CLRINT);
-          p->flags &= ~AHC_HANDLING_REQINITS;
-          unpause_sequencer(p, TRUE);
-        }
-        break;
-      }
-    default:
-      {
-        panic("aic7xxx: Unknown REQINIT message type.\n");
-        break;
-      }
-  } /* End of switch(p->msg_type) */
-}
-
-/*+F*************************************************************************
- * Function:
- *   aic7xxx_handle_scsiint
- *
- * Description:
- *   Interrupt handler for SCSI interrupts (SCSIINT).
- *-F*************************************************************************/
-static void
-aic7xxx_handle_scsiint(struct aic7xxx_host *p, unsigned char intstat)
-{
-  unsigned char scb_index;
-  unsigned char status;
-  struct aic7xxx_scb *scb;
-  struct aic_dev_data *aic_dev;
-
-  scb_index = aic_inb(p, SCB_TAG);
-  status = aic_inb(p, SSTAT1);
-
-  if (scb_index < p->scb_data->numscbs)
-  {
-    scb = p->scb_data->scb_array[scb_index];
-    if ((scb->flags & SCB_ACTIVE) == 0)
-    {
-      scb = NULL;
-    }
-  }
-  else
-  {
-    scb = NULL;
-  }
-
-
-  if ((status & SCSIRSTI) != 0)
-  {
-    int channel;
-
-    if ( (p->chip & AHC_CHIPID_MASK) == AHC_AIC7770 )
-      channel = (aic_inb(p, SBLKCTL) & SELBUSB) >> 3;
-    else
-      channel = 0;
-
-    if (aic7xxx_verbose & VERBOSE_RESET)
-      printk(WARN_LEAD "Someone else reset the channel!!\n",
-           p->host_no, channel, -1, -1);
-    if (aic7xxx_panic_on_abort)
-      aic7xxx_panic_abort(p, NULL);
-    /*
-     * Go through and abort all commands for the channel, but do not
-     * reset the channel again.
-     */
-    aic7xxx_reset_channel(p, channel, /* Initiate Reset */ FALSE);
-    aic7xxx_run_done_queue(p, TRUE);
-    scb = NULL;
-  }
-  else if ( ((status & BUSFREE) != 0) && ((status & SELTO) == 0) )
-  {
-    /*
-     * First look at what phase we were last in.  If it's message-out,
-     * chances are pretty good that the bus free was in response to
-     * one of our abort requests.
-     */
-    unsigned char lastphase = aic_inb(p, LASTPHASE);
-    unsigned char saved_tcl = aic_inb(p, SAVED_TCL);
-    unsigned char target = (saved_tcl >> 4) & 0x0F;
-    int channel;
-    int printerror = TRUE;
-
-    if ( (p->chip & AHC_CHIPID_MASK) == AHC_AIC7770 )
-      channel = (aic_inb(p, SBLKCTL) & SELBUSB) >> 3;
-    else
-      channel = 0;
-
-    aic_outb(p, aic_inb(p, SCSISEQ) & (ENSELI|ENRSELI|ENAUTOATNP),
-             SCSISEQ);
-    if (lastphase == P_MESGOUT)
-    {
-      unsigned char message;
-
-      message = aic_inb(p, SINDEX);
-
-      if ((message == MSG_ABORT) || (message == MSG_ABORT_TAG))
-      {
-        if (aic7xxx_verbose & VERBOSE_ABORT_PROCESS)
-          printk(INFO_LEAD "SCB %d abort delivered.\n", p->host_no,
-            CTL_OF_SCB(scb), scb->hscb->tag);
-        aic7xxx_reset_device(p, target, channel, ALL_LUNS,
-                (message == MSG_ABORT) ? SCB_LIST_NULL : scb->hscb->tag );
-        aic7xxx_run_done_queue(p, TRUE);
-        scb = NULL;
-        printerror = 0;
-      }
-      else if (message == MSG_BUS_DEV_RESET)
-      {
-        aic7xxx_handle_device_reset(p, target, channel);
-        scb = NULL;
-        printerror = 0;
-      }
-    }
-    if ( (scb != NULL) && (scb->flags & SCB_DTR_SCB) ) 
-    {
-      /*
-       * Hmmm...error during a negotiation command.  Either we have a
-       * borken bus, or the device doesn't like our negotiation message.
-       * Since we check the INQUIRY data of a device before sending it
-       * negotiation messages, assume the bus is borken for whatever
-       * reason.  Complete the command.
-       */
-      printerror = 0;
-      aic7xxx_reset_device(p, target, channel, ALL_LUNS, scb->hscb->tag);
-      aic7xxx_run_done_queue(p, TRUE);
-      scb = NULL;
-    }
-    if (printerror != 0)
-    {
-      if (scb != NULL)
-      {
-        unsigned char tag;
-
-        if ((scb->hscb->control & TAG_ENB) != 0)
-        {
-          tag = scb->hscb->tag;
-        }
-        else
-        {
-          tag = SCB_LIST_NULL;
-        }
-        aic7xxx_reset_device(p, target, channel, ALL_LUNS, tag);
-        aic7xxx_run_done_queue(p, TRUE);
-      }
-      else
-      {
-        aic7xxx_reset_device(p, target, channel, ALL_LUNS, SCB_LIST_NULL);
-        aic7xxx_run_done_queue(p, TRUE);
-      }
-      printk(INFO_LEAD "Unexpected busfree, LASTPHASE = 0x%x, "
-             "SEQADDR = 0x%x\n", p->host_no, channel, target, -1, lastphase,
-             (aic_inb(p, SEQADDR1) << 8) | aic_inb(p, SEQADDR0));
-      scb = NULL;
-    }
-    aic_outb(p, MSG_NOOP, MSG_OUT);
-    aic_outb(p, aic_inb(p, SIMODE1) & ~(ENBUSFREE|ENREQINIT),
-      SIMODE1);
-    p->flags &= ~AHC_HANDLING_REQINITS;
-    aic_outb(p, CLRBUSFREE, CLRSINT1);
-    aic_outb(p, CLRSCSIINT, CLRINT);
-    restart_sequencer(p);
-    unpause_sequencer(p, TRUE);
-  }
-  else if ((status & SELTO) != 0)
-  {
-        unsigned char scbptr;
-        unsigned char nextscb;
-        struct scsi_cmnd *cmd;
-
-    scbptr = aic_inb(p, WAITING_SCBH);
-    if (scbptr > p->scb_data->maxhscbs)
-    {
-      /*
-       * I'm still trying to track down exactly how this happens, but until
-       * I find it, this code will make sure we aren't passing bogus values
-       * into the SCBPTR register, even if that register will just wrap
-       * things around, we still don't like having out of range variables.
-       *
-       * NOTE: Don't check the aic7xxx_verbose variable, I want this message
-       * to always be displayed.
-       */
-      printk(INFO_LEAD "Invalid WAITING_SCBH value %d, improvising.\n",
-             p->host_no, -1, -1, -1, scbptr);
-      if (p->scb_data->maxhscbs > 4)
-        scbptr &= (p->scb_data->maxhscbs - 1);
-      else
-        scbptr &= 0x03;
-    }
-    aic_outb(p, scbptr, SCBPTR);
-    scb_index = aic_inb(p, SCB_TAG);
-
-    scb = NULL;
-    if (scb_index < p->scb_data->numscbs)
-    {
-      scb = p->scb_data->scb_array[scb_index];
-      if ((scb->flags & SCB_ACTIVE) == 0)
-      {
-        scb = NULL;
-      }
-    }
-    if (scb == NULL)
-    {
-      printk(WARN_LEAD "Referenced SCB %d not valid during SELTO.\n",
-             p->host_no, -1, -1, -1, scb_index);
-      printk(KERN_WARNING "        SCSISEQ = 0x%x SEQADDR = 0x%x SSTAT0 = 0x%x "
-             "SSTAT1 = 0x%x\n", aic_inb(p, SCSISEQ),
-             aic_inb(p, SEQADDR0) | (aic_inb(p, SEQADDR1) << 8),
-             aic_inb(p, SSTAT0), aic_inb(p, SSTAT1));
-      if (aic7xxx_panic_on_abort)
-        aic7xxx_panic_abort(p, NULL);
-    }
-    else
-    {
-      cmd = scb->cmd;
-      cmd->result = (DID_TIME_OUT << 16);
-
-      /*
-       * Clear out this hardware SCB
-       */
-      aic_outb(p, 0, SCB_CONTROL);
-
-      /*
-       * Clear out a few values in the card that are in an undetermined
-       * state.
-       */
-      aic_outb(p, MSG_NOOP, MSG_OUT);
-
-      /*
-       * Shift the waiting for selection queue forward
-       */
-      nextscb = aic_inb(p, SCB_NEXT);
-      aic_outb(p, nextscb, WAITING_SCBH);
-
-      /*
-       * Put this SCB back on the free list.
-       */
-      aic7xxx_add_curscb_to_free_list(p);
-#ifdef AIC7XXX_VERBOSE_DEBUGGING
-      if (aic7xxx_verbose > 0xffff)
-        printk(INFO_LEAD "Selection Timeout.\n", p->host_no, CTL_OF_SCB(scb));
-#endif
-      if (scb->flags & SCB_QUEUED_ABORT)
-      {
-        /*
-         * We know that this particular SCB had to be the queued abort since
-         * the disconnected SCB would have gotten a reconnect instead.
-         * What we need to do then is to let the command timeout again so
-         * we get a reset since this abort just failed.
-         */
-        cmd->result = 0;
-        scb = NULL;
-      }
-    }
-    /*
-     * Keep the sequencer from trying to restart any selections
-     */
-    aic_outb(p, aic_inb(p, SCSISEQ) & ~ENSELO, SCSISEQ);
-    /*
-     * Make sure the data bits on the bus are released
-     * Don't do this on 7770 chipsets, it makes them give us
-     * a BRKADDRINT and kills the card.
-     */
-    if( (p->chip & ~AHC_CHIPID_MASK) == AHC_PCI )
-      aic_outb(p, 0, SCSIBUSL);
-
-    /*
-     * Delay for the selection timeout delay period then stop the selection
-     */
-    udelay(301);
-    aic_outb(p, CLRSELINGO, CLRSINT0);
-    /*
-     * Clear out all the interrupt status bits
-     */
-    aic_outb(p, aic_inb(p, SIMODE1) & ~(ENREQINIT|ENBUSFREE), SIMODE1);
-    p->flags &= ~AHC_HANDLING_REQINITS;
-    aic_outb(p, CLRSELTIMEO | CLRBUSFREE, CLRSINT1);
-    aic_outb(p, CLRSCSIINT, CLRINT);
-    /*
-     * Restarting the sequencer will stop the selection and make sure devices
-     * are allowed to reselect in.
-     */
-    restart_sequencer(p);
-    unpause_sequencer(p, TRUE);
-  }
-  else if (scb == NULL)
-  {
-    printk(WARN_LEAD "aic7xxx_isr - referenced scb not valid "
-           "during scsiint 0x%x scb(%d)\n"
-           "      SIMODE0 0x%x, SIMODE1 0x%x, SSTAT0 0x%x, SEQADDR 0x%x\n",
-           p->host_no, -1, -1, -1, status, scb_index, aic_inb(p, SIMODE0),
-           aic_inb(p, SIMODE1), aic_inb(p, SSTAT0),
-           (aic_inb(p, SEQADDR1) << 8) | aic_inb(p, SEQADDR0));
-    /*
-     * Turn off the interrupt and set status to zero, so that it
-     * falls through the rest of the SCSIINT code.
-     */
-    aic_outb(p, status, CLRSINT1);
-    aic_outb(p, CLRSCSIINT, CLRINT);
-    unpause_sequencer(p, /* unpause always */ TRUE);
-    scb = NULL;
-  }
-  else if (status & SCSIPERR)
-  {
-    /*
-     * Determine the bus phase and queue an appropriate message.
-     */
-        char  *phase;
-        struct scsi_cmnd *cmd;
-        unsigned char mesg_out = MSG_NOOP;
-        unsigned char lastphase = aic_inb(p, LASTPHASE);
-        unsigned char sstat2 = aic_inb(p, SSTAT2);
-
-    cmd = scb->cmd;
-    switch (lastphase)
-    {
-      case P_DATAOUT:
-        phase = "Data-Out";
-        break;
-      case P_DATAIN:
-        phase = "Data-In";
-        mesg_out = MSG_INITIATOR_DET_ERR;
-        break;
-      case P_COMMAND:
-        phase = "Command";
-        break;
-      case P_MESGOUT:
-        phase = "Message-Out";
-        break;
-      case P_STATUS:
-        phase = "Status";
-        mesg_out = MSG_INITIATOR_DET_ERR;
-        break;
-      case P_MESGIN:
-        phase = "Message-In";
-        mesg_out = MSG_PARITY_ERROR;
-        break;
-      default:
-        phase = "unknown";
-        break;
-    }
-
-    /*
-     * A parity error has occurred during a data
-     * transfer phase. Flag it and continue.
-     */
-    if( (p->features & AHC_ULTRA3) && 
-        (aic_inb(p, SCSIRATE) & AHC_SYNCRATE_CRC) &&
-        (lastphase == P_DATAIN) )
-    {
-      printk(WARN_LEAD "CRC error during %s phase.\n",
-             p->host_no, CTL_OF_SCB(scb), phase);
-      if(sstat2 & CRCVALERR)
-      {
-        printk(WARN_LEAD "  CRC error in intermediate CRC packet.\n",
-               p->host_no, CTL_OF_SCB(scb));
-      }
-      if(sstat2 & CRCENDERR)
-      {
-        printk(WARN_LEAD "  CRC error in ending CRC packet.\n",
-               p->host_no, CTL_OF_SCB(scb));
-      }
-      if(sstat2 & CRCREQERR)
-      {
-        printk(WARN_LEAD "  Target incorrectly requested a CRC packet.\n",
-               p->host_no, CTL_OF_SCB(scb));
-      }
-      if(sstat2 & DUAL_EDGE_ERROR)
-      {
-        printk(WARN_LEAD "  Dual Edge transmission error.\n",
-               p->host_no, CTL_OF_SCB(scb));
-      }
-    }
-    else if( (lastphase == P_MESGOUT) &&
-             (scb->flags & SCB_MSGOUT_PPR) )
-    {
-      /*
-       * As per the draft specs, any device capable of supporting any of
-       * the option values other than 0 are not allowed to reject the
-       * PPR message.  Instead, they must negotiate out what they do
-       * support instead of rejecting our offering or else they cause
-       * a parity error during msg_out phase to signal that they don't
-       * like our settings.
-       */
-      aic_dev = AIC_DEV(scb->cmd);
-      aic_dev->needppr = aic_dev->needppr_copy = 0;
-      aic7xxx_set_width(p, scb->cmd->device->id, scb->cmd->device->channel, scb->cmd->device->lun,
-                        MSG_EXT_WDTR_BUS_8_BIT,
-                        (AHC_TRANS_ACTIVE|AHC_TRANS_CUR|AHC_TRANS_QUITE),
-                        aic_dev);
-      aic7xxx_set_syncrate(p, NULL, scb->cmd->device->id, scb->cmd->device->channel, 0, 0,
-                           0, AHC_TRANS_ACTIVE|AHC_TRANS_CUR|AHC_TRANS_QUITE,
-                           aic_dev);
-      aic_dev->goal.options = 0;
-      scb->flags &= ~SCB_MSGOUT_BITS;
-      if(aic7xxx_verbose & VERBOSE_NEGOTIATION2)
-      {
-        printk(INFO_LEAD "parity error during PPR message, reverting "
-               "to WDTR/SDTR\n", p->host_no, CTL_OF_SCB(scb));
-      }
-      if ( aic_dev->goal.width )
-      {
-        aic_dev->needwdtr = aic_dev->needwdtr_copy = 1;
-      }
-      if ( aic_dev->goal.offset )
-      {
-        if( aic_dev->goal.period <= 9 )
-        {
-          aic_dev->goal.period = 10;
-        }
-        aic_dev->needsdtr = aic_dev->needsdtr_copy = 1;
-      }
-      scb = NULL;
-    }
-
-    /*
-     * We've set the hardware to assert ATN if we get a parity
-     * error on "in" phases, so all we need to do is stuff the
-     * message buffer with the appropriate message.  "In" phases
-     * have set mesg_out to something other than MSG_NOP.
-     */
-    if (mesg_out != MSG_NOOP)
-    {
-      aic_outb(p, mesg_out, MSG_OUT);
-      aic_outb(p, aic_inb(p, SCSISIGI) | ATNO, SCSISIGO);
-      scb = NULL;
-    }
-    aic_outb(p, CLRSCSIPERR, CLRSINT1);
-    aic_outb(p, CLRSCSIINT, CLRINT);
-    unpause_sequencer(p, /* unpause_always */ TRUE);
-  }
-  else if ( (status & REQINIT) &&
-            (p->flags & AHC_HANDLING_REQINITS) )
-  {
-#ifdef AIC7XXX_VERBOSE_DEBUGGING
-    if (aic7xxx_verbose > 0xffff)
-      printk(INFO_LEAD "Handling REQINIT, SSTAT1=0x%x.\n", p->host_no,
-             CTL_OF_SCB(scb), aic_inb(p, SSTAT1));
-#endif
-    aic7xxx_handle_reqinit(p, scb);
-    return;
-  }
-  else
-  {
-    /*
-     * We don't know what's going on. Turn off the
-     * interrupt source and try to continue.
-     */
-    if (aic7xxx_verbose & VERBOSE_SCSIINT)
-      printk(INFO_LEAD "Unknown SCSIINT status, SSTAT1(0x%x).\n",
-        p->host_no, -1, -1, -1, status);
-    aic_outb(p, status, CLRSINT1);
-    aic_outb(p, CLRSCSIINT, CLRINT);
-    unpause_sequencer(p, /* unpause always */ TRUE);
-    scb = NULL;
-  }
-  if (scb != NULL)
-  {
-    aic7xxx_done(p, scb);
-  }
-}
-
-#ifdef AIC7XXX_VERBOSE_DEBUGGING
-static void
-aic7xxx_check_scbs(struct aic7xxx_host *p, char *buffer)
-{
-  unsigned char saved_scbptr, free_scbh, dis_scbh, wait_scbh, temp;
-  int i, bogus, lost;
-  static unsigned char scb_status[AIC7XXX_MAXSCB];
-
-#define SCB_NO_LIST 0
-#define SCB_FREE_LIST 1
-#define SCB_WAITING_LIST 2
-#define SCB_DISCONNECTED_LIST 4
-#define SCB_CURRENTLY_ACTIVE 8
-
-  /*
-   * Note, these checks will fail on a regular basis once the machine moves
-   * beyond the bus scan phase.  The problem is race conditions concerning
-   * the scbs and where they are linked in.  When you have 30 or so commands
-   * outstanding on the bus, and run this twice with every interrupt, the
-   * chances get pretty good that you'll catch the sequencer with an SCB
-   * only partially linked in.  Therefore, once we pass the scan phase
-   * of the bus, we really should disable this function.
-   */
-  bogus = FALSE;
-  memset(&scb_status[0], 0, sizeof(scb_status));
-  pause_sequencer(p);
-  saved_scbptr = aic_inb(p, SCBPTR);
-  if (saved_scbptr >= p->scb_data->maxhscbs)
-  {
-    printk("Bogus SCBPTR %d\n", saved_scbptr);
-    bogus = TRUE;
-  }
-  scb_status[saved_scbptr] = SCB_CURRENTLY_ACTIVE;
-  free_scbh = aic_inb(p, FREE_SCBH);
-  if ( (free_scbh != SCB_LIST_NULL) &&
-       (free_scbh >= p->scb_data->maxhscbs) )
-  {
-    printk("Bogus FREE_SCBH %d\n", free_scbh);
-    bogus = TRUE;
-  }
-  else
-  {
-    temp = free_scbh;
-    while( (temp != SCB_LIST_NULL) && (temp < p->scb_data->maxhscbs) )
-    {
-      if(scb_status[temp] & 0x07)
-      {
-        printk("HSCB %d on multiple lists, status 0x%02x", temp,
-               scb_status[temp] | SCB_FREE_LIST);
-        bogus = TRUE;
-      }
-      scb_status[temp] |= SCB_FREE_LIST;
-      aic_outb(p, temp, SCBPTR);
-      temp = aic_inb(p, SCB_NEXT);
-    }
-  }
-
-  dis_scbh = aic_inb(p, DISCONNECTED_SCBH);
-  if ( (dis_scbh != SCB_LIST_NULL) &&
-       (dis_scbh >= p->scb_data->maxhscbs) )
-  {
-    printk("Bogus DISCONNECTED_SCBH %d\n", dis_scbh);
-    bogus = TRUE;
-  }
-  else
-  {
-    temp = dis_scbh;
-    while( (temp != SCB_LIST_NULL) && (temp < p->scb_data->maxhscbs) )
-    {
-      if(scb_status[temp] & 0x07)
-      {
-        printk("HSCB %d on multiple lists, status 0x%02x", temp,
-               scb_status[temp] | SCB_DISCONNECTED_LIST);
-        bogus = TRUE;
-      }
-      scb_status[temp] |= SCB_DISCONNECTED_LIST;
-      aic_outb(p, temp, SCBPTR);
-      temp = aic_inb(p, SCB_NEXT);
-    }
-  }
-  
-  wait_scbh = aic_inb(p, WAITING_SCBH);
-  if ( (wait_scbh != SCB_LIST_NULL) &&
-       (wait_scbh >= p->scb_data->maxhscbs) )
-  {
-    printk("Bogus WAITING_SCBH %d\n", wait_scbh);
-    bogus = TRUE;
-  }
-  else
-  {
-    temp = wait_scbh;
-    while( (temp != SCB_LIST_NULL) && (temp < p->scb_data->maxhscbs) )
-    {
-      if(scb_status[temp] & 0x07)
-      {
-        printk("HSCB %d on multiple lists, status 0x%02x", temp,
-               scb_status[temp] | SCB_WAITING_LIST);
-        bogus = TRUE;
-      }
-      scb_status[temp] |= SCB_WAITING_LIST;
-      aic_outb(p, temp, SCBPTR);
-      temp = aic_inb(p, SCB_NEXT);
-    }
-  }
-
-  lost=0;
-  for(i=0; i < p->scb_data->maxhscbs; i++)
-  {
-    aic_outb(p, i, SCBPTR);
-    temp = aic_inb(p, SCB_NEXT);
-    if ( ((temp != SCB_LIST_NULL) &&
-          (temp >= p->scb_data->maxhscbs)) )
-    {
-      printk("HSCB %d bad, SCB_NEXT invalid(%d).\n", i, temp);
-      bogus = TRUE;
-    }
-    if ( temp == i )
-    {
-      printk("HSCB %d bad, SCB_NEXT points to self.\n", i);
-      bogus = TRUE;
-    }
-    if (scb_status[i] == 0)
-      lost++;
-    if (lost > 1)
-    {
-      printk("Too many lost scbs.\n");
-      bogus=TRUE;
-    }
-  }
-  aic_outb(p, saved_scbptr, SCBPTR);
-  unpause_sequencer(p, FALSE);
-  if (bogus)
-  {
-    printk("Bogus parameters found in card SCB array structures.\n");
-    printk("%s\n", buffer);
-    aic7xxx_panic_abort(p, NULL);
-  }
-  return;
-}
-#endif
-
-
-/*+F*************************************************************************
- * Function:
- *   aic7xxx_handle_command_completion_intr
- *
- * Description:
- *   SCSI command completion interrupt handler.
- *-F*************************************************************************/
-static void
-aic7xxx_handle_command_completion_intr(struct aic7xxx_host *p)
-{
-        struct aic7xxx_scb *scb = NULL;
-        struct aic_dev_data *aic_dev;
-        struct scsi_cmnd *cmd;
-        unsigned char scb_index, tindex;
-
-#ifdef AIC7XXX_VERBOSE_DEBUGGING
-  if( (p->isr_count < 16) && (aic7xxx_verbose > 0xffff) )
-    printk(INFO_LEAD "Command Complete Int.\n", p->host_no, -1, -1, -1);
-#endif
-    
-  /*
-   * Read the INTSTAT location after clearing the CMDINT bit.  This forces
-   * any posted PCI writes to flush to memory.  Gerard Roudier suggested
-   * this fix to the possible race of clearing the CMDINT bit but not
-   * having all command bytes flushed onto the qoutfifo.
-   */
-  aic_outb(p, CLRCMDINT, CLRINT);
-  aic_inb(p, INTSTAT);
-  /*
-   * The sequencer will continue running when it
-   * issues this interrupt. There may be >1 commands
-   * finished, so loop until we've processed them all.
-   */
-
-  while (p->qoutfifo[p->qoutfifonext] != SCB_LIST_NULL)
-  {
-    scb_index = p->qoutfifo[p->qoutfifonext];
-    p->qoutfifo[p->qoutfifonext++] = SCB_LIST_NULL;
-    if ( scb_index >= p->scb_data->numscbs )
-    {
-      printk(WARN_LEAD "CMDCMPLT with invalid SCB index %d\n", p->host_no,
-        -1, -1, -1, scb_index);
-      continue;
-    }
-    scb = p->scb_data->scb_array[scb_index];
-    if (!(scb->flags & SCB_ACTIVE) || (scb->cmd == NULL))
-    {
-      printk(WARN_LEAD "CMDCMPLT without command for SCB %d, SCB flags "
-        "0x%x, cmd 0x%lx\n", p->host_no, -1, -1, -1, scb_index, scb->flags,
-        (unsigned long) scb->cmd);
-      continue;
-    }
-    tindex = TARGET_INDEX(scb->cmd);
-    aic_dev = AIC_DEV(scb->cmd);
-    if (scb->flags & SCB_QUEUED_ABORT)
-    {
-      pause_sequencer(p);
-      if ( ((aic_inb(p, LASTPHASE) & PHASE_MASK) != P_BUSFREE) &&
-           (aic_inb(p, SCB_TAG) == scb->hscb->tag) )
-      {
-        unpause_sequencer(p, FALSE);
-        continue;
-      }
-      aic7xxx_reset_device(p, scb->cmd->device->id, scb->cmd->device->channel,
-        scb->cmd->device->lun, scb->hscb->tag);
-      scb->flags &= ~(SCB_QUEUED_FOR_DONE | SCB_RESET | SCB_ABORT |
-        SCB_QUEUED_ABORT);
-      unpause_sequencer(p, FALSE);
-    }
-    else if (scb->flags & SCB_ABORT)
-    {
-      /*
-       * We started to abort this, but it completed on us, let it
-       * through as successful
-       */
-      scb->flags &= ~(SCB_ABORT|SCB_RESET);
-    }
-    else if (scb->flags & SCB_SENSE)
-    {
-      char *buffer = &scb->cmd->sense_buffer[0];
-
-      if (buffer[12] == 0x47 || buffer[12] == 0x54)
-      {
-        /*
-         * Signal that we need to re-negotiate things.
-         */
-        aic_dev->needppr = aic_dev->needppr_copy;
-        aic_dev->needsdtr = aic_dev->needsdtr_copy;
-        aic_dev->needwdtr = aic_dev->needwdtr_copy;
-      }
-    }
-    cmd = scb->cmd;
-    if (scb->hscb->residual_SG_segment_count != 0)
-    {
-      aic7xxx_calculate_residual(p, scb);
-    }
-    cmd->result |= (aic7xxx_error(cmd) << 16);
-    aic7xxx_done(p, scb);
-  }
-}
-
-/*+F*************************************************************************
- * Function:
- *   aic7xxx_isr
- *
- * Description:
- *   SCSI controller interrupt handler.
- *-F*************************************************************************/
-static void
-aic7xxx_isr(void *dev_id)
-{
-  struct aic7xxx_host *p;
-  unsigned char intstat;
-
-  p = dev_id;
-
-  /*
-   * Just a few sanity checks.  Make sure that we have an int pending.
-   * Also, if PCI, then we are going to check for a PCI bus error status
-   * should we get too many spurious interrupts.
-   */
-  if (!((intstat = aic_inb(p, INTSTAT)) & INT_PEND))
-  {
-#ifdef CONFIG_PCI
-    if ( (p->chip & AHC_PCI) && (p->spurious_int > 500) &&
-        !(p->flags & AHC_HANDLING_REQINITS) )
-    {
-      if ( aic_inb(p, ERROR) & PCIERRSTAT )
-      {
-        aic7xxx_pci_intr(p);
-      }
-      p->spurious_int = 0;
-    }
-    else if ( !(p->flags & AHC_HANDLING_REQINITS) )
-    {
-      p->spurious_int++;
-    }
-#endif
-    return;
-  }
-
-  p->spurious_int = 0;
-
-  /*
-   * Keep track of interrupts for /proc/scsi
-   */
-  p->isr_count++;
-
-#ifdef AIC7XXX_VERBOSE_DEBUGGING
-  if ( (p->isr_count < 16) && (aic7xxx_verbose > 0xffff) &&
-       (aic7xxx_panic_on_abort) && (p->flags & AHC_PAGESCBS) )
-    aic7xxx_check_scbs(p, "Bogus settings at start of interrupt.");
-#endif
-
-  /*
-   * Handle all the interrupt sources - especially for SCSI
-   * interrupts, we won't get a second chance at them.
-   */
-  if (intstat & CMDCMPLT)
-  {
-    aic7xxx_handle_command_completion_intr(p);
-  }
-
-  if (intstat & BRKADRINT)
-  {
-    int i;
-    unsigned char errno = aic_inb(p, ERROR);
-
-    printk(KERN_ERR "(scsi%d) BRKADRINT error(0x%x):\n", p->host_no, errno);
-    for (i = 0; i < ARRAY_SIZE(hard_error); i++)
-    {
-      if (errno & hard_error[i].errno)
-      {
-        printk(KERN_ERR "  %s\n", hard_error[i].errmesg);
-      }
-    }
-    printk(KERN_ERR "(scsi%d)   SEQADDR=0x%x\n", p->host_no,
-      (((aic_inb(p, SEQADDR1) << 8) & 0x100) | aic_inb(p, SEQADDR0)));
-    if (aic7xxx_panic_on_abort)
-      aic7xxx_panic_abort(p, NULL);
-#ifdef CONFIG_PCI
-    if (errno & PCIERRSTAT)
-      aic7xxx_pci_intr(p);
-#endif
-    if (errno & (SQPARERR | ILLOPCODE | ILLSADDR))
-    {
-      panic("aic7xxx: unrecoverable BRKADRINT.\n");
-    }
-    if (errno & ILLHADDR)
-    {
-      printk(KERN_ERR "(scsi%d) BUG! Driver accessed chip without first "
-             "pausing controller!\n", p->host_no);
-    }
-#ifdef AIC7XXX_VERBOSE_DEBUGGING
-    if (errno & DPARERR)
-    {
-      if (aic_inb(p, DMAPARAMS) & DIRECTION)
-        printk("(scsi%d) while DMAing SCB from host to card.\n", p->host_no);
-      else
-        printk("(scsi%d) while DMAing SCB from card to host.\n", p->host_no);
-    }
-#endif
-    aic_outb(p, CLRPARERR | CLRBRKADRINT, CLRINT);
-    unpause_sequencer(p, FALSE);
-  }
-
-  if (intstat & SEQINT)
-  {
-    /*
-     * Read the CCSCBCTL register to work around a bug in the Ultra2 cards
-     */
-    if(p->features & AHC_ULTRA2)
-    {
-      aic_inb(p, CCSCBCTL);
-    }
-    aic7xxx_handle_seqint(p, intstat);
-  }
-
-  if (intstat & SCSIINT)
-  {
-    aic7xxx_handle_scsiint(p, intstat);
-  }
-
-#ifdef AIC7XXX_VERBOSE_DEBUGGING
-  if ( (p->isr_count < 16) && (aic7xxx_verbose > 0xffff) &&
-       (aic7xxx_panic_on_abort) && (p->flags & AHC_PAGESCBS) )
-    aic7xxx_check_scbs(p, "Bogus settings at end of interrupt.");
-#endif
-
-}
-
-/*+F*************************************************************************
- * Function:
- *   do_aic7xxx_isr
- *
- * Description:
- *   This is a gross hack to solve a problem in linux kernels 2.1.85 and
- *   above.  Please, children, do not try this at home, and if you ever see
- *   anything like it, please inform the Gross Hack Police immediately
- *-F*************************************************************************/
-static irqreturn_t
-do_aic7xxx_isr(int irq, void *dev_id)
-{
-  unsigned long cpu_flags;
-  struct aic7xxx_host *p;
-  
-  p = dev_id;
-  if(!p)
-    return IRQ_NONE;
-  spin_lock_irqsave(p->host->host_lock, cpu_flags);
-  p->flags |= AHC_IN_ISR;
-  do
-  {
-    aic7xxx_isr(dev_id);
-  } while ( (aic_inb(p, INTSTAT) & INT_PEND) );
-  aic7xxx_done_cmds_complete(p);
-  aic7xxx_run_waiting_queues(p);
-  p->flags &= ~AHC_IN_ISR;
-  spin_unlock_irqrestore(p->host->host_lock, cpu_flags);
-
-  return IRQ_HANDLED;
-}
-
-/*+F*************************************************************************
- * Function:
- *   aic7xxx_init_transinfo
- *
- * Description:
- *   Set up the initial aic_dev values from the BIOS settings and from
- *   INQUIRY results
- *-F*************************************************************************/
-static void
-aic7xxx_init_transinfo(struct aic7xxx_host *p, struct aic_dev_data *aic_dev)
-{
-  struct scsi_device *sdpnt = aic_dev->SDptr;
-  unsigned char tindex;
-
-  tindex = sdpnt->id | (sdpnt->channel << 3);
-  if (!(aic_dev->flags & DEVICE_DTR_SCANNED))
-  {
-    aic_dev->flags |= DEVICE_DTR_SCANNED;
-
-    if ( sdpnt->wdtr && (p->features & AHC_WIDE) )
-    {
-      aic_dev->needwdtr = aic_dev->needwdtr_copy = 1;
-      aic_dev->goal.width = p->user[tindex].width;
-    }
-    else
-    {
-      aic_dev->needwdtr = aic_dev->needwdtr_copy = 0;
-      pause_sequencer(p);
-      aic7xxx_set_width(p, sdpnt->id, sdpnt->channel, sdpnt->lun,
-                        MSG_EXT_WDTR_BUS_8_BIT, (AHC_TRANS_ACTIVE |
-                                                 AHC_TRANS_GOAL |
-                                                 AHC_TRANS_CUR), aic_dev );
-      unpause_sequencer(p, FALSE);
-    }
-    if ( sdpnt->sdtr && p->user[tindex].offset )
-    {
-      aic_dev->goal.period = p->user[tindex].period;
-      aic_dev->goal.options = p->user[tindex].options;
-      if (p->features & AHC_ULTRA2)
-        aic_dev->goal.offset = MAX_OFFSET_ULTRA2;
-      else if (aic_dev->goal.width == MSG_EXT_WDTR_BUS_16_BIT)
-        aic_dev->goal.offset = MAX_OFFSET_16BIT;
-      else
-        aic_dev->goal.offset = MAX_OFFSET_8BIT;
-      if ( sdpnt->ppr && p->user[tindex].period <= 9 &&
-             p->user[tindex].options )
-      {
-        aic_dev->needppr = aic_dev->needppr_copy = 1;
-        aic_dev->needsdtr = aic_dev->needsdtr_copy = 0;
-        aic_dev->needwdtr = aic_dev->needwdtr_copy = 0;
-        aic_dev->flags |= DEVICE_SCSI_3;
-      }
-      else
-      {
-        aic_dev->needsdtr = aic_dev->needsdtr_copy = 1;
-        aic_dev->goal.period = max_t(unsigned char, 10, aic_dev->goal.period);
-        aic_dev->goal.options = 0;
-      }
-    }
-    else
-    {
-      aic_dev->needsdtr = aic_dev->needsdtr_copy = 0;
-      aic_dev->goal.period = 255;
-      aic_dev->goal.offset = 0;
-      aic_dev->goal.options = 0;
-    }
-    aic_dev->flags |= DEVICE_PRINT_DTR;
-  }
-}
-
-/*+F*************************************************************************
- * Function:
- *   aic7xxx_slave_alloc
- *
- * Description:
- *   Set up the initial aic_dev struct pointers
- *-F*************************************************************************/
-static int
-aic7xxx_slave_alloc(struct scsi_device *SDptr)
-{
-  struct aic7xxx_host *p = (struct aic7xxx_host *)SDptr->host->hostdata;
-  struct aic_dev_data *aic_dev;
-
-  aic_dev = kmalloc(sizeof(struct aic_dev_data), GFP_KERNEL);
-  if(!aic_dev)
-    return 1;
-  /*
-   * Check to see if channel was scanned.
-   */
-  
-  if (!(p->flags & AHC_A_SCANNED) && (SDptr->channel == 0))
-  {
-    if (aic7xxx_verbose & VERBOSE_PROBE2)
-      printk(INFO_LEAD "Scanning channel for devices.\n",
-        p->host_no, 0, -1, -1);
-    p->flags |= AHC_A_SCANNED;
-  }
-  else
-  {
-    if (!(p->flags & AHC_B_SCANNED) && (SDptr->channel == 1))
-    {
-      if (aic7xxx_verbose & VERBOSE_PROBE2)
-        printk(INFO_LEAD "Scanning channel for devices.\n",
-          p->host_no, 1, -1, -1);
-      p->flags |= AHC_B_SCANNED;
-    }
-  }
-
-  memset(aic_dev, 0, sizeof(struct aic_dev_data));
-  SDptr->hostdata = aic_dev;
-  aic_dev->SDptr = SDptr;
-  aic_dev->max_q_depth = 1;
-  aic_dev->temp_q_depth = 1;
-  scbq_init(&aic_dev->delayed_scbs);
-  INIT_LIST_HEAD(&aic_dev->list);
-  list_add_tail(&aic_dev->list, &p->aic_devs);
-  return 0;
-}
-
-/*+F*************************************************************************
- * Function:
- *   aic7xxx_device_queue_depth
- *
- * Description:
- *   Determines the queue depth for a given device.  There are two ways
- *   a queue depth can be obtained for a tagged queueing device.  One
- *   way is the default queue depth which is determined by whether
- *   aic7xxx_default_queue_depth.  The other is by the aic7xxx_tag_info
- *   array.
- *
- *   If tagged queueing isn't supported on the device, then we set the
- *   depth to p->host->hostt->cmd_per_lun for internal driver queueing.
- *   as the default queue depth.  Otherwise, we use either 4 or 8 as the
- *   default queue depth (dependent on the number of hardware SCBs).
- *   The other way we determine queue depth is through the use of the
- *   aic7xxx_tag_info array which is enabled by defining
- *   AIC7XXX_TAGGED_QUEUEING_BY_DEVICE.  This array can be initialized
- *   with queue depths for individual devices.  It also allows tagged
- *   queueing to be [en|dis]abled for a specific adapter.
- *-F*************************************************************************/
-static void
-aic7xxx_device_queue_depth(struct aic7xxx_host *p, struct scsi_device *device)
-{
-  int tag_enabled = FALSE;
-  struct aic_dev_data *aic_dev = device->hostdata;
-  unsigned char tindex;
-
-  tindex = device->id | (device->channel << 3);
-
-  if (device->simple_tags)
-    return; // We've already enabled this device
-
-  if (device->tagged_supported)
-  {
-    tag_enabled = TRUE;
-
-    if (!(p->discenable & (1 << tindex)))
-    {
-      if (aic7xxx_verbose & VERBOSE_NEGOTIATION2)
-        printk(INFO_LEAD "Disconnection disabled, unable to "
-             "enable tagged queueing.\n",
-             p->host_no, device->channel, device->id, device->lun);
-      tag_enabled = FALSE;
-    }
-    else
-    {
-      if (p->instance >= ARRAY_SIZE(aic7xxx_tag_info))
-      {
-        static int print_warning = TRUE;
-        if(print_warning)
-        {
-          printk(KERN_INFO "aic7xxx: WARNING, insufficient tag_info instances for"
-                           " installed controllers.\n");
-          printk(KERN_INFO "aic7xxx: Please update the aic7xxx_tag_info array in"
-                           " the aic7xxx.c source file.\n");
-          print_warning = FALSE;
-        }
-        aic_dev->max_q_depth = aic_dev->temp_q_depth =
-                aic7xxx_default_queue_depth;
-      }
-      else
-      {
-
-        if (aic7xxx_tag_info[p->instance].tag_commands[tindex] == 255)
-        {
-          tag_enabled = FALSE;
-        }
-        else if (aic7xxx_tag_info[p->instance].tag_commands[tindex] == 0)
-        {
-          aic_dev->max_q_depth = aic_dev->temp_q_depth =
-                  aic7xxx_default_queue_depth;
-        }
-        else
-        {
-          aic_dev->max_q_depth = aic_dev->temp_q_depth = 
-            aic7xxx_tag_info[p->instance].tag_commands[tindex];
-        }
-      }
-    }
-  }
-  if (tag_enabled)
-  {
-    if (aic7xxx_verbose & VERBOSE_NEGOTIATION2)
-    {
-          printk(INFO_LEAD "Tagged queuing enabled, queue depth %d.\n",
-            p->host_no, device->channel, device->id,
-            device->lun, aic_dev->max_q_depth);
-    }
-    scsi_adjust_queue_depth(device, MSG_ORDERED_TAG, aic_dev->max_q_depth);
-  }
-  else
-  {
-    if (aic7xxx_verbose & VERBOSE_NEGOTIATION2)
-    {
-          printk(INFO_LEAD "Tagged queuing disabled, queue depth %d.\n",
-            p->host_no, device->channel, device->id,
-            device->lun, device->host->cmd_per_lun);
-    }
-    scsi_adjust_queue_depth(device, 0, device->host->cmd_per_lun);
-  }
-  return;
-}
-
-/*+F*************************************************************************
- * Function:
- *   aic7xxx_slave_destroy
- *
- * Description:
- *   prepare for this device to go away
- *-F*************************************************************************/
-static void
-aic7xxx_slave_destroy(struct scsi_device *SDptr)
-{
-  struct aic_dev_data *aic_dev = SDptr->hostdata;
-
-  list_del(&aic_dev->list);
-  SDptr->hostdata = NULL;
-  kfree(aic_dev);
-  return;
-}
-
-/*+F*************************************************************************
- * Function:
- *   aic7xxx_slave_configure
- *
- * Description:
- *   Configure the device we are attaching to the controller.  This is
- *   where we get to do things like scan the INQUIRY data, set queue
- *   depths, allocate command structs, etc.
- *-F*************************************************************************/
-static int
-aic7xxx_slave_configure(struct scsi_device *SDptr)
-{
-  struct aic7xxx_host *p = (struct aic7xxx_host *) SDptr->host->hostdata;
-  struct aic_dev_data *aic_dev;
-  int scbnum;
-
-  aic_dev = (struct aic_dev_data *)SDptr->hostdata;
-
-  aic7xxx_init_transinfo(p, aic_dev);
-  aic7xxx_device_queue_depth(p, SDptr);
-  if(list_empty(&aic_dev->list))
-    list_add_tail(&aic_dev->list, &p->aic_devs);
-
-  scbnum = 0;
-  list_for_each_entry(aic_dev, &p->aic_devs, list) {
-    scbnum += aic_dev->max_q_depth;
-  }
-  while (scbnum > p->scb_data->numscbs)
-  {
-    /*
-     * Pre-allocate the needed SCBs to get around the possibility of having
-     * to allocate some when memory is more or less exhausted and we need
-     * the SCB in order to perform a swap operation (possible deadlock)
-     */
-    if ( aic7xxx_allocate_scb(p) == 0 )
-      break;
-  }
-
-
-  return(0);
-}
-
-/*+F*************************************************************************
- * Function:
- *   aic7xxx_probe
- *
- * Description:
- *   Probing for EISA boards: it looks like the first two bytes
- *   are a manufacturer code - three characters, five bits each:
- *
- *               BYTE 0   BYTE 1   BYTE 2   BYTE 3
- *              ?1111122 22233333 PPPPPPPP RRRRRRRR
- *
- *   The characters are baselined off ASCII '@', so add that value
- *   to each to get the real ASCII code for it. The next two bytes
- *   appear to be a product and revision number, probably vendor-
- *   specific. This is what is being searched for at each port,
- *   and what should probably correspond to the ID= field in the
- *   ECU's .cfg file for the card - if your card is not detected,
- *   make sure your signature is listed in the array.
- *
- *   The fourth byte's lowest bit seems to be an enabled/disabled
- *   flag (rest of the bits are reserved?).
- *
- * NOTE:  This function is only needed on Intel and Alpha platforms,
- *   the other platforms we support don't have EISA/VLB busses.  So,
- *   we #ifdef this entire function to avoid compiler warnings about
- *   an unused function.
- *-F*************************************************************************/
-#if defined(__i386__) || defined(__alpha__)
-static int
-aic7xxx_probe(int slot, int base, ahc_flag_type *flags)
-{
-  int i;
-  unsigned char buf[4];
-
-  static struct {
-    int n;
-    unsigned char signature[sizeof(buf)];
-    ahc_chip type;
-    int bios_disabled;
-  } AIC7xxx[] = {
-    { 4, { 0x04, 0x90, 0x77, 0x70 },
-      AHC_AIC7770|AHC_EISA, FALSE },  /* mb 7770  */
-    { 4, { 0x04, 0x90, 0x77, 0x71 },
-      AHC_AIC7770|AHC_EISA, FALSE }, /* host adapter 274x */
-    { 4, { 0x04, 0x90, 0x77, 0x56 },
-      AHC_AIC7770|AHC_VL, FALSE }, /* 284x BIOS enabled */
-    { 4, { 0x04, 0x90, 0x77, 0x57 },
-      AHC_AIC7770|AHC_VL, TRUE }   /* 284x BIOS disabled */
-  };
-
-  /*
-   * The VL-bus cards need to be primed by
-   * writing before a signature check.
-   */
-  for (i = 0; i < sizeof(buf); i++)
-  {
-    outb(0x80 + i, base);
-    buf[i] = inb(base + i);
-  }
-
-  for (i = 0; i < ARRAY_SIZE(AIC7xxx); i++)
-  {
-    /*
-     * Signature match on enabled card?
-     */
-    if (!memcmp(buf, AIC7xxx[i].signature, AIC7xxx[i].n))
-    {
-      if (inb(base + 4) & 1)
-      {
-        if (AIC7xxx[i].bios_disabled)
-        {
-          *flags |= AHC_USEDEFAULTS;
-        }
-        else
-        {
-          *flags |= AHC_BIOS_ENABLED;
-        }
-        return (i);
-      }
-
-      printk("aic7xxx: <Adaptec 7770 SCSI Host Adapter> "
-             "disabled at slot %d, ignored.\n", slot);
-    }
-  }
-
-  return (-1);
-}
-#endif /* (__i386__) || (__alpha__) */
-
-
-/*+F*************************************************************************
- * Function:
- *   read_2840_seeprom
- *
- * Description:
- *   Reads the 2840 serial EEPROM and returns 1 if successful and 0 if
- *   not successful.
- *
- *   See read_seeprom (for the 2940) for the instruction set of the 93C46
- *   chip.
- *
- *   The 2840 interface to the 93C46 serial EEPROM is through the
- *   STATUS_2840 and SEECTL_2840 registers.  The CS_2840, CK_2840, and
- *   DO_2840 bits of the SEECTL_2840 register are connected to the chip
- *   select, clock, and data out lines respectively of the serial EEPROM.
- *   The DI_2840 bit of the STATUS_2840 is connected to the data in line
- *   of the serial EEPROM.  The EEPROM_TF bit of STATUS_2840 register is
- *   useful in that it gives us an 800 nsec timer.  After a read from the
- *   SEECTL_2840 register the timing flag is cleared and goes high 800 nsec
- *   later.
- *-F*************************************************************************/
-static int
-read_284x_seeprom(struct aic7xxx_host *p, struct seeprom_config *sc)
-{
-  int i = 0, k = 0;
-  unsigned char temp;
-  unsigned short checksum = 0;
-  unsigned short *seeprom = (unsigned short *) sc;
-  struct seeprom_cmd {
-    unsigned char len;
-    unsigned char bits[3];
-  };
-  struct seeprom_cmd seeprom_read = {3, {1, 1, 0}};
-
-#define CLOCK_PULSE(p) \
-  while ((aic_inb(p, STATUS_2840) & EEPROM_TF) == 0)        \
-  {                                                \
-    ;  /* Do nothing */                                \
-  }                                                \
-  (void) aic_inb(p, SEECTL_2840);
-
-  /*
-   * Read the first 32 registers of the seeprom.  For the 2840,
-   * the 93C46 SEEPROM is a 1024-bit device with 64 16-bit registers
-   * but only the first 32 are used by Adaptec BIOS.  The loop
-   * will range from 0 to 31.
-   */
-  for (k = 0; k < (sizeof(*sc) / 2); k++)
-  {
-    /*
-     * Send chip select for one clock cycle.
-     */
-    aic_outb(p, CK_2840 | CS_2840, SEECTL_2840);
-    CLOCK_PULSE(p);
-
-    /*
-     * Now we're ready to send the read command followed by the
-     * address of the 16-bit register we want to read.
-     */
-    for (i = 0; i < seeprom_read.len; i++)
-    {
-      temp = CS_2840 | seeprom_read.bits[i];
-      aic_outb(p, temp, SEECTL_2840);
-      CLOCK_PULSE(p);
-      temp = temp ^ CK_2840;
-      aic_outb(p, temp, SEECTL_2840);
-      CLOCK_PULSE(p);
-    }
-    /*
-     * Send the 6 bit address (MSB first, LSB last).
-     */
-    for (i = 5; i >= 0; i--)
-    {
-      temp = k;
-      temp = (temp >> i) & 1;  /* Mask out all but lower bit. */
-      temp = CS_2840 | temp;
-      aic_outb(p, temp, SEECTL_2840);
-      CLOCK_PULSE(p);
-      temp = temp ^ CK_2840;
-      aic_outb(p, temp, SEECTL_2840);
-      CLOCK_PULSE(p);
-    }
-
-    /*
-     * Now read the 16 bit register.  An initial 0 precedes the
-     * register contents which begins with bit 15 (MSB) and ends
-     * with bit 0 (LSB).  The initial 0 will be shifted off the
-     * top of our word as we let the loop run from 0 to 16.
-     */
-    for (i = 0; i <= 16; i++)
-    {
-      temp = CS_2840;
-      aic_outb(p, temp, SEECTL_2840);
-      CLOCK_PULSE(p);
-      temp = temp ^ CK_2840;
-      seeprom[k] = (seeprom[k] << 1) | (aic_inb(p, STATUS_2840) & DI_2840);
-      aic_outb(p, temp, SEECTL_2840);
-      CLOCK_PULSE(p);
-    }
-    /*
-     * The serial EEPROM has a checksum in the last word.  Keep a
-     * running checksum for all words read except for the last
-     * word.  We'll verify the checksum after all words have been
-     * read.
-     */
-    if (k < (sizeof(*sc) / 2) - 1)
-    {
-      checksum = checksum + seeprom[k];
-    }
-
-    /*
-     * Reset the chip select for the next command cycle.
-     */
-    aic_outb(p, 0, SEECTL_2840);
-    CLOCK_PULSE(p);
-    aic_outb(p, CK_2840, SEECTL_2840);
-    CLOCK_PULSE(p);
-    aic_outb(p, 0, SEECTL_2840);
-    CLOCK_PULSE(p);
-  }
-
-#if 0
-  printk("Computed checksum 0x%x, checksum read 0x%x\n", checksum, sc->checksum);
-  printk("Serial EEPROM:");
-  for (k = 0; k < (sizeof(*sc) / 2); k++)
-  {
-    if (((k % 8) == 0) && (k != 0))
-    {
-      printk("\n              ");
-    }
-    printk(" 0x%x", seeprom[k]);
-  }
-  printk("\n");
-#endif
-
-  if (checksum != sc->checksum)
-  {
-    printk("aic7xxx: SEEPROM checksum error, ignoring SEEPROM settings.\n");
-    return (0);
-  }
-
-  return (1);
-#undef CLOCK_PULSE
-}
-
-#define CLOCK_PULSE(p)                                               \
-  do {                                                               \
-    int limit = 0;                                                   \
-    do {                                                             \
-      mb();                                                          \
-      pause_sequencer(p);  /* This is just to generate some PCI */   \
-                           /* traffic so the PCI read is flushed */  \
-                           /* it shouldn't be needed, but some */    \
-                           /* chipsets do indeed appear to need */   \
-                           /* something to force PCI reads to get */ \
-                           /* flushed */                             \
-      udelay(1);           /* Do nothing */                          \
-    } while (((aic_inb(p, SEECTL) & SEERDY) == 0) && (++limit < 1000)); \
-  } while(0)
-
-/*+F*************************************************************************
- * Function:
- *   acquire_seeprom
- *
- * Description:
- *   Acquires access to the memory port on PCI controllers.
- *-F*************************************************************************/
-static int
-acquire_seeprom(struct aic7xxx_host *p)
-{
-
-  /*
-   * Request access of the memory port.  When access is
-   * granted, SEERDY will go high.  We use a 1 second
-   * timeout which should be near 1 second more than
-   * is needed.  Reason: after the 7870 chip reset, there
-   * should be no contention.
-   */
-  aic_outb(p, SEEMS, SEECTL);
-  CLOCK_PULSE(p);
-  if ((aic_inb(p, SEECTL) & SEERDY) == 0)
-  {
-    aic_outb(p, 0, SEECTL);
-    return (0);
-  }
-  return (1);
-}
-
-/*+F*************************************************************************
- * Function:
- *   release_seeprom
- *
- * Description:
- *   Releases access to the memory port on PCI controllers.
- *-F*************************************************************************/
-static void
-release_seeprom(struct aic7xxx_host *p)
-{
-  /*
-   * Make sure the SEEPROM is ready before we release it.
-   */
-  CLOCK_PULSE(p);
-  aic_outb(p, 0, SEECTL);
-}
-
-/*+F*************************************************************************
- * Function:
- *   read_seeprom
- *
- * Description:
- *   Reads the serial EEPROM and returns 1 if successful and 0 if
- *   not successful.
- *
- *   The instruction set of the 93C46/56/66 chips is as follows:
- *
- *               Start  OP
- *     Function   Bit  Code  Address    Data     Description
- *     -------------------------------------------------------------------
- *     READ        1    10   A5 - A0             Reads data stored in memory,
- *                                               starting at specified address
- *     EWEN        1    00   11XXXX              Write enable must precede
- *                                               all programming modes
- *     ERASE       1    11   A5 - A0             Erase register A5A4A3A2A1A0
- *     WRITE       1    01   A5 - A0   D15 - D0  Writes register
- *     ERAL        1    00   10XXXX              Erase all registers
- *     WRAL        1    00   01XXXX    D15 - D0  Writes to all registers
- *     EWDS        1    00   00XXXX              Disables all programming
- *                                               instructions
- *     *Note: A value of X for address is a don't care condition.
- *     *Note: The 93C56 and 93C66 have 8 address bits.
- * 
- *
- *   The 93C46 has a four wire interface: clock, chip select, data in, and
- *   data out.  In order to perform one of the above functions, you need
- *   to enable the chip select for a clock period (typically a minimum of
- *   1 usec, with the clock high and low a minimum of 750 and 250 nsec
- *   respectively.  While the chip select remains high, you can clock in
- *   the instructions (above) starting with the start bit, followed by the
- *   OP code, Address, and Data (if needed).  For the READ instruction, the
- *   requested 16-bit register contents is read from the data out line but
- *   is preceded by an initial zero (leading 0, followed by 16-bits, MSB
- *   first).  The clock cycling from low to high initiates the next data
- *   bit to be sent from the chip.
- *
- *   The 78xx interface to the 93C46 serial EEPROM is through the SEECTL
- *   register.  After successful arbitration for the memory port, the
- *   SEECS bit of the SEECTL register is connected to the chip select.
- *   The SEECK, SEEDO, and SEEDI are connected to the clock, data out,
- *   and data in lines respectively.  The SEERDY bit of SEECTL is useful
- *   in that it gives us an 800 nsec timer.  After a write to the SEECTL
- *   register, the SEERDY goes high 800 nsec later.  The one exception
- *   to this is when we first request access to the memory port.  The
- *   SEERDY goes high to signify that access has been granted and, for
- *   this case, has no implied timing.
- *-F*************************************************************************/
-static int
-read_seeprom(struct aic7xxx_host *p, int offset, 
-    unsigned short *scarray, unsigned int len, seeprom_chip_type chip)
-{
-  int i = 0, k;
-  unsigned char temp;
-  unsigned short checksum = 0;
-  struct seeprom_cmd {
-    unsigned char len;
-    unsigned char bits[3];
-  };
-  struct seeprom_cmd seeprom_read = {3, {1, 1, 0}};
-
-  /*
-   * Request access of the memory port.
-   */
-  if (acquire_seeprom(p) == 0)
-  {
-    return (0);
-  }
-
-  /*
-   * Read 'len' registers of the seeprom.  For the 7870, the 93C46
-   * SEEPROM is a 1024-bit device with 64 16-bit registers but only
-   * the first 32 are used by Adaptec BIOS.  Some adapters use the
-   * 93C56 SEEPROM which is a 2048-bit device.  The loop will range
-   * from 0 to 'len' - 1.
-   */
-  for (k = 0; k < len; k++)
-  {
-    /*
-     * Send chip select for one clock cycle.
-     */
-    aic_outb(p, SEEMS | SEECK | SEECS, SEECTL);
-    CLOCK_PULSE(p);
-
-    /*
-     * Now we're ready to send the read command followed by the
-     * address of the 16-bit register we want to read.
-     */
-    for (i = 0; i < seeprom_read.len; i++)
-    {
-      temp = SEEMS | SEECS | (seeprom_read.bits[i] << 1);
-      aic_outb(p, temp, SEECTL);
-      CLOCK_PULSE(p);
-      temp = temp ^ SEECK;
-      aic_outb(p, temp, SEECTL);
-      CLOCK_PULSE(p);
-    }
-    /*
-     * Send the 6 or 8 bit address (MSB first, LSB last).
-     */
-    for (i = ((int) chip - 1); i >= 0; i--)
-    {
-      temp = k + offset;
-      temp = (temp >> i) & 1;  /* Mask out all but lower bit. */
-      temp = SEEMS | SEECS | (temp << 1);
-      aic_outb(p, temp, SEECTL);
-      CLOCK_PULSE(p);
-      temp = temp ^ SEECK;
-      aic_outb(p, temp, SEECTL);
-      CLOCK_PULSE(p);
-    }
-
-    /*
-     * Now read the 16 bit register.  An initial 0 precedes the
-     * register contents which begins with bit 15 (MSB) and ends
-     * with bit 0 (LSB).  The initial 0 will be shifted off the
-     * top of our word as we let the loop run from 0 to 16.
-     */
-    for (i = 0; i <= 16; i++)
-    {
-      temp = SEEMS | SEECS;
-      aic_outb(p, temp, SEECTL);
-      CLOCK_PULSE(p);
-      temp = temp ^ SEECK;
-      scarray[k] = (scarray[k] << 1) | (aic_inb(p, SEECTL) & SEEDI);
-      aic_outb(p, temp, SEECTL);
-      CLOCK_PULSE(p);
-    }
-
-    /*
-     * The serial EEPROM should have a checksum in the last word.
-     * Keep a running checksum for all words read except for the
-     * last word.  We'll verify the checksum after all words have
-     * been read.
-     */
-    if (k < (len - 1))
-    {
-      checksum = checksum + scarray[k];
-    }
-
-    /*
-     * Reset the chip select for the next command cycle.
-     */
-    aic_outb(p, SEEMS, SEECTL);
-    CLOCK_PULSE(p);
-    aic_outb(p, SEEMS | SEECK, SEECTL);
-    CLOCK_PULSE(p);
-    aic_outb(p, SEEMS, SEECTL);
-    CLOCK_PULSE(p);
-  }
-
-  /*
-   * Release access to the memory port and the serial EEPROM.
-   */
-  release_seeprom(p);
-
-#if 0
-  printk("Computed checksum 0x%x, checksum read 0x%x\n",
-         checksum, scarray[len - 1]);
-  printk("Serial EEPROM:");
-  for (k = 0; k < len; k++)
-  {
-    if (((k % 8) == 0) && (k != 0))
-    {
-      printk("\n              ");
-    }
-    printk(" 0x%x", scarray[k]);
-  }
-  printk("\n");
-#endif
-  if ( (checksum != scarray[len - 1]) || (checksum == 0) )
-  {
-    return (0);
-  }
-
-  return (1);
-}
-
-/*+F*************************************************************************
- * Function:
- *   read_brdctl
- *
- * Description:
- *   Reads the BRDCTL register.
- *-F*************************************************************************/
-static unsigned char
-read_brdctl(struct aic7xxx_host *p)
-{
-  unsigned char brdctl, value;
-
-  /*
-   * Make sure the SEEPROM is ready before we access it
-   */
-  CLOCK_PULSE(p);
-  if (p->features & AHC_ULTRA2)
-  {
-    brdctl = BRDRW_ULTRA2;
-    aic_outb(p, brdctl, BRDCTL);
-    CLOCK_PULSE(p);
-    value = aic_inb(p, BRDCTL);
-    CLOCK_PULSE(p);
-    return(value);
-  }
-  brdctl = BRDRW;
-  if ( !((p->chip & AHC_CHIPID_MASK) == AHC_AIC7895) ||
-        (p->flags & AHC_CHNLB) )
-  {
-    brdctl |= BRDCS;
-  }
-  aic_outb(p, brdctl, BRDCTL);
-  CLOCK_PULSE(p);
-  value = aic_inb(p, BRDCTL);
-  CLOCK_PULSE(p);
-  aic_outb(p, 0, BRDCTL);
-  CLOCK_PULSE(p);
-  return (value);
-}
-
-/*+F*************************************************************************
- * Function:
- *   write_brdctl
- *
- * Description:
- *   Writes a value to the BRDCTL register.
- *-F*************************************************************************/
-static void
-write_brdctl(struct aic7xxx_host *p, unsigned char value)
-{
-  unsigned char brdctl;
-
-  /*
-   * Make sure the SEEPROM is ready before we access it
-   */
-  CLOCK_PULSE(p);
-  if (p->features & AHC_ULTRA2)
-  {
-    brdctl = value;
-    aic_outb(p, brdctl, BRDCTL);
-    CLOCK_PULSE(p);
-    brdctl |= BRDSTB_ULTRA2;
-    aic_outb(p, brdctl, BRDCTL);
-    CLOCK_PULSE(p);
-    brdctl &= ~BRDSTB_ULTRA2;
-    aic_outb(p, brdctl, BRDCTL);
-    CLOCK_PULSE(p);
-    read_brdctl(p);
-    CLOCK_PULSE(p);
-  }
-  else
-  {
-    brdctl = BRDSTB;
-    if ( !((p->chip & AHC_CHIPID_MASK) == AHC_AIC7895) ||
-          (p->flags & AHC_CHNLB) )
-    {
-      brdctl |= BRDCS;
-    }
-    brdctl = BRDSTB | BRDCS;
-    aic_outb(p, brdctl, BRDCTL);
-    CLOCK_PULSE(p);
-    brdctl |= value;
-    aic_outb(p, brdctl, BRDCTL);
-    CLOCK_PULSE(p);
-    brdctl &= ~BRDSTB;
-    aic_outb(p, brdctl, BRDCTL);
-    CLOCK_PULSE(p);
-    brdctl &= ~BRDCS;
-    aic_outb(p, brdctl, BRDCTL);
-    CLOCK_PULSE(p);
-  }
-}
-
-/*+F*************************************************************************
- * Function:
- *   aic785x_cable_detect
- *
- * Description:
- *   Detect the cables that are present on aic785x class controller chips
- *-F*************************************************************************/
-static void
-aic785x_cable_detect(struct aic7xxx_host *p, int *int_50,
-    int *ext_present, int *eeprom)
-{
-  unsigned char brdctl;
-
-  aic_outb(p, BRDRW | BRDCS, BRDCTL);
-  CLOCK_PULSE(p);
-  aic_outb(p, 0, BRDCTL);
-  CLOCK_PULSE(p);
-  brdctl = aic_inb(p, BRDCTL);
-  CLOCK_PULSE(p);
-  *int_50 = !(brdctl & BRDDAT5);
-  *ext_present = !(brdctl & BRDDAT6);
-  *eeprom = (aic_inb(p, SPIOCAP) & EEPROM);
-}
-
-#undef CLOCK_PULSE
-
-/*+F*************************************************************************
- * Function:
- *   aic2940_uwpro_cable_detect
- *
- * Description:
- *   Detect the cables that are present on the 2940-UWPro cards
- *
- * NOTE: This function assumes the SEEPROM will have already been acquired
- *       prior to invocation of this function.
- *-F*************************************************************************/
-static void
-aic2940_uwpro_wide_cable_detect(struct aic7xxx_host *p, int *int_68,
-    int *ext_68, int *eeprom)
-{
-  unsigned char brdctl;
-
-  /*
-   * First read the status of our cables.  Set the rom bank to
-   * 0 since the bank setting serves as a multiplexor for the
-   * cable detection logic.  BRDDAT5 controls the bank switch.
-   */
-  write_brdctl(p, 0);
-
-  /*
-   * Now we read the state of the internal 68 connector.  BRDDAT6
-   * is don't care, BRDDAT7 is internal 68.  The cable is
-   * present if the bit is 0
-   */
-  brdctl = read_brdctl(p);
-  *int_68 = !(brdctl & BRDDAT7);
-
-  /*
-   * Set the bank bit in brdctl and then read the external cable state
-   * and the EEPROM status
-   */
-  write_brdctl(p, BRDDAT5);
-  brdctl = read_brdctl(p);
-
-  *ext_68 = !(brdctl & BRDDAT6);
-  *eeprom = !(brdctl & BRDDAT7);
-
-  /*
-   * We're done, the calling function will release the SEEPROM for us
-   */
-}
-
-/*+F*************************************************************************
- * Function:
- *   aic787x_cable_detect
- *
- * Description:
- *   Detect the cables that are present on aic787x class controller chips
- *
- * NOTE: This function assumes the SEEPROM will have already been acquired
- *       prior to invocation of this function.
- *-F*************************************************************************/
-static void
-aic787x_cable_detect(struct aic7xxx_host *p, int *int_50, int *int_68,
-    int *ext_present, int *eeprom)
-{
-  unsigned char brdctl;
-
-  /*
-   * First read the status of our cables.  Set the rom bank to
-   * 0 since the bank setting serves as a multiplexor for the
-   * cable detection logic.  BRDDAT5 controls the bank switch.
-   */
-  write_brdctl(p, 0);
-
-  /*
-   * Now we read the state of the two internal connectors.  BRDDAT6
-   * is internal 50, BRDDAT7 is internal 68.  For each, the cable is
-   * present if the bit is 0
-   */
-  brdctl = read_brdctl(p);
-  *int_50 = !(brdctl & BRDDAT6);
-  *int_68 = !(brdctl & BRDDAT7);
-
-  /*
-   * Set the bank bit in brdctl and then read the external cable state
-   * and the EEPROM status
-   */
-  write_brdctl(p, BRDDAT5);
-  brdctl = read_brdctl(p);
-
-  *ext_present = !(brdctl & BRDDAT6);
-  *eeprom = !(brdctl & BRDDAT7);
-
-  /*
-   * We're done, the calling function will release the SEEPROM for us
-   */
-}
-
-/*+F*************************************************************************
- * Function:
- *   aic787x_ultra2_term_detect
- *
- * Description:
- *   Detect the termination settings present on ultra2 class controllers
- *
- * NOTE: This function assumes the SEEPROM will have already been acquired
- *       prior to invocation of this function.
- *-F*************************************************************************/
-static void
-aic7xxx_ultra2_term_detect(struct aic7xxx_host *p, int *enableSE_low,
-                           int *enableSE_high, int *enableLVD_low,
-                           int *enableLVD_high, int *eprom_present)
-{
-  unsigned char brdctl;
-
-  brdctl = read_brdctl(p);
-
-  *eprom_present  = (brdctl & BRDDAT7);
-  *enableSE_high  = (brdctl & BRDDAT6);
-  *enableSE_low   = (brdctl & BRDDAT5);
-  *enableLVD_high = (brdctl & BRDDAT4);
-  *enableLVD_low  = (brdctl & BRDDAT3);
-}
-
-/*+F*************************************************************************
- * Function:
- *   configure_termination
- *
- * Description:
- *   Configures the termination settings on PCI adapters that have
- *   SEEPROMs available.
- *-F*************************************************************************/
-static void
-configure_termination(struct aic7xxx_host *p)
-{
-  int internal50_present = 0;
-  int internal68_present = 0;
-  int external_present = 0;
-  int eprom_present = 0;
-  int enableSE_low = 0;
-  int enableSE_high = 0;
-  int enableLVD_low = 0;
-  int enableLVD_high = 0;
-  unsigned char brddat = 0;
-  unsigned char max_target = 0;
-  unsigned char sxfrctl1 = aic_inb(p, SXFRCTL1);
-
-  if (acquire_seeprom(p))
-  {
-    if (p->features & (AHC_WIDE|AHC_TWIN))
-      max_target = 16;
-    else
-      max_target = 8;
-    aic_outb(p, SEEMS | SEECS, SEECTL);
-    sxfrctl1 &= ~STPWEN;
-    /*
-     * The termination/cable detection logic is split into three distinct
-     * groups.  Ultra2 and later controllers, 2940UW-Pro controllers, and
-     * older 7850, 7860, 7870, 7880, and 7895 controllers.  Each has its
-     * own unique way of detecting their cables and writing the results
-     * back to the card.
-     */
-    if (p->features & AHC_ULTRA2)
-    {
-      /*
-       * As long as user hasn't overridden term settings, always check the
-       * cable detection logic
-       */
-      if (aic7xxx_override_term == -1)
-      {
-        aic7xxx_ultra2_term_detect(p, &enableSE_low, &enableSE_high,
-                                   &enableLVD_low, &enableLVD_high,
-                                   &eprom_present);
-      }
-      
-      /*
-       * If the user is overriding settings, then they have been preserved
-       * to here as fake adapter_control entries.  Parse them and allow
-       * them to override the detected settings (if we even did detection).
-       */
-      if (!(p->adapter_control & CFSEAUTOTERM))
-      {
-        enableSE_low = (p->adapter_control & CFSTERM);
-        enableSE_high = (p->adapter_control & CFWSTERM);
-      }
-      if (!(p->adapter_control & CFAUTOTERM))
-      {
-        enableLVD_low = enableLVD_high = (p->adapter_control & CFLVDSTERM);
-      }
-
-      /*
-       * Now take those settings that we have and translate them into the
-       * values that must be written into the registers.
-       *
-       * Flash Enable = BRDDAT7
-       * Secondary High Term Enable = BRDDAT6
-       * Secondary Low Term Enable = BRDDAT5
-       * LVD/Primary High Term Enable = BRDDAT4
-       * LVD/Primary Low Term Enable = STPWEN bit in SXFRCTL1
-       */
-      if (enableLVD_low != 0)
-      {
-        sxfrctl1 |= STPWEN;
-        p->flags |= AHC_TERM_ENB_LVD;
-        if (aic7xxx_verbose & VERBOSE_PROBE2)
-          printk(KERN_INFO "(scsi%d) LVD/Primary Low byte termination "
-                 "Enabled\n", p->host_no);
-      }
-          
-      if (enableLVD_high != 0)
-      {
-        brddat |= BRDDAT4;
-        if (aic7xxx_verbose & VERBOSE_PROBE2)
-          printk(KERN_INFO "(scsi%d) LVD/Primary High byte termination "
-                 "Enabled\n", p->host_no);
-      }
-
-      if (enableSE_low != 0)
-      {
-        brddat |= BRDDAT5;
-        if (aic7xxx_verbose & VERBOSE_PROBE2)
-          printk(KERN_INFO "(scsi%d) Secondary Low byte termination "
-                 "Enabled\n", p->host_no);
-      }
-
-      if (enableSE_high != 0)
-      {
-        brddat |= BRDDAT6;
-        if (aic7xxx_verbose & VERBOSE_PROBE2)
-          printk(KERN_INFO "(scsi%d) Secondary High byte termination "
-                 "Enabled\n", p->host_no);
-      }
-    }
-    else if (p->features & AHC_NEW_AUTOTERM)
-    {
-      /*
-       * The 50 pin connector termination is controlled by STPWEN in the
-       * SXFRCTL1 register.  Since the Adaptec docs typically say the
-       * controller is not allowed to be in the middle of a cable and
-       * this is the only connection on that stub of the bus, there is
-       * no need to even check for narrow termination, it's simply
-       * always on.
-       */
-      sxfrctl1 |= STPWEN;
-      if (aic7xxx_verbose & VERBOSE_PROBE2)
-        printk(KERN_INFO "(scsi%d) Narrow channel termination Enabled\n",
-               p->host_no);
-
-      if (p->adapter_control & CFAUTOTERM)
-      {
-        aic2940_uwpro_wide_cable_detect(p, &internal68_present,
-                                        &external_present,
-                                        &eprom_present);
-        printk(KERN_INFO "(scsi%d) Cables present (Int-50 %s, Int-68 %s, "
-               "Ext-68 %s)\n", p->host_no,
-               "Don't Care",
-               internal68_present ? "YES" : "NO",
-               external_present ? "YES" : "NO");
-        if (aic7xxx_verbose & VERBOSE_PROBE2)
-          printk(KERN_INFO "(scsi%d) EEPROM %s present.\n", p->host_no,
-               eprom_present ? "is" : "is not");
-        if (internal68_present && external_present)
-        {
-          brddat = 0;
-          p->flags &= ~AHC_TERM_ENB_SE_HIGH;
-          if (aic7xxx_verbose & VERBOSE_PROBE2)
-            printk(KERN_INFO "(scsi%d) Wide channel termination Disabled\n",
-                   p->host_no);
-        }
-        else
-        {
-          brddat = BRDDAT6;
-          p->flags |= AHC_TERM_ENB_SE_HIGH;
-          if (aic7xxx_verbose & VERBOSE_PROBE2)
-            printk(KERN_INFO "(scsi%d) Wide channel termination Enabled\n",
-                   p->host_no);
-        }
-      }
-      else
-      {
-        /*
-         * The termination of the Wide channel is done more like normal
-         * though, and the setting of this termination is done by writing
-         * either a 0 or 1 to BRDDAT6 of the BRDDAT register
-         */
-        if (p->adapter_control & CFWSTERM)
-        {
-          brddat = BRDDAT6;
-          p->flags |= AHC_TERM_ENB_SE_HIGH;
-          if (aic7xxx_verbose & VERBOSE_PROBE2)
-            printk(KERN_INFO "(scsi%d) Wide channel termination Enabled\n",
-                   p->host_no);
-        }
-        else
-        {
-          brddat = 0;
-        }
-      }
-    }
-    else
-    {
-      if (p->adapter_control & CFAUTOTERM)
-      {
-        if (p->flags & AHC_MOTHERBOARD)
-        {
-          printk(KERN_INFO "(scsi%d) Warning - detected auto-termination\n",
-                 p->host_no);
-          printk(KERN_INFO "(scsi%d) Please verify driver detected settings "
-            "are correct.\n", p->host_no);
-          printk(KERN_INFO "(scsi%d) If not, then please properly set the "
-            "device termination\n", p->host_no);
-          printk(KERN_INFO "(scsi%d) in the Adaptec SCSI BIOS by hitting "
-            "CTRL-A when prompted\n", p->host_no);
-          printk(KERN_INFO "(scsi%d) during machine bootup.\n", p->host_no);
-        }
-        /* Configure auto termination. */
-
-        if ( (p->chip & AHC_CHIPID_MASK) >= AHC_AIC7870 )
-        {
-          aic787x_cable_detect(p, &internal50_present, &internal68_present,
-            &external_present, &eprom_present);
-        }
-        else
-        {
-          aic785x_cable_detect(p, &internal50_present, &external_present,
-            &eprom_present);
-        }
-
-        if (max_target <= 8)
-          internal68_present = 0;
-
-        if (max_target > 8)
-        {
-          printk(KERN_INFO "(scsi%d) Cables present (Int-50 %s, Int-68 %s, "
-                 "Ext-68 %s)\n", p->host_no,
-                 internal50_present ? "YES" : "NO",
-                 internal68_present ? "YES" : "NO",
-                 external_present ? "YES" : "NO");
-        }
-        else
-        {
-          printk(KERN_INFO "(scsi%d) Cables present (Int-50 %s, Ext-50 %s)\n",
-                 p->host_no,
-                 internal50_present ? "YES" : "NO",
-                 external_present ? "YES" : "NO");
-        }
-        if (aic7xxx_verbose & VERBOSE_PROBE2)
-          printk(KERN_INFO "(scsi%d) EEPROM %s present.\n", p->host_no,
-               eprom_present ? "is" : "is not");
-
-        /*
-         * Now set the termination based on what we found.  BRDDAT6
-         * controls wide termination enable.
-         * Flash Enable = BRDDAT7
-         * SE High Term Enable = BRDDAT6
-         */
-        if (internal50_present && internal68_present && external_present)
-        {
-          printk(KERN_INFO "(scsi%d) Illegal cable configuration!!  Only two\n",
-                 p->host_no);
-          printk(KERN_INFO "(scsi%d) connectors on the SCSI controller may be "
-                 "in use at a time!\n", p->host_no);
-          /*
-           * Force termination (low and high byte) on.  This is safer than
-           * leaving it completely off, especially since this message comes
-           * most often from motherboard controllers that don't even have 3
-           * connectors, but instead are failing the cable detection.
-           */
-          internal50_present = external_present = 0;
-          enableSE_high = enableSE_low = 1;
-        }
-
-        if ((max_target > 8) &&
-            ((external_present == 0) || (internal68_present == 0)) )
-        {
-          brddat |= BRDDAT6;
-          p->flags |= AHC_TERM_ENB_SE_HIGH;
-          if (aic7xxx_verbose & VERBOSE_PROBE2)
-            printk(KERN_INFO "(scsi%d) SE High byte termination Enabled\n",
-                   p->host_no);
-        }
-
-        if ( ((internal50_present ? 1 : 0) +
-              (internal68_present ? 1 : 0) +
-              (external_present   ? 1 : 0)) <= 1 )
-        {
-          sxfrctl1 |= STPWEN;
-          p->flags |= AHC_TERM_ENB_SE_LOW;
-          if (aic7xxx_verbose & VERBOSE_PROBE2)
-            printk(KERN_INFO "(scsi%d) SE Low byte termination Enabled\n",
-                   p->host_no);
-        }
-      }
-      else /* p->adapter_control & CFAUTOTERM */
-      {
-        if (p->adapter_control & CFSTERM)
-        {
-          sxfrctl1 |= STPWEN;
-          if (aic7xxx_verbose & VERBOSE_PROBE2)
-            printk(KERN_INFO "(scsi%d) SE Low byte termination Enabled\n",
-                   p->host_no);
-        }
-
-        if (p->adapter_control & CFWSTERM)
-        {
-          brddat |= BRDDAT6;
-          if (aic7xxx_verbose & VERBOSE_PROBE2)
-            printk(KERN_INFO "(scsi%d) SE High byte termination Enabled\n",
-                   p->host_no);
-        }
-      }
-    }
-
-    aic_outb(p, sxfrctl1, SXFRCTL1);
-    write_brdctl(p, brddat);
-    release_seeprom(p);
-  }
-}
-
-/*+F*************************************************************************
- * Function:
- *   detect_maxscb
- *
- * Description:
- *   Detects the maximum number of SCBs for the controller and returns
- *   the count and a mask in p (p->maxscbs, p->qcntmask).
- *-F*************************************************************************/
-static void
-detect_maxscb(struct aic7xxx_host *p)
-{
-  int i;
-
-  /*
-   * It's possible that we've already done this for multichannel
-   * adapters.
-   */
-  if (p->scb_data->maxhscbs == 0)
-  {
-    /*
-     * We haven't initialized the SCB settings yet.  Walk the SCBs to
-     * determince how many there are.
-     */
-    aic_outb(p, 0, FREE_SCBH);
-
-    for (i = 0; i < AIC7XXX_MAXSCB; i++)
-    {
-      aic_outb(p, i, SCBPTR);
-      aic_outb(p, i, SCB_CONTROL);
-      if (aic_inb(p, SCB_CONTROL) != i)
-        break;
-      aic_outb(p, 0, SCBPTR);
-      if (aic_inb(p, SCB_CONTROL) != 0)
-        break;
-
-      aic_outb(p, i, SCBPTR);
-      aic_outb(p, 0, SCB_CONTROL);   /* Clear the control byte. */
-      aic_outb(p, i + 1, SCB_NEXT);  /* Set the next pointer. */
-      aic_outb(p, SCB_LIST_NULL, SCB_TAG);  /* Make the tag invalid. */
-      aic_outb(p, SCB_LIST_NULL, SCB_BUSYTARGETS);  /* no busy untagged */
-      aic_outb(p, SCB_LIST_NULL, SCB_BUSYTARGETS+1);/* targets active yet */
-      aic_outb(p, SCB_LIST_NULL, SCB_BUSYTARGETS+2);
-      aic_outb(p, SCB_LIST_NULL, SCB_BUSYTARGETS+3);
-    }
-
-    /* Make sure the last SCB terminates the free list. */
-    aic_outb(p, i - 1, SCBPTR);
-    aic_outb(p, SCB_LIST_NULL, SCB_NEXT);
-
-    /* Ensure we clear the first (0) SCBs control byte. */
-    aic_outb(p, 0, SCBPTR);
-    aic_outb(p, 0, SCB_CONTROL);
-
-    p->scb_data->maxhscbs = i;
-    /*
-     * Use direct indexing instead for speed
-     */
-    if ( i == AIC7XXX_MAXSCB )
-      p->flags &= ~AHC_PAGESCBS;
-  }
-
-}
-
-/*+F*************************************************************************
- * Function:
- *   aic7xxx_register
- *
- * Description:
- *   Register a Adaptec aic7xxx chip SCSI controller with the kernel.
- *-F*************************************************************************/
-static int
-aic7xxx_register(struct scsi_host_template *template, struct aic7xxx_host *p,
-  int reset_delay)
-{
-  int i, result;
-  int max_targets;
-  int found = 1;
-  unsigned char term, scsi_conf;
-  struct Scsi_Host *host;
-
-  host = p->host;
-
-  p->scb_data->maxscbs = AIC7XXX_MAXSCB;
-  host->can_queue = AIC7XXX_MAXSCB;
-  host->cmd_per_lun = 3;
-  host->sg_tablesize = AIC7XXX_MAX_SG;
-  host->this_id = p->scsi_id;
-  host->io_port = p->base;
-  host->n_io_port = 0xFF;
-  host->base = p->mbase;
-  host->irq = p->irq;
-  if (p->features & AHC_WIDE)
-  {
-    host->max_id = 16;
-  }
-  if (p->features & AHC_TWIN)
-  {
-    host->max_channel = 1;
-  }
-
-  p->host = host;
-  p->host_no = host->host_no;
-  host->unique_id = p->instance;
-  p->isr_count = 0;
-  p->next = NULL;
-  p->completeq.head = NULL;
-  p->completeq.tail = NULL;
-  scbq_init(&p->scb_data->free_scbs);
-  scbq_init(&p->waiting_scbs);
-  INIT_LIST_HEAD(&p->aic_devs);
-
-  /*
-   * We currently have no commands of any type
-   */
-  p->qinfifonext = 0;
-  p->qoutfifonext = 0;
-
-  printk(KERN_INFO "(scsi%d) <%s> found at ", p->host_no,
-    board_names[p->board_name_index]);
-  switch(p->chip)
-  {
-    case (AHC_AIC7770|AHC_EISA):
-      printk("EISA slot %d\n", p->pci_device_fn);
-      break;
-    case (AHC_AIC7770|AHC_VL):
-      printk("VLB slot %d\n", p->pci_device_fn);
-      break;
-    default:
-      printk("PCI %d/%d/%d\n", p->pci_bus, PCI_SLOT(p->pci_device_fn),
-        PCI_FUNC(p->pci_device_fn));
-      break;
-  }
-  if (p->features & AHC_TWIN)
-  {
-    printk(KERN_INFO "(scsi%d) Twin Channel, A SCSI ID %d, B SCSI ID %d, ",
-           p->host_no, p->scsi_id, p->scsi_id_b);
-  }
-  else
-  {
-    char *channel;
-
-    channel = "";
-
-    if ((p->flags & AHC_MULTI_CHANNEL) != 0)
-    {
-      channel = " A";
-
-      if ( (p->flags & (AHC_CHNLB|AHC_CHNLC)) != 0 )
-      {
-        channel = (p->flags & AHC_CHNLB) ? " B" : " C";
-      }
-    }
-    if (p->features & AHC_WIDE)
-    {
-      printk(KERN_INFO "(scsi%d) Wide ", p->host_no);
-    }
-    else
-    {
-      printk(KERN_INFO "(scsi%d) Narrow ", p->host_no);
-    }
-    printk("Channel%s, SCSI ID=%d, ", channel, p->scsi_id);
-  }
-  aic_outb(p, 0, SEQ_FLAGS);
-
-  detect_maxscb(p);
-
-  printk("%d/%d SCBs\n", p->scb_data->maxhscbs, p->scb_data->maxscbs);
-  if (aic7xxx_verbose & VERBOSE_PROBE2)
-  {
-    printk(KERN_INFO "(scsi%d) BIOS %sabled, IO Port 0x%lx, IRQ %d\n",
-      p->host_no, (p->flags & AHC_BIOS_ENABLED) ? "en" : "dis",
-      p->base, p->irq);
-    printk(KERN_INFO "(scsi%d) IO Memory at 0x%lx, MMAP Memory at %p\n",
-      p->host_no, p->mbase, p->maddr);
-  }
-
-#ifdef CONFIG_PCI
-  /*
-   * Now that we know our instance number, we can set the flags we need to
-   * force termination if need be.
-   */
-  if (aic7xxx_stpwlev != -1)
-  {
-    /*
-     * This option only applies to PCI controllers.
-     */
-    if ( (p->chip & ~AHC_CHIPID_MASK) == AHC_PCI)
-    {
-      unsigned char devconfig;
-
-      pci_read_config_byte(p->pdev, DEVCONFIG, &devconfig);
-      if ( (aic7xxx_stpwlev >> p->instance) & 0x01 )
-      {
-        devconfig |= STPWLEVEL;
-        if (aic7xxx_verbose & VERBOSE_PROBE2)
-          printk("(scsi%d) Force setting STPWLEVEL bit\n", p->host_no);
-      }
-      else
-      {
-        devconfig &= ~STPWLEVEL;
-        if (aic7xxx_verbose & VERBOSE_PROBE2)
-          printk("(scsi%d) Force clearing STPWLEVEL bit\n", p->host_no);
-      }
-      pci_write_config_byte(p->pdev, DEVCONFIG, devconfig);
-    }
-  }
-#endif
-
-  /*
-   * That took care of devconfig and stpwlev, now for the actual termination
-   * settings.
-   */
-  if (aic7xxx_override_term != -1)
-  {
-    /*
-     * Again, this only applies to PCI controllers.  We don't have problems
-     * with the termination on 274x controllers to the best of my knowledge.
-     */
-    if ( (p->chip & ~AHC_CHIPID_MASK) == AHC_PCI)
-    {
-      unsigned char term_override;
-
-      term_override = ( (aic7xxx_override_term >> (p->instance * 4)) & 0x0f);
-      p->adapter_control &= 
-        ~(CFSTERM|CFWSTERM|CFLVDSTERM|CFAUTOTERM|CFSEAUTOTERM);
-      if ( (p->features & AHC_ULTRA2) && (term_override & 0x0c) )
-      {
-        p->adapter_control |= CFLVDSTERM;
-      }
-      if (term_override & 0x02)
-      {
-        p->adapter_control |= CFWSTERM;
-      }
-      if (term_override & 0x01)
-      {
-        p->adapter_control |= CFSTERM;
-      }
-    }
-  }
-
-  if ( (p->flags & AHC_SEEPROM_FOUND) || (aic7xxx_override_term != -1) )
-  {
-    if (p->features & AHC_SPIOCAP)
-    {
-      if ( aic_inb(p, SPIOCAP) & SSPIOCPS )
-      /*
-       * Update the settings in sxfrctl1 to match the termination
-       * settings.
-       */
-        configure_termination(p);
-    }
-    else if ((p->chip & AHC_CHIPID_MASK) >= AHC_AIC7870)
-    {
-      configure_termination(p);
-    }
-  }
-
-  /*
-   * Set the SCSI Id, SXFRCTL0, SXFRCTL1, and SIMODE1, for both channels
-   */
-  if (p->features & AHC_TWIN)
-  {
-    /* Select channel B */
-    aic_outb(p, aic_inb(p, SBLKCTL) | SELBUSB, SBLKCTL);
-
-    if ((p->flags & AHC_SEEPROM_FOUND) || (aic7xxx_override_term != -1))
-      term = (aic_inb(p, SXFRCTL1) & STPWEN);
-    else
-      term = ((p->flags & AHC_TERM_ENB_B) ? STPWEN : 0);
-
-    aic_outb(p, p->scsi_id_b, SCSIID);
-    scsi_conf = aic_inb(p, SCSICONF + 1);
-    aic_outb(p, DFON | SPIOEN, SXFRCTL0);
-    aic_outb(p, (scsi_conf & ENSPCHK) | aic7xxx_seltime | term | 
-         ENSTIMER | ACTNEGEN, SXFRCTL1);
-    aic_outb(p, 0, SIMODE0);
-    aic_outb(p, ENSELTIMO | ENSCSIRST | ENSCSIPERR, SIMODE1);
-    aic_outb(p, 0, SCSIRATE);
-
-    /* Select channel A */
-    aic_outb(p, aic_inb(p, SBLKCTL) & ~SELBUSB, SBLKCTL);
-  }
-
-  if (p->features & AHC_ULTRA2)
-  {
-    aic_outb(p, p->scsi_id, SCSIID_ULTRA2);
-  }
-  else
-  {
-    aic_outb(p, p->scsi_id, SCSIID);
-  }
-  if ((p->flags & AHC_SEEPROM_FOUND) || (aic7xxx_override_term != -1))
-    term = (aic_inb(p, SXFRCTL1) & STPWEN);
-  else
-    term = ((p->flags & (AHC_TERM_ENB_A|AHC_TERM_ENB_LVD)) ? STPWEN : 0);
-  scsi_conf = aic_inb(p, SCSICONF);
-  aic_outb(p, DFON | SPIOEN, SXFRCTL0);
-  aic_outb(p, (scsi_conf & ENSPCHK) | aic7xxx_seltime | term | 
-       ENSTIMER | ACTNEGEN, SXFRCTL1);
-  aic_outb(p, 0, SIMODE0);
-  /*
-   * If we are a cardbus adapter then don't enable SCSI reset detection.
-   * We shouldn't likely be sharing SCSI busses with someone else, and
-   * if we don't have a cable currently plugged into the controller then
-   * we won't have a power source for the SCSI termination, which means
-   * we'll see infinite incoming bus resets.
-   */
-  if(p->flags & AHC_NO_STPWEN)
-    aic_outb(p, ENSELTIMO | ENSCSIPERR, SIMODE1);
-  else
-    aic_outb(p, ENSELTIMO | ENSCSIRST | ENSCSIPERR, SIMODE1);
-  aic_outb(p, 0, SCSIRATE);
-  if ( p->features & AHC_ULTRA2)
-    aic_outb(p, 0, SCSIOFFSET);
-
-  /*
-   * Look at the information that board initialization or the board
-   * BIOS has left us. In the lower four bits of each target's
-   * scratch space any value other than 0 indicates that we should
-   * initiate synchronous transfers. If it's zero, the user or the
-   * BIOS has decided to disable synchronous negotiation to that
-   * target so we don't activate the needsdtr flag.
-   */
-  if ((p->features & (AHC_TWIN|AHC_WIDE)) == 0)
-  {
-    max_targets = 8;
-  }
-  else
-  {
-    max_targets = 16;
-  }
-
-  if (!(aic7xxx_no_reset))
-  {
-    /*
-     * If we reset the bus, then clear the transfer settings, else leave
-     * them be.
-     */
-    aic_outb(p, 0, ULTRA_ENB);
-    aic_outb(p, 0, ULTRA_ENB + 1);
-    p->ultraenb = 0;
-  }
-
-  /*
-   * Allocate enough hardware scbs to handle the maximum number of
-   * concurrent transactions we can have.  We have to make sure that
-   * the allocated memory is contiguous memory.  The Linux kmalloc
-   * routine should only allocate contiguous memory, but note that
-   * this could be a problem if kmalloc() is changed.
-   */
-  {
-    size_t array_size;
-    unsigned int hscb_physaddr;
-
-    array_size = p->scb_data->maxscbs * sizeof(struct aic7xxx_hwscb);
-    if (p->scb_data->hscbs == NULL)
-    {
-      /* pci_alloc_consistent enforces the alignment already and
-       * clears the area as well.
-       */
-      p->scb_data->hscbs = pci_alloc_consistent(p->pdev, array_size,
-                                                &p->scb_data->hscbs_dma);
-      /* We have to use pci_free_consistent, not kfree */
-      p->scb_data->hscb_kmalloc_ptr = NULL;
-      p->scb_data->hscbs_dma_len = array_size;
-    }
-    if (p->scb_data->hscbs == NULL)
-    {
-      printk("(scsi%d) Unable to allocate hardware SCB array; "
-             "failing detection.\n", p->host_no);
-      aic_outb(p, 0, SIMODE1);
-      p->irq = 0;
-      return(0);
-    }
-
-    hscb_physaddr = p->scb_data->hscbs_dma;
-    aic_outb(p, hscb_physaddr & 0xFF, HSCB_ADDR);
-    aic_outb(p, (hscb_physaddr >> 8) & 0xFF, HSCB_ADDR + 1);
-    aic_outb(p, (hscb_physaddr >> 16) & 0xFF, HSCB_ADDR + 2);
-    aic_outb(p, (hscb_physaddr >> 24) & 0xFF, HSCB_ADDR + 3);
-
-    /* Set up the fifo areas at the same time */
-    p->untagged_scbs = pci_alloc_consistent(p->pdev, 3*256, &p->fifo_dma);
-    if (p->untagged_scbs == NULL)
-    {
-      printk("(scsi%d) Unable to allocate hardware FIFO arrays; "
-             "failing detection.\n", p->host_no);
-      p->irq = 0;
-      return(0);
-    }
-
-    p->qoutfifo = p->untagged_scbs + 256;
-    p->qinfifo = p->qoutfifo + 256;
-    for (i = 0; i < 256; i++)
-    {
-      p->untagged_scbs[i] = SCB_LIST_NULL;
-      p->qinfifo[i] = SCB_LIST_NULL;
-      p->qoutfifo[i] = SCB_LIST_NULL;
-    }
-
-    hscb_physaddr = p->fifo_dma;
-    aic_outb(p, hscb_physaddr & 0xFF, SCBID_ADDR);
-    aic_outb(p, (hscb_physaddr >> 8) & 0xFF, SCBID_ADDR + 1);
-    aic_outb(p, (hscb_physaddr >> 16) & 0xFF, SCBID_ADDR + 2);
-    aic_outb(p, (hscb_physaddr >> 24) & 0xFF, SCBID_ADDR + 3);
-  }
-
-  /* The Q-FIFOs we just set up are all empty */
-  aic_outb(p, 0, QINPOS);
-  aic_outb(p, 0, KERNEL_QINPOS);
-  aic_outb(p, 0, QOUTPOS);
-
-  if(p->features & AHC_QUEUE_REGS)
-  {
-    aic_outb(p, SCB_QSIZE_256, QOFF_CTLSTA);
-    aic_outb(p, 0, SDSCB_QOFF);
-    aic_outb(p, 0, SNSCB_QOFF);
-    aic_outb(p, 0, HNSCB_QOFF);
-  }
-
-  /*
-   * We don't have any waiting selections or disconnected SCBs.
-   */
-  aic_outb(p, SCB_LIST_NULL, WAITING_SCBH);
-  aic_outb(p, SCB_LIST_NULL, DISCONNECTED_SCBH);
-
-  /*
-   * Message out buffer starts empty
-   */
-  aic_outb(p, MSG_NOOP, MSG_OUT);
-  aic_outb(p, MSG_NOOP, LAST_MSG);
-
-  /*
-   * Set all the other asundry items that haven't been set yet.
-   * This includes just dumping init values to a lot of registers simply
-   * to make sure they've been touched and are ready for use parity wise
-   * speaking.
-   */
-  aic_outb(p, 0, TMODE_CMDADDR);
-  aic_outb(p, 0, TMODE_CMDADDR + 1);
-  aic_outb(p, 0, TMODE_CMDADDR + 2);
-  aic_outb(p, 0, TMODE_CMDADDR + 3);
-  aic_outb(p, 0, TMODE_CMDADDR_NEXT);
-
-  /*
-   * Link us into the list of valid hosts
-   */
-  p->next = first_aic7xxx;
-  first_aic7xxx = p;
-
-  /*
-   * Allocate the first set of scbs for this controller.  This is to stream-
-   * line code elsewhere in the driver.  If we have to check for the existence
-   * of scbs in certain code sections, it slows things down.  However, as
-   * soon as we register the IRQ for this card, we could get an interrupt that
-   * includes possibly the SCSI_RSTI interrupt.  If we catch that interrupt
-   * then we are likely to segfault if we don't have at least one chunk of
-   * SCBs allocated or add checks all through the reset code to make sure
-   * that the SCBs have been allocated which is an invalid running condition
-   * and therefore I think it's preferable to simply pre-allocate the first
-   * chunk of SCBs.
-   */
-  aic7xxx_allocate_scb(p);
-
-  /*
-   * Load the sequencer program, then re-enable the board -
-   * resetting the AIC-7770 disables it, leaving the lights
-   * on with nobody home.
-   */
-  aic7xxx_loadseq(p);
-
-  /*
-   * Make sure the AUTOFLUSHDIS bit is *not* set in the SBLKCTL register
-   */
-  aic_outb(p, aic_inb(p, SBLKCTL) & ~AUTOFLUSHDIS, SBLKCTL);
-
-  if ( (p->chip & AHC_CHIPID_MASK) == AHC_AIC7770 )
-  {
-    aic_outb(p, ENABLE, BCTL);  /* Enable the boards BUS drivers. */
-  }
-
-  if ( !(aic7xxx_no_reset) )
-  {
-    if (p->features & AHC_TWIN)
-    {
-      if (aic7xxx_verbose & VERBOSE_PROBE2)
-        printk(KERN_INFO "(scsi%d) Resetting channel B\n", p->host_no);
-      aic_outb(p, aic_inb(p, SBLKCTL) | SELBUSB, SBLKCTL);
-      aic7xxx_reset_current_bus(p);
-      aic_outb(p, aic_inb(p, SBLKCTL) & ~SELBUSB, SBLKCTL);
-    }
-    /* Reset SCSI bus A. */
-    if (aic7xxx_verbose & VERBOSE_PROBE2)
-    {  /* In case we are a 3940, 3985, or 7895, print the right channel */
-      char *channel = "";
-      if (p->flags & AHC_MULTI_CHANNEL)
-      {
-        channel = " A";
-        if (p->flags & (AHC_CHNLB|AHC_CHNLC))
-          channel = (p->flags & AHC_CHNLB) ? " B" : " C";
-      }
-      printk(KERN_INFO "(scsi%d) Resetting channel%s\n", p->host_no, channel);
-    }
-    
-    aic7xxx_reset_current_bus(p);
-
-  }
-  else
-  {
-    if (!reset_delay)
-    {
-      printk(KERN_INFO "(scsi%d) Not resetting SCSI bus.  Note: Don't use "
-             "the no_reset\n", p->host_no);
-      printk(KERN_INFO "(scsi%d) option unless you have a verifiable need "
-             "for it.\n", p->host_no);
-    }
-  }
-  
-  /*
-   * Register IRQ with the kernel.  Only allow sharing IRQs with
-   * PCI devices.
-   */
-  if (!(p->chip & AHC_PCI))
-  {
-    result = (request_irq(p->irq, do_aic7xxx_isr, 0, "aic7xxx", p));
-  }
-  else
-  {
-    result = (request_irq(p->irq, do_aic7xxx_isr, IRQF_SHARED,
-              "aic7xxx", p));
-    if (result < 0)
-    {
-      result = (request_irq(p->irq, do_aic7xxx_isr, IRQF_DISABLED | IRQF_SHARED,
-              "aic7xxx", p));
-    }
-  }
-  if (result < 0)
-  {
-    printk(KERN_WARNING "(scsi%d) Couldn't register IRQ %d, ignoring "
-           "controller.\n", p->host_no, p->irq);
-    aic_outb(p, 0, SIMODE1);
-    p->irq = 0;
-    return (0);
-  }
-
-  if(aic_inb(p, INTSTAT) & INT_PEND)
-    printk(INFO_LEAD "spurious interrupt during configuration, cleared.\n",
-      p->host_no, -1, -1 , -1);
-  aic7xxx_clear_intstat(p);
-
-  unpause_sequencer(p, /* unpause_always */ TRUE);
-
-  return (found);
-}
-
-/*+F*************************************************************************
- * Function:
- *   aic7xxx_chip_reset
- *
- * Description:
- *   Perform a chip reset on the aic7xxx SCSI controller.  The controller
- *   is paused upon return.
- *-F*************************************************************************/
-static int
-aic7xxx_chip_reset(struct aic7xxx_host *p)
-{
-  unsigned char sblkctl;
-  int wait;
-
-  /*
-   * For some 274x boards, we must clear the CHIPRST bit and pause
-   * the sequencer. For some reason, this makes the driver work.
-   */
-  aic_outb(p, PAUSE | CHIPRST, HCNTRL);
-
-  /*
-   * In the future, we may call this function as a last resort for
-   * error handling.  Let's be nice and not do any unnecessary delays.
-   */
-  wait = 1000;  /* 1 msec (1000 * 1 msec) */
-  while (--wait && !(aic_inb(p, HCNTRL) & CHIPRSTACK))
-  {
-    udelay(1);  /* 1 usec */
-  }
-
-  pause_sequencer(p);
-
-  sblkctl = aic_inb(p, SBLKCTL) & (SELBUSB|SELWIDE);
-  if (p->chip & AHC_PCI)
-    sblkctl &= ~SELBUSB;
-  switch( sblkctl )
-  {
-    case 0:  /* normal narrow card */
-      break;
-    case 2:  /* Wide card */
-      p->features |= AHC_WIDE;
-      break;
-    case 8:  /* Twin card */
-      p->features |= AHC_TWIN;
-      p->flags |= AHC_MULTI_CHANNEL;
-      break;
-    default: /* hmmm...we don't know what this is */
-      printk(KERN_WARNING "aic7xxx: Unsupported adapter type %d, ignoring.\n",
-        aic_inb(p, SBLKCTL) & 0x0a);
-      return(-1);
-  }
-  return(0);
-}
-
-/*+F*************************************************************************
- * Function:
- *   aic7xxx_alloc
- *
- * Description:
- *   Allocate and initialize a host structure.  Returns NULL upon error
- *   and a pointer to a aic7xxx_host struct upon success.
- *-F*************************************************************************/
-static struct aic7xxx_host *
-aic7xxx_alloc(struct scsi_host_template *sht, struct aic7xxx_host *temp)
-{
-  struct aic7xxx_host *p = NULL;
-  struct Scsi_Host *host;
-
-  /*
-   * Allocate a storage area by registering us with the mid-level
-   * SCSI layer.
-   */
-  host = scsi_register(sht, sizeof(struct aic7xxx_host));
-
-  if (host != NULL)
-  {
-    p = (struct aic7xxx_host *) host->hostdata;
-    memset(p, 0, sizeof(struct aic7xxx_host));
-    *p = *temp;
-    p->host = host;
-
-    p->scb_data = kzalloc(sizeof(scb_data_type), GFP_ATOMIC);
-    if (p->scb_data)
-    {
-      scbq_init (&p->scb_data->free_scbs);
-    }
-    else
-    {
-      /*
-       * For some reason we don't have enough memory.  Free the
-       * allocated memory for the aic7xxx_host struct, and return NULL.
-       */
-      release_region(p->base, MAXREG - MINREG);
-      scsi_unregister(host);
-      return(NULL);
-    }
-    p->host_no = host->host_no;
-  }
-  return (p);
-}
-
-/*+F*************************************************************************
- * Function:
- *   aic7xxx_free
- *
- * Description:
- *   Frees and releases all resources associated with an instance of
- *   the driver (struct aic7xxx_host *).
- *-F*************************************************************************/
-static void
-aic7xxx_free(struct aic7xxx_host *p)
-{
-  int i;
-
-  /*
-   * Free the allocated hardware SCB space.
-   */
-  if (p->scb_data != NULL)
-  {
-    struct aic7xxx_scb_dma *scb_dma = NULL;
-    if (p->scb_data->hscbs != NULL)
-    {
-      pci_free_consistent(p->pdev, p->scb_data->hscbs_dma_len,
-                          p->scb_data->hscbs, p->scb_data->hscbs_dma);
-      p->scb_data->hscbs = p->scb_data->hscb_kmalloc_ptr = NULL;
-    }
-    /*
-     * Free the driver SCBs.  These were allocated on an as-need
-     * basis.  We allocated these in groups depending on how many
-     * we could fit into a given amount of RAM.  The tail SCB for
-     * these allocations has a pointer to the alloced area.
-     */
-    for (i = 0; i < p->scb_data->numscbs; i++)
-    {
-      if (p->scb_data->scb_array[i]->scb_dma != scb_dma)
-      {
-        scb_dma = p->scb_data->scb_array[i]->scb_dma;
-        pci_free_consistent(p->pdev, scb_dma->dma_len,
-                            (void *)((unsigned long)scb_dma->dma_address
-                                     - scb_dma->dma_offset),
-                            scb_dma->dma_address);
-      }
-      kfree(p->scb_data->scb_array[i]->kmalloc_ptr);
-      p->scb_data->scb_array[i] = NULL;
-    }
-  
-    /*
-     * Free the SCB data area.
-     */
-    kfree(p->scb_data);
-  }
-
-  pci_free_consistent(p->pdev, 3*256, (void *)p->untagged_scbs, p->fifo_dma);
-}
-
-/*+F*************************************************************************
- * Function:
- *   aic7xxx_load_seeprom
- *
- * Description:
- *   Load the seeprom and configure adapter and target settings.
- *   Returns 1 if the load was successful and 0 otherwise.
- *-F*************************************************************************/
-static void
-aic7xxx_load_seeprom(struct aic7xxx_host *p, unsigned char *sxfrctl1)
-{
-  int have_seeprom = 0;
-  int i, max_targets, mask;
-  unsigned char scsirate, scsi_conf;
-  unsigned short scarray[128];
-  struct seeprom_config *sc = (struct seeprom_config *) scarray;
-
-  if (aic7xxx_verbose & VERBOSE_PROBE2)
-  {
-    printk(KERN_INFO "aic7xxx: Loading serial EEPROM...");
-  }
-  switch (p->chip)
-  {
-    case (AHC_AIC7770|AHC_EISA):  /* None of these adapters have seeproms. */
-      if (aic_inb(p, SCSICONF) & TERM_ENB)
-        p->flags |= AHC_TERM_ENB_A;
-      if ( (p->features & AHC_TWIN) && (aic_inb(p, SCSICONF + 1) & TERM_ENB) )
-        p->flags |= AHC_TERM_ENB_B;
-      break;
-
-    case (AHC_AIC7770|AHC_VL):
-      have_seeprom = read_284x_seeprom(p, (struct seeprom_config *) scarray);
-      break;
-
-    default:
-      have_seeprom = read_seeprom(p, (p->flags & (AHC_CHNLB|AHC_CHNLC)),
-                                  scarray, p->sc_size, p->sc_type);
-      if (!have_seeprom)
-      {
-        if(p->sc_type == C46)
-          have_seeprom = read_seeprom(p, (p->flags & (AHC_CHNLB|AHC_CHNLC)),
-                                      scarray, p->sc_size, C56_66);
-        else
-          have_seeprom = read_seeprom(p, (p->flags & (AHC_CHNLB|AHC_CHNLC)),
-                                      scarray, p->sc_size, C46);
-      }
-      if (!have_seeprom)
-      {
-        p->sc_size = 128;
-        have_seeprom = read_seeprom(p, 4*(p->flags & (AHC_CHNLB|AHC_CHNLC)),
-                                    scarray, p->sc_size, p->sc_type);
-        if (!have_seeprom)
-        {
-          if(p->sc_type == C46)
-            have_seeprom = read_seeprom(p, 4*(p->flags & (AHC_CHNLB|AHC_CHNLC)),
-                                        scarray, p->sc_size, C56_66);
-          else
-            have_seeprom = read_seeprom(p, 4*(p->flags & (AHC_CHNLB|AHC_CHNLC)),
-                                        scarray, p->sc_size, C46);
-        }
-      }
-      break;
-  }
-
-  if (!have_seeprom)
-  {
-    if (aic7xxx_verbose & VERBOSE_PROBE2)
-    {
-      printk("\naic7xxx: No SEEPROM available.\n");
-    }
-    p->flags |= AHC_NEWEEPROM_FMT;
-    if (aic_inb(p, SCSISEQ) == 0)
-    {
-      p->flags |= AHC_USEDEFAULTS;
-      p->flags &= ~AHC_BIOS_ENABLED;
-      p->scsi_id = p->scsi_id_b = 7;
-      *sxfrctl1 |= STPWEN;
-      if (aic7xxx_verbose & VERBOSE_PROBE2)
-      {
-        printk("aic7xxx: Using default values.\n");
-      }
-    }
-    else if (aic7xxx_verbose & VERBOSE_PROBE2)
-    {
-      printk("aic7xxx: Using leftover BIOS values.\n");
-    }
-    if ( ((p->chip & ~AHC_CHIPID_MASK) == AHC_PCI) && (*sxfrctl1 & STPWEN) )
-    {
-      p->flags |= AHC_TERM_ENB_SE_LOW | AHC_TERM_ENB_SE_HIGH;
-      sc->adapter_control &= ~CFAUTOTERM;
-      sc->adapter_control |= CFSTERM | CFWSTERM | CFLVDSTERM;
-    }
-    if (aic7xxx_extended)
-      p->flags |= (AHC_EXTEND_TRANS_A | AHC_EXTEND_TRANS_B);
-    else
-      p->flags &= ~(AHC_EXTEND_TRANS_A | AHC_EXTEND_TRANS_B);
-  }
-  else
-  {
-    if (aic7xxx_verbose & VERBOSE_PROBE2)
-    {
-      printk("done\n");
-    }
-
-    /*
-     * Note things in our flags
-     */
-    p->flags |= AHC_SEEPROM_FOUND;
-
-    /*
-     * Update the settings in sxfrctl1 to match the termination settings.
-     */
-    *sxfrctl1 = 0;
-
-    /*
-     * Get our SCSI ID from the SEEPROM setting...
-     */
-    p->scsi_id = (sc->brtime_id & CFSCSIID);
-
-    /*
-     * First process the settings that are different between the VLB
-     * and PCI adapter seeproms.
-     */
-    if ((p->chip & AHC_CHIPID_MASK) == AHC_AIC7770)
-    {
-      /* VLB adapter seeproms */
-      if (sc->bios_control & CF284XEXTEND)
-        p->flags |= AHC_EXTEND_TRANS_A;
-
-      if (sc->adapter_control & CF284XSTERM)
-      {
-        *sxfrctl1 |= STPWEN;
-        p->flags |= AHC_TERM_ENB_SE_LOW | AHC_TERM_ENB_SE_HIGH;
-      }
-    }
-    else
-    {
-      /* PCI adapter seeproms */
-      if (sc->bios_control & CFEXTEND)
-        p->flags |= AHC_EXTEND_TRANS_A;
-      if (sc->bios_control & CFBIOSEN)
-        p->flags |= AHC_BIOS_ENABLED;
-      else
-        p->flags &= ~AHC_BIOS_ENABLED;
-
-      if (sc->adapter_control & CFSTERM)
-      {
-        *sxfrctl1 |= STPWEN;
-        p->flags |= AHC_TERM_ENB_SE_LOW | AHC_TERM_ENB_SE_HIGH;
-      }
-    }
-    memcpy(&p->sc, sc, sizeof(struct seeprom_config));
-  }
-
-  p->discenable = 0;
-
-  /*
-   * Limit to 16 targets just in case.  The 2842 for one is known to
-   * blow the max_targets setting, future cards might also.
-   */
-  max_targets = ((p->features & (AHC_TWIN | AHC_WIDE)) ? 16 : 8);
-
-  if (have_seeprom)
-  {
-    for (i = 0; i < max_targets; i++)
-    {
-      if( ((p->features & AHC_ULTRA) &&
-          !(sc->adapter_control & CFULTRAEN) &&
-           (sc->device_flags[i] & CFSYNCHISULTRA)) ||
-          (sc->device_flags[i] & CFNEWULTRAFORMAT) )
-      {
-        p->flags |= AHC_NEWEEPROM_FMT;
-        break;
-      }
-    }
-  }
-
-  for (i = 0; i < max_targets; i++)
-  {
-    mask = (0x01 << i);
-    if (!have_seeprom)
-    {
-      if (aic_inb(p, SCSISEQ) != 0)
-      {
-        /*
-         * OK...the BIOS set things up and left behind the settings we need.
-         * Just make our sc->device_flags[i] entry match what the card has
-         * set for this device.
-         */
-        p->discenable =
-          ~(aic_inb(p, DISC_DSB) | (aic_inb(p, DISC_DSB + 1) << 8) );
-        p->ultraenb =
-          (aic_inb(p, ULTRA_ENB) | (aic_inb(p, ULTRA_ENB + 1) << 8) );
-        sc->device_flags[i] = (p->discenable & mask) ? CFDISC : 0;
-        if (aic_inb(p, TARG_SCSIRATE + i) & WIDEXFER)
-          sc->device_flags[i] |= CFWIDEB;
-        if (p->features & AHC_ULTRA2)
-        {
-          if (aic_inb(p, TARG_OFFSET + i))
-          {
-            sc->device_flags[i] |= CFSYNCH;
-            sc->device_flags[i] |= (aic_inb(p, TARG_SCSIRATE + i) & 0x07);
-            if ( (aic_inb(p, TARG_SCSIRATE + i) & 0x18) == 0x18 )
-              sc->device_flags[i] |= CFSYNCHISULTRA;
-          }
-        }
-        else
-        {
-          if (aic_inb(p, TARG_SCSIRATE + i) & ~WIDEXFER)
-          {
-            sc->device_flags[i] |= CFSYNCH;
-            if (p->features & AHC_ULTRA)
-              sc->device_flags[i] |= ((p->ultraenb & mask) ?
-                                      CFSYNCHISULTRA : 0);
-          }
-        }
-      }
-      else
-      {
-        /*
-         * Assume the BIOS has NOT been run on this card and nothing between
-         * the card and the devices is configured yet.
-         */
-        sc->device_flags[i] = CFDISC;
-        if (p->features & AHC_WIDE)
-          sc->device_flags[i] |= CFWIDEB;
-        if (p->features & AHC_ULTRA3)
-          sc->device_flags[i] |= 2;
-        else if (p->features & AHC_ULTRA2)
-          sc->device_flags[i] |= 3;
-        else if (p->features & AHC_ULTRA)
-          sc->device_flags[i] |= CFSYNCHISULTRA;
-        sc->device_flags[i] |= CFSYNCH;
-        aic_outb(p, 0, TARG_SCSIRATE + i);
-        if (p->features & AHC_ULTRA2)
-          aic_outb(p, 0, TARG_OFFSET + i);
-      }
-    }
-    if (sc->device_flags[i] & CFDISC)
-    {
-      p->discenable |= mask;
-    }
-    if (p->flags & AHC_NEWEEPROM_FMT)
-    {
-      if ( !(p->features & AHC_ULTRA2) )
-      {
-        /*
-         * I know of two different Ultra BIOSes that do this differently.
-         * One on the Gigabyte 6BXU mb that wants flags[i] & CFXFER to
-         * be == to 0x03 and SYNCHISULTRA to be true to mean 40MByte/s
-         * while on the IBM Netfinity 5000 they want the same thing
-         * to be something else, while flags[i] & CFXFER == 0x03 and
-         * SYNCHISULTRA false should be 40MByte/s.  So, we set both to
-         * 40MByte/s and the lower speeds be damned.  People will have
-         * to select around the conversely mapped lower speeds in order
-         * to select lower speeds on these boards.
-         */
-        if ( (sc->device_flags[i] & CFNEWULTRAFORMAT) &&
-            ((sc->device_flags[i] & CFXFER) == 0x03) )
-        {
-          sc->device_flags[i] &= ~CFXFER;
-          sc->device_flags[i] |= CFSYNCHISULTRA;
-        }
-        if (sc->device_flags[i] & CFSYNCHISULTRA)
-        {
-          p->ultraenb |= mask;
-        }
-      }
-      else if ( !(sc->device_flags[i] & CFNEWULTRAFORMAT) &&
-                 (p->features & AHC_ULTRA2) &&
-                 (sc->device_flags[i] & CFSYNCHISULTRA) )
-      {
-        p->ultraenb |= mask;
-      }
-    }
-    else if (sc->adapter_control & CFULTRAEN)
-    {
-      p->ultraenb |= mask;
-    }
-    if ( (sc->device_flags[i] & CFSYNCH) == 0)
-    {
-      sc->device_flags[i] &= ~CFXFER;
-      p->ultraenb &= ~mask;
-      p->user[i].offset = 0;
-      p->user[i].period = 0;
-      p->user[i].options = 0;
-    }
-    else
-    {
-      if (p->features & AHC_ULTRA3)
-      {
-        p->user[i].offset = MAX_OFFSET_ULTRA2;
-        if( (sc->device_flags[i] & CFXFER) < 0x03 )
-        {
-          scsirate = (sc->device_flags[i] & CFXFER);
-          p->user[i].options = MSG_EXT_PPR_OPTION_DT_CRC;
-        }
-        else
-        {
-          scsirate = (sc->device_flags[i] & CFXFER) |
-                     ((p->ultraenb & mask) ? 0x18 : 0x10);
-          p->user[i].options = 0;
-        }
-        p->user[i].period = aic7xxx_find_period(p, scsirate,
-                                       AHC_SYNCRATE_ULTRA3);
-      }
-      else if (p->features & AHC_ULTRA2)
-      {
-        p->user[i].offset = MAX_OFFSET_ULTRA2;
-        scsirate = (sc->device_flags[i] & CFXFER) |
-                   ((p->ultraenb & mask) ? 0x18 : 0x10);
-        p->user[i].options = 0;
-        p->user[i].period = aic7xxx_find_period(p, scsirate,
-                                       AHC_SYNCRATE_ULTRA2);
-      }
-      else
-      {
-        scsirate = (sc->device_flags[i] & CFXFER) << 4;
-        p->user[i].options = 0;
-        p->user[i].offset = MAX_OFFSET_8BIT;
-        if (p->features & AHC_ULTRA)
-        {
-          short ultraenb;
-          ultraenb = aic_inb(p, ULTRA_ENB) |
-            (aic_inb(p, ULTRA_ENB + 1) << 8);
-          p->user[i].period = aic7xxx_find_period(p, scsirate,
-                                          (p->ultraenb & mask) ?
-                                          AHC_SYNCRATE_ULTRA :
-                                          AHC_SYNCRATE_FAST);
-        }
-        else
-          p->user[i].period = aic7xxx_find_period(p, scsirate,
-                                          AHC_SYNCRATE_FAST);
-      }
-    }
-    if ( (sc->device_flags[i] & CFWIDEB) && (p->features & AHC_WIDE) )
-    {
-      p->user[i].width = MSG_EXT_WDTR_BUS_16_BIT;
-    }
-    else
-    {
-      p->user[i].width = MSG_EXT_WDTR_BUS_8_BIT;
-    }
-  }
-  aic_outb(p, ~(p->discenable & 0xFF), DISC_DSB);
-  aic_outb(p, ~((p->discenable >> 8) & 0xFF), DISC_DSB + 1);
-
-  /*
-   * We set the p->ultraenb from the SEEPROM to begin with, but now we make
-   * it match what is already down in the card.  If we are doing a reset
-   * on the card then this will get put back to a default state anyway.
-   * This allows us to not have to pre-emptively negotiate when using the
-   * no_reset option.
-   */
-  if (p->features & AHC_ULTRA)
-    p->ultraenb = aic_inb(p, ULTRA_ENB) | (aic_inb(p, ULTRA_ENB + 1) << 8);
-
-  
-  scsi_conf = (p->scsi_id & HSCSIID);
-
-  if(have_seeprom)
-  {
-    p->adapter_control = sc->adapter_control;
-    p->bios_control = sc->bios_control;
-
-    switch (p->chip & AHC_CHIPID_MASK)
-    {
-      case AHC_AIC7895:
-      case AHC_AIC7896:
-      case AHC_AIC7899:
-        if (p->adapter_control & CFBPRIMARY)
-          p->flags |= AHC_CHANNEL_B_PRIMARY;
-      default:
-        break;
-    }
-
-    if (sc->adapter_control & CFSPARITY)
-      scsi_conf |= ENSPCHK;
-  }
-  else
-  {
-    scsi_conf |= ENSPCHK | RESET_SCSI;
-  }
-
-  /*
-   * Only set the SCSICONF and SCSICONF + 1 registers if we are a PCI card.
-   * The 2842 and 2742 cards already have these registers set and we don't
-   * want to muck with them since we don't set all the bits they do.
-   */
-  if ( (p->chip & ~AHC_CHIPID_MASK) == AHC_PCI )
-  {
-    /* Set the host ID */
-    aic_outb(p, scsi_conf, SCSICONF);
-    /* In case we are a wide card */
-    aic_outb(p, p->scsi_id, SCSICONF + 1);
-  }
-}
-
-/*+F*************************************************************************
- * Function:
- *   aic7xxx_configure_bugs
- *
- * Description:
- *   Take the card passed in and set the appropriate bug flags based upon
- *   the card model.  Also make any changes needed to device registers or
- *   PCI registers while we are here.
- *-F*************************************************************************/
-static void
-aic7xxx_configure_bugs(struct aic7xxx_host *p)
-{
-  unsigned short tmp_word;
- 
-  switch(p->chip & AHC_CHIPID_MASK)
-  {
-    case AHC_AIC7860:
-      p->bugs |= AHC_BUG_PCI_2_1_RETRY;
-      /* fall through */
-    case AHC_AIC7850:
-    case AHC_AIC7870:
-      p->bugs |= AHC_BUG_TMODE_WIDEODD | AHC_BUG_CACHETHEN | AHC_BUG_PCI_MWI;
-      break;
-    case AHC_AIC7880:
-      p->bugs |= AHC_BUG_TMODE_WIDEODD | AHC_BUG_PCI_2_1_RETRY |
-                 AHC_BUG_CACHETHEN | AHC_BUG_PCI_MWI;
-      break;
-    case AHC_AIC7890:
-      p->bugs |= AHC_BUG_AUTOFLUSH | AHC_BUG_CACHETHEN;
-      break;
-    case AHC_AIC7892:
-      p->bugs |= AHC_BUG_SCBCHAN_UPLOAD;
-      break;
-    case AHC_AIC7895:
-      p->bugs |= AHC_BUG_TMODE_WIDEODD | AHC_BUG_PCI_2_1_RETRY |
-                 AHC_BUG_CACHETHEN | AHC_BUG_PCI_MWI;
-      break;
-    case AHC_AIC7896:
-      p->bugs |= AHC_BUG_CACHETHEN_DIS;
-      break;
-    case AHC_AIC7899:
-      p->bugs |= AHC_BUG_SCBCHAN_UPLOAD;
-      break;
-    default:
-      /* Nothing to do */
-      break;
-  }
-
-  /*
-   * Now handle the bugs that require PCI register or card register tweaks
-   */
-  pci_read_config_word(p->pdev, PCI_COMMAND, &tmp_word);
-  if(p->bugs & AHC_BUG_PCI_MWI)
-  {
-    tmp_word &= ~PCI_COMMAND_INVALIDATE;
-  }
-  else
-  {
-    tmp_word |= PCI_COMMAND_INVALIDATE;
-  }
-  pci_write_config_word(p->pdev, PCI_COMMAND, tmp_word);
-
-  if(p->bugs & AHC_BUG_CACHETHEN)
-  {
-    aic_outb(p, aic_inb(p, DSCOMMAND0) & ~CACHETHEN, DSCOMMAND0);
-  }
-  else if (p->bugs & AHC_BUG_CACHETHEN_DIS)
-  {
-    aic_outb(p, aic_inb(p, DSCOMMAND0) | CACHETHEN, DSCOMMAND0);
-  }
-
-  return;
-}
-
-
-/*+F*************************************************************************
- * Function:
- *   aic7xxx_detect
- *
- * Description:
- *   Try to detect and register an Adaptec 7770 or 7870 SCSI controller.
- *
- * XXX - This should really be called aic7xxx_probe().  A sequence of
- *       probe(), attach()/detach(), and init() makes more sense than
- *       one do-it-all function.  This may be useful when (and if) the
- *       mid-level SCSI code is overhauled.
- *-F*************************************************************************/
-static int
-aic7xxx_detect(struct scsi_host_template *template)
-{
-  struct aic7xxx_host *temp_p = NULL;
-  struct aic7xxx_host *current_p = NULL;
-  struct aic7xxx_host *list_p = NULL;
-  int found = 0;
-#if defined(__i386__) || defined(__alpha__)
-  ahc_flag_type flags = 0;
-  int type;
-#endif
-  unsigned char sxfrctl1;
-#if defined(__i386__) || defined(__alpha__)
-  unsigned char hcntrl, hostconf;
-  unsigned int slot, base;
-#endif
-
-#ifdef MODULE
-  /*
-   * If we are called as a module, the aic7xxx pointer may not be null
-   * and it would point to our bootup string, just like on the lilo
-   * command line.  IF not NULL, then process this config string with
-   * aic7xxx_setup
-   */
-  if(aic7xxx)
-    aic7xxx_setup(aic7xxx);
-#endif
-
-  template->proc_name = "aic7xxx";
-  template->sg_tablesize = AIC7XXX_MAX_SG;
-
-
-#ifdef CONFIG_PCI
-  /*
-   * PCI-bus probe.
-   */
-  {
-    static struct
-    {
-      unsigned short      vendor_id;
-      unsigned short      device_id;
-      ahc_chip            chip;
-      ahc_flag_type       flags;
-      ahc_feature         features;
-      int                 board_name_index;
-      unsigned short      seeprom_size;
-      unsigned short      seeprom_type;
-    } const aic_pdevs[] = {
-      {PCI_VENDOR_ID_ADAPTEC, PCI_DEVICE_ID_ADAPTEC_7810, AHC_NONE,
-       AHC_FNONE, AHC_FENONE,                                1,
-       32, C46 },
-      {PCI_VENDOR_ID_ADAPTEC, PCI_DEVICE_ID_ADAPTEC_7850, AHC_AIC7850,
-       AHC_PAGESCBS, AHC_AIC7850_FE,                         5,
-       32, C46 },
-      {PCI_VENDOR_ID_ADAPTEC, PCI_DEVICE_ID_ADAPTEC_7855, AHC_AIC7850,
-       AHC_PAGESCBS, AHC_AIC7850_FE,                         6,
-       32, C46 },
-      {PCI_VENDOR_ID_ADAPTEC, PCI_DEVICE_ID_ADAPTEC_7821, AHC_AIC7860,
-       AHC_PAGESCBS | AHC_NEWEEPROM_FMT | AHC_BIOS_ENABLED,
-       AHC_AIC7860_FE,                                       7,
-       32, C46 },
-      {PCI_VENDOR_ID_ADAPTEC, PCI_DEVICE_ID_ADAPTEC_3860, AHC_AIC7860,
-       AHC_PAGESCBS | AHC_NEWEEPROM_FMT | AHC_BIOS_ENABLED,
-       AHC_AIC7860_FE,                                       7,
-       32, C46 },
-      {PCI_VENDOR_ID_ADAPTEC, PCI_DEVICE_ID_ADAPTEC_38602, AHC_AIC7860,
-       AHC_PAGESCBS | AHC_NEWEEPROM_FMT | AHC_BIOS_ENABLED,
-       AHC_AIC7860_FE,                                       7,
-       32, C46 },
-      {PCI_VENDOR_ID_ADAPTEC, PCI_DEVICE_ID_ADAPTEC_38602, AHC_AIC7860,
-       AHC_PAGESCBS | AHC_NEWEEPROM_FMT | AHC_BIOS_ENABLED,
-       AHC_AIC7860_FE,                                       7,
-       32, C46 },
-      {PCI_VENDOR_ID_ADAPTEC, PCI_DEVICE_ID_ADAPTEC_7860, AHC_AIC7860,
-       AHC_PAGESCBS | AHC_NEWEEPROM_FMT | AHC_BIOS_ENABLED | AHC_MOTHERBOARD,
-       AHC_AIC7860_FE,                                       7,
-       32, C46 },
-      {PCI_VENDOR_ID_ADAPTEC, PCI_DEVICE_ID_ADAPTEC_7861, AHC_AIC7860,
-       AHC_PAGESCBS | AHC_NEWEEPROM_FMT | AHC_BIOS_ENABLED,
-       AHC_AIC7860_FE,                                       8,
-       32, C46 },
-      {PCI_VENDOR_ID_ADAPTEC, PCI_DEVICE_ID_ADAPTEC_7870, AHC_AIC7870,
-       AHC_PAGESCBS | AHC_BIOS_ENABLED | AHC_MOTHERBOARD,
-       AHC_AIC7870_FE,                                       9,
-       32, C46 },
-      {PCI_VENDOR_ID_ADAPTEC, PCI_DEVICE_ID_ADAPTEC_7871, AHC_AIC7870,
-       AHC_PAGESCBS | AHC_BIOS_ENABLED, AHC_AIC7870_FE,     10,
-       32, C46 },
-      {PCI_VENDOR_ID_ADAPTEC, PCI_DEVICE_ID_ADAPTEC_7872, AHC_AIC7870,
-       AHC_PAGESCBS | AHC_BIOS_ENABLED | AHC_MULTI_CHANNEL,
-       AHC_AIC7870_FE,                                      11,
-       32, C56_66 },
-      {PCI_VENDOR_ID_ADAPTEC, PCI_DEVICE_ID_ADAPTEC_7873, AHC_AIC7870,
-       AHC_PAGESCBS | AHC_BIOS_ENABLED | AHC_MULTI_CHANNEL,
-       AHC_AIC7870_FE,                                      12,
-       32, C56_66 },
-      {PCI_VENDOR_ID_ADAPTEC, PCI_DEVICE_ID_ADAPTEC_7874, AHC_AIC7870,
-       AHC_PAGESCBS | AHC_BIOS_ENABLED, AHC_AIC7870_FE,     13,
-       32, C46 },
-      {PCI_VENDOR_ID_ADAPTEC, PCI_DEVICE_ID_ADAPTEC_7880, AHC_AIC7880,
-       AHC_PAGESCBS | AHC_BIOS_ENABLED | AHC_MOTHERBOARD,
-       AHC_AIC7880_FE,                                      14,
-       32, C46 },
-      {PCI_VENDOR_ID_ADAPTEC, PCI_DEVICE_ID_ADAPTEC_7881, AHC_AIC7880,
-       AHC_PAGESCBS | AHC_BIOS_ENABLED, AHC_AIC7880_FE,     15,
-       32, C46 },
-      {PCI_VENDOR_ID_ADAPTEC, PCI_DEVICE_ID_ADAPTEC_7882, AHC_AIC7880,
-       AHC_PAGESCBS | AHC_BIOS_ENABLED | AHC_MULTI_CHANNEL,
-       AHC_AIC7880_FE,                                      16,
-       32, C56_66 },
-      {PCI_VENDOR_ID_ADAPTEC, PCI_DEVICE_ID_ADAPTEC_7883, AHC_AIC7880,
-       AHC_PAGESCBS | AHC_BIOS_ENABLED | AHC_MULTI_CHANNEL,
-       AHC_AIC7880_FE,                                      17,
-       32, C56_66 },
-      {PCI_VENDOR_ID_ADAPTEC, PCI_DEVICE_ID_ADAPTEC_7884, AHC_AIC7880,
-       AHC_PAGESCBS | AHC_BIOS_ENABLED, AHC_AIC7880_FE,     18,
-       32, C46 },
-      {PCI_VENDOR_ID_ADAPTEC, PCI_DEVICE_ID_ADAPTEC_7885, AHC_AIC7880,
-       AHC_PAGESCBS | AHC_BIOS_ENABLED, AHC_AIC7880_FE,     18,
-       32, C46 },
-      {PCI_VENDOR_ID_ADAPTEC, PCI_DEVICE_ID_ADAPTEC_7886, AHC_AIC7880,
-       AHC_PAGESCBS | AHC_BIOS_ENABLED, AHC_AIC7880_FE,     18,
-       32, C46 },
-      {PCI_VENDOR_ID_ADAPTEC, PCI_DEVICE_ID_ADAPTEC_7887, AHC_AIC7880,
-       AHC_PAGESCBS | AHC_BIOS_ENABLED, AHC_AIC7880_FE | AHC_NEW_AUTOTERM, 19,
-       32, C46 },
-      {PCI_VENDOR_ID_ADAPTEC, PCI_DEVICE_ID_ADAPTEC_7888, AHC_AIC7880,
-       AHC_PAGESCBS | AHC_BIOS_ENABLED, AHC_AIC7880_FE,     18,
-       32, C46 },
-      {PCI_VENDOR_ID_ADAPTEC, PCI_DEVICE_ID_ADAPTEC_7895, AHC_AIC7895,
-       AHC_PAGESCBS | AHC_NEWEEPROM_FMT | AHC_BIOS_ENABLED | AHC_MULTI_CHANNEL,
-       AHC_AIC7895_FE,                                      20,
-       32, C56_66 },
-      {PCI_VENDOR_ID_ADAPTEC2, PCI_DEVICE_ID_ADAPTEC2_7890, AHC_AIC7890,
-       AHC_PAGESCBS | AHC_NEWEEPROM_FMT | AHC_BIOS_ENABLED,
-       AHC_AIC7890_FE,                                      21,
-       32, C46 },
-      {PCI_VENDOR_ID_ADAPTEC2, PCI_DEVICE_ID_ADAPTEC2_7890B, AHC_AIC7890,
-       AHC_PAGESCBS | AHC_NEWEEPROM_FMT | AHC_BIOS_ENABLED,
-       AHC_AIC7890_FE,                                      21,
-       32, C46 },
-      {PCI_VENDOR_ID_ADAPTEC2, PCI_DEVICE_ID_ADAPTEC2_2930U2, AHC_AIC7890,
-       AHC_PAGESCBS | AHC_NEWEEPROM_FMT | AHC_BIOS_ENABLED,
-       AHC_AIC7890_FE,                                      22,
-       32, C46 },
-      {PCI_VENDOR_ID_ADAPTEC2, PCI_DEVICE_ID_ADAPTEC2_2940U2, AHC_AIC7890,
-       AHC_PAGESCBS | AHC_NEWEEPROM_FMT | AHC_BIOS_ENABLED,
-       AHC_AIC7890_FE,                                      23,
-       32, C46 },
-      {PCI_VENDOR_ID_ADAPTEC2, PCI_DEVICE_ID_ADAPTEC2_7896, AHC_AIC7896,
-       AHC_PAGESCBS | AHC_NEWEEPROM_FMT | AHC_BIOS_ENABLED | AHC_MULTI_CHANNEL,
-       AHC_AIC7896_FE,                                      24,
-       32, C56_66 },
-      {PCI_VENDOR_ID_ADAPTEC2, PCI_DEVICE_ID_ADAPTEC2_3940U2, AHC_AIC7896,
-       AHC_PAGESCBS | AHC_NEWEEPROM_FMT | AHC_BIOS_ENABLED | AHC_MULTI_CHANNEL,
-       AHC_AIC7896_FE,                                      25,
-       32, C56_66 },
-      {PCI_VENDOR_ID_ADAPTEC2, PCI_DEVICE_ID_ADAPTEC2_3950U2D, AHC_AIC7896,
-       AHC_PAGESCBS | AHC_NEWEEPROM_FMT | AHC_BIOS_ENABLED | AHC_MULTI_CHANNEL,
-       AHC_AIC7896_FE,                                      26,
-       32, C56_66 },
-      {PCI_VENDOR_ID_ADAPTEC, PCI_DEVICE_ID_ADAPTEC_1480A, AHC_AIC7860,
-       AHC_PAGESCBS | AHC_NEWEEPROM_FMT | AHC_BIOS_ENABLED | AHC_NO_STPWEN,
-       AHC_AIC7860_FE,                                      27,
-       32, C46 },
-      {PCI_VENDOR_ID_ADAPTEC2, PCI_DEVICE_ID_ADAPTEC2_7892A, AHC_AIC7892,
-       AHC_PAGESCBS | AHC_NEWEEPROM_FMT | AHC_BIOS_ENABLED,
-       AHC_AIC7892_FE,                                      28,
-       32, C46 },
-      {PCI_VENDOR_ID_ADAPTEC2, PCI_DEVICE_ID_ADAPTEC2_7892B, AHC_AIC7892,
-       AHC_PAGESCBS | AHC_NEWEEPROM_FMT | AHC_BIOS_ENABLED,
-       AHC_AIC7892_FE,                                      28,
-       32, C46 },
-      {PCI_VENDOR_ID_ADAPTEC2, PCI_DEVICE_ID_ADAPTEC2_7892D, AHC_AIC7892,
-       AHC_PAGESCBS | AHC_NEWEEPROM_FMT | AHC_BIOS_ENABLED,
-       AHC_AIC7892_FE,                                      28,
-       32, C46 },
-      {PCI_VENDOR_ID_ADAPTEC2, PCI_DEVICE_ID_ADAPTEC2_7892P, AHC_AIC7892,
-       AHC_PAGESCBS | AHC_NEWEEPROM_FMT | AHC_BIOS_ENABLED,
-       AHC_AIC7892_FE,                                      28,
-       32, C46 },
-      {PCI_VENDOR_ID_ADAPTEC2, PCI_DEVICE_ID_ADAPTEC2_7899A, AHC_AIC7899,
-       AHC_PAGESCBS | AHC_NEWEEPROM_FMT | AHC_BIOS_ENABLED | AHC_MULTI_CHANNEL,
-       AHC_AIC7899_FE,                                      29,
-       32, C56_66 },
-      {PCI_VENDOR_ID_ADAPTEC2, PCI_DEVICE_ID_ADAPTEC2_7899B, AHC_AIC7899,
-       AHC_PAGESCBS | AHC_NEWEEPROM_FMT | AHC_BIOS_ENABLED | AHC_MULTI_CHANNEL,
-       AHC_AIC7899_FE,                                      29,
-       32, C56_66 },
-      {PCI_VENDOR_ID_ADAPTEC2, PCI_DEVICE_ID_ADAPTEC2_7899D, AHC_AIC7899,
-       AHC_PAGESCBS | AHC_NEWEEPROM_FMT | AHC_BIOS_ENABLED | AHC_MULTI_CHANNEL,
-       AHC_AIC7899_FE,                                      29,
-       32, C56_66 },
-      {PCI_VENDOR_ID_ADAPTEC2, PCI_DEVICE_ID_ADAPTEC2_7899P, AHC_AIC7899,
-       AHC_PAGESCBS | AHC_NEWEEPROM_FMT | AHC_BIOS_ENABLED | AHC_MULTI_CHANNEL,
-       AHC_AIC7899_FE,                                      29,
-       32, C56_66 },
-    };
-
-    unsigned short command;
-    unsigned int  devconfig, i, oldverbose;
-    struct pci_dev *pdev = NULL;
-
-    for (i = 0; i < ARRAY_SIZE(aic_pdevs); i++)
-    {
-      pdev = NULL;
-      while ((pdev = pci_get_device(aic_pdevs[i].vendor_id,
-                                     aic_pdevs[i].device_id,
-                                     pdev))) {
-        if (pci_enable_device(pdev))
-                continue;
-        if ( i == 0 ) /* We found one, but it's the 7810 RAID cont. */
-        {
-          if (aic7xxx_verbose & (VERBOSE_PROBE|VERBOSE_PROBE2))
-          {
-            printk(KERN_INFO "aic7xxx: The 7810 RAID controller is not "
-              "supported by\n");
-            printk(KERN_INFO "         this driver, we are ignoring it.\n");
-          }
-        }
-        else if ( (temp_p = kzalloc(sizeof(struct aic7xxx_host),
-                                    GFP_ATOMIC)) != NULL )
-        {
-          temp_p->chip = aic_pdevs[i].chip | AHC_PCI;
-          temp_p->flags = aic_pdevs[i].flags;
-          temp_p->features = aic_pdevs[i].features;
-          temp_p->board_name_index = aic_pdevs[i].board_name_index;
-          temp_p->sc_size = aic_pdevs[i].seeprom_size;
-          temp_p->sc_type = aic_pdevs[i].seeprom_type;
-
-          /*
-           * Read sundry information from PCI BIOS.
-           */
-          temp_p->irq = pdev->irq;
-          temp_p->pdev = pdev;
-          temp_p->pci_bus = pdev->bus->number;
-          temp_p->pci_device_fn = pdev->devfn;
-          temp_p->base = pci_resource_start(pdev, 0);
-          temp_p->mbase = pci_resource_start(pdev, 1);
-          current_p = list_p;
-          while(current_p && temp_p)
-          {
-            if ( ((current_p->pci_bus == temp_p->pci_bus) &&
-                  (current_p->pci_device_fn == temp_p->pci_device_fn)) ||
-                 (temp_p->base && (current_p->base == temp_p->base)) ||
-                 (temp_p->mbase && (current_p->mbase == temp_p->mbase)) )
-            {
-              /* duplicate PCI entry, skip it */
-              kfree(temp_p);
-              temp_p = NULL;
-              continue;
-            }
-            current_p = current_p->next;
-          }
-          if(pci_request_regions(temp_p->pdev, "aic7xxx"))
-          {
-            printk("aic7xxx: <%s> at PCI %d/%d/%d\n", 
-              board_names[aic_pdevs[i].board_name_index],
-              temp_p->pci_bus,
-              PCI_SLOT(temp_p->pci_device_fn),
-              PCI_FUNC(temp_p->pci_device_fn));
-            printk("aic7xxx: I/O ports already in use, ignoring.\n");
-            kfree(temp_p);
-            continue;
-          }
-
-          if (aic7xxx_verbose & VERBOSE_PROBE2)
-            printk("aic7xxx: <%s> at PCI %d/%d\n", 
-              board_names[aic_pdevs[i].board_name_index],
-              PCI_SLOT(pdev->devfn),
-              PCI_FUNC(pdev->devfn));
-          pci_read_config_word(pdev, PCI_COMMAND, &command);
-          if (aic7xxx_verbose & VERBOSE_PROBE2)
-          {
-            printk("aic7xxx: Initial PCI_COMMAND value was 0x%x\n",
-              (int)command);
-          }
-#ifdef AIC7XXX_STRICT_PCI_SETUP
-          command |= PCI_COMMAND_SERR | PCI_COMMAND_PARITY |
-            PCI_COMMAND_MASTER | PCI_COMMAND_MEMORY | PCI_COMMAND_IO;
-#else
-          command |= PCI_COMMAND_MASTER | PCI_COMMAND_MEMORY | PCI_COMMAND_IO;
-#endif
-          command &= ~PCI_COMMAND_INVALIDATE;
-          if (aic7xxx_pci_parity == 0)
-            command &= ~(PCI_COMMAND_SERR | PCI_COMMAND_PARITY);
-          pci_write_config_word(pdev, PCI_COMMAND, command);
-#ifdef AIC7XXX_STRICT_PCI_SETUP
-          pci_read_config_dword(pdev, DEVCONFIG, &devconfig);
-          if (aic7xxx_verbose & VERBOSE_PROBE2)
-          {
-            printk("aic7xxx: Initial DEVCONFIG value was 0x%x\n", devconfig);
-          }
-          devconfig |= 0x80000040;
-          pci_write_config_dword(pdev, DEVCONFIG, devconfig);
-#endif /* AIC7XXX_STRICT_PCI_SETUP */
-
-          temp_p->unpause = INTEN;
-          temp_p->pause = temp_p->unpause | PAUSE;
-          if ( ((temp_p->base == 0) &&
-                (temp_p->mbase == 0)) ||
-               (temp_p->irq == 0) )
-          {
-            printk("aic7xxx: <%s> at PCI %d/%d/%d\n", 
-              board_names[aic_pdevs[i].board_name_index],
-              temp_p->pci_bus,
-              PCI_SLOT(temp_p->pci_device_fn),
-              PCI_FUNC(temp_p->pci_device_fn));
-            printk("aic7xxx: Controller disabled by BIOS, ignoring.\n");
-            goto skip_pci_controller;
-          }
-
-#ifdef MMAPIO
-          if ( !(temp_p->base) || !(temp_p->flags & AHC_MULTI_CHANNEL) ||
-               ((temp_p->chip != (AHC_AIC7870 | AHC_PCI)) &&
-                (temp_p->chip != (AHC_AIC7880 | AHC_PCI))) )
-          {
-            temp_p->maddr = ioremap_nocache(temp_p->mbase, 256);
-            if(temp_p->maddr)
-            {
-              /*
-               * We need to check the I/O with the MMAPed address.  Some machines
-               * simply fail to work with MMAPed I/O and certain controllers.
-               */
-              if(aic_inb(temp_p, HCNTRL) == 0xff)
-              {
-                /*
-                 * OK.....we failed our test....go back to programmed I/O
-                 */
-                printk(KERN_INFO "aic7xxx: <%s> at PCI %d/%d/%d\n", 
-                  board_names[aic_pdevs[i].board_name_index],
-                  temp_p->pci_bus,
-                  PCI_SLOT(temp_p->pci_device_fn),
-                  PCI_FUNC(temp_p->pci_device_fn));
-                printk(KERN_INFO "aic7xxx: MMAPed I/O failed, reverting to "
-                                 "Programmed I/O.\n");
-                iounmap(temp_p->maddr);
-                temp_p->maddr = NULL;
-                if(temp_p->base == 0)
-                {
-                  printk("aic7xxx: <%s> at PCI %d/%d/%d\n", 
-                    board_names[aic_pdevs[i].board_name_index],
-                    temp_p->pci_bus,
-                    PCI_SLOT(temp_p->pci_device_fn),
-                    PCI_FUNC(temp_p->pci_device_fn));
-                  printk("aic7xxx: Controller disabled by BIOS, ignoring.\n");
-                  goto skip_pci_controller;
-                }
-              }
-            }
-          }
-#endif
-
-          /*
-           * We HAVE to make sure the first pause_sequencer() and all other
-           * subsequent I/O that isn't PCI config space I/O takes place
-           * after the MMAPed I/O region is configured and tested.  The
-           * problem is the PowerPC architecture that doesn't support
-           * programmed I/O at all, so we have to have the MMAP I/O set up
-           * for this pause to even work on those machines.
-           */
-          pause_sequencer(temp_p);
-
-          /*
-           * Clear out any pending PCI error status messages.  Also set
-           * verbose to 0 so that we don't emit strange PCI error messages
-           * while cleaning out the current status bits.
-           */
-          oldverbose = aic7xxx_verbose;
-          aic7xxx_verbose = 0;
-          aic7xxx_pci_intr(temp_p);
-          aic7xxx_verbose = oldverbose;
-
-          temp_p->bios_address = 0;
-
-          /*
-           * Remember how the card was setup in case there is no seeprom.
-           */
-          if (temp_p->features & AHC_ULTRA2)
-            temp_p->scsi_id = aic_inb(temp_p, SCSIID_ULTRA2) & OID;
-          else
-            temp_p->scsi_id = aic_inb(temp_p, SCSIID) & OID;
-          /*
-           * Get current termination setting
-           */
-          sxfrctl1 = aic_inb(temp_p, SXFRCTL1);
-
-          if (aic7xxx_chip_reset(temp_p) == -1)
-          {
-            goto skip_pci_controller;
-          }
-          /*
-           * Very quickly put the term setting back into the register since
-           * the chip reset may cause odd things to happen.  This is to keep
-           * LVD busses with lots of drives from draining the power out of
-           * the diffsense line before we get around to running the
-           * configure_termination() function.  Also restore the STPWLEVEL
-           * bit of DEVCONFIG
-           */
-          aic_outb(temp_p, sxfrctl1, SXFRCTL1);
-          pci_write_config_dword(temp_p->pdev, DEVCONFIG, devconfig);
-          sxfrctl1 &= STPWEN;
-
-          /*
-           * We need to set the CHNL? assignments before loading the SEEPROM
-           * The 3940 and 3985 cards (original stuff, not any of the later
-           * stuff) are 7870 and 7880 class chips.  The Ultra2 stuff falls
-           * under 7896 and 7897.  The 7895 is in a class by itself :)
-           */
-          switch (temp_p->chip & AHC_CHIPID_MASK)
-          {
-            case AHC_AIC7870: /* 3840 / 3985 */
-            case AHC_AIC7880: /* 3840 UW / 3985 UW */
-              if(temp_p->flags & AHC_MULTI_CHANNEL)
-              {
-                switch(PCI_SLOT(temp_p->pci_device_fn))
-                {
-                  case 5:
-                    temp_p->flags |= AHC_CHNLB;
-                    break;
-                  case 8:
-                    temp_p->flags |= AHC_CHNLB;
-                    break;
-                  case 12:
-                    temp_p->flags |= AHC_CHNLC;
-                    break;
-                  default:
-                    break;
-                }
-              }
-              break;
-
-            case AHC_AIC7895: /* 7895 */
-            case AHC_AIC7896: /* 7896/7 */
-            case AHC_AIC7899: /* 7899 */
-              if (PCI_FUNC(pdev->devfn) != 0)
-              {
-                temp_p->flags |= AHC_CHNLB;
-              }
-              /*
-               * The 7895 is the only chipset that sets the SCBSIZE32 param
-               * in the DEVCONFIG register.  The Ultra2 chipsets use
-               * the DSCOMMAND0 register instead.
-               */
-              if ((temp_p->chip & AHC_CHIPID_MASK) == AHC_AIC7895)
-              {
-                pci_read_config_dword(pdev, DEVCONFIG, &devconfig);
-                devconfig |= SCBSIZE32;
-                pci_write_config_dword(pdev, DEVCONFIG, devconfig);
-              }
-              break;
-            default:
-              break;
-          }
-
-          /*
-           * Loading of the SEEPROM needs to come after we've set the flags
-           * to indicate possible CHNLB and CHNLC assigments.  Otherwise,
-           * on 394x and 398x cards we'll end up reading the wrong settings
-           * for channels B and C
-           */
-          switch (temp_p->chip & AHC_CHIPID_MASK)
-          {
-            case AHC_AIC7892:
-            case AHC_AIC7899:
-              aic_outb(temp_p, 0, SCAMCTL);
-              /*
-               * Switch to the alt mode of the chip...
-               */
-              aic_outb(temp_p, aic_inb(temp_p, SFUNCT) | ALT_MODE, SFUNCT);
-              /*
-               * Set our options...the last two items set our CRC after x byte
-               * count in target mode...
-               */
-              aic_outb(temp_p, AUTO_MSGOUT_DE | DIS_MSGIN_DUALEDGE, OPTIONMODE);
-              aic_outb(temp_p, 0x00, 0x0b);
-              aic_outb(temp_p, 0x10, 0x0a);
-              /*
-               * switch back to normal mode...
-               */
-              aic_outb(temp_p, aic_inb(temp_p, SFUNCT) & ~ALT_MODE, SFUNCT);
-              aic_outb(temp_p, CRCVALCHKEN | CRCENDCHKEN | CRCREQCHKEN |
-                               TARGCRCENDEN | TARGCRCCNTEN,
-                       CRCCONTROL1);
-              aic_outb(temp_p, ((aic_inb(temp_p, DSCOMMAND0) | USCBSIZE32 |
-                                 MPARCKEN | CIOPARCKEN | CACHETHEN) & 
-                               ~DPARCKEN), DSCOMMAND0);
-              aic7xxx_load_seeprom(temp_p, &sxfrctl1);
-              break;
-            case AHC_AIC7890:
-            case AHC_AIC7896:
-              aic_outb(temp_p, 0, SCAMCTL);
-              aic_outb(temp_p, (aic_inb(temp_p, DSCOMMAND0) |
-                                CACHETHEN | MPARCKEN | USCBSIZE32 |
-                                CIOPARCKEN) & ~DPARCKEN, DSCOMMAND0);
-              aic7xxx_load_seeprom(temp_p, &sxfrctl1);
-              break;
-            case AHC_AIC7850:
-            case AHC_AIC7860:
-              /*
-               * Set the DSCOMMAND0 register on these cards different from
-               * on the 789x cards.  Also, read the SEEPROM as well.
-               */
-              aic_outb(temp_p, (aic_inb(temp_p, DSCOMMAND0) |
-                                CACHETHEN | MPARCKEN) & ~DPARCKEN,
-                       DSCOMMAND0);
-              /* FALLTHROUGH */
-            default:
-              aic7xxx_load_seeprom(temp_p, &sxfrctl1);
-              break;
-            case AHC_AIC7880:
-              /*
-               * Check the rev of the chipset before we change DSCOMMAND0
-               */
-              pci_read_config_dword(pdev, DEVCONFIG, &devconfig);
-              if ((devconfig & 0xff) >= 1)
-              {
-                aic_outb(temp_p, (aic_inb(temp_p, DSCOMMAND0) |
-                                  CACHETHEN | MPARCKEN) & ~DPARCKEN,
-                         DSCOMMAND0);
-              }
-              aic7xxx_load_seeprom(temp_p, &sxfrctl1);
-              break;
-          }
-          
-
-          /*
-           * and then we need another switch based on the type in order to
-           * make sure the channel B primary flag is set properly on 7895
-           * controllers....Arrrgggghhh!!!  We also have to catch the fact
-           * that when you disable the BIOS on the 7895 on the Intel DK440LX
-           * motherboard, and possibly others, it only sets the BIOS disabled
-           * bit on the A channel...I think I'm starting to lean towards
-           * going postal....
-           */
-          switch(temp_p->chip & AHC_CHIPID_MASK)
-          {
-            case AHC_AIC7895:
-            case AHC_AIC7896:
-            case AHC_AIC7899:
-              current_p = list_p;
-              while(current_p != NULL)
-              {
-                if ( (current_p->pci_bus == temp_p->pci_bus) &&
-                     (PCI_SLOT(current_p->pci_device_fn) ==
-                      PCI_SLOT(temp_p->pci_device_fn)) )
-                {
-                  if ( PCI_FUNC(current_p->pci_device_fn) == 0 )
-                  {
-                    temp_p->flags |= 
-                      (current_p->flags & AHC_CHANNEL_B_PRIMARY);
-                    temp_p->flags &= ~(AHC_BIOS_ENABLED|AHC_USEDEFAULTS);
-                    temp_p->flags |=
-                      (current_p->flags & (AHC_BIOS_ENABLED|AHC_USEDEFAULTS));
-                  }
-                  else
-                  {
-                    current_p->flags |=
-                      (temp_p->flags & AHC_CHANNEL_B_PRIMARY);
-                    current_p->flags &= ~(AHC_BIOS_ENABLED|AHC_USEDEFAULTS);
-                    current_p->flags |=
-                      (temp_p->flags & (AHC_BIOS_ENABLED|AHC_USEDEFAULTS));
-                  }
-                }
-                current_p = current_p->next;
-              }
-              break;
-            default:
-              break;
-          }
-
-          /*
-           * We only support external SCB RAM on the 7895/6/7 chipsets.
-           * We could support it on the 7890/1 easy enough, but I don't
-           * know of any 7890/1 based cards that have it.  I do know
-           * of 7895/6/7 cards that have it and they work properly.
-           */
-          switch(temp_p->chip & AHC_CHIPID_MASK)
-          {
-            default:
-              break;
-            case AHC_AIC7895:
-            case AHC_AIC7896:
-            case AHC_AIC7899:
-              pci_read_config_dword(pdev, DEVCONFIG, &devconfig);
-              if (temp_p->features & AHC_ULTRA2)
-              {
-                if ( (aic_inb(temp_p, DSCOMMAND0) & RAMPSM_ULTRA2) &&
-                     (aic7xxx_scbram) )
-                {
-                  aic_outb(temp_p,
-                           aic_inb(temp_p, DSCOMMAND0) & ~SCBRAMSEL_ULTRA2,
-                           DSCOMMAND0);
-                  temp_p->flags |= AHC_EXTERNAL_SRAM;
-                  devconfig |= EXTSCBPEN;
-                }
-                else if (aic_inb(temp_p, DSCOMMAND0) & RAMPSM_ULTRA2)
-                {
-                  printk(KERN_INFO "aic7xxx: <%s> at PCI %d/%d/%d\n", 
-                    board_names[aic_pdevs[i].board_name_index],
-                    temp_p->pci_bus,
-                    PCI_SLOT(temp_p->pci_device_fn),
-                    PCI_FUNC(temp_p->pci_device_fn));
-                  printk("aic7xxx: external SCB RAM detected, "
-                         "but not enabled\n");
-                }
-              }
-              else
-              {
-                if ((devconfig & RAMPSM) && (aic7xxx_scbram))
-                {
-                  devconfig &= ~SCBRAMSEL;
-                  devconfig |= EXTSCBPEN;
-                  temp_p->flags |= AHC_EXTERNAL_SRAM;
-                }
-                else if (devconfig & RAMPSM)
-                {
-                  printk(KERN_INFO "aic7xxx: <%s> at PCI %d/%d/%d\n", 
-                    board_names[aic_pdevs[i].board_name_index],
-                    temp_p->pci_bus,
-                    PCI_SLOT(temp_p->pci_device_fn),
-                    PCI_FUNC(temp_p->pci_device_fn));
-                  printk("aic7xxx: external SCB RAM detected, "
-                         "but not enabled\n");
-                }
-              }
-              pci_write_config_dword(pdev, DEVCONFIG, devconfig);
-              if ( (temp_p->flags & AHC_EXTERNAL_SRAM) &&
-                   (temp_p->flags & AHC_CHNLB) )
-                aic_outb(temp_p, 1, CCSCBBADDR);
-              break;
-          }
-
-          /*
-           * Take the LED out of diagnostic mode
-           */
-          aic_outb(temp_p, 
-            (aic_inb(temp_p, SBLKCTL) & ~(DIAGLEDEN | DIAGLEDON)),
-            SBLKCTL);
-
-          /*
-           * We don't know where this is set in the SEEPROM or by the
-           * BIOS, so we default to 100%.  On Ultra2 controllers, use 75%
-           * instead.
-           */
-          if (temp_p->features & AHC_ULTRA2)
-          {
-            aic_outb(temp_p, RD_DFTHRSH_MAX | WR_DFTHRSH_MAX, DFF_THRSH);
-          }
-          else
-          {
-            aic_outb(temp_p, DFTHRSH_100, DSPCISTATUS);
-          }
-
-          /*
-           * Call our function to fixup any bugs that exist on this chipset.
-           * This may muck with PCI settings and other device settings, so
-           * make sure it's after all the other PCI and device register
-           * tweaks so it can back out bad settings on specific broken cards.
-           */
-          aic7xxx_configure_bugs(temp_p);
-
-          /* Hold a pci device reference */
-          pci_dev_get(temp_p->pdev);
-
-          if ( list_p == NULL )
-          {
-            list_p = current_p = temp_p;
-          }
-          else
-          {
-            current_p = list_p;
-            while(current_p->next != NULL)
-              current_p = current_p->next;
-            current_p->next = temp_p;
-          }
-          temp_p->next = NULL;
-          found++;
-          continue;
-skip_pci_controller:
-#ifdef CONFIG_PCI
-          pci_release_regions(temp_p->pdev);
-#endif
-          kfree(temp_p);
-        }  /* Found an Adaptec PCI device. */
-        else /* Well, we found one, but we couldn't get any memory */
-        {
-          printk("aic7xxx: Found <%s>\n", 
-            board_names[aic_pdevs[i].board_name_index]);
-          printk(KERN_INFO "aic7xxx: Unable to allocate device memory, "
-            "skipping.\n");
-        }
-      } /* while(pdev=....) */
-    } /* for PCI_DEVICES */
-  }
-#endif /* CONFIG_PCI */
-
-#if defined(__i386__) || defined(__alpha__)
-  /*
-   * EISA/VL-bus card signature probe.
-   */
-  slot = MINSLOT;
-  while ( (slot <= MAXSLOT) &&
-         !(aic7xxx_no_probe) )
-  {
-    base = SLOTBASE(slot) + MINREG;
-
-    if (!request_region(base, MAXREG - MINREG, "aic7xxx"))
-    {
-      /*
-       * Some other driver has staked a
-       * claim to this i/o region already.
-       */
-      slot++;
-      continue; /* back to the beginning of the for loop */
-    }
-    flags = 0;
-    type = aic7xxx_probe(slot, base + AHC_HID0, &flags);
-    if (type == -1)
-    {
-      release_region(base, MAXREG - MINREG);
-      slot++;
-      continue;
-    }
-    temp_p = kmalloc(sizeof(struct aic7xxx_host), GFP_ATOMIC);
-    if (temp_p == NULL)
-    {
-      printk(KERN_WARNING "aic7xxx: Unable to allocate device space.\n");
-      release_region(base, MAXREG - MINREG);
-      slot++;
-      continue; /* back to the beginning of the while loop */
-    }
-
-    /*
-     * Pause the card preserving the IRQ type.  Allow the operator
-     * to override the IRQ trigger.
-     */
-    if (aic7xxx_irq_trigger == 1)
-      hcntrl = IRQMS;  /* Level */
-    else if (aic7xxx_irq_trigger == 0)
-      hcntrl = 0;  /* Edge */
-    else
-      hcntrl = inb(base + HCNTRL) & IRQMS;  /* Default */
-    memset(temp_p, 0, sizeof(struct aic7xxx_host));
-    temp_p->unpause = hcntrl | INTEN;
-    temp_p->pause = hcntrl | PAUSE | INTEN;
-    temp_p->base = base;
-    temp_p->mbase = 0;
-    temp_p->maddr = NULL;
-    temp_p->pci_bus = 0;
-    temp_p->pci_device_fn = slot;
-    aic_outb(temp_p, hcntrl | PAUSE, HCNTRL);
-    while( (aic_inb(temp_p, HCNTRL) & PAUSE) == 0 ) ;
-    if (aic7xxx_chip_reset(temp_p) == -1)
-      temp_p->irq = 0;
-    else
-      temp_p->irq = aic_inb(temp_p, INTDEF) & 0x0F;
-    temp_p->flags |= AHC_PAGESCBS;
-
-    switch (temp_p->irq)
-    {
-      case 9:
-      case 10:
-      case 11:
-      case 12:
-      case 14:
-      case 15:
-        break;
-
-      default:
-        printk(KERN_WARNING "aic7xxx: Host adapter uses unsupported IRQ "
-          "level %d, ignoring.\n", temp_p->irq);
-        kfree(temp_p);
-        release_region(base, MAXREG - MINREG);
-        slot++;
-        continue; /* back to the beginning of the while loop */
-    }
-
-    /*
-     * We are committed now, everything has been checked and this card
-     * has been found, now we just set it up
-     */
-
-    /*
-     * Insert our new struct into the list at the end
-     */
-    if (list_p == NULL)
-    {
-      list_p = current_p = temp_p;
-    }
-    else
-    {
-      current_p = list_p;
-      while (current_p->next != NULL)
-        current_p = current_p->next;
-      current_p->next = temp_p;
-    }
-
-    switch (type)
-    {
-      case 0:
-        temp_p->board_name_index = 2;
-        if (aic7xxx_verbose & VERBOSE_PROBE2)
-          printk("aic7xxx: <%s> at EISA %d\n",
-               board_names[2], slot);
-        /* FALLTHROUGH */
-      case 1:
-      {
-        temp_p->chip = AHC_AIC7770 | AHC_EISA;
-        temp_p->features |= AHC_AIC7770_FE;
-        temp_p->bios_control = aic_inb(temp_p, HA_274_BIOSCTRL);
-
-        /*
-         * Get the primary channel information.  Right now we don't
-         * do anything with this, but someday we will be able to inform
-         * the mid-level SCSI code which channel is primary.
-         */
-        if (temp_p->board_name_index == 0)
-        {
-          temp_p->board_name_index = 3;
-          if (aic7xxx_verbose & VERBOSE_PROBE2)
-            printk("aic7xxx: <%s> at EISA %d\n",
-                 board_names[3], slot);
-        }
-        if (temp_p->bios_control & CHANNEL_B_PRIMARY)
-        {
-          temp_p->flags |= AHC_CHANNEL_B_PRIMARY;
-        }
-
-        if ((temp_p->bios_control & BIOSMODE) == BIOSDISABLED)
-        {
-          temp_p->flags &= ~AHC_BIOS_ENABLED;
-        }
-        else
-        {
-          temp_p->flags &= ~AHC_USEDEFAULTS;
-          temp_p->flags |= AHC_BIOS_ENABLED;
-          if ( (temp_p->bios_control & 0x20) == 0 )
-          {
-            temp_p->bios_address = 0xcc000;
-            temp_p->bios_address += (0x4000 * (temp_p->bios_control & 0x07));
-          }
-          else
-          {
-            temp_p->bios_address = 0xd0000;
-            temp_p->bios_address += (0x8000 * (temp_p->bios_control & 0x06));
-          }
-        }
-        temp_p->adapter_control = aic_inb(temp_p, SCSICONF) << 8;
-        temp_p->adapter_control |= aic_inb(temp_p, SCSICONF + 1);
-        if (temp_p->features & AHC_WIDE)
-        {
-          temp_p->scsi_id = temp_p->adapter_control & HWSCSIID;
-          temp_p->scsi_id_b = temp_p->scsi_id;
-        }
-        else
-        {
-          temp_p->scsi_id = (temp_p->adapter_control >> 8) & HSCSIID;
-          temp_p->scsi_id_b = temp_p->adapter_control & HSCSIID;
-        }
-        aic7xxx_load_seeprom(temp_p, &sxfrctl1);
-        break;
-      }
-
-      case 2:
-      case 3:
-        temp_p->chip = AHC_AIC7770 | AHC_VL;
-        temp_p->features |= AHC_AIC7770_FE;
-        if (type == 2)
-          temp_p->flags |= AHC_BIOS_ENABLED;
-        else
-          temp_p->flags &= ~AHC_BIOS_ENABLED;
-        if (aic_inb(temp_p, SCSICONF) & TERM_ENB)
-          sxfrctl1 = STPWEN;
-        aic7xxx_load_seeprom(temp_p, &sxfrctl1);
-        temp_p->board_name_index = 4;
-        if (aic7xxx_verbose & VERBOSE_PROBE2)
-          printk("aic7xxx: <%s> at VLB %d\n",
-               board_names[2], slot);
-        switch( aic_inb(temp_p, STATUS_2840) & BIOS_SEL )
-        {
-          case 0x00:
-            temp_p->bios_address = 0xe0000;
-            break;
-          case 0x20:
-            temp_p->bios_address = 0xc8000;
-            break;
-          case 0x40:
-            temp_p->bios_address = 0xd0000;
-            break;
-          case 0x60:
-            temp_p->bios_address = 0xd8000;
-            break;
-          default:
-            break; /* can't get here */
-        }
-        break;
-
-      default:  /* Won't get here. */
-        break;
-    }
-    if (aic7xxx_verbose & VERBOSE_PROBE2)
-    {
-      printk(KERN_INFO "aic7xxx: BIOS %sabled, IO Port 0x%lx, IRQ %d (%s)\n",
-        (temp_p->flags & AHC_USEDEFAULTS) ? "dis" : "en", temp_p->base,
-        temp_p->irq,
-        (temp_p->pause & IRQMS) ? "level sensitive" : "edge triggered");
-      printk(KERN_INFO "aic7xxx: Extended translation %sabled.\n",
-             (temp_p->flags & AHC_EXTEND_TRANS_A) ? "en" : "dis");
-    }
-
-    /*
-     * All the 7770 based chipsets have this bug
-     */
-    temp_p->bugs |= AHC_BUG_TMODE_WIDEODD;
-
-    /*
-     * Set the FIFO threshold and the bus off time.
-     */
-    hostconf = aic_inb(temp_p, HOSTCONF);
-    aic_outb(temp_p, hostconf & DFTHRSH, BUSSPD);
-    aic_outb(temp_p, (hostconf << 2) & BOFF, BUSTIME);
-    slot++;
-    found++;
-  }
-
-#endif /* defined(__i386__) || defined(__alpha__) */
-
-  /*
-   * Now, we re-order the probed devices by BIOS address and BUS class.
-   * In general, we follow this algorithm to make the adapters show up
-   * in the same order under linux that the computer finds them.
-   *  1: All VLB/EISA cards with BIOS_ENABLED first, according to BIOS
-   *     address, going from lowest to highest.
-   *  2: All PCI controllers with BIOS_ENABLED next, according to BIOS
-   *     address, going from lowest to highest.
-   *  3: Remaining VLB/EISA controllers going in slot order.
-   *  4: Remaining PCI controllers, going in PCI device order (reversible)
-   */
-
-  {
-    struct aic7xxx_host *sort_list[4] = { NULL, NULL, NULL, NULL };
-    struct aic7xxx_host *vlb, *pci;
-    struct aic7xxx_host *prev_p;
-    struct aic7xxx_host *p;
-    unsigned char left;
-
-    prev_p = vlb = pci = NULL;
-
-    temp_p = list_p;
-    while (temp_p != NULL)
-    {
-      switch(temp_p->chip & ~AHC_CHIPID_MASK)
-      {
-        case AHC_EISA:
-        case AHC_VL:
-        {
-          p = temp_p;
-          if (p->flags & AHC_BIOS_ENABLED)
-            vlb = sort_list[0];
-          else
-            vlb = sort_list[2];
-
-          if (vlb == NULL)
-          {
-            vlb = temp_p;
-            temp_p = temp_p->next;
-            vlb->next = NULL;
-          }
-          else
-          {
-            current_p = vlb;
-            prev_p = NULL;
-            while ( (current_p != NULL) &&
-                    (current_p->bios_address < temp_p->bios_address))
-            {
-              prev_p = current_p;
-              current_p = current_p->next;
-            }
-            if (prev_p != NULL)
-            {
-              prev_p->next = temp_p;
-              temp_p = temp_p->next;
-              prev_p->next->next = current_p;
-            }
-            else
-            {
-              vlb = temp_p;
-              temp_p = temp_p->next;
-              vlb->next = current_p;
-            }
-          }
-          
-          if (p->flags & AHC_BIOS_ENABLED)
-            sort_list[0] = vlb;
-          else
-            sort_list[2] = vlb;
-          
-          break;
-        }
-        default:  /* All PCI controllers fall through to default */
-        {
-
-          p = temp_p;
-          if (p->flags & AHC_BIOS_ENABLED) 
-            pci = sort_list[1];
-          else
-            pci = sort_list[3];
-
-          if (pci == NULL)
-          {
-            pci = temp_p;
-            temp_p = temp_p->next;
-            pci->next = NULL;
-          }
-          else
-          {
-            current_p = pci;
-            prev_p = NULL;
-            if (!aic7xxx_reverse_scan)
-            {
-              while ( (current_p != NULL) &&
-                      ( (PCI_SLOT(current_p->pci_device_fn) |
-                        (current_p->pci_bus << 8)) < 
-                        (PCI_SLOT(temp_p->pci_device_fn) |
-                        (temp_p->pci_bus << 8)) ) )
-              {
-                prev_p = current_p;
-                current_p = current_p->next;
-              }
-            }
-            else
-            {
-              while ( (current_p != NULL) &&
-                      ( (PCI_SLOT(current_p->pci_device_fn) |
-                        (current_p->pci_bus << 8)) > 
-                        (PCI_SLOT(temp_p->pci_device_fn) |
-                        (temp_p->pci_bus << 8)) ) )
-              {
-                prev_p = current_p;
-                current_p = current_p->next;
-              }
-            }
-            /*
-             * Are we dealing with a 7895/6/7/9 where we need to sort the
-             * channels as well, if so, the bios_address values should
-             * be the same
-             */
-            if ( (current_p) && (temp_p->flags & AHC_MULTI_CHANNEL) &&
-                 (temp_p->pci_bus == current_p->pci_bus) &&
-                 (PCI_SLOT(temp_p->pci_device_fn) ==
-                  PCI_SLOT(current_p->pci_device_fn)) )
-            {
-              if (temp_p->flags & AHC_CHNLB)
-              {
-                if ( !(temp_p->flags & AHC_CHANNEL_B_PRIMARY) )
-                {
-                  prev_p = current_p;
-                  current_p = current_p->next;
-                }
-              }
-              else
-              {
-                if (temp_p->flags & AHC_CHANNEL_B_PRIMARY)
-                {
-                  prev_p = current_p;
-                  current_p = current_p->next;
-                }
-              }
-            }
-            if (prev_p != NULL)
-            {
-              prev_p->next = temp_p;
-              temp_p = temp_p->next;
-              prev_p->next->next = current_p;
-            }
-            else
-            {
-              pci = temp_p;
-              temp_p = temp_p->next;
-              pci->next = current_p;
-            }
-          }
-
-          if (p->flags & AHC_BIOS_ENABLED)
-            sort_list[1] = pci;
-          else
-            sort_list[3] = pci;
-
-          break;
-        }
-      }  /* End of switch(temp_p->type) */
-    } /* End of while (temp_p != NULL) */
-    /*
-     * At this point, the cards have been broken into 4 sorted lists, now
-     * we run through the lists in order and register each controller
-     */
-    {
-      int i;
-      
-      left = found;
-      for (i=0; i<ARRAY_SIZE(sort_list); i++)
-      {
-        temp_p = sort_list[i];
-        while(temp_p != NULL)
-        {
-          template->name = board_names[temp_p->board_name_index];
-          p = aic7xxx_alloc(template, temp_p);
-          if (p != NULL)
-          {
-            p->instance = found - left;
-            if (aic7xxx_register(template, p, (--left)) == 0)
-            {
-              found--;
-              aic7xxx_release(p->host);
-              scsi_unregister(p->host);
-            }
-            else if (aic7xxx_dump_card)
-            {
-              pause_sequencer(p);
-              aic7xxx_print_card(p);
-              aic7xxx_print_scratch_ram(p);
-              unpause_sequencer(p, TRUE);
-            }
-          }
-          current_p = temp_p;
-          temp_p = (struct aic7xxx_host *)temp_p->next;
-          kfree(current_p);
-        }
-      }
-    }
-  }
-  return (found);
-}
-
-/*+F*************************************************************************
- * Function:
- *   aic7xxx_buildscb
- *
- * Description:
- *   Build a SCB.
- *-F*************************************************************************/
-static void aic7xxx_buildscb(struct aic7xxx_host *p, struct scsi_cmnd *cmd,
-                             struct aic7xxx_scb *scb)
-{
-  unsigned short mask;
-  struct aic7xxx_hwscb *hscb;
-  struct aic_dev_data *aic_dev = cmd->device->hostdata;
-  struct scsi_device *sdptr = cmd->device;
-  unsigned char tindex = TARGET_INDEX(cmd);
-  int use_sg;
-
-  mask = (0x01 << tindex);
-  hscb = scb->hscb;
-
-  /*
-   * Setup the control byte if we need negotiation and have not
-   * already requested it.
-   */
-  hscb->control = 0;
-  scb->tag_action = 0;
-
-  if (p->discenable & mask)
-  {
-    hscb->control |= DISCENB;
-    /* We always force TEST_UNIT_READY to untagged */
-    if (cmd->cmnd[0] != TEST_UNIT_READY && sdptr->simple_tags)
-    {
-      hscb->control |= MSG_SIMPLE_Q_TAG;
-      scb->tag_action = MSG_SIMPLE_Q_TAG;
-    }
-  }
-  if ( !(aic_dev->dtr_pending) &&
-        (aic_dev->needppr || aic_dev->needwdtr || aic_dev->needsdtr) &&
-        (aic_dev->flags & DEVICE_DTR_SCANNED) )
-  {
-    aic_dev->dtr_pending = 1;
-    scb->tag_action = 0;
-    hscb->control &= DISCENB;
-    hscb->control |= MK_MESSAGE;
-    if(aic_dev->needppr)
-    {
-      scb->flags |= SCB_MSGOUT_PPR;
-    }
-    else if(aic_dev->needwdtr)
-    {
-      scb->flags |= SCB_MSGOUT_WDTR;
-    }
-    else if(aic_dev->needsdtr)
-    {
-      scb->flags |= SCB_MSGOUT_SDTR;
-    }
-    scb->flags |= SCB_DTR_SCB;
-  }
-  hscb->target_channel_lun = ((cmd->device->id << 4) & 0xF0) |
-        ((cmd->device->channel & 0x01) << 3) | (cmd->device->lun & 0x07);
-
-  /*
-   * The interpretation of request_buffer and request_bufflen
-   * changes depending on whether or not use_sg is zero; a
-   * non-zero use_sg indicates the number of elements in the
-   * scatter-gather array.
-   */
-
-  /*
-   * XXX - this relies on the host data being stored in a
-   *       little-endian format.
-   */
-  hscb->SCSI_cmd_length = cmd->cmd_len;
-  memcpy(scb->cmnd, cmd->cmnd, cmd->cmd_len);
-  hscb->SCSI_cmd_pointer = cpu_to_le32(SCB_DMA_ADDR(scb, scb->cmnd));
-
-  use_sg = scsi_dma_map(cmd);
-  BUG_ON(use_sg < 0);
-
-  if (use_sg) {
-    struct scatterlist *sg;  /* Must be mid-level SCSI code scatterlist */
-
-    /*
-     * We must build an SG list in adapter format, as the kernel's SG list
-     * cannot be used directly because of data field size (__alpha__)
-     * differences and the kernel SG list uses virtual addresses where
-     * we need physical addresses.
-     */
-    int i;
-
-    scb->sg_length = 0;
-
-
-    /*
-     * Copy the segments into the SG array.  NOTE!!! - We used to
-     * have the first entry both in the data_pointer area and the first
-     * SG element.  That has changed somewhat.  We still have the first
-     * entry in both places, but now we download the address of
-     * scb->sg_list[1] instead of 0 to the sg pointer in the hscb.
-     */
-    scsi_for_each_sg(cmd, sg, use_sg, i) {
-      unsigned int len = sg_dma_len(sg);
-      scb->sg_list[i].address = cpu_to_le32(sg_dma_address(sg));
-      scb->sg_list[i].length = cpu_to_le32(len);
-      scb->sg_length += len;
-    }
-    /* Copy the first SG into the data pointer area. */
-    hscb->data_pointer = scb->sg_list[0].address;
-    hscb->data_count = scb->sg_list[0].length;
-    scb->sg_count = i;
-    hscb->SG_segment_count = i;
-    hscb->SG_list_pointer = cpu_to_le32(SCB_DMA_ADDR(scb, &scb->sg_list[1]));
-  } else {
-      scb->sg_count = 0;
-      scb->sg_length = 0;
-      hscb->SG_segment_count = 0;
-      hscb->SG_list_pointer = 0;
-      hscb->data_count = 0;
-      hscb->data_pointer = 0;
-  }
-}
-
-/*+F*************************************************************************
- * Function:
- *   aic7xxx_queue
- *
- * Description:
- *   Queue a SCB to the controller.
- *-F*************************************************************************/
-static int aic7xxx_queue_lck(struct scsi_cmnd *cmd, void (*fn)(struct scsi_cmnd *))
-{
-  struct aic7xxx_host *p;
-  struct aic7xxx_scb *scb;
-  struct aic_dev_data *aic_dev;
-
-  p = (struct aic7xxx_host *) cmd->device->host->hostdata;
-
-  aic_dev = cmd->device->hostdata;  
-#ifdef AIC7XXX_VERBOSE_DEBUGGING
-  if (aic_dev->active_cmds > aic_dev->max_q_depth)
-  {
-    printk(WARN_LEAD "Commands queued exceeds queue "
-           "depth, active=%d\n",
-           p->host_no, CTL_OF_CMD(cmd), 
-           aic_dev->active_cmds);
-  }
-#endif
-
-  scb = scbq_remove_head(&p->scb_data->free_scbs);
-  if (scb == NULL)
-  {
-    aic7xxx_allocate_scb(p);
-    scb = scbq_remove_head(&p->scb_data->free_scbs);
-    if(scb == NULL)
-    {
-      printk(WARN_LEAD "Couldn't get a free SCB.\n", p->host_no,
-             CTL_OF_CMD(cmd));
-      return 1;
-    }
-  }
-  scb->cmd = cmd;
-
-        /*
-        * Make sure the scsi_cmnd pointer is saved, the struct it points to
-        * is set up properly, and the parity error flag is reset, then send
-        * the SCB to the sequencer and watch the fun begin.
-        */
-  aic7xxx_position(cmd) = scb->hscb->tag;
-  cmd->scsi_done = fn;
-  cmd->result = DID_OK;
-  aic7xxx_error(cmd) = DID_OK;
-  aic7xxx_status(cmd) = 0;
-  cmd->host_scribble = NULL;
-
-  /*
-   * Construct the SCB beforehand, so the sequencer is
-   * paused a minimal amount of time.
-   */
-  aic7xxx_buildscb(p, cmd, scb);
-
-  scb->flags |= SCB_ACTIVE | SCB_WAITINGQ;
-
-  scbq_insert_tail(&p->waiting_scbs, scb);
-  aic7xxx_run_waiting_queues(p);
-  return (0);
-}
-
-static DEF_SCSI_QCMD(aic7xxx_queue)
-
-/*+F*************************************************************************
- * Function:
- *   aic7xxx_bus_device_reset
- *
- * Description:
- *   Abort or reset the current SCSI command(s).  If the scb has not
- *   previously been aborted, then we attempt to send a BUS_DEVICE_RESET
- *   message to the target.  If the scb has previously been unsuccessfully
- *   aborted, then we will reset the channel and have all devices renegotiate.
- *   Returns an enumerated type that indicates the status of the operation.
- *-F*************************************************************************/
-static int __aic7xxx_bus_device_reset(struct scsi_cmnd *cmd)
-{
-  struct aic7xxx_host  *p;
-  struct aic7xxx_scb   *scb;
-  struct aic7xxx_hwscb *hscb;
-  int channel;
-  unsigned char saved_scbptr, lastphase;
-  unsigned char hscb_index;
-  int disconnected;
-  struct aic_dev_data *aic_dev;
-
-  if(cmd == NULL)
-  {
-    printk(KERN_ERR "aic7xxx_bus_device_reset: called with NULL cmd!\n");
-    return FAILED;
-  }
-  p = (struct aic7xxx_host *)cmd->device->host->hostdata;
-  aic_dev = AIC_DEV(cmd);
-  if(aic7xxx_position(cmd) < p->scb_data->numscbs)
-    scb = (p->scb_data->scb_array[aic7xxx_position(cmd)]);
-  else
-    return FAILED;
-
-  hscb = scb->hscb;
-
-  aic7xxx_isr(p);
-  aic7xxx_done_cmds_complete(p);
-  /* If the command was already complete or just completed, then we didn't
-   * do a reset, return FAILED */
-  if(!(scb->flags & SCB_ACTIVE))
-    return FAILED;
-
-  pause_sequencer(p);
-  lastphase = aic_inb(p, LASTPHASE);
-  if (aic7xxx_verbose & VERBOSE_RESET_PROCESS)
-  {
-    printk(INFO_LEAD "Bus Device reset, scb flags 0x%x, ",
-         p->host_no, CTL_OF_SCB(scb), scb->flags);
-    switch (lastphase)
-    {
-      case P_DATAOUT:
-        printk("Data-Out phase\n");
-        break;
-      case P_DATAIN:
-        printk("Data-In phase\n");
-        break;
-      case P_COMMAND:
-        printk("Command phase\n");
-        break;
-      case P_MESGOUT:
-        printk("Message-Out phase\n");
-        break;
-      case P_STATUS:
-        printk("Status phase\n");
-        break;
-      case P_MESGIN:
-        printk("Message-In phase\n");
-        break;
-      default:
-      /*
-       * We're not in a valid phase, so assume we're idle.
-       */
-        printk("while idle, LASTPHASE = 0x%x\n", lastphase);
-        break;
-    }
-    printk(INFO_LEAD "SCSISIGI 0x%x, SEQADDR 0x%x, SSTAT0 0x%x, SSTAT1 "
-         "0x%x\n", p->host_no, CTL_OF_SCB(scb),
-         aic_inb(p, SCSISIGI),
-         aic_inb(p, SEQADDR0) | (aic_inb(p, SEQADDR1) << 8),
-         aic_inb(p, SSTAT0), aic_inb(p, SSTAT1));
-    printk(INFO_LEAD "SG_CACHEPTR 0x%x, SSTAT2 0x%x, STCNT 0x%x\n", p->host_no,
-         CTL_OF_SCB(scb),
-         (p->features & AHC_ULTRA2) ? aic_inb(p, SG_CACHEPTR) : 0,
-         aic_inb(p, SSTAT2),
-         aic_inb(p, STCNT + 2) << 16 | aic_inb(p, STCNT + 1) << 8 |
-         aic_inb(p, STCNT));
-  }
-
-  channel = cmd->device->channel;
-
-    /*
-     * Send a Device Reset Message:
-     * The target that is holding up the bus may not be the same as
-     * the one that triggered this timeout (different commands have
-     * different timeout lengths).  Our strategy here is to queue an
-     * abort message to the timed out target if it is disconnected.
-     * Otherwise, if we have an active target we stuff the message buffer
-     * with an abort message and assert ATN in the hopes that the target
-     * will let go of the bus and go to the mesgout phase.  If this
-     * fails, we'll get another timeout a few seconds later which will
-     * attempt a bus reset.
-     */
-  saved_scbptr = aic_inb(p, SCBPTR);
-  disconnected = FALSE;
-
-  if (lastphase != P_BUSFREE)
-  {
-    if (aic_inb(p, SCB_TAG) >= p->scb_data->numscbs)
-    {
-      printk(WARN_LEAD "Invalid SCB ID %d is active, "
-             "SCB flags = 0x%x.\n", p->host_no,
-            CTL_OF_CMD(cmd), scb->hscb->tag, scb->flags);
-      unpause_sequencer(p, FALSE);
-      return FAILED;
-    }
-    if (scb->hscb->tag == aic_inb(p, SCB_TAG))
-    { 
-      if ( (lastphase == P_MESGOUT) || (lastphase == P_MESGIN) )
-      {
-        printk(WARN_LEAD "Device reset, Message buffer "
-                "in use\n", p->host_no, CTL_OF_SCB(scb));
-        unpause_sequencer(p, FALSE);
-        return FAILED;
-      }
-        
-      if (aic7xxx_verbose & VERBOSE_RESET_PROCESS)
-        printk(INFO_LEAD "Device reset message in "
-              "message buffer\n", p->host_no, CTL_OF_SCB(scb));
-      scb->flags |= SCB_RESET | SCB_DEVICE_RESET;
-      aic7xxx_error(cmd) = DID_RESET;
-      aic_dev->flags |= BUS_DEVICE_RESET_PENDING;
-      /* Send the abort message to the active SCB. */
-      aic_outb(p, HOST_MSG, MSG_OUT);
-      aic_outb(p, lastphase | ATNO, SCSISIGO);
-      unpause_sequencer(p, FALSE);
-      spin_unlock_irq(p->host->host_lock);
-      ssleep(1);
-      spin_lock_irq(p->host->host_lock);
-      if(aic_dev->flags & BUS_DEVICE_RESET_PENDING)
-        return FAILED;
-      else
-        return SUCCESS;
-    }
-  } /* if (last_phase != P_BUSFREE).....indicates we are idle and can work */
-  /*
-   * Simply set the MK_MESSAGE flag and the SEQINT handler will do
-   * the rest on a reconnect/connect.
-   */
-  scb->hscb->control |= MK_MESSAGE;
-  scb->flags |= SCB_RESET | SCB_DEVICE_RESET;
-  aic_dev->flags |= BUS_DEVICE_RESET_PENDING;
-  /*
-   * Check to see if the command is on the qinfifo.  If it is, then we will
-   * not need to queue the command again since the card should start it soon
-   */
-  if (aic7xxx_search_qinfifo(p, cmd->device->channel, cmd->device->id, cmd->device->lun, hscb->tag,
-                          0, TRUE, NULL) == 0)
-  {
-    disconnected = TRUE;
-    if ((hscb_index = aic7xxx_find_scb(p, scb)) != SCB_LIST_NULL)
-    {
-      unsigned char scb_control;
-
-      aic_outb(p, hscb_index, SCBPTR);
-      scb_control = aic_inb(p, SCB_CONTROL);
-      /*
-       * If the DISCONNECTED bit is not set in SCB_CONTROL, then we are
-       * actually on the waiting list, not disconnected, and we don't
-       * need to requeue the command.
-       */
-      disconnected = (scb_control & DISCONNECTED);
-      aic_outb(p, scb_control | MK_MESSAGE, SCB_CONTROL);
-    }
-    if (disconnected)
-    {
-      /*
-       * Actually requeue this SCB in case we can select the
-       * device before it reconnects.  This can result in the command
-       * being on the qinfifo twice, but we don't care because it will
-       * all get cleaned up if/when the reset takes place.
-       */
-      if (aic7xxx_verbose & VERBOSE_RESET_PROCESS)
-        printk(INFO_LEAD "Queueing device reset command.\n", p->host_no,
-                      CTL_OF_SCB(scb));
-      p->qinfifo[p->qinfifonext++] = scb->hscb->tag;
-      if (p->features & AHC_QUEUE_REGS)
-        aic_outb(p, p->qinfifonext, HNSCB_QOFF);
-      else
-        aic_outb(p, p->qinfifonext, KERNEL_QINPOS);
-      scb->flags |= SCB_QUEUED_ABORT;
-    }
-  }
-  aic_outb(p, saved_scbptr, SCBPTR);
-  unpause_sequencer(p, FALSE);
-  spin_unlock_irq(p->host->host_lock);
-  msleep(1000/4);
-  spin_lock_irq(p->host->host_lock);
-  if(aic_dev->flags & BUS_DEVICE_RESET_PENDING)
-    return FAILED;
-  else
-    return SUCCESS;
-}
-
-static int aic7xxx_bus_device_reset(struct scsi_cmnd *cmd)
-{
-      int rc;
-
-      spin_lock_irq(cmd->device->host->host_lock);
-      rc = __aic7xxx_bus_device_reset(cmd);
-      spin_unlock_irq(cmd->device->host->host_lock);
-
-      return rc;
-}
-
-
-/*+F*************************************************************************
- * Function:
- *   aic7xxx_panic_abort
- *
- * Description:
- *   Abort the current SCSI command(s).
- *-F*************************************************************************/
-static void aic7xxx_panic_abort(struct aic7xxx_host *p, struct scsi_cmnd *cmd)
-{
-
-  printk("aic7xxx driver version %s\n", AIC7XXX_C_VERSION);
-  printk("Controller type:\n    %s\n", board_names[p->board_name_index]);
-  printk("p->flags=0x%lx, p->chip=0x%x, p->features=0x%x, "
-         "sequencer %s paused\n",
-     p->flags, p->chip, p->features,
-    (aic_inb(p, HCNTRL) & PAUSE) ? "is" : "isn't" );
-  pause_sequencer(p);
-  disable_irq(p->irq);
-  aic7xxx_print_card(p);
-  aic7xxx_print_scratch_ram(p);
-  spin_unlock_irq(p->host->host_lock);
-  for(;;) barrier();
-}
-
-/*+F*************************************************************************
- * Function:
- *   aic7xxx_abort
- *
- * Description:
- *   Abort the current SCSI command(s).
- *-F*************************************************************************/
-static int __aic7xxx_abort(struct scsi_cmnd *cmd)
-{
-  struct aic7xxx_scb  *scb = NULL;
-  struct aic7xxx_host *p;
-  int    found=0, disconnected;
-  unsigned char saved_hscbptr, hscbptr, scb_control;
-  struct aic_dev_data *aic_dev;
-
-  if(cmd == NULL)
-  {
-    printk(KERN_ERR "aic7xxx_abort: called with NULL cmd!\n");
-    return FAILED;
-  }
-  p = (struct aic7xxx_host *)cmd->device->host->hostdata;
-  aic_dev = AIC_DEV(cmd);
-  if(aic7xxx_position(cmd) < p->scb_data->numscbs)
-    scb = (p->scb_data->scb_array[aic7xxx_position(cmd)]);
-  else
-    return FAILED;
-
-  aic7xxx_isr(p);
-  aic7xxx_done_cmds_complete(p);
-  /* If the command was already complete or just completed, then we didn't
-   * do a reset, return FAILED */
-  if(!(scb->flags & SCB_ACTIVE))
-    return FAILED;
-
-  pause_sequencer(p);
-
-  /*
-   * I added a new config option to the driver: "panic_on_abort" that will
-   * cause the driver to panic and the machine to stop on the first abort
-   * or reset call into the driver.  At that point, it prints out a lot of
-   * useful information for me which I can then use to try and debug the
-   * problem.  Simply enable the boot time prompt in order to activate this
-   * code.
-   */
-  if (aic7xxx_panic_on_abort)
-    aic7xxx_panic_abort(p, cmd);
-
-  if (aic7xxx_verbose & VERBOSE_ABORT)
-  {
-    printk(INFO_LEAD "Aborting scb %d, flags 0x%x, SEQADDR 0x%x, LASTPHASE "
-           "0x%x\n",
-         p->host_no, CTL_OF_SCB(scb), scb->hscb->tag, scb->flags,
-         aic_inb(p, SEQADDR0) | (aic_inb(p, SEQADDR1) << 8),
-         aic_inb(p, LASTPHASE));
-    printk(INFO_LEAD "SG_CACHEPTR 0x%x, SG_COUNT %d, SCSISIGI 0x%x\n",
-         p->host_no, CTL_OF_SCB(scb), (p->features & AHC_ULTRA2) ?
-         aic_inb(p, SG_CACHEPTR) : 0, aic_inb(p, SG_COUNT),
-         aic_inb(p, SCSISIGI));
-    printk(INFO_LEAD "SSTAT0 0x%x, SSTAT1 0x%x, SSTAT2 0x%x\n",
-         p->host_no, CTL_OF_SCB(scb), aic_inb(p, SSTAT0),
-         aic_inb(p, SSTAT1), aic_inb(p, SSTAT2));
-  }
-
-  if (scb->flags & SCB_WAITINGQ)
-  {
-    if (aic7xxx_verbose & VERBOSE_ABORT_PROCESS) 
-      printk(INFO_LEAD "SCB found on waiting list and "
-          "aborted.\n", p->host_no, CTL_OF_SCB(scb));
-    scbq_remove(&p->waiting_scbs, scb);
-    scbq_remove(&aic_dev->delayed_scbs, scb);
-    aic_dev->active_cmds++;
-    p->activescbs++;
-    scb->flags &= ~(SCB_WAITINGQ | SCB_ACTIVE);
-    scb->flags |= SCB_ABORT | SCB_QUEUED_FOR_DONE;
-    goto success;
-  }
-
-/*
- *  We just checked the waiting_q, now for the QINFIFO
- */
-  if ( ((found = aic7xxx_search_qinfifo(p, cmd->device->id, cmd->device->channel,
-                     cmd->device->lun, scb->hscb->tag, SCB_ABORT | SCB_QUEUED_FOR_DONE,
-                     FALSE, NULL)) != 0) &&
-                    (aic7xxx_verbose & VERBOSE_ABORT_PROCESS))
-  {
-    printk(INFO_LEAD "SCB found in QINFIFO and aborted.\n", p->host_no,
-                    CTL_OF_SCB(scb));
-    goto success;
-  }
-
-/*
- *  QINFIFO, waitingq, completeq done.  Next, check WAITING_SCB list in card
- */
-
-  saved_hscbptr = aic_inb(p, SCBPTR);
-  if ((hscbptr = aic7xxx_find_scb(p, scb)) != SCB_LIST_NULL)
-  {
-    aic_outb(p, hscbptr, SCBPTR);
-    scb_control = aic_inb(p, SCB_CONTROL);
-    disconnected = scb_control & DISCONNECTED;
-    /*
-     * If the DISCONNECTED bit is not set in SCB_CONTROL, then we are
-     * either currently active or on the waiting list.
-     */
-    if(!disconnected && aic_inb(p, LASTPHASE) == P_BUSFREE) {
-      if (aic7xxx_verbose & VERBOSE_ABORT_PROCESS)
-        printk(INFO_LEAD "SCB found on hardware waiting"
-          " list and aborted.\n", p->host_no, CTL_OF_SCB(scb));
-      /* If we are the only waiting command, stop the selection engine */
-      if (aic_inb(p, WAITING_SCBH) == hscbptr && aic_inb(p, SCB_NEXT) ==
-                        SCB_LIST_NULL)
-      {
-        aic_outb(p, aic_inb(p, SCSISEQ) & ~ENSELO, SCSISEQ);
-        aic_outb(p, CLRSELTIMEO, CLRSINT1);
-        aic_outb(p, SCB_LIST_NULL, WAITING_SCBH);
-      }
-      else
-      {
-        unsigned char prev, next;
-        prev = SCB_LIST_NULL;
-        next = aic_inb(p, WAITING_SCBH);
-        while(next != SCB_LIST_NULL)
-        {
-          aic_outb(p, next, SCBPTR);
-          if (next == hscbptr)
-          {
-            next = aic_inb(p, SCB_NEXT);
-            if (prev != SCB_LIST_NULL)
-            {
-              aic_outb(p, prev, SCBPTR);
-              aic_outb(p, next, SCB_NEXT);
-            }
-            else
-              aic_outb(p, next, WAITING_SCBH);
-            aic_outb(p, hscbptr, SCBPTR);
-            next = SCB_LIST_NULL;
-          }
-          else
-          {
-            prev = next;
-            next = aic_inb(p, SCB_NEXT);
-          }
-        }
-      }
-      aic_outb(p, SCB_LIST_NULL, SCB_TAG);
-      aic_outb(p, 0, SCB_CONTROL);
-      aic7xxx_add_curscb_to_free_list(p);
-      scb->flags = SCB_ABORT | SCB_QUEUED_FOR_DONE;
-      goto success;
-    }
-    else if (!disconnected)
-    {
-      /*
-       * We are the currently active command
-       */
-      if((aic_inb(p, LASTPHASE) == P_MESGIN) ||
-         (aic_inb(p, LASTPHASE) == P_MESGOUT))
-      {
-        /*
-         * Message buffer busy, unable to abort
-         */
-        printk(INFO_LEAD "message buffer busy, unable to abort.\n",
-                          p->host_no, CTL_OF_SCB(scb));
-        unpause_sequencer(p, FALSE);
-        return FAILED;
-      }
-      /* Fallthrough to below, set ATNO after we set SCB_CONTROL */
-    } 
-    aic_outb(p,  scb_control | MK_MESSAGE, SCB_CONTROL);
-    if(!disconnected)
-    {
-      aic_outb(p, HOST_MSG, MSG_OUT);
-      aic_outb(p, aic_inb(p, SCSISIGI) | ATNO, SCSISIGO);
-    }
-    aic_outb(p, saved_hscbptr, SCBPTR);
-  } 
-  else
-  {
-    /*
-     * The scb isn't in the card at all and it is active and it isn't in
-     * any of the queues, so it must be disconnected and paged out.  Fall
-     * through to the code below.
-     */
-    disconnected = 1;
-  }
-        
-  p->flags |= AHC_ABORT_PENDING;
-  scb->flags |= SCB_QUEUED_ABORT | SCB_ABORT | SCB_RECOVERY_SCB;
-  scb->hscb->control |= MK_MESSAGE;
-  if(disconnected)
-  {
-    if (aic7xxx_verbose & VERBOSE_ABORT_PROCESS)
-      printk(INFO_LEAD "SCB disconnected.  Queueing Abort"
-        " SCB.\n", p->host_no, CTL_OF_SCB(scb));
-    p->qinfifo[p->qinfifonext++] = scb->hscb->tag;
-    if (p->features & AHC_QUEUE_REGS)
-      aic_outb(p, p->qinfifonext, HNSCB_QOFF);
-    else
-      aic_outb(p, p->qinfifonext, KERNEL_QINPOS);
-  }
-  unpause_sequencer(p, FALSE);
-  spin_unlock_irq(p->host->host_lock);
-  msleep(1000/4);
-  spin_lock_irq(p->host->host_lock);
-  if (p->flags & AHC_ABORT_PENDING)
-  {
-    if (aic7xxx_verbose & VERBOSE_ABORT_RETURN)
-      printk(INFO_LEAD "Abort never delivered, returning FAILED\n", p->host_no,
-                    CTL_OF_CMD(cmd));
-    p->flags &= ~AHC_ABORT_PENDING;
-    return FAILED;
-  }
-  if (aic7xxx_verbose & VERBOSE_ABORT_RETURN)
-    printk(INFO_LEAD "Abort successful.\n", p->host_no, CTL_OF_CMD(cmd));
-  return SUCCESS;
-
-success:
-  if (aic7xxx_verbose & VERBOSE_ABORT_RETURN)
-    printk(INFO_LEAD "Abort successful.\n", p->host_no, CTL_OF_CMD(cmd));
-  aic7xxx_run_done_queue(p, TRUE);
-  unpause_sequencer(p, FALSE);
-  return SUCCESS;
-}
-
-static int aic7xxx_abort(struct scsi_cmnd *cmd)
-{
-        int rc;
-
-        spin_lock_irq(cmd->device->host->host_lock);
-        rc = __aic7xxx_abort(cmd);
-        spin_unlock_irq(cmd->device->host->host_lock);
-
-        return rc;
-}
-
-
-/*+F*************************************************************************
- * Function:
- *   aic7xxx_reset
- *
- * Description:
- *   Resetting the bus always succeeds - is has to, otherwise the
- *   kernel will panic! Try a surgical technique - sending a BUS
- *   DEVICE RESET message - on the offending target before pulling
- *   the SCSI bus reset line.
- *-F*************************************************************************/
-static int aic7xxx_reset(struct scsi_cmnd *cmd)
-{
-  struct aic7xxx_scb *scb;
-  struct aic7xxx_host *p;
-  struct aic_dev_data *aic_dev;
-
-  p = (struct aic7xxx_host *) cmd->device->host->hostdata;
-  spin_lock_irq(p->host->host_lock);
-
-  aic_dev = AIC_DEV(cmd);
-  if(aic7xxx_position(cmd) < p->scb_data->numscbs)
-  {
-    scb = (p->scb_data->scb_array[aic7xxx_position(cmd)]);
-    if (scb->cmd != cmd)
-      scb = NULL;
-  }
-  else
-  {
-    scb = NULL;
-  }
-
-  /*
-   * I added a new config option to the driver: "panic_on_abort" that will
-   * cause the driver to panic and the machine to stop on the first abort
-   * or reset call into the driver.  At that point, it prints out a lot of
-   * useful information for me which I can then use to try and debug the
-   * problem.  Simply enable the boot time prompt in order to activate this
-   * code.
-   */
-  if (aic7xxx_panic_on_abort)
-    aic7xxx_panic_abort(p, cmd);
-
-  pause_sequencer(p);
-
-  while((aic_inb(p, INTSTAT) & INT_PEND) && !(p->flags & AHC_IN_ISR))
-  {
-    aic7xxx_isr(p);
-    pause_sequencer(p);
-  }
-  aic7xxx_done_cmds_complete(p);
-
-  if(scb && (scb->cmd == NULL))
-  {
-    /*
-     * We just completed the command when we ran the isr stuff, so we no
-     * longer have it.
-     */
-    unpause_sequencer(p, FALSE);
-    spin_unlock_irq(p->host->host_lock);
-    return SUCCESS;
-  }
-    
-/*
- *  By this point, we want to already know what we are going to do and
- *  only have the following code implement our course of action.
- */
-  aic7xxx_reset_channel(p, cmd->device->channel, TRUE);
-  if (p->features & AHC_TWIN)
-  {
-    aic7xxx_reset_channel(p, cmd->device->channel ^ 0x01, TRUE);
-    restart_sequencer(p);
-  }
-  aic_outb(p,  aic_inb(p, SIMODE1) & ~(ENREQINIT|ENBUSFREE), SIMODE1);
-  aic7xxx_clear_intstat(p);
-  p->flags &= ~AHC_HANDLING_REQINITS;
-  p->msg_type = MSG_TYPE_NONE;
-  p->msg_index = 0;
-  p->msg_len = 0;
-  aic7xxx_run_done_queue(p, TRUE);
-  unpause_sequencer(p, FALSE);
-  spin_unlock_irq(p->host->host_lock);
-  ssleep(2);
-  return SUCCESS;
-}
-
-/*+F*************************************************************************
- * Function:
- *   aic7xxx_biosparam
- *
- * Description:
- *   Return the disk geometry for the given SCSI device.
- *
- * Note:
- *   This function is broken for today's really large drives and needs
- *   fixed.
- *-F*************************************************************************/
-static int
-aic7xxx_biosparam(struct scsi_device *sdev, struct block_device *bdev,
-                sector_t capacity, int geom[])
-{
-  sector_t heads, sectors, cylinders;
-  int ret;
-  struct aic7xxx_host *p;
-  unsigned char *buf;
-
-  p = (struct aic7xxx_host *) sdev->host->hostdata;
-  buf = scsi_bios_ptable(bdev);
-
-  if ( buf )
-  {
-    ret = scsi_partsize(buf, capacity, &geom[2], &geom[0], &geom[1]);
-    kfree(buf);
-    if ( ret != -1 )
-      return(ret);
-  }
-  
-  heads = 64;
-  sectors = 32;
-  cylinders = capacity >> 11;
-
-  if ((p->flags & AHC_EXTEND_TRANS_A) && (cylinders > 1024))
-  {
-    heads = 255;
-    sectors = 63;
-    cylinders = capacity >> 14;
-    if(capacity > (65535 * heads * sectors))
-      cylinders = 65535;
-    else
-      cylinders = ((unsigned int)capacity) / (unsigned int)(heads * sectors);
-  }
-
-  geom[0] = (int)heads;
-  geom[1] = (int)sectors;
-  geom[2] = (int)cylinders;
-
-  return (0);
-}
-
-/*+F*************************************************************************
- * Function:
- *   aic7xxx_release
- *
- * Description:
- *   Free the passed in Scsi_Host memory structures prior to unloading the
- *   module.
- *-F*************************************************************************/
-static int
-aic7xxx_release(struct Scsi_Host *host)
-{
-  struct aic7xxx_host *p = (struct aic7xxx_host *) host->hostdata;
-  struct aic7xxx_host *next, *prev;
-
-  if(p->irq)
-    free_irq(p->irq, p);
-#ifdef MMAPIO
-  if(p->maddr)
-  {
-    iounmap(p->maddr);
-  }
-#endif /* MMAPIO */
-  if(!p->pdev)
-    release_region(p->base, MAXREG - MINREG);
-#ifdef CONFIG_PCI
-  else {
-    pci_release_regions(p->pdev);
-    pci_dev_put(p->pdev);
-  }
-#endif
-  prev = NULL;
-  next = first_aic7xxx;
-  while(next != NULL)
-  {
-    if(next == p)
-    {
-      if(prev == NULL)
-        first_aic7xxx = next->next;
-      else
-        prev->next = next->next;
-    }
-    else
-    {
-      prev = next;
-    }
-    next = next->next;
-  }
-  aic7xxx_free(p);
-  return(0);
-}
-
-/*+F*************************************************************************
- * Function:
- *   aic7xxx_print_card
- *
- * Description:
- *   Print out all of the control registers on the card
- *
- *   NOTE: This function is not yet safe for use on the VLB and EISA
- *   controllers, so it isn't used on those controllers at all.
- *-F*************************************************************************/
-static void
-aic7xxx_print_card(struct aic7xxx_host *p)
-{
-  int i, j, k, chip;
-  static struct register_ranges {
-    int num_ranges;
-    int range_val[32];
-  } cards_ds[] = {
-    { 0, {0,} }, /* none */
-    {10, {0x00, 0x05, 0x08, 0x11, 0x18, 0x19, 0x1f, 0x1f, 0x60, 0x60, /*7771*/
-          0x62, 0x66, 0x80, 0x8e, 0x90, 0x95, 0x97, 0x97, 0x9b, 0x9f} },
-    { 9, {0x00, 0x05, 0x08, 0x11, 0x18, 0x1f, 0x60, 0x60, 0x62, 0x66, /*7850*/
-          0x80, 0x8e, 0x90, 0x95, 0x97, 0x97, 0x9a, 0x9f} },
-    { 9, {0x00, 0x05, 0x08, 0x11, 0x18, 0x1f, 0x60, 0x60, 0x62, 0x66, /*7860*/
-          0x80, 0x8e, 0x90, 0x95, 0x97, 0x97, 0x9a, 0x9f} },
-    {10, {0x00, 0x05, 0x08, 0x11, 0x18, 0x19, 0x1c, 0x1f, 0x60, 0x60, /*7870*/
-          0x62, 0x66, 0x80, 0x8e, 0x90, 0x95, 0x97, 0x97, 0x9a, 0x9f} },
-    {10, {0x00, 0x05, 0x08, 0x11, 0x18, 0x1a, 0x1c, 0x1f, 0x60, 0x60, /*7880*/
-          0x62, 0x66, 0x80, 0x8e, 0x90, 0x95, 0x97, 0x97, 0x9a, 0x9f} },
-    {16, {0x00, 0x05, 0x08, 0x11, 0x18, 0x1f, 0x60, 0x60, 0x62, 0x66, /*7890*/
-          0x84, 0x8e, 0x90, 0x95, 0x97, 0x97, 0x9a, 0x9a, 0x9f, 0x9f,
-          0xe0, 0xf1, 0xf4, 0xf4, 0xf6, 0xf6, 0xf8, 0xf8, 0xfa, 0xfc,
-          0xfe, 0xff} },
-    {12, {0x00, 0x05, 0x08, 0x11, 0x18, 0x19, 0x1b, 0x1f, 0x60, 0x60, /*7895*/
-          0x62, 0x66, 0x80, 0x8e, 0x90, 0x95, 0x97, 0x97, 0x9a, 0x9a,
-          0x9f, 0x9f, 0xe0, 0xf1} },
-    {16, {0x00, 0x05, 0x08, 0x11, 0x18, 0x1f, 0x60, 0x60, 0x62, 0x66, /*7896*/
-          0x84, 0x8e, 0x90, 0x95, 0x97, 0x97, 0x9a, 0x9a, 0x9f, 0x9f,
-          0xe0, 0xf1, 0xf4, 0xf4, 0xf6, 0xf6, 0xf8, 0xf8, 0xfa, 0xfc,
-          0xfe, 0xff} },
-    {12, {0x00, 0x05, 0x08, 0x11, 0x18, 0x1f, 0x60, 0x60, 0x62, 0x66, /*7892*/
-          0x84, 0x8e, 0x90, 0x95, 0x97, 0x97, 0x9a, 0x9a, 0x9c, 0x9f,
-          0xe0, 0xf1, 0xf4, 0xfc} },
-    {12, {0x00, 0x05, 0x08, 0x11, 0x18, 0x1f, 0x60, 0x60, 0x62, 0x66, /*7899*/
-          0x84, 0x8e, 0x90, 0x95, 0x97, 0x97, 0x9a, 0x9a, 0x9c, 0x9f,
-          0xe0, 0xf1, 0xf4, 0xfc} },
-  };
-  chip = p->chip & AHC_CHIPID_MASK;
-  printk("%s at ",
-         board_names[p->board_name_index]);
-  switch(p->chip & ~AHC_CHIPID_MASK)
-  {
-    case AHC_VL:
-      printk("VLB Slot %d.\n", p->pci_device_fn);
-      break;
-    case AHC_EISA:
-      printk("EISA Slot %d.\n", p->pci_device_fn);
-      break;
-    case AHC_PCI:
-    default:
-      printk("PCI %d/%d/%d.\n", p->pci_bus, PCI_SLOT(p->pci_device_fn),
-             PCI_FUNC(p->pci_device_fn));
-      break;
-  }
-
-  /*
-   * the registers on the card....
-   */
-  printk("Card Dump:\n");
-  k = 0;
-  for(i=0; i<cards_ds[chip].num_ranges; i++)
-  {
-    for(j  = cards_ds[chip].range_val[ i * 2 ];
-        j <= cards_ds[chip].range_val[ i * 2 + 1 ] ;
-        j++)
-    {
-      printk("%02x:%02x ", j, aic_inb(p, j));
-      if(++k == 13)
-      {
-        printk("\n");
-        k=0;
-      }
-    }
-  }
-  if(k != 0)
-    printk("\n");
-
-  /*
-   * If this was an Ultra2 controller, then we just hosed the card in terms
-   * of the QUEUE REGS.  This function is only called at init time or by
-   * the panic_abort function, so it's safe to assume a generic init time
-   * setting here
-   */
-
-  if(p->features & AHC_QUEUE_REGS)
-  {
-    aic_outb(p, 0, SDSCB_QOFF);
-    aic_outb(p, 0, SNSCB_QOFF);
-    aic_outb(p, 0, HNSCB_QOFF);
-  }
-
-}
-
-/*+F*************************************************************************
- * Function:
- *   aic7xxx_print_scratch_ram
- *
- * Description:
- *   Print out the scratch RAM values on the card.
- *-F*************************************************************************/
-static void
-aic7xxx_print_scratch_ram(struct aic7xxx_host *p)
-{
-  int i, k;
-
-  k = 0;
-  printk("Scratch RAM:\n");
-  for(i = SRAM_BASE; i < SEQCTL; i++)
-  {
-    printk("%02x:%02x ", i, aic_inb(p, i));
-    if(++k == 13)
-    {
-      printk("\n");
-      k=0;
-    }
-  }
-  if (p->features & AHC_MORE_SRAM)
-  {
-    for(i = TARG_OFFSET; i < 0x80; i++)
-    {
-      printk("%02x:%02x ", i, aic_inb(p, i));
-      if(++k == 13)
-      {
-        printk("\n");
-        k=0;
-      }
-    }
-  }
-  printk("\n");
-}
-
-
-#include "aic7xxx_old/aic7xxx_proc.c"
-
-MODULE_LICENSE("Dual BSD/GPL");
-MODULE_VERSION(AIC7XXX_H_VERSION);
-
-
-static struct scsi_host_template driver_template = {
-        .show_info              = aic7xxx_show_info,
-        .detect                 = aic7xxx_detect,
-        .release                = aic7xxx_release,
-        .info                   = aic7xxx_info, 
-        .queuecommand           = aic7xxx_queue,
-        .slave_alloc            = aic7xxx_slave_alloc,
-        .slave_configure        = aic7xxx_slave_configure,
-        .slave_destroy          = aic7xxx_slave_destroy,
-        .bios_param             = aic7xxx_biosparam,
-        .eh_abort_handler       = aic7xxx_abort,
-        .eh_device_reset_handler        = aic7xxx_bus_device_reset,
-        .eh_host_reset_handler  = aic7xxx_reset,
-        .can_queue              = 255,
-        .this_id                = -1,
-        .max_sectors            = 2048,
-        .cmd_per_lun            = 3,
-        .use_clustering         = ENABLE_CLUSTERING,
-};
-
-#include "scsi_module.c"
-
-/*
- * Overrides for Emacs so that we almost follow Linus's tabbing style.
- * Emacs will notice this stuff at the end of the file and automatically
- * adjust the settings for this buffer only.  This must remain at the end
- * of the file.
- * ---------------------------------------------------------------------------
- * Local variables:
- * c-indent-level: 2
- * c-brace-imaginary-offset: 0
- * c-brace-offset: -2
- * c-argdecl-indent: 2
- * c-label-offset: -2
- * c-continued-statement-offset: 2
- * c-continued-brace-offset: 0
- * indent-tabs-mode: nil
- * tab-width: 8
- * End:
- */
diff --git a/drivers/scsi/aic7xxx_old/aic7xxx.h b/drivers/scsi/aic7xxx_old/aic7xxx.h
deleted file mode 100644
index 0116c8128a6b..000000000000
--- a/drivers/scsi/aic7xxx_old/aic7xxx.h
+++ /dev/null
@@ -1,28 +0,0 @@
-/*+M*************************************************************************
- * Adaptec AIC7xxx device driver for Linux.
- *
- * Copyright (c) 1994 John Aycock
- *   The University of Calgary Department of Computer Science.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2, or (at your option)
- * any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; see the file COPYING.  If not, write to
- * the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
- * 
- * $Id: aic7xxx.h,v 3.2 1996/07/23 03:37:26 deang Exp $
- *-M*************************************************************************/
-#ifndef _aic7xxx_h
-#define _aic7xxx_h
-
-#define AIC7XXX_H_VERSION  "5.2.0"
-
-#endif /* _aic7xxx_h */
diff --git a/drivers/scsi/aic7xxx_old/aic7xxx.reg b/drivers/scsi/aic7xxx_old/aic7xxx.reg
deleted file mode 100644
index f67b4bced01c..000000000000
--- a/drivers/scsi/aic7xxx_old/aic7xxx.reg
+++ /dev/null
@@ -1,1401 +0,0 @@
-/*
- * Aic7xxx register and scratch ram definitions.
- *
- * Copyright (c) 1994-1998 Justin Gibbs.
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions, and the following disclaimer,
- *    without modification, immediately at the beginning of the file.
- * 2. The name of the author may not be used to endorse or promote products
- *    derived from this software without specific prior written permission.
- *
- * Where this Software is combined with software released under the terms of 
- * the GNU General Public License ("GPL") and the terms of the GPL would require the 
- * combined work to also be released under the terms of the GPL, the terms
- * and conditions of this License will apply in addition to those of the
- * GPL with the exception of any terms or conditions of this License that
- * conflict with, or are expressly prohibited by, the GPL.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE FOR
- * ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- *
- *      $Id: aic7xxx.reg,v 1.4 1997/06/27 19:38:39 gibbs Exp $
- */
-
-/*
- * This file is processed by the aic7xxx_asm utility for use in assembling
- * firmware for the aic7xxx family of SCSI host adapters as well as to generate
- * a C header file for use in the kernel portion of the Aic7xxx driver.
- *
- * All page numbers refer to the Adaptec AIC-7770 Data Book available from
- * Adaptec's Technical Documents Department 1-800-934-2766
- */
-
-/*
- * SCSI Sequence Control (p. 3-11).
- * Each bit, when set starts a specific SCSI sequence on the bus
- */
-register SCSISEQ {
-        address                 0x000
-        access_mode RW
-        bit     TEMODE          0x80
-        bit     ENSELO          0x40
-        bit     ENSELI          0x20
-        bit     ENRSELI         0x10
-        bit     ENAUTOATNO      0x08
-        bit     ENAUTOATNI      0x04
-        bit     ENAUTOATNP      0x02
-        bit     SCSIRSTO        0x01
-}
-
-/*
- * SCSI Transfer Control 0 Register (pp. 3-13).
- * Controls the SCSI module data path.
- */
-register SXFRCTL0 {
-        address                 0x001
-        access_mode RW
-        bit     DFON            0x80
-        bit     DFPEXP          0x40
-        bit     FAST20          0x20
-        bit     CLRSTCNT        0x10
-        bit     SPIOEN          0x08
-        bit     SCAMEN          0x04
-        bit     CLRCHN          0x02
-}
-
-/*
- * SCSI Transfer Control 1 Register (pp. 3-14,15).
- * Controls the SCSI module data path.
- */
-register SXFRCTL1 {
-        address                 0x002
-        access_mode RW
-        bit     BITBUCKET       0x80
-        bit     SWRAPEN         0x40
-        bit     ENSPCHK         0x20
-        mask    STIMESEL        0x18
-        bit     ENSTIMER        0x04
-        bit     ACTNEGEN        0x02
-        bit     STPWEN          0x01    /* Powered Termination */
-}
-
-/*
- * SCSI Control Signal Read Register (p. 3-15).
- * Reads the actual state of the SCSI bus pins
- */
-register SCSISIGI {
-        address                 0x003
-        access_mode RO
-        bit     CDI             0x80
-        bit     IOI             0x40
-        bit     MSGI            0x20
-        bit     ATNI            0x10
-        bit     SELI            0x08
-        bit     BSYI            0x04
-        bit     REQI            0x02
-        bit     ACKI            0x01
-/*
- * Possible phases in SCSISIGI
- */
-        mask    PHASE_MASK      CDI|IOI|MSGI
-        mask    P_DATAOUT       0x00
-        mask    P_DATAIN        IOI
-        mask    P_COMMAND       CDI
-        mask    P_MESGOUT       CDI|MSGI
-        mask    P_STATUS        CDI|IOI
-        mask    P_MESGIN        CDI|IOI|MSGI
-}
-
-/*
- * SCSI Control Signal Write Register (p. 3-16).
- * Writing to this register modifies the control signals on the bus.  Only
- * those signals that are allowed in the current mode (Initiator/Target) are
- * asserted.
- */
-register SCSISIGO {
-        address                 0x003
-        access_mode WO
-        bit     CDO             0x80
-        bit     IOO             0x40
-        bit     MSGO            0x20
-        bit     ATNO            0x10
-        bit     SELO            0x08
-        bit     BSYO            0x04
-        bit     REQO            0x02
-        bit     ACKO            0x01
-/*
- * Possible phases to write into SCSISIG0
- */
-        mask    PHASE_MASK      CDI|IOI|MSGI
-        mask    P_DATAOUT       0x00
-        mask    P_DATAIN        IOI
-        mask    P_COMMAND       CDI
-        mask    P_MESGOUT       CDI|MSGI
-        mask    P_STATUS        CDI|IOI
-        mask    P_MESGIN        CDI|IOI|MSGI
-}
-
-/* 
- * SCSI Rate Control (p. 3-17).
- * Contents of this register determine the Synchronous SCSI data transfer
- * rate and the maximum synchronous Req/Ack offset.  An offset of 0 in the
- * SOFS (3:0) bits disables synchronous data transfers.  Any offset value
- * greater than 0 enables synchronous transfers.
- */
-register SCSIRATE {
-        address                 0x004
-        access_mode RW
-        bit     WIDEXFER        0x80            /* Wide transfer control */
-        mask    SXFR            0x70            /* Sync transfer rate */
-        mask    SXFR_ULTRA2     0x7f            /* Sync transfer rate */
-        mask    SOFS            0x0f            /* Sync offset */
-}
-
-/*
- * SCSI ID (p. 3-18).
- * Contains the ID of the board and the current target on the
- * selected channel.
- */
-register SCSIID {
-        address                 0x005
-        access_mode RW
-        mask    TID             0xf0            /* Target ID mask */
-        mask    OID             0x0f            /* Our ID mask */
-        /*
-         * SCSI Maximum Offset (p. 4-61 aic7890/91 Data Book)
-         * The aic7890/91 allow an offset of up to 127 transfers in both wide
-         * and narrow mode.
-         */
-        alias   SCSIOFFSET
-        mask    SOFS_ULTRA2     0x7f            /* Sync offset U2 chips */
-}
-
-/*
- * SCSI Latched Data (p. 3-19).
- * Read/Write latches used to transfer data on the SCSI bus during
- * Automatic or Manual PIO mode.  SCSIDATH can be used for the
- * upper byte of a 16bit wide asynchronouse data phase transfer.
- */
-register SCSIDATL {
-        address                 0x006
-        access_mode RW
-}
-
-register SCSIDATH {
-        address                 0x007
-        access_mode RW
-}
-
-/*
- * SCSI Transfer Count (pp. 3-19,20)
- * These registers count down the number of bytes transferred
- * across the SCSI bus.  The counter is decremented only once
- * the data has been safely transferred.  SDONE in SSTAT0 is
- * set when STCNT goes to 0
- */ 
-register STCNT {
-        address                 0x008
-        size    3
-        access_mode RW
-}
-
-/*
- * Option Mode Register (Alternate Mode) (p. 5-198)
- * This register is used to set certain options on Ultra3 based chips.
- * The chip must be in alternate mode (bit ALT_MODE in SFUNCT must be set)
- */
-register OPTIONMODE {
-        address                 0x008
-        access_mode RW
-        bit     AUTORATEEN      0x80
-        bit     AUTOACKEN       0x40
-        bit     ATNMGMNTEN      0x20
-        bit     BUSFREEREV      0x10
-        bit     EXPPHASEDIS     0x08
-        bit     SCSIDATL_IMGEN  0x04
-        bit     AUTO_MSGOUT_DE  0x02
-        bit     DIS_MSGIN_DUALEDGE      0x01
-}
-
-
-/*
- * Clear SCSI Interrupt 0 (p. 3-20)
- * Writing a 1 to a bit clears the associated SCSI Interrupt in SSTAT0.
- */
-register CLRSINT0 {
-        address                 0x00b
-        access_mode WO
-        bit     CLRSELDO        0x40
-        bit     CLRSELDI        0x20
-        bit     CLRSELINGO      0x10
-        bit     CLRSWRAP        0x08
-        bit     CLRSPIORDY      0x02
-}
-
-/*
- * SCSI Status 0 (p. 3-21)
- * Contains one set of SCSI Interrupt codes
- * These are most likely of interest to the sequencer
- */
-register SSTAT0 {
-        address                 0x00b
-        access_mode RO
-        bit     TARGET          0x80    /* Board acting as target */
-        bit     SELDO           0x40    /* Selection Done */
-        bit     SELDI           0x20    /* Board has been selected */
-        bit     SELINGO         0x10    /* Selection In Progress */
-        bit     SWRAP           0x08    /* 24bit counter wrap */
-        bit     IOERR           0x08    /* LVD Tranceiver mode changed */
-        bit     SDONE           0x04    /* STCNT = 0x000000 */
-        bit     SPIORDY         0x02    /* SCSI PIO Ready */
-        bit     DMADONE         0x01    /* DMA transfer completed */
-}
-
-/*
- * Clear SCSI Interrupt 1 (p. 3-23)
- * Writing a 1 to a bit clears the associated SCSI Interrupt in SSTAT1.
- */
-register CLRSINT1 {
-        address                 0x00c
-        access_mode WO
-        bit     CLRSELTIMEO     0x80
-        bit     CLRATNO         0x40
-        bit     CLRSCSIRSTI     0x20
-        bit     CLRBUSFREE      0x08
-        bit     CLRSCSIPERR     0x04
-        bit     CLRPHASECHG     0x02
-        bit     CLRREQINIT      0x01
-}
-
-/*
- * SCSI Status 1 (p. 3-24)
- */
-register SSTAT1 {
-        address                 0x00c
-        access_mode RO
-        bit     SELTO           0x80
-        bit     ATNTARG         0x40
-        bit     SCSIRSTI        0x20
-        bit     PHASEMIS        0x10
-        bit     BUSFREE         0x08
-        bit     SCSIPERR        0x04
-        bit     PHASECHG        0x02
-        bit     REQINIT         0x01
-}
-
-/*
- * SCSI Status 2 (pp. 3-25,26)
- */
-register SSTAT2 {
-        address                 0x00d
-        access_mode RO
-        bit     OVERRUN         0x80
-        bit     SHVALID         0x40
-        bit     WIDE_RES        0x20
-        bit     EXP_ACTIVE      0x10    /* SCSI Expander Active */
-        bit     CRCVALERR       0x08    /* CRC Value Error */
-        bit     CRCENDERR       0x04    /* CRC End Error */
-        bit     CRCREQERR       0x02    /* CRC REQ Error */
-        bit     DUAL_EDGE_ERROR 0x01    /* Invalid pins for Dual Edge phase */
-        mask    SFCNT           0x1f
-}
-
-/*
- * SCSI Status 3 (p. 3-26)
- */
-register SSTAT3 {
-        address                 0x00e
-        access_mode RO
-        mask    SCSICNT         0xf0
-        mask    OFFCNT          0x0f
-}
-
-/*
- * SCSI ID for the aic7890/91 chips
- */
-register SCSIID_ULTRA2 {
-        address                 0x00f
-        access_mode RW
-        mask    TID             0xf0            /* Target ID mask */
-        mask    OID             0x0f            /* Our ID mask */
-}
-
-/*
- * SCSI Interrupt Mode 1 (p. 3-28)
- * Setting any bit will enable the corresponding function
- * in SIMODE0 to interrupt via the IRQ pin.
- */
-register SIMODE0 {
-        address                 0x010
-        access_mode RW
-        bit     ENSELDO         0x40
-        bit     ENSELDI         0x20
-        bit     ENSELINGO       0x10
-        bit     ENSWRAP         0x08
-        bit     ENIOERR         0x08    /* LVD Tranceiver mode changes */
-        bit     ENSDONE         0x04
-        bit     ENSPIORDY       0x02
-        bit     ENDMADONE       0x01
-}
-
-/*
- * SCSI Interrupt Mode 1 (pp. 3-28,29)
- * Setting any bit will enable the corresponding function
- * in SIMODE1 to interrupt via the IRQ pin.
- */
-register SIMODE1 {
-        address                 0x011
-        access_mode RW
-        bit     ENSELTIMO       0x80
-        bit     ENATNTARG       0x40
-        bit     ENSCSIRST       0x20
-        bit     ENPHASEMIS      0x10
-        bit     ENBUSFREE       0x08
-        bit     ENSCSIPERR      0x04
-        bit     ENPHASECHG      0x02
-        bit     ENREQINIT       0x01
-}
-
-/*
- * SCSI Data Bus (High) (p. 3-29)
- * This register reads data on the SCSI Data bus directly.
- */
-register SCSIBUSL {
-        address                 0x012
-        access_mode RO
-}
-
-register SCSIBUSH {
-        address                 0x013
-        access_mode RO
-}
-
-/*
- * SCSI/Host Address (p. 3-30)
- * These registers hold the host address for the byte about to be
- * transferred on the SCSI bus.  They are counted up in the same
- * manner as STCNT is counted down.  SHADDR should always be used
- * to determine the address of the last byte transferred since HADDR
- * can be skewed by write ahead.
- */
-register SHADDR {
-        address                 0x014
-        size    4
-        access_mode RO
-}
-
-/*
- * Selection Timeout Timer (p. 3-30)
- */
-register SELTIMER {
-        address                 0x018
-        access_mode RW
-        bit     STAGE6          0x20
-        bit     STAGE5          0x10
-        bit     STAGE4          0x08
-        bit     STAGE3          0x04
-        bit     STAGE2          0x02
-        bit     STAGE1          0x01
-}
-
-/*
- * Selection/Reselection ID (p. 3-31)
- * Upper four bits are the device id.  The ONEBIT is set when the re/selecting
- * device did not set its own ID.
- */
-register SELID {
-        address                 0x019
-        access_mode RW
-        mask    SELID_MASK      0xf0
-        bit     ONEBIT          0x08
-}
-
-/*
- * Serial Port I/O Cabability register (p. 4-95 aic7860 Data Book)
- * Indicates if external logic has been attached to the chip to
- * perform the tasks of accessing a serial eeprom, testing termination
- * strength, and performing cable detection.  On the aic7860, most of
- * these features are handled on chip, but on the aic7855 an attached
- * aic3800 does the grunt work.
- */
-register SPIOCAP {
-        address                 0x01b
-        access_mode RW
-        bit     SOFT1           0x80
-        bit     SOFT0           0x40
-        bit     SOFTCMDEN       0x20    
-        bit     HAS_BRDCTL      0x10    /* External Board control */
-        bit     SEEPROM         0x08    /* External serial eeprom logic */
-        bit     EEPROM          0x04    /* Writable external BIOS ROM */
-        bit     ROM             0x02    /* Logic for accessing external ROM */
-        bit     SSPIOCPS        0x01    /* Termination and cable detection */
-}
-
-/*
- * SCSI Block Control (p. 3-32)
- * Controls Bus type and channel selection.  In a twin channel configuration
- * addresses 0x00-0x1e are gated to the appropriate channel based on this
- * register.  SELWIDE allows for the coexistence of 8bit and 16bit devices
- * on a wide bus.
- */
-register SBLKCTL {
-        address                 0x01f
-        access_mode RW
-        bit     DIAGLEDEN       0x80    /* Aic78X0 only */
-        bit     DIAGLEDON       0x40    /* Aic78X0 only */
-        bit     AUTOFLUSHDIS    0x20
-        bit     SELBUSB         0x08
-        bit     ENAB40          0x08    /* LVD transceiver active */
-        bit     ENAB20          0x04    /* SE/HVD transceiver active */
-        bit     SELWIDE         0x02
-        bit     XCVR            0x01    /* External transceiver active */
-}
-
-/*
- * Sequencer Control (p. 3-33)
- * Error detection mode and speed configuration
- */
-register SEQCTL {
-        address                 0x060
-        access_mode RW
-        bit     PERRORDIS       0x80
-        bit     PAUSEDIS        0x40
-        bit     FAILDIS         0x20
-        bit     FASTMODE        0x10
-        bit     BRKADRINTEN     0x08
-        bit     STEP            0x04
-        bit     SEQRESET        0x02
-        bit     LOADRAM         0x01
-}
-
-/*
- * Sequencer RAM Data (p. 3-34)
- * Single byte window into the Scratch Ram area starting at the address
- * specified by SEQADDR0 and SEQADDR1.  To write a full word, simply write
- * four bytes in succession.  The SEQADDRs will increment after the most
- * significant byte is written
- */
-register SEQRAM {
-        address                 0x061
-        access_mode RW
-}
-
-/*
- * Sequencer Address Registers (p. 3-35)
- * Only the first bit of SEQADDR1 holds addressing information
- */
-register SEQADDR0 {
-        address                 0x062
-        access_mode RW
-}
-
-register SEQADDR1 {
-        address                 0x063
-        access_mode RW
-        mask    SEQADDR1_MASK   0x01
-}
-
-/*
- * Accumulator
- * We cheat by passing arguments in the Accumulator up to the kernel driver
- */
-register ACCUM {
-        address                 0x064
-        access_mode RW
-        accumulator
-}
-
-register SINDEX {
-        address                 0x065
-        access_mode RW
-        sindex
-}
-
-register DINDEX {
-        address                 0x066
-        access_mode RW
-}
-
-register ALLONES {
-        address                 0x069
-        access_mode RO
-        allones
-}
-
-register ALLZEROS {
-        address                 0x06a
-        access_mode RO
-        allzeros
-}
-
-register NONE {
-        address                 0x06a
-        access_mode WO
-        none
-}
-
-register FLAGS {
-        address                 0x06b
-        access_mode RO
-        bit     ZERO            0x02
-        bit     CARRY           0x01
-}
-
-register SINDIR {
-        address                 0x06c
-        access_mode RO
-}
-
-register DINDIR  {
-        address                 0x06d
-        access_mode WO
-}
-
-register FUNCTION1 {
-        address                 0x06e
-        access_mode RW
-}
-
-register STACK {
-        address                 0x06f
-        access_mode RO
-}
-
-/*
- * Board Control (p. 3-43)
- */
-register BCTL {
-        address                 0x084
-        access_mode RW
-        bit     ACE             0x08
-        bit     ENABLE          0x01
-}
-
-register DSCOMMAND0 {
-        address                 0x084
-        access_mode RW
-        bit     CACHETHEN       0x80
-        bit     DPARCKEN        0x40
-        bit     MPARCKEN        0x20
-        bit     EXTREQLCK       0x10
-        bit     INTSCBRAMSEL    0x08
-        bit     RAMPS           0x04
-        bit     USCBSIZE32      0x02
-        bit     CIOPARCKEN      0x01
-}
-
-/*
- * On the aic78X0 chips, Board Control is replaced by the DSCommand
- * register (p. 4-64)
- */
-register DSCOMMAND {
-        address                 0x084
-        access_mode RW
-        bit     CACHETHEN       0x80    /* Cache Threshold enable */
-        bit     DPARCKEN        0x40    /* Data Parity Check Enable */
-        bit     MPARCKEN        0x20    /* Memory Parity Check Enable */
-        bit     EXTREQLCK       0x10    /* External Request Lock */
-}
-
-/*
- * Bus On/Off Time (p. 3-44)
- */
-register BUSTIME {
-        address                 0x085
-        access_mode RW
-        mask    BOFF            0xf0
-        mask    BON             0x0f
-}
-
-/*
- * Bus Speed (p. 3-45)
- */
-register BUSSPD {
-        address                 0x086
-        access_mode RW
-        mask    DFTHRSH         0xc0
-        mask    STBOFF          0x38
-        mask    STBON           0x07
-        mask    DFTHRSH_100     0xc0
-}
-
-/*
- * Host Control (p. 3-47) R/W
- * Overall host control of the device.
- */
-register HCNTRL {
-        address                 0x087
-        access_mode RW
-        bit     POWRDN          0x40
-        bit     SWINT           0x10
-        bit     IRQMS           0x08
-        bit     PAUSE           0x04
-        bit     INTEN           0x02
-        bit     CHIPRST         0x01
-        bit     CHIPRSTACK      0x01
-}
-
-/*
- * Host Address (p. 3-48)
- * This register contains the address of the byte about
- * to be transferred across the host bus.
- */
-register HADDR {
-        address                 0x088
-        size    4
-        access_mode RW
-}
-
-register HCNT {
-        address                 0x08c
-        size    3
-        access_mode RW
-}
-
-/*
- * SCB Pointer (p. 3-49)
- * Gate one of the four SCBs into the SCBARRAY window.
- */
-register SCBPTR {
-        address                 0x090
-        access_mode RW
-}
-
-/*
- * Interrupt Status (p. 3-50)
- * Status for system interrupts
- */
-register INTSTAT {
-        address                 0x091
-        access_mode RW
-        bit     BRKADRINT 0x08
-        bit     SCSIINT   0x04
-        bit     CMDCMPLT  0x02
-        bit     SEQINT    0x01
-        mask    BAD_PHASE       SEQINT          /* unknown scsi bus phase */
-        mask    SEND_REJECT     0x10|SEQINT     /* sending a message reject */
-        mask    NO_IDENT        0x20|SEQINT     /* no IDENTIFY after reconnect*/
-        mask    NO_MATCH        0x30|SEQINT     /* no cmd match for reconnect */
-        mask    EXTENDED_MSG    0x40|SEQINT     /* Extended message received */
-        mask    WIDE_RESIDUE    0x50|SEQINT     /* need kernel to back up */
-                                                /* the SG array for us */
-        mask    REJECT_MSG      0x60|SEQINT     /* Reject message received */
-        mask    BAD_STATUS      0x70|SEQINT     /* Bad status from target */
-        mask    RESIDUAL        0x80|SEQINT     /* Residual byte count != 0 */
-        mask    AWAITING_MSG    0xa0|SEQINT     /*
-                                                 * Kernel requested to specify
-                                                 * a message to this target
-                                                 * (command was null), so tell
-                                                 * it that it can fill the
-                                                 * message buffer.
-                                                 */
-        mask    SEQ_SG_FIXUP    0xb0|SEQINT     /* need help with fixing up
-                                                 * the sg array pointer after
-                                                 * a phasemis with no valid
-                                                 * sg elements in the shadow
-                                                 * pipeline.
-                                                 */
-        mask    TRACEPOINT2     0xc0|SEQINT
-        mask    MSGIN_PHASEMIS  0xd0|SEQINT     /*
-                                                 * Target changed phase on us
-                                                 * when we were expecting
-                                                 * another msgin byte.
-                                                 */
-        mask    DATA_OVERRUN    0xe0|SEQINT     /*
-                                                 * Target attempted to write
-                                                 * beyond the bounds of its
-                                                 * command.
-                                                 */
-
-        mask    SEQINT_MASK     0xf0|SEQINT     /* SEQINT Status Codes */
-        mask    INT_PEND  (BRKADRINT|SEQINT|SCSIINT|CMDCMPLT)
-}
-
-/*
- * Hard Error (p. 3-53)
- * Reporting of catastrophic errors.  You usually cannot recover from
- * these without a full board reset.
- */
-register ERROR {
-        address                 0x092
-        access_mode RO
-        bit     CIOPARERR       0x80    /* Ultra2 only */
-        bit     PCIERRSTAT      0x40    /* PCI only */
-        bit     MPARERR         0x20    /* PCI only */
-        bit     DPARERR         0x10    /* PCI only */
-        bit     SQPARERR        0x08
-        bit     ILLOPCODE       0x04
-        bit     ILLSADDR        0x02
-        bit     DSCTMOUT        0x02    /* Ultra3 only */
-        bit     ILLHADDR        0x01
-}
-
-/*
- * Clear Interrupt Status (p. 3-52)
- */
-register CLRINT {
-        address                 0x092
-        access_mode WO
-        bit     CLRPARERR       0x10    /* PCI only */
-        bit     CLRBRKADRINT    0x08
-        bit     CLRSCSIINT      0x04
-        bit     CLRCMDINT       0x02
-        bit     CLRSEQINT       0x01
-}
-
-register DFCNTRL {
-        address                 0x093
-        access_mode RW
-        bit     PRELOADEN       0x80    /* aic7890 only */
-        bit     WIDEODD         0x40
-        bit     SCSIEN          0x20
-        bit     SDMAEN          0x10
-        bit     SDMAENACK       0x10
-        bit     HDMAEN          0x08
-        bit     HDMAENACK       0x08
-        bit     DIRECTION       0x04
-        bit     FIFOFLUSH       0x02
-        bit     FIFORESET       0x01
-}
-
-register DFSTATUS {
-        address                 0x094
-        access_mode RO
-        bit     PRELOAD_AVAIL   0x80
-        bit     DWORDEMP        0x20
-        bit     MREQPEND        0x10
-        bit     HDONE           0x08
-        bit     DFTHRESH        0x04
-        bit     FIFOFULL        0x02
-        bit     FIFOEMP         0x01
-}
-
-register DFDAT {
-        address                 0x099
-        access_mode RW
-}
-
-/*
- * SCB Auto Increment (p. 3-59)
- * Byte offset into the SCB Array and an optional bit to allow auto
- * incrementing of the address during download and upload operations
- */
-register SCBCNT {
-        address                 0x09a
-        access_mode RW
-        bit     SCBAUTO         0x80
-        mask    SCBCNT_MASK     0x1f
-}
-
-/*
- * Queue In FIFO (p. 3-60)
- * Input queue for queued SCBs (commands that the seqencer has yet to start)
- */
-register QINFIFO {
-        address                 0x09b
-        access_mode RW
-}
-
-/*
- * Queue In Count (p. 3-60)
- * Number of queued SCBs
- */
-register QINCNT {
-        address                 0x09c
-        access_mode RO
-}
-
-/*
- * SCSIDATL IMAGE Register (p. 5-104)
- * Write to this register also go to SCSIDATL but this register will preserve
- * the data for later reading as long as the SCSIDATL_IMGEN bit in the
- * OPTIONMODE register is set.
- */
-register SCSIDATL_IMG {
-        address                 0x09c
-        access_mode RW
-}
-
-/*
- * Queue Out FIFO (p. 3-61)
- * Queue of SCBs that have completed and await the host
- */
-register QOUTFIFO {
-        address                 0x09d
-        access_mode WO
-}
-
-/*
- * CRC Control 1 Register (p. 5-105)
- * Control bits for the Ultra 160/m CRC facilities
- */
-register CRCCONTROL1 {
-        address                 0x09d
-        access_mode RW
-        bit     CRCONSEEN       0x80 /* CRC ON Single Edge ENable */
-        bit     CRCVALCHKEN     0x40 /* CRC Value Check Enable */
-        bit     CRCENDCHKEN     0x20 /* CRC End Check Enable */
-        bit     CRCREQCHKEN     0x10
-        bit     TARGCRCENDEN    0x08 /* Enable End CRC transfer when target */
-        bit     TARGCRCCNTEN    0x04 /* Enable CRC transfer when target */
-}
-
-/*
- * Queue Out Count (p. 3-61)
- * Number of queued SCBs in the Out FIFO
- */
-register QOUTCNT {
-        address                 0x09e
-        access_mode RO
-}
-
-/*
- * SCSI Phase Register (p. 5-106)
- * Current bus phase
- */
-register SCSIPHASE {
-        address                 0x09e
-        access_mode RO
-        bit     SP_STATUS               0x20
-        bit     SP_COMMAND              0x10
-        bit     SP_MSG_IN               0x08
-        bit     SP_MSG_OUT              0x04
-        bit     SP_DATA_IN              0x02
-        bit     SP_DATA_OUT     0x01
-}
-
-/*
- * Special Function
- */
-register SFUNCT {
-        address                 0x09f
-        access_mode RW
-        bit     ALT_MODE        0x80
-}
-
-/*
- * SCB Definition (p. 5-4)
- */
-scb {
-        address                 0x0a0
-        SCB_CONTROL {
-                size    1
-                bit     MK_MESSAGE      0x80
-                bit     DISCENB         0x40
-                bit     TAG_ENB         0x20
-                bit     DISCONNECTED    0x04
-                mask    SCB_TAG_TYPE    0x03
-        }
-        SCB_TCL {
-                size    1
-                bit     SELBUSB         0x08
-                mask    TID             0xf0
-                mask    LID             0x07
-        }
-        SCB_TARGET_STATUS {
-                size    1
-        }
-        SCB_SGCOUNT {
-                size    1
-        }
-        SCB_SGPTR {
-                size    4
-        }
-        SCB_RESID_SGCNT {
-                size    1
-        }
-        SCB_RESID_DCNT  {
-                size    3
-        }
-        SCB_DATAPTR {
-                size    4
-        }
-        SCB_DATACNT {
-                /*
-                 * Really only 3 bytes, but padded to make
-                 * the kernel's job easier.
-                 */
-                size    4
-        }
-        SCB_CMDPTR {
-                size    4
-        }
-        SCB_CMDLEN {
-                size    1
-        }
-        SCB_TAG {
-                size    1
-        }
-        SCB_NEXT {
-                size    1
-        }
-        SCB_PREV {
-                size    1
-        }
-        SCB_BUSYTARGETS {
-                size    4
-        }
-}
-
-const   SG_SIZEOF       0x08            /* sizeof(struct ahc_dma) */
-
-/* --------------------- AHA-2840-only definitions -------------------- */
-
-register SEECTL_2840 {
-        address                 0x0c0
-        access_mode RW
-        bit     CS_2840         0x04
-        bit     CK_2840         0x02
-        bit     DO_2840         0x01
-}
-
-register STATUS_2840 {
-        address                 0x0c1
-        access_mode RW
-        bit     EEPROM_TF       0x80
-        mask    BIOS_SEL        0x60
-        mask    ADSEL           0x1e
-        bit     DI_2840         0x01
-}
-
-/* --------------------- AIC-7870-only definitions -------------------- */
-
-register DSPCISTATUS {
-        address                 0x086
-        mask    DFTHRSH_100     0xc0
-}
-
-register CCHADDR {
-        address                 0x0E0
-        size 8
-}
-
-register CCHCNT {
-        address                 0x0E8
-}
-
-register CCSGRAM {
-        address                 0x0E9
-}
-
-register CCSGADDR {
-        address                 0x0EA
-}
-
-register CCSGCTL {
-        address                 0x0EB
-        bit     CCSGDONE        0x80
-        bit     CCSGEN          0x08
-        bit     FLAG            0x02
-        bit     CCSGRESET       0x01
-}
-
-register CCSCBCNT {
-        address                 0xEF
-}
-
-register CCSCBCTL {
-        address                 0x0EE
-        bit     CCSCBDONE       0x80
-        bit     ARRDONE         0x40    /* SCB Array prefetch done */
-        bit     CCARREN         0x10
-        bit     CCSCBEN         0x08
-        bit     CCSCBDIR        0x04
-        bit     CCSCBRESET      0x01
-}
-
-register CCSCBADDR {
-        address                 0x0ED
-}
-
-register CCSCBRAM {
-        address                 0xEC
-}
-
-register CCSCBPTR {
-        address                 0x0F1
-}
-
-register HNSCB_QOFF {
-        address                 0x0F4
-}
-
-register HESCB_QOFF {
-        address                 0x0F5
-}
-
-register SNSCB_QOFF {
-        address                 0x0F6
-}
-
-register SESCB_QOFF {
-        address                 0x0F7
-}
-
-register SDSCB_QOFF {
-        address                 0x0F8
-}
-
-register QOFF_CTLSTA {
-        address                 0x0FA
-        bit     ESTABLISH_SCB_AVAIL     0x80
-        bit     SCB_AVAIL       0x40
-        bit     SNSCB_ROLLOVER  0x20
-        bit     SDSCB_ROLLOVER  0x10
-        bit     SESCB_ROLLOVER  0x08
-        mask    SCB_QSIZE       0x07
-        mask    SCB_QSIZE_256   0x06
-}
-
-register DFF_THRSH {
-        address                 0x0FB
-        mask    WR_DFTHRSH      0x70
-        mask    RD_DFTHRSH      0x07
-        mask    RD_DFTHRSH_MIN  0x00
-        mask    RD_DFTHRSH_25   0x01
-        mask    RD_DFTHRSH_50   0x02
-        mask    RD_DFTHRSH_63   0x03
-        mask    RD_DFTHRSH_75   0x04
-        mask    RD_DFTHRSH_85   0x05
-        mask    RD_DFTHRSH_90   0x06
-        mask    RD_DFTHRSH_MAX  0x07
-        mask    WR_DFTHRSH_MIN  0x00
-        mask    WR_DFTHRSH_25   0x10
-        mask    WR_DFTHRSH_50   0x20
-        mask    WR_DFTHRSH_63   0x30
-        mask    WR_DFTHRSH_75   0x40
-        mask    WR_DFTHRSH_85   0x50
-        mask    WR_DFTHRSH_90   0x60
-        mask    WR_DFTHRSH_MAX  0x70
-}
-
-register SG_CACHEPTR {
-        access_mode RW
-        address                 0x0fc
-        mask    SG_USER_DATA    0xfc
-        bit     LAST_SEG        0x02
-        bit     LAST_SEG_DONE   0x01
-}
-
-register BRDCTL {
-        address                 0x01d
-        bit     BRDDAT7         0x80
-        bit     BRDDAT6         0x40
-        bit     BRDDAT5         0x20
-        bit     BRDSTB          0x10
-        bit     BRDCS           0x08
-        bit     BRDRW           0x04
-        bit     BRDCTL1         0x02
-        bit     BRDCTL0         0x01
-        /* 7890 Definitions */
-        bit     BRDDAT4         0x10
-        bit     BRDDAT3         0x08
-        bit     BRDDAT2         0x04
-        bit     BRDRW_ULTRA2    0x02
-        bit     BRDSTB_ULTRA2   0x01
-}
-
-/*
- * Serial EEPROM Control (p. 4-92 in 7870 Databook)
- * Controls the reading and writing of an external serial 1-bit
- * EEPROM Device.  In order to access the serial EEPROM, you must
- * first set the SEEMS bit that generates a request to the memory
- * port for access to the serial EEPROM device.  When the memory
- * port is not busy servicing another request, it reconfigures
- * to allow access to the serial EEPROM.  When this happens, SEERDY
- * gets set high to verify that the memory port access has been
- * granted.  
- *
- * After successful arbitration for the memory port, the SEECS bit of 
- * the SEECTL register is connected to the chip select.  The SEECK, 
- * SEEDO, and SEEDI are connected to the clock, data out, and data in 
- * lines respectively.  The SEERDY bit of SEECTL is useful in that it 
- * gives us an 800 nsec timer.  After a write to the SEECTL register, 
- * the SEERDY goes high 800 nsec later.  The one exception to this is 
- * when we first request access to the memory port.  The SEERDY goes 
- * high to signify that access has been granted and, for this case, has 
- * no implied timing.
- *
- * See 93cx6.c for detailed information on the protocol necessary to 
- * read the serial EEPROM.
- */
-register SEECTL {
-        address                 0x01e
-        bit     EXTARBACK       0x80
-        bit     EXTARBREQ       0x40
-        bit     SEEMS           0x20
-        bit     SEERDY          0x10
-        bit     SEECS           0x08
-        bit     SEECK           0x04
-        bit     SEEDO           0x02
-        bit     SEEDI           0x01
-}
-/* ---------------------- Scratch RAM Offsets ------------------------- */
-/* These offsets are either to values that are initialized by the board's
- * BIOS or are specified by the sequencer code.
- *
- * The host adapter card (at least the BIOS) uses 20-2f for SCSI
- * device information, 32-33 and 5a-5f as well. As it turns out, the
- * BIOS trashes 20-2f, writing the synchronous negotiation results
- * on top of the BIOS values, so we re-use those for our per-target
- * scratchspace (actually a value that can be copied directly into
- * SCSIRATE).  The kernel driver will enable synchronous negotiation
- * for all targets that have a value other than 0 in the lower four
- * bits of the target scratch space.  This should work regardless of
- * whether the bios has been installed.
- */
-
-scratch_ram {
-        address                 0x020
-
-        /*
-         * 1 byte per target starting at this address for configuration values
-         */
-        TARG_SCSIRATE {
-                size            16
-        }
-        /*
-         * Bit vector of targets that have ULTRA enabled.
-         */
-        ULTRA_ENB {
-                size            2
-        }
-        /*
-         * Bit vector of targets that have disconnection disabled.
-         */
-        DISC_DSB {
-                size            2
-        }
-        /*
-         * Single byte buffer used to designate the type or message
-         * to send to a target.
-         */
-        MSG_OUT {
-                size            1
-        }
-        /* Parameters for DMA Logic */
-        DMAPARAMS {
-                size            1
-                bit     PRELOADEN       0x80
-                bit     WIDEODD         0x40
-                bit     SCSIEN          0x20
-                bit     SDMAEN          0x10
-                bit     SDMAENACK       0x10
-                bit     HDMAEN          0x08
-                bit     HDMAENACK       0x08
-                bit     DIRECTION       0x04
-                bit     FIFOFLUSH       0x02
-                bit     FIFORESET       0x01
-        }
-        SEQ_FLAGS {
-                size            1
-                bit     IDENTIFY_SEEN   0x80
-                bit     SCBPTR_VALID    0x20
-                bit     DPHASE          0x10
-                bit     AMTARGET        0x08
-                bit     WIDE_BUS        0x02
-                bit     TWIN_BUS        0x01
-        }
-        /*
-         * Temporary storage for the
-         * target/channel/lun of a
-         * reconnecting target
-         */
-        SAVED_TCL {
-                size            1
-        }
-        /* Working value of the number of SG segments left */
-        SG_COUNT {
-                size            1
-        }
-        /* Working value of SG pointer */
-        SG_NEXT {
-                size            4
-        }
-        /*
-         * The last bus phase as seen by the sequencer. 
-         */
-        LASTPHASE {
-                size            1
-                bit     CDI             0x80
-                bit     IOI             0x40
-                bit     MSGI            0x20
-                mask    PHASE_MASK      CDI|IOI|MSGI
-                mask    P_DATAOUT       0x00
-                mask    P_DATAIN        IOI
-                mask    P_COMMAND       CDI
-                mask    P_MESGOUT       CDI|MSGI
-                mask    P_STATUS        CDI|IOI
-                mask    P_MESGIN        CDI|IOI|MSGI
-                mask    P_BUSFREE       0x01
-        }
-        /*
-         * head of list of SCBs awaiting
-         * selection
-         */
-        WAITING_SCBH {
-                size            1
-        }
-        /*
-         * head of list of SCBs that are
-         * disconnected.  Used for SCB
-         * paging.
-         */
-        DISCONNECTED_SCBH {
-                size            1
-        }
-        /*
-         * head of list of SCBs that are
-         * not in use.  Used for SCB paging.
-         */
-        FREE_SCBH {
-                size            1
-        }
-        /*
-         * Address of the hardware scb array in the host.
-         */
-        HSCB_ADDR {
-                size            4
-        }
-        /*
-         * Address of the 256 byte array storing the SCBID of outstanding
-         * untagged SCBs indexed by TCL.
-         */
-        SCBID_ADDR {
-                size            4
-        }
-        /*
-         * Address of the array of command descriptors used to store
-         * information about incoming selections.
-         */
-        TMODE_CMDADDR {
-                size            4
-        }
-        KERNEL_QINPOS {
-                size            1
-        }
-        QINPOS {
-                size            1
-        }
-        QOUTPOS {
-                size            1
-        }
-        /*
-         * Offset into the command descriptor array for the next
-         * available desciptor to use.
-         */
-        TMODE_CMDADDR_NEXT {
-                size            1
-        }
-        ARG_1 {
-                size            1
-                mask    SEND_MSG        0x80
-                mask    SEND_SENSE      0x40
-                mask    SEND_REJ        0x20
-                mask    MSGOUT_PHASEMIS 0x10
-                alias   RETURN_1
-        }
-        ARG_2 {
-                size            1
-                alias   RETURN_2
-        }
-
-        /*
-         * Snapshot of MSG_OUT taken after each message is sent.
-         */
-        LAST_MSG {
-                size            1
-        }
-
-        /*
-         * Number of times we have filled the CCSGRAM with prefetched
-         * SG elements.
-         */
-        PREFETCH_CNT {
-                size            1
-        }
-
-
-        /*
-         * These are reserved registers in the card's scratch ram.  Some of
-         * the values are specified in the AHA2742 technical reference manual
-         * and are initialized by the BIOS at boot time.
-         */
-        SCSICONF {
-                address         0x05a
-                size            1
-                bit     TERM_ENB        0x80
-                bit     RESET_SCSI      0x40
-                mask    HSCSIID         0x07    /* our SCSI ID */
-                mask    HWSCSIID        0x0f    /* our SCSI ID if Wide Bus */
-        }
-        HOSTCONF {
-                address         0x05d
-                size            1
-        }
-        HA_274_BIOSCTRL {
-                address         0x05f
-                size            1
-                mask    BIOSMODE                0x30
-                mask    BIOSDISABLED            0x30    
-                bit     CHANNEL_B_PRIMARY       0x08
-        }
-        /*
-         * Per target SCSI offset values for Ultra2 controllers.
-         */
-        TARG_OFFSET {
-                address         0x070
-                size            16
-        }
-}
-
-const SCB_LIST_NULL     0xff
-
-const CCSGADDR_MAX      0x80
-const CCSGRAM_MAXSEGS   16
-
-/* Offsets into the SCBID array where different data is stored */
-const UNTAGGEDSCB_OFFSET        0
-const QOUTFIFO_OFFSET           1
-const QINFIFO_OFFSET            2
-
-/* WDTR Message values */
-const BUS_8_BIT                 0x00
-const BUS_16_BIT                0x01
-const BUS_32_BIT                0x02
-
-/* Offset maximums */
-const MAX_OFFSET_8BIT           0x0f
-const MAX_OFFSET_16BIT          0x08
-const MAX_OFFSET_ULTRA2         0x7f
-const HOST_MSG                  0xff
-
-/* Target mode command processing constants */
-const CMD_GROUP_CODE_SHIFT      0x05
-const CMD_GROUP0_BYTE_DELTA     -4
-const CMD_GROUP2_BYTE_DELTA     -6
-const CMD_GROUP4_BYTE_DELTA     4
-const CMD_GROUP5_BYTE_DELTA     11
-
-/*
- * Downloaded (kernel inserted) constants
- */
-
-/*
- * Number of command descriptors in the command descriptor array.
- */
-const TMODE_NUMCMDS     download
diff --git a/drivers/scsi/aic7xxx_old/aic7xxx.seq b/drivers/scsi/aic7xxx_old/aic7xxx.seq
deleted file mode 100644
index dc3bb81cff0c..000000000000
--- a/drivers/scsi/aic7xxx_old/aic7xxx.seq
+++ /dev/null
@@ -1,1539 +0,0 @@
-/*
- * Adaptec 274x/284x/294x device driver firmware for Linux and FreeBSD.
- *
- * Copyright (c) 1994-1999 Justin Gibbs.
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions, and the following disclaimer,
- *    without modification, immediately at the beginning of the file.
- * 2. The name of the author may not be used to endorse or promote products
- *    derived from this software without specific prior written permission.
- *
- * Where this Software is combined with software released under the terms of 
- * the GNU General Public License (GPL) and the terms of the GPL would require the 
- * combined work to also be released under the terms of the GPL, the terms
- * and conditions of this License will apply in addition to those of the
- * GPL with the exception of any terms or conditions of this License that
- * conflict with, or are expressly prohibited by, the GPL.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE FOR
- * ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- *
- *      $Id: aic7xxx.seq,v 1.77 1998/06/28 02:58:57 gibbs Exp $
- */
-
-#include "aic7xxx.reg"
-#include "scsi_message.h"
-
-/*
- * A few words on the waiting SCB list:
- * After starting the selection hardware, we check for reconnecting targets
- * as well as for our selection to complete just in case the reselection wins
- * bus arbitration.  The problem with this is that we must keep track of the
- * SCB that we've already pulled from the QINFIFO and started the selection
- * on just in case the reselection wins so that we can retry the selection at
- * a later time.  This problem cannot be resolved by holding a single entry
- * in scratch ram since a reconnecting target can request sense and this will
- * create yet another SCB waiting for selection.  The solution used here is to 
- * use byte 27 of the SCB as a pseudo-next pointer and to thread a list
- * of SCBs that are awaiting selection.  Since 0-0xfe are valid SCB indexes, 
- * SCB_LIST_NULL is 0xff which is out of range.  An entry is also added to
- * this list every time a request sense occurs or after completing a non-tagged
- * command for which a second SCB has been queued.  The sequencer will
- * automatically consume the entries.
- */
-
-reset:
-        clr     SCSISIGO;               /* De-assert BSY */
-        and     SXFRCTL1, ~BITBUCKET;
-        /* Always allow reselection */
-        mvi     SCSISEQ, ENRSELI|ENAUTOATNP;
-
-        if ((p->features & AHC_CMD_CHAN) != 0) {
-                /* Ensure that no DMA operations are in progress */
-                clr     CCSGCTL;
-                clr     CCSCBCTL;
-        }
-
-        call    clear_target_state;
-poll_for_work:
-        and     SXFRCTL0, ~SPIOEN;
-        if ((p->features & AHC_QUEUE_REGS) == 0) {
-                mov     A, QINPOS;
-        }
-poll_for_work_loop:
-        if ((p->features & AHC_QUEUE_REGS) == 0) {
-                and     SEQCTL, ~PAUSEDIS;
-        }
-        test    SSTAT0, SELDO|SELDI     jnz selection;
-        test    SCSISEQ, ENSELO jnz poll_for_work;
-        if ((p->features & AHC_TWIN) != 0) {
-                /*
-                 * Twin channel devices cannot handle things like SELTO
-                 * interrupts on the "background" channel.  So, if we
-                 * are selecting, keep polling the current channel util
-                 * either a selection or reselection occurs.
-                 */
-                xor     SBLKCTL,SELBUSB;        /* Toggle to the other bus */
-                test    SSTAT0, SELDO|SELDI     jnz selection;
-                test    SCSISEQ, ENSELO jnz poll_for_work;
-                xor     SBLKCTL,SELBUSB;        /* Toggle back */
-        }
-        cmp     WAITING_SCBH,SCB_LIST_NULL jne start_waiting;
-test_queue:
-        /* Has the driver posted any work for us? */
-        if ((p->features & AHC_QUEUE_REGS) != 0) {
-                test    QOFF_CTLSTA, SCB_AVAIL jz poll_for_work_loop;
-                mov     NONE, SNSCB_QOFF;
-                inc     QINPOS;
-        } else {
-                or      SEQCTL, PAUSEDIS;
-                cmp     KERNEL_QINPOS, A je poll_for_work_loop;
-                inc     QINPOS;
-                and     SEQCTL, ~PAUSEDIS;
-        }
-
-/*
- * We have at least one queued SCB now and we don't have any 
- * SCBs in the list of SCBs awaiting selection.  If we have
- * any SCBs available for use, pull the tag from the QINFIFO
- * and get to work on it.
- */
-        if ((p->flags & AHC_PAGESCBS) != 0) {
-                mov     ALLZEROS        call    get_free_or_disc_scb;
-        }
-
-dequeue_scb:
-        add     A, -1, QINPOS;
-        mvi     QINFIFO_OFFSET call fetch_byte;
-
-        if ((p->flags & AHC_PAGESCBS) == 0) {
-                /* In the non-paging case, the SCBID == hardware SCB index */
-                mov     SCBPTR, RETURN_2;
-        }
-dma_queued_scb:
-/*
- * DMA the SCB from host ram into the current SCB location.
- */
-        mvi     DMAPARAMS, HDMAEN|DIRECTION|FIFORESET;
-        mov     RETURN_2         call dma_scb;
-
-/*
- * Preset the residual fields in case we never go through a data phase.
- * This isn't done by the host so we can avoid a DMA to clear these
- * fields for the normal case of I/O that completes without underrun
- * or overrun conditions.
- */
-        if ((p->features & AHC_CMD_CHAN) != 0) {
-                bmov    SCB_RESID_DCNT, SCB_DATACNT, 3;
-        } else {
-                mov     SCB_RESID_DCNT[0],SCB_DATACNT[0];
-                mov     SCB_RESID_DCNT[1],SCB_DATACNT[1];
-                mov     SCB_RESID_DCNT[2],SCB_DATACNT[2];
-        }
-        mov     SCB_RESID_SGCNT, SCB_SGCOUNT;
-
-start_scb:
-        /*
-         * Place us on the waiting list in case our selection
-         * doesn't win during bus arbitration.
-         */
-        mov     SCB_NEXT,WAITING_SCBH;
-        mov     WAITING_SCBH, SCBPTR;
-start_waiting:
-        /*
-         * Pull the first entry off of the waiting SCB list.
-         */
-        mov     SCBPTR, WAITING_SCBH;
-        call    start_selection;
-        jmp     poll_for_work;
-
-start_selection:
-        if ((p->features & AHC_TWIN) != 0) {
-                and     SINDEX,~SELBUSB,SBLKCTL;/* Clear channel select bit */
-                and     A,SELBUSB,SCB_TCL;      /* Get new channel bit */
-                or      SINDEX,A;
-                mov     SBLKCTL,SINDEX;         /* select channel */
-        }
-initialize_scsiid:
-        if ((p->features & AHC_ULTRA2) != 0) {
-                and     A, TID, SCB_TCL;        /* Get target ID */
-                and     SCSIID_ULTRA2, OID;     /* Clear old target */
-                or      SCSIID_ULTRA2, A;
-        } else {
-                and     A, TID, SCB_TCL;        /* Get target ID */
-                and     SCSIID, OID;            /* Clear old target */
-                or      SCSIID, A;
-        }
-        mov     SCSIDATL, ALLZEROS;             /* clear out the latched */
-                                                /* data register, this */
-                                                /* fixes a bug on some */
-                                                /* controllers where the */
-                                                /* last byte written to */
-                                                /* this register can leak */
-                                                /* onto the data bus at */
-                                                /* bad times, such as during */
-                                                /* selection timeouts */
-        mvi     SCSISEQ, ENSELO|ENAUTOATNO|ENRSELI|ENAUTOATNP ret;
-
-/*
- * Initialize Ultra mode setting and clear the SCSI channel.
- * SINDEX should contain any additional bit's the client wants
- * set in SXFRCTL0.
- */
-initialize_channel:
-        or      SXFRCTL0, CLRSTCNT|CLRCHN, SINDEX;
-        if ((p->features & AHC_ULTRA) != 0) {
-ultra:
-                mvi     SINDEX, ULTRA_ENB+1;
-                test    SAVED_TCL, 0x80         jnz ultra_2; /* Target ID > 7 */
-                dec     SINDEX;
-ultra_2:
-                mov     FUNCTION1,SAVED_TCL;
-                mov     A,FUNCTION1;
-                test    SINDIR, A       jz ndx_dtr;
-                or      SXFRCTL0, FAST20;
-        } 
-/*
- * Initialize SCSIRATE with the appropriate value for this target.
- * The SCSIRATE settings for each target are stored in an array
- * based at TARG_SCSIRATE.
- */
-ndx_dtr:
-        shr     A,4,SAVED_TCL;
-        if ((p->features & AHC_TWIN) != 0) {
-                test    SBLKCTL,SELBUSB jz ndx_dtr_2;
-                or      SAVED_TCL, SELBUSB; 
-                or      A,0x08;                 /* Channel B entries add 8 */
-ndx_dtr_2:
-        }
-
-        if ((p->features & AHC_ULTRA2) != 0) {
-                add     SINDEX, TARG_OFFSET, A;
-                mov     SCSIOFFSET, SINDIR;
-        }
-
-        add     SINDEX,TARG_SCSIRATE,A;
-        mov     SCSIRATE,SINDIR ret;
-
-
-selection:
-        test    SSTAT0,SELDO    jnz select_out;
-/*
- * Reselection has been initiated by a target. Make a note that we've been
- * reselected, but haven't seen an IDENTIFY message from the target yet.
- */
-initiator_reselect:
-        mvi     CLRSINT0, CLRSELDI;
-        /* XXX test for and handle ONE BIT condition */
-        and     SAVED_TCL, SELID_MASK, SELID;
-        mvi     CLRSINT1,CLRBUSFREE;
-        or      SIMODE1, ENBUSFREE;             /*
-                                                 * We aren't expecting a
-                                                 * bus free, so interrupt
-                                                 * the kernel driver if it
-                                                 * happens.
-                                                 */
-        mvi     SPIOEN call     initialize_channel;
-        mvi     MSG_OUT, MSG_NOOP;              /* No message to send */
-        jmp     ITloop;
-
-/*
- * After the selection, remove this SCB from the "waiting SCB"
- * list.  This is achieved by simply moving our "next" pointer into
- * WAITING_SCBH.  Our next pointer will be set to null the next time this
- * SCB is used, so don't bother with it now.
- */
-select_out:
-        /* Turn off the selection hardware */
-        mvi     SCSISEQ, ENRSELI|ENAUTOATNP;    /*
-                                                 * ATN on parity errors
-                                                 * for "in" phases
-                                                 */
-        mvi     CLRSINT0, CLRSELDO;
-        mov     SCBPTR, WAITING_SCBH;
-        mov     WAITING_SCBH,SCB_NEXT;
-        mov     SAVED_TCL, SCB_TCL;
-        mvi     CLRSINT1,CLRBUSFREE;
-        or      SIMODE1, ENBUSFREE;             /*
-                                                 * We aren't expecting a
-                                                 * bus free, so interrupt
-                                                 * the kernel driver if it
-                                                 * happens.
-                                                 */
-        mvi     SPIOEN call     initialize_channel;
-/*
- * As soon as we get a successful selection, the target should go
- * into the message out phase since we have ATN asserted.
- */
-        mvi     MSG_OUT, MSG_IDENTIFYFLAG;
-        or      SEQ_FLAGS, IDENTIFY_SEEN;
-
-/*
- * Main loop for information transfer phases.  Wait for the target
- * to assert REQ before checking MSG, C/D and I/O for the bus phase.
- */
-ITloop:
-        call    phase_lock;
-
-        mov     A, LASTPHASE;
-
-        test    A, ~P_DATAIN    jz p_data;
-        cmp     A,P_COMMAND     je p_command;
-        cmp     A,P_MESGOUT     je p_mesgout;
-        cmp     A,P_STATUS      je p_status;
-        cmp     A,P_MESGIN      je p_mesgin;
-
-        mvi     INTSTAT,BAD_PHASE;      /* unknown phase - signal driver */
-        jmp     ITloop;                 /* Try reading the bus again. */
-
-await_busfree:
-        and     SIMODE1, ~ENBUSFREE;
-        call    clear_target_state;
-        mov     NONE, SCSIDATL;         /* Ack the last byte */
-        and     SXFRCTL0, ~SPIOEN;
-        test    SSTAT1,REQINIT|BUSFREE  jz .;
-        test    SSTAT1, BUSFREE jnz poll_for_work;
-        mvi     INTSTAT, BAD_PHASE;
-        
-clear_target_state:
-        /*
-         * We assume that the kernel driver may reset us
-         * at any time, even in the middle of a DMA, so
-         * clear DFCNTRL too.
-         */
-        clr     DFCNTRL;
-
-        /*
-         * We don't know the target we will connect to,
-         * so default to narrow transfers to avoid
-         * parity problems.
-         */
-        if ((p->features & AHC_ULTRA2) != 0) {
-                bmov    SCSIRATE, ALLZEROS, 2;
-        } else {
-                clr     SCSIRATE;
-                and     SXFRCTL0, ~(FAST20);
-        }
-        mvi     LASTPHASE, P_BUSFREE;
-        /* clear target specific flags */
-        clr     SEQ_FLAGS ret;
-
-
-data_phase_reinit:
-/*
- * If we re-enter the data phase after going through another phase, the
- * STCNT may have been cleared, so restore it from the residual field.
- * On Ultra2, we have to put it into the HCNT field because we have to
- * drop the data down into the shadow layer via the preload ability.
- */
-        if ((p->features & AHC_ULTRA2) != 0) {
-                bmov    HADDR, SHADDR, 4;
-                bmov    HCNT, SCB_RESID_DCNT, 3;
-        }
-        if ((p->chip & AHC_CHIPID_MASK) == AHC_AIC7895) {
-                bmov    STCNT, SCB_RESID_DCNT, 3;
-        }
-        if ((p->features & AHC_CMD_CHAN) == 0) {
-                mvi     DINDEX, STCNT;
-                mvi     SCB_RESID_DCNT  call bcopy_3;
-        }
-        jmp     data_phase_loop;
-p_data:
-        if ((p->features & AHC_ULTRA2) != 0) {
-                mvi     DMAPARAMS, PRELOADEN|SCSIEN|HDMAEN;
-        } else {
-                mvi     DMAPARAMS, WIDEODD|SCSIEN|SDMAEN|HDMAEN|FIFORESET;
-        }
-        test    LASTPHASE, IOI jnz . + 2;
-        or      DMAPARAMS, DIRECTION;
-        call    assert;         /*
-                                 * Ensure entering a data
-                                 * phase is okay - seen identify, etc.
-                                 */
-        if ((p->features & AHC_CMD_CHAN) != 0) {
-                mvi     CCSGADDR, CCSGADDR_MAX;
-        }
-
-        test    SEQ_FLAGS, DPHASE       jnz data_phase_reinit;
-        or      SEQ_FLAGS, DPHASE;      /* we've seen a data phase */
-        /*
-         * Initialize the DMA address and counter from the SCB.
-         * Also set SG_COUNT and SG_NEXT in memory since we cannot
-         * modify the values in the SCB itself until we see a
-         * save data pointers message.
-         */
-        if ((p->features & AHC_CMD_CHAN) != 0) {
-                bmov    HADDR, SCB_DATAPTR, 7;
-                bmov    SG_COUNT, SCB_SGCOUNT, 5;
-                if ((p->features & AHC_ULTRA2) == 0) {
-                        bmov    STCNT, HCNT, 3;
-                }
-        } else {
-                mvi     DINDEX, HADDR;
-                mvi     SCB_DATAPTR     call bcopy_7;
-                call    set_stcnt_from_hcnt;
-                mvi     DINDEX, SG_COUNT;
-                mvi     SCB_SGCOUNT     call bcopy_5;
-        }
-data_phase_loop:
-        /* Guard against overruns */
-        test    SG_COUNT, 0xff jnz data_phase_inbounds;
-/*
- * Turn on 'Bit Bucket' mode, set the transfer count to
- * 16meg and let the target run until it changes phase.
- * When the transfer completes, notify the host that we
- * had an overrun.
- */
-        or      SXFRCTL1,BITBUCKET;
-        and     DMAPARAMS, ~(HDMAEN|SDMAEN);
-        if ((p->features & AHC_ULTRA2) != 0) {
-                bmov    HCNT, ALLONES, 3;
-        }
-        if ((p->chip & AHC_CHIPID_MASK) == AHC_AIC7895) {
-                bmov    STCNT, ALLONES, 3;
-        }
-        if ((p->features & AHC_CMD_CHAN) == 0) {
-                mvi     STCNT[0], 0xFF;
-                mvi     STCNT[1], 0xFF;
-                mvi     STCNT[2], 0xFF;
-        }
-
-data_phase_inbounds:
-/* If we are the last SG block, tell the hardware. */
-        if ((p->features & AHC_ULTRA2) != 0) {
-                shl     A, 2, SG_COUNT;
-                cmp     SG_COUNT,0x01 jne data_phase_wideodd;
-                or      A, LAST_SEG;
-        } else {
-                cmp     SG_COUNT,0x01 jne data_phase_wideodd;
-                and     DMAPARAMS, ~WIDEODD;
-        }
-data_phase_wideodd:
-        if ((p->features & AHC_ULTRA2) != 0) {  
-                mov     SG_CACHEPTR, A;
-                mov     DFCNTRL, DMAPARAMS; /* start the operation */
-                test    SXFRCTL1, BITBUCKET jnz data_phase_overrun;
-u2_preload_wait:
-                test    SSTAT1, PHASEMIS jnz u2_phasemis;
-                test    DFSTATUS, PRELOAD_AVAIL jz u2_preload_wait;
-        } else {
-                mov     DMAPARAMS  call dma;
-data_phase_dma_done:
-/* Go tell the host about any overruns */
-                test    SXFRCTL1,BITBUCKET jnz data_phase_overrun;
-
-/* Exit if we had an underrun.  dma clears SINDEX in this case. */
-                test    SINDEX,0xff     jz data_phase_finish;
-        }
-/*
- * Advance the scatter-gather pointers 
- */
-sg_advance:
-        if ((p->features & AHC_ULTRA2) != 0) {
-                cmp     SG_COUNT, 0x01  je u2_data_phase_finish;
-        } else {
-                dec     SG_COUNT;
-                test    SG_COUNT, 0xff  jz data_phase_finish;
-        }
-
-        if ((p->features & AHC_CMD_CHAN) != 0) {
-
-                /*
-                 * Do we have any prefetch left???
-                 */
-                cmp     CCSGADDR, CCSGADDR_MAX jne prefetch_avail;
-
-                /*
-                 * Fetch MIN(CCSGADDR_MAX, (SG_COUNT * 8)) bytes.
-                 */
-                add     A, -(CCSGRAM_MAXSEGS + 1), SG_COUNT;
-                mvi     A, CCSGADDR_MAX;
-                jc      . + 2;
-                shl     A, 3, SG_COUNT;
-                mov     CCHCNT, A;
-                bmov    CCHADDR, SG_NEXT, 4;
-                mvi     CCSGCTL, CCSGEN|CCSGRESET;
-                test    CCSGCTL, CCSGDONE jz .;
-                and     CCSGCTL, ~CCSGEN;
-                test    CCSGCTL, CCSGEN jnz .;
-                mvi     CCSGCTL, CCSGRESET;
-prefetch_avail:
-                bmov    HADDR, CCSGRAM, 8;
-                if ((p->features & AHC_ULTRA2) == 0) {
-                        bmov    STCNT, HCNT, 3;
-                } else {
-                        dec     SG_COUNT;
-                }
-        } else {
-                mvi     DINDEX, HADDR;
-                mvi     SG_NEXT call bcopy_4;
-
-                mvi     HCNT[0],SG_SIZEOF;
-                clr     HCNT[1];
-                clr     HCNT[2];
-
-                or      DFCNTRL, HDMAEN|DIRECTION|FIFORESET;
-
-                call    dma_finish;
-
-/*
- * Copy data from FIFO into SCB data pointer and data count.
- * This assumes that the SG segments are of the form:
- * struct ahc_dma_seg {
- *      u_int32_t       addr;   four bytes, little-endian order
- *      u_int32_t       len;    four bytes, little endian order
- * };
- */
-                mvi     DINDEX, HADDR;
-                call    dfdat_in_7;
-                call    set_stcnt_from_hcnt;
-        }
-/* Advance the SG pointer */
-        clr     A;              /* add sizeof(struct scatter) */
-        add     SG_NEXT[0],SG_SIZEOF;
-        adc     SG_NEXT[1],A;
-
-        if ((p->features & AHC_ULTRA2) != 0) {
-                jmp     data_phase_loop;
-        } else {
-                test    SSTAT1, REQINIT jz .;
-                test    SSTAT1,PHASEMIS jz data_phase_loop;
-        }
-
-
-/*
- * We've loaded all of our segments into the preload layer.  Now, we simply
- * have to wait for it to finish or for us to get a phasemis.  And, since
- * we'll get a phasemis if we do finish, all we really need to do is wait
- * for a phasemis then check if we did actually complete all the segments.
- */
-        if ((p->features & AHC_ULTRA2) != 0) {
-u2_data_phase_finish:
-                test    SSTAT1, PHASEMIS jnz u2_phasemis;
-                test    SG_CACHEPTR, LAST_SEG_DONE jz u2_data_phase_finish;
-                clr     SG_COUNT;
-                test    SSTAT1, REQINIT jz .;
-                test    SSTAT1, PHASEMIS jz data_phase_loop;
-u2_phasemis:
-                call    ultra2_dmafinish;
-                test    SG_CACHEPTR, LAST_SEG_DONE jnz data_phase_finish;
-                test    SSTAT2, SHVALID jnz u2_fixup_residual;
-                mvi     INTSTAT, SEQ_SG_FIXUP;
-                jmp     data_phase_finish;
-u2_fixup_residual:
-                shr     ARG_1, 2, SG_CACHEPTR;
-u2_phasemis_loop:
-                and     A, 0x3f, SG_COUNT;
-                cmp     ARG_1, A je data_phase_finish;
-/*
- * Subtract SG_SIZEOF from the SG_NEXT pointer and add 1 to the SG_COUNT
- */
-                clr     A;
-                add     SG_NEXT[0], -SG_SIZEOF;
-                adc     SG_NEXT[1], 0xff;
-                inc     SG_COUNT;
-                jmp     u2_phasemis_loop;
-        }
-
-data_phase_finish:
-/*
- * After a DMA finishes, save the SG and STCNT residuals back into the SCB
- * We use STCNT instead of HCNT, since it's a reflection of how many bytes 
- * were transferred on the SCSI (as opposed to the host) bus.
- */
-        if ((p->features & AHC_CMD_CHAN) != 0) {
-                bmov    SCB_RESID_DCNT, STCNT, 3;
-                mov     SCB_RESID_SGCNT, SG_COUNT;
-                if ((p->features & AHC_ULTRA2) != 0) {
-                        or      SXFRCTL0, CLRSTCNT|CLRCHN;
-                }
-        } else {
-                mov     SCB_RESID_DCNT[0],STCNT[0];
-                mov     SCB_RESID_DCNT[1],STCNT[1];
-                mov     SCB_RESID_DCNT[2],STCNT[2];
-                mov     SCB_RESID_SGCNT, SG_COUNT;
-        }
-
-        jmp     ITloop;
-
-data_phase_overrun:
-/*
- * Turn off BITBUCKET mode and notify the host
- */
-        if ((p->features & AHC_ULTRA2) != 0) {
-/*
- * Wait for the target to quit transferring data on the SCSI bus
- */
-                test    SSTAT1, PHASEMIS jz .;
-                call    ultra2_dmafinish;
-        }
-        and     SXFRCTL1, ~BITBUCKET;
-        mvi     INTSTAT,DATA_OVERRUN;
-        jmp     ITloop;
-
-
-
-
-/*
- * Actually turn off the DMA hardware, save our current position into the
- * proper residual variables, wait for the next REQ signal, then jump to
- * the ITloop.  Jumping to the ITloop ensures that if we happen to get
- * brought into the data phase again (or are still in it after our last
- * segment) that we will properly signal an overrun to the kernel.
- */
-        if ((p->features & AHC_ULTRA2) != 0) {
-ultra2_dmafinish:
-                test    DFCNTRL, DIRECTION jnz ultra2_dmahalt;
-                and     DFCNTRL, ~SCSIEN;
-                test    DFCNTRL, SCSIEN jnz .;
-                if ((p->bugs & AHC_BUG_AUTOFLUSH) != 0) {
-                        or      DFCNTRL, FIFOFLUSH;
-                }
-ultra2_dmafifoflush:
-                if ((p->bugs & AHC_BUG_AUTOFLUSH) != 0) {
-                        /*
-                         * hardware bug alert!  This needless set of jumps
-                         * works around a glitch in the silicon.  When the
-                         * PCI DMA fifo goes empty, but there is still SCSI
-                         * data to be flushed into the PCI DMA fifo (and from
-                         * there on into main memory), the FIFOEMP bit will
-                         * come on between the time when the PCI DMA buffer
-                         * went empty and the next bit of data is copied from
-                         * the SCSI fifo into the PCI fifo.  It should only
-                         * come on when both FIFOs (meaning the entire FIFO
-                         * chain) are empty.  Since it can take up to 4 cycles
-                         * for new data to be copied from the SCSI fifo into
-                         * the PCI fifo, testing for FIFOEMP status for 4
-                         * extra times gives the needed time for any
-                         * remaining SCSI fifo data to be put in the PCI fifo
-                         * before we declare it *truly* empty.
-                         */
-                        test    DFSTATUS, FIFOEMP jz ultra2_dmafifoflush;
-                        test    DFSTATUS, FIFOEMP jz ultra2_dmafifoflush;
-                        test    DFSTATUS, FIFOEMP jz ultra2_dmafifoflush;
-                        test    DFSTATUS, FIFOEMP jz ultra2_dmafifoflush;
-                }
-                test    DFSTATUS, FIFOEMP jz ultra2_dmafifoflush;
-                test    DFSTATUS, MREQPEND      jnz .;
-ultra2_dmahalt:
-                and     DFCNTRL, ~(HDMAEN|SCSIEN);
-                test    DFCNTRL, (HDMAEN|SCSIEN) jnz .;
-                ret;
-        }
-
-/*
- * Command phase.  Set up the DMA registers and let 'er rip.
- */
-p_command:
-        call    assert;
-
-/*
- * Load HADDR and HCNT.
- */
-        if ((p->features & AHC_CMD_CHAN) != 0) {
-                bmov    HADDR, SCB_CMDPTR, 5;
-                bmov    HCNT[1], ALLZEROS, 2;
-                if ((p->features & AHC_ULTRA2) == 0) {
-                        bmov    STCNT, HCNT, 3;
-                }
-        } else {
-                mvi     DINDEX, HADDR;
-                mvi     SCB_CMDPTR      call bcopy_5;
-                clr     HCNT[1];
-                clr     HCNT[2];
-                call    set_stcnt_from_hcnt;
-        }
-
-        if ((p->features & AHC_ULTRA2) == 0) {
-                mvi     (SCSIEN|SDMAEN|HDMAEN|DIRECTION|FIFORESET) call dma;
-        } else {
-                mvi     DFCNTRL, (PRELOADEN|SCSIEN|HDMAEN|DIRECTION);
-                test    SSTAT0, SDONE jnz .;
-p_command_dma_loop:
-                test    SSTAT0, SDONE jnz p_command_ultra2_dma_done;
-                test    SSTAT1,PHASEMIS jz p_command_dma_loop;  /* ie. underrun */
-p_command_ultra2_dma_done:
-                test    SCSISIGI, REQI  jz p_command_ultra2_shutdown;
-                test    SSTAT1, (PHASEMIS|REQINIT)      jz p_command_ultra2_dma_done;
-p_command_ultra2_shutdown:
-                and     DFCNTRL, ~(HDMAEN|SCSIEN);
-                test    DFCNTRL, (HDMAEN|SCSIEN) jnz .;
-                or      SXFRCTL0, CLRSTCNT|CLRCHN;
-        }
-        jmp     ITloop;
-
-/*
- * Status phase.  Wait for the data byte to appear, then read it
- * and store it into the SCB.
- */
-p_status:
-        call    assert;
-
-        mov     SCB_TARGET_STATUS, SCSIDATL;
-        jmp     ITloop;
-
-/*
- * Message out phase.  If MSG_OUT is 0x80, build I full indentify message
- * sequence and send it to the target.  In addition, if the MK_MESSAGE bit
- * is set in the SCB_CONTROL byte, interrupt the host and allow it to send
- * it's own message.
- * 
- * If MSG_OUT is == HOST_MSG, also interrupt the host and take a message.
- * This is done to allow the host to send messages outside of an identify
- * sequence while protecting the seqencer from testing the MK_MESSAGE bit
- * on an SCB that might not be for the current nexus. (For example, a
- * BDR message in response to a bad reselection would leave us pointed to
- * an SCB that doesn't have anything to do with the current target).
- * Otherwise, treat MSG_OUT as a 1 byte message to send (abort, abort tag,
- * bus device reset).
- *
- * When there are no messages to send, MSG_OUT should be set to MSG_NOOP,
- * in case the target decides to put us in this phase for some strange
- * reason.
- */
-p_mesgout_retry:
-        or      SCSISIGO,ATNO,LASTPHASE;/* turn on ATN for the retry */
-p_mesgout:
-        mov     SINDEX, MSG_OUT;
-        cmp     SINDEX, MSG_IDENTIFYFLAG jne p_mesgout_from_host;
-p_mesgout_identify:
-        if ((p->features & AHC_WIDE) != 0) {
-                and     SINDEX,0xf,SCB_TCL;     /* lun */
-        } else {
-                and     SINDEX,0x7,SCB_TCL;     /* lun */
-        }
-        and     A,DISCENB,SCB_CONTROL;  /* mask off disconnect privilege */
-        or      SINDEX,A;               /* or in disconnect privilege */
-        or      SINDEX,MSG_IDENTIFYFLAG;
-p_mesgout_mk_message:
-        test    SCB_CONTROL,MK_MESSAGE  jz p_mesgout_tag;
-        mov     SCSIDATL, SINDEX;       /* Send the last byte */
-        jmp     p_mesgout_from_host + 1;/* Skip HOST_MSG test */
-/*
- * Send a tag message if TAG_ENB is set in the SCB control block.
- * Use SCB_TAG (the position in the kernel's SCB array) as the tag value.
- */
-p_mesgout_tag:
-        test    SCB_CONTROL,TAG_ENB jz  p_mesgout_onebyte;
-        mov     SCSIDATL, SINDEX;       /* Send the identify message */
-        call    phase_lock;
-        cmp     LASTPHASE, P_MESGOUT    jne p_mesgout_done;
-        and     SCSIDATL,TAG_ENB|SCB_TAG_TYPE,SCB_CONTROL;
-        call    phase_lock;
-        cmp     LASTPHASE, P_MESGOUT    jne p_mesgout_done;
-        mov     SCB_TAG jmp p_mesgout_onebyte;
-/*
- * Interrupt the driver, and allow it to send a message
- * if it asks.
- */
-p_mesgout_from_host:
-        cmp     SINDEX, HOST_MSG        jne p_mesgout_onebyte;
-        mvi     INTSTAT,AWAITING_MSG;
-        nop;
-        /*
-         * Did the host detect a phase change?
-         */
-        cmp     RETURN_1, MSGOUT_PHASEMIS je p_mesgout_done;
-
-p_mesgout_onebyte:
-        mvi     CLRSINT1, CLRATNO;
-        mov     SCSIDATL, SINDEX;
-
-/*
- * If the next bus phase after ATN drops is a message out, it means
- * that the target is requesting that the last message(s) be resent.
- */
-        call    phase_lock;
-        cmp     LASTPHASE, P_MESGOUT    je p_mesgout_retry;
-
-p_mesgout_done:
-        mvi     CLRSINT1,CLRATNO;       /* Be sure to turn ATNO off */
-        mov     LAST_MSG, MSG_OUT;
-        cmp     MSG_OUT, MSG_IDENTIFYFLAG jne . + 2;
-        and     SCB_CONTROL, ~MK_MESSAGE;
-        mvi     MSG_OUT, MSG_NOOP;      /* No message left */
-        jmp     ITloop;
-
-/*
- * Message in phase.  Bytes are read using Automatic PIO mode.
- */
-p_mesgin:
-        mvi     ACCUM           call inb_first; /* read the 1st message byte */
-
-        test    A,MSG_IDENTIFYFLAG      jnz mesgin_identify;
-        cmp     A,MSG_DISCONNECT        je mesgin_disconnect;
-        cmp     A,MSG_SAVEDATAPOINTER   je mesgin_sdptrs;
-        cmp     ALLZEROS,A              je mesgin_complete;
-        cmp     A,MSG_RESTOREPOINTERS   je mesgin_rdptrs;
-        cmp     A,MSG_EXTENDED          je mesgin_extended;
-        cmp     A,MSG_MESSAGE_REJECT    je mesgin_reject;
-        cmp     A,MSG_NOOP              je mesgin_done;
-        cmp     A,MSG_IGN_WIDE_RESIDUE  je mesgin_wide_residue;
-
-rej_mesgin:
-/*
- * We have no idea what this message in is, so we issue a message reject
- * and hope for the best.  In any case, rejection should be a rare
- * occurrence - signal the driver when it happens.
- */
-        mvi     INTSTAT,SEND_REJECT;            /* let driver know */
-
-        mvi     MSG_MESSAGE_REJECT      call mk_mesg;
-
-mesgin_done:
-        mov     NONE,SCSIDATL;          /*dummy read from latch to ACK*/
-        jmp     ITloop;
-
-
-mesgin_complete:
-/*
- * We got a "command complete" message, so put the SCB_TAG into the QOUTFIFO,
- * and trigger a completion interrupt.  Before doing so, check to see if there
- * is a residual or the status byte is something other than STATUS_GOOD (0).
- * In either of these conditions, we upload the SCB back to the host so it can
- * process this information.  In the case of a non zero status byte, we 
- * additionally interrupt the kernel driver synchronously, allowing it to
- * decide if sense should be retrieved.  If the kernel driver wishes to request
- * sense, it will fill the kernel SCB with a request sense command and set
- * RETURN_1 to SEND_SENSE.  If RETURN_1 is set to SEND_SENSE we redownload
- * the SCB, and process it as the next command by adding it to the waiting list.
- * If the kernel driver does not wish to request sense, it need only clear
- * RETURN_1, and the command is allowed to complete normally.  We don't bother
- * to post to the QOUTFIFO in the error cases since it would require extra
- * work in the kernel driver to ensure that the entry was removed before the
- * command complete code tried processing it.
- */
-
-/*
- * First check for residuals
- */
-        test    SCB_RESID_SGCNT,0xff    jnz upload_scb;
-        test    SCB_TARGET_STATUS,0xff  jz complete;    /* Good Status? */
-upload_scb:
-        mvi     DMAPARAMS, FIFORESET;
-        mov     SCB_TAG         call dma_scb;
-check_status:
-        test    SCB_TARGET_STATUS,0xff  jz complete;    /* Just a residual? */
-        mvi     INTSTAT,BAD_STATUS;                     /* let driver know */
-        nop;
-        cmp     RETURN_1, SEND_SENSE    jne complete;
-        /* This SCB becomes the next to execute as it will retrieve sense */
-        mvi     DMAPARAMS, HDMAEN|DIRECTION|FIFORESET;
-        mov     SCB_TAG         call dma_scb;
-add_to_waiting_list:
-        mov     SCB_NEXT,WAITING_SCBH;
-        mov     WAITING_SCBH, SCBPTR;
-        /*
-         * Prepare our selection hardware before the busfree so we have a
-         * high probability of winning arbitration.
-         */
-        call    start_selection;
-        jmp     await_busfree;
-
-complete:
-        /* If we are untagged, clear our address up in host ram */
-        test    SCB_CONTROL, TAG_ENB jnz complete_post;
-        mov     A, SAVED_TCL;
-        mvi     UNTAGGEDSCB_OFFSET call post_byte_setup;
-        mvi     SCB_LIST_NULL call post_byte;
-
-complete_post:
-        /* Post the SCB and issue an interrupt */
-        if ((p->features & AHC_QUEUE_REGS) != 0) {
-                mov     A, SDSCB_QOFF;
-        } else {
-                mov     A, QOUTPOS;
-        }
-        mvi     QOUTFIFO_OFFSET call post_byte_setup;
-        mov     SCB_TAG call post_byte;
-        if ((p->features & AHC_QUEUE_REGS) == 0) {
-                inc     QOUTPOS;
-        }
-        mvi     INTSTAT,CMDCMPLT;
-
-add_to_free_list:
-        call    add_scb_to_free_list;
-        jmp     await_busfree;
-
-/*
- * Is it an extended message?  Copy the message to our message buffer and
- * notify the host.  The host will tell us whether to reject this message,
- * respond to it with the message that the host placed in our message buffer,
- * or simply to do nothing.
- */
-mesgin_extended:
-        mvi     INTSTAT,EXTENDED_MSG;           /* let driver know */
-        jmp     ITloop;
-
-/*
- * Is it a disconnect message?  Set a flag in the SCB to remind us
- * and await the bus going free.
- */
-mesgin_disconnect:
-        or      SCB_CONTROL,DISCONNECTED;
-        call    add_scb_to_disc_list;
-        jmp     await_busfree;
-
-/*
- * Save data pointers message:
- * Copying RAM values back to SCB, for Save Data Pointers message, but
- * only if we've actually been into a data phase to change them.  This
- * protects against bogus data in scratch ram and the residual counts
- * since they are only initialized when we go into data_in or data_out.
- */
-mesgin_sdptrs:
-        test    SEQ_FLAGS, DPHASE       jz mesgin_done;
-        /*
-         * The SCB SGPTR becomes the next one we'll download,
-         * and the SCB DATAPTR becomes the current SHADDR.
-         * Use the residual number since STCNT is corrupted by
-         * any message transfer.
-         */
-        if ((p->features & AHC_CMD_CHAN) != 0) {
-                bmov    SCB_SGCOUNT, SG_COUNT, 5;
-                bmov    SCB_DATAPTR, SHADDR, 4;
-                bmov    SCB_DATACNT, SCB_RESID_DCNT, 3;
-        } else {
-                mvi     DINDEX, SCB_SGCOUNT;
-                mvi     SG_COUNT        call bcopy_5;
-                mvi     DINDEX, SCB_DATAPTR;
-                mvi     SHADDR          call bcopy_4;
-                mvi     SCB_RESID_DCNT  call    bcopy_3;
-        }
-        jmp     mesgin_done;
-
-/*
- * Restore pointers message?  Data pointers are recopied from the
- * SCB anytime we enter a data phase for the first time, so all
- * we need to do is clear the DPHASE flag and let the data phase
- * code do the rest.
- */
-mesgin_rdptrs:
-        and     SEQ_FLAGS, ~DPHASE;             /*
-                                                 * We'll reload them
-                                                 * the next time through
-                                                 * the dataphase.
-                                                 */
-        jmp     mesgin_done;
-
-/*
- * Identify message?  For a reconnecting target, this tells us the lun
- * that the reconnection is for - find the correct SCB and switch to it,
- * clearing the "disconnected" bit so we don't "find" it by accident later.
- */
-mesgin_identify:
-        
-        if ((p->features & AHC_WIDE) != 0) {
-                and     A,0x0f;         /* lun in lower four bits */
-        } else {
-                and     A,0x07;         /* lun in lower three bits */
-        }
-        or      SAVED_TCL,A;            /* SAVED_TCL should be complete now */
-
-        mvi     ARG_2, SCB_LIST_NULL;   /* SCBID of prev SCB in disc List */
-        call    get_untagged_SCBID;
-        cmp     ARG_1, SCB_LIST_NULL    je snoop_tag;
-        if ((p->flags & AHC_PAGESCBS) != 0) {
-                test    SEQ_FLAGS, SCBPTR_VALID jz use_retrieveSCB;
-        }
-        /*
-         * If the SCB was found in the disconnected list (as is
-         * always the case in non-paging scenarios), SCBPTR is already
-         * set to the correct SCB.  So, simply setup the SCB and get
-         * on with things.
-         */
-        mov     SCBPTR  call rem_scb_from_disc_list;
-        jmp     setup_SCB;
-/*
- * Here we "snoop" the bus looking for a SIMPLE QUEUE TAG message.
- * If we get one, we use the tag returned to find the proper
- * SCB.  With SCB paging, this requires using search for both tagged
- * and non-tagged transactions since the SCB may exist in any slot.
- * If we're not using SCB paging, we can use the tag as the direct
- * index to the SCB.
- */
-snoop_tag:
-        mov     NONE,SCSIDATL;          /* ACK Identify MSG */
-snoop_tag_loop:
-        call    phase_lock;
-        cmp     LASTPHASE, P_MESGIN     jne not_found;
-        cmp     SCSIBUSL,MSG_SIMPLE_Q_TAG jne not_found;
-get_tag:
-        mvi     ARG_1   call inb_next;  /* tag value */
-
-use_retrieveSCB:
-        call    retrieveSCB;
-setup_SCB:
-        mov     A, SAVED_TCL;
-        cmp     SCB_TCL, A      jne not_found_cleanup_scb;
-        test    SCB_CONTROL,DISCONNECTED jz not_found_cleanup_scb;
-        and     SCB_CONTROL,~DISCONNECTED;
-        or      SEQ_FLAGS,IDENTIFY_SEEN;          /* make note of IDENTIFY */
-        /* See if the host wants to send a message upon reconnection */
-        test    SCB_CONTROL, MK_MESSAGE jz mesgin_done;
-        and     SCB_CONTROL, ~MK_MESSAGE;
-        mvi     HOST_MSG        call mk_mesg;
-        jmp     mesgin_done;
-
-not_found_cleanup_scb:
-        test    SCB_CONTROL, DISCONNECTED jz . + 3;
-        call    add_scb_to_disc_list;
-        jmp     not_found;
-        call    add_scb_to_free_list;
-not_found:
-        mvi     INTSTAT, NO_MATCH;
-        mvi     MSG_BUS_DEV_RESET       call mk_mesg;
-        jmp     mesgin_done;
-
-/*
- * Message reject?  Let the kernel driver handle this.  If we have an 
- * outstanding WDTR or SDTR negotiation, assume that it's a response from 
- * the target selecting 8bit or asynchronous transfer, otherwise just ignore 
- * it since we have no clue what it pertains to.
- */
-mesgin_reject:
-        mvi     INTSTAT, REJECT_MSG;
-        jmp     mesgin_done;
-
-/*
- * Wide Residue.  We handle the simple cases, but pass of the one hard case
- * to the kernel (when the residue byte happened to cause us to advance our
- * sg element array, so we know have to back that advance out).
- */
-mesgin_wide_residue:
-        mvi     ARG_1   call inb_next; /* ACK the wide_residue and get */
-                                       /* the size byte */
-/*
- * In order for this to be reliable, we have to do all sorts of horrible
- * magic in terms of resetting the datafifo and reloading the shadow layer
- * with the correct new values (so that a subsequent save data pointers
- * message will do the right thing).  We let the kernel do that work.
- */
-        mvi     INTSTAT, WIDE_RESIDUE;
-        jmp     mesgin_done;
-        
-/*
- * [ ADD MORE MESSAGE HANDLING HERE ]
- */
-
-/*
- * Locking the driver out, build a one-byte message passed in SINDEX
- * if there is no active message already.  SINDEX is returned intact.
- */
-mk_mesg:
-        or      SCSISIGO,ATNO,LASTPHASE;/* turn on ATNO */
-        mov     MSG_OUT,SINDEX ret;
-
-/*
- * Functions to read data in Automatic PIO mode.
- *
- * According to Adaptec's documentation, an ACK is not sent on input from
- * the target until SCSIDATL is read from.  So we wait until SCSIDATL is
- * latched (the usual way), then read the data byte directly off the bus
- * using SCSIBUSL.  When we have pulled the ATN line, or we just want to
- * acknowledge the byte, then we do a dummy read from SCISDATL.  The SCSI
- * spec guarantees that the target will hold the data byte on the bus until
- * we send our ACK.
- *
- * The assumption here is that these are called in a particular sequence,
- * and that REQ is already set when inb_first is called.  inb_{first,next}
- * use the same calling convention as inb.
- */
-
-inb_next:
-        mov     NONE,SCSIDATL;          /*dummy read from latch to ACK*/
-inb_next_wait:
-        /*
-         * If there is a parity error, wait for the kernel to
-         * see the interrupt and prepare our message response
-         * before continuing.
-         */
-        test    SSTAT1, REQINIT jz inb_next_wait;
-        test    SSTAT1, SCSIPERR jnz .;
-        and     LASTPHASE, PHASE_MASK, SCSISIGI;
-        cmp     LASTPHASE, P_MESGIN jne mesgin_phasemis;
-inb_first:
-        mov     DINDEX,SINDEX;
-        mov     DINDIR,SCSIBUSL ret;            /*read byte directly from bus*/
-inb_last:
-        mov     NONE,SCSIDATL ret;              /*dummy read from latch to ACK*/
-
-        
-mesgin_phasemis:
-/*
- * We expected to receive another byte, but the target changed phase
- */
-        mvi     INTSTAT, MSGIN_PHASEMIS;
-        jmp     ITloop;
-
-/*
- * DMA data transfer.  HADDR and HCNT must be loaded first, and
- * SINDEX should contain the value to load DFCNTRL with - 0x3d for
- * host->scsi, or 0x39 for scsi->host.  The SCSI channel is cleared
- * during initialization.
- */
-if ((p->features & AHC_ULTRA2) == 0) {
-dma:
-        mov     DFCNTRL,SINDEX;
-dma_loop:
-        test    SSTAT0,DMADONE  jnz dma_dmadone;
-        test    SSTAT1,PHASEMIS jz dma_loop;    /* ie. underrun */
-dma_phasemis:
-        test    SSTAT0,SDONE    jnz dma_checkfifo;
-        mov     SINDEX,ALLZEROS;                /* Notify caller of phasemiss */
-
-/*
- * We will be "done" DMAing when the transfer count goes to zero, or
- * the target changes the phase (in light of this, it makes sense that
- * the DMA circuitry doesn't ACK when PHASEMIS is active).  If we are
- * doing a SCSI->Host transfer, the data FIFO should be flushed auto-
- * magically on STCNT=0 or a phase change, so just wait for FIFO empty
- * status.
- */
-dma_checkfifo:
-        test    DFCNTRL,DIRECTION       jnz dma_fifoempty;
-dma_fifoflush:
-        test    DFSTATUS,FIFOEMP        jz dma_fifoflush;
-
-dma_fifoempty:
-        /* Don't clobber an inprogress host data transfer */
-        test    DFSTATUS, MREQPEND      jnz dma_fifoempty;
-/*
- * Now shut the DMA enables off and make sure that the DMA enables are 
- * actually off first lest we get an ILLSADDR.
- */
-dma_dmadone:
-        cmp     LASTPHASE, P_COMMAND    je dma_await_nreq;
-        test    SCSIRATE, 0x0f  jnz dma_shutdown;
-dma_await_nreq:
-        test    SCSISIGI, REQI  jz dma_shutdown;
-        test    SSTAT1, (PHASEMIS|REQINIT)      jz dma_await_nreq;
-dma_shutdown:
-        and     DFCNTRL, ~(SCSIEN|SDMAEN|HDMAEN);
-dma_halt:
-        /*
-         * Some revisions of the aic7880 have a problem where, if the
-         * data fifo is full, but the PCI input latch is not empty, 
-         * HDMAEN cannot be cleared.  The fix used here is to attempt
-         * to drain the data fifo until there is space for the input
-         * latch to drain and HDMAEN de-asserts.
-         */
-        if ((p->bugs & AHC_BUG_PCI_2_1_RETRY) != 0) {
-                mov     NONE, DFDAT;
-        }
-        test    DFCNTRL, (SCSIEN|SDMAEN|HDMAEN) jnz dma_halt;
-}
-return:
-        ret;
-
-/*
- * Assert that if we've been reselected, then we've seen an IDENTIFY
- * message.
- */
-assert:
-        test    SEQ_FLAGS,IDENTIFY_SEEN jnz return;     /* seen IDENTIFY? */
-
-        mvi     INTSTAT,NO_IDENT        ret;    /* no - tell the kernel */
-
-/*
- * Locate a disconnected SCB either by SAVED_TCL (ARG_1 is SCB_LIST_NULL)
- * or by the SCBID ARG_1.  The search begins at the SCB index passed in
- * via SINDEX which is an SCB that must be on the disconnected list.  If
- * the SCB cannot be found, SINDEX will be SCB_LIST_NULL, otherwise, SCBPTR
- * is set to the proper SCB.
- */
-findSCB:
-        mov     SCBPTR,SINDEX;                  /* Initialize SCBPTR */
-        cmp     ARG_1, SCB_LIST_NULL    jne findSCB_by_SCBID;
-        mov     A, SAVED_TCL;
-        mvi     SCB_TCL jmp findSCB_loop;       /* &SCB_TCL -> SINDEX */
-findSCB_by_SCBID:
-        mov     A, ARG_1;                       /* Tag passed in ARG_1 */
-        mvi     SCB_TAG jmp findSCB_loop;       /* &SCB_TAG -> SINDEX */
-findSCB_next:
-        mov     ARG_2, SCBPTR;
-        cmp     SCB_NEXT, SCB_LIST_NULL je notFound;
-        mov     SCBPTR,SCB_NEXT;
-        dec     SINDEX;         /* Last comparison moved us too far */
-findSCB_loop:
-        cmp     SINDIR, A       jne findSCB_next;
-        mov     SINDEX, SCBPTR  ret;
-notFound:
-        mvi     SINDEX, SCB_LIST_NULL   ret;
-
-/*
- * Retrieve an SCB by SCBID first searching the disconnected list falling
- * back to DMA'ing the SCB down from the host.  This routine assumes that
- * ARG_1 is the SCBID of interest and that SINDEX is the position in the
- * disconnected list to start the search from.  If SINDEX is SCB_LIST_NULL,
- * we go directly to the host for the SCB.
- */
-retrieveSCB:
-        test    SEQ_FLAGS, SCBPTR_VALID jz retrieve_from_host;
-        mov     SCBPTR  call findSCB;   /* Continue the search */
-        cmp     SINDEX, SCB_LIST_NULL   je retrieve_from_host;
-
-/*
- * This routine expects SINDEX to contain the index of the SCB to be
- * removed, SCBPTR to be pointing to that SCB, and ARG_2 to be the
- * SCBID of the SCB just previous to this one in the list or SCB_LIST_NULL
- * if it is at the head.
- */
-rem_scb_from_disc_list:
-/* Remove this SCB from the disconnection list */
-        cmp     ARG_2, SCB_LIST_NULL    je rHead;
-        mov     DINDEX, SCB_NEXT;
-        mov     SCBPTR, ARG_2;
-        mov     SCB_NEXT, DINDEX;
-        mov     SCBPTR, SINDEX ret;
-rHead:
-        mov     DISCONNECTED_SCBH,SCB_NEXT ret;
-
-retrieve_from_host:
-/*
- * We didn't find it.  Pull an SCB and DMA down the one we want.
- * We should never get here in the non-paging case.
- */
-        mov     ALLZEROS        call    get_free_or_disc_scb;
-        mvi     DMAPARAMS, HDMAEN|DIRECTION|FIFORESET;
-        /* Jump instead of call as we want to return anyway */
-        mov     ARG_1   jmp dma_scb;
-
-/*
- * Determine whether a target is using tagged or non-tagged transactions
- * by first looking for a matching transaction based on the TCL and if
- * that fails, looking up this device in the host's untagged SCB array.
- * The TCL to search for is assumed to be in SAVED_TCL.  The value is
- * returned in ARG_1 (SCB_LIST_NULL for tagged, SCBID for non-tagged).
- * The SCBPTR_VALID bit is set in SEQ_FLAGS if we found the information
- * in an SCB instead of having to go to the host.
- */
-get_untagged_SCBID:
-        cmp     DISCONNECTED_SCBH, SCB_LIST_NULL je get_SCBID_from_host;
-        mvi     ARG_1, SCB_LIST_NULL;
-        mov     DISCONNECTED_SCBH call findSCB;
-        cmp     SINDEX, SCB_LIST_NULL   je get_SCBID_from_host;
-        or      SEQ_FLAGS, SCBPTR_VALID;/* Was in disconnected list */
-        test    SCB_CONTROL, TAG_ENB    jnz . + 2;
-        mov     ARG_1, SCB_TAG  ret;
-        mvi     ARG_1, SCB_LIST_NULL ret;
-
-/*
- * Fetch a byte from host memory given an index of (A + (256 * SINDEX))
- * and a base address of SCBID_ADDR.  The byte is returned in RETURN_2.
- */
-fetch_byte:
-        mov     ARG_2, SINDEX;
-        if ((p->features & AHC_CMD_CHAN) != 0) {
-                mvi     DINDEX, CCHADDR;
-                mvi     SCBID_ADDR call set_1byte_addr;
-                mvi     CCHCNT, 1;
-                mvi     CCSGCTL, CCSGEN|CCSGRESET;
-                test    CCSGCTL, CCSGDONE jz .;
-                mvi     CCSGCTL, CCSGRESET;
-                bmov    RETURN_2, CCSGRAM, 1 ret;
-        } else {
-                mvi     DINDEX, HADDR;
-                mvi     SCBID_ADDR call set_1byte_addr;
-                mvi     HCNT[0], 1;
-                clr     HCNT[1];
-                clr     HCNT[2];
-                mvi     DFCNTRL, HDMAEN|DIRECTION|FIFORESET;
-                call    dma_finish;
-                mov     RETURN_2, DFDAT ret;
-        }
-
-/*
- * Prepare the hardware to post a byte to host memory given an
- * index of (A + (256 * SINDEX)) and a base address of SCBID_ADDR.
- */
-post_byte_setup:
-        mov     ARG_2, SINDEX;
-        if ((p->features & AHC_CMD_CHAN) != 0) {
-                mvi     DINDEX, CCHADDR;
-                mvi     SCBID_ADDR call set_1byte_addr;
-                mvi     CCHCNT, 1;
-                mvi     CCSCBCTL, CCSCBRESET ret;
-        } else {
-                mvi     DINDEX, HADDR;
-                mvi     SCBID_ADDR call set_1byte_addr;
-                mvi     HCNT[0], 1;
-                clr     HCNT[1];
-                clr     HCNT[2];
-                mvi     DFCNTRL, FIFORESET ret;
-        }
-
-post_byte:
-        if ((p->features & AHC_CMD_CHAN) != 0) {
-                bmov    CCSCBRAM, SINDEX, 1;
-                or      CCSCBCTL, CCSCBEN|CCSCBRESET;
-                test    CCSCBCTL, CCSCBDONE jz .;
-                clr     CCSCBCTL ret;
-        } else {
-                mov     DFDAT, SINDEX;
-                or      DFCNTRL, HDMAEN|FIFOFLUSH;
-                jmp     dma_finish;
-        }
-
-get_SCBID_from_host:
-        mov     A, SAVED_TCL;
-        mvi     UNTAGGEDSCB_OFFSET call fetch_byte;
-        mov     RETURN_1,  RETURN_2 ret;
-
-phase_lock:     
-        test    SSTAT1, REQINIT jz phase_lock;
-        test    SSTAT1, SCSIPERR jnz phase_lock;
-        and     SCSISIGO, PHASE_MASK, SCSISIGI;
-        and     LASTPHASE, PHASE_MASK, SCSISIGI ret;
-
-if ((p->features & AHC_CMD_CHAN) == 0) {
-set_stcnt_from_hcnt:
-        mov     STCNT[0], HCNT[0];
-        mov     STCNT[1], HCNT[1];
-        mov     STCNT[2], HCNT[2] ret;
-
-bcopy_7:
-        mov     DINDIR, SINDIR;
-        mov     DINDIR, SINDIR;
-bcopy_5:
-        mov     DINDIR, SINDIR;
-bcopy_4:
-        mov     DINDIR, SINDIR;
-bcopy_3:
-        mov     DINDIR, SINDIR;
-        mov     DINDIR, SINDIR;
-        mov     DINDIR, SINDIR ret;
-}
-
-/*
- * Setup addr assuming that A is an index into
- * an array of 32byte objects, SINDEX contains
- * the base address of that array, and DINDEX
- * contains the base address of the location
- * to store the indexed address.
- */
-set_32byte_addr:
-        shr     ARG_2, 3, A;
-        shl     A, 5;
-/*
- * Setup addr assuming that A + (ARG_1 * 256) is an
- * index into an array of 1byte objects, SINDEX contains
- * the base address of that array, and DINDEX contains
- * the base address of the location to store the computed
- * address.
- */
-set_1byte_addr:
-        add     DINDIR, A, SINDIR;
-        mov     A, ARG_2;
-        adc     DINDIR, A, SINDIR;
-        clr     A;
-        adc     DINDIR, A, SINDIR;
-        adc     DINDIR, A, SINDIR ret;
-
-/*
- * Either post or fetch and SCB from host memory based on the
- * DIRECTION bit in DMAPARAMS. The host SCB index is in SINDEX.
- */
-dma_scb:
-        mov     A, SINDEX;
-        if ((p->features & AHC_CMD_CHAN) != 0) {
-                mvi     DINDEX, CCHADDR;
-                mvi     HSCB_ADDR call set_32byte_addr;
-                mov     CCSCBPTR, SCBPTR;
-                mvi     CCHCNT, 32;
-                test    DMAPARAMS, DIRECTION jz dma_scb_tohost;
-                mvi     CCSCBCTL, CCARREN|CCSCBEN|CCSCBDIR|CCSCBRESET;
-                cmp     CCSCBCTL, CCSCBDONE|ARRDONE|CCARREN|CCSCBEN|CCSCBDIR jne .;
-                jmp     dma_scb_finish;
-dma_scb_tohost:
-                if ((p->features & AHC_ULTRA2) == 0) {
-                        mvi     CCSCBCTL, CCSCBRESET;
-                        bmov    CCSCBRAM, SCB_CONTROL, 32;
-                        or      CCSCBCTL, CCSCBEN|CCSCBRESET;
-                        test    CCSCBCTL, CCSCBDONE jz .;
-                }
-                if ((p->features & AHC_ULTRA2) != 0) {
-                        if ((p->bugs & AHC_BUG_SCBCHAN_UPLOAD) != 0) {
-                                mvi     CCSCBCTL, CCARREN|CCSCBRESET;
-                                cmp     CCSCBCTL, ARRDONE|CCARREN jne .;
-                                mvi     CCHCNT, 32;
-                                mvi     CCSCBCTL, CCSCBEN|CCSCBRESET;
-                                cmp     CCSCBCTL, CCSCBDONE|CCSCBEN jne .;
-                        } else {
-                                mvi     CCSCBCTL, CCARREN|CCSCBEN|CCSCBRESET;
-                                cmp     CCSCBCTL, CCSCBDONE|ARRDONE|CCARREN|CCSCBEN jne .;
-                        }
-                }
-dma_scb_finish:
-                clr     CCSCBCTL;
-                test    CCSCBCTL, CCARREN|CCSCBEN jnz .;
-                ret;
-        }
-        if ((p->features & AHC_CMD_CHAN) == 0) {
-                mvi     DINDEX, HADDR;
-                mvi     HSCB_ADDR call set_32byte_addr;
-                mvi     HCNT[0], 32;
-                clr     HCNT[1];
-                clr     HCNT[2];
-                mov     DFCNTRL, DMAPARAMS;
-                test    DMAPARAMS, DIRECTION    jnz dma_scb_fromhost;
-                /* Fill it with the SCB data */
-copy_scb_tofifo:
-                mvi     SINDEX, SCB_CONTROL;
-                add     A, 32, SINDEX;
-copy_scb_tofifo_loop:
-                mov     DFDAT,SINDIR;
-                mov     DFDAT,SINDIR;
-                mov     DFDAT,SINDIR;
-                mov     DFDAT,SINDIR;
-                mov     DFDAT,SINDIR;
-                mov     DFDAT,SINDIR;
-                mov     DFDAT,SINDIR;
-                mov     DFDAT,SINDIR;
-                cmp     SINDEX, A jne copy_scb_tofifo_loop;
-                or      DFCNTRL, HDMAEN|FIFOFLUSH;
-                jmp     dma_finish;
-dma_scb_fromhost:
-                mvi     DINDEX, SCB_CONTROL;
-                if ((p->bugs & AHC_BUG_PCI_2_1_RETRY) != 0) {
-                        /*
-                         * Set the A to -24.  It it hits 0, then we let
-                         * our code fall through to dfdat_in_8 to complete
-                         * the last of the copy.
-                         *
-                         * Also, things happen 8 bytes at a time in this
-                         * case, so we may need to drain the fifo at most
-                         * 3 times to keep things flowing
-                         */
-                        mvi     A, -24;
-dma_scb_hang_fifo:
-                        /* Wait for the first bit of data to hit the fifo */
-                        test    DFSTATUS, FIFOEMP jnz .;
-dma_scb_hang_wait:
-                        /* OK, now they've started to transfer into the fifo,
-                         * so wait for them to stop trying to transfer any
-                         * more data.
-                         */
-                        test    DFSTATUS, MREQPEND jnz .;
-                        /*
-                         * OK, they started, then they stopped, now see if they
-                         * managed to complete the job before stopping.  Try
-                         * it multiple times to give the chip a few cycles to
-                         * set the flag if it did complete.
-                         */
-                        test    DFSTATUS, HDONE jnz dma_scb_hang_dma_done;
-                        test    DFSTATUS, HDONE jnz dma_scb_hang_dma_done;
-                        test    DFSTATUS, HDONE jnz dma_scb_hang_dma_done;
-                        /*
-                         * Too bad, the chip didn't complete the DMA, but there
-                         * aren't any more memory requests pending, so that
-                         * means it stopped part way through and hung.  That's
-                         * our bug, so now we drain what data there is in the
-                         * fifo in order to get things going again.
-                         */
-dma_scb_hang_empty_fifo:
-                        call    dfdat_in_8;
-                        add     A, 8;
-                        add     SINDEX, A, HCNT;
-                        /*
-                         * If there are another 8 bytes of data waiting in the
-                         * fifo, then the carry bit will be set as a result
-                         * of the above add command (unless A is non-negative,
-                         * in which case the carry bit won't be set).
-                         */
-                        jc      dma_scb_hang_empty_fifo;
-                        /*
-                         * We've emptied the fifo now, but we wouldn't have got
-                         * here if the memory transfer hadn't stopped part way
-                         * through, so go back up to the beginning of the
-                         * loop and start over.  When it succeeds in getting
-                         * all the data down, HDONE will be set and we'll
-                         * jump to the code just below here.
-                         */
-                        jmp     dma_scb_hang_fifo;
-dma_scb_hang_dma_done:
-                        and     DFCNTRL, ~HDMAEN;
-                        test    DFCNTRL, HDMAEN jnz .;
-                        call    dfdat_in_8;
-                        add     A, 8;
-                        cmp     A, 8 jne . - 2;
-                        ret;
-                } else {
-                        call    dma_finish;
-                        call    dfdat_in_8;
-                        call    dfdat_in_8;
-                        call    dfdat_in_8;
-                }
-dfdat_in_8:
-                mov     DINDIR,DFDAT;
-dfdat_in_7:
-                mov     DINDIR,DFDAT;
-                mov     DINDIR,DFDAT;
-                mov     DINDIR,DFDAT;
-                mov     DINDIR,DFDAT;
-                mov     DINDIR,DFDAT;
-                mov     DINDIR,DFDAT;
-                mov     DINDIR,DFDAT ret;
-        }
-
-
-/*
- * Wait for DMA from host memory to data FIFO to complete, then disable
- * DMA and wait for it to acknowledge that it's off.
- */
-if ((p->features & AHC_CMD_CHAN) == 0) {
-dma_finish:
-        test    DFSTATUS,HDONE  jz dma_finish;
-        /* Turn off DMA */
-        and     DFCNTRL, ~HDMAEN;
-        test    DFCNTRL, HDMAEN jnz .;
-        ret;
-}
-
-add_scb_to_free_list:
-        if ((p->flags & AHC_PAGESCBS) != 0) {
-                mov     SCB_NEXT, FREE_SCBH;
-                mov     FREE_SCBH, SCBPTR;
-        }
-        mvi     SCB_TAG, SCB_LIST_NULL ret;
-
-if ((p->flags & AHC_PAGESCBS) != 0) {
-get_free_or_disc_scb:
-        cmp     FREE_SCBH, SCB_LIST_NULL jne dequeue_free_scb;
-        cmp     DISCONNECTED_SCBH, SCB_LIST_NULL jne dequeue_disc_scb;
-return_error:
-        mvi     SINDEX, SCB_LIST_NULL   ret;
-dequeue_disc_scb:
-        mov     SCBPTR, DISCONNECTED_SCBH;
-dma_up_scb:
-        mvi     DMAPARAMS, FIFORESET;
-        mov     SCB_TAG         call dma_scb;
-unlink_disc_scb:
-        mov     DISCONNECTED_SCBH, SCB_NEXT ret;
-dequeue_free_scb:
-        mov     SCBPTR, FREE_SCBH;
-        mov     FREE_SCBH, SCB_NEXT ret;
-}
-
-add_scb_to_disc_list:
-/*
- * Link this SCB into the DISCONNECTED list.  This list holds the
- * candidates for paging out an SCB if one is needed for a new command.
- * Modifying the disconnected list is a critical(pause dissabled) section.
- */
-        mov     SCB_NEXT, DISCONNECTED_SCBH;
-        mov     DISCONNECTED_SCBH, SCBPTR ret;
diff --git a/drivers/scsi/aic7xxx_old/aic7xxx_proc.c b/drivers/scsi/aic7xxx_old/aic7xxx_proc.c
deleted file mode 100644
index 976f45ccf2cf..000000000000
--- a/drivers/scsi/aic7xxx_old/aic7xxx_proc.c
+++ /dev/null
@@ -1,270 +0,0 @@
-/*+M*************************************************************************
- * Adaptec AIC7xxx device driver proc support for Linux.
- *
- * Copyright (c) 1995, 1996 Dean W. Gehnert
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2, or (at your option)
- * any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; see the file COPYING.  If not, write to
- * the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
- *
- * ----------------------------------------------------------------
- *  o Modified from the EATA-DMA /proc support.
- *  o Additional support for device block statistics provided by
- *    Matthew Jacob.
- *  o Correction of overflow by Heinz Mauelshagen
- *  o Adittional corrections by Doug Ledford
- *
- *  Dean W. Gehnert, deang@teleport.com, 05/01/96
- *
- *  $Id: aic7xxx_proc.c,v 4.1 1997/06/97 08:23:42 deang Exp $
- *-M*************************************************************************/
-
-
-#define HDRB \
-"               0 - 4K   4 - 16K   16 - 64K  64 - 256K  256K - 1M        1M+"
-
-
-/*+F*************************************************************************
- * Function:
- *   aic7xxx_show_info
- *
- * Description:
- *   Return information to handle /proc support for the driver.
- *-F*************************************************************************/
-int
-aic7xxx_show_info(struct seq_file *m, struct Scsi_Host *HBAptr)
-{
-  struct aic7xxx_host *p;
-  struct aic_dev_data *aic_dev;
-  struct scsi_device *sdptr;
-  unsigned char i;
-  unsigned char tindex;
-
-  for(p=first_aic7xxx; p && p->host != HBAptr; p=p->next)
-    ;
-
-  if (!p)
-  {
-    seq_printf(m, "Can't find adapter for host number %d\n", HBAptr->host_no);
-    return 0;
-  }
-
-  p = (struct aic7xxx_host *) HBAptr->hostdata;
-
-  seq_printf(m, "Adaptec AIC7xxx driver version: ");
-  seq_printf(m, "%s/", AIC7XXX_C_VERSION);
-  seq_printf(m, "%s", AIC7XXX_H_VERSION);
-  seq_printf(m, "\n");
-  seq_printf(m, "Adapter Configuration:\n");
-  seq_printf(m, "           SCSI Adapter: %s\n",
-      board_names[p->board_name_index]);
-  if (p->flags & AHC_TWIN)
-    seq_printf(m, "                         Twin Channel Controller ");
-  else
-  {
-    char *channel = "";
-    char *ultra = "";
-    char *wide = "Narrow ";
-    if (p->flags & AHC_MULTI_CHANNEL)
-    {
-      channel = " Channel A";
-      if (p->flags & (AHC_CHNLB|AHC_CHNLC))
-        channel = (p->flags & AHC_CHNLB) ? " Channel B" : " Channel C";
-    }
-    if (p->features & AHC_WIDE)
-      wide = "Wide ";
-    if (p->features & AHC_ULTRA3)
-    {
-      switch(p->chip & AHC_CHIPID_MASK)
-      {
-        case AHC_AIC7892:
-        case AHC_AIC7899:
-          ultra = "Ultra-160/m LVD/SE ";
-          break;
-        default:
-          ultra = "Ultra-3 LVD/SE ";
-          break;
-      }
-    }
-    else if (p->features & AHC_ULTRA2)
-      ultra = "Ultra-2 LVD/SE ";
-    else if (p->features & AHC_ULTRA)
-      ultra = "Ultra ";
-    seq_printf(m, "                           %s%sController%s ",
-      ultra, wide, channel);
-  }
-  switch(p->chip & ~AHC_CHIPID_MASK)
-  {
-    case AHC_VL:
-      seq_printf(m, "at VLB slot %d\n", p->pci_device_fn);
-      break;
-    case AHC_EISA:
-      seq_printf(m, "at EISA slot %d\n", p->pci_device_fn);
-      break;
-    default:
-      seq_printf(m, "at PCI %d/%d/%d\n", p->pci_bus,
-        PCI_SLOT(p->pci_device_fn), PCI_FUNC(p->pci_device_fn));
-      break;
-  }
-  if( !(p->maddr) )
-  {
-    seq_printf(m, "    Programmed I/O Base: %lx\n", p->base);
-  }
-  else
-  {
-    seq_printf(m, "    PCI MMAPed I/O Base: 0x%lx\n", p->mbase);
-  }
-  if( (p->chip & (AHC_VL | AHC_EISA)) )
-  {
-    seq_printf(m, "    BIOS Memory Address: 0x%08x\n", p->bios_address);
-  }
-  seq_printf(m, " Adapter SEEPROM Config: %s\n",
-          (p->flags & AHC_SEEPROM_FOUND) ? "SEEPROM found and used." :
-         ((p->flags & AHC_USEDEFAULTS) ? "SEEPROM not found, using defaults." :
-           "SEEPROM not found, using leftover BIOS values.") );
-  seq_printf(m, "      Adaptec SCSI BIOS: %s\n",
-          (p->flags & AHC_BIOS_ENABLED) ? "Enabled" : "Disabled");
-  seq_printf(m, "                    IRQ: %d\n", HBAptr->irq);
-  seq_printf(m, "                   SCBs: Active %d, Max Active %d,\n",
-            p->activescbs, p->max_activescbs);
-  seq_printf(m, "                         Allocated %d, HW %d, "
-            "Page %d\n", p->scb_data->numscbs, p->scb_data->maxhscbs,
-            p->scb_data->maxscbs);
-  if (p->flags & AHC_EXTERNAL_SRAM)
-    seq_printf(m, "                         Using External SCB SRAM\n");
-  seq_printf(m, "             Interrupts: %ld", p->isr_count);
-  if (p->chip & AHC_EISA)
-  {
-    seq_printf(m, " %s\n",
-        (p->pause & IRQMS) ? "(Level Sensitive)" : "(Edge Triggered)");
-  }
-  else
-  {
-    seq_printf(m, "\n");
-  }
-  seq_printf(m, "      BIOS Control Word: 0x%04x\n",
-            p->bios_control);
-  seq_printf(m, "   Adapter Control Word: 0x%04x\n",
-            p->adapter_control);
-  seq_printf(m, "   Extended Translation: %sabled\n",
-      (p->flags & AHC_EXTEND_TRANS_A) ? "En" : "Dis");
-  seq_printf(m, "Disconnect Enable Flags: 0x%04x\n", p->discenable);
-  if (p->features & (AHC_ULTRA | AHC_ULTRA2))
-  {
-    seq_printf(m, "     Ultra Enable Flags: 0x%04x\n", p->ultraenb);
-  }
-  seq_printf(m, "Default Tag Queue Depth: %d\n", aic7xxx_default_queue_depth);
-  seq_printf(m, "    Tagged Queue By Device array for aic7xxx host "
-                       "instance %d:\n", p->instance);
-  seq_printf(m, "      {");
-  for(i=0; i < (MAX_TARGETS - 1); i++)
-    seq_printf(m, "%d,",aic7xxx_tag_info[p->instance].tag_commands[i]);
-  seq_printf(m, "%d}\n",aic7xxx_tag_info[p->instance].tag_commands[i]);
-
-  seq_printf(m, "\n");
-  seq_printf(m, "Statistics:\n\n");
-  list_for_each_entry(aic_dev, &p->aic_devs, list)
-  {
-    sdptr = aic_dev->SDptr;
-    tindex = sdptr->channel << 3 | sdptr->id;
-    seq_printf(m, "(scsi%d:%d:%d:%d)\n",
-        p->host_no, sdptr->channel, sdptr->id, sdptr->lun);
-    seq_printf(m, "  Device using %s/%s",
-          (aic_dev->cur.width == MSG_EXT_WDTR_BUS_16_BIT) ?
-          "Wide" : "Narrow",
-          (aic_dev->cur.offset != 0) ?
-          "Sync transfers at " : "Async transfers.\n" );
-    if (aic_dev->cur.offset != 0)
-    {
-      struct aic7xxx_syncrate *sync_rate;
-      unsigned char options = aic_dev->cur.options;
-      int period = aic_dev->cur.period;
-      int rate = (aic_dev->cur.width ==
-                  MSG_EXT_WDTR_BUS_16_BIT) ? 1 : 0;
-
-      sync_rate = aic7xxx_find_syncrate(p, &period, 0, &options);
-      if (sync_rate != NULL)
-      {
-        seq_printf(m, "%s MByte/sec, offset %d\n",
-                        sync_rate->rate[rate],
-                        aic_dev->cur.offset );
-      }
-      else
-      {
-        seq_printf(m, "3.3 MByte/sec, offset %d\n",
-                        aic_dev->cur.offset );
-      }
-    }
-    seq_printf(m, "  Transinfo settings: ");
-    seq_printf(m, "current(%d/%d/%d/%d), ",
-                    aic_dev->cur.period,
-                    aic_dev->cur.offset,
-                    aic_dev->cur.width,
-                    aic_dev->cur.options);
-    seq_printf(m, "goal(%d/%d/%d/%d), ",
-                    aic_dev->goal.period,
-                    aic_dev->goal.offset,
-                    aic_dev->goal.width,
-                    aic_dev->goal.options);
-    seq_printf(m, "user(%d/%d/%d/%d)\n",
-                    p->user[tindex].period,
-                    p->user[tindex].offset,
-                    p->user[tindex].width,
-                    p->user[tindex].options);
-    if(sdptr->simple_tags)
-    {
-      seq_printf(m, "  Tagged Command Queueing Enabled, Ordered Tags %s, Depth %d/%d\n", sdptr->ordered_tags ? "Enabled" : "Disabled", sdptr->queue_depth, aic_dev->max_q_depth);
-    }
-    if(aic_dev->barrier_total)
-      seq_printf(m, "  Total transfers %ld:\n    (%ld/%ld/%ld/%ld reads/writes/REQ_BARRIER/Ordered Tags)\n",
-        aic_dev->r_total+aic_dev->w_total, aic_dev->r_total, aic_dev->w_total,
-        aic_dev->barrier_total, aic_dev->ordered_total);
-    else
-      seq_printf(m, "  Total transfers %ld:\n    (%ld/%ld reads/writes)\n",
-        aic_dev->r_total+aic_dev->w_total, aic_dev->r_total, aic_dev->w_total);
-    seq_printf(m, "%s\n", HDRB);
-    seq_printf(m, "   Reads:");
-    for (i = 0; i < ARRAY_SIZE(aic_dev->r_bins); i++)
-    {
-      seq_printf(m, " %10ld", aic_dev->r_bins[i]);
-    }
-    seq_printf(m, "\n");
-    seq_printf(m, "  Writes:");
-    for (i = 0; i < ARRAY_SIZE(aic_dev->w_bins); i++)
-    {
-      seq_printf(m, " %10ld", aic_dev->w_bins[i]);
-    }
-    seq_printf(m, "\n");
-    seq_printf(m, "\n\n");
-  }
-  return 0;
-}
-
-/*
- * Overrides for Emacs so that we follow Linus's tabbing style.
- * Emacs will notice this stuff at the end of the file and automatically
- * adjust the settings for this buffer only.  This must remain at the end
- * of the file.
- * ---------------------------------------------------------------------------
- * Local variables:
- * c-indent-level: 2
- * c-brace-imaginary-offset: 0
- * c-brace-offset: -2
- * c-argdecl-indent: 2
- * c-label-offset: -2
- * c-continued-statement-offset: 2
- * c-continued-brace-offset: 0
- * indent-tabs-mode: nil
- * tab-width: 8
- * End:
- */
diff --git a/drivers/scsi/aic7xxx_old/aic7xxx_reg.h b/drivers/scsi/aic7xxx_old/aic7xxx_reg.h
deleted file mode 100644
index 27f2334abc71..000000000000
--- a/drivers/scsi/aic7xxx_old/aic7xxx_reg.h
+++ /dev/null
@@ -1,629 +0,0 @@
-/*
-  * DO NOT EDIT - This file is automatically generated.
-  */
-
-#define SCSISEQ                         0x00
-#define         TEMODE                  0x80
-#define         ENSELO                  0x40
-#define         ENSELI                  0x20
-#define         ENRSELI                 0x10
-#define         ENAUTOATNO              0x08
-#define         ENAUTOATNI              0x04
-#define         ENAUTOATNP              0x02
-#define         SCSIRSTO                0x01
-
-#define SXFRCTL0                        0x01
-#define         DFON                    0x80
-#define         DFPEXP                  0x40
-#define         FAST20                  0x20
-#define         CLRSTCNT                0x10
-#define         SPIOEN                  0x08
-#define         SCAMEN                  0x04
-#define         CLRCHN                  0x02
-
-#define SXFRCTL1                        0x02
-#define         BITBUCKET               0x80
-#define         SWRAPEN                 0x40
-#define         ENSPCHK                 0x20
-#define         STIMESEL                0x18
-#define         ENSTIMER                0x04
-#define         ACTNEGEN                0x02
-#define         STPWEN                  0x01
-
-#define SCSISIGO                        0x03
-#define         CDO                     0x80
-#define         IOO                     0x40
-#define         MSGO                    0x20
-#define         ATNO                    0x10
-#define         SELO                    0x08
-#define         BSYO                    0x04
-#define         REQO                    0x02
-#define         ACKO                    0x01
-
-#define SCSISIGI                        0x03
-#define         ATNI                    0x10
-#define         SELI                    0x08
-#define         BSYI                    0x04
-#define         REQI                    0x02
-#define         ACKI                    0x01
-
-#define SCSIRATE                        0x04
-#define         WIDEXFER                0x80
-#define         SXFR_ULTRA2             0x7f
-#define         SXFR                    0x70
-#define         SOFS                    0x0f
-
-#define SCSIID                          0x05
-#define SCSIOFFSET                      0x05
-#define         SOFS_ULTRA2             0x7f
-
-#define SCSIDATL                        0x06
-
-#define SCSIDATH                        0x07
-
-#define STCNT                           0x08
-
-#define OPTIONMODE                      0x08
-#define         AUTORATEEN              0x80
-#define         AUTOACKEN               0x40
-#define         ATNMGMNTEN              0x20
-#define         BUSFREEREV              0x10
-#define         EXPPHASEDIS             0x08
-#define         SCSIDATL_IMGEN          0x04
-#define         AUTO_MSGOUT_DE          0x02
-#define         DIS_MSGIN_DUALEDGE      0x01
-
-#define CLRSINT0                        0x0b
-#define         CLRSELDO                0x40
-#define         CLRSELDI                0x20
-#define         CLRSELINGO              0x10
-#define         CLRSWRAP                0x08
-#define         CLRSPIORDY              0x02
-
-#define SSTAT0                          0x0b
-#define         TARGET                  0x80
-#define         SELDO                   0x40
-#define         SELDI                   0x20
-#define         SELINGO                 0x10
-#define         IOERR                   0x08
-#define         SWRAP                   0x08
-#define         SDONE                   0x04
-#define         SPIORDY                 0x02
-#define         DMADONE                 0x01
-
-#define CLRSINT1                        0x0c
-#define         CLRSELTIMEO             0x80
-#define         CLRATNO                 0x40
-#define         CLRSCSIRSTI             0x20
-#define         CLRBUSFREE              0x08
-#define         CLRSCSIPERR             0x04
-#define         CLRPHASECHG             0x02
-#define         CLRREQINIT              0x01
-
-#define SSTAT1                          0x0c
-#define         SELTO                   0x80
-#define         ATNTARG                 0x40
-#define         SCSIRSTI                0x20
-#define         PHASEMIS                0x10
-#define         BUSFREE                 0x08
-#define         SCSIPERR                0x04
-#define         PHASECHG                0x02
-#define         REQINIT                 0x01
-
-#define SSTAT2                          0x0d
-#define         OVERRUN                 0x80
-#define         SHVALID                 0x40
-#define         WIDE_RES                0x20
-#define         SFCNT                   0x1f
-#define         EXP_ACTIVE              0x10
-#define         CRCVALERR               0x08
-#define         CRCENDERR               0x04
-#define         CRCREQERR               0x02
-#define         DUAL_EDGE_ERROR         0x01
-
-#define SSTAT3                          0x0e
-#define         SCSICNT                 0xf0
-#define         OFFCNT                  0x0f
-
-#define SCSIID_ULTRA2                   0x0f
-#define         OID                     0x0f
-
-#define SIMODE0                         0x10
-#define         ENSELDO                 0x40
-#define         ENSELDI                 0x20
-#define         ENSELINGO               0x10
-#define         ENIOERR                 0x08
-#define         ENSWRAP                 0x08
-#define         ENSDONE                 0x04
-#define         ENSPIORDY               0x02
-#define         ENDMADONE               0x01
-
-#define SIMODE1                         0x11
-#define         ENSELTIMO               0x80
-#define         ENATNTARG               0x40
-#define         ENSCSIRST               0x20
-#define         ENPHASEMIS              0x10
-#define         ENBUSFREE               0x08
-#define         ENSCSIPERR              0x04
-#define         ENPHASECHG              0x02
-#define         ENREQINIT               0x01
-
-#define SCSIBUSL                        0x12
-
-#define SCSIBUSH                        0x13
-
-#define SHADDR                          0x14
-
-#define SELTIMER                        0x18
-#define         STAGE6                  0x20
-#define         STAGE5                  0x10
-#define         STAGE4                  0x08
-#define         STAGE3                  0x04
-#define         STAGE2                  0x02
-#define         STAGE1                  0x01
-
-#define SELID                           0x19
-#define         SELID_MASK              0xf0
-#define         ONEBIT                  0x08
-
-#define SPIOCAP                         0x1b
-#define         SOFT1                   0x80
-#define         SOFT0                   0x40
-#define         SOFTCMDEN               0x20
-#define         HAS_BRDCTL              0x10
-#define         SEEPROM                 0x08
-#define         EEPROM                  0x04
-#define         ROM                     0x02
-#define         SSPIOCPS                0x01
-
-#define BRDCTL                          0x1d
-#define         BRDDAT7                 0x80
-#define         BRDDAT6                 0x40
-#define         BRDDAT5                 0x20
-#define         BRDDAT4                 0x10
-#define         BRDSTB                  0x10
-#define         BRDCS                   0x08
-#define         BRDDAT3                 0x08
-#define         BRDDAT2                 0x04
-#define         BRDRW                   0x04
-#define         BRDRW_ULTRA2            0x02
-#define         BRDCTL1                 0x02
-#define         BRDSTB_ULTRA2           0x01
-#define         BRDCTL0                 0x01
-
-#define SEECTL                          0x1e
-#define         EXTARBACK               0x80
-#define         EXTARBREQ               0x40
-#define         SEEMS                   0x20
-#define         SEERDY                  0x10
-#define         SEECS                   0x08
-#define         SEECK                   0x04
-#define         SEEDO                   0x02
-#define         SEEDI                   0x01
-
-#define SBLKCTL                         0x1f
-#define         DIAGLEDEN               0x80
-#define         DIAGLEDON               0x40
-#define         AUTOFLUSHDIS            0x20
-#define         ENAB40                  0x08
-#define         ENAB20                  0x04
-#define         SELWIDE                 0x02
-#define         XCVR                    0x01
-
-#define SRAM_BASE                       0x20
-
-#define TARG_SCSIRATE                   0x20
-
-#define ULTRA_ENB                       0x30
-
-#define DISC_DSB                        0x32
-
-#define MSG_OUT                         0x34
-
-#define DMAPARAMS                       0x35
-#define         PRELOADEN               0x80
-#define         WIDEODD                 0x40
-#define         SCSIEN                  0x20
-#define         SDMAENACK               0x10
-#define         SDMAEN                  0x10
-#define         HDMAEN                  0x08
-#define         HDMAENACK               0x08
-#define         DIRECTION               0x04
-#define         FIFOFLUSH               0x02
-#define         FIFORESET               0x01
-
-#define SEQ_FLAGS                       0x36
-#define         IDENTIFY_SEEN           0x80
-#define         SCBPTR_VALID            0x20
-#define         DPHASE                  0x10
-#define         AMTARGET                0x08
-#define         WIDE_BUS                0x02
-#define         TWIN_BUS                0x01
-
-#define SAVED_TCL                       0x37
-
-#define SG_COUNT                        0x38
-
-#define SG_NEXT                         0x39
-
-#define LASTPHASE                       0x3d
-#define         P_MESGIN                0xe0
-#define         PHASE_MASK              0xe0
-#define         P_STATUS                0xc0
-#define         P_MESGOUT               0xa0
-#define         P_COMMAND               0x80
-#define         CDI                     0x80
-#define         IOI                     0x40
-#define         P_DATAIN                0x40
-#define         MSGI                    0x20
-#define         P_BUSFREE               0x01
-#define         P_DATAOUT               0x00
-
-#define WAITING_SCBH                    0x3e
-
-#define DISCONNECTED_SCBH               0x3f
-
-#define FREE_SCBH                       0x40
-
-#define HSCB_ADDR                       0x41
-
-#define SCBID_ADDR                      0x45
-
-#define TMODE_CMDADDR                   0x49
-
-#define KERNEL_QINPOS                   0x4d
-
-#define QINPOS                          0x4e
-
-#define QOUTPOS                         0x4f
-
-#define TMODE_CMDADDR_NEXT              0x50
-
-#define ARG_1                           0x51
-#define RETURN_1                        0x51
-#define         SEND_MSG                0x80
-#define         SEND_SENSE              0x40
-#define         SEND_REJ                0x20
-#define         MSGOUT_PHASEMIS         0x10
-
-#define ARG_2                           0x52
-#define RETURN_2                        0x52
-
-#define LAST_MSG                        0x53
-
-#define PREFETCH_CNT                    0x54
-
-#define SCSICONF                        0x5a
-#define         TERM_ENB                0x80
-#define         RESET_SCSI              0x40
-#define         HWSCSIID                0x0f
-#define         HSCSIID                 0x07
-
-#define HOSTCONF                        0x5d
-
-#define HA_274_BIOSCTRL                 0x5f
-#define         BIOSMODE                0x30
-#define         BIOSDISABLED            0x30
-#define         CHANNEL_B_PRIMARY       0x08
-
-#define SEQCTL                          0x60
-#define         PERRORDIS               0x80
-#define         PAUSEDIS                0x40
-#define         FAILDIS                 0x20
-#define         FASTMODE                0x10
-#define         BRKADRINTEN             0x08
-#define         STEP                    0x04
-#define         SEQRESET                0x02
-#define         LOADRAM                 0x01
-
-#define SEQRAM                          0x61
-
-#define SEQADDR0                        0x62
-
-#define SEQADDR1                        0x63
-#define         SEQADDR1_MASK           0x01
-
-#define ACCUM                           0x64
-
-#define SINDEX                          0x65
-
-#define DINDEX                          0x66
-
-#define ALLONES                         0x69
-
-#define ALLZEROS                        0x6a
-
-#define NONE                            0x6a
-
-#define FLAGS                           0x6b
-#define         ZERO                    0x02
-#define         CARRY                   0x01
-
-#define SINDIR                          0x6c
-
-#define DINDIR                          0x6d
-
-#define FUNCTION1                       0x6e
-
-#define STACK                           0x6f
-
-#define TARG_OFFSET                     0x70
-
-#define BCTL                            0x84
-#define         ACE                     0x08
-#define         ENABLE                  0x01
-
-#define DSCOMMAND0                      0x84
-#define         INTSCBRAMSEL            0x08
-#define         RAMPS                   0x04
-#define         USCBSIZE32              0x02
-#define         CIOPARCKEN              0x01
-
-#define DSCOMMAND                       0x84
-#define         CACHETHEN               0x80
-#define         DPARCKEN                0x40
-#define         MPARCKEN                0x20
-#define         EXTREQLCK               0x10
-
-#define BUSTIME                         0x85
-#define         BOFF                    0xf0
-#define         BON                     0x0f
-
-#define BUSSPD                          0x86
-#define         DFTHRSH                 0xc0
-#define         STBOFF                  0x38
-#define         STBON                   0x07
-
-#define DSPCISTATUS                     0x86
-#define         DFTHRSH_100             0xc0
-
-#define HCNTRL                          0x87
-#define         POWRDN                  0x40
-#define         SWINT                   0x10
-#define         IRQMS                   0x08
-#define         PAUSE                   0x04
-#define         INTEN                   0x02
-#define         CHIPRST                 0x01
-#define         CHIPRSTACK              0x01
-
-#define HADDR                           0x88
-
-#define HCNT                            0x8c
-
-#define SCBPTR                          0x90
-
-#define INTSTAT                         0x91
-#define         SEQINT_MASK             0xf1
-#define         DATA_OVERRUN            0xe1
-#define         MSGIN_PHASEMIS          0xd1
-#define         TRACEPOINT2             0xc1
-#define         SEQ_SG_FIXUP            0xb1
-#define         AWAITING_MSG            0xa1
-#define         RESIDUAL                0x81
-#define         BAD_STATUS              0x71
-#define         REJECT_MSG              0x61
-#define         WIDE_RESIDUE            0x51
-#define         EXTENDED_MSG            0x41
-#define         NO_MATCH                0x31
-#define         NO_IDENT                0x21
-#define         SEND_REJECT             0x11
-#define         INT_PEND                0x0f
-#define         BRKADRINT               0x08
-#define         SCSIINT                 0x04
-#define         CMDCMPLT                0x02
-#define         BAD_PHASE               0x01
-#define         SEQINT                  0x01
-
-#define CLRINT                          0x92
-#define         CLRPARERR               0x10
-#define         CLRBRKADRINT            0x08
-#define         CLRSCSIINT              0x04
-#define         CLRCMDINT               0x02
-#define         CLRSEQINT               0x01
-
-#define ERROR                           0x92
-#define         CIOPARERR               0x80
-#define         PCIERRSTAT              0x40
-#define         MPARERR                 0x20
-#define         DPARERR                 0x10
-#define         SQPARERR                0x08
-#define         ILLOPCODE               0x04
-#define         DSCTMOUT                0x02
-#define         ILLSADDR                0x02
-#define         ILLHADDR                0x01
-
-#define DFCNTRL                         0x93
-
-#define DFSTATUS                        0x94
-#define         PRELOAD_AVAIL           0x80
-#define         DWORDEMP                0x20
-#define         MREQPEND                0x10
-#define         HDONE                   0x08
-#define         DFTHRESH                0x04
-#define         FIFOFULL                0x02
-#define         FIFOEMP                 0x01
-
-#define DFDAT                           0x99
-
-#define SCBCNT                          0x9a
-#define         SCBAUTO                 0x80
-#define         SCBCNT_MASK             0x1f
-
-#define QINFIFO                         0x9b
-
-#define QINCNT                          0x9c
-
-#define SCSIDATL_IMG                    0x9c
-
-#define QOUTFIFO                        0x9d
-
-#define CRCCONTROL1                     0x9d
-#define         CRCONSEEN               0x80
-#define         CRCVALCHKEN             0x40
-#define         CRCENDCHKEN             0x20
-#define         CRCREQCHKEN             0x10
-#define         TARGCRCENDEN            0x08
-#define         TARGCRCCNTEN            0x04
-
-#define SCSIPHASE                       0x9e
-#define         SP_STATUS               0x20
-#define         SP_COMMAND              0x10
-#define         SP_MSG_IN               0x08
-#define         SP_MSG_OUT              0x04
-#define         SP_DATA_IN              0x02
-#define         SP_DATA_OUT             0x01
-
-#define QOUTCNT                         0x9e
-
-#define SFUNCT                          0x9f
-#define         ALT_MODE                0x80
-
-#define SCB_CONTROL                     0xa0
-#define         MK_MESSAGE              0x80
-#define         DISCENB                 0x40
-#define         TAG_ENB                 0x20
-#define         DISCONNECTED            0x04
-#define         SCB_TAG_TYPE            0x03
-
-#define SCB_BASE                        0xa0
-
-#define SCB_TCL                         0xa1
-#define         TID                     0xf0
-#define         SELBUSB                 0x08
-#define         LID                     0x07
-
-#define SCB_TARGET_STATUS               0xa2
-
-#define SCB_SGCOUNT                     0xa3
-
-#define SCB_SGPTR                       0xa4
-
-#define SCB_RESID_SGCNT                 0xa8
-
-#define SCB_RESID_DCNT                  0xa9
-
-#define SCB_DATAPTR                     0xac
-
-#define SCB_DATACNT                     0xb0
-
-#define SCB_CMDPTR                      0xb4
-
-#define SCB_CMDLEN                      0xb8
-
-#define SCB_TAG                         0xb9
-
-#define SCB_NEXT                        0xba
-
-#define SCB_PREV                        0xbb
-
-#define SCB_BUSYTARGETS                 0xbc
-
-#define SEECTL_2840                     0xc0
-#define         CS_2840                 0x04
-#define         CK_2840                 0x02
-#define         DO_2840                 0x01
-
-#define STATUS_2840                     0xc1
-#define         EEPROM_TF               0x80
-#define         BIOS_SEL                0x60
-#define         ADSEL                   0x1e
-#define         DI_2840                 0x01
-
-#define CCHADDR                         0xe0
-
-#define CCHCNT                          0xe8
-
-#define CCSGRAM                         0xe9
-
-#define CCSGADDR                        0xea
-
-#define CCSGCTL                         0xeb
-#define         CCSGDONE                0x80
-#define         CCSGEN                  0x08
-#define         FLAG                    0x02
-#define         CCSGRESET               0x01
-
-#define CCSCBRAM                        0xec
-
-#define CCSCBADDR                       0xed
-
-#define CCSCBCTL                        0xee
-#define         CCSCBDONE               0x80
-#define         ARRDONE                 0x40
-#define         CCARREN                 0x10
-#define         CCSCBEN                 0x08
-#define         CCSCBDIR                0x04
-#define         CCSCBRESET              0x01
-
-#define CCSCBCNT                        0xef
-
-#define CCSCBPTR                        0xf1
-
-#define HNSCB_QOFF                      0xf4
-
-#define HESCB_QOFF                      0xf5
-
-#define SNSCB_QOFF                      0xf6
-
-#define SESCB_QOFF                      0xf7
-
-#define SDSCB_QOFF                      0xf8
-
-#define QOFF_CTLSTA                     0xfa
-#define         ESTABLISH_SCB_AVAIL     0x80
-#define         SCB_AVAIL               0x40
-#define         SNSCB_ROLLOVER          0x20
-#define         SDSCB_ROLLOVER          0x10
-#define         SESCB_ROLLOVER          0x08
-#define         SCB_QSIZE               0x07
-#define         SCB_QSIZE_256           0x06
-
-#define DFF_THRSH                       0xfb
-#define         WR_DFTHRSH              0x70
-#define         WR_DFTHRSH_MAX          0x70
-#define         WR_DFTHRSH_90           0x60
-#define         WR_DFTHRSH_85           0x50
-#define         WR_DFTHRSH_75           0x40
-#define         WR_DFTHRSH_63           0x30
-#define         WR_DFTHRSH_50           0x20
-#define         WR_DFTHRSH_25           0x10
-#define         RD_DFTHRSH_MAX          0x07
-#define         RD_DFTHRSH              0x07
-#define         RD_DFTHRSH_90           0x06
-#define         RD_DFTHRSH_85           0x05
-#define         RD_DFTHRSH_75           0x04
-#define         RD_DFTHRSH_63           0x03
-#define         RD_DFTHRSH_50           0x02
-#define         RD_DFTHRSH_25           0x01
-#define         WR_DFTHRSH_MIN          0x00
-#define         RD_DFTHRSH_MIN          0x00
-
-#define SG_CACHEPTR                     0xfc
-#define         SG_USER_DATA            0xfc
-#define         LAST_SEG                0x02
-#define         LAST_SEG_DONE           0x01
-
-
-#define CMD_GROUP2_BYTE_DELTA   0xfa
-#define MAX_OFFSET_8BIT 0x0f
-#define BUS_16_BIT      0x01
-#define QINFIFO_OFFSET  0x02
-#define CMD_GROUP5_BYTE_DELTA   0x0b
-#define CMD_GROUP_CODE_SHIFT    0x05
-#define MAX_OFFSET_ULTRA2       0x7f
-#define MAX_OFFSET_16BIT        0x08
-#define BUS_8_BIT       0x00
-#define QOUTFIFO_OFFSET 0x01
-#define UNTAGGEDSCB_OFFSET      0x00
-#define CCSGRAM_MAXSEGS 0x10
-#define SCB_LIST_NULL   0xff
-#define SG_SIZEOF       0x08
-#define CMD_GROUP4_BYTE_DELTA   0x04
-#define CMD_GROUP0_BYTE_DELTA   0xfc
-#define HOST_MSG        0xff
-#define BUS_32_BIT      0x02
-#define CCSGADDR_MAX    0x80
-
-
-/* Downloaded Constant Definitions */
-#define TMODE_NUMCMDS   0x00
diff --git a/drivers/scsi/aic7xxx_old/aic7xxx_seq.c b/drivers/scsi/aic7xxx_old/aic7xxx_seq.c
deleted file mode 100644
index e1bc140e9735..000000000000
--- a/drivers/scsi/aic7xxx_old/aic7xxx_seq.c
+++ /dev/null
@@ -1,817 +0,0 @@
-/*
-  * DO NOT EDIT - This file is automatically generated.
-  */
-static unsigned char seqprog[] = {
-        0xff, 0x6a, 0x06, 0x08,
-        0x7f, 0x02, 0x04, 0x08,
-        0x12, 0x6a, 0x00, 0x00,
-        0xff, 0x6a, 0xd6, 0x09,
-        0xff, 0x6a, 0xdc, 0x09,
-        0x00, 0x65, 0xca, 0x58,
-        0xf7, 0x01, 0x02, 0x08,
-        0xff, 0x4e, 0xc8, 0x08,
-        0xbf, 0x60, 0xc0, 0x08,
-        0x60, 0x0b, 0x86, 0x68,
-        0x40, 0x00, 0x0c, 0x68,
-        0x08, 0x1f, 0x3e, 0x10,
-        0x60, 0x0b, 0x86, 0x68,
-        0x40, 0x00, 0x0c, 0x68,
-        0x08, 0x1f, 0x3e, 0x10,
-        0xff, 0x3e, 0x48, 0x60,
-        0x40, 0xfa, 0x10, 0x78,
-        0xff, 0xf6, 0xd4, 0x08,
-        0x01, 0x4e, 0x9c, 0x18,
-        0x40, 0x60, 0xc0, 0x00,
-        0x00, 0x4d, 0x10, 0x70,
-        0x01, 0x4e, 0x9c, 0x18,
-        0xbf, 0x60, 0xc0, 0x08,
-        0x00, 0x6a, 0x86, 0x5c,
-        0xff, 0x4e, 0xc8, 0x18,
-        0x02, 0x6a, 0x70, 0x5b,
-        0xff, 0x52, 0x20, 0x09,
-        0x0d, 0x6a, 0x6a, 0x00,
-        0x00, 0x52, 0xe6, 0x5b,
-        0x03, 0xb0, 0x52, 0x31,
-        0xff, 0xb0, 0x52, 0x09,
-        0xff, 0xb1, 0x54, 0x09,
-        0xff, 0xb2, 0x56, 0x09,
-        0xff, 0xa3, 0x50, 0x09,
-        0xff, 0x3e, 0x74, 0x09,
-        0xff, 0x90, 0x7c, 0x08,
-        0xff, 0x3e, 0x20, 0x09,
-        0x00, 0x65, 0x4e, 0x58,
-        0x00, 0x65, 0x0c, 0x40,
-        0xf7, 0x1f, 0xca, 0x08,
-        0x08, 0xa1, 0xc8, 0x08,
-        0x00, 0x65, 0xca, 0x00,
-        0xff, 0x65, 0x3e, 0x08,
-        0xf0, 0xa1, 0xc8, 0x08,
-        0x0f, 0x0f, 0x1e, 0x08,
-        0x00, 0x0f, 0x1e, 0x00,
-        0xf0, 0xa1, 0xc8, 0x08,
-        0x0f, 0x05, 0x0a, 0x08,
-        0x00, 0x05, 0x0a, 0x00,
-        0xff, 0x6a, 0x0c, 0x08,
-        0x5a, 0x6a, 0x00, 0x04,
-        0x12, 0x65, 0x02, 0x00,
-        0x31, 0x6a, 0xca, 0x00,
-        0x80, 0x37, 0x6e, 0x68,
-        0xff, 0x65, 0xca, 0x18,
-        0xff, 0x37, 0xdc, 0x08,
-        0xff, 0x6e, 0xc8, 0x08,
-        0x00, 0x6c, 0x76, 0x78,
-        0x20, 0x01, 0x02, 0x00,
-        0x4c, 0x37, 0xc8, 0x28,
-        0x08, 0x1f, 0x7e, 0x78,
-        0x08, 0x37, 0x6e, 0x00,
-        0x08, 0x64, 0xc8, 0x00,
-        0x70, 0x64, 0xca, 0x18,
-        0xff, 0x6c, 0x0a, 0x08,
-        0x20, 0x64, 0xca, 0x18,
-        0xff, 0x6c, 0x08, 0x0c,
-        0x40, 0x0b, 0x96, 0x68,
-        0x20, 0x6a, 0x16, 0x00,
-        0xf0, 0x19, 0x6e, 0x08,
-        0x08, 0x6a, 0x18, 0x00,
-        0x08, 0x11, 0x22, 0x00,
-        0x08, 0x6a, 0x66, 0x58,
-        0x08, 0x6a, 0x68, 0x00,
-        0x00, 0x65, 0xaa, 0x40,
-        0x12, 0x6a, 0x00, 0x00,
-        0x40, 0x6a, 0x16, 0x00,
-        0xff, 0x3e, 0x20, 0x09,
-        0xff, 0xba, 0x7c, 0x08,
-        0xff, 0xa1, 0x6e, 0x08,
-        0x08, 0x6a, 0x18, 0x00,
-        0x08, 0x11, 0x22, 0x00,
-        0x08, 0x6a, 0x66, 0x58,
-        0x80, 0x6a, 0x68, 0x00,
-        0x80, 0x36, 0x6c, 0x00,
-        0x00, 0x65, 0xba, 0x5b,
-        0xff, 0x3d, 0xc8, 0x08,
-        0xbf, 0x64, 0xe2, 0x78,
-        0x80, 0x64, 0xc8, 0x71,
-        0xa0, 0x64, 0xf8, 0x71,
-        0xc0, 0x64, 0xf0, 0x71,
-        0xe0, 0x64, 0x38, 0x72,
-        0x01, 0x6a, 0x22, 0x01,
-        0x00, 0x65, 0xaa, 0x40,
-        0xf7, 0x11, 0x22, 0x08,
-        0x00, 0x65, 0xca, 0x58,
-        0xff, 0x06, 0xd4, 0x08,
-        0xf7, 0x01, 0x02, 0x08,
-        0x09, 0x0c, 0xc4, 0x78,
-        0x08, 0x0c, 0x0c, 0x68,
-        0x01, 0x6a, 0x22, 0x01,
-        0xff, 0x6a, 0x26, 0x09,
-        0x02, 0x6a, 0x08, 0x30,
-        0xff, 0x6a, 0x08, 0x08,
-        0xdf, 0x01, 0x02, 0x08,
-        0x01, 0x6a, 0x7a, 0x00,
-        0xff, 0x6a, 0x6c, 0x0c,
-        0x04, 0x14, 0x10, 0x31,
-        0x03, 0xa9, 0x18, 0x31,
-        0x03, 0xa9, 0x10, 0x30,
-        0x08, 0x6a, 0xcc, 0x00,
-        0xa9, 0x6a, 0xd0, 0x5b,
-        0x00, 0x65, 0x02, 0x41,
-        0xa8, 0x6a, 0x6a, 0x00,
-        0x79, 0x6a, 0x6a, 0x00,
-        0x40, 0x3d, 0xea, 0x68,
-        0x04, 0x35, 0x6a, 0x00,
-        0x00, 0x65, 0x2a, 0x5b,
-        0x80, 0x6a, 0xd4, 0x01,
-        0x10, 0x36, 0xd6, 0x68,
-        0x10, 0x36, 0x6c, 0x00,
-        0x07, 0xac, 0x10, 0x31,
-        0x05, 0xa3, 0x70, 0x30,
-        0x03, 0x8c, 0x10, 0x30,
-        0x88, 0x6a, 0xcc, 0x00,
-        0xac, 0x6a, 0xc8, 0x5b,
-        0x00, 0x65, 0xc2, 0x5b,
-        0x38, 0x6a, 0xcc, 0x00,
-        0xa3, 0x6a, 0xcc, 0x5b,
-        0xff, 0x38, 0x12, 0x69,
-        0x80, 0x02, 0x04, 0x00,
-        0xe7, 0x35, 0x6a, 0x08,
-        0x03, 0x69, 0x18, 0x31,
-        0x03, 0x69, 0x10, 0x30,
-        0xff, 0x6a, 0x10, 0x00,
-        0xff, 0x6a, 0x12, 0x00,
-        0xff, 0x6a, 0x14, 0x00,
-        0x22, 0x38, 0xc8, 0x28,
-        0x01, 0x38, 0x1c, 0x61,
-        0x02, 0x64, 0xc8, 0x00,
-        0x01, 0x38, 0x1c, 0x61,
-        0xbf, 0x35, 0x6a, 0x08,
-        0xff, 0x64, 0xf8, 0x09,
-        0xff, 0x35, 0x26, 0x09,
-        0x80, 0x02, 0xa4, 0x69,
-        0x10, 0x0c, 0x7a, 0x69,
-        0x80, 0x94, 0x22, 0x79,
-        0x00, 0x35, 0x0a, 0x5b,
-        0x80, 0x02, 0xa4, 0x69,
-        0xff, 0x65, 0x94, 0x79,
-        0x01, 0x38, 0x70, 0x71,
-        0xff, 0x38, 0x70, 0x18,
-        0xff, 0x38, 0x94, 0x79,
-        0x80, 0xea, 0x4a, 0x61,
-        0xef, 0x38, 0xc8, 0x18,
-        0x80, 0x6a, 0xc8, 0x00,
-        0x00, 0x65, 0x3c, 0x49,
-        0x33, 0x38, 0xc8, 0x28,
-        0xff, 0x64, 0xd0, 0x09,
-        0x04, 0x39, 0xc0, 0x31,
-        0x09, 0x6a, 0xd6, 0x01,
-        0x80, 0xeb, 0x42, 0x79,
-        0xf7, 0xeb, 0xd6, 0x09,
-        0x08, 0xeb, 0x46, 0x69,
-        0x01, 0x6a, 0xd6, 0x01,
-        0x08, 0xe9, 0x10, 0x31,
-        0x03, 0x8c, 0x10, 0x30,
-        0xff, 0x38, 0x70, 0x18,
-        0x88, 0x6a, 0xcc, 0x00,
-        0x39, 0x6a, 0xce, 0x5b,
-        0x08, 0x6a, 0x18, 0x01,
-        0xff, 0x6a, 0x1a, 0x09,
-        0xff, 0x6a, 0x1c, 0x09,
-        0x0d, 0x93, 0x26, 0x01,
-        0x00, 0x65, 0x78, 0x5c,
-        0x88, 0x6a, 0xcc, 0x00,
-        0x00, 0x65, 0x6a, 0x5c,
-        0x00, 0x65, 0xc2, 0x5b,
-        0xff, 0x6a, 0xc8, 0x08,
-        0x08, 0x39, 0x72, 0x18,
-        0x00, 0x3a, 0x74, 0x20,
-        0x00, 0x65, 0x02, 0x41,
-        0x01, 0x0c, 0x6c, 0x79,
-        0x10, 0x0c, 0x02, 0x79,
-        0x10, 0x0c, 0x7a, 0x69,
-        0x01, 0xfc, 0x70, 0x79,
-        0xff, 0x6a, 0x70, 0x08,
-        0x01, 0x0c, 0x76, 0x79,
-        0x10, 0x0c, 0x02, 0x79,
-        0x00, 0x65, 0xae, 0x59,
-        0x01, 0xfc, 0x94, 0x69,
-        0x40, 0x0d, 0x84, 0x69,
-        0xb1, 0x6a, 0x22, 0x01,
-        0x00, 0x65, 0x94, 0x41,
-        0x2e, 0xfc, 0xa2, 0x28,
-        0x3f, 0x38, 0xc8, 0x08,
-        0x00, 0x51, 0x94, 0x71,
-        0xff, 0x6a, 0xc8, 0x08,
-        0xf8, 0x39, 0x72, 0x18,
-        0xff, 0x3a, 0x74, 0x20,
-        0x01, 0x38, 0x70, 0x18,
-        0x00, 0x65, 0x86, 0x41,
-        0x03, 0x08, 0x52, 0x31,
-        0xff, 0x38, 0x50, 0x09,
-        0x12, 0x01, 0x02, 0x00,
-        0xff, 0x08, 0x52, 0x09,
-        0xff, 0x09, 0x54, 0x09,
-        0xff, 0x0a, 0x56, 0x09,
-        0xff, 0x38, 0x50, 0x09,
-        0x00, 0x65, 0xaa, 0x40,
-        0x10, 0x0c, 0xa4, 0x79,
-        0x00, 0x65, 0xae, 0x59,
-        0x7f, 0x02, 0x04, 0x08,
-        0xe1, 0x6a, 0x22, 0x01,
-        0x00, 0x65, 0xaa, 0x40,
-        0x04, 0x93, 0xc2, 0x69,
-        0xdf, 0x93, 0x26, 0x09,
-        0x20, 0x93, 0xb2, 0x69,
-        0x02, 0x93, 0x26, 0x01,
-        0x01, 0x94, 0xb6, 0x79,
-        0x01, 0x94, 0xb6, 0x79,
-        0x01, 0x94, 0xb6, 0x79,
-        0x01, 0x94, 0xb6, 0x79,
-        0x01, 0x94, 0xb6, 0x79,
-        0x10, 0x94, 0xc0, 0x69,
-        0xd7, 0x93, 0x26, 0x09,
-        0x28, 0x93, 0xc4, 0x69,
-        0xff, 0x6a, 0xd4, 0x0c,
-        0x00, 0x65, 0x2a, 0x5b,
-        0x05, 0xb4, 0x10, 0x31,
-        0x02, 0x6a, 0x1a, 0x31,
-        0x03, 0x8c, 0x10, 0x30,
-        0x88, 0x6a, 0xcc, 0x00,
-        0xb4, 0x6a, 0xcc, 0x5b,
-        0xff, 0x6a, 0x1a, 0x09,
-        0xff, 0x6a, 0x1c, 0x09,
-        0x00, 0x65, 0xc2, 0x5b,
-        0x3d, 0x6a, 0x0a, 0x5b,
-        0xac, 0x6a, 0x26, 0x01,
-        0x04, 0x0b, 0xde, 0x69,
-        0x04, 0x0b, 0xe4, 0x69,
-        0x10, 0x0c, 0xe0, 0x79,
-        0x02, 0x03, 0xe8, 0x79,
-        0x11, 0x0c, 0xe4, 0x79,
-        0xd7, 0x93, 0x26, 0x09,
-        0x28, 0x93, 0xea, 0x69,
-        0x12, 0x01, 0x02, 0x00,
-        0x00, 0x65, 0xaa, 0x40,
-        0x00, 0x65, 0x2a, 0x5b,
-        0xff, 0x06, 0x44, 0x09,
-        0x00, 0x65, 0xaa, 0x40,
-        0x10, 0x3d, 0x06, 0x00,
-        0xff, 0x34, 0xca, 0x08,
-        0x80, 0x65, 0x1c, 0x62,
-        0x0f, 0xa1, 0xca, 0x08,
-        0x07, 0xa1, 0xca, 0x08,
-        0x40, 0xa0, 0xc8, 0x08,
-        0x00, 0x65, 0xca, 0x00,
-        0x80, 0x65, 0xca, 0x00,
-        0x80, 0xa0, 0x0c, 0x7a,
-        0xff, 0x65, 0x0c, 0x08,
-        0x00, 0x65, 0x1e, 0x42,
-        0x20, 0xa0, 0x24, 0x7a,
-        0xff, 0x65, 0x0c, 0x08,
-        0x00, 0x65, 0xba, 0x5b,
-        0xa0, 0x3d, 0x2c, 0x62,
-        0x23, 0xa0, 0x0c, 0x08,
-        0x00, 0x65, 0xba, 0x5b,
-        0xa0, 0x3d, 0x2c, 0x62,
-        0x00, 0xb9, 0x24, 0x42,
-        0xff, 0x65, 0x24, 0x62,
-        0xa1, 0x6a, 0x22, 0x01,
-        0xff, 0x6a, 0xd4, 0x08,
-        0x10, 0x51, 0x2c, 0x72,
-        0x40, 0x6a, 0x18, 0x00,
-        0xff, 0x65, 0x0c, 0x08,
-        0x00, 0x65, 0xba, 0x5b,
-        0xa0, 0x3d, 0xf6, 0x71,
-        0x40, 0x6a, 0x18, 0x00,
-        0xff, 0x34, 0xa6, 0x08,
-        0x80, 0x34, 0x34, 0x62,
-        0x7f, 0xa0, 0x40, 0x09,
-        0x08, 0x6a, 0x68, 0x00,
-        0x00, 0x65, 0xaa, 0x40,
-        0x64, 0x6a, 0x00, 0x5b,
-        0x80, 0x64, 0xaa, 0x6a,
-        0x04, 0x64, 0x8c, 0x72,
-        0x02, 0x64, 0x92, 0x72,
-        0x00, 0x6a, 0x54, 0x72,
-        0x03, 0x64, 0xa6, 0x72,
-        0x01, 0x64, 0x88, 0x72,
-        0x07, 0x64, 0xe8, 0x72,
-        0x08, 0x64, 0x50, 0x72,
-        0x23, 0x64, 0xec, 0x72,
-        0x11, 0x6a, 0x22, 0x01,
-        0x07, 0x6a, 0xf2, 0x5a,
-        0xff, 0x06, 0xd4, 0x08,
-        0x00, 0x65, 0xaa, 0x40,
-        0xff, 0xa8, 0x58, 0x6a,
-        0xff, 0xa2, 0x70, 0x7a,
-        0x01, 0x6a, 0x6a, 0x00,
-        0x00, 0xb9, 0xe6, 0x5b,
-        0xff, 0xa2, 0x70, 0x7a,
-        0x71, 0x6a, 0x22, 0x01,
-        0xff, 0x6a, 0xd4, 0x08,
-        0x40, 0x51, 0x70, 0x62,
-        0x0d, 0x6a, 0x6a, 0x00,
-        0x00, 0xb9, 0xe6, 0x5b,
-        0xff, 0x3e, 0x74, 0x09,
-        0xff, 0x90, 0x7c, 0x08,
-        0x00, 0x65, 0x4e, 0x58,
-        0x00, 0x65, 0xbc, 0x40,
-        0x20, 0xa0, 0x78, 0x6a,
-        0xff, 0x37, 0xc8, 0x08,
-        0x00, 0x6a, 0x90, 0x5b,
-        0xff, 0x6a, 0xa6, 0x5b,
-        0xff, 0xf8, 0xc8, 0x08,
-        0xff, 0x4f, 0xc8, 0x08,
-        0x01, 0x6a, 0x90, 0x5b,
-        0x00, 0xb9, 0xa6, 0x5b,
-        0x01, 0x4f, 0x9e, 0x18,
-        0x02, 0x6a, 0x22, 0x01,
-        0x00, 0x65, 0x80, 0x5c,
-        0x00, 0x65, 0xbc, 0x40,
-        0x41, 0x6a, 0x22, 0x01,
-        0x00, 0x65, 0xaa, 0x40,
-        0x04, 0xa0, 0x40, 0x01,
-        0x00, 0x65, 0x98, 0x5c,
-        0x00, 0x65, 0xbc, 0x40,
-        0x10, 0x36, 0x50, 0x7a,
-        0x05, 0x38, 0x46, 0x31,
-        0x04, 0x14, 0x58, 0x31,
-        0x03, 0xa9, 0x60, 0x31,
-        0xa3, 0x6a, 0xcc, 0x00,
-        0x38, 0x6a, 0xcc, 0x5b,
-        0xac, 0x6a, 0xcc, 0x00,
-        0x14, 0x6a, 0xce, 0x5b,
-        0xa9, 0x6a, 0xd0, 0x5b,
-        0x00, 0x65, 0x50, 0x42,
-        0xef, 0x36, 0x6c, 0x08,
-        0x00, 0x65, 0x50, 0x42,
-        0x0f, 0x64, 0xc8, 0x08,
-        0x07, 0x64, 0xc8, 0x08,
-        0x00, 0x37, 0x6e, 0x00,
-        0xff, 0x6a, 0xa4, 0x00,
-        0x00, 0x65, 0x60, 0x5b,
-        0xff, 0x51, 0xbc, 0x72,
-        0x20, 0x36, 0xc6, 0x7a,
-        0x00, 0x90, 0x4e, 0x5b,
-        0x00, 0x65, 0xc8, 0x42,
-        0xff, 0x06, 0xd4, 0x08,
-        0x00, 0x65, 0xba, 0x5b,
-        0xe0, 0x3d, 0xe2, 0x62,
-        0x20, 0x12, 0xe2, 0x62,
-        0x51, 0x6a, 0xf6, 0x5a,
-        0x00, 0x65, 0x48, 0x5b,
-        0xff, 0x37, 0xc8, 0x08,
-        0x00, 0xa1, 0xda, 0x62,
-        0x04, 0xa0, 0xda, 0x7a,
-        0xfb, 0xa0, 0x40, 0x09,
-        0x80, 0x36, 0x6c, 0x00,
-        0x80, 0xa0, 0x50, 0x7a,
-        0x7f, 0xa0, 0x40, 0x09,
-        0xff, 0x6a, 0xf2, 0x5a,
-        0x00, 0x65, 0x50, 0x42,
-        0x04, 0xa0, 0xe0, 0x7a,
-        0x00, 0x65, 0x98, 0x5c,
-        0x00, 0x65, 0xe2, 0x42,
-        0x00, 0x65, 0x80, 0x5c,
-        0x31, 0x6a, 0x22, 0x01,
-        0x0c, 0x6a, 0xf2, 0x5a,
-        0x00, 0x65, 0x50, 0x42,
-        0x61, 0x6a, 0x22, 0x01,
-        0x00, 0x65, 0x50, 0x42,
-        0x51, 0x6a, 0xf6, 0x5a,
-        0x51, 0x6a, 0x22, 0x01,
-        0x00, 0x65, 0x50, 0x42,
-        0x10, 0x3d, 0x06, 0x00,
-        0xff, 0x65, 0x68, 0x0c,
-        0xff, 0x06, 0xd4, 0x08,
-        0x01, 0x0c, 0xf8, 0x7a,
-        0x04, 0x0c, 0xfa, 0x6a,
-        0xe0, 0x03, 0x7a, 0x08,
-        0xe0, 0x3d, 0x06, 0x63,
-        0xff, 0x65, 0xcc, 0x08,
-        0xff, 0x12, 0xda, 0x0c,
-        0xff, 0x06, 0xd4, 0x0c,
-        0xd1, 0x6a, 0x22, 0x01,
-        0x00, 0x65, 0xaa, 0x40,
-        0xff, 0x65, 0x26, 0x09,
-        0x01, 0x0b, 0x1a, 0x6b,
-        0x10, 0x0c, 0x0c, 0x7b,
-        0x04, 0x0b, 0x14, 0x6b,
-        0xff, 0x6a, 0xca, 0x08,
-        0x04, 0x93, 0x18, 0x6b,
-        0x01, 0x94, 0x16, 0x7b,
-        0x10, 0x94, 0x18, 0x6b,
-        0x80, 0x3d, 0x1e, 0x73,
-        0x0f, 0x04, 0x22, 0x6b,
-        0x02, 0x03, 0x22, 0x7b,
-        0x11, 0x0c, 0x1e, 0x7b,
-        0xc7, 0x93, 0x26, 0x09,
-        0xff, 0x99, 0xd4, 0x08,
-        0x38, 0x93, 0x24, 0x6b,
-        0xff, 0x6a, 0xd4, 0x0c,
-        0x80, 0x36, 0x28, 0x6b,
-        0x21, 0x6a, 0x22, 0x05,
-        0xff, 0x65, 0x20, 0x09,
-        0xff, 0x51, 0x36, 0x63,
-        0xff, 0x37, 0xc8, 0x08,
-        0xa1, 0x6a, 0x42, 0x43,
-        0xff, 0x51, 0xc8, 0x08,
-        0xb9, 0x6a, 0x42, 0x43,
-        0xff, 0x90, 0xa4, 0x08,
-        0xff, 0xba, 0x46, 0x73,
-        0xff, 0xba, 0x20, 0x09,
-        0xff, 0x65, 0xca, 0x18,
-        0x00, 0x6c, 0x3a, 0x63,
-        0xff, 0x90, 0xca, 0x0c,
-        0xff, 0x6a, 0xca, 0x04,
-        0x20, 0x36, 0x5a, 0x7b,
-        0x00, 0x90, 0x2e, 0x5b,
-        0xff, 0x65, 0x5a, 0x73,
-        0xff, 0x52, 0x58, 0x73,
-        0xff, 0xba, 0xcc, 0x08,
-        0xff, 0x52, 0x20, 0x09,
-        0xff, 0x66, 0x74, 0x09,
-        0xff, 0x65, 0x20, 0x0d,
-        0xff, 0xba, 0x7e, 0x0c,
-        0x00, 0x6a, 0x86, 0x5c,
-        0x0d, 0x6a, 0x6a, 0x00,
-        0x00, 0x51, 0xe6, 0x43,
-        0xff, 0x3f, 0xb4, 0x73,
-        0xff, 0x6a, 0xa2, 0x00,
-        0x00, 0x3f, 0x2e, 0x5b,
-        0xff, 0x65, 0xb4, 0x73,
-        0x20, 0x36, 0x6c, 0x00,
-        0x20, 0xa0, 0x6e, 0x6b,
-        0xff, 0xb9, 0xa2, 0x0c,
-        0xff, 0x6a, 0xa2, 0x04,
-        0xff, 0x65, 0xa4, 0x08,
-        0xe0, 0x6a, 0xcc, 0x00,
-        0x45, 0x6a, 0xda, 0x5b,
-        0x01, 0x6a, 0xd0, 0x01,
-        0x09, 0x6a, 0xd6, 0x01,
-        0x80, 0xeb, 0x7a, 0x7b,
-        0x01, 0x6a, 0xd6, 0x01,
-        0x01, 0xe9, 0xa4, 0x34,
-        0x88, 0x6a, 0xcc, 0x00,
-        0x45, 0x6a, 0xda, 0x5b,
-        0x01, 0x6a, 0x18, 0x01,
-        0xff, 0x6a, 0x1a, 0x09,
-        0xff, 0x6a, 0x1c, 0x09,
-        0x0d, 0x6a, 0x26, 0x01,
-        0x00, 0x65, 0x78, 0x5c,
-        0xff, 0x99, 0xa4, 0x0c,
-        0xff, 0x65, 0xa4, 0x08,
-        0xe0, 0x6a, 0xcc, 0x00,
-        0x45, 0x6a, 0xda, 0x5b,
-        0x01, 0x6a, 0xd0, 0x01,
-        0x01, 0x6a, 0xdc, 0x05,
-        0x88, 0x6a, 0xcc, 0x00,
-        0x45, 0x6a, 0xda, 0x5b,
-        0x01, 0x6a, 0x18, 0x01,
-        0xff, 0x6a, 0x1a, 0x09,
-        0xff, 0x6a, 0x1c, 0x09,
-        0x01, 0x6a, 0x26, 0x05,
-        0x01, 0x65, 0xd8, 0x31,
-        0x09, 0xee, 0xdc, 0x01,
-        0x80, 0xee, 0xaa, 0x7b,
-        0xff, 0x6a, 0xdc, 0x0d,
-        0xff, 0x65, 0x32, 0x09,
-        0x0a, 0x93, 0x26, 0x01,
-        0x00, 0x65, 0x78, 0x44,
-        0xff, 0x37, 0xc8, 0x08,
-        0x00, 0x6a, 0x70, 0x5b,
-        0xff, 0x52, 0xa2, 0x0c,
-        0x01, 0x0c, 0xba, 0x7b,
-        0x04, 0x0c, 0xba, 0x6b,
-        0xe0, 0x03, 0x06, 0x08,
-        0xe0, 0x03, 0x7a, 0x0c,
-        0xff, 0x8c, 0x10, 0x08,
-        0xff, 0x8d, 0x12, 0x08,
-        0xff, 0x8e, 0x14, 0x0c,
-        0xff, 0x6c, 0xda, 0x08,
-        0xff, 0x6c, 0xda, 0x08,
-        0xff, 0x6c, 0xda, 0x08,
-        0xff, 0x6c, 0xda, 0x08,
-        0xff, 0x6c, 0xda, 0x08,
-        0xff, 0x6c, 0xda, 0x08,
-        0xff, 0x6c, 0xda, 0x0c,
-        0x3d, 0x64, 0xa4, 0x28,
-        0x55, 0x64, 0xc8, 0x28,
-        0x00, 0x6c, 0xda, 0x18,
-        0xff, 0x52, 0xc8, 0x08,
-        0x00, 0x6c, 0xda, 0x20,
-        0xff, 0x6a, 0xc8, 0x08,
-        0x00, 0x6c, 0xda, 0x20,
-        0x00, 0x6c, 0xda, 0x24,
-        0xff, 0x65, 0xc8, 0x08,
-        0xe0, 0x6a, 0xcc, 0x00,
-        0x41, 0x6a, 0xd6, 0x5b,
-        0xff, 0x90, 0xe2, 0x09,
-        0x20, 0x6a, 0xd0, 0x01,
-        0x04, 0x35, 0xf8, 0x7b,
-        0x1d, 0x6a, 0xdc, 0x01,
-        0xdc, 0xee, 0xf4, 0x63,
-        0x00, 0x65, 0x0e, 0x44,
-        0x01, 0x6a, 0xdc, 0x01,
-        0x20, 0xa0, 0xd8, 0x31,
-        0x09, 0xee, 0xdc, 0x01,
-        0x80, 0xee, 0xfe, 0x7b,
-        0x11, 0x6a, 0xdc, 0x01,
-        0x50, 0xee, 0x02, 0x64,
-        0x20, 0x6a, 0xd0, 0x01,
-        0x09, 0x6a, 0xdc, 0x01,
-        0x88, 0xee, 0x08, 0x64,
-        0x19, 0x6a, 0xdc, 0x01,
-        0xd8, 0xee, 0x0c, 0x64,
-        0xff, 0x6a, 0xdc, 0x09,
-        0x18, 0xee, 0x10, 0x6c,
-        0xff, 0x6a, 0xd4, 0x0c,
-        0x88, 0x6a, 0xcc, 0x00,
-        0x41, 0x6a, 0xd6, 0x5b,
-        0x20, 0x6a, 0x18, 0x01,
-        0xff, 0x6a, 0x1a, 0x09,
-        0xff, 0x6a, 0x1c, 0x09,
-        0xff, 0x35, 0x26, 0x09,
-        0x04, 0x35, 0x3c, 0x6c,
-        0xa0, 0x6a, 0xca, 0x00,
-        0x20, 0x65, 0xc8, 0x18,
-        0xff, 0x6c, 0x32, 0x09,
-        0xff, 0x6c, 0x32, 0x09,
-        0xff, 0x6c, 0x32, 0x09,
-        0xff, 0x6c, 0x32, 0x09,
-        0xff, 0x6c, 0x32, 0x09,
-        0xff, 0x6c, 0x32, 0x09,
-        0xff, 0x6c, 0x32, 0x09,
-        0xff, 0x6c, 0x32, 0x09,
-        0x00, 0x65, 0x26, 0x64,
-        0x0a, 0x93, 0x26, 0x01,
-        0x00, 0x65, 0x78, 0x44,
-        0xa0, 0x6a, 0xcc, 0x00,
-        0xe8, 0x6a, 0xc8, 0x00,
-        0x01, 0x94, 0x40, 0x6c,
-        0x10, 0x94, 0x42, 0x6c,
-        0x08, 0x94, 0x54, 0x6c,
-        0x08, 0x94, 0x54, 0x6c,
-        0x08, 0x94, 0x54, 0x6c,
-        0x00, 0x65, 0x68, 0x5c,
-        0x08, 0x64, 0xc8, 0x18,
-        0x00, 0x8c, 0xca, 0x18,
-        0x00, 0x65, 0x4a, 0x4c,
-        0x00, 0x65, 0x40, 0x44,
-        0xf7, 0x93, 0x26, 0x09,
-        0x08, 0x93, 0x56, 0x6c,
-        0x00, 0x65, 0x68, 0x5c,
-        0x08, 0x64, 0xc8, 0x18,
-        0x08, 0x64, 0x58, 0x64,
-        0xff, 0x6a, 0xd4, 0x0c,
-        0x00, 0x65, 0x78, 0x5c,
-        0x00, 0x65, 0x68, 0x5c,
-        0x00, 0x65, 0x68, 0x5c,
-        0x00, 0x65, 0x68, 0x5c,
-        0xff, 0x99, 0xda, 0x08,
-        0xff, 0x99, 0xda, 0x08,
-        0xff, 0x99, 0xda, 0x08,
-        0xff, 0x99, 0xda, 0x08,
-        0xff, 0x99, 0xda, 0x08,
-        0xff, 0x99, 0xda, 0x08,
-        0xff, 0x99, 0xda, 0x08,
-        0xff, 0x99, 0xda, 0x0c,
-        0x08, 0x94, 0x78, 0x7c,
-        0xf7, 0x93, 0x26, 0x09,
-        0x08, 0x93, 0x7c, 0x6c,
-        0xff, 0x6a, 0xd4, 0x0c,
-        0xff, 0x40, 0x74, 0x09,
-        0xff, 0x90, 0x80, 0x08,
-        0xff, 0x6a, 0x72, 0x05,
-        0xff, 0x40, 0x94, 0x64,
-        0xff, 0x3f, 0x8c, 0x64,
-        0xff, 0x6a, 0xca, 0x04,
-        0xff, 0x3f, 0x20, 0x09,
-        0x01, 0x6a, 0x6a, 0x00,
-        0x00, 0xb9, 0xe6, 0x5b,
-        0xff, 0xba, 0x7e, 0x0c,
-        0xff, 0x40, 0x20, 0x09,
-        0xff, 0xba, 0x80, 0x0c,
-        0xff, 0x3f, 0x74, 0x09,
-        0xff, 0x90, 0x7e, 0x0c,
-};
-
-static int aic7xxx_patch15_func(struct aic7xxx_host *p);
-
-static int
-aic7xxx_patch15_func(struct aic7xxx_host *p)
-{
-        return ((p->bugs & AHC_BUG_SCBCHAN_UPLOAD) != 0);
-}
-
-static int aic7xxx_patch14_func(struct aic7xxx_host *p);
-
-static int
-aic7xxx_patch14_func(struct aic7xxx_host *p)
-{
-        return ((p->bugs & AHC_BUG_PCI_2_1_RETRY) != 0);
-}
-
-static int aic7xxx_patch13_func(struct aic7xxx_host *p);
-
-static int
-aic7xxx_patch13_func(struct aic7xxx_host *p)
-{
-        return ((p->features & AHC_WIDE) != 0);
-}
-
-static int aic7xxx_patch12_func(struct aic7xxx_host *p);
-
-static int
-aic7xxx_patch12_func(struct aic7xxx_host *p)
-{
-        return ((p->bugs & AHC_BUG_AUTOFLUSH) != 0);
-}
-
-static int aic7xxx_patch11_func(struct aic7xxx_host *p);
-
-static int
-aic7xxx_patch11_func(struct aic7xxx_host *p)
-{
-        return ((p->features & AHC_ULTRA2) == 0);
-}
-
-static int aic7xxx_patch10_func(struct aic7xxx_host *p);
-
-static int
-aic7xxx_patch10_func(struct aic7xxx_host *p)
-{
-        return ((p->features & AHC_CMD_CHAN) == 0);
-}
-
-static int aic7xxx_patch9_func(struct aic7xxx_host *p);
-
-static int
-aic7xxx_patch9_func(struct aic7xxx_host *p)
-{
-        return ((p->chip & AHC_CHIPID_MASK) == AHC_AIC7895);
-}
-
-static int aic7xxx_patch8_func(struct aic7xxx_host *p);
-
-static int
-aic7xxx_patch8_func(struct aic7xxx_host *p)
-{
-        return ((p->features & AHC_ULTRA) != 0);
-}
-
-static int aic7xxx_patch7_func(struct aic7xxx_host *p);
-
-static int
-aic7xxx_patch7_func(struct aic7xxx_host *p)
-{
-        return ((p->features & AHC_ULTRA2) != 0);
-}
-
-static int aic7xxx_patch6_func(struct aic7xxx_host *p);
-
-static int
-aic7xxx_patch6_func(struct aic7xxx_host *p)
-{
-        return ((p->flags & AHC_PAGESCBS) == 0);
-}
-
-static int aic7xxx_patch5_func(struct aic7xxx_host *p);
-
-static int
-aic7xxx_patch5_func(struct aic7xxx_host *p)
-{
-        return ((p->flags & AHC_PAGESCBS) != 0);
-}
-
-static int aic7xxx_patch4_func(struct aic7xxx_host *p);
-
-static int
-aic7xxx_patch4_func(struct aic7xxx_host *p)
-{
-        return ((p->features & AHC_QUEUE_REGS) != 0);
-}
-
-static int aic7xxx_patch3_func(struct aic7xxx_host *p);
-
-static int
-aic7xxx_patch3_func(struct aic7xxx_host *p)
-{
-        return ((p->features & AHC_TWIN) != 0);
-}
-
-static int aic7xxx_patch2_func(struct aic7xxx_host *p);
-
-static int
-aic7xxx_patch2_func(struct aic7xxx_host *p)
-{
-        return ((p->features & AHC_QUEUE_REGS) == 0);
-}
-
-static int aic7xxx_patch1_func(struct aic7xxx_host *p);
-
-static int
-aic7xxx_patch1_func(struct aic7xxx_host *p)
-{
-        return ((p->features & AHC_CMD_CHAN) != 0);
-}
-
-static int aic7xxx_patch0_func(struct aic7xxx_host *p);
-
-static int
-aic7xxx_patch0_func(struct aic7xxx_host *p)
-{
-        return (0);
-}
-
-struct sequencer_patch {
-        int             (*patch_func)(struct aic7xxx_host *);
-        unsigned int    begin      :10,
-                        skip_instr :10,
-                        skip_patch :12;
-} sequencer_patches[] = {
-        { aic7xxx_patch1_func, 3, 2, 1 },
-        { aic7xxx_patch2_func, 7, 1, 1 },
-        { aic7xxx_patch2_func, 8, 1, 1 },
-        { aic7xxx_patch3_func, 11, 4, 1 },
-        { aic7xxx_patch4_func, 16, 3, 2 },
-        { aic7xxx_patch0_func, 19, 4, 1 },
-        { aic7xxx_patch5_func, 23, 1, 1 },
-        { aic7xxx_patch6_func, 26, 1, 1 },
-        { aic7xxx_patch1_func, 29, 1, 2 },
-        { aic7xxx_patch0_func, 30, 3, 1 },
-        { aic7xxx_patch3_func, 39, 4, 1 },
-        { aic7xxx_patch7_func, 43, 3, 2 },
-        { aic7xxx_patch0_func, 46, 3, 1 },
-        { aic7xxx_patch8_func, 52, 7, 1 },
-        { aic7xxx_patch3_func, 60, 3, 1 },
-        { aic7xxx_patch7_func, 63, 2, 1 },
-        { aic7xxx_patch7_func, 102, 1, 2 },
-        { aic7xxx_patch0_func, 103, 2, 1 },
-        { aic7xxx_patch7_func, 107, 2, 1 },
-        { aic7xxx_patch9_func, 109, 1, 1 },
-        { aic7xxx_patch10_func, 110, 2, 1 },
-        { aic7xxx_patch7_func, 113, 1, 2 },
-        { aic7xxx_patch0_func, 114, 1, 1 },
-        { aic7xxx_patch1_func, 118, 1, 1 },
-        { aic7xxx_patch1_func, 121, 3, 3 },
-        { aic7xxx_patch11_func, 123, 1, 1 },
-        { aic7xxx_patch0_func, 124, 5, 1 },
-        { aic7xxx_patch7_func, 132, 1, 1 },
-        { aic7xxx_patch9_func, 133, 1, 1 },
-        { aic7xxx_patch10_func, 134, 3, 1 },
-        { aic7xxx_patch7_func, 137, 3, 2 },
-        { aic7xxx_patch0_func, 140, 2, 1 },
-        { aic7xxx_patch7_func, 142, 5, 2 },
-        { aic7xxx_patch0_func, 147, 3, 1 },
-        { aic7xxx_patch7_func, 150, 1, 2 },
-        { aic7xxx_patch0_func, 151, 2, 1 },
-        { aic7xxx_patch1_func, 153, 15, 4 },
-        { aic7xxx_patch11_func, 166, 1, 2 },
-        { aic7xxx_patch0_func, 167, 1, 1 },
-        { aic7xxx_patch0_func, 168, 10, 1 },
-        { aic7xxx_patch7_func, 181, 1, 2 },
-        { aic7xxx_patch0_func, 182, 2, 1 },
-        { aic7xxx_patch7_func, 184, 18, 1 },
-        { aic7xxx_patch1_func, 202, 3, 3 },
-        { aic7xxx_patch7_func, 204, 1, 1 },
-        { aic7xxx_patch0_func, 205, 4, 1 },
-        { aic7xxx_patch7_func, 210, 2, 1 },
-        { aic7xxx_patch7_func, 215, 13, 3 },
-        { aic7xxx_patch12_func, 218, 1, 1 },
-        { aic7xxx_patch12_func, 219, 4, 1 },
-        { aic7xxx_patch1_func, 229, 3, 3 },
-        { aic7xxx_patch11_func, 231, 1, 1 },
-        { aic7xxx_patch0_func, 232, 5, 1 },
-        { aic7xxx_patch11_func, 237, 1, 2 },
-        { aic7xxx_patch0_func, 238, 9, 1 },
-        { aic7xxx_patch13_func, 254, 1, 2 },
-        { aic7xxx_patch0_func, 255, 1, 1 },
-        { aic7xxx_patch4_func, 316, 1, 2 },
-        { aic7xxx_patch0_func, 317, 1, 1 },
-        { aic7xxx_patch2_func, 320, 1, 1 },
-        { aic7xxx_patch1_func, 330, 3, 2 },
-        { aic7xxx_patch0_func, 333, 5, 1 },
-        { aic7xxx_patch13_func, 341, 1, 2 },
-        { aic7xxx_patch0_func, 342, 1, 1 },
-        { aic7xxx_patch5_func, 347, 1, 1 },
-        { aic7xxx_patch11_func, 389, 15, 2 },
-        { aic7xxx_patch14_func, 402, 1, 1 },
-        { aic7xxx_patch1_func, 441, 7, 2 },
-        { aic7xxx_patch0_func, 448, 8, 1 },
-        { aic7xxx_patch1_func, 457, 4, 2 },
-        { aic7xxx_patch0_func, 461, 6, 1 },
-        { aic7xxx_patch1_func, 467, 4, 2 },
-        { aic7xxx_patch0_func, 471, 3, 1 },
-        { aic7xxx_patch10_func, 481, 10, 1 },
-        { aic7xxx_patch1_func, 500, 22, 5 },
-        { aic7xxx_patch11_func, 508, 4, 1 },
-        { aic7xxx_patch7_func, 512, 7, 3 },
-        { aic7xxx_patch15_func, 512, 5, 2 },
-        { aic7xxx_patch0_func, 517, 2, 1 },
-        { aic7xxx_patch10_func, 522, 50, 3 },
-        { aic7xxx_patch14_func, 543, 17, 2 },
-        { aic7xxx_patch0_func, 560, 4, 1 },
-        { aic7xxx_patch10_func, 572, 4, 1 },
-        { aic7xxx_patch5_func, 576, 2, 1 },
-        { aic7xxx_patch5_func, 579, 9, 1 },
-
-};
diff --git a/drivers/scsi/aic7xxx_old/scsi_message.h b/drivers/scsi/aic7xxx_old/scsi_message.h
deleted file mode 100644
index a79f89c65173..000000000000
--- a/drivers/scsi/aic7xxx_old/scsi_message.h
+++ /dev/null
@@ -1,49 +0,0 @@
-/* Messages (1 byte) */              /* I/T (M)andatory or (O)ptional */
-#define MSG_CMDCOMPLETE         0x00 /* M/M */
-#define MSG_EXTENDED            0x01 /* O/O */
-#define MSG_SAVEDATAPOINTER     0x02 /* O/O */
-#define MSG_RESTOREPOINTERS     0x03 /* O/O */
-#define MSG_DISCONNECT          0x04 /* O/O */
-#define MSG_INITIATOR_DET_ERR   0x05 /* M/M */
-#define MSG_ABORT               0x06 /* O/M */
-#define MSG_MESSAGE_REJECT      0x07 /* M/M */
-#define MSG_NOOP                0x08 /* M/M */
-#define MSG_PARITY_ERROR        0x09 /* M/M */
-#define MSG_LINK_CMD_COMPLETE   0x0a /* O/O */
-#define MSG_LINK_CMD_COMPLETEF  0x0b /* O/O */
-#define MSG_BUS_DEV_RESET       0x0c /* O/M */
-#define MSG_ABORT_TAG           0x0d /* O/O */
-#define MSG_CLEAR_QUEUE         0x0e /* O/O */
-#define MSG_INIT_RECOVERY       0x0f /* O/O */
-#define MSG_REL_RECOVERY        0x10 /* O/O */
-#define MSG_TERM_IO_PROC        0x11 /* O/O */
-
-/* Messages (2 byte) */
-#define MSG_SIMPLE_Q_TAG        0x20 /* O/O */
-#define MSG_HEAD_OF_Q_TAG       0x21 /* O/O */
-#define MSG_ORDERED_Q_TAG       0x22 /* O/O */
-#define MSG_IGN_WIDE_RESIDUE    0x23 /* O/O */
-
-/* Identify message */               /* M/M */  
-#define MSG_IDENTIFYFLAG        0x80 
-#define MSG_IDENTIFY_DISCFLAG   0x40 
-#define MSG_IDENTIFY(lun, disc) (((disc) ? 0xc0 : MSG_IDENTIFYFLAG) | (lun))
-#define MSG_ISIDENTIFY(m)       ((m) & MSG_IDENTIFYFLAG)
-
-/* Extended messages (opcode and length) */
-#define MSG_EXT_SDTR            0x01
-#define MSG_EXT_SDTR_LEN        0x03
-
-#define MSG_EXT_WDTR            0x03
-#define MSG_EXT_WDTR_LEN        0x02
-#define MSG_EXT_WDTR_BUS_8_BIT  0x00
-#define MSG_EXT_WDTR_BUS_16_BIT 0x01
-#define MSG_EXT_WDTR_BUS_32_BIT 0x02
-
-#define MSG_EXT_PPR     0x04
-#define MSG_EXT_PPR_LEN 0x06
-#define MSG_EXT_PPR_OPTION_ST 0x00
-#define MSG_EXT_PPR_OPTION_DT_CRC 0x02
-#define MSG_EXT_PPR_OPTION_DT_UNITS 0x03
-#define MSG_EXT_PPR_OPTION_DT_CRC_QUICK 0x04
-#define MSG_EXT_PPR_OPTION_DT_UNITS_QUICK 0x05
diff --git a/drivers/scsi/aic7xxx_old/sequencer.h b/drivers/scsi/aic7xxx_old/sequencer.h
deleted file mode 100644
index ee66855222b1..000000000000
--- a/drivers/scsi/aic7xxx_old/sequencer.h
+++ /dev/null
@@ -1,135 +0,0 @@
-/*
- * Instruction formats for the sequencer program downloaded to
- * Aic7xxx SCSI host adapters
- *
- * Copyright (c) 1997, 1998 Justin T. Gibbs.
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions, and the following disclaimer,
- *    without modification, immediately at the beginning of the file.
- * 2. The name of the author may not be used to endorse or promote products
- *    derived from this software without specific prior written permission.
- *
- * Where this Software is combined with software released under the terms of 
- * the GNU General Public License ("GPL") and the terms of the GPL would require the 
- * combined work to also be released under the terms of the GPL, the terms
- * and conditions of this License will apply in addition to those of the
- * GPL with the exception of any terms or conditions of this License that
- * conflict with, or are expressly prohibited by, the GPL.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE FOR
- * ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- *
- *      $Id: sequencer.h,v 1.3 1997/09/27 19:37:31 gibbs Exp $
- */
-
-#ifdef __LITTLE_ENDIAN_BITFIELD
-struct ins_format1 {
-        unsigned int
-                        immediate       : 8,
-                        source          : 9,
-                        destination     : 9,
-                        ret             : 1,
-                        opcode          : 4,
-                        parity          : 1;
-};
-
-struct ins_format2 {
-        unsigned int
-                        shift_control   : 8,
-                        source          : 9,
-                        destination     : 9,
-                        ret             : 1,
-                        opcode          : 4,
-                        parity          : 1;
-};
-
-struct ins_format3 {
-        unsigned int
-                        immediate       : 8,
-                        source          : 9,
-                        address         : 10,
-                        opcode          : 4,
-                        parity          : 1;
-};
-#elif defined(__BIG_ENDIAN_BITFIELD)
-struct ins_format1 {
-        unsigned int
-                        parity          : 1,
-                        opcode          : 4,
-                        ret             : 1,
-                        destination     : 9,
-                        source          : 9,
-                        immediate       : 8;
-};
-
-struct ins_format2 {
-        unsigned int
-                        parity          : 1,
-                        opcode          : 4,
-                        ret             : 1,
-                        destination     : 9,
-                        source          : 9,
-                        shift_control   : 8;
-};
-
-struct ins_format3 {
-        unsigned int
-                        parity          : 1,
-                        opcode          : 4,
-                        address         : 10,
-                        source          : 9,
-                        immediate       : 8;
-};
-#endif
-
-union ins_formats {
-                struct ins_format1 format1;
-                struct ins_format2 format2;
-                struct ins_format3 format3;
-                unsigned char      bytes[4];
-                unsigned int       integer;
-};
-struct instruction {
-        union   ins_formats format;
-        unsigned int    srcline;
-        struct symbol *patch_label;
-  struct {
-    struct instruction *stqe_next;
-  } links;
-};
-
-#define AIC_OP_OR       0x0
-#define AIC_OP_AND      0x1
-#define AIC_OP_XOR      0x2
-#define AIC_OP_ADD      0x3
-#define AIC_OP_ADC      0x4
-#define AIC_OP_ROL      0x5
-#define AIC_OP_BMOV     0x6
-
-#define AIC_OP_JMP      0x8
-#define AIC_OP_JC       0x9
-#define AIC_OP_JNC      0xa
-#define AIC_OP_CALL     0xb
-#define AIC_OP_JNE      0xc
-#define AIC_OP_JNZ      0xd
-#define AIC_OP_JE       0xe
-#define AIC_OP_JZ       0xf
-
-/* Pseudo Ops */
-#define AIC_OP_SHL      0x10
-#define AIC_OP_SHR      0x20
-#define AIC_OP_ROR      0x30
diff --git a/drivers/scsi/be2iscsi/be_iscsi.c b/drivers/scsi/be2iscsi/be_iscsi.c
index ffadbee0b4d9..889066d9d6fb 100644
--- a/drivers/scsi/be2iscsi/be_iscsi.c
+++ b/drivers/scsi/be2iscsi/be_iscsi.c
@@ -541,10 +541,8 @@ static int be2iscsi_get_if_param(struct beiscsi_hba *phba,
                 ip_type = BE2_IPV6;
 
         len = mgmt_get_if_info(phba, ip_type, &if_info);
-        if (len) {
-                kfree(if_info);
+        if (len)
                 return len;
-        }
 
         switch (param) {
         case ISCSI_NET_PARAM_IPV4_ADDR:
@@ -569,7 +567,7 @@ static int be2iscsi_get_if_param(struct beiscsi_hba *phba,
                 break;
         case ISCSI_NET_PARAM_VLAN_ID:
                 if (if_info->vlan_priority == BEISCSI_VLAN_DISABLE)
-                        return -EINVAL;
+                        len = -EINVAL;
                 else
                         len = sprintf(buf, "%d\n",
                                      (if_info->vlan_priority &
@@ -577,7 +575,7 @@ static int be2iscsi_get_if_param(struct beiscsi_hba *phba,
                 break;
         case ISCSI_NET_PARAM_VLAN_PRIORITY:
                 if (if_info->vlan_priority == BEISCSI_VLAN_DISABLE)
-                        return -EINVAL;
+                        len = -EINVAL;
                 else
                         len = sprintf(buf, "%d\n",
                                      ((if_info->vlan_priority >> 13) &
diff --git a/drivers/scsi/bfa/bfa_core.c b/drivers/scsi/bfa/bfa_core.c
index 520540a5fef6..e3f67b097a5c 100644
--- a/drivers/scsi/bfa/bfa_core.c
+++ b/drivers/scsi/bfa/bfa_core.c
@@ -1367,10 +1367,6 @@ bfa_faa_query(struct bfa_s *bfa, struct bfa_faa_attr_s *attr,
         struct bfa_iocfc_s      *iocfc = &bfa->iocfc;
         bfa_status_t            status;
 
-        iocfc->faa_args.faa_attr = attr;
-        iocfc->faa_args.faa_cb.faa_cbfn = cbfn;
-        iocfc->faa_args.faa_cb.faa_cbarg = cbarg;
-
         status = bfa_faa_validate_request(bfa);
         if (status != BFA_STATUS_OK)
                 return status;
@@ -1378,6 +1374,10 @@ bfa_faa_query(struct bfa_s *bfa, struct bfa_faa_attr_s *attr,
         if (iocfc->faa_args.busy == BFA_TRUE)
                 return BFA_STATUS_DEVBUSY;
 
+        iocfc->faa_args.faa_attr = attr;
+        iocfc->faa_args.faa_cb.faa_cbfn = cbfn;
+        iocfc->faa_args.faa_cb.faa_cbarg = cbarg;
+
         iocfc->faa_args.busy = BFA_TRUE;
         memset(&faa_attr_req, 0, sizeof(struct bfi_faa_query_s));
         bfi_h2i_set(faa_attr_req.mh, BFI_MC_IOCFC,
diff --git a/drivers/scsi/bfa/bfa_defs.h b/drivers/scsi/bfa/bfa_defs.h
index d40a79f5265f..877b86dd2837 100644
--- a/drivers/scsi/bfa/bfa_defs.h
+++ b/drivers/scsi/bfa/bfa_defs.h
@@ -132,6 +132,7 @@ enum bfa_status {
         BFA_STATUS_ETIMER       = 5,    /*  Timer expired - Retry, if persists,
                                          *  contact support */
         BFA_STATUS_EPROTOCOL    = 6,    /*  Protocol error */
+        BFA_STATUS_BADFLASH     = 9,    /*  Flash is bad */
         BFA_STATUS_SFP_UNSUPP   = 10,   /*  Unsupported SFP - Replace SFP */
         BFA_STATUS_UNKNOWN_VFID = 11,   /*  VF_ID not found */
         BFA_STATUS_DATACORRUPTED = 12,  /*  Diag returned data corrupted */
diff --git a/drivers/scsi/bfa/bfa_fc.h b/drivers/scsi/bfa/bfa_fc.h
index 562ef739b0bc..64069a0a3d0d 100644
--- a/drivers/scsi/bfa/bfa_fc.h
+++ b/drivers/scsi/bfa/bfa_fc.h
@@ -1026,7 +1026,7 @@ struct fc_alpabm_s {
 #define FC_ED_TOV       2
 #define FC_REC_TOV      (FC_ED_TOV + 1)
 #define FC_RA_TOV       10
-#define FC_ELS_TOV      ((2 * FC_RA_TOV) + 1)
+#define FC_ELS_TOV      (2 * FC_RA_TOV)
 #define FC_FCCT_TOV     (3 * FC_RA_TOV)
 
 /*
diff --git a/drivers/scsi/bfa/bfa_fcs_lport.c b/drivers/scsi/bfa/bfa_fcs_lport.c
index f5e4e61a0fd7..ff75ef891755 100644
--- a/drivers/scsi/bfa/bfa_fcs_lport.c
+++ b/drivers/scsi/bfa/bfa_fcs_lport.c
@@ -773,7 +773,20 @@ bfa_fcs_lport_uf_recv(struct bfa_fcs_lport_s *lport,
         bfa_trc(lport->fcs, fchs->type);
 
         if (!bfa_fcs_lport_is_online(lport)) {
-                bfa_stats(lport, uf_recv_drops);
+                /*
+                 * In direct attach topology, it is possible to get a PLOGI
+                 * before the lport is online due to port feature
+                 * (QoS/Trunk/FEC/CR), so send a rjt
+                 */
+                if ((fchs->type == FC_TYPE_ELS) &&
+                        (els_cmd->els_code == FC_ELS_PLOGI)) {
+                        bfa_fcs_lport_send_ls_rjt(lport, fchs,
+                                FC_LS_RJT_RSN_UNABLE_TO_PERF_CMD,
+                                FC_LS_RJT_EXP_NO_ADDL_INFO);
+                        bfa_stats(lport, plogi_rcvd);
+                } else
+                        bfa_stats(lport, uf_recv_drops);
+
                 return;
         }
 
diff --git a/drivers/scsi/bfa/bfa_ioc.c b/drivers/scsi/bfa/bfa_ioc.c
index f78bcb6696b2..65180e15de6e 100644
--- a/drivers/scsi/bfa/bfa_ioc.c
+++ b/drivers/scsi/bfa/bfa_ioc.c
@@ -21,6 +21,7 @@
 #include "bfi_reg.h"
 #include "bfa_defs.h"
 #include "bfa_defs_svc.h"
+#include "bfi.h"
 
 BFA_TRC_FILE(CNA, IOC);
 
@@ -45,6 +46,14 @@ BFA_TRC_FILE(CNA, IOC);
 
 #define BFA_DBG_FWTRC_OFF(_fn)  (BFI_IOC_TRC_OFF + BFA_DBG_FWTRC_LEN * (_fn))
 
+#define bfa_ioc_state_disabled(__sm)            \
+        (((__sm) == BFI_IOC_UNINIT) ||          \
+        ((__sm) == BFI_IOC_INITING) ||          \
+        ((__sm) == BFI_IOC_HWINIT) ||           \
+        ((__sm) == BFI_IOC_DISABLED) ||         \
+        ((__sm) == BFI_IOC_FAIL) ||             \
+        ((__sm) == BFI_IOC_CFG_DISABLED))
+
 /*
  * Asic specific macros : see bfa_hw_cb.c and bfa_hw_ct.c for details.
  */
@@ -102,6 +111,12 @@ static void bfa_ioc_disable_comp(struct bfa_ioc_s *ioc);
 static void bfa_ioc_lpu_stop(struct bfa_ioc_s *ioc);
 static void bfa_ioc_fail_notify(struct bfa_ioc_s *ioc);
 static void bfa_ioc_pf_fwmismatch(struct bfa_ioc_s *ioc);
+static enum bfi_ioc_img_ver_cmp_e bfa_ioc_fw_ver_patch_cmp(
+                                struct bfi_ioc_image_hdr_s *base_fwhdr,
+                                struct bfi_ioc_image_hdr_s *fwhdr_to_cmp);
+static enum bfi_ioc_img_ver_cmp_e bfa_ioc_flash_fwver_cmp(
+                                struct bfa_ioc_s *ioc,
+                                struct bfi_ioc_image_hdr_s *base_fwhdr);
 
 /*
  * IOC state machine definitions/declarations
@@ -1454,28 +1469,42 @@ bfa_ioc_fwver_get(struct bfa_ioc_s *ioc, struct bfi_ioc_image_hdr_s *fwhdr)
 }
 
 /*
- * Returns TRUE if same.
+ * Returns TRUE if driver is willing to work with current smem f/w version.
  */
 bfa_boolean_t
-bfa_ioc_fwver_cmp(struct bfa_ioc_s *ioc, struct bfi_ioc_image_hdr_s *fwhdr)
+bfa_ioc_fwver_cmp(struct bfa_ioc_s *ioc,
+                struct bfi_ioc_image_hdr_s *smem_fwhdr)
 {
         struct bfi_ioc_image_hdr_s *drv_fwhdr;
-        int i;
+        enum bfi_ioc_img_ver_cmp_e smem_flash_cmp, drv_smem_cmp;
 
         drv_fwhdr = (struct bfi_ioc_image_hdr_s *)
                 bfa_cb_image_get_chunk(bfa_ioc_asic_gen(ioc), 0);
 
-        for (i = 0; i < BFI_IOC_MD5SUM_SZ; i++) {
-                if (fwhdr->md5sum[i] != cpu_to_le32(drv_fwhdr->md5sum[i])) {
-                        bfa_trc(ioc, i);
-                        bfa_trc(ioc, fwhdr->md5sum[i]);
-                        bfa_trc(ioc, drv_fwhdr->md5sum[i]);
-                        return BFA_FALSE;
-                }
+        /*
+         * If smem is incompatible or old, driver should not work with it.
+         */
+        drv_smem_cmp = bfa_ioc_fw_ver_patch_cmp(drv_fwhdr, smem_fwhdr);
+        if (drv_smem_cmp == BFI_IOC_IMG_VER_INCOMP ||
+                drv_smem_cmp == BFI_IOC_IMG_VER_OLD) {
+                return BFA_FALSE;
         }
 
-        bfa_trc(ioc, fwhdr->md5sum[0]);
-        return BFA_TRUE;
+        /*
+         * IF Flash has a better F/W than smem do not work with smem.
+         * If smem f/w == flash f/w, as smem f/w not old | incmp, work with it.
+         * If Flash is old or incomp work with smem iff smem f/w == drv f/w.
+         */
+        smem_flash_cmp = bfa_ioc_flash_fwver_cmp(ioc, smem_fwhdr);
+
+        if (smem_flash_cmp == BFI_IOC_IMG_VER_BETTER) {
+                return BFA_FALSE;
+        } else if (smem_flash_cmp == BFI_IOC_IMG_VER_SAME) {
+                return BFA_TRUE;
+        } else {
+                return (drv_smem_cmp == BFI_IOC_IMG_VER_SAME) ?
+                        BFA_TRUE : BFA_FALSE;
+        }
 }
 
 /*
@@ -1485,17 +1514,9 @@ bfa_ioc_fwver_cmp(struct bfa_ioc_s *ioc, struct bfi_ioc_image_hdr_s *fwhdr)
 static bfa_boolean_t
 bfa_ioc_fwver_valid(struct bfa_ioc_s *ioc, u32 boot_env)
 {
-        struct bfi_ioc_image_hdr_s fwhdr, *drv_fwhdr;
+        struct bfi_ioc_image_hdr_s fwhdr;
 
         bfa_ioc_fwver_get(ioc, &fwhdr);
-        drv_fwhdr = (struct bfi_ioc_image_hdr_s *)
-                bfa_cb_image_get_chunk(bfa_ioc_asic_gen(ioc), 0);
-
-        if (fwhdr.signature != cpu_to_le32(drv_fwhdr->signature)) {
-                bfa_trc(ioc, fwhdr.signature);
-                bfa_trc(ioc, drv_fwhdr->signature);
-                return BFA_FALSE;
-        }
 
         if (swab32(fwhdr.bootenv) != boot_env) {
                 bfa_trc(ioc, fwhdr.bootenv);
@@ -1506,6 +1527,168 @@ bfa_ioc_fwver_valid(struct bfa_ioc_s *ioc, u32 boot_env)
         return bfa_ioc_fwver_cmp(ioc, &fwhdr);
 }
 
+static bfa_boolean_t
+bfa_ioc_fwver_md5_check(struct bfi_ioc_image_hdr_s *fwhdr_1,
+                                struct bfi_ioc_image_hdr_s *fwhdr_2)
+{
+        int i;
+
+        for (i = 0; i < BFI_IOC_MD5SUM_SZ; i++)
+                if (fwhdr_1->md5sum[i] != fwhdr_2->md5sum[i])
+                        return BFA_FALSE;
+
+        return BFA_TRUE;
+}
+
+/*
+ * Returns TRUE if major minor and maintainence are same.
+ * If patch versions are same, check for MD5 Checksum to be same.
+ */
+static bfa_boolean_t
+bfa_ioc_fw_ver_compatible(struct bfi_ioc_image_hdr_s *drv_fwhdr,
+                                struct bfi_ioc_image_hdr_s *fwhdr_to_cmp)
+{
+        if (drv_fwhdr->signature != fwhdr_to_cmp->signature)
+                return BFA_FALSE;
+
+        if (drv_fwhdr->fwver.major != fwhdr_to_cmp->fwver.major)
+                return BFA_FALSE;
+
+        if (drv_fwhdr->fwver.minor != fwhdr_to_cmp->fwver.minor)
+                return BFA_FALSE;
+
+        if (drv_fwhdr->fwver.maint != fwhdr_to_cmp->fwver.maint)
+                return BFA_FALSE;
+
+        if (drv_fwhdr->fwver.patch == fwhdr_to_cmp->fwver.patch &&
+                drv_fwhdr->fwver.phase == fwhdr_to_cmp->fwver.phase &&
+                drv_fwhdr->fwver.build == fwhdr_to_cmp->fwver.build) {
+                return bfa_ioc_fwver_md5_check(drv_fwhdr, fwhdr_to_cmp);
+        }
+
+        return BFA_TRUE;
+}
+
+static bfa_boolean_t
+bfa_ioc_flash_fwver_valid(struct bfi_ioc_image_hdr_s *flash_fwhdr)
+{
+        if (flash_fwhdr->fwver.major == 0 || flash_fwhdr->fwver.major == 0xFF)
+                return BFA_FALSE;
+
+        return BFA_TRUE;
+}
+
+static bfa_boolean_t fwhdr_is_ga(struct bfi_ioc_image_hdr_s *fwhdr)
+{
+        if (fwhdr->fwver.phase == 0 &&
+                fwhdr->fwver.build == 0)
+                return BFA_TRUE;
+
+        return BFA_FALSE;
+}
+
+/*
+ * Returns TRUE if both are compatible and patch of fwhdr_to_cmp is better.
+ */
+static enum bfi_ioc_img_ver_cmp_e
+bfa_ioc_fw_ver_patch_cmp(struct bfi_ioc_image_hdr_s *base_fwhdr,
+                                struct bfi_ioc_image_hdr_s *fwhdr_to_cmp)
+{
+        if (bfa_ioc_fw_ver_compatible(base_fwhdr, fwhdr_to_cmp) == BFA_FALSE)
+                return BFI_IOC_IMG_VER_INCOMP;
+
+        if (fwhdr_to_cmp->fwver.patch > base_fwhdr->fwver.patch)
+                return BFI_IOC_IMG_VER_BETTER;
+
+        else if (fwhdr_to_cmp->fwver.patch < base_fwhdr->fwver.patch)
+                return BFI_IOC_IMG_VER_OLD;
+
+        /*
+         * GA takes priority over internal builds of the same patch stream.
+         * At this point major minor maint and patch numbers are same.
+         */
+
+        if (fwhdr_is_ga(base_fwhdr) == BFA_TRUE) {
+                if (fwhdr_is_ga(fwhdr_to_cmp))
+                        return BFI_IOC_IMG_VER_SAME;
+                else
+                        return BFI_IOC_IMG_VER_OLD;
+        } else {
+                if (fwhdr_is_ga(fwhdr_to_cmp))
+                        return BFI_IOC_IMG_VER_BETTER;
+        }
+
+        if (fwhdr_to_cmp->fwver.phase > base_fwhdr->fwver.phase)
+                return BFI_IOC_IMG_VER_BETTER;
+        else if (fwhdr_to_cmp->fwver.phase < base_fwhdr->fwver.phase)
+                return BFI_IOC_IMG_VER_OLD;
+
+        if (fwhdr_to_cmp->fwver.build > base_fwhdr->fwver.build)
+                return BFI_IOC_IMG_VER_BETTER;
+        else if (fwhdr_to_cmp->fwver.build < base_fwhdr->fwver.build)
+                return BFI_IOC_IMG_VER_OLD;
+
+        /*
+         * All Version Numbers are equal.
+         * Md5 check to be done as a part of compatibility check.
+         */
+        return BFI_IOC_IMG_VER_SAME;
+}
+
+#define BFA_FLASH_PART_FWIMG_ADDR       0x100000 /* fw image address */
+
+bfa_status_t
+bfa_ioc_flash_img_get_chnk(struct bfa_ioc_s *ioc, u32 off,
+                                u32 *fwimg)
+{
+        return bfa_flash_raw_read(ioc->pcidev.pci_bar_kva,
+                        BFA_FLASH_PART_FWIMG_ADDR + (off * sizeof(u32)),
+                        (char *)fwimg, BFI_FLASH_CHUNK_SZ);
+}
+
+static enum bfi_ioc_img_ver_cmp_e
+bfa_ioc_flash_fwver_cmp(struct bfa_ioc_s *ioc,
+                        struct bfi_ioc_image_hdr_s *base_fwhdr)
+{
+        struct bfi_ioc_image_hdr_s *flash_fwhdr;
+        bfa_status_t status;
+        u32 fwimg[BFI_FLASH_CHUNK_SZ_WORDS];
+
+        status = bfa_ioc_flash_img_get_chnk(ioc, 0, fwimg);
+        if (status != BFA_STATUS_OK)
+                return BFI_IOC_IMG_VER_INCOMP;
+
+        flash_fwhdr = (struct bfi_ioc_image_hdr_s *) fwimg;
+        if (bfa_ioc_flash_fwver_valid(flash_fwhdr) == BFA_TRUE)
+                return bfa_ioc_fw_ver_patch_cmp(base_fwhdr, flash_fwhdr);
+        else
+                return BFI_IOC_IMG_VER_INCOMP;
+}
+
+
+/*
+ * Invalidate fwver signature
+ */
+bfa_status_t
+bfa_ioc_fwsig_invalidate(struct bfa_ioc_s *ioc)
+{
+
+        u32     pgnum, pgoff;
+        u32     loff = 0;
+        enum bfi_ioc_state ioc_fwstate;
+
+        ioc_fwstate = bfa_ioc_get_cur_ioc_fwstate(ioc);
+        if (!bfa_ioc_state_disabled(ioc_fwstate))
+                return BFA_STATUS_ADAPTER_ENABLED;
+
+        pgnum = PSS_SMEM_PGNUM(ioc->ioc_regs.smem_pg0, loff);
+        pgoff = PSS_SMEM_PGOFF(loff);
+        writel(pgnum, ioc->ioc_regs.host_page_num_fn);
+        bfa_mem_write(ioc->ioc_regs.smem_page_start, loff, BFA_IOC_FW_INV_SIGN);
+
+        return BFA_STATUS_OK;
+}
+
 /*
  * Conditionally flush any pending message from firmware at start.
  */
@@ -1544,8 +1727,8 @@ bfa_ioc_hwinit(struct bfa_ioc_s *ioc, bfa_boolean_t force)
                 BFA_FALSE : bfa_ioc_fwver_valid(ioc, boot_env);
 
         if (!fwvalid) {
-                bfa_ioc_boot(ioc, boot_type, boot_env);
-                bfa_ioc_poll_fwinit(ioc);
+                if (bfa_ioc_boot(ioc, boot_type, boot_env) == BFA_STATUS_OK)
+                        bfa_ioc_poll_fwinit(ioc);
                 return;
         }
 
@@ -1580,8 +1763,8 @@ bfa_ioc_hwinit(struct bfa_ioc_s *ioc, bfa_boolean_t force)
         /*
          * Initialize the h/w for any other states.
          */
-        bfa_ioc_boot(ioc, boot_type, boot_env);
-        bfa_ioc_poll_fwinit(ioc);
+        if (bfa_ioc_boot(ioc, boot_type, boot_env) == BFA_STATUS_OK)
+                bfa_ioc_poll_fwinit(ioc);
 }
 
 static void
@@ -1684,7 +1867,7 @@ bfa_ioc_hb_monitor(struct bfa_ioc_s *ioc)
 /*
  *      Initiate a full firmware download.
  */
-static void
+static bfa_status_t
 bfa_ioc_download_fw(struct bfa_ioc_s *ioc, u32 boot_type,
                     u32 boot_env)
 {
@@ -1694,28 +1877,60 @@ bfa_ioc_download_fw(struct bfa_ioc_s *ioc, u32 boot_type,
         u32 chunkno = 0;
         u32 i;
         u32 asicmode;
+        u32 fwimg_size;
+        u32 fwimg_buf[BFI_FLASH_CHUNK_SZ_WORDS];
+        bfa_status_t status;
+
+        if (boot_env == BFI_FWBOOT_ENV_OS &&
+                boot_type == BFI_FWBOOT_TYPE_FLASH) {
+                fwimg_size = BFI_FLASH_IMAGE_SZ/sizeof(u32);
+
+                status = bfa_ioc_flash_img_get_chnk(ioc,
+                        BFA_IOC_FLASH_CHUNK_ADDR(chunkno), fwimg_buf);
+                if (status != BFA_STATUS_OK)
+                        return status;
+
+                fwimg = fwimg_buf;
+        } else {
+                fwimg_size = bfa_cb_image_get_size(bfa_ioc_asic_gen(ioc));
+                fwimg = bfa_cb_image_get_chunk(bfa_ioc_asic_gen(ioc),
+                                        BFA_IOC_FLASH_CHUNK_ADDR(chunkno));
+        }
+
+        bfa_trc(ioc, fwimg_size);
 
-        bfa_trc(ioc, bfa_cb_image_get_size(bfa_ioc_asic_gen(ioc)));
-        fwimg = bfa_cb_image_get_chunk(bfa_ioc_asic_gen(ioc), chunkno);
 
         pgnum = PSS_SMEM_PGNUM(ioc->ioc_regs.smem_pg0, loff);
         pgoff = PSS_SMEM_PGOFF(loff);
 
         writel(pgnum, ioc->ioc_regs.host_page_num_fn);
 
-        for (i = 0; i < bfa_cb_image_get_size(bfa_ioc_asic_gen(ioc)); i++) {
+        for (i = 0; i < fwimg_size; i++) {
 
                 if (BFA_IOC_FLASH_CHUNK_NO(i) != chunkno) {
                         chunkno = BFA_IOC_FLASH_CHUNK_NO(i);
-                        fwimg = bfa_cb_image_get_chunk(bfa_ioc_asic_gen(ioc),
+
+                        if (boot_env == BFI_FWBOOT_ENV_OS &&
+                                boot_type == BFI_FWBOOT_TYPE_FLASH) {
+                                status = bfa_ioc_flash_img_get_chnk(ioc,
+                                        BFA_IOC_FLASH_CHUNK_ADDR(chunkno),
+                                        fwimg_buf);
+                                if (status != BFA_STATUS_OK)
+                                        return status;
+
+                                fwimg = fwimg_buf;
+                        } else {
+                                fwimg = bfa_cb_image_get_chunk(
+                                        bfa_ioc_asic_gen(ioc),
                                         BFA_IOC_FLASH_CHUNK_ADDR(chunkno));
+                        }
                 }
 
                 /*
                  * write smem
                  */
                 bfa_mem_write(ioc->ioc_regs.smem_page_start, loff,
-                        cpu_to_le32(fwimg[BFA_IOC_FLASH_OFFSET_IN_CHUNK(i)]));
+                              fwimg[BFA_IOC_FLASH_OFFSET_IN_CHUNK(i)]);
 
                 loff += sizeof(u32);
 
@@ -1733,8 +1948,12 @@ bfa_ioc_download_fw(struct bfa_ioc_s *ioc, u32 boot_type,
                         ioc->ioc_regs.host_page_num_fn);
 
         /*
-         * Set boot type and device mode at the end.
+         * Set boot type, env and device mode at the end.
          */
+        if (boot_env == BFI_FWBOOT_ENV_OS &&
+                boot_type == BFI_FWBOOT_TYPE_FLASH) {
+                boot_type = BFI_FWBOOT_TYPE_NORMAL;
+        }
         asicmode = BFI_FWBOOT_DEVMODE(ioc->asic_gen, ioc->asic_mode,
                                 ioc->port0_mode, ioc->port1_mode);
         bfa_mem_write(ioc->ioc_regs.smem_page_start, BFI_FWBOOT_DEVMODE_OFF,
@@ -1743,6 +1962,7 @@ bfa_ioc_download_fw(struct bfa_ioc_s *ioc, u32 boot_type,
                         swab32(boot_type));
         bfa_mem_write(ioc->ioc_regs.smem_page_start, BFI_FWBOOT_ENV_OFF,
                         swab32(boot_env));
+        return BFA_STATUS_OK;
 }
 
 
@@ -2002,13 +2222,30 @@ bfa_ioc_pll_init(struct bfa_ioc_s *ioc)
  * Interface used by diag module to do firmware boot with memory test
  * as the entry vector.
  */
-void
+bfa_status_t
 bfa_ioc_boot(struct bfa_ioc_s *ioc, u32 boot_type, u32 boot_env)
 {
+        struct bfi_ioc_image_hdr_s *drv_fwhdr;
+        bfa_status_t status;
         bfa_ioc_stats(ioc, ioc_boots);
 
         if (bfa_ioc_pll_init(ioc) != BFA_STATUS_OK)
-                return;
+                return BFA_STATUS_FAILED;
+
+        if (boot_env == BFI_FWBOOT_ENV_OS &&
+                boot_type == BFI_FWBOOT_TYPE_NORMAL) {
+
+                drv_fwhdr = (struct bfi_ioc_image_hdr_s *)
+                        bfa_cb_image_get_chunk(bfa_ioc_asic_gen(ioc), 0);
+
+                /*
+                 * Work with Flash iff flash f/w is better than driver f/w.
+                 * Otherwise push drivers firmware.
+                 */
+                if (bfa_ioc_flash_fwver_cmp(ioc, drv_fwhdr) ==
+                                                BFI_IOC_IMG_VER_BETTER)
+                        boot_type = BFI_FWBOOT_TYPE_FLASH;
+        }
 
         /*
          * Initialize IOC state of all functions on a chip reset.
@@ -2022,8 +2259,14 @@ bfa_ioc_boot(struct bfa_ioc_s *ioc, u32 boot_type, u32 boot_env)
         }
 
         bfa_ioc_msgflush(ioc);
-        bfa_ioc_download_fw(ioc, boot_type, boot_env);
-        bfa_ioc_lpu_start(ioc);
+        status = bfa_ioc_download_fw(ioc, boot_type, boot_env);
+        if (status == BFA_STATUS_OK)
+                bfa_ioc_lpu_start(ioc);
+        else {
+                WARN_ON(boot_type == BFI_FWBOOT_TYPE_MEMTEST);
+                bfa_iocpf_timeout(ioc);
+        }
+        return status;
 }
 
 /*
@@ -2419,14 +2662,6 @@ bfa_ioc_fw_mismatch(struct bfa_ioc_s *ioc)
                 bfa_fsm_cmp_state(&ioc->iocpf, bfa_iocpf_sm_mismatch);
 }
 
-#define bfa_ioc_state_disabled(__sm)            \
-        (((__sm) == BFI_IOC_UNINIT) ||          \
-         ((__sm) == BFI_IOC_INITING) ||         \
-         ((__sm) == BFI_IOC_HWINIT) ||          \
-         ((__sm) == BFI_IOC_DISABLED) ||        \
-         ((__sm) == BFI_IOC_FAIL) ||            \
-         ((__sm) == BFI_IOC_CFG_DISABLED))
-
 /*
  * Check if adapter is disabled -- both IOCs should be in a disabled
  * state.
@@ -6423,3 +6658,407 @@ bfa_fru_intr(void *fruarg, struct bfi_mbmsg_s *msg)
                 WARN_ON(1);
         }
 }
+
+/*
+ * register definitions
+ */
+#define FLI_CMD_REG                     0x0001d000
+#define FLI_RDDATA_REG                  0x0001d010
+#define FLI_ADDR_REG                    0x0001d004
+#define FLI_DEV_STATUS_REG              0x0001d014
+
+#define BFA_FLASH_FIFO_SIZE             128     /* fifo size */
+#define BFA_FLASH_CHECK_MAX             10000   /* max # of status check */
+#define BFA_FLASH_BLOCKING_OP_MAX       1000000 /* max # of blocking op check */
+#define BFA_FLASH_WIP_MASK              0x01    /* write in progress bit mask */
+
+enum bfa_flash_cmd {
+        BFA_FLASH_FAST_READ     = 0x0b, /* fast read */
+        BFA_FLASH_READ_STATUS   = 0x05, /* read status */
+};
+
+/**
+ * @brief hardware error definition
+ */
+enum bfa_flash_err {
+        BFA_FLASH_NOT_PRESENT   = -1,   /*!< flash not present */
+        BFA_FLASH_UNINIT        = -2,   /*!< flash not initialized */
+        BFA_FLASH_BAD           = -3,   /*!< flash bad */
+        BFA_FLASH_BUSY          = -4,   /*!< flash busy */
+        BFA_FLASH_ERR_CMD_ACT   = -5,   /*!< command active never cleared */
+        BFA_FLASH_ERR_FIFO_CNT  = -6,   /*!< fifo count never cleared */
+        BFA_FLASH_ERR_WIP       = -7,   /*!< write-in-progress never cleared */
+        BFA_FLASH_ERR_TIMEOUT   = -8,   /*!< fli timeout */
+        BFA_FLASH_ERR_LEN       = -9,   /*!< invalid length */
+};
+
+/**
+ * @brief flash command register data structure
+ */
+union bfa_flash_cmd_reg_u {
+        struct {
+#ifdef __BIG_ENDIAN
+                u32     act:1;
+                u32     rsv:1;
+                u32     write_cnt:9;
+                u32     read_cnt:9;
+                u32     addr_cnt:4;
+                u32     cmd:8;
+#else
+                u32     cmd:8;
+                u32     addr_cnt:4;
+                u32     read_cnt:9;
+                u32     write_cnt:9;
+                u32     rsv:1;
+                u32     act:1;
+#endif
+        } r;
+        u32     i;
+};
+
+/**
+ * @brief flash device status register data structure
+ */
+union bfa_flash_dev_status_reg_u {
+        struct {
+#ifdef __BIG_ENDIAN
+                u32     rsv:21;
+                u32     fifo_cnt:6;
+                u32     busy:1;
+                u32     init_status:1;
+                u32     present:1;
+                u32     bad:1;
+                u32     good:1;
+#else
+                u32     good:1;
+                u32     bad:1;
+                u32     present:1;
+                u32     init_status:1;
+                u32     busy:1;
+                u32     fifo_cnt:6;
+                u32     rsv:21;
+#endif
+        } r;
+        u32     i;
+};
+
+/**
+ * @brief flash address register data structure
+ */
+union bfa_flash_addr_reg_u {
+        struct {
+#ifdef __BIG_ENDIAN
+                u32     addr:24;
+                u32     dummy:8;
+#else
+                u32     dummy:8;
+                u32     addr:24;
+#endif
+        } r;
+        u32     i;
+};
+
+/**
+ * dg flash_raw_private Flash raw private functions
+ */
+static void
+bfa_flash_set_cmd(void __iomem *pci_bar, u8 wr_cnt,
+                  u8 rd_cnt, u8 ad_cnt, u8 op)
+{
+        union bfa_flash_cmd_reg_u cmd;
+
+        cmd.i = 0;
+        cmd.r.act = 1;
+        cmd.r.write_cnt = wr_cnt;
+        cmd.r.read_cnt = rd_cnt;
+        cmd.r.addr_cnt = ad_cnt;
+        cmd.r.cmd = op;
+        writel(cmd.i, (pci_bar + FLI_CMD_REG));
+}
+
+static void
+bfa_flash_set_addr(void __iomem *pci_bar, u32 address)
+{
+        union bfa_flash_addr_reg_u addr;
+
+        addr.r.addr = address & 0x00ffffff;
+        addr.r.dummy = 0;
+        writel(addr.i, (pci_bar + FLI_ADDR_REG));
+}
+
+static int
+bfa_flash_cmd_act_check(void __iomem *pci_bar)
+{
+        union bfa_flash_cmd_reg_u cmd;
+
+        cmd.i = readl(pci_bar + FLI_CMD_REG);
+
+        if (cmd.r.act)
+                return BFA_FLASH_ERR_CMD_ACT;
+
+        return 0;
+}
+
+/**
+ * @brief
+ * Flush FLI data fifo.
+ *
+ * @param[in] pci_bar - pci bar address
+ * @param[in] dev_status - device status
+ *
+ * Return 0 on success, negative error number on error.
+ */
+static u32
+bfa_flash_fifo_flush(void __iomem *pci_bar)
+{
+        u32 i;
+        u32 t;
+        union bfa_flash_dev_status_reg_u dev_status;
+
+        dev_status.i = readl(pci_bar + FLI_DEV_STATUS_REG);
+
+        if (!dev_status.r.fifo_cnt)
+                return 0;
+
+        /* fifo counter in terms of words */
+        for (i = 0; i < dev_status.r.fifo_cnt; i++)
+                t = readl(pci_bar + FLI_RDDATA_REG);
+
+        /*
+         * Check the device status. It may take some time.
+         */
+        for (i = 0; i < BFA_FLASH_CHECK_MAX; i++) {
+                dev_status.i = readl(pci_bar + FLI_DEV_STATUS_REG);
+                if (!dev_status.r.fifo_cnt)
+                        break;
+        }
+
+        if (dev_status.r.fifo_cnt)
+                return BFA_FLASH_ERR_FIFO_CNT;
+
+        return 0;
+}
+
+/**
+ * @brief
+ * Read flash status.
+ *
+ * @param[in] pci_bar - pci bar address
+ *
+ * Return 0 on success, negative error number on error.
+*/
+static u32
+bfa_flash_status_read(void __iomem *pci_bar)
+{
+        union bfa_flash_dev_status_reg_u        dev_status;
+        u32                             status;
+        u32                     ret_status;
+        int                             i;
+
+        status = bfa_flash_fifo_flush(pci_bar);
+        if (status < 0)
+                return status;
+
+        bfa_flash_set_cmd(pci_bar, 0, 4, 0, BFA_FLASH_READ_STATUS);
+
+        for (i = 0; i < BFA_FLASH_CHECK_MAX; i++) {
+                status = bfa_flash_cmd_act_check(pci_bar);
+                if (!status)
+                        break;
+        }
+
+        if (status)
+                return status;
+
+        dev_status.i = readl(pci_bar + FLI_DEV_STATUS_REG);
+        if (!dev_status.r.fifo_cnt)
+                return BFA_FLASH_BUSY;
+
+        ret_status = readl(pci_bar + FLI_RDDATA_REG);
+        ret_status >>= 24;
+
+        status = bfa_flash_fifo_flush(pci_bar);
+        if (status < 0)
+                return status;
+
+        return ret_status;
+}
+
+/**
+ * @brief
+ * Start flash read operation.
+ *
+ * @param[in] pci_bar - pci bar address
+ * @param[in] offset - flash address offset
+ * @param[in] len - read data length
+ * @param[in] buf - read data buffer
+ *
+ * Return 0 on success, negative error number on error.
+ */
+static u32
+bfa_flash_read_start(void __iomem *pci_bar, u32 offset, u32 len,
+                         char *buf)
+{
+        u32 status;
+
+        /*
+         * len must be mutiple of 4 and not exceeding fifo size
+         */
+        if (len == 0 || len > BFA_FLASH_FIFO_SIZE || (len & 0x03) != 0)
+                return BFA_FLASH_ERR_LEN;
+
+        /*
+         * check status
+         */
+        status = bfa_flash_status_read(pci_bar);
+        if (status == BFA_FLASH_BUSY)
+                status = bfa_flash_status_read(pci_bar);
+
+        if (status < 0)
+                return status;
+
+        /*
+         * check if write-in-progress bit is cleared
+         */
+        if (status & BFA_FLASH_WIP_MASK)
+                return BFA_FLASH_ERR_WIP;
+
+        bfa_flash_set_addr(pci_bar, offset);
+
+        bfa_flash_set_cmd(pci_bar, 0, (u8)len, 4, BFA_FLASH_FAST_READ);
+
+        return 0;
+}
+
+/**
+ * @brief
+ * Check flash read operation.
+ *
+ * @param[in] pci_bar - pci bar address
+ *
+ * Return flash device status, 1 if busy, 0 if not.
+ */
+static u32
+bfa_flash_read_check(void __iomem *pci_bar)
+{
+        if (bfa_flash_cmd_act_check(pci_bar))
+                return 1;
+
+        return 0;
+}
+/**
+ * @brief
+ * End flash read operation.
+ *
+ * @param[in] pci_bar - pci bar address
+ * @param[in] len - read data length
+ * @param[in] buf - read data buffer
+ *
+ */
+static void
+bfa_flash_read_end(void __iomem *pci_bar, u32 len, char *buf)
+{
+
+        u32 i;
+
+        /*
+         * read data fifo up to 32 words
+         */
+        for (i = 0; i < len; i += 4) {
+                u32 w = readl(pci_bar + FLI_RDDATA_REG);
+                *((u32 *) (buf + i)) = swab32(w);
+        }
+
+        bfa_flash_fifo_flush(pci_bar);
+}
+
+/**
+ * @brief
+ * Perform flash raw read.
+ *
+ * @param[in] pci_bar - pci bar address
+ * @param[in] offset - flash partition address offset
+ * @param[in] buf - read data buffer
+ * @param[in] len - read data length
+ *
+ * Return status.
+ */
+
+
+#define FLASH_BLOCKING_OP_MAX   500
+#define FLASH_SEM_LOCK_REG      0x18820
+
+static int
+bfa_raw_sem_get(void __iomem *bar)
+{
+        int     locked;
+
+        locked = readl((bar + FLASH_SEM_LOCK_REG));
+        return !locked;
+
+}
+
+bfa_status_t
+bfa_flash_sem_get(void __iomem *bar)
+{
+        u32 n = FLASH_BLOCKING_OP_MAX;
+
+        while (!bfa_raw_sem_get(bar)) {
+                if (--n <= 0)
+                        return BFA_STATUS_BADFLASH;
+                udelay(10000);
+        }
+        return BFA_STATUS_OK;
+}
+
+void
+bfa_flash_sem_put(void __iomem *bar)
+{
+        writel(0, (bar + FLASH_SEM_LOCK_REG));
+}
+
+bfa_status_t
+bfa_flash_raw_read(void __iomem *pci_bar, u32 offset, char *buf,
+                       u32 len)
+{
+        u32 n, status;
+        u32 off, l, s, residue, fifo_sz;
+
+        residue = len;
+        off = 0;
+        fifo_sz = BFA_FLASH_FIFO_SIZE;
+        status = bfa_flash_sem_get(pci_bar);
+        if (status != BFA_STATUS_OK)
+                return status;
+
+        while (residue) {
+                s = offset + off;
+                n = s / fifo_sz;
+                l = (n + 1) * fifo_sz - s;
+                if (l > residue)
+                        l = residue;
+
+                status = bfa_flash_read_start(pci_bar, offset + off, l,
+                                                                &buf[off]);
+                if (status < 0) {
+                        bfa_flash_sem_put(pci_bar);
+                        return BFA_STATUS_FAILED;
+                }
+
+                n = BFA_FLASH_BLOCKING_OP_MAX;
+                while (bfa_flash_read_check(pci_bar)) {
+                        if (--n <= 0) {
+                                bfa_flash_sem_put(pci_bar);
+                                return BFA_STATUS_FAILED;
+                        }
+                }
+
+                bfa_flash_read_end(pci_bar, l, &buf[off]);
+
+                residue -= l;
+                off += l;
+        }
+        bfa_flash_sem_put(pci_bar);
+
+        return BFA_STATUS_OK;
+}
diff --git a/drivers/scsi/bfa/bfa_ioc.h b/drivers/scsi/bfa/bfa_ioc.h
index 90814fe85ac1..2e28392c2fb6 100644
--- a/drivers/scsi/bfa/bfa_ioc.h
+++ b/drivers/scsi/bfa/bfa_ioc.h
@@ -515,6 +515,8 @@ void bfa_flash_attach(struct bfa_flash_s *flash, struct bfa_ioc_s *ioc,
                 void *dev, struct bfa_trc_mod_s *trcmod, bfa_boolean_t mincfg);
 void bfa_flash_memclaim(struct bfa_flash_s *flash,
                 u8 *dm_kva, u64 dm_pa, bfa_boolean_t mincfg);
+bfa_status_t    bfa_flash_raw_read(void __iomem *pci_bar_kva,
+                                u32 offset, char *buf, u32 len);
 
 /*
  *      DIAG module specific
@@ -888,7 +890,7 @@ void bfa_ioc_enable(struct bfa_ioc_s *ioc);
 void bfa_ioc_disable(struct bfa_ioc_s *ioc);
 bfa_boolean_t bfa_ioc_intx_claim(struct bfa_ioc_s *ioc);
 
-void bfa_ioc_boot(struct bfa_ioc_s *ioc, u32 boot_type,
+bfa_status_t bfa_ioc_boot(struct bfa_ioc_s *ioc, u32 boot_type,
                 u32 boot_env);
 void bfa_ioc_isr(struct bfa_ioc_s *ioc, struct bfi_mbmsg_s *msg);
 void bfa_ioc_error_isr(struct bfa_ioc_s *ioc);
@@ -919,6 +921,7 @@ bfa_status_t bfa_ioc_debug_fwtrc(struct bfa_ioc_s *ioc, void *trcdata,
                                  int *trclen);
 bfa_status_t bfa_ioc_debug_fwcore(struct bfa_ioc_s *ioc, void *buf,
         u32 *offset, int *buflen);
+bfa_status_t bfa_ioc_fwsig_invalidate(struct bfa_ioc_s *ioc);
 bfa_boolean_t bfa_ioc_sem_get(void __iomem *sem_reg);
 void bfa_ioc_fwver_get(struct bfa_ioc_s *ioc,
                         struct bfi_ioc_image_hdr_s *fwhdr);
@@ -956,6 +959,8 @@ bfa_status_t bfa_ablk_optrom_en(struct bfa_ablk_s *ablk,
 bfa_status_t bfa_ablk_optrom_dis(struct bfa_ablk_s *ablk,
                 bfa_ablk_cbfn_t cbfn, void *cbarg);
 
+bfa_status_t bfa_ioc_flash_img_get_chnk(struct bfa_ioc_s *ioc, u32 off,
+                                u32 *fwimg);
 /*
  * bfa mfg wwn API functions
  */
diff --git a/drivers/scsi/bfa/bfa_ioc_cb.c b/drivers/scsi/bfa/bfa_ioc_cb.c
index e3b928746674..453c2f5b5561 100644
--- a/drivers/scsi/bfa/bfa_ioc_cb.c
+++ b/drivers/scsi/bfa/bfa_ioc_cb.c
@@ -81,6 +81,29 @@ bfa_ioc_set_cb_hwif(struct bfa_ioc_s *ioc)
 static bfa_boolean_t
 bfa_ioc_cb_firmware_lock(struct bfa_ioc_s *ioc)
 {
+        enum bfi_ioc_state alt_fwstate, cur_fwstate;
+        struct bfi_ioc_image_hdr_s fwhdr;
+
+        cur_fwstate = bfa_ioc_cb_get_cur_ioc_fwstate(ioc);
+        bfa_trc(ioc, cur_fwstate);
+        alt_fwstate = bfa_ioc_cb_get_alt_ioc_fwstate(ioc);
+        bfa_trc(ioc, alt_fwstate);
+
+        /*
+         * Uninit implies this is the only driver as of now.
+         */
+        if (cur_fwstate == BFI_IOC_UNINIT)
+                return BFA_TRUE;
+        /*
+         * Check if another driver with a different firmware is active
+         */
+        bfa_ioc_fwver_get(ioc, &fwhdr);
+        if (!bfa_ioc_fwver_cmp(ioc, &fwhdr) &&
+                alt_fwstate != BFI_IOC_DISABLED) {
+                bfa_trc(ioc, alt_fwstate);
+                return BFA_FALSE;
+        }
+
         return BFA_TRUE;
 }
 
diff --git a/drivers/scsi/bfa/bfa_svc.c b/drivers/scsi/bfa/bfa_svc.c
index 6c41e57fd752..625225f31081 100644
--- a/drivers/scsi/bfa/bfa_svc.c
+++ b/drivers/scsi/bfa/bfa_svc.c
@@ -6758,7 +6758,7 @@ bfa_dport_scn(struct bfa_dport_s *dport, struct bfi_diag_dport_scn_s *msg)
                 dport->rp_pwwn = msg->info.teststart.pwwn;
                 dport->rp_nwwn = msg->info.teststart.nwwn;
                 dport->lpcnt = cpu_to_be32(msg->info.teststart.numfrm);
-                bfa_dport_result_start(dport, BFA_DPORT_OPMODE_AUTO);
+                bfa_dport_result_start(dport, msg->info.teststart.mode);
                 break;
 
         case BFI_DPORT_SCN_SUBTESTSTART:
diff --git a/drivers/scsi/bfa/bfad.c b/drivers/scsi/bfa/bfad.c
index fc80a325a1e6..cc0fbcdc5192 100644
--- a/drivers/scsi/bfa/bfad.c
+++ b/drivers/scsi/bfa/bfad.c
@@ -63,9 +63,9 @@ int		max_rport_logins = BFA_FCS_MAX_RPORT_LOGINS;
 u32     bfi_image_cb_size, bfi_image_ct_size, bfi_image_ct2_size;
 u32     *bfi_image_cb, *bfi_image_ct, *bfi_image_ct2;
 
-#define BFAD_FW_FILE_CB         "cbfw-3.2.1.1.bin"
-#define BFAD_FW_FILE_CT         "ctfw-3.2.1.1.bin"
-#define BFAD_FW_FILE_CT2        "ct2fw-3.2.1.1.bin"
+#define BFAD_FW_FILE_CB         "cbfw-3.2.3.0.bin"
+#define BFAD_FW_FILE_CT         "ctfw-3.2.3.0.bin"
+#define BFAD_FW_FILE_CT2        "ct2fw-3.2.3.0.bin"
 
 static u32 *bfad_load_fwimg(struct pci_dev *pdev);
 static void bfad_free_fwimg(void);
@@ -204,6 +204,7 @@ static void
 bfad_sm_created(struct bfad_s *bfad, enum bfad_sm_event event)
 {
         unsigned long flags;
+        bfa_status_t ret;
 
         bfa_trc(bfad, event);
 
@@ -217,7 +218,7 @@ bfad_sm_created(struct bfad_s *bfad, enum bfad_sm_event event)
                 if (bfad_setup_intr(bfad)) {
                         printk(KERN_WARNING "bfad%d: bfad_setup_intr failed\n",
                                         bfad->inst_no);
-                        bfa_sm_send_event(bfad, BFAD_E_INTR_INIT_FAILED);
+                        bfa_sm_send_event(bfad, BFAD_E_INIT_FAILED);
                         break;
                 }
 
@@ -242,8 +243,26 @@ bfad_sm_created(struct bfad_s *bfad, enum bfad_sm_event event)
                         printk(KERN_WARNING
                                 "bfa %s: bfa init failed\n",
                                 bfad->pci_name);
+                        spin_lock_irqsave(&bfad->bfad_lock, flags);
+                        bfa_fcs_init(&bfad->bfa_fcs);
+                        spin_unlock_irqrestore(&bfad->bfad_lock, flags);
+
+                        ret = bfad_cfg_pport(bfad, BFA_LPORT_ROLE_FCP_IM);
+                        if (ret != BFA_STATUS_OK) {
+                                init_completion(&bfad->comp);
+
+                                spin_lock_irqsave(&bfad->bfad_lock, flags);
+                                bfad->pport.flags |= BFAD_PORT_DELETE;
+                                bfa_fcs_exit(&bfad->bfa_fcs);
+                                spin_unlock_irqrestore(&bfad->bfad_lock, flags);
+
+                                wait_for_completion(&bfad->comp);
+
+                                bfa_sm_send_event(bfad, BFAD_E_INIT_FAILED);
+                                break;
+                        }
                         bfad->bfad_flags |= BFAD_HAL_INIT_FAIL;
-                        bfa_sm_send_event(bfad, BFAD_E_INIT_FAILED);
+                        bfa_sm_send_event(bfad, BFAD_E_HAL_INIT_FAILED);
                 }
 
                 break;
@@ -273,12 +292,14 @@ bfad_sm_initializing(struct bfad_s *bfad, enum bfad_sm_event event)
                 spin_unlock_irqrestore(&bfad->bfad_lock, flags);
 
                 retval = bfad_start_ops(bfad);
-                if (retval != BFA_STATUS_OK)
+                if (retval != BFA_STATUS_OK) {
+                        bfa_sm_set_state(bfad, bfad_sm_failed);
                         break;
+                }
                 bfa_sm_set_state(bfad, bfad_sm_operational);
                 break;
 
-        case BFAD_E_INTR_INIT_FAILED:
+        case BFAD_E_INIT_FAILED:
                 bfa_sm_set_state(bfad, bfad_sm_uninit);
                 kthread_stop(bfad->bfad_tsk);
                 spin_lock_irqsave(&bfad->bfad_lock, flags);
@@ -286,7 +307,7 @@ bfad_sm_initializing(struct bfad_s *bfad, enum bfad_sm_event event)
                 spin_unlock_irqrestore(&bfad->bfad_lock, flags);
                 break;
 
-        case BFAD_E_INIT_FAILED:
+        case BFAD_E_HAL_INIT_FAILED:
                 bfa_sm_set_state(bfad, bfad_sm_failed);
                 break;
         default:
@@ -310,13 +331,8 @@ bfad_sm_failed(struct bfad_s *bfad, enum bfad_sm_event event)
                 break;
 
         case BFAD_E_STOP:
-                if (bfad->bfad_flags & BFAD_CFG_PPORT_DONE)
-                        bfad_uncfg_pport(bfad);
-                if (bfad->bfad_flags & BFAD_FC4_PROBE_DONE) {
-                        bfad_im_probe_undo(bfad);
-                        bfad->bfad_flags &= ~BFAD_FC4_PROBE_DONE;
-                }
-                bfad_stop(bfad);
+                bfa_sm_set_state(bfad, bfad_sm_fcs_exit);
+                bfa_sm_send_event(bfad, BFAD_E_FCS_EXIT_COMP);
                 break;
 
         case BFAD_E_EXIT_COMP:
@@ -824,7 +840,7 @@ bfad_drv_init(struct bfad_s *bfad)
                 printk(KERN_WARNING
                         "Not enough memory to attach all Brocade HBA ports, %s",
                         "System may need more memory.\n");
-                goto out_hal_mem_alloc_failure;
+                return BFA_STATUS_FAILED;
         }
 
         bfad->bfa.trcmod = bfad->trcmod;
@@ -841,31 +857,11 @@ bfad_drv_init(struct bfad_s *bfad)
         bfad->bfa_fcs.trcmod = bfad->trcmod;
         bfa_fcs_attach(&bfad->bfa_fcs, &bfad->bfa, bfad, BFA_FALSE);
         bfad->bfa_fcs.fdmi_enabled = fdmi_enable;
-        bfa_fcs_init(&bfad->bfa_fcs);
         spin_unlock_irqrestore(&bfad->bfad_lock, flags);
 
         bfad->bfad_flags |= BFAD_DRV_INIT_DONE;
 
-        /* configure base port */
-        rc = bfad_cfg_pport(bfad, BFA_LPORT_ROLE_FCP_IM);
-        if (rc != BFA_STATUS_OK)
-                goto out_cfg_pport_fail;
-
         return BFA_STATUS_OK;
-
-out_cfg_pport_fail:
-        /* fcs exit - on cfg pport failure */
-        spin_lock_irqsave(&bfad->bfad_lock, flags);
-        init_completion(&bfad->comp);
-        bfad->pport.flags |= BFAD_PORT_DELETE;
-        bfa_fcs_exit(&bfad->bfa_fcs);
-        spin_unlock_irqrestore(&bfad->bfad_lock, flags);
-        wait_for_completion(&bfad->comp);
-        /* bfa detach - free hal memory */
-        bfa_detach(&bfad->bfa);
-        bfad_hal_mem_release(bfad);
-out_hal_mem_alloc_failure:
-        return BFA_STATUS_FAILED;
 }
 
 void
@@ -1009,13 +1005,19 @@ bfad_start_ops(struct bfad_s *bfad) {
         /* FCS driver info init */
         spin_lock_irqsave(&bfad->bfad_lock, flags);
         bfa_fcs_driver_info_init(&bfad->bfa_fcs, &driver_info);
+
+        if (bfad->bfad_flags & BFAD_CFG_PPORT_DONE)
+                bfa_fcs_update_cfg(&bfad->bfa_fcs);
+        else
+                bfa_fcs_init(&bfad->bfa_fcs);
+
         spin_unlock_irqrestore(&bfad->bfad_lock, flags);
 
-        /*
-         * FCS update cfg - reset the pwwn/nwwn of fabric base logical port
-         * with values learned during bfa_init firmware GETATTR REQ.
-         */
-        bfa_fcs_update_cfg(&bfad->bfa_fcs);
+        if (!(bfad->bfad_flags & BFAD_CFG_PPORT_DONE)) {
+                retval = bfad_cfg_pport(bfad, BFA_LPORT_ROLE_FCP_IM);
+                if (retval != BFA_STATUS_OK)
+                        return BFA_STATUS_FAILED;
+        }
 
         /* Setup fc host fixed attribute if the lk supports */
         bfad_fc_host_init(bfad->pport.im_port);
@@ -1026,10 +1028,6 @@ bfad_start_ops(struct bfad_s *bfad) {
                 printk(KERN_WARNING "bfad_im_probe failed\n");
                 if (bfa_sm_cmp_state(bfad, bfad_sm_initializing))
                         bfa_sm_set_state(bfad, bfad_sm_failed);
-                bfad_im_probe_undo(bfad);
-                bfad->bfad_flags &= ~BFAD_FC4_PROBE_DONE;
-                bfad_uncfg_pport(bfad);
-                bfad_stop(bfad);
                 return BFA_STATUS_FAILED;
         } else
                 bfad->bfad_flags |= BFAD_FC4_PROBE_DONE;
@@ -1399,7 +1397,6 @@ bfad_pci_probe(struct pci_dev *pdev, const struct pci_device_id *pid)
         return 0;
 
 out_bfad_sm_failure:
-        bfa_detach(&bfad->bfa);
         bfad_hal_mem_release(bfad);
 out_drv_init_failure:
         /* Remove the debugfs node for this bfad */
@@ -1534,7 +1531,7 @@ restart_bfa(struct bfad_s *bfad)
         if (bfad_setup_intr(bfad)) {
                 dev_printk(KERN_WARNING, &pdev->dev,
                            "%s: bfad_setup_intr failed\n", bfad->pci_name);
-                bfa_sm_send_event(bfad, BFAD_E_INTR_INIT_FAILED);
+                bfa_sm_send_event(bfad, BFAD_E_INIT_FAILED);
                 return -1;
         }
 
@@ -1802,7 +1799,7 @@ out:
 static u32 *
 bfad_load_fwimg(struct pci_dev *pdev)
 {
-        if (pdev->device == BFA_PCI_DEVICE_ID_CT2) {
+        if (bfa_asic_id_ct2(pdev->device)) {
                 if (bfi_image_ct2_size == 0)
                         bfad_read_firmware(pdev, &bfi_image_ct2,
                                 &bfi_image_ct2_size, BFAD_FW_FILE_CT2);
@@ -1812,12 +1809,14 @@ bfad_load_fwimg(struct pci_dev *pdev)
                         bfad_read_firmware(pdev, &bfi_image_ct,
                                 &bfi_image_ct_size, BFAD_FW_FILE_CT);
                 return bfi_image_ct;
-        } else {
+        } else if (bfa_asic_id_cb(pdev->device)) {
                 if (bfi_image_cb_size == 0)
                         bfad_read_firmware(pdev, &bfi_image_cb,
                                 &bfi_image_cb_size, BFAD_FW_FILE_CB);
                 return bfi_image_cb;
         }
+
+        return NULL;
 }
 
 static void
diff --git a/drivers/scsi/bfa/bfad_bsg.c b/drivers/scsi/bfa/bfad_bsg.c
index 0467c349251a..157f6044a9bb 100644
--- a/drivers/scsi/bfa/bfad_bsg.c
+++ b/drivers/scsi/bfa/bfad_bsg.c
@@ -229,6 +229,18 @@ bfad_iocmd_iocfc_get_attr(struct bfad_s *bfad, void *cmd)
 }
 
 int
+bfad_iocmd_ioc_fw_sig_inv(struct bfad_s *bfad, void *cmd)
+{
+        struct bfa_bsg_gen_s *iocmd = (struct bfa_bsg_gen_s *)cmd;
+        unsigned long flags;
+
+        spin_lock_irqsave(&bfad->bfad_lock, flags);
+        iocmd->status = bfa_ioc_fwsig_invalidate(&bfad->bfa.ioc);
+        spin_unlock_irqrestore(&bfad->bfad_lock, flags);
+        return 0;
+}
+
+int
 bfad_iocmd_iocfc_set_intr(struct bfad_s *bfad, void *cmd)
 {
         struct bfa_bsg_iocfc_intr_s *iocmd = (struct bfa_bsg_iocfc_intr_s *)cmd;
@@ -2893,6 +2905,9 @@ bfad_iocmd_handler(struct bfad_s *bfad, unsigned int cmd, void *iocmd,
         case IOCMD_IOC_PCIFN_CFG:
                 rc = bfad_iocmd_ioc_get_pcifn_cfg(bfad, iocmd);
                 break;
+        case IOCMD_IOC_FW_SIG_INV:
+                rc = bfad_iocmd_ioc_fw_sig_inv(bfad, iocmd);
+                break;
         case IOCMD_PCIFN_CREATE:
                 rc = bfad_iocmd_pcifn_create(bfad, iocmd);
                 break;
diff --git a/drivers/scsi/bfa/bfad_bsg.h b/drivers/scsi/bfa/bfad_bsg.h
index 05f0fc9cf063..90abef691585 100644
--- a/drivers/scsi/bfa/bfad_bsg.h
+++ b/drivers/scsi/bfa/bfad_bsg.h
@@ -34,6 +34,7 @@ enum {
         IOCMD_IOC_RESET_FWSTATS,
         IOCMD_IOC_SET_ADAPTER_NAME,
         IOCMD_IOC_SET_PORT_NAME,
+        IOCMD_IOC_FW_SIG_INV,
         IOCMD_IOCFC_GET_ATTR,
         IOCMD_IOCFC_SET_INTR,
         IOCMD_PORT_ENABLE,
diff --git a/drivers/scsi/bfa/bfad_drv.h b/drivers/scsi/bfa/bfad_drv.h
index 78d3401bc16b..8b97877d42cf 100644
--- a/drivers/scsi/bfa/bfad_drv.h
+++ b/drivers/scsi/bfa/bfad_drv.h
@@ -57,7 +57,7 @@
 #ifdef BFA_DRIVER_VERSION
 #define BFAD_DRIVER_VERSION    BFA_DRIVER_VERSION
 #else
-#define BFAD_DRIVER_VERSION    "3.2.21.1"
+#define BFAD_DRIVER_VERSION    "3.2.23.0"
 #endif
 
 #define BFAD_PROTO_NAME FCPI_NAME
@@ -240,8 +240,8 @@ enum bfad_sm_event {
         BFAD_E_KTHREAD_CREATE_FAILED    = 2,
         BFAD_E_INIT                     = 3,
         BFAD_E_INIT_SUCCESS             = 4,
-        BFAD_E_INIT_FAILED              = 5,
-        BFAD_E_INTR_INIT_FAILED         = 6,
+        BFAD_E_HAL_INIT_FAILED          = 5,
+        BFAD_E_INIT_FAILED              = 6,
         BFAD_E_FCS_EXIT_COMP            = 7,
         BFAD_E_EXIT_COMP                = 8,
         BFAD_E_STOP                     = 9
diff --git a/drivers/scsi/bfa/bfi.h b/drivers/scsi/bfa/bfi.h
index 37bd2564e83b..9ef91f907dec 100644
--- a/drivers/scsi/bfa/bfi.h
+++ b/drivers/scsi/bfa/bfi.h
@@ -46,6 +46,7 @@
  */
 #define BFI_FLASH_CHUNK_SZ                      256     /*  Flash chunk size */
 #define BFI_FLASH_CHUNK_SZ_WORDS        (BFI_FLASH_CHUNK_SZ/sizeof(u32))
+#define BFI_FLASH_IMAGE_SZ              0x100000
 
 /*
  * Msg header common to all msgs
@@ -324,7 +325,29 @@ struct bfi_ioc_getattr_reply_s {
 #define BFI_IOC_TRC_ENTS        256
 
 #define BFI_IOC_FW_SIGNATURE    (0xbfadbfad)
+#define BFA_IOC_FW_INV_SIGN     (0xdeaddead)
 #define BFI_IOC_MD5SUM_SZ       4
+
+struct bfi_ioc_fwver_s {
+#ifdef __BIG_ENDIAN
+        uint8_t patch;
+        uint8_t maint;
+        uint8_t minor;
+        uint8_t major;
+        uint8_t rsvd[2];
+        uint8_t build;
+        uint8_t phase;
+#else
+        uint8_t major;
+        uint8_t minor;
+        uint8_t maint;
+        uint8_t patch;
+        uint8_t phase;
+        uint8_t build;
+        uint8_t rsvd[2];
+#endif
+};
+
 struct bfi_ioc_image_hdr_s {
         u32     signature;      /* constant signature           */
         u8      asic_gen;       /* asic generation              */
@@ -333,10 +356,18 @@ struct bfi_ioc_image_hdr_s {
         u8      port1_mode;     /* device mode for port 1       */
         u32     exec;           /* exec vector                  */
         u32     bootenv;        /* fimware boot env             */
-        u32     rsvd_b[4];
+        u32     rsvd_b[2];
+        struct bfi_ioc_fwver_s  fwver;
         u32     md5sum[BFI_IOC_MD5SUM_SZ];
 };
 
+enum bfi_ioc_img_ver_cmp_e {
+        BFI_IOC_IMG_VER_INCOMP,
+        BFI_IOC_IMG_VER_OLD,
+        BFI_IOC_IMG_VER_SAME,
+        BFI_IOC_IMG_VER_BETTER
+};
+
 #define BFI_FWBOOT_DEVMODE_OFF          4
 #define BFI_FWBOOT_TYPE_OFF             8
 #define BFI_FWBOOT_ENV_OFF              12
@@ -346,6 +377,12 @@ struct bfi_ioc_image_hdr_s {
          ((u32)(__p0_mode)) << 8 |              \
          ((u32)(__p1_mode)))
 
+enum bfi_fwboot_type {
+        BFI_FWBOOT_TYPE_NORMAL  = 0,
+        BFI_FWBOOT_TYPE_FLASH   = 1,
+        BFI_FWBOOT_TYPE_MEMTEST = 2,
+};
+
 #define BFI_FWBOOT_TYPE_NORMAL  0
 #define BFI_FWBOOT_TYPE_MEMTEST 2
 #define BFI_FWBOOT_ENV_OS       0
@@ -1107,7 +1144,8 @@ struct bfi_diag_dport_scn_teststart_s {
         wwn_t   pwwn;   /* switch port wwn. 8 bytes */
         wwn_t   nwwn;   /* switch node wwn. 8 bytes */
         u8      type;   /* bfa_diag_dport_test_type_e */
-        u8      rsvd[3];
+        u8      mode;   /* bfa_diag_dport_test_opmode */
+        u8      rsvd[2];
         u32     numfrm; /* from switch uint in 1M */
 };
 
diff --git a/drivers/scsi/gvp11.c b/drivers/scsi/gvp11.c
index 2203ac281103..3b6f83ffddc4 100644
--- a/drivers/scsi/gvp11.c
+++ b/drivers/scsi/gvp11.c
@@ -310,7 +310,7 @@ static int gvp11_probe(struct zorro_dev *z, const struct zorro_device_id *ent)
         if (!request_mem_region(address, 256, "wd33c93"))
                 return -EBUSY;
 
-        regs = (struct gvp11_scsiregs *)(ZTWO_VADDR(address));
+        regs = ZTWO_VADDR(address);
 
         error = check_wd33c93(regs);
         if (error)
diff --git a/drivers/scsi/hosts.c b/drivers/scsi/hosts.c
index f2c5005f312a..f28ea070d3df 100644
--- a/drivers/scsi/hosts.c
+++ b/drivers/scsi/hosts.c
@@ -169,6 +169,7 @@ void scsi_remove_host(struct Scsi_Host *shost)
         spin_unlock_irqrestore(shost->host_lock, flags);
 
         scsi_autopm_get_host(shost);
+        flush_workqueue(shost->tmf_work_q);
         scsi_forget_host(shost);
         mutex_unlock(&shost->scan_mutex);
         scsi_proc_host_rm(shost);
@@ -294,6 +295,8 @@ static void scsi_host_dev_release(struct device *dev)
 
         scsi_proc_hostdir_rm(shost->hostt);
 
+        if (shost->tmf_work_q)
+                destroy_workqueue(shost->tmf_work_q);
         if (shost->ehandler)
                 kthread_stop(shost->ehandler);
         if (shost->work_q)
@@ -316,11 +319,11 @@ static void scsi_host_dev_release(struct device *dev)
         kfree(shost);
 }
 
-static unsigned int shost_eh_deadline;
+static int shost_eh_deadline = -1;
 
-module_param_named(eh_deadline, shost_eh_deadline, uint, S_IRUGO|S_IWUSR);
+module_param_named(eh_deadline, shost_eh_deadline, int, S_IRUGO|S_IWUSR);
 MODULE_PARM_DESC(eh_deadline,
-                 "SCSI EH timeout in seconds (should be between 1 and 2^32-1)");
+                 "SCSI EH timeout in seconds (should be between 0 and 2^31-1)");
 
 static struct device_type scsi_host_type = {
         .name =         "scsi_host",
@@ -360,7 +363,6 @@ struct Scsi_Host *scsi_host_alloc(struct scsi_host_template *sht, int privsize)
         INIT_LIST_HEAD(&shost->eh_cmd_q);
         INIT_LIST_HEAD(&shost->starved_list);
         init_waitqueue_head(&shost->host_wait);
-
         mutex_init(&shost->scan_mutex);
 
         /*
@@ -394,9 +396,18 @@ struct Scsi_Host *scsi_host_alloc(struct scsi_host_template *sht, int privsize)
         shost->unchecked_isa_dma = sht->unchecked_isa_dma;
         shost->use_clustering = sht->use_clustering;
         shost->ordered_tag = sht->ordered_tag;
-        shost->eh_deadline = shost_eh_deadline * HZ;
         shost->no_write_same = sht->no_write_same;
 
+        if (shost_eh_deadline == -1)
+                shost->eh_deadline = -1;
+        else if ((ulong) shost_eh_deadline * HZ > INT_MAX) {
+                shost_printk(KERN_WARNING, shost,
+                             "eh_deadline %u too large, setting to %u\n",
+                             shost_eh_deadline, INT_MAX / HZ);
+                shost->eh_deadline = INT_MAX;
+        } else
+                shost->eh_deadline = shost_eh_deadline * HZ;
+
         if (sht->supported_mode == MODE_UNKNOWN)
                 /* means we didn't set it ... default to INITIATOR */
                 shost->active_mode = MODE_INITIATOR;
@@ -444,9 +455,19 @@ struct Scsi_Host *scsi_host_alloc(struct scsi_host_template *sht, int privsize)
                 goto fail_kfree;
         }
 
+        shost->tmf_work_q = alloc_workqueue("scsi_tmf_%d",
+                                            WQ_UNBOUND | WQ_MEM_RECLAIM,
+                                           1, shost->host_no);
+        if (!shost->tmf_work_q) {
+                printk(KERN_WARNING "scsi%d: failed to create tmf workq\n",
+                       shost->host_no);
+                goto fail_kthread;
+        }
         scsi_proc_hostdir_add(shost->hostt);
         return shost;
 
+ fail_kthread:
+        kthread_stop(shost->ehandler);
  fail_kfree:
         kfree(shost);
         return NULL;
diff --git a/drivers/scsi/hpsa.c b/drivers/scsi/hpsa.c
index 20a5e6ecf945..868318a7067c 100644
--- a/drivers/scsi/hpsa.c
+++ b/drivers/scsi/hpsa.c
@@ -29,7 +29,6 @@
 #include <linux/delay.h>
 #include <linux/fs.h>
 #include <linux/timer.h>
-#include <linux/seq_file.h>
 #include <linux/init.h>
 #include <linux/spinlock.h>
 #include <linux/compat.h>
@@ -96,7 +95,6 @@ static const struct pci_device_id hpsa_pci_device_id[] = {
         {PCI_VENDOR_ID_HP,     PCI_DEVICE_ID_HP_CISSF,     0x103C, 0x3351},
         {PCI_VENDOR_ID_HP,     PCI_DEVICE_ID_HP_CISSF,     0x103C, 0x3352},
         {PCI_VENDOR_ID_HP,     PCI_DEVICE_ID_HP_CISSF,     0x103C, 0x3353},
-        {PCI_VENDOR_ID_HP,     PCI_DEVICE_ID_HP_CISSF,     0x103C, 0x334D},
         {PCI_VENDOR_ID_HP,     PCI_DEVICE_ID_HP_CISSF,     0x103C, 0x3354},
         {PCI_VENDOR_ID_HP,     PCI_DEVICE_ID_HP_CISSF,     0x103C, 0x3355},
         {PCI_VENDOR_ID_HP,     PCI_DEVICE_ID_HP_CISSF,     0x103C, 0x3356},
@@ -143,7 +141,6 @@ static struct board_type products[] = {
         {0x3351103C, "Smart Array P420", &SA5_access},
         {0x3352103C, "Smart Array P421", &SA5_access},
         {0x3353103C, "Smart Array P822", &SA5_access},
-        {0x334D103C, "Smart Array P822se", &SA5_access},
         {0x3354103C, "Smart Array P420i", &SA5_access},
         {0x3355103C, "Smart Array P220i", &SA5_access},
         {0x3356103C, "Smart Array P721m", &SA5_access},
@@ -171,10 +168,6 @@ static struct board_type products[] = {
 
 static int number_of_controllers;
 
-static struct list_head hpsa_ctlr_list = LIST_HEAD_INIT(hpsa_ctlr_list);
-static spinlock_t lockup_detector_lock;
-static struct task_struct *hpsa_lockup_detector;
-
 static irqreturn_t do_hpsa_intr_intx(int irq, void *dev_id);
 static irqreturn_t do_hpsa_intr_msi(int irq, void *dev_id);
 static int hpsa_ioctl(struct scsi_device *dev, int cmd, void *arg);
@@ -1248,10 +1241,8 @@ static void complete_scsi_command(struct CommandList *cp)
                 }
 
                 if (ei->ScsiStatus == SAM_STAT_CHECK_CONDITION) {
-                        if (check_for_unit_attention(h, cp)) {
-                                cmd->result = DID_SOFT_ERROR << 16;
+                        if (check_for_unit_attention(h, cp))
                                 break;
-                        }
                         if (sense_key == ILLEGAL_REQUEST) {
                                 /*
                                  * SCSI REPORT_LUNS is commonly unsupported on
@@ -1783,6 +1774,7 @@ static unsigned char *ext_target_model[] = {
         "MSA2312",
         "MSA2324",
         "P2000 G3 SAS",
+        "MSA 2040 SAS",
         NULL,
 };
 
@@ -3171,7 +3163,7 @@ static int hpsa_big_passthru_ioctl(struct ctlr_info *h, void __user *argp)
                                 hpsa_pci_unmap(h->pdev, c, i,
                                         PCI_DMA_BIDIRECTIONAL);
                                 status = -ENOMEM;
-                                goto cleanup1;
+                                goto cleanup0;
                         }
                         c->SG[i].Addr.lower = temp64.val32.lower;
                         c->SG[i].Addr.upper = temp64.val32.upper;
@@ -3187,24 +3179,23 @@ static int hpsa_big_passthru_ioctl(struct ctlr_info *h, void __user *argp)
         /* Copy the error information out */
         memcpy(&ioc->error_info, c->err_info, sizeof(ioc->error_info));
         if (copy_to_user(argp, ioc, sizeof(*ioc))) {
-                cmd_special_free(h, c);
                 status = -EFAULT;
-                goto cleanup1;
+                goto cleanup0;
         }
         if (ioc->Request.Type.Direction == XFER_READ && ioc->buf_size > 0) {
                 /* Copy the data out of the buffer we created */
                 BYTE __user *ptr = ioc->buf;
                 for (i = 0; i < sg_used; i++) {
                         if (copy_to_user(ptr, buff[i], buff_size[i])) {
-                                cmd_special_free(h, c);
                                 status = -EFAULT;
-                                goto cleanup1;
+                                goto cleanup0;
                         }
                         ptr += buff_size[i];
                 }
         }
-        cmd_special_free(h, c);
         status = 0;
+cleanup0:
+        cmd_special_free(h, c);
 cleanup1:
         if (buff) {
                 for (i = 0; i < sg_used; i++)
@@ -3223,6 +3214,36 @@ static void check_ioctl_unit_attention(struct ctlr_info *h,
                         c->err_info->ScsiStatus != SAM_STAT_CHECK_CONDITION)
                 (void) check_for_unit_attention(h, c);
 }
+
+static int increment_passthru_count(struct ctlr_info *h)
+{
+        unsigned long flags;
+
+        spin_lock_irqsave(&h->passthru_count_lock, flags);
+        if (h->passthru_count >= HPSA_MAX_CONCURRENT_PASSTHRUS) {
+                spin_unlock_irqrestore(&h->passthru_count_lock, flags);
+                return -1;
+        }
+        h->passthru_count++;
+        spin_unlock_irqrestore(&h->passthru_count_lock, flags);
+        return 0;
+}
+
+static void decrement_passthru_count(struct ctlr_info *h)
+{
+        unsigned long flags;
+
+        spin_lock_irqsave(&h->passthru_count_lock, flags);
+        if (h->passthru_count <= 0) {
+                spin_unlock_irqrestore(&h->passthru_count_lock, flags);
+                /* not expecting to get here. */
+                dev_warn(&h->pdev->dev, "Bug detected, passthru_count seems to be incorrect.\n");
+                return;
+        }
+        h->passthru_count--;
+        spin_unlock_irqrestore(&h->passthru_count_lock, flags);
+}
+
 /*
  * ioctl
  */
@@ -3230,6 +3251,7 @@ static int hpsa_ioctl(struct scsi_device *dev, int cmd, void *arg)
 {
         struct ctlr_info *h;
         void __user *argp = (void __user *)arg;
+        int rc;
 
         h = sdev_to_hba(dev);
 
@@ -3244,9 +3266,17 @@ static int hpsa_ioctl(struct scsi_device *dev, int cmd, void *arg)
         case CCISS_GETDRIVVER:
                 return hpsa_getdrivver_ioctl(h, argp);
         case CCISS_PASSTHRU:
-                return hpsa_passthru_ioctl(h, argp);
+                if (increment_passthru_count(h))
+                        return -EAGAIN;
+                rc = hpsa_passthru_ioctl(h, argp);
+                decrement_passthru_count(h);
+                return rc;
         case CCISS_BIG_PASSTHRU:
-                return hpsa_big_passthru_ioctl(h, argp);
+                if (increment_passthru_count(h))
+                        return -EAGAIN;
+                rc = hpsa_big_passthru_ioctl(h, argp);
+                decrement_passthru_count(h);
+                return rc;
         default:
                 return -ENOTTY;
         }
@@ -3445,9 +3475,11 @@ static void start_io(struct ctlr_info *h)
                 c = list_entry(h->reqQ.next, struct CommandList, list);
                 /* can't do anything if fifo is full */
                 if ((h->access.fifo_full(h))) {
+                        h->fifo_recently_full = 1;
                         dev_warn(&h->pdev->dev, "fifo full\n");
                         break;
                 }
+                h->fifo_recently_full = 0;
 
                 /* Get the first entry from the Request Q */
                 removeQ(c);
@@ -3501,15 +3533,41 @@ static inline int bad_tag(struct ctlr_info *h, u32 tag_index,
 static inline void finish_cmd(struct CommandList *c)
 {
         unsigned long flags;
+        int io_may_be_stalled = 0;
+        struct ctlr_info *h = c->h;
 
-        spin_lock_irqsave(&c->h->lock, flags);
+        spin_lock_irqsave(&h->lock, flags);
         removeQ(c);
-        spin_unlock_irqrestore(&c->h->lock, flags);
+
+        /*
+         * Check for possibly stalled i/o.
+         *
+         * If a fifo_full condition is encountered, requests will back up
+         * in h->reqQ.  This queue is only emptied out by start_io which is
+         * only called when a new i/o request comes in.  If no i/o's are
+         * forthcoming, the i/o's in h->reqQ can get stuck.  So we call
+         * start_io from here if we detect such a danger.
+         *
+         * Normally, we shouldn't hit this case, but pounding on the
+         * CCISS_PASSTHRU ioctl can provoke it.  Only call start_io if
+         * commands_outstanding is low.  We want to avoid calling
+         * start_io from in here as much as possible, and esp. don't
+         * want to get in a cycle where we call start_io every time
+         * through here.
+         */
+        if (unlikely(h->fifo_recently_full) &&
+                h->commands_outstanding < 5)
+                io_may_be_stalled = 1;
+
+        spin_unlock_irqrestore(&h->lock, flags);
+
         dial_up_lockup_detection_on_fw_flash_complete(c->h, c);
         if (likely(c->cmd_type == CMD_SCSI))
                 complete_scsi_command(c);
         else if (c->cmd_type == CMD_IOCTL_PEND)
                 complete(c->waiting);
+        if (unlikely(io_may_be_stalled))
+                start_io(h);
 }
 
 static inline u32 hpsa_tag_contains_index(u32 tag)
@@ -3785,6 +3843,13 @@ static int hpsa_controller_hard_reset(struct pci_dev *pdev,
                  */
                 dev_info(&pdev->dev, "using doorbell to reset controller\n");
                 writel(use_doorbell, vaddr + SA5_DOORBELL);
+
+                /* PMC hardware guys tell us we need a 5 second delay after
+                 * doorbell reset and before any attempt to talk to the board
+                 * at all to ensure that this actually works and doesn't fall
+                 * over in some weird corner cases.
+                 */
+                msleep(5000);
         } else { /* Try to do it the PCI power state way */
 
                 /* Quoting from the Open CISS Specification: "The Power
@@ -3981,16 +4046,6 @@ static int hpsa_kdump_hard_reset_controller(struct pci_dev *pdev)
            need a little pause here */
         msleep(HPSA_POST_RESET_PAUSE_MSECS);
 
-        /* Wait for board to become not ready, then ready. */
-        dev_info(&pdev->dev, "Waiting for board to reset.\n");
-        rc = hpsa_wait_for_board_state(pdev, vaddr, BOARD_NOT_READY);
-        if (rc) {
-                dev_warn(&pdev->dev,
-                        "failed waiting for board to reset."
-                        " Will try soft reset.\n");
-                rc = -ENOTSUPP; /* Not expected, but try soft reset later */
-                goto unmap_cfgtable;
-        }
         rc = hpsa_wait_for_board_state(pdev, vaddr, BOARD_READY);
         if (rc) {
                 dev_warn(&pdev->dev,
@@ -4308,16 +4363,17 @@ static inline bool hpsa_CISS_signature_present(struct ctlr_info *h)
         return true;
 }
 
-/* Need to enable prefetch in the SCSI core for 6400 in x86 */
-static inline void hpsa_enable_scsi_prefetch(struct ctlr_info *h)
+static inline void hpsa_set_driver_support_bits(struct ctlr_info *h)
 {
-#ifdef CONFIG_X86
-        u32 prefetch;
+        u32 driver_support;
 
-        prefetch = readl(&(h->cfgtable->SCSI_Prefetch));
-        prefetch |= 0x100;
-        writel(prefetch, &(h->cfgtable->SCSI_Prefetch));
+#ifdef CONFIG_X86
+        /* Need to enable prefetch in the SCSI core for 6400 in x86 */
+        driver_support = readl(&(h->cfgtable->driver_support));
+        driver_support |= ENABLE_SCSI_PREFETCH;
 #endif
+        driver_support |= ENABLE_UNIT_ATTN;
+        writel(driver_support, &(h->cfgtable->driver_support));
 }
 
 /* Disable DMA prefetch for the P600.  Otherwise an ASIC bug may result
@@ -4427,7 +4483,7 @@ static int hpsa_pci_init(struct ctlr_info *h)
                 err = -ENODEV;
                 goto err_out_free_res;
         }
-        hpsa_enable_scsi_prefetch(h);
+        hpsa_set_driver_support_bits(h);
         hpsa_p600_dma_prefetch_quirk(h);
         err = hpsa_enter_simple_mode(h);
         if (err)
@@ -4638,16 +4694,6 @@ static void hpsa_undo_allocations_after_kdump_soft_reset(struct ctlr_info *h)
         kfree(h);
 }
 
-static void remove_ctlr_from_lockup_detector_list(struct ctlr_info *h)
-{
-        assert_spin_locked(&lockup_detector_lock);
-        if (!hpsa_lockup_detector)
-                return;
-        if (h->lockup_detected)
-                return; /* already stopped the lockup detector */
-        list_del(&h->lockup_list);
-}
-
 /* Called when controller lockup detected. */
 static void fail_all_cmds_on_list(struct ctlr_info *h, struct list_head *list)
 {
@@ -4666,8 +4712,6 @@ static void controller_lockup_detected(struct ctlr_info *h)
 {
         unsigned long flags;
 
-        assert_spin_locked(&lockup_detector_lock);
-        remove_ctlr_from_lockup_detector_list(h);
         h->access.set_intr_mask(h, HPSA_INTR_OFF);
         spin_lock_irqsave(&h->lock, flags);
         h->lockup_detected = readl(h->vaddr + SA5_SCRATCHPAD_OFFSET);
@@ -4687,7 +4731,6 @@ static void detect_controller_lockup(struct ctlr_info *h)
         u32 heartbeat;
         unsigned long flags;
 
-        assert_spin_locked(&lockup_detector_lock);
         now = get_jiffies_64();
         /* If we've received an interrupt recently, we're ok. */
         if (time_after64(h->last_intr_timestamp +
@@ -4717,68 +4760,22 @@ static void detect_controller_lockup(struct ctlr_info *h)
         h->last_heartbeat_timestamp = now;
 }
 
-static int detect_controller_lockup_thread(void *notused)
+static void hpsa_monitor_ctlr_worker(struct work_struct *work)
 {
-        struct ctlr_info *h;
         unsigned long flags;
-
-        while (1) {
-                struct list_head *this, *tmp;
-
-                schedule_timeout_interruptible(HEARTBEAT_SAMPLE_INTERVAL);
-                if (kthread_should_stop())
-                        break;
-                spin_lock_irqsave(&lockup_detector_lock, flags);
-                list_for_each_safe(this, tmp, &hpsa_ctlr_list) {
-                        h = list_entry(this, struct ctlr_info, lockup_list);
-                        detect_controller_lockup(h);
-                }
-                spin_unlock_irqrestore(&lockup_detector_lock, flags);
-        }
-        return 0;
-}
-
-static void add_ctlr_to_lockup_detector_list(struct ctlr_info *h)
-{
-        unsigned long flags;
-
-        h->heartbeat_sample_interval = HEARTBEAT_SAMPLE_INTERVAL;
-        spin_lock_irqsave(&lockup_detector_lock, flags);
-        list_add_tail(&h->lockup_list, &hpsa_ctlr_list);
-        spin_unlock_irqrestore(&lockup_detector_lock, flags);
-}
-
-static void start_controller_lockup_detector(struct ctlr_info *h)
-{
-        /* Start the lockup detector thread if not already started */
-        if (!hpsa_lockup_detector) {
-                spin_lock_init(&lockup_detector_lock);
-                hpsa_lockup_detector =
-                        kthread_run(detect_controller_lockup_thread,
-                                                NULL, HPSA);
-        }
-        if (!hpsa_lockup_detector) {
-                dev_warn(&h->pdev->dev,
-                        "Could not start lockup detector thread\n");
+        struct ctlr_info *h = container_of(to_delayed_work(work),
+                                        struct ctlr_info, monitor_ctlr_work);
+        detect_controller_lockup(h);
+        if (h->lockup_detected)
+                return;
+        spin_lock_irqsave(&h->lock, flags);
+        if (h->remove_in_progress) {
+                spin_unlock_irqrestore(&h->lock, flags);
                 return;
         }
-        add_ctlr_to_lockup_detector_list(h);
-}
-
-static void stop_controller_lockup_detector(struct ctlr_info *h)
-{
-        unsigned long flags;
-
-        spin_lock_irqsave(&lockup_detector_lock, flags);
-        remove_ctlr_from_lockup_detector_list(h);
-        /* If the list of ctlr's to monitor is empty, stop the thread */
-        if (list_empty(&hpsa_ctlr_list)) {
-                spin_unlock_irqrestore(&lockup_detector_lock, flags);
-                kthread_stop(hpsa_lockup_detector);
-                spin_lock_irqsave(&lockup_detector_lock, flags);
-                hpsa_lockup_detector = NULL;
-        }
-        spin_unlock_irqrestore(&lockup_detector_lock, flags);
+        schedule_delayed_work(&h->monitor_ctlr_work,
+                                h->heartbeat_sample_interval);
+        spin_unlock_irqrestore(&h->lock, flags);
 }
 
 static int hpsa_init_one(struct pci_dev *pdev, const struct pci_device_id *ent)
@@ -4822,6 +4819,7 @@ reinit_after_soft_reset:
         INIT_LIST_HEAD(&h->reqQ);
         spin_lock_init(&h->lock);
         spin_lock_init(&h->scan_lock);
+        spin_lock_init(&h->passthru_count_lock);
         rc = hpsa_pci_init(h);
         if (rc != 0)
                 goto clean1;
@@ -4925,7 +4923,12 @@ reinit_after_soft_reset:
 
         hpsa_hba_inquiry(h);
         hpsa_register_scsi(h);  /* hook ourselves into SCSI subsystem */
-        start_controller_lockup_detector(h);
+
+        /* Monitor the controller for firmware lockups */
+        h->heartbeat_sample_interval = HEARTBEAT_SAMPLE_INTERVAL;
+        INIT_DELAYED_WORK(&h->monitor_ctlr_work, hpsa_monitor_ctlr_worker);
+        schedule_delayed_work(&h->monitor_ctlr_work,
+                                h->heartbeat_sample_interval);
         return 0;
 
 clean4:
@@ -4942,6 +4945,15 @@ static void hpsa_flush_cache(struct ctlr_info *h)
 {
         char *flush_buf;
         struct CommandList *c;
+        unsigned long flags;
+
+        /* Don't bother trying to flush the cache if locked up */
+        spin_lock_irqsave(&h->lock, flags);
+        if (unlikely(h->lockup_detected)) {
+                spin_unlock_irqrestore(&h->lock, flags);
+                return;
+        }
+        spin_unlock_irqrestore(&h->lock, flags);
 
         flush_buf = kzalloc(4, GFP_KERNEL);
         if (!flush_buf)
@@ -4991,13 +5003,20 @@ static void hpsa_free_device_info(struct ctlr_info *h)
 static void hpsa_remove_one(struct pci_dev *pdev)
 {
         struct ctlr_info *h;
+        unsigned long flags;
 
         if (pci_get_drvdata(pdev) == NULL) {
                 dev_err(&pdev->dev, "unable to remove device\n");
                 return;
         }
         h = pci_get_drvdata(pdev);
-        stop_controller_lockup_detector(h);
+
+        /* Get rid of any controller monitoring work items */
+        spin_lock_irqsave(&h->lock, flags);
+        h->remove_in_progress = 1;
+        cancel_delayed_work(&h->monitor_ctlr_work);
+        spin_unlock_irqrestore(&h->lock, flags);
+
         hpsa_unregister_scsi(h);        /* unhook from SCSI subsystem */
         hpsa_shutdown(pdev);
         iounmap(h->vaddr);
diff --git a/drivers/scsi/hpsa.h b/drivers/scsi/hpsa.h
index bc85e7244f40..01c328349c83 100644
--- a/drivers/scsi/hpsa.h
+++ b/drivers/scsi/hpsa.h
@@ -114,6 +114,11 @@ struct ctlr_info {
         struct TransTable_struct *transtable;
         unsigned long transMethod;
 
+        /* cap concurrent passthrus at some reasonable maximum */
+#define HPSA_MAX_CONCURRENT_PASSTHRUS (20)
+        spinlock_t passthru_count_lock; /* protects passthru_count */
+        int passthru_count;
+
         /*
          * Performant mode completion buffers
          */
@@ -130,7 +135,9 @@ struct ctlr_info {
         u32 heartbeat_sample_interval;
         atomic_t firmware_flash_in_progress;
         u32 lockup_detected;
-        struct list_head lockup_list;
+        struct delayed_work monitor_ctlr_work;
+        int remove_in_progress;
+        u32 fifo_recently_full;
         /* Address of h->q[x] is passed to intr handler to know which queue */
         u8 q[MAX_REPLY_QUEUES];
         u32 TMFSupportFlags; /* cache what task mgmt funcs are supported. */
diff --git a/drivers/scsi/hpsa_cmd.h b/drivers/scsi/hpsa_cmd.h
index a894f2eca7ac..bfc8c4ea66f8 100644
--- a/drivers/scsi/hpsa_cmd.h
+++ b/drivers/scsi/hpsa_cmd.h
@@ -356,7 +356,9 @@ struct CfgTable {
         u32           TransMethodOffset;
         u8            ServerName[16];
         u32           HeartBeat;
-        u32           SCSI_Prefetch;
+        u32           driver_support;
+#define                 ENABLE_SCSI_PREFETCH 0x100
+#define                 ENABLE_UNIT_ATTN 0x01
         u32             MaxScatterGatherElements;
         u32             MaxLogicalUnits;
         u32             MaxPhysicalDevices;
diff --git a/drivers/scsi/ipr.c b/drivers/scsi/ipr.c
index 573f4128b6b6..3f5b56a99892 100644
--- a/drivers/scsi/ipr.c
+++ b/drivers/scsi/ipr.c
@@ -220,7 +220,7 @@ module_param_named(max_devs, ipr_max_devs, int, 0);
 MODULE_PARM_DESC(max_devs, "Specify the maximum number of physical devices. "
                  "[Default=" __stringify(IPR_DEFAULT_SIS64_DEVS) "]");
 module_param_named(number_of_msix, ipr_number_of_msix, int, 0);
-MODULE_PARM_DESC(number_of_msix, "Specify the number of MSIX interrupts to use on capable adapters (1 - 5).  (default:2)");
+MODULE_PARM_DESC(number_of_msix, "Specify the number of MSIX interrupts to use on capable adapters (1 - 16).  (default:2)");
 MODULE_LICENSE("GPL");
 MODULE_VERSION(IPR_DRIVER_VERSION);
 
diff --git a/drivers/scsi/ipr.h b/drivers/scsi/ipr.h
index cad1483f05da..9ce38a22647e 100644
--- a/drivers/scsi/ipr.h
+++ b/drivers/scsi/ipr.h
@@ -301,7 +301,7 @@ IPR_PCII_NO_HOST_RRQ | IPR_PCII_IOARRIN_LOST | IPR_PCII_MMIO_ERROR)
  * Dump literals
  */
 #define IPR_FMT2_MAX_IOA_DUMP_SIZE                      (4 * 1024 * 1024)
-#define IPR_FMT3_MAX_IOA_DUMP_SIZE                      (32 * 1024 * 1024)
+#define IPR_FMT3_MAX_IOA_DUMP_SIZE                      (80 * 1024 * 1024)
 #define IPR_FMT2_NUM_SDT_ENTRIES                        511
 #define IPR_FMT3_NUM_SDT_ENTRIES                        0xFFF
 #define IPR_FMT2_MAX_NUM_DUMP_PAGES     ((IPR_FMT2_MAX_IOA_DUMP_SIZE / PAGE_SIZE) + 1)
@@ -311,7 +311,7 @@ IPR_PCII_NO_HOST_RRQ | IPR_PCII_IOARRIN_LOST | IPR_PCII_MMIO_ERROR)
  * Misc literals
  */
 #define IPR_NUM_IOADL_ENTRIES                   IPR_MAX_SGLIST
-#define IPR_MAX_MSIX_VECTORS            0x5
+#define IPR_MAX_MSIX_VECTORS            0x10
 #define IPR_MAX_HRRQ_NUM                0x10
 #define IPR_INIT_HRRQ                   0x0
 
diff --git a/drivers/scsi/libiscsi.c b/drivers/scsi/libiscsi.c
index e3995612ea76..40462415291e 100644
--- a/drivers/scsi/libiscsi.c
+++ b/drivers/scsi/libiscsi.c
@@ -2945,6 +2945,7 @@ void iscsi_conn_teardown(struct iscsi_cls_conn *cls_conn)
         free_pages((unsigned long) conn->data,
                    get_order(ISCSI_DEF_MAX_RECV_SEG_LEN));
         kfree(conn->persistent_address);
+        kfree(conn->local_ipaddr);
         kfifo_in(&session->cmdpool.queue, (void*)&conn->login_task,
                     sizeof(void*));
         if (session->leadconn == conn)
@@ -3269,6 +3270,8 @@ int iscsi_set_param(struct iscsi_cls_conn *cls_conn,
                 sscanf(buf, "%d", &val);
                 session->discovery_sess = !!val;
                 break;
+        case ISCSI_PARAM_LOCAL_IPADDR:
+                return iscsi_switch_str_param(&conn->local_ipaddr, buf);
         default:
                 return -ENOSYS;
         }
@@ -3542,6 +3545,9 @@ int iscsi_conn_get_param(struct iscsi_cls_conn *cls_conn,
         case ISCSI_PARAM_TCP_RECV_WSF:
                 len = sprintf(buf, "%u\n", conn->tcp_recv_wsf);
                 break;
+        case ISCSI_PARAM_LOCAL_IPADDR:
+                len = sprintf(buf, "%s\n", conn->local_ipaddr);
+                break;
         default:
                 return -ENOSYS;
         }
diff --git a/drivers/scsi/libsas/sas_expander.c b/drivers/scsi/libsas/sas_expander.c
index 446b85110a1f..0cac7d8fd0f7 100644
--- a/drivers/scsi/libsas/sas_expander.c
+++ b/drivers/scsi/libsas/sas_expander.c
@@ -2163,10 +2163,10 @@ int sas_smp_handler(struct Scsi_Host *shost, struct sas_rphy *rphy,
         }
 
         /* do we need to support multiple segments? */
-        if (bio_segments(req->bio) > 1 || bio_segments(rsp->bio) > 1) {
-                printk("%s: multiple segments req %u %u, rsp %u %u\n",
-                       __func__, bio_segments(req->bio), blk_rq_bytes(req),
-                       bio_segments(rsp->bio), blk_rq_bytes(rsp));
+        if (bio_multiple_segments(req->bio) ||
+            bio_multiple_segments(rsp->bio)) {
+                printk("%s: multiple segments req %u, rsp %u\n",
+                       __func__, blk_rq_bytes(req), blk_rq_bytes(rsp));
                 return -EINVAL;
         }
 
diff --git a/drivers/scsi/lpfc/lpfc_debugfs.c b/drivers/scsi/lpfc/lpfc_debugfs.c
index 60084e6ad2f2..b800cc952ca6 100644
--- a/drivers/scsi/lpfc/lpfc_debugfs.c
+++ b/drivers/scsi/lpfc/lpfc_debugfs.c
@@ -4001,7 +4001,7 @@ lpfc_debugfs_initialize(struct lpfc_vport *vport)
                                 goto debug_failed;
                         }
                 } else
-                        phba->debug_dumpHBASlim = NULL;
+                        phba->debug_dumpHostSlim = NULL;
 
                 /* Setup dumpData */
                 snprintf(name, sizeof(name), "dumpData");
diff --git a/drivers/scsi/mac_scsi.c b/drivers/scsi/mac_scsi.c
index 858075723c87..f5cdc68cd5b6 100644
--- a/drivers/scsi/mac_scsi.c
+++ b/drivers/scsi/mac_scsi.c
@@ -260,6 +260,8 @@ int __init macscsi_detect(struct scsi_host_template * tpnt)
     /* Once we support multiple 5380s (e.g. DuoDock) we'll do
        something different here */
     instance = scsi_register (tpnt, sizeof(struct NCR5380_hostdata));
+    if (instance == NULL)
+        return 0;
 
     if (macintosh_config->ident == MAC_MODEL_IIFX) {
         mac_scsi_regp  = via1+0x8000;
diff --git a/drivers/scsi/megaraid/megaraid_sas.h b/drivers/scsi/megaraid/megaraid_sas.h
index e9e543c58485..34452ea386ac 100644
--- a/drivers/scsi/megaraid/megaraid_sas.h
+++ b/drivers/scsi/megaraid/megaraid_sas.h
@@ -1527,7 +1527,6 @@ struct megasas_instance {
         u32 *reply_queue;
         dma_addr_t reply_queue_h;
 
-        unsigned long base_addr;
         struct megasas_register_set __iomem *reg_set;
         u32 *reply_post_host_index_addr[MR_MAX_MSIX_REG_ARRAY];
         struct megasas_pd_list          pd_list[MEGASAS_MAX_PD];
diff --git a/drivers/scsi/megaraid/megaraid_sas_base.c b/drivers/scsi/megaraid/megaraid_sas_base.c
index c99812bf2a73..3b7ad10497fe 100644
--- a/drivers/scsi/megaraid/megaraid_sas_base.c
+++ b/drivers/scsi/megaraid/megaraid_sas_base.c
@@ -3615,6 +3615,7 @@ static int megasas_init_fw(struct megasas_instance *instance)
         u32 max_sectors_1;
         u32 max_sectors_2;
         u32 tmp_sectors, msix_enable, scratch_pad_2;
+        resource_size_t base_addr;
         struct megasas_register_set __iomem *reg_set;
         struct megasas_ctrl_info *ctrl_info;
         unsigned long bar_list;
@@ -3623,14 +3624,14 @@ static int megasas_init_fw(struct megasas_instance *instance)
         /* Find first memory bar */
         bar_list = pci_select_bars(instance->pdev, IORESOURCE_MEM);
         instance->bar = find_first_bit(&bar_list, sizeof(unsigned long));
-        instance->base_addr = pci_resource_start(instance->pdev, instance->bar);
         if (pci_request_selected_regions(instance->pdev, instance->bar,
                                          "megasas: LSI")) {
                 printk(KERN_DEBUG "megasas: IO memory region busy!\n");
                 return -EBUSY;
         }
 
-        instance->reg_set = ioremap_nocache(instance->base_addr, 8192);
+        base_addr = pci_resource_start(instance->pdev, instance->bar);
+        instance->reg_set = ioremap_nocache(base_addr, 8192);
 
         if (!instance->reg_set) {
                 printk(KERN_DEBUG "megasas: Failed to map IO mem\n");
diff --git a/drivers/scsi/mpt2sas/mpt2sas_base.c b/drivers/scsi/mpt2sas/mpt2sas_base.c
index 3901edc35812..bde63f7452bd 100644
--- a/drivers/scsi/mpt2sas/mpt2sas_base.c
+++ b/drivers/scsi/mpt2sas/mpt2sas_base.c
@@ -128,7 +128,7 @@ static int mpt2sas_remove_dead_ioc_func(void *arg)
                 pdev = ioc->pdev;
                 if ((pdev == NULL))
                         return -1;
-                pci_stop_and_remove_bus_device(pdev);
+                pci_stop_and_remove_bus_device_locked(pdev);
                 return 0;
 }
 
diff --git a/drivers/scsi/mpt2sas/mpt2sas_transport.c b/drivers/scsi/mpt2sas/mpt2sas_transport.c
index 9d26637308be..410f4a3e8888 100644
--- a/drivers/scsi/mpt2sas/mpt2sas_transport.c
+++ b/drivers/scsi/mpt2sas/mpt2sas_transport.c
@@ -1901,7 +1901,7 @@ _transport_smp_handler(struct Scsi_Host *shost, struct sas_rphy *rphy,
         struct MPT2SAS_ADAPTER *ioc = shost_priv(shost);
         Mpi2SmpPassthroughRequest_t *mpi_request;
         Mpi2SmpPassthroughReply_t *mpi_reply;
-        int rc, i;
+        int rc;
         u16 smid;
         u32 ioc_state;
         unsigned long timeleft;
@@ -1916,7 +1916,8 @@ _transport_smp_handler(struct Scsi_Host *shost, struct sas_rphy *rphy,
         void *pci_addr_out = NULL;
         u16 wait_state_count;
         struct request *rsp = req->next_rq;
-        struct bio_vec *bvec = NULL;
+        struct bio_vec bvec;
+        struct bvec_iter iter;
 
         if (!rsp) {
                 printk(MPT2SAS_ERR_FMT "%s: the smp response space is "
@@ -1942,7 +1943,7 @@ _transport_smp_handler(struct Scsi_Host *shost, struct sas_rphy *rphy,
         ioc->transport_cmds.status = MPT2_CMD_PENDING;
 
         /* Check if the request is split across multiple segments */
-        if (bio_segments(req->bio) > 1) {
+        if (bio_multiple_segments(req->bio)) {
                 u32 offset = 0;
 
                 /* Allocate memory and copy the request */
@@ -1955,11 +1956,11 @@ _transport_smp_handler(struct Scsi_Host *shost, struct sas_rphy *rphy,
                         goto out;
                 }
 
-                bio_for_each_segment(bvec, req->bio, i) {
+                bio_for_each_segment(bvec, req->bio, iter) {
                         memcpy(pci_addr_out + offset,
-                            page_address(bvec->bv_page) + bvec->bv_offset,
-                            bvec->bv_len);
-                        offset += bvec->bv_len;
+                            page_address(bvec.bv_page) + bvec.bv_offset,
+                            bvec.bv_len);
+                        offset += bvec.bv_len;
                 }
         } else {
                 dma_addr_out = pci_map_single(ioc->pdev, bio_data(req->bio),
@@ -1974,7 +1975,7 @@ _transport_smp_handler(struct Scsi_Host *shost, struct sas_rphy *rphy,
 
         /* Check if the response needs to be populated across
          * multiple segments */
-        if (bio_segments(rsp->bio) > 1) {
+        if (bio_multiple_segments(rsp->bio)) {
                 pci_addr_in = pci_alloc_consistent(ioc->pdev, blk_rq_bytes(rsp),
                     &pci_dma_in);
                 if (!pci_addr_in) {
@@ -2041,7 +2042,7 @@ _transport_smp_handler(struct Scsi_Host *shost, struct sas_rphy *rphy,
         sgl_flags = (MPI2_SGE_FLAGS_SIMPLE_ELEMENT |
             MPI2_SGE_FLAGS_END_OF_BUFFER | MPI2_SGE_FLAGS_HOST_TO_IOC);
         sgl_flags = sgl_flags << MPI2_SGE_FLAGS_SHIFT;
-        if (bio_segments(req->bio) > 1) {
+        if (bio_multiple_segments(req->bio)) {
                 ioc->base_add_sg_single(psge, sgl_flags |
                     (blk_rq_bytes(req) - 4), pci_dma_out);
         } else {
@@ -2057,7 +2058,7 @@ _transport_smp_handler(struct Scsi_Host *shost, struct sas_rphy *rphy,
             MPI2_SGE_FLAGS_LAST_ELEMENT | MPI2_SGE_FLAGS_END_OF_BUFFER |
             MPI2_SGE_FLAGS_END_OF_LIST);
         sgl_flags = sgl_flags << MPI2_SGE_FLAGS_SHIFT;
-        if (bio_segments(rsp->bio) > 1) {
+        if (bio_multiple_segments(rsp->bio)) {
                 ioc->base_add_sg_single(psge, sgl_flags |
                     (blk_rq_bytes(rsp) + 4), pci_dma_in);
         } else {
@@ -2102,23 +2103,23 @@ _transport_smp_handler(struct Scsi_Host *shost, struct sas_rphy *rphy,
                     le16_to_cpu(mpi_reply->ResponseDataLength);
                 /* check if the resp needs to be copied from the allocated
                  * pci mem */
-                if (bio_segments(rsp->bio) > 1) {
+                if (bio_multiple_segments(rsp->bio)) {
                         u32 offset = 0;
                         u32 bytes_to_copy =
                             le16_to_cpu(mpi_reply->ResponseDataLength);
-                        bio_for_each_segment(bvec, rsp->bio, i) {
-                                if (bytes_to_copy <= bvec->bv_len) {
-                                        memcpy(page_address(bvec->bv_page) +
-                                            bvec->bv_offset, pci_addr_in +
+                        bio_for_each_segment(bvec, rsp->bio, iter) {
+                                if (bytes_to_copy <= bvec.bv_len) {
+                                        memcpy(page_address(bvec.bv_page) +
+                                            bvec.bv_offset, pci_addr_in +
                                             offset, bytes_to_copy);
                                         break;
                                 } else {
-                                        memcpy(page_address(bvec->bv_page) +
-                                            bvec->bv_offset, pci_addr_in +
-                                            offset, bvec->bv_len);
-                                        bytes_to_copy -= bvec->bv_len;
+                                        memcpy(page_address(bvec.bv_page) +
+                                            bvec.bv_offset, pci_addr_in +
+                                            offset, bvec.bv_len);
+                                        bytes_to_copy -= bvec.bv_len;
                                 }
-                                offset += bvec->bv_len;
+                                offset += bvec.bv_len;
                         }
                 }
         } else {
diff --git a/drivers/scsi/mpt3sas/mpt3sas_base.c b/drivers/scsi/mpt3sas/mpt3sas_base.c
index fa785062e97b..0cf4f7000f94 100644
--- a/drivers/scsi/mpt3sas/mpt3sas_base.c
+++ b/drivers/scsi/mpt3sas/mpt3sas_base.c
@@ -131,7 +131,7 @@ static int mpt3sas_remove_dead_ioc_func(void *arg)
         pdev = ioc->pdev;
         if ((pdev == NULL))
                 return -1;
-        pci_stop_and_remove_bus_device(pdev);
+        pci_stop_and_remove_bus_device_locked(pdev);
         return 0;
 }
 
diff --git a/drivers/scsi/mpt3sas/mpt3sas_transport.c b/drivers/scsi/mpt3sas/mpt3sas_transport.c
index e771a88c6a74..65170cb1a00f 100644
--- a/drivers/scsi/mpt3sas/mpt3sas_transport.c
+++ b/drivers/scsi/mpt3sas/mpt3sas_transport.c
@@ -1884,7 +1884,7 @@ _transport_smp_handler(struct Scsi_Host *shost, struct sas_rphy *rphy,
         struct MPT3SAS_ADAPTER *ioc = shost_priv(shost);
         Mpi2SmpPassthroughRequest_t *mpi_request;
         Mpi2SmpPassthroughReply_t *mpi_reply;
-        int rc, i;
+        int rc;
         u16 smid;
         u32 ioc_state;
         unsigned long timeleft;
@@ -1898,7 +1898,8 @@ _transport_smp_handler(struct Scsi_Host *shost, struct sas_rphy *rphy,
         void *pci_addr_out = NULL;
         u16 wait_state_count;
         struct request *rsp = req->next_rq;
-        struct bio_vec *bvec = NULL;
+        struct bio_vec bvec;
+        struct bvec_iter iter;
 
         if (!rsp) {
                 pr_err(MPT3SAS_FMT "%s: the smp response space is missing\n",
@@ -1925,7 +1926,7 @@ _transport_smp_handler(struct Scsi_Host *shost, struct sas_rphy *rphy,
         ioc->transport_cmds.status = MPT3_CMD_PENDING;
 
         /* Check if the request is split across multiple segments */
-        if (req->bio->bi_vcnt > 1) {
+        if (bio_multiple_segments(req->bio)) {
                 u32 offset = 0;
 
                 /* Allocate memory and copy the request */
@@ -1938,11 +1939,11 @@ _transport_smp_handler(struct Scsi_Host *shost, struct sas_rphy *rphy,
                         goto out;
                 }
 
-                bio_for_each_segment(bvec, req->bio, i) {
+                bio_for_each_segment(bvec, req->bio, iter) {
                         memcpy(pci_addr_out + offset,
-                            page_address(bvec->bv_page) + bvec->bv_offset,
-                            bvec->bv_len);
-                        offset += bvec->bv_len;
+                            page_address(bvec.bv_page) + bvec.bv_offset,
+                            bvec.bv_len);
+                        offset += bvec.bv_len;
                 }
         } else {
                 dma_addr_out = pci_map_single(ioc->pdev, bio_data(req->bio),
@@ -1957,7 +1958,7 @@ _transport_smp_handler(struct Scsi_Host *shost, struct sas_rphy *rphy,
 
         /* Check if the response needs to be populated across
          * multiple segments */
-        if (rsp->bio->bi_vcnt > 1) {
+        if (bio_multiple_segments(rsp->bio)) {
                 pci_addr_in = pci_alloc_consistent(ioc->pdev, blk_rq_bytes(rsp),
                     &pci_dma_in);
                 if (!pci_addr_in) {
@@ -2018,7 +2019,7 @@ _transport_smp_handler(struct Scsi_Host *shost, struct sas_rphy *rphy,
         mpi_request->RequestDataLength = cpu_to_le16(blk_rq_bytes(req) - 4);
         psge = &mpi_request->SGL;
 
-        if (req->bio->bi_vcnt > 1)
+        if (bio_multiple_segments(req->bio))
                 ioc->build_sg(ioc, psge, pci_dma_out, (blk_rq_bytes(req) - 4),
                     pci_dma_in, (blk_rq_bytes(rsp) + 4));
         else
@@ -2063,23 +2064,23 @@ _transport_smp_handler(struct Scsi_Host *shost, struct sas_rphy *rphy,
 
                 /* check if the resp needs to be copied from the allocated
                  * pci mem */
-                if (rsp->bio->bi_vcnt > 1) {
+                if (bio_multiple_segments(rsp->bio)) {
                         u32 offset = 0;
                         u32 bytes_to_copy =
                             le16_to_cpu(mpi_reply->ResponseDataLength);
-                        bio_for_each_segment(bvec, rsp->bio, i) {
-                                if (bytes_to_copy <= bvec->bv_len) {
-                                        memcpy(page_address(bvec->bv_page) +
-                                            bvec->bv_offset, pci_addr_in +
+                        bio_for_each_segment(bvec, rsp->bio, iter) {
+                                if (bytes_to_copy <= bvec.bv_len) {
+                                        memcpy(page_address(bvec.bv_page) +
+                                            bvec.bv_offset, pci_addr_in +
                                             offset, bytes_to_copy);
                                         break;
                                 } else {
-                                        memcpy(page_address(bvec->bv_page) +
-                                            bvec->bv_offset, pci_addr_in +
-                                            offset, bvec->bv_len);
-                                        bytes_to_copy -= bvec->bv_len;
+                                        memcpy(page_address(bvec.bv_page) +
+                                            bvec.bv_offset, pci_addr_in +
+                                            offset, bvec.bv_len);
+                                        bytes_to_copy -= bvec.bv_len;
                                 }
-                                offset += bvec->bv_len;
+                                offset += bvec.bv_len;
                         }
                 }
         } else {
diff --git a/drivers/scsi/osd/osd_initiator.c b/drivers/scsi/osd/osd_initiator.c
index aa66361ed44b..bac04c2335aa 100644
--- a/drivers/scsi/osd/osd_initiator.c
+++ b/drivers/scsi/osd/osd_initiator.c
@@ -731,7 +731,7 @@ static int _osd_req_list_objects(struct osd_request *or,
 
         bio->bi_rw &= ~REQ_WRITE;
         or->in.bio = bio;
-        or->in.total_bytes = bio->bi_size;
+        or->in.total_bytes = bio->bi_iter.bi_size;
         return 0;
 }
 
diff --git a/drivers/scsi/qla1280.c b/drivers/scsi/qla1280.c
index 5a522c5bbd43..97dabd39b092 100644
--- a/drivers/scsi/qla1280.c
+++ b/drivers/scsi/qla1280.c
@@ -2502,7 +2502,7 @@ qla1280_mailbox_command(struct scsi_qla_host *ha, uint8_t mr, uint16_t *mb)
         /* Issue set host interrupt command. */
 
         /* set up a timer just in case we're really jammed */
-        init_timer(&timer);
+        init_timer_on_stack(&timer);
         timer.expires = jiffies + 20*HZ;
         timer.data = (unsigned long)ha;
         timer.function = qla1280_mailbox_timeout;
diff --git a/drivers/scsi/qla2xxx/qla_attr.c b/drivers/scsi/qla2xxx/qla_attr.c
index 5f174b83f56f..4a0d7c92181f 100644
--- a/drivers/scsi/qla2xxx/qla_attr.c
+++ b/drivers/scsi/qla2xxx/qla_attr.c
@@ -862,7 +862,7 @@ qla2x00_alloc_sysfs_attr(scsi_qla_host_t *vha)
 }
 
 void
-qla2x00_free_sysfs_attr(scsi_qla_host_t *vha)
+qla2x00_free_sysfs_attr(scsi_qla_host_t *vha, bool stop_beacon)
 {
         struct Scsi_Host *host = vha->host;
         struct sysfs_entry *iter;
@@ -880,7 +880,7 @@ qla2x00_free_sysfs_attr(scsi_qla_host_t *vha)
                     iter->attr);
         }
 
-        if (ha->beacon_blink_led == 1)
+        if (stop_beacon && ha->beacon_blink_led == 1)
                 ha->isp_ops->beacon_off(vha);
 }
 
@@ -890,7 +890,7 @@ static ssize_t
 qla2x00_drvr_version_show(struct device *dev,
                           struct device_attribute *attr, char *buf)
 {
-        return snprintf(buf, PAGE_SIZE, "%s\n", qla2x00_version_str);
+        return scnprintf(buf, PAGE_SIZE, "%s\n", qla2x00_version_str);
 }
 
 static ssize_t
@@ -901,7 +901,7 @@ qla2x00_fw_version_show(struct device *dev,
         struct qla_hw_data *ha = vha->hw;
         char fw_str[128];
 
-        return snprintf(buf, PAGE_SIZE, "%s\n",
+        return scnprintf(buf, PAGE_SIZE, "%s\n",
             ha->isp_ops->fw_version_str(vha, fw_str));
 }
 
@@ -914,15 +914,15 @@ qla2x00_serial_num_show(struct device *dev, struct device_attribute *attr,
         uint32_t sn;
 
         if (IS_QLAFX00(vha->hw)) {
-                return snprintf(buf, PAGE_SIZE, "%s\n",
+                return scnprintf(buf, PAGE_SIZE, "%s\n",
                     vha->hw->mr.serial_num);
         } else if (IS_FWI2_CAPABLE(ha)) {
-                qla2xxx_get_vpd_field(vha, "SN", buf, PAGE_SIZE);
-                return snprintf(buf, PAGE_SIZE, "%s\n", buf);
+                qla2xxx_get_vpd_field(vha, "SN", buf, PAGE_SIZE - 1);
+                return strlen(strcat(buf, "\n"));
         }
 
         sn = ((ha->serial0 & 0x1f) << 16) | (ha->serial2 << 8) | ha->serial1;
-        return snprintf(buf, PAGE_SIZE, "%c%05d\n", 'A' + sn / 100000,
+        return scnprintf(buf, PAGE_SIZE, "%c%05d\n", 'A' + sn / 100000,
             sn % 100000);
 }
 
@@ -931,7 +931,7 @@ qla2x00_isp_name_show(struct device *dev, struct device_attribute *attr,
                       char *buf)
 {
         scsi_qla_host_t *vha = shost_priv(class_to_shost(dev));
-        return snprintf(buf, PAGE_SIZE, "ISP%04X\n", vha->hw->pdev->device);
+        return scnprintf(buf, PAGE_SIZE, "ISP%04X\n", vha->hw->pdev->device);
 }
 
 static ssize_t
@@ -942,10 +942,10 @@ qla2x00_isp_id_show(struct device *dev, struct device_attribute *attr,
         struct qla_hw_data *ha = vha->hw;
 
         if (IS_QLAFX00(vha->hw))
-                return snprintf(buf, PAGE_SIZE, "%s\n",
+                return scnprintf(buf, PAGE_SIZE, "%s\n",
                     vha->hw->mr.hw_version);
 
-        return snprintf(buf, PAGE_SIZE, "%04x %04x %04x %04x\n",
+        return scnprintf(buf, PAGE_SIZE, "%04x %04x %04x %04x\n",
             ha->product_id[0], ha->product_id[1], ha->product_id[2],
             ha->product_id[3]);
 }
@@ -956,11 +956,7 @@ qla2x00_model_name_show(struct device *dev, struct device_attribute *attr,
 {
         scsi_qla_host_t *vha = shost_priv(class_to_shost(dev));
 
-        if (IS_QLAFX00(vha->hw))
-                return snprintf(buf, PAGE_SIZE, "%s\n",
-                    vha->hw->mr.product_name);
-
-        return snprintf(buf, PAGE_SIZE, "%s\n", vha->hw->model_number);
+        return scnprintf(buf, PAGE_SIZE, "%s\n", vha->hw->model_number);
 }
 
 static ssize_t
@@ -968,7 +964,7 @@ qla2x00_model_desc_show(struct device *dev, struct device_attribute *attr,
                         char *buf)
 {
         scsi_qla_host_t *vha = shost_priv(class_to_shost(dev));
-        return snprintf(buf, PAGE_SIZE, "%s\n",
+        return scnprintf(buf, PAGE_SIZE, "%s\n",
             vha->hw->model_desc ? vha->hw->model_desc : "");
 }
 
@@ -979,7 +975,7 @@ qla2x00_pci_info_show(struct device *dev, struct device_attribute *attr,
         scsi_qla_host_t *vha = shost_priv(class_to_shost(dev));
         char pci_info[30];
 
-        return snprintf(buf, PAGE_SIZE, "%s\n",
+        return scnprintf(buf, PAGE_SIZE, "%s\n",
             vha->hw->isp_ops->pci_info_str(vha, pci_info));
 }
 
@@ -994,29 +990,29 @@ qla2x00_link_state_show(struct device *dev, struct device_attribute *attr,
         if (atomic_read(&vha->loop_state) == LOOP_DOWN ||
             atomic_read(&vha->loop_state) == LOOP_DEAD ||
             vha->device_flags & DFLG_NO_CABLE)
-                len = snprintf(buf, PAGE_SIZE, "Link Down\n");
+                len = scnprintf(buf, PAGE_SIZE, "Link Down\n");
         else if (atomic_read(&vha->loop_state) != LOOP_READY ||
             qla2x00_reset_active(vha))
-                len = snprintf(buf, PAGE_SIZE, "Unknown Link State\n");
+                len = scnprintf(buf, PAGE_SIZE, "Unknown Link State\n");
         else {
-                len = snprintf(buf, PAGE_SIZE, "Link Up - ");
+                len = scnprintf(buf, PAGE_SIZE, "Link Up - ");
 
                 switch (ha->current_topology) {
                 case ISP_CFG_NL:
-                        len += snprintf(buf + len, PAGE_SIZE-len, "Loop\n");
+                        len += scnprintf(buf + len, PAGE_SIZE-len, "Loop\n");
                         break;
                 case ISP_CFG_FL:
-                        len += snprintf(buf + len, PAGE_SIZE-len, "FL_Port\n");
+                        len += scnprintf(buf + len, PAGE_SIZE-len, "FL_Port\n");
                         break;
                 case ISP_CFG_N:
-                        len += snprintf(buf + len, PAGE_SIZE-len,
+                        len += scnprintf(buf + len, PAGE_SIZE-len,
                             "N_Port to N_Port\n");
                         break;
                 case ISP_CFG_F:
-                        len += snprintf(buf + len, PAGE_SIZE-len, "F_Port\n");
+                        len += scnprintf(buf + len, PAGE_SIZE-len, "F_Port\n");
                         break;
                 default:
-                        len += snprintf(buf + len, PAGE_SIZE-len, "Loop\n");
+                        len += scnprintf(buf + len, PAGE_SIZE-len, "Loop\n");
                         break;
                 }
         }
@@ -1032,10 +1028,10 @@ qla2x00_zio_show(struct device *dev, struct device_attribute *attr,
 
         switch (vha->hw->zio_mode) {
         case QLA_ZIO_MODE_6:
-                len += snprintf(buf + len, PAGE_SIZE-len, "Mode 6\n");
+                len += scnprintf(buf + len, PAGE_SIZE-len, "Mode 6\n");
                 break;
         case QLA_ZIO_DISABLED:
-                len += snprintf(buf + len, PAGE_SIZE-len, "Disabled\n");
+                len += scnprintf(buf + len, PAGE_SIZE-len, "Disabled\n");
                 break;
         }
         return len;
@@ -1075,7 +1071,7 @@ qla2x00_zio_timer_show(struct device *dev, struct device_attribute *attr,
 {
         scsi_qla_host_t *vha = shost_priv(class_to_shost(dev));
 
-        return snprintf(buf, PAGE_SIZE, "%d us\n", vha->hw->zio_timer * 100);
+        return scnprintf(buf, PAGE_SIZE, "%d us\n", vha->hw->zio_timer * 100);
 }
 
 static ssize_t
@@ -1105,9 +1101,9 @@ qla2x00_beacon_show(struct device *dev, struct device_attribute *attr,
         int len = 0;
 
         if (vha->hw->beacon_blink_led)
-                len += snprintf(buf + len, PAGE_SIZE-len, "Enabled\n");
+                len += scnprintf(buf + len, PAGE_SIZE-len, "Enabled\n");
         else
-                len += snprintf(buf + len, PAGE_SIZE-len, "Disabled\n");
+                len += scnprintf(buf + len, PAGE_SIZE-len, "Disabled\n");
         return len;
 }
 
@@ -1149,7 +1145,7 @@ qla2x00_optrom_bios_version_show(struct device *dev,
 {
         scsi_qla_host_t *vha = shost_priv(class_to_shost(dev));
         struct qla_hw_data *ha = vha->hw;
-        return snprintf(buf, PAGE_SIZE, "%d.%02d\n", ha->bios_revision[1],
+        return scnprintf(buf, PAGE_SIZE, "%d.%02d\n", ha->bios_revision[1],
             ha->bios_revision[0]);
 }
 
@@ -1159,7 +1155,7 @@ qla2x00_optrom_efi_version_show(struct device *dev,
 {
         scsi_qla_host_t *vha = shost_priv(class_to_shost(dev));
         struct qla_hw_data *ha = vha->hw;
-        return snprintf(buf, PAGE_SIZE, "%d.%02d\n", ha->efi_revision[1],
+        return scnprintf(buf, PAGE_SIZE, "%d.%02d\n", ha->efi_revision[1],
             ha->efi_revision[0]);
 }
 
@@ -1169,7 +1165,7 @@ qla2x00_optrom_fcode_version_show(struct device *dev,
 {
         scsi_qla_host_t *vha = shost_priv(class_to_shost(dev));
         struct qla_hw_data *ha = vha->hw;
-        return snprintf(buf, PAGE_SIZE, "%d.%02d\n", ha->fcode_revision[1],
+        return scnprintf(buf, PAGE_SIZE, "%d.%02d\n", ha->fcode_revision[1],
             ha->fcode_revision[0]);
 }
 
@@ -1179,7 +1175,7 @@ qla2x00_optrom_fw_version_show(struct device *dev,
 {
         scsi_qla_host_t *vha = shost_priv(class_to_shost(dev));
         struct qla_hw_data *ha = vha->hw;
-        return snprintf(buf, PAGE_SIZE, "%d.%02d.%02d %d\n",
+        return scnprintf(buf, PAGE_SIZE, "%d.%02d.%02d %d\n",
             ha->fw_revision[0], ha->fw_revision[1], ha->fw_revision[2],
             ha->fw_revision[3]);
 }
@@ -1192,9 +1188,9 @@ qla2x00_optrom_gold_fw_version_show(struct device *dev,
         struct qla_hw_data *ha = vha->hw;
 
         if (!IS_QLA81XX(ha) && !IS_QLA83XX(ha))
-                return snprintf(buf, PAGE_SIZE, "\n");
+                return scnprintf(buf, PAGE_SIZE, "\n");
 
-        return snprintf(buf, PAGE_SIZE, "%d.%02d.%02d (%d)\n",
+        return scnprintf(buf, PAGE_SIZE, "%d.%02d.%02d (%d)\n",
             ha->gold_fw_version[0], ha->gold_fw_version[1],
             ha->gold_fw_version[2], ha->gold_fw_version[3]);
 }
@@ -1204,7 +1200,7 @@ qla2x00_total_isp_aborts_show(struct device *dev,
                               struct device_attribute *attr, char *buf)
 {
         scsi_qla_host_t *vha = shost_priv(class_to_shost(dev));
-        return snprintf(buf, PAGE_SIZE, "%d\n",
+        return scnprintf(buf, PAGE_SIZE, "%d\n",
             vha->qla_stats.total_isp_aborts);
 }
 
@@ -1218,16 +1214,16 @@ qla24xx_84xx_fw_version_show(struct device *dev,
         struct qla_hw_data *ha = vha->hw;
 
         if (!IS_QLA84XX(ha))
-                return snprintf(buf, PAGE_SIZE, "\n");
+                return scnprintf(buf, PAGE_SIZE, "\n");
 
         if (ha->cs84xx->op_fw_version == 0)
                 rval = qla84xx_verify_chip(vha, status);
 
         if ((rval == QLA_SUCCESS) && (status[0] == 0))
-                return snprintf(buf, PAGE_SIZE, "%u\n",
+                return scnprintf(buf, PAGE_SIZE, "%u\n",
                         (uint32_t)ha->cs84xx->op_fw_version);
 
-        return snprintf(buf, PAGE_SIZE, "\n");
+        return scnprintf(buf, PAGE_SIZE, "\n");
 }
 
 static ssize_t
@@ -1238,9 +1234,9 @@ qla2x00_mpi_version_show(struct device *dev, struct device_attribute *attr,
         struct qla_hw_data *ha = vha->hw;
 
         if (!IS_QLA81XX(ha) && !IS_QLA8031(ha) && !IS_QLA8044(ha))
-                return snprintf(buf, PAGE_SIZE, "\n");
+                return scnprintf(buf, PAGE_SIZE, "\n");
 
-        return snprintf(buf, PAGE_SIZE, "%d.%02d.%02d (%x)\n",
+        return scnprintf(buf, PAGE_SIZE, "%d.%02d.%02d (%x)\n",
             ha->mpi_version[0], ha->mpi_version[1], ha->mpi_version[2],
             ha->mpi_capabilities);
 }
@@ -1253,9 +1249,9 @@ qla2x00_phy_version_show(struct device *dev, struct device_attribute *attr,
         struct qla_hw_data *ha = vha->hw;
 
         if (!IS_QLA81XX(ha) && !IS_QLA8031(ha))
-                return snprintf(buf, PAGE_SIZE, "\n");
+                return scnprintf(buf, PAGE_SIZE, "\n");
 
-        return snprintf(buf, PAGE_SIZE, "%d.%02d.%02d\n",
+        return scnprintf(buf, PAGE_SIZE, "%d.%02d.%02d\n",
             ha->phy_version[0], ha->phy_version[1], ha->phy_version[2]);
 }
 
@@ -1266,7 +1262,7 @@ qla2x00_flash_block_size_show(struct device *dev,
         scsi_qla_host_t *vha = shost_priv(class_to_shost(dev));
         struct qla_hw_data *ha = vha->hw;
 
-        return snprintf(buf, PAGE_SIZE, "0x%x\n", ha->fdt_block_size);
+        return scnprintf(buf, PAGE_SIZE, "0x%x\n", ha->fdt_block_size);
 }
 
 static ssize_t
@@ -1276,9 +1272,9 @@ qla2x00_vlan_id_show(struct device *dev, struct device_attribute *attr,
         scsi_qla_host_t *vha = shost_priv(class_to_shost(dev));
 
         if (!IS_CNA_CAPABLE(vha->hw))
-                return snprintf(buf, PAGE_SIZE, "\n");
+                return scnprintf(buf, PAGE_SIZE, "\n");
 
-        return snprintf(buf, PAGE_SIZE, "%d\n", vha->fcoe_vlan_id);
+        return scnprintf(buf, PAGE_SIZE, "%d\n", vha->fcoe_vlan_id);
 }
 
 static ssize_t
@@ -1288,9 +1284,9 @@ qla2x00_vn_port_mac_address_show(struct device *dev,
         scsi_qla_host_t *vha = shost_priv(class_to_shost(dev));
 
         if (!IS_CNA_CAPABLE(vha->hw))
-                return snprintf(buf, PAGE_SIZE, "\n");
+                return scnprintf(buf, PAGE_SIZE, "\n");
 
-        return snprintf(buf, PAGE_SIZE, "%pMR\n", vha->fcoe_vn_port_mac);
+        return scnprintf(buf, PAGE_SIZE, "%pMR\n", vha->fcoe_vn_port_mac);
 }
 
 static ssize_t
@@ -1299,7 +1295,7 @@ qla2x00_fabric_param_show(struct device *dev, struct device_attribute *attr,
 {
         scsi_qla_host_t *vha = shost_priv(class_to_shost(dev));
 
-        return snprintf(buf, PAGE_SIZE, "%d\n", vha->hw->switch_cap);
+        return scnprintf(buf, PAGE_SIZE, "%d\n", vha->hw->switch_cap);
 }
 
 static ssize_t
@@ -1320,10 +1316,10 @@ qla2x00_thermal_temp_show(struct device *dev,
         }
 
         if (qla2x00_get_thermal_temp(vha, &temp) == QLA_SUCCESS)
-                return snprintf(buf, PAGE_SIZE, "%d\n", temp);
+                return scnprintf(buf, PAGE_SIZE, "%d\n", temp);
 
 done:
-        return snprintf(buf, PAGE_SIZE, "\n");
+        return scnprintf(buf, PAGE_SIZE, "\n");
 }
 
 static ssize_t
@@ -1337,7 +1333,7 @@ qla2x00_fw_state_show(struct device *dev, struct device_attribute *attr,
 
         if (IS_QLAFX00(vha->hw)) {
                 pstate = qlafx00_fw_state_show(dev, attr, buf);
-                return snprintf(buf, PAGE_SIZE, "0x%x\n", pstate);
+                return scnprintf(buf, PAGE_SIZE, "0x%x\n", pstate);
         }
 
         if (qla2x00_reset_active(vha))
@@ -1348,7 +1344,7 @@ qla2x00_fw_state_show(struct device *dev, struct device_attribute *attr,
         if (rval != QLA_SUCCESS)
                 memset(state, -1, sizeof(state));
 
-        return snprintf(buf, PAGE_SIZE, "0x%x 0x%x 0x%x 0x%x 0x%x\n", state[0],
+        return scnprintf(buf, PAGE_SIZE, "0x%x 0x%x 0x%x 0x%x 0x%x\n", state[0],
             state[1], state[2], state[3], state[4]);
 }
 
@@ -1359,9 +1355,9 @@ qla2x00_diag_requests_show(struct device *dev,
         scsi_qla_host_t *vha = shost_priv(class_to_shost(dev));
 
         if (!IS_BIDI_CAPABLE(vha->hw))
-                return snprintf(buf, PAGE_SIZE, "\n");
+                return scnprintf(buf, PAGE_SIZE, "\n");
 
-        return snprintf(buf, PAGE_SIZE, "%llu\n", vha->bidi_stats.io_count);
+        return scnprintf(buf, PAGE_SIZE, "%llu\n", vha->bidi_stats.io_count);
 }
 
 static ssize_t
@@ -1371,9 +1367,9 @@ qla2x00_diag_megabytes_show(struct device *dev,
         scsi_qla_host_t *vha = shost_priv(class_to_shost(dev));
 
         if (!IS_BIDI_CAPABLE(vha->hw))
-                return snprintf(buf, PAGE_SIZE, "\n");
+                return scnprintf(buf, PAGE_SIZE, "\n");
 
-        return snprintf(buf, PAGE_SIZE, "%llu\n",
+        return scnprintf(buf, PAGE_SIZE, "%llu\n",
             vha->bidi_stats.transfer_bytes >> 20);
 }
 
@@ -1392,7 +1388,7 @@ qla2x00_fw_dump_size_show(struct device *dev, struct device_attribute *attr,
         else
                 size = ha->fw_dump_len;
 
-        return snprintf(buf, PAGE_SIZE, "%d\n", size);
+        return scnprintf(buf, PAGE_SIZE, "%d\n", size);
 }
 
 static DEVICE_ATTR(driver_version, S_IRUGO, qla2x00_drvr_version_show, NULL);
@@ -1994,6 +1990,8 @@ qla24xx_vport_delete(struct fc_vport *fc_vport)
 
         vha->flags.delete_progress = 1;
 
+        qlt_remove_target(ha, vha);
+
         fc_remove_host(vha->host);
 
         scsi_remove_host(vha->host);
diff --git a/drivers/scsi/qla2xxx/qla_bsg.c b/drivers/scsi/qla2xxx/qla_bsg.c
index aa57bf0af574..f15d03e6b7ee 100644
--- a/drivers/scsi/qla2xxx/qla_bsg.c
+++ b/drivers/scsi/qla2xxx/qla_bsg.c
@@ -2022,6 +2022,46 @@ done:
 }
 
 static int
+qla26xx_serdes_op(struct fc_bsg_job *bsg_job)
+{
+        struct Scsi_Host *host = bsg_job->shost;
+        scsi_qla_host_t *vha = shost_priv(host);
+        int rval = 0;
+        struct qla_serdes_reg sr;
+
+        memset(&sr, 0, sizeof(sr));
+
+        sg_copy_to_buffer(bsg_job->request_payload.sg_list,
+            bsg_job->request_payload.sg_cnt, &sr, sizeof(sr));
+
+        switch (sr.cmd) {
+        case INT_SC_SERDES_WRITE_REG:
+                rval = qla2x00_write_serdes_word(vha, sr.addr, sr.val);
+                bsg_job->reply->reply_payload_rcv_len = 0;
+                break;
+        case INT_SC_SERDES_READ_REG:
+                rval = qla2x00_read_serdes_word(vha, sr.addr, &sr.val);
+                sg_copy_from_buffer(bsg_job->reply_payload.sg_list,
+                    bsg_job->reply_payload.sg_cnt, &sr, sizeof(sr));
+                bsg_job->reply->reply_payload_rcv_len = sizeof(sr);
+                break;
+        default:
+                ql_log(ql_log_warn, vha, 0x708c,
+                    "Unknown serdes cmd %x.\n", sr.cmd);
+                rval = -EDOM;
+                break;
+        }
+
+        bsg_job->reply->reply_data.vendor_reply.vendor_rsp[0] =
+            rval ? EXT_STATUS_MAILBOX : 0;
+
+        bsg_job->reply_len = sizeof(struct fc_bsg_reply);
+        bsg_job->reply->result = DID_OK << 16;
+        bsg_job->job_done(bsg_job);
+        return 0;
+}
+
+static int
 qla2x00_process_vendor_specific(struct fc_bsg_job *bsg_job)
 {
         switch (bsg_job->request->rqst_data.h_vendor.vendor_cmd[0]) {
@@ -2069,6 +2109,10 @@ qla2x00_process_vendor_specific(struct fc_bsg_job *bsg_job)
 
         case QL_VND_FX00_MGMT_CMD:
                 return qlafx00_mgmt_cmd(bsg_job);
+
+        case QL_VND_SERDES_OP:
+                return qla26xx_serdes_op(bsg_job);
+
         default:
                 return -ENOSYS;
         }
diff --git a/drivers/scsi/qla2xxx/qla_bsg.h b/drivers/scsi/qla2xxx/qla_bsg.h
index 04f770332c2b..e5c2126221e9 100644
--- a/drivers/scsi/qla2xxx/qla_bsg.h
+++ b/drivers/scsi/qla2xxx/qla_bsg.h
@@ -23,6 +23,7 @@
 #define QL_VND_WRITE_I2C        0x10
 #define QL_VND_READ_I2C         0x11
 #define QL_VND_FX00_MGMT_CMD    0x12
+#define QL_VND_SERDES_OP        0x13
 
 /* BSG Vendor specific subcode returns */
 #define EXT_STATUS_OK                   0
@@ -212,4 +213,16 @@ struct qla_i2c_access {
         uint8_t  buffer[0x40];
 } __packed;
 
+/* 26xx serdes register interface */
+
+/* serdes reg commands */
+#define INT_SC_SERDES_READ_REG          1
+#define INT_SC_SERDES_WRITE_REG         2
+
+struct qla_serdes_reg {
+        uint16_t cmd;
+        uint16_t addr;
+        uint16_t val;
+} __packed;
+
 #endif
diff --git a/drivers/scsi/qla2xxx/qla_dbg.c b/drivers/scsi/qla2xxx/qla_dbg.c
index ee5c1833eb73..f6103f553bb1 100644
--- a/drivers/scsi/qla2xxx/qla_dbg.c
+++ b/drivers/scsi/qla2xxx/qla_dbg.c
@@ -11,8 +11,9 @@
  * ----------------------------------------------------------------------
  * |             Level            |   Last Value Used  |     Holes      |
  * ----------------------------------------------------------------------
- * | Module Init and Probe        |       0x0159       | 0x4b,0xba,0xfa |
- * | Mailbox commands             |       0x1181       | 0x111a-0x111b  |
+ * | Module Init and Probe        |       0x015b       | 0x4b,0xba,0xfa |
+ * |                              |                    | 0x0x015a       |
+ * | Mailbox commands             |       0x1187       | 0x111a-0x111b  |
  * |                              |                    | 0x1155-0x1158  |
  * |                              |                    | 0x1018-0x1019  |
  * |                              |                    | 0x1115-0x1116  |
@@ -26,7 +27,7 @@
  * |                              |                    | 0x302d,0x3033  |
  * |                              |                    | 0x3036,0x3038  |
  * |                              |                    | 0x303a         |
- * | DPC Thread                   |       0x4022       | 0x4002,0x4013  |
+ * | DPC Thread                   |       0x4023       | 0x4002,0x4013  |
  * | Async Events                 |       0x5087       | 0x502b-0x502f  |
  * |                              |                    | 0x5047,0x5052  |
  * |                              |                    | 0x5084,0x5075  |
diff --git a/drivers/scsi/qla2xxx/qla_def.h b/drivers/scsi/qla2xxx/qla_def.h
index 93db74ef3461..e1fe95ef23e1 100644
--- a/drivers/scsi/qla2xxx/qla_def.h
+++ b/drivers/scsi/qla2xxx/qla_def.h
@@ -862,7 +862,6 @@ struct mbx_cmd_32 {
  */
 #define MBC_LOAD_RAM                    1       /* Load RAM. */
 #define MBC_EXECUTE_FIRMWARE            2       /* Execute firmware. */
-#define MBC_WRITE_RAM_WORD              4       /* Write RAM word. */
 #define MBC_READ_RAM_WORD               5       /* Read RAM word. */
 #define MBC_MAILBOX_REGISTER_TEST       6       /* Wrap incoming mailboxes */
 #define MBC_VERIFY_CHECKSUM             7       /* Verify checksum. */
@@ -937,6 +936,8 @@ struct mbx_cmd_32 {
 /*
  * ISP24xx mailbox commands
  */
+#define MBC_WRITE_SERDES                0x3     /* Write serdes word. */
+#define MBC_READ_SERDES                 0x4     /* Read serdes word. */
 #define MBC_SERDES_PARAMS               0x10    /* Serdes Tx Parameters. */
 #define MBC_GET_IOCB_STATUS             0x12    /* Get IOCB status command. */
 #define MBC_PORT_PARAMS                 0x1A    /* Port iDMA Parameters. */
@@ -2734,7 +2735,6 @@ struct req_que {
         srb_t **outstanding_cmds;
         uint32_t current_outstanding_cmd;
         uint16_t num_outstanding_cmds;
-#define MAX_Q_DEPTH             32
         int max_q_depth;
 
         dma_addr_t  dma_fx00;
@@ -2750,6 +2750,13 @@ struct qlfc_fw {
         uint32_t len;
 };
 
+struct scsi_qlt_host {
+        void *target_lport_ptr;
+        struct mutex tgt_mutex;
+        struct mutex tgt_host_action_mutex;
+        struct qla_tgt *qla_tgt;
+};
+
 struct qlt_hw_data {
         /* Protected by hw lock */
         uint32_t enable_class_2:1;
@@ -2765,15 +2772,11 @@ struct qlt_hw_data {
         uint32_t __iomem *atio_q_in;
         uint32_t __iomem *atio_q_out;
 
-        void *target_lport_ptr;
         struct qla_tgt_func_tmpl *tgt_ops;
-        struct qla_tgt *qla_tgt;
         struct qla_tgt_cmd *cmds[DEFAULT_OUTSTANDING_COMMANDS];
         uint16_t current_handle;
 
         struct qla_tgt_vp_map *tgt_vp_map;
-        struct mutex tgt_mutex;
-        struct mutex tgt_host_action_mutex;
 
         int saved_set;
         uint16_t saved_exchange_count;
@@ -3302,12 +3305,7 @@ struct qla_hw_data {
         struct work_struct nic_core_reset;
         struct work_struct idc_state_handler;
         struct work_struct nic_core_unrecoverable;
-
-#define HOST_QUEUE_RAMPDOWN_INTERVAL           (60 * HZ)
-#define HOST_QUEUE_RAMPUP_INTERVAL             (30 * HZ)
-        unsigned long   host_last_rampdown_time;
-        unsigned long   host_last_rampup_time;
-        int             cfg_lun_q_depth;
+        struct work_struct board_disable;
 
         struct mr_data_fx00 mr;
 
@@ -3372,12 +3370,11 @@ typedef struct scsi_qla_host {
 #define MPI_RESET_NEEDED        19      /* Initiate MPI FW reset */
 #define ISP_QUIESCE_NEEDED      20      /* Driver need some quiescence */
 #define SCR_PENDING             21      /* SCR in target mode */
-#define HOST_RAMP_DOWN_QUEUE_DEPTH     22
-#define HOST_RAMP_UP_QUEUE_DEPTH       23
-#define PORT_UPDATE_NEEDED      24
-#define FX00_RESET_RECOVERY     25
-#define FX00_TARGET_SCAN        26
-#define FX00_CRITEMP_RECOVERY   27
+#define PORT_UPDATE_NEEDED      22
+#define FX00_RESET_RECOVERY     23
+#define FX00_TARGET_SCAN        24
+#define FX00_CRITEMP_RECOVERY   25
+#define FX00_HOST_INFO_RESEND   26
 
         uint32_t        device_flags;
 #define SWITCH_FOUND            BIT_0
@@ -3441,6 +3438,7 @@ typedef struct scsi_qla_host {
 #define VP_ERR_FAB_LOGOUT       4
 #define VP_ERR_ADAP_NORESOURCES 5
         struct qla_hw_data *hw;
+        struct scsi_qlt_host vha_tgt;
         struct req_que *req;
         int             fw_heartbeat_counter;
         int             seconds_since_last_heartbeat;
diff --git a/drivers/scsi/qla2xxx/qla_gbl.h b/drivers/scsi/qla2xxx/qla_gbl.h
index 4446bf5fe292..1f426628a0a5 100644
--- a/drivers/scsi/qla2xxx/qla_gbl.h
+++ b/drivers/scsi/qla2xxx/qla_gbl.h
@@ -98,7 +98,6 @@ extern int qlport_down_retry;
 extern int ql2xplogiabsentdevice;
 extern int ql2xloginretrycount;
 extern int ql2xfdmienable;
-extern int ql2xmaxqdepth;
 extern int ql2xallocfwdump;
 extern int ql2xextended_error_logging;
 extern int ql2xiidmaenable;
@@ -160,6 +159,9 @@ extern int qla83xx_clear_drv_presence(scsi_qla_host_t *vha);
 extern int __qla83xx_clear_drv_presence(scsi_qla_host_t *vha);
 extern int qla2x00_post_uevent_work(struct scsi_qla_host *, u32);
 
+extern int qla2x00_post_uevent_work(struct scsi_qla_host *, u32);
+extern void qla2x00_disable_board_on_pci_error(struct work_struct *);
+
 /*
  * Global Functions in qla_mid.c source file.
  */
@@ -339,6 +341,11 @@ extern int
 qla2x00_system_error(scsi_qla_host_t *);
 
 extern int
+qla2x00_write_serdes_word(scsi_qla_host_t *, uint16_t, uint16_t);
+extern int
+qla2x00_read_serdes_word(scsi_qla_host_t *, uint16_t, uint16_t *);
+
+extern int
 qla2x00_set_serdes_params(scsi_qla_host_t *, uint16_t, uint16_t, uint16_t);
 
 extern int
@@ -455,6 +462,7 @@ extern uint8_t *qla25xx_read_nvram_data(scsi_qla_host_t *, uint8_t *, uint32_t,
 extern int qla25xx_write_nvram_data(scsi_qla_host_t *, uint8_t *, uint32_t,
                                     uint32_t);
 extern int qla2x00_is_a_vp_did(scsi_qla_host_t *, uint32_t);
+bool qla2x00_check_reg_for_disconnect(scsi_qla_host_t *, uint32_t);
 
 extern int qla2x00_beacon_on(struct scsi_qla_host *);
 extern int qla2x00_beacon_off(struct scsi_qla_host *);
@@ -541,10 +549,9 @@ struct fc_function_template;
 extern struct fc_function_template qla2xxx_transport_functions;
 extern struct fc_function_template qla2xxx_transport_vport_functions;
 extern void qla2x00_alloc_sysfs_attr(scsi_qla_host_t *);
-extern void qla2x00_free_sysfs_attr(scsi_qla_host_t *);
+extern void qla2x00_free_sysfs_attr(scsi_qla_host_t *, bool);
 extern void qla2x00_init_host_attr(scsi_qla_host_t *);
 extern void qla2x00_alloc_sysfs_attr(scsi_qla_host_t *);
-extern void qla2x00_free_sysfs_attr(scsi_qla_host_t *);
 extern int qla2x00_loopback_test(scsi_qla_host_t *, struct msg_echo_lb *, uint16_t *);
 extern int qla2x00_echo_test(scsi_qla_host_t *,
         struct msg_echo_lb *, uint16_t *);
@@ -725,7 +732,7 @@ extern inline void qla8044_set_qsnt_ready(struct scsi_qla_host *vha);
 extern inline void qla8044_need_reset_handler(struct scsi_qla_host *vha);
 extern int qla8044_device_state_handler(struct scsi_qla_host *vha);
 extern void qla8044_clear_qsnt_ready(struct scsi_qla_host *vha);
-extern void qla8044_clear_drv_active(struct scsi_qla_host *vha);
+extern void qla8044_clear_drv_active(struct qla_hw_data *);
 void qla8044_get_minidump(struct scsi_qla_host *vha);
 int qla8044_collect_md_data(struct scsi_qla_host *vha);
 extern int qla8044_md_get_template(scsi_qla_host_t *);
diff --git a/drivers/scsi/qla2xxx/qla_init.c b/drivers/scsi/qla2xxx/qla_init.c
index 03f715e7591e..e7e5f4facf7f 100644
--- a/drivers/scsi/qla2xxx/qla_init.c
+++ b/drivers/scsi/qla2xxx/qla_init.c
@@ -1694,6 +1694,8 @@ enable_82xx_npiv:
                                 if (!fw_major_version && ql2xallocfwdump
                                     && !(IS_P3P_TYPE(ha)))
                                         qla2x00_alloc_fw_dump(vha);
+                        } else {
+                                goto failed;
                         }
                 } else {
                         ql_log(ql_log_fatal, vha, 0x00cd,
diff --git a/drivers/scsi/qla2xxx/qla_inline.h b/drivers/scsi/qla2xxx/qla_inline.h
index 957088b04611..ce8b5fb0f347 100644
--- a/drivers/scsi/qla2xxx/qla_inline.h
+++ b/drivers/scsi/qla2xxx/qla_inline.h
@@ -261,25 +261,6 @@ qla2x00_gid_list_size(struct qla_hw_data *ha)
 }
 
 static inline void
-qla2x00_do_host_ramp_up(scsi_qla_host_t *vha)
-{
-        if (vha->hw->cfg_lun_q_depth >= ql2xmaxqdepth)
-                return;
-
-        /* Wait at least HOST_QUEUE_RAMPDOWN_INTERVAL before ramping up */
-        if (time_before(jiffies, (vha->hw->host_last_rampdown_time +
-            HOST_QUEUE_RAMPDOWN_INTERVAL)))
-                return;
-
-        /* Wait at least HOST_QUEUE_RAMPUP_INTERVAL between each ramp up */
-        if (time_before(jiffies, (vha->hw->host_last_rampup_time +
-            HOST_QUEUE_RAMPUP_INTERVAL)))
-                return;
-
-        set_bit(HOST_RAMP_UP_QUEUE_DEPTH, &vha->dpc_flags);
-}
-
-static inline void
 qla2x00_handle_mbx_completion(struct qla_hw_data *ha, int status)
 {
         if (test_bit(MBX_INTR_WAIT, &ha->mbx_cmd_flags) &&
diff --git a/drivers/scsi/qla2xxx/qla_isr.c b/drivers/scsi/qla2xxx/qla_isr.c
index ff9c86b1a0d8..9bc86b9e86b1 100644
--- a/drivers/scsi/qla2xxx/qla_isr.c
+++ b/drivers/scsi/qla2xxx/qla_isr.c
@@ -56,6 +56,16 @@ qla2100_intr_handler(int irq, void *dev_id)
         vha = pci_get_drvdata(ha->pdev);
         for (iter = 50; iter--; ) {
                 hccr = RD_REG_WORD(&reg->hccr);
+                /* Check for PCI disconnection */
+                if (hccr == 0xffff) {
+                        /*
+                         * Schedule this on the default system workqueue so that
+                         * all the adapter workqueues and the DPC thread can be
+                         * shutdown cleanly.
+                         */
+                        schedule_work(&ha->board_disable);
+                        break;
+                }
                 if (hccr & HCCR_RISC_PAUSE) {
                         if (pci_channel_offline(ha->pdev))
                                 break;
@@ -110,6 +120,22 @@ qla2100_intr_handler(int irq, void *dev_id)
         return (IRQ_HANDLED);
 }
 
+bool
+qla2x00_check_reg_for_disconnect(scsi_qla_host_t *vha, uint32_t reg)
+{
+        /* Check for PCI disconnection */
+        if (reg == 0xffffffff) {
+                /*
+                 * Schedule this on the default system workqueue so that all the
+                 * adapter workqueues and the DPC thread can be shutdown
+                 * cleanly.
+                 */
+                schedule_work(&vha->hw->board_disable);
+                return true;
+        } else
+                return false;
+}
+
 /**
  * qla2300_intr_handler() - Process interrupts for the ISP23xx and ISP63xx.
  * @irq:
@@ -148,11 +174,14 @@ qla2300_intr_handler(int irq, void *dev_id)
         vha = pci_get_drvdata(ha->pdev);
         for (iter = 50; iter--; ) {
                 stat = RD_REG_DWORD(&reg->u.isp2300.host_status);
+                if (qla2x00_check_reg_for_disconnect(vha, stat))
+                        break;
                 if (stat & HSR_RISC_PAUSED) {
                         if (unlikely(pci_channel_offline(ha->pdev)))
                                 break;
 
                         hccr = RD_REG_WORD(&reg->hccr);
+
                         if (hccr & (BIT_15 | BIT_13 | BIT_11 | BIT_8))
                                 ql_log(ql_log_warn, vha, 0x5026,
                                     "Parity error -- HCCR=%x, Dumping "
@@ -269,11 +298,18 @@ qla81xx_idc_event(scsi_qla_host_t *vha, uint16_t aen, uint16_t descr)
                 { "Complete", "Request Notification", "Time Extension" };
         int rval;
         struct device_reg_24xx __iomem *reg24 = &vha->hw->iobase->isp24;
+        struct device_reg_82xx __iomem *reg82 = &vha->hw->iobase->isp82;
         uint16_t __iomem *wptr;
         uint16_t cnt, timeout, mb[QLA_IDC_ACK_REGS];
 
         /* Seed data -- mailbox1 -> mailbox7. */
-        wptr = (uint16_t __iomem *)&reg24->mailbox1;
+        if (IS_QLA81XX(vha->hw) || IS_QLA83XX(vha->hw))
+                wptr = (uint16_t __iomem *)&reg24->mailbox1;
+        else if (IS_QLA8044(vha->hw))
+                wptr = (uint16_t __iomem *)&reg82->mailbox_out[1];
+        else
+                return;
+
         for (cnt = 0; cnt < QLA_IDC_ACK_REGS; cnt++, wptr++)
                 mb[cnt] = RD_REG_WORD(wptr);
 
@@ -287,7 +323,7 @@ qla81xx_idc_event(scsi_qla_host_t *vha, uint16_t aen, uint16_t descr)
         case MBA_IDC_COMPLETE:
                 if (mb[1] >> 15) {
                         vha->hw->flags.idc_compl_status = 1;
-                        if (vha->hw->notify_dcbx_comp)
+                        if (vha->hw->notify_dcbx_comp && !vha->vp_idx)
                                 complete(&vha->hw->dcbx_comp);
                 }
                 break;
@@ -758,7 +794,7 @@ skip_rio:
                         ql_dbg(ql_dbg_async, vha, 0x500d,
                             "DCBX Completed -- %04x %04x %04x.\n",
                             mb[1], mb[2], mb[3]);
-                        if (ha->notify_dcbx_comp)
+                        if (ha->notify_dcbx_comp && !vha->vp_idx)
                                 complete(&ha->dcbx_comp);
 
                 } else
@@ -1032,7 +1068,7 @@ skip_rio:
                         }
                 }
         case MBA_IDC_COMPLETE:
-                if (ha->notify_lb_portup_comp)
+                if (ha->notify_lb_portup_comp && !vha->vp_idx)
                         complete(&ha->lb_portup_comp);
                 /* Fallthru */
         case MBA_IDC_TIME_EXT:
@@ -1991,7 +2027,6 @@ qla2x00_status_entry(scsi_qla_host_t *vha, struct rsp_que *rsp, void *pkt)
 
         /* Fast path completion. */
         if (comp_status == CS_COMPLETE && scsi_status == 0) {
-                qla2x00_do_host_ramp_up(vha);
                 qla2x00_process_completed_request(vha, req, handle);
 
                 return;
@@ -2250,9 +2285,6 @@ out:
                     cp->cmnd, scsi_bufflen(cp), rsp_info_len,
                     resid_len, fw_resid_len);
 
-        if (!res)
-                qla2x00_do_host_ramp_up(vha);
-
         if (rsp->status_srb == NULL)
                 sp->done(ha, sp, res);
 }
@@ -2575,6 +2607,8 @@ qla24xx_intr_handler(int irq, void *dev_id)
         vha = pci_get_drvdata(ha->pdev);
         for (iter = 50; iter--; ) {
                 stat = RD_REG_DWORD(&reg->host_status);
+                if (qla2x00_check_reg_for_disconnect(vha, stat))
+                        break;
                 if (stat & HSRX_RISC_PAUSED) {
                         if (unlikely(pci_channel_offline(ha->pdev)))
                                 break;
@@ -2644,6 +2678,7 @@ qla24xx_msix_rsp_q(int irq, void *dev_id)
         struct device_reg_24xx __iomem *reg;
         struct scsi_qla_host *vha;
         unsigned long flags;
+        uint32_t stat = 0;
 
         rsp = (struct rsp_que *) dev_id;
         if (!rsp) {
@@ -2657,11 +2692,19 @@ qla24xx_msix_rsp_q(int irq, void *dev_id)
         spin_lock_irqsave(&ha->hardware_lock, flags);
 
         vha = pci_get_drvdata(ha->pdev);
+        /*
+         * Use host_status register to check to PCI disconnection before we
+         * we process the response queue.
+         */
+        stat = RD_REG_DWORD(&reg->host_status);
+        if (qla2x00_check_reg_for_disconnect(vha, stat))
+                goto out;
         qla24xx_process_response_queue(vha, rsp);
         if (!ha->flags.disable_msix_handshake) {
                 WRT_REG_DWORD(&reg->hccr, HCCRX_CLR_RISC_INT);
                 RD_REG_DWORD_RELAXED(&reg->hccr);
         }
+out:
         spin_unlock_irqrestore(&ha->hardware_lock, flags);
 
         return IRQ_HANDLED;
@@ -2671,9 +2714,11 @@ static irqreturn_t
 qla25xx_msix_rsp_q(int irq, void *dev_id)
 {
         struct qla_hw_data *ha;
+        scsi_qla_host_t *vha;
         struct rsp_que *rsp;
         struct device_reg_24xx __iomem *reg;
         unsigned long flags;
+        uint32_t hccr = 0;
 
         rsp = (struct rsp_que *) dev_id;
         if (!rsp) {
@@ -2682,17 +2727,21 @@ qla25xx_msix_rsp_q(int irq, void *dev_id)
                 return IRQ_NONE;
         }
         ha = rsp->hw;
+        vha = pci_get_drvdata(ha->pdev);
 
         /* Clear the interrupt, if enabled, for this response queue */
         if (!ha->flags.disable_msix_handshake) {
                 reg = &ha->iobase->isp24;
                 spin_lock_irqsave(&ha->hardware_lock, flags);
                 WRT_REG_DWORD(&reg->hccr, HCCRX_CLR_RISC_INT);
-                RD_REG_DWORD_RELAXED(&reg->hccr);
+                hccr = RD_REG_DWORD_RELAXED(&reg->hccr);
                 spin_unlock_irqrestore(&ha->hardware_lock, flags);
         }
+        if (qla2x00_check_reg_for_disconnect(vha, hccr))
+                goto out;
         queue_work_on((int) (rsp->id - 1), ha->wq, &rsp->q_work);
 
+out:
         return IRQ_HANDLED;
 }
 
@@ -2723,6 +2772,8 @@ qla24xx_msix_default(int irq, void *dev_id)
         vha = pci_get_drvdata(ha->pdev);
         do {
                 stat = RD_REG_DWORD(&reg->host_status);
+                if (qla2x00_check_reg_for_disconnect(vha, stat))
+                        break;
                 if (stat & HSRX_RISC_PAUSED) {
                         if (unlikely(pci_channel_offline(ha->pdev)))
                                 break;
@@ -2937,7 +2988,7 @@ msix_out:
 int
 qla2x00_request_irqs(struct qla_hw_data *ha, struct rsp_que *rsp)
 {
-        int ret;
+        int ret = QLA_FUNCTION_FAILED;
         device_reg_t __iomem *reg = ha->iobase;
         scsi_qla_host_t *vha = pci_get_drvdata(ha->pdev);
 
@@ -2971,10 +3022,12 @@ qla2x00_request_irqs(struct qla_hw_data *ha, struct rsp_que *rsp)
                     ha->chip_revision, ha->fw_attributes);
                 goto clear_risc_ints;
         }
-        ql_log(ql_log_info, vha, 0x0037,
-            "MSI-X Falling back-to MSI mode -%d.\n", ret);
+
 skip_msix:
 
+        ql_log(ql_log_info, vha, 0x0037,
+            "Falling back-to MSI mode -%d.\n", ret);
+
         if (!IS_QLA24XX(ha) && !IS_QLA2532(ha) && !IS_QLA8432(ha) &&
             !IS_QLA8001(ha) && !IS_P3P_TYPE(ha) && !IS_QLAFX00(ha))
                 goto skip_msi;
@@ -2986,14 +3039,13 @@ skip_msix:
                 ha->flags.msi_enabled = 1;
         } else
                 ql_log(ql_log_warn, vha, 0x0039,
-                    "MSI-X; Falling back-to INTa mode -- %d.\n", ret);
+                    "Falling back-to INTa mode -- %d.\n", ret);
+skip_msi:
 
         /* Skip INTx on ISP82xx. */
         if (!ha->flags.msi_enabled && IS_QLA82XX(ha))
                 return QLA_FUNCTION_FAILED;
 
-skip_msi:
-
         ret = request_irq(ha->pdev->irq, ha->isp_ops->intr_handler,
             ha->flags.msi_enabled ? 0 : IRQF_SHARED,
             QLA2XXX_DRIVER_NAME, rsp);
diff --git a/drivers/scsi/qla2xxx/qla_mbx.c b/drivers/scsi/qla2xxx/qla_mbx.c
index a9aae500e791..b94511ae0051 100644
--- a/drivers/scsi/qla2xxx/qla_mbx.c
+++ b/drivers/scsi/qla2xxx/qla_mbx.c
@@ -468,7 +468,7 @@ qla2x00_execute_fw(scsi_qla_host_t *vha, uint32_t risc_addr)
                 mcp->mb[1] = MSW(risc_addr);
                 mcp->mb[2] = LSW(risc_addr);
                 mcp->mb[3] = 0;
-                if (IS_QLA81XX(ha) || IS_QLA83XX(ha)) {
+                if (IS_QLA25XX(ha) || IS_QLA81XX(ha) || IS_QLA83XX(ha)) {
                         struct nvram_81xx *nv = ha->nvram;
                         mcp->mb[4] = (nv->enhanced_features &
                             EXTENDED_BB_CREDITS);
@@ -1214,7 +1214,7 @@ qla2x00_init_firmware(scsi_qla_host_t *vha, uint16_t size)
         mcp->mb[6] = MSW(MSD(ha->init_cb_dma));
         mcp->mb[7] = LSW(MSD(ha->init_cb_dma));
         mcp->out_mb = MBX_7|MBX_6|MBX_3|MBX_2|MBX_1|MBX_0;
-        if ((IS_QLA81XX(ha) || IS_QLA83XX(ha)) && ha->ex_init_cb->ex_version) {
+        if (ha->ex_init_cb && ha->ex_init_cb->ex_version) {
                 mcp->mb[1] = BIT_0;
                 mcp->mb[10] = MSW(ha->ex_init_cb_dma);
                 mcp->mb[11] = LSW(ha->ex_init_cb_dma);
@@ -2800,6 +2800,75 @@ qla2x00_system_error(scsi_qla_host_t *vha)
         return rval;
 }
 
+int
+qla2x00_write_serdes_word(scsi_qla_host_t *vha, uint16_t addr, uint16_t data)
+{
+        int rval;
+        mbx_cmd_t mc;
+        mbx_cmd_t *mcp = &mc;
+
+        if (!IS_QLA2031(vha->hw))
+                return QLA_FUNCTION_FAILED;
+
+        ql_dbg(ql_dbg_mbx + ql_dbg_verbose, vha, 0x1182,
+            "Entered %s.\n", __func__);
+
+        mcp->mb[0] = MBC_WRITE_SERDES;
+        mcp->mb[1] = addr;
+        mcp->mb[2] = data & 0xff;
+        mcp->mb[3] = 0;
+        mcp->out_mb = MBX_3|MBX_2|MBX_1|MBX_0;
+        mcp->in_mb = MBX_0;
+        mcp->tov = MBX_TOV_SECONDS;
+        mcp->flags = 0;
+        rval = qla2x00_mailbox_command(vha, mcp);
+
+        if (rval != QLA_SUCCESS) {
+                ql_dbg(ql_dbg_mbx, vha, 0x1183,
+                    "Failed=%x mb[0]=%x.\n", rval, mcp->mb[0]);
+        } else {
+                ql_dbg(ql_dbg_mbx + ql_dbg_verbose, vha, 0x1184,
+                    "Done %s.\n", __func__);
+        }
+
+        return rval;
+}
+
+int
+qla2x00_read_serdes_word(scsi_qla_host_t *vha, uint16_t addr, uint16_t *data)
+{
+        int rval;
+        mbx_cmd_t mc;
+        mbx_cmd_t *mcp = &mc;
+
+        if (!IS_QLA2031(vha->hw))
+                return QLA_FUNCTION_FAILED;
+
+        ql_dbg(ql_dbg_mbx + ql_dbg_verbose, vha, 0x1185,
+            "Entered %s.\n", __func__);
+
+        mcp->mb[0] = MBC_READ_SERDES;
+        mcp->mb[1] = addr;
+        mcp->mb[3] = 0;
+        mcp->out_mb = MBX_3|MBX_1|MBX_0;
+        mcp->in_mb = MBX_1|MBX_0;
+        mcp->tov = MBX_TOV_SECONDS;
+        mcp->flags = 0;
+        rval = qla2x00_mailbox_command(vha, mcp);
+
+        *data = mcp->mb[1] & 0xff;
+
+        if (rval != QLA_SUCCESS) {
+                ql_dbg(ql_dbg_mbx, vha, 0x1186,
+                    "Failed=%x mb[0]=%x.\n", rval, mcp->mb[0]);
+        } else {
+                ql_dbg(ql_dbg_mbx + ql_dbg_verbose, vha, 0x1187,
+                    "Done %s.\n", __func__);
+        }
+
+        return rval;
+}
+
 /**
  * qla2x00_set_serdes_params() -
  * @ha: HA context
diff --git a/drivers/scsi/qla2xxx/qla_mr.c b/drivers/scsi/qla2xxx/qla_mr.c
index 30d20e74e48a..ba6f8b139c98 100644
--- a/drivers/scsi/qla2xxx/qla_mr.c
+++ b/drivers/scsi/qla2xxx/qla_mr.c
@@ -1610,6 +1610,22 @@ qlafx00_timer_routine(scsi_qla_host_t *vha)
                         ha->mr.fw_critemp_timer_tick--;
                 }
         }
+        if (ha->mr.host_info_resend) {
+                /*
+                 * Incomplete host info might be sent to firmware
+                 * durinng system boot - info should be resend
+                 */
+                if (ha->mr.hinfo_resend_timer_tick == 0) {
+                        ha->mr.host_info_resend = false;
+                        set_bit(FX00_HOST_INFO_RESEND, &vha->dpc_flags);
+                        ha->mr.hinfo_resend_timer_tick =
+                            QLAFX00_HINFO_RESEND_INTERVAL;
+                        qla2xxx_wake_dpc(vha);
+                } else {
+                        ha->mr.hinfo_resend_timer_tick--;
+                }
+        }
+
 }
 
 /*
@@ -1867,6 +1883,7 @@ qlafx00_fx_disc(scsi_qla_host_t *vha, fc_port_t *fcport, uint16_t fx_type)
                         goto done_free_sp;
                 }
                 break;
+        case FXDISC_ABORT_IOCTL:
         default:
                 break;
         }
@@ -1888,6 +1905,8 @@ qlafx00_fx_disc(scsi_qla_host_t *vha, fc_port_t *fcport, uint16_t fx_type)
                             p_sysid->sysname, SYSNAME_LENGTH);
                         strncpy(phost_info->nodename,
                             p_sysid->nodename, NODENAME_LENGTH);
+                        if (!strcmp(phost_info->nodename, "(none)"))
+                                ha->mr.host_info_resend = true;
                         strncpy(phost_info->release,
                             p_sysid->release, RELEASE_LENGTH);
                         strncpy(phost_info->version,
@@ -1948,8 +1967,8 @@ qlafx00_fx_disc(scsi_qla_host_t *vha, fc_port_t *fcport, uint16_t fx_type)
         if (fx_type == FXDISC_GET_CONFIG_INFO) {
                 struct config_info_data *pinfo =
                     (struct config_info_data *) fdisc->u.fxiocb.rsp_addr;
-                memcpy(&vha->hw->mr.product_name, pinfo->product_name,
-                    sizeof(vha->hw->mr.product_name));
+                strcpy(vha->hw->model_number, pinfo->model_num);
+                strcpy(vha->hw->model_desc, pinfo->model_description);
                 memcpy(&vha->hw->mr.symbolic_name, pinfo->symbolic_name,
                     sizeof(vha->hw->mr.symbolic_name));
                 memcpy(&vha->hw->mr.serial_num, pinfo->serial_num,
@@ -1993,7 +2012,11 @@ qlafx00_fx_disc(scsi_qla_host_t *vha, fc_port_t *fcport, uint16_t fx_type)
                 ql_dump_buffer(ql_dbg_init + ql_dbg_buffer, vha, 0x0146,
                     (uint8_t *)pinfo, 16);
                 memcpy(vha->hw->gid_list, pinfo, QLAFX00_TGT_NODE_LIST_SIZE);
-        }
+        } else if (fx_type == FXDISC_ABORT_IOCTL)
+                fdisc->u.fxiocb.result =
+                    (fdisc->u.fxiocb.result == cpu_to_le32(0x68)) ?
+                    cpu_to_le32(QLA_SUCCESS) : cpu_to_le32(QLA_FUNCTION_FAILED);
+
         rval = le32_to_cpu(fdisc->u.fxiocb.result);
 
 done_unmap_dma:
@@ -2092,6 +2115,10 @@ qlafx00_abort_command(srb_t *sp)
                 /* Command not found. */
                 return QLA_FUNCTION_FAILED;
         }
+        if (sp->type == SRB_FXIOCB_DCMD)
+                return qlafx00_fx_disc(vha, &vha->hw->mr.fcport,
+                    FXDISC_ABORT_IOCTL);
+
         return qlafx00_async_abt_cmd(sp);
 }
 
@@ -2419,7 +2446,6 @@ qlafx00_status_entry(scsi_qla_host_t *vha, struct rsp_que *rsp, void *pkt)
 
         /* Fast path completion. */
         if (comp_status == CS_COMPLETE && scsi_status == 0) {
-                qla2x00_do_host_ramp_up(vha);
                 qla2x00_process_completed_request(vha, req, handle);
                 return;
         }
@@ -2630,9 +2656,6 @@ check_scsi_status:
                     rsp_info_len, resid_len, fw_resid_len, sense_len,
                     par_sense_len, rsp_info_len);
 
-        if (!res)
-                qla2x00_do_host_ramp_up(vha);
-
         if (rsp->status_srb == NULL)
                 sp->done(ha, sp, res);
 }
@@ -3021,6 +3044,8 @@ qlafx00_intr_handler(int irq, void *dev_id)
         vha = pci_get_drvdata(ha->pdev);
         for (iter = 50; iter--; clr_intr = 0) {
                 stat = QLAFX00_RD_INTR_REG(ha);
+                if (qla2x00_check_reg_for_disconnect(vha, stat))
+                        break;
                 if ((stat & QLAFX00_HST_INT_STS_BITS) == 0)
                         break;
 
diff --git a/drivers/scsi/qla2xxx/qla_mr.h b/drivers/scsi/qla2xxx/qla_mr.h
index 79a93c52baec..6cd7072cc0ff 100644
--- a/drivers/scsi/qla2xxx/qla_mr.h
+++ b/drivers/scsi/qla2xxx/qla_mr.h
@@ -304,7 +304,9 @@ struct register_host_info {
 #define QLAFX00_TGT_NODE_LIST_SIZE (sizeof(uint32_t) * 32)
 
 struct config_info_data {
-        uint8_t         product_name[256];
+        uint8_t         model_num[16];
+        uint8_t         model_description[80];
+        uint8_t         reserved0[160];
         uint8_t         symbolic_name[64];
         uint8_t         serial_num[32];
         uint8_t         hw_version[16];
@@ -343,6 +345,7 @@ struct config_info_data {
 #define FXDISC_GET_TGT_NODE_INFO        0x80
 #define FXDISC_GET_TGT_NODE_LIST        0x81
 #define FXDISC_REG_HOST_INFO            0x99
+#define FXDISC_ABORT_IOCTL              0xff
 
 #define QLAFX00_HBA_ICNTRL_REG          0x20B08
 #define QLAFX00_ICR_ENB_MASK            0x80000000
@@ -490,7 +493,6 @@ struct qla_mt_iocb_rsp_fx00 {
 #define FX00_DEF_RATOV  10
 
 struct mr_data_fx00 {
-        uint8_t product_name[256];
         uint8_t symbolic_name[64];
         uint8_t serial_num[32];
         uint8_t hw_version[16];
@@ -511,6 +513,8 @@ struct mr_data_fx00 {
         uint32_t old_aenmbx0_state;
         uint32_t critical_temperature;
         bool extended_io_enabled;
+        bool host_info_resend;
+        uint8_t hinfo_resend_timer_tick;
 };
 
 #define QLAFX00_EXTENDED_IO_EN_MASK    0x20
@@ -537,7 +541,11 @@ struct mr_data_fx00 {
 #define QLAFX00_RESET_INTERVAL          120     /* number of seconds */
 #define QLAFX00_MAX_RESET_INTERVAL      600     /* number of seconds */
 #define QLAFX00_CRITEMP_INTERVAL        60      /* number of seconds */
+#define QLAFX00_HINFO_RESEND_INTERVAL   60      /* number of seconds */
 
 #define QLAFX00_CRITEMP_THRSHLD         80      /* Celsius degrees */
 
+/* Max conncurrent IOs that can be queued */
+#define QLAFX00_MAX_CANQUEUE            1024
+
 #endif
diff --git a/drivers/scsi/qla2xxx/qla_nx.c b/drivers/scsi/qla2xxx/qla_nx.c
index 11ce53dcbe7e..1e6ba4a369e2 100644
--- a/drivers/scsi/qla2xxx/qla_nx.c
+++ b/drivers/scsi/qla2xxx/qla_nx.c
@@ -2096,6 +2096,7 @@ qla82xx_msix_default(int irq, void *dev_id)
         int status = 0;
         unsigned long flags;
         uint32_t stat = 0;
+        uint32_t host_int = 0;
         uint16_t mb[4];
 
         rsp = (struct rsp_que *) dev_id;
@@ -2111,7 +2112,10 @@ qla82xx_msix_default(int irq, void *dev_id)
         spin_lock_irqsave(&ha->hardware_lock, flags);
         vha = pci_get_drvdata(ha->pdev);
         do {
-                if (RD_REG_DWORD(&reg->host_int)) {
+                host_int = RD_REG_DWORD(&reg->host_int);
+                if (qla2x00_check_reg_for_disconnect(vha, host_int))
+                        break;
+                if (host_int) {
                         stat = RD_REG_DWORD(&reg->host_status);
 
                         switch (stat & 0xff) {
@@ -2156,6 +2160,7 @@ qla82xx_msix_rsp_q(int irq, void *dev_id)
         struct rsp_que *rsp;
         struct device_reg_82xx __iomem *reg;
         unsigned long flags;
+        uint32_t host_int = 0;
 
         rsp = (struct rsp_que *) dev_id;
         if (!rsp) {
@@ -2168,8 +2173,12 @@ qla82xx_msix_rsp_q(int irq, void *dev_id)
         reg = &ha->iobase->isp82;
         spin_lock_irqsave(&ha->hardware_lock, flags);
         vha = pci_get_drvdata(ha->pdev);
+        host_int = RD_REG_DWORD(&reg->host_int);
+        if (qla2x00_check_reg_for_disconnect(vha, host_int))
+                goto out;
         qla24xx_process_response_queue(vha, rsp);
         WRT_REG_DWORD(&reg->host_int, 0);
+out:
         spin_unlock_irqrestore(&ha->hardware_lock, flags);
         return IRQ_HANDLED;
 }
@@ -2183,6 +2192,7 @@ qla82xx_poll(int irq, void *dev_id)
         struct device_reg_82xx __iomem *reg;
         int status = 0;
         uint32_t stat;
+        uint32_t host_int = 0;
         uint16_t mb[4];
         unsigned long flags;
 
@@ -2198,7 +2208,10 @@ qla82xx_poll(int irq, void *dev_id)
         spin_lock_irqsave(&ha->hardware_lock, flags);
         vha = pci_get_drvdata(ha->pdev);
 
-        if (RD_REG_DWORD(&reg->host_int)) {
+        host_int = RD_REG_DWORD(&reg->host_int);
+        if (qla2x00_check_reg_for_disconnect(vha, host_int))
+                goto out;
+        if (host_int) {
                 stat = RD_REG_DWORD(&reg->host_status);
                 switch (stat & 0xff) {
                 case 0x1:
@@ -2224,8 +2237,9 @@ qla82xx_poll(int irq, void *dev_id)
                             stat * 0xff);
                         break;
                 }
+                WRT_REG_DWORD(&reg->host_int, 0);
         }
-        WRT_REG_DWORD(&reg->host_int, 0);
+out:
         spin_unlock_irqrestore(&ha->hardware_lock, flags);
 }
 
@@ -3003,7 +3017,7 @@ qla8xxx_dev_failed_handler(scsi_qla_host_t *vha)
                 qla82xx_clear_drv_active(ha);
                 qla82xx_idc_unlock(ha);
         } else if (IS_QLA8044(ha)) {
-                qla8044_clear_drv_active(vha);
+                qla8044_clear_drv_active(ha);
                 qla8044_idc_unlock(ha);
         }
 
diff --git a/drivers/scsi/qla2xxx/qla_nx2.c b/drivers/scsi/qla2xxx/qla_nx2.c
index 4f5d66b2168b..f60989d729a8 100644
--- a/drivers/scsi/qla2xxx/qla_nx2.c
+++ b/drivers/scsi/qla2xxx/qla_nx2.c
@@ -1257,10 +1257,10 @@ exit_start_fw:
 }
 
 void
-qla8044_clear_drv_active(struct scsi_qla_host *vha)
+qla8044_clear_drv_active(struct qla_hw_data *ha)
 {
         uint32_t drv_active;
-        struct qla_hw_data *ha = vha->hw;
+        struct scsi_qla_host *vha = pci_get_drvdata(ha->pdev);
 
         drv_active = qla8044_rd_direct(vha, QLA8044_CRB_DRV_ACTIVE_INDEX);
         drv_active &= ~(1 << (ha->portnum));
@@ -1324,7 +1324,7 @@ qla8044_device_bootstrap(struct scsi_qla_host *vha)
         if (rval != QLA_SUCCESS) {
                 ql_log(ql_log_info, vha, 0xb0b3,
                      "%s: HW State: FAILED\n", __func__);
-                qla8044_clear_drv_active(vha);
+                qla8044_clear_drv_active(ha);
                 qla8044_wr_direct(vha, QLA8044_CRB_DEV_STATE_INDEX,
                     QLA8XXX_DEV_FAILED);
                 return rval;
@@ -1555,6 +1555,15 @@ qla8044_need_reset_handler(struct scsi_qla_host *vha)
                 qla8044_idc_lock(ha);
         }
 
+        drv_state = qla8044_rd_direct(vha,
+            QLA8044_CRB_DRV_STATE_INDEX);
+        drv_active = qla8044_rd_direct(vha,
+            QLA8044_CRB_DRV_ACTIVE_INDEX);
+
+        ql_log(ql_log_info, vha, 0xb0c5,
+            "%s(%ld): drv_state = 0x%x, drv_active = 0x%x\n",
+            __func__, vha->host_no, drv_state, drv_active);
+
         if (!ha->flags.nic_core_reset_owner) {
                 ql_dbg(ql_dbg_p3p, vha, 0xb0c3,
                     "%s(%ld): reset acknowledged\n",
@@ -1580,23 +1589,15 @@ qla8044_need_reset_handler(struct scsi_qla_host *vha)
 
                         dev_state = qla8044_rd_direct(vha,
                                         QLA8044_CRB_DEV_STATE_INDEX);
-                } while (dev_state == QLA8XXX_DEV_NEED_RESET);
+                } while (((drv_state & drv_active) != drv_active) &&
+                    (dev_state == QLA8XXX_DEV_NEED_RESET));
         } else {
                 qla8044_set_rst_ready(vha);
 
                 /* wait for 10 seconds for reset ack from all functions */
                 reset_timeout = jiffies + (ha->fcoe_reset_timeout * HZ);
 
-                drv_state = qla8044_rd_direct(vha,
-                    QLA8044_CRB_DRV_STATE_INDEX);
-                drv_active = qla8044_rd_direct(vha,
-                    QLA8044_CRB_DRV_ACTIVE_INDEX);
-
-                ql_log(ql_log_info, vha, 0xb0c5,
-                    "%s(%ld): drv_state = 0x%x, drv_active = 0x%x\n",
-                    __func__, vha->host_no, drv_state, drv_active);
-
-                while (drv_state != drv_active) {
+                while ((drv_state & drv_active) != drv_active) {
                         if (time_after_eq(jiffies, reset_timeout)) {
                                 ql_log(ql_log_info, vha, 0xb0c6,
                                     "%s: RESET TIMEOUT!"
@@ -1736,7 +1737,7 @@ qla8044_update_idc_reg(struct scsi_qla_host *vha)
 
         rval = qla8044_set_idc_ver(vha);
         if (rval == QLA_FUNCTION_FAILED)
-                qla8044_clear_drv_active(vha);
+                qla8044_clear_drv_active(ha);
         qla8044_idc_unlock(ha);
 
 exit_update_idc_reg:
@@ -1859,7 +1860,7 @@ qla8044_device_state_handler(struct scsi_qla_host *vha)
                         goto exit;
                 case QLA8XXX_DEV_COLD:
                         rval = qla8044_device_bootstrap(vha);
-                        goto exit;
+                        break;
                 case QLA8XXX_DEV_INITIALIZING:
                         qla8044_idc_unlock(ha);
                         msleep(1000);
diff --git a/drivers/scsi/qla2xxx/qla_os.c b/drivers/scsi/qla2xxx/qla_os.c
index 52be35e0300c..89a53002b585 100644
--- a/drivers/scsi/qla2xxx/qla_os.c
+++ b/drivers/scsi/qla2xxx/qla_os.c
@@ -110,7 +110,8 @@ MODULE_PARM_DESC(ql2xfdmienable,
                 "Enables FDMI registrations. "
                 "0 - no FDMI. Default is 1 - perform FDMI.");
 
-int ql2xmaxqdepth = MAX_Q_DEPTH;
+#define MAX_Q_DEPTH     32
+static int ql2xmaxqdepth = MAX_Q_DEPTH;
 module_param(ql2xmaxqdepth, int, S_IRUGO|S_IWUSR);
 MODULE_PARM_DESC(ql2xmaxqdepth,
                 "Maximum queue depth to set for each LUN. "
@@ -728,10 +729,8 @@ qla2xxx_queuecommand(struct Scsi_Host *host, struct scsi_cmnd *cmd)
         }
 
         sp = qla2x00_get_sp(vha, fcport, GFP_ATOMIC);
-        if (!sp) {
-                set_bit(HOST_RAMP_DOWN_QUEUE_DEPTH, &vha->dpc_flags);
+        if (!sp)
                 goto qc24_host_busy;
-        }
 
         sp->u.scmd.cmd = cmd;
         sp->type = SRB_SCSI_CMD;
@@ -744,7 +743,6 @@ qla2xxx_queuecommand(struct Scsi_Host *host, struct scsi_cmnd *cmd)
         if (rval != QLA_SUCCESS) {
                 ql_dbg(ql_dbg_io + ql_dbg_verbose, vha, 0x3013,
                     "Start scsi failed rval=%d for cmd=%p.\n", rval, cmd);
-                set_bit(HOST_RAMP_DOWN_QUEUE_DEPTH, &vha->dpc_flags);
                 goto qc24_host_busy_free_sp;
         }
 
@@ -1474,81 +1472,6 @@ qla2x00_change_queue_type(struct scsi_device *sdev, int tag_type)
         return tag_type;
 }
 
-static void
-qla2x00_host_ramp_down_queuedepth(scsi_qla_host_t *vha)
-{
-        scsi_qla_host_t *vp;
-        struct Scsi_Host *shost;
-        struct scsi_device *sdev;
-        struct qla_hw_data *ha = vha->hw;
-        unsigned long flags;
-
-        ha->host_last_rampdown_time = jiffies;
-
-        if (ha->cfg_lun_q_depth <= vha->host->cmd_per_lun)
-                return;
-
-        if ((ha->cfg_lun_q_depth / 2) < vha->host->cmd_per_lun)
-                ha->cfg_lun_q_depth = vha->host->cmd_per_lun;
-        else
-                ha->cfg_lun_q_depth = ha->cfg_lun_q_depth / 2;
-
-        /*
-         * Geometrically ramp down the queue depth for all devices on this
-         * adapter
-         */
-        spin_lock_irqsave(&ha->vport_slock, flags);
-        list_for_each_entry(vp, &ha->vp_list, list) {
-                shost = vp->host;
-                shost_for_each_device(sdev, shost) {
-                        if (sdev->queue_depth > shost->cmd_per_lun) {
-                                if (sdev->queue_depth < ha->cfg_lun_q_depth)
-                                        continue;
-                                ql_dbg(ql_dbg_io, vp, 0x3031,
-                                    "%ld:%d:%d: Ramping down queue depth to %d",
-                                    vp->host_no, sdev->id, sdev->lun,
-                                    ha->cfg_lun_q_depth);
-                                qla2x00_change_queue_depth(sdev,
-                                    ha->cfg_lun_q_depth, SCSI_QDEPTH_DEFAULT);
-                        }
-                }
-        }
-        spin_unlock_irqrestore(&ha->vport_slock, flags);
-
-        return;
-}
-
-static void
-qla2x00_host_ramp_up_queuedepth(scsi_qla_host_t *vha)
-{
-        scsi_qla_host_t *vp;
-        struct Scsi_Host *shost;
-        struct scsi_device *sdev;
-        struct qla_hw_data *ha = vha->hw;
-        unsigned long flags;
-
-        ha->host_last_rampup_time = jiffies;
-        ha->cfg_lun_q_depth++;
-
-        /*
-         * Linearly ramp up the queue depth for all devices on this
-         * adapter
-         */
-        spin_lock_irqsave(&ha->vport_slock, flags);
-        list_for_each_entry(vp, &ha->vp_list, list) {
-                shost = vp->host;
-                shost_for_each_device(sdev, shost) {
-                        if (sdev->queue_depth > ha->cfg_lun_q_depth)
-                                continue;
-                        qla2x00_change_queue_depth(sdev, ha->cfg_lun_q_depth,
-                            SCSI_QDEPTH_RAMP_UP);
-                }
-        }
-        spin_unlock_irqrestore(&ha->vport_slock, flags);
-
-        return;
-}
-
 /**
  * qla2x00_config_dma_addressing() - Configure OS DMA addressing method.
  * @ha: HA context
@@ -2424,7 +2347,6 @@ qla2x00_probe_one(struct pci_dev *pdev, const struct pci_device_id *id)
         ha->init_cb_size = sizeof(init_cb_t);
         ha->link_data_rate = PORT_SPEED_UNKNOWN;
         ha->optrom_size = OPTROM_SIZE_2300;
-        ha->cfg_lun_q_depth = ql2xmaxqdepth;
 
         /* Assign ISP specific operations. */
         if (IS_QLA2100(ha)) {
@@ -2573,6 +2495,8 @@ qla2x00_probe_one(struct pci_dev *pdev, const struct pci_device_id *id)
                 ha->mr.fw_reset_timer_tick = QLAFX00_RESET_INTERVAL;
                 ha->mr.fw_critemp_timer_tick = QLAFX00_CRITEMP_INTERVAL;
                 ha->mr.fw_hbt_en = 1;
+                ha->mr.host_info_resend = false;
+                ha->mr.hinfo_resend_timer_tick = QLAFX00_HINFO_RESEND_INTERVAL;
         }
 
         ql_dbg_pci(ql_dbg_init, pdev, 0x001e,
@@ -2638,7 +2562,7 @@ qla2x00_probe_one(struct pci_dev *pdev, const struct pci_device_id *id)
         host = base_vha->host;
         base_vha->req = req;
         if (IS_QLAFX00(ha))
-                host->can_queue = 1024;
+                host->can_queue = QLAFX00_MAX_CANQUEUE;
         else
                 host->can_queue = req->length + 128;
         if (IS_QLA2XXX_MIDTYPE(ha))
@@ -2816,6 +2740,8 @@ que_init:
          */
         qla2xxx_wake_dpc(base_vha);
 
+        INIT_WORK(&ha->board_disable, qla2x00_disable_board_on_pci_error);
+
         if (IS_QLA8031(ha) || IS_MCTP_CAPABLE(ha)) {
                 sprintf(wq_name, "qla2xxx_%lu_dpc_lp_wq", base_vha->host_no);
                 ha->dpc_lp_wq = create_singlethread_workqueue(wq_name);
@@ -2955,7 +2881,7 @@ probe_hw_failed:
         }
         if (IS_QLA8044(ha)) {
                 qla8044_idc_lock(ha);
-                qla8044_clear_drv_active(base_vha);
+                qla8044_clear_drv_active(ha);
                 qla8044_idc_unlock(ha);
         }
 iospace_config_failed:
@@ -2980,22 +2906,6 @@ probe_out:
 }
 
 static void
-qla2x00_stop_dpc_thread(scsi_qla_host_t *vha)
-{
-        struct qla_hw_data *ha = vha->hw;
-        struct task_struct *t = ha->dpc_thread;
-
-        if (ha->dpc_thread == NULL)
-                return;
-        /*
-         * qla2xxx_wake_dpc checks for ->dpc_thread
-         * so we need to zero it out.
-         */
-        ha->dpc_thread = NULL;
-        kthread_stop(t);
-}
-
-static void
 qla2x00_shutdown(struct pci_dev *pdev)
 {
         scsi_qla_host_t *vha;
@@ -3038,29 +2948,14 @@ qla2x00_shutdown(struct pci_dev *pdev)
         qla2x00_free_fw_dump(ha);
 }
 
+/* Deletes all the virtual ports for a given ha */
 static void
-qla2x00_remove_one(struct pci_dev *pdev)
+qla2x00_delete_all_vps(struct qla_hw_data *ha, scsi_qla_host_t *base_vha)
 {
-        scsi_qla_host_t *base_vha, *vha;
-        struct qla_hw_data  *ha;
+        struct Scsi_Host *scsi_host;
+        scsi_qla_host_t *vha;
         unsigned long flags;
 
-        /*
-         * If the PCI device is disabled that means that probe failed and any
-         * resources should be have cleaned up on probe exit.
-         */
-        if (!atomic_read(&pdev->enable_cnt))
-                return;
-
-        base_vha = pci_get_drvdata(pdev);
-        ha = base_vha->hw;
-
-        ha->flags.host_shutting_down = 1;
-
-        set_bit(UNLOADING, &base_vha->dpc_flags);
-        if (IS_QLAFX00(ha))
-                qlafx00_driver_shutdown(base_vha, 20);
-
         mutex_lock(&ha->vport_lock);
         while (ha->cur_vport_count) {
                 spin_lock_irqsave(&ha->vport_slock, flags);
@@ -3068,7 +2963,7 @@ qla2x00_remove_one(struct pci_dev *pdev)
                 BUG_ON(base_vha->list.next == &ha->vp_list);
                 /* This assumes first entry in ha->vp_list is always base vha */
                 vha = list_first_entry(&base_vha->list, scsi_qla_host_t, list);
-                scsi_host_get(vha->host);
+                scsi_host = scsi_host_get(vha->host);
 
                 spin_unlock_irqrestore(&ha->vport_slock, flags);
                 mutex_unlock(&ha->vport_lock);
@@ -3079,27 +2974,12 @@ qla2x00_remove_one(struct pci_dev *pdev)
                 mutex_lock(&ha->vport_lock);
         }
         mutex_unlock(&ha->vport_lock);
+}
 
-        if (IS_QLA8031(ha)) {
-                ql_dbg(ql_dbg_p3p, base_vha, 0xb07e,
-                    "Clearing fcoe driver presence.\n");
-                if (qla83xx_clear_drv_presence(base_vha) != QLA_SUCCESS)
-                        ql_dbg(ql_dbg_p3p, base_vha, 0xb079,
-                            "Error while clearing DRV-Presence.\n");
-        }
-
-        qla2x00_abort_all_cmds(base_vha, DID_NO_CONNECT << 16);
-
-        qla2x00_dfs_remove(base_vha);
-
-        qla84xx_put_chip(base_vha);
-
-        /* Disable timer */
-        if (base_vha->timer_active)
-                qla2x00_stop_timer(base_vha);
-
-        base_vha->flags.online = 0;
-
+/* Stops all deferred work threads */
+static void
+qla2x00_destroy_deferred_work(struct qla_hw_data *ha)
+{
         /* Flush the work queue and remove it */
         if (ha->wq) {
                 flush_workqueue(ha->wq);
@@ -3133,27 +3013,12 @@ qla2x00_remove_one(struct pci_dev *pdev)
                 ha->dpc_thread = NULL;
                 kthread_stop(t);
         }
-        qlt_remove_target(ha, base_vha);
-
-        qla2x00_free_sysfs_attr(base_vha);
-
-        fc_remove_host(base_vha->host);
-
-        scsi_remove_host(base_vha->host);
-
-        qla2x00_free_device(base_vha);
-
-        scsi_host_put(base_vha->host);
+}
 
-        if (IS_QLA8044(ha)) {
-                qla8044_idc_lock(ha);
-                qla8044_clear_drv_active(base_vha);
-                qla8044_idc_unlock(ha);
-        }
+static void
+qla2x00_unmap_iobases(struct qla_hw_data *ha)
+{
         if (IS_QLA82XX(ha)) {
-                qla82xx_idc_lock(ha);
-                qla82xx_clear_drv_active(ha);
-                qla82xx_idc_unlock(ha);
 
                 iounmap((device_reg_t __iomem *)ha->nx_pcibase);
                 if (!ql2xdbwr)
@@ -3171,6 +3036,84 @@ qla2x00_remove_one(struct pci_dev *pdev)
                 if (IS_QLA83XX(ha) && ha->msixbase)
                         iounmap(ha->msixbase);
         }
+}
+
+static void
+qla2x00_clear_drv_active(scsi_qla_host_t *vha)
+{
+        struct qla_hw_data *ha = vha->hw;
+
+        if (IS_QLA8044(ha)) {
+                qla8044_idc_lock(ha);
+                qla8044_clear_drv_active(ha);
+                qla8044_idc_unlock(ha);
+        } else if (IS_QLA82XX(ha)) {
+                qla82xx_idc_lock(ha);
+                qla82xx_clear_drv_active(ha);
+                qla82xx_idc_unlock(ha);
+        }
+}
+
+static void
+qla2x00_remove_one(struct pci_dev *pdev)
+{
+        scsi_qla_host_t *base_vha;
+        struct qla_hw_data  *ha;
+
+        /*
+         * If the PCI device is disabled that means that probe failed and any
+         * resources should be have cleaned up on probe exit.
+         */
+        if (!atomic_read(&pdev->enable_cnt))
+                return;
+
+        base_vha = pci_get_drvdata(pdev);
+        ha = base_vha->hw;
+
+        set_bit(UNLOADING, &base_vha->dpc_flags);
+
+        if (IS_QLAFX00(ha))
+                qlafx00_driver_shutdown(base_vha, 20);
+
+        qla2x00_delete_all_vps(ha, base_vha);
+
+        if (IS_QLA8031(ha)) {
+                ql_dbg(ql_dbg_p3p, base_vha, 0xb07e,
+                    "Clearing fcoe driver presence.\n");
+                if (qla83xx_clear_drv_presence(base_vha) != QLA_SUCCESS)
+                        ql_dbg(ql_dbg_p3p, base_vha, 0xb079,
+                            "Error while clearing DRV-Presence.\n");
+        }
+
+        qla2x00_abort_all_cmds(base_vha, DID_NO_CONNECT << 16);
+
+        qla2x00_dfs_remove(base_vha);
+
+        qla84xx_put_chip(base_vha);
+
+        /* Disable timer */
+        if (base_vha->timer_active)
+                qla2x00_stop_timer(base_vha);
+
+        base_vha->flags.online = 0;
+
+        qla2x00_destroy_deferred_work(ha);
+
+        qlt_remove_target(ha, base_vha);
+
+        qla2x00_free_sysfs_attr(base_vha, true);
+
+        fc_remove_host(base_vha->host);
+
+        scsi_remove_host(base_vha->host);
+
+        qla2x00_free_device(base_vha);
+
+        scsi_host_put(base_vha->host);
+
+        qla2x00_clear_drv_active(base_vha);
+
+        qla2x00_unmap_iobases(ha);
 
         pci_release_selected_regions(ha->pdev, ha->bars);
         kfree(ha);
@@ -3192,9 +3135,8 @@ qla2x00_free_device(scsi_qla_host_t *vha)
         if (vha->timer_active)
                 qla2x00_stop_timer(vha);
 
-        qla2x00_stop_dpc_thread(vha);
-
         qla25xx_delete_queues(vha);
+
         if (ha->flags.fce_enabled)
                 qla2x00_disable_fce_trace(vha, NULL, NULL);
 
@@ -4731,6 +4673,66 @@ exit:
         return rval;
 }
 
+void
+qla2x00_disable_board_on_pci_error(struct work_struct *work)
+{
+        struct qla_hw_data *ha = container_of(work, struct qla_hw_data,
+            board_disable);
+        struct pci_dev *pdev = ha->pdev;
+        scsi_qla_host_t *base_vha = pci_get_drvdata(ha->pdev);
+
+        ql_log(ql_log_warn, base_vha, 0x015b,
+            "Disabling adapter.\n");
+
+        set_bit(UNLOADING, &base_vha->dpc_flags);
+
+        qla2x00_delete_all_vps(ha, base_vha);
+
+        qla2x00_abort_all_cmds(base_vha, DID_NO_CONNECT << 16);
+
+        qla2x00_dfs_remove(base_vha);
+
+        qla84xx_put_chip(base_vha);
+
+        if (base_vha->timer_active)
+                qla2x00_stop_timer(base_vha);
+
+        base_vha->flags.online = 0;
+
+        qla2x00_destroy_deferred_work(ha);
+
+        /*
+         * Do not try to stop beacon blink as it will issue a mailbox
+         * command.
+         */
+        qla2x00_free_sysfs_attr(base_vha, false);
+
+        fc_remove_host(base_vha->host);
+
+        scsi_remove_host(base_vha->host);
+
+        base_vha->flags.init_done = 0;
+        qla25xx_delete_queues(base_vha);
+        qla2x00_free_irqs(base_vha);
+        qla2x00_free_fcports(base_vha);
+        qla2x00_mem_free(ha);
+        qla82xx_md_free(base_vha);
+        qla2x00_free_queues(ha);
+
+        scsi_host_put(base_vha->host);
+
+        qla2x00_unmap_iobases(ha);
+
+        pci_release_selected_regions(ha->pdev, ha->bars);
+        kfree(ha);
+        ha = NULL;
+
+        pci_disable_pcie_error_reporting(pdev);
+        pci_disable_device(pdev);
+        pci_set_drvdata(pdev, NULL);
+
+}
+
 /**************************************************************************
 * qla2x00_do_dpc
 *   This kernel thread is a task that is schedule by the interrupt handler
@@ -4863,6 +4865,14 @@ qla2x00_do_dpc(void *data)
                                 ql_dbg(ql_dbg_dpc, base_vha, 0x401f,
                                     "ISPFx00 Target Scan End\n");
                         }
+                        if (test_and_clear_bit(FX00_HOST_INFO_RESEND,
+                                &base_vha->dpc_flags)) {
+                                ql_dbg(ql_dbg_dpc, base_vha, 0x4023,
+                                    "ISPFx00 Host Info resend scheduled\n");
+                                qlafx00_fx_disc(base_vha,
+                                    &base_vha->hw->mr.fcport,
+                                    FXDISC_REG_HOST_INFO);
+                        }
                 }
 
                 if (test_and_clear_bit(ISP_ABORT_NEEDED,
@@ -4990,17 +5000,6 @@ loop_resync_check:
                         qla2xxx_flash_npiv_conf(base_vha);
                 }
 
-                if (test_and_clear_bit(HOST_RAMP_DOWN_QUEUE_DEPTH,
-                    &base_vha->dpc_flags)) {
-                        /* Prevents simultaneous ramp up and down */
-                        clear_bit(HOST_RAMP_UP_QUEUE_DEPTH,
-                            &base_vha->dpc_flags);
-                        qla2x00_host_ramp_down_queuedepth(base_vha);
-                }
-
-                if (test_and_clear_bit(HOST_RAMP_UP_QUEUE_DEPTH,
-                    &base_vha->dpc_flags))
-                        qla2x00_host_ramp_up_queuedepth(base_vha);
 intr_on_check:
                 if (!ha->interrupts_on)
                         ha->isp_ops->enable_intrs(ha);
@@ -5095,9 +5094,20 @@ qla2x00_timer(scsi_qla_host_t *vha)
                 return;
         }
 
-        /* Hardware read to raise pending EEH errors during mailbox waits. */
-        if (!pci_channel_offline(ha->pdev))
+        /*
+         * Hardware read to raise pending EEH errors during mailbox waits. If
+         * the read returns -1 then disable the board.
+         */
+        if (!pci_channel_offline(ha->pdev)) {
                 pci_read_config_word(ha->pdev, PCI_VENDOR_ID, &w);
+                if (w == 0xffff)
+                        /*
+                         * Schedule this on the default system workqueue so that
+                         * all the adapter workqueues and the DPC thread can be
+                         * shutdown cleanly.
+                         */
+                        schedule_work(&ha->board_disable);
+        }
 
         /* Make sure qla82xx_watchdog is run only for physical port */
         if (!vha->vp_idx && IS_P3P_TYPE(ha)) {
@@ -5182,7 +5192,6 @@ qla2x00_timer(scsi_qla_host_t *vha)
                     "Loop down - seconds remaining %d.\n",
                     atomic_read(&vha->loop_down_timer));
         }
-
         /* Check if beacon LED needs to be blinked for physical host only */
         if (!vha->vp_idx && (ha->beacon_blink_led == 1)) {
                 /* There is no beacon_blink function for ISP82xx */
@@ -5206,9 +5215,7 @@ qla2x00_timer(scsi_qla_host_t *vha)
             test_bit(ISP_UNRECOVERABLE, &vha->dpc_flags) ||
             test_bit(FCOE_CTX_RESET_NEEDED, &vha->dpc_flags) ||
             test_bit(VP_DPC_NEEDED, &vha->dpc_flags) ||
-            test_bit(RELOGIN_NEEDED, &vha->dpc_flags) ||
-            test_bit(HOST_RAMP_DOWN_QUEUE_DEPTH, &vha->dpc_flags) ||
-            test_bit(HOST_RAMP_UP_QUEUE_DEPTH, &vha->dpc_flags))) {
+            test_bit(RELOGIN_NEEDED, &vha->dpc_flags))) {
                 ql_dbg(ql_dbg_timer, vha, 0x600b,
                     "isp_abort_needed=%d loop_resync_needed=%d "
                     "fcport_update_needed=%d start_dpc=%d "
@@ -5221,15 +5228,12 @@ qla2x00_timer(scsi_qla_host_t *vha)
                 ql_dbg(ql_dbg_timer, vha, 0x600c,
                     "beacon_blink_needed=%d isp_unrecoverable=%d "
                     "fcoe_ctx_reset_needed=%d vp_dpc_needed=%d "
-                    "relogin_needed=%d, host_ramp_down_needed=%d "
-                    "host_ramp_up_needed=%d.\n",
+                    "relogin_needed=%d.\n",
                     test_bit(BEACON_BLINK_NEEDED, &vha->dpc_flags),
                     test_bit(ISP_UNRECOVERABLE, &vha->dpc_flags),
                     test_bit(FCOE_CTX_RESET_NEEDED, &vha->dpc_flags),
                     test_bit(VP_DPC_NEEDED, &vha->dpc_flags),
-                    test_bit(RELOGIN_NEEDED, &vha->dpc_flags),
-                    test_bit(HOST_RAMP_UP_QUEUE_DEPTH, &vha->dpc_flags),
-                    test_bit(HOST_RAMP_DOWN_QUEUE_DEPTH, &vha->dpc_flags));
+                    test_bit(RELOGIN_NEEDED, &vha->dpc_flags));
                 qla2xxx_wake_dpc(vha);
         }
 
diff --git a/drivers/scsi/qla2xxx/qla_target.c b/drivers/scsi/qla2xxx/qla_target.c
index 596480022b0a..2eb97d7e8d12 100644
--- a/drivers/scsi/qla2xxx/qla_target.c
+++ b/drivers/scsi/qla2xxx/qla_target.c
@@ -471,7 +471,7 @@ static void qlt_schedule_sess_for_deletion(struct qla_tgt_sess *sess,
                 schedule_delayed_work(&tgt->sess_del_work, 0);
         else
                 schedule_delayed_work(&tgt->sess_del_work,
-                    jiffies - sess->expires);
+                    sess->expires - jiffies);
 }
 
 /* ha->hardware_lock supposed to be held on entry */
@@ -550,13 +550,14 @@ static void qlt_del_sess_work_fn(struct delayed_work *work)
         struct scsi_qla_host *vha = tgt->vha;
         struct qla_hw_data *ha = vha->hw;
         struct qla_tgt_sess *sess;
-        unsigned long flags;
+        unsigned long flags, elapsed;
 
         spin_lock_irqsave(&ha->hardware_lock, flags);
         while (!list_empty(&tgt->del_sess_list)) {
                 sess = list_entry(tgt->del_sess_list.next, typeof(*sess),
                     del_list_entry);
-                if (time_after_eq(jiffies, sess->expires)) {
+                elapsed = jiffies;
+                if (time_after_eq(elapsed, sess->expires)) {
                         qlt_undelete_sess(sess);
 
                         ql_dbg(ql_dbg_tgt_mgt, vha, 0xf004,
@@ -566,7 +567,7 @@ static void qlt_del_sess_work_fn(struct delayed_work *work)
                         ha->tgt.tgt_ops->put_sess(sess);
                 } else {
                         schedule_delayed_work(&tgt->sess_del_work,
-                            jiffies - sess->expires);
+                            sess->expires - elapsed);
                         break;
                 }
         }
@@ -589,7 +590,7 @@ static struct qla_tgt_sess *qlt_create_sess(
 
         /* Check to avoid double sessions */
         spin_lock_irqsave(&ha->hardware_lock, flags);
-        list_for_each_entry(sess, &ha->tgt.qla_tgt->sess_list,
+        list_for_each_entry(sess, &vha->vha_tgt.qla_tgt->sess_list,
                                 sess_list_entry) {
                 if (!memcmp(sess->port_name, fcport->port_name, WWN_SIZE)) {
                         ql_dbg(ql_dbg_tgt_mgt, vha, 0xf005,
@@ -626,7 +627,7 @@ static struct qla_tgt_sess *qlt_create_sess(
 
                 return NULL;
         }
-        sess->tgt = ha->tgt.qla_tgt;
+        sess->tgt = vha->vha_tgt.qla_tgt;
         sess->vha = vha;
         sess->s_id = fcport->d_id;
         sess->loop_id = fcport->loop_id;
@@ -634,7 +635,7 @@ static struct qla_tgt_sess *qlt_create_sess(
 
         ql_dbg(ql_dbg_tgt_mgt, vha, 0xf006,
             "Adding sess %p to tgt %p via ->check_initiator_node_acl()\n",
-            sess, ha->tgt.qla_tgt);
+            sess, vha->vha_tgt.qla_tgt);
 
         be_sid[0] = sess->s_id.b.domain;
         be_sid[1] = sess->s_id.b.area;
@@ -661,8 +662,8 @@ static struct qla_tgt_sess *qlt_create_sess(
         memcpy(sess->port_name, fcport->port_name, sizeof(sess->port_name));
 
         spin_lock_irqsave(&ha->hardware_lock, flags);
-        list_add_tail(&sess->sess_list_entry, &ha->tgt.qla_tgt->sess_list);
-        ha->tgt.qla_tgt->sess_count++;
+        list_add_tail(&sess->sess_list_entry, &vha->vha_tgt.qla_tgt->sess_list);
+        vha->vha_tgt.qla_tgt->sess_count++;
         spin_unlock_irqrestore(&ha->hardware_lock, flags);
 
         ql_dbg(ql_dbg_tgt_mgt, vha, 0xf04b,
@@ -681,7 +682,7 @@ static struct qla_tgt_sess *qlt_create_sess(
 void qlt_fc_port_added(struct scsi_qla_host *vha, fc_port_t *fcport)
 {
         struct qla_hw_data *ha = vha->hw;
-        struct qla_tgt *tgt = ha->tgt.qla_tgt;
+        struct qla_tgt *tgt = vha->vha_tgt.qla_tgt;
         struct qla_tgt_sess *sess;
         unsigned long flags;
 
@@ -691,6 +692,9 @@ void qlt_fc_port_added(struct scsi_qla_host *vha, fc_port_t *fcport)
         if (!tgt || (fcport->port_type != FCT_INITIATOR))
                 return;
 
+        if (qla_ini_mode_enabled(vha))
+                return;
+
         spin_lock_irqsave(&ha->hardware_lock, flags);
         if (tgt->tgt_stop) {
                 spin_unlock_irqrestore(&ha->hardware_lock, flags);
@@ -700,9 +704,9 @@ void qlt_fc_port_added(struct scsi_qla_host *vha, fc_port_t *fcport)
         if (!sess) {
                 spin_unlock_irqrestore(&ha->hardware_lock, flags);
 
-                mutex_lock(&ha->tgt.tgt_mutex);
+                mutex_lock(&vha->vha_tgt.tgt_mutex);
                 sess = qlt_create_sess(vha, fcport, false);
-                mutex_unlock(&ha->tgt.tgt_mutex);
+                mutex_unlock(&vha->vha_tgt.tgt_mutex);
 
                 spin_lock_irqsave(&ha->hardware_lock, flags);
         } else {
@@ -738,7 +742,7 @@ void qlt_fc_port_added(struct scsi_qla_host *vha, fc_port_t *fcport)
 void qlt_fc_port_deleted(struct scsi_qla_host *vha, fc_port_t *fcport)
 {
         struct qla_hw_data *ha = vha->hw;
-        struct qla_tgt *tgt = ha->tgt.qla_tgt;
+        struct qla_tgt *tgt = vha->vha_tgt.qla_tgt;
         struct qla_tgt_sess *sess;
         unsigned long flags;
 
@@ -805,12 +809,12 @@ void qlt_stop_phase1(struct qla_tgt *tgt)
          * Mutex needed to sync with qla_tgt_fc_port_[added,deleted].
          * Lock is needed, because we still can get an incoming packet.
          */
-        mutex_lock(&ha->tgt.tgt_mutex);
+        mutex_lock(&vha->vha_tgt.tgt_mutex);
         spin_lock_irqsave(&ha->hardware_lock, flags);
         tgt->tgt_stop = 1;
         qlt_clear_tgt_db(tgt, true);
         spin_unlock_irqrestore(&ha->hardware_lock, flags);
-        mutex_unlock(&ha->tgt.tgt_mutex);
+        mutex_unlock(&vha->vha_tgt.tgt_mutex);
 
         flush_delayed_work(&tgt->sess_del_work);
 
@@ -844,20 +848,21 @@ EXPORT_SYMBOL(qlt_stop_phase1);
 void qlt_stop_phase2(struct qla_tgt *tgt)
 {
         struct qla_hw_data *ha = tgt->ha;
+        scsi_qla_host_t *vha = pci_get_drvdata(ha->pdev);
         unsigned long flags;
 
         if (tgt->tgt_stopped) {
-                ql_dbg(ql_dbg_tgt_mgt, tgt->vha, 0xf04f,
+                ql_dbg(ql_dbg_tgt_mgt, vha, 0xf04f,
                     "Already in tgt->tgt_stopped state\n");
                 dump_stack();
                 return;
         }
 
-        ql_dbg(ql_dbg_tgt_mgt, tgt->vha, 0xf00b,
+        ql_dbg(ql_dbg_tgt_mgt, vha, 0xf00b,
             "Waiting for %d IRQ commands to complete (tgt %p)",
             tgt->irq_cmd_count, tgt);
 
-        mutex_lock(&ha->tgt.tgt_mutex);
+        mutex_lock(&vha->vha_tgt.tgt_mutex);
         spin_lock_irqsave(&ha->hardware_lock, flags);
         while (tgt->irq_cmd_count != 0) {
                 spin_unlock_irqrestore(&ha->hardware_lock, flags);
@@ -867,9 +872,9 @@ void qlt_stop_phase2(struct qla_tgt *tgt)
         tgt->tgt_stop = 0;
         tgt->tgt_stopped = 1;
         spin_unlock_irqrestore(&ha->hardware_lock, flags);
-        mutex_unlock(&ha->tgt.tgt_mutex);
+        mutex_unlock(&vha->vha_tgt.tgt_mutex);
 
-        ql_dbg(ql_dbg_tgt_mgt, tgt->vha, 0xf00c, "Stop of tgt %p finished",
+        ql_dbg(ql_dbg_tgt_mgt, vha, 0xf00c, "Stop of tgt %p finished",
             tgt);
 }
 EXPORT_SYMBOL(qlt_stop_phase2);
@@ -877,14 +882,14 @@ EXPORT_SYMBOL(qlt_stop_phase2);
 /* Called from qlt_remove_target() -> qla2x00_remove_one() */
 static void qlt_release(struct qla_tgt *tgt)
 {
-        struct qla_hw_data *ha = tgt->ha;
+        scsi_qla_host_t *vha = tgt->vha;
 
-        if ((ha->tgt.qla_tgt != NULL) && !tgt->tgt_stopped)
+        if ((vha->vha_tgt.qla_tgt != NULL) && !tgt->tgt_stopped)
                 qlt_stop_phase2(tgt);
 
-        ha->tgt.qla_tgt = NULL;
+        vha->vha_tgt.qla_tgt = NULL;
 
-        ql_dbg(ql_dbg_tgt_mgt, tgt->vha, 0xf00d,
+        ql_dbg(ql_dbg_tgt_mgt, vha, 0xf00d,
             "Release of tgt %p finished\n", tgt);
 
         kfree(tgt);
@@ -948,8 +953,8 @@ static void qlt_send_notify_ack(struct scsi_qla_host *vha,
                 return;
         }
 
-        if (ha->tgt.qla_tgt != NULL)
-                ha->tgt.qla_tgt->notify_ack_expected++;
+        if (vha->vha_tgt.qla_tgt != NULL)
+                vha->vha_tgt.qla_tgt->notify_ack_expected++;
 
         pkt->entry_type = NOTIFY_ACK_TYPE;
         pkt->entry_count = 1;
@@ -1053,7 +1058,7 @@ static void qlt_24xx_send_abts_resp(struct scsi_qla_host *vha,
                 /* Other bytes are zero */
         }
 
-        ha->tgt.qla_tgt->abts_resp_expected++;
+        vha->vha_tgt.qla_tgt->abts_resp_expected++;
 
         qla2x00_start_iocbs(vha, vha->req);
 }
@@ -1205,7 +1210,7 @@ static void qlt_24xx_handle_abts(struct scsi_qla_host *vha,
                 ql_dbg(ql_dbg_tgt_mgt, vha, 0xf012,
                     "qla_target(%d): task abort for non-existant session\n",
                     vha->vp_idx);
-                rc = qlt_sched_sess_work(ha->tgt.qla_tgt,
+                rc = qlt_sched_sess_work(vha->vha_tgt.qla_tgt,
                     QLA_TGT_SESS_WORK_ABORT, abts, sizeof(*abts));
                 if (rc != 0) {
                         qlt_24xx_send_abts_resp(vha, abts, FCP_TMF_REJECTED,
@@ -2156,8 +2161,7 @@ static int qlt_prepare_srr_ctio(struct scsi_qla_host *vha,
         struct qla_tgt_cmd *cmd, void *ctio)
 {
         struct qla_tgt_srr_ctio *sc;
-        struct qla_hw_data *ha = vha->hw;
-        struct qla_tgt *tgt = ha->tgt.qla_tgt;
+        struct qla_tgt *tgt = vha->vha_tgt.qla_tgt;
         struct qla_tgt_srr_imm *imm;
 
         tgt->ctio_srr_id++;
@@ -2473,7 +2477,7 @@ static void qlt_do_work(struct work_struct *work)
         struct qla_tgt_cmd *cmd = container_of(work, struct qla_tgt_cmd, work);
         scsi_qla_host_t *vha = cmd->vha;
         struct qla_hw_data *ha = vha->hw;
-        struct qla_tgt *tgt = ha->tgt.qla_tgt;
+        struct qla_tgt *tgt = vha->vha_tgt.qla_tgt;
         struct qla_tgt_sess *sess = NULL;
         struct atio_from_isp *atio = &cmd->atio;
         unsigned char *cdb;
@@ -2506,10 +2510,10 @@ static void qlt_do_work(struct work_struct *work)
                         goto out_term;
                 }
 
-                mutex_lock(&ha->tgt.tgt_mutex);
+                mutex_lock(&vha->vha_tgt.tgt_mutex);
                 sess = qlt_make_local_sess(vha, s_id);
                 /* sess has an extra creation ref. */
-                mutex_unlock(&ha->tgt.tgt_mutex);
+                mutex_unlock(&vha->vha_tgt.tgt_mutex);
 
                 if (!sess)
                         goto out_term;
@@ -2575,8 +2579,7 @@ out_term:
 static int qlt_handle_cmd_for_atio(struct scsi_qla_host *vha,
         struct atio_from_isp *atio)
 {
-        struct qla_hw_data *ha = vha->hw;
-        struct qla_tgt *tgt = ha->tgt.qla_tgt;
+        struct qla_tgt *tgt = vha->vha_tgt.qla_tgt;
         struct qla_tgt_cmd *cmd;
 
         if (unlikely(tgt->tgt_stop)) {
@@ -2592,11 +2595,9 @@ static int qlt_handle_cmd_for_atio(struct scsi_qla_host *vha,
                 return -ENOMEM;
         }
 
-        INIT_LIST_HEAD(&cmd->cmd_list);
-
         memcpy(&cmd->atio, atio, sizeof(*atio));
         cmd->state = QLA_TGT_STATE_NEW;
-        cmd->tgt = ha->tgt.qla_tgt;
+        cmd->tgt = vha->vha_tgt.qla_tgt;
         cmd->vha = vha;
 
         INIT_WORK(&cmd->work, qlt_do_work);
@@ -2722,7 +2723,7 @@ static int qlt_handle_task_mgmt(struct scsi_qla_host *vha, void *iocb)
         uint32_t lun, unpacked_lun;
         int lun_size, fn;
 
-        tgt = ha->tgt.qla_tgt;
+        tgt = vha->vha_tgt.qla_tgt;
 
         lun = a->u.isp24.fcp_cmnd.lun;
         lun_size = sizeof(a->u.isp24.fcp_cmnd.lun);
@@ -2796,7 +2797,7 @@ static int qlt_abort_task(struct scsi_qla_host *vha,
                 ql_dbg(ql_dbg_tgt_mgt, vha, 0xf025,
                     "qla_target(%d): task abort for unexisting "
                     "session\n", vha->vp_idx);
-                return qlt_sched_sess_work(ha->tgt.qla_tgt,
+                return qlt_sched_sess_work(vha->vha_tgt.qla_tgt,
                     QLA_TGT_SESS_WORK_ABORT, iocb, sizeof(*iocb));
         }
 
@@ -2809,7 +2810,6 @@ static int qlt_abort_task(struct scsi_qla_host *vha,
 static int qlt_24xx_handle_els(struct scsi_qla_host *vha,
         struct imm_ntfy_from_isp *iocb)
 {
-        struct qla_hw_data *ha = vha->hw;
         int res = 0;
 
         ql_dbg(ql_dbg_tgt_mgt, vha, 0xf026,
@@ -2827,7 +2827,7 @@ static int qlt_24xx_handle_els(struct scsi_qla_host *vha,
         case ELS_PDISC:
         case ELS_ADISC:
         {
-                struct qla_tgt *tgt = ha->tgt.qla_tgt;
+                struct qla_tgt *tgt = vha->vha_tgt.qla_tgt;
                 if (tgt->link_reinit_iocb_pending) {
                         qlt_send_notify_ack(vha, &tgt->link_reinit_iocb,
                             0, 0, 0, 0, 0, 0);
@@ -3201,8 +3201,7 @@ static void qlt_prepare_srr_imm(struct scsi_qla_host *vha,
         struct imm_ntfy_from_isp *iocb)
 {
         struct qla_tgt_srr_imm *imm;
-        struct qla_hw_data *ha = vha->hw;
-        struct qla_tgt *tgt = ha->tgt.qla_tgt;
+        struct qla_tgt *tgt = vha->vha_tgt.qla_tgt;
         struct qla_tgt_srr_ctio *sctio;
 
         tgt->imm_srr_id++;
@@ -3312,7 +3311,7 @@ static void qlt_handle_imm_notify(struct scsi_qla_host *vha,
 
         case IMM_NTFY_LIP_LINK_REINIT:
         {
-                struct qla_tgt *tgt = ha->tgt.qla_tgt;
+                struct qla_tgt *tgt = vha->vha_tgt.qla_tgt;
                 ql_dbg(ql_dbg_tgt_mgt, vha, 0xf033,
                     "qla_target(%d): LINK REINIT (loop %#x, "
                     "subcode %x)\n", vha->vp_idx,
@@ -3488,7 +3487,7 @@ static void qlt_24xx_atio_pkt(struct scsi_qla_host *vha,
         struct atio_from_isp *atio)
 {
         struct qla_hw_data *ha = vha->hw;
-        struct qla_tgt *tgt = ha->tgt.qla_tgt;
+        struct qla_tgt *tgt = vha->vha_tgt.qla_tgt;
         int rc;
 
         if (unlikely(tgt == NULL)) {
@@ -3590,7 +3589,7 @@ static void qlt_24xx_atio_pkt(struct scsi_qla_host *vha,
 static void qlt_response_pkt(struct scsi_qla_host *vha, response_t *pkt)
 {
         struct qla_hw_data *ha = vha->hw;
-        struct qla_tgt *tgt = ha->tgt.qla_tgt;
+        struct qla_tgt *tgt = vha->vha_tgt.qla_tgt;
 
         if (unlikely(tgt == NULL)) {
                 ql_dbg(ql_dbg_tgt, vha, 0xe05d,
@@ -3793,7 +3792,7 @@ void qlt_async_event(uint16_t code, struct scsi_qla_host *vha,
         uint16_t *mailbox)
 {
         struct qla_hw_data *ha = vha->hw;
-        struct qla_tgt *tgt = ha->tgt.qla_tgt;
+        struct qla_tgt *tgt = vha->vha_tgt.qla_tgt;
         int login_code;
 
         ql_dbg(ql_dbg_tgt, vha, 0xe039,
@@ -3923,14 +3922,14 @@ static fc_port_t *qlt_get_port_database(struct scsi_qla_host *vha,
 static struct qla_tgt_sess *qlt_make_local_sess(struct scsi_qla_host *vha,
         uint8_t *s_id)
 {
-        struct qla_hw_data *ha = vha->hw;
         struct qla_tgt_sess *sess = NULL;
         fc_port_t *fcport = NULL;
         int rc, global_resets;
         uint16_t loop_id = 0;
 
 retry:
-        global_resets = atomic_read(&ha->tgt.qla_tgt->tgt_global_resets_count);
+        global_resets =
+            atomic_read(&vha->vha_tgt.qla_tgt->tgt_global_resets_count);
 
         rc = qla24xx_get_loop_id(vha, s_id, &loop_id);
         if (rc != 0) {
@@ -3957,12 +3956,13 @@ retry:
                 return NULL;
 
         if (global_resets !=
-            atomic_read(&ha->tgt.qla_tgt->tgt_global_resets_count)) {
+            atomic_read(&vha->vha_tgt.qla_tgt->tgt_global_resets_count)) {
                 ql_dbg(ql_dbg_tgt_mgt, vha, 0xf043,
                     "qla_target(%d): global reset during session discovery "
                     "(counter was %d, new %d), retrying", vha->vp_idx,
                     global_resets,
-                    atomic_read(&ha->tgt.qla_tgt->tgt_global_resets_count));
+                    atomic_read(&vha->vha_tgt.
+                        qla_tgt->tgt_global_resets_count));
                 goto retry;
         }
 
@@ -3997,10 +3997,10 @@ static void qlt_abort_work(struct qla_tgt *tgt,
         if (!sess) {
                 spin_unlock_irqrestore(&ha->hardware_lock, flags);
 
-                mutex_lock(&ha->tgt.tgt_mutex);
+                mutex_lock(&vha->vha_tgt.tgt_mutex);
                 sess = qlt_make_local_sess(vha, s_id);
                 /* sess has got an extra creation ref */
-                mutex_unlock(&ha->tgt.tgt_mutex);
+                mutex_unlock(&vha->vha_tgt.tgt_mutex);
 
                 spin_lock_irqsave(&ha->hardware_lock, flags);
                 if (!sess)
@@ -4051,10 +4051,10 @@ static void qlt_tmr_work(struct qla_tgt *tgt,
         if (!sess) {
                 spin_unlock_irqrestore(&ha->hardware_lock, flags);
 
-                mutex_lock(&ha->tgt.tgt_mutex);
+                mutex_lock(&vha->vha_tgt.tgt_mutex);
                 sess = qlt_make_local_sess(vha, s_id);
                 /* sess has got an extra creation ref */
-                mutex_unlock(&ha->tgt.tgt_mutex);
+                mutex_unlock(&vha->vha_tgt.tgt_mutex);
 
                 spin_lock_irqsave(&ha->hardware_lock, flags);
                 if (!sess)
@@ -4140,9 +4140,9 @@ int qlt_add_target(struct qla_hw_data *ha, struct scsi_qla_host *base_vha)
         }
 
         ql_dbg(ql_dbg_tgt, base_vha, 0xe03b,
-            "Registering target for host %ld(%p)", base_vha->host_no, ha);
+            "Registering target for host %ld(%p).\n", base_vha->host_no, ha);
 
-        BUG_ON((ha->tgt.qla_tgt != NULL) || (ha->tgt.tgt_ops != NULL));
+        BUG_ON(base_vha->vha_tgt.qla_tgt != NULL);
 
         tgt = kzalloc(sizeof(struct qla_tgt), GFP_KERNEL);
         if (!tgt) {
@@ -4170,7 +4170,7 @@ int qlt_add_target(struct qla_hw_data *ha, struct scsi_qla_host *base_vha)
         INIT_WORK(&tgt->srr_work, qlt_handle_srr_work);
         atomic_set(&tgt->tgt_global_resets_count, 0);
 
-        ha->tgt.qla_tgt = tgt;
+        base_vha->vha_tgt.qla_tgt = tgt;
 
         ql_dbg(ql_dbg_tgt, base_vha, 0xe067,
                 "qla_target(%d): using 64 Bit PCI addressing",
@@ -4191,16 +4191,16 @@ int qlt_add_target(struct qla_hw_data *ha, struct scsi_qla_host *base_vha)
 /* Must be called under tgt_host_action_mutex */
 int qlt_remove_target(struct qla_hw_data *ha, struct scsi_qla_host *vha)
 {
-        if (!ha->tgt.qla_tgt)
+        if (!vha->vha_tgt.qla_tgt)
                 return 0;
 
         mutex_lock(&qla_tgt_mutex);
-        list_del(&ha->tgt.qla_tgt->tgt_list_entry);
+        list_del(&vha->vha_tgt.qla_tgt->tgt_list_entry);
         mutex_unlock(&qla_tgt_mutex);
 
         ql_dbg(ql_dbg_tgt, vha, 0xe03c, "Unregistering target for host %ld(%p)",
             vha->host_no, ha);
-        qlt_release(ha->tgt.qla_tgt);
+        qlt_release(vha->vha_tgt.qla_tgt);
 
         return 0;
 }
@@ -4234,8 +4234,9 @@ static void qlt_lport_dump(struct scsi_qla_host *vha, u64 wwpn,
  * @callback:  lport initialization callback for tcm_qla2xxx code
  * @target_lport_ptr: pointer for tcm_qla2xxx specific lport data
  */
-int qlt_lport_register(struct qla_tgt_func_tmpl *qla_tgt_ops, u64 wwpn,
-        int (*callback)(struct scsi_qla_host *), void *target_lport_ptr)
+int qlt_lport_register(void *target_lport_ptr, u64 phys_wwpn,
+                       u64 npiv_wwpn, u64 npiv_wwnn,
+                       int (*callback)(struct scsi_qla_host *, void *, u64, u64))
 {
         struct qla_tgt *tgt;
         struct scsi_qla_host *vha;
@@ -4254,14 +4255,11 @@ int qlt_lport_register(struct qla_tgt_func_tmpl *qla_tgt_ops, u64 wwpn,
                 if (!host)
                         continue;
 
-                if (ha->tgt.tgt_ops != NULL)
-                        continue;
-
                 if (!(host->hostt->supported_mode & MODE_TARGET))
                         continue;
 
                 spin_lock_irqsave(&ha->hardware_lock, flags);
-                if (host->active_mode & MODE_TARGET) {
+                if ((!npiv_wwpn || !npiv_wwnn) && host->active_mode & MODE_TARGET) {
                         pr_debug("MODE_TARGET already active on qla2xxx(%d)\n",
                             host->host_no);
                         spin_unlock_irqrestore(&ha->hardware_lock, flags);
@@ -4275,23 +4273,18 @@ int qlt_lport_register(struct qla_tgt_func_tmpl *qla_tgt_ops, u64 wwpn,
                             " qla2xxx scsi_host\n");
                         continue;
                 }
-                qlt_lport_dump(vha, wwpn, b);
+                qlt_lport_dump(vha, phys_wwpn, b);
 
                 if (memcmp(vha->port_name, b, WWN_SIZE)) {
                         scsi_host_put(host);
                         continue;
                 }
-                /*
-                 * Setup passed parameters ahead of invoking callback
-                 */
-                ha->tgt.tgt_ops = qla_tgt_ops;
-                ha->tgt.target_lport_ptr = target_lport_ptr;
-                rc = (*callback)(vha);
-                if (rc != 0) {
-                        ha->tgt.tgt_ops = NULL;
-                        ha->tgt.target_lport_ptr = NULL;
-                }
                 mutex_unlock(&qla_tgt_mutex);
+
+                rc = (*callback)(vha, target_lport_ptr, npiv_wwpn, npiv_wwnn);
+                if (rc != 0)
+                        scsi_host_put(host);
+
                 return rc;
         }
         mutex_unlock(&qla_tgt_mutex);
@@ -4312,7 +4305,7 @@ void qlt_lport_deregister(struct scsi_qla_host *vha)
         /*
          * Clear the target_lport_ptr qla_target_template pointer in qla_hw_data
          */
-        ha->tgt.target_lport_ptr = NULL;
+        vha->vha_tgt.target_lport_ptr = NULL;
         ha->tgt.tgt_ops = NULL;
         /*
          * Release the Scsi_Host reference for the underlying qla2xxx host
@@ -4374,8 +4367,9 @@ void
 qlt_enable_vha(struct scsi_qla_host *vha)
 {
         struct qla_hw_data *ha = vha->hw;
-        struct qla_tgt *tgt = ha->tgt.qla_tgt;
+        struct qla_tgt *tgt = vha->vha_tgt.qla_tgt;
         unsigned long flags;
+        scsi_qla_host_t *base_vha = pci_get_drvdata(ha->pdev);
 
         if (!tgt) {
                 ql_dbg(ql_dbg_tgt, vha, 0xe069,
@@ -4390,9 +4384,14 @@ qlt_enable_vha(struct scsi_qla_host *vha)
         qlt_set_mode(vha);
         spin_unlock_irqrestore(&ha->hardware_lock, flags);
 
-        set_bit(ISP_ABORT_NEEDED, &vha->dpc_flags);
-        qla2xxx_wake_dpc(vha);
-        qla2x00_wait_for_hba_online(vha);
+        if (vha->vp_idx) {
+                qla24xx_disable_vp(vha);
+                qla24xx_enable_vp(vha);
+        } else {
+                set_bit(ISP_ABORT_NEEDED, &base_vha->dpc_flags);
+                qla2xxx_wake_dpc(base_vha);
+                qla2x00_wait_for_hba_online(base_vha);
+        }
 }
 EXPORT_SYMBOL(qlt_enable_vha);
 
@@ -4405,7 +4404,7 @@ void
 qlt_disable_vha(struct scsi_qla_host *vha)
 {
         struct qla_hw_data *ha = vha->hw;
-        struct qla_tgt *tgt = ha->tgt.qla_tgt;
+        struct qla_tgt *tgt = vha->vha_tgt.qla_tgt;
         unsigned long flags;
 
         if (!tgt) {
@@ -4436,8 +4435,10 @@ qlt_vport_create(struct scsi_qla_host *vha, struct qla_hw_data *ha)
         if (!qla_tgt_mode_enabled(vha))
                 return;
 
-        mutex_init(&ha->tgt.tgt_mutex);
-        mutex_init(&ha->tgt.tgt_host_action_mutex);
+        vha->vha_tgt.qla_tgt = NULL;
+
+        mutex_init(&vha->vha_tgt.tgt_mutex);
+        mutex_init(&vha->vha_tgt.tgt_host_action_mutex);
 
         qlt_clear_mode(vha);
 
@@ -4448,6 +4449,8 @@ qlt_vport_create(struct scsi_qla_host *vha, struct qla_hw_data *ha)
          * assigning the value appropriately.
          */
         ha->tgt.atio_q_length = ATIO_ENTRY_CNT_24XX;
+
+        qlt_add_target(ha, vha);
 }
 
 void
@@ -4766,8 +4769,8 @@ qlt_probe_one_stage1(struct scsi_qla_host *base_vha, struct qla_hw_data *ha)
                 ISP_ATIO_Q_OUT(base_vha) = &ha->iobase->isp24.atio_q_out;
         }
 
-        mutex_init(&ha->tgt.tgt_mutex);
-        mutex_init(&ha->tgt.tgt_host_action_mutex);
+        mutex_init(&base_vha->vha_tgt.tgt_mutex);
+        mutex_init(&base_vha->vha_tgt.tgt_host_action_mutex);
         qlt_clear_mode(base_vha);
 }
 
diff --git a/drivers/scsi/qla2xxx/qla_target.h b/drivers/scsi/qla2xxx/qla_target.h
index b33e411f28a0..66e755cdde57 100644
--- a/drivers/scsi/qla2xxx/qla_target.h
+++ b/drivers/scsi/qla2xxx/qla_target.h
@@ -855,7 +855,6 @@ struct qla_tgt_cmd {
         uint16_t loop_id;       /* to save extra sess dereferences */
         struct qla_tgt *tgt;    /* to save extra sess dereferences */
         struct scsi_qla_host *vha;
-        struct list_head cmd_list;
 
         struct atio_from_isp atio;
 };
@@ -932,8 +931,8 @@ void qlt_disable_vha(struct scsi_qla_host *);
  */
 extern int qlt_add_target(struct qla_hw_data *, struct scsi_qla_host *);
 extern int qlt_remove_target(struct qla_hw_data *, struct scsi_qla_host *);
-extern int qlt_lport_register(struct qla_tgt_func_tmpl *, u64,
-                        int (*callback)(struct scsi_qla_host *), void *);
+extern int qlt_lport_register(void *, u64, u64, u64,
+                        int (*callback)(struct scsi_qla_host *, void *, u64, u64));
 extern void qlt_lport_deregister(struct scsi_qla_host *);
 extern void qlt_unreg_sess(struct qla_tgt_sess *);
 extern void qlt_fc_port_added(struct scsi_qla_host *, fc_port_t *);
diff --git a/drivers/scsi/qla2xxx/qla_version.h b/drivers/scsi/qla2xxx/qla_version.h
index a808e293dae0..31d19535b015 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.06.00.08-k"
+#define QLA2XXX_VERSION      "8.06.00.12-k"
 
 #define QLA_DRIVER_MAJOR_VER    8
 #define QLA_DRIVER_MINOR_VER    6
diff --git a/drivers/scsi/qla2xxx/tcm_qla2xxx.c b/drivers/scsi/qla2xxx/tcm_qla2xxx.c
index 7eb19be35d46..75a141bbe74d 100644
--- a/drivers/scsi/qla2xxx/tcm_qla2xxx.c
+++ b/drivers/scsi/qla2xxx/tcm_qla2xxx.c
@@ -53,16 +53,6 @@
 struct workqueue_struct *tcm_qla2xxx_free_wq;
 struct workqueue_struct *tcm_qla2xxx_cmd_wq;
 
-static int tcm_qla2xxx_check_true(struct se_portal_group *se_tpg)
-{
-        return 1;
-}
-
-static int tcm_qla2xxx_check_false(struct se_portal_group *se_tpg)
-{
-        return 0;
-}
-
 /*
  * Parse WWN.
  * If strict, we require lower-case hex and colon separators to be sure
@@ -174,7 +164,7 @@ static int tcm_qla2xxx_npiv_parse_wwn(
         *wwnn = 0;
 
         /* count may include a LF at end of string */
-        if (name[cnt-1] == '\n')
+        if (name[cnt-1] == '\n' || name[cnt-1] == 0)
                 cnt--;
 
         /* validate we have enough characters for WWPN */
@@ -777,6 +767,9 @@ static void tcm_qla2xxx_put_session(struct se_session *se_sess)
 
 static void tcm_qla2xxx_put_sess(struct qla_tgt_sess *sess)
 {
+        if (!sess)
+                return;
+
         assert_spin_locked(&sess->vha->hw->hardware_lock);
         kref_put(&sess->se_sess->sess_kref, tcm_qla2xxx_release_session);
 }
@@ -957,7 +950,6 @@ static ssize_t tcm_qla2xxx_tpg_store_enable(
         struct tcm_qla2xxx_lport *lport = container_of(se_wwn,
                         struct tcm_qla2xxx_lport, lport_wwn);
         struct scsi_qla_host *vha = lport->qla_vha;
-        struct qla_hw_data *ha = vha->hw;
         struct tcm_qla2xxx_tpg *tpg = container_of(se_tpg,
                         struct tcm_qla2xxx_tpg, se_tpg);
         unsigned long op;
@@ -977,12 +969,12 @@ static ssize_t tcm_qla2xxx_tpg_store_enable(
                 atomic_set(&tpg->lport_tpg_enabled, 1);
                 qlt_enable_vha(vha);
         } else {
-                if (!ha->tgt.qla_tgt) {
-                        pr_err("truct qla_hw_data *ha->tgt.qla_tgt is NULL\n");
+                if (!vha->vha_tgt.qla_tgt) {
+                        pr_err("struct qla_hw_data *vha->vha_tgt.qla_tgt is NULL\n");
                         return -ENODEV;
                 }
                 atomic_set(&tpg->lport_tpg_enabled, 0);
-                qlt_stop_phase1(ha->tgt.qla_tgt);
+                qlt_stop_phase1(vha->vha_tgt.qla_tgt);
         }
 
         return count;
@@ -1011,7 +1003,7 @@ static struct se_portal_group *tcm_qla2xxx_make_tpg(
         if (kstrtoul(name + 5, 10, &tpgt) || tpgt > USHRT_MAX)
                 return ERR_PTR(-EINVAL);
 
-        if (!lport->qla_npiv_vp && (tpgt != 1)) {
+        if ((tpgt != 1)) {
                 pr_err("In non NPIV mode, a single TPG=1 is used for HW port mappings\n");
                 return ERR_PTR(-ENOSYS);
         }
@@ -1038,11 +1030,8 @@ static struct se_portal_group *tcm_qla2xxx_make_tpg(
                 kfree(tpg);
                 return NULL;
         }
-        /*
-         * Setup local TPG=1 pointer for non NPIV mode.
-         */
-        if (lport->qla_npiv_vp == NULL)
-                lport->tpg_1 = tpg;
+
+        lport->tpg_1 = tpg;
 
         return &tpg->se_tpg;
 }
@@ -1053,19 +1042,17 @@ static void tcm_qla2xxx_drop_tpg(struct se_portal_group *se_tpg)
                         struct tcm_qla2xxx_tpg, se_tpg);
         struct tcm_qla2xxx_lport *lport = tpg->lport;
         struct scsi_qla_host *vha = lport->qla_vha;
-        struct qla_hw_data *ha = vha->hw;
         /*
          * Call into qla2x_target.c LLD logic to shutdown the active
          * FC Nexuses and disable target mode operation for this qla_hw_data
          */
-        if (ha->tgt.qla_tgt && !ha->tgt.qla_tgt->tgt_stop)
-                qlt_stop_phase1(ha->tgt.qla_tgt);
+        if (vha->vha_tgt.qla_tgt && !vha->vha_tgt.qla_tgt->tgt_stop)
+                qlt_stop_phase1(vha->vha_tgt.qla_tgt);
 
         core_tpg_deregister(se_tpg);
         /*
          * Clear local TPG=1 pointer for non NPIV mode.
          */
-        if (lport->qla_npiv_vp == NULL)
                 lport->tpg_1 = NULL;
 
         kfree(tpg);
@@ -1095,12 +1082,22 @@ static struct se_portal_group *tcm_qla2xxx_npiv_make_tpg(
         tpg->lport = lport;
         tpg->lport_tpgt = tpgt;
 
+        /*
+         * By default allow READ-ONLY TPG demo-mode access w/ cached dynamic
+         * NodeACLs
+         */
+        tpg->tpg_attrib.generate_node_acls = 1;
+        tpg->tpg_attrib.demo_mode_write_protect = 1;
+        tpg->tpg_attrib.cache_dynamic_acls = 1;
+        tpg->tpg_attrib.demo_mode_login_only = 1;
+
         ret = core_tpg_register(&tcm_qla2xxx_npiv_fabric_configfs->tf_ops, wwn,
                                 &tpg->se_tpg, tpg, TRANSPORT_TPG_TYPE_NORMAL);
         if (ret < 0) {
                 kfree(tpg);
                 return NULL;
         }
+        lport->tpg_1 = tpg;
         return &tpg->se_tpg;
 }
 
@@ -1111,13 +1108,12 @@ static struct qla_tgt_sess *tcm_qla2xxx_find_sess_by_s_id(
         scsi_qla_host_t *vha,
         const uint8_t *s_id)
 {
-        struct qla_hw_data *ha = vha->hw;
         struct tcm_qla2xxx_lport *lport;
         struct se_node_acl *se_nacl;
         struct tcm_qla2xxx_nacl *nacl;
         u32 key;
 
-        lport = ha->tgt.target_lport_ptr;
+        lport = vha->vha_tgt.target_lport_ptr;
         if (!lport) {
                 pr_err("Unable to locate struct tcm_qla2xxx_lport\n");
                 dump_stack();
@@ -1221,13 +1217,12 @@ static struct qla_tgt_sess *tcm_qla2xxx_find_sess_by_loop_id(
         scsi_qla_host_t *vha,
         const uint16_t loop_id)
 {
-        struct qla_hw_data *ha = vha->hw;
         struct tcm_qla2xxx_lport *lport;
         struct se_node_acl *se_nacl;
         struct tcm_qla2xxx_nacl *nacl;
         struct tcm_qla2xxx_fc_loopid *fc_loopid;
 
-        lport = ha->tgt.target_lport_ptr;
+        lport = vha->vha_tgt.target_lport_ptr;
         if (!lport) {
                 pr_err("Unable to locate struct tcm_qla2xxx_lport\n");
                 dump_stack();
@@ -1341,6 +1336,7 @@ static void tcm_qla2xxx_free_session(struct qla_tgt_sess *sess)
 {
         struct qla_tgt *tgt = sess->tgt;
         struct qla_hw_data *ha = tgt->ha;
+        scsi_qla_host_t *vha = pci_get_drvdata(ha->pdev);
         struct se_session *se_sess;
         struct se_node_acl *se_nacl;
         struct tcm_qla2xxx_lport *lport;
@@ -1357,7 +1353,7 @@ static void tcm_qla2xxx_free_session(struct qla_tgt_sess *sess)
         se_nacl = se_sess->se_node_acl;
         nacl = container_of(se_nacl, struct tcm_qla2xxx_nacl, se_node_acl);
 
-        lport = ha->tgt.target_lport_ptr;
+        lport = vha->vha_tgt.target_lport_ptr;
         if (!lport) {
                 pr_err("Unable to locate struct tcm_qla2xxx_lport\n");
                 dump_stack();
@@ -1391,7 +1387,7 @@ static int tcm_qla2xxx_check_initiator_node_acl(
         unsigned char port_name[36];
         unsigned long flags;
 
-        lport = ha->tgt.target_lport_ptr;
+        lport = vha->vha_tgt.target_lport_ptr;
         if (!lport) {
                 pr_err("Unable to locate struct tcm_qla2xxx_lport\n");
                 dump_stack();
@@ -1455,7 +1451,8 @@ static void tcm_qla2xxx_update_sess(struct qla_tgt_sess *sess, port_id_t s_id,
 {
         struct qla_tgt *tgt = sess->tgt;
         struct qla_hw_data *ha = tgt->ha;
-        struct tcm_qla2xxx_lport *lport = ha->tgt.target_lport_ptr;
+        scsi_qla_host_t *vha = pci_get_drvdata(ha->pdev);
+        struct tcm_qla2xxx_lport *lport = vha->vha_tgt.target_lport_ptr;
         struct se_node_acl *se_nacl = sess->se_sess->se_node_acl;
         struct tcm_qla2xxx_nacl *nacl = container_of(se_nacl,
                         struct tcm_qla2xxx_nacl, se_node_acl);
@@ -1562,15 +1559,18 @@ static int tcm_qla2xxx_init_lport(struct tcm_qla2xxx_lport *lport)
         return 0;
 }
 
-static int tcm_qla2xxx_lport_register_cb(struct scsi_qla_host *vha)
+static int tcm_qla2xxx_lport_register_cb(struct scsi_qla_host *vha,
+                                         void *target_lport_ptr,
+                                         u64 npiv_wwpn, u64 npiv_wwnn)
 {
         struct qla_hw_data *ha = vha->hw;
-        struct tcm_qla2xxx_lport *lport;
+        struct tcm_qla2xxx_lport *lport =
+                        (struct tcm_qla2xxx_lport *)target_lport_ptr;
         /*
-         * Setup local pointer to vha, NPIV VP pointer (if present) and
-         * vha->tcm_lport pointer
+         * Setup tgt_ops, local pointer to vha and target_lport_ptr
          */
-        lport = (struct tcm_qla2xxx_lport *)ha->tgt.target_lport_ptr;
+        ha->tgt.tgt_ops = &tcm_qla2xxx_template;
+        vha->vha_tgt.target_lport_ptr = target_lport_ptr;
         lport->qla_vha = vha;
 
         return 0;
@@ -1602,8 +1602,8 @@ static struct se_wwn *tcm_qla2xxx_make_lport(
         if (ret != 0)
                 goto out;
 
-        ret = qlt_lport_register(&tcm_qla2xxx_template, wwpn,
-                                tcm_qla2xxx_lport_register_cb, lport);
+        ret = qlt_lport_register(lport, wwpn, 0, 0,
+                                 tcm_qla2xxx_lport_register_cb);
         if (ret != 0)
                 goto out_lport;
 
@@ -1621,7 +1621,6 @@ static void tcm_qla2xxx_drop_lport(struct se_wwn *wwn)
         struct tcm_qla2xxx_lport *lport = container_of(wwn,
                         struct tcm_qla2xxx_lport, lport_wwn);
         struct scsi_qla_host *vha = lport->qla_vha;
-        struct qla_hw_data *ha = vha->hw;
         struct se_node_acl *node;
         u32 key = 0;
 
@@ -1630,8 +1629,8 @@ static void tcm_qla2xxx_drop_lport(struct se_wwn *wwn)
          * shutdown of struct qla_tgt after the call to
          * qlt_stop_phase1() from tcm_qla2xxx_drop_tpg() above..
          */
-        if (ha->tgt.qla_tgt && !ha->tgt.qla_tgt->tgt_stopped)
-                qlt_stop_phase2(ha->tgt.qla_tgt);
+        if (vha->vha_tgt.qla_tgt && !vha->vha_tgt.qla_tgt->tgt_stopped)
+                qlt_stop_phase2(vha->vha_tgt.qla_tgt);
 
         qlt_lport_deregister(vha);
 
@@ -1642,17 +1641,70 @@ static void tcm_qla2xxx_drop_lport(struct se_wwn *wwn)
         kfree(lport);
 }
 
+static int tcm_qla2xxx_lport_register_npiv_cb(struct scsi_qla_host *base_vha,
+                                              void *target_lport_ptr,
+                                              u64 npiv_wwpn, u64 npiv_wwnn)
+{
+        struct fc_vport *vport;
+        struct Scsi_Host *sh = base_vha->host;
+        struct scsi_qla_host *npiv_vha;
+        struct tcm_qla2xxx_lport *lport =
+                        (struct tcm_qla2xxx_lport *)target_lport_ptr;
+        struct fc_vport_identifiers vport_id;
+
+        if (!qla_tgt_mode_enabled(base_vha)) {
+                pr_err("qla2xxx base_vha not enabled for target mode\n");
+                return -EPERM;
+        }
+
+        memset(&vport_id, 0, sizeof(vport_id));
+        vport_id.port_name = npiv_wwpn;
+        vport_id.node_name = npiv_wwnn;
+        vport_id.roles = FC_PORT_ROLE_FCP_INITIATOR;
+        vport_id.vport_type = FC_PORTTYPE_NPIV;
+        vport_id.disable = false;
+
+        vport = fc_vport_create(sh, 0, &vport_id);
+        if (!vport) {
+                pr_err("fc_vport_create failed for qla2xxx_npiv\n");
+                return -ENODEV;
+        }
+        /*
+         * Setup local pointer to NPIV vhba + target_lport_ptr
+         */
+        npiv_vha = (struct scsi_qla_host *)vport->dd_data;
+        npiv_vha->vha_tgt.target_lport_ptr = target_lport_ptr;
+        lport->qla_vha = npiv_vha;
+
+        scsi_host_get(npiv_vha->host);
+        return 0;
+}
+
+
 static struct se_wwn *tcm_qla2xxx_npiv_make_lport(
         struct target_fabric_configfs *tf,
         struct config_group *group,
         const char *name)
 {
         struct tcm_qla2xxx_lport *lport;
-        u64 npiv_wwpn, npiv_wwnn;
+        u64 phys_wwpn, npiv_wwpn, npiv_wwnn;
+        char *p, tmp[128];
         int ret;
 
-        if (tcm_qla2xxx_npiv_parse_wwn(name, strlen(name)+1,
-                                &npiv_wwpn, &npiv_wwnn) < 0)
+        snprintf(tmp, 128, "%s", name);
+
+        p = strchr(tmp, '@');
+        if (!p) {
+                pr_err("Unable to locate NPIV '@' seperator\n");
+                return ERR_PTR(-EINVAL);
+        }
+        *p++ = '\0';
+
+        if (tcm_qla2xxx_parse_wwn(tmp, &phys_wwpn, 1) < 0)
+                return ERR_PTR(-EINVAL);
+
+        if (tcm_qla2xxx_npiv_parse_wwn(p, strlen(p)+1,
+                                       &npiv_wwpn, &npiv_wwnn) < 0)
                 return ERR_PTR(-EINVAL);
 
         lport = kzalloc(sizeof(struct tcm_qla2xxx_lport), GFP_KERNEL);
@@ -1666,12 +1718,19 @@ static struct se_wwn *tcm_qla2xxx_npiv_make_lport(
                         TCM_QLA2XXX_NAMELEN, npiv_wwpn, npiv_wwnn);
         sprintf(lport->lport_naa_name, "naa.%016llx", (unsigned long long) npiv_wwpn);
 
-/* FIXME: tcm_qla2xxx_npiv_make_lport */
-        ret = -ENOSYS;
+        ret = tcm_qla2xxx_init_lport(lport);
         if (ret != 0)
                 goto out;
 
+        ret = qlt_lport_register(lport, phys_wwpn, npiv_wwpn, npiv_wwnn,
+                                 tcm_qla2xxx_lport_register_npiv_cb);
+        if (ret != 0)
+                goto out_lport;
+
         return &lport->lport_wwn;
+out_lport:
+        vfree(lport->lport_loopid_map);
+        btree_destroy32(&lport->lport_fcport_map);
 out:
         kfree(lport);
         return ERR_PTR(ret);
@@ -1681,14 +1740,16 @@ static void tcm_qla2xxx_npiv_drop_lport(struct se_wwn *wwn)
 {
         struct tcm_qla2xxx_lport *lport = container_of(wwn,
                         struct tcm_qla2xxx_lport, lport_wwn);
-        struct scsi_qla_host *vha = lport->qla_vha;
-        struct Scsi_Host *sh = vha->host;
+        struct scsi_qla_host *npiv_vha = lport->qla_vha;
+        struct qla_hw_data *ha = npiv_vha->hw;
+        scsi_qla_host_t *base_vha = pci_get_drvdata(ha->pdev);
+
+        scsi_host_put(npiv_vha->host);
         /*
-         * Notify libfc that we want to release the lport->npiv_vport
+         * Notify libfc that we want to release the vha->fc_vport
          */
-        fc_vport_terminate(lport->npiv_vport);
-
-        scsi_host_put(sh);
+        fc_vport_terminate(npiv_vha->fc_vport);
+        scsi_host_put(base_vha->host);
         kfree(lport);
 }
 
@@ -1769,14 +1830,16 @@ static struct target_core_fabric_ops tcm_qla2xxx_npiv_ops = {
         .tpg_get_pr_transport_id        = tcm_qla2xxx_get_pr_transport_id,
         .tpg_get_pr_transport_id_len    = tcm_qla2xxx_get_pr_transport_id_len,
         .tpg_parse_pr_out_transport_id  = tcm_qla2xxx_parse_pr_out_transport_id,
-        .tpg_check_demo_mode            = tcm_qla2xxx_check_false,
-        .tpg_check_demo_mode_cache      = tcm_qla2xxx_check_true,
-        .tpg_check_demo_mode_write_protect = tcm_qla2xxx_check_true,
-        .tpg_check_prod_mode_write_protect = tcm_qla2xxx_check_false,
+        .tpg_check_demo_mode            = tcm_qla2xxx_check_demo_mode,
+        .tpg_check_demo_mode_cache      = tcm_qla2xxx_check_demo_mode_cache,
+        .tpg_check_demo_mode_write_protect = tcm_qla2xxx_check_demo_mode,
+        .tpg_check_prod_mode_write_protect =
+            tcm_qla2xxx_check_prod_write_protect,
         .tpg_check_demo_mode_login_only = tcm_qla2xxx_check_demo_mode_login_only,
         .tpg_alloc_fabric_acl           = tcm_qla2xxx_alloc_fabric_acl,
         .tpg_release_fabric_acl         = tcm_qla2xxx_release_fabric_acl,
         .tpg_get_inst_index             = tcm_qla2xxx_tpg_get_inst_index,
+        .check_stop_free                = tcm_qla2xxx_check_stop_free,
         .release_cmd                    = tcm_qla2xxx_release_cmd,
         .put_session                    = tcm_qla2xxx_put_session,
         .shutdown_session               = tcm_qla2xxx_shutdown_session,
@@ -1871,7 +1934,8 @@ static int tcm_qla2xxx_register_configfs(void)
          * Setup default attribute lists for various npiv_fabric->tf_cit_tmpl
          */
         npiv_fabric->tf_cit_tmpl.tfc_wwn_cit.ct_attrs = tcm_qla2xxx_wwn_attrs;
-        npiv_fabric->tf_cit_tmpl.tfc_tpg_base_cit.ct_attrs = NULL;
+        npiv_fabric->tf_cit_tmpl.tfc_tpg_base_cit.ct_attrs =
+            tcm_qla2xxx_tpg_attrs;
         npiv_fabric->tf_cit_tmpl.tfc_tpg_attrib_cit.ct_attrs = NULL;
         npiv_fabric->tf_cit_tmpl.tfc_tpg_param_cit.ct_attrs = NULL;
         npiv_fabric->tf_cit_tmpl.tfc_tpg_np_base_cit.ct_attrs = NULL;
diff --git a/drivers/scsi/qla2xxx/tcm_qla2xxx.h b/drivers/scsi/qla2xxx/tcm_qla2xxx.h
index 771f7b816443..275d8b9a7a34 100644
--- a/drivers/scsi/qla2xxx/tcm_qla2xxx.h
+++ b/drivers/scsi/qla2xxx/tcm_qla2xxx.h
@@ -70,12 +70,8 @@ struct tcm_qla2xxx_lport {
         struct tcm_qla2xxx_fc_loopid *lport_loopid_map;
         /* Pointer to struct scsi_qla_host from qla2xxx LLD */
         struct scsi_qla_host *qla_vha;
-        /* Pointer to struct scsi_qla_host for NPIV VP from qla2xxx LLD */
-        struct scsi_qla_host *qla_npiv_vp;
         /* Pointer to struct qla_tgt pointer */
         struct qla_tgt lport_qla_tgt;
-        /* Pointer to struct fc_vport for NPIV vport from libfc */
-        struct fc_vport *npiv_vport;
         /* Pointer to TPG=1 for non NPIV mode */
         struct tcm_qla2xxx_tpg *tpg_1;
         /* Returned by tcm_qla2xxx_make_lport() */
diff --git a/drivers/scsi/qla4xxx/ql4_bsg.c b/drivers/scsi/qla4xxx/ql4_bsg.c
index cf8fdf1d1257..04a0027dbca0 100644
--- a/drivers/scsi/qla4xxx/ql4_bsg.c
+++ b/drivers/scsi/qla4xxx/ql4_bsg.c
@@ -446,6 +446,363 @@ leave:
         return rval;
 }
 
+static void ql4xxx_execute_diag_cmd(struct bsg_job *bsg_job)
+{
+        struct Scsi_Host *host = iscsi_job_to_shost(bsg_job);
+        struct scsi_qla_host *ha = to_qla_host(host);
+        struct iscsi_bsg_request *bsg_req = bsg_job->request;
+        struct iscsi_bsg_reply *bsg_reply = bsg_job->reply;
+        uint8_t *rsp_ptr = NULL;
+        uint32_t mbox_cmd[MBOX_REG_COUNT];
+        uint32_t mbox_sts[MBOX_REG_COUNT];
+        int status = QLA_ERROR;
+
+        DEBUG2(ql4_printk(KERN_INFO, ha, "%s: in\n", __func__));
+
+        if (test_bit(DPC_RESET_HA, &ha->dpc_flags)) {
+                ql4_printk(KERN_INFO, ha, "%s: Adapter reset in progress. Invalid Request\n",
+                           __func__);
+                bsg_reply->result = DID_ERROR << 16;
+                goto exit_diag_mem_test;
+        }
+
+        bsg_reply->reply_payload_rcv_len = 0;
+        memcpy(mbox_cmd, &bsg_req->rqst_data.h_vendor.vendor_cmd[1],
+               sizeof(uint32_t) * MBOX_REG_COUNT);
+
+        DEBUG2(ql4_printk(KERN_INFO, ha,
+                          "%s: mbox_cmd: %08X %08X %08X %08X %08X %08X %08X %08X\n",
+                          __func__, mbox_cmd[0], mbox_cmd[1], mbox_cmd[2],
+                          mbox_cmd[3], mbox_cmd[4], mbox_cmd[5], mbox_cmd[6],
+                          mbox_cmd[7]));
+
+        status = qla4xxx_mailbox_command(ha, MBOX_REG_COUNT, 8, &mbox_cmd[0],
+                                         &mbox_sts[0]);
+
+        DEBUG2(ql4_printk(KERN_INFO, ha,
+                          "%s: mbox_sts: %08X %08X %08X %08X %08X %08X %08X %08X\n",
+                          __func__, mbox_sts[0], mbox_sts[1], mbox_sts[2],
+                          mbox_sts[3], mbox_sts[4], mbox_sts[5], mbox_sts[6],
+                          mbox_sts[7]));
+
+        if (status == QLA_SUCCESS)
+                bsg_reply->result = DID_OK << 16;
+        else
+                bsg_reply->result = DID_ERROR << 16;
+
+        /* Send mbox_sts to application */
+        bsg_job->reply_len = sizeof(struct iscsi_bsg_reply) + sizeof(mbox_sts);
+        rsp_ptr = ((uint8_t *)bsg_reply) + sizeof(struct iscsi_bsg_reply);
+        memcpy(rsp_ptr, mbox_sts, sizeof(mbox_sts));
+
+exit_diag_mem_test:
+        DEBUG2(ql4_printk(KERN_INFO, ha,
+                          "%s: bsg_reply->result = x%x, status = %s\n",
+                          __func__, bsg_reply->result, STATUS(status)));
+
+        bsg_job_done(bsg_job, bsg_reply->result,
+                     bsg_reply->reply_payload_rcv_len);
+}
+
+static int qla4_83xx_wait_for_loopback_config_comp(struct scsi_qla_host *ha,
+                                                   int wait_for_link)
+{
+        int status = QLA_SUCCESS;
+
+        if (!wait_for_completion_timeout(&ha->idc_comp, (IDC_COMP_TOV * HZ))) {
+                ql4_printk(KERN_INFO, ha, "%s: IDC Complete notification not received, Waiting for another %d timeout",
+                           __func__, ha->idc_extend_tmo);
+                if (ha->idc_extend_tmo) {
+                        if (!wait_for_completion_timeout(&ha->idc_comp,
+                                                (ha->idc_extend_tmo * HZ))) {
+                                ha->notify_idc_comp = 0;
+                                ha->notify_link_up_comp = 0;
+                                ql4_printk(KERN_WARNING, ha, "%s: IDC Complete notification not received",
+                                           __func__);
+                                status = QLA_ERROR;
+                                goto exit_wait;
+                        } else {
+                                DEBUG2(ql4_printk(KERN_INFO, ha,
+                                                  "%s: IDC Complete notification received\n",
+                                                  __func__));
+                        }
+                }
+        } else {
+                DEBUG2(ql4_printk(KERN_INFO, ha,
+                                  "%s: IDC Complete notification received\n",
+                                  __func__));
+        }
+        ha->notify_idc_comp = 0;
+
+        if (wait_for_link) {
+                if (!wait_for_completion_timeout(&ha->link_up_comp,
+                                                 (IDC_COMP_TOV * HZ))) {
+                        ha->notify_link_up_comp = 0;
+                        ql4_printk(KERN_WARNING, ha, "%s: LINK UP notification not received",
+                                   __func__);
+                        status = QLA_ERROR;
+                        goto exit_wait;
+                } else {
+                        DEBUG2(ql4_printk(KERN_INFO, ha,
+                                          "%s: LINK UP notification received\n",
+                                          __func__));
+                }
+                ha->notify_link_up_comp = 0;
+        }
+
+exit_wait:
+        return status;
+}
+
+static int qla4_83xx_pre_loopback_config(struct scsi_qla_host *ha,
+                                         uint32_t *mbox_cmd)
+{
+        uint32_t config = 0;
+        int status = QLA_SUCCESS;
+
+        DEBUG2(ql4_printk(KERN_INFO, ha, "%s: in\n", __func__));
+
+        status = qla4_83xx_get_port_config(ha, &config);
+        if (status != QLA_SUCCESS)
+                goto exit_pre_loopback_config;
+
+        DEBUG2(ql4_printk(KERN_INFO, ha, "%s: Default port config=%08X\n",
+                          __func__, config));
+
+        if ((config & ENABLE_INTERNAL_LOOPBACK) ||
+            (config & ENABLE_EXTERNAL_LOOPBACK)) {
+                ql4_printk(KERN_INFO, ha, "%s: Loopback diagnostics already in progress. Invalid requiest\n",
+                           __func__);
+                goto exit_pre_loopback_config;
+        }
+
+        if (mbox_cmd[1] == QL_DIAG_CMD_TEST_INT_LOOPBACK)
+                config |= ENABLE_INTERNAL_LOOPBACK;
+
+        if (mbox_cmd[1] == QL_DIAG_CMD_TEST_EXT_LOOPBACK)
+                config |= ENABLE_EXTERNAL_LOOPBACK;
+
+        config &= ~ENABLE_DCBX;
+
+        DEBUG2(ql4_printk(KERN_INFO, ha, "%s: New port config=%08X\n",
+                          __func__, config));
+
+        ha->notify_idc_comp = 1;
+        ha->notify_link_up_comp = 1;
+
+        /* get the link state */
+        qla4xxx_get_firmware_state(ha);
+
+        status = qla4_83xx_set_port_config(ha, &config);
+        if (status != QLA_SUCCESS) {
+                ha->notify_idc_comp = 0;
+                ha->notify_link_up_comp = 0;
+                goto exit_pre_loopback_config;
+        }
+exit_pre_loopback_config:
+        DEBUG2(ql4_printk(KERN_INFO, ha, "%s: status = %s\n", __func__,
+                          STATUS(status)));
+        return status;
+}
+
+static int qla4_83xx_post_loopback_config(struct scsi_qla_host *ha,
+                                          uint32_t *mbox_cmd)
+{
+        int status = QLA_SUCCESS;
+        uint32_t config = 0;
+
+        DEBUG2(ql4_printk(KERN_INFO, ha, "%s: in\n", __func__));
+
+        status = qla4_83xx_get_port_config(ha, &config);
+        if (status != QLA_SUCCESS)
+                goto exit_post_loopback_config;
+
+        DEBUG2(ql4_printk(KERN_INFO, ha, "%s: port config=%08X\n", __func__,
+                          config));
+
+        if (mbox_cmd[1] == QL_DIAG_CMD_TEST_INT_LOOPBACK)
+                config &= ~ENABLE_INTERNAL_LOOPBACK;
+        else if (mbox_cmd[1] == QL_DIAG_CMD_TEST_EXT_LOOPBACK)
+                config &= ~ENABLE_EXTERNAL_LOOPBACK;
+
+        config |= ENABLE_DCBX;
+
+        DEBUG2(ql4_printk(KERN_INFO, ha,
+                          "%s: Restore default port config=%08X\n", __func__,
+                          config));
+
+        ha->notify_idc_comp = 1;
+        if (ha->addl_fw_state & FW_ADDSTATE_LINK_UP)
+                ha->notify_link_up_comp = 1;
+
+        status = qla4_83xx_set_port_config(ha, &config);
+        if (status != QLA_SUCCESS) {
+                ql4_printk(KERN_INFO, ha, "%s: Scheduling adapter reset\n",
+                           __func__);
+                set_bit(DPC_RESET_HA, &ha->dpc_flags);
+                clear_bit(AF_LOOPBACK, &ha->flags);
+                goto exit_post_loopback_config;
+        }
+
+exit_post_loopback_config:
+        DEBUG2(ql4_printk(KERN_INFO, ha, "%s: status = %s\n", __func__,
+                          STATUS(status)));
+        return status;
+}
+
+static void qla4xxx_execute_diag_loopback_cmd(struct bsg_job *bsg_job)
+{
+        struct Scsi_Host *host = iscsi_job_to_shost(bsg_job);
+        struct scsi_qla_host *ha = to_qla_host(host);
+        struct iscsi_bsg_request *bsg_req = bsg_job->request;
+        struct iscsi_bsg_reply *bsg_reply = bsg_job->reply;
+        uint8_t *rsp_ptr = NULL;
+        uint32_t mbox_cmd[MBOX_REG_COUNT];
+        uint32_t mbox_sts[MBOX_REG_COUNT];
+        int wait_for_link = 1;
+        int status = QLA_ERROR;
+
+        DEBUG2(ql4_printk(KERN_INFO, ha, "%s: in\n", __func__));
+
+        bsg_reply->reply_payload_rcv_len = 0;
+
+        if (test_bit(AF_LOOPBACK, &ha->flags)) {
+                ql4_printk(KERN_INFO, ha, "%s: Loopback Diagnostics already in progress. Invalid Request\n",
+                           __func__);
+                bsg_reply->result = DID_ERROR << 16;
+                goto exit_loopback_cmd;
+        }
+
+        if (test_bit(DPC_RESET_HA, &ha->dpc_flags)) {
+                ql4_printk(KERN_INFO, ha, "%s: Adapter reset in progress. Invalid Request\n",
+                           __func__);
+                bsg_reply->result = DID_ERROR << 16;
+                goto exit_loopback_cmd;
+        }
+
+        memcpy(mbox_cmd, &bsg_req->rqst_data.h_vendor.vendor_cmd[1],
+               sizeof(uint32_t) * MBOX_REG_COUNT);
+
+        if (is_qla8032(ha) || is_qla8042(ha)) {
+                status = qla4_83xx_pre_loopback_config(ha, mbox_cmd);
+                if (status != QLA_SUCCESS) {
+                        bsg_reply->result = DID_ERROR << 16;
+                        goto exit_loopback_cmd;
+                }
+
+                status = qla4_83xx_wait_for_loopback_config_comp(ha,
+                                                                 wait_for_link);
+                if (status != QLA_SUCCESS) {
+                        bsg_reply->result = DID_TIME_OUT << 16;
+                        goto restore;
+                }
+        }
+
+        DEBUG2(ql4_printk(KERN_INFO, ha,
+                          "%s: mbox_cmd: %08X %08X %08X %08X %08X %08X %08X %08X\n",
+                          __func__, mbox_cmd[0], mbox_cmd[1], mbox_cmd[2],
+                          mbox_cmd[3], mbox_cmd[4], mbox_cmd[5], mbox_cmd[6],
+                          mbox_cmd[7]));
+
+        status = qla4xxx_mailbox_command(ha, MBOX_REG_COUNT, 8, &mbox_cmd[0],
+                                &mbox_sts[0]);
+
+        if (status == QLA_SUCCESS)
+                bsg_reply->result = DID_OK << 16;
+        else
+                bsg_reply->result = DID_ERROR << 16;
+
+        DEBUG2(ql4_printk(KERN_INFO, ha,
+                          "%s: mbox_sts: %08X %08X %08X %08X %08X %08X %08X %08X\n",
+                          __func__, mbox_sts[0], mbox_sts[1], mbox_sts[2],
+                          mbox_sts[3], mbox_sts[4], mbox_sts[5], mbox_sts[6],
+                          mbox_sts[7]));
+
+        /* Send mbox_sts to application */
+        bsg_job->reply_len = sizeof(struct iscsi_bsg_reply) + sizeof(mbox_sts);
+        rsp_ptr = ((uint8_t *)bsg_reply) + sizeof(struct iscsi_bsg_reply);
+        memcpy(rsp_ptr, mbox_sts, sizeof(mbox_sts));
+restore:
+        if (is_qla8032(ha) || is_qla8042(ha)) {
+                status = qla4_83xx_post_loopback_config(ha, mbox_cmd);
+                if (status != QLA_SUCCESS) {
+                        bsg_reply->result = DID_ERROR << 16;
+                        goto exit_loopback_cmd;
+                }
+
+                /* for pre_loopback_config() wait for LINK UP only
+                 * if PHY LINK is UP */
+                if (!(ha->addl_fw_state & FW_ADDSTATE_LINK_UP))
+                        wait_for_link = 0;
+
+                status = qla4_83xx_wait_for_loopback_config_comp(ha,
+                                                                 wait_for_link);
+                if (status != QLA_SUCCESS) {
+                        bsg_reply->result = DID_TIME_OUT << 16;
+                        goto exit_loopback_cmd;
+                }
+        }
+exit_loopback_cmd:
+        DEBUG2(ql4_printk(KERN_INFO, ha,
+                          "%s: bsg_reply->result = x%x, status = %s\n",
+                          __func__, bsg_reply->result, STATUS(status)));
+        bsg_job_done(bsg_job, bsg_reply->result,
+                     bsg_reply->reply_payload_rcv_len);
+}
+
+static int qla4xxx_execute_diag_test(struct bsg_job *bsg_job)
+{
+        struct Scsi_Host *host = iscsi_job_to_shost(bsg_job);
+        struct scsi_qla_host *ha = to_qla_host(host);
+        struct iscsi_bsg_request *bsg_req = bsg_job->request;
+        uint32_t diag_cmd;
+        int rval = -EINVAL;
+
+        DEBUG2(ql4_printk(KERN_INFO, ha, "%s: in\n", __func__));
+
+        diag_cmd = bsg_req->rqst_data.h_vendor.vendor_cmd[1];
+        if (diag_cmd == MBOX_CMD_DIAG_TEST) {
+                switch (bsg_req->rqst_data.h_vendor.vendor_cmd[2]) {
+                case QL_DIAG_CMD_TEST_DDR_SIZE:
+                case QL_DIAG_CMD_TEST_DDR_RW:
+                case QL_DIAG_CMD_TEST_ONCHIP_MEM_RW:
+                case QL_DIAG_CMD_TEST_NVRAM:
+                case QL_DIAG_CMD_TEST_FLASH_ROM:
+                case QL_DIAG_CMD_TEST_DMA_XFER:
+                case QL_DIAG_CMD_SELF_DDR_RW:
+                case QL_DIAG_CMD_SELF_ONCHIP_MEM_RW:
+                        /* Execute diag test for adapter RAM/FLASH */
+                        ql4xxx_execute_diag_cmd(bsg_job);
+                        /* Always return success as we want to sent bsg_reply
+                         * to Application */
+                        rval = QLA_SUCCESS;
+                        break;
+
+                case QL_DIAG_CMD_TEST_INT_LOOPBACK:
+                case QL_DIAG_CMD_TEST_EXT_LOOPBACK:
+                        /* Execute diag test for Network */
+                        qla4xxx_execute_diag_loopback_cmd(bsg_job);
+                        /* Always return success as we want to sent bsg_reply
+                         * to Application */
+                        rval = QLA_SUCCESS;
+                        break;
+                default:
+                        ql4_printk(KERN_ERR, ha, "%s: Invalid diag test: 0x%x\n",
+                                   __func__,
+                                   bsg_req->rqst_data.h_vendor.vendor_cmd[2]);
+                }
+        } else if ((diag_cmd == MBOX_CMD_SET_LED_CONFIG) ||
+                   (diag_cmd == MBOX_CMD_GET_LED_CONFIG)) {
+                ql4xxx_execute_diag_cmd(bsg_job);
+                rval = QLA_SUCCESS;
+        } else {
+                ql4_printk(KERN_ERR, ha, "%s: Invalid diag cmd: 0x%x\n",
+                           __func__, diag_cmd);
+        }
+
+        return rval;
+}
+
 /**
  * qla4xxx_process_vendor_specific - handle vendor specific bsg request
  * @job: iscsi_bsg_job to handle
@@ -479,6 +836,9 @@ int qla4xxx_process_vendor_specific(struct bsg_job *bsg_job)
         case QLISCSI_VND_GET_ACB:
                 return qla4xxx_bsg_get_acb(bsg_job);
 
+        case QLISCSI_VND_DIAG_TEST:
+                return qla4xxx_execute_diag_test(bsg_job);
+
         default:
                 ql4_printk(KERN_ERR, ha, "%s: invalid BSG vendor command: "
                            "0x%x\n", __func__, bsg_req->msgcode);
diff --git a/drivers/scsi/qla4xxx/ql4_bsg.h b/drivers/scsi/qla4xxx/ql4_bsg.h
index c6a0364509fd..88c2401910c0 100644
--- a/drivers/scsi/qla4xxx/ql4_bsg.h
+++ b/drivers/scsi/qla4xxx/ql4_bsg.h
@@ -15,5 +15,18 @@
 #define QLISCSI_VND_UPDATE_NVRAM        5
 #define QLISCSI_VND_RESTORE_DEFAULTS    6
 #define QLISCSI_VND_GET_ACB             7
+#define QLISCSI_VND_DIAG_TEST           8
+
+/* QLISCSI_VND_DIAG_CMD sub code */
+#define QL_DIAG_CMD_TEST_DDR_SIZE       0x2
+#define QL_DIAG_CMD_TEST_DDR_RW         0x3
+#define QL_DIAG_CMD_TEST_ONCHIP_MEM_RW  0x4
+#define QL_DIAG_CMD_TEST_NVRAM          0x5     /* Only ISP4XXX */
+#define QL_DIAG_CMD_TEST_FLASH_ROM      0x6
+#define QL_DIAG_CMD_TEST_INT_LOOPBACK   0x7
+#define QL_DIAG_CMD_TEST_EXT_LOOPBACK   0x8
+#define QL_DIAG_CMD_TEST_DMA_XFER       0x9     /* Only ISP4XXX */
+#define QL_DIAG_CMD_SELF_DDR_RW         0xC
+#define QL_DIAG_CMD_SELF_ONCHIP_MEM_RW  0xD
 
 #endif
diff --git a/drivers/scsi/qla4xxx/ql4_def.h b/drivers/scsi/qla4xxx/ql4_def.h
index 084d1fd59c9e..aa67bb9a4426 100644
--- a/drivers/scsi/qla4xxx/ql4_def.h
+++ b/drivers/scsi/qla4xxx/ql4_def.h
@@ -73,6 +73,7 @@
 
 #define QLA_SUCCESS                     0
 #define QLA_ERROR                       1
+#define STATUS(status)          status == QLA_ERROR ? "FAILED" : "SUCCEEDED"
 
 /*
  * Data bit definitions
@@ -179,6 +180,10 @@
                 n &= ~v;        \
 }
 
+#define OP_STATE(o, f, p) {                     \
+        p = (o & f) ? "enable" : "disable";     \
+}
+
 /*
  * Retry & Timeout Values
  */
@@ -206,6 +211,8 @@
 #define MAX_RESET_HA_RETRIES            2
 #define FW_ALIVE_WAIT_TOV               3
 #define IDC_EXTEND_TOV                  8
+#define IDC_COMP_TOV                    5
+#define LINK_UP_COMP_TOV                30
 
 #define CMD_SP(Cmnd)                    ((Cmnd)->SCp.ptr)
 
@@ -476,6 +483,34 @@ struct ipaddress_config {
         uint16_t eth_mtu_size;
         uint16_t ipv4_port;
         uint16_t ipv6_port;
+        uint8_t control;
+        uint16_t ipv6_tcp_options;
+        uint8_t tcp_wsf;
+        uint8_t ipv6_tcp_wsf;
+        uint8_t ipv4_tos;
+        uint8_t ipv4_cache_id;
+        uint8_t ipv6_cache_id;
+        uint8_t ipv4_alt_cid_len;
+        uint8_t ipv4_alt_cid[11];
+        uint8_t ipv4_vid_len;
+        uint8_t ipv4_vid[11];
+        uint8_t ipv4_ttl;
+        uint16_t ipv6_flow_lbl;
+        uint8_t ipv6_traffic_class;
+        uint8_t ipv6_hop_limit;
+        uint32_t ipv6_nd_reach_time;
+        uint32_t ipv6_nd_rexmit_timer;
+        uint32_t ipv6_nd_stale_timeout;
+        uint8_t ipv6_dup_addr_detect_count;
+        uint32_t ipv6_gw_advrt_mtu;
+        uint16_t def_timeout;
+        uint8_t abort_timer;
+        uint16_t iscsi_options;
+        uint16_t iscsi_max_pdu_size;
+        uint16_t iscsi_first_burst_len;
+        uint16_t iscsi_max_outstnd_r2t;
+        uint16_t iscsi_max_burst_len;
+        uint8_t iscsi_name[224];
 };
 
 #define QL4_CHAP_MAX_NAME_LEN 256
@@ -790,6 +825,11 @@ struct scsi_qla_host {
         uint32_t pf_bit;
         struct qla4_83xx_idc_information idc_info;
         struct addr_ctrl_blk *saved_acb;
+        int notify_idc_comp;
+        int notify_link_up_comp;
+        int idc_extend_tmo;
+        struct completion idc_comp;
+        struct completion link_up_comp;
 };
 
 struct ql4_task_data {
diff --git a/drivers/scsi/qla4xxx/ql4_fw.h b/drivers/scsi/qla4xxx/ql4_fw.h
index 1243e5942b76..8d4092b33c07 100644
--- a/drivers/scsi/qla4xxx/ql4_fw.h
+++ b/drivers/scsi/qla4xxx/ql4_fw.h
@@ -410,6 +410,7 @@ struct qla_flt_region {
 #define DDB_DS_LOGIN_IN_PROCESS                 0x07
 #define MBOX_CMD_GET_FW_STATE                   0x0069
 #define MBOX_CMD_GET_INIT_FW_CTRL_BLOCK_DEFAULTS 0x006A
+#define MBOX_CMD_DIAG_TEST                      0x0075
 #define MBOX_CMD_GET_SYS_INFO                   0x0078
 #define MBOX_CMD_GET_NVRAM                      0x0078  /* For 40xx */
 #define MBOX_CMD_SET_NVRAM                      0x0079  /* For 40xx */
@@ -425,8 +426,17 @@ struct qla_flt_region {
 #define MBOX_CMD_GET_IP_ADDR_STATE              0x0091
 #define MBOX_CMD_SEND_IPV6_ROUTER_SOL           0x0092
 #define MBOX_CMD_GET_DB_ENTRY_CURRENT_IP_ADDR   0x0093
+#define MBOX_CMD_SET_PORT_CONFIG                0x0122
+#define MBOX_CMD_GET_PORT_CONFIG                0x0123
+#define MBOX_CMD_SET_LED_CONFIG                 0x0125
+#define MBOX_CMD_GET_LED_CONFIG                 0x0126
 #define MBOX_CMD_MINIDUMP                       0x0129
 
+/* Port Config */
+#define ENABLE_INTERNAL_LOOPBACK                0x04
+#define ENABLE_EXTERNAL_LOOPBACK                0x08
+#define ENABLE_DCBX                             0x10
+
 /* Minidump subcommand */
 #define MINIDUMP_GET_SIZE_SUBCOMMAND            0x00
 #define MINIDUMP_GET_TMPLT_SUBCOMMAND           0x01
@@ -535,10 +545,6 @@ struct qla_flt_region {
 #define FLASH_OPT_COMMIT        2
 #define FLASH_OPT_RMW_COMMIT    3
 
-/* Loopback type */
-#define ENABLE_INTERNAL_LOOPBACK        0x04
-#define ENABLE_EXTERNAL_LOOPBACK        0x08
-
 /* generic defines to enable/disable params */
 #define QL4_PARAM_DISABLE       0
 #define QL4_PARAM_ENABLE        1
@@ -551,6 +557,7 @@ struct addr_ctrl_blk {
 #define  IFCB_VER_MIN                   0x01
 #define  IFCB_VER_MAX                   0x02
         uint8_t control;        /* 01 */
+#define  CTRLOPT_NEW_CONN_DISABLE       0x0002
 
         uint16_t fw_options;    /* 02-03 */
 #define  FWOPT_HEARTBEAT_ENABLE           0x1000
@@ -582,11 +589,40 @@ struct addr_ctrl_blk {
         uint32_t shdwreg_addr_hi;       /* 2C-2F */
 
         uint16_t iscsi_opts;    /* 30-31 */
+#define ISCSIOPTS_HEADER_DIGEST_EN              0x2000
+#define ISCSIOPTS_DATA_DIGEST_EN                0x1000
+#define ISCSIOPTS_IMMEDIATE_DATA_EN             0x0800
+#define ISCSIOPTS_INITIAL_R2T_EN                0x0400
+#define ISCSIOPTS_DATA_SEQ_INORDER_EN           0x0200
+#define ISCSIOPTS_DATA_PDU_INORDER_EN           0x0100
+#define ISCSIOPTS_CHAP_AUTH_EN                  0x0080
+#define ISCSIOPTS_SNACK_EN                      0x0040
+#define ISCSIOPTS_DISCOVERY_LOGOUT_EN           0x0020
+#define ISCSIOPTS_BIDI_CHAP_EN                  0x0010
+#define ISCSIOPTS_DISCOVERY_AUTH_EN             0x0008
+#define ISCSIOPTS_STRICT_LOGIN_COMP_EN          0x0004
+#define ISCSIOPTS_ERL                           0x0003
         uint16_t ipv4_tcp_opts; /* 32-33 */
+#define TCPOPT_DELAYED_ACK_DISABLE      0x8000
 #define TCPOPT_DHCP_ENABLE              0x0200
+#define TCPOPT_DNS_SERVER_IP_EN         0x0100
+#define TCPOPT_SLP_DA_INFO_EN           0x0080
+#define TCPOPT_NAGLE_ALGO_DISABLE       0x0020
+#define TCPOPT_WINDOW_SCALE_DISABLE     0x0010
+#define TCPOPT_TIMER_SCALE              0x000E
+#define TCPOPT_TIMESTAMP_ENABLE         0x0001
         uint16_t ipv4_ip_opts;  /* 34-35 */
 #define IPOPT_IPV4_PROTOCOL_ENABLE      0x8000
+#define IPOPT_IPV4_TOS_EN               0x4000
 #define IPOPT_VLAN_TAGGING_ENABLE       0x2000
+#define IPOPT_GRAT_ARP_EN               0x1000
+#define IPOPT_ALT_CID_EN                0x0800
+#define IPOPT_REQ_VID_EN                0x0400
+#define IPOPT_USE_VID_EN                0x0200
+#define IPOPT_LEARN_IQN_EN              0x0100
+#define IPOPT_FRAGMENTATION_DISABLE     0x0010
+#define IPOPT_IN_FORWARD_EN             0x0008
+#define IPOPT_ARP_REDIRECT_EN           0x0004
 
         uint16_t iscsi_max_pdu_size;    /* 36-37 */
         uint8_t ipv4_tos;       /* 38 */
@@ -637,15 +673,24 @@ struct addr_ctrl_blk {
         uint32_t cookie;        /* 200-203 */
         uint16_t ipv6_port;     /* 204-205 */
         uint16_t ipv6_opts;     /* 206-207 */
-#define IPV6_OPT_IPV6_PROTOCOL_ENABLE   0x8000
-#define IPV6_OPT_VLAN_TAGGING_ENABLE    0x2000
+#define IPV6_OPT_IPV6_PROTOCOL_ENABLE           0x8000
+#define IPV6_OPT_VLAN_TAGGING_ENABLE            0x2000
+#define IPV6_OPT_GRAT_NEIGHBOR_ADV_EN           0x1000
+#define IPV6_OPT_REDIRECT_EN                    0x0004
 
         uint16_t ipv6_addtl_opts;       /* 208-209 */
+#define IPV6_ADDOPT_IGNORE_ICMP_ECHO_REQ                0x0040
+#define IPV6_ADDOPT_MLD_EN                              0x0004
 #define IPV6_ADDOPT_NEIGHBOR_DISCOVERY_ADDR_ENABLE      0x0002 /* Pri ACB
                                                                   Only */
 #define IPV6_ADDOPT_AUTOCONFIG_LINK_LOCAL_ADDR          0x0001
 
         uint16_t ipv6_tcp_opts; /* 20A-20B */
+#define IPV6_TCPOPT_DELAYED_ACK_DISABLE         0x8000
+#define IPV6_TCPOPT_NAGLE_ALGO_DISABLE          0x0020
+#define IPV6_TCPOPT_WINDOW_SCALE_DISABLE        0x0010
+#define IPV6_TCPOPT_TIMER_SCALE                 0x000E
+#define IPV6_TCPOPT_TIMESTAMP_EN                0x0001
         uint8_t ipv6_tcp_wsf;   /* 20C */
         uint16_t ipv6_flow_lbl; /* 20D-20F */
         uint8_t ipv6_dflt_rtr_addr[16]; /* 210-21F */
@@ -1252,7 +1297,88 @@ struct response {
 };
 
 struct ql_iscsi_stats {
-        uint8_t reserved1[656]; /* 0000-028F */
+        uint64_t mac_tx_frames; /* 0000–0007 */
+        uint64_t mac_tx_bytes; /* 0008–000F */
+        uint64_t mac_tx_multicast_frames; /* 0010–0017 */
+        uint64_t mac_tx_broadcast_frames; /* 0018–001F */
+        uint64_t mac_tx_pause_frames; /* 0020–0027 */
+        uint64_t mac_tx_control_frames; /* 0028–002F */
+        uint64_t mac_tx_deferral; /* 0030–0037 */
+        uint64_t mac_tx_excess_deferral; /* 0038–003F */
+        uint64_t mac_tx_late_collision; /* 0040–0047 */
+        uint64_t mac_tx_abort; /* 0048–004F */
+        uint64_t mac_tx_single_collision; /* 0050–0057 */
+        uint64_t mac_tx_multiple_collision; /* 0058–005F */
+        uint64_t mac_tx_collision; /* 0060–0067 */
+        uint64_t mac_tx_frames_dropped; /* 0068–006F */
+        uint64_t mac_tx_jumbo_frames; /* 0070–0077 */
+        uint64_t mac_rx_frames; /* 0078–007F */
+        uint64_t mac_rx_bytes; /* 0080–0087 */
+        uint64_t mac_rx_unknown_control_frames; /* 0088–008F */
+        uint64_t mac_rx_pause_frames; /* 0090–0097 */
+        uint64_t mac_rx_control_frames; /* 0098–009F */
+        uint64_t mac_rx_dribble; /* 00A0–00A7 */
+        uint64_t mac_rx_frame_length_error; /* 00A8–00AF */
+        uint64_t mac_rx_jabber; /* 00B0–00B7 */
+        uint64_t mac_rx_carrier_sense_error; /* 00B8–00BF */
+        uint64_t mac_rx_frame_discarded; /* 00C0–00C7 */
+        uint64_t mac_rx_frames_dropped; /* 00C8–00CF */
+        uint64_t mac_crc_error; /* 00D0–00D7 */
+        uint64_t mac_encoding_error; /* 00D8–00DF */
+        uint64_t mac_rx_length_error_large; /* 00E0–00E7 */
+        uint64_t mac_rx_length_error_small; /* 00E8–00EF */
+        uint64_t mac_rx_multicast_frames; /* 00F0–00F7 */
+        uint64_t mac_rx_broadcast_frames; /* 00F8–00FF */
+        uint64_t ip_tx_packets; /* 0100–0107 */
+        uint64_t ip_tx_bytes; /* 0108–010F */
+        uint64_t ip_tx_fragments; /* 0110–0117 */
+        uint64_t ip_rx_packets; /* 0118–011F */
+        uint64_t ip_rx_bytes; /* 0120–0127 */
+        uint64_t ip_rx_fragments; /* 0128–012F */
+        uint64_t ip_datagram_reassembly; /* 0130–0137 */
+        uint64_t ip_invalid_address_error; /* 0138–013F */
+        uint64_t ip_error_packets; /* 0140–0147 */
+        uint64_t ip_fragrx_overlap; /* 0148–014F */
+        uint64_t ip_fragrx_outoforder; /* 0150–0157 */
+        uint64_t ip_datagram_reassembly_timeout; /* 0158–015F */
+        uint64_t ipv6_tx_packets; /* 0160–0167 */
+        uint64_t ipv6_tx_bytes; /* 0168–016F */
+        uint64_t ipv6_tx_fragments; /* 0170–0177 */
+        uint64_t ipv6_rx_packets; /* 0178–017F */
+        uint64_t ipv6_rx_bytes; /* 0180–0187 */
+        uint64_t ipv6_rx_fragments; /* 0188–018F */
+        uint64_t ipv6_datagram_reassembly; /* 0190–0197 */
+        uint64_t ipv6_invalid_address_error; /* 0198–019F */
+        uint64_t ipv6_error_packets; /* 01A0–01A7 */
+        uint64_t ipv6_fragrx_overlap; /* 01A8–01AF */
+        uint64_t ipv6_fragrx_outoforder; /* 01B0–01B7 */
+        uint64_t ipv6_datagram_reassembly_timeout; /* 01B8–01BF */
+        uint64_t tcp_tx_segments; /* 01C0–01C7 */
+        uint64_t tcp_tx_bytes; /* 01C8–01CF */
+        uint64_t tcp_rx_segments; /* 01D0–01D7 */
+        uint64_t tcp_rx_byte; /* 01D8–01DF */
+        uint64_t tcp_duplicate_ack_retx; /* 01E0–01E7 */
+        uint64_t tcp_retx_timer_expired; /* 01E8–01EF */
+        uint64_t tcp_rx_duplicate_ack; /* 01F0–01F7 */
+        uint64_t tcp_rx_pure_ackr; /* 01F8–01FF */
+        uint64_t tcp_tx_delayed_ack; /* 0200–0207 */
+        uint64_t tcp_tx_pure_ack; /* 0208–020F */
+        uint64_t tcp_rx_segment_error; /* 0210–0217 */
+        uint64_t tcp_rx_segment_outoforder; /* 0218–021F */
+        uint64_t tcp_rx_window_probe; /* 0220–0227 */
+        uint64_t tcp_rx_window_update; /* 0228–022F */
+        uint64_t tcp_tx_window_probe_persist; /* 0230–0237 */
+        uint64_t ecc_error_correction; /* 0238–023F */
+        uint64_t iscsi_pdu_tx; /* 0240-0247 */
+        uint64_t iscsi_data_bytes_tx; /* 0248-024F */
+        uint64_t iscsi_pdu_rx; /* 0250-0257 */
+        uint64_t iscsi_data_bytes_rx; /* 0258-025F */
+        uint64_t iscsi_io_completed; /* 0260-0267 */
+        uint64_t iscsi_unexpected_io_rx; /* 0268-026F */
+        uint64_t iscsi_format_error; /* 0270-0277 */
+        uint64_t iscsi_hdr_digest_error; /* 0278-027F */
+        uint64_t iscsi_data_digest_error; /* 0280-0287 */
+        uint64_t iscsi_sequence_error; /* 0288-028F */
         uint32_t tx_cmd_pdu; /* 0290-0293 */
         uint32_t tx_resp_pdu; /* 0294-0297 */
         uint32_t rx_cmd_pdu; /* 0298-029B */
diff --git a/drivers/scsi/qla4xxx/ql4_glbl.h b/drivers/scsi/qla4xxx/ql4_glbl.h
index 5cef2527180a..d67c50e0b896 100644
--- a/drivers/scsi/qla4xxx/ql4_glbl.h
+++ b/drivers/scsi/qla4xxx/ql4_glbl.h
@@ -276,6 +276,9 @@ int qla4xxx_get_acb(struct scsi_qla_host *ha, dma_addr_t acb_dma,
 int qla4_84xx_config_acb(struct scsi_qla_host *ha, int acb_config);
 int qla4_83xx_ms_mem_write_128b(struct scsi_qla_host *ha,
                                 uint64_t addr, uint32_t *data, uint32_t count);
+uint8_t qla4xxx_set_ipaddr_state(uint8_t fw_ipaddr_state);
+int qla4_83xx_get_port_config(struct scsi_qla_host *ha, uint32_t *config);
+int qla4_83xx_set_port_config(struct scsi_qla_host *ha, uint32_t *config);
 
 extern int ql4xextended_error_logging;
 extern int ql4xdontresethba;
diff --git a/drivers/scsi/qla4xxx/ql4_isr.c b/drivers/scsi/qla4xxx/ql4_isr.c
index 7dff09f09b71..a3c8bc7706c2 100644
--- a/drivers/scsi/qla4xxx/ql4_isr.c
+++ b/drivers/scsi/qla4xxx/ql4_isr.c
@@ -606,6 +606,36 @@ static int qla4_83xx_loopback_in_progress(struct scsi_qla_host *ha)
         return rval;
 }
 
+static void qla4xxx_update_ipaddr_state(struct scsi_qla_host *ha,
+                                        uint32_t ipaddr_idx,
+                                        uint32_t ipaddr_fw_state)
+{
+        uint8_t ipaddr_state;
+        uint8_t ip_idx;
+
+        ip_idx = ipaddr_idx & 0xF;
+        ipaddr_state = qla4xxx_set_ipaddr_state((uint8_t)ipaddr_fw_state);
+
+        switch (ip_idx) {
+        case 0:
+                ha->ip_config.ipv4_addr_state = ipaddr_state;
+                break;
+        case 1:
+                ha->ip_config.ipv6_link_local_state = ipaddr_state;
+                break;
+        case 2:
+                ha->ip_config.ipv6_addr0_state = ipaddr_state;
+                break;
+        case 3:
+                ha->ip_config.ipv6_addr1_state = ipaddr_state;
+                break;
+        default:
+                ql4_printk(KERN_INFO, ha, "%s: Invalid IPADDR index %d\n",
+                           __func__, ip_idx);
+        }
+}
+
+
 /**
  * qla4xxx_isr_decode_mailbox - decodes mailbox status
  * @ha: Pointer to host adapter structure.
@@ -620,6 +650,7 @@ static void qla4xxx_isr_decode_mailbox(struct scsi_qla_host * ha,
         int i;
         uint32_t mbox_sts[MBOX_AEN_REG_COUNT];
         __le32 __iomem *mailbox_out;
+        uint32_t opcode = 0;
 
         if (is_qla8032(ha) || is_qla8042(ha))
                 mailbox_out = &ha->qla4_83xx_reg->mailbox_out[0];
@@ -698,6 +729,11 @@ static void qla4xxx_isr_decode_mailbox(struct scsi_qla_host * ha,
                         qla4xxx_post_aen_work(ha, ISCSI_EVENT_LINKUP,
                                               sizeof(mbox_sts),
                                               (uint8_t *) mbox_sts);
+
+                        if ((is_qla8032(ha) || is_qla8042(ha)) &&
+                            ha->notify_link_up_comp)
+                                complete(&ha->link_up_comp);
+
                         break;
 
                 case MBOX_ASTS_LINK_DOWN:
@@ -741,6 +777,8 @@ static void qla4xxx_isr_decode_mailbox(struct scsi_qla_host * ha,
                             "mbox_sts[3]=%04x\n", ha->host_no, mbox_sts[0],
                             mbox_sts[2], mbox_sts[3]);
 
+                        qla4xxx_update_ipaddr_state(ha, mbox_sts[5],
+                                                    mbox_sts[3]);
                         /* mbox_sts[2] = Old ACB state
                          * mbox_sts[3] = new ACB state */
                         if ((mbox_sts[3] == ACB_STATE_VALID) &&
@@ -841,8 +879,6 @@ static void qla4xxx_isr_decode_mailbox(struct scsi_qla_host * ha,
                         break;
 
                 case MBOX_ASTS_IDC_REQUEST_NOTIFICATION:
-                {
-                        uint32_t opcode;
                         if (is_qla8032(ha) || is_qla8042(ha)) {
                                 DEBUG2(ql4_printk(KERN_INFO, ha,
                                                   "scsi%ld: AEN %04x, mbox_sts[1]=%08x, mbox_sts[2]=%08x, mbox_sts[3]=%08x, mbox_sts[4]=%08x\n",
@@ -862,7 +898,6 @@ static void qla4xxx_isr_decode_mailbox(struct scsi_qla_host * ha,
                                 }
                         }
                         break;
-                }
 
                 case MBOX_ASTS_IDC_COMPLETE:
                         if (is_qla8032(ha) || is_qla8042(ha)) {
@@ -875,6 +910,14 @@ static void qla4xxx_isr_decode_mailbox(struct scsi_qla_host * ha,
                                                   "scsi:%ld: AEN %04x IDC Complete notification\n",
                                                   ha->host_no, mbox_sts[0]));
 
+                                opcode = mbox_sts[1] >> 16;
+                                if (ha->notify_idc_comp)
+                                        complete(&ha->idc_comp);
+
+                                if ((opcode == MBOX_CMD_SET_PORT_CONFIG) ||
+                                    (opcode == MBOX_CMD_PORT_RESET))
+                                        ha->idc_info.info2 = mbox_sts[3];
+
                                 if (qla4_83xx_loopback_in_progress(ha)) {
                                         set_bit(AF_LOOPBACK, &ha->flags);
                                 } else {
@@ -907,6 +950,8 @@ static void qla4xxx_isr_decode_mailbox(struct scsi_qla_host * ha,
                         DEBUG2(ql4_printk(KERN_INFO, ha,
                                           "scsi%ld: AEN %04x Received IDC Extend Timeout notification\n",
                                           ha->host_no, mbox_sts[0]));
+                        /* new IDC timeout */
+                        ha->idc_extend_tmo = mbox_sts[1];
                         break;
 
                 case MBOX_ASTS_INITIALIZATION_FAILED:
diff --git a/drivers/scsi/qla4xxx/ql4_mbx.c b/drivers/scsi/qla4xxx/ql4_mbx.c
index 22cbd005bdf4..9ae8ca3b69f9 100644
--- a/drivers/scsi/qla4xxx/ql4_mbx.c
+++ b/drivers/scsi/qla4xxx/ql4_mbx.c
@@ -418,6 +418,38 @@ qla4xxx_get_ifcb(struct scsi_qla_host *ha, uint32_t *mbox_cmd,
         return QLA_SUCCESS;
 }
 
+uint8_t qla4xxx_set_ipaddr_state(uint8_t fw_ipaddr_state)
+{
+        uint8_t ipaddr_state;
+
+        switch (fw_ipaddr_state) {
+        case IP_ADDRSTATE_UNCONFIGURED:
+                ipaddr_state = ISCSI_IPDDRESS_STATE_UNCONFIGURED;
+                break;
+        case IP_ADDRSTATE_INVALID:
+                ipaddr_state = ISCSI_IPDDRESS_STATE_INVALID;
+                break;
+        case IP_ADDRSTATE_ACQUIRING:
+                ipaddr_state = ISCSI_IPDDRESS_STATE_ACQUIRING;
+                break;
+        case IP_ADDRSTATE_TENTATIVE:
+                ipaddr_state = ISCSI_IPDDRESS_STATE_TENTATIVE;
+                break;
+        case IP_ADDRSTATE_DEPRICATED:
+                ipaddr_state = ISCSI_IPDDRESS_STATE_DEPRECATED;
+                break;
+        case IP_ADDRSTATE_PREFERRED:
+                ipaddr_state = ISCSI_IPDDRESS_STATE_VALID;
+                break;
+        case IP_ADDRSTATE_DISABLING:
+                ipaddr_state = ISCSI_IPDDRESS_STATE_DISABLING;
+                break;
+        default:
+                ipaddr_state = ISCSI_IPDDRESS_STATE_UNCONFIGURED;
+        }
+        return ipaddr_state;
+}
+
 static void
 qla4xxx_update_local_ip(struct scsi_qla_host *ha,
                         struct addr_ctrl_blk *init_fw_cb)
@@ -425,7 +457,7 @@ qla4xxx_update_local_ip(struct scsi_qla_host *ha,
         ha->ip_config.tcp_options = le16_to_cpu(init_fw_cb->ipv4_tcp_opts);
         ha->ip_config.ipv4_options = le16_to_cpu(init_fw_cb->ipv4_ip_opts);
         ha->ip_config.ipv4_addr_state =
-                                le16_to_cpu(init_fw_cb->ipv4_addr_state);
+                        qla4xxx_set_ipaddr_state(init_fw_cb->ipv4_addr_state);
         ha->ip_config.eth_mtu_size =
                                 le16_to_cpu(init_fw_cb->eth_mtu_size);
         ha->ip_config.ipv4_port = le16_to_cpu(init_fw_cb->ipv4_port);
@@ -434,6 +466,8 @@ qla4xxx_update_local_ip(struct scsi_qla_host *ha,
                 ha->ip_config.ipv6_options = le16_to_cpu(init_fw_cb->ipv6_opts);
                 ha->ip_config.ipv6_addl_options =
                                 le16_to_cpu(init_fw_cb->ipv6_addtl_opts);
+                ha->ip_config.ipv6_tcp_options =
+                                le16_to_cpu(init_fw_cb->ipv6_tcp_opts);
         }
 
         /* Save IPv4 Address Info */
@@ -448,17 +482,65 @@ qla4xxx_update_local_ip(struct scsi_qla_host *ha,
                    sizeof(init_fw_cb->ipv4_gw_addr)));
 
         ha->ip_config.ipv4_vlan_tag = be16_to_cpu(init_fw_cb->ipv4_vlan_tag);
+        ha->ip_config.control = init_fw_cb->control;
+        ha->ip_config.tcp_wsf = init_fw_cb->ipv4_tcp_wsf;
+        ha->ip_config.ipv4_tos = init_fw_cb->ipv4_tos;
+        ha->ip_config.ipv4_cache_id = init_fw_cb->ipv4_cacheid;
+        ha->ip_config.ipv4_alt_cid_len = init_fw_cb->ipv4_dhcp_alt_cid_len;
+        memcpy(ha->ip_config.ipv4_alt_cid, init_fw_cb->ipv4_dhcp_alt_cid,
+               min(sizeof(ha->ip_config.ipv4_alt_cid),
+                   sizeof(init_fw_cb->ipv4_dhcp_alt_cid)));
+        ha->ip_config.ipv4_vid_len = init_fw_cb->ipv4_dhcp_vid_len;
+        memcpy(ha->ip_config.ipv4_vid, init_fw_cb->ipv4_dhcp_vid,
+               min(sizeof(ha->ip_config.ipv4_vid),
+                   sizeof(init_fw_cb->ipv4_dhcp_vid)));
+        ha->ip_config.ipv4_ttl = init_fw_cb->ipv4_ttl;
+        ha->ip_config.def_timeout = le16_to_cpu(init_fw_cb->def_timeout);
+        ha->ip_config.abort_timer = init_fw_cb->abort_timer;
+        ha->ip_config.iscsi_options = le16_to_cpu(init_fw_cb->iscsi_opts);
+        ha->ip_config.iscsi_max_pdu_size =
+                                le16_to_cpu(init_fw_cb->iscsi_max_pdu_size);
+        ha->ip_config.iscsi_first_burst_len =
+                                le16_to_cpu(init_fw_cb->iscsi_fburst_len);
+        ha->ip_config.iscsi_max_outstnd_r2t =
+                                le16_to_cpu(init_fw_cb->iscsi_max_outstnd_r2t);
+        ha->ip_config.iscsi_max_burst_len =
+                                le16_to_cpu(init_fw_cb->iscsi_max_burst_len);
+        memcpy(ha->ip_config.iscsi_name, init_fw_cb->iscsi_name,
+               min(sizeof(ha->ip_config.iscsi_name),
+                   sizeof(init_fw_cb->iscsi_name)));
 
         if (is_ipv6_enabled(ha)) {
                 /* Save IPv6 Address */
                 ha->ip_config.ipv6_link_local_state =
-                        le16_to_cpu(init_fw_cb->ipv6_lnk_lcl_addr_state);
+                  qla4xxx_set_ipaddr_state(init_fw_cb->ipv6_lnk_lcl_addr_state);
                 ha->ip_config.ipv6_addr0_state =
-                                le16_to_cpu(init_fw_cb->ipv6_addr0_state);
+                        qla4xxx_set_ipaddr_state(init_fw_cb->ipv6_addr0_state);
                 ha->ip_config.ipv6_addr1_state =
-                                le16_to_cpu(init_fw_cb->ipv6_addr1_state);
-                ha->ip_config.ipv6_default_router_state =
-                                le16_to_cpu(init_fw_cb->ipv6_dflt_rtr_state);
+                        qla4xxx_set_ipaddr_state(init_fw_cb->ipv6_addr1_state);
+
+                switch (le16_to_cpu(init_fw_cb->ipv6_dflt_rtr_state)) {
+                case IPV6_RTRSTATE_UNKNOWN:
+                        ha->ip_config.ipv6_default_router_state =
+                                                ISCSI_ROUTER_STATE_UNKNOWN;
+                        break;
+                case IPV6_RTRSTATE_MANUAL:
+                        ha->ip_config.ipv6_default_router_state =
+                                                ISCSI_ROUTER_STATE_MANUAL;
+                        break;
+                case IPV6_RTRSTATE_ADVERTISED:
+                        ha->ip_config.ipv6_default_router_state =
+                                                ISCSI_ROUTER_STATE_ADVERTISED;
+                        break;
+                case IPV6_RTRSTATE_STALE:
+                        ha->ip_config.ipv6_default_router_state =
+                                                ISCSI_ROUTER_STATE_STALE;
+                        break;
+                default:
+                        ha->ip_config.ipv6_default_router_state =
+                                                ISCSI_ROUTER_STATE_UNKNOWN;
+                }
+
                 ha->ip_config.ipv6_link_local_addr.in6_u.u6_addr8[0] = 0xFE;
                 ha->ip_config.ipv6_link_local_addr.in6_u.u6_addr8[1] = 0x80;
 
@@ -479,6 +561,23 @@ qla4xxx_update_local_ip(struct scsi_qla_host *ha,
                 ha->ip_config.ipv6_vlan_tag =
                                 be16_to_cpu(init_fw_cb->ipv6_vlan_tag);
                 ha->ip_config.ipv6_port = le16_to_cpu(init_fw_cb->ipv6_port);
+                ha->ip_config.ipv6_cache_id = init_fw_cb->ipv6_cache_id;
+                ha->ip_config.ipv6_flow_lbl =
+                                le16_to_cpu(init_fw_cb->ipv6_flow_lbl);
+                ha->ip_config.ipv6_traffic_class =
+                                init_fw_cb->ipv6_traffic_class;
+                ha->ip_config.ipv6_hop_limit = init_fw_cb->ipv6_hop_limit;
+                ha->ip_config.ipv6_nd_reach_time =
+                                le32_to_cpu(init_fw_cb->ipv6_nd_reach_time);
+                ha->ip_config.ipv6_nd_rexmit_timer =
+                                le32_to_cpu(init_fw_cb->ipv6_nd_rexmit_timer);
+                ha->ip_config.ipv6_nd_stale_timeout =
+                                le32_to_cpu(init_fw_cb->ipv6_nd_stale_timeout);
+                ha->ip_config.ipv6_dup_addr_detect_count =
+                                        init_fw_cb->ipv6_dup_addr_detect_count;
+                ha->ip_config.ipv6_gw_advrt_mtu =
+                                le32_to_cpu(init_fw_cb->ipv6_gw_advrt_mtu);
+                ha->ip_config.ipv6_tcp_wsf = init_fw_cb->ipv6_tcp_wsf;
         }
 }
 
@@ -2317,3 +2416,46 @@ exit_config_acb:
                           rval == QLA_SUCCESS ? "SUCCEEDED" : "FAILED"));
         return rval;
 }
+
+int qla4_83xx_get_port_config(struct scsi_qla_host *ha, uint32_t *config)
+{
+        uint32_t mbox_cmd[MBOX_REG_COUNT];
+        uint32_t mbox_sts[MBOX_REG_COUNT];
+        int status;
+
+        memset(&mbox_cmd, 0, sizeof(mbox_cmd));
+        memset(&mbox_sts, 0, sizeof(mbox_sts));
+
+        mbox_cmd[0] = MBOX_CMD_GET_PORT_CONFIG;
+
+        status = qla4xxx_mailbox_command(ha, MBOX_REG_COUNT, MBOX_REG_COUNT,
+                                         mbox_cmd, mbox_sts);
+        if (status == QLA_SUCCESS)
+                *config = mbox_sts[1];
+        else
+                ql4_printk(KERN_ERR, ha, "%s: failed status %04X\n", __func__,
+                           mbox_sts[0]);
+
+        return status;
+}
+
+int qla4_83xx_set_port_config(struct scsi_qla_host *ha, uint32_t *config)
+{
+        uint32_t mbox_cmd[MBOX_REG_COUNT];
+        uint32_t mbox_sts[MBOX_REG_COUNT];
+        int status;
+
+        memset(&mbox_cmd, 0, sizeof(mbox_cmd));
+        memset(&mbox_sts, 0, sizeof(mbox_sts));
+
+        mbox_cmd[0] = MBOX_CMD_SET_PORT_CONFIG;
+        mbox_cmd[1] = *config;
+
+        status = qla4xxx_mailbox_command(ha, MBOX_REG_COUNT, MBOX_REG_COUNT,
+                                mbox_cmd, mbox_sts);
+        if (status != QLA_SUCCESS)
+                ql4_printk(KERN_ERR, ha, "%s: failed status %04X\n", __func__,
+                           mbox_sts[0]);
+
+        return status;
+}
diff --git a/drivers/scsi/qla4xxx/ql4_os.c b/drivers/scsi/qla4xxx/ql4_os.c
index a28d5e624aab..c21adc338cf1 100644
--- a/drivers/scsi/qla4xxx/ql4_os.c
+++ b/drivers/scsi/qla4xxx/ql4_os.c
@@ -151,6 +151,7 @@ static int qla4xxx_get_chap_list(struct Scsi_Host *shost, uint16_t chap_tbl_idx,
 static int qla4xxx_delete_chap(struct Scsi_Host *shost, uint16_t chap_tbl_idx);
 static int qla4xxx_set_chap_entry(struct Scsi_Host *shost, void  *data,
                                   int len);
+static int qla4xxx_get_host_stats(struct Scsi_Host *shost, char *buf, int len);
 
 /*
  * SCSI host template entry points
@@ -262,6 +263,7 @@ static struct iscsi_transport qla4xxx_iscsi_transport = {
         .login_flashnode        = qla4xxx_sysfs_ddb_login,
         .logout_flashnode       = qla4xxx_sysfs_ddb_logout,
         .logout_flashnode_sid   = qla4xxx_sysfs_ddb_logout_sid,
+        .get_host_stats         = qla4xxx_get_host_stats,
 };
 
 static struct scsi_transport_template *qla4xxx_scsi_transport;
@@ -419,6 +421,7 @@ static umode_t qla4_attr_is_visible(int param_type, int param)
                 case ISCSI_PARAM_EXP_STATSN:
                 case ISCSI_PARAM_DISCOVERY_PARENT_IDX:
                 case ISCSI_PARAM_DISCOVERY_PARENT_TYPE:
+                case ISCSI_PARAM_LOCAL_IPADDR:
                         return S_IRUGO;
                 default:
                         return 0;
@@ -440,6 +443,65 @@ static umode_t qla4_attr_is_visible(int param_type, int param)
                 case ISCSI_NET_PARAM_VLAN_ENABLED:
                 case ISCSI_NET_PARAM_MTU:
                 case ISCSI_NET_PARAM_PORT:
+                case ISCSI_NET_PARAM_IPADDR_STATE:
+                case ISCSI_NET_PARAM_IPV6_LINKLOCAL_STATE:
+                case ISCSI_NET_PARAM_IPV6_ROUTER_STATE:
+                case ISCSI_NET_PARAM_DELAYED_ACK_EN:
+                case ISCSI_NET_PARAM_TCP_NAGLE_DISABLE:
+                case ISCSI_NET_PARAM_TCP_WSF_DISABLE:
+                case ISCSI_NET_PARAM_TCP_WSF:
+                case ISCSI_NET_PARAM_TCP_TIMER_SCALE:
+                case ISCSI_NET_PARAM_TCP_TIMESTAMP_EN:
+                case ISCSI_NET_PARAM_CACHE_ID:
+                case ISCSI_NET_PARAM_IPV4_DHCP_DNS_ADDR_EN:
+                case ISCSI_NET_PARAM_IPV4_DHCP_SLP_DA_EN:
+                case ISCSI_NET_PARAM_IPV4_TOS_EN:
+                case ISCSI_NET_PARAM_IPV4_TOS:
+                case ISCSI_NET_PARAM_IPV4_GRAT_ARP_EN:
+                case ISCSI_NET_PARAM_IPV4_DHCP_ALT_CLIENT_ID_EN:
+                case ISCSI_NET_PARAM_IPV4_DHCP_ALT_CLIENT_ID:
+                case ISCSI_NET_PARAM_IPV4_DHCP_REQ_VENDOR_ID_EN:
+                case ISCSI_NET_PARAM_IPV4_DHCP_USE_VENDOR_ID_EN:
+                case ISCSI_NET_PARAM_IPV4_DHCP_VENDOR_ID:
+                case ISCSI_NET_PARAM_IPV4_DHCP_LEARN_IQN_EN:
+                case ISCSI_NET_PARAM_IPV4_FRAGMENT_DISABLE:
+                case ISCSI_NET_PARAM_IPV4_IN_FORWARD_EN:
+                case ISCSI_NET_PARAM_REDIRECT_EN:
+                case ISCSI_NET_PARAM_IPV4_TTL:
+                case ISCSI_NET_PARAM_IPV6_GRAT_NEIGHBOR_ADV_EN:
+                case ISCSI_NET_PARAM_IPV6_MLD_EN:
+                case ISCSI_NET_PARAM_IPV6_FLOW_LABEL:
+                case ISCSI_NET_PARAM_IPV6_TRAFFIC_CLASS:
+                case ISCSI_NET_PARAM_IPV6_HOP_LIMIT:
+                case ISCSI_NET_PARAM_IPV6_ND_REACHABLE_TMO:
+                case ISCSI_NET_PARAM_IPV6_ND_REXMIT_TIME:
+                case ISCSI_NET_PARAM_IPV6_ND_STALE_TMO:
+                case ISCSI_NET_PARAM_IPV6_DUP_ADDR_DETECT_CNT:
+                case ISCSI_NET_PARAM_IPV6_RTR_ADV_LINK_MTU:
+                        return S_IRUGO;
+                default:
+                        return 0;
+                }
+        case ISCSI_IFACE_PARAM:
+                switch (param) {
+                case ISCSI_IFACE_PARAM_DEF_TASKMGMT_TMO:
+                case ISCSI_IFACE_PARAM_HDRDGST_EN:
+                case ISCSI_IFACE_PARAM_DATADGST_EN:
+                case ISCSI_IFACE_PARAM_IMM_DATA_EN:
+                case ISCSI_IFACE_PARAM_INITIAL_R2T_EN:
+                case ISCSI_IFACE_PARAM_DATASEQ_INORDER_EN:
+                case ISCSI_IFACE_PARAM_PDU_INORDER_EN:
+                case ISCSI_IFACE_PARAM_ERL:
+                case ISCSI_IFACE_PARAM_MAX_RECV_DLENGTH:
+                case ISCSI_IFACE_PARAM_FIRST_BURST:
+                case ISCSI_IFACE_PARAM_MAX_R2T:
+                case ISCSI_IFACE_PARAM_MAX_BURST:
+                case ISCSI_IFACE_PARAM_CHAP_AUTH_EN:
+                case ISCSI_IFACE_PARAM_BIDI_CHAP_EN:
+                case ISCSI_IFACE_PARAM_DISCOVERY_AUTH_OPTIONAL:
+                case ISCSI_IFACE_PARAM_DISCOVERY_LOGOUT_EN:
+                case ISCSI_IFACE_PARAM_STRICT_LOGIN_COMP_EN:
+                case ISCSI_IFACE_PARAM_INITIATOR_NAME:
                         return S_IRUGO;
                 default:
                         return 0;
@@ -511,6 +573,65 @@ static umode_t qla4_attr_is_visible(int param_type, int param)
         return 0;
 }
 
+/**
+ * qla4xxx_create chap_list - Create CHAP list from FLASH
+ * @ha: pointer to adapter structure
+ *
+ * Read flash and make a list of CHAP entries, during login when a CHAP entry
+ * is received, it will be checked in this list. If entry exist then the CHAP
+ * entry index is set in the DDB. If CHAP entry does not exist in this list
+ * then a new entry is added in FLASH in CHAP table and the index obtained is
+ * used in the DDB.
+ **/
+static void qla4xxx_create_chap_list(struct scsi_qla_host *ha)
+{
+        int rval = 0;
+        uint8_t *chap_flash_data = NULL;
+        uint32_t offset;
+        dma_addr_t chap_dma;
+        uint32_t chap_size = 0;
+
+        if (is_qla40XX(ha))
+                chap_size = MAX_CHAP_ENTRIES_40XX *
+                            sizeof(struct ql4_chap_table);
+        else    /* Single region contains CHAP info for both
+                 * ports which is divided into half for each port.
+                 */
+                chap_size = ha->hw.flt_chap_size / 2;
+
+        chap_flash_data = dma_alloc_coherent(&ha->pdev->dev, chap_size,
+                                             &chap_dma, GFP_KERNEL);
+        if (!chap_flash_data) {
+                ql4_printk(KERN_ERR, ha, "No memory for chap_flash_data\n");
+                return;
+        }
+
+        if (is_qla40XX(ha)) {
+                offset = FLASH_CHAP_OFFSET;
+        } else {
+                offset = FLASH_RAW_ACCESS_ADDR + (ha->hw.flt_region_chap << 2);
+                if (ha->port_num == 1)
+                        offset += chap_size;
+        }
+
+        rval = qla4xxx_get_flash(ha, chap_dma, offset, chap_size);
+        if (rval != QLA_SUCCESS)
+                goto exit_chap_list;
+
+        if (ha->chap_list == NULL)
+                ha->chap_list = vmalloc(chap_size);
+        if (ha->chap_list == NULL) {
+                ql4_printk(KERN_ERR, ha, "No memory for ha->chap_list\n");
+                goto exit_chap_list;
+        }
+
+        memset(ha->chap_list, 0, chap_size);
+        memcpy(ha->chap_list, chap_flash_data, chap_size);
+
+exit_chap_list:
+        dma_free_coherent(&ha->pdev->dev, chap_size, chap_flash_data, chap_dma);
+}
+
 static int qla4xxx_get_chap_by_index(struct scsi_qla_host *ha,
                                      int16_t chap_index,
                                      struct ql4_chap_table **chap_entry)
@@ -624,6 +745,8 @@ static int qla4xxx_get_chap_list(struct Scsi_Host *shost, uint16_t chap_tbl_idx,
                 goto exit_get_chap_list;
         }
 
+        qla4xxx_create_chap_list(ha);
+
         chap_rec = (struct iscsi_chap_rec *) buf;
         mutex_lock(&ha->chap_sem);
         for (i = chap_tbl_idx; i < max_chap_entries; i++) {
@@ -802,6 +925,7 @@ static int qla4xxx_set_chap_entry(struct Scsi_Host *shost, void *data, int len)
         int type;
         int rem = len;
         int rc = 0;
+        int size;
 
         memset(&chap_rec, 0, sizeof(chap_rec));
 
@@ -816,12 +940,14 @@ static int qla4xxx_set_chap_entry(struct Scsi_Host *shost, void *data, int len)
                         chap_rec.chap_type = param_info->value[0];
                         break;
                 case ISCSI_CHAP_PARAM_USERNAME:
-                        memcpy(chap_rec.username, param_info->value,
-                               param_info->len);
+                        size = min_t(size_t, sizeof(chap_rec.username),
+                                     param_info->len);
+                        memcpy(chap_rec.username, param_info->value, size);
                         break;
                 case ISCSI_CHAP_PARAM_PASSWORD:
-                        memcpy(chap_rec.password, param_info->value,
-                               param_info->len);
+                        size = min_t(size_t, sizeof(chap_rec.password),
+                                     param_info->len);
+                        memcpy(chap_rec.password, param_info->value, size);
                         break;
                 case ISCSI_CHAP_PARAM_PASSWORD_LEN:
                         chap_rec.password_length = param_info->value[0];
@@ -888,113 +1014,646 @@ exit_set_chap:
         return rc;
 }
 
+
+static int qla4xxx_get_host_stats(struct Scsi_Host *shost, char *buf, int len)
+{
+        struct scsi_qla_host *ha = to_qla_host(shost);
+        struct iscsi_offload_host_stats *host_stats = NULL;
+        int host_stats_size;
+        int ret = 0;
+        int ddb_idx = 0;
+        struct ql_iscsi_stats *ql_iscsi_stats = NULL;
+        int stats_size;
+        dma_addr_t iscsi_stats_dma;
+
+        DEBUG2(ql4_printk(KERN_INFO, ha, "Func: %s\n", __func__));
+
+        host_stats_size = sizeof(struct iscsi_offload_host_stats);
+
+        if (host_stats_size != len) {
+                ql4_printk(KERN_INFO, ha, "%s: host_stats size mismatch expected = %d, is = %d\n",
+                           __func__, len, host_stats_size);
+                ret = -EINVAL;
+                goto exit_host_stats;
+        }
+        host_stats = (struct iscsi_offload_host_stats *)buf;
+
+        if (!buf) {
+                ret = -ENOMEM;
+                goto exit_host_stats;
+        }
+
+        stats_size = PAGE_ALIGN(sizeof(struct ql_iscsi_stats));
+
+        ql_iscsi_stats = dma_alloc_coherent(&ha->pdev->dev, stats_size,
+                                            &iscsi_stats_dma, GFP_KERNEL);
+        if (!ql_iscsi_stats) {
+                ql4_printk(KERN_ERR, ha,
+                           "Unable to allocate memory for iscsi stats\n");
+                goto exit_host_stats;
+        }
+
+        ret =  qla4xxx_get_mgmt_data(ha, ddb_idx, stats_size,
+                                     iscsi_stats_dma);
+        if (ret != QLA_SUCCESS) {
+                ql4_printk(KERN_ERR, ha,
+                           "Unable to retrieve iscsi stats\n");
+                goto exit_host_stats;
+        }
+        host_stats->mactx_frames = le64_to_cpu(ql_iscsi_stats->mac_tx_frames);
+        host_stats->mactx_bytes = le64_to_cpu(ql_iscsi_stats->mac_tx_bytes);
+        host_stats->mactx_multicast_frames =
+                        le64_to_cpu(ql_iscsi_stats->mac_tx_multicast_frames);
+        host_stats->mactx_broadcast_frames =
+                        le64_to_cpu(ql_iscsi_stats->mac_tx_broadcast_frames);
+        host_stats->mactx_pause_frames =
+                        le64_to_cpu(ql_iscsi_stats->mac_tx_pause_frames);
+        host_stats->mactx_control_frames =
+                        le64_to_cpu(ql_iscsi_stats->mac_tx_control_frames);
+        host_stats->mactx_deferral =
+                        le64_to_cpu(ql_iscsi_stats->mac_tx_deferral);
+        host_stats->mactx_excess_deferral =
+                        le64_to_cpu(ql_iscsi_stats->mac_tx_excess_deferral);
+        host_stats->mactx_late_collision =
+                        le64_to_cpu(ql_iscsi_stats->mac_tx_late_collision);
+        host_stats->mactx_abort = le64_to_cpu(ql_iscsi_stats->mac_tx_abort);
+        host_stats->mactx_single_collision =
+                        le64_to_cpu(ql_iscsi_stats->mac_tx_single_collision);
+        host_stats->mactx_multiple_collision =
+                        le64_to_cpu(ql_iscsi_stats->mac_tx_multiple_collision);
+        host_stats->mactx_collision =
+                        le64_to_cpu(ql_iscsi_stats->mac_tx_collision);
+        host_stats->mactx_frames_dropped =
+                        le64_to_cpu(ql_iscsi_stats->mac_tx_frames_dropped);
+        host_stats->mactx_jumbo_frames =
+                        le64_to_cpu(ql_iscsi_stats->mac_tx_jumbo_frames);
+        host_stats->macrx_frames = le64_to_cpu(ql_iscsi_stats->mac_rx_frames);
+        host_stats->macrx_bytes = le64_to_cpu(ql_iscsi_stats->mac_rx_bytes);
+        host_stats->macrx_unknown_control_frames =
+                le64_to_cpu(ql_iscsi_stats->mac_rx_unknown_control_frames);
+        host_stats->macrx_pause_frames =
+                        le64_to_cpu(ql_iscsi_stats->mac_rx_pause_frames);
+        host_stats->macrx_control_frames =
+                        le64_to_cpu(ql_iscsi_stats->mac_rx_control_frames);
+        host_stats->macrx_dribble =
+                        le64_to_cpu(ql_iscsi_stats->mac_rx_dribble);
+        host_stats->macrx_frame_length_error =
+                        le64_to_cpu(ql_iscsi_stats->mac_rx_frame_length_error);
+        host_stats->macrx_jabber = le64_to_cpu(ql_iscsi_stats->mac_rx_jabber);
+        host_stats->macrx_carrier_sense_error =
+                le64_to_cpu(ql_iscsi_stats->mac_rx_carrier_sense_error);
+        host_stats->macrx_frame_discarded =
+                        le64_to_cpu(ql_iscsi_stats->mac_rx_frame_discarded);
+        host_stats->macrx_frames_dropped =
+                        le64_to_cpu(ql_iscsi_stats->mac_rx_frames_dropped);
+        host_stats->mac_crc_error = le64_to_cpu(ql_iscsi_stats->mac_crc_error);
+        host_stats->mac_encoding_error =
+                        le64_to_cpu(ql_iscsi_stats->mac_encoding_error);
+        host_stats->macrx_length_error_large =
+                        le64_to_cpu(ql_iscsi_stats->mac_rx_length_error_large);
+        host_stats->macrx_length_error_small =
+                        le64_to_cpu(ql_iscsi_stats->mac_rx_length_error_small);
+        host_stats->macrx_multicast_frames =
+                        le64_to_cpu(ql_iscsi_stats->mac_rx_multicast_frames);
+        host_stats->macrx_broadcast_frames =
+                        le64_to_cpu(ql_iscsi_stats->mac_rx_broadcast_frames);
+        host_stats->iptx_packets = le64_to_cpu(ql_iscsi_stats->ip_tx_packets);
+        host_stats->iptx_bytes = le64_to_cpu(ql_iscsi_stats->ip_tx_bytes);
+        host_stats->iptx_fragments =
+                        le64_to_cpu(ql_iscsi_stats->ip_tx_fragments);
+        host_stats->iprx_packets = le64_to_cpu(ql_iscsi_stats->ip_rx_packets);
+        host_stats->iprx_bytes = le64_to_cpu(ql_iscsi_stats->ip_rx_bytes);
+        host_stats->iprx_fragments =
+                        le64_to_cpu(ql_iscsi_stats->ip_rx_fragments);
+        host_stats->ip_datagram_reassembly =
+                        le64_to_cpu(ql_iscsi_stats->ip_datagram_reassembly);
+        host_stats->ip_invalid_address_error =
+                        le64_to_cpu(ql_iscsi_stats->ip_invalid_address_error);
+        host_stats->ip_error_packets =
+                        le64_to_cpu(ql_iscsi_stats->ip_error_packets);
+        host_stats->ip_fragrx_overlap =
+                        le64_to_cpu(ql_iscsi_stats->ip_fragrx_overlap);
+        host_stats->ip_fragrx_outoforder =
+                        le64_to_cpu(ql_iscsi_stats->ip_fragrx_outoforder);
+        host_stats->ip_datagram_reassembly_timeout =
+                le64_to_cpu(ql_iscsi_stats->ip_datagram_reassembly_timeout);
+        host_stats->ipv6tx_packets =
+                        le64_to_cpu(ql_iscsi_stats->ipv6_tx_packets);
+        host_stats->ipv6tx_bytes = le64_to_cpu(ql_iscsi_stats->ipv6_tx_bytes);
+        host_stats->ipv6tx_fragments =
+                        le64_to_cpu(ql_iscsi_stats->ipv6_tx_fragments);
+        host_stats->ipv6rx_packets =
+                        le64_to_cpu(ql_iscsi_stats->ipv6_rx_packets);
+        host_stats->ipv6rx_bytes = le64_to_cpu(ql_iscsi_stats->ipv6_rx_bytes);
+        host_stats->ipv6rx_fragments =
+                        le64_to_cpu(ql_iscsi_stats->ipv6_rx_fragments);
+        host_stats->ipv6_datagram_reassembly =
+                        le64_to_cpu(ql_iscsi_stats->ipv6_datagram_reassembly);
+        host_stats->ipv6_invalid_address_error =
+                le64_to_cpu(ql_iscsi_stats->ipv6_invalid_address_error);
+        host_stats->ipv6_error_packets =
+                        le64_to_cpu(ql_iscsi_stats->ipv6_error_packets);
+        host_stats->ipv6_fragrx_overlap =
+                        le64_to_cpu(ql_iscsi_stats->ipv6_fragrx_overlap);
+        host_stats->ipv6_fragrx_outoforder =
+                        le64_to_cpu(ql_iscsi_stats->ipv6_fragrx_outoforder);
+        host_stats->ipv6_datagram_reassembly_timeout =
+                le64_to_cpu(ql_iscsi_stats->ipv6_datagram_reassembly_timeout);
+        host_stats->tcptx_segments =
+                        le64_to_cpu(ql_iscsi_stats->tcp_tx_segments);
+        host_stats->tcptx_bytes = le64_to_cpu(ql_iscsi_stats->tcp_tx_bytes);
+        host_stats->tcprx_segments =
+                        le64_to_cpu(ql_iscsi_stats->tcp_rx_segments);
+        host_stats->tcprx_byte = le64_to_cpu(ql_iscsi_stats->tcp_rx_byte);
+        host_stats->tcp_duplicate_ack_retx =
+                        le64_to_cpu(ql_iscsi_stats->tcp_duplicate_ack_retx);
+        host_stats->tcp_retx_timer_expired =
+                        le64_to_cpu(ql_iscsi_stats->tcp_retx_timer_expired);
+        host_stats->tcprx_duplicate_ack =
+                        le64_to_cpu(ql_iscsi_stats->tcp_rx_duplicate_ack);
+        host_stats->tcprx_pure_ackr =
+                        le64_to_cpu(ql_iscsi_stats->tcp_rx_pure_ackr);
+        host_stats->tcptx_delayed_ack =
+                        le64_to_cpu(ql_iscsi_stats->tcp_tx_delayed_ack);
+        host_stats->tcptx_pure_ack =
+                        le64_to_cpu(ql_iscsi_stats->tcp_tx_pure_ack);
+        host_stats->tcprx_segment_error =
+                        le64_to_cpu(ql_iscsi_stats->tcp_rx_segment_error);
+        host_stats->tcprx_segment_outoforder =
+                        le64_to_cpu(ql_iscsi_stats->tcp_rx_segment_outoforder);
+        host_stats->tcprx_window_probe =
+                        le64_to_cpu(ql_iscsi_stats->tcp_rx_window_probe);
+        host_stats->tcprx_window_update =
+                        le64_to_cpu(ql_iscsi_stats->tcp_rx_window_update);
+        host_stats->tcptx_window_probe_persist =
+                le64_to_cpu(ql_iscsi_stats->tcp_tx_window_probe_persist);
+        host_stats->ecc_error_correction =
+                        le64_to_cpu(ql_iscsi_stats->ecc_error_correction);
+        host_stats->iscsi_pdu_tx = le64_to_cpu(ql_iscsi_stats->iscsi_pdu_tx);
+        host_stats->iscsi_data_bytes_tx =
+                        le64_to_cpu(ql_iscsi_stats->iscsi_data_bytes_tx);
+        host_stats->iscsi_pdu_rx = le64_to_cpu(ql_iscsi_stats->iscsi_pdu_rx);
+        host_stats->iscsi_data_bytes_rx =
+                        le64_to_cpu(ql_iscsi_stats->iscsi_data_bytes_rx);
+        host_stats->iscsi_io_completed =
+                        le64_to_cpu(ql_iscsi_stats->iscsi_io_completed);
+        host_stats->iscsi_unexpected_io_rx =
+                        le64_to_cpu(ql_iscsi_stats->iscsi_unexpected_io_rx);
+        host_stats->iscsi_format_error =
+                        le64_to_cpu(ql_iscsi_stats->iscsi_format_error);
+        host_stats->iscsi_hdr_digest_error =
+                        le64_to_cpu(ql_iscsi_stats->iscsi_hdr_digest_error);
+        host_stats->iscsi_data_digest_error =
+                        le64_to_cpu(ql_iscsi_stats->iscsi_data_digest_error);
+        host_stats->iscsi_sequence_error =
+                        le64_to_cpu(ql_iscsi_stats->iscsi_sequence_error);
+exit_host_stats:
+        if (ql_iscsi_stats)
+                dma_free_coherent(&ha->pdev->dev, host_stats_size,
+                                  ql_iscsi_stats, iscsi_stats_dma);
+
+        ql4_printk(KERN_INFO, ha, "%s: Get host stats done\n",
+                   __func__);
+        return ret;
+}
+
 static int qla4xxx_get_iface_param(struct iscsi_iface *iface,
                                    enum iscsi_param_type param_type,
                                    int param, char *buf)
 {
         struct Scsi_Host *shost = iscsi_iface_to_shost(iface);
         struct scsi_qla_host *ha = to_qla_host(shost);
+        int ival;
+        char *pval = NULL;
         int len = -ENOSYS;
 
-        if (param_type != ISCSI_NET_PARAM)
-                return -ENOSYS;
+        if (param_type == ISCSI_NET_PARAM) {
+                switch (param) {
+                case ISCSI_NET_PARAM_IPV4_ADDR:
+                        len = sprintf(buf, "%pI4\n", &ha->ip_config.ip_address);
+                        break;
+                case ISCSI_NET_PARAM_IPV4_SUBNET:
+                        len = sprintf(buf, "%pI4\n",
+                                      &ha->ip_config.subnet_mask);
+                        break;
+                case ISCSI_NET_PARAM_IPV4_GW:
+                        len = sprintf(buf, "%pI4\n", &ha->ip_config.gateway);
+                        break;
+                case ISCSI_NET_PARAM_IFACE_ENABLE:
+                        if (iface->iface_type == ISCSI_IFACE_TYPE_IPV4) {
+                                OP_STATE(ha->ip_config.ipv4_options,
+                                         IPOPT_IPV4_PROTOCOL_ENABLE, pval);
+                        } else {
+                                OP_STATE(ha->ip_config.ipv6_options,
+                                         IPV6_OPT_IPV6_PROTOCOL_ENABLE, pval);
+                        }
 
-        switch (param) {
-        case ISCSI_NET_PARAM_IPV4_ADDR:
-                len = sprintf(buf, "%pI4\n", &ha->ip_config.ip_address);
-                break;
-        case ISCSI_NET_PARAM_IPV4_SUBNET:
-                len = sprintf(buf, "%pI4\n", &ha->ip_config.subnet_mask);
-                break;
-        case ISCSI_NET_PARAM_IPV4_GW:
-                len = sprintf(buf, "%pI4\n", &ha->ip_config.gateway);
-                break;
-        case ISCSI_NET_PARAM_IFACE_ENABLE:
-                if (iface->iface_type == ISCSI_IFACE_TYPE_IPV4)
-                        len = sprintf(buf, "%s\n",
-                                      (ha->ip_config.ipv4_options &
-                                       IPOPT_IPV4_PROTOCOL_ENABLE) ?
-                                      "enabled" : "disabled");
-                else if (iface->iface_type == ISCSI_IFACE_TYPE_IPV6)
+                        len = sprintf(buf, "%s\n", pval);
+                        break;
+                case ISCSI_NET_PARAM_IPV4_BOOTPROTO:
                         len = sprintf(buf, "%s\n",
-                                      (ha->ip_config.ipv6_options &
-                                       IPV6_OPT_IPV6_PROTOCOL_ENABLE) ?
-                                       "enabled" : "disabled");
-                break;
-        case ISCSI_NET_PARAM_IPV4_BOOTPROTO:
-                len = sprintf(buf, "%s\n",
-                              (ha->ip_config.tcp_options & TCPOPT_DHCP_ENABLE) ?
-                              "dhcp" : "static");
-                break;
-        case ISCSI_NET_PARAM_IPV6_ADDR:
-                if (iface->iface_num == 0)
-                        len = sprintf(buf, "%pI6\n", &ha->ip_config.ipv6_addr0);
-                if (iface->iface_num == 1)
-                        len = sprintf(buf, "%pI6\n", &ha->ip_config.ipv6_addr1);
-                break;
-        case ISCSI_NET_PARAM_IPV6_LINKLOCAL:
-                len = sprintf(buf, "%pI6\n",
-                              &ha->ip_config.ipv6_link_local_addr);
-                break;
-        case ISCSI_NET_PARAM_IPV6_ROUTER:
-                len = sprintf(buf, "%pI6\n",
-                              &ha->ip_config.ipv6_default_router_addr);
-                break;
-        case ISCSI_NET_PARAM_IPV6_ADDR_AUTOCFG:
-                len = sprintf(buf, "%s\n",
-                              (ha->ip_config.ipv6_addl_options &
-                               IPV6_ADDOPT_NEIGHBOR_DISCOVERY_ADDR_ENABLE) ?
-                               "nd" : "static");
-                break;
-        case ISCSI_NET_PARAM_IPV6_LINKLOCAL_AUTOCFG:
-                len = sprintf(buf, "%s\n",
-                              (ha->ip_config.ipv6_addl_options &
-                               IPV6_ADDOPT_AUTOCONFIG_LINK_LOCAL_ADDR) ?
-                               "auto" : "static");
-                break;
-        case ISCSI_NET_PARAM_VLAN_ID:
-                if (iface->iface_type == ISCSI_IFACE_TYPE_IPV4)
+                                      (ha->ip_config.tcp_options &
+                                       TCPOPT_DHCP_ENABLE) ?
+                                      "dhcp" : "static");
+                        break;
+                case ISCSI_NET_PARAM_IPV6_ADDR:
+                        if (iface->iface_num == 0)
+                                len = sprintf(buf, "%pI6\n",
+                                              &ha->ip_config.ipv6_addr0);
+                        if (iface->iface_num == 1)
+                                len = sprintf(buf, "%pI6\n",
+                                              &ha->ip_config.ipv6_addr1);
+                        break;
+                case ISCSI_NET_PARAM_IPV6_LINKLOCAL:
+                        len = sprintf(buf, "%pI6\n",
+                                      &ha->ip_config.ipv6_link_local_addr);
+                        break;
+                case ISCSI_NET_PARAM_IPV6_ROUTER:
+                        len = sprintf(buf, "%pI6\n",
+                                      &ha->ip_config.ipv6_default_router_addr);
+                        break;
+                case ISCSI_NET_PARAM_IPV6_ADDR_AUTOCFG:
+                        pval = (ha->ip_config.ipv6_addl_options &
+                                IPV6_ADDOPT_NEIGHBOR_DISCOVERY_ADDR_ENABLE) ?
+                                "nd" : "static";
+
+                        len = sprintf(buf, "%s\n", pval);
+                        break;
+                case ISCSI_NET_PARAM_IPV6_LINKLOCAL_AUTOCFG:
+                        pval = (ha->ip_config.ipv6_addl_options &
+                                IPV6_ADDOPT_AUTOCONFIG_LINK_LOCAL_ADDR) ?
+                                "auto" : "static";
+
+                        len = sprintf(buf, "%s\n", pval);
+                        break;
+                case ISCSI_NET_PARAM_VLAN_ID:
+                        if (iface->iface_type == ISCSI_IFACE_TYPE_IPV4)
+                                ival = ha->ip_config.ipv4_vlan_tag &
+                                       ISCSI_MAX_VLAN_ID;
+                        else
+                                ival = ha->ip_config.ipv6_vlan_tag &
+                                       ISCSI_MAX_VLAN_ID;
+
+                        len = sprintf(buf, "%d\n", ival);
+                        break;
+                case ISCSI_NET_PARAM_VLAN_PRIORITY:
+                        if (iface->iface_type == ISCSI_IFACE_TYPE_IPV4)
+                                ival = (ha->ip_config.ipv4_vlan_tag >> 13) &
+                                       ISCSI_MAX_VLAN_PRIORITY;
+                        else
+                                ival = (ha->ip_config.ipv6_vlan_tag >> 13) &
+                                       ISCSI_MAX_VLAN_PRIORITY;
+
+                        len = sprintf(buf, "%d\n", ival);
+                        break;
+                case ISCSI_NET_PARAM_VLAN_ENABLED:
+                        if (iface->iface_type == ISCSI_IFACE_TYPE_IPV4) {
+                                OP_STATE(ha->ip_config.ipv4_options,
+                                         IPOPT_VLAN_TAGGING_ENABLE, pval);
+                        } else {
+                                OP_STATE(ha->ip_config.ipv6_options,
+                                         IPV6_OPT_VLAN_TAGGING_ENABLE, pval);
+                        }
+                        len = sprintf(buf, "%s\n", pval);
+                        break;
+                case ISCSI_NET_PARAM_MTU:
+                        len = sprintf(buf, "%d\n", ha->ip_config.eth_mtu_size);
+                        break;
+                case ISCSI_NET_PARAM_PORT:
+                        if (iface->iface_type == ISCSI_IFACE_TYPE_IPV4)
+                                len = sprintf(buf, "%d\n",
+                                              ha->ip_config.ipv4_port);
+                        else
+                                len = sprintf(buf, "%d\n",
+                                              ha->ip_config.ipv6_port);
+                        break;
+                case ISCSI_NET_PARAM_IPADDR_STATE:
+                        if (iface->iface_type == ISCSI_IFACE_TYPE_IPV4) {
+                                pval = iscsi_get_ipaddress_state_name(
+                                                ha->ip_config.ipv4_addr_state);
+                        } else {
+                                if (iface->iface_num == 0)
+                                        pval = iscsi_get_ipaddress_state_name(
+                                                ha->ip_config.ipv6_addr0_state);
+                                else if (iface->iface_num == 1)
+                                        pval = iscsi_get_ipaddress_state_name(
+                                                ha->ip_config.ipv6_addr1_state);
+                        }
+
+                        len = sprintf(buf, "%s\n", pval);
+                        break;
+                case ISCSI_NET_PARAM_IPV6_LINKLOCAL_STATE:
+                        pval = iscsi_get_ipaddress_state_name(
+                                        ha->ip_config.ipv6_link_local_state);
+                        len = sprintf(buf, "%s\n", pval);
+                        break;
+                case ISCSI_NET_PARAM_IPV6_ROUTER_STATE:
+                        pval = iscsi_get_router_state_name(
+                                      ha->ip_config.ipv6_default_router_state);
+                        len = sprintf(buf, "%s\n", pval);
+                        break;
+                case ISCSI_NET_PARAM_DELAYED_ACK_EN:
+                        if (iface->iface_type == ISCSI_IFACE_TYPE_IPV4) {
+                                OP_STATE(~ha->ip_config.tcp_options,
+                                         TCPOPT_DELAYED_ACK_DISABLE, pval);
+                        } else {
+                                OP_STATE(~ha->ip_config.ipv6_tcp_options,
+                                         IPV6_TCPOPT_DELAYED_ACK_DISABLE, pval);
+                        }
+                        len = sprintf(buf, "%s\n", pval);
+                        break;
+                case ISCSI_NET_PARAM_TCP_NAGLE_DISABLE:
+                        if (iface->iface_type == ISCSI_IFACE_TYPE_IPV4) {
+                                OP_STATE(~ha->ip_config.tcp_options,
+                                         TCPOPT_NAGLE_ALGO_DISABLE, pval);
+                        } else {
+                                OP_STATE(~ha->ip_config.ipv6_tcp_options,
+                                         IPV6_TCPOPT_NAGLE_ALGO_DISABLE, pval);
+                        }
+                        len = sprintf(buf, "%s\n", pval);
+                        break;
+                case ISCSI_NET_PARAM_TCP_WSF_DISABLE:
+                        if (iface->iface_type == ISCSI_IFACE_TYPE_IPV4) {
+                                OP_STATE(~ha->ip_config.tcp_options,
+                                         TCPOPT_WINDOW_SCALE_DISABLE, pval);
+                        } else {
+                                OP_STATE(~ha->ip_config.ipv6_tcp_options,
+                                         IPV6_TCPOPT_WINDOW_SCALE_DISABLE,
+                                         pval);
+                        }
+                        len = sprintf(buf, "%s\n", pval);
+                        break;
+                case ISCSI_NET_PARAM_TCP_WSF:
+                        if (iface->iface_type == ISCSI_IFACE_TYPE_IPV4)
+                                len = sprintf(buf, "%d\n",
+                                              ha->ip_config.tcp_wsf);
+                        else
+                                len = sprintf(buf, "%d\n",
+                                              ha->ip_config.ipv6_tcp_wsf);
+                        break;
+                case ISCSI_NET_PARAM_TCP_TIMER_SCALE:
+                        if (iface->iface_type == ISCSI_IFACE_TYPE_IPV4)
+                                ival = (ha->ip_config.tcp_options &
+                                        TCPOPT_TIMER_SCALE) >> 1;
+                        else
+                                ival = (ha->ip_config.ipv6_tcp_options &
+                                        IPV6_TCPOPT_TIMER_SCALE) >> 1;
+
+                        len = sprintf(buf, "%d\n", ival);
+                        break;
+                case ISCSI_NET_PARAM_TCP_TIMESTAMP_EN:
+                        if (iface->iface_type == ISCSI_IFACE_TYPE_IPV4) {
+                                OP_STATE(ha->ip_config.tcp_options,
+                                         TCPOPT_TIMESTAMP_ENABLE, pval);
+                        } else {
+                                OP_STATE(ha->ip_config.ipv6_tcp_options,
+                                         IPV6_TCPOPT_TIMESTAMP_EN, pval);
+                        }
+                        len = sprintf(buf, "%s\n", pval);
+                        break;
+                case ISCSI_NET_PARAM_CACHE_ID:
+                        if (iface->iface_type == ISCSI_IFACE_TYPE_IPV4)
+                                len = sprintf(buf, "%d\n",
+                                              ha->ip_config.ipv4_cache_id);
+                        else
+                                len = sprintf(buf, "%d\n",
+                                              ha->ip_config.ipv6_cache_id);
+                        break;
+                case ISCSI_NET_PARAM_IPV4_DHCP_DNS_ADDR_EN:
+                        OP_STATE(ha->ip_config.tcp_options,
+                                 TCPOPT_DNS_SERVER_IP_EN, pval);
+
+                        len = sprintf(buf, "%s\n", pval);
+                        break;
+                case ISCSI_NET_PARAM_IPV4_DHCP_SLP_DA_EN:
+                        OP_STATE(ha->ip_config.tcp_options,
+                                 TCPOPT_SLP_DA_INFO_EN, pval);
+
+                        len = sprintf(buf, "%s\n", pval);
+                        break;
+                case ISCSI_NET_PARAM_IPV4_TOS_EN:
+                        OP_STATE(ha->ip_config.ipv4_options,
+                                 IPOPT_IPV4_TOS_EN, pval);
+
+                        len = sprintf(buf, "%s\n", pval);
+                        break;
+                case ISCSI_NET_PARAM_IPV4_TOS:
+                        len = sprintf(buf, "%d\n", ha->ip_config.ipv4_tos);
+                        break;
+                case ISCSI_NET_PARAM_IPV4_GRAT_ARP_EN:
+                        OP_STATE(ha->ip_config.ipv4_options,
+                                 IPOPT_GRAT_ARP_EN, pval);
+
+                        len = sprintf(buf, "%s\n", pval);
+                        break;
+                case ISCSI_NET_PARAM_IPV4_DHCP_ALT_CLIENT_ID_EN:
+                        OP_STATE(ha->ip_config.ipv4_options, IPOPT_ALT_CID_EN,
+                                 pval);
+
+                        len = sprintf(buf, "%s\n", pval);
+                        break;
+                case ISCSI_NET_PARAM_IPV4_DHCP_ALT_CLIENT_ID:
+                        pval = (ha->ip_config.ipv4_alt_cid_len) ?
+                               (char *)ha->ip_config.ipv4_alt_cid : "";
+
+                        len = sprintf(buf, "%s\n", pval);
+                        break;
+                case ISCSI_NET_PARAM_IPV4_DHCP_REQ_VENDOR_ID_EN:
+                        OP_STATE(ha->ip_config.ipv4_options,
+                                 IPOPT_REQ_VID_EN, pval);
+
+                        len = sprintf(buf, "%s\n", pval);
+                        break;
+                case ISCSI_NET_PARAM_IPV4_DHCP_USE_VENDOR_ID_EN:
+                        OP_STATE(ha->ip_config.ipv4_options,
+                                 IPOPT_USE_VID_EN, pval);
+
+                        len = sprintf(buf, "%s\n", pval);
+                        break;
+                case ISCSI_NET_PARAM_IPV4_DHCP_VENDOR_ID:
+                        pval = (ha->ip_config.ipv4_vid_len) ?
+                               (char *)ha->ip_config.ipv4_vid : "";
+
+                        len = sprintf(buf, "%s\n", pval);
+                        break;
+                case ISCSI_NET_PARAM_IPV4_DHCP_LEARN_IQN_EN:
+                        OP_STATE(ha->ip_config.ipv4_options,
+                                 IPOPT_LEARN_IQN_EN, pval);
+
+                        len = sprintf(buf, "%s\n", pval);
+                        break;
+                case ISCSI_NET_PARAM_IPV4_FRAGMENT_DISABLE:
+                        OP_STATE(~ha->ip_config.ipv4_options,
+                                 IPOPT_FRAGMENTATION_DISABLE, pval);
+
+                        len = sprintf(buf, "%s\n", pval);
+                        break;
+                case ISCSI_NET_PARAM_IPV4_IN_FORWARD_EN:
+                        OP_STATE(ha->ip_config.ipv4_options,
+                                 IPOPT_IN_FORWARD_EN, pval);
+
+                        len = sprintf(buf, "%s\n", pval);
+                        break;
+                case ISCSI_NET_PARAM_REDIRECT_EN:
+                        if (iface->iface_type == ISCSI_IFACE_TYPE_IPV4) {
+                                OP_STATE(ha->ip_config.ipv4_options,
+                                         IPOPT_ARP_REDIRECT_EN, pval);
+                        } else {
+                                OP_STATE(ha->ip_config.ipv6_options,
+                                         IPV6_OPT_REDIRECT_EN, pval);
+                        }
+                        len = sprintf(buf, "%s\n", pval);
+                        break;
+                case ISCSI_NET_PARAM_IPV4_TTL:
+                        len = sprintf(buf, "%d\n", ha->ip_config.ipv4_ttl);
+                        break;
+                case ISCSI_NET_PARAM_IPV6_GRAT_NEIGHBOR_ADV_EN:
+                        OP_STATE(ha->ip_config.ipv6_options,
+                                 IPV6_OPT_GRAT_NEIGHBOR_ADV_EN, pval);
+
+                        len = sprintf(buf, "%s\n", pval);
+                        break;
+                case ISCSI_NET_PARAM_IPV6_MLD_EN:
+                        OP_STATE(ha->ip_config.ipv6_addl_options,
+                                 IPV6_ADDOPT_MLD_EN, pval);
+
+                        len = sprintf(buf, "%s\n", pval);
+                        break;
+                case ISCSI_NET_PARAM_IPV6_FLOW_LABEL:
+                        len = sprintf(buf, "%u\n", ha->ip_config.ipv6_flow_lbl);
+                        break;
+                case ISCSI_NET_PARAM_IPV6_TRAFFIC_CLASS:
                         len = sprintf(buf, "%d\n",
-                                      (ha->ip_config.ipv4_vlan_tag &
-                                       ISCSI_MAX_VLAN_ID));
-                else if (iface->iface_type == ISCSI_IFACE_TYPE_IPV6)
+                                      ha->ip_config.ipv6_traffic_class);
+                        break;
+                case ISCSI_NET_PARAM_IPV6_HOP_LIMIT:
                         len = sprintf(buf, "%d\n",
-                                      (ha->ip_config.ipv6_vlan_tag &
-                                       ISCSI_MAX_VLAN_ID));
-                break;
-        case ISCSI_NET_PARAM_VLAN_PRIORITY:
-                if (iface->iface_type == ISCSI_IFACE_TYPE_IPV4)
+                                      ha->ip_config.ipv6_hop_limit);
+                        break;
+                case ISCSI_NET_PARAM_IPV6_ND_REACHABLE_TMO:
                         len = sprintf(buf, "%d\n",
-                                      ((ha->ip_config.ipv4_vlan_tag >> 13) &
-                                        ISCSI_MAX_VLAN_PRIORITY));
-                else if (iface->iface_type == ISCSI_IFACE_TYPE_IPV6)
+                                      ha->ip_config.ipv6_nd_reach_time);
+                        break;
+                case ISCSI_NET_PARAM_IPV6_ND_REXMIT_TIME:
                         len = sprintf(buf, "%d\n",
-                                      ((ha->ip_config.ipv6_vlan_tag >> 13) &
-                                        ISCSI_MAX_VLAN_PRIORITY));
-                break;
-        case ISCSI_NET_PARAM_VLAN_ENABLED:
-                if (iface->iface_type == ISCSI_IFACE_TYPE_IPV4)
-                        len = sprintf(buf, "%s\n",
-                                      (ha->ip_config.ipv4_options &
-                                       IPOPT_VLAN_TAGGING_ENABLE) ?
-                                       "enabled" : "disabled");
-                else if (iface->iface_type == ISCSI_IFACE_TYPE_IPV6)
-                        len = sprintf(buf, "%s\n",
-                                      (ha->ip_config.ipv6_options &
-                                       IPV6_OPT_VLAN_TAGGING_ENABLE) ?
-                                       "enabled" : "disabled");
-                break;
-        case ISCSI_NET_PARAM_MTU:
-                len = sprintf(buf, "%d\n", ha->ip_config.eth_mtu_size);
-                break;
-        case ISCSI_NET_PARAM_PORT:
-                if (iface->iface_type == ISCSI_IFACE_TYPE_IPV4)
-                        len = sprintf(buf, "%d\n", ha->ip_config.ipv4_port);
-                else if (iface->iface_type == ISCSI_IFACE_TYPE_IPV6)
-                        len = sprintf(buf, "%d\n", ha->ip_config.ipv6_port);
-                break;
-        default:
-                len = -ENOSYS;
+                                      ha->ip_config.ipv6_nd_rexmit_timer);
+                        break;
+                case ISCSI_NET_PARAM_IPV6_ND_STALE_TMO:
+                        len = sprintf(buf, "%d\n",
+                                      ha->ip_config.ipv6_nd_stale_timeout);
+                        break;
+                case ISCSI_NET_PARAM_IPV6_DUP_ADDR_DETECT_CNT:
+                        len = sprintf(buf, "%d\n",
+                                      ha->ip_config.ipv6_dup_addr_detect_count);
+                        break;
+                case ISCSI_NET_PARAM_IPV6_RTR_ADV_LINK_MTU:
+                        len = sprintf(buf, "%d\n",
+                                      ha->ip_config.ipv6_gw_advrt_mtu);
+                        break;
+                default:
+                        len = -ENOSYS;
+                }
+        } else if (param_type == ISCSI_IFACE_PARAM) {
+                switch (param) {
+                case ISCSI_IFACE_PARAM_DEF_TASKMGMT_TMO:
+                        len = sprintf(buf, "%d\n", ha->ip_config.def_timeout);
+                        break;
+                case ISCSI_IFACE_PARAM_HDRDGST_EN:
+                        OP_STATE(ha->ip_config.iscsi_options,
+                                 ISCSIOPTS_HEADER_DIGEST_EN, pval);
+
+                        len = sprintf(buf, "%s\n", pval);
+                        break;
+                case ISCSI_IFACE_PARAM_DATADGST_EN:
+                        OP_STATE(ha->ip_config.iscsi_options,
+                                 ISCSIOPTS_DATA_DIGEST_EN, pval);
+
+                        len = sprintf(buf, "%s\n", pval);
+                        break;
+                case ISCSI_IFACE_PARAM_IMM_DATA_EN:
+                        OP_STATE(ha->ip_config.iscsi_options,
+                                 ISCSIOPTS_IMMEDIATE_DATA_EN, pval);
+
+                        len = sprintf(buf, "%s\n", pval);
+                        break;
+                case ISCSI_IFACE_PARAM_INITIAL_R2T_EN:
+                        OP_STATE(ha->ip_config.iscsi_options,
+                                 ISCSIOPTS_INITIAL_R2T_EN, pval);
+
+                        len = sprintf(buf, "%s\n", pval);
+                        break;
+                case ISCSI_IFACE_PARAM_DATASEQ_INORDER_EN:
+                        OP_STATE(ha->ip_config.iscsi_options,
+                                 ISCSIOPTS_DATA_SEQ_INORDER_EN, pval);
+
+                        len = sprintf(buf, "%s\n", pval);
+                        break;
+                case ISCSI_IFACE_PARAM_PDU_INORDER_EN:
+                        OP_STATE(ha->ip_config.iscsi_options,
+                                 ISCSIOPTS_DATA_PDU_INORDER_EN, pval);
+
+                        len = sprintf(buf, "%s\n", pval);
+                        break;
+                case ISCSI_IFACE_PARAM_ERL:
+                        len = sprintf(buf, "%d\n",
+                                      (ha->ip_config.iscsi_options &
+                                       ISCSIOPTS_ERL));
+                        break;
+                case ISCSI_IFACE_PARAM_MAX_RECV_DLENGTH:
+                        len = sprintf(buf, "%u\n",
+                                      ha->ip_config.iscsi_max_pdu_size *
+                                      BYTE_UNITS);
+                        break;
+                case ISCSI_IFACE_PARAM_FIRST_BURST:
+                        len = sprintf(buf, "%u\n",
+                                      ha->ip_config.iscsi_first_burst_len *
+                                      BYTE_UNITS);
+                        break;
+                case ISCSI_IFACE_PARAM_MAX_R2T:
+                        len = sprintf(buf, "%d\n",
+                                      ha->ip_config.iscsi_max_outstnd_r2t);
+                        break;
+                case ISCSI_IFACE_PARAM_MAX_BURST:
+                        len = sprintf(buf, "%u\n",
+                                      ha->ip_config.iscsi_max_burst_len *
+                                      BYTE_UNITS);
+                        break;
+                case ISCSI_IFACE_PARAM_CHAP_AUTH_EN:
+                        OP_STATE(ha->ip_config.iscsi_options,
+                                 ISCSIOPTS_CHAP_AUTH_EN, pval);
+
+                        len = sprintf(buf, "%s\n", pval);
+                        break;
+                case ISCSI_IFACE_PARAM_BIDI_CHAP_EN:
+                        OP_STATE(ha->ip_config.iscsi_options,
+                                 ISCSIOPTS_BIDI_CHAP_EN, pval);
+
+                        len = sprintf(buf, "%s\n", pval);
+                        break;
+                case ISCSI_IFACE_PARAM_DISCOVERY_AUTH_OPTIONAL:
+                        OP_STATE(ha->ip_config.iscsi_options,
+                                 ISCSIOPTS_DISCOVERY_AUTH_EN, pval);
+
+                        len = sprintf(buf, "%s\n", pval);
+                        break;
+                case ISCSI_IFACE_PARAM_DISCOVERY_LOGOUT_EN:
+                        OP_STATE(ha->ip_config.iscsi_options,
+                                 ISCSIOPTS_DISCOVERY_LOGOUT_EN, pval);
+
+                        len = sprintf(buf, "%s\n", pval);
+                        break;
+                case ISCSI_IFACE_PARAM_STRICT_LOGIN_COMP_EN:
+                        OP_STATE(ha->ip_config.iscsi_options,
+                                 ISCSIOPTS_STRICT_LOGIN_COMP_EN, pval);
+
+                        len = sprintf(buf, "%s\n", pval);
+                        break;
+                case ISCSI_IFACE_PARAM_INITIATOR_NAME:
+                        len = sprintf(buf, "%s\n", ha->ip_config.iscsi_name);
+                        break;
+                default:
+                        len = -ENOSYS;
+                }
         }
 
         return len;
@@ -1366,8 +2025,8 @@ static void qla4xxx_set_ipv6(struct scsi_qla_host *ha,
                                 cpu_to_le16(
                                   IPV6_ADDOPT_NEIGHBOR_DISCOVERY_ADDR_ENABLE);
                 else
-                        ql4_printk(KERN_ERR, ha, "Invalid autocfg setting for "
-                                   "IPv6 addr\n");
+                        ql4_printk(KERN_ERR, ha,
+                                   "Invalid autocfg setting for IPv6 addr\n");
                 break;
         case ISCSI_NET_PARAM_IPV6_LINKLOCAL_AUTOCFG:
                 /* Autocfg applies to even interface */
@@ -1383,8 +2042,8 @@ static void qla4xxx_set_ipv6(struct scsi_qla_host *ha,
                         init_fw_cb->ipv6_addtl_opts &= cpu_to_le16(
                                        ~IPV6_ADDOPT_AUTOCONFIG_LINK_LOCAL_ADDR);
                 else
-                        ql4_printk(KERN_ERR, ha, "Invalid autocfg setting for "
-                                   "IPv6 linklocal addr\n");
+                        ql4_printk(KERN_ERR, ha,
+                                   "Invalid autocfg setting for IPv6 linklocal addr\n");
                 break;
         case ISCSI_NET_PARAM_IPV6_ROUTER_AUTOCFG:
                 /* Autocfg applies to even interface */
@@ -1433,6 +2092,135 @@ static void qla4xxx_set_ipv6(struct scsi_qla_host *ha,
                 init_fw_cb->ipv6_port =
                                 cpu_to_le16(*(uint16_t *)iface_param->value);
                 break;
+        case ISCSI_NET_PARAM_DELAYED_ACK_EN:
+                if (iface_param->iface_num & 0x1)
+                        break;
+                if (iface_param->value[0] == ISCSI_NET_PARAM_DISABLE)
+                        init_fw_cb->ipv6_tcp_opts |=
+                                cpu_to_le16(IPV6_TCPOPT_DELAYED_ACK_DISABLE);
+                else
+                        init_fw_cb->ipv6_tcp_opts &=
+                                cpu_to_le16(~IPV6_TCPOPT_DELAYED_ACK_DISABLE);
+                break;
+        case ISCSI_NET_PARAM_TCP_NAGLE_DISABLE:
+                if (iface_param->iface_num & 0x1)
+                        break;
+                if (iface_param->value[0] == ISCSI_NET_PARAM_DISABLE)
+                        init_fw_cb->ipv6_tcp_opts |=
+                                cpu_to_le16(IPV6_TCPOPT_NAGLE_ALGO_DISABLE);
+                else
+                        init_fw_cb->ipv6_tcp_opts &=
+                                cpu_to_le16(~IPV6_TCPOPT_NAGLE_ALGO_DISABLE);
+                break;
+        case ISCSI_NET_PARAM_TCP_WSF_DISABLE:
+                if (iface_param->iface_num & 0x1)
+                        break;
+                if (iface_param->value[0] == ISCSI_NET_PARAM_DISABLE)
+                        init_fw_cb->ipv6_tcp_opts |=
+                                cpu_to_le16(IPV6_TCPOPT_WINDOW_SCALE_DISABLE);
+                else
+                        init_fw_cb->ipv6_tcp_opts &=
+                                cpu_to_le16(~IPV6_TCPOPT_WINDOW_SCALE_DISABLE);
+                break;
+        case ISCSI_NET_PARAM_TCP_WSF:
+                if (iface_param->iface_num & 0x1)
+                        break;
+                init_fw_cb->ipv6_tcp_wsf = iface_param->value[0];
+                break;
+        case ISCSI_NET_PARAM_TCP_TIMER_SCALE:
+                if (iface_param->iface_num & 0x1)
+                        break;
+                init_fw_cb->ipv6_tcp_opts &=
+                                        cpu_to_le16(~IPV6_TCPOPT_TIMER_SCALE);
+                init_fw_cb->ipv6_tcp_opts |=
+                                cpu_to_le16((iface_param->value[0] << 1) &
+                                            IPV6_TCPOPT_TIMER_SCALE);
+                break;
+        case ISCSI_NET_PARAM_TCP_TIMESTAMP_EN:
+                if (iface_param->iface_num & 0x1)
+                        break;
+                if (iface_param->value[0] == ISCSI_NET_PARAM_ENABLE)
+                        init_fw_cb->ipv6_tcp_opts |=
+                                cpu_to_le16(IPV6_TCPOPT_TIMESTAMP_EN);
+                else
+                        init_fw_cb->ipv6_tcp_opts &=
+                                cpu_to_le16(~IPV6_TCPOPT_TIMESTAMP_EN);
+                break;
+        case ISCSI_NET_PARAM_IPV6_GRAT_NEIGHBOR_ADV_EN:
+                if (iface_param->iface_num & 0x1)
+                        break;
+                if (iface_param->value[0] == ISCSI_NET_PARAM_ENABLE)
+                        init_fw_cb->ipv6_opts |=
+                                cpu_to_le16(IPV6_OPT_GRAT_NEIGHBOR_ADV_EN);
+                else
+                        init_fw_cb->ipv6_opts &=
+                                cpu_to_le16(~IPV6_OPT_GRAT_NEIGHBOR_ADV_EN);
+                break;
+        case ISCSI_NET_PARAM_REDIRECT_EN:
+                if (iface_param->iface_num & 0x1)
+                        break;
+                if (iface_param->value[0] == ISCSI_NET_PARAM_ENABLE)
+                        init_fw_cb->ipv6_opts |=
+                                cpu_to_le16(IPV6_OPT_REDIRECT_EN);
+                else
+                        init_fw_cb->ipv6_opts &=
+                                cpu_to_le16(~IPV6_OPT_REDIRECT_EN);
+                break;
+        case ISCSI_NET_PARAM_IPV6_MLD_EN:
+                if (iface_param->iface_num & 0x1)
+                        break;
+                if (iface_param->value[0] == ISCSI_NET_PARAM_ENABLE)
+                        init_fw_cb->ipv6_addtl_opts |=
+                                cpu_to_le16(IPV6_ADDOPT_MLD_EN);
+                else
+                        init_fw_cb->ipv6_addtl_opts &=
+                                cpu_to_le16(~IPV6_ADDOPT_MLD_EN);
+                break;
+        case ISCSI_NET_PARAM_IPV6_FLOW_LABEL:
+                if (iface_param->iface_num & 0x1)
+                        break;
+                init_fw_cb->ipv6_flow_lbl =
+                                cpu_to_le16(*(uint16_t *)iface_param->value);
+                break;
+        case ISCSI_NET_PARAM_IPV6_TRAFFIC_CLASS:
+                if (iface_param->iface_num & 0x1)
+                        break;
+                init_fw_cb->ipv6_traffic_class = iface_param->value[0];
+                break;
+        case ISCSI_NET_PARAM_IPV6_HOP_LIMIT:
+                if (iface_param->iface_num & 0x1)
+                        break;
+                init_fw_cb->ipv6_hop_limit = iface_param->value[0];
+                break;
+        case ISCSI_NET_PARAM_IPV6_ND_REACHABLE_TMO:
+                if (iface_param->iface_num & 0x1)
+                        break;
+                init_fw_cb->ipv6_nd_reach_time =
+                                cpu_to_le32(*(uint32_t *)iface_param->value);
+                break;
+        case ISCSI_NET_PARAM_IPV6_ND_REXMIT_TIME:
+                if (iface_param->iface_num & 0x1)
+                        break;
+                init_fw_cb->ipv6_nd_rexmit_timer =
+                                cpu_to_le32(*(uint32_t *)iface_param->value);
+                break;
+        case ISCSI_NET_PARAM_IPV6_ND_STALE_TMO:
+                if (iface_param->iface_num & 0x1)
+                        break;
+                init_fw_cb->ipv6_nd_stale_timeout =
+                                cpu_to_le32(*(uint32_t *)iface_param->value);
+                break;
+        case ISCSI_NET_PARAM_IPV6_DUP_ADDR_DETECT_CNT:
+                if (iface_param->iface_num & 0x1)
+                        break;
+                init_fw_cb->ipv6_dup_addr_detect_count = iface_param->value[0];
+                break;
+        case ISCSI_NET_PARAM_IPV6_RTR_ADV_LINK_MTU:
+                if (iface_param->iface_num & 0x1)
+                        break;
+                init_fw_cb->ipv6_gw_advrt_mtu =
+                                cpu_to_le32(*(uint32_t *)iface_param->value);
+                break;
         default:
                 ql4_printk(KERN_ERR, ha, "Unknown IPv6 param = %d\n",
                            iface_param->param);
@@ -1501,6 +2289,195 @@ static void qla4xxx_set_ipv4(struct scsi_qla_host *ha,
                 init_fw_cb->ipv4_port =
                                 cpu_to_le16(*(uint16_t *)iface_param->value);
                 break;
+        case ISCSI_NET_PARAM_DELAYED_ACK_EN:
+                if (iface_param->iface_num & 0x1)
+                        break;
+                if (iface_param->value[0] == ISCSI_NET_PARAM_DISABLE)
+                        init_fw_cb->ipv4_tcp_opts |=
+                                cpu_to_le16(TCPOPT_DELAYED_ACK_DISABLE);
+                else
+                        init_fw_cb->ipv4_tcp_opts &=
+                                cpu_to_le16(~TCPOPT_DELAYED_ACK_DISABLE);
+                break;
+        case ISCSI_NET_PARAM_TCP_NAGLE_DISABLE:
+                if (iface_param->iface_num & 0x1)
+                        break;
+                if (iface_param->value[0] == ISCSI_NET_PARAM_DISABLE)
+                        init_fw_cb->ipv4_tcp_opts |=
+                                cpu_to_le16(TCPOPT_NAGLE_ALGO_DISABLE);
+                else
+                        init_fw_cb->ipv4_tcp_opts &=
+                                cpu_to_le16(~TCPOPT_NAGLE_ALGO_DISABLE);
+                break;
+        case ISCSI_NET_PARAM_TCP_WSF_DISABLE:
+                if (iface_param->iface_num & 0x1)
+                        break;
+                if (iface_param->value[0] == ISCSI_NET_PARAM_DISABLE)
+                        init_fw_cb->ipv4_tcp_opts |=
+                                cpu_to_le16(TCPOPT_WINDOW_SCALE_DISABLE);
+                else
+                        init_fw_cb->ipv4_tcp_opts &=
+                                cpu_to_le16(~TCPOPT_WINDOW_SCALE_DISABLE);
+                break;
+        case ISCSI_NET_PARAM_TCP_WSF:
+                if (iface_param->iface_num & 0x1)
+                        break;
+                init_fw_cb->ipv4_tcp_wsf = iface_param->value[0];
+                break;
+        case ISCSI_NET_PARAM_TCP_TIMER_SCALE:
+                if (iface_param->iface_num & 0x1)
+                        break;
+                init_fw_cb->ipv4_tcp_opts &= cpu_to_le16(~TCPOPT_TIMER_SCALE);
+                init_fw_cb->ipv4_tcp_opts |=
+                                cpu_to_le16((iface_param->value[0] << 1) &
+                                            TCPOPT_TIMER_SCALE);
+                break;
+        case ISCSI_NET_PARAM_TCP_TIMESTAMP_EN:
+                if (iface_param->iface_num & 0x1)
+                        break;
+                if (iface_param->value[0] == ISCSI_NET_PARAM_ENABLE)
+                        init_fw_cb->ipv4_tcp_opts |=
+                                cpu_to_le16(TCPOPT_TIMESTAMP_ENABLE);
+                else
+                        init_fw_cb->ipv4_tcp_opts &=
+                                cpu_to_le16(~TCPOPT_TIMESTAMP_ENABLE);
+                break;
+        case ISCSI_NET_PARAM_IPV4_DHCP_DNS_ADDR_EN:
+                if (iface_param->iface_num & 0x1)
+                        break;
+                if (iface_param->value[0] == ISCSI_NET_PARAM_ENABLE)
+                        init_fw_cb->ipv4_tcp_opts |=
+                                cpu_to_le16(TCPOPT_DNS_SERVER_IP_EN);
+                else
+                        init_fw_cb->ipv4_tcp_opts &=
+                                cpu_to_le16(~TCPOPT_DNS_SERVER_IP_EN);
+                break;
+        case ISCSI_NET_PARAM_IPV4_DHCP_SLP_DA_EN:
+                if (iface_param->iface_num & 0x1)
+                        break;
+                if (iface_param->value[0] == ISCSI_NET_PARAM_ENABLE)
+                        init_fw_cb->ipv4_tcp_opts |=
+                                cpu_to_le16(TCPOPT_SLP_DA_INFO_EN);
+                else
+                        init_fw_cb->ipv4_tcp_opts &=
+                                cpu_to_le16(~TCPOPT_SLP_DA_INFO_EN);
+                break;
+        case ISCSI_NET_PARAM_IPV4_TOS_EN:
+                if (iface_param->iface_num & 0x1)
+                        break;
+                if (iface_param->value[0] == ISCSI_NET_PARAM_ENABLE)
+                        init_fw_cb->ipv4_ip_opts |=
+                                cpu_to_le16(IPOPT_IPV4_TOS_EN);
+                else
+                        init_fw_cb->ipv4_ip_opts &=
+                                cpu_to_le16(~IPOPT_IPV4_TOS_EN);
+                break;
+        case ISCSI_NET_PARAM_IPV4_TOS:
+                if (iface_param->iface_num & 0x1)
+                        break;
+                init_fw_cb->ipv4_tos = iface_param->value[0];
+                break;
+        case ISCSI_NET_PARAM_IPV4_GRAT_ARP_EN:
+                if (iface_param->iface_num & 0x1)
+                        break;
+                if (iface_param->value[0] == ISCSI_NET_PARAM_ENABLE)
+                        init_fw_cb->ipv4_ip_opts |=
+                                        cpu_to_le16(IPOPT_GRAT_ARP_EN);
+                else
+                        init_fw_cb->ipv4_ip_opts &=
+                                        cpu_to_le16(~IPOPT_GRAT_ARP_EN);
+                break;
+        case ISCSI_NET_PARAM_IPV4_DHCP_ALT_CLIENT_ID_EN:
+                if (iface_param->iface_num & 0x1)
+                        break;
+                if (iface_param->value[0] == ISCSI_NET_PARAM_ENABLE)
+                        init_fw_cb->ipv4_ip_opts |=
+                                cpu_to_le16(IPOPT_ALT_CID_EN);
+                else
+                        init_fw_cb->ipv4_ip_opts &=
+                                cpu_to_le16(~IPOPT_ALT_CID_EN);
+                break;
+        case ISCSI_NET_PARAM_IPV4_DHCP_ALT_CLIENT_ID:
+                if (iface_param->iface_num & 0x1)
+                        break;
+                memcpy(init_fw_cb->ipv4_dhcp_alt_cid, iface_param->value,
+                       (sizeof(init_fw_cb->ipv4_dhcp_alt_cid) - 1));
+                init_fw_cb->ipv4_dhcp_alt_cid_len =
+                                        strlen(init_fw_cb->ipv4_dhcp_alt_cid);
+                break;
+        case ISCSI_NET_PARAM_IPV4_DHCP_REQ_VENDOR_ID_EN:
+                if (iface_param->iface_num & 0x1)
+                        break;
+                if (iface_param->value[0] == ISCSI_NET_PARAM_ENABLE)
+                        init_fw_cb->ipv4_ip_opts |=
+                                        cpu_to_le16(IPOPT_REQ_VID_EN);
+                else
+                        init_fw_cb->ipv4_ip_opts &=
+                                        cpu_to_le16(~IPOPT_REQ_VID_EN);
+                break;
+        case ISCSI_NET_PARAM_IPV4_DHCP_USE_VENDOR_ID_EN:
+                if (iface_param->iface_num & 0x1)
+                        break;
+                if (iface_param->value[0] == ISCSI_NET_PARAM_ENABLE)
+                        init_fw_cb->ipv4_ip_opts |=
+                                        cpu_to_le16(IPOPT_USE_VID_EN);
+                else
+                        init_fw_cb->ipv4_ip_opts &=
+                                        cpu_to_le16(~IPOPT_USE_VID_EN);
+                break;
+        case ISCSI_NET_PARAM_IPV4_DHCP_VENDOR_ID:
+                if (iface_param->iface_num & 0x1)
+                        break;
+                memcpy(init_fw_cb->ipv4_dhcp_vid, iface_param->value,
+                       (sizeof(init_fw_cb->ipv4_dhcp_vid) - 1));
+                init_fw_cb->ipv4_dhcp_vid_len =
+                                        strlen(init_fw_cb->ipv4_dhcp_vid);
+                break;
+        case ISCSI_NET_PARAM_IPV4_DHCP_LEARN_IQN_EN:
+                if (iface_param->iface_num & 0x1)
+                        break;
+                if (iface_param->value[0] == ISCSI_NET_PARAM_ENABLE)
+                        init_fw_cb->ipv4_ip_opts |=
+                                        cpu_to_le16(IPOPT_LEARN_IQN_EN);
+                else
+                        init_fw_cb->ipv4_ip_opts &=
+                                        cpu_to_le16(~IPOPT_LEARN_IQN_EN);
+                break;
+        case ISCSI_NET_PARAM_IPV4_FRAGMENT_DISABLE:
+                if (iface_param->iface_num & 0x1)
+                        break;
+                if (iface_param->value[0] == ISCSI_NET_PARAM_DISABLE)
+                        init_fw_cb->ipv4_ip_opts |=
+                                cpu_to_le16(IPOPT_FRAGMENTATION_DISABLE);
+                else
+                        init_fw_cb->ipv4_ip_opts &=
+                                cpu_to_le16(~IPOPT_FRAGMENTATION_DISABLE);
+                break;
+        case ISCSI_NET_PARAM_IPV4_IN_FORWARD_EN:
+                if (iface_param->iface_num & 0x1)
+                        break;
+                if (iface_param->value[0] == ISCSI_NET_PARAM_ENABLE)
+                        init_fw_cb->ipv4_ip_opts |=
+                                cpu_to_le16(IPOPT_IN_FORWARD_EN);
+                else
+                        init_fw_cb->ipv4_ip_opts &=
+                                cpu_to_le16(~IPOPT_IN_FORWARD_EN);
+                break;
+        case ISCSI_NET_PARAM_REDIRECT_EN:
+                if (iface_param->iface_num & 0x1)
+                        break;
+                if (iface_param->value[0] == ISCSI_NET_PARAM_ENABLE)
+                        init_fw_cb->ipv4_ip_opts |=
+                                cpu_to_le16(IPOPT_ARP_REDIRECT_EN);
+                else
+                        init_fw_cb->ipv4_ip_opts &=
+                                cpu_to_le16(~IPOPT_ARP_REDIRECT_EN);
+                break;
+        case ISCSI_NET_PARAM_IPV4_TTL:
+                if (iface_param->iface_num & 0x1)
+                        break;
+                init_fw_cb->ipv4_ttl = iface_param->value[0];
+                break;
         default:
                 ql4_printk(KERN_ERR, ha, "Unknown IPv4 param = %d\n",
                            iface_param->param);
@@ -1508,6 +2485,168 @@ static void qla4xxx_set_ipv4(struct scsi_qla_host *ha,
         }
 }
 
+static void qla4xxx_set_iscsi_param(struct scsi_qla_host *ha,
+                                    struct iscsi_iface_param_info *iface_param,
+                                    struct addr_ctrl_blk *init_fw_cb)
+{
+        switch (iface_param->param) {
+        case ISCSI_IFACE_PARAM_DEF_TASKMGMT_TMO:
+                if (iface_param->iface_num & 0x1)
+                        break;
+                init_fw_cb->def_timeout =
+                                cpu_to_le16(*(uint16_t *)iface_param->value);
+                break;
+        case ISCSI_IFACE_PARAM_HDRDGST_EN:
+                if (iface_param->iface_num & 0x1)
+                        break;
+                if (iface_param->value[0] == ISCSI_NET_PARAM_ENABLE)
+                        init_fw_cb->iscsi_opts |=
+                                cpu_to_le16(ISCSIOPTS_HEADER_DIGEST_EN);
+                else
+                        init_fw_cb->iscsi_opts &=
+                                cpu_to_le16(~ISCSIOPTS_HEADER_DIGEST_EN);
+                break;
+        case ISCSI_IFACE_PARAM_DATADGST_EN:
+                if (iface_param->iface_num & 0x1)
+                        break;
+                if (iface_param->value[0] == ISCSI_NET_PARAM_ENABLE)
+                        init_fw_cb->iscsi_opts |=
+                                cpu_to_le16(ISCSIOPTS_DATA_DIGEST_EN);
+                else
+                        init_fw_cb->iscsi_opts &=
+                                cpu_to_le16(~ISCSIOPTS_DATA_DIGEST_EN);
+                break;
+        case ISCSI_IFACE_PARAM_IMM_DATA_EN:
+                if (iface_param->iface_num & 0x1)
+                        break;
+                if (iface_param->value[0] == ISCSI_NET_PARAM_ENABLE)
+                        init_fw_cb->iscsi_opts |=
+                                cpu_to_le16(ISCSIOPTS_IMMEDIATE_DATA_EN);
+                else
+                        init_fw_cb->iscsi_opts &=
+                                cpu_to_le16(~ISCSIOPTS_IMMEDIATE_DATA_EN);
+                break;
+        case ISCSI_IFACE_PARAM_INITIAL_R2T_EN:
+                if (iface_param->iface_num & 0x1)
+                        break;
+                if (iface_param->value[0] == ISCSI_NET_PARAM_ENABLE)
+                        init_fw_cb->iscsi_opts |=
+                                cpu_to_le16(ISCSIOPTS_INITIAL_R2T_EN);
+                else
+                        init_fw_cb->iscsi_opts &=
+                                cpu_to_le16(~ISCSIOPTS_INITIAL_R2T_EN);
+                break;
+        case ISCSI_IFACE_PARAM_DATASEQ_INORDER_EN:
+                if (iface_param->iface_num & 0x1)
+                        break;
+                if (iface_param->value[0] == ISCSI_NET_PARAM_ENABLE)
+                        init_fw_cb->iscsi_opts |=
+                                cpu_to_le16(ISCSIOPTS_DATA_SEQ_INORDER_EN);
+                else
+                        init_fw_cb->iscsi_opts &=
+                                cpu_to_le16(~ISCSIOPTS_DATA_SEQ_INORDER_EN);
+                break;
+        case ISCSI_IFACE_PARAM_PDU_INORDER_EN:
+                if (iface_param->iface_num & 0x1)
+                        break;
+                if (iface_param->value[0] == ISCSI_NET_PARAM_ENABLE)
+                        init_fw_cb->iscsi_opts |=
+                                cpu_to_le16(ISCSIOPTS_DATA_PDU_INORDER_EN);
+                else
+                        init_fw_cb->iscsi_opts &=
+                                cpu_to_le16(~ISCSIOPTS_DATA_PDU_INORDER_EN);
+                break;
+        case ISCSI_IFACE_PARAM_ERL:
+                if (iface_param->iface_num & 0x1)
+                        break;
+                init_fw_cb->iscsi_opts &= cpu_to_le16(~ISCSIOPTS_ERL);
+                init_fw_cb->iscsi_opts |= cpu_to_le16(iface_param->value[0] &
+                                                      ISCSIOPTS_ERL);
+                break;
+        case ISCSI_IFACE_PARAM_MAX_RECV_DLENGTH:
+                if (iface_param->iface_num & 0x1)
+                        break;
+                init_fw_cb->iscsi_max_pdu_size =
+                                cpu_to_le32(*(uint32_t *)iface_param->value) /
+                                BYTE_UNITS;
+                break;
+        case ISCSI_IFACE_PARAM_FIRST_BURST:
+                if (iface_param->iface_num & 0x1)
+                        break;
+                init_fw_cb->iscsi_fburst_len =
+                                cpu_to_le32(*(uint32_t *)iface_param->value) /
+                                BYTE_UNITS;
+                break;
+        case ISCSI_IFACE_PARAM_MAX_R2T:
+                if (iface_param->iface_num & 0x1)
+                        break;
+                init_fw_cb->iscsi_max_outstnd_r2t =
+                                cpu_to_le16(*(uint16_t *)iface_param->value);
+                break;
+        case ISCSI_IFACE_PARAM_MAX_BURST:
+                if (iface_param->iface_num & 0x1)
+                        break;
+                init_fw_cb->iscsi_max_burst_len =
+                                cpu_to_le32(*(uint32_t *)iface_param->value) /
+                                BYTE_UNITS;
+                break;
+        case ISCSI_IFACE_PARAM_CHAP_AUTH_EN:
+                if (iface_param->iface_num & 0x1)
+                        break;
+                if (iface_param->value[0] == ISCSI_NET_PARAM_ENABLE)
+                        init_fw_cb->iscsi_opts |=
+                                cpu_to_le16(ISCSIOPTS_CHAP_AUTH_EN);
+                else
+                        init_fw_cb->iscsi_opts &=
+                                cpu_to_le16(~ISCSIOPTS_CHAP_AUTH_EN);
+                break;
+        case ISCSI_IFACE_PARAM_BIDI_CHAP_EN:
+                if (iface_param->iface_num & 0x1)
+                        break;
+                if (iface_param->value[0] == ISCSI_NET_PARAM_ENABLE)
+                        init_fw_cb->iscsi_opts |=
+                                cpu_to_le16(ISCSIOPTS_BIDI_CHAP_EN);
+                else
+                        init_fw_cb->iscsi_opts &=
+                                cpu_to_le16(~ISCSIOPTS_BIDI_CHAP_EN);
+                break;
+        case ISCSI_IFACE_PARAM_DISCOVERY_AUTH_OPTIONAL:
+                if (iface_param->iface_num & 0x1)
+                        break;
+                if (iface_param->value[0] == ISCSI_NET_PARAM_ENABLE)
+                        init_fw_cb->iscsi_opts |=
+                                cpu_to_le16(ISCSIOPTS_DISCOVERY_AUTH_EN);
+                else
+                        init_fw_cb->iscsi_opts &=
+                                cpu_to_le16(~ISCSIOPTS_DISCOVERY_AUTH_EN);
+                break;
+        case ISCSI_IFACE_PARAM_DISCOVERY_LOGOUT_EN:
+                if (iface_param->iface_num & 0x1)
+                        break;
+                if (iface_param->value[0] == ISCSI_NET_PARAM_ENABLE)
+                        init_fw_cb->iscsi_opts |=
+                                cpu_to_le16(ISCSIOPTS_DISCOVERY_LOGOUT_EN);
+                else
+                        init_fw_cb->iscsi_opts &=
+                                cpu_to_le16(~ISCSIOPTS_DISCOVERY_LOGOUT_EN);
+                break;
+        case ISCSI_IFACE_PARAM_STRICT_LOGIN_COMP_EN:
+                if (iface_param->iface_num & 0x1)
+                        break;
+                if (iface_param->value[0] == ISCSI_NET_PARAM_ENABLE)
+                        init_fw_cb->iscsi_opts |=
+                                cpu_to_le16(ISCSIOPTS_STRICT_LOGIN_COMP_EN);
+                else
+                        init_fw_cb->iscsi_opts &=
+                                cpu_to_le16(~ISCSIOPTS_STRICT_LOGIN_COMP_EN);
+                break;
+        default:
+                ql4_printk(KERN_ERR, ha, "Unknown iscsi param = %d\n",
+                           iface_param->param);
+                break;
+        }
+}
+
 static void
 qla4xxx_initcb_to_acb(struct addr_ctrl_blk *init_fw_cb)
 {
@@ -1565,40 +2704,47 @@ qla4xxx_iface_set_param(struct Scsi_Host *shost, void *data, uint32_t len)
         nla_for_each_attr(attr, data, len, rem) {
                 iface_param = nla_data(attr);
 
-                if (iface_param->param_type != ISCSI_NET_PARAM)
-                        continue;
-
-                switch (iface_param->iface_type) {
-                case ISCSI_IFACE_TYPE_IPV4:
-                        switch (iface_param->iface_num) {
-                        case 0:
-                                qla4xxx_set_ipv4(ha, iface_param, init_fw_cb);
-                                break;
-                        default:
+                if (iface_param->param_type == ISCSI_NET_PARAM) {
+                        switch (iface_param->iface_type) {
+                        case ISCSI_IFACE_TYPE_IPV4:
+                                switch (iface_param->iface_num) {
+                                case 0:
+                                        qla4xxx_set_ipv4(ha, iface_param,
+                                                         init_fw_cb);
+                                        break;
+                                default:
                                 /* Cannot have more than one IPv4 interface */
-                                ql4_printk(KERN_ERR, ha, "Invalid IPv4 iface "
-                                           "number = %d\n",
-                                           iface_param->iface_num);
+                                        ql4_printk(KERN_ERR, ha,
+                                                   "Invalid IPv4 iface number = %d\n",
+                                                   iface_param->iface_num);
+                                        break;
+                                }
                                 break;
-                        }
-                        break;
-                case ISCSI_IFACE_TYPE_IPV6:
-                        switch (iface_param->iface_num) {
-                        case 0:
-                        case 1:
-                                qla4xxx_set_ipv6(ha, iface_param, init_fw_cb);
+                        case ISCSI_IFACE_TYPE_IPV6:
+                                switch (iface_param->iface_num) {
+                                case 0:
+                                case 1:
+                                        qla4xxx_set_ipv6(ha, iface_param,
+                                                         init_fw_cb);
+                                        break;
+                                default:
+                                /* Cannot have more than two IPv6 interface */
+                                        ql4_printk(KERN_ERR, ha,
+                                                   "Invalid IPv6 iface number = %d\n",
+                                                   iface_param->iface_num);
+                                        break;
+                                }
                                 break;
                         default:
-                                /* Cannot have more than two IPv6 interface */
-                                ql4_printk(KERN_ERR, ha, "Invalid IPv6 iface "
-                                           "number = %d\n",
-                                           iface_param->iface_num);
+                                ql4_printk(KERN_ERR, ha,
+                                           "Invalid iface type\n");
                                 break;
                         }
-                        break;
-                default:
-                        ql4_printk(KERN_ERR, ha, "Invalid iface type\n");
-                        break;
+                } else if (iface_param->param_type == ISCSI_IFACE_PARAM) {
+                                qla4xxx_set_iscsi_param(ha, iface_param,
+                                                        init_fw_cb);
+                } else {
+                        continue;
                 }
         }
 
@@ -2538,6 +3684,7 @@ static void qla4xxx_copy_to_sess_conn_params(struct iscsi_conn *conn,
         unsigned long options = 0;
         uint16_t ddb_link;
         uint16_t disc_parent;
+        char ip_addr[DDB_IPADDR_LEN];
 
         options = le16_to_cpu(fw_ddb_entry->options);
         conn->is_fw_assigned_ipv6 = test_bit(OPT_IS_FW_ASSIGNED_IPV6, &options);
@@ -2619,6 +3766,14 @@ static void qla4xxx_copy_to_sess_conn_params(struct iscsi_conn *conn,
 
         iscsi_set_param(conn->cls_conn, ISCSI_PARAM_TARGET_ALIAS,
                         (char *)fw_ddb_entry->iscsi_alias, 0);
+
+        options = le16_to_cpu(fw_ddb_entry->options);
+        if (options & DDB_OPT_IPV6_DEVICE) {
+                memset(ip_addr, 0, sizeof(ip_addr));
+                sprintf(ip_addr, "%pI6", fw_ddb_entry->link_local_ipv6_addr);
+                iscsi_set_param(conn->cls_conn, ISCSI_PARAM_LOCAL_IPADDR,
+                                (char *)ip_addr, 0);
+        }
 }
 
 static void qla4xxx_copy_fwddb_param(struct scsi_qla_host *ha,
@@ -5030,64 +6185,6 @@ kset_free:
 }
 
 
-/**
- * qla4xxx_create chap_list - Create CHAP list from FLASH
- * @ha: pointer to adapter structure
- *
- * Read flash and make a list of CHAP entries, during login when a CHAP entry
- * is received, it will be checked in this list. If entry exist then the CHAP
- * entry index is set in the DDB. If CHAP entry does not exist in this list
- * then a new entry is added in FLASH in CHAP table and the index obtained is
- * used in the DDB.
- **/
-static void qla4xxx_create_chap_list(struct scsi_qla_host *ha)
-{
-        int rval = 0;
-        uint8_t *chap_flash_data = NULL;
-        uint32_t offset;
-        dma_addr_t chap_dma;
-        uint32_t chap_size = 0;
-
-        if (is_qla40XX(ha))
-                chap_size = MAX_CHAP_ENTRIES_40XX  *
-                                        sizeof(struct ql4_chap_table);
-        else    /* Single region contains CHAP info for both
-                 * ports which is divided into half for each port.
-                 */
-                chap_size = ha->hw.flt_chap_size / 2;
-
-        chap_flash_data = dma_alloc_coherent(&ha->pdev->dev, chap_size,
-                                          &chap_dma, GFP_KERNEL);
-        if (!chap_flash_data) {
-                ql4_printk(KERN_ERR, ha, "No memory for chap_flash_data\n");
-                return;
-        }
-        if (is_qla40XX(ha))
-                offset = FLASH_CHAP_OFFSET;
-        else {
-                offset = FLASH_RAW_ACCESS_ADDR + (ha->hw.flt_region_chap << 2);
-                if (ha->port_num == 1)
-                        offset += chap_size;
-        }
-
-        rval = qla4xxx_get_flash(ha, chap_dma, offset, chap_size);
-        if (rval != QLA_SUCCESS)
-                goto exit_chap_list;
-
-        if (ha->chap_list == NULL)
-                ha->chap_list = vmalloc(chap_size);
-        if (ha->chap_list == NULL) {
-                ql4_printk(KERN_ERR, ha, "No memory for ha->chap_list\n");
-                goto exit_chap_list;
-        }
-
-        memcpy(ha->chap_list, chap_flash_data, chap_size);
-
-exit_chap_list:
-        dma_free_coherent(&ha->pdev->dev, chap_size,
-                        chap_flash_data, chap_dma);
-}
-
 static void qla4xxx_get_param_ddb(struct ddb_entry *ddb_entry,
                                   struct ql4_tuple_ddb *tddb)
 {
@@ -7521,6 +8618,9 @@ static int qla4xxx_probe_adapter(struct pci_dev *pdev,
         mutex_init(&ha->chap_sem);
         init_completion(&ha->mbx_intr_comp);
         init_completion(&ha->disable_acb_comp);
+        init_completion(&ha->idc_comp);
+        init_completion(&ha->link_up_comp);
+        init_completion(&ha->disable_acb_comp);
 
         spin_lock_init(&ha->hardware_lock);
         spin_lock_init(&ha->work_lock);
diff --git a/drivers/scsi/qla4xxx/ql4_version.h b/drivers/scsi/qla4xxx/ql4_version.h
index f4fef72c9bcd..9b2946658683 100644
--- a/drivers/scsi/qla4xxx/ql4_version.h
+++ b/drivers/scsi/qla4xxx/ql4_version.h
@@ -5,4 +5,4 @@
  * See LICENSE.qla4xxx for copyright and licensing details.
  */
 
-#define QLA4XXX_DRIVER_VERSION  "5.04.00-k1"
+#define QLA4XXX_DRIVER_VERSION  "5.04.00-k3"
diff --git a/drivers/scsi/scsi.c b/drivers/scsi/scsi.c
index fe0bcb18fb26..d8afec8317cf 100644
--- a/drivers/scsi/scsi.c
+++ b/drivers/scsi/scsi.c
@@ -297,6 +297,7 @@ struct scsi_cmnd *scsi_get_command(struct scsi_device *dev, gfp_t gfp_mask)
 
                 cmd->device = dev;
                 INIT_LIST_HEAD(&cmd->list);
+                INIT_DELAYED_WORK(&cmd->abort_work, scmd_eh_abort_handler);
                 spin_lock_irqsave(&dev->list_lock, flags);
                 list_add_tail(&cmd->list, &dev->cmd_list);
                 spin_unlock_irqrestore(&dev->list_lock, flags);
@@ -353,6 +354,8 @@ void scsi_put_command(struct scsi_cmnd *cmd)
         list_del_init(&cmd->list);
         spin_unlock_irqrestore(&cmd->device->list_lock, flags);
 
+        cancel_delayed_work(&cmd->abort_work);
+
         __scsi_put_command(cmd->device->host, cmd, &sdev->sdev_gendev);
 }
 EXPORT_SYMBOL(scsi_put_command);
@@ -742,15 +745,13 @@ int scsi_dispatch_cmd(struct scsi_cmnd *cmd)
 }
 
 /**
- * scsi_done - Enqueue the finished SCSI command into the done queue.
+ * scsi_done - Invoke completion on finished SCSI command.
  * @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.
  *
  * Description: This function is the mid-level's (SCSI Core) interrupt routine,
  * which regains ownership of the SCSI command (de facto) from a LLDD, and
- * enqueues the command to the done queue for further processing.
- *
- * This is the producer of the done queue who enqueues at the tail.
+ * calls blk_complete_request() for further processing.
  *
  * This function is interrupt context safe.
  */
diff --git a/drivers/scsi/scsi_debug.c b/drivers/scsi/scsi_debug.c
index 80b8b10edf41..2decc6417518 100644
--- a/drivers/scsi/scsi_debug.c
+++ b/drivers/scsi/scsi_debug.c
@@ -2873,13 +2873,13 @@ static int scsi_debug_show_info(struct seq_file *m, struct Scsi_Host *host)
         return 0;
 }
 
-static ssize_t sdebug_delay_show(struct device_driver * ddp, char * buf)
+static ssize_t delay_show(struct device_driver *ddp, char *buf)
 {
         return scnprintf(buf, PAGE_SIZE, "%d\n", scsi_debug_delay);
 }
 
-static ssize_t sdebug_delay_store(struct device_driver * ddp,
-                                  const char * buf, size_t count)
+static ssize_t delay_store(struct device_driver *ddp, const char *buf,
+                           size_t count)
 {
         int delay;
         char work[20];
@@ -2892,16 +2892,15 @@ static ssize_t sdebug_delay_store(struct device_driver * ddp,
         }
         return -EINVAL;
 }
-DRIVER_ATTR(delay, S_IRUGO | S_IWUSR, sdebug_delay_show,
-            sdebug_delay_store);
+static DRIVER_ATTR_RW(delay);
 
-static ssize_t sdebug_opts_show(struct device_driver * ddp, char * buf)
+static ssize_t opts_show(struct device_driver *ddp, char *buf)
 {
         return scnprintf(buf, PAGE_SIZE, "0x%x\n", scsi_debug_opts);
 }
 
-static ssize_t sdebug_opts_store(struct device_driver * ddp,
-                                 const char * buf, size_t count)
+static ssize_t opts_store(struct device_driver *ddp, const char *buf,
+                          size_t count)
 {
         int opts;
         char work[20];
@@ -2921,15 +2920,14 @@ opts_done:
         scsi_debug_cmnd_count = 0;
         return count;
 }
-DRIVER_ATTR(opts, S_IRUGO | S_IWUSR, sdebug_opts_show,
-            sdebug_opts_store);
+static DRIVER_ATTR_RW(opts);
 
-static ssize_t sdebug_ptype_show(struct device_driver * ddp, char * buf)
+static ssize_t ptype_show(struct device_driver *ddp, char *buf)
 {
         return scnprintf(buf, PAGE_SIZE, "%d\n", scsi_debug_ptype);
 }
-static ssize_t sdebug_ptype_store(struct device_driver * ddp,
-                                  const char * buf, size_t count)
+static ssize_t ptype_store(struct device_driver *ddp, const char *buf,
+                           size_t count)
 {
         int n;
 
@@ -2939,14 +2937,14 @@ static ssize_t sdebug_ptype_store(struct device_driver * ddp,
         }
         return -EINVAL;
 }
-DRIVER_ATTR(ptype, S_IRUGO | S_IWUSR, sdebug_ptype_show, sdebug_ptype_store);
+static DRIVER_ATTR_RW(ptype);
 
-static ssize_t sdebug_dsense_show(struct device_driver * ddp, char * buf)
+static ssize_t dsense_show(struct device_driver *ddp, char *buf)
 {
         return scnprintf(buf, PAGE_SIZE, "%d\n", scsi_debug_dsense);
 }
-static ssize_t sdebug_dsense_store(struct device_driver * ddp,
-                                  const char * buf, size_t count)
+static ssize_t dsense_store(struct device_driver *ddp, const char *buf,
+                            size_t count)
 {
         int n;
 
@@ -2956,15 +2954,14 @@ static ssize_t sdebug_dsense_store(struct device_driver * ddp,
         }
         return -EINVAL;
 }
-DRIVER_ATTR(dsense, S_IRUGO | S_IWUSR, sdebug_dsense_show,
-            sdebug_dsense_store);
+static DRIVER_ATTR_RW(dsense);
 
-static ssize_t sdebug_fake_rw_show(struct device_driver * ddp, char * buf)
+static ssize_t fake_rw_show(struct device_driver *ddp, char *buf)
 {
         return scnprintf(buf, PAGE_SIZE, "%d\n", scsi_debug_fake_rw);
 }
-static ssize_t sdebug_fake_rw_store(struct device_driver * ddp,
-                                    const char * buf, size_t count)
+static ssize_t fake_rw_store(struct device_driver *ddp, const char *buf,
+                             size_t count)
 {
         int n;
 
@@ -2974,15 +2971,14 @@ static ssize_t sdebug_fake_rw_store(struct device_driver * ddp,
         }
         return -EINVAL;
 }
-DRIVER_ATTR(fake_rw, S_IRUGO | S_IWUSR, sdebug_fake_rw_show,
-            sdebug_fake_rw_store);
+static DRIVER_ATTR_RW(fake_rw);
 
-static ssize_t sdebug_no_lun_0_show(struct device_driver * ddp, char * buf)
+static ssize_t no_lun_0_show(struct device_driver *ddp, char *buf)
 {
         return scnprintf(buf, PAGE_SIZE, "%d\n", scsi_debug_no_lun_0);
 }
-static ssize_t sdebug_no_lun_0_store(struct device_driver * ddp,
-                                     const char * buf, size_t count)
+static ssize_t no_lun_0_store(struct device_driver *ddp, const char *buf,
+                              size_t count)
 {
         int n;
 
@@ -2992,15 +2988,14 @@ static ssize_t sdebug_no_lun_0_store(struct device_driver * ddp,
         }
         return -EINVAL;
 }
-DRIVER_ATTR(no_lun_0, S_IRUGO | S_IWUSR, sdebug_no_lun_0_show,
-            sdebug_no_lun_0_store);
+static DRIVER_ATTR_RW(no_lun_0);
 
-static ssize_t sdebug_num_tgts_show(struct device_driver * ddp, char * buf)
+static ssize_t num_tgts_show(struct device_driver *ddp, char *buf)
 {
         return scnprintf(buf, PAGE_SIZE, "%d\n", scsi_debug_num_tgts);
 }
-static ssize_t sdebug_num_tgts_store(struct device_driver * ddp,
-                                     const char * buf, size_t count)
+static ssize_t num_tgts_store(struct device_driver *ddp, const char *buf,
+                              size_t count)
 {
         int n;
 
@@ -3011,27 +3006,26 @@ static ssize_t sdebug_num_tgts_store(struct device_driver * ddp,
         }
         return -EINVAL;
 }
-DRIVER_ATTR(num_tgts, S_IRUGO | S_IWUSR, sdebug_num_tgts_show,
-            sdebug_num_tgts_store);
+static DRIVER_ATTR_RW(num_tgts);
 
-static ssize_t sdebug_dev_size_mb_show(struct device_driver * ddp, char * buf)
+static ssize_t dev_size_mb_show(struct device_driver *ddp, char *buf)
 {
         return scnprintf(buf, PAGE_SIZE, "%d\n", scsi_debug_dev_size_mb);
 }
-DRIVER_ATTR(dev_size_mb, S_IRUGO, sdebug_dev_size_mb_show, NULL);
+static DRIVER_ATTR_RO(dev_size_mb);
 
-static ssize_t sdebug_num_parts_show(struct device_driver * ddp, char * buf)
+static ssize_t num_parts_show(struct device_driver *ddp, char *buf)
 {
         return scnprintf(buf, PAGE_SIZE, "%d\n", scsi_debug_num_parts);
 }
-DRIVER_ATTR(num_parts, S_IRUGO, sdebug_num_parts_show, NULL);
+static DRIVER_ATTR_RO(num_parts);
 
-static ssize_t sdebug_every_nth_show(struct device_driver * ddp, char * buf)
+static ssize_t every_nth_show(struct device_driver *ddp, char *buf)
 {
         return scnprintf(buf, PAGE_SIZE, "%d\n", scsi_debug_every_nth);
 }
-static ssize_t sdebug_every_nth_store(struct device_driver * ddp,
-                                      const char * buf, size_t count)
+static ssize_t every_nth_store(struct device_driver *ddp, const char *buf,
+                               size_t count)
 {
         int nth;
 
@@ -3042,15 +3036,14 @@ static ssize_t sdebug_every_nth_store(struct device_driver * ddp,
         }
         return -EINVAL;
 }
-DRIVER_ATTR(every_nth, S_IRUGO | S_IWUSR, sdebug_every_nth_show,
-            sdebug_every_nth_store);
+static DRIVER_ATTR_RW(every_nth);
 
-static ssize_t sdebug_max_luns_show(struct device_driver * ddp, char * buf)
+static ssize_t max_luns_show(struct device_driver *ddp, char *buf)
 {
         return scnprintf(buf, PAGE_SIZE, "%d\n", scsi_debug_max_luns);
 }
-static ssize_t sdebug_max_luns_store(struct device_driver * ddp,
-                                     const char * buf, size_t count)
+static ssize_t max_luns_store(struct device_driver *ddp, const char *buf,
+                              size_t count)
 {
         int n;
 
@@ -3061,15 +3054,14 @@ static ssize_t sdebug_max_luns_store(struct device_driver * ddp,
         }
         return -EINVAL;
 }
-DRIVER_ATTR(max_luns, S_IRUGO | S_IWUSR, sdebug_max_luns_show,
-            sdebug_max_luns_store);
+static DRIVER_ATTR_RW(max_luns);
 
-static ssize_t sdebug_max_queue_show(struct device_driver * ddp, char * buf)
+static ssize_t max_queue_show(struct device_driver *ddp, char *buf)
 {
         return scnprintf(buf, PAGE_SIZE, "%d\n", scsi_debug_max_queue);
 }
-static ssize_t sdebug_max_queue_store(struct device_driver * ddp,
-                                      const char * buf, size_t count)
+static ssize_t max_queue_store(struct device_driver *ddp, const char *buf,
+                               size_t count)
 {
         int n;
 
@@ -3080,27 +3072,26 @@ static ssize_t sdebug_max_queue_store(struct device_driver * ddp,
         }
         return -EINVAL;
 }
-DRIVER_ATTR(max_queue, S_IRUGO | S_IWUSR, sdebug_max_queue_show,
-            sdebug_max_queue_store);
+static DRIVER_ATTR_RW(max_queue);
 
-static ssize_t sdebug_no_uld_show(struct device_driver * ddp, char * buf)
+static ssize_t no_uld_show(struct device_driver *ddp, char *buf)
 {
         return scnprintf(buf, PAGE_SIZE, "%d\n", scsi_debug_no_uld);
 }
-DRIVER_ATTR(no_uld, S_IRUGO, sdebug_no_uld_show, NULL);
+static DRIVER_ATTR_RO(no_uld);
 
-static ssize_t sdebug_scsi_level_show(struct device_driver * ddp, char * buf)
+static ssize_t scsi_level_show(struct device_driver *ddp, char *buf)
 {
         return scnprintf(buf, PAGE_SIZE, "%d\n", scsi_debug_scsi_level);
 }
-DRIVER_ATTR(scsi_level, S_IRUGO, sdebug_scsi_level_show, NULL);
+static DRIVER_ATTR_RO(scsi_level);
 
-static ssize_t sdebug_virtual_gb_show(struct device_driver * ddp, char * buf)
+static ssize_t virtual_gb_show(struct device_driver *ddp, char *buf)
 {
         return scnprintf(buf, PAGE_SIZE, "%d\n", scsi_debug_virtual_gb);
 }
-static ssize_t sdebug_virtual_gb_store(struct device_driver * ddp,
-                                       const char * buf, size_t count)
+static ssize_t virtual_gb_store(struct device_driver *ddp, const char *buf,
+                                size_t count)
 {
         int n;
 
@@ -3113,16 +3104,15 @@ static ssize_t sdebug_virtual_gb_store(struct device_driver * ddp,
         }
         return -EINVAL;
 }
-DRIVER_ATTR(virtual_gb, S_IRUGO | S_IWUSR, sdebug_virtual_gb_show,
-            sdebug_virtual_gb_store);
+static DRIVER_ATTR_RW(virtual_gb);
 
-static ssize_t sdebug_add_host_show(struct device_driver * ddp, char * buf)
+static ssize_t add_host_show(struct device_driver *ddp, char *buf)
 {
         return scnprintf(buf, PAGE_SIZE, "%d\n", scsi_debug_add_host);
 }
 
-static ssize_t sdebug_add_host_store(struct device_driver * ddp,
-                                     const char * buf, size_t count)
+static ssize_t add_host_store(struct device_driver *ddp, const char *buf,
+                              size_t count)
 {
         int delta_hosts;
 
@@ -3139,16 +3129,14 @@ static ssize_t sdebug_add_host_store(struct device_driver * ddp,
         }
         return count;
 }
-DRIVER_ATTR(add_host, S_IRUGO | S_IWUSR, sdebug_add_host_show,
-            sdebug_add_host_store);
+static DRIVER_ATTR_RW(add_host);
 
-static ssize_t sdebug_vpd_use_hostno_show(struct device_driver * ddp,
-                                          char * buf)
+static ssize_t vpd_use_hostno_show(struct device_driver *ddp, char *buf)
 {
         return scnprintf(buf, PAGE_SIZE, "%d\n", scsi_debug_vpd_use_hostno);
 }
-static ssize_t sdebug_vpd_use_hostno_store(struct device_driver * ddp,
-                                           const char * buf, size_t count)
+static ssize_t vpd_use_hostno_store(struct device_driver *ddp, const char *buf,
+                                    size_t count)
 {
         int n;
 
@@ -3158,40 +3146,39 @@ static ssize_t sdebug_vpd_use_hostno_store(struct device_driver * ddp,
         }
         return -EINVAL;
 }
-DRIVER_ATTR(vpd_use_hostno, S_IRUGO | S_IWUSR, sdebug_vpd_use_hostno_show,
-            sdebug_vpd_use_hostno_store);
+static DRIVER_ATTR_RW(vpd_use_hostno);
 
-static ssize_t sdebug_sector_size_show(struct device_driver * ddp, char * buf)
+static ssize_t sector_size_show(struct device_driver *ddp, char *buf)
 {
         return scnprintf(buf, PAGE_SIZE, "%u\n", scsi_debug_sector_size);
 }
-DRIVER_ATTR(sector_size, S_IRUGO, sdebug_sector_size_show, NULL);
+static DRIVER_ATTR_RO(sector_size);
 
-static ssize_t sdebug_dix_show(struct device_driver *ddp, char *buf)
+static ssize_t dix_show(struct device_driver *ddp, char *buf)
 {
         return scnprintf(buf, PAGE_SIZE, "%d\n", scsi_debug_dix);
 }
-DRIVER_ATTR(dix, S_IRUGO, sdebug_dix_show, NULL);
+static DRIVER_ATTR_RO(dix);
 
-static ssize_t sdebug_dif_show(struct device_driver *ddp, char *buf)
+static ssize_t dif_show(struct device_driver *ddp, char *buf)
 {
         return scnprintf(buf, PAGE_SIZE, "%d\n", scsi_debug_dif);
 }
-DRIVER_ATTR(dif, S_IRUGO, sdebug_dif_show, NULL);
+static DRIVER_ATTR_RO(dif);
 
-static ssize_t sdebug_guard_show(struct device_driver *ddp, char *buf)
+static ssize_t guard_show(struct device_driver *ddp, char *buf)
 {
         return scnprintf(buf, PAGE_SIZE, "%u\n", scsi_debug_guard);
 }
-DRIVER_ATTR(guard, S_IRUGO, sdebug_guard_show, NULL);
+static DRIVER_ATTR_RO(guard);
 
-static ssize_t sdebug_ato_show(struct device_driver *ddp, char *buf)
+static ssize_t ato_show(struct device_driver *ddp, char *buf)
 {
         return scnprintf(buf, PAGE_SIZE, "%d\n", scsi_debug_ato);
 }
-DRIVER_ATTR(ato, S_IRUGO, sdebug_ato_show, NULL);
+static DRIVER_ATTR_RO(ato);
 
-static ssize_t sdebug_map_show(struct device_driver *ddp, char *buf)
+static ssize_t map_show(struct device_driver *ddp, char *buf)
 {
         ssize_t count;
 
@@ -3206,15 +3193,14 @@ static ssize_t sdebug_map_show(struct device_driver *ddp, char *buf)
 
         return count;
 }
-DRIVER_ATTR(map, S_IRUGO, sdebug_map_show, NULL);
+static DRIVER_ATTR_RO(map);
 
-static ssize_t sdebug_removable_show(struct device_driver *ddp,
-                                     char *buf)
+static ssize_t removable_show(struct device_driver *ddp, char *buf)
 {
         return scnprintf(buf, PAGE_SIZE, "%d\n", scsi_debug_removable ? 1 : 0);
 }
-static ssize_t sdebug_removable_store(struct device_driver *ddp,
-                                      const char *buf, size_t count)
+static ssize_t removable_store(struct device_driver *ddp, const char *buf,
+                               size_t count)
 {
         int n;
 
@@ -3224,74 +3210,43 @@ static ssize_t sdebug_removable_store(struct device_driver *ddp,
         }
         return -EINVAL;
 }
-DRIVER_ATTR(removable, S_IRUGO | S_IWUSR, sdebug_removable_show,
-            sdebug_removable_store);
+static DRIVER_ATTR_RW(removable);
 
-
-/* Note: The following function creates attribute files in the
+/* Note: The following array creates attribute files in the
    /sys/bus/pseudo/drivers/scsi_debug directory. The advantage of these
    files (over those found in the /sys/module/scsi_debug/parameters
    directory) is that auxiliary actions can be triggered when an attribute
    is changed. For example see: sdebug_add_host_store() above.
  */
-static int do_create_driverfs_files(void)
-{
-        int ret;
 
-        ret = driver_create_file(&sdebug_driverfs_driver, &driver_attr_add_host);
-        ret |= driver_create_file(&sdebug_driverfs_driver, &driver_attr_delay);
-        ret |= driver_create_file(&sdebug_driverfs_driver, &driver_attr_dev_size_mb);
-        ret |= driver_create_file(&sdebug_driverfs_driver, &driver_attr_dsense);
-        ret |= driver_create_file(&sdebug_driverfs_driver, &driver_attr_every_nth);
-        ret |= driver_create_file(&sdebug_driverfs_driver, &driver_attr_fake_rw);
-        ret |= driver_create_file(&sdebug_driverfs_driver, &driver_attr_max_luns);
-        ret |= driver_create_file(&sdebug_driverfs_driver, &driver_attr_max_queue);
-        ret |= driver_create_file(&sdebug_driverfs_driver, &driver_attr_no_lun_0);
-        ret |= driver_create_file(&sdebug_driverfs_driver, &driver_attr_no_uld);
-        ret |= driver_create_file(&sdebug_driverfs_driver, &driver_attr_num_parts);
-        ret |= driver_create_file(&sdebug_driverfs_driver, &driver_attr_num_tgts);
-        ret |= driver_create_file(&sdebug_driverfs_driver, &driver_attr_ptype);
-        ret |= driver_create_file(&sdebug_driverfs_driver, &driver_attr_opts);
-        ret |= driver_create_file(&sdebug_driverfs_driver, &driver_attr_removable);
-        ret |= driver_create_file(&sdebug_driverfs_driver, &driver_attr_scsi_level);
-        ret |= driver_create_file(&sdebug_driverfs_driver, &driver_attr_virtual_gb);
-        ret |= driver_create_file(&sdebug_driverfs_driver, &driver_attr_vpd_use_hostno);
-        ret |= driver_create_file(&sdebug_driverfs_driver, &driver_attr_sector_size);
-        ret |= driver_create_file(&sdebug_driverfs_driver, &driver_attr_dix);
-        ret |= driver_create_file(&sdebug_driverfs_driver, &driver_attr_dif);
-        ret |= driver_create_file(&sdebug_driverfs_driver, &driver_attr_guard);
-        ret |= driver_create_file(&sdebug_driverfs_driver, &driver_attr_ato);
-        ret |= driver_create_file(&sdebug_driverfs_driver, &driver_attr_map);
-        return ret;
-}
-
-static void do_remove_driverfs_files(void)
-{
-        driver_remove_file(&sdebug_driverfs_driver, &driver_attr_map);
-        driver_remove_file(&sdebug_driverfs_driver, &driver_attr_ato);
-        driver_remove_file(&sdebug_driverfs_driver, &driver_attr_guard);
-        driver_remove_file(&sdebug_driverfs_driver, &driver_attr_dif);
-        driver_remove_file(&sdebug_driverfs_driver, &driver_attr_dix);
-        driver_remove_file(&sdebug_driverfs_driver, &driver_attr_sector_size);
-        driver_remove_file(&sdebug_driverfs_driver, &driver_attr_vpd_use_hostno);
-        driver_remove_file(&sdebug_driverfs_driver, &driver_attr_virtual_gb);
-        driver_remove_file(&sdebug_driverfs_driver, &driver_attr_scsi_level);
-        driver_remove_file(&sdebug_driverfs_driver, &driver_attr_opts);
-        driver_remove_file(&sdebug_driverfs_driver, &driver_attr_ptype);
-        driver_remove_file(&sdebug_driverfs_driver, &driver_attr_removable);
-        driver_remove_file(&sdebug_driverfs_driver, &driver_attr_num_tgts);
-        driver_remove_file(&sdebug_driverfs_driver, &driver_attr_num_parts);
-        driver_remove_file(&sdebug_driverfs_driver, &driver_attr_no_uld);
-        driver_remove_file(&sdebug_driverfs_driver, &driver_attr_no_lun_0);
-        driver_remove_file(&sdebug_driverfs_driver, &driver_attr_max_queue);
-        driver_remove_file(&sdebug_driverfs_driver, &driver_attr_max_luns);
-        driver_remove_file(&sdebug_driverfs_driver, &driver_attr_fake_rw);
-        driver_remove_file(&sdebug_driverfs_driver, &driver_attr_every_nth);
-        driver_remove_file(&sdebug_driverfs_driver, &driver_attr_dsense);
-        driver_remove_file(&sdebug_driverfs_driver, &driver_attr_dev_size_mb);
-        driver_remove_file(&sdebug_driverfs_driver, &driver_attr_delay);
-        driver_remove_file(&sdebug_driverfs_driver, &driver_attr_add_host);
-}
+static struct attribute *sdebug_drv_attrs[] = {
+        &driver_attr_delay.attr,
+        &driver_attr_opts.attr,
+        &driver_attr_ptype.attr,
+        &driver_attr_dsense.attr,
+        &driver_attr_fake_rw.attr,
+        &driver_attr_no_lun_0.attr,
+        &driver_attr_num_tgts.attr,
+        &driver_attr_dev_size_mb.attr,
+        &driver_attr_num_parts.attr,
+        &driver_attr_every_nth.attr,
+        &driver_attr_max_luns.attr,
+        &driver_attr_max_queue.attr,
+        &driver_attr_no_uld.attr,
+        &driver_attr_scsi_level.attr,
+        &driver_attr_virtual_gb.attr,
+        &driver_attr_add_host.attr,
+        &driver_attr_vpd_use_hostno.attr,
+        &driver_attr_sector_size.attr,
+        &driver_attr_dix.attr,
+        &driver_attr_dif.attr,
+        &driver_attr_guard.attr,
+        &driver_attr_ato.attr,
+        &driver_attr_map.attr,
+        &driver_attr_removable.attr,
+        NULL,
+};
+ATTRIBUTE_GROUPS(sdebug_drv);
 
 struct device *pseudo_primary;
 
@@ -3456,12 +3411,6 @@ static int __init scsi_debug_init(void)
                         ret);
                 goto bus_unreg;
         }
-        ret = do_create_driverfs_files();
-        if (ret < 0) {
-                printk(KERN_WARNING "scsi_debug: driver_create_file error: %d\n",
-                        ret);
-                goto del_files;
-        }
 
         init_all_queued();
 
@@ -3482,9 +3431,6 @@ static int __init scsi_debug_init(void)
         }
         return 0;
 
-del_files:
-        do_remove_driverfs_files();
-        driver_unregister(&sdebug_driverfs_driver);
 bus_unreg:
         bus_unregister(&pseudo_lld_bus);
 dev_unreg:
@@ -3506,7 +3452,6 @@ static void __exit scsi_debug_exit(void)
         stop_all_queued();
         for (; k; k--)
                 sdebug_remove_adapter();
-        do_remove_driverfs_files();
         driver_unregister(&sdebug_driverfs_driver);
         bus_unregister(&pseudo_lld_bus);
         root_device_unregister(pseudo_primary);
@@ -4096,4 +4041,5 @@ static struct bus_type pseudo_lld_bus = {
         .match = pseudo_lld_bus_match,
         .probe = sdebug_driver_probe,
         .remove = sdebug_driver_remove,
+        .drv_groups = sdebug_drv_groups,
 };
diff --git a/drivers/scsi/scsi_error.c b/drivers/scsi/scsi_error.c
index e8bee9f0ad0f..78b004da2885 100644
--- a/drivers/scsi/scsi_error.c
+++ b/drivers/scsi/scsi_error.c
@@ -53,6 +53,8 @@ static void scsi_eh_done(struct scsi_cmnd *scmd);
 #define HOST_RESET_SETTLE_TIME  (10)
 
 static int scsi_eh_try_stu(struct scsi_cmnd *scmd);
+static int scsi_try_to_abort_cmd(struct scsi_host_template *,
+                                 struct scsi_cmnd *);
 
 /* called with shost->host_lock held */
 void scsi_eh_wakeup(struct Scsi_Host *shost)
@@ -89,17 +91,138 @@ EXPORT_SYMBOL_GPL(scsi_schedule_eh);
 
 static int scsi_host_eh_past_deadline(struct Scsi_Host *shost)
 {
-        if (!shost->last_reset || !shost->eh_deadline)
+        if (!shost->last_reset || shost->eh_deadline == -1)
                 return 0;
 
-        if (time_before(jiffies,
-                        shost->last_reset + shost->eh_deadline))
+        /*
+         * 32bit accesses are guaranteed to be atomic
+         * (on all supported architectures), so instead
+         * of using a spinlock we can as well double check
+         * if eh_deadline has been set to 'off' during the
+         * time_before call.
+         */
+        if (time_before(jiffies, shost->last_reset + shost->eh_deadline) &&
+            shost->eh_deadline > -1)
                 return 0;
 
         return 1;
 }
 
 /**
+ * scmd_eh_abort_handler - Handle command aborts
+ * @work:       command to be aborted.
+ */
+void
+scmd_eh_abort_handler(struct work_struct *work)
+{
+        struct scsi_cmnd *scmd =
+                container_of(work, struct scsi_cmnd, abort_work.work);
+        struct scsi_device *sdev = scmd->device;
+        int rtn;
+
+        if (scsi_host_eh_past_deadline(sdev->host)) {
+                SCSI_LOG_ERROR_RECOVERY(3,
+                        scmd_printk(KERN_INFO, scmd,
+                                    "scmd %p eh timeout, not aborting\n",
+                                    scmd));
+        } else {
+                SCSI_LOG_ERROR_RECOVERY(3,
+                        scmd_printk(KERN_INFO, scmd,
+                                    "aborting command %p\n", scmd));
+                rtn = scsi_try_to_abort_cmd(sdev->host->hostt, scmd);
+                if (rtn == SUCCESS) {
+                        scmd->result |= DID_TIME_OUT << 16;
+                        if (scsi_host_eh_past_deadline(sdev->host)) {
+                                SCSI_LOG_ERROR_RECOVERY(3,
+                                        scmd_printk(KERN_INFO, scmd,
+                                                    "scmd %p eh timeout, "
+                                                    "not retrying aborted "
+                                                    "command\n", scmd));
+                        } else if (!scsi_noretry_cmd(scmd) &&
+                            (++scmd->retries <= scmd->allowed)) {
+                                SCSI_LOG_ERROR_RECOVERY(3,
+                                        scmd_printk(KERN_WARNING, scmd,
+                                                    "scmd %p retry "
+                                                    "aborted command\n", scmd));
+                                scsi_queue_insert(scmd, SCSI_MLQUEUE_EH_RETRY);
+                                return;
+                        } else {
+                                SCSI_LOG_ERROR_RECOVERY(3,
+                                        scmd_printk(KERN_WARNING, scmd,
+                                                    "scmd %p finish "
+                                                    "aborted command\n", scmd));
+                                scsi_finish_command(scmd);
+                                return;
+                        }
+                } else {
+                        SCSI_LOG_ERROR_RECOVERY(3,
+                                scmd_printk(KERN_INFO, scmd,
+                                            "scmd %p abort failed, rtn %d\n",
+                                            scmd, rtn));
+                }
+        }
+
+        if (!scsi_eh_scmd_add(scmd, 0)) {
+                SCSI_LOG_ERROR_RECOVERY(3,
+                        scmd_printk(KERN_WARNING, scmd,
+                                    "scmd %p terminate "
+                                    "aborted command\n", scmd));
+                scmd->result |= DID_TIME_OUT << 16;
+                scsi_finish_command(scmd);
+        }
+}
+
+/**
+ * scsi_abort_command - schedule a command abort
+ * @scmd:       scmd to abort.
+ *
+ * We only need to abort commands after a command timeout
+ */
+static int
+scsi_abort_command(struct scsi_cmnd *scmd)
+{
+        struct scsi_device *sdev = scmd->device;
+        struct Scsi_Host *shost = sdev->host;
+        unsigned long flags;
+
+        if (scmd->eh_eflags & SCSI_EH_ABORT_SCHEDULED) {
+                /*
+                 * Retry after abort failed, escalate to next level.
+                 */
+                SCSI_LOG_ERROR_RECOVERY(3,
+                        scmd_printk(KERN_INFO, scmd,
+                                    "scmd %p previous abort failed\n", scmd));
+                cancel_delayed_work(&scmd->abort_work);
+                return FAILED;
+        }
+
+        /*
+         * Do not try a command abort if
+         * SCSI EH has already started.
+         */
+        spin_lock_irqsave(shost->host_lock, flags);
+        if (scsi_host_in_recovery(shost)) {
+                spin_unlock_irqrestore(shost->host_lock, flags);
+                SCSI_LOG_ERROR_RECOVERY(3,
+                        scmd_printk(KERN_INFO, scmd,
+                                    "scmd %p not aborting, host in recovery\n",
+                                    scmd));
+                return FAILED;
+        }
+
+        if (shost->eh_deadline != -1 && !shost->last_reset)
+                shost->last_reset = jiffies;
+        spin_unlock_irqrestore(shost->host_lock, flags);
+
+        scmd->eh_eflags |= SCSI_EH_ABORT_SCHEDULED;
+        SCSI_LOG_ERROR_RECOVERY(3,
+                scmd_printk(KERN_INFO, scmd,
+                            "scmd %p abort scheduled\n", scmd));
+        queue_delayed_work(shost->tmf_work_q, &scmd->abort_work, HZ / 100);
+        return SUCCESS;
+}
+
+/**
  * scsi_eh_scmd_add - add scsi cmd to error handling.
  * @scmd:       scmd to run eh on.
  * @eh_flag:    optional SCSI_EH flag.
@@ -121,10 +244,12 @@ int scsi_eh_scmd_add(struct scsi_cmnd *scmd, int eh_flag)
                 if (scsi_host_set_state(shost, SHOST_CANCEL_RECOVERY))
                         goto out_unlock;
 
-        if (shost->eh_deadline && !shost->last_reset)
+        if (shost->eh_deadline != -1 && !shost->last_reset)
                 shost->last_reset = jiffies;
 
         ret = 1;
+        if (scmd->eh_eflags & SCSI_EH_ABORT_SCHEDULED)
+                eh_flag &= ~SCSI_EH_CANCEL_CMD;
         scmd->eh_eflags |= eh_flag;
         list_add_tail(&scmd->eh_entry, &shost->eh_cmd_q);
         shost->host_failed++;
@@ -153,7 +278,7 @@ enum blk_eh_timer_return scsi_times_out(struct request *req)
         trace_scsi_dispatch_cmd_timeout(scmd);
         scsi_log_completion(scmd, TIMEOUT_ERROR);
 
-        if (host->eh_deadline && !host->last_reset)
+        if (host->eh_deadline != -1 && !host->last_reset)
                 host->last_reset = jiffies;
 
         if (host->transportt->eh_timed_out)
@@ -161,6 +286,10 @@ enum blk_eh_timer_return scsi_times_out(struct request *req)
         else if (host->hostt->eh_timed_out)
                 rtn = host->hostt->eh_timed_out(scmd);
 
+        if (rtn == BLK_EH_NOT_HANDLED && !host->hostt->no_async_abort)
+                if (scsi_abort_command(scmd) == SUCCESS)
+                        return BLK_EH_NOT_HANDLED;
+
         scmd->result |= DID_TIME_OUT << 16;
 
         if (unlikely(rtn == BLK_EH_NOT_HANDLED &&
@@ -941,12 +1070,6 @@ retry:
 
         scsi_eh_restore_cmnd(scmd, &ses);
 
-        if (scmd->request->cmd_type != REQ_TYPE_BLOCK_PC) {
-                struct scsi_driver *sdrv = scsi_cmd_to_driver(scmd);
-                if (sdrv->eh_action)
-                        rtn = sdrv->eh_action(scmd, cmnd, cmnd_size, rtn);
-        }
-
         return rtn;
 }
 
@@ -964,6 +1087,16 @@ static int scsi_request_sense(struct scsi_cmnd *scmd)
         return scsi_send_eh_cmnd(scmd, NULL, 0, scmd->device->eh_timeout, ~0);
 }
 
+static int scsi_eh_action(struct scsi_cmnd *scmd, int rtn)
+{
+        if (scmd->request->cmd_type != REQ_TYPE_BLOCK_PC) {
+                struct scsi_driver *sdrv = scsi_cmd_to_driver(scmd);
+                if (sdrv->eh_action)
+                        rtn = sdrv->eh_action(scmd, rtn);
+        }
+        return rtn;
+}
+
 /**
  * scsi_eh_finish_cmd - Handle a cmd that eh is finished with.
  * @scmd:       Original SCSI cmd that eh has finished.
@@ -1010,7 +1143,6 @@ int scsi_eh_get_sense(struct list_head *work_q,
         struct scsi_cmnd *scmd, *next;
         struct Scsi_Host *shost;
         int rtn;
-        unsigned long flags;
 
         list_for_each_entry_safe(scmd, next, work_q, eh_entry) {
                 if ((scmd->eh_eflags & SCSI_EH_CANCEL_CMD) ||
@@ -1018,16 +1150,13 @@ int scsi_eh_get_sense(struct list_head *work_q,
                         continue;
 
                 shost = scmd->device->host;
-                spin_lock_irqsave(shost->host_lock, flags);
                 if (scsi_host_eh_past_deadline(shost)) {
-                        spin_unlock_irqrestore(shost->host_lock, flags);
                         SCSI_LOG_ERROR_RECOVERY(3,
                                 shost_printk(KERN_INFO, shost,
                                             "skip %s, past eh deadline\n",
                                              __func__));
                         break;
                 }
-                spin_unlock_irqrestore(shost->host_lock, flags);
                 SCSI_LOG_ERROR_RECOVERY(2, scmd_printk(KERN_INFO, scmd,
                                                   "%s: requesting sense\n",
                                                   current->comm));
@@ -1113,26 +1242,21 @@ static int scsi_eh_test_devices(struct list_head *cmd_list,
         struct scsi_cmnd *scmd, *next;
         struct scsi_device *sdev;
         int finish_cmds;
-        unsigned long flags;
 
         while (!list_empty(cmd_list)) {
                 scmd = list_entry(cmd_list->next, struct scsi_cmnd, eh_entry);
                 sdev = scmd->device;
 
                 if (!try_stu) {
-                        spin_lock_irqsave(sdev->host->host_lock, flags);
                         if (scsi_host_eh_past_deadline(sdev->host)) {
                                 /* Push items back onto work_q */
                                 list_splice_init(cmd_list, work_q);
-                                spin_unlock_irqrestore(sdev->host->host_lock,
-                                                       flags);
                                 SCSI_LOG_ERROR_RECOVERY(3,
                                         shost_printk(KERN_INFO, sdev->host,
                                                      "skip %s, past eh deadline",
                                                      __func__));
                                 break;
                         }
-                        spin_unlock_irqrestore(sdev->host->host_lock, flags);
                 }
 
                 finish_cmds = !scsi_device_online(scmd->device) ||
@@ -1142,7 +1266,9 @@ static int scsi_eh_test_devices(struct list_head *cmd_list,
 
                 list_for_each_entry_safe(scmd, next, cmd_list, eh_entry)
                         if (scmd->device == sdev) {
-                                if (finish_cmds)
+                                if (finish_cmds &&
+                                    (try_stu ||
+                                     scsi_eh_action(scmd, SUCCESS) == SUCCESS))
                                         scsi_eh_finish_cmd(scmd, done_q);
                                 else
                                         list_move_tail(&scmd->eh_entry, work_q);
@@ -1171,15 +1297,12 @@ static int scsi_eh_abort_cmds(struct list_head *work_q,
         LIST_HEAD(check_list);
         int rtn;
         struct Scsi_Host *shost;
-        unsigned long flags;
 
         list_for_each_entry_safe(scmd, next, work_q, eh_entry) {
                 if (!(scmd->eh_eflags & SCSI_EH_CANCEL_CMD))
                         continue;
                 shost = scmd->device->host;
-                spin_lock_irqsave(shost->host_lock, flags);
                 if (scsi_host_eh_past_deadline(shost)) {
-                        spin_unlock_irqrestore(shost->host_lock, flags);
                         list_splice_init(&check_list, work_q);
                         SCSI_LOG_ERROR_RECOVERY(3,
                                 shost_printk(KERN_INFO, shost,
@@ -1187,7 +1310,6 @@ static int scsi_eh_abort_cmds(struct list_head *work_q,
                                              __func__));
                         return list_empty(work_q);
                 }
-                spin_unlock_irqrestore(shost->host_lock, flags);
                 SCSI_LOG_ERROR_RECOVERY(3, printk("%s: aborting cmd:"
                                                   "0x%p\n", current->comm,
                                                   scmd));
@@ -1251,19 +1373,15 @@ static int scsi_eh_stu(struct Scsi_Host *shost,
 {
         struct scsi_cmnd *scmd, *stu_scmd, *next;
         struct scsi_device *sdev;
-        unsigned long flags;
 
         shost_for_each_device(sdev, shost) {
-                spin_lock_irqsave(shost->host_lock, flags);
                 if (scsi_host_eh_past_deadline(shost)) {
-                        spin_unlock_irqrestore(shost->host_lock, flags);
                         SCSI_LOG_ERROR_RECOVERY(3,
                                 shost_printk(KERN_INFO, shost,
                                             "skip %s, past eh deadline\n",
                                              __func__));
                         break;
                 }
-                spin_unlock_irqrestore(shost->host_lock, flags);
                 stu_scmd = NULL;
                 list_for_each_entry(scmd, work_q, eh_entry)
                         if (scmd->device == sdev && SCSI_SENSE_VALID(scmd) &&
@@ -1283,7 +1401,8 @@ static int scsi_eh_stu(struct Scsi_Host *shost,
                             !scsi_eh_tur(stu_scmd)) {
                                 list_for_each_entry_safe(scmd, next,
                                                           work_q, eh_entry) {
-                                        if (scmd->device == sdev)
+                                        if (scmd->device == sdev &&
+                                            scsi_eh_action(scmd, SUCCESS) == SUCCESS)
                                                 scsi_eh_finish_cmd(scmd, done_q);
                                 }
                         }
@@ -1316,20 +1435,16 @@ static int scsi_eh_bus_device_reset(struct Scsi_Host *shost,
 {
         struct scsi_cmnd *scmd, *bdr_scmd, *next;
         struct scsi_device *sdev;
-        unsigned long flags;
         int rtn;
 
         shost_for_each_device(sdev, shost) {
-                spin_lock_irqsave(shost->host_lock, flags);
                 if (scsi_host_eh_past_deadline(shost)) {
-                        spin_unlock_irqrestore(shost->host_lock, flags);
                         SCSI_LOG_ERROR_RECOVERY(3,
                                 shost_printk(KERN_INFO, shost,
                                             "skip %s, past eh deadline\n",
                                              __func__));
                         break;
                 }
-                spin_unlock_irqrestore(shost->host_lock, flags);
                 bdr_scmd = NULL;
                 list_for_each_entry(scmd, work_q, eh_entry)
                         if (scmd->device == sdev) {
@@ -1350,7 +1465,8 @@ static int scsi_eh_bus_device_reset(struct Scsi_Host *shost,
                             !scsi_eh_tur(bdr_scmd)) {
                                 list_for_each_entry_safe(scmd, next,
                                                          work_q, eh_entry) {
-                                        if (scmd->device == sdev)
+                                        if (scmd->device == sdev &&
+                                            scsi_eh_action(scmd, rtn) != FAILED)
                                                 scsi_eh_finish_cmd(scmd,
                                                                    done_q);
                                 }
@@ -1389,11 +1505,8 @@ static int scsi_eh_target_reset(struct Scsi_Host *shost,
                 struct scsi_cmnd *next, *scmd;
                 int rtn;
                 unsigned int id;
-                unsigned long flags;
 
-                spin_lock_irqsave(shost->host_lock, flags);
                 if (scsi_host_eh_past_deadline(shost)) {
-                        spin_unlock_irqrestore(shost->host_lock, flags);
                         /* push back on work queue for further processing */
                         list_splice_init(&check_list, work_q);
                         list_splice_init(&tmp_list, work_q);
@@ -1403,7 +1516,6 @@ static int scsi_eh_target_reset(struct Scsi_Host *shost,
                                              __func__));
                         return list_empty(work_q);
                 }
-                spin_unlock_irqrestore(shost->host_lock, flags);
 
                 scmd = list_entry(tmp_list.next, struct scsi_cmnd, eh_entry);
                 id = scmd_id(scmd);
@@ -1448,7 +1560,6 @@ static int scsi_eh_bus_reset(struct Scsi_Host *shost,
         LIST_HEAD(check_list);
         unsigned int channel;
         int rtn;
-        unsigned long flags;
 
         /*
          * we really want to loop over the various channels, and do this on
@@ -1458,9 +1569,7 @@ static int scsi_eh_bus_reset(struct Scsi_Host *shost,
          */
 
         for (channel = 0; channel <= shost->max_channel; channel++) {
-                spin_lock_irqsave(shost->host_lock, flags);
                 if (scsi_host_eh_past_deadline(shost)) {
-                        spin_unlock_irqrestore(shost->host_lock, flags);
                         list_splice_init(&check_list, work_q);
                         SCSI_LOG_ERROR_RECOVERY(3,
                                 shost_printk(KERN_INFO, shost,
@@ -1468,7 +1577,6 @@ static int scsi_eh_bus_reset(struct Scsi_Host *shost,
                                              __func__));
                         return list_empty(work_q);
                 }
-                spin_unlock_irqrestore(shost->host_lock, flags);
 
                 chan_scmd = NULL;
                 list_for_each_entry(scmd, work_q, eh_entry) {
@@ -1569,7 +1677,7 @@ static void scsi_eh_offline_sdevs(struct list_head *work_q,
 }
 
 /**
- * scsi_noretry_cmd - determinte if command should be failed fast
+ * scsi_noretry_cmd - determine if command should be failed fast
  * @scmd:       SCSI cmd to examine.
  */
 int scsi_noretry_cmd(struct scsi_cmnd *scmd)
@@ -1577,6 +1685,8 @@ int scsi_noretry_cmd(struct scsi_cmnd *scmd)
         switch (host_byte(scmd->result)) {
         case DID_OK:
                 break;
+        case DID_TIME_OUT:
+                goto check_type;
         case DID_BUS_BUSY:
                 return (scmd->request->cmd_flags & REQ_FAILFAST_TRANSPORT);
         case DID_PARITY:
@@ -1590,18 +1700,19 @@ int scsi_noretry_cmd(struct scsi_cmnd *scmd)
                 return (scmd->request->cmd_flags & REQ_FAILFAST_DRIVER);
         }
 
-        switch (status_byte(scmd->result)) {
-        case CHECK_CONDITION:
-                /*
-                 * assume caller has checked sense and determinted
-                 * the check condition was retryable.
-                 */
-                if (scmd->request->cmd_flags & REQ_FAILFAST_DEV ||
-                    scmd->request->cmd_type == REQ_TYPE_BLOCK_PC)
-                        return 1;
-        }
+        if (status_byte(scmd->result) != CHECK_CONDITION)
+                return 0;
 
-        return 0;
+check_type:
+        /*
+         * assume caller has checked sense and determined
+         * the check condition was retryable.
+         */
+        if (scmd->request->cmd_flags & REQ_FAILFAST_DEV ||
+            scmd->request->cmd_type == REQ_TYPE_BLOCK_PC)
+                return 1;
+        else
+                return 0;
 }
 
 /**
@@ -1651,9 +1762,13 @@ int scsi_decide_disposition(struct scsi_cmnd *scmd)
                  * looks good.  drop through, and check the next byte.
                  */
                 break;
+        case DID_ABORT:
+                if (scmd->eh_eflags & SCSI_EH_ABORT_SCHEDULED) {
+                        scmd->result |= DID_TIME_OUT << 16;
+                        return SUCCESS;
+                }
         case DID_NO_CONNECT:
         case DID_BAD_TARGET:
-        case DID_ABORT:
                 /*
                  * note - this means that we just report the status back
                  * to the top level driver, not that we actually think
@@ -1999,7 +2114,7 @@ static void scsi_unjam_host(struct Scsi_Host *shost)
                         scsi_eh_ready_devs(shost, &eh_work_q, &eh_done_q);
 
         spin_lock_irqsave(shost->host_lock, flags);
-        if (shost->eh_deadline)
+        if (shost->eh_deadline != -1)
                 shost->last_reset = 0;
         spin_unlock_irqrestore(shost->host_lock, flags);
         scsi_eh_flush_done_q(&eh_done_q);
diff --git a/drivers/scsi/scsi_pm.c b/drivers/scsi/scsi_pm.c
index af4c050ce6e4..001e9ceda4c3 100644
--- a/drivers/scsi/scsi_pm.c
+++ b/drivers/scsi/scsi_pm.c
@@ -16,6 +16,8 @@
 
 #include "scsi_priv.h"
 
+#ifdef CONFIG_PM_SLEEP
+
 static int scsi_dev_type_suspend(struct device *dev, int (*cb)(struct device *))
 {
         int err;
@@ -43,8 +45,6 @@ static int scsi_dev_type_resume(struct device *dev, int (*cb)(struct device *))
         return err;
 }
 
-#ifdef CONFIG_PM_SLEEP
-
 static int
 scsi_bus_suspend_common(struct device *dev, int (*cb)(struct device *))
 {
@@ -145,38 +145,22 @@ static int scsi_bus_restore(struct device *dev)
 
 #ifdef CONFIG_PM_RUNTIME
 
-static int sdev_blk_runtime_suspend(struct scsi_device *sdev,
-                                        int (*cb)(struct device *))
+static int sdev_runtime_suspend(struct device *dev)
 {
+        const struct dev_pm_ops *pm = dev->driver ? dev->driver->pm : NULL;
+        struct scsi_device *sdev = to_scsi_device(dev);
         int err;
 
         err = blk_pre_runtime_suspend(sdev->request_queue);
         if (err)
                 return err;
-        if (cb)
-                err = cb(&sdev->sdev_gendev);
+        if (pm && pm->runtime_suspend)
+                err = pm->runtime_suspend(dev);
         blk_post_runtime_suspend(sdev->request_queue, err);
 
         return err;
 }
 
-static int sdev_runtime_suspend(struct device *dev)
-{
-        const struct dev_pm_ops *pm = dev->driver ? dev->driver->pm : NULL;
-        int (*cb)(struct device *) = pm ? pm->runtime_suspend : NULL;
-        struct scsi_device *sdev = to_scsi_device(dev);
-        int err;
-
-        if (sdev->request_queue->dev)
-                return sdev_blk_runtime_suspend(sdev, cb);
-
-        err = scsi_dev_type_suspend(dev, cb);
-        if (err == -EAGAIN)
-                pm_schedule_suspend(dev, jiffies_to_msecs(
-                                        round_jiffies_up_relative(HZ/10)));
-        return err;
-}
-
 static int scsi_runtime_suspend(struct device *dev)
 {
         int err = 0;
@@ -190,31 +174,20 @@ static int scsi_runtime_suspend(struct device *dev)
         return err;
 }
 
-static int sdev_blk_runtime_resume(struct scsi_device *sdev,
-                                        int (*cb)(struct device *))
+static int sdev_runtime_resume(struct device *dev)
 {
+        struct scsi_device *sdev = to_scsi_device(dev);
+        const struct dev_pm_ops *pm = dev->driver ? dev->driver->pm : NULL;
         int err = 0;
 
         blk_pre_runtime_resume(sdev->request_queue);
-        if (cb)
-                err = cb(&sdev->sdev_gendev);
+        if (pm && pm->runtime_resume)
+                err = pm->runtime_resume(dev);
         blk_post_runtime_resume(sdev->request_queue, err);
 
         return err;
 }
 
-static int sdev_runtime_resume(struct device *dev)
-{
-        struct scsi_device *sdev = to_scsi_device(dev);
-        const struct dev_pm_ops *pm = dev->driver ? dev->driver->pm : NULL;
-        int (*cb)(struct device *) = pm ? pm->runtime_resume : NULL;
-
-        if (sdev->request_queue->dev)
-                return sdev_blk_runtime_resume(sdev, cb);
-        else
-                return scsi_dev_type_resume(dev, cb);
-}
-
 static int scsi_runtime_resume(struct device *dev)
 {
         int err = 0;
@@ -235,14 +208,11 @@ static int scsi_runtime_idle(struct device *dev)
         /* Insert hooks here for targets, hosts, and transport classes */
 
         if (scsi_is_sdev_device(dev)) {
-                struct scsi_device *sdev = to_scsi_device(dev);
-
-                if (sdev->request_queue->dev) {
-                        pm_runtime_mark_last_busy(dev);
-                        pm_runtime_autosuspend(dev);
-                        return -EBUSY;
-                }
+                pm_runtime_mark_last_busy(dev);
+                pm_runtime_autosuspend(dev);
+                return -EBUSY;
         }
+
         return 0;
 }
 
diff --git a/drivers/scsi/scsi_priv.h b/drivers/scsi/scsi_priv.h
index 8f9a0cadc296..f079a598bed4 100644
--- a/drivers/scsi/scsi_priv.h
+++ b/drivers/scsi/scsi_priv.h
@@ -19,6 +19,7 @@ struct scsi_nl_hdr;
  * Scsi Error Handler Flags
  */
 #define SCSI_EH_CANCEL_CMD      0x0001  /* Cancel this cmd */
+#define SCSI_EH_ABORT_SCHEDULED 0x0002  /* Abort has been scheduled */
 
 #define SCSI_SENSE_VALID(scmd) \
         (((scmd)->sense_buffer[0] & 0x70) == 0x70)
@@ -66,6 +67,7 @@ extern int __init scsi_init_devinfo(void);
 extern void scsi_exit_devinfo(void);
 
 /* scsi_error.c */
+extern void scmd_eh_abort_handler(struct work_struct *work);
 extern enum blk_eh_timer_return scsi_times_out(struct request *req);
 extern int scsi_error_handler(void *host);
 extern int scsi_decide_disposition(struct scsi_cmnd *cmd);
diff --git a/drivers/scsi/scsi_sysfs.c b/drivers/scsi/scsi_sysfs.c
index 8ff62c26a41c..9117d0bf408e 100644
--- a/drivers/scsi/scsi_sysfs.c
+++ b/drivers/scsi/scsi_sysfs.c
@@ -287,7 +287,9 @@ show_shost_eh_deadline(struct device *dev,
 {
         struct Scsi_Host *shost = class_to_shost(dev);
 
-        return sprintf(buf, "%d\n", shost->eh_deadline / HZ);
+        if (shost->eh_deadline == -1)
+                return snprintf(buf, strlen("off") + 2, "off\n");
+        return sprintf(buf, "%u\n", shost->eh_deadline / HZ);
 }
 
 static ssize_t
@@ -296,22 +298,34 @@ store_shost_eh_deadline(struct device *dev, struct device_attribute *attr,
 {
         struct Scsi_Host *shost = class_to_shost(dev);
         int ret = -EINVAL;
-        int deadline;
-        unsigned long flags;
+        unsigned long deadline, flags;
 
         if (shost->transportt && shost->transportt->eh_strategy_handler)
                 return ret;
 
-        if (sscanf(buf, "%d\n", &deadline) == 1) {
-                spin_lock_irqsave(shost->host_lock, flags);
-                if (scsi_host_in_recovery(shost))
-                        ret = -EBUSY;
-                else {
+        if (!strncmp(buf, "off", strlen("off")))
+                deadline = -1;
+        else {
+                ret = kstrtoul(buf, 10, &deadline);
+                if (ret)
+                        return ret;
+                if (deadline * HZ > UINT_MAX)
+                        return -EINVAL;
+        }
+
+        spin_lock_irqsave(shost->host_lock, flags);
+        if (scsi_host_in_recovery(shost))
+                ret = -EBUSY;
+        else {
+                if (deadline == -1)
+                        shost->eh_deadline = -1;
+                else
                         shost->eh_deadline = deadline * HZ;
-                        ret = count;
-                }
-                spin_unlock_irqrestore(shost->host_lock, flags);
+
+                ret = count;
         }
+        spin_unlock_irqrestore(shost->host_lock, flags);
+
         return ret;
 }
 
diff --git a/drivers/scsi/scsi_transport_iscsi.c b/drivers/scsi/scsi_transport_iscsi.c
index de5b4d9bb022..0102a2d70dd8 100644
--- a/drivers/scsi/scsi_transport_iscsi.c
+++ b/drivers/scsi/scsi_transport_iscsi.c
@@ -305,20 +305,71 @@ show_##type##_##name(struct device *dev, struct device_attribute *attr,	\
         iscsi_iface_attr_show(type, name, ISCSI_NET_PARAM, param)       \
 static ISCSI_IFACE_ATTR(type, name, S_IRUGO, show_##type##_##name, NULL);
 
-/* generic read only ipvi4 attribute */
+#define iscsi_iface_attr(type, name, param)                             \
+        iscsi_iface_attr_show(type, name, ISCSI_IFACE_PARAM, param)     \
+static ISCSI_IFACE_ATTR(type, name, S_IRUGO, show_##type##_##name, NULL);
+
+/* generic read only ipv4 attribute */
 iscsi_iface_net_attr(ipv4_iface, ipaddress, ISCSI_NET_PARAM_IPV4_ADDR);
 iscsi_iface_net_attr(ipv4_iface, gateway, ISCSI_NET_PARAM_IPV4_GW);
 iscsi_iface_net_attr(ipv4_iface, subnet, ISCSI_NET_PARAM_IPV4_SUBNET);
 iscsi_iface_net_attr(ipv4_iface, bootproto, ISCSI_NET_PARAM_IPV4_BOOTPROTO);
+iscsi_iface_net_attr(ipv4_iface, dhcp_dns_address_en,
+                     ISCSI_NET_PARAM_IPV4_DHCP_DNS_ADDR_EN);
+iscsi_iface_net_attr(ipv4_iface, dhcp_slp_da_info_en,
+                     ISCSI_NET_PARAM_IPV4_DHCP_SLP_DA_EN);
+iscsi_iface_net_attr(ipv4_iface, tos_en, ISCSI_NET_PARAM_IPV4_TOS_EN);
+iscsi_iface_net_attr(ipv4_iface, tos, ISCSI_NET_PARAM_IPV4_TOS);
+iscsi_iface_net_attr(ipv4_iface, grat_arp_en,
+                     ISCSI_NET_PARAM_IPV4_GRAT_ARP_EN);
+iscsi_iface_net_attr(ipv4_iface, dhcp_alt_client_id_en,
+                     ISCSI_NET_PARAM_IPV4_DHCP_ALT_CLIENT_ID_EN);
+iscsi_iface_net_attr(ipv4_iface, dhcp_alt_client_id,
+                     ISCSI_NET_PARAM_IPV4_DHCP_ALT_CLIENT_ID);
+iscsi_iface_net_attr(ipv4_iface, dhcp_req_vendor_id_en,
+                     ISCSI_NET_PARAM_IPV4_DHCP_REQ_VENDOR_ID_EN);
+iscsi_iface_net_attr(ipv4_iface, dhcp_use_vendor_id_en,
+                     ISCSI_NET_PARAM_IPV4_DHCP_USE_VENDOR_ID_EN);
+iscsi_iface_net_attr(ipv4_iface, dhcp_vendor_id,
+                     ISCSI_NET_PARAM_IPV4_DHCP_VENDOR_ID);
+iscsi_iface_net_attr(ipv4_iface, dhcp_learn_iqn_en,
+                     ISCSI_NET_PARAM_IPV4_DHCP_LEARN_IQN_EN);
+iscsi_iface_net_attr(ipv4_iface, fragment_disable,
+                     ISCSI_NET_PARAM_IPV4_FRAGMENT_DISABLE);
+iscsi_iface_net_attr(ipv4_iface, incoming_forwarding_en,
+                     ISCSI_NET_PARAM_IPV4_IN_FORWARD_EN);
+iscsi_iface_net_attr(ipv4_iface, ttl, ISCSI_NET_PARAM_IPV4_TTL);
 
 /* generic read only ipv6 attribute */
 iscsi_iface_net_attr(ipv6_iface, ipaddress, ISCSI_NET_PARAM_IPV6_ADDR);
-iscsi_iface_net_attr(ipv6_iface, link_local_addr, ISCSI_NET_PARAM_IPV6_LINKLOCAL);
+iscsi_iface_net_attr(ipv6_iface, link_local_addr,
+                     ISCSI_NET_PARAM_IPV6_LINKLOCAL);
 iscsi_iface_net_attr(ipv6_iface, router_addr, ISCSI_NET_PARAM_IPV6_ROUTER);
 iscsi_iface_net_attr(ipv6_iface, ipaddr_autocfg,
                      ISCSI_NET_PARAM_IPV6_ADDR_AUTOCFG);
 iscsi_iface_net_attr(ipv6_iface, link_local_autocfg,
                      ISCSI_NET_PARAM_IPV6_LINKLOCAL_AUTOCFG);
+iscsi_iface_net_attr(ipv6_iface, link_local_state,
+                     ISCSI_NET_PARAM_IPV6_LINKLOCAL_STATE);
+iscsi_iface_net_attr(ipv6_iface, router_state,
+                     ISCSI_NET_PARAM_IPV6_ROUTER_STATE);
+iscsi_iface_net_attr(ipv6_iface, grat_neighbor_adv_en,
+                     ISCSI_NET_PARAM_IPV6_GRAT_NEIGHBOR_ADV_EN);
+iscsi_iface_net_attr(ipv6_iface, mld_en, ISCSI_NET_PARAM_IPV6_MLD_EN);
+iscsi_iface_net_attr(ipv6_iface, flow_label, ISCSI_NET_PARAM_IPV6_FLOW_LABEL);
+iscsi_iface_net_attr(ipv6_iface, traffic_class,
+                     ISCSI_NET_PARAM_IPV6_TRAFFIC_CLASS);
+iscsi_iface_net_attr(ipv6_iface, hop_limit, ISCSI_NET_PARAM_IPV6_HOP_LIMIT);
+iscsi_iface_net_attr(ipv6_iface, nd_reachable_tmo,
+                     ISCSI_NET_PARAM_IPV6_ND_REACHABLE_TMO);
+iscsi_iface_net_attr(ipv6_iface, nd_rexmit_time,
+                     ISCSI_NET_PARAM_IPV6_ND_REXMIT_TIME);
+iscsi_iface_net_attr(ipv6_iface, nd_stale_tmo,
+                     ISCSI_NET_PARAM_IPV6_ND_STALE_TMO);
+iscsi_iface_net_attr(ipv6_iface, dup_addr_detect_cnt,
+                     ISCSI_NET_PARAM_IPV6_DUP_ADDR_DETECT_CNT);
+iscsi_iface_net_attr(ipv6_iface, router_adv_link_mtu,
+                     ISCSI_NET_PARAM_IPV6_RTR_ADV_LINK_MTU);
 
 /* common read only iface attribute */
 iscsi_iface_net_attr(iface, enabled, ISCSI_NET_PARAM_IFACE_ENABLE);
@@ -327,6 +378,40 @@ iscsi_iface_net_attr(iface, vlan_priority, ISCSI_NET_PARAM_VLAN_PRIORITY);
 iscsi_iface_net_attr(iface, vlan_enabled, ISCSI_NET_PARAM_VLAN_ENABLED);
 iscsi_iface_net_attr(iface, mtu, ISCSI_NET_PARAM_MTU);
 iscsi_iface_net_attr(iface, port, ISCSI_NET_PARAM_PORT);
+iscsi_iface_net_attr(iface, ipaddress_state, ISCSI_NET_PARAM_IPADDR_STATE);
+iscsi_iface_net_attr(iface, delayed_ack_en, ISCSI_NET_PARAM_DELAYED_ACK_EN);
+iscsi_iface_net_attr(iface, tcp_nagle_disable,
+                     ISCSI_NET_PARAM_TCP_NAGLE_DISABLE);
+iscsi_iface_net_attr(iface, tcp_wsf_disable, ISCSI_NET_PARAM_TCP_WSF_DISABLE);
+iscsi_iface_net_attr(iface, tcp_wsf, ISCSI_NET_PARAM_TCP_WSF);
+iscsi_iface_net_attr(iface, tcp_timer_scale, ISCSI_NET_PARAM_TCP_TIMER_SCALE);
+iscsi_iface_net_attr(iface, tcp_timestamp_en, ISCSI_NET_PARAM_TCP_TIMESTAMP_EN);
+iscsi_iface_net_attr(iface, cache_id, ISCSI_NET_PARAM_CACHE_ID);
+iscsi_iface_net_attr(iface, redirect_en, ISCSI_NET_PARAM_REDIRECT_EN);
+
+/* common iscsi specific settings attributes */
+iscsi_iface_attr(iface, def_taskmgmt_tmo, ISCSI_IFACE_PARAM_DEF_TASKMGMT_TMO);
+iscsi_iface_attr(iface, header_digest, ISCSI_IFACE_PARAM_HDRDGST_EN);
+iscsi_iface_attr(iface, data_digest, ISCSI_IFACE_PARAM_DATADGST_EN);
+iscsi_iface_attr(iface, immediate_data, ISCSI_IFACE_PARAM_IMM_DATA_EN);
+iscsi_iface_attr(iface, initial_r2t, ISCSI_IFACE_PARAM_INITIAL_R2T_EN);
+iscsi_iface_attr(iface, data_seq_in_order,
+                 ISCSI_IFACE_PARAM_DATASEQ_INORDER_EN);
+iscsi_iface_attr(iface, data_pdu_in_order, ISCSI_IFACE_PARAM_PDU_INORDER_EN);
+iscsi_iface_attr(iface, erl, ISCSI_IFACE_PARAM_ERL);
+iscsi_iface_attr(iface, max_recv_dlength, ISCSI_IFACE_PARAM_MAX_RECV_DLENGTH);
+iscsi_iface_attr(iface, first_burst_len, ISCSI_IFACE_PARAM_FIRST_BURST);
+iscsi_iface_attr(iface, max_outstanding_r2t, ISCSI_IFACE_PARAM_MAX_R2T);
+iscsi_iface_attr(iface, max_burst_len, ISCSI_IFACE_PARAM_MAX_BURST);
+iscsi_iface_attr(iface, chap_auth, ISCSI_IFACE_PARAM_CHAP_AUTH_EN);
+iscsi_iface_attr(iface, bidi_chap, ISCSI_IFACE_PARAM_BIDI_CHAP_EN);
+iscsi_iface_attr(iface, discovery_auth_optional,
+                 ISCSI_IFACE_PARAM_DISCOVERY_AUTH_OPTIONAL);
+iscsi_iface_attr(iface, discovery_logout,
+                 ISCSI_IFACE_PARAM_DISCOVERY_LOGOUT_EN);
+iscsi_iface_attr(iface, strict_login_comp_en,
+                 ISCSI_IFACE_PARAM_STRICT_LOGIN_COMP_EN);
+iscsi_iface_attr(iface, initiator_name, ISCSI_IFACE_PARAM_INITIATOR_NAME);
 
 static umode_t iscsi_iface_attr_is_visible(struct kobject *kobj,
                                           struct attribute *attr, int i)
@@ -335,6 +420,7 @@ static umode_t iscsi_iface_attr_is_visible(struct kobject *kobj,
         struct iscsi_iface *iface = iscsi_dev_to_iface(dev);
         struct iscsi_transport *t = iface->transport;
         int param;
+        int param_type;
 
         if (attr == &dev_attr_iface_enabled.attr)
                 param = ISCSI_NET_PARAM_IFACE_ENABLE;
@@ -348,6 +434,60 @@ static umode_t iscsi_iface_attr_is_visible(struct kobject *kobj,
                 param = ISCSI_NET_PARAM_MTU;
         else if (attr == &dev_attr_iface_port.attr)
                 param = ISCSI_NET_PARAM_PORT;
+        else if (attr == &dev_attr_iface_ipaddress_state.attr)
+                param = ISCSI_NET_PARAM_IPADDR_STATE;
+        else if (attr == &dev_attr_iface_delayed_ack_en.attr)
+                param = ISCSI_NET_PARAM_DELAYED_ACK_EN;
+        else if (attr == &dev_attr_iface_tcp_nagle_disable.attr)
+                param = ISCSI_NET_PARAM_TCP_NAGLE_DISABLE;
+        else if (attr == &dev_attr_iface_tcp_wsf_disable.attr)
+                param = ISCSI_NET_PARAM_TCP_WSF_DISABLE;
+        else if (attr == &dev_attr_iface_tcp_wsf.attr)
+                param = ISCSI_NET_PARAM_TCP_WSF;
+        else if (attr == &dev_attr_iface_tcp_timer_scale.attr)
+                param = ISCSI_NET_PARAM_TCP_TIMER_SCALE;
+        else if (attr == &dev_attr_iface_tcp_timestamp_en.attr)
+                param = ISCSI_NET_PARAM_TCP_TIMESTAMP_EN;
+        else if (attr == &dev_attr_iface_cache_id.attr)
+                param = ISCSI_NET_PARAM_CACHE_ID;
+        else if (attr == &dev_attr_iface_redirect_en.attr)
+                param = ISCSI_NET_PARAM_REDIRECT_EN;
+        else if (attr == &dev_attr_iface_def_taskmgmt_tmo.attr)
+                param = ISCSI_IFACE_PARAM_DEF_TASKMGMT_TMO;
+        else if (attr == &dev_attr_iface_header_digest.attr)
+                param = ISCSI_IFACE_PARAM_HDRDGST_EN;
+        else if (attr == &dev_attr_iface_data_digest.attr)
+                param = ISCSI_IFACE_PARAM_DATADGST_EN;
+        else if (attr == &dev_attr_iface_immediate_data.attr)
+                param = ISCSI_IFACE_PARAM_IMM_DATA_EN;
+        else if (attr == &dev_attr_iface_initial_r2t.attr)
+                param = ISCSI_IFACE_PARAM_INITIAL_R2T_EN;
+        else if (attr == &dev_attr_iface_data_seq_in_order.attr)
+                param = ISCSI_IFACE_PARAM_DATASEQ_INORDER_EN;
+        else if (attr == &dev_attr_iface_data_pdu_in_order.attr)
+                param = ISCSI_IFACE_PARAM_PDU_INORDER_EN;
+        else if (attr == &dev_attr_iface_erl.attr)
+                param = ISCSI_IFACE_PARAM_ERL;
+        else if (attr == &dev_attr_iface_max_recv_dlength.attr)
+                param = ISCSI_IFACE_PARAM_MAX_RECV_DLENGTH;
+        else if (attr == &dev_attr_iface_first_burst_len.attr)
+                param = ISCSI_IFACE_PARAM_FIRST_BURST;
+        else if (attr == &dev_attr_iface_max_outstanding_r2t.attr)
+                param = ISCSI_IFACE_PARAM_MAX_R2T;
+        else if (attr == &dev_attr_iface_max_burst_len.attr)
+                param = ISCSI_IFACE_PARAM_MAX_BURST;
+        else if (attr == &dev_attr_iface_chap_auth.attr)
+                param = ISCSI_IFACE_PARAM_CHAP_AUTH_EN;
+        else if (attr == &dev_attr_iface_bidi_chap.attr)
+                param = ISCSI_IFACE_PARAM_BIDI_CHAP_EN;
+        else if (attr == &dev_attr_iface_discovery_auth_optional.attr)
+                param = ISCSI_IFACE_PARAM_DISCOVERY_AUTH_OPTIONAL;
+        else if (attr == &dev_attr_iface_discovery_logout.attr)
+                param = ISCSI_IFACE_PARAM_DISCOVERY_LOGOUT_EN;
+        else if (attr == &dev_attr_iface_strict_login_comp_en.attr)
+                param = ISCSI_IFACE_PARAM_STRICT_LOGIN_COMP_EN;
+        else if (attr == &dev_attr_iface_initiator_name.attr)
+                param = ISCSI_IFACE_PARAM_INITIATOR_NAME;
         else if (iface->iface_type == ISCSI_IFACE_TYPE_IPV4) {
                 if (attr == &dev_attr_ipv4_iface_ipaddress.attr)
                         param = ISCSI_NET_PARAM_IPV4_ADDR;
@@ -357,6 +497,42 @@ static umode_t iscsi_iface_attr_is_visible(struct kobject *kobj,
                         param = ISCSI_NET_PARAM_IPV4_SUBNET;
                 else if (attr == &dev_attr_ipv4_iface_bootproto.attr)
                         param = ISCSI_NET_PARAM_IPV4_BOOTPROTO;
+                else if (attr ==
+                         &dev_attr_ipv4_iface_dhcp_dns_address_en.attr)
+                        param = ISCSI_NET_PARAM_IPV4_DHCP_DNS_ADDR_EN;
+                else if (attr ==
+                         &dev_attr_ipv4_iface_dhcp_slp_da_info_en.attr)
+                        param = ISCSI_NET_PARAM_IPV4_DHCP_SLP_DA_EN;
+                else if (attr == &dev_attr_ipv4_iface_tos_en.attr)
+                        param = ISCSI_NET_PARAM_IPV4_TOS_EN;
+                else if (attr == &dev_attr_ipv4_iface_tos.attr)
+                        param = ISCSI_NET_PARAM_IPV4_TOS;
+                else if (attr == &dev_attr_ipv4_iface_grat_arp_en.attr)
+                        param = ISCSI_NET_PARAM_IPV4_GRAT_ARP_EN;
+                else if (attr ==
+                         &dev_attr_ipv4_iface_dhcp_alt_client_id_en.attr)
+                        param = ISCSI_NET_PARAM_IPV4_DHCP_ALT_CLIENT_ID_EN;
+                else if (attr == &dev_attr_ipv4_iface_dhcp_alt_client_id.attr)
+                        param = ISCSI_NET_PARAM_IPV4_DHCP_ALT_CLIENT_ID;
+                else if (attr ==
+                         &dev_attr_ipv4_iface_dhcp_req_vendor_id_en.attr)
+                        param = ISCSI_NET_PARAM_IPV4_DHCP_REQ_VENDOR_ID_EN;
+                else if (attr ==
+                         &dev_attr_ipv4_iface_dhcp_use_vendor_id_en.attr)
+                        param = ISCSI_NET_PARAM_IPV4_DHCP_USE_VENDOR_ID_EN;
+                else if (attr == &dev_attr_ipv4_iface_dhcp_vendor_id.attr)
+                        param = ISCSI_NET_PARAM_IPV4_DHCP_VENDOR_ID;
+                else if (attr ==
+                         &dev_attr_ipv4_iface_dhcp_learn_iqn_en.attr)
+                        param = ISCSI_NET_PARAM_IPV4_DHCP_LEARN_IQN_EN;
+                else if (attr ==
+                         &dev_attr_ipv4_iface_fragment_disable.attr)
+                        param = ISCSI_NET_PARAM_IPV4_FRAGMENT_DISABLE;
+                else if (attr ==
+                         &dev_attr_ipv4_iface_incoming_forwarding_en.attr)
+                        param = ISCSI_NET_PARAM_IPV4_IN_FORWARD_EN;
+                else if (attr == &dev_attr_ipv4_iface_ttl.attr)
+                        param = ISCSI_NET_PARAM_IPV4_TTL;
                 else
                         return 0;
         } else if (iface->iface_type == ISCSI_IFACE_TYPE_IPV6) {
@@ -370,6 +546,31 @@ static umode_t iscsi_iface_attr_is_visible(struct kobject *kobj,
                         param = ISCSI_NET_PARAM_IPV6_ADDR_AUTOCFG;
                 else if (attr == &dev_attr_ipv6_iface_link_local_autocfg.attr)
                         param = ISCSI_NET_PARAM_IPV6_LINKLOCAL_AUTOCFG;
+                else if (attr == &dev_attr_ipv6_iface_link_local_state.attr)
+                        param = ISCSI_NET_PARAM_IPV6_LINKLOCAL_STATE;
+                else if (attr == &dev_attr_ipv6_iface_router_state.attr)
+                        param = ISCSI_NET_PARAM_IPV6_ROUTER_STATE;
+                else if (attr ==
+                         &dev_attr_ipv6_iface_grat_neighbor_adv_en.attr)
+                        param = ISCSI_NET_PARAM_IPV6_GRAT_NEIGHBOR_ADV_EN;
+                else if (attr == &dev_attr_ipv6_iface_mld_en.attr)
+                        param = ISCSI_NET_PARAM_IPV6_MLD_EN;
+                else if (attr == &dev_attr_ipv6_iface_flow_label.attr)
+                        param = ISCSI_NET_PARAM_IPV6_FLOW_LABEL;
+                else if (attr == &dev_attr_ipv6_iface_traffic_class.attr)
+                        param = ISCSI_NET_PARAM_IPV6_TRAFFIC_CLASS;
+                else if (attr == &dev_attr_ipv6_iface_hop_limit.attr)
+                        param = ISCSI_NET_PARAM_IPV6_HOP_LIMIT;
+                else if (attr == &dev_attr_ipv6_iface_nd_reachable_tmo.attr)
+                        param = ISCSI_NET_PARAM_IPV6_ND_REACHABLE_TMO;
+                else if (attr == &dev_attr_ipv6_iface_nd_rexmit_time.attr)
+                        param = ISCSI_NET_PARAM_IPV6_ND_REXMIT_TIME;
+                else if (attr == &dev_attr_ipv6_iface_nd_stale_tmo.attr)
+                        param = ISCSI_NET_PARAM_IPV6_ND_STALE_TMO;
+                else if (attr == &dev_attr_ipv6_iface_dup_addr_detect_cnt.attr)
+                        param = ISCSI_NET_PARAM_IPV6_DUP_ADDR_DETECT_CNT;
+                else if (attr == &dev_attr_ipv6_iface_router_adv_link_mtu.attr)
+                        param = ISCSI_NET_PARAM_IPV6_RTR_ADV_LINK_MTU;
                 else
                         return 0;
         } else {
@@ -377,7 +578,32 @@ static umode_t iscsi_iface_attr_is_visible(struct kobject *kobj,
                 return 0;
         }
 
-        return t->attr_is_visible(ISCSI_NET_PARAM, param);
+        switch (param) {
+        case ISCSI_IFACE_PARAM_DEF_TASKMGMT_TMO:
+        case ISCSI_IFACE_PARAM_HDRDGST_EN:
+        case ISCSI_IFACE_PARAM_DATADGST_EN:
+        case ISCSI_IFACE_PARAM_IMM_DATA_EN:
+        case ISCSI_IFACE_PARAM_INITIAL_R2T_EN:
+        case ISCSI_IFACE_PARAM_DATASEQ_INORDER_EN:
+        case ISCSI_IFACE_PARAM_PDU_INORDER_EN:
+        case ISCSI_IFACE_PARAM_ERL:
+        case ISCSI_IFACE_PARAM_MAX_RECV_DLENGTH:
+        case ISCSI_IFACE_PARAM_FIRST_BURST:
+        case ISCSI_IFACE_PARAM_MAX_R2T:
+        case ISCSI_IFACE_PARAM_MAX_BURST:
+        case ISCSI_IFACE_PARAM_CHAP_AUTH_EN:
+        case ISCSI_IFACE_PARAM_BIDI_CHAP_EN:
+        case ISCSI_IFACE_PARAM_DISCOVERY_AUTH_OPTIONAL:
+        case ISCSI_IFACE_PARAM_DISCOVERY_LOGOUT_EN:
+        case ISCSI_IFACE_PARAM_STRICT_LOGIN_COMP_EN:
+        case ISCSI_IFACE_PARAM_INITIATOR_NAME:
+                param_type = ISCSI_IFACE_PARAM;
+                break;
+        default:
+                param_type = ISCSI_NET_PARAM;
+        }
+
+        return t->attr_is_visible(param_type, param);
 }
 
 static struct attribute *iscsi_iface_attrs[] = {
@@ -396,6 +622,59 @@ static struct attribute *iscsi_iface_attrs[] = {
         &dev_attr_ipv6_iface_link_local_autocfg.attr,
         &dev_attr_iface_mtu.attr,
         &dev_attr_iface_port.attr,
+        &dev_attr_iface_ipaddress_state.attr,
+        &dev_attr_iface_delayed_ack_en.attr,
+        &dev_attr_iface_tcp_nagle_disable.attr,
+        &dev_attr_iface_tcp_wsf_disable.attr,
+        &dev_attr_iface_tcp_wsf.attr,
+        &dev_attr_iface_tcp_timer_scale.attr,
+        &dev_attr_iface_tcp_timestamp_en.attr,
+        &dev_attr_iface_cache_id.attr,
+        &dev_attr_iface_redirect_en.attr,
+        &dev_attr_iface_def_taskmgmt_tmo.attr,
+        &dev_attr_iface_header_digest.attr,
+        &dev_attr_iface_data_digest.attr,
+        &dev_attr_iface_immediate_data.attr,
+        &dev_attr_iface_initial_r2t.attr,
+        &dev_attr_iface_data_seq_in_order.attr,
+        &dev_attr_iface_data_pdu_in_order.attr,
+        &dev_attr_iface_erl.attr,
+        &dev_attr_iface_max_recv_dlength.attr,
+        &dev_attr_iface_first_burst_len.attr,
+        &dev_attr_iface_max_outstanding_r2t.attr,
+        &dev_attr_iface_max_burst_len.attr,
+        &dev_attr_iface_chap_auth.attr,
+        &dev_attr_iface_bidi_chap.attr,
+        &dev_attr_iface_discovery_auth_optional.attr,
+        &dev_attr_iface_discovery_logout.attr,
+        &dev_attr_iface_strict_login_comp_en.attr,
+        &dev_attr_iface_initiator_name.attr,
+        &dev_attr_ipv4_iface_dhcp_dns_address_en.attr,
+        &dev_attr_ipv4_iface_dhcp_slp_da_info_en.attr,
+        &dev_attr_ipv4_iface_tos_en.attr,
+        &dev_attr_ipv4_iface_tos.attr,
+        &dev_attr_ipv4_iface_grat_arp_en.attr,
+        &dev_attr_ipv4_iface_dhcp_alt_client_id_en.attr,
+        &dev_attr_ipv4_iface_dhcp_alt_client_id.attr,
+        &dev_attr_ipv4_iface_dhcp_req_vendor_id_en.attr,
+        &dev_attr_ipv4_iface_dhcp_use_vendor_id_en.attr,
+        &dev_attr_ipv4_iface_dhcp_vendor_id.attr,
+        &dev_attr_ipv4_iface_dhcp_learn_iqn_en.attr,
+        &dev_attr_ipv4_iface_fragment_disable.attr,
+        &dev_attr_ipv4_iface_incoming_forwarding_en.attr,
+        &dev_attr_ipv4_iface_ttl.attr,
+        &dev_attr_ipv6_iface_link_local_state.attr,
+        &dev_attr_ipv6_iface_router_state.attr,
+        &dev_attr_ipv6_iface_grat_neighbor_adv_en.attr,
+        &dev_attr_ipv6_iface_mld_en.attr,
+        &dev_attr_ipv6_iface_flow_label.attr,
+        &dev_attr_ipv6_iface_traffic_class.attr,
+        &dev_attr_ipv6_iface_hop_limit.attr,
+        &dev_attr_ipv6_iface_nd_reachable_tmo.attr,
+        &dev_attr_ipv6_iface_nd_rexmit_time.attr,
+        &dev_attr_ipv6_iface_nd_stale_tmo.attr,
+        &dev_attr_ipv6_iface_dup_addr_detect_cnt.attr,
+        &dev_attr_ipv6_iface_router_adv_link_mtu.attr,
         NULL,
 };
 
@@ -404,6 +683,61 @@ static struct attribute_group iscsi_iface_group = {
         .is_visible = iscsi_iface_attr_is_visible,
 };
 
+/* convert iscsi_ipaddress_state values to ascii string name */
+static const struct {
+        enum iscsi_ipaddress_state      value;
+        char                            *name;
+} iscsi_ipaddress_state_names[] = {
+        {ISCSI_IPDDRESS_STATE_UNCONFIGURED,     "Unconfigured" },
+        {ISCSI_IPDDRESS_STATE_ACQUIRING,        "Acquiring" },
+        {ISCSI_IPDDRESS_STATE_TENTATIVE,        "Tentative" },
+        {ISCSI_IPDDRESS_STATE_VALID,            "Valid" },
+        {ISCSI_IPDDRESS_STATE_DISABLING,        "Disabling" },
+        {ISCSI_IPDDRESS_STATE_INVALID,          "Invalid" },
+        {ISCSI_IPDDRESS_STATE_DEPRECATED,       "Deprecated" },
+};
+
+char *iscsi_get_ipaddress_state_name(enum iscsi_ipaddress_state port_state)
+{
+        int i;
+        char *state = NULL;
+
+        for (i = 0; i < ARRAY_SIZE(iscsi_ipaddress_state_names); i++) {
+                if (iscsi_ipaddress_state_names[i].value == port_state) {
+                        state = iscsi_ipaddress_state_names[i].name;
+                        break;
+                }
+        }
+        return state;
+}
+EXPORT_SYMBOL_GPL(iscsi_get_ipaddress_state_name);
+
+/* convert iscsi_router_state values to ascii string name */
+static const struct {
+        enum iscsi_router_state value;
+        char                    *name;
+} iscsi_router_state_names[] = {
+        {ISCSI_ROUTER_STATE_UNKNOWN,            "Unknown" },
+        {ISCSI_ROUTER_STATE_ADVERTISED,         "Advertised" },
+        {ISCSI_ROUTER_STATE_MANUAL,             "Manual" },
+        {ISCSI_ROUTER_STATE_STALE,              "Stale" },
+};
+
+char *iscsi_get_router_state_name(enum iscsi_router_state router_state)
+{
+        int i;
+        char *state = NULL;
+
+        for (i = 0; i < ARRAY_SIZE(iscsi_router_state_names); i++) {
+                if (iscsi_router_state_names[i].value == router_state) {
+                        state = iscsi_router_state_names[i].name;
+                        break;
+                }
+        }
+        return state;
+}
+EXPORT_SYMBOL_GPL(iscsi_get_router_state_name);
+
 struct iscsi_iface *
 iscsi_create_iface(struct Scsi_Host *shost, struct iscsi_transport *transport,
                    uint32_t iface_type, uint32_t iface_num, int dd_size)
@@ -3082,6 +3416,73 @@ exit_logout_sid:
 }
 
 static int
+iscsi_get_host_stats(struct iscsi_transport *transport, struct nlmsghdr *nlh)
+{
+        struct iscsi_uevent *ev = nlmsg_data(nlh);
+        struct Scsi_Host *shost = NULL;
+        struct iscsi_internal *priv;
+        struct sk_buff *skbhost_stats;
+        struct nlmsghdr *nlhhost_stats;
+        struct iscsi_uevent *evhost_stats;
+        int host_stats_size = 0;
+        int len, err = 0;
+        char *buf;
+
+        if (!transport->get_host_stats)
+                return -EINVAL;
+
+        priv = iscsi_if_transport_lookup(transport);
+        if (!priv)
+                return -EINVAL;
+
+        host_stats_size = sizeof(struct iscsi_offload_host_stats);
+        len = nlmsg_total_size(sizeof(*ev) + host_stats_size);
+
+        shost = scsi_host_lookup(ev->u.get_host_stats.host_no);
+        if (!shost) {
+                pr_err("%s: failed. Cound not find host no %u\n",
+                       __func__, ev->u.get_host_stats.host_no);
+                return -ENODEV;
+        }
+
+        do {
+                int actual_size;
+
+                skbhost_stats = alloc_skb(len, GFP_KERNEL);
+                if (!skbhost_stats) {
+                        pr_err("cannot deliver host stats: OOM\n");
+                        err = -ENOMEM;
+                        goto exit_host_stats;
+                }
+
+                nlhhost_stats = __nlmsg_put(skbhost_stats, 0, 0, 0,
+                                      (len - sizeof(*nlhhost_stats)), 0);
+                evhost_stats = nlmsg_data(nlhhost_stats);
+                memset(evhost_stats, 0, sizeof(*evhost_stats));
+                evhost_stats->transport_handle = iscsi_handle(transport);
+                evhost_stats->type = nlh->nlmsg_type;
+                evhost_stats->u.get_host_stats.host_no =
+                                        ev->u.get_host_stats.host_no;
+                buf = (char *)((char *)evhost_stats + sizeof(*evhost_stats));
+                memset(buf, 0, host_stats_size);
+
+                err = transport->get_host_stats(shost, buf, host_stats_size);
+
+                actual_size = nlmsg_total_size(sizeof(*ev) + host_stats_size);
+                skb_trim(skbhost_stats, NLMSG_ALIGN(actual_size));
+                nlhhost_stats->nlmsg_len = actual_size;
+
+                err = iscsi_multicast_skb(skbhost_stats, ISCSI_NL_GRP_ISCSID,
+                                          GFP_KERNEL);
+        } while (err < 0 && err != -ECONNREFUSED);
+
+exit_host_stats:
+        scsi_host_put(shost);
+        return err;
+}
+
+
+static int
 iscsi_if_recv_msg(struct sk_buff *skb, struct nlmsghdr *nlh, uint32_t *group)
 {
         int err = 0;
@@ -3260,6 +3661,9 @@ iscsi_if_recv_msg(struct sk_buff *skb, struct nlmsghdr *nlh, uint32_t *group)
                 err = iscsi_set_chap(transport, ev,
                                      nlmsg_attrlen(nlh, sizeof(*ev)));
                 break;
+        case ISCSI_UEVENT_GET_HOST_STATS:
+                err = iscsi_get_host_stats(transport, nlh);
+                break;
         default:
                 err = -ENOSYS;
                 break;
@@ -3368,6 +3772,7 @@ iscsi_conn_attr(ipv6_flow_label, ISCSI_PARAM_IPV6_FLOW_LABEL);
 iscsi_conn_attr(is_fw_assigned_ipv6, ISCSI_PARAM_IS_FW_ASSIGNED_IPV6);
 iscsi_conn_attr(tcp_xmit_wsf, ISCSI_PARAM_TCP_XMIT_WSF);
 iscsi_conn_attr(tcp_recv_wsf, ISCSI_PARAM_TCP_RECV_WSF);
+iscsi_conn_attr(local_ipaddr, ISCSI_PARAM_LOCAL_IPADDR);
 
 
 #define iscsi_conn_ep_attr_show(param)                                  \
@@ -3437,6 +3842,7 @@ static struct attribute *iscsi_conn_attrs[] = {
         &dev_attr_conn_is_fw_assigned_ipv6.attr,
         &dev_attr_conn_tcp_xmit_wsf.attr,
         &dev_attr_conn_tcp_recv_wsf.attr,
+        &dev_attr_conn_local_ipaddr.attr,
         NULL,
 };
 
@@ -3506,6 +3912,8 @@ static umode_t iscsi_conn_attr_is_visible(struct kobject *kobj,
                 param = ISCSI_PARAM_TCP_XMIT_WSF;
         else if (attr == &dev_attr_conn_tcp_recv_wsf.attr)
                 param = ISCSI_PARAM_TCP_RECV_WSF;
+        else if (attr == &dev_attr_conn_local_ipaddr.attr)
+                param = ISCSI_PARAM_LOCAL_IPADDR;
         else {
                 WARN_ONCE(1, "Invalid conn attr");
                 return 0;
diff --git a/drivers/scsi/scsi_transport_srp.c b/drivers/scsi/scsi_transport_srp.c
index 2700a5a09bd4..d47ffc8d3e43 100644
--- a/drivers/scsi/scsi_transport_srp.c
+++ b/drivers/scsi/scsi_transport_srp.c
@@ -64,10 +64,14 @@ static inline struct Scsi_Host *rport_to_shost(struct srp_rport *r)
 
 /**
  * srp_tmo_valid() - check timeout combination validity
+ * @reconnect_delay: Reconnect delay in seconds.
+ * @fast_io_fail_tmo: Fast I/O fail timeout in seconds.
+ * @dev_loss_tmo: Device loss timeout in seconds.
  *
  * The combination of the timeout parameters must be such that SCSI commands
  * are finished in a reasonable time. Hence do not allow the fast I/O fail
- * timeout to exceed SCSI_DEVICE_BLOCK_MAX_TIMEOUT. Furthermore, these
+ * timeout to exceed SCSI_DEVICE_BLOCK_MAX_TIMEOUT nor allow dev_loss_tmo to
+ * exceed that limit if failing I/O fast has been disabled. Furthermore, these
  * parameters must be such that multipath can detect failed paths timely.
  * Hence do not allow all three parameters to be disabled simultaneously.
  */
@@ -79,6 +83,9 @@ int srp_tmo_valid(int reconnect_delay, int fast_io_fail_tmo, int dev_loss_tmo)
                 return -EINVAL;
         if (fast_io_fail_tmo > SCSI_DEVICE_BLOCK_MAX_TIMEOUT)
                 return -EINVAL;
+        if (fast_io_fail_tmo < 0 &&
+            dev_loss_tmo > SCSI_DEVICE_BLOCK_MAX_TIMEOUT)
+                return -EINVAL;
         if (dev_loss_tmo >= LONG_MAX / HZ)
                 return -EINVAL;
         if (fast_io_fail_tmo >= 0 && dev_loss_tmo >= 0 &&
@@ -368,6 +375,7 @@ invalid:
 
 /**
  * srp_reconnect_work() - reconnect and schedule a new attempt if necessary
+ * @work: Work structure used for scheduling this operation.
  */
 static void srp_reconnect_work(struct work_struct *work)
 {
@@ -408,6 +416,7 @@ static void __rport_fail_io_fast(struct srp_rport *rport)
 
 /**
  * rport_fast_io_fail_timedout() - fast I/O failure timeout handler
+ * @work: Work structure used for scheduling this operation.
  */
 static void rport_fast_io_fail_timedout(struct work_struct *work)
 {
@@ -426,6 +435,7 @@ static void rport_fast_io_fail_timedout(struct work_struct *work)
 
 /**
  * rport_dev_loss_timedout() - device loss timeout handler
+ * @work: Work structure used for scheduling this operation.
  */
 static void rport_dev_loss_timedout(struct work_struct *work)
 {
@@ -452,42 +462,35 @@ static void __srp_start_tl_fail_timers(struct srp_rport *rport)
 
         lockdep_assert_held(&rport->mutex);
 
-        if (!rport->deleted) {
-                delay = rport->reconnect_delay;
-                fast_io_fail_tmo = rport->fast_io_fail_tmo;
-                dev_loss_tmo = rport->dev_loss_tmo;
-                pr_debug("%s current state: %d\n",
-                         dev_name(&shost->shost_gendev), rport->state);
+        delay = rport->reconnect_delay;
+        fast_io_fail_tmo = rport->fast_io_fail_tmo;
+        dev_loss_tmo = rport->dev_loss_tmo;
+        pr_debug("%s current state: %d\n", dev_name(&shost->shost_gendev),
+                 rport->state);
 
-                if (delay > 0)
-                        queue_delayed_work(system_long_wq,
-                                           &rport->reconnect_work,
-                                           1UL * delay * HZ);
-                if (fast_io_fail_tmo >= 0 &&
-                    srp_rport_set_state(rport, SRP_RPORT_BLOCKED) == 0) {
-                        pr_debug("%s new state: %d\n",
-                                 dev_name(&shost->shost_gendev),
-                                 rport->state);
-                        scsi_target_block(&shost->shost_gendev);
+        if (rport->state == SRP_RPORT_LOST)
+                return;
+        if (delay > 0)
+                queue_delayed_work(system_long_wq, &rport->reconnect_work,
+                                   1UL * delay * HZ);
+        if (srp_rport_set_state(rport, SRP_RPORT_BLOCKED) == 0) {
+                pr_debug("%s new state: %d\n", dev_name(&shost->shost_gendev),
+                         rport->state);
+                scsi_target_block(&shost->shost_gendev);
+                if (fast_io_fail_tmo >= 0)
                         queue_delayed_work(system_long_wq,
                                            &rport->fast_io_fail_work,
                                            1UL * fast_io_fail_tmo * HZ);
-                }
                 if (dev_loss_tmo >= 0)
                         queue_delayed_work(system_long_wq,
                                            &rport->dev_loss_work,
                                            1UL * dev_loss_tmo * HZ);
-        } else {
-                pr_debug("%s has already been deleted\n",
-                         dev_name(&shost->shost_gendev));
-                srp_rport_set_state(rport, SRP_RPORT_FAIL_FAST);
-                scsi_target_unblock(&shost->shost_gendev,
-                                    SDEV_TRANSPORT_OFFLINE);
         }
 }
 
 /**
  * srp_start_tl_fail_timers() - start the transport layer failure timers
+ * @rport: SRP target port.
  *
  * Start the transport layer fast I/O failure and device loss timers. Do not
  * modify a timer that was already started.
@@ -502,6 +505,7 @@ EXPORT_SYMBOL(srp_start_tl_fail_timers);
 
 /**
  * scsi_request_fn_active() - number of kernel threads inside scsi_request_fn()
+ * @shost: SCSI host for which to count the number of scsi_request_fn() callers.
  */
 static int scsi_request_fn_active(struct Scsi_Host *shost)
 {
@@ -522,6 +526,7 @@ static int scsi_request_fn_active(struct Scsi_Host *shost)
 
 /**
  * srp_reconnect_rport() - reconnect to an SRP target port
+ * @rport: SRP target port.
  *
  * Blocks SCSI command queueing before invoking reconnect() such that
  * queuecommand() won't be invoked concurrently with reconnect() from outside
@@ -556,7 +561,7 @@ int srp_reconnect_rport(struct srp_rport *rport)
         scsi_target_block(&shost->shost_gendev);
         while (scsi_request_fn_active(shost))
                 msleep(20);
-        res = i->f->reconnect(rport);
+        res = rport->state != SRP_RPORT_LOST ? i->f->reconnect(rport) : -ENODEV;
         pr_debug("%s (state %d): transport.reconnect() returned %d\n",
                  dev_name(&shost->shost_gendev), rport->state, res);
         if (res == 0) {
@@ -578,9 +583,9 @@ int srp_reconnect_rport(struct srp_rport *rport)
                 spin_unlock_irq(shost->host_lock);
         } else if (rport->state == SRP_RPORT_RUNNING) {
                 /*
-                 * srp_reconnect_rport() was invoked with fast_io_fail
-                 * off. Mark the port as failed and start the TL failure
-                 * timers if these had not yet been started.
+                 * srp_reconnect_rport() has been invoked with fast_io_fail
+                 * and dev_loss off. Mark the port as failed and start the TL
+                 * failure timers if these had not yet been started.
                  */
                 __rport_fail_io_fast(rport);
                 scsi_target_unblock(&shost->shost_gendev,
@@ -599,6 +604,7 @@ EXPORT_SYMBOL(srp_reconnect_rport);
 
 /**
  * srp_timed_out() - SRP transport intercept of the SCSI timeout EH
+ * @scmd: SCSI command.
  *
  * If a timeout occurs while an rport is in the blocked state, ask the SCSI
  * EH to continue waiting (BLK_EH_RESET_TIMER). Otherwise let the SCSI core
@@ -622,10 +628,6 @@ static void srp_rport_release(struct device *dev)
 {
         struct srp_rport *rport = dev_to_rport(dev);
 
-        cancel_delayed_work_sync(&rport->reconnect_work);
-        cancel_delayed_work_sync(&rport->fast_io_fail_work);
-        cancel_delayed_work_sync(&rport->dev_loss_work);
-
         put_device(dev->parent);
         kfree(rport);
 }
@@ -674,6 +676,7 @@ static int srp_host_match(struct attribute_container *cont, struct device *dev)
 
 /**
  * srp_rport_get() - increment rport reference count
+ * @rport: SRP target port.
  */
 void srp_rport_get(struct srp_rport *rport)
 {
@@ -683,6 +686,7 @@ EXPORT_SYMBOL(srp_rport_get);
 
 /**
  * srp_rport_put() - decrement rport reference count
+ * @rport: SRP target port.
  */
 void srp_rport_put(struct srp_rport *rport)
 {
@@ -780,12 +784,6 @@ void srp_rport_del(struct srp_rport *rport)
         device_del(dev);
         transport_destroy_device(dev);
 
-        mutex_lock(&rport->mutex);
-        if (rport->state == SRP_RPORT_BLOCKED)
-                __rport_fail_io_fast(rport);
-        rport->deleted = true;
-        mutex_unlock(&rport->mutex);
-
         put_device(dev);
 }
 EXPORT_SYMBOL_GPL(srp_rport_del);
@@ -810,6 +808,27 @@ void srp_remove_host(struct Scsi_Host *shost)
 }
 EXPORT_SYMBOL_GPL(srp_remove_host);
 
+/**
+ * srp_stop_rport_timers - stop the transport layer recovery timers
+ *
+ * Must be called after srp_remove_host() and scsi_remove_host(). The caller
+ * must hold a reference on the rport (rport->dev) and on the SCSI host
+ * (rport->dev.parent).
+ */
+void srp_stop_rport_timers(struct srp_rport *rport)
+{
+        mutex_lock(&rport->mutex);
+        if (rport->state == SRP_RPORT_BLOCKED)
+                __rport_fail_io_fast(rport);
+        srp_rport_set_state(rport, SRP_RPORT_LOST);
+        mutex_unlock(&rport->mutex);
+
+        cancel_delayed_work_sync(&rport->reconnect_work);
+        cancel_delayed_work_sync(&rport->fast_io_fail_work);
+        cancel_delayed_work_sync(&rport->dev_loss_work);
+}
+EXPORT_SYMBOL_GPL(srp_stop_rport_timers);
+
 static int srp_tsk_mgmt_response(struct Scsi_Host *shost, u64 nexus, u64 tm_id,
                                  int result)
 {
diff --git a/drivers/scsi/sd.c b/drivers/scsi/sd.c
index 69725f7c32c1..470954aba728 100644
--- a/drivers/scsi/sd.c
+++ b/drivers/scsi/sd.c
@@ -110,7 +110,7 @@ static int sd_suspend_runtime(struct device *);
 static int sd_resume(struct device *);
 static void sd_rescan(struct device *);
 static int sd_done(struct scsi_cmnd *);
-static int sd_eh_action(struct scsi_cmnd *, unsigned char *, int, int);
+static int sd_eh_action(struct scsi_cmnd *, int);
 static void sd_read_capacity(struct scsi_disk *sdkp, unsigned char *buffer);
 static void scsi_disk_release(struct device *cdev);
 static void sd_print_sense_hdr(struct scsi_disk *, struct scsi_sense_hdr *);
@@ -801,7 +801,7 @@ static int sd_setup_write_same_cmnd(struct scsi_device *sdp, struct request *rq)
         if (sdkp->device->no_write_same)
                 return BLKPREP_KILL;
 
-        BUG_ON(bio_offset(bio) || bio_iovec(bio)->bv_len != sdp->sector_size);
+        BUG_ON(bio_offset(bio) || bio_iovec(bio).bv_len != sdp->sector_size);
 
         sector >>= ilog2(sdp->sector_size) - 9;
         nr_sectors >>= ilog2(sdp->sector_size) - 9;
@@ -1551,23 +1551,23 @@ static const struct block_device_operations sd_fops = {
 /**
  *      sd_eh_action - error handling callback
  *      @scmd:          sd-issued command that has failed
- *      @eh_cmnd:       The command that was sent during error handling
- *      @eh_cmnd_len:   Length of eh_cmnd in bytes
  *      @eh_disp:       The recovery disposition suggested by the midlayer
  *
- *      This function is called by the SCSI midlayer upon completion of
- *      an error handling command (TEST UNIT READY, START STOP UNIT,
- *      etc.) The command sent to the device by the error handler is
- *      stored in eh_cmnd. The result of sending the eh command is
- *      passed in eh_disp.
+ *      This function is called by the SCSI midlayer upon completion of an
+ *      error test command (currently TEST UNIT READY). The result of sending
+ *      the eh command is passed in eh_disp.  We're looking for devices that
+ *      fail medium access commands but are OK with non access commands like
+ *      test unit ready (so wrongly see the device as having a successful
+ *      recovery)
  **/
-static int sd_eh_action(struct scsi_cmnd *scmd, unsigned char *eh_cmnd,
-                        int eh_cmnd_len, int eh_disp)
+static int sd_eh_action(struct scsi_cmnd *scmd, int eh_disp)
 {
         struct scsi_disk *sdkp = scsi_disk(scmd->request->rq_disk);
 
         if (!scsi_device_online(scmd->device) ||
-            !scsi_medium_access_command(scmd))
+            !scsi_medium_access_command(scmd) ||
+            host_byte(scmd->result) != DID_TIME_OUT ||
+            eh_disp != SUCCESS)
                 return eh_disp;
 
         /*
@@ -1577,9 +1577,7 @@ static int sd_eh_action(struct scsi_cmnd *scmd, unsigned char *eh_cmnd,
          * process of recovering or has it suffered an internal failure
          * that prevents access to the storage medium.
          */
-        if (host_byte(scmd->result) == DID_TIME_OUT && eh_disp == SUCCESS &&
-            eh_cmnd_len && eh_cmnd[0] == TEST_UNIT_READY)
-                sdkp->medium_access_timed_out++;
+        sdkp->medium_access_timed_out++;
 
         /*
          * If the device keeps failing read/write commands but TEST UNIT
@@ -1628,7 +1626,7 @@ static unsigned int sd_completed_bytes(struct scsi_cmnd *scmd)
                 end_lba <<= 1;
         } else {
                 /* be careful ... don't want any overflows */
-                u64 factor = scmd->device->sector_size / 512;
+                unsigned int factor = scmd->device->sector_size / 512;
                 do_div(start_lba, factor);
                 do_div(end_lba, factor);
         }
diff --git a/drivers/scsi/sd_dif.c b/drivers/scsi/sd_dif.c
index 6174ca4ea275..a7a691d0af7d 100644
--- a/drivers/scsi/sd_dif.c
+++ b/drivers/scsi/sd_dif.c
@@ -365,7 +365,6 @@ void sd_dif_prepare(struct request *rq, sector_t hw_sector,
         struct bio *bio;
         struct scsi_disk *sdkp;
         struct sd_dif_tuple *sdt;
-        unsigned int i, j;
         u32 phys, virt;
 
         sdkp = rq->bio->bi_bdev->bd_disk->private_data;
@@ -376,19 +375,21 @@ void sd_dif_prepare(struct request *rq, sector_t hw_sector,
         phys = hw_sector & 0xffffffff;
 
         __rq_for_each_bio(bio, rq) {
-                struct bio_vec *iv;
+                struct bio_vec iv;
+                struct bvec_iter iter;
+                unsigned int j;
 
                 /* Already remapped? */
                 if (bio_flagged(bio, BIO_MAPPED_INTEGRITY))
                         break;
 
-                virt = bio->bi_integrity->bip_sector & 0xffffffff;
+                virt = bio->bi_integrity->bip_iter.bi_sector & 0xffffffff;
 
-                bip_for_each_vec(iv, bio->bi_integrity, i) {
-                        sdt = kmap_atomic(iv->bv_page)
-                                + iv->bv_offset;
+                bip_for_each_vec(iv, bio->bi_integrity, iter) {
+                        sdt = kmap_atomic(iv.bv_page)
+                                + iv.bv_offset;
 
-                        for (j = 0 ; j < iv->bv_len ; j += tuple_sz, sdt++) {
+                        for (j = 0; j < iv.bv_len; j += tuple_sz, sdt++) {
 
                                 if (be32_to_cpu(sdt->ref_tag) == virt)
                                         sdt->ref_tag = cpu_to_be32(phys);
@@ -414,7 +415,7 @@ void sd_dif_complete(struct scsi_cmnd *scmd, unsigned int good_bytes)
         struct scsi_disk *sdkp;
         struct bio *bio;
         struct sd_dif_tuple *sdt;
-        unsigned int i, j, sectors, sector_sz;
+        unsigned int j, sectors, sector_sz;
         u32 phys, virt;
 
         sdkp = scsi_disk(scmd->request->rq_disk);
@@ -430,15 +431,16 @@ void sd_dif_complete(struct scsi_cmnd *scmd, unsigned int good_bytes)
                 phys >>= 3;
 
         __rq_for_each_bio(bio, scmd->request) {
-                struct bio_vec *iv;
+                struct bio_vec iv;
+                struct bvec_iter iter;
 
-                virt = bio->bi_integrity->bip_sector & 0xffffffff;
+                virt = bio->bi_integrity->bip_iter.bi_sector & 0xffffffff;
 
-                bip_for_each_vec(iv, bio->bi_integrity, i) {
-                        sdt = kmap_atomic(iv->bv_page)
-                                + iv->bv_offset;
+                bip_for_each_vec(iv, bio->bi_integrity, iter) {
+                        sdt = kmap_atomic(iv.bv_page)
+                                + iv.bv_offset;
 
-                        for (j = 0 ; j < iv->bv_len ; j += tuple_sz, sdt++) {
+                        for (j = 0; j < iv.bv_len; j += tuple_sz, sdt++) {
 
                                 if (sectors == 0) {
                                         kunmap_atomic(sdt);
diff --git a/drivers/scsi/sr.c b/drivers/scsi/sr.c
index 119d67f9c47e..40d85929aefe 100644
--- a/drivers/scsi/sr.c
+++ b/drivers/scsi/sr.c
@@ -161,14 +161,10 @@ static inline struct scsi_cd *scsi_cd_get(struct gendisk *disk)
                 goto out;
         cd = scsi_cd(disk);
         kref_get(&cd->kref);
-        if (scsi_device_get(cd->device))
-                goto out_put;
-        if (!scsi_autopm_get_device(cd->device))
-                goto out;
-
- out_put:
-        kref_put(&cd->kref, sr_kref_release);
-        cd = NULL;
+        if (scsi_device_get(cd->device)) {
+                kref_put(&cd->kref, sr_kref_release);
+                cd = NULL;
+        }
  out:
         mutex_unlock(&sr_ref_mutex);
         return cd;
@@ -180,7 +176,6 @@ static void scsi_cd_put(struct scsi_cd *cd)
 
         mutex_lock(&sr_ref_mutex);
         kref_put(&cd->kref, sr_kref_release);
-        scsi_autopm_put_device(sdev);
         scsi_device_put(sdev);
         mutex_unlock(&sr_ref_mutex);
 }
@@ -558,8 +553,6 @@ static int sr_block_ioctl(struct block_device *bdev, fmode_t mode, unsigned cmd,
         void __user *argp = (void __user *)arg;
         int ret;
 
-        scsi_autopm_get_device(cd->device);
-
         mutex_lock(&sr_mutex);
 
         /*
@@ -591,7 +584,6 @@ static int sr_block_ioctl(struct block_device *bdev, fmode_t mode, unsigned cmd,
 
 out:
         mutex_unlock(&sr_mutex);
-        scsi_autopm_put_device(cd->device);
         return ret;
 }
 
@@ -599,17 +591,11 @@ static unsigned int sr_block_check_events(struct gendisk *disk,
                                           unsigned int clearing)
 {
         struct scsi_cd *cd = scsi_cd(disk);
-        unsigned int ret;
 
-        if (atomic_read(&cd->device->disk_events_disable_depth) == 0) {
-                scsi_autopm_get_device(cd->device);
-                ret = cdrom_check_events(&cd->cdi, clearing);
-                scsi_autopm_put_device(cd->device);
-        } else {
-                ret = 0;
-        }
+        if (atomic_read(&cd->device->disk_events_disable_depth))
+                return 0;
 
-        return ret;
+        return cdrom_check_events(&cd->cdi, clearing);
 }
 
 static int sr_block_revalidate_disk(struct gendisk *disk)
@@ -617,8 +603,6 @@ static int sr_block_revalidate_disk(struct gendisk *disk)
         struct scsi_cd *cd = scsi_cd(disk);
         struct scsi_sense_hdr sshdr;
 
-        scsi_autopm_get_device(cd->device);
-
         /* if the unit is not ready, nothing more to do */
         if (scsi_test_unit_ready(cd->device, SR_TIMEOUT, MAX_RETRIES, &sshdr))
                 goto out;
@@ -626,7 +610,6 @@ static int sr_block_revalidate_disk(struct gendisk *disk)
         sr_cd_check(&cd->cdi);
         get_sectorsize(cd);
 out:
-        scsi_autopm_put_device(cd->device);
         return 0;
 }
 
@@ -747,6 +730,12 @@ static int sr_probe(struct device *dev)
         if (register_cdrom(&cd->cdi))
                 goto fail_put;
 
+        /*
+         * Initialize block layer runtime PM stuffs before the
+         * periodic event checking request gets started in add_disk.
+         */
+        blk_pm_runtime_init(sdev->request_queue, dev);
+
         dev_set_drvdata(dev, cd);
         disk->flags |= GENHD_FL_REMOVABLE;
         add_disk(disk);
diff --git a/drivers/scsi/st.c b/drivers/scsi/st.c
index ff44b3c2cff2..a1d6986261a3 100644
--- a/drivers/scsi/st.c
+++ b/drivers/scsi/st.c
@@ -3719,7 +3719,7 @@ static struct st_buffer *new_tape_buffer(int need_dma, int max_sg)
 
 static int enlarge_buffer(struct st_buffer * STbuffer, int new_size, int need_dma)
 {
-        int segs, nbr, max_segs, b_size, order, got;
+        int segs, max_segs, b_size, order, got;
         gfp_t priority;
 
         if (new_size <= STbuffer->buffer_size)
@@ -3729,9 +3729,6 @@ static int enlarge_buffer(struct st_buffer * STbuffer, int new_size, int need_dm
                 normalize_buffer(STbuffer);  /* Avoid extra segment */
 
         max_segs = STbuffer->use_sg;
-        nbr = max_segs - STbuffer->frp_segs;
-        if (nbr <= 0)
-                return 0;
 
         priority = GFP_KERNEL | __GFP_NOWARN;
         if (need_dma)
diff --git a/drivers/scsi/sym53c8xx_2/sym_glue.c b/drivers/scsi/sym53c8xx_2/sym_glue.c
index bac55f7f69f9..6d3ee1ab6362 100644
--- a/drivers/scsi/sym53c8xx_2/sym_glue.c
+++ b/drivers/scsi/sym53c8xx_2/sym_glue.c
@@ -1531,7 +1531,7 @@ static int sym_iomap_device(struct sym_device *device)
         struct pci_bus_region bus_addr;
         int i = 2;
 
-        pcibios_resource_to_bus(pdev, &bus_addr, &pdev->resource[1]);
+        pcibios_resource_to_bus(pdev->bus, &bus_addr, &pdev->resource[1]);
         device->mmio_base = bus_addr.start;
 
         if (device->chip.features & FE_RAM) {
@@ -1541,7 +1541,8 @@ static int sym_iomap_device(struct sym_device *device)
                  */
                 if (!pdev->resource[i].flags)
                         i++;
-                pcibios_resource_to_bus(pdev, &bus_addr, &pdev->resource[i]);
+                pcibios_resource_to_bus(pdev->bus, &bus_addr,
+                                        &pdev->resource[i]);
                 device->ram_base = bus_addr.start;
         }
 
diff --git a/drivers/scsi/virtio_scsi.c b/drivers/scsi/virtio_scsi.c
index c3173dced870..16bfd50cd3fe 100644
--- a/drivers/scsi/virtio_scsi.c
+++ b/drivers/scsi/virtio_scsi.c
@@ -956,6 +956,10 @@ static void virtscsi_remove(struct virtio_device *vdev)
 #ifdef CONFIG_PM_SLEEP
 static int virtscsi_freeze(struct virtio_device *vdev)
 {
+        struct Scsi_Host *sh = virtio_scsi_host(vdev);
+        struct virtio_scsi *vscsi = shost_priv(sh);
+
+        unregister_hotcpu_notifier(&vscsi->nb);
         virtscsi_remove_vqs(vdev);
         return 0;
 }
@@ -964,8 +968,17 @@ static int virtscsi_restore(struct virtio_device *vdev)
 {
         struct Scsi_Host *sh = virtio_scsi_host(vdev);
         struct virtio_scsi *vscsi = shost_priv(sh);
+        int err;
+
+        err = virtscsi_init(vdev, vscsi);
+        if (err)
+                return err;
+
+        err = register_hotcpu_notifier(&vscsi->nb);
+        if (err)
+                vdev->config->del_vqs(vdev);
 
-        return virtscsi_init(vdev, vscsi);
+        return err;
 }
 #endif
 
diff --git a/drivers/scsi/zorro7xx.c b/drivers/scsi/zorro7xx.c
index cbf3476c68cd..aff31991aea9 100644
--- a/drivers/scsi/zorro7xx.c
+++ b/drivers/scsi/zorro7xx.c
@@ -104,7 +104,7 @@ static int zorro7xx_init_one(struct zorro_dev *z,
         if (ioaddr > 0x01000000)
                 hostdata->base = ioremap(ioaddr, zorro_resource_len(z));
         else
-                hostdata->base = (void __iomem *)ZTWO_VADDR(ioaddr);
+                hostdata->base = ZTWO_VADDR(ioaddr);
 
         hostdata->clock = 50;
         hostdata->chip710 = 1;