]> asedeno.scripts.mit.edu Git - linux.git/commitdiff
scsi: hisi_sas: Remove sleep after issue phy reset if sas_smp_phy_control() fails
authorLuo Jiaxing <luojiaxing@huawei.com>
Fri, 6 Sep 2019 12:55:28 +0000 (20:55 +0800)
committerMartin K. Petersen <martin.petersen@oracle.com>
Wed, 11 Sep 2019 02:28:56 +0000 (22:28 -0400)
At expander environment, we delay after issue phy reset to wait for
hardware to handle phy reset. But if sas_smp_phy_control() fails, the
delay is unnecessary so remove it.

Link: https://lore.kernel.org/r/1567774537-20003-5-git-send-email-john.garry@huawei.com
Signed-off-by: Luo Jiaxing <luojiaxing@huawei.com>
Signed-off-by: John Garry <john.garry@huawei.com>
Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>
drivers/scsi/hisi_sas/hisi_sas_main.c

index ffe02f9cf49a55d8af7fa998e3323216f777719e..a3691154e13c4cec8b830c687531d699f5d66cd0 100644 (file)
@@ -1791,9 +1791,10 @@ static int hisi_sas_debug_I_T_nexus_reset(struct domain_device *device)
        } else if (sas_dev->dev_status != HISI_SAS_DEV_INIT) {
                /*
                 * If in init state, we rely on caller to wait for link to be
-                * ready; otherwise, delay.
+                * ready; otherwise, except phy reset is fail, delay.
                 */
-               msleep(2000);
+               if (!rc)
+                       msleep(2000);
        }
 
        return rc;