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

!5874 scsi: hisi_sas: Update disk locked timeout to 7 seconds 

Merge Pull Request from: @ci-robot 
 
PR sync from: Xingui Yang <yangxingui@huawei.com>
https://mailweb.openeuler.org/hyperkitty/list/kernel@openeuler.org/message/YFX7XMU7BQZ6GXFAE7RIFEFMN4AYTKK3/ 
 
https://gitee.com/openeuler/kernel/issues/I9DOVK 
 
Link:https://gitee.com/openeuler/kernel/pulls/5874

 

Reviewed-by: default avatarYihang Li <liyihang9@huawei.com>
Signed-off-by: default avatarZhang Changzhong <zhangchangzhong@huawei.com>
parents 59fffb38 85ed5064

drivers/scsi/hisi_sas/hisi_sas_v3_hw.c

+2 −0
Original line number Diff line number Diff line
@@ -48,6 +48,7 @@ 
#define CQ_INT_CONVERGE_EN		0xb0

#define CFG_AGING_TIME			0xbc

#define HGC_DFX_CFG2			0xc0

#define CFG_ICT_TIMER_STEP_TRSH		0xc8

#define CFG_1US_TIMER_TRSH              0xcc

#define CFG_ABT_SET_QUERY_IPTT	0xd4

#define CFG_SET_ABORTED_IPTT_OFF	0
@@ -615,6 +616,7 @@ static void init_reg_v3_hw(struct hisi_hba *hisi_hba) 
	hisi_sas_write32(hisi_hba, TRANS_LOCK_ICT_TIME, 0x4A817C80);

	hisi_sas_write32(hisi_hba, HGC_SAS_TXFAIL_RETRY_CTRL, 0x108);

	hisi_sas_write32(hisi_hba, CFG_AGING_TIME, 0x1);

	hisi_sas_write32(hisi_hba, CFG_ICT_TIMER_STEP_TRSH, 0xf4240);

	hisi_sas_write32(hisi_hba, INT_COAL_EN, 0x1);

	hisi_sas_write32(hisi_hba, OQ_INT_COAL_TIME, 0x1);

	hisi_sas_write32(hisi_hba, OQ_INT_COAL_CNT, 0x1);