Merge git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi-misc-2.6
[safe/jmp/linux-2.6] / drivers / message / fusion / mptspi.c
index a0a2e0a..6162014 100644 (file)
@@ -1,10 +1,10 @@
 /*
  *  linux/drivers/message/fusion/mptspi.c
- *      For use with LSI Logic PCI chip/adapter(s)
- *      running LSI Logic Fusion MPT (Message Passing Technology) firmware.
+ *      For use with LSI PCI chip/adapter(s)
+ *      running LSI Fusion MPT (Message Passing Technology) firmware.
  *
- *  Copyright (c) 1999-2005 LSI Logic Corporation
- *  (mailto:mpt_linux_developer@lsil.com)
+ *  Copyright (c) 1999-2008 LSI Corporation
+ *  (mailto:DL-MPTFusionLinux@lsi.com)
  *
  */
 /*=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=*/
@@ -44,7 +44,6 @@
 */
 /*=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=*/
 
-#include "linux_compat.h"      /* linux-2.6 tweaks */
 #include <linux/module.h>
 #include <linux/kernel.h>
 #include <linux/init.h>
 #include <linux/delay.h>       /* for mdelay */
 #include <linux/interrupt.h>   /* needed for in_interrupt() proto */
 #include <linux/reboot.h>      /* notifier code */
-#include <linux/sched.h>
 #include <linux/workqueue.h>
+#include <linux/raid_class.h>
 
 #include <scsi/scsi.h>
 #include <scsi/scsi_cmnd.h>
 #include <scsi/scsi_device.h>
 #include <scsi/scsi_host.h>
 #include <scsi/scsi_tcq.h>
+#include <scsi/scsi_transport.h>
+#include <scsi/scsi_transport_spi.h>
+#include <scsi/scsi_dbg.h>
 
 #include "mptbase.h"
 #include "mptscsih.h"
 MODULE_AUTHOR(MODULEAUTHOR);
 MODULE_DESCRIPTION(my_NAME);
 MODULE_LICENSE("GPL");
+MODULE_VERSION(my_VERSION);
 
 /* Command line args */
-#ifdef MPTSCSIH_ENABLE_DOMAIN_VALIDATION
-static int mpt_dv = MPTSCSIH_DOMAIN_VALIDATION;
-module_param(mpt_dv, int, 0);
-MODULE_PARM_DESC(mpt_dv, " DV Algorithm: enhanced=1, basic=0 (default=MPTSCSIH_DOMAIN_VALIDATION=1)");
-
-static int mpt_width = MPTSCSIH_MAX_WIDTH;
-module_param(mpt_width, int, 0);
-MODULE_PARM_DESC(mpt_width, " Max Bus Width: wide=1, narrow=0 (default=MPTSCSIH_MAX_WIDTH=1)");
-
-static ushort mpt_factor = MPTSCSIH_MIN_SYNC;
-module_param(mpt_factor, ushort, 0);
-MODULE_PARM_DESC(mpt_factor, " Min Sync Factor (default=MPTSCSIH_MIN_SYNC=0x08)");
-#endif
-
 static int mpt_saf_te = MPTSCSIH_SAF_TE;
 module_param(mpt_saf_te, int, 0);
 MODULE_PARM_DESC(mpt_saf_te, " Force enabling SEP Processor: enable=1  (default=MPTSCSIH_SAF_TE=0)");
 
