Merge tag 'scsi-misc' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi

Pull SCSI updates from James Bottomley:
 "This is the usual grab bag of driver updates (lpfc, qla2xxx, storvsc,
  aacraid, ipr) plus an assortment of minor updates.  There's also a
  major update to aic1542 which moves the driver into this millenium"

* tag 'scsi-misc' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi: (106 commits)
  change SCSI Maintainer email
  sd, mmc, virtio_blk, string_helpers: fix block size units
  ufs: add support to allow non standard behaviours (quirks)
  ufs-qcom: save controller revision info in internal structure
  qla2xxx: Update driver version to 8.07.00.18-k
  qla2xxx: Restore physical port WWPN only, when port down detected for FA-WWPN port.
  qla2xxx: Fix virtual port configuration, when switch port is disabled/enabled.
  qla2xxx: Prevent multiple firmware dump collection for ISP27XX.
  qla2xxx: Disable Interrupt handshake for ISP27XX.
  qla2xxx: Add debugging info for MBX timeout.
  qla2xxx: Add serdes read/write support for ISP27XX
  qla2xxx: Add udev notification to save fw dump for ISP27XX
  qla2xxx: Add message for sucessful FW dump collected for ISP27XX.
  qla2xxx: Add support to load firmware from file for ISP 26XX/27XX.
  qla2xxx: Fix beacon blink for ISP27XX.
  qla2xxx: Increase the wait time for firmware to be ready for P3P.
  qla2xxx: Fix crash due to wrong casting of reg for ISP27XX.
  qla2xxx: Fix warnings reported by static checker.
  lpfc: Update version to 10.5.0.0 for upstream patch set
  lpfc: Update copyright to 2015
  ...

4 files changed, 94 insertions, 12 deletions

diff --git a/drivers/scsi/ufs/ufs-qcom.c b/drivers/scsi/ufs/ufs-qcom.c
index 9217af9bf734..6652a8171de6 100644
--- a/drivers/scsi/ufs/ufs-qcom.c
+++ b/drivers/scsi/ufs/ufs-qcom.c
@@ -214,8 +214,6 @@ static int ufs_qcom_power_up_sequence(struct ufs_hba *hba)
         struct ufs_qcom_host *host = hba->priv;
         struct phy *phy = host->generic_phy;
         int ret = 0;
-        u8 major;
-        u16 minor, step;
         bool is_rate_B = (UFS_QCOM_LIMIT_HS_RATE == PA_HS_MODE_B)
                                                         ? true : false;
 
@@ -224,8 +222,6 @@ static int ufs_qcom_power_up_sequence(struct ufs_hba *hba)
         /* provide 1ms delay to let the reset pulse propagate */
         usleep_range(1000, 1100);
 
