10 files changed, 374 insertions, 205 deletions

diff --git a/drivers/scsi/mpt2sas/mpi/mpi2.h b/drivers/scsi/mpt2sas/mpi/mpi2.h
index 8dc1b32918dd..a01f0aa66f20 100644
--- a/drivers/scsi/mpt2sas/mpi/mpi2.h
+++ b/drivers/scsi/mpt2sas/mpi/mpi2.h
@@ -8,7 +8,7 @@
  *                  scatter/gather formats.
  *  Creation Date:  June 21, 2006
  *
- *  mpi2.h Version:  02.00.20
+ *  mpi2.h Version:  02.00.22
  *
  *  Version History
  *  ---------------
@@ -69,6 +69,8 @@
  *  02-23-11  02.00.19  Bumped MPI2_HEADER_VERSION_UNIT.
  *                      Added MPI2_FUNCTION_SEND_HOST_MESSAGE.
  *  03-09-11  02.00.20  Bumped MPI2_HEADER_VERSION_UNIT.
+ *  05-25-11  02.00.21  Bumped MPI2_HEADER_VERSION_UNIT.
+ *  08-24-11  02.00.22  Bumped MPI2_HEADER_VERSION_UNIT.
  *  --------------------------------------------------------------------------
  */
 
@@ -94,7 +96,7 @@
 #define MPI2_VERSION_02_00                  (0x0200)
 
 /* versioning for this MPI header set */
-#define MPI2_HEADER_VERSION_UNIT            (0x14)
+#define MPI2_HEADER_VERSION_UNIT            (0x16)
 #define MPI2_HEADER_VERSION_DEV             (0x00)
 #define MPI2_HEADER_VERSION_UNIT_MASK       (0xFF00)
 #define MPI2_HEADER_VERSION_UNIT_SHIFT      (8)
@@ -1073,8 +1075,10 @@ typedef struct _MPI2_IEEE_SGE_UNION
 #define MPI2_IEEE_SGE_FLAGS_IOCPLB_ADDR         (0x02)
 #define MPI2_IEEE_SGE_FLAGS_IOCPLBNTA_ADDR      (0x03)
                                                 /* IEEE Simple Element only */
-#define MPI2_IEEE_SGE_FLAGS_SYSTEMPLBCPI_ADDR   (0x03)
+#define MPI2_IEEE_SGE_FLAGS_SYSTEMPLBPCI_ADDR   (0x03)
                                                 /* IEEE Chain Element only */
+#define MPI2_IEEE_SGE_FLAGS_SYSTEMPLBCPI_ADDR   \
+        (MPI2_IEEE_SGE_FLAGS_SYSTEMPLBPCI_ADDR) /* typo in name */
 
 /****************************************************************************
 *  IEEE SGE operation Macros
diff --git a/drivers/scsi/mpt2sas/mpi/mpi2_cnfg.h b/drivers/scsi/mpt2sas/mpi/mpi2_cnfg.h
index cfd95b4e3004..3a023dad77a1 100644
--- a/drivers/scsi/mpt2sas/mpi/mpi2_cnfg.h
+++ b/drivers/scsi/mpt2sas/mpi/mpi2_cnfg.h
@@ -6,7 +6,7 @@
  *          Title:  MPI Configuration messages and pages
  *  Creation Date:  November 10, 2006
  *
- *    mpi2_cnfg.h Version:  02.00.19
+ *    mpi2_cnfg.h Version:  02.00.21
  *
  *  Version History
  *  ---------------
@@ -140,6 +140,13 @@
  *                      Added SASNotifyPrimitiveMasks field to
  *                      MPI2_CONFIG_PAGE_IOC_7.
  *  03-09-11  02.00.19  Fixed IO Unit Page 10 (to match the spec).
+ *  05-25-11  02.00.20  Cleaned up a few comments.
+ *  08-24-11  02.00.21  Marked the IO Unit Page 7 PowerManagementCapabilities
+ *                      for PCIe link as obsolete.
+ *                      Added SpinupFlags field containing a Disable Spin-up
+ *                      bit to the MPI2_SAS_IOUNIT4_SPINUP_GROUP fields of
+ *                      SAS IO Unit Page 4.
+
  *  --------------------------------------------------------------------------
  */
 
