scsi: ufs: Cleanup WB buffer flush toggle implementation
PATCH 1/1 scsi: ufs: Cleanup WB buffer flush toggle implementation
From: Bean Huo <[email protected]>
Delete ufshcd_wb_buf_flush_enable() and ufshcd_wb_buf_flush_disable(), move the implementation into ufshcd_wb_toggle_flush().
---
Changelog:
1. Rebased the patch onto 5.12/scsi-staging, since existing one conflict with commit 21acf4601cc6 ("scsi: ufs: Relax the condition of UFSHCI_QUIRK_SKIP_MANUAL_WB_FLUSH_CTRL"), which results in applying failure.
--- drivers/scsi/ufs/ufshcd.c | 61 ++++++++++++--------------------------- 1 file changed, 19 insertions(+), 42 deletions(-)
drivers/scsi/ufs/ufshcd.c +19 -42
@@ -247,10 +247,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);
@@ -5476,58 +5474,37 @@ 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 (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 (!ufshcd_is_wb_allowed (hba) || + hba->dev_info.wb_buf_flush_enabled == enable)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); +if (enable) + opcode =UPIU_QUERY_OPCODE_SET_FLAG ;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) -return 0 ; + 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; } + hba->dev_info.wb_buf_flush_enabled = enable; + +dev_dbg (hba->dev,"WB-Buf Flush %s\n" , enable ?"enabled" :"disabled" ); +out:return ret; + } static bool ufshcd_wb_presrv_usrspc_keep_vcc_on(struct ufs_hba *hba,
Signature · 1 line
2.17.1
Martin K. Petersen
AppliedBean,
Quoted 2 lines
Delete
ufshcd_wb_buf_flush_enable()andufshcd_wb_buf_flush_disable(), move the implementation intoufshcd_wb_toggle_flush().
Applied to 5.12/scsi-staging, thanks!
Signature · 1 line
Martin K. Petersen Oracle Linux Engineering
Martin K. Petersen
AppliedQuoted 2 lines · Bean Huo
Delete
ufshcd_wb_buf_flush_enable()andufshcd_wb_buf_flush_disable(), move the implementation intoufshcd_wb_toggle_flush().
Applied to 5.12/scsi-queue, thanks!
[1/1] scsi: ufs: Cleanup WB buffer flush toggle implementation
https://git.kernel.org/mkp/scsi/c/d3ba622db82b
Signature · 1 line
Martin K. Petersen Oracle Linux Engineering