-        ufs_qcom_get_controller_revision(hba, &major, &minor, &step);
-        ufs_qcom_phy_save_controller_version(phy, major, minor, step);
         ret = ufs_qcom_phy_calibrate_phy(phy, is_rate_B);
         if (ret) {
                 dev_err(hba->dev, "%s: ufs_qcom_phy_calibrate_phy() failed, ret = %d\n",
@@ -698,16 +694,24 @@ out:
  */
 static void ufs_qcom_advertise_quirks(struct ufs_hba *hba)
 {
-        u8 major;
-        u16 minor, step;
+        struct ufs_qcom_host *host = hba->priv;
 
-        ufs_qcom_get_controller_revision(hba, &major, &minor, &step);
+        if (host->hw_ver.major == 0x1)
+                hba->quirks |= UFSHCD_QUIRK_DELAY_BEFORE_DME_CMDS;
 
-        /*
-         * TBD
-         * here we should be advertising controller quirks according to
-         * controller version.
-         */
+        if (host->hw_ver.major >= 0x2) {
+                if (!ufs_qcom_cap_qunipro(host))
+                        /* Legacy UniPro mode still need following quirks */
+                        hba->quirks |= UFSHCD_QUIRK_DELAY_BEFORE_DME_CMDS;
+        }
+}
+
+static void ufs_qcom_set_caps(struct ufs_hba *hba)
+{
+        struct ufs_qcom_host *host = hba->priv;
+
+        if (host->hw_ver.major >= 0x2)
+                host->caps = UFS_QCOM_CAP_QUNIPRO;
 }
 
 static int ufs_qcom_get_bus_vote(struct ufs_qcom_host *host,
@@ -929,6 +933,13 @@ static int ufs_qcom_init(struct ufs_hba *hba)
         if (err)
                 goto out_host_free;
 
+        ufs_qcom_get_controller_revision(hba, &host->hw_ver.major,
+                &host->hw_ver.minor, &host->hw_ver.step);
+
+        /* update phy revision information before calling phy_init() */
+        ufs_qcom_phy_save_controller_version(host->generic_phy,
+                host->hw_ver.major, host->hw_ver.minor, host->hw_ver.step);
+
         phy_init(host->generic_phy);
         err = phy_power_on(host->generic_phy);
         if (err)
@@ -938,6 +949,7 @@ static int ufs_qcom_init(struct ufs_hba *hba)
         if (err)
                 goto out_disable_phy;
 
+        ufs_qcom_set_caps(hba);
         ufs_qcom_advertise_quirks(hba);
 
         hba->caps |= UFSHCD_CAP_CLK_GATING | UFSHCD_CAP_CLK_SCALING;
diff --git a/drivers/scsi/ufs/ufs-qcom.h b/drivers/scsi/ufs/ufs-qcom.h
index 9a6febd007df..db2c0a00e846 100644
--- a/drivers/scsi/ufs/ufs-qcom.h
+++ b/drivers/scsi/ufs/ufs-qcom.h
@@ -151,7 +151,23 @@ struct ufs_qcom_bus_vote {
         struct device_attribute max_bus_bw;
 };
 
+/* Host controller hardware version: major.minor.step */
+struct ufs_hw_version {
+        u16 step;
+        u16 minor;
+        u8 major;
+};
 struct ufs_qcom_host {
+
+        /*
+         * Set this capability if host controller supports the QUniPro mode
+         * and if driver wants the Host controller to operate in QUniPro mode.
+         * Note: By default this capability will be kept enabled if host
+         * controller supports the QUniPro mode.
+         */
+        #define UFS_QCOM_CAP_QUNIPRO    UFS_BIT(0)
+        u32 caps;
+
         struct phy *generic_phy;
         struct ufs_hba *hba;
         struct ufs_qcom_bus_vote bus_vote;
@@ -161,10 +177,20 @@ struct ufs_qcom_host {
         struct clk *rx_l1_sync_clk;
         struct clk *tx_l1_sync_clk;
         bool is_lane_clks_enabled;
+
+        struct ufs_hw_version hw_ver;
 };
 
 #define ufs_qcom_is_link_off(hba) ufshcd_is_link_off(hba)
 #define ufs_qcom_is_link_active(hba) ufshcd_is_link_active(hba)
 #define ufs_qcom_is_link_hibern8(hba) ufshcd_is_link_hibern8(hba)
 
+static inline bool ufs_qcom_cap_qunipro(struct ufs_qcom_host *host)
+{
+        if (host->caps & UFS_QCOM_CAP_QUNIPRO)
+                return true;
+        else
+                return false;
+}
+
 #endif /* UFS_QCOM_H_ */
diff --git a/drivers/scsi/ufs/ufshcd.c b/drivers/scsi/ufs/ufshcd.c
index 2aa85e398f76..648a44675880 100644
--- a/drivers/scsi/ufs/ufshcd.c
+++ b/drivers/scsi/ufs/ufshcd.c
@@ -183,6 +183,7 @@ static int __ufshcd_setup_clocks(struct ufs_hba *hba, bool on,
 static int ufshcd_setup_clocks(struct ufs_hba *hba, bool on);
 static int ufshcd_uic_hibern8_exit(struct ufs_hba *hba);
 static int ufshcd_uic_hibern8_enter(struct ufs_hba *hba);
+static inline void ufshcd_add_delay_before_dme_cmd(struct ufs_hba *hba);
 static int ufshcd_host_reset_and_restore(struct ufs_hba *hba);
 static irqreturn_t ufshcd_intr(int irq, void *__hba);
 static int ufshcd_config_pwr_mode(struct ufs_hba *hba,
@@ -972,6 +973,8 @@ ufshcd_send_uic_cmd(struct ufs_hba *hba, struct uic_command *uic_cmd)
 
         ufshcd_hold(hba, false);
         mutex_lock(&hba->uic_cmd_mutex);
+        ufshcd_add_delay_before_dme_cmd(hba);
+
         spin_lock_irqsave(hba->host->host_lock, flags);
         ret = __ufshcd_send_uic_cmd(hba, uic_cmd);
         spin_unlock_irqrestore(hba->host->host_lock, flags);
@@ -2058,6 +2061,37 @@ static int ufshcd_dme_link_startup(struct ufs_hba *hba)
         return ret;
 }
 
+static inline void ufshcd_add_delay_before_dme_cmd(struct ufs_hba *hba)
+{
+        #define MIN_DELAY_BEFORE_DME_CMDS_US    1000
+        unsigned long min_sleep_time_us;
+
+        if (!(hba->quirks & UFSHCD_QUIRK_DELAY_BEFORE_DME_CMDS))
+                return;
+
+        /*
+         * last_dme_cmd_tstamp will be 0 only for 1st call to
+         * this function
+         */
+        if (unlikely(!ktime_to_us(hba->last_dme_cmd_tstamp))) {
+                min_sleep_time_us = MIN_DELAY_BEFORE_DME_CMDS_US;
+        } else {
+                unsigned long delta =
+                        (unsigned long) ktime_to_us(
+                                ktime_sub(ktime_get(),
+                                hba->last_dme_cmd_tstamp));
+
+                if (delta < MIN_DELAY_BEFORE_DME_CMDS_US)
+                        min_sleep_time_us =
+                                MIN_DELAY_BEFORE_DME_CMDS_US - delta;
+                else
+                        return; /* no more delay required */
+        }
+
+        /* allow sleep for extra 50us if needed */
+        usleep_range(min_sleep_time_us, min_sleep_time_us + 50);
+}
+
 /**
  * ufshcd_dme_set_attr - UIC command for DME_SET, DME_PEER_SET
  * @hba: per adapter instance
@@ -2157,6 +2191,7 @@ static int ufshcd_uic_pwr_ctrl(struct ufs_hba *hba, struct uic_command *cmd)
 
         mutex_lock(&hba->uic_cmd_mutex);
         init_completion(&uic_async_done);
+        ufshcd_add_delay_before_dme_cmd(hba);
 
         spin_lock_irqsave(hba->host->host_lock, flags);
         hba->uic_async_done = &uic_async_done;
diff --git a/drivers/scsi/ufs/ufshcd.h b/drivers/scsi/ufs/ufshcd.h
index 4a574aa45855..b47ff07698e8 100644
--- a/drivers/scsi/ufs/ufshcd.h
+++ b/drivers/scsi/ufs/ufshcd.h
@@ -366,6 +366,7 @@ struct ufs_init_prefetch {
  * @saved_err: sticky error mask
  * @saved_uic_err: sticky UIC error mask
  * @dev_cmd: ufs device management command information
+ * @last_dme_cmd_tstamp: time stamp of the last completed DME command
  * @auto_bkops_enabled: to track whether bkops is enabled in device
  * @vreg_info: UFS device voltage regulator information
  * @clk_list_head: UFS host controller clocks list node head
@@ -416,6 +417,13 @@ struct ufs_hba {
         unsigned int irq;
         bool is_irq_enabled;
 
+        /*
+         * delay before each dme command is required as the unipro
+         * layer has shown instabilities
+         */
+        #define UFSHCD_QUIRK_DELAY_BEFORE_DME_CMDS              UFS_BIT(0)
+
+        unsigned int quirks;    /* Deviations from standard UFSHCI spec. */
 
         wait_queue_head_t tm_wq;
         wait_queue_head_t tm_tag_wq;
@@ -446,6 +454,7 @@ struct ufs_hba {
 
         /* Device management request data */
         struct ufs_dev_cmd dev_cmd;
+        ktime_t last_dme_cmd_tstamp;
 
         /* Keeps information of the UFS device connected to this host */
         struct ufs_dev_info dev_info;