scsi: hisi_sas: Recover PHY state according to the status before reset (69f4ec1e) · Commits · 戴 / test

Currently the PHY state is set according to the state of the PHYs after reset. This is invalid as the PHYs are already re-initialized. Set PHY state according to the state before the reset instead of after. Link: https://lore.kernel.org/r/1601649038-25534-8-git-send-email-john.garry@huawei.com Signed-off-by:

drivers/scsi/hisi_sas/hisi_sas_main.c

+1 −3

Original line number	Diff line number	Diff line
		@@ -1551,7 +1551,6 @@ EXPORT_SYMBOL_GPL(hisi_sas_controller_reset_prepare);
		void hisi_sas_controller_reset_done(struct hisi_hba *hisi_hba)
		{
		struct Scsi_Host *shost = hisi_hba->shost;
		u32 state;

		/* Init and wait for PHYs to come up and all libsas event finished. */
		hisi_hba->hw->phys_init(hisi_hba);
		@@ -1566,8 +1565,7 @@ void hisi_sas_controller_reset_done(struct hisi_hba *hisi_hba)
		scsi_unblock_requests(shost);
		clear_bit(HISI_SAS_RESET_BIT, &hisi_hba->flags);

		state = hisi_hba->hw->get_phys_state(hisi_hba);
		hisi_sas_rescan_topology(hisi_hba, state);
		hisi_sas_rescan_topology(hisi_hba, hisi_hba->phy_state);
		}
		EXPORT_SYMBOL_GPL(hisi_sas_controller_reset_done);