Commit 30255785 authored Aug 09, 2020 by Can Guo Committed by Greg Kroah-Hartman Oct 30, 2020

scsi: ufs: ufs-qcom: Fix race conditions caused by ufs_qcom_testbus_config()

[ Upstream commit 89dd87acd40a44de8ff3358138aedf8f73f4efc6 ]

If ufs_qcom_dump_dbg_regs() calls ufs_qcom_testbus_config() from
ufshcd_suspend/resume and/or clk gate/ungate context, pm_runtime_get_sync()
and ufshcd_hold() will cause a race condition. Fix this by removing the
unnecessary calls of pm_runtime_get_sync() and ufshcd_hold().

Link: https://lore.kernel.org/r/1596975355-39813-3-git-send-email-cang@codeaurora.org


Reviewed-by: Hongwu Su <hongwus@codeaurora.org>
Reviewed-by: Avri Altman <avri.altman@wdc.com>
Reviewed-by: Bean Huo <beanhuo@micron.com>
Reviewed-by: Asutosh Das <asutoshd@codeaurora.org>
Signed-off-by: Can Guo <cang@codeaurora.org>
Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>
Signed-off-by: Sasha Levin <sashal@kernel.org>

parent 923fe07f

drivers/scsi/ufs/ufs-qcom.c

+0 −5

Original line number	Diff line number	Diff line
		@@ -1581,9 +1581,6 @@ int ufs_qcom_testbus_config(struct ufs_qcom_host *host)
		*/
		}
		mask <<= offset;

		pm_runtime_get_sync(host->hba->dev);
		ufshcd_hold(host->hba, false);
		ufshcd_rmwl(host->hba, TEST_BUS_SEL,
		(u32)host->testbus.select_major << 19,
		REG_UFS_CFG1);
		@@ -1596,8 +1593,6 @@ int ufs_qcom_testbus_config(struct ufs_qcom_host *host)
		* committed before returning.
		*/
		mb();
		ufshcd_release(host->hba);
		pm_runtime_put_sync(host->hba->dev);

		return 0;
		}