Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 6f7c32d6 authored by John Garry's avatar John Garry Committed by Martin K. Petersen
Browse files

scsi: hisi_sas: stop controller timer for reset 



We should only have the timer enabled after PHY up after controller
reset, so disable prior to reset.

Signed-off-by: default avatarJohn Garry <john.garry@huawei.com>
Signed-off-by: default avatarXiaofei Tan <tanxiaofei@huawei.com>
Signed-off-by: default avatarMartin K. Petersen <martin.petersen@oracle.com>
parent c6ef8954

drivers/scsi/hisi_sas/hisi_sas_main.c

+3 −0
Original line number Diff line number Diff line
@@ -1130,6 +1130,9 @@ static int hisi_sas_controller_reset(struct hisi_hba *hisi_hba) 
	old_state = hisi_hba->hw->get_phys_state(hisi_hba);



	scsi_block_requests(shost);

	if (timer_pending(&hisi_hba->timer))

		del_timer_sync(&hisi_hba->timer);



	set_bit(HISI_SAS_REJECT_CMD_BIT, &hisi_hba->flags);

	rc = hisi_hba->hw->soft_reset(hisi_hba);

	if (rc) {