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

scsi: hisi_sas: use an general way to delay PHY work 



Use an general way to do delay work for a PHY. Then it will be easier to add
new delayed work for a PHY in future.

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 72f7fc30

drivers/scsi/hisi_sas/hisi_sas.h

+8 −1
Original line number Diff line number Diff line
@@ -124,12 +124,17 @@ enum hisi_sas_bit_err_type { 
	HISI_SAS_ERR_MULTI_BIT_ECC = 0x1,

};



enum hisi_sas_phy_event {

	HISI_PHYE_PHY_UP   = 0U,

	HISI_PHYES_NUM,

};



struct hisi_sas_phy {

	struct work_struct	works[HISI_PHYES_NUM];

	struct hisi_hba	*hisi_hba;

	struct hisi_sas_port	*port;

	struct asd_sas_phy	sas_phy;

	struct sas_identify	identify;

	struct work_struct	phyup_ws;

	u64		port_id; /* from hw */

	u64		dev_sas_addr;

	u64		frame_rcvd_size;
@@ -453,4 +458,6 @@ extern void hisi_sas_init_mem(struct hisi_hba *hisi_hba); 
extern void hisi_sas_rst_work_handler(struct work_struct *work);

extern void hisi_sas_sync_rst_work_handler(struct work_struct *work);

extern void hisi_sas_kill_tasklets(struct hisi_hba *hisi_hba);

extern bool hisi_sas_notify_phy_event(struct hisi_sas_phy *phy,

				enum hisi_sas_phy_event event);

#endif

drivers/scsi/hisi_sas/hisi_sas_main.c

+20 −2
Original line number Diff line number Diff line
@@ -622,7 +622,7 @@ static int hisi_sas_scan_finished(struct Scsi_Host *shost, unsigned long time) 
static void hisi_sas_phyup_work(struct work_struct *work)

{

	struct hisi_sas_phy *phy =

		container_of(work, struct hisi_sas_phy, phyup_ws);

		container_of(work, typeof(*phy), works[HISI_PHYE_PHY_UP]);

	struct hisi_hba *hisi_hba = phy->hisi_hba;

	struct asd_sas_phy *sas_phy = &phy->sas_phy;

	int phy_no = sas_phy->id;
@@ -631,10 +631,27 @@ static void hisi_sas_phyup_work(struct work_struct *work) 
	hisi_sas_bytes_dmaed(hisi_hba, phy_no);

}



static const work_func_t hisi_sas_phye_fns[HISI_PHYES_NUM] = {

	[HISI_PHYE_PHY_UP] = hisi_sas_phyup_work,

};



bool hisi_sas_notify_phy_event(struct hisi_sas_phy *phy,

				enum hisi_sas_phy_event event)

{

	struct hisi_hba *hisi_hba = phy->hisi_hba;



	if (WARN_ON(event >= HISI_PHYES_NUM))

		return false;



	return queue_work(hisi_hba->wq, &phy->works[event]);

}

EXPORT_SYMBOL_GPL(hisi_sas_notify_phy_event);



static void hisi_sas_phy_init(struct hisi_hba *hisi_hba, int phy_no)

{

	struct hisi_sas_phy *phy = &hisi_hba->phy[phy_no];

	struct asd_sas_phy *sas_phy = &phy->sas_phy;

	int i;



	phy->hisi_hba = hisi_hba;

	phy->port = NULL;
@@ -652,7 +669,8 @@ static void hisi_sas_phy_init(struct hisi_hba *hisi_hba, int phy_no) 
	sas_phy->ha = (struct sas_ha_struct *)hisi_hba->shost->hostdata;

	sas_phy->lldd_phy = phy;



	INIT_WORK(&phy->phyup_ws, hisi_sas_phyup_work);

	for (i = 0; i < HISI_PHYES_NUM; i++)

		INIT_WORK(&phy->works[i], hisi_sas_phye_fns[i]);

}



static void hisi_sas_port_notify_formed(struct asd_sas_phy *sas_phy)

drivers/scsi/hisi_sas/hisi_sas_v1_hw.c

+1 −1
Original line number Diff line number Diff line
@@ -1482,7 +1482,7 @@ static irqreturn_t int_phyup_v1_hw(int irq_no, void *p) 
	else if (phy->identify.device_type != SAS_PHY_UNUSED)

		phy->identify.target_port_protocols =

			SAS_PROTOCOL_SMP;

	queue_work(hisi_hba->wq, &phy->phyup_ws);

	hisi_sas_notify_phy_event(phy, HISI_PHYE_PHY_UP);



end:

	hisi_sas_phy_write32(hisi_hba, phy_no, CHL_INT2,

drivers/scsi/hisi_sas/hisi_sas_v2_hw.c

+2 −2
Original line number Diff line number Diff line
@@ -2708,7 +2708,7 @@ static int phy_up_v2_hw(int phy_no, struct hisi_hba *hisi_hba) 
		if (!timer_pending(&hisi_hba->timer))

			set_link_timer_quirk(hisi_hba);

	}

	queue_work(hisi_hba->wq, &phy->phyup_ws);

	hisi_sas_notify_phy_event(phy, HISI_PHYE_PHY_UP);



end:

	hisi_sas_phy_write32(hisi_hba, phy_no, CHL_INT0,
@@ -3262,7 +3262,7 @@ static irqreturn_t sata_int_v2_hw(int irq_no, void *p) 
	phy->identify.device_type = SAS_SATA_DEV;

	phy->frame_rcvd_size = sizeof(struct dev_to_host_fis);

	phy->identify.target_port_protocols = SAS_PROTOCOL_SATA;

	queue_work(hisi_hba->wq, &phy->phyup_ws);

	hisi_sas_notify_phy_event(phy, HISI_PHYE_PHY_UP);



end:

	hisi_sas_write32(hisi_hba, ENT_INT_SRC1 + offset, ent_tmp);

drivers/scsi/hisi_sas/hisi_sas_v3_hw.c

+1 −1
Original line number Diff line number Diff line
@@ -1192,7 +1192,7 @@ static int phy_up_v3_hw(int phy_no, struct hisi_hba *hisi_hba) 


	phy->port_id = port_id;

	phy->phy_attached = 1;

	queue_work(hisi_hba->wq, &phy->phyup_ws);

	hisi_sas_notify_phy_event(phy, HISI_PHYE_PHY_UP);



end:

	hisi_sas_phy_write32(hisi_hba, phy_no, CHL_INT0,

CRA Git | Maintained and supported by SUSTech CRA and CCSE