Merge SCSI misc branch into isci-for-3.6 tag

3 files changed, 44 insertions, 15 deletions

diff --git a/drivers/scsi/megaraid/megaraid_sas.h b/drivers/scsi/megaraid/megaraid_sas.h
index e8f892647681..fcb005fa4bd1 100644
--- a/drivers/scsi/megaraid/megaraid_sas.h
+++ b/drivers/scsi/megaraid/megaraid_sas.h
@@ -33,9 +33,9 @@
 /*
  * MegaRAID SAS Driver meta data
  */
-#define MEGASAS_VERSION                         "00.00.06.15-rc1"
-#define MEGASAS_RELDATE                         "Mar. 19, 2012"
-#define MEGASAS_EXT_VERSION                     "Mon. Mar. 19 17:00:00 PDT 2012"
+#define MEGASAS_VERSION                         "00.00.06.18-rc1"
+#define MEGASAS_RELDATE                         "Jun. 17, 2012"
+#define MEGASAS_EXT_VERSION                     "Tue. Jun. 17 17:00:00 PDT 2012"
 
 /*
  * Device IDs
@@ -747,6 +747,7 @@ struct megasas_ctrl_info {
 #define MEGASAS_RESET_NOTICE_INTERVAL           5
 #define MEGASAS_IOCTL_CMD                       0
 #define MEGASAS_DEFAULT_CMD_TIMEOUT             90
+#define MEGASAS_THROTTLE_QUEUE_DEPTH            16
 
 /*
  * FW reports the maximum of number of commands that it can accept (maximum
@@ -1364,6 +1365,7 @@ struct megasas_instance {
         unsigned long bar;
         long reset_flags;
         struct mutex reset_mutex;
+        int throttlequeuedepth;
 };
 
 enum {
diff --git a/drivers/scsi/megaraid/megaraid_sas_base.c b/drivers/scsi/megaraid/megaraid_sas_base.c
index ed38454228c6..0393ec478cdf 100644
--- a/drivers/scsi/megaraid/megaraid_sas_base.c
+++ b/drivers/scsi/megaraid/megaraid_sas_base.c
@@ -18,7 +18,7 @@
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
  *
  *  FILE: megaraid_sas_base.c
- *  Version : v00.00.06.15-rc1
+ *  Version : v00.00.06.18-rc1
  *
  *  Authors: LSI Corporation
  *           Sreenivas Bagalkote
@@ -71,6 +71,16 @@ static int msix_disable;
 module_param(msix_disable, int, S_IRUGO);
 MODULE_PARM_DESC(msix_disable, "Disable MSI-X interrupt handling. Default: 0");
 
+static int throttlequeuedepth = MEGASAS_THROTTLE_QUEUE_DEPTH;
+module_param(throttlequeuedepth, int, S_IRUGO);
+MODULE_PARM_DESC(throttlequeuedepth,
+        "Adapter queue depth when throttled due to I/O timeout. Default: 16");
+
+int resetwaittime = MEGASAS_RESET_WAIT_TIME;
+module_param(resetwaittime, int, S_IRUGO);
+MODULE_PARM_DESC(resetwaittime, "Wait time in seconds after I/O timeout "
+                 "before resetting adapter. Default: 180");
+
 MODULE_LICENSE("GPL");
 MODULE_VERSION(MEGASAS_VERSION);
 MODULE_AUTHOR("megaraidlinux@lsi.com");
@@ -1595,8 +1605,9 @@ megasas_check_and_restore_queue_depth(struct megasas_instance *instance)
 {
         unsigned long flags;
         if (instance->flag & MEGASAS_FW_BUSY
-                && time_after(jiffies, instance->last_time + 5 * HZ)
-                && atomic_read(&instance->fw_outstanding) < 17) {
+            && time_after(jiffies, instance->last_time + 5 * HZ)
+            && atomic_read(&instance->fw_outstanding) <
+            instance->throttlequeuedepth + 1) {
 
                 spin_lock_irqsave(instance->host->host_lock, flags);
                 instance->flag &= ~MEGASAS_FW_BUSY;
@@ -1772,7 +1783,7 @@ static int megasas_wait_for_outstanding(struct megasas_instance *instance)
                 return SUCCESS;
         }
 
-        for (i = 0; i < wait_time; i++) {
+        for (i = 0; i < resetwaittime; i++) {
 
                 int outstanding = atomic_read(&instance->fw_outstanding);
 
@@ -1914,7 +1925,7 @@ blk_eh_timer_return megasas_reset_timer(struct scsi_cmnd *scmd)
                 /* FW is busy, throttle IO */
                 spin_lock_irqsave(instance->host->host_lock, flags);
 
