From: Keoseong Park <keosung.park@samsung.com>
To: Bean Huo <huobean@gmail.com>,
ALIM AKHTAR <alim.akhtar@samsung.com>,
"avri.altman@wdc.com" <avri.altman@wdc.com>,
"asutoshd@codeaurora.org" <asutoshd@codeaurora.org>,
"jejb@linux.ibm.com" <jejb@linux.ibm.com>,
"martin.petersen@oracle.com" <martin.petersen@oracle.com>,
"stanley.chu@mediatek.com" <stanley.chu@mediatek.com>,
"beanhuo@micron.com" <beanhuo@micron.com>,
"bvanassche@acm.org" <bvanassche@acm.org>,
"tomas.winkler@intel.com" <tomas.winkler@intel.com>,
"cang@codeaurora.org" <cang@codeaurora.org>,
Daejun Park <daejun7.park@samsung.com>,
"powen.kao@mediatek.com" <powen.kao@mediatek.com>,
"peter.wang@mediatek.com" <peter.wang@mediatek.com>,
cpgsproxy3 <cpgsproxy3@samsung.com>
Cc: "linux-scsi@vger.kernel.org" <linux-scsi@vger.kernel.org>,
"linux-kernel@vger.kernel.org" <linux-kernel@vger.kernel.org>
Subject: RE: [PATCH v2 1/5] scsi: ufshpb: Merge ufshpb_reset() and ufshpb_reset_host()
Date: Wed, 20 Apr 2022 11:47:22 +0900 [thread overview]
Message-ID: <1891546521.01650433981606.JavaMail.epsvc@epcpadp4> (raw)
In-Reply-To: <20220419183044.789065-2-huobean@gmail.com>
Hi Bean,
>From: Bean Huo <beanhuo@micron.com>
>
>There is no functional change in this patch, just merge ufshpb_reset() and
>ufshpb_reset_host() into one function ufshpb_toggle()
>
>Signed-off-by: Bean Huo <beanhuo@micron.com>
>---
> drivers/scsi/ufs/ufshcd.c | 4 ++--
> drivers/scsi/ufs/ufshpb.c | 36 +++++++++++++-----------------------
> drivers/scsi/ufs/ufshpb.h | 6 ++----
> 3 files changed, 17 insertions(+), 29 deletions(-)
>
>diff --git a/drivers/scsi/ufs/ufshcd.c b/drivers/scsi/ufs/ufshcd.c
>index 0899d5b8cdad..de0bc53e3ac6 100644
>--- a/drivers/scsi/ufs/ufshcd.c
>+++ b/drivers/scsi/ufs/ufshcd.c
>@@ -7223,7 +7223,7 @@ static int ufshcd_host_reset_and_restore(struct ufs_hba *hba)
> * Stop the host controller and complete the requests
> * cleared by h/w
> */
>- ufshpb_reset_host(hba);
>+ ufshpb_toggle(hba, HPB_PRESENT, HPB_RESET);
> ufshcd_hba_stop(hba);
> hba->silence_err_logs = true;
> ufshcd_complete_requests(hba);
>@@ -8184,7 +8184,7 @@ static int ufshcd_probe_hba(struct ufs_hba *hba, bool init_dev_params)
> /* Enable Auto-Hibernate if configured */
> ufshcd_auto_hibern8_enable(hba);
>
>- ufshpb_reset(hba);
>+ ufshpb_toggle(hba, HPB_RESET, HPB_PRESENT);
> out:
> spin_lock_irqsave(hba->host->host_lock, flags);
> if (ret)
>diff --git a/drivers/scsi/ufs/ufshpb.c b/drivers/scsi/ufs/ufshpb.c
>index 3ca745ad616c..9df032e82ec3 100644
>--- a/drivers/scsi/ufs/ufshpb.c
>+++ b/drivers/scsi/ufs/ufshpb.c
>@@ -2278,38 +2278,28 @@ static bool ufshpb_check_hpb_reset_query(struct ufs_hba *hba)
> return flag_res;
> }
>
>-void ufshpb_reset(struct ufs_hba *hba)
>+/**
>+ * ufshpb_toggle - switch HPB state of all LUs
>+ * @hba: per-adapter instance
>+ * @src: expected current HPB state
>+ * @dest: target HPB state to switch to
>+ */
>+void ufshpb_toggle(struct ufs_hba *hba, enum UFSHPB_STATE src, enum UFSHPB_STATE dest)
How about changing it to something like ufshpb_state_toggle()?
Best Regards,
Keoseong Park
> {
> struct ufshpb_lu *hpb;
> struct scsi_device *sdev;
>
> shost_for_each_device(sdev, hba->host) {
> hpb = ufshpb_get_hpb_data(sdev);
>- if (!hpb)
>- continue;
>-
>- if (ufshpb_get_state(hpb) != HPB_RESET)
>- continue;
>-
>- ufshpb_set_state(hpb, HPB_PRESENT);
>- }
>-}
>-
>-void ufshpb_reset_host(struct ufs_hba *hba)
>-{
>- struct ufshpb_lu *hpb;
>- struct scsi_device *sdev;
>
>- shost_for_each_device(sdev, hba->host) {
>- hpb = ufshpb_get_hpb_data(sdev);
>- if (!hpb)
>+ if (!hpb || ufshpb_get_state(hpb) != src)
> continue;
>+ ufshpb_set_state(hpb, dest);
>
>- if (ufshpb_get_state(hpb) != HPB_PRESENT)
>- continue;
>- ufshpb_set_state(hpb, HPB_RESET);
>- ufshpb_cancel_jobs(hpb);
>- ufshpb_discard_rsp_lists(hpb);
>+ if (dest == HPB_RESET) {
>+ ufshpb_cancel_jobs(hpb);
>+ ufshpb_discard_rsp_lists(hpb);
>+ }
> }
> }
>
>diff --git a/drivers/scsi/ufs/ufshpb.h b/drivers/scsi/ufs/ufshpb.h
>index b475dbd78988..2825ec69a6a6 100644
>--- a/drivers/scsi/ufs/ufshpb.h
>+++ b/drivers/scsi/ufs/ufshpb.h
>@@ -288,8 +288,7 @@ static int ufshpb_prep(struct ufs_hba *hba, struct ufshcd_lrb *lrbp) { return 0;
> static void ufshpb_rsp_upiu(struct ufs_hba *hba, struct ufshcd_lrb *lrbp) {}
> static void ufshpb_resume(struct ufs_hba *hba) {}
> static void ufshpb_suspend(struct ufs_hba *hba) {}
>-static void ufshpb_reset(struct ufs_hba *hba) {}
>-static void ufshpb_reset_host(struct ufs_hba *hba) {}
>+static void ufshpb_toggle(struct ufs_hba *hba, enum UFSHPB_STATE src, enum UFSHPB_STATE dest) {}
> static void ufshpb_init(struct ufs_hba *hba) {}
> static void ufshpb_init_hpb_lu(struct ufs_hba *hba, struct scsi_device *sdev) {}
> static void ufshpb_destroy_lu(struct ufs_hba *hba, struct scsi_device *sdev) {}
>@@ -303,8 +302,7 @@ int ufshpb_prep(struct ufs_hba *hba, struct ufshcd_lrb *lrbp);
> void ufshpb_rsp_upiu(struct ufs_hba *hba, struct ufshcd_lrb *lrbp);
> void ufshpb_resume(struct ufs_hba *hba);
> void ufshpb_suspend(struct ufs_hba *hba);
>-void ufshpb_reset(struct ufs_hba *hba);
>-void ufshpb_reset_host(struct ufs_hba *hba);
>+void ufshpb_toggle(struct ufs_hba *hba, enum UFSHPB_STATE src, enum UFSHPB_STATE dest);
> void ufshpb_init(struct ufs_hba *hba);
> void ufshpb_init_hpb_lu(struct ufs_hba *hba, struct scsi_device *sdev);
> void ufshpb_destroy_lu(struct ufs_hba *hba, struct scsi_device *sdev);
>--
>2.34.1
>
>
next prev parent reply other threads:[~2022-04-20 5:53 UTC|newest]
Thread overview: 14+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-04-19 18:30 [PATCH v2 0/5] Several changes for UFSHPB Bean Huo
2022-04-19 18:30 ` [PATCH v2 1/5] scsi: ufshpb: Merge ufshpb_reset() and ufshpb_reset_host() Bean Huo
2022-04-20 2:47 ` Keoseong Park [this message]
2022-04-20 12:48 ` Bean Huo
2022-04-21 3:48 ` Bart Van Assche
2022-04-21 13:02 ` Bean Huo
2022-04-19 18:30 ` [PATCH v2 2/5] scsi: ufshpb: Remove 0 assignment for enum value Bean Huo
2022-04-20 2:49 ` Keoseong Park
2022-04-19 18:30 ` [PATCH v2 3/5] scsi: ufshpb: Cleanup the handler when device reset HPB information Bean Huo
2022-04-19 18:30 ` [PATCH v2 4/5] scsi: ufshpb: Add handing of device reset HPB regions Infos in HPB device mode Bean Huo
2022-04-20 5:31 ` Keoseong Park
2022-04-20 13:21 ` Bean Huo
2022-04-24 22:16 ` Bean Huo
2022-04-19 18:30 ` [PATCH v2 5/5] scsi: ufshpb: Cleanup ufshpb_suspend/resume Bean Huo
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=1891546521.01650433981606.JavaMail.epsvc@epcpadp4 \
--to=keosung.park@samsung.com \
--cc=alim.akhtar@samsung.com \
--cc=asutoshd@codeaurora.org \
--cc=avri.altman@wdc.com \
--cc=beanhuo@micron.com \
--cc=bvanassche@acm.org \
--cc=cang@codeaurora.org \
--cc=cpgsproxy3@samsung.com \
--cc=daejun7.park@samsung.com \
--cc=huobean@gmail.com \
--cc=jejb@linux.ibm.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-scsi@vger.kernel.org \
--cc=martin.petersen@oracle.com \
--cc=peter.wang@mediatek.com \
--cc=powen.kao@mediatek.com \
--cc=stanley.chu@mediatek.com \
--cc=tomas.winkler@intel.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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox