Unverified Commit 8fa5de01 authored by openeuler-ci-bot's avatar openeuler-ci-bot Committed by Gitee
Browse files

!10901 scsi: hisi_sas: Modify the deadline for ata_wait_after_reset() 

Merge Pull Request from: @chenyi211 
 
PR sync from Yihang Li <liyihang9@huawei.com>
https://gitee.com/openeuler/kernel/commit/88770a5bd0c2b5d9276988769ead2ca14c16b620 
 
Link:https://gitee.com/openeuler/kernel/pulls/10901

 

Reviewed-by: default avatarYihang Li <liyihang9@huawei.com>
Signed-off-by: default avatarYang Yingliang <yangyingliang@huawei.com>
parents 21044dd7 28baf48e

drivers/scsi/hisi_sas/hisi_sas_main.c

+3 −1
Original line number Diff line number Diff line
@@ -1921,8 +1921,10 @@ static int hisi_sas_debug_I_T_nexus_reset(struct domain_device *device) 


	if (dev_is_sata(device)) {

		struct ata_link *link = &device->sata_dev.ap->link;

		unsigned long deadline = ata_deadline(jiffies,

				HISI_SAS_WAIT_PHYUP_TIMEOUT / HZ * 1000);



		rc = ata_wait_after_reset(link, HISI_SAS_WAIT_PHYUP_TIMEOUT,

		rc = ata_wait_after_reset(link, deadline,

					  smp_ata_check_ready_type);

	} else {

		msleep(2000);