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

!6262 scsi: hisi_sas: Remove hisi_hba->timer for v3 hw 

Merge Pull Request from: @slim6882 
 
fix his_sas_v3_hw call trace when configured CONFIG_LOCKDEP and CONFIG_DEBUG_TEST_DRIVER

#I9HNHF 
 
Link:https://gitee.com/openeuler/kernel/pulls/6262

 

Reviewed-by: default avatarYihang Li <liyihang9@huawei.com>
Signed-off-by: default avatarJialin Zhang <zhangjialin11@huawei.com>
parents 90fd2a38 e55e4852

drivers/scsi/hisi_sas/hisi_sas_main.c

+5 −1
Original line number Diff line number Diff line
@@ -1605,7 +1605,11 @@ void hisi_sas_controller_reset_prepare(struct hisi_hba *hisi_hba) 
	scsi_block_requests(shost);

	hisi_hba->hw->wait_cmds_complete_timeout(hisi_hba, 100, 5000);



	if (timer_pending(&hisi_hba->timer))

	/*

	 * hisi_hba->timer is only used for v1/v2 hw, and check hw->sht

	 * which is also only used for v1/v2 hw to skip it for v3 hw

	 */

	if (hisi_hba->hw->sht && timer_pending(&hisi_hba->timer)) 

		del_timer_sync(&hisi_hba->timer);



	set_bit(HISI_SAS_REJECT_CMD_BIT, &hisi_hba->flags);

drivers/scsi/hisi_sas/hisi_sas_v3_hw.c

+0 −2
Original line number Diff line number Diff line
@@ -5005,8 +5005,6 @@ static void hisi_sas_v3_remove(struct pci_dev *pdev) 
	struct Scsi_Host *shost = sha->core.shost;



	pm_runtime_get_noresume(dev);

	if (timer_pending(&hisi_hba->timer))

		del_timer(&hisi_hba->timer);



	sas_unregister_ha(sha);

	flush_workqueue(hisi_hba->wq);