Skip to content

Commit da3fecb

Browse files
Can Guomartinkpetersen
authored andcommitted
scsi: ufs: Fix unbalanced scsi_block_reqs_cnt caused by ufshcd_hold()
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: Hongwu Su <hongwus@codeaurora.org> Reviewed-by: Stanley Chu <stanley.chu@mediatek.com> Reviewed-by: Bean Huo <beanhuo@micron.com> Signed-off-by: Can Guo <cang@codeaurora.org> Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>
1 parent 5feed64 commit da3fecb

1 file changed

Lines changed: 3 additions & 3 deletions

File tree

drivers/scsi/ufs/ufshcd.c

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1627,12 +1627,12 @@ int ufshcd_hold(struct ufs_hba *hba, bool async)
16271627
*/
16281628
fallthrough;
16291629
case CLKS_OFF:
1630-
ufshcd_scsi_block_requests(hba);
16311630
hba->clk_gating.state = REQ_CLKS_ON;
16321631
trace_ufshcd_clk_gating(dev_name(hba->dev),
16331632
hba->clk_gating.state);
1634-
queue_work(hba->clk_gating.clk_gating_workq,
1635-
&hba->clk_gating.ungate_work);
1633+
if (queue_work(hba->clk_gating.clk_gating_workq,
1634+
&hba->clk_gating.ungate_work))
1635+
ufshcd_scsi_block_requests(hba);
16361636
/*
16371637
* fall through to check if we should wait for this
16381638
* work to be done or not.

0 commit comments

Comments
 (0)