Skip to content

Commit 4fa382b

Browse files
bvanasschemartinkpetersen
authored andcommitted
scsi: ufs: core: Fix ufshcd_is_ufs_dev_busy() and ufshcd_eh_timed_out()
ufshcd_is_ufs_dev_busy(), ufshcd_print_host_state() and ufshcd_eh_timed_out() are used in both modes (legacy mode and MCQ mode). hba->outstanding_reqs only represents the outstanding requests in legacy mode. Hence, change hba->outstanding_reqs into scsi_host_busy(hba->host) in these functions. Fixes: eacb139 ("scsi: ufs: core: mcq: Enable multi-circular queue") Signed-off-by: Bart Van Assche <bvanassche@acm.org> Link: https://lore.kernel.org/r/20250214224352.3025151-1-bvanassche@acm.org Reviewed-by: Peter Wang <peter.wang@mediatek.com> Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>
1 parent 5233e32 commit 4fa382b

File tree

1 file changed

+4
-4
lines changed

1 file changed

+4
-4
lines changed

drivers/ufs/core/ufshcd.c

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -266,7 +266,7 @@ static bool ufshcd_has_pending_tasks(struct ufs_hba *hba)
266266

267267
static bool ufshcd_is_ufs_dev_busy(struct ufs_hba *hba)
268268
{
269-
return hba->outstanding_reqs || ufshcd_has_pending_tasks(hba);
269+
return scsi_host_busy(hba->host) || ufshcd_has_pending_tasks(hba);
270270
}
271271

272272
static const struct ufs_dev_quirk ufs_fixups[] = {
@@ -628,8 +628,8 @@ static void ufshcd_print_host_state(struct ufs_hba *hba)
628628
const struct scsi_device *sdev_ufs = hba->ufs_device_wlun;
629629

630630
dev_err(hba->dev, "UFS Host state=%d\n", hba->ufshcd_state);
631-
dev_err(hba->dev, "outstanding reqs=0x%lx tasks=0x%lx\n",
632-
hba->outstanding_reqs, hba->outstanding_tasks);
631+
dev_err(hba->dev, "%d outstanding reqs, tasks=0x%lx\n",
632+
scsi_host_busy(hba->host), hba->outstanding_tasks);
633633
dev_err(hba->dev, "saved_err=0x%x, saved_uic_err=0x%x\n",
634634
hba->saved_err, hba->saved_uic_err);
635635
dev_err(hba->dev, "Device power mode=%d, UIC link state=%d\n",
@@ -8882,7 +8882,7 @@ static enum scsi_timeout_action ufshcd_eh_timed_out(struct scsi_cmnd *scmd)
88828882
dev_info(hba->dev, "%s() finished; outstanding_tasks = %#lx.\n",
88838883
__func__, hba->outstanding_tasks);
88848884

8885-
return hba->outstanding_reqs ? SCSI_EH_RESET_TIMER : SCSI_EH_DONE;
8885+
return scsi_host_busy(hba->host) ? SCSI_EH_RESET_TIMER : SCSI_EH_DONE;
88868886
}
88878887

88888888
static const struct attribute_group *ufshcd_driver_groups[] = {

0 commit comments

Comments
 (0)