-static int mpt_pq_filter = 0;
-module_param(mpt_pq_filter, int, 0);
-MODULE_PARM_DESC(mpt_pq_filter, " Enable peripheral qualifier filter: enable=1  (default=0)");
+static void mptspi_write_offset(struct scsi_target *, int);
+static void mptspi_write_width(struct scsi_target *, int);
+static int mptspi_write_spi_device_pg1(struct scsi_target *,
+                                      struct _CONFIG_PAGE_SCSI_DEVICE_1 *);
+
+static struct scsi_transport_template *mptspi_transport_template = NULL;
+
+static u8      mptspiDoneCtx = MPT_MAX_PROTOCOL_DRIVERS;
+static u8      mptspiTaskCtx = MPT_MAX_PROTOCOL_DRIVERS;
+static u8      mptspiInternalCtx = MPT_MAX_PROTOCOL_DRIVERS; /* Used only for internal commands */
+
+/**
+ *     mptspi_setTargetNegoParms  - Update the target negotiation parameters
+ *     @hd: Pointer to a SCSI Host Structure
+ *     @target: per target private data
+ *     @sdev: SCSI device
+ *
+ *     Update the target negotiation parameters based on the the Inquiry
+ *     data, adapter capabilities, and NVRAM settings.
+ **/
+static void
+mptspi_setTargetNegoParms(MPT_SCSI_HOST *hd, VirtTarget *target,
+                           struct scsi_device *sdev)
+{
+       MPT_ADAPTER *ioc = hd->ioc;
+       SpiCfgData *pspi_data = &ioc->spi_data;
+       int  id = (int) target->id;
+       int  nvram;
+       u8 width = MPT_NARROW;
+       u8 factor = MPT_ASYNC;
+       u8 offset = 0;
+       u8 nfactor;
+       u8 noQas = 1;
+
+       target->negoFlags = pspi_data->noQas;
+
+       if (sdev->scsi_level < SCSI_2) {
+               width = 0;
+               factor = MPT_ULTRA2;
+               offset = pspi_data->maxSyncOffset;
+               target->tflags &= ~MPT_TARGET_FLAGS_Q_YES;
+       } else {
+               if (scsi_device_wide(sdev))
+                       width = 1;
+
+               if (scsi_device_sync(sdev)) {
+                       factor = pspi_data->minSyncFactor;
+                       if (!scsi_device_dt(sdev))
+                                       factor = MPT_ULTRA2;
+                       else {
+                               if (!scsi_device_ius(sdev) &&
+                                   !scsi_device_qas(sdev))
+                                       factor = MPT_ULTRA160;
+                               else {
+                                       factor = MPT_ULTRA320;
+                                       if (scsi_device_qas(sdev)) {
+                                               ddvprintk(ioc,
+                                               printk(MYIOC_s_DEBUG_FMT "Enabling QAS due to "
+                                               "byte56=%02x on id=%d!\n", ioc->name,
+                                               scsi_device_qas(sdev), id));
+                                               noQas = 0;
+                                       }
+                                       if (sdev->type == TYPE_TAPE &&
+                                           scsi_device_ius(sdev))
+                                               target->negoFlags |= MPT_TAPE_NEGO_IDP;
+                               }
+                       }
+                       offset = pspi_data->maxSyncOffset;
+
+                       /* If RAID, never disable QAS
+                        * else if non RAID, do not disable
+                        *   QAS if bit 1 is set
+                        * bit 1 QAS support, non-raid only
+                        * bit 0 IU support
+                        */
+                       if (target->raidVolume == 1)
+                               noQas = 0;
+               } else {
+                       factor = MPT_ASYNC;
+                       offset = 0;
+               }
+       }
+
+       if (!sdev->tagged_supported)
+               target->tflags &= ~MPT_TARGET_FLAGS_Q_YES;
+
+       /* Update tflags based on NVRAM settings. (SCSI only)
+        */
+       if (pspi_data->nvram && (pspi_data->nvram[id] != MPT_HOST_NVRAM_INVALID)) {
+               nvram = pspi_data->nvram[id];
+               nfactor = (nvram & MPT_NVRAM_SYNC_MASK) >> 8;
+
+               if (width)
+                       width = nvram & MPT_NVRAM_WIDE_DISABLE ? 0 : 1;
+
+               if (offset > 0) {
+                       /* Ensure factor is set to the
+                        * maximum of: adapter, nvram, inquiry
+                        */
+                       if (nfactor) {
+                               if (nfactor < pspi_data->minSyncFactor )
+                                       nfactor = pspi_data->minSyncFactor;
+
+                               factor = max(factor, nfactor);
+                               if (factor == MPT_ASYNC)
+                                       offset = 0;
+                       } else {
+                               offset = 0;
+                               factor = MPT_ASYNC;
+               }
+               } else {
+                       factor = MPT_ASYNC;
+               }
+       }
+
+       /* Make sure data is consistent
+        */
+       if ((!width) && (factor < MPT_ULTRA2))
+               factor = MPT_ULTRA2;
+
+       /* Save the data to the target structure.
+        */
+       target->minSyncFactor = factor;
+       target->maxOffset = offset;
+       target->maxWidth = width;
+
+       target->tflags |= MPT_TARGET_FLAGS_VALID_NEGO;
+
+       /* Disable unused features.
+        */
+       if (!width)
+               target->negoFlags |= MPT_TARGET_NO_NEGO_WIDE;
+
+       if (!offset)
+               target->negoFlags |= MPT_TARGET_NO_NEGO_SYNC;
+
+       if ( factor > MPT_ULTRA320 )
+               noQas = 0;
+
+       if (noQas && (pspi_data->noQas == 0)) {
+               pspi_data->noQas |= MPT_TARGET_NO_NEGO_QAS;
+               target->negoFlags |= MPT_TARGET_NO_NEGO_QAS;
+
+               /* Disable QAS in a mixed configuration case
+                */
+
+               ddvprintk(ioc, printk(MYIOC_s_DEBUG_FMT
+                       "Disabling QAS due to noQas=%02x on id=%d!\n", ioc->name, noQas, id));
+       }
+}
+
+/**
+ *     mptspi_writeIOCPage4  - write IOC Page 4
+ *     @hd: Pointer to a SCSI Host Structure
+ *     @channel: channel number
+ *     @id: write IOC Page4 for this ID & Bus
+ *
+ *     Return: -EAGAIN if unable to obtain a Message Frame
+ *             or 0 if success.
+ *
+ *     Remark: We do not wait for a return, write pages sequentially.
+ **/
+static int
+mptspi_writeIOCPage4(MPT_SCSI_HOST *hd, u8 channel , u8 id)
+{
+       MPT_ADAPTER             *ioc = hd->ioc;
+       Config_t                *pReq;
+       IOCPage4_t              *IOCPage4Ptr;
+       MPT_FRAME_HDR           *mf;
+       dma_addr_t               dataDma;
+       u16                      req_idx;
+       u32                      frameOffset;
+       u32                      flagsLength;
+       int                      ii;
+
+       /* Get a MF for this command.
+        */
+       if ((mf = mpt_get_msg_frame(ioc->DoneCtx, ioc)) == NULL) {
+               dfailprintk(ioc, printk(MYIOC_s_WARN_FMT
+                               "writeIOCPage4 : no msg frames!\n",ioc->name));
+               return -EAGAIN;
+       }
+
+       /* Set the request and the data pointers.
+        * Place data at end of MF.
+        */
+       pReq = (Config_t *)mf;
+
+       req_idx = le16_to_cpu(mf->u.frame.hwhdr.msgctxu.fld.req_idx);
+       frameOffset = ioc->req_sz - sizeof(IOCPage4_t);
+
+       /* Complete the request frame (same for all requests).
+        */
+       pReq->Action = MPI_CONFIG_ACTION_PAGE_WRITE_CURRENT;
+       pReq->Reserved = 0;
+       pReq->ChainOffset = 0;
+       pReq->Function = MPI_FUNCTION_CONFIG;
+       pReq->ExtPageLength = 0;
+       pReq->ExtPageType = 0;
+       pReq->MsgFlags = 0;
+       for (ii=0; ii < 8; ii++) {
+               pReq->Reserved2[ii] = 0;
+       }
+
+       IOCPage4Ptr = ioc->spi_data.pIocPg4;
+       dataDma = ioc->spi_data.IocPg4_dma;
+       ii = IOCPage4Ptr->ActiveSEP++;
+       IOCPage4Ptr->SEP[ii].SEPTargetID = id;
+       IOCPage4Ptr->SEP[ii].SEPBus = channel;
+       pReq->Header = IOCPage4Ptr->Header;
+       pReq->PageAddress = cpu_to_le32(id | (channel << 8 ));
+
+       /* Add a SGE to the config request.
+        */
+       flagsLength = MPT_SGE_FLAGS_SSIMPLE_WRITE |
+               (IOCPage4Ptr->Header.PageLength + ii) * 4;
+
+       mpt_add_sge((char *)&pReq->PageBufferSGE, flagsLength, dataDma);
+
+       ddvprintk(ioc, printk(MYIOC_s_DEBUG_FMT
+               "writeIOCPage4: MaxSEP=%d ActiveSEP=%d id=%d bus=%d\n",
+               ioc->name, IOCPage4Ptr->MaxSEP, IOCPage4Ptr->ActiveSEP, id, channel));
+
+       mpt_put_msg_frame(ioc->DoneCtx, ioc, mf);
+
+       return 0;
+}
+
+/**
+ *     mptspi_initTarget - Target, LUN alloc/free functionality.
+ *     @hd: Pointer to MPT_SCSI_HOST structure
+ *     @vtarget: per target private data
+ *     @sdev: SCSI device
+ *
+ *     NOTE: It's only SAFE to call this routine if data points to
+ *     sane & valid STANDARD INQUIRY data!
+ *
+ *     Allocate and initialize memory for this target.
+ *     Save inquiry data.
+ *
+ **/
+static void
+mptspi_initTarget(MPT_SCSI_HOST *hd, VirtTarget *vtarget,
+                   struct scsi_device *sdev)
+{
+
+       /* Is LUN supported? If so, upper 2 bits will be 0
+       * in first byte of inquiry data.
+       */
+       if (sdev->inq_periph_qual != 0)
+               return;
+
+       if (vtarget == NULL)
+               return;
+
+       vtarget->type = sdev->type;
+
+       if ((sdev->type == TYPE_PROCESSOR) && (hd->ioc->spi_data.Saf_Te)) {
+               /* Treat all Processors as SAF-TE if
+                * command line option is set */
+               vtarget->tflags |= MPT_TARGET_FLAGS_SAF_TE_ISSUED;
+               mptspi_writeIOCPage4(hd, vtarget->channel, vtarget->id);
+       }else if ((sdev->type == TYPE_PROCESSOR) &&
+               !(vtarget->tflags & MPT_TARGET_FLAGS_SAF_TE_ISSUED )) {
+               if (sdev->inquiry_len > 49 ) {
+                       if (sdev->inquiry[44] == 'S' &&
+                           sdev->inquiry[45] == 'A' &&
+                           sdev->inquiry[46] == 'F' &&
+                           sdev->inquiry[47] == '-' &&
+                           sdev->inquiry[48] == 'T' &&
+                           sdev->inquiry[49] == 'E' ) {
+                               vtarget->tflags |= MPT_TARGET_FLAGS_SAF_TE_ISSUED;
+                               mptspi_writeIOCPage4(hd, vtarget->channel, vtarget->id);
+                       }
+               }
+       }
+       mptspi_setTargetNegoParms(hd, vtarget, sdev);
+}
+
+/**
+ *     mptspi_is_raid - Determines whether target is belonging to volume
+ *     @hd: Pointer to a SCSI HOST structure
+ *     @id: target device id
+ *
+ *     Return:
+ *             non-zero = true
+ *             zero = false
+ *
+ */
+static int
+mptspi_is_raid(struct _MPT_SCSI_HOST *hd, u32 id)
+{
+       int i, rc = 0;
+       MPT_ADAPTER *ioc = hd->ioc;
+
+       if (!ioc->raid_data.pIocPg2)
+               goto out;
+
+       if (!ioc->raid_data.pIocPg2->NumActiveVolumes)
+               goto out;
+       for (i=0; i < ioc->raid_data.pIocPg2->NumActiveVolumes; i++) {
+               if (ioc->raid_data.pIocPg2->RaidVolume[i].VolumeID == id) {
+                       rc = 1;
+                       goto out;
+               }
+       }
+
+ out:
+       return rc;
+}
+
+static int mptspi_target_alloc(struct scsi_target *starget)
+{
+       struct Scsi_Host *shost = dev_to_shost(&starget->dev);
+       struct _MPT_SCSI_HOST *hd = shost_priv(shost);
+       VirtTarget              *vtarget;
+       MPT_ADAPTER *ioc;
+
+       if (hd == NULL)
+               return -ENODEV;
+
+       ioc = hd->ioc;
+       vtarget = kzalloc(sizeof(VirtTarget), GFP_KERNEL);
+       if (!vtarget)
+               return -ENOMEM;
+
+       vtarget->ioc_id = ioc->id;
+       vtarget->tflags = MPT_TARGET_FLAGS_Q_YES;
+       vtarget->id = (u8)starget->id;
+       vtarget->channel = (u8)starget->channel;
+       vtarget->starget = starget;
+       starget->hostdata = vtarget;
+
+       if (starget->channel == 1) {
+               if (mptscsih_is_phys_disk(ioc, 0, starget->id) == 0)
+                       return 0;
+               vtarget->tflags |= MPT_TARGET_FLAGS_RAID_COMPONENT;
+               /* The real channel for this device is zero */
+               vtarget->channel = 0;
+               /* The actual physdisknum (for RAID passthrough) */
+               vtarget->id = mptscsih_raid_id_to_num(ioc, 0,
+                   starget->id);
+       }
+
+       if (starget->channel == 0 &&
+           mptspi_is_raid(hd, starget->id)) {
+               vtarget->raidVolume = 1;
+               ddvprintk(ioc, printk(MYIOC_s_DEBUG_FMT
+                   "RAID Volume @ channel=%d id=%d\n", ioc->name, starget->channel,
+                   starget->id));
+       }
+
+       if (ioc->spi_data.nvram &&
+           ioc->spi_data.nvram[starget->id] != MPT_HOST_NVRAM_INVALID) {
+               u32 nvram = ioc->spi_data.nvram[starget->id];
+               spi_min_period(starget) = (nvram & MPT_NVRAM_SYNC_MASK) >> MPT_NVRAM_SYNC_SHIFT;
+               spi_max_width(starget) = nvram & MPT_NVRAM_WIDE_DISABLE ? 0 : 1;
+       } else {
+               spi_min_period(starget) = ioc->spi_data.minSyncFactor;
+               spi_max_width(starget) = ioc->spi_data.maxBusWidth;
+       }
+       spi_max_offset(starget) = ioc->spi_data.maxSyncOffset;
+
+       spi_offset(starget) = 0;
+       spi_period(starget) = 0xFF;
+       mptspi_write_width(starget, 0);
+
+       return 0;
+}
+
+static void
+mptspi_target_destroy(struct scsi_target *starget)
+{
+       if (starget->hostdata)
+               kfree(starget->hostdata);
+       starget->hostdata = NULL;
+}
+
+/**
+ *     mptspi_print_write_nego - negotiation parameters debug info that is being sent
+ *     @hd: Pointer to a SCSI HOST structure
+ *     @starget: SCSI target
+ *     @ii: negotiation parameters
+ *
+ */
+static void
+mptspi_print_write_nego(struct _MPT_SCSI_HOST *hd, struct scsi_target *starget, u32 ii)
+{
+       ddvprintk(hd->ioc, printk(MYIOC_s_DEBUG_FMT "id=%d Requested = 0x%08x"
+           " ( %s factor = 0x%02x @ offset = 0x%02x %s%s%s%s%s%s%s%s)\n",
+           hd->ioc->name, starget->id, ii,
+           ii & MPI_SCSIDEVPAGE0_NP_WIDE ? "Wide ": "",
+           ((ii >> 8) & 0xFF), ((ii >> 16) & 0xFF),
+           ii & MPI_SCSIDEVPAGE0_NP_IU ? "IU ": "",
+           ii & MPI_SCSIDEVPAGE0_NP_DT ? "DT ": "",
+           ii & MPI_SCSIDEVPAGE0_NP_QAS ? "QAS ": "",
+           ii & MPI_SCSIDEVPAGE0_NP_HOLD_MCS ? "HOLDMCS ": "",
+           ii & MPI_SCSIDEVPAGE0_NP_WR_FLOW ? "WRFLOW ": "",
+           ii & MPI_SCSIDEVPAGE0_NP_RD_STRM ? "RDSTRM ": "",
+           ii & MPI_SCSIDEVPAGE0_NP_RTI ? "RTI ": "",
+           ii & MPI_SCSIDEVPAGE0_NP_PCOMP_EN ? "PCOMP ": ""));
+}
+
+/**
+ *     mptspi_print_read_nego - negotiation parameters debug info that is being read
+ *     @hd: Pointer to a SCSI HOST structure
+ *     @starget: SCSI target
+ *     @ii: negotiation parameters
+ *
+ */
+static void
+mptspi_print_read_nego(struct _MPT_SCSI_HOST *hd, struct scsi_target *starget, u32 ii)
+{
+       ddvprintk(hd->ioc, printk(MYIOC_s_DEBUG_FMT "id=%d Read = 0x%08x"
+           " ( %s factor = 0x%02x @ offset = 0x%02x %s%s%s%s%s%s%s%s)\n",
+           hd->ioc->name, starget->id, ii,
+           ii & MPI_SCSIDEVPAGE0_NP_WIDE ? "Wide ": "",
+           ((ii >> 8) & 0xFF), ((ii >> 16) & 0xFF),
+           ii & MPI_SCSIDEVPAGE0_NP_IU ? "IU ": "",
+           ii & MPI_SCSIDEVPAGE0_NP_DT ? "DT ": "",
+           ii & MPI_SCSIDEVPAGE0_NP_QAS ? "QAS ": "",
+           ii & MPI_SCSIDEVPAGE0_NP_HOLD_MCS ? "HOLDMCS ": "",
+           ii & MPI_SCSIDEVPAGE0_NP_WR_FLOW ? "WRFLOW ": "",
+           ii & MPI_SCSIDEVPAGE0_NP_RD_STRM ? "RDSTRM ": "",
+           ii & MPI_SCSIDEVPAGE0_NP_RTI ? "RTI ": "",
+           ii & MPI_SCSIDEVPAGE0_NP_PCOMP_EN ? "PCOMP ": ""));
+}
+
+static int mptspi_read_spi_device_pg0(struct scsi_target *starget,
+                            struct _CONFIG_PAGE_SCSI_DEVICE_0 *pass_pg0)
+{
+       struct Scsi_Host *shost = dev_to_shost(&starget->dev);
+       struct _MPT_SCSI_HOST *hd = shost_priv(shost);
+       struct _MPT_ADAPTER *ioc = hd->ioc;
+       struct _CONFIG_PAGE_SCSI_DEVICE_0 *spi_dev_pg0;
+       dma_addr_t spi_dev_pg0_dma;
+       int size;
+       struct _x_config_parms cfg;
+       struct _CONFIG_PAGE_HEADER hdr;
+       int err = -EBUSY;
+
+       /* No SPI parameters for RAID devices */
+       if (starget->channel == 0 &&
+           mptspi_is_raid(hd, starget->id))
+               return -1;
+
+       size = ioc->spi_data.sdp0length * 4;
+       /*
+       if (ioc->spi_data.sdp0length & 1)
+               size += size + 4;
+       size += 2048;
+       */
+
+       spi_dev_pg0 = dma_alloc_coherent(&ioc->pcidev->dev, size, &spi_dev_pg0_dma, GFP_KERNEL);
+       if (spi_dev_pg0 == NULL) {
+               starget_printk(KERN_ERR, starget, MYIOC_s_FMT
+                   "dma_alloc_coherent for parameters failed\n", ioc->name);
+               return -EINVAL;
+       }
+
+       memset(&hdr, 0, sizeof(hdr));
+
+       hdr.PageVersion = ioc->spi_data.sdp0version;
+       hdr.PageLength = ioc->spi_data.sdp0length;
+       hdr.PageNumber = 0;
+       hdr.PageType = MPI_CONFIG_PAGETYPE_SCSI_DEVICE;
+
+       memset(&cfg, 0, sizeof(cfg));
+
+       cfg.cfghdr.hdr = &hdr;
+       cfg.physAddr = spi_dev_pg0_dma;
+       cfg.action = MPI_CONFIG_ACTION_PAGE_READ_CURRENT;
+       cfg.dir = 0;
+       cfg.pageAddr = starget->id;
+
+       if (mpt_config(ioc, &cfg)) {
+               starget_printk(KERN_ERR, starget, MYIOC_s_FMT "mpt_config failed\n", ioc->name);
+               goto out_free;
+       }
+       err = 0;
+       memcpy(pass_pg0, spi_dev_pg0, size);
+
+       mptspi_print_read_nego(hd, starget, le32_to_cpu(spi_dev_pg0->NegotiatedParameters));
+
+ out_free:
+       dma_free_coherent(&ioc->pcidev->dev, size, spi_dev_pg0, spi_dev_pg0_dma);
+       return err;
+}
+
+static u32 mptspi_getRP(struct scsi_target *starget)
+{
+       u32 nego = 0;
+
+       nego |= spi_iu(starget) ? MPI_SCSIDEVPAGE1_RP_IU : 0;
+       nego |= spi_dt(starget) ? MPI_SCSIDEVPAGE1_RP_DT : 0;
+       nego |= spi_qas(starget) ? MPI_SCSIDEVPAGE1_RP_QAS : 0;
+       nego |= spi_hold_mcs(starget) ? MPI_SCSIDEVPAGE1_RP_HOLD_MCS : 0;
+       nego |= spi_wr_flow(starget) ? MPI_SCSIDEVPAGE1_RP_WR_FLOW : 0;
+       nego |= spi_rd_strm(starget) ? MPI_SCSIDEVPAGE1_RP_RD_STRM : 0;
+       nego |= spi_rti(starget) ? MPI_SCSIDEVPAGE1_RP_RTI : 0;
+       nego |= spi_pcomp_en(starget) ? MPI_SCSIDEVPAGE1_RP_PCOMP_EN : 0;
+
+       nego |= (spi_period(starget) <<  MPI_SCSIDEVPAGE1_RP_SHIFT_MIN_SYNC_PERIOD) & MPI_SCSIDEVPAGE1_RP_MIN_SYNC_PERIOD_MASK;
+       nego |= (spi_offset(starget) << MPI_SCSIDEVPAGE1_RP_SHIFT_MAX_SYNC_OFFSET) & MPI_SCSIDEVPAGE1_RP_MAX_SYNC_OFFSET_MASK;
+       nego |= spi_width(starget) ?  MPI_SCSIDEVPAGE1_RP_WIDE : 0;
+
+       return nego;
+}
+
+static void mptspi_read_parameters(struct scsi_target *starget)
+{
+       int nego;
+       struct _CONFIG_PAGE_SCSI_DEVICE_0 spi_dev_pg0;
+
+       mptspi_read_spi_device_pg0(starget, &spi_dev_pg0);
+
+       nego = le32_to_cpu(spi_dev_pg0.NegotiatedParameters);
+
+       spi_iu(starget) = (nego & MPI_SCSIDEVPAGE0_NP_IU) ? 1 : 0;
+       spi_dt(starget) = (nego & MPI_SCSIDEVPAGE0_NP_DT) ? 1 : 0;
+       spi_qas(starget) = (nego & MPI_SCSIDEVPAGE0_NP_QAS) ? 1 : 0;
+       spi_wr_flow(starget) = (nego & MPI_SCSIDEVPAGE0_NP_WR_FLOW) ? 1 : 0;
+       spi_rd_strm(starget) = (nego & MPI_SCSIDEVPAGE0_NP_RD_STRM) ? 1 : 0;
+       spi_rti(starget) = (nego & MPI_SCSIDEVPAGE0_NP_RTI) ? 1 : 0;
+       spi_pcomp_en(starget) = (nego & MPI_SCSIDEVPAGE0_NP_PCOMP_EN) ? 1 : 0;
+       spi_hold_mcs(starget) = (nego & MPI_SCSIDEVPAGE0_NP_HOLD_MCS) ? 1 : 0;
+       spi_period(starget) = (nego & MPI_SCSIDEVPAGE0_NP_NEG_SYNC_PERIOD_MASK) >> MPI_SCSIDEVPAGE0_NP_SHIFT_SYNC_PERIOD;
+       spi_offset(starget) = (nego & MPI_SCSIDEVPAGE0_NP_NEG_SYNC_OFFSET_MASK) >> MPI_SCSIDEVPAGE0_NP_SHIFT_SYNC_OFFSET;
+       spi_width(starget) = (nego & MPI_SCSIDEVPAGE0_NP_WIDE) ? 1 : 0;
+}
+
+static int
+mptscsih_quiesce_raid(MPT_SCSI_HOST *hd, int quiesce, u8 channel, u8 id)
+{
+       MpiRaidActionRequest_t  *pReq;
+       MPT_FRAME_HDR           *mf;
+       MPT_ADAPTER *ioc = hd->ioc;
+
+       /* Get and Populate a free Frame
+        */
+       if ((mf = mpt_get_msg_frame(ioc->InternalCtx, ioc)) == NULL) {
+               ddvprintk(ioc, printk(MYIOC_s_WARN_FMT "_do_raid: no msg frames!\n",
+                                       ioc->name));
+               return -EAGAIN;
+       }
+       pReq = (MpiRaidActionRequest_t *)mf;
+       if (quiesce)
+               pReq->Action = MPI_RAID_ACTION_QUIESCE_PHYS_IO;
+       else
+               pReq->Action = MPI_RAID_ACTION_ENABLE_PHYS_IO;
+       pReq->Reserved1 = 0;
+       pReq->ChainOffset = 0;
+       pReq->Function = MPI_FUNCTION_RAID_ACTION;
+       pReq->VolumeID = id;
+       pReq->VolumeBus = channel;
+       pReq->PhysDiskNum = 0;
+       pReq->MsgFlags = 0;
+       pReq->Reserved2 = 0;
+       pReq->ActionDataWord = 0; /* Reserved for this action */
+
+       mpt_add_sge((char *)&pReq->ActionDataSGE,
+               MPT_SGE_FLAGS_SSIMPLE_READ | 0, (dma_addr_t) -1);
+
+       ddvprintk(ioc, printk(MYIOC_s_DEBUG_FMT "RAID Volume action=%x channel=%d id=%d\n",
+                       ioc->name, pReq->Action, channel, id));
+
+       hd->pLocal = NULL;
+       hd->timer.expires = jiffies + HZ*10; /* 10 second timeout */
+       hd->scandv_wait_done = 0;
+
+       /* Save cmd pointer, for resource free if timeout or
+        * FW reload occurs
+        */
+       hd->cmdPtr = mf;
+
+       add_timer(&hd->timer);
+       mpt_put_msg_frame(ioc->InternalCtx, ioc, mf);
+       wait_event(hd->scandv_waitq, hd->scandv_wait_done);
+
+       if ((hd->pLocal == NULL) || (hd->pLocal->completion != 0))
+               return -1;
+
+       return 0;
+}
+
+static void mptspi_dv_device(struct _MPT_SCSI_HOST *hd,
+                            struct scsi_device *sdev)
+{
+       VirtTarget *vtarget = scsi_target(sdev)->hostdata;
+       MPT_ADAPTER *ioc = hd->ioc;
+
+       /* no DV on RAID devices */
+       if (sdev->channel == 0 &&
+           mptspi_is_raid(hd, sdev->id))
+               return;
+
+       /* If this is a piece of a RAID, then quiesce first */
+       if (sdev->channel == 1 &&
+           mptscsih_quiesce_raid(hd, 1, vtarget->channel, vtarget->id) < 0) {
+               starget_printk(KERN_ERR, scsi_target(sdev), MYIOC_s_FMT
+                   "Integrated RAID quiesce failed\n", ioc->name);
+               return;
+       }
+
+       hd->spi_pending |= (1 << sdev->id);
+       spi_dv_device(sdev);
+       hd->spi_pending &= ~(1 << sdev->id);
+
+       if (sdev->channel == 1 &&
+           mptscsih_quiesce_raid(hd, 0, vtarget->channel, vtarget->id) < 0)
+               starget_printk(KERN_ERR, scsi_target(sdev), MYIOC_s_FMT
+                   "Integrated RAID resume failed\n", ioc->name);
+
+       mptspi_read_parameters(sdev->sdev_target);
+       spi_display_xfer_agreement(sdev->sdev_target);
+       mptspi_read_parameters(sdev->sdev_target);
+}
+
+static int mptspi_slave_alloc(struct scsi_device *sdev)
+{
+       MPT_SCSI_HOST *hd = shost_priv(sdev->host);
+       VirtTarget              *vtarget;
+       VirtDevice              *vdevice;
+       struct scsi_target      *starget;
+       MPT_ADAPTER *ioc = hd->ioc;
+
+       if (sdev->channel == 1 &&
+               mptscsih_is_phys_disk(ioc, 0, sdev->id) == 0)
+                       return -ENXIO;
+
+       vdevice = kzalloc(sizeof(VirtDevice), GFP_KERNEL);
+       if (!vdevice) {
+               printk(MYIOC_s_ERR_FMT "slave_alloc kmalloc(%zd) FAILED!\n",
+                               ioc->name, sizeof(VirtDevice));
+               return -ENOMEM;
+       }
+
+       vdevice->lun = sdev->lun;
+       sdev->hostdata = vdevice;
+
+       starget = scsi_target(sdev);
+       vtarget = starget->hostdata;
+       vdevice->vtarget = vtarget;
+       vtarget->num_luns++;
+
+       if (sdev->channel == 1)
+               sdev->no_uld_attach = 1;
+
+       return 0;
+}
+
+static int mptspi_slave_configure(struct scsi_device *sdev)
+{
+       struct _MPT_SCSI_HOST *hd = shost_priv(sdev->host);
+       VirtTarget *vtarget = scsi_target(sdev)->hostdata;
+       int ret;
+
+       mptspi_initTarget(hd, vtarget, sdev);
+
+       ret = mptscsih_slave_configure(sdev);
+
+       if (ret)
+               return ret;
+
+       ddvprintk(hd->ioc, printk(MYIOC_s_DEBUG_FMT "id=%d min_period=0x%02x"
+               " max_offset=0x%02x max_width=%d\n", hd->ioc->name,
+               sdev->id, spi_min_period(scsi_target(sdev)),
+               spi_max_offset(scsi_target(sdev)),
+               spi_max_width(scsi_target(sdev))));
+
+       if ((sdev->channel == 1 ||
+            !(mptspi_is_raid(hd, sdev->id))) &&
+           !spi_initial_dv(sdev->sdev_target))
+               mptspi_dv_device(hd, sdev);
+
+       return 0;
+}
+
+static int
+mptspi_qcmd(struct scsi_cmnd *SCpnt, void (*done)(struct scsi_cmnd *))
+{
+       struct _MPT_SCSI_HOST *hd = shost_priv(SCpnt->device->host);
+       VirtDevice      *vdevice = SCpnt->device->hostdata;
+       MPT_ADAPTER *ioc = hd->ioc;
+
+       if (!vdevice || !vdevice->vtarget) {
+               SCpnt->result = DID_NO_CONNECT << 16;
+               done(SCpnt);
+               return 0;
+       }
+
+       if (SCpnt->device->channel == 1 &&
+               mptscsih_is_phys_disk(ioc, 0, SCpnt->device->id) == 0) {
+               SCpnt->result = DID_NO_CONNECT << 16;
+               done(SCpnt);
+               return 0;
+       }
+
+       if (spi_dv_pending(scsi_target(SCpnt->device)))
+               ddvprintk(ioc, scsi_print_command(SCpnt));
+
+       return mptscsih_qcmd(SCpnt,done);
+}
+
+static void mptspi_slave_destroy(struct scsi_device *sdev)
+{
+       struct scsi_target *starget = scsi_target(sdev);
+       VirtTarget *vtarget = starget->hostdata;
+       VirtDevice *vdevice = sdev->hostdata;
+
+       /* Will this be the last lun on a non-raid device? */
+       if (vtarget->num_luns == 1 && vdevice->configured_lun) {
+               struct _CONFIG_PAGE_SCSI_DEVICE_1 pg1;
 
-static int     mptspiDoneCtx = -1;
-static int     mptspiTaskCtx = -1;
-static int     mptspiInternalCtx = -1; /* Used only for internal commands */
+               /* Async Narrow */
+               pg1.RequestedParameters = 0;
+               pg1.Reserved = 0;
+               pg1.Configuration = 0;
+
+               mptspi_write_spi_device_pg1(starget, &pg1);
+       }
+
+       mptscsih_slave_destroy(sdev);
+}
 
 static struct scsi_host_template mptspi_driver_template = {
+       .module                         = THIS_MODULE,
        .proc_name                      = "mptspi",
        .proc_info                      = mptscsih_proc_info,
        .name                           = "MPT SPI Host",
        .info                           = mptscsih_info,
-       .queuecommand                   = mptscsih_qcmd,
-       .slave_alloc                    = mptscsih_slave_alloc,
-       .slave_configure                = mptscsih_slave_configure,
-       .slave_destroy                  = mptscsih_slave_destroy,
+       .queuecommand                   = mptspi_qcmd,
+       .target_alloc                   = mptspi_target_alloc,
+       .slave_alloc                    = mptspi_slave_alloc,
+       .slave_configure                = mptspi_slave_configure,
+       .target_destroy                 = mptspi_target_destroy,
+       .slave_destroy                  = mptspi_slave_destroy,
        .change_queue_depth             = mptscsih_change_queue_depth,
        .eh_abort_handler               = mptscsih_abort,
        .eh_device_reset_handler        = mptscsih_dev_reset,
@@ -123,22 +832,475 @@ static struct scsi_host_template mptspi_driver_template = {
        .max_sectors                    = 8192,
        .cmd_per_lun                    = 7,
        .use_clustering                 = ENABLE_CLUSTERING,
+       .shost_attrs                    = mptscsih_host_attrs,
 };
 
+static int mptspi_write_spi_device_pg1(struct scsi_target *starget,
+                              struct _CONFIG_PAGE_SCSI_DEVICE_1 *pass_pg1)
+{
+       struct Scsi_Host *shost = dev_to_shost(&starget->dev);
+       struct _MPT_SCSI_HOST *hd = shost_priv(shost);
+       struct _MPT_ADAPTER *ioc = hd->ioc;
+       struct _CONFIG_PAGE_SCSI_DEVICE_1 *pg1;
+       dma_addr_t pg1_dma;
+       int size;
+       struct _x_config_parms cfg;
+       struct _CONFIG_PAGE_HEADER hdr;
+       int err = -EBUSY;
+
+       /* don't allow updating nego parameters on RAID devices */
+       if (starget->channel == 0 &&
+           mptspi_is_raid(hd, starget->id))
+               return -1;
+
+       size = ioc->spi_data.sdp1length * 4;
+
+       pg1 = dma_alloc_coherent(&ioc->pcidev->dev, size, &pg1_dma, GFP_KERNEL);
+       if (pg1 == NULL) {
+               starget_printk(KERN_ERR, starget, MYIOC_s_FMT
+                   "dma_alloc_coherent for parameters failed\n", ioc->name);
+               return -EINVAL;
+       }
+
+       memset(&hdr, 0, sizeof(hdr));
+
+       hdr.PageVersion = ioc->spi_data.sdp1version;
+       hdr.PageLength = ioc->spi_data.sdp1length;
+       hdr.PageNumber = 1;
+       hdr.PageType = MPI_CONFIG_PAGETYPE_SCSI_DEVICE;
+
+       memset(&cfg, 0, sizeof(cfg));
+
+       cfg.cfghdr.hdr = &hdr;
+       cfg.physAddr = pg1_dma;
+       cfg.action = MPI_CONFIG_ACTION_PAGE_WRITE_CURRENT;
+       cfg.dir = 1;
+       cfg.pageAddr = starget->id;
+
+       memcpy(pg1, pass_pg1, size);
+
+       pg1->Header.PageVersion = hdr.PageVersion;
+       pg1->Header.PageLength = hdr.PageLength;
+       pg1->Header.PageNumber = hdr.PageNumber;
+       pg1->Header.PageType = hdr.PageType;
+
+       mptspi_print_write_nego(hd, starget, le32_to_cpu(pg1->RequestedParameters));
+
+       if (mpt_config(ioc, &cfg)) {
+               starget_printk(KERN_ERR, starget, MYIOC_s_FMT
+                   "mpt_config failed\n", ioc->name);
+               goto out_free;
+       }
+       err = 0;
+
+ out_free:
+       dma_free_coherent(&ioc->pcidev->dev, size, pg1, pg1_dma);
+       return err;
+}
+
+static void mptspi_write_offset(struct scsi_target *starget, int offset)
+{
+       struct _CONFIG_PAGE_SCSI_DEVICE_1 pg1;
+       u32 nego;
+
+       if (offset < 0)
+               offset = 0;
+
+       if (offset > 255)
+               offset = 255;
+
+       if (spi_offset(starget) == -1)
+               mptspi_read_parameters(starget);
+
+       spi_offset(starget) = offset;
+
+       nego = mptspi_getRP(starget);
+
+       pg1.RequestedParameters = cpu_to_le32(nego);
+       pg1.Reserved = 0;
+       pg1.Configuration = 0;
+
+       mptspi_write_spi_device_pg1(starget, &pg1);
+}
+
+static void mptspi_write_period(struct scsi_target *starget, int period)
+{
+       struct _CONFIG_PAGE_SCSI_DEVICE_1 pg1;
+       u32 nego;
+
+       if (period < 8)
+               period = 8;
+
+       if (period > 255)
+               period = 255;
+
+       if (spi_period(starget) == -1)
+               mptspi_read_parameters(starget);
+
+       if (period == 8) {
+               spi_iu(starget) = 1;
+               spi_dt(starget) = 1;
+       } else if (period == 9) {
+               spi_dt(starget) = 1;
+       }
+
+       spi_period(starget) = period;
+
+       nego = mptspi_getRP(starget);
+
+       pg1.RequestedParameters = cpu_to_le32(nego);
+       pg1.Reserved = 0;
+       pg1.Configuration = 0;
+
+       mptspi_write_spi_device_pg1(starget, &pg1);
+}
+
+static void mptspi_write_dt(struct scsi_target *starget, int dt)
+{
+       struct _CONFIG_PAGE_SCSI_DEVICE_1 pg1;
+       u32 nego;
+
+       if (spi_period(starget) == -1)
+               mptspi_read_parameters(starget);
+
+       if (!dt && spi_period(starget) < 10)
+               spi_period(starget) = 10;
+
+       spi_dt(starget) = dt;
+
+       nego = mptspi_getRP(starget);
+
+
+       pg1.RequestedParameters = cpu_to_le32(nego);
+       pg1.Reserved = 0;
+       pg1.Configuration = 0;
+
+       mptspi_write_spi_device_pg1(starget, &pg1);
+}
+
+static void mptspi_write_iu(struct scsi_target *starget, int iu)
+{
+       struct _CONFIG_PAGE_SCSI_DEVICE_1 pg1;
+       u32 nego;
+
+       if (spi_period(starget) == -1)
+               mptspi_read_parameters(starget);
+
+       if (!iu && spi_period(starget) < 9)
+               spi_period(starget) = 9;
+
+       spi_iu(starget) = iu;
+
+       nego = mptspi_getRP(starget);
+
+       pg1.RequestedParameters = cpu_to_le32(nego);
+       pg1.Reserved = 0;
+       pg1.Configuration = 0;
+
+       mptspi_write_spi_device_pg1(starget, &pg1);
+}
+
+#define MPTSPI_SIMPLE_TRANSPORT_PARM(parm)                             \
+static void mptspi_write_##parm(struct scsi_target *starget, int parm)\
+{                                                                      \
+       struct _CONFIG_PAGE_SCSI_DEVICE_1 pg1;                          \
+       u32 nego;                                                       \
+                                                                       \
+       spi_##parm(starget) = parm;                                     \
+                                                                       \
+       nego = mptspi_getRP(starget);                                   \
+                                                                       \
+       pg1.RequestedParameters = cpu_to_le32(nego);                    \
+       pg1.Reserved = 0;                                               \
+       pg1.Configuration = 0;                                          \
+                                                                       \
+       mptspi_write_spi_device_pg1(starget, &pg1);                             \
+}
+
+MPTSPI_SIMPLE_TRANSPORT_PARM(rd_strm)
+MPTSPI_SIMPLE_TRANSPORT_PARM(wr_flow)
+MPTSPI_SIMPLE_TRANSPORT_PARM(rti)
+MPTSPI_SIMPLE_TRANSPORT_PARM(hold_mcs)
+MPTSPI_SIMPLE_TRANSPORT_PARM(pcomp_en)
+
+static void mptspi_write_qas(struct scsi_target *starget, int qas)
+{
+       struct _CONFIG_PAGE_SCSI_DEVICE_1 pg1;
+       struct Scsi_Host *shost = dev_to_shost(&starget->dev);
+       struct _MPT_SCSI_HOST *hd = shost_priv(shost);
+       VirtTarget *vtarget = starget->hostdata;
+       u32 nego;
+
+       if ((vtarget->negoFlags & MPT_TARGET_NO_NEGO_QAS) ||
+           hd->ioc->spi_data.noQas)
+               spi_qas(starget) = 0;
+       else
+               spi_qas(starget) = qas;
+
+       nego = mptspi_getRP(starget);
+
+       pg1.RequestedParameters = cpu_to_le32(nego);
+       pg1.Reserved = 0;
+       pg1.Configuration = 0;
+
+       mptspi_write_spi_device_pg1(starget, &pg1);
+}
+
+static void mptspi_write_width(struct scsi_target *starget, int width)
+{
+       struct _CONFIG_PAGE_SCSI_DEVICE_1 pg1;
+       u32 nego;
+
+       if (!width) {
+               spi_dt(starget) = 0;
+               if (spi_period(starget) < 10)
+                       spi_period(starget) = 10;
+       }
+
+       spi_width(starget) = width;
+
+       nego = mptspi_getRP(starget);
+
+       pg1.RequestedParameters = cpu_to_le32(nego);
+       pg1.Reserved = 0;
+       pg1.Configuration = 0;
+
+       mptspi_write_spi_device_pg1(starget, &pg1);
+}
+
+struct work_queue_wrapper {
+       struct work_struct      work;
+       struct _MPT_SCSI_HOST   *hd;
+       int                     disk;
+};
+
+static void mpt_work_wrapper(struct work_struct *work)
+{
+       struct work_queue_wrapper *wqw =
+               container_of(work, struct work_queue_wrapper, work);
+       struct _MPT_SCSI_HOST *hd = wqw->hd;
+       MPT_ADAPTER *ioc = hd->ioc;
+       struct Scsi_Host *shost = ioc->sh;
+       struct scsi_device *sdev;
+       int disk = wqw->disk;
+       struct _CONFIG_PAGE_IOC_3 *pg3;
+
+       kfree(wqw);
+
+       mpt_findImVolumes(ioc);
+       pg3 = ioc->raid_data.pIocPg3;
+       if (!pg3)
+               return;
+
+       shost_for_each_device(sdev,shost) {
+               struct scsi_target *starget = scsi_target(sdev);
+               VirtTarget *vtarget = starget->hostdata;
+
+               /* only want to search RAID components */
+               if (sdev->channel != 1)
+                       continue;
+
+               /* The id is the raid PhysDiskNum, even if
+                * starget->id is the actual target address */
+               if(vtarget->id != disk)
+                       continue;
+
+               starget_printk(KERN_INFO, vtarget->starget, MYIOC_s_FMT
+                   "Integrated RAID requests DV of new device\n", ioc->name);
+               mptspi_dv_device(hd, sdev);
+       }
+       shost_printk(KERN_INFO, shost, MYIOC_s_FMT
+           "Integrated RAID detects new device %d\n", ioc->name, disk);
+       scsi_scan_target(&ioc->sh->shost_gendev, 1, disk, 0, 1);
+}
+
+
+static void mpt_dv_raid(struct _MPT_SCSI_HOST *hd, int disk)
+{
+       struct work_queue_wrapper *wqw = kmalloc(sizeof(*wqw), GFP_ATOMIC);
+       MPT_ADAPTER *ioc = hd->ioc;
+
+       if (!wqw) {
+               shost_printk(KERN_ERR, ioc->sh, MYIOC_s_FMT
+                   "Failed to act on RAID event for physical disk %d\n",
+                   ioc->name, disk);
+               return;
+       }
+       INIT_WORK(&wqw->work, mpt_work_wrapper);
+       wqw->hd = hd;
+       wqw->disk = disk;
+
+       schedule_work(&wqw->work);
+}
+
+static int
+mptspi_event_process(MPT_ADAPTER *ioc, EventNotificationReply_t *pEvReply)
+{
+       u8 event = le32_to_cpu(pEvReply->Event) & 0xFF;
+       struct _MPT_SCSI_HOST *hd = shost_priv(ioc->sh);
+
+       if (hd && event ==  MPI_EVENT_INTEGRATED_RAID) {
+               int reason
+                       = (le32_to_cpu(pEvReply->Data[0]) & 0x00FF0000) >> 16;
+
+               if (reason == MPI_EVENT_RAID_RC_DOMAIN_VAL_NEEDED) {
+                       int disk = (le32_to_cpu(pEvReply->Data[0]) & 0xFF000000) >> 24;
+                       mpt_dv_raid(hd, disk);
+               }
+       }
+       return mptscsih_event_process(ioc, pEvReply);
+}
+
+static int
+mptspi_deny_binding(struct scsi_target *starget)
+{
+       struct _MPT_SCSI_HOST *hd =
+               (struct _MPT_SCSI_HOST *)dev_to_shost(starget->dev.parent)->hostdata;
+       return ((mptspi_is_raid(hd, starget->id)) &&
+               starget->channel == 0) ? 1 : 0;
+}
+
+static struct spi_function_template mptspi_transport_functions = {
+       .get_offset     = mptspi_read_parameters,
+       .set_offset     = mptspi_write_offset,
+       .show_offset    = 1,
+       .get_period     = mptspi_read_parameters,
+       .set_period     = mptspi_write_period,
+       .show_period    = 1,
+       .get_width      = mptspi_read_parameters,
+       .set_width      = mptspi_write_width,
+       .show_width     = 1,
+       .get_iu         = mptspi_read_parameters,
+       .set_iu         = mptspi_write_iu,
+       .show_iu        = 1,
+       .get_dt         = mptspi_read_parameters,
+       .set_dt         = mptspi_write_dt,
+       .show_dt        = 1,
+       .get_qas        = mptspi_read_parameters,
+       .set_qas        = mptspi_write_qas,
+       .show_qas       = 1,
+       .get_wr_flow    = mptspi_read_parameters,
+       .set_wr_flow    = mptspi_write_wr_flow,
+       .show_wr_flow   = 1,
+       .get_rd_strm    = mptspi_read_parameters,
+       .set_rd_strm    = mptspi_write_rd_strm,
+       .show_rd_strm   = 1,
+       .get_rti        = mptspi_read_parameters,
+       .set_rti        = mptspi_write_rti,
+       .show_rti       = 1,
+       .get_pcomp_en   = mptspi_read_parameters,
+       .set_pcomp_en   = mptspi_write_pcomp_en,
+       .show_pcomp_en  = 1,
+       .get_hold_mcs   = mptspi_read_parameters,
+       .set_hold_mcs   = mptspi_write_hold_mcs,
+       .show_hold_mcs  = 1,
+       .deny_binding   = mptspi_deny_binding,
+};
 
 /****************************************************************************
  * Supported hardware
  */
 
 static struct pci_device_id mptspi_pci_table[] = {
-       { PCI_VENDOR_ID_LSI_LOGIC, PCI_DEVICE_ID_LSI_53C1030,
+       { PCI_VENDOR_ID_LSI_LOGIC, MPI_MANUFACTPAGE_DEVID_53C1030,
                PCI_ANY_ID, PCI_ANY_ID },
-       { PCI_VENDOR_ID_LSI_LOGIC, PCI_DEVICE_ID_LSI_1030_53C1035,
+       { PCI_VENDOR_ID_ATTO, MPI_MANUFACTPAGE_DEVID_53C1030,
+               PCI_ANY_ID, PCI_ANY_ID },
+       { PCI_VENDOR_ID_LSI_LOGIC, MPI_MANUFACTPAGE_DEVID_53C1035,
                PCI_ANY_ID, PCI_ANY_ID },
        {0}     /* Terminating entry */
 };
 MODULE_DEVICE_TABLE(pci, mptspi_pci_table);
 
+
+/*
+ * renegotiate for a given target
+ */
+static void
+mptspi_dv_renegotiate_work(struct work_struct *work)
+{
+       struct work_queue_wrapper *wqw =
+               container_of(work, struct work_queue_wrapper, work);
+       struct _MPT_SCSI_HOST *hd = wqw->hd;
+       struct scsi_device *sdev;
+       struct scsi_target *starget;
+       struct _CONFIG_PAGE_SCSI_DEVICE_1 pg1;
+       u32 nego;
+       MPT_ADAPTER *ioc = hd->ioc;
+
+       kfree(wqw);
+
+       if (hd->spi_pending) {
+               shost_for_each_device(sdev, ioc->sh) {
+                       if  (hd->spi_pending & (1 << sdev->id))
+                               continue;
+                       starget = scsi_target(sdev);
+                       nego = mptspi_getRP(starget);
+                       pg1.RequestedParameters = cpu_to_le32(nego);
+                       pg1.Reserved = 0;
+                       pg1.Configuration = 0;
+                       mptspi_write_spi_device_pg1(starget, &pg1);
+               }
+       } else {
+               shost_for_each_device(sdev, ioc->sh)
+                       mptspi_dv_device(hd, sdev);
+       }
+}
+
+static void
+mptspi_dv_renegotiate(struct _MPT_SCSI_HOST *hd)
+{
+       struct work_queue_wrapper *wqw = kmalloc(sizeof(*wqw), GFP_ATOMIC);
+
+       if (!wqw)
+               return;
+
+       INIT_WORK(&wqw->work, mptspi_dv_renegotiate_work);
+       wqw->hd = hd;
+
+       schedule_work(&wqw->work);
+}
+
+/*
+ * spi module reset handler
+ */
+static int
+mptspi_ioc_reset(MPT_ADAPTER *ioc, int reset_phase)
+{
+       int rc;
+
+       rc = mptscsih_ioc_reset(ioc, reset_phase);
+
+       /* only try to do a renegotiation if we're properly set up
+        * if we get an ioc fault on bringup, ioc->sh will be NULL */
+       if (reset_phase == MPT_IOC_POST_RESET &&
+           ioc->sh) {
+               struct _MPT_SCSI_HOST *hd = shost_priv(ioc->sh);
+
+               mptspi_dv_renegotiate(hd);
+       }
+
+       return rc;
+}
+
+#ifdef CONFIG_PM
+/*
+ * spi module resume handler
+ */
+static int
+mptspi_resume(struct pci_dev *pdev)
+{
+       MPT_ADAPTER     *ioc = pci_get_drvdata(pdev);
+       struct _MPT_SCSI_HOST *hd = shost_priv(ioc->sh);
+       int rc;
+
+       rc = mptscsih_resume(pdev);
+       mptspi_dv_renegotiate(hd);
+
+       return rc;
+}
+#endif
+
 /*=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=*/
 /*=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=*/
 /*
@@ -155,35 +1317,36 @@ mptspi_probe(struct pci_dev *pdev, const struct pci_device_id *id)
        MPT_SCSI_HOST           *hd;
        MPT_ADAPTER             *ioc;
        unsigned long            flags;
-       int                      sz, ii;
+       int                      ii;
        int                      numSGE = 0;
        int                      scale;
        int                      ioc_cap;
-       u8                      *mem;
        int                     error=0;
        int                     r;
-       
+
        if ((r = mpt_attach(pdev,id)) != 0)
                return r;
-       
+
        ioc = pci_get_drvdata(pdev);
        ioc->DoneCtx = mptspiDoneCtx;
        ioc->TaskCtx = mptspiTaskCtx;
        ioc->InternalCtx = mptspiInternalCtx;
-       
+
        /*  Added sanity check on readiness of the MPT adapter.
         */
        if (ioc->last_state != MPI_IOC_STATE_OPERATIONAL) {
                printk(MYIOC_s_WARN_FMT
                  "Skipping because it's not operational!\n",
                  ioc->name);
-               return -ENODEV;
+               error = -ENODEV;
+               goto out_mptspi_probe;
        }
 
        if (!ioc->active) {
                printk(MYIOC_s_WARN_FMT "Skipping because it's disabled!\n",
                  ioc->name);
-               return -ENODEV;
+               error = -ENODEV;
+               goto out_mptspi_probe;
        }
 
        /*  Sanity check - ensure at least 1 port is INITIATOR capable
@@ -199,7 +1362,7 @@ mptspi_probe(struct pci_dev *pdev, const struct pci_device_id *id)
                printk(MYIOC_s_WARN_FMT
                        "Skipping ioc=%p because SCSI Initiator mode is NOT enabled!\n",
                        ioc->name, ioc);
-               return -ENODEV;
+               return 0;
        }
 
        sh = scsi_host_alloc(&mptspi_driver_template, sizeof(MPT_SCSI_HOST));
@@ -208,7 +1371,8 @@ mptspi_probe(struct pci_dev *pdev, const struct pci_device_id *id)
                printk(MYIOC_s_WARN_FMT
                        "Unable to register controller with SCSI subsystem\n",
                        ioc->name);
-                return -1;
+               error = -1;
+               goto out_mptspi_probe;
         }
 
        spin_lock_irqsave(&ioc->FreeQlock, flags);
@@ -234,10 +1398,16 @@ mptspi_probe(struct pci_dev *pdev, const struct pci_device_id *id)
         * max_lun = 1 + actual last lun,
         *      see hosts.h :o(
         */
-       sh->max_id = MPT_MAX_SCSI_DEVICES;
+       sh->max_id = ioc->devices_per_bus;
 
        sh->max_lun = MPT_LAST_LUN + 1;
-       sh->max_channel = 0;
+       /*
+        * If RAID Firmware Detected, setup virtual channel
+        */
+       if (ioc->ir_firmware)
+               sh->max_channel = 1;
+       else
+               sh->max_channel = 0;
        sh->this_id = ioc->pfacts[0].PortSCSIID;
 
        /* Required entry.
@@ -268,7 +1438,7 @@ mptspi_probe(struct pci_dev *pdev, const struct pci_device_id *id)
 
        if (numSGE < sh->sg_tablesize) {
                /* Reset this value */
-               dprintk((MYIOC_s_INFO_FMT
+               dprintk(ioc, printk(MYIOC_s_DEBUG_FMT
                  "Resetting sg_tablesize to %d from %d\n",
                  ioc->name, numSGE, sh->sg_tablesize));
                sh->sg_tablesize = numSGE;
@@ -276,42 +1446,21 @@ mptspi_probe(struct pci_dev *pdev, const struct pci_device_id *id)
 
        spin_unlock_irqrestore(&ioc->FreeQlock, flags);
 
-       hd = (MPT_SCSI_HOST *) sh->hostdata;
+       hd = shost_priv(sh);
        hd->ioc = ioc;
 
        /* SCSI needs scsi_cmnd lookup table!
         * (with size equal to req_depth*PtrSz!)
         */
-       sz = ioc->req_depth * sizeof(void *);
-       mem = kmalloc(sz, GFP_ATOMIC);
-       if (mem == NULL) {
-               error = -ENOMEM;
-               goto mptspi_probe_failed;
-       }
-
-       memset(mem, 0, sz);
-       hd->ScsiLookup = (struct scsi_cmnd **) mem;
-
-       dprintk((MYIOC_s_INFO_FMT "ScsiLookup @ %p, sz=%d\n",
-                ioc->name, hd->ScsiLookup, sz));
-
-       /* Allocate memory for the device structures.
-        * A non-Null pointer at an offset
-        * indicates a device exists.
-        * max_id = 1 + maximum id (hosts.h)
-        */
-       sz = sh->max_id * sizeof(void *);
-       mem = kmalloc(sz, GFP_ATOMIC);
-       if (mem == NULL) {
+       ioc->ScsiLookup = kcalloc(ioc->req_depth, sizeof(void *), GFP_ATOMIC);
+       if (!ioc->ScsiLookup) {
                error = -ENOMEM;
-               goto mptspi_probe_failed;
+               goto out_mptspi_probe;
        }
+       spin_lock_init(&ioc->scsi_lookup_lock);
 
-       memset(mem, 0, sz);
-       hd->Targets = (VirtDevice **) mem;
-
-       dprintk((KERN_INFO
-         "  Targets @ %p, sz=%d\n", hd->Targets, sz));
+       dprintk(ioc, printk(MYIOC_s_DEBUG_FMT "ScsiLookup @ %p\n",
+                ioc->name, ioc->ScsiLookup));
 
        /* Clear the TM flags
         */
@@ -336,62 +1485,43 @@ mptspi_probe(struct pci_dev *pdev, const struct pci_device_id *id)
        hd->timer.function = mptscsih_timer_expired;
 
        ioc->spi_data.Saf_Te = mpt_saf_te;
-       hd->mpt_pq_filter = mpt_pq_filter;
 
-#ifdef MPTSCSIH_ENABLE_DOMAIN_VALIDATION
-       if (ioc->spi_data.maxBusWidth > mpt_width)
-               ioc->spi_data.maxBusWidth = mpt_width;
-       if (ioc->spi_data.minSyncFactor < mpt_factor)
-               ioc->spi_data.minSyncFactor = mpt_factor;
-       if (ioc->spi_data.minSyncFactor == MPT_ASYNC) {
-               ioc->spi_data.maxSyncOffset = 0;
-       }
-       ioc->spi_data.mpt_dv = mpt_dv;
-       hd->negoNvram = 0;
-
-       ddvprintk((MYIOC_s_INFO_FMT
-               "dv %x width %x factor %x saf_te %x mpt_pq_filter %x\n",
-               ioc->name,
-               mpt_dv,
-               mpt_width,
-               mpt_factor,
-               mpt_saf_te,
-               mpt_pq_filter));
-#else
        hd->negoNvram = MPT_SCSICFG_USE_NVRAM;
-       ddvprintk((MYIOC_s_INFO_FMT
-               "saf_te %x mpt_pq_filter %x\n",
+       ddvprintk(ioc, printk(MYIOC_s_DEBUG_FMT
+               "saf_te %x\n",
                ioc->name,
-               mpt_saf_te,
-               mpt_pq_filter));
-#endif
-
-       ioc->spi_data.forceDv = 0;
+               mpt_saf_te));
        ioc->spi_data.noQas = 0;
 
-       for (ii=0; ii < MPT_MAX_SCSI_DEVICES; ii++)
-               ioc->spi_data.dvStatus[ii] =
-                 MPT_SCSICFG_NEGOTIATE;
-
-       for (ii=0; ii < MPT_MAX_SCSI_DEVICES; ii++)
-               ioc->spi_data.dvStatus[ii] |=
-                 MPT_SCSICFG_DV_NOT_DONE;
-
        init_waitqueue_head(&hd->scandv_waitq);
        hd->scandv_wait_done = 0;
        hd->last_queue_full = 0;
+       hd->spi_pending = 0;
+
+       /* Some versions of the firmware don't support page 0; without
+        * that we can't get the parameters */
+       if (ioc->spi_data.sdp0length != 0)
+               sh->transportt = mptspi_transport_template;
 
        error = scsi_add_host (sh, &ioc->pcidev->dev);
        if(error) {
-               dprintk((KERN_ERR MYNAM
-                 "scsi_add_host failed\n"));
-               goto mptspi_probe_failed;
+               dprintk(ioc, printk(MYIOC_s_ERR_FMT
+                 "scsi_add_host failed\n", ioc->name));
+               goto out_mptspi_probe;
        }
 
+       /*
+        * issue internal bus reset
+        */
+       if (ioc->spi_data.bus_reset)
+               mptscsih_TMHandler(hd,
+                   MPI_SCSITASKMGMT_TASKTYPE_RESET_BUS,
+                   0, 0, 0, 0, 5);
+
        scsi_scan_host(sh);
        return 0;
 
-mptspi_probe_failed:
+out_mptspi_probe:
 
        mptscsih_remove(pdev);
        return error;
@@ -402,67 +1532,61 @@ static struct pci_driver mptspi_driver = {
        .id_table       = mptspi_pci_table,
        .probe          = mptspi_probe,
        .remove         = __devexit_p(mptscsih_remove),
-       .driver         = {
-               .shutdown = mptscsih_shutdown,
-        },
+       .shutdown       = mptscsih_shutdown,
 #ifdef CONFIG_PM
        .suspend        = mptscsih_suspend,
-       .resume         = mptscsih_resume,
+       .resume         = mptspi_resume,
 #endif
 };
 
 /*=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=*/
 /**
- *     mptspi_init - Register MPT adapter(s) as SCSI host(s) with
- *     linux scsi mid-layer.
+ *     mptspi_init - Register MPT adapter(s) as SCSI host(s) with SCSI mid-layer.
  *
  *     Returns 0 for success, non-zero for failure.
  */
 static int __init
 mptspi_init(void)
 {
+       int error;
 
        show_mptmod_ver(my_NAME, my_VERSION);
 
+       mptspi_transport_template = spi_attach_transport(&mptspi_transport_functions);
+       if (!mptspi_transport_template)
+               return -ENODEV;
+
        mptspiDoneCtx = mpt_register(mptscsih_io_done, MPTSPI_DRIVER);
        mptspiTaskCtx = mpt_register(mptscsih_taskmgmt_complete, MPTSPI_DRIVER);
        mptspiInternalCtx = mpt_register(mptscsih_scandv_complete, MPTSPI_DRIVER);
 
-       if (mpt_event_register(mptspiDoneCtx, mptscsih_event_process) == 0) {
-               devtprintk((KERN_INFO MYNAM
-                 ": Registered for IOC event notifications\n"));
-       }
+       mpt_event_register(mptspiDoneCtx, mptspi_event_process);
+       mpt_reset_register(mptspiDoneCtx, mptspi_ioc_reset);
 
-       if (mpt_reset_register(mptspiDoneCtx, mptscsih_ioc_reset) == 0) {
-               dprintk((KERN_INFO MYNAM
-                 ": Registered for IOC reset notifications\n"));
-       }
+       error = pci_register_driver(&mptspi_driver);
+       if (error)
+               spi_release_transport(mptspi_transport_template);
 
-       return pci_register_driver(&mptspi_driver);
+       return error;
 }
 
 /*=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=*/
 /*=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=*/
 /**
  *     mptspi_exit - Unregisters MPT adapter(s)
- *
  */
 static void __exit
 mptspi_exit(void)
 {
        pci_unregister_driver(&mptspi_driver);
-       
-       mpt_reset_deregister(mptspiDoneCtx);
-       dprintk((KERN_INFO MYNAM
-         ": Deregistered for IOC reset notifications\n"));
 
+       mpt_reset_deregister(mptspiDoneCtx);
        mpt_event_deregister(mptspiDoneCtx);
-       dprintk((KERN_INFO MYNAM
-         ": Deregistered for IOC event notifications\n"));
 
        mpt_deregister(mptspiInternalCtx);
        mpt_deregister(mptspiTaskCtx);
        mpt_deregister(mptspiDoneCtx);
+       spi_release_transport(mptspi_transport_template);
 }
 
 module_init(mptspi_init);