@@ -6201,14 +6201,9 @@ static bool ufshcd_is_pwr_mode_restore_needed(struct ufs_hba *hba)
return false;
}
-/**
- * ufshcd_err_handler - handle UFS errors that require s/w attention
- * @work: pointer to work structure
- */
-static void ufshcd_err_handler(struct work_struct *work)
+static void ufshcd_recover_link(struct ufs_hba *hba)
{
int retries = MAX_ERR_HANDLER_RETRIES;
- struct ufs_hba *hba;
unsigned long flags;
bool needs_restore;
bool needs_reset;
@@ -6217,8 +6212,6 @@ static void ufshcd_err_handler(struct work_struct *work)
int pmc_err;
int tag;
- hba = container_of(work, struct ufs_hba, eh_work);
-
dev_info(hba->dev,
"%s started; HBA state %s; powered %d; shutting down %d; saved_err = %d; saved_uic_err = %d; force_reset = %d%s\n",
__func__, ufshcd_state_name[hba->ufshcd_state],
@@ -6226,13 +6219,11 @@ static void ufshcd_err_handler(struct work_struct *work)
hba->saved_uic_err, hba->force_reset,
ufshcd_is_link_broken(hba) ? "; link is broken" : "");
- down(&hba->host_sem);
spin_lock_irqsave(hba->host->host_lock, flags);
if (ufshcd_err_handling_should_stop(hba)) {
if (hba->ufshcd_state != UFSHCD_STATE_ERROR)
hba->ufshcd_state = UFSHCD_STATE_OPERATIONAL;
spin_unlock_irqrestore(hba->host->host_lock, flags);
- up(&hba->host_sem);
return;
}
ufshcd_set_eh_in_progress(hba);
@@ -6401,12 +6392,24 @@ static void ufshcd_err_handler(struct work_struct *work)
ufshcd_clear_eh_in_progress(hba);
spin_unlock_irqrestore(hba->host->host_lock, flags);
ufshcd_err_handling_unprepare(hba);
- up(&hba->host_sem);
dev_info(hba->dev, "%s finished; HBA state %s\n", __func__,
ufshcd_state_name[hba->ufshcd_state]);
}
+/**
+ * ufshcd_err_handler - handle UFS errors that require s/w attention
+ * @work: pointer to work structure
+ */
+static void ufshcd_err_handler(struct work_struct *work)
+{
+ struct ufs_hba *hba = container_of(work, struct ufs_hba, eh_work);
+
+ down(&hba->host_sem);
+ ufshcd_recover_link(hba);
+ up(&hba->host_sem);
+}
+
/**
* ufshcd_update_uic_error - check and set fatal UIC error flags.
* @hba: per-adapter instance
Prepare for invoking error handling without holding 'host_sem'. The only functional change in this patch is that two dev_info() calls now happen while 'host_sem' is held instead without holding 'host_sem'. Signed-off-by: Bart Van Assche <bvanassche@acm.org> --- drivers/ufs/core/ufshcd.c | 25 ++++++++++++++----------- 1 file changed, 14 insertions(+), 11 deletions(-)