From: Xiang Chen chenxiang66@hisilicon.com

Normally phyup will occur very quickly (about 0.1~0.2s) after enabling the PHY, so currently the timeout value of phyup is 2s. But it is possible that it takes more time to wait phyup in some extreme situations. So change the timeout of phyup from 2s to 5s to decrease the possibility that error occurs since the waiting time for phyup is not enough.

Signed-off-by: Xiang Chen chenxiang66@hisilicon.com --- drivers/scsi/hisi_sas/hisi_sas_main.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/scsi/hisi_sas/hisi_sas_main.c b/drivers/scsi/hisi_sas/hisi_sas_main.c index 23d9f596c910..bd534f07f9d7 100644 --- a/drivers/scsi/hisi_sas/hisi_sas_main.c +++ b/drivers/scsi/hisi_sas/hisi_sas_main.c @@ -1214,7 +1214,7 @@ static int hisi_sas_control_phy(struct asd_sas_phy *sas_phy, enum phy_func func, goto out; }

- if (sts && !wait_for_completion_timeout(&completion, 2 * HZ)) { + if (sts && !wait_for_completion_timeout(&completion, 5 * HZ)) { dev_warn(dev, "phy%d wait phyup timed out for func %d\n", phy_no, func); if (phy->in_reset)