Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 4d3413ba authored by Can Guo's avatar Can Guo Committed by Greg Kroah-Hartman
Browse files

scsi: ufs: Fix unbalanced scsi_block_reqs_cnt caused by ufshcd_hold() 

[ Upstream commit da3fecb0040324c08f1587e5bff1f15f36be1872 ]

The scsi_block_reqs_cnt increased in ufshcd_hold() is supposed to be
decreased back in ufshcd_ungate_work() in a paired way. However, if
specific ufshcd_hold/release sequences are met, it is possible that
scsi_block_reqs_cnt is increased twice but only one ungate work is
queued. To make sure scsi_block_reqs_cnt is handled by ufshcd_hold() and
ufshcd_ungate_work() in a paired way, increase it only if queue_work()
returns true.

Link: https://lore.kernel.org/r/1604384682-15837-2-git-send-email-cang@codeaurora.org


Reviewed-by: default avatarHongwu Su <hongwus@codeaurora.org>
Reviewed-by: default avatarStanley Chu <stanley.chu@mediatek.com>
Reviewed-by: default avatarBean Huo <beanhuo@micron.com>
Signed-off-by: default avatarCan Guo <cang@codeaurora.org>
Signed-off-by: default avatarMartin K. Petersen <martin.petersen@oracle.com>
Signed-off-by: default avatarSasha Levin <sashal@kernel.org>
parent 6c5f86ab

drivers/scsi/ufs/ufshcd.c

+3 −3
Original line number Diff line number Diff line
@@ -1592,12 +1592,12 @@ int ufshcd_hold(struct ufs_hba *hba, bool async) 
		 * work and to enable clocks.

		 */

	case CLKS_OFF:

		ufshcd_scsi_block_requests(hba);

		hba->clk_gating.state = REQ_CLKS_ON;

		trace_ufshcd_clk_gating(dev_name(hba->dev),

					hba->clk_gating.state);

		queue_work(hba->clk_gating.clk_gating_workq,

			   &hba->clk_gating.ungate_work);

		if (queue_work(hba->clk_gating.clk_gating_workq,

			       &hba->clk_gating.ungate_work))

			ufshcd_scsi_block_requests(hba);

		/*

		 * fall through to check if we should wait for this

		 * work to be done or not.