1 files changed, 40 insertions, 7 deletions

diff --git a/drivers/message/fusion/mptsas.c b/drivers/message/fusion/mptsas.c
index 7596aecd5072..9d9504298549 100644
--- a/drivers/message/fusion/mptsas.c
+++ b/drivers/message/fusion/mptsas.c
@@ -92,6 +92,11 @@ static int max_lun = MPTSAS_MAX_LUN;
 module_param(max_lun, int, 0);
 MODULE_PARM_DESC(max_lun, " max lun, default=16895 ");
 
+static int mpt_loadtime_max_sectors = 8192;
+module_param(mpt_loadtime_max_sectors, int, 0);
+MODULE_PARM_DESC(mpt_loadtime_max_sectors,
+                " Maximum sector define for Host Bus Adaptor.Range 64 to 8192 default=8192");
+
 static u8       mptsasDoneCtx = MPT_MAX_PROTOCOL_DRIVERS;
 static u8       mptsasTaskCtx = MPT_MAX_PROTOCOL_DRIVERS;
 static u8       mptsasInternalCtx = MPT_MAX_PROTOCOL_DRIVERS; /* Used only for internal commands */
@@ -285,10 +290,11 @@ mptsas_add_fw_event(MPT_ADAPTER *ioc, struct fw_event_work *fw_event,
         spin_lock_irqsave(&ioc->fw_event_lock, flags);
         list_add_tail(&fw_event->list, &ioc->fw_event_list);
         INIT_DELAYED_WORK(&fw_event->work, mptsas_firmware_event_work);
-        devtprintk(ioc, printk(MYIOC_s_DEBUG_FMT "%s: add (fw_event=0x%p)\n",
-            ioc->name, __func__, fw_event));
-        queue_delayed_work(ioc->fw_event_q, &fw_event->work,
-            delay);
+        devtprintk(ioc, printk(MYIOC_s_DEBUG_FMT "%s: add (fw_event=0x%p)"
+                "on cpuid %d\n", ioc->name, __func__,
+                fw_event, smp_processor_id()));
+        queue_delayed_work_on(smp_processor_id(), ioc->fw_event_q,
+            &fw_event->work, delay);
         spin_unlock_irqrestore(&ioc->fw_event_lock, flags);
 }
 
@@ -300,10 +306,11 @@ mptsas_requeue_fw_event(MPT_ADAPTER *ioc, struct fw_event_work *fw_event,
         unsigned long flags;
         spin_lock_irqsave(&ioc->fw_event_lock, flags);
         devtprintk(ioc, printk(MYIOC_s_DEBUG_FMT "%s: reschedule task "
-            "(fw_event=0x%p)\n", ioc->name, __func__, fw_event));
+            "(fw_event=0x%p)on cpuid %d\n", ioc->name, __func__,
+                fw_event, smp_processor_id()));
         fw_event->retries++;
-        queue_delayed_work(ioc->fw_event_q, &fw_event->work,
-            msecs_to_jiffies(delay));
+        queue_delayed_work_on(smp_processor_id(), ioc->fw_event_q,
+            &fw_event->work, msecs_to_jiffies(delay));
         spin_unlock_irqrestore(&ioc->fw_event_lock, flags);
 }
 
@@ -1943,6 +1950,15 @@ static enum blk_eh_timer_return mptsas_eh_timed_out(struct scsi_cmnd *sc)
                 goto done;
         }
 
+        /* In case if IOC is in reset from internal context.
+        *  Do not execute EEH for the same IOC. SML should to reset timer.
+        */
+        if (ioc->ioc_reset_in_progress) {
+                dtmprintk(ioc, printk(MYIOC_s_WARN_FMT ": %s: ioc is in reset,"
+                    "SML need to reset the timer (sc=%p)\n",
+                    ioc->name, __func__, sc));
+                rc = BLK_EH_RESET_TIMER;
+        }
         vdevice = sc->device->hostdata;
         if (vdevice && vdevice->vtarget && (vdevice->vtarget->inDMD
                 || vdevice->vtarget->deleted)) {
@@ -5142,6 +5158,8 @@ mptsas_probe(struct pci_dev *pdev, const struct pci_device_id *id)
         ioc->TaskCtx = mptsasTaskCtx;
         ioc->InternalCtx = mptsasInternalCtx;
         ioc->schedule_target_reset = &mptsas_schedule_target_reset;
+        ioc->schedule_dead_ioc_flush_running_cmds =
+                                &mptscsih_flush_running_cmds;
         /*  Added sanity check on readiness of the MPT adapter.
          */
         if (ioc->last_state != MPI_IOC_STATE_OPERATIONAL) {
@@ -5239,6 +5257,21 @@ mptsas_probe(struct pci_dev *pdev, const struct pci_device_id *id)
                 sh->sg_tablesize = numSGE;
         }
 
+        if (mpt_loadtime_max_sectors) {
+                if (mpt_loadtime_max_sectors < 64 ||
+                        mpt_loadtime_max_sectors > 8192) {
+                        printk(MYIOC_s_INFO_FMT "Invalid value passed for"
+                                "mpt_loadtime_max_sectors %d."
+                                "Range from 64 to 8192\n", ioc->name,
+                                mpt_loadtime_max_sectors);
+                }
+                mpt_loadtime_max_sectors &=  0xFFFFFFFE;
+                dprintk(ioc, printk(MYIOC_s_DEBUG_FMT
+                        "Resetting max sector to %d from %d\n",
+                  ioc->name, mpt_loadtime_max_sectors, sh->max_sectors));
+                sh->max_sectors = mpt_loadtime_max_sectors;
+        }
+
         hd = shost_priv(sh);
         hd->ioc = ioc;