@@ -904,8 +911,8 @@ typedef struct _MPI2_CONFIG_PAGE_IO_UNIT_7 {
 #define MPI2_IOUNITPAGE7_PMCAP_12_5_PCT_IOCSPEED    (0x00000400)
 #define MPI2_IOUNITPAGE7_PMCAP_25_0_PCT_IOCSPEED    (0x00000200)
 #define MPI2_IOUNITPAGE7_PMCAP_50_0_PCT_IOCSPEED    (0x00000100)
-#define MPI2_IOUNITPAGE7_PMCAP_PCIE_WIDTH_CHANGE    (0x00000008)
-#define MPI2_IOUNITPAGE7_PMCAP_PCIE_SPEED_CHANGE    (0x00000004)
+#define MPI2_IOUNITPAGE7_PMCAP_PCIE_WIDTH_CHANGE    (0x00000008) /* obsolete */
+#define MPI2_IOUNITPAGE7_PMCAP_PCIE_SPEED_CHANGE    (0x00000004) /* obsolete */
 
 /* defines for IO Unit Page 7 IOCTemperatureUnits field */
 #define MPI2_IOUNITPAGE7_IOC_TEMP_NOT_PRESENT       (0x00)
@@ -1970,10 +1977,14 @@ typedef struct _MPI2_SAS_IOUNIT4_SPINUP_GROUP
 {
     U8          MaxTargetSpinup;            /* 0x00 */
     U8          SpinupDelay;                /* 0x01 */
-    U16         Reserved1;                  /* 0x02 */
+        U8          SpinupFlags;                /* 0x02 */
+        U8          Reserved1;                  /* 0x03 */
 } MPI2_SAS_IOUNIT4_SPINUP_GROUP, MPI2_POINTER PTR_MPI2_SAS_IOUNIT4_SPINUP_GROUP,
   Mpi2SasIOUnit4SpinupGroup_t, MPI2_POINTER pMpi2SasIOUnit4SpinupGroup_t;
 
+/* defines for SAS IO Unit Page 4 SpinupFlags */
+#define MPI2_SASIOUNIT4_SPINUP_DISABLE_FLAG         (0x01)
+
 /*
  * Host code (drivers, BIOS, utilities, etc.) should leave this define set to
  * one and check the value returned for NumPhys at runtime.
@@ -2321,13 +2332,12 @@ typedef struct _MPI2_CONFIG_PAGE_EXPANDER_1
 
 /* use MPI2_SAS_NEG_LINK_RATE_ defines for the NegotiatedLinkRate field */
 
-/* use MPI2_SAS_APHYINFO_ defines for AttachedPhyInfo field */
-
 /* values for SAS Expander Page 1 DiscoveryInfo field */
 #define MPI2_SAS_EXPANDER1_DISCINFO_BAD_PHY_DISABLED    (0x04)
 #define MPI2_SAS_EXPANDER1_DISCINFO_LINK_STATUS_CHANGE  (0x02)
 #define MPI2_SAS_EXPANDER1_DISCINFO_NO_ROUTING_ENTRIES  (0x01)
 
+/* use MPI2_SAS_APHYINFO_ defines for AttachedPhyInfo field */
 
 /****************************************************************************
 *   SAS Device Config Pages
@@ -2447,6 +2457,8 @@ typedef struct _MPI2_CONFIG_PAGE_SAS_PHY_0
 
 #define MPI2_SASPHY0_PAGEVERSION            (0x03)
 
+/* use MPI2_SAS_APHYINFO_ defines for AttachedPhyInfo field */
+
 /* use MPI2_SAS_PRATE_ defines for the ProgrammedLinkRate field */
 
 /* use MPI2_SAS_HWRATE_ defines for the HwLinkRate field */
@@ -2454,12 +2466,10 @@ typedef struct _MPI2_CONFIG_PAGE_SAS_PHY_0
 /* values for SAS PHY Page 0 Flags field */
 #define MPI2_SAS_PHY0_FLAGS_SGPIO_DIRECT_ATTACH_ENC             (0x01)
 
-/* use MPI2_SAS_APHYINFO_ defines for AttachedPhyInfo field */
+/* use MPI2_SAS_PHYINFO_ for the PhyInfo field */
 
 /* use MPI2_SAS_NEG_LINK_RATE_ defines for the NegotiatedLinkRate field */
 
-/* use MPI2_SAS_PHYINFO_ for the PhyInfo field */
-
 
 /* SAS PHY Page 1 */
 
diff --git a/drivers/scsi/mpt2sas/mpi/mpi2_ioc.h b/drivers/scsi/mpt2sas/mpi/mpi2_ioc.h
index 93d9b6956d05..9a925c07a9ec 100644
--- a/drivers/scsi/mpt2sas/mpi/mpi2_ioc.h
+++ b/drivers/scsi/mpt2sas/mpi/mpi2_ioc.h
@@ -6,7 +6,7 @@
  *          Title:  MPI IOC, Port, Event, FW Download, and FW Upload messages
  *  Creation Date:  October 11, 2006
  *
- *  mpi2_ioc.h Version:  02.00.17
+ *  mpi2_ioc.h Version:  02.00.19
  *
  *  Version History
  *  ---------------
@@ -110,6 +110,13 @@
  *                      Added Temperature Threshold Event.
  *                      Added Host Message Event.
  *                      Added Send Host Message request and reply.
+ *  05-25-11  02.00.18  For Extended Image Header, added
+ *                      MPI2_EXT_IMAGE_TYPE_MIN_PRODUCT_SPECIFIC and
+ *                      MPI2_EXT_IMAGE_TYPE_MAX_PRODUCT_SPECIFIC defines.
+ *                      Deprecated MPI2_EXT_IMAGE_TYPE_MAX define.
+ *  08-24-11  02.00.19  Added PhysicalPort field to
+ *                      MPI2_EVENT_DATA_SAS_DEVICE_STATUS_CHANGE structure.
+ *                      Marked MPI2_PM_CONTROL_FEATURE_PCIE_LINK as obsolete.
  *  --------------------------------------------------------------------------
  */
 
@@ -578,7 +585,7 @@ typedef struct _MPI2_EVENT_DATA_SAS_DEVICE_STATUS_CHANGE
 {
     U16                     TaskTag;                        /* 0x00 */
     U8                      ReasonCode;                     /* 0x02 */
-    U8                      Reserved1;                      /* 0x03 */
+        U8                      PhysicalPort;                   /* 0x03 */
     U8                      ASC;                            /* 0x04 */
     U8                      ASCQ;                           /* 0x05 */
     U16                     DevHandle;                      /* 0x06 */
@@ -1366,16 +1373,18 @@ typedef struct _MPI2_EXT_IMAGE_HEADER
 #define MPI2_EXT_IMAGE_HEADER_SIZE              (0x40)
 
 /* defines for the ImageType field */
-#define MPI2_EXT_IMAGE_TYPE_UNSPECIFIED         (0x00)
-#define MPI2_EXT_IMAGE_TYPE_FW                  (0x01)
-#define MPI2_EXT_IMAGE_TYPE_NVDATA              (0x03)
-#define MPI2_EXT_IMAGE_TYPE_BOOTLOADER          (0x04)
-#define MPI2_EXT_IMAGE_TYPE_INITIALIZATION      (0x05)
-#define MPI2_EXT_IMAGE_TYPE_FLASH_LAYOUT        (0x06)
-#define MPI2_EXT_IMAGE_TYPE_SUPPORTED_DEVICES   (0x07)
-#define MPI2_EXT_IMAGE_TYPE_MEGARAID            (0x08)
-
-#define MPI2_EXT_IMAGE_TYPE_MAX                 (MPI2_EXT_IMAGE_TYPE_MEGARAID)
+#define MPI2_EXT_IMAGE_TYPE_UNSPECIFIED                         (0x00)
+#define MPI2_EXT_IMAGE_TYPE_FW                                          (0x01)
+#define MPI2_EXT_IMAGE_TYPE_NVDATA                                      (0x03)
+#define MPI2_EXT_IMAGE_TYPE_BOOTLOADER                          (0x04)
+#define MPI2_EXT_IMAGE_TYPE_INITIALIZATION                      (0x05)
+#define MPI2_EXT_IMAGE_TYPE_FLASH_LAYOUT                        (0x06)
+#define MPI2_EXT_IMAGE_TYPE_SUPPORTED_DEVICES           (0x07)
+#define MPI2_EXT_IMAGE_TYPE_MEGARAID                            (0x08)
+#define MPI2_EXT_IMAGE_TYPE_MIN_PRODUCT_SPECIFIC    (0x80)
+#define MPI2_EXT_IMAGE_TYPE_MAX_PRODUCT_SPECIFIC    (0xFF)
+#define MPI2_EXT_IMAGE_TYPE_MAX                   \
+        (MPI2_EXT_IMAGE_TYPE_MAX_PRODUCT_SPECIFIC)      /* deprecated */
 
 
 
@@ -1568,7 +1577,7 @@ typedef struct _MPI2_PWR_MGMT_CONTROL_REQUEST {
 /* defines for the Feature field */
 #define MPI2_PM_CONTROL_FEATURE_DA_PHY_POWER_COND       (0x01)
 #define MPI2_PM_CONTROL_FEATURE_PORT_WIDTH_MODULATION   (0x02)
-#define MPI2_PM_CONTROL_FEATURE_PCIE_LINK               (0x03)
+#define MPI2_PM_CONTROL_FEATURE_PCIE_LINK               (0x03) /* obsolete */
 #define MPI2_PM_CONTROL_FEATURE_IOC_SPEED               (0x04)
 #define MPI2_PM_CONTROL_FEATURE_MIN_PRODUCT_SPECIFIC    (0x80)
 #define MPI2_PM_CONTROL_FEATURE_MAX_PRODUCT_SPECIFIC    (0xFF)
@@ -1597,14 +1606,14 @@ typedef struct _MPI2_PWR_MGMT_CONTROL_REQUEST {
 
 /* parameter usage for the MPI2_PM_CONTROL_FEATURE_PCIE_LINK Feature */
 /* Parameter1 indicates desired PCIe link speed using these defines */
-#define MPI2_PM_CONTROL_PARAM1_PCIE_2_5_GBPS            (0x00)
-#define MPI2_PM_CONTROL_PARAM1_PCIE_5_0_GBPS            (0x01)
-#define MPI2_PM_CONTROL_PARAM1_PCIE_8_0_GBPS            (0x02)
+#define MPI2_PM_CONTROL_PARAM1_PCIE_2_5_GBPS            (0x00) /* obsolete */
+#define MPI2_PM_CONTROL_PARAM1_PCIE_5_0_GBPS            (0x01) /* obsolete */
+#define MPI2_PM_CONTROL_PARAM1_PCIE_8_0_GBPS            (0x02) /* obsolete */
 /* Parameter2 indicates desired PCIe link width using these defines */
-#define MPI2_PM_CONTROL_PARAM2_WIDTH_X1                 (0x01)
-#define MPI2_PM_CONTROL_PARAM2_WIDTH_X2                 (0x02)
-#define MPI2_PM_CONTROL_PARAM2_WIDTH_X4                 (0x04)
-#define MPI2_PM_CONTROL_PARAM2_WIDTH_X8                 (0x08)
+#define MPI2_PM_CONTROL_PARAM2_WIDTH_X1                 (0x01) /* obsolete */
+#define MPI2_PM_CONTROL_PARAM2_WIDTH_X2                 (0x02) /* obsolete */
+#define MPI2_PM_CONTROL_PARAM2_WIDTH_X4                 (0x04) /* obsolete */
+#define MPI2_PM_CONTROL_PARAM2_WIDTH_X8                 (0x08) /* obsolete */
 /* Parameter3 and Parameter4 are reserved */
 
 /* parameter usage for the MPI2_PM_CONTROL_FEATURE_IOC_SPEED Feature */
diff --git a/drivers/scsi/mpt2sas/mpi/mpi2_raid.h b/drivers/scsi/mpt2sas/mpi/mpi2_raid.h
index bd61a7b60a2b..0601612b875a 100644
--- a/drivers/scsi/mpt2sas/mpi/mpi2_raid.h
+++ b/drivers/scsi/mpt2sas/mpi/mpi2_raid.h
@@ -6,7 +6,7 @@
  *          Title:  MPI Integrated RAID messages and structures
  *  Creation Date:  April 26, 2007
  *
- *    mpi2_raid.h Version:  02.00.05
+ *    mpi2_raid.h Version:  02.00.06
  *
  *  Version History
  *  ---------------
@@ -23,6 +23,10 @@
  *  07-30-09  02.00.04  Added proper define for the Use Default Settings bit of
  *                      VolumeCreationFlags and marked the old one as obsolete.
  *  05-12-10  02.00.05  Added MPI2_RAID_VOL_FLAGS_OP_MDC define.
+ *  08-24-10  02.00.06  Added MPI2_RAID_ACTION_COMPATIBILITY_CHECK along with
+ *                      related structures and defines.
+ *                      Added product-specific range to RAID Action values.
+
  *  --------------------------------------------------------------------------
  */
 
@@ -176,7 +180,9 @@ typedef struct _MPI2_RAID_ACTION_REQUEST
 #define MPI2_RAID_ACTION_SYSTEM_SHUTDOWN_INITIATED  (0x20)
 #define MPI2_RAID_ACTION_START_RAID_FUNCTION        (0x21)
 #define MPI2_RAID_ACTION_STOP_RAID_FUNCTION         (0x22)
-
+#define MPI2_RAID_ACTION_COMPATIBILITY_CHECK        (0x23)
+#define MPI2_RAID_ACTION_MIN_PRODUCT_SPECIFIC       (0x80)
+#define MPI2_RAID_ACTION_MAX_PRODUCT_SPECIFIC       (0xFF)
 
 /* RAID Volume Creation Structure */
 
@@ -244,6 +250,23 @@ typedef struct _MPI2_RAID_ONLINE_CAPACITY_EXPANSION
   Mpi2RaidOnlineCapacityExpansion_t,
   MPI2_POINTER pMpi2RaidOnlineCapacityExpansion_t;
 
+/* RAID Compatibility Input Structure */
+
+typedef struct _MPI2_RAID_COMPATIBILITY_INPUT_STRUCT {
+        U16                     SourceDevHandle;               /* 0x00 */
+        U16                     CandidateDevHandle;             /* 0x02 */
+        U32                     Flags;                          /* 0x04 */
+        U32                     Reserved1;                      /* 0x08 */
+        U32                     Reserved2;                      /* 0x0C */
+} MPI2_RAID_COMPATIBILITY_INPUT_STRUCT,
+MPI2_POINTER PTR_MPI2_RAID_COMPATIBILITY_INPUT_STRUCT,
+Mpi2RaidCompatibilityInputStruct_t,
+MPI2_POINTER pMpi2RaidCompatibilityInputStruct_t;
+
+/* defines for RAID Compatibility Structure Flags field */
+#define MPI2_RAID_COMPAT_SOURCE_IS_VOLUME_FLAG      (0x00000002)
+#define MPI2_RAID_COMPAT_REPORT_SOURCE_INFO_FLAG    (0x00000001)
+
 
 /* RAID Volume Indicator Structure */
 
@@ -263,15 +286,45 @@ typedef struct _MPI2_RAID_VOL_INDICATOR
 #define MPI2_RAID_VOL_FLAGS_OP_RESYNC               (0x00000003)
 #define MPI2_RAID_VOL_FLAGS_OP_MDC                  (0x00000004)
 
+/* RAID Compatibility Result Structure */
+
+typedef struct _MPI2_RAID_COMPATIBILITY_RESULT_STRUCT {
+        U8                      State;                          /* 0x00 */
+        U8                      Reserved1;                      /* 0x01 */
+        U16                     Reserved2;                      /* 0x02 */
+        U32                     GenericAttributes;              /* 0x04 */
+        U32                     OEMSpecificAttributes;          /* 0x08 */
+        U32                     Reserved3;                      /* 0x0C */
+        U32                     Reserved4;                      /* 0x10 */
+} MPI2_RAID_COMPATIBILITY_RESULT_STRUCT,
+MPI2_POINTER PTR_MPI2_RAID_COMPATIBILITY_RESULT_STRUCT,
+Mpi2RaidCompatibilityResultStruct_t,
+MPI2_POINTER pMpi2RaidCompatibilityResultStruct_t;
+
+/* defines for RAID Compatibility Result Structure State field */
+#define MPI2_RAID_COMPAT_STATE_COMPATIBLE           (0x00)
+#define MPI2_RAID_COMPAT_STATE_NOT_COMPATIBLE       (0x01)
+
+/* defines for RAID Compatibility Result Structure GenericAttributes field */
+#define MPI2_RAID_COMPAT_GENATTRIB_4K_SECTOR            (0x00000010)
+
+#define MPI2_RAID_COMPAT_GENATTRIB_MEDIA_MASK           (0x0000000C)
+#define MPI2_RAID_COMPAT_GENATTRIB_SOLID_STATE_DRIVE    (0x00000008)
+#define MPI2_RAID_COMPAT_GENATTRIB_HARD_DISK_DRIVE      (0x00000004)
+
+#define MPI2_RAID_COMPAT_GENATTRIB_PROTOCOL_MASK        (0x00000003)
+#define MPI2_RAID_COMPAT_GENATTRIB_SAS_PROTOCOL         (0x00000002)
+#define MPI2_RAID_COMPAT_GENATTRIB_SATA_PROTOCOL        (0x00000001)
 
 /* RAID Action Reply ActionData union */
 typedef union _MPI2_RAID_ACTION_REPLY_DATA
 {
-    U32                     Word[5];
-    MPI2_RAID_VOL_INDICATOR RaidVolumeIndicator;
-    U16                     VolDevHandle;
-    U8                      VolumeState;
-    U8                      PhysDiskNum;
+        U32                                     Word[5];
+        MPI2_RAID_VOL_INDICATOR                 RaidVolumeIndicator;
+        U16                                     VolDevHandle;
+        U8                                      VolumeState;
+        U8                                      PhysDiskNum;
+        MPI2_RAID_COMPATIBILITY_RESULT_STRUCT   RaidCompatibilityResult;
 } MPI2_RAID_ACTION_REPLY_DATA, MPI2_POINTER PTR_MPI2_RAID_ACTION_REPLY_DATA,
   Mpi2RaidActionReplyData_t, MPI2_POINTER pMpi2RaidActionReplyData_t;
 
diff --git a/drivers/scsi/mpt2sas/mpi/mpi2_tool.h b/drivers/scsi/mpt2sas/mpi/mpi2_tool.h
index 2a4bceda364b..3cbe677c6886 100644
--- a/drivers/scsi/mpt2sas/mpi/mpi2_tool.h
+++ b/drivers/scsi/mpt2sas/mpi/mpi2_tool.h
@@ -6,7 +6,7 @@
  *          Title:  MPI diagnostic tool structures and definitions
  *  Creation Date:  March 26, 2007
  *
- *    mpi2_tool.h Version:  02.00.06
+ *    mpi2_tool.h Version:  02.00.07
  *
  *  Version History
  *  ---------------
@@ -25,6 +25,8 @@
  *  05-12-10  02.00.05  Added Diagnostic Data Upload tool.
  *  08-11-10  02.00.06  Added defines that were missing for Diagnostic Buffer
  *                      Post Request.
+ *  05-25-11  02.00.07  Added Flags field and related defines to
+ *                      MPI2_TOOLBOX_ISTWI_READ_WRITE_REQUEST.
  *  --------------------------------------------------------------------------
  */
 
@@ -181,7 +183,7 @@ typedef struct _MPI2_TOOLBOX_ISTWI_READ_WRITE_REQUEST {
     U8                      DevIndex;                   /* 0x14 */
     U8                      Action;                     /* 0x15 */
     U8                      SGLFlags;                   /* 0x16 */
-    U8                      Reserved7;                  /* 0x17 */
+         U8                      Flags;                      /* 0x17 */
     U16                     TxDataLength;               /* 0x18 */
     U16                     RxDataLength;               /* 0x1A */
     U32                     Reserved8;                  /* 0x1C */
@@ -205,6 +207,9 @@ typedef struct _MPI2_TOOLBOX_ISTWI_READ_WRITE_REQUEST {
 
 /* use MPI2_SGLFLAGS_ defines from mpi2.h for the SGLFlags field */
 
+/* values for the Flags field */
+#define MPI2_TOOL_ISTWI_FLAG_AUTO_RESERVE_RELEASE   (0x80)
+#define MPI2_TOOL_ISTWI_FLAG_PAGE_ADDR_MASK         (0x07)
 
 /* Toolbox ISTWI Read Write Tool reply message */
 typedef struct _MPI2_TOOLBOX_ISTWI_REPLY {
diff --git a/drivers/scsi/mpt2sas/mpt2sas_base.c b/drivers/scsi/mpt2sas/mpt2sas_base.c
index beda04a8404b..0b2c95583660 100644
--- a/drivers/scsi/mpt2sas/mpt2sas_base.c
+++ b/drivers/scsi/mpt2sas/mpt2sas_base.c
@@ -57,6 +57,7 @@
 #include <linux/sort.h>
 #include <linux/io.h>
 #include <linux/time.h>
+#include <linux/kthread.h>
 #include <linux/aer.h>
 
 #include "mpt2sas_base.h"
@@ -65,6 +66,8 @@ static MPT_CALLBACK	mpt_callbacks[MPT_MAX_CALLBACKS];
 
 #define FAULT_POLLING_INTERVAL 1000 /* in milliseconds */
 
+#define MAX_HBA_QUEUE_DEPTH     30000
+#define MAX_CHAIN_DEPTH         100000
 static int max_queue_depth = -1;
 module_param(max_queue_depth, int, 0);
 MODULE_PARM_DESC(max_queue_depth, " max controller queue depth ");
@@ -89,19 +92,6 @@ static int disable_discovery = -1;
 module_param(disable_discovery, int, 0);
 MODULE_PARM_DESC(disable_discovery, " disable discovery ");
 
-
-/* diag_buffer_enable is bitwise
- * bit 0 set = TRACE
- * bit 1 set = SNAPSHOT
- * bit 2 set = EXTENDED
- *
- * Either bit can be set, or both
- */
-static int diag_buffer_enable;
-module_param(diag_buffer_enable, int, 0);
-MODULE_PARM_DESC(diag_buffer_enable, " post diag buffers "
-    "(TRACE=1/SNAPSHOT=2/EXTENDED=4/default=0)");
-
 /**
  * _scsih_set_fwfault_debug - global setting of ioc->fwfault_debug.
  *
@@ -120,10 +110,34 @@ _scsih_set_fwfault_debug(const char *val, struct kernel_param *kp)
                 ioc->fwfault_debug = mpt2sas_fwfault_debug;
         return 0;
 }
+
 module_param_call(mpt2sas_fwfault_debug, _scsih_set_fwfault_debug,
     param_get_int, &mpt2sas_fwfault_debug, 0644);
 
 /**
+ *  mpt2sas_remove_dead_ioc_func - kthread context to remove dead ioc
+ * @arg: input argument, used to derive ioc
+ *
+ * Return 0 if controller is removed from pci subsystem.
+ * Return -1 for other case.
+ */
+static int mpt2sas_remove_dead_ioc_func(void *arg)
+{
+                struct MPT2SAS_ADAPTER *ioc = (struct MPT2SAS_ADAPTER *)arg;
+                struct pci_dev *pdev;
+
+                if ((ioc == NULL))
+                        return -1;
+
+                pdev = ioc->pdev;
+                if ((pdev == NULL))
+                        return -1;
+                pci_remove_bus_device(pdev);
+                return 0;
+}
+
+
+/**
  * _base_fault_reset_work - workq handling ioc fault conditions
  * @work: input argument, used to derive ioc
  * Context: sleep.
@@ -138,6 +152,7 @@ _base_fault_reset_work(struct work_struct *work)
         unsigned long    flags;
         u32 doorbell;
         int rc;
+        struct task_struct *p;
 
         spin_lock_irqsave(&ioc->ioc_reset_in_progress_lock, flags);
         if (ioc->shost_recovery)
@@ -145,6 +160,39 @@ _base_fault_reset_work(struct work_struct *work)
         spin_unlock_irqrestore(&ioc->ioc_reset_in_progress_lock, flags);
 
         doorbell = mpt2sas_base_get_iocstate(ioc, 0);
+        if ((doorbell & MPI2_IOC_STATE_MASK) == MPI2_IOC_STATE_MASK) {
+                printk(MPT2SAS_INFO_FMT "%s : SAS host is non-operational !!!!\n",
+                        ioc->name, __func__);
+
+                /*
+                 * Call _scsih_flush_pending_cmds callback so that we flush all
+                 * pending commands back to OS. This call is required to aovid
+                 * deadlock at block layer. Dead IOC will fail to do diag reset,
+                 * and this call is safe since dead ioc will never return any
+                 * command back from HW.
+                 */
+                ioc->schedule_dead_ioc_flush_running_cmds(ioc);
+                /*
+                 * Set remove_host flag early since kernel thread will
+                 * take some time to execute.
+                 */
+                ioc->remove_host = 1;
+                /*Remove the Dead Host */
+                p = kthread_run(mpt2sas_remove_dead_ioc_func, ioc,
+                    "mpt2sas_dead_ioc_%d", ioc->id);
+                if (IS_ERR(p)) {
+                        printk(MPT2SAS_ERR_FMT
+                        "%s: Running mpt2sas_dead_ioc thread failed !!!!\n",
+                        ioc->name, __func__);
+                } else {
+                    printk(MPT2SAS_ERR_FMT
+                        "%s: Running mpt2sas_dead_ioc thread success !!!!\n",
+                        ioc->name, __func__);
+                }
+
+                return; /* don't rearm timer */
+        }
+
         if ((doorbell & MPI2_IOC_STATE_MASK) == MPI2_IOC_STATE_FAULT) {
                 rc = mpt2sas_base_hard_reset_handler(ioc, CAN_SLEEP,
                     FORCE_BIG_HAMMER);
@@ -1346,7 +1394,7 @@ _base_enable_msix(struct MPT2SAS_ADAPTER *ioc)
         if (_base_check_enable_msix(ioc) != 0)
                 goto try_ioapic;
 
-        ioc->reply_queue_count = min_t(u8, ioc->cpu_count,
+        ioc->reply_queue_count = min_t(int, ioc->cpu_count,
             ioc->msix_vector_count);
 
         entries = kcalloc(ioc->reply_queue_count, sizeof(struct msix_entry),
@@ -1916,6 +1964,10 @@ _base_display_intel_branding(struct MPT2SAS_ADAPTER *ioc)
                         printk(MPT2SAS_INFO_FMT "%s\n", ioc->name,
                             MPT2SAS_INTEL_RMS2LL040_BRANDING);
                         break;
+                case MPT2SAS_INTEL_RAMSDALE_SSDID:
+                        printk(MPT2SAS_INFO_FMT "%s\n", ioc->name,
+                            MPT2SAS_INTEL_RAMSDALE_BRANDING);
+                        break;
                 default:
                         break;
                 }
@@ -1925,6 +1977,22 @@ _base_display_intel_branding(struct MPT2SAS_ADAPTER *ioc)
                         printk(MPT2SAS_INFO_FMT "%s\n", ioc->name,
                             MPT2SAS_INTEL_RS25GB008_BRANDING);
                         break;
+                case MPT2SAS_INTEL_RMS25JB080_SSDID:
+                        printk(MPT2SAS_INFO_FMT "%s\n", ioc->name,
+                            MPT2SAS_INTEL_RMS25JB080_BRANDING);
+                        break;
+                case MPT2SAS_INTEL_RMS25JB040_SSDID:
+                        printk(MPT2SAS_INFO_FMT "%s\n", ioc->name,
+                            MPT2SAS_INTEL_RMS25JB040_BRANDING);
+                        break;
+                case MPT2SAS_INTEL_RMS25KB080_SSDID:
+                        printk(MPT2SAS_INFO_FMT "%s\n", ioc->name,
+                            MPT2SAS_INTEL_RMS25KB080_BRANDING);
+                        break;
+                case MPT2SAS_INTEL_RMS25KB040_SSDID:
+                        printk(MPT2SAS_INFO_FMT "%s\n", ioc->name,
+                            MPT2SAS_INTEL_RMS25KB040_BRANDING);
+                        break;
                 default:
                         break;
                 }
@@ -2311,8 +2379,6 @@ _base_release_memory_pools(struct MPT2SAS_ADAPTER *ioc)
                 }
                 if (ioc->chain_dma_pool)
                         pci_pool_destroy(ioc->chain_dma_pool);
-        }
-        if (ioc->chain_lookup) {
                 free_pages((ulong)ioc->chain_lookup, ioc->chain_pages);
                 ioc->chain_lookup = NULL;
         }
@@ -2330,9 +2396,7 @@ static int
 _base_allocate_memory_pools(struct MPT2SAS_ADAPTER *ioc,  int sleep_flag)
 {
         struct mpt2sas_facts *facts;
-        u32 queue_size, queue_diff;
         u16 max_sge_elements;
-        u16 num_of_reply_frames;
         u16 chains_needed_per_io;
         u32 sz, total_sz, reply_post_free_sz;
         u32 retry_sz;
@@ -2359,7 +2423,8 @@ _base_allocate_memory_pools(struct MPT2SAS_ADAPTER *ioc,  int sleep_flag)
                 max_request_credit = (max_queue_depth < facts->RequestCredit)
                     ? max_queue_depth : facts->RequestCredit;
         else
-                max_request_credit = facts->RequestCredit;
+                max_request_credit = min_t(u16, facts->RequestCredit,
+                    MAX_HBA_QUEUE_DEPTH);
 
         ioc->hba_queue_depth = max_request_credit;
         ioc->hi_priority_depth = facts->HighPriorityCredit;
@@ -2400,50 +2465,25 @@ _base_allocate_memory_pools(struct MPT2SAS_ADAPTER *ioc,  int sleep_flag)
         }
         ioc->chains_needed_per_io = chains_needed_per_io;
 
-        /* reply free queue sizing - taking into account for events */
-        num_of_reply_frames = ioc->hba_queue_depth + 32;
-
-        /* number of replies frames can't be a multiple of 16 */
-        /* decrease number of reply frames by 1 */
-        if (!(num_of_reply_frames % 16))
-                num_of_reply_frames--;
-
-        /* calculate number of reply free queue entries
-         *  (must be multiple of 16)
-         */
-
-        /* (we know reply_free_queue_depth is not a multiple of 16) */
-        queue_size = num_of_reply_frames;
-        queue_size += 16 - (queue_size % 16);
-        ioc->reply_free_queue_depth = queue_size;
-
-        /* reply descriptor post queue sizing */
-        /* this size should be the number of request frames + number of reply
-         * frames
-         */
-
-        queue_size = ioc->hba_queue_depth + num_of_reply_frames + 1;
-        /* round up to 16 byte boundary */
-        if (queue_size % 16)
-                queue_size += 16 - (queue_size % 16);
-
-        /* check against IOC maximum reply post queue depth */
-        if (queue_size > facts->MaxReplyDescriptorPostQueueDepth) {
-                queue_diff = queue_size -
-                    facts->MaxReplyDescriptorPostQueueDepth;
+        /* reply free queue sizing - taking into account for 64 FW events */
+        ioc->reply_free_queue_depth = ioc->hba_queue_depth + 64;
 
-                /* round queue_diff up to multiple of 16 */
-                if (queue_diff % 16)
-                        queue_diff += 16 - (queue_diff % 16);
-
-                /* adjust hba_queue_depth, reply_free_queue_depth,
-                 * and queue_size
-                 */
-                ioc->hba_queue_depth -= (queue_diff / 2);
-                ioc->reply_free_queue_depth -= (queue_diff / 2);
-                queue_size = facts->MaxReplyDescriptorPostQueueDepth;
+        /* align the reply post queue on the next 16 count boundary */
+        if (!ioc->reply_free_queue_depth % 16)
+                ioc->reply_post_queue_depth = ioc->reply_free_queue_depth + 16;
+        else
+                ioc->reply_post_queue_depth = ioc->reply_free_queue_depth +
+                                32 - (ioc->reply_free_queue_depth % 16);
+        if (ioc->reply_post_queue_depth >
+            facts->MaxReplyDescriptorPostQueueDepth) {
+                ioc->reply_post_queue_depth = min_t(u16,
+                    (facts->MaxReplyDescriptorPostQueueDepth -
+                    (facts->MaxReplyDescriptorPostQueueDepth % 16)),
+                    (ioc->hba_queue_depth - (ioc->hba_queue_depth % 16)));
+                ioc->reply_free_queue_depth = ioc->reply_post_queue_depth - 16;
+                ioc->hba_queue_depth = ioc->reply_free_queue_depth - 64;
         }
-        ioc->reply_post_queue_depth = queue_size;
+
 
         dinitprintk(ioc, printk(MPT2SAS_INFO_FMT "scatter gather: "
             "sge_in_main_msg(%d), sge_per_chain(%d), sge_per_io(%d), "
@@ -2529,15 +2569,12 @@ _base_allocate_memory_pools(struct MPT2SAS_ADAPTER *ioc,  int sleep_flag)
             "depth(%d)\n", ioc->name, ioc->request,
             ioc->scsiio_depth));
 
-        /* loop till the allocation succeeds */
-        do {
-                sz = ioc->chain_depth * sizeof(struct chain_tracker);
-                ioc->chain_pages = get_order(sz);
-                ioc->chain_lookup = (struct chain_tracker *)__get_free_pages(
-                    GFP_KERNEL, ioc->chain_pages);
-                if (ioc->chain_lookup == NULL)
-                        ioc->chain_depth -= 100;
-        } while (ioc->chain_lookup == NULL);
+        ioc->chain_depth = min_t(u32, ioc->chain_depth, MAX_CHAIN_DEPTH);
+        sz = ioc->chain_depth * sizeof(struct chain_tracker);
+        ioc->chain_pages = get_order(sz);
+
+        ioc->chain_lookup = (struct chain_tracker *)__get_free_pages(
+            GFP_KERNEL, ioc->chain_pages);
         ioc->chain_dma_pool = pci_pool_create("chain pool", ioc->pdev,
             ioc->request_sz, 16, 0);
         if (!ioc->chain_dma_pool) {
@@ -3136,8 +3173,8 @@ mpt2sas_base_sas_iounit_control(struct MPT2SAS_ADAPTER *ioc,
         if (mpi_request->Operation == MPI2_SAS_OP_PHY_HARD_RESET ||
             mpi_request->Operation == MPI2_SAS_OP_PHY_LINK_RESET)
                 ioc->ioc_link_reset_in_progress = 1;
-        mpt2sas_base_put_smid_default(ioc, smid);
         init_completion(&ioc->base_cmds.done);
+        mpt2sas_base_put_smid_default(ioc, smid);
         timeleft = wait_for_completion_timeout(&ioc->base_cmds.done,
             msecs_to_jiffies(10000));
         if ((mpi_request->Operation == MPI2_SAS_OP_PHY_HARD_RESET ||
@@ -3238,8 +3275,8 @@ mpt2sas_base_scsi_enclosure_processor(struct MPT2SAS_ADAPTER *ioc,
         request = mpt2sas_base_get_msg_frame(ioc, smid);
         ioc->base_cmds.smid = smid;
         memcpy(request, mpi_request, sizeof(Mpi2SepReply_t));
-        mpt2sas_base_put_smid_default(ioc, smid);
         init_completion(&ioc->base_cmds.done);
+        mpt2sas_base_put_smid_default(ioc, smid);
         timeleft = wait_for_completion_timeout(&ioc->base_cmds.done,
             msecs_to_jiffies(10000));
         if (!(ioc->base_cmds.status & MPT2_CMD_COMPLETE)) {
@@ -3746,8 +3783,8 @@ _base_event_notification(struct MPT2SAS_ADAPTER *ioc, int sleep_flag)
         for (i = 0; i < MPI2_EVENT_NOTIFY_EVENTMASK_WORDS; i++)
                 mpi_request->EventMasks[i] =
                     cpu_to_le32(ioc->event_masks[i]);
-        mpt2sas_base_put_smid_default(ioc, smid);
         init_completion(&ioc->base_cmds.done);
+        mpt2sas_base_put_smid_default(ioc, smid);
         timeleft = wait_for_completion_timeout(&ioc->base_cmds.done, 30*HZ);
         if (!(ioc->base_cmds.status & MPT2_CMD_COMPLETE)) {
                 printk(MPT2SAS_ERR_FMT "%s: timeout\n",
@@ -4062,7 +4099,8 @@ _base_make_ioc_operational(struct MPT2SAS_ADAPTER *ioc, int sleep_flag)
                 ioc->reply_free[i] = cpu_to_le32(reply_address);
 
         /* initialize reply queues */
-        _base_assign_reply_queues(ioc);
+        if (ioc->is_driver_loading)
+                _base_assign_reply_queues(ioc);
 
         /* initialize Reply Post Free Queue */
         reply_post_free = (long)ioc->reply_post_free;
@@ -4110,24 +4148,17 @@ _base_make_ioc_operational(struct MPT2SAS_ADAPTER *ioc, int sleep_flag)
 
 
         if (ioc->is_driver_loading) {
-
-
-
-                ioc->wait_for_discovery_to_complete =
-                    _base_determine_wait_on_discovery(ioc);
-                return r; /* scan_start and scan_finished support */
-        }
-
-
-        if (ioc->wait_for_discovery_to_complete && ioc->is_warpdrive) {
-                if (ioc->manu_pg10.OEMIdentifier  == 0x80) {
+                if (ioc->is_warpdrive && ioc->manu_pg10.OEMIdentifier
+                    == 0x80) {
                         hide_flag = (u8) (ioc->manu_pg10.OEMSpecificFlags0 &
                             MFG_PAGE10_HIDE_SSDS_MASK);
                         if (hide_flag != MFG_PAGE10_HIDE_SSDS_MASK)
                                 ioc->mfg_pg10_hide_flag = hide_flag;
                 }
+                ioc->wait_for_discovery_to_complete =
+                    _base_determine_wait_on_discovery(ioc);
+                return r; /* scan_start and scan_finished support */
         }
-
         r = _base_send_port_enable(ioc, sleep_flag);
         if (r)
                 return r;
@@ -4206,7 +4237,7 @@ mpt2sas_base_attach(struct MPT2SAS_ADAPTER *ioc)
 
         r = mpt2sas_base_map_resources(ioc);
         if (r)
-                return r;
+                goto out_free_resources;
 
         if (ioc->is_warpdrive) {
                 ioc->reply_post_host_index[0] =
diff --git a/drivers/scsi/mpt2sas/mpt2sas_base.h b/drivers/scsi/mpt2sas/mpt2sas_base.h
index 3c3babc7d260..c7459fdc06cc 100644
--- a/drivers/scsi/mpt2sas/mpt2sas_base.h
+++ b/drivers/scsi/mpt2sas/mpt2sas_base.h
@@ -69,8 +69,8 @@
 #define MPT2SAS_DRIVER_NAME             "mpt2sas"
 #define MPT2SAS_AUTHOR  "LSI Corporation <DL-MPTFusionLinux@lsi.com>"
 #define MPT2SAS_DESCRIPTION     "LSI MPT Fusion SAS 2.0 Device Driver"
-#define MPT2SAS_DRIVER_VERSION          "10.100.00.00"
-#define MPT2SAS_MAJOR_VERSION           10
+#define MPT2SAS_DRIVER_VERSION          "12.100.00.00"
+#define MPT2SAS_MAJOR_VERSION           12
 #define MPT2SAS_MINOR_VERSION           100
 #define MPT2SAS_BUILD_VERSION           00
 #define MPT2SAS_RELEASE_VERSION         00
@@ -157,20 +157,33 @@
 /*
  * Intel HBA branding
  */
+#define MPT2SAS_INTEL_RMS25JB080_BRANDING    \
+                                "Intel(R) Integrated RAID Module RMS25JB080"
+#define MPT2SAS_INTEL_RMS25JB040_BRANDING    \
+                                "Intel(R) Integrated RAID Module RMS25JB040"
+#define MPT2SAS_INTEL_RMS25KB080_BRANDING    \
+                                "Intel(R) Integrated RAID Module RMS25KB080"
+#define MPT2SAS_INTEL_RMS25KB040_BRANDING    \
+                                "Intel(R) Integrated RAID Module RMS25KB040"
 #define MPT2SAS_INTEL_RMS2LL080_BRANDING        \
                                 "Intel Integrated RAID Module RMS2LL080"
 #define MPT2SAS_INTEL_RMS2LL040_BRANDING        \
                                 "Intel Integrated RAID Module RMS2LL040"
 #define MPT2SAS_INTEL_RS25GB008_BRANDING       \
                                 "Intel(R) RAID Controller RS25GB008"
-
+#define MPT2SAS_INTEL_RAMSDALE_BRANDING        \
+                                "Intel 720 Series SSD"
 /*
  * Intel HBA SSDIDs
  */
+#define MPT2SAS_INTEL_RMS25JB080_SSDID         0x3516
+#define MPT2SAS_INTEL_RMS25JB040_SSDID         0x3517
+#define MPT2SAS_INTEL_RMS25KB080_SSDID         0x3518
+#define MPT2SAS_INTEL_RMS25KB040_SSDID         0x3519
 #define MPT2SAS_INTEL_RMS2LL080_SSDID          0x350E
 #define MPT2SAS_INTEL_RMS2LL040_SSDID          0x350F
 #define MPT2SAS_INTEL_RS25GB008_SSDID          0x3000
-
+#define MPT2SAS_INTEL_RAMSDALE_SSDID           0x3700
 
 /*
  * HP HBA branding
@@ -373,6 +386,7 @@ struct _sas_device {
  * @percent_complete: resync percent complete
  * @direct_io_enabled: Whether direct io to PDs are allowed or not
  * @stripe_exponent: X where 2powX is the stripe sz in blocks
+ * @block_exponent: X where 2powX is the block sz in bytes
  * @max_lba: Maximum number of LBA in the volume
  * @stripe_sz: Stripe Size of the volume
  * @device_info: Device info of the volume member disk
@@ -394,6 +408,7 @@ struct _raid_device {
         u8      percent_complete;
         u8      direct_io_enabled;
         u8      stripe_exponent;
+        u8      block_exponent;
         u64     max_lba;
         u32     stripe_sz;
         u32     device_info;
@@ -623,6 +638,7 @@ enum mutex_type {
         TM_MUTEX_ON = 1,
 };
 
+typedef void (*MPT2SAS_FLUSH_RUNNING_CMDS)(struct MPT2SAS_ADAPTER *ioc);
 /**
  * struct MPT2SAS_ADAPTER - per adapter struct
  * @list: ioc_list
@@ -665,6 +681,7 @@ enum mutex_type {
  * @msix_vector_count: number msix vectors
  * @cpu_msix_table: table for mapping cpus to msix index
  * @cpu_msix_table_sz: table size
+ * @schedule_dead_ioc_flush_running_cmds: callback to flush pending commands
  * @scsi_io_cb_idx: shost generated commands
  * @tm_cb_idx: task management commands
  * @scsih_cb_idx: scsih internal commands
@@ -816,6 +833,7 @@ struct MPT2SAS_ADAPTER {
         resource_size_t **reply_post_host_index;
         u16             cpu_msix_table_sz;
         u32             ioc_reset_count;
+        MPT2SAS_FLUSH_RUNNING_CMDS schedule_dead_ioc_flush_running_cmds;
 
         /* internal commands, callback index */
         u8              scsi_io_cb_idx;
diff --git a/drivers/scsi/mpt2sas/mpt2sas_ctl.c b/drivers/scsi/mpt2sas/mpt2sas_ctl.c
index aabcb911706e..7fceb899029e 100644
--- a/drivers/scsi/mpt2sas/mpt2sas_ctl.c
+++ b/drivers/scsi/mpt2sas/mpt2sas_ctl.c
@@ -818,6 +818,7 @@ _ctl_do_mpt_command(struct MPT2SAS_ADAPTER *ioc,
         _ctl_display_some_debug(ioc, smid, "ctl_request", NULL);
 #endif
 
+        init_completion(&ioc->ctl_cmds.done);
         switch (mpi_request->Function) {
         case MPI2_FUNCTION_SCSI_IO_REQUEST:
         case MPI2_FUNCTION_RAID_SCSI_IO_PASSTHROUGH:
@@ -903,7 +904,6 @@ _ctl_do_mpt_command(struct MPT2SAS_ADAPTER *ioc,
                 timeout = MPT2_IOCTL_DEFAULT_TIMEOUT;
         else
                 timeout = karg.timeout;
-        init_completion(&ioc->ctl_cmds.done);
         timeleft = wait_for_completion_timeout(&ioc->ctl_cmds.done,
             timeout*HZ);
         if (mpi_request->Function == MPI2_FUNCTION_SCSI_TASK_MGMT) {
@@ -1477,8 +1477,8 @@ _ctl_diag_register_2(struct MPT2SAS_ADAPTER *ioc,
                 mpi_request->ProductSpecific[i] =
                         cpu_to_le32(ioc->product_specific[buffer_type][i]);
 
-        mpt2sas_base_put_smid_default(ioc, smid);
         init_completion(&ioc->ctl_cmds.done);
+        mpt2sas_base_put_smid_default(ioc, smid);
         timeleft = wait_for_completion_timeout(&ioc->ctl_cmds.done,
             MPT2_IOCTL_DEFAULT_TIMEOUT*HZ);
 
@@ -1821,8 +1821,8 @@ _ctl_send_release(struct MPT2SAS_ADAPTER *ioc, u8 buffer_type, u8 *issue_reset)
         mpi_request->VF_ID = 0; /* TODO */
         mpi_request->VP_ID = 0;
 
-        mpt2sas_base_put_smid_default(ioc, smid);
         init_completion(&ioc->ctl_cmds.done);
+        mpt2sas_base_put_smid_default(ioc, smid);
         timeleft = wait_for_completion_timeout(&ioc->ctl_cmds.done,
             MPT2_IOCTL_DEFAULT_TIMEOUT*HZ);
 
@@ -2095,8 +2095,8 @@ _ctl_diag_read_buffer(void __user *arg, enum block_state state)
         mpi_request->VF_ID = 0; /* TODO */
         mpi_request->VP_ID = 0;
 
-        mpt2sas_base_put_smid_default(ioc, smid);
         init_completion(&ioc->ctl_cmds.done);
+        mpt2sas_base_put_smid_default(ioc, smid);
         timeleft = wait_for_completion_timeout(&ioc->ctl_cmds.done,
             MPT2_IOCTL_DEFAULT_TIMEOUT*HZ);
 
diff --git a/drivers/scsi/mpt2sas/mpt2sas_scsih.c b/drivers/scsi/mpt2sas/mpt2sas_scsih.c
index d570573b7963..193e33e28e49 100644
--- a/drivers/scsi/mpt2sas/mpt2sas_scsih.c
+++ b/drivers/scsi/mpt2sas/mpt2sas_scsih.c
@@ -99,7 +99,7 @@ MODULE_PARM_DESC(logging_level, " bits for enabling additional logging info "
 
 static ushort max_sectors = 0xFFFF;
 module_param(max_sectors, ushort, 0);
-MODULE_PARM_DESC(max_sectors, "max sectors, range 64 to 8192  default=8192");
+MODULE_PARM_DESC(max_sectors, "max sectors, range 64 to 32767  default=32767");
 
 /* scsi-mid layer global parmeter is max_report_luns, which is 511 */
 #define MPT2SAS_MAX_LUN (16895)
@@ -612,13 +612,17 @@ _scsih_sas_device_add(struct MPT2SAS_ADAPTER *ioc,
         if (!mpt2sas_transport_port_add(ioc, sas_device->handle,
              sas_device->sas_address_parent)) {
                 _scsih_sas_device_remove(ioc, sas_device);
-                } else if (!sas_device->starget) {
-                        if (!ioc->is_driver_loading)
-                                mpt2sas_transport_port_remove(ioc,
-                                sas_device->sas_address,
-                            sas_device->sas_address_parent);
-                        _scsih_sas_device_remove(ioc, sas_device);
-                }
+        } else if (!sas_device->starget) {
+                /* When asyn scanning is enabled, its not possible to remove
+                 * devices while scanning is turned on due to an oops in
+                 * scsi_sysfs_add_sdev()->add_device()->sysfs_addrm_start()
+                 */
+                if (!ioc->is_driver_loading)
+                        mpt2sas_transport_port_remove(ioc,
+                        sas_device->sas_address,
+                        sas_device->sas_address_parent);
+                _scsih_sas_device_remove(ioc, sas_device);
+        }
 }
 
 /**
@@ -1007,8 +1011,8 @@ _scsih_get_chain_buffer_tracker(struct MPT2SAS_ADAPTER *ioc, u16 smid)
         spin_lock_irqsave(&ioc->scsi_lookup_lock, flags);
         if (list_empty(&ioc->free_chain_list)) {
                 spin_unlock_irqrestore(&ioc->scsi_lookup_lock, flags);
-                printk(MPT2SAS_WARN_FMT "chain buffers not available\n",
-                    ioc->name);
+                dfailprintk(ioc, printk(MPT2SAS_WARN_FMT "chain buffers not "
+                        "available\n", ioc->name));
                 return NULL;
         }
         chain_req = list_entry(ioc->free_chain_list.next,
@@ -1449,7 +1453,7 @@ _scsih_slave_destroy(struct scsi_device *sdev)
                 spin_lock_irqsave(&ioc->sas_device_lock, flags);
                 sas_device = mpt2sas_scsih_sas_device_find_by_sas_address(ioc,
                    sas_target_priv_data->sas_address);
-                if (sas_device)
+                if (sas_device && !sas_target_priv_data->num_luns)
                         sas_device->starget = NULL;
                 spin_unlock_irqrestore(&ioc->sas_device_lock, flags);
         }
@@ -1776,11 +1780,9 @@ _scsih_init_warpdrive_properties(struct MPT2SAS_ADAPTER *ioc,
         Mpi2ConfigReply_t mpi_reply;
         u16 sz;
         u8 num_pds, count;
-        u64 mb = 1024 * 1024;
-        u64 tb_2 = 2 * mb * mb;
-        u64 capacity;
-        u32 stripe_sz;
-        u8 i, stripe_exp;
+        unsigned long stripe_sz, block_sz;
+        u8 stripe_exp, block_exp;
+        u64 dev_max_lba;
 
         if (!ioc->is_warpdrive)
                 return;
@@ -1844,51 +1846,57 @@ _scsih_init_warpdrive_properties(struct MPT2SAS_ADAPTER *ioc,
                             vol_pg0->PhysDisk[count].PhysDiskNum);
                         goto out_error;
                 }
+                /* Disable direct I/O if member drive lba exceeds 4 bytes */
+                dev_max_lba = le64_to_cpu(pd_pg0.DeviceMaxLBA);
+                if (dev_max_lba >> 32) {
+                        printk(MPT2SAS_INFO_FMT "WarpDrive : Direct IO is "
+                            "disabled for the drive with handle(0x%04x) member"
+                            "handle (0x%04x) unsupported max lba 0x%016llx\n",
+                            ioc->name, raid_device->handle,
+                            le16_to_cpu(pd_pg0.DevHandle),
+                            (unsigned long long)dev_max_lba);
+                        goto out_error;
+                }
+
                 raid_device->pd_handle[count] = le16_to_cpu(pd_pg0.DevHandle);
         }
 
         /*
          * Assumption for WD: Direct I/O is not supported if the volume is
-         * not RAID0, if the stripe size is not 64KB, if the block size is
-         * not 512 and if the volume size is >2TB
+         * not RAID0
          */
-        if (raid_device->volume_type != MPI2_RAID_VOL_TYPE_RAID0 ||
-            le16_to_cpu(vol_pg0->BlockSize) != 512) {
+        if (raid_device->volume_type != MPI2_RAID_VOL_TYPE_RAID0) {
                 printk(MPT2SAS_INFO_FMT "WarpDrive : Direct IO is disabled "
                     "for the drive with handle(0x%04x): type=%d, "
                     "s_sz=%uK, blk_size=%u\n", ioc->name,
                     raid_device->handle, raid_device->volume_type,
-                    le32_to_cpu(vol_pg0->StripeSize)/2,
+                    (le32_to_cpu(vol_pg0->StripeSize) *
+                    le16_to_cpu(vol_pg0->BlockSize)) / 1024,
                     le16_to_cpu(vol_pg0->BlockSize));
                 goto out_error;
         }
 
-        capacity = (u64) le16_to_cpu(vol_pg0->BlockSize) *
-            (le64_to_cpu(vol_pg0->MaxLBA) + 1);
-
-        if (capacity > tb_2) {
+        stripe_sz = le32_to_cpu(vol_pg0->StripeSize);
+        stripe_exp = find_first_bit(&stripe_sz, 32);
+        if (stripe_exp == 32) {
                 printk(MPT2SAS_INFO_FMT "WarpDrive : Direct IO is disabled "
-                "for the drive with handle(0x%04x) since drive sz > 2TB\n",
-                ioc->name, raid_device->handle);
+                "for the drive with handle(0x%04x) invalid stripe sz %uK\n",
+                    ioc->name, raid_device->handle,
+                    (le32_to_cpu(vol_pg0->StripeSize) *
+                    le16_to_cpu(vol_pg0->BlockSize)) / 1024);
                 goto out_error;
         }
-
-        stripe_sz = le32_to_cpu(vol_pg0->StripeSize);
-        stripe_exp = 0;
-        for (i = 0; i < 32; i++) {
-                if (stripe_sz & 1)
-                        break;
-                stripe_exp++;
-                stripe_sz >>= 1;
-        }
-        if (i == 32) {
+        raid_device->stripe_exponent = stripe_exp;
+        block_sz = le16_to_cpu(vol_pg0->BlockSize);
+        block_exp = find_first_bit(&block_sz, 16);
+        if (block_exp == 16) {
                 printk(MPT2SAS_INFO_FMT "WarpDrive : Direct IO is disabled "
-                    "for the drive with handle(0x%04x) invalid stripe sz %uK\n",
+                    "for the drive with handle(0x%04x) invalid block sz %u\n",
                     ioc->name, raid_device->handle,
-                    le32_to_cpu(vol_pg0->StripeSize)/2);
+                    le16_to_cpu(vol_pg0->BlockSize));
                 goto out_error;
         }
-        raid_device->stripe_exponent = stripe_exp;
+        raid_device->block_exponent = block_exp;
         raid_device->direct_io_enabled = 1;
 
         printk(MPT2SAS_INFO_FMT "WarpDrive : Direct IO is Enabled for the drive"
@@ -3804,8 +3812,9 @@ _scsih_setup_direct_io(struct MPT2SAS_ADAPTER *ioc, struct scsi_cmnd *scmd,
 {
         u32 v_lba, p_lba, stripe_off, stripe_unit, column, io_size;
         u32 stripe_sz, stripe_exp;
-        u8 num_pds, *cdb_ptr, *tmp_ptr, *lba_ptr1, *lba_ptr2;
+        u8 num_pds, *cdb_ptr, i;
         u8 cdb0 = scmd->cmnd[0];
+        u64 v_llba;
 
         /*
          * Try Direct I/O to RAID memeber disks
@@ -3816,15 +3825,11 @@ _scsih_setup_direct_io(struct MPT2SAS_ADAPTER *ioc, struct scsi_cmnd *scmd,
 
                 if ((cdb0 < READ_16) || !(cdb_ptr[2] | cdb_ptr[3] | cdb_ptr[4]
                         | cdb_ptr[5])) {
-                        io_size = scsi_bufflen(scmd) >> 9;
+                        io_size = scsi_bufflen(scmd) >>
+                            raid_device->block_exponent;
+                        i = (cdb0 < READ_16) ? 2 : 6;
                         /* get virtual lba */
-                        lba_ptr1 = lba_ptr2 = (cdb0 < READ_16) ? &cdb_ptr[2] :
-                            &cdb_ptr[6];
-                        tmp_ptr = (u8 *)&v_lba + 3;
-                        *tmp_ptr-- = *lba_ptr1++;
-                        *tmp_ptr-- = *lba_ptr1++;
-                        *tmp_ptr-- = *lba_ptr1++;
-                        *tmp_ptr = *lba_ptr1;
+                        v_lba = be32_to_cpu(*(__be32 *)(&cdb_ptr[i]));
 
                         if (((u64)v_lba + (u64)io_size - 1) <=
                             (u32)raid_device->max_lba) {
@@ -3843,11 +3848,39 @@ _scsih_setup_direct_io(struct MPT2SAS_ADAPTER *ioc, struct scsi_cmnd *scmd,
                                         mpi_request->DevHandle =
                                                 cpu_to_le16(raid_device->
                                                     pd_handle[column]);
-                                        tmp_ptr = (u8 *)&p_lba + 3;
-                                        *lba_ptr2++ = *tmp_ptr--;
-                                        *lba_ptr2++ = *tmp_ptr--;
-                                        *lba_ptr2++ = *tmp_ptr--;
-                                        *lba_ptr2 = *tmp_ptr;
+                                        (*(__be32 *)(&cdb_ptr[i])) =
+                                                cpu_to_be32(p_lba);
+                                        /*
+                                        * WD: To indicate this I/O is directI/O
+                                        */
+                                        _scsih_scsi_direct_io_set(ioc, smid, 1);
+                                }
+                        }
+                } else {
+                        io_size = scsi_bufflen(scmd) >>
+                            raid_device->block_exponent;
+                        /* get virtual lba */
+                        v_llba = be64_to_cpu(*(__be64 *)(&cdb_ptr[2]));
+
+                        if ((v_llba + (u64)io_size - 1) <=
+                            raid_device->max_lba) {
+                                stripe_sz = raid_device->stripe_sz;
+                                stripe_exp = raid_device->stripe_exponent;
+                                stripe_off = (u32) (v_llba & (stripe_sz - 1));
+
+                                /* Check whether IO falls within a stripe */
+                                if ((stripe_off + io_size) <= stripe_sz) {
+                                        num_pds = raid_device->num_pds;
+                                        p_lba = (u32)(v_llba >> stripe_exp);
+                                        stripe_unit = p_lba / num_pds;
+                                        column = p_lba % num_pds;
+                                        p_lba = (stripe_unit << stripe_exp) +
+                                            stripe_off;
+                                        mpi_request->DevHandle =
+                                                cpu_to_le16(raid_device->
+                                                    pd_handle[column]);
+                                        (*(__be64 *)(&cdb_ptr[2])) =
+                                            cpu_to_be64((u64)p_lba);
                                         /*
                                         * WD: To indicate this I/O is directI/O
                                         */
@@ -4403,11 +4436,14 @@ _scsih_io_done(struct MPT2SAS_ADAPTER *ioc, u16 smid, u8 msix_index, u32 reply)
                 scmd->result = DID_NO_CONNECT << 16;
                 goto out;
         }
+        ioc_status = le16_to_cpu(mpi_reply->IOCStatus);
         /*
          * WARPDRIVE: If direct_io is set then it is directIO,
          * the failed direct I/O should be redirected to volume
          */
-        if (_scsih_scsi_direct_io_get(ioc, smid)) {
+        if (_scsih_scsi_direct_io_get(ioc, smid) &&
+            ((ioc_status & MPI2_IOCSTATUS_MASK)
+            != MPI2_IOCSTATUS_SCSI_TASK_TERMINATED)) {
                 spin_lock_irqsave(&ioc->scsi_lookup_lock, flags);
                 ioc->scsi_lookup[smid - 1].scmd = scmd;
                 spin_unlock_irqrestore(&ioc->scsi_lookup_lock, flags);
@@ -4441,7 +4477,6 @@ _scsih_io_done(struct MPT2SAS_ADAPTER *ioc, u16 smid, u8 msix_index, u32 reply)
 
         xfer_cnt = le32_to_cpu(mpi_reply->TransferCount);
         scsi_set_resid(scmd, scsi_bufflen(scmd) - xfer_cnt);
-        ioc_status = le16_to_cpu(mpi_reply->IOCStatus);
         if (ioc_status & MPI2_IOCSTATUS_FLAG_LOG_INFO_AVAILABLE)
                 log_info =  le32_to_cpu(mpi_reply->IOCLogInfo);
         else
@@ -4485,6 +4520,8 @@ _scsih_io_done(struct MPT2SAS_ADAPTER *ioc, u16 smid, u8 msix_index, u32 reply)
                         scmd->result = DID_TRANSPORT_DISRUPTED << 16;
                         goto out;
                 }
+                scmd->result = DID_SOFT_ERROR << 16;
+                break;
         case MPI2_IOCSTATUS_SCSI_TASK_TERMINATED:
         case MPI2_IOCSTATUS_SCSI_EXT_TERMINATED:
                 scmd->result = DID_RESET << 16;
@@ -6714,6 +6751,7 @@ _scsih_mark_responding_raid_device(struct MPT2SAS_ADAPTER *ioc, u64 wwid,
                         } else
                                 sas_target_priv_data = NULL;
                         raid_device->responding = 1;
+                        spin_unlock_irqrestore(&ioc->raid_device_lock, flags);
                         starget_printk(KERN_INFO, raid_device->starget,
                             "handle(0x%04x), wwid(0x%016llx)\n", handle,
                             (unsigned long long)raid_device->wwid);
@@ -6724,16 +6762,16 @@ _scsih_mark_responding_raid_device(struct MPT2SAS_ADAPTER *ioc, u64 wwid,
                          */
                         _scsih_init_warpdrive_properties(ioc, raid_device);
                         if (raid_device->handle == handle)
-                                goto out;
+                                return;
                         printk(KERN_INFO "\thandle changed from(0x%04x)!!!\n",
                             raid_device->handle);
                         raid_device->handle = handle;
                         if (sas_target_priv_data)
                                 sas_target_priv_data->handle = handle;
-                        goto out;
+                        return;
                 }
         }
- out:
+
         spin_unlock_irqrestore(&ioc->raid_device_lock, flags);
 }
 
@@ -7418,7 +7456,7 @@ static struct scsi_host_template scsih_driver_template = {
         .can_queue                      = 1,
         .this_id                        = -1,
         .sg_tablesize                   = MPT2SAS_SG_DEPTH,
-        .max_sectors                    = 8192,
+        .max_sectors                    = 32767,
         .cmd_per_lun                    = 7,
         .use_clustering                 = ENABLE_CLUSTERING,
         .shost_attrs                    = mpt2sas_host_attrs,
@@ -7928,6 +7966,7 @@ _scsih_probe(struct pci_dev *pdev, const struct pci_device_id *id)
         ioc->tm_tr_volume_cb_idx = tm_tr_volume_cb_idx;
         ioc->tm_sas_control_cb_idx = tm_sas_control_cb_idx;
         ioc->logging_level = logging_level;
+        ioc->schedule_dead_ioc_flush_running_cmds = &_scsih_flush_running_cmds;
         /* misc semaphores and spin locks */
         mutex_init(&ioc->reset_in_progress_mutex);
         spin_lock_init(&ioc->ioc_reset_in_progress_lock);
@@ -7958,11 +7997,11 @@ _scsih_probe(struct pci_dev *pdev, const struct pci_device_id *id)
                         printk(MPT2SAS_WARN_FMT "Invalid value %d passed "
                             "for max_sectors, range is 64 to 8192. Assigning "
                             "value of 64.\n", ioc->name, max_sectors);
-                } else if (max_sectors > 8192) {
-                        shost->max_sectors = 8192;
+                } else if (max_sectors > 32767) {
+                        shost->max_sectors = 32767;
                         printk(MPT2SAS_WARN_FMT "Invalid value %d passed "
                             "for max_sectors, range is 64 to 8192. Assigning "
-                            "default value of 8192.\n", ioc->name,
+                            "default value of 32767.\n", ioc->name,
                             max_sectors);
                 } else {
                         shost->max_sectors = max_sectors & 0xFFFE;
@@ -8000,7 +8039,6 @@ _scsih_probe(struct pci_dev *pdev, const struct pci_device_id *id)
                 goto out_attach_fail;
         }
 
-        scsi_scan_host(shost);
         if (ioc->is_warpdrive) {
                 if (ioc->mfg_pg10_hide_flag ==  MFG_PAGE10_EXPOSE_ALL_DISKS)
                         ioc->hide_drives = 0;
@@ -8014,8 +8052,8 @@ _scsih_probe(struct pci_dev *pdev, const struct pci_device_id *id)
                 }
         } else
                 ioc->hide_drives = 0;
+        scsi_scan_host(shost);
 
-        _scsih_probe_devices(ioc);
         return 0;
 
  out_attach_fail:
diff --git a/drivers/scsi/mpt2sas/mpt2sas_transport.c b/drivers/scsi/mpt2sas/mpt2sas_transport.c
index 230732241aa2..831047466a5a 100644
--- a/drivers/scsi/mpt2sas/mpt2sas_transport.c
+++ b/drivers/scsi/mpt2sas/mpt2sas_transport.c
@@ -398,8 +398,8 @@ _transport_expander_report_manufacture(struct MPT2SAS_ADAPTER *ioc,
         dtransportprintk(ioc, printk(MPT2SAS_INFO_FMT "report_manufacture - "
             "send to sas_addr(0x%016llx)\n", ioc->name,
             (unsigned long long)sas_address));
-        mpt2sas_base_put_smid_default(ioc, smid);
         init_completion(&ioc->transport_cmds.done);
+        mpt2sas_base_put_smid_default(ioc, smid);
         timeleft = wait_for_completion_timeout(&ioc->transport_cmds.done,
             10*HZ);
 
@@ -1184,8 +1184,8 @@ _transport_get_expander_phy_error_log(struct MPT2SAS_ADAPTER *ioc,
         dtransportprintk(ioc, printk(MPT2SAS_INFO_FMT "phy_error_log - "
             "send to sas_addr(0x%016llx), phy(%d)\n", ioc->name,
             (unsigned long long)phy->identify.sas_address, phy->number));
-        mpt2sas_base_put_smid_default(ioc, smid);
         init_completion(&ioc->transport_cmds.done);
+        mpt2sas_base_put_smid_default(ioc, smid);
         timeleft = wait_for_completion_timeout(&ioc->transport_cmds.done,
             10*HZ);
 
@@ -1509,8 +1509,9 @@ _transport_expander_phy_control(struct MPT2SAS_ADAPTER *ioc,
             "send to sas_addr(0x%016llx), phy(%d), opcode(%d)\n", ioc->name,
             (unsigned long long)phy->identify.sas_address, phy->number,
             phy_operation));
-        mpt2sas_base_put_smid_default(ioc, smid);
+
         init_completion(&ioc->transport_cmds.done);
+        mpt2sas_base_put_smid_default(ioc, smid);
         timeleft = wait_for_completion_timeout(&ioc->transport_cmds.done,
             10*HZ);
 
@@ -1949,8 +1950,8 @@ _transport_smp_handler(struct Scsi_Host *shost, struct sas_rphy *rphy,
         dtransportprintk(ioc, printk(MPT2SAS_INFO_FMT "%s - "
             "sending smp request\n", ioc->name, __func__));
 
-        mpt2sas_base_put_smid_default(ioc, smid);
         init_completion(&ioc->transport_cmds.done);
+        mpt2sas_base_put_smid_default(ioc, smid);
         timeleft = wait_for_completion_timeout(&ioc->transport_cmds.done,
             10*HZ);