Commit 510ebd8e authored by Xingui Yang's avatar Xingui Yang Committed by Laibin Qiu
Browse files

scsi: hisi_sas: Change DMA setup lock timeout to 2.5s 

driver inclusion
category: bugfix
bugzilla: https://gitee.com/openeuler/kernel/issues/I5BXH1


CVE: NA

-------------------------------------------------------------------

DMA setup lock timeout protection is added when DMA setup frames are
received, it's a function outside the protocol and used to prevent SATA
disk I/Os from being delivered for a long time. The default value is 100ms
, it's too strict and easily triggered timeout when the disk is overloaded
or faulty. Based on the average I/O latency of 300 disks, we adjust the
value to 2.5s.

Signed-off-by: default avatarXingui Yang <yangxingui@huawei.com>
Reviewed-by: default avatarkang fenglong <kangfenglong@huawei.com>
Acked-by: default avatarXie XiuQi <xiexiuqi@huawei.com>
Signed-off-by: default avatarLaibin Qiu <qiulaibin@huawei.com>
parent 6d8e8ddf

drivers/scsi/hisi_sas/hisi_sas_v3_hw.c

+4 −0
Original line number Diff line number Diff line
@@ -35,6 +35,7 @@ 
#define SATA_INITI_D2H_STORE_ADDR_HI	0x64

#define CFG_MAX_TAG			0x68

#define SAS_DMAC_OUTSTAND	0x6c

#define TRANS_LOCK_ICT_TIME		0X70

#define HGC_SAS_TX_OPEN_FAIL_RETRY_CTRL	0x84

#define HGC_SAS_TXFAIL_RETRY_CTRL	0x88

#define HGC_GET_ITV_TIME		0x90
@@ -596,6 +597,8 @@ static void init_reg_v3_hw(struct hisi_hba *hisi_hba) 
			 (u32)((1ULL << hisi_hba->queue_count) - 1));

	hisi_sas_write32(hisi_hba, SAS_AXI_USER3, 0);

	hisi_sas_write32(hisi_hba, CFG_MAX_TAG, 0xfff0400);

	/* time / CLK_AHB = 2.5s / 2ns = 0x4A817C80 */

	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, INT_COAL_EN, 0x1);
@@ -3061,6 +3064,7 @@ static const struct hisi_sas_debugfs_reg_lu debugfs_global_reg_lu[] = { 
	HISI_SAS_DEBUGFS_REG(SATA_INITI_D2H_STORE_ADDR_LO),

	HISI_SAS_DEBUGFS_REG(SATA_INITI_D2H_STORE_ADDR_HI),

	HISI_SAS_DEBUGFS_REG(CFG_MAX_TAG),

	HISI_SAS_DEBUGFS_REG(TRANS_LOCK_ICT_TIME),

	HISI_SAS_DEBUGFS_REG(HGC_SAS_TX_OPEN_FAIL_RETRY_CTRL),

	HISI_SAS_DEBUGFS_REG(HGC_SAS_TXFAIL_RETRY_CTRL),

	HISI_SAS_DEBUGFS_REG(HGC_GET_ITV_TIME),