Skip to content

Commit

Permalink
scsi: Revert "scsi: hisi_sas: Drain bcast events in hisi_sas_rescan_t…
Browse files Browse the repository at this point in the history
…opology()"

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>
  • Loading branch information
Jie Zhan authored and Martin K. Petersen committed Nov 26, 2022
1 parent 96a2dfa commit 7e613be
Showing 1 changed file with 0 additions and 7 deletions.
7 changes: 0 additions & 7 deletions drivers/scsi/hisi_sas/hisi_sas_main.c
Original file line number Diff line number Diff line change
Expand Up @@ -1323,7 +1323,6 @@ static void hisi_sas_refresh_port_id(struct hisi_hba *hisi_hba)

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

Expand Down Expand Up @@ -1352,12 +1351,6 @@ static void hisi_sas_rescan_topology(struct hisi_hba *hisi_hba, u32 state)
hisi_sas_phy_down(hisi_hba, phy_no, 0, GFP_KERNEL);
}
}
/*
* Ensure any bcast events are processed prior to calling async nexus
* reset calls from hisi_sas_clear_nexus_ha() ->
* hisi_sas_async_I_T_nexus_reset()
*/
sas_drain_work(sas_ha);
}

static void hisi_sas_reset_init_all_devices(struct hisi_hba *hisi_hba)
Expand Down

0 comments on commit 7e613be

Please sign in to comment.