From: Can Guo <c...@codeaurora.org>

[ 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-c...@codeaurora.org
Reviewed-by: Hongwu Su <hong...@codeaurora.org>
Reviewed-by: Avri Altman <avri.alt...@wdc.com>
Reviewed-by: Bean Huo <bean...@micron.com>
Reviewed-by: Asutosh Das <asuto...@codeaurora.org>
Signed-off-by: Can Guo <c...@codeaurora.org>
Signed-off-by: Martin K. Petersen <martin.peter...@oracle.com>
Signed-off-by: Sasha Levin <sas...@kernel.org>
---
 drivers/scsi/ufs/ufs-qcom.c | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/drivers/scsi/ufs/ufs-qcom.c b/drivers/scsi/ufs/ufs-qcom.c
index ee3589ac64abf..6b6b8bf2ec929 100644
--- a/drivers/scsi/ufs/ufs-qcom.c
+++ b/drivers/scsi/ufs/ufs-qcom.c
@@ -1595,9 +1595,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);
@@ -1610,8 +1607,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;
 }
-- 
2.25.1

Reply via email to