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

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

hisi_sas: for v2 hw only set ITCT qw2 for SAS device 



This patch fixes the ITCT table setup as it should be configured
differently for SAS and SATA devices.  For SATA disks there is no need
to set qw2 (already zeroed).  Also, link parameters for Bus inactive
limit, max connection time limit, and reject to open limit timers
parameters are changed to match global config register,
MAX_CON_TIME_LIMIT_TIME, as recommended by hw team.

Signed-off-by: default avatarJohn Garry <john.garry@huawei.com>
Reviewed-by: default avatarZhangfei Gao <zhangfei.gao@linaro.org>
Signed-off-by: default avatarMartin K. Petersen <martin.petersen@oracle.com>
parent 11826e5d

drivers/scsi/hisi_sas/hisi_sas_v2_hw.c

+6 −5
Original line number Diff line number Diff line
@@ -554,10 +554,11 @@ static void setup_itct_v2_hw(struct hisi_hba *hisi_hba, 
	itct->sas_addr = __swab64(itct->sas_addr);



	/* qw2 */

	if (!dev_is_sata(device))

		itct->qw2 = cpu_to_le64((500ULL << ITCT_HDR_INLT_OFF) |

				(0xff00ULL << ITCT_HDR_BITLT_OFF) |

				(0xff00ULL << ITCT_HDR_MCTLT_OFF) |

				(0xff00ULL << ITCT_HDR_RTOLT_OFF));

					(0x1ULL << ITCT_HDR_BITLT_OFF) |

					(0x32ULL << ITCT_HDR_MCTLT_OFF) |

					(0x1ULL << ITCT_HDR_RTOLT_OFF));

}



static void free_device_v2_hw(struct hisi_hba *hisi_hba,
@@ -715,7 +716,7 @@ static void init_reg_v2_hw(struct hisi_hba *hisi_hba) 
	hisi_sas_write32(hisi_hba, HGC_SAS_TX_OPEN_FAIL_RETRY_CTRL, 0x7FF);

	hisi_sas_write32(hisi_hba, OPENA_WT_CONTI_TIME, 0x1);

	hisi_sas_write32(hisi_hba, I_T_NEXUS_LOSS_TIME, 0x1F4);

	hisi_sas_write32(hisi_hba, MAX_CON_TIME_LIMIT_TIME, 0x4E20);

	hisi_sas_write32(hisi_hba, MAX_CON_TIME_LIMIT_TIME, 0x32);

	hisi_sas_write32(hisi_hba, BUS_INACTIVE_LIMIT_TIME, 0x1);

	hisi_sas_write32(hisi_hba, CFG_AGING_TIME, 0x1);

	hisi_sas_write32(hisi_hba, HGC_ERR_STAT_EN, 0x1);