1 files changed, 31 insertions, 21 deletions

diff --git a/drivers/message/fusion/mptspi.c b/drivers/message/fusion/mptspi.c
index 643a3c6443af..8f46fdff7f77 100644
--- a/drivers/message/fusion/mptspi.c
+++ b/drivers/message/fusion/mptspi.c
@@ -614,19 +614,24 @@ static void mptspi_read_parameters(struct scsi_target *starget)
         spi_width(starget) = (nego & MPI_SCSIDEVPAGE0_NP_WIDE) ? 1 : 0;
 }
 
-static int
+int
 mptscsih_quiesce_raid(MPT_SCSI_HOST *hd, int quiesce, u8 channel, u8 id)
 {
+        MPT_ADAPTER     *ioc = hd->ioc;
         MpiRaidActionRequest_t  *pReq;
         MPT_FRAME_HDR           *mf;
-        MPT_ADAPTER *ioc = hd->ioc;
+        int                     ret;
+        unsigned long           timeleft;
+
+        mutex_lock(&ioc->internal_cmds.mutex);
 
         /* 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;
+                dfailprintk(hd->ioc, printk(MYIOC_s_WARN_FMT
+                        "%s: no msg frames!\n", ioc->name, __func__));
+                ret = -EAGAIN;
+                goto out;
         }
         pReq = (MpiRaidActionRequest_t *)mf;
         if (quiesce)
@@ -649,23 +654,30 @@ mptscsih_quiesce_raid(MPT_SCSI_HOST *hd, int quiesce, u8 channel, u8 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 */
-        hd->scandv_wait_done = 0;
-
-        /* Save cmd pointer, for resource free if timeout or
-         * FW reload occurs
-         */
-        hd->cmdPtr = mf;
-
-        add_timer(&hd->timer);
+        INITIALIZE_MGMT_STATUS(ioc->internal_cmds.status)
         mpt_put_msg_frame(ioc->InternalCtx, ioc, mf);
-        wait_event(hd->scandv_waitq, hd->scandv_wait_done);
+        timeleft = wait_for_completion_timeout(&ioc->internal_cmds.done, 10*HZ);
+        if (!(ioc->internal_cmds.status & MPT_MGMT_STATUS_COMMAND_GOOD)) {
+                ret = -ETIME;
+                dfailprintk(ioc, printk(MYIOC_s_DEBUG_FMT "%s: TIMED OUT!\n",
+                    ioc->name, __func__));
+                if (ioc->internal_cmds.status & MPT_MGMT_STATUS_DID_IOCRESET)
+                        goto out;
+                if (!timeleft) {
+                        printk(MYIOC_s_WARN_FMT "Issuing Reset from %s!!\n",
+                            ioc->name, __func__);
+                        mpt_HardResetHandler(ioc, CAN_SLEEP);
+                        mpt_free_msg_frame(ioc, mf);
+                }
+                goto out;
+        }
 
-        if ((hd->pLocal == NULL) || (hd->pLocal->completion != 0))
-                return -1;
+        ret = ioc->internal_cmds.completion_code;
 
-        return 0;
+ out:
+        CLEAR_MGMT_STATUS(ioc->internal_cmds.status)
+        mutex_unlock(&ioc->internal_cmds.mutex);
+        return ret;
 }
 
 static void mptspi_dv_device(struct _MPT_SCSI_HOST *hd,
@@ -1491,8 +1503,6 @@ mptspi_probe(struct pci_dev *pdev, const struct pci_device_id *id)
                 mpt_saf_te));
         ioc->spi_data.noQas = 0;
 
-        init_waitqueue_head(&hd->scandv_waitq);
-        hd->scandv_wait_done = 0;
         hd->last_queue_full = 0;
         hd->spi_pending = 0;