Commit 0258141a authored by Xiaofei Tan's avatar Xiaofei Tan Committed by Martin K. Petersen
Browse files

scsi: hisi_sas: relocate clearing ITCT and freeing device 



In certain scenarios we may just want to clear the ITCT for a device, and not
free other resources like the SATA bitmap using in v2 hw.

To facilitate this, this patch relocates the code of clearing ITCT from
free_device() to a new hw interface clear_itct().  Then for some hw, we should
not realise free_device() if there's nothing left to do for it.

[mkp: typo]

Signed-off-by: default avatarXiaofei Tan <tanxiaofei@huawei.com>
Signed-off-by: default avatarJohn Garry <john.garry@huawei.com>
Signed-off-by: default avatarMartin K. Petersen <martin.petersen@oracle.com>
parent dc1e4730

drivers/scsi/hisi_sas/hisi_sas.h

+2 −1
Original line number Diff line number Diff line
@@ -205,8 +205,9 @@ struct hisi_sas_hw { 
	void (*phy_set_linkrate)(struct hisi_hba *hisi_hba, int phy_no,

			struct sas_phy_linkrates *linkrates);

	enum sas_linkrate (*phy_get_max_linkrate)(void);

	void (*free_device)(struct hisi_hba *hisi_hba,

	void (*clear_itct)(struct hisi_hba *hisi_hba,

			    struct hisi_sas_device *dev);

	void (*free_device)(struct hisi_sas_device *sas_dev);

	int (*get_wideport_bitmap)(struct hisi_hba *hisi_hba, int port_id);

	void (*dereg_device)(struct hisi_hba *hisi_hba,

				struct domain_device *device);

drivers/scsi/hisi_sas/hisi_sas_main.c

+5 −2
Original line number Diff line number Diff line
@@ -743,7 +743,10 @@ static void hisi_sas_dev_gone(struct domain_device *device) 


	hisi_sas_dereg_device(hisi_hba, device);



	hisi_hba->hw->free_device(hisi_hba, sas_dev);

	hisi_hba->hw->clear_itct(hisi_hba, sas_dev);

	if (hisi_hba->hw->free_device)

		hisi_hba->hw->free_device(sas_dev);



	device->lldd_dev = NULL;

	memset(sas_dev, 0, sizeof(*sas_dev));

	sas_dev->dev_type = SAS_PHY_UNUSED;
@@ -1001,7 +1004,7 @@ static void hisi_sas_refresh_port_id(struct hisi_hba *hisi_hba, 
				|| !device || (device->port != sas_port))

			continue;



		hisi_hba->hw->free_device(hisi_hba, sas_dev);

		hisi_hba->hw->clear_itct(hisi_hba, sas_dev);



		/* Update linkrate of directly attached device. */

		if (!device->parent)

drivers/scsi/hisi_sas/hisi_sas_v1_hw.c

+2 −2
Original line number Diff line number Diff line
@@ -544,7 +544,7 @@ static void setup_itct_v1_hw(struct hisi_hba *hisi_hba, 
				(0xff00ULL << ITCT_HDR_REJ_OPEN_TL_OFF));

}



static void free_device_v1_hw(struct hisi_hba *hisi_hba,

static void clear_itct_v1_hw(struct hisi_hba *hisi_hba,

			      struct hisi_sas_device *sas_dev)

{

	u64 dev_id = sas_dev->device_id;
@@ -1850,7 +1850,7 @@ static const struct hisi_sas_hw hisi_sas_v1_hw = { 
	.hw_init = hisi_sas_v1_init,

	.setup_itct = setup_itct_v1_hw,

	.sl_notify = sl_notify_v1_hw,

	.free_device = free_device_v1_hw,

	.clear_itct = clear_itct_v1_hw,

	.prep_smp = prep_smp_v1_hw,

	.prep_ssp = prep_ssp_v1_hw,

	.get_free_slot = get_free_slot_v1_hw,

drivers/scsi/hisi_sas/hisi_sas_v2_hw.c

+11 −5
Original line number Diff line number Diff line
@@ -952,7 +952,7 @@ static void setup_itct_v2_hw(struct hisi_hba *hisi_hba, 
					(0x1ULL << ITCT_HDR_RTOLT_OFF));

}



static void free_device_v2_hw(struct hisi_hba *hisi_hba,

static void clear_itct_v2_hw(struct hisi_hba *hisi_hba,

			      struct hisi_sas_device *sas_dev)

{

	DECLARE_COMPLETION_ONSTACK(completion);
@@ -963,10 +963,6 @@ static void free_device_v2_hw(struct hisi_hba *hisi_hba, 


	sas_dev->completion = &completion;



	/* SoC bug workaround */

	if (dev_is_sata(sas_dev->sas_device))

		clear_bit(sas_dev->sata_idx, hisi_hba->sata_dev_bitmap);



	/* clear the itct interrupt state */

	if (ENT_INT_SRC3_ITC_INT_MSK & reg_val)

		hisi_sas_write32(hisi_hba, ENT_INT_SRC3,
@@ -981,6 +977,15 @@ static void free_device_v2_hw(struct hisi_hba *hisi_hba, 
	}

}



static void free_device_v2_hw(struct hisi_sas_device *sas_dev)

{

	struct hisi_hba *hisi_hba = sas_dev->hisi_hba;



	/* SoC bug workaround */

	if (dev_is_sata(sas_dev->sas_device))

		clear_bit(sas_dev->sata_idx, hisi_hba->sata_dev_bitmap);

}



static int reset_hw_v2_hw(struct hisi_hba *hisi_hba)

{

	int i, reset_val;
@@ -3415,6 +3420,7 @@ static const struct hisi_sas_hw hisi_sas_v2_hw = { 
	.alloc_dev = alloc_dev_quirk_v2_hw,

	.sl_notify = sl_notify_v2_hw,

	.get_wideport_bitmap = get_wideport_bitmap_v2_hw,

	.clear_itct = clear_itct_v2_hw,

	.free_device = free_device_v2_hw,

	.prep_smp = prep_smp_v2_hw,

	.prep_ssp = prep_ssp_v2_hw,

drivers/scsi/hisi_sas/hisi_sas_v3_hw.c

+2 −2
Original line number Diff line number Diff line
@@ -588,7 +588,7 @@ static void setup_itct_v3_hw(struct hisi_hba *hisi_hba, 
					(0x1ULL << ITCT_HDR_RTOLT_OFF));

}



static void free_device_v3_hw(struct hisi_hba *hisi_hba,

static void clear_itct_v3_hw(struct hisi_hba *hisi_hba,

			      struct hisi_sas_device *sas_dev)

{

	DECLARE_COMPLETION_ONSTACK(completion);
@@ -1951,7 +1951,7 @@ static const struct hisi_sas_hw hisi_sas_v3_hw = { 
	.max_command_entries = HISI_SAS_COMMAND_ENTRIES_V3_HW,

	.get_wideport_bitmap = get_wideport_bitmap_v3_hw,

	.complete_hdr_size = sizeof(struct hisi_sas_complete_v3_hdr),

	.free_device = free_device_v3_hw,

	.clear_itct = clear_itct_v3_hw,

	.sl_notify = sl_notify_v3_hw,

	.prep_ssp = prep_ssp_v3_hw,

	.prep_smp = prep_smp_v3_hw,

CRA Git | Maintained and supported by SUSTech CRA and CCSE