Skip to content

Commit 94a3555

Browse files
Jie Zhanmartinkpetersen
authored andcommitted
scsi: Revert "scsi: hisi_sas: Don't send bcast events from HW during nexus HA reset"
This reverts commit f5f2a27. 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: Jie Zhan <[email protected]> Link: https://lore.kernel.org/r/[email protected] Reviewed-by: John Garry <[email protected]> Signed-off-by: Martin K. Petersen <[email protected]>
1 parent 7e613be commit 94a3555

File tree

1 file changed

+4
-12
lines changed

1 file changed

+4
-12
lines changed

drivers/scsi/hisi_sas/hisi_sas_main.c

Lines changed: 4 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1812,14 +1812,12 @@ static int hisi_sas_clear_nexus_ha(struct sas_ha_struct *sas_ha)
18121812
struct hisi_hba *hisi_hba = sas_ha->lldd_ha;
18131813
HISI_SAS_DECLARE_RST_WORK_ON_STACK(r);
18141814
ASYNC_DOMAIN_EXCLUSIVE(async);
1815-
int i, ret;
1815+
int i;
18161816

18171817
queue_work(hisi_hba->wq, &r.work);
18181818
wait_for_completion(r.completion);
1819-
if (!r.done) {
1820-
ret = TMF_RESP_FUNC_FAILED;
1821-
goto out;
1822-
}
1819+
if (!r.done)
1820+
return TMF_RESP_FUNC_FAILED;
18231821

18241822
for (i = 0; i < HISI_SAS_MAX_DEVICES; i++) {
18251823
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)
18361834
async_synchronize_full_domain(&async);
18371835
hisi_sas_release_tasks(hisi_hba);
18381836

1839-
ret = TMF_RESP_FUNC_COMPLETE;
1840-
out:
1841-
return ret;
1837+
return TMF_RESP_FUNC_COMPLETE;
18421838
}
18431839

18441840
static int hisi_sas_query_task(struct sas_task *task)
@@ -1986,14 +1982,10 @@ void hisi_sas_phy_bcast(struct hisi_sas_phy *phy)
19861982
{
19871983
struct asd_sas_phy *sas_phy = &phy->sas_phy;
19881984
struct hisi_hba *hisi_hba = phy->hisi_hba;
1989-
struct sas_ha_struct *sha = &hisi_hba->sha;
19901985

19911986
if (test_bit(HISI_SAS_RESETTING_BIT, &hisi_hba->flags))
19921987
return;
19931988

1994-
if (test_bit(SAS_HA_FROZEN, &sha->state))
1995-
return;
1996-
19971989
sas_notify_port_event(sas_phy, PORTE_BROADCAST_RCVD, GFP_ATOMIC);
19981990
}
19991991
EXPORT_SYMBOL_GPL(hisi_sas_phy_bcast);

0 commit comments

Comments
 (0)