Commit 94a3555d authored by Jie Zhan's avatar Jie Zhan Committed by Martin K. Petersen
Browse files

scsi: Revert "scsi: hisi_sas: Don't send bcast events from HW during nexus HA reset" 



This reverts commit f5f2a271.

This is now unnecessary to solve the SATA devices missing issue in
hisi_sas_clear_nexus_ha(). Hence, we should not ignore bcast events during
sas_eh_handle_sas_errors() in case of missing bcast events, unless a
justified need is found and a mechanism to defer (but not ignore) bcast
events in sas_eh_handle_sas_errors() is provided.

Also, in hisi_sas_clear_nexus_ha(), there is nothing further to handle in
"out: " other than return, so that part can be reverted.

Signed-off-by: default avatarJie Zhan <zhanjie9@hisilicon.com>
Link: https://lore.kernel.org/r/20221118083714.4034612-3-zhanjie9@hisilicon.com


Reviewed-by: default avatarJohn Garry <john.garry@huawei.com>
Signed-off-by: default avatarMartin K. Petersen <martin.petersen@oracle.com>
parent 7e613be7

drivers/scsi/hisi_sas/hisi_sas_main.c

+4 −12
Original line number Diff line number Diff line
@@ -1812,14 +1812,12 @@ static int hisi_sas_clear_nexus_ha(struct sas_ha_struct *sas_ha) 
	struct hisi_hba *hisi_hba = sas_ha->lldd_ha;

	HISI_SAS_DECLARE_RST_WORK_ON_STACK(r);

	ASYNC_DOMAIN_EXCLUSIVE(async);

	int i, ret;

	int i;



	queue_work(hisi_hba->wq, &r.work);

	wait_for_completion(r.completion);

	if (!r.done) {

		ret = TMF_RESP_FUNC_FAILED;

		goto out;

	}

	if (!r.done)

		return TMF_RESP_FUNC_FAILED;



	for (i = 0; i < HISI_SAS_MAX_DEVICES; i++) {

		struct hisi_sas_device *sas_dev = &hisi_hba->devices[i];
@@ -1836,9 +1834,7 @@ static int hisi_sas_clear_nexus_ha(struct sas_ha_struct *sas_ha) 
	async_synchronize_full_domain(&async);

	hisi_sas_release_tasks(hisi_hba);



	ret = TMF_RESP_FUNC_COMPLETE;

out:

	return ret;

	return TMF_RESP_FUNC_COMPLETE;

}



static int hisi_sas_query_task(struct sas_task *task)
@@ -1986,14 +1982,10 @@ void hisi_sas_phy_bcast(struct hisi_sas_phy *phy) 
{

	struct asd_sas_phy *sas_phy = &phy->sas_phy;

	struct hisi_hba	*hisi_hba = phy->hisi_hba;

	struct sas_ha_struct *sha = &hisi_hba->sha;



	if (test_bit(HISI_SAS_RESETTING_BIT, &hisi_hba->flags))

		return;



	if (test_bit(SAS_HA_FROZEN, &sha->state))

		return;



	sas_notify_port_event(sas_phy, PORTE_BROADCAST_RCVD, GFP_ATOMIC);

}

EXPORT_SYMBOL_GPL(hisi_sas_phy_bcast);