scsi: hisi_sas: only reset link for PHY_FUNC_LINK_RESET

BugLink: https://bugs.launchpad.net/bugs/1695999
We currently do a hard reset for a link reset. Change this to do a link
reset only.

Signed-off-by: John Garry <john.garry@huawei.com>
Signed-off-by: Xiang Chen <chenxiang@hisilicon.com>
Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>
(cherry picked from commit b4c67a6ca790ca3b8caa1e6582d61ccd5bd174e5)
Signed-off-by: dann frazier <dann.frazier@canonical.com>
Acked-by: Stefan Bader <stefan.bader@canonical.com>
Acked-by: Seth Forshee <seth.forshee@canonical.com>
Signed-off-by: Stefan Bader <stefan.bader@canonical.com>

diff --git a/drivers/scsi/hisi_sas/hisi_sas_main.c b/drivers/scsi/hisi_sas/hisi_sas_main.c
index 7c1fb75d11e6b38f9e929bc676095129f99eb689..00068d25ba48450819e94ea28cf6969d1cb41f0b 100644 (file)
--- a/drivers/scsi/hisi_sas/hisi_sas_main.c
+++ b/drivers/scsi/hisi_sas/hisi_sas_main.c
@@ -659,8 +659,9 @@ static int hisi_sas_control_phy(struct asd_sas_phy *sas_phy, enum phy_func func,
                break;
 
        case PHY_FUNC_LINK_RESET:
+               hisi_hba->hw->phy_disable(hisi_hba, phy_no);
+               msleep(100);
                hisi_hba->hw->phy_enable(hisi_hba, phy_no);
-               hisi_hba->hw->phy_hard_reset(hisi_hba, phy_no);
                break;
 
        case PHY_FUNC_DISABLE: