1 files changed, 509 insertions, 159 deletions

diff --git a/drivers/scsi/mpt3sas/mpt3sas_base.c b/drivers/scsi/mpt3sas/mpt3sas_base.c
index d4f1dcdb8361..11393ebf1a68 100644
--- a/drivers/scsi/mpt3sas/mpt3sas_base.c
+++ b/drivers/scsi/mpt3sas/mpt3sas_base.c
@@ -108,9 +108,12 @@ _scsih_set_fwfault_debug(const char *val, struct kernel_param *kp)
         if (ret)
                 return ret;
 
+        /* global ioc spinlock to protect controller list on list operations */
         pr_info("setting fwfault_debug(%d)\n", mpt3sas_fwfault_debug);
+        spin_lock(&gioc_lock);
         list_for_each_entry(ioc, &mpt3sas_ioc_list, list)
                 ioc->fwfault_debug = mpt3sas_fwfault_debug;
+        spin_unlock(&gioc_lock);
         return 0;
 }
 module_param_call(mpt3sas_fwfault_debug, _scsih_set_fwfault_debug,
@@ -157,7 +160,7 @@ _base_fault_reset_work(struct work_struct *work)
 
 
         spin_lock_irqsave(&ioc->ioc_reset_in_progress_lock, flags);
-        if (ioc->shost_recovery)
+        if (ioc->shost_recovery || ioc->pci_error_recovery)
                 goto rearm_timer;
         spin_unlock_irqrestore(&ioc->ioc_reset_in_progress_lock, flags);
 
@@ -166,6 +169,20 @@ _base_fault_reset_work(struct work_struct *work)
                 pr_err(MPT3SAS_FMT "SAS host is non-operational !!!!\n",
                     ioc->name);
 
+                /* It may be possible that EEH recovery can resolve some of
+                 * pci bus failure issues rather removing the dead ioc function
+                 * by considering controller is in a non-operational state. So
+                 * here priority is given to the EEH recovery. If it doesn't
+                 * not resolve this issue, mpt3sas driver will consider this
+                 * controller to non-operational state and remove the dead ioc
+                 * function.
+                 */
+                if (ioc->non_operational_loop++ < 5) {
+                        spin_lock_irqsave(&ioc->ioc_reset_in_progress_lock,
+                                                         flags);
+                        goto rearm_timer;
+                }
+
                 /*
                  * Call _scsih_flush_pending_cmds callback so that we flush all
                  * pending commands back to OS. This call is required to aovid
@@ -181,7 +198,7 @@ _base_fault_reset_work(struct work_struct *work)
                 ioc->remove_host = 1;
                 /*Remove the Dead Host */
                 p = kthread_run(mpt3sas_remove_dead_ioc_func, ioc,
-                    "mpt3sas_dead_ioc_%d", ioc->id);
+                    "%s_dead_ioc_%d", ioc->driver_name, ioc->id);
                 if (IS_ERR(p))
                         pr_err(MPT3SAS_FMT
                         "%s: Running mpt3sas_dead_ioc thread failed !!!!\n",
@@ -193,6 +210,8 @@ _base_fault_reset_work(struct work_struct *work)
                 return; /* don't rearm timer */
         }
 
+        ioc->non_operational_loop = 0;
+
         if ((doorbell & MPI2_IOC_STATE_MASK) != MPI2_IOC_STATE_OPERATIONAL) {
                 rc = mpt3sas_base_hard_reset_handler(ioc, CAN_SLEEP,
                     FORCE_BIG_HAMMER);
@@ -235,7 +254,8 @@ mpt3sas_base_start_watchdog(struct MPT3SAS_ADAPTER *ioc)
 
         INIT_DELAYED_WORK(&ioc->fault_reset_work, _base_fault_reset_work);
         snprintf(ioc->fault_reset_work_q_name,
-            sizeof(ioc->fault_reset_work_q_name), "poll_%d_status", ioc->id);
+            sizeof(ioc->fault_reset_work_q_name), "poll_%s%d_status",
+            ioc->driver_name, ioc->id);
         ioc->fault_reset_work_q =
                 create_singlethread_workqueue(ioc->fault_reset_work_q_name);
         if (!ioc->fault_reset_work_q) {
@@ -324,7 +344,6 @@ mpt3sas_halt_firmware(struct MPT3SAS_ADAPTER *ioc)
                 panic("panic in %s\n", __func__);
 }
 
