@@ -731,7 +731,6 @@ static inline void ufshcd_outstanding_req_clear(struct ufs_hba *hba, int tag)
static inline void ufshcd_outstanding_task_clear(struct ufs_hba *hba, int tag)
{
__clear_bit(tag, &hba->outstanding_tasks);
- dev_info(hba->dev, "clear outstanding_tasks: %d\n", tag);
}
/**
@@ -5540,11 +5539,34 @@ static void ufshcd_check_errors(struct ufs_hba *hba)
*/
static void ufshcd_tmc_handler(struct ufs_hba *hba)
{
- u32 tm_doorbell;
+ u32 tm_doorbell, tag;
+ unsigned long tm_err_handled = 0;
+ unsigned long tm_done;
tm_doorbell = ufshcd_readl(hba, REG_UTP_TASK_REQ_DOOR_BELL);
hba->tm_condition = tm_doorbell ^ hba->outstanding_tasks;
- wake_up(&hba->tm_wq);
+ tm_done = hba->tm_condition;
+
+ /* clean resources for timed-out tasks */
+ for_each_set_bit(tag, &hba->tm_condition, hba->nutmrs) {
+ if (test_and_clear_bit(tag, &hba->tm_slots_err)) {
+ clear_bit(tag, &hba->tm_condition);
+ ufshcd_put_tm_slot(hba, tag);
+ ufshcd_outstanding_task_clear(hba, tag);
+ __set_bit(tag, &tm_err_handled);
+ }
+ }
+
+ /*
+ * Now tag waiters can get free tags if tags were occupied
+ * by timed-out tasks
+ */
+ if (tm_err_handled)
+ wake_up(&hba->tm_tag_wq);
+
+ /* if we have normal tasks, they shall have post-processing */
+ if (tm_err_handled != tm_done)
+ wake_up(&hba->tm_wq);
}
/**
@@ -5682,6 +5704,7 @@ static int __ufshcd_issue_tm_cmd(struct ufs_hba *hba,
if (ufshcd_clear_tm_cmd(hba, free_slot))
dev_WARN(hba->dev, "%s: unable clear tm cmd (slot %d) after timeout\n",
__func__, free_slot);
+ set_bit(free_slot, &hba->tm_slots_err);
err = -ETIMEDOUT;
} else {
err = 0;
@@ -5692,12 +5715,13 @@ static int __ufshcd_issue_tm_cmd(struct ufs_hba *hba,
spin_lock_irqsave(hba->host->host_lock, flags);
ufshcd_outstanding_task_clear(hba, free_slot);
spin_unlock_irqrestore(hba->host->host_lock, flags);
-
}
- clear_bit(free_slot, &hba->tm_condition);
- ufshcd_put_tm_slot(hba, free_slot);
- wake_up(&hba->tm_tag_wq);
+ if (!(test_bit(free_slot, &hba->tm_slots_err))) {
+ clear_bit(free_slot, &hba->tm_condition);
+ ufshcd_put_tm_slot(hba, free_slot);
+ wake_up(&hba->tm_tag_wq);
+ }
ufshcd_release(hba);
return err;
@@ -645,6 +645,7 @@ struct ufs_hba {
wait_queue_head_t tm_tag_wq;
unsigned long tm_condition;
unsigned long tm_slots_in_use;
+ unsigned long tm_slots_err;
struct uic_command *active_uic_cmd;
struct mutex uic_cmd_mutex;
Currently bits in hba->outstanding_tasks are cleared only after their corresponding task management commands are successfully done by __ufshcd_issue_tm_cmd(). If timeout happens in a task management command, its corresponding bit in hba->outstanding_tasks will not be cleared until next task management command with the same tag used successfully finishes.‧ This is wrong and can lead to some issues, like power consumpton issue. For example, ufshcd_release() and ufshcd_gate_work() will do nothing if hba->outstanding_tasks is not zero even if both UFS host and devices are actually idle. Because error handling flow, i.e., ufshcd_reset_and_restore(), will be triggered after any task management command times out, we fix this by clearing corresponding hba->outstanding_tasks bits during this flow. To achieve this, we need a mask to track timed-out commands and thus error handling flow can clear their tags specifically. Signed-off-by: Stanley Chu <stanley.chu@mediatek.com> --- drivers/scsi/ufs/ufshcd.c | 38 +++++++++++++++++++++++++++++++------- drivers/scsi/ufs/ufshcd.h | 1 + 2 files changed, 32 insertions(+), 7 deletions(-)