Commit 0098c55e authored by Xiang Chen's avatar Xiang Chen Committed by Martin K. Petersen
Browse files

scsi: hisi_sas: Modify the deadline for ata_wait_after_reset() 



We found that the second parameter of function ata_wait_after_reset() is
incorrectly used. We call smp_ata_check_ready_type() to poll the device
type until the 30s timeout, so the correct deadline should be (jiffies +
30000).

Fixes: 3c2673a0 ("scsi: hisi_sas: Fix SATA devices missing issue during I_T nexus reset")
Co-developed-by: default avatarxiabing <xiabing12@h-partners.com>
Signed-off-by: default avatarxiabing <xiabing12@h-partners.com>
Co-developed-by: default avatarYihang Li <liyihang9@huawei.com>
Signed-off-by: default avatarYihang Li <liyihang9@huawei.com>
Signed-off-by: default avatarXiang Chen <chenxiang66@hisilicon.com>
Link: https://lore.kernel.org/r/20240402035513.2024241-3-chenxiang66@hisilicon.com


Signed-off-by: default avatarMartin K. Petersen <martin.petersen@oracle.com>
parent 358e919a

drivers/scsi/hisi_sas/hisi_sas_main.c

+1 −1
Original line number Diff line number Diff line
@@ -1797,7 +1797,7 @@ 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;



		rc = ata_wait_after_reset(link, HISI_SAS_WAIT_PHYUP_TIMEOUT,

		rc = ata_wait_after_reset(link, jiffies + HISI_SAS_WAIT_PHYUP_TIMEOUT,

					  smp_ata_check_ready_type);

	} else {

		msleep(2000);