-#ifdef CONFIG_SCSI_MPT3SAS_LOGGING
 /**
  * _base_sas_ioc_info - verbose translation of the ioc status
  * @ioc: per adapter object
@@ -578,7 +597,8 @@ _base_display_event_data(struct MPT3SAS_ADAPTER *ioc,
                 desc = "Device Status Change";
                 break;
         case MPI2_EVENT_IR_OPERATION_STATUS:
-                desc = "IR Operation Status";
+                if (!ioc->hide_ir_msg)
+                        desc = "IR Operation Status";
                 break;
         case MPI2_EVENT_SAS_DISCOVERY:
         {
@@ -609,16 +629,20 @@ _base_display_event_data(struct MPT3SAS_ADAPTER *ioc,
                 desc = "SAS Enclosure Device Status Change";
                 break;
         case MPI2_EVENT_IR_VOLUME:
-                desc = "IR Volume";
+                if (!ioc->hide_ir_msg)
+                        desc = "IR Volume";
                 break;
         case MPI2_EVENT_IR_PHYSICAL_DISK:
-                desc = "IR Physical Disk";
+                if (!ioc->hide_ir_msg)
+                        desc = "IR Physical Disk";
                 break;
         case MPI2_EVENT_IR_CONFIGURATION_CHANGE_LIST:
-                desc = "IR Configuration Change List";
+                if (!ioc->hide_ir_msg)
+                        desc = "IR Configuration Change List";
                 break;
         case MPI2_EVENT_LOG_ENTRY_ADDED:
-                desc = "Log Entry Added";
+                if (!ioc->hide_ir_msg)
+                        desc = "Log Entry Added";
                 break;
         case MPI2_EVENT_TEMP_THRESHOLD:
                 desc = "Temperature Threshold";
@@ -630,7 +654,6 @@ _base_display_event_data(struct MPT3SAS_ADAPTER *ioc,
 
         pr_info(MPT3SAS_FMT "%s\n", ioc->name, desc);
 }
-#endif
 
 /**
  * _base_sas_log_info - verbose translation of firmware log info
@@ -675,7 +698,10 @@ _base_sas_log_info(struct MPT3SAS_ADAPTER *ioc , u32 log_info)
                 originator_str = "PL";
                 break;
         case 2:
-                originator_str = "IR";
+                if (!ioc->hide_ir_msg)
+                        originator_str = "IR";
+                else
+                        originator_str = "WarpDrive";
                 break;
         }
 
@@ -710,13 +736,13 @@ _base_display_reply_info(struct MPT3SAS_ADAPTER *ioc, u16 smid, u8 msix_index,
                 return;
         }
         ioc_status = le16_to_cpu(mpi_reply->IOCStatus);
-#ifdef CONFIG_SCSI_MPT3SAS_LOGGING
+
         if ((ioc_status & MPI2_IOCSTATUS_MASK) &&
             (ioc->logging_level & MPT_DEBUG_REPLY)) {
                 _base_sas_ioc_info(ioc , mpi_reply,
                    mpt3sas_base_get_msg_frame(ioc, smid));
         }
-#endif
+
         if (ioc_status & MPI2_IOCSTATUS_FLAG_LOG_INFO_AVAILABLE) {
                 loginfo = le32_to_cpu(mpi_reply->IOCLogInfo);
                 _base_sas_log_info(ioc, loginfo);
@@ -783,9 +809,9 @@ _base_async_event(struct MPT3SAS_ADAPTER *ioc, u8 msix_index, u32 reply)
                 return 1;
         if (mpi_reply->Function != MPI2_FUNCTION_EVENT_NOTIFICATION)
                 return 1;
-#ifdef CONFIG_SCSI_MPT3SAS_LOGGING
+
         _base_display_event_data(ioc, mpi_reply);
-#endif
+
         if (!(mpi_reply->AckRequired & MPI2_EVENT_NOTIFICATION_ACK_REQUIRED))
                 goto out;
         smid = mpt3sas_base_get_smid(ioc, ioc->base_cb_idx);
@@ -1009,6 +1035,12 @@ _base_interrupt(int irq, void *bus_id)
         }
 
         wmb();
+        if (ioc->is_warpdrive) {
+                writel(reply_q->reply_post_host_index,
+                ioc->reply_post_host_index[msix_index]);
+                atomic_dec(&reply_q->busy);
+                return IRQ_HANDLED;
+        }
 
         /* Update Reply Post Host Index.
          * For those HBA's which support combined reply queue feature
@@ -1320,6 +1352,149 @@ _base_build_zero_len_sge_ieee(struct MPT3SAS_ADAPTER *ioc, void *paddr)
 }
 
 /**
+ * _base_build_sg_scmd - main sg creation routine
+ * @ioc: per adapter object
+ * @scmd: scsi command
+ * @smid: system request message index
+ * Context: none.
+ *
+ * The main routine that builds scatter gather table from a given
+ * scsi request sent via the .queuecommand main handler.
+ *
+ * Returns 0 success, anything else error
+ */
+static int
+_base_build_sg_scmd(struct MPT3SAS_ADAPTER *ioc,
+                struct scsi_cmnd *scmd, u16 smid)
+{
+        Mpi2SCSIIORequest_t *mpi_request;
+        dma_addr_t chain_dma;
+        struct scatterlist *sg_scmd;
+        void *sg_local, *chain;
+        u32 chain_offset;
+        u32 chain_length;
+        u32 chain_flags;
+        int sges_left;
+        u32 sges_in_segment;
+        u32 sgl_flags;
+        u32 sgl_flags_last_element;
+        u32 sgl_flags_end_buffer;
+        struct chain_tracker *chain_req;
+
+        mpi_request = mpt3sas_base_get_msg_frame(ioc, smid);
+
+        /* init scatter gather flags */
+        sgl_flags = MPI2_SGE_FLAGS_SIMPLE_ELEMENT;
+        if (scmd->sc_data_direction == DMA_TO_DEVICE)
+                sgl_flags |= MPI2_SGE_FLAGS_HOST_TO_IOC;
+        sgl_flags_last_element = (sgl_flags | MPI2_SGE_FLAGS_LAST_ELEMENT)
+            << MPI2_SGE_FLAGS_SHIFT;
+        sgl_flags_end_buffer = (sgl_flags | MPI2_SGE_FLAGS_LAST_ELEMENT |
+            MPI2_SGE_FLAGS_END_OF_BUFFER | MPI2_SGE_FLAGS_END_OF_LIST)
+            << MPI2_SGE_FLAGS_SHIFT;
+        sgl_flags = sgl_flags << MPI2_SGE_FLAGS_SHIFT;
+
+        sg_scmd = scsi_sglist(scmd);
+        sges_left = scsi_dma_map(scmd);
+        if (sges_left < 0) {
+                sdev_printk(KERN_ERR, scmd->device,
+                 "pci_map_sg failed: request for %d bytes!\n",
+                 scsi_bufflen(scmd));
+                return -ENOMEM;
+        }
+
+        sg_local = &mpi_request->SGL;
+        sges_in_segment = ioc->max_sges_in_main_message;
+        if (sges_left <= sges_in_segment)
+                goto fill_in_last_segment;
+
+        mpi_request->ChainOffset = (offsetof(Mpi2SCSIIORequest_t, SGL) +
+            (sges_in_segment * ioc->sge_size))/4;
+
+        /* fill in main message segment when there is a chain following */
+        while (sges_in_segment) {
+                if (sges_in_segment == 1)
+                        ioc->base_add_sg_single(sg_local,
+                            sgl_flags_last_element | sg_dma_len(sg_scmd),
+                            sg_dma_address(sg_scmd));
+                else
+                        ioc->base_add_sg_single(sg_local, sgl_flags |
+                            sg_dma_len(sg_scmd), sg_dma_address(sg_scmd));
+                sg_scmd = sg_next(sg_scmd);
+                sg_local += ioc->sge_size;
+                sges_left--;
+                sges_in_segment--;
+        }
+
+        /* initializing the chain flags and pointers */
+        chain_flags = MPI2_SGE_FLAGS_CHAIN_ELEMENT << MPI2_SGE_FLAGS_SHIFT;
+        chain_req = _base_get_chain_buffer_tracker(ioc, smid);
+        if (!chain_req)
+                return -1;
+        chain = chain_req->chain_buffer;
+        chain_dma = chain_req->chain_buffer_dma;
+        do {
+                sges_in_segment = (sges_left <=
+                    ioc->max_sges_in_chain_message) ? sges_left :
+                    ioc->max_sges_in_chain_message;
+                chain_offset = (sges_left == sges_in_segment) ?
+                    0 : (sges_in_segment * ioc->sge_size)/4;
+                chain_length = sges_in_segment * ioc->sge_size;
+                if (chain_offset) {
+                        chain_offset = chain_offset <<
+                            MPI2_SGE_CHAIN_OFFSET_SHIFT;
+                        chain_length += ioc->sge_size;
+                }
+                ioc->base_add_sg_single(sg_local, chain_flags | chain_offset |
+                    chain_length, chain_dma);
+                sg_local = chain;
+                if (!chain_offset)
+                        goto fill_in_last_segment;
+
+                /* fill in chain segments */
+                while (sges_in_segment) {
+                        if (sges_in_segment == 1)
+                                ioc->base_add_sg_single(sg_local,
+                                    sgl_flags_last_element |
+                                    sg_dma_len(sg_scmd),
+                                    sg_dma_address(sg_scmd));
+                        else
+                                ioc->base_add_sg_single(sg_local, sgl_flags |
+                                    sg_dma_len(sg_scmd),
+                                    sg_dma_address(sg_scmd));
+                        sg_scmd = sg_next(sg_scmd);
+                        sg_local += ioc->sge_size;
+                        sges_left--;
+                        sges_in_segment--;
+                }
+
+                chain_req = _base_get_chain_buffer_tracker(ioc, smid);
+                if (!chain_req)
+                        return -1;
+                chain = chain_req->chain_buffer;
+                chain_dma = chain_req->chain_buffer_dma;
+        } while (1);
+
+
+ fill_in_last_segment:
+
+        /* fill the last segment */
+        while (sges_left) {
+                if (sges_left == 1)
+                        ioc->base_add_sg_single(sg_local, sgl_flags_end_buffer |
+                            sg_dma_len(sg_scmd), sg_dma_address(sg_scmd));
+                else
+                        ioc->base_add_sg_single(sg_local, sgl_flags |
+                            sg_dma_len(sg_scmd), sg_dma_address(sg_scmd));
+                sg_scmd = sg_next(sg_scmd);
+                sg_local += ioc->sge_size;
+                sges_left--;
+        }
+
+        return 0;
+}
+
+/**
  * _base_build_sg_scmd_ieee - main sg creation routine for IEEE format
  * @ioc: per adapter object
  * @scmd: scsi command
@@ -1571,6 +1746,14 @@ _base_check_enable_msix(struct MPT3SAS_ADAPTER *ioc)
         int base;
         u16 message_control;
 
+        /* Check whether controller SAS2008 B0 controller,
+         * if it is SAS2008 B0 controller use IO-APIC instead of MSIX
+         */
+        if (ioc->pdev->device == MPI2_MFGPAGE_DEVID_SAS2008 &&
+            ioc->pdev->revision == SAS2_PCI_DEVICE_B0_REVISION) {
+                return -EINVAL;
+        }
+
         base = pci_find_capability(ioc->pdev, PCI_CAP_ID_MSIX);
         if (!base) {
                 dfailprintk(ioc, pr_info(MPT3SAS_FMT "msix not supported\n",
@@ -1579,9 +1762,19 @@ _base_check_enable_msix(struct MPT3SAS_ADAPTER *ioc)
         }
 
         /* get msix vector count */
-
-        pci_read_config_word(ioc->pdev, base + 2, &message_control);
-        ioc->msix_vector_count = (message_control & 0x3FF) + 1;
+        /* NUMA_IO not supported for older controllers */
+        if (ioc->pdev->device == MPI2_MFGPAGE_DEVID_SAS2004 ||
+            ioc->pdev->device == MPI2_MFGPAGE_DEVID_SAS2008 ||
+            ioc->pdev->device == MPI2_MFGPAGE_DEVID_SAS2108_1 ||
+            ioc->pdev->device == MPI2_MFGPAGE_DEVID_SAS2108_2 ||
+            ioc->pdev->device == MPI2_MFGPAGE_DEVID_SAS2108_3 ||
+            ioc->pdev->device == MPI2_MFGPAGE_DEVID_SAS2116_1 ||
+            ioc->pdev->device == MPI2_MFGPAGE_DEVID_SAS2116_2)
+                ioc->msix_vector_count = 1;
+        else {
+                pci_read_config_word(ioc->pdev, base + 2, &message_control);
+                ioc->msix_vector_count = (message_control & 0x3FF) + 1;
+        }
         dinitprintk(ioc, pr_info(MPT3SAS_FMT
                 "msix is supported, vector_count(%d)\n",
                 ioc->name, ioc->msix_vector_count));
@@ -1643,10 +1836,10 @@ _base_request_irq(struct MPT3SAS_ADAPTER *ioc, u8 index, u32 vector)
         atomic_set(&reply_q->busy, 0);
         if (ioc->msix_enable)
                 snprintf(reply_q->name, MPT_NAME_LENGTH, "%s%d-msix%d",
-                    MPT3SAS_DRIVER_NAME, ioc->id, index);
+                    ioc->driver_name, ioc->id, index);
         else
                 snprintf(reply_q->name, MPT_NAME_LENGTH, "%s%d",
-                    MPT3SAS_DRIVER_NAME, ioc->id);
+                    ioc->driver_name, ioc->id);
         r = request_irq(vector, _base_interrupt, IRQF_SHARED, reply_q->name,
             reply_q);
         if (r) {
@@ -1872,7 +2065,7 @@ mpt3sas_base_map_resources(struct MPT3SAS_ADAPTER *ioc)
 
 
         if (pci_request_selected_regions(pdev, ioc->bars,
-            MPT3SAS_DRIVER_NAME)) {
+            ioc->driver_name)) {
                 pr_warn(MPT3SAS_FMT "pci_request_selected_regions: failed\n",
                         ioc->name);
                 ioc->bars = 0;
@@ -2158,6 +2351,7 @@ mpt3sas_base_free_smid(struct MPT3SAS_ADAPTER *ioc, u16 smid)
                 }
                 ioc->scsi_lookup[i].cb_idx = 0xFF;
                 ioc->scsi_lookup[i].scmd = NULL;
+                ioc->scsi_lookup[i].direct_io = 0;
                 list_add(&ioc->scsi_lookup[i].tracker_list, &ioc->free_list);
                 spin_unlock_irqrestore(&ioc->scsi_lookup_lock, flags);
 
@@ -2318,143 +2512,261 @@ mpt3sas_base_put_smid_default(struct MPT3SAS_ADAPTER *ioc, u16 smid)
 }
 
 /**
- * _base_display_intel_branding - Display branding string
+ * _base_display_OEMs_branding - Display branding string
  * @ioc: per adapter object
  *
  * Return nothing.
  */
 static void
-_base_display_intel_branding(struct MPT3SAS_ADAPTER *ioc)
+_base_display_OEMs_branding(struct MPT3SAS_ADAPTER *ioc)
 {
         if (ioc->pdev->subsystem_vendor != PCI_VENDOR_ID_INTEL)
                 return;
 
-        switch (ioc->pdev->device) {
-        case MPI25_MFGPAGE_DEVID_SAS3008:
-                switch (ioc->pdev->subsystem_device) {
-                case MPT3SAS_INTEL_RMS3JC080_SSDID:
-                        pr_info(MPT3SAS_FMT "%s\n", ioc->name,
-                                MPT3SAS_INTEL_RMS3JC080_BRANDING);
-                        break;
-
-                case MPT3SAS_INTEL_RS3GC008_SSDID:
-                        pr_info(MPT3SAS_FMT "%s\n", ioc->name,
-                                MPT3SAS_INTEL_RS3GC008_BRANDING);
-                        break;
-                case MPT3SAS_INTEL_RS3FC044_SSDID:
-                        pr_info(MPT3SAS_FMT "%s\n", ioc->name,
-                                MPT3SAS_INTEL_RS3FC044_BRANDING);
-                        break;
-                case MPT3SAS_INTEL_RS3UC080_SSDID:
-                        pr_info(MPT3SAS_FMT "%s\n", ioc->name,
-                                MPT3SAS_INTEL_RS3UC080_BRANDING);
+        switch (ioc->pdev->subsystem_vendor) {
+        case PCI_VENDOR_ID_INTEL:
+                switch (ioc->pdev->device) {
+                case MPI2_MFGPAGE_DEVID_SAS2008:
+                        switch (ioc->pdev->subsystem_device) {
+                        case MPT2SAS_INTEL_RMS2LL080_SSDID:
+                                pr_info(MPT3SAS_FMT "%s\n", ioc->name,
+                                    MPT2SAS_INTEL_RMS2LL080_BRANDING);
+                                break;
+                        case MPT2SAS_INTEL_RMS2LL040_SSDID:
+                                pr_info(MPT3SAS_FMT "%s\n", ioc->name,
+                                    MPT2SAS_INTEL_RMS2LL040_BRANDING);
+                                break;
+                        case MPT2SAS_INTEL_SSD910_SSDID:
+                                pr_info(MPT3SAS_FMT "%s\n", ioc->name,
+                                    MPT2SAS_INTEL_SSD910_BRANDING);
+                                break;
+                        default:
+                                pr_info(MPT3SAS_FMT
+                                 "Intel(R) Controller: Subsystem ID: 0x%X\n",
+                                 ioc->name, ioc->pdev->subsystem_device);
+                                break;
+                        }
+                case MPI2_MFGPAGE_DEVID_SAS2308_2:
+                        switch (ioc->pdev->subsystem_device) {
+                        case MPT2SAS_INTEL_RS25GB008_SSDID:
+                                pr_info(MPT3SAS_FMT "%s\n", ioc->name,
+                                    MPT2SAS_INTEL_RS25GB008_BRANDING);
+                                break;
+                        case MPT2SAS_INTEL_RMS25JB080_SSDID:
+                                pr_info(MPT3SAS_FMT "%s\n", ioc->name,
+                                    MPT2SAS_INTEL_RMS25JB080_BRANDING);
+                                break;
+                        case MPT2SAS_INTEL_RMS25JB040_SSDID:
+                                pr_info(MPT3SAS_FMT "%s\n", ioc->name,
+                                    MPT2SAS_INTEL_RMS25JB040_BRANDING);
+                                break;
+                        case MPT2SAS_INTEL_RMS25KB080_SSDID:
+                                pr_info(MPT3SAS_FMT "%s\n", ioc->name,
+                                    MPT2SAS_INTEL_RMS25KB080_BRANDING);
+                                break;
+                        case MPT2SAS_INTEL_RMS25KB040_SSDID:
+                                pr_info(MPT3SAS_FMT "%s\n", ioc->name,
+                                    MPT2SAS_INTEL_RMS25KB040_BRANDING);
+                                break;
+                        case MPT2SAS_INTEL_RMS25LB040_SSDID:
+                                pr_info(MPT3SAS_FMT "%s\n", ioc->name,
+                                    MPT2SAS_INTEL_RMS25LB040_BRANDING);
+                                break;
+                        case MPT2SAS_INTEL_RMS25LB080_SSDID:
+                                pr_info(MPT3SAS_FMT "%s\n", ioc->name,
+                                    MPT2SAS_INTEL_RMS25LB080_BRANDING);
+                                break;
+                        default:
+                                pr_info(MPT3SAS_FMT
+                                 "Intel(R) Controller: Subsystem ID: 0x%X\n",
+                                 ioc->name, ioc->pdev->subsystem_device);
+                                break;
+                        }
+                case MPI25_MFGPAGE_DEVID_SAS3008:
+                        switch (ioc->pdev->subsystem_device) {
+                        case MPT3SAS_INTEL_RMS3JC080_SSDID:
+                                pr_info(MPT3SAS_FMT "%s\n", ioc->name,
+                                        MPT3SAS_INTEL_RMS3JC080_BRANDING);
+                                break;
+
+                        case MPT3SAS_INTEL_RS3GC008_SSDID:
+                                pr_info(MPT3SAS_FMT "%s\n", ioc->name,
+                                        MPT3SAS_INTEL_RS3GC008_BRANDING);
+                                break;
+                        case MPT3SAS_INTEL_RS3FC044_SSDID:
+                                pr_info(MPT3SAS_FMT "%s\n", ioc->name,
+                                        MPT3SAS_INTEL_RS3FC044_BRANDING);
+                                break;
+                        case MPT3SAS_INTEL_RS3UC080_SSDID:
+                                pr_info(MPT3SAS_FMT "%s\n", ioc->name,
+                                        MPT3SAS_INTEL_RS3UC080_BRANDING);
+                                break;
+                        default:
+                                pr_info(MPT3SAS_FMT
+                                 "Intel(R) Controller: Subsystem ID: 0x%X\n",
+                                 ioc->name, ioc->pdev->subsystem_device);
+                                break;
+                        }
                         break;
                 default:
                         pr_info(MPT3SAS_FMT
-                                "Intel(R) Controller: Subsystem ID: 0x%X\n",
-                                ioc->name, ioc->pdev->subsystem_device);
+                         "Intel(R) Controller: Subsystem ID: 0x%X\n",
+                         ioc->name, ioc->pdev->subsystem_device);
                         break;
                 }
                 break;
-        default:
-                pr_info(MPT3SAS_FMT
-                        "Intel(R) Controller: Subsystem ID: 0x%X\n",
-                        ioc->name, ioc->pdev->subsystem_device);
-                break;
-        }
-}
-
-
-
-/**
- * _base_display_dell_branding - Display branding string
- * @ioc: per adapter object
- *
- * Return nothing.
- */
-static void
-_base_display_dell_branding(struct MPT3SAS_ADAPTER *ioc)
-{
-        if (ioc->pdev->subsystem_vendor != PCI_VENDOR_ID_DELL)
-                return;
-
-        switch (ioc->pdev->device) {
-        case MPI25_MFGPAGE_DEVID_SAS3008:
-                switch (ioc->pdev->subsystem_device) {
-                case MPT3SAS_DELL_12G_HBA_SSDID:
-                        pr_info(MPT3SAS_FMT "%s\n", ioc->name,
-                                MPT3SAS_DELL_12G_HBA_BRANDING);
+        case PCI_VENDOR_ID_DELL:
+                switch (ioc->pdev->device) {
+                case MPI2_MFGPAGE_DEVID_SAS2008:
+                        switch (ioc->pdev->subsystem_device) {
+                        case MPT2SAS_DELL_6GBPS_SAS_HBA_SSDID:
+                                pr_info(MPT3SAS_FMT "%s\n", ioc->name,
+                                 MPT2SAS_DELL_6GBPS_SAS_HBA_BRANDING);
+                                break;
+                        case MPT2SAS_DELL_PERC_H200_ADAPTER_SSDID:
+                                pr_info(MPT3SAS_FMT "%s\n", ioc->name,
+                                 MPT2SAS_DELL_PERC_H200_ADAPTER_BRANDING);
+                                break;
+                        case MPT2SAS_DELL_PERC_H200_INTEGRATED_SSDID:
+                                pr_info(MPT3SAS_FMT "%s\n", ioc->name,
+                                 MPT2SAS_DELL_PERC_H200_INTEGRATED_BRANDING);
+                                break;
+                        case MPT2SAS_DELL_PERC_H200_MODULAR_SSDID:
+                                pr_info(MPT3SAS_FMT "%s\n", ioc->name,
+                                 MPT2SAS_DELL_PERC_H200_MODULAR_BRANDING);
+                                break;
+                        case MPT2SAS_DELL_PERC_H200_EMBEDDED_SSDID:
+                                pr_info(MPT3SAS_FMT "%s\n", ioc->name,
+                                 MPT2SAS_DELL_PERC_H200_EMBEDDED_BRANDING);
+                                break;
+                        case MPT2SAS_DELL_PERC_H200_SSDID:
+                                pr_info(MPT3SAS_FMT "%s\n", ioc->name,
+                                 MPT2SAS_DELL_PERC_H200_BRANDING);
+                                break;
+                        case MPT2SAS_DELL_6GBPS_SAS_SSDID:
+                                pr_info(MPT3SAS_FMT "%s\n", ioc->name,
+                                 MPT2SAS_DELL_6GBPS_SAS_BRANDING);
+                                break;
+                        default:
+                                pr_info(MPT3SAS_FMT
+                                   "Dell 6Gbps HBA: Subsystem ID: 0x%X\n",
+                                   ioc->name, ioc->pdev->subsystem_device);
+                                break;
+                        }
+                        break;
+                case MPI25_MFGPAGE_DEVID_SAS3008:
+                        switch (ioc->pdev->subsystem_device) {
+                        case MPT3SAS_DELL_12G_HBA_SSDID:
+                                pr_info(MPT3SAS_FMT "%s\n", ioc->name,
+                                        MPT3SAS_DELL_12G_HBA_BRANDING);
+                                break;
+                        default:
+                                pr_info(MPT3SAS_FMT
+                                   "Dell 12Gbps HBA: Subsystem ID: 0x%X\n",
+                                   ioc->name, ioc->pdev->subsystem_device);
+                                break;
+                        }
                         break;
                 default:
                         pr_info(MPT3SAS_FMT
-                           "Dell 12Gbps HBA: Subsystem ID: 0x%X\n", ioc->name,
+                           "Dell HBA: Subsystem ID: 0x%X\n", ioc->name,
                            ioc->pdev->subsystem_device);
                         break;
                 }
                 break;
-        default:
-                pr_info(MPT3SAS_FMT
-                        "Dell 12Gbps HBA: Subsystem ID: 0x%X\n", ioc->name,
-                        ioc->pdev->subsystem_device);
-                break;
-        }
-}
-
-/**
- * _base_display_cisco_branding - Display branding string
- * @ioc: per adapter object
- *
- * Return nothing.
- */
-static void
-_base_display_cisco_branding(struct MPT3SAS_ADAPTER *ioc)
-{
-        if (ioc->pdev->subsystem_vendor != PCI_VENDOR_ID_CISCO)
-                return;
-
-        switch (ioc->pdev->device) {
-        case MPI25_MFGPAGE_DEVID_SAS3008:
-                switch (ioc->pdev->subsystem_device) {
-                case MPT3SAS_CISCO_12G_8E_HBA_SSDID:
-                        pr_info(MPT3SAS_FMT "%s\n", ioc->name,
-                                MPT3SAS_CISCO_12G_8E_HBA_BRANDING);
-                        break;
-                case MPT3SAS_CISCO_12G_8I_HBA_SSDID:
-                        pr_info(MPT3SAS_FMT "%s\n", ioc->name,
-                                MPT3SAS_CISCO_12G_8I_HBA_BRANDING);
+        case PCI_VENDOR_ID_CISCO:
+                switch (ioc->pdev->device) {
+                case MPI25_MFGPAGE_DEVID_SAS3008:
+                        switch (ioc->pdev->subsystem_device) {
+                        case MPT3SAS_CISCO_12G_8E_HBA_SSDID:
+                                pr_info(MPT3SAS_FMT "%s\n", ioc->name,
+                                        MPT3SAS_CISCO_12G_8E_HBA_BRANDING);
+                                break;
+                        case MPT3SAS_CISCO_12G_8I_HBA_SSDID:
+                                pr_info(MPT3SAS_FMT "%s\n", ioc->name,
+                                        MPT3SAS_CISCO_12G_8I_HBA_BRANDING);
+                                break;
+                        case MPT3SAS_CISCO_12G_AVILA_HBA_SSDID:
+                                pr_info(MPT3SAS_FMT "%s\n", ioc->name,
+                                        MPT3SAS_CISCO_12G_AVILA_HBA_BRANDING);
+                                break;
+                        default:
+                                pr_info(MPT3SAS_FMT
+                                  "Cisco 12Gbps SAS HBA: Subsystem ID: 0x%X\n",
+                                  ioc->name, ioc->pdev->subsystem_device);
+                                break;
+                        }
                         break;
-                case MPT3SAS_CISCO_12G_AVILA_HBA_SSDID:
-                        pr_info(MPT3SAS_FMT "%s\n", ioc->name,
+                case MPI25_MFGPAGE_DEVID_SAS3108_1:
+                        switch (ioc->pdev->subsystem_device) {
+                        case MPT3SAS_CISCO_12G_AVILA_HBA_SSDID:
+                                pr_info(MPT3SAS_FMT "%s\n", ioc->name,
                                 MPT3SAS_CISCO_12G_AVILA_HBA_BRANDING);
+                                break;
+                        case MPT3SAS_CISCO_12G_COLUSA_MEZZANINE_HBA_SSDID:
+                                pr_info(MPT3SAS_FMT "%s\n", ioc->name,
+                                MPT3SAS_CISCO_12G_COLUSA_MEZZANINE_HBA_BRANDING
+                                );
+                                break;
+                        default:
+                                pr_info(MPT3SAS_FMT
+                                 "Cisco 12Gbps SAS HBA: Subsystem ID: 0x%X\n",
+                                 ioc->name, ioc->pdev->subsystem_device);
+                                break;
+                        }
                         break;
                 default:
                         pr_info(MPT3SAS_FMT
-                          "Cisco 12Gbps SAS HBA: Subsystem ID: 0x%X\n",
-                          ioc->name, ioc->pdev->subsystem_device);
+                           "Cisco SAS HBA: Subsystem ID: 0x%X\n",
+                           ioc->name, ioc->pdev->subsystem_device);
                         break;
                 }
                 break;
-        case MPI25_MFGPAGE_DEVID_SAS3108_1:
-                switch (ioc->pdev->subsystem_device) {
-                case MPT3SAS_CISCO_12G_AVILA_HBA_SSDID:
-                        pr_info(MPT3SAS_FMT "%s\n", ioc->name,
-                        MPT3SAS_CISCO_12G_AVILA_HBA_BRANDING);
-                        break;
-                case MPT3SAS_CISCO_12G_COLUSA_MEZZANINE_HBA_SSDID:
-                        pr_info(MPT3SAS_FMT "%s\n", ioc->name,
-                        MPT3SAS_CISCO_12G_COLUSA_MEZZANINE_HBA_BRANDING);
-                        break;
+        case MPT2SAS_HP_3PAR_SSVID:
+                switch (ioc->pdev->device) {
+                case MPI2_MFGPAGE_DEVID_SAS2004:
+                        switch (ioc->pdev->subsystem_device) {
+                        case MPT2SAS_HP_DAUGHTER_2_4_INTERNAL_SSDID:
+                                pr_info(MPT3SAS_FMT "%s\n", ioc->name,
+                                    MPT2SAS_HP_DAUGHTER_2_4_INTERNAL_BRANDING);
+                                break;
+                        default:
+                                pr_info(MPT3SAS_FMT
+                                   "HP 6Gbps SAS HBA: Subsystem ID: 0x%X\n",
+                                   ioc->name, ioc->pdev->subsystem_device);
+                                break;
+                        }
+                case MPI2_MFGPAGE_DEVID_SAS2308_2:
+                        switch (ioc->pdev->subsystem_device) {
+                        case MPT2SAS_HP_2_4_INTERNAL_SSDID:
+                                pr_info(MPT3SAS_FMT "%s\n", ioc->name,
+                                    MPT2SAS_HP_2_4_INTERNAL_BRANDING);
+                                break;
+                        case MPT2SAS_HP_2_4_EXTERNAL_SSDID:
+                                pr_info(MPT3SAS_FMT "%s\n", ioc->name,
+                                    MPT2SAS_HP_2_4_EXTERNAL_BRANDING);
+                                break;
+                        case MPT2SAS_HP_1_4_INTERNAL_1_4_EXTERNAL_SSDID:
+                                pr_info(MPT3SAS_FMT "%s\n", ioc->name,
+                                 MPT2SAS_HP_1_4_INTERNAL_1_4_EXTERNAL_BRANDING);
+                                break;
+                        case MPT2SAS_HP_EMBEDDED_2_4_INTERNAL_SSDID:
+                                pr_info(MPT3SAS_FMT "%s\n", ioc->name,
+                                    MPT2SAS_HP_EMBEDDED_2_4_INTERNAL_BRANDING);
+                                break;
+                        default:
+                                pr_info(MPT3SAS_FMT
+                                   "HP 6Gbps SAS HBA: Subsystem ID: 0x%X\n",
+                                   ioc->name, ioc->pdev->subsystem_device);
+                                break;
+                        }
                 default:
                         pr_info(MPT3SAS_FMT
-                         "Cisco 12Gbps SAS HBA: Subsystem ID: 0x%X\n",
-                         ioc->name, ioc->pdev->subsystem_device);
+                           "HP SAS HBA: Subsystem ID: 0x%X\n",
+                           ioc->name, ioc->pdev->subsystem_device);
                         break;
                 }
-                break;
         default:
-                 pr_info(MPT3SAS_FMT
-                        "Cisco 12Gbps SAS HBA: Subsystem ID: 0x%X\n",
-                        ioc->name, ioc->pdev->subsystem_device);
                 break;
         }
 }
@@ -2488,9 +2800,7 @@ _base_display_ioc_capabilities(struct MPT3SAS_ADAPTER *ioc)
            (bios_version & 0x0000FF00) >> 8,
             bios_version & 0x000000FF);
 
-        _base_display_intel_branding(ioc);
-        _base_display_dell_branding(ioc);
-        _base_display_cisco_branding(ioc);
+        _base_display_OEMs_branding(ioc);
 
         pr_info(MPT3SAS_FMT "Protocol=(", ioc->name);
 
@@ -2508,10 +2818,12 @@ _base_display_ioc_capabilities(struct MPT3SAS_ADAPTER *ioc)
         pr_info("), ");
         pr_info("Capabilities=(");
 
-        if (ioc->facts.IOCCapabilities &
+        if (!ioc->hide_ir_msg) {
+                if (ioc->facts.IOCCapabilities &
                     MPI2_IOCFACTS_CAPABILITY_INTEGRATED_RAID) {
                         pr_info("Raid");
                         i++;
+                }
         }
 
         if (ioc->facts.IOCCapabilities & MPI2_IOCFACTS_CAPABILITY_TLR) {
@@ -2852,18 +3164,22 @@ _base_allocate_memory_pools(struct MPT3SAS_ADAPTER *ioc,  int sleep_flag)
         /* command line tunables for max sgl entries */
         if (max_sgl_entries != -1)
                 sg_tablesize = max_sgl_entries;
-        else
-                sg_tablesize = MPT3SAS_SG_DEPTH;
+        else {
+                if (ioc->hba_mpi_version_belonged == MPI2_VERSION)
+                        sg_tablesize = MPT2SAS_SG_DEPTH;
+                else
+                        sg_tablesize = MPT3SAS_SG_DEPTH;
+        }
 
-        if (sg_tablesize < MPT3SAS_MIN_PHYS_SEGMENTS)
-                sg_tablesize = MPT3SAS_MIN_PHYS_SEGMENTS;
-        else if (sg_tablesize > MPT3SAS_MAX_PHYS_SEGMENTS) {
+        if (sg_tablesize < MPT_MIN_PHYS_SEGMENTS)
+                sg_tablesize = MPT_MIN_PHYS_SEGMENTS;
+        else if (sg_tablesize > MPT_MAX_PHYS_SEGMENTS) {
                 sg_tablesize = min_t(unsigned short, sg_tablesize,
                                       SCSI_MAX_SG_CHAIN_SEGMENTS);
                 pr_warn(MPT3SAS_FMT
                  "sg_tablesize(%u) is bigger than kernel"
                  " defined SCSI_MAX_SG_SEGMENTS(%u)\n", ioc->name,
-                 sg_tablesize, MPT3SAS_MAX_PHYS_SEGMENTS);
+                 sg_tablesize, MPT_MAX_PHYS_SEGMENTS);
         }
         ioc->shost->sg_tablesize = sg_tablesize;
 
@@ -4021,7 +4337,7 @@ _base_send_ioc_init(struct MPT3SAS_ADAPTER *ioc, int sleep_flag)
         mpi_request.WhoInit = MPI2_WHOINIT_HOST_DRIVER;
         mpi_request.VF_ID = 0; /* TODO */
         mpi_request.VP_ID = 0;
-        mpi_request.MsgVersion = cpu_to_le16(MPI25_VERSION);
+        mpi_request.MsgVersion = cpu_to_le16(ioc->hba_mpi_version_belonged);
         mpi_request.HeaderVersion = cpu_to_le16(MPI2_HEADER_VERSION);
 
         if (_base_is_controller_msix_enabled(ioc))
@@ -4655,6 +4971,7 @@ _base_make_ioc_operational(struct MPT3SAS_ADAPTER *ioc, int sleep_flag)
         u32 reply_address;
         u16 smid;
         struct _tr_list *delayed_tr, *delayed_tr_next;
+        u8 hide_flag;
         struct adapter_reply_queue *reply_q;
         long reply_post_free;
         u32 reply_post_free_sz, index = 0;
@@ -4685,6 +5002,7 @@ _base_make_ioc_operational(struct MPT3SAS_ADAPTER *ioc, int sleep_flag)
                 ioc->scsi_lookup[i].cb_idx = 0xFF;
                 ioc->scsi_lookup[i].smid = smid;
                 ioc->scsi_lookup[i].scmd = NULL;
+                ioc->scsi_lookup[i].direct_io = 0;
                 list_add_tail(&ioc->scsi_lookup[i].tracker_list,
                     &ioc->free_list);
         }
@@ -4787,6 +5105,16 @@ _base_make_ioc_operational(struct MPT3SAS_ADAPTER *ioc, int sleep_flag)
 
 
         if (ioc->is_driver_loading) {
+
+                if (ioc->is_warpdrive && ioc->manu_pg10.OEMIdentifier
+                    == 0x80) {
+                        hide_flag = (u8) (
+                            le32_to_cpu(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);
 
@@ -4812,6 +5140,8 @@ mpt3sas_base_free_resources(struct MPT3SAS_ADAPTER *ioc)
         dexitprintk(ioc, pr_info(MPT3SAS_FMT "%s\n", ioc->name,
             __func__));
 
+        /* synchronizing freeing resource with pci_access_mutex lock */
+        mutex_lock(&ioc->pci_access_mutex);
         if (ioc->chip_phys && ioc->chip) {
                 _base_mask_interrupts(ioc);
                 ioc->shost_recovery = 1;
@@ -4820,6 +5150,7 @@ mpt3sas_base_free_resources(struct MPT3SAS_ADAPTER *ioc)
         }
 
         mpt3sas_base_unmap_resources(ioc);
+        mutex_unlock(&ioc->pci_access_mutex);
         return;
 }
 
@@ -4834,7 +5165,6 @@ mpt3sas_base_attach(struct MPT3SAS_ADAPTER *ioc)
 {
         int r, i;
         int cpu_id, last_cpu_id = 0;
-        u8 revision;
 
         dinitprintk(ioc, pr_info(MPT3SAS_FMT "%s\n", ioc->name,
             __func__));
@@ -4854,19 +5184,16 @@ mpt3sas_base_attach(struct MPT3SAS_ADAPTER *ioc)
                 goto out_free_resources;
         }
 
-        /* Check whether the controller revision is C0 or above.
-         * only C0 and above revision controllers support 96 MSI-X vectors.
-         */
-        revision = ioc->pdev->revision;
-
-        if ((ioc->pdev->device == MPI25_MFGPAGE_DEVID_SAS3004 ||
-             ioc->pdev->device == MPI25_MFGPAGE_DEVID_SAS3008 ||
-             ioc->pdev->device == MPI25_MFGPAGE_DEVID_SAS3108_1 ||
-             ioc->pdev->device == MPI25_MFGPAGE_DEVID_SAS3108_2 ||
-             ioc->pdev->device == MPI25_MFGPAGE_DEVID_SAS3108_5 ||
-             ioc->pdev->device == MPI25_MFGPAGE_DEVID_SAS3108_6) &&
-             (revision >= 0x02))
-                ioc->msix96_vector = 1;
+        if (ioc->is_warpdrive) {
+                ioc->reply_post_host_index = kcalloc(ioc->cpu_msix_table_sz,
+                    sizeof(resource_size_t *), GFP_KERNEL);
+                if (!ioc->reply_post_host_index) {
+                        dfailprintk(ioc, pr_info(MPT3SAS_FMT "allocation "
+                                "for cpu_msix_table failed!!!\n", ioc->name));
+                        r = -ENOMEM;
+                        goto out_free_resources;
+                }
+        }
 
         ioc->rdpq_array_enable_assigned = 0;
         ioc->dma_mask = 0;
@@ -4874,23 +5201,41 @@ mpt3sas_base_attach(struct MPT3SAS_ADAPTER *ioc)
         if (r)
                 goto out_free_resources;
 
+        if (ioc->is_warpdrive) {
+                ioc->reply_post_host_index[0] = (resource_size_t __iomem *)
+                    &ioc->chip->ReplyPostHostIndex;
+
+                for (i = 1; i < ioc->cpu_msix_table_sz; i++)
+                        ioc->reply_post_host_index[i] =
+                        (resource_size_t __iomem *)
+                        ((u8 __iomem *)&ioc->chip->Doorbell + (0x4000 + ((i - 1)
+                        * 4)));
+        }
 
         pci_set_drvdata(ioc->pdev, ioc->shost);
         r = _base_get_ioc_facts(ioc, CAN_SLEEP);
         if (r)
                 goto out_free_resources;
 
-        /*
-         * In SAS3.0,
-         * SCSI_IO, SMP_PASSTHRU, SATA_PASSTHRU, Target Assist, and
-         * Target Status - all require the IEEE formated scatter gather
-         * elements.
-         */
-
-        ioc->build_sg_scmd = &_base_build_sg_scmd_ieee;
-        ioc->build_sg = &_base_build_sg_ieee;
-        ioc->build_zero_len_sge = &_base_build_zero_len_sge_ieee;
-        ioc->sge_size_ieee = sizeof(Mpi2IeeeSgeSimple64_t);
+        switch (ioc->hba_mpi_version_belonged) {
+        case MPI2_VERSION:
+                ioc->build_sg_scmd = &_base_build_sg_scmd;
+                ioc->build_sg = &_base_build_sg;
+                ioc->build_zero_len_sge = &_base_build_zero_len_sge;
+                break;
+        case MPI25_VERSION:
+                /*
+                 * In SAS3.0,
+                 * SCSI_IO, SMP_PASSTHRU, SATA_PASSTHRU, Target Assist, and
+                 * Target Status - all require the IEEE formated scatter gather
+                 * elements.
+                 */
+                ioc->build_sg_scmd = &_base_build_sg_scmd_ieee;
+                ioc->build_sg = &_base_build_sg_ieee;
+                ioc->build_zero_len_sge = &_base_build_zero_len_sge_ieee;
+                ioc->sge_size_ieee = sizeof(Mpi2IeeeSgeSimple64_t);
+                break;
+        }
 
         /*
          * These function pointers for other requests that don't
@@ -5006,6 +5351,7 @@ mpt3sas_base_attach(struct MPT3SAS_ADAPTER *ioc)
         if (r)
                 goto out_free_resources;
 
+        ioc->non_operational_loop = 0;
         return 0;
 
  out_free_resources:
@@ -5016,6 +5362,8 @@ mpt3sas_base_attach(struct MPT3SAS_ADAPTER *ioc)
         _base_release_memory_pools(ioc);
         pci_set_drvdata(ioc->pdev, NULL);
         kfree(ioc->cpu_msix_table);
+        if (ioc->is_warpdrive)
+                kfree(ioc->reply_post_host_index);
         kfree(ioc->pd_handles);
         kfree(ioc->blocking_handles);
         kfree(ioc->tm_cmds.reply);
@@ -5055,6 +5403,8 @@ mpt3sas_base_detach(struct MPT3SAS_ADAPTER *ioc)
         _base_release_memory_pools(ioc);
         pci_set_drvdata(ioc->pdev, NULL);
         kfree(ioc->cpu_msix_table);
+        if (ioc->is_warpdrive)
+                kfree(ioc->reply_post_host_index);
         kfree(ioc->pd_handles);
         kfree(ioc->blocking_handles);
         kfree(ioc->pfacts);