1 files changed, 114 insertions, 97 deletions

diff --git a/drivers/message/fusion/mptspi.c b/drivers/message/fusion/mptspi.c
index 8c98420640a5..25bcfcf36f2e 100644
--- a/drivers/message/fusion/mptspi.c
+++ b/drivers/message/fusion/mptspi.c
@@ -1,9 +1,9 @@
 /*
  *  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-2007 LSI Logic Corporation
+ *  Copyright (c) 1999-2007 LSI Corporation
  *  (mailto:DL-MPTFusionLinux@lsi.com)
  *
  */
@@ -90,9 +90,9 @@ static int mptspi_write_spi_device_pg1(struct scsi_target *,
 
 static struct scsi_transport_template *mptspi_transport_template = NULL;
 
-static int      mptspiDoneCtx = -1;
-static int      mptspiTaskCtx = -1;
-static int      mptspiInternalCtx = -1; /* Used only for internal commands */
+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
@@ -107,7 +107,8 @@ static void
 mptspi_setTargetNegoParms(MPT_SCSI_HOST *hd, VirtTarget *target,
                             struct scsi_device *sdev)
 {
-        SpiCfgData *pspi_data = &hd->ioc->spi_data;
+        MPT_ADAPTER *ioc = hd->ioc;
+        SpiCfgData *pspi_data = &ioc->spi_data;
         int  id = (int) target->id;
         int  nvram;
         u8 width = MPT_NARROW;
@@ -138,9 +139,10 @@ mptspi_setTargetNegoParms(MPT_SCSI_HOST *hd, VirtTarget *target,
                                 else {
                                         factor = MPT_ULTRA320;
                                         if (scsi_device_qas(sdev)) {
-                                                ddvprintk(hd->ioc,
-                                                printk(KERN_DEBUG "Enabling QAS due to "
-                                                "byte56=%02x on id=%d!\n", scsi_device_qas(sdev), id));
+                                                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 &&
@@ -227,8 +229,8 @@ mptspi_setTargetNegoParms(MPT_SCSI_HOST *hd, VirtTarget *target,
                 /* Disable QAS in a mixed configuration case
                  */
 
-                ddvprintk(hd->ioc, printk(KERN_DEBUG
-                        "Disabling QAS due to noQas=%02x on id=%d!\n", noQas, id));
+                ddvprintk(ioc, printk(MYIOC_s_DEBUG_FMT
+                        "Disabling QAS due to noQas=%02x on id=%d!\n", ioc->name, noQas, id));
         }
 }
 
@@ -302,7 +304,7 @@ mptspi_writeIOCPage4(MPT_SCSI_HOST *hd, u8 channel , u8 id)
 
         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));
+                ioc->name, IOCPage4Ptr->MaxSEP, IOCPage4Ptr->ActiveSEP, id, channel));
 
         mpt_put_msg_frame(ioc->DoneCtx, ioc, mf);
 
