Skip to content

Commit 7e613be

Browse files
jiezhan0214martinkpetersen
authored andcommitted
scsi: Revert "scsi: hisi_sas: Drain bcast events in hisi_sas_rescan_topology()"
This reverts commit 11ff0c9. Draining or flushing events in hisi_sas_rescan_topology() can hang the driver, typically with phy up or phy down events being processed, i.e. sas_porte_bytes_dmaed() or sas_phye_loss_of_signal(). Signed-off-by: Jie Zhan <zhanjie9@hisilicon.com> Link: https://lore.kernel.org/r/20221118083714.4034612-2-zhanjie9@hisilicon.com Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>
1 parent 96a2dfa commit 7e613be

1 file changed

Lines changed: 0 additions & 7 deletions

File tree

drivers/scsi/hisi_sas/hisi_sas_main.c

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1323,7 +1323,6 @@ static void hisi_sas_refresh_port_id(struct hisi_hba *hisi_hba)
13231323

13241324
static void hisi_sas_rescan_topology(struct hisi_hba *hisi_hba, u32 state)
13251325
{
1326-
struct sas_ha_struct *sas_ha = &hisi_hba->sha;
13271326
struct asd_sas_port *_sas_port = NULL;
13281327
int phy_no;
13291328

@@ -1352,12 +1351,6 @@ static void hisi_sas_rescan_topology(struct hisi_hba *hisi_hba, u32 state)
13521351
hisi_sas_phy_down(hisi_hba, phy_no, 0, GFP_KERNEL);
13531352
}
13541353
}
1355-
/*
1356-
* Ensure any bcast events are processed prior to calling async nexus
1357-
* reset calls from hisi_sas_clear_nexus_ha() ->
1358-
* hisi_sas_async_I_T_nexus_reset()
1359-
*/
1360-
sas_drain_work(sas_ha);
13611354
}
13621355

13631356
static void hisi_sas_reset_init_all_devices(struct hisi_hba *hisi_hba)

0 commit comments

Comments
 (0)