1 files changed, 20 insertions, 3 deletions

diff --git a/drivers/scsi/ufs/ufshcd.c b/drivers/scsi/ufs/ufshcd.c
index 926b58b99811..edb06e466224 100644
--- a/drivers/scsi/ufs/ufshcd.c
+++ b/drivers/scsi/ufs/ufshcd.c
@@ -3130,7 +3130,16 @@ static int ufshcd_link_startup(struct ufs_hba *hba)
 {
         int ret;
         int retries = DME_LINKSTARTUP_RETRIES;
+        bool link_startup_again = false;
 
+        /*
+         * If UFS device isn't active then we will have to issue link startup
+         * 2 times to make sure the device state move to active.
+         */
+        if (!ufshcd_is_ufs_dev_active(hba))
+                link_startup_again = true;
+
+link_startup:
         do {
                 ufshcd_vops_link_startup_notify(hba, PRE_CHANGE);
 
@@ -3156,6 +3165,12 @@ static int ufshcd_link_startup(struct ufs_hba *hba)
                 /* failed to get the link up... retire */
                 goto out;
 
+        if (link_startup_again) {
+                link_startup_again = false;
+                retries = DME_LINKSTARTUP_RETRIES;
+                goto link_startup;
+        }
+
         if (hba->quirks & UFSHCD_QUIRK_BROKEN_LCC) {
                 ret = ufshcd_disable_device_tx_lcc(hba);
                 if (ret)
@@ -6630,10 +6645,12 @@ int ufshcd_init(struct ufs_hba *hba, void __iomem *mmio_base, unsigned int irq)
         pm_runtime_get_sync(dev);
 
         /*
-         * The device-initialize-sequence hasn't been invoked yet.
-         * Set the device to power-off state
+         * We are assuming that device wasn't put in sleep/power-down
+         * state exclusively during the boot stage before kernel.
+         * This assumption helps avoid doing link startup twice during
+         * ufshcd_probe_hba().
          */
-        ufshcd_set_ufs_dev_poweroff(hba);
+        ufshcd_set_ufs_dev_active(hba);
 
         async_schedule(ufshcd_async_scan, hba);