Skip to content

Commit eeb1b55

Browse files
Jaegeuk Kimmartinkpetersen
authored andcommitted
scsi: ufs: Fix tm request when non-fatal error happens
When non-fatal error like line-reset happens, ufshcd_err_handler() starts to abort tasks by ufshcd_try_to_abort_task(). When it tries to issue a task management request, we hit two warnings: WARNING: CPU: 7 PID: 7 at block/blk-core.c:630 blk_get_request+0x68/0x70 WARNING: CPU: 4 PID: 157 at block/blk-mq-tag.c:82 blk_mq_get_tag+0x438/0x46c After fixing the above warnings we hit another tm_cmd timeout which may be caused by unstable controller state: __ufshcd_issue_tm_cmd: task management cmd 0x80 timed-out Then, ufshcd_err_handler() enters full reset, and kernel gets stuck. It turned out ufshcd_print_trs() printed too many messages on console which requires CPU locks. Likewise hba->silence_err_logs, we need to avoid too verbose messages. This is actually not an error case. Link: https://lore.kernel.org/r/20210107185316.788815-3-jaegeuk@kernel.org Fixes: 69a6c26 ("scsi: ufs: Use blk_{get,put}_request() to allocate and free TMFs") Reviewed-by: Can Guo <cang@codeaurora.org> Signed-off-by: Jaegeuk Kim <jaegeuk@kernel.org> Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>
1 parent 4ee7ee5 commit eeb1b55

1 file changed

Lines changed: 13 additions & 5 deletions

File tree

drivers/scsi/ufs/ufshcd.c

Lines changed: 13 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -4994,7 +4994,8 @@ ufshcd_transfer_rsp_status(struct ufs_hba *hba, struct ufshcd_lrb *lrbp)
49944994
break;
49954995
} /* end of switch */
49964996

4997-
if ((host_byte(result) != DID_OK) && !hba->silence_err_logs)
4997+
if ((host_byte(result) != DID_OK) &&
4998+
(host_byte(result) != DID_REQUEUE) && !hba->silence_err_logs)
49984999
ufshcd_print_trs(hba, 1 << lrbp->task_tag, true);
49995000
return result;
50005001
}
@@ -6300,9 +6301,13 @@ static irqreturn_t ufshcd_intr(int irq, void *__hba)
63006301
intr_status = ufshcd_readl(hba, REG_INTERRUPT_STATUS);
63016302
}
63026303

6303-
if (enabled_intr_status && retval == IRQ_NONE) {
6304-
dev_err(hba->dev, "%s: Unhandled interrupt 0x%08x\n",
6305-
__func__, intr_status);
6304+
if (enabled_intr_status && retval == IRQ_NONE &&
6305+
!ufshcd_eh_in_progress(hba)) {
6306+
dev_err(hba->dev, "%s: Unhandled interrupt 0x%08x (0x%08x, 0x%08x)\n",
6307+
__func__,
6308+
intr_status,
6309+
hba->ufs_stats.last_intr_status,
6310+
enabled_intr_status);
63066311
ufshcd_dump_regs(hba, 0, UFSHCI_REG_SPACE_SIZE, "host_regs: ");
63076312
}
63086313

@@ -6346,7 +6351,10 @@ static int __ufshcd_issue_tm_cmd(struct ufs_hba *hba,
63466351
* Even though we use wait_event() which sleeps indefinitely,
63476352
* the maximum wait time is bounded by %TM_CMD_TIMEOUT.
63486353
*/
6349-
req = blk_get_request(q, REQ_OP_DRV_OUT, BLK_MQ_REQ_RESERVED);
6354+
req = blk_get_request(q, REQ_OP_DRV_OUT, 0);
6355+
if (IS_ERR(req))
6356+
return PTR_ERR(req);
6357+
63506358
req->end_io_data = &wait;
63516359
free_slot = req->tag;
63526360
WARN_ON_ONCE(free_slot < 0 || free_slot >= hba->nutmrs);

0 commit comments

Comments
 (0)