-                instance->host->can_queue = 16;
+                instance->host->can_queue = instance->throttlequeuedepth;
                 instance->last_time = jiffies;
                 instance->flag |= MEGASAS_FW_BUSY;
 
@@ -3577,6 +3588,24 @@ static int megasas_init_fw(struct megasas_instance *instance)
 
         kfree(ctrl_info);
 
+        /* Check for valid throttlequeuedepth module parameter */
+        if (instance->pdev->device == PCI_DEVICE_ID_LSI_SAS0073SKINNY ||
+            instance->pdev->device == PCI_DEVICE_ID_LSI_SAS0071SKINNY) {
+                if (throttlequeuedepth > (instance->max_fw_cmds -
+                                          MEGASAS_SKINNY_INT_CMDS))
+                        instance->throttlequeuedepth =
+                                MEGASAS_THROTTLE_QUEUE_DEPTH;
+                else
+                        instance->throttlequeuedepth = throttlequeuedepth;
+        } else {
+                if (throttlequeuedepth > (instance->max_fw_cmds -
+                                          MEGASAS_INT_CMDS))
+                        instance->throttlequeuedepth =
+                                MEGASAS_THROTTLE_QUEUE_DEPTH;
+                else
+                        instance->throttlequeuedepth = throttlequeuedepth;
+        }
+
         /*
         * Setup tasklet for cmd completion
         */
diff --git a/drivers/scsi/megaraid/megaraid_sas_fusion.c b/drivers/scsi/megaraid/megaraid_sas_fusion.c
index a610cf1d4847..ddf094e7d0ac 100644
--- a/drivers/scsi/megaraid/megaraid_sas_fusion.c
+++ b/drivers/scsi/megaraid/megaraid_sas_fusion.c
@@ -94,6 +94,7 @@ int megasas_transition_to_ready(struct megasas_instance *instance, int ocr);
 void megaraid_sas_kill_hba(struct megasas_instance *instance);
 
 extern u32 megasas_dbg_lvl;
+extern int resetwaittime;
 
 /**
  * megasas_enable_intr_fusion - Enables interrupts
@@ -461,8 +462,8 @@ megasas_alloc_cmds_fusion(struct megasas_instance *instance)
          * Allocate the dynamic array first and then allocate individual
          * commands.
          */
-        fusion->cmd_list = kmalloc(sizeof(struct megasas_cmd_fusion *)
-                                   *max_cmd, GFP_KERNEL);
+        fusion->cmd_list = kzalloc(sizeof(struct megasas_cmd_fusion *)
+                                   * max_cmd, GFP_KERNEL);
 
         if (!fusion->cmd_list) {
                 printk(KERN_DEBUG "megasas: out of memory. Could not alloc "
@@ -470,9 +471,6 @@ megasas_alloc_cmds_fusion(struct megasas_instance *instance)
                 goto fail_cmd_list;
         }
 
-        memset(fusion->cmd_list, 0, sizeof(struct megasas_cmd_fusion *)
-               *max_cmd);
-
         max_cmd = instance->max_fw_cmds;
         for (i = 0; i < max_cmd; i++) {
                 fusion->cmd_list[i] = kmalloc(sizeof(struct megasas_cmd_fusion),
@@ -2063,9 +2061,9 @@ megasas_check_reset_fusion(struct megasas_instance *instance,
 int megasas_wait_for_outstanding_fusion(struct megasas_instance *instance)
 {
         int i, outstanding, retval = 0;
-        u32 fw_state, wait_time = MEGASAS_RESET_WAIT_TIME;
+        u32 fw_state;
 
-        for (i = 0; i < wait_time; i++) {
+        for (i = 0; i < resetwaittime; i++) {
                 /* Check if firmware is in fault state */
                 fw_state = instance->instancet->read_fw_status_reg(
                         instance->reg_set) & MFI_STATE_MASK;