]> git.proxmox.com Git - mirror_ubuntu-hirsute-kernel.git/commitdiff
scsi: ufs: core: Fix task management request completion timeout
authorCan Guo <cang@codeaurora.org>
Thu, 1 Apr 2021 07:39:08 +0000 (00:39 -0700)
committerStefan Bader <stefan.bader@canonical.com>
Fri, 7 May 2021 07:53:39 +0000 (09:53 +0200)
BugLink: https://bugs.launchpad.net/bugs/1926368
[ Upstream commit 1235fc569e0bf541ddda0a1224d4c6fa6d914890 ]

ufshcd_tmc_handler() calls blk_mq_tagset_busy_iter(fn = ufshcd_compl_tm()),
but since blk_mq_tagset_busy_iter() only iterates over all reserved tags
and requests which are not in IDLE state, ufshcd_compl_tm() never gets a
chance to run. Thus, TMR always ends up with completion timeout. Fix it by
calling blk_mq_start_request() in __ufshcd_issue_tm_cmd().

Link: https://lore.kernel.org/r/1617262750-4864-2-git-send-email-cang@codeaurora.org
Fixes: 69a6c269c097 ("scsi: ufs: Use blk_{get,put}_request() to allocate and free TMFs")
Reviewed-by: Bart Van Assche <bvanassche@acm.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>
Signed-off-by: Kamal Mostafa <kamal@canonical.com>
Signed-off-by: Stefan Bader <stefan.bader@canonical.com>
drivers/scsi/ufs/ufshcd.c

index 16e1bd1aa49d5c51d56d7542ae9d999e2db9affd..c801f88007dd2c21fec683618cede3001313ba15 100644 (file)
@@ -6381,6 +6381,7 @@ static int __ufshcd_issue_tm_cmd(struct ufs_hba *hba,
 
        spin_lock_irqsave(host->host_lock, flags);
        task_tag = hba->nutrs + free_slot;
+       blk_mq_start_request(req);
 
        treq->req_header.dword_0 |= cpu_to_be32(task_tag);