From: Bart Van Assche <bvanassche@acm.org>
To: "Martin K . Petersen" <martin.petersen@oracle.com>
Cc: Jaegeuk Kim <jaegeuk@kernel.org>,
linux-scsi@vger.kernel.org,
Adrian Hunter <adrian.hunter@intel.com>,
Bart Van Assche <bvanassche@acm.org>,
"James E.J. Bottomley" <jejb@linux.ibm.com>,
Bean Huo <beanhuo@micron.com>, Avri Altman <avri.altman@wdc.com>,
Jinyoung Choi <j-young.choi@samsung.com>
Subject: [PATCH 6/8] scsi: ufs: Split ufshcd_err_handler()
Date: Fri, 23 Sep 2022 13:11:36 -0700 [thread overview]
Message-ID: <20220923201138.2113123-7-bvanassche@acm.org> (raw)
In-Reply-To: <20220923201138.2113123-1-bvanassche@acm.org>
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(-)
diff --git a/drivers/ufs/core/ufshcd.c b/drivers/ufs/core/ufshcd.c
index e8c0504e9e83..d7453f788d0d 100644
--- a/drivers/ufs/core/ufshcd.c
+++ b/drivers/ufs/core/ufshcd.c
@@ -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
next prev parent reply other threads:[~2022-09-23 20:12 UTC|newest]
Thread overview: 15+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-09-23 20:11 [PATCH 0/8] Fix a deadlock in the UFS driver Bart Van Assche
2022-09-23 20:11 ` [PATCH 1/8] scsi: core: Fix a race between scsi_done() and scsi_times_out() Bart Van Assche
2022-09-23 20:11 ` [PATCH 2/8] scsi: core: Change the return type of .eh_timed_out() Bart Van Assche
2022-09-24 2:10 ` kernel test robot
2022-09-23 20:11 ` [PATCH 3/8] scsi: ufs: Remove an outdated comment Bart Van Assche
2022-09-23 20:11 ` [PATCH 4/8] scsi: ufs: Use 'else' in ufshcd_set_dev_pwr_mode() Bart Van Assche
2022-09-23 20:11 ` [PATCH 5/8] scsi: ufs: Try harder to change the power mode Bart Van Assche
2022-09-27 10:41 ` Avri Altman
2022-09-27 16:44 ` Bart Van Assche
2022-09-23 20:11 ` Bart Van Assche [this message]
2022-09-23 20:11 ` [PATCH 7/8] scsi: ufs: Add a PM notifier Bart Van Assche
2022-09-23 20:11 ` [PATCH 8/8] scsi: ufs: Fix deadlock between power management and error handler Bart Van Assche
2022-09-24 15:06 ` kernel test robot
2022-09-27 17:06 ` Adrian Hunter
2022-09-27 17:54 ` Bart Van Assche
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20220923201138.2113123-7-bvanassche@acm.org \
--to=bvanassche@acm.org \
--cc=adrian.hunter@intel.com \
--cc=avri.altman@wdc.com \
--cc=beanhuo@micron.com \
--cc=j-young.choi@samsung.com \
--cc=jaegeuk@kernel.org \
--cc=jejb@linux.ibm.com \
--cc=linux-scsi@vger.kernel.org \
--cc=martin.petersen@oracle.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.