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

Commit c399acfb authored by Xiang Chen's avatar Xiang Chen Committed by Martin K. Petersen
Browse files

scsi: hisi_sas: modify some values of ITCT table 



Set SMP connection timeout and continue AWT timer;
Clear ITCT table when dev gone.

Signed-off-by: default avatarXiang Chen <chenxiang66@hisilicon.com>
Signed-off-by: default avatarJohn Garry <john.garry@huawei.com>
Reviewed-by: default avatarJohannes Thumshirn <jthumshirn@suse.de>
Signed-off-by: default avatarMartin K. Petersen <martin.petersen@oracle.com>
parent f2f89c32

drivers/scsi/hisi_sas/hisi_sas_v2_hw.c

+10 −4
Original line number Diff line number Diff line
@@ -334,6 +334,11 @@ 
#define ITCT_HDR_MCR_MSK		(0xf << ITCT_HDR_MCR_OFF)

#define ITCT_HDR_VLN_OFF		9

#define ITCT_HDR_VLN_MSK		(0xf << ITCT_HDR_VLN_OFF)

#define ITCT_HDR_SMP_TIMEOUT_OFF	16

#define ITCT_HDR_SMP_TIMEOUT_8US	1

#define ITCT_HDR_SMP_TIMEOUT		(ITCT_HDR_SMP_TIMEOUT_8US * \

					 250) /* 2ms */

#define ITCT_HDR_AWT_CONTINUE_OFF	25

#define ITCT_HDR_PORT_ID_OFF		28

#define ITCT_HDR_PORT_ID_MSK		(0xf << ITCT_HDR_PORT_ID_OFF)

/* qw2 */
@@ -696,6 +701,8 @@ static void setup_itct_v2_hw(struct hisi_hba *hisi_hba, 
	qw0 |= ((1 << ITCT_HDR_VALID_OFF) |

		(device->linkrate << ITCT_HDR_MCR_OFF) |

		(1 << ITCT_HDR_VLN_OFF) |

		(ITCT_HDR_SMP_TIMEOUT << ITCT_HDR_SMP_TIMEOUT_OFF) |

		(1 << ITCT_HDR_AWT_CONTINUE_OFF) |

		(port->id << ITCT_HDR_PORT_ID_OFF));

	itct->qw0 = cpu_to_le64(qw0);
@@ -705,7 +712,7 @@ static void setup_itct_v2_hw(struct hisi_hba *hisi_hba, 


	/* qw2 */

	if (!dev_is_sata(device))

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

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

					(0x1ULL << ITCT_HDR_BITLT_OFF) |

					(0x32ULL << ITCT_HDR_MCTLT_OFF) |

					(0x1ULL << ITCT_HDR_RTOLT_OFF));
@@ -714,7 +721,7 @@ static void setup_itct_v2_hw(struct hisi_hba *hisi_hba, 
static void free_device_v2_hw(struct hisi_hba *hisi_hba,

			      struct hisi_sas_device *sas_dev)

{

	u64 qw0, dev_id = sas_dev->device_id;

	u64 dev_id = sas_dev->device_id;

	struct device *dev = &hisi_hba->pdev->dev;

	struct hisi_sas_itct *itct = &hisi_hba->itct[dev_id];

	u32 reg_val = hisi_sas_read32(hisi_hba, ENT_INT_SRC3);
@@ -738,8 +745,7 @@ static void free_device_v2_hw(struct hisi_hba *hisi_hba, 
			dev_dbg(dev, "got clear ITCT done interrupt\n");



			/* invalid the itct state*/

			qw0 = cpu_to_le64(itct->qw0);

			qw0 &= ~(1 << ITCT_HDR_VALID_OFF);

			memset(itct, 0, sizeof(struct hisi_sas_itct));

			hisi_sas_write32(hisi_hba, ENT_INT_SRC3,

					 ENT_INT_SRC3_ITC_INT_MSK);