@@ -374,14 +376,15 @@ static int
 mptspi_is_raid(struct _MPT_SCSI_HOST *hd, u32 id)
 {
         int i, rc = 0;
+        MPT_ADAPTER *ioc = hd->ioc;
 
-        if (!hd->ioc->raid_data.pIocPg2)
+        if (!ioc->raid_data.pIocPg2)
                 goto out;
 
-        if (!hd->ioc->raid_data.pIocPg2->NumActiveVolumes)
+        if (!ioc->raid_data.pIocPg2->NumActiveVolumes)
                 goto out;
-        for (i=0; i < hd->ioc->raid_data.pIocPg2->NumActiveVolumes; i++) {
-                if (hd->ioc->raid_data.pIocPg2->RaidVolume[i].VolumeID == id) {
+        for (i=0; i < ioc->raid_data.pIocPg2->NumActiveVolumes; i++) {
+                if (ioc->raid_data.pIocPg2->RaidVolume[i].VolumeID == id) {
                         rc = 1;
                         goto out;
                 }
@@ -394,17 +397,19 @@ mptspi_is_raid(struct _MPT_SCSI_HOST *hd, u32 id)
 static int mptspi_target_alloc(struct scsi_target *starget)
 {
         struct Scsi_Host *shost = dev_to_shost(&starget->dev);
-        struct _MPT_SCSI_HOST *hd = (struct _MPT_SCSI_HOST *)shost->hostdata;
+        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 = hd->ioc->id;
+        vtarget->ioc_id = ioc->id;
         vtarget->tflags = MPT_TARGET_FLAGS_Q_YES;
         vtarget->id = (u8)starget->id;
         vtarget->channel = (u8)starget->channel;
@@ -412,34 +417,34 @@ static int mptspi_target_alloc(struct scsi_target *starget)
         starget->hostdata = vtarget;
 
         if (starget->channel == 1) {
-                if (mptscsih_is_phys_disk(hd->ioc, 0, starget->id) == 0)
+                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(hd->ioc, 0,
+                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(hd->ioc, printk(KERN_DEBUG
-                    "RAID Volume @ channel=%d id=%d\n", starget->channel,
+                ddvprintk(ioc, printk(MYIOC_s_DEBUG_FMT
+                    "RAID Volume @ channel=%d id=%d\n", ioc->name, starget->channel,
                     starget->id));
         }
 
-        if (hd->ioc->spi_data.nvram &&
-            hd->ioc->spi_data.nvram[starget->id] != MPT_HOST_NVRAM_INVALID) {
-                u32 nvram = hd->ioc->spi_data.nvram[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) = hd->ioc->spi_data.minSyncFactor;
-                spi_max_width(starget) = hd->ioc->spi_data.maxBusWidth;
+                spi_min_period(starget) = ioc->spi_data.minSyncFactor;
+                spi_max_width(starget) = ioc->spi_data.maxBusWidth;
         }
-        spi_max_offset(starget) = hd->ioc->spi_data.maxSyncOffset;
+        spi_max_offset(starget) = ioc->spi_data.maxSyncOffset;
 
         spi_offset(starget) = 0;
         mptspi_write_width(starget, 0);
@@ -509,10 +514,10 @@ 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 = (struct _MPT_SCSI_HOST *)shost->hostdata;
+        struct _MPT_SCSI_HOST *hd = shost_priv(shost);
         struct _MPT_ADAPTER *ioc = hd->ioc;
-        struct _CONFIG_PAGE_SCSI_DEVICE_0 *pg0;
-        dma_addr_t pg0_dma;
+        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;
@@ -530,9 +535,10 @@ static int mptspi_read_spi_device_pg0(struct scsi_target *starget,
         size += 2048;
         */
 
-        pg0 = dma_alloc_coherent(&ioc->pcidev->dev, size, &pg0_dma, GFP_KERNEL);
-        if (pg0 == NULL) {
-                starget_printk(KERN_ERR, starget, "dma_alloc_coherent for parameters failed\n");
+        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;
         }
 
@@ -546,22 +552,22 @@ static int mptspi_read_spi_device_pg0(struct scsi_target *starget,
         memset(&cfg, 0, sizeof(cfg));
 
         cfg.cfghdr.hdr = &hdr;
-        cfg.physAddr = pg0_dma;
+        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, "mpt_config failed\n");
+                starget_printk(KERN_ERR, starget, MYIOC_s_FMT "mpt_config failed\n", ioc->name);
                 goto out_free;
         }
         err = 0;
-        memcpy(pass_pg0, pg0, size);
+        memcpy(pass_pg0, spi_dev_pg0, size);
 
-        mptspi_print_read_nego(hd, starget, le32_to_cpu(pg0->NegotiatedParameters));
+        mptspi_print_read_nego(hd, starget, le32_to_cpu(spi_dev_pg0->NegotiatedParameters));
 
  out_free:
-        dma_free_coherent(&ioc->pcidev->dev, size, pg0, pg0_dma);
+        dma_free_coherent(&ioc->pcidev->dev, size, spi_dev_pg0, spi_dev_pg0_dma);
         return err;
 }
 
@@ -588,11 +594,11 @@ static u32 mptspi_getRP(struct scsi_target *starget)
 static void mptspi_read_parameters(struct scsi_target *starget)
 {
         int nego;
-        struct _CONFIG_PAGE_SCSI_DEVICE_0 pg0;
+        struct _CONFIG_PAGE_SCSI_DEVICE_0 spi_dev_pg0;
 
-        mptspi_read_spi_device_pg0(starget, &pg0);
+        mptspi_read_spi_device_pg0(starget, &spi_dev_pg0);
 
-        nego = le32_to_cpu(pg0.NegotiatedParameters);
+        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;
@@ -612,12 +618,13 @@ 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(hd->ioc->InternalCtx, hd->ioc)) == NULL) {
-                ddvprintk(hd->ioc, printk(MYIOC_s_WARN_FMT "_do_raid: no msg frames!\n",
-                                        hd->ioc->name));
+        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;
@@ -638,8 +645,8 @@ mptscsih_quiesce_raid(MPT_SCSI_HOST *hd, int quiesce, u8 channel, u8 id)
         mpt_add_sge((char *)&pReq->ActionDataSGE,
                 MPT_SGE_FLAGS_SSIMPLE_READ | 0, (dma_addr_t) -1);
 
-        ddvprintk(hd->ioc, printk(MYIOC_s_DEBUG_FMT "RAID Volume action=%x channel=%d id=%d\n",
-                        hd->ioc->name, pReq->Action, channel, id));
+        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 */
@@ -651,7 +658,7 @@ mptscsih_quiesce_raid(MPT_SCSI_HOST *hd, int quiesce, u8 channel, u8 id)
         hd->cmdPtr = mf;
 
         add_timer(&hd->timer);
-        mpt_put_msg_frame(hd->ioc->InternalCtx, hd->ioc, mf);
+        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))
@@ -664,6 +671,7 @@ 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 &&
@@ -673,8 +681,8 @@ static void mptspi_dv_device(struct _MPT_SCSI_HOST *hd,
         /* 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),
-                               "Integrated RAID quiesce failed\n");
+                starget_printk(KERN_ERR, scsi_target(sdev), MYIOC_s_FMT
+                    "Integrated RAID quiesce failed\n", ioc->name);
                 return;
         }
 
@@ -684,8 +692,8 @@ static void mptspi_dv_device(struct _MPT_SCSI_HOST *hd,
 
         if (sdev->channel == 1 &&
             mptscsih_quiesce_raid(hd, 0, vtarget->channel, vtarget->id) < 0)
-                starget_printk(KERN_ERR, scsi_target(sdev),
-                               "Integrated RAID resume failed\n");
+                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);
@@ -694,28 +702,29 @@ static void mptspi_dv_device(struct _MPT_SCSI_HOST *hd,
 
 static int mptspi_slave_alloc(struct scsi_device *sdev)
 {
-        MPT_SCSI_HOST *hd = (MPT_SCSI_HOST *)sdev->host->hostdata;
+        MPT_SCSI_HOST *hd = shost_priv(sdev->host);
         VirtTarget              *vtarget;
-        VirtDevice              *vdev;
+        VirtDevice              *vdevice;
         struct scsi_target      *starget;
+        MPT_ADAPTER *ioc = hd->ioc;
 
         if (sdev->channel == 1 &&
-                mptscsih_is_phys_disk(hd->ioc, 0, sdev->id) == 0)
+                mptscsih_is_phys_disk(ioc, 0, sdev->id) == 0)
                         return -ENXIO;
 
-        vdev = kzalloc(sizeof(VirtDevice), GFP_KERNEL);
-        if (!vdev) {
+        vdevice = kzalloc(sizeof(VirtDevice), GFP_KERNEL);
+        if (!vdevice) {
                 printk(MYIOC_s_ERR_FMT "slave_alloc kmalloc(%zd) FAILED!\n",
-                                hd->ioc->name, sizeof(VirtDevice));
+                                ioc->name, sizeof(VirtDevice));
                 return -ENOMEM;
         }
 
-        vdev->lun = sdev->lun;
-        sdev->hostdata = vdev;
+        vdevice->lun = sdev->lun;
+        sdev->hostdata = vdevice;
 
         starget = scsi_target(sdev);
         vtarget = starget->hostdata;
-        vdev->vtarget = vtarget;
+        vdevice->vtarget = vtarget;
         vtarget->num_luns++;
 
         if (sdev->channel == 1)
@@ -726,8 +735,7 @@ static int mptspi_slave_alloc(struct scsi_device *sdev)
 
 static int mptspi_slave_configure(struct scsi_device *sdev)
 {
-        struct _MPT_SCSI_HOST *hd =
-                (struct _MPT_SCSI_HOST *)sdev->host->hostdata;
+        struct _MPT_SCSI_HOST *hd = shost_priv(sdev->host);
         VirtTarget *vtarget = scsi_target(sdev)->hostdata;
         int ret;
 
@@ -755,24 +763,25 @@ static int mptspi_slave_configure(struct scsi_device *sdev)
 static int
 mptspi_qcmd(struct scsi_cmnd *SCpnt, void (*done)(struct scsi_cmnd *))
 {
-        struct _MPT_SCSI_HOST *hd = (MPT_SCSI_HOST *) SCpnt->device->host->hostdata;
-        VirtDevice      *vdev = SCpnt->device->hostdata;
+        struct _MPT_SCSI_HOST *hd = shost_priv(SCpnt->device->host);
+        VirtDevice      *vdevice = SCpnt->device->hostdata;
+        MPT_ADAPTER *ioc = hd->ioc;
 
-        if (!vdev || !vdev->vtarget) {
+        if (!vdevice || !vdevice->vtarget) {
                 SCpnt->result = DID_NO_CONNECT << 16;
                 done(SCpnt);
                 return 0;
         }
 
         if (SCpnt->device->channel == 1 &&
-                mptscsih_is_phys_disk(hd->ioc, 0, SCpnt->device->id) == 0) {
+                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(hd->ioc, scsi_print_command(SCpnt));
+                ddvprintk(ioc, scsi_print_command(SCpnt));
 
         return mptscsih_qcmd(SCpnt,done);
 }
@@ -829,7 +838,7 @@ 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 = (struct _MPT_SCSI_HOST *)shost->hostdata;
+        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;
@@ -847,7 +856,8 @@ static int mptspi_write_spi_device_pg1(struct scsi_target *starget,
 
         pg1 = dma_alloc_coherent(&ioc->pcidev->dev, size, &pg1_dma, GFP_KERNEL);
         if (pg1 == NULL) {
-                starget_printk(KERN_ERR, starget, "dma_alloc_coherent for parameters failed\n");
+                starget_printk(KERN_ERR, starget, MYIOC_s_FMT
+                    "dma_alloc_coherent for parameters failed\n", ioc->name);
                 return -EINVAL;
         }
 
@@ -876,7 +886,8 @@ static int mptspi_write_spi_device_pg1(struct scsi_target *starget,
         mptspi_print_write_nego(hd, starget, le32_to_cpu(pg1->RequestedParameters));
 
         if (mpt_config(ioc, &cfg)) {
-                starget_printk(KERN_ERR, starget, "mpt_config failed\n");
+                starget_printk(KERN_ERR, starget, MYIOC_s_FMT
+                    "mpt_config failed\n", ioc->name);
                 goto out_free;
         }
         err = 0;
@@ -1015,7 +1026,7 @@ 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 = (struct _MPT_SCSI_HOST *)shost->hostdata;
+        struct _MPT_SCSI_HOST *hd = shost_priv(shost);
         VirtTarget *vtarget = starget->hostdata;
         u32 nego;
 
@@ -1067,15 +1078,16 @@ 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;
-        struct Scsi_Host *shost = hd->ioc->sh;
+        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(hd->ioc);
-        pg3 = hd->ioc->raid_data.pIocPg3;
+        mpt_findImVolumes(ioc);
+        pg3 = ioc->raid_data.pIocPg3;
         if (!pg3)
                 return;
 
@@ -1092,24 +1104,25 @@ static void mpt_work_wrapper(struct work_struct *work)
                 if(vtarget->id != disk)
                         continue;
 
-                starget_printk(KERN_INFO, vtarget->starget,
-                               "Integrated RAID requests DV of new device\n");
+                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,
-                     "Integrated RAID detects new device %d\n", disk);
-        scsi_scan_target(&hd->ioc->sh->shost_gendev, 1, disk, 0, 1);
+        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, hd->ioc->sh,
-                             "Failed to act on RAID event for physical disk %d\n",
-                           disk);
+                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);
@@ -1123,7 +1136,7 @@ static int
 mptspi_event_process(MPT_ADAPTER *ioc, EventNotificationReply_t *pEvReply)
 {
         u8 event = le32_to_cpu(pEvReply->Event) & 0xFF;
-        struct _MPT_SCSI_HOST *hd = (struct _MPT_SCSI_HOST *)ioc->sh->hostdata;
+        struct _MPT_SCSI_HOST *hd = shost_priv(ioc->sh);
 
         if (hd && event ==  MPI_EVENT_INTEGRATED_RAID) {
                 int reason
@@ -1190,6 +1203,8 @@ static struct spi_function_template mptspi_transport_functions = {
 static struct pci_device_id mptspi_pci_table[] = {
         { PCI_VENDOR_ID_LSI_LOGIC, MPI_MANUFACTPAGE_DEVID_53C1030,
                 PCI_ANY_ID, PCI_ANY_ID },
+        { 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 */
@@ -1210,11 +1225,12 @@ mptspi_dv_renegotiate_work(struct work_struct *work)
         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, hd->ioc->sh) {
+                shost_for_each_device(sdev, ioc->sh) {
                         if  (hd->spi_pending & (1 << sdev->id))
                                 continue;
                         starget = scsi_target(sdev);
@@ -1225,7 +1241,7 @@ mptspi_dv_renegotiate_work(struct work_struct *work)
                         mptspi_write_spi_device_pg1(starget, &pg1);
                 }
         } else {
-                shost_for_each_device(sdev, hd->ioc->sh)
+                shost_for_each_device(sdev, ioc->sh)
                         mptspi_dv_device(hd, sdev);
         }
 }
@@ -1250,7 +1266,7 @@ mptspi_dv_renegotiate(struct _MPT_SCSI_HOST *hd)
 static int
 mptspi_ioc_reset(MPT_ADAPTER *ioc, int reset_phase)
 {
-        struct _MPT_SCSI_HOST *hd = (struct _MPT_SCSI_HOST *)ioc->sh->hostdata;
+        struct _MPT_SCSI_HOST *hd = shost_priv(ioc->sh);
         int rc;
 
         rc = mptscsih_ioc_reset(ioc, reset_phase);
@@ -1269,7 +1285,7 @@ static int
 mptspi_resume(struct pci_dev *pdev)
 {
         MPT_ADAPTER     *ioc = pci_get_drvdata(pdev);
-        struct _MPT_SCSI_HOST *hd = (struct _MPT_SCSI_HOST *)ioc->sh->hostdata;
+        struct _MPT_SCSI_HOST *hd = shost_priv(ioc->sh);
         int rc;
 
         rc = mptscsih_resume(pdev);
@@ -1416,7 +1432,7 @@ mptspi_probe(struct pci_dev *pdev, const struct pci_device_id *id)
 
         if (numSGE < sh->sg_tablesize) {
                 /* Reset this value */
-                dprintk(ioc, printk(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;
@@ -1424,20 +1440,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!)
          */
-        hd->ScsiLookup = kcalloc(ioc->req_depth, sizeof(void *), GFP_ATOMIC);
-        if (!hd->ScsiLookup) {
+        ioc->ScsiLookup = kcalloc(ioc->req_depth, sizeof(void *), GFP_ATOMIC);
+        if (!ioc->ScsiLookup) {
                 error = -ENOMEM;
                 goto out_mptspi_probe;
         }
+        spin_lock_init(&ioc->scsi_lookup_lock);
 
         dprintk(ioc, printk(MYIOC_s_DEBUG_FMT "ScsiLookup @ %p\n",
-                 ioc->name, hd->ScsiLookup));
+                 ioc->name, ioc->ScsiLookup));
 
         /* Clear the TM flags
          */
@@ -1477,13 +1494,13 @@ mptspi_probe(struct pci_dev *pdev, const struct pci_device_id *id)
 
         /* Some versions of the firmware don't support page 0; without
          * that we can't get the parameters */
-        if (hd->ioc->spi_data.sdp0length != 0)
+        if (ioc->spi_data.sdp0length != 0)
                 sh->transportt = mptspi_transport_template;
 
         error = scsi_add_host (sh, &ioc->pcidev->dev);
         if(error) {
-                dprintk(ioc, printk(KERN_ERR MYNAM
-                  "scsi_add_host failed\n"));
+                dprintk(ioc, printk(MYIOC_s_ERR_FMT
+                  "scsi_add_host failed\n", ioc->name));
                 goto out_mptspi_probe;
         }