From: Stanley Chu <stanley.chu@mediatek.com>
To: Bean Huo <huobean@gmail.com>
Cc: <alim.akhtar@samsung.com>, <avri.altman@wdc.com>,
<asutoshd@codeaurora.org>, <jejb@linux.ibm.com>,
<martin.petersen@oracle.com>, <beanhuo@micron.com>,
<bvanassche@acm.org>, <tomas.winkler@intel.com>,
<cang@codeaurora.org>, <linux-scsi@vger.kernel.org>,
<linux-kernel@vger.kernel.org>
Subject: Re: [PATCH v4 5/6] scsi: ufs: Cleanup WB buffer flush toggle implementation
Date: Tue, 15 Dec 2020 17:07:14 +0800 [thread overview]
Message-ID: <1608023234.10163.19.camel@mtkswgap22> (raw)
In-Reply-To: <20201211140035.20016-6-huobean@gmail.com>
Hi Bean,
On Fri, 2020-12-11 at 15:00 +0100, Bean Huo wrote:
> From: Bean Huo <beanhuo@micron.com>
>
> Delete ufshcd_wb_buf_flush_enable() and ufshcd_wb_buf_flush_disable(),
> move the implementation into ufshcd_wb_toggle_flush().
>
> Signed-off-by: Bean Huo <beanhuo@micron.com>
> ---
> drivers/scsi/ufs/ufshcd.c | 69 ++++++++++++++-------------------------
> 1 file changed, 24 insertions(+), 45 deletions(-)
>
> diff --git a/drivers/scsi/ufs/ufshcd.c b/drivers/scsi/ufs/ufshcd.c
> index 0998e6103cd7..fb3c98724005 100644
> --- a/drivers/scsi/ufs/ufshcd.c
> +++ b/drivers/scsi/ufs/ufshcd.c
> @@ -244,10 +244,8 @@ static int ufshcd_setup_vreg(struct ufs_hba *hba, bool on);
> static inline int ufshcd_config_vreg_hpm(struct ufs_hba *hba,
> struct ufs_vreg *vreg);
> static int ufshcd_try_to_abort_task(struct ufs_hba *hba, int tag);
> -static int ufshcd_wb_buf_flush_enable(struct ufs_hba *hba);
> -static int ufshcd_wb_buf_flush_disable(struct ufs_hba *hba);
> static int ufshcd_wb_toggle_flush_during_h8(struct ufs_hba *hba, bool set);
> -static inline void ufshcd_wb_toggle_flush(struct ufs_hba *hba, bool enable);
> +static inline int ufshcd_wb_toggle_flush(struct ufs_hba *hba, bool enable);
> static void ufshcd_hba_vreg_set_lpm(struct ufs_hba *hba);
> static void ufshcd_hba_vreg_set_hpm(struct ufs_hba *hba);
>
> @@ -5398,60 +5396,41 @@ static int ufshcd_wb_toggle_flush_during_h8(struct ufs_hba *hba, bool set)
> index, NULL);
> }
>
> -static inline void ufshcd_wb_toggle_flush(struct ufs_hba *hba, bool enable)
> -{
> - if (hba->quirks & UFSHCI_QUIRK_SKIP_MANUAL_WB_FLUSH_CTRL)
> - return;
> -
> - if (enable)
> - ufshcd_wb_buf_flush_enable(hba);
> - else
> - ufshcd_wb_buf_flush_disable(hba);
> -
> -}
> -
> -static int ufshcd_wb_buf_flush_enable(struct ufs_hba *hba)
> +static inline int ufshcd_wb_toggle_flush(struct ufs_hba *hba, bool enable)
> {
> int ret;
> u8 index;
> + enum query_opcode opcode;
>
> - if (!ufshcd_is_wb_allowed(hba) || hba->dev_info.wb_buf_flush_enabled)
> + if (hba->quirks & UFSHCI_QUIRK_SKIP_MANUAL_WB_FLUSH_CTRL)
> return 0;
>
> - index = ufshcd_wb_get_query_index(hba);
> - ret = ufshcd_query_flag_retry(hba, UPIU_QUERY_OPCODE_SET_FLAG,
> - QUERY_FLAG_IDN_WB_BUFF_FLUSH_EN,
> - index, NULL);
> - if (ret)
> - dev_err(hba->dev, "%s WB - buf flush enable failed %d\n",
> - __func__, ret);
> - else
> - hba->dev_info.wb_buf_flush_enabled = true;
> -
> - dev_dbg(hba->dev, "WB - Flush enabled: %d\n", ret);
> - return ret;
> -}
> -
> -static int ufshcd_wb_buf_flush_disable(struct ufs_hba *hba)
> -{
> - int ret;
> - u8 index;
> -
> - if (!ufshcd_is_wb_allowed(hba) || !hba->dev_info.wb_buf_flush_enabled)
> + if (!ufshcd_is_wb_allowed(hba) ||
> + hba->dev_info.wb_buf_flush_enabled == enable)
> return 0;
>
> + if (enable)
> + opcode = UPIU_QUERY_OPCODE_SET_FLAG;
> + else
> + opcode = UPIU_QUERY_OPCODE_CLEAR_FLAG;
> +
> index = ufshcd_wb_get_query_index(hba);
> - ret = ufshcd_query_flag_retry(hba, UPIU_QUERY_OPCODE_CLEAR_FLAG,
> - QUERY_FLAG_IDN_WB_BUFF_FLUSH_EN,
> - index, NULL);
> + ret = ufshcd_query_flag_retry(hba, opcode,
> + QUERY_FLAG_IDN_WB_BUFF_FLUSH_EN, index,
> + NULL);
> if (ret) {
> - dev_warn(hba->dev, "%s: WB - buf flush disable failed %d\n",
> - __func__, ret);
> - } else {
> - hba->dev_info.wb_buf_flush_enabled = false;
> - dev_dbg(hba->dev, "WB - Flush disabled: %d\n", ret);
> + dev_err(hba->dev, "%s WB-Buf Flush %s failed %d\n", __func__,
> + enable ? "enable" : "disable", ret);
> + goto out;
> }
>
> + if (enable)
> + hba->dev_info.wb_buf_flush_enabled = true;
> + else
> + hba->dev_info.wb_buf_flush_enabled = false;
Perhaps this could be simpler as below?
hba->dev_info.wb_buf_flush_enabled = enable;
Thanks,
Stanley Chu
> +
> + dev_dbg(hba->dev, "WB-Buf Flush %s\n", enable ? "enabled" : "disabled");
> +out:
> return ret;
> }
>
next prev parent reply other threads:[~2020-12-15 9:09 UTC|newest]
Thread overview: 16+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-12-11 14:00 [PATCH v4 0/6] Several changes for UFS WriteBooster Bean Huo
2020-12-11 14:00 ` [PATCH v4 1/6] scsi: ufs: Add "wb_on" sysfs node to control WB on/off Bean Huo
2020-12-15 10:32 ` Greg KH
2020-12-15 19:56 ` Bean Huo
2020-12-11 14:00 ` [PATCH v4 2/6] scsi: ufs: Changes comment in the function ufshcd_wb_probe() Bean Huo
2020-12-11 14:00 ` [PATCH v4 3/6] scsi: ufs: Group UFS WB related flags to struct ufs_dev_info Bean Huo
2020-12-15 9:01 ` Stanley Chu
2020-12-15 9:42 ` Bean Huo
2020-12-15 10:11 ` Stanley Chu
2020-12-11 14:00 ` [PATCH v4 4/6] scsi: ufs: Remove d_wb_alloc_units from " Bean Huo
2020-12-15 8:57 ` Stanley Chu
2020-12-15 9:59 ` Bean Huo
2020-12-11 14:00 ` [PATCH v4 5/6] scsi: ufs: Cleanup WB buffer flush toggle implementation Bean Huo
2020-12-15 9:07 ` Stanley Chu [this message]
2020-12-15 9:28 ` Bean Huo
2020-12-11 14:00 ` [PATCH v4 6/6] scsi: ufs: Keep device active mode only fWriteBoosterBufferFlushDuringHibernate == 1 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=1608023234.10163.19.camel@mtkswgap22 \
--to=stanley.chu@mediatek.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=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=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