22 files changed, 1177 insertions, 166 deletions

diff --git a/Documentation/devicetree/bindings/ufs/ufshcd-pltfrm.txt b/Documentation/devicetree/bindings/ufs/ufshcd-pltfrm.txt
index 03c0e989e020..66f6adf8d44d 100644
--- a/Documentation/devicetree/bindings/ufs/ufshcd-pltfrm.txt
+++ b/Documentation/devicetree/bindings/ufs/ufshcd-pltfrm.txt
@@ -38,6 +38,9 @@ Optional properties:
                           defined or a value in the array is "0" then it is assumed
                           that the frequency is set by the parent clock or a
                           fixed rate clock source.
+-lanes-per-direction    : number of lanes available per direction - either 1 or 2.
+                          Note that it is assume same number of lanes is used both
+                          directions at once. If not specified, default is 2 lanes per direction.
 
 Note: If above properties are not defined it can be assumed that the supply
 regulators or clocks are always on.
diff --git a/drivers/scsi/device_handler/scsi_dh_alua.c b/drivers/scsi/device_handler/scsi_dh_alua.c
index 5bcdf8dd6fb0..a404a41e871c 100644
--- a/drivers/scsi/device_handler/scsi_dh_alua.c
+++ b/drivers/scsi/device_handler/scsi_dh_alua.c
@@ -332,7 +332,7 @@ static int alua_check_vpd(struct scsi_device *sdev, struct alua_dh_data *h,
 {
         int rel_port = -1, group_id;
         struct alua_port_group *pg, *old_pg = NULL;
-        bool pg_updated;
+        bool pg_updated = false;
         unsigned long flags;
 
         group_id = scsi_vpd_tpg_id(sdev, &rel_port);
diff --git a/drivers/scsi/fnic/fnic_scsi.c b/drivers/scsi/fnic/fnic_scsi.c
index 266b909fe854..f3032ca5051b 100644
--- a/drivers/scsi/fnic/fnic_scsi.c
+++ b/drivers/scsi/fnic/fnic_scsi.c
@@ -958,23 +958,22 @@ static void fnic_fcpio_icmnd_cmpl_handler(struct fnic *fnic,
         case FCPIO_INVALID_PARAM:    /* some parameter in request invalid */
         case FCPIO_REQ_NOT_SUPPORTED:/* request type is not supported */
         default:
-                shost_printk(KERN_ERR, fnic->lport->host, "hdr status = %s\n",
-                             fnic_fcpio_status_to_str(hdr_status));
                 sc->result = (DID_ERROR << 16) | icmnd_cmpl->scsi_status;
                 break;
         }
 
-        if (hdr_status != FCPIO_SUCCESS) {
-                atomic64_inc(&fnic_stats->io_stats.io_failures);
-                shost_printk(KERN_ERR, fnic->lport->host, "hdr status = %s\n",
-                             fnic_fcpio_status_to_str(hdr_status));
-        }
         /* Break link with the SCSI command */
         CMD_SP(sc) = NULL;
         CMD_FLAGS(sc) |= FNIC_IO_DONE;
 
         spin_unlock_irqrestore(io_lock, flags);
 
+        if (hdr_status != FCPIO_SUCCESS) {
+                atomic64_inc(&fnic_stats->io_stats.io_failures);
+                shost_printk(KERN_ERR, fnic->lport->host, "hdr status = %s\n",
+                             fnic_fcpio_status_to_str(hdr_status));
+        }
+
         fnic_release_ioreq_buf(fnic, io_req, sc);
 
         mempool_free(io_req, fnic->io_req_pool);
diff --git a/drivers/scsi/lpfc/lpfc_init.c b/drivers/scsi/lpfc/lpfc_init.c
index a544366a367e..f57d02c3b6cf 100644
--- a/drivers/scsi/lpfc/lpfc_init.c
+++ b/drivers/scsi/lpfc/lpfc_init.c
@@ -2860,7 +2860,7 @@ lpfc_online(struct lpfc_hba *phba)
         }
 
         vports = lpfc_create_vport_work_array(phba);
-        if (vports != NULL)
+        if (vports != NULL) {
                 for (i = 0; i <= phba->max_vports && vports[i] != NULL; i++) {
                         struct Scsi_Host *shost;
                         shost = lpfc_shost_from_vport(vports[i]);
@@ -2877,7 +2877,8 @@ lpfc_online(struct lpfc_hba *phba)
                         }
                         spin_unlock_irq(shost->host_lock);
                 }
-                lpfc_destroy_vport_work_array(phba, vports);
+        }
+        lpfc_destroy_vport_work_array(phba, vports);
 
         lpfc_unblock_mgmt_io(phba);
         return 0;
diff --git a/drivers/scsi/megaraid/megaraid_sas.h b/drivers/scsi/megaraid/megaraid_sas.h
index 4484e63033a5..fce414a2cd76 100644
--- a/drivers/scsi/megaraid/megaraid_sas.h
+++ b/drivers/scsi/megaraid/megaraid_sas.h
@@ -2097,7 +2097,7 @@ struct megasas_instance {
         u8 UnevenSpanSupport;
 
         u8 supportmax256vd;
-        u8 allow_fw_scan;
+        u8 pd_list_not_supported;
         u16 fw_supported_vd_count;
         u16 fw_supported_pd_count;
 
diff --git a/drivers/scsi/megaraid/megaraid_sas_base.c b/drivers/scsi/megaraid/megaraid_sas_base.c
index 5c08568ccfbf..e6ebc7ae2df1 100644
--- a/drivers/scsi/megaraid/megaraid_sas_base.c
+++ b/drivers/scsi/megaraid/megaraid_sas_base.c
@@ -1838,7 +1838,7 @@ static int megasas_slave_configure(struct scsi_device *sdev)
         struct megasas_instance *instance;
 
         instance = megasas_lookup_instance(sdev->host->host_no);
-        if (instance->allow_fw_scan) {
+        if (instance->pd_list_not_supported) {
                 if (sdev->channel < MEGASAS_MAX_PD_CHANNELS &&
                         sdev->type == TYPE_DISK) {
                         pd_index = (sdev->channel * MEGASAS_MAX_DEV_PER_CHANNEL) +
@@ -1874,7 +1874,8 @@ static int megasas_slave_alloc(struct scsi_device *sdev)
                 pd_index =
                         (sdev->channel * MEGASAS_MAX_DEV_PER_CHANNEL) +
                         sdev->id;
-                if ((instance->allow_fw_scan || instance->pd_list[pd_index].driveState ==
+                if ((instance->pd_list_not_supported ||
+                        instance->pd_list[pd_index].driveState ==
                         MR_PD_STATE_SYSTEM)) {
                         goto scan_target;
                 }
@@ -4087,7 +4088,13 @@ megasas_get_pd_list(struct megasas_instance *instance)
 
         switch (ret) {
         case DCMD_FAILED:
-                megaraid_sas_kill_hba(instance);
+                dev_info(&instance->pdev->dev, "MR_DCMD_PD_LIST_QUERY "
+                        "failed/not supported by firmware\n");
+
+                if (instance->ctrl_context)
+                        megaraid_sas_kill_hba(instance);
+                else
+                        instance->pd_list_not_supported = 1;
                 break;
         case DCMD_TIMEOUT:
 
@@ -5034,7 +5041,6 @@ static int megasas_init_fw(struct megasas_instance *instance)
         case PCI_DEVICE_ID_DELL_PERC5:
         default:
                 instance->instancet = &megasas_instance_template_xscale;
-                instance->allow_fw_scan = 1;
                 break;
         }
 
@@ -6650,12 +6656,13 @@ out:
         }
 
         for (i = 0; i < ioc->sge_count; i++) {
-                if (kbuff_arr[i])
+                if (kbuff_arr[i]) {