From: Luo Jiaxing Date: Fri, 6 Sep 2019 12:55:27 +0000 (+0800) Subject: scsi: hisi_sas: Directly return when running I_T_nexus reset if phy disabled X-Git-Tag: v5.4-rc1~89^2~10 X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=c2bae4f7d721e06e6bb8d1174ec7f8ff7604892c;p=linux.git scsi: hisi_sas: Directly return when running I_T_nexus reset if phy disabled At hisi_sas_debug_I_T_nexus_reset(), we call sas_phy_reset() to reset a phy. But if the phy is disabled, sas_phy_reset() will directly return -ENODEV without issue a phy reset request. If so, We can directly return -ENODEV to libsas before issue a phy reset. Link: https://lore.kernel.org/r/1567774537-20003-4-git-send-email-john.garry@huawei.com Signed-off-by: Luo Jiaxing Signed-off-by: John Garry Signed-off-by: Martin K. Petersen --- diff --git a/drivers/scsi/hisi_sas/hisi_sas_main.c b/drivers/scsi/hisi_sas/hisi_sas_main.c index 59c11f4fcc23..ffe02f9cf49a 100644 --- a/drivers/scsi/hisi_sas/hisi_sas_main.c +++ b/drivers/scsi/hisi_sas/hisi_sas_main.c @@ -1752,6 +1752,11 @@ static int hisi_sas_debug_I_T_nexus_reset(struct domain_device *device) DECLARE_COMPLETION_ONSTACK(phyreset); int rc, reset_type; + if (!local_phy->enabled) { + sas_put_local_phy(local_phy); + return -ENODEV; + } + if (scsi_is_sas_phy_local(local_phy)) { struct asd_sas_phy *sas_phy = sas_ha->sas_phy[local_phy->number];