scsi: ufs: Tidy up WB configuration code
PATCH v2 1/1 scsi: ufs: Tidy up WB configuration code
From: Yue Hu <[email protected]>
There are similar code implementations for WB configuration in ufshcd_wb_{ctrl, toggle_flush_during_h8, toggle_flush}. We can extract the part to create a new helper with a flag parameter to reduce code duplication.
Meanwhile, rename ufshcd_wb_ctrl() to ufshcd_wb_toggle() for better readability.
And remove unnecessary log messages from ufshcd_wb_config() since relevant toggle function will spew log respectively. Also change ufshcd_wb_toggle_flush{__during_h8} to void type accordingly.
---
v2: use opcode instead of val, update minor log words
drivers/scsi/ufs/ufs-sysfs.c | 2 +- drivers/scsi/ufs/ufshcd.c | 97 +++++++++++++++++++------------------------- drivers/scsi/ufs/ufshcd.h | 2 +- 3 files changed, 43 insertions(+), 58 deletions(-)
drivers/scsi/ufs/ufs-sysfs.c +1 -1
@@ -246,7 +246,7 @@ static ssize_t wb_on_store(struct device *dev, struct device_attribute *attr, }pm_runtime_get_sync (hba->dev); - res =ufshcd_wb_ctrl (hba, wb_enable); + res =ufshcd_wb_toggle (hba, wb_enable);pm_runtime_put_sync (hba->dev); out:up (&hba->host_sem);
drivers/scsi/ufs/ufshcd.c +41 -56
161 lines not on this page · raw message
drivers/scsi/ufs/ufshcd.h +1 -1
@@ -1099,7 +1099,7 @@ int ufshcd_exec_raw_upiu_cmd(struct ufs_hba *hba, u8 *desc_buff, int *buff_len, enum query_opcode desc_op); -int ufshcd_wb_ctrl (struct ufs_hba *hba,bool enable); +int ufshcd_wb_toggle (struct ufs_hba *hba,bool enable);/* Wrapper functions for safely calling variant operations */ static inline const char *ufshcd_get_var_name (struct ufs_hba *hba)
Signature · 1 line
1.9.1
Quoted 9 lines
(quoted diff) +1
-1-int ufshcd_wb_ctrl(struct ufs_hba *hba, bool enable) +static int __ufshcd_wb_toggle(struct ufs_hba *hba, bool set, enum flag_idnidn)
{- int ret; u8 index; enum query_opcode opcode;
What I meant is:
enum query_opcode opcode = set ? UPIU_QUERY_OPCODE_SET_FLAG : UPIU_QUERY_OPCODE_CLEAR_FLAG;
Either way, you can add my Reviewed-by tag.
Thanks,
Avri
Quoted 128 lines
drivers/scsi/ufs/ufshcd.c +31
-35+if (set) + opcode =UPIU_QUERY_OPCODE_SET_FLAG ; +else + opcode =UPIU_QUERY_OPCODE_CLEAR_FLAG ; + + index =ufshcd_wb_get_query_index (hba); +return ufshcd_query_flag_retry (hba, opcode, idn, index,NULL ); +} + +int ufshcd_wb_toggle (struct ufs_hba *hba,bool enable) +{ +int ret; +if (!ufshcd_is_wb_allowed (hba))return 0 ;if (!(enable ^ hba->dev_info.wb_enabled))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, opcode, -QUERY_FLAG_IDN_WB_EN , index,NULL ); + ret =__ufshcd_wb_toggle (hba, enable,QUERY_FLAG_IDN_WB_EN );if (ret) { -dev_err (hba->dev,"%s write booster %s failed %d\n" , +dev_err (hba->dev,"%s Write Booster %s failed %d\n" , __func__, enable ?"enable" :"disable" , ret);return ret; } hba->dev_info.wb_enabled = enable; -dev_dbg (hba->dev,"%s write booster %s %d\n" , - __func__, enable ?"enable" :"disable" , ret); +dev_info (hba->dev,"%s Write Booster %s\n" , + __func__, enable ?"enabled" :"disabled" );return ret; } -static int ufshcd_wb_toggle_flush_during_h8 (struct ufs_hba *hba,bool set) +static void ufshcd_wb_toggle_flush_during_h8 (struct ufs_hba *hba,bool set) { -int val; -u8 index; - -if (set) - val =UPIU_QUERY_OPCODE_SET_FLAG ; -else - val =UPIU_QUERY_OPCODE_CLEAR_FLAG ; +int ret; - index =ufshcd_wb_get_query_index (hba); -return ufshcd_query_flag_retry (hba, val, -QUERY_FLAG_IDN_WB_BUFF_FLUSH_DURING_HIBERN8 , - index,NULL ); + ret =__ufshcd_wb_toggle (hba, set, +QUERY_FLAG_IDN_WB_BUFF_FLUSH_DURING_HIBERN8 ); +if (ret) { +dev_err (hba->dev,"%s: WB-Buf Flush during H8 %s failed: %d\n" , + __func__, set ?"enable" :"disable" , ret); +return ; + } +dev_dbg (hba->dev,"%s WB-Buf Flush during H8 %s\n" , + __func__, set ?"enabled" :"disabled" ); } -static inline int ufshcd_wb_toggle_flush (struct ufs_hba *hba,bool enable) +static inline void 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 == enable) -return 0 ; - -if (enable) - opcode =UPIU_QUERY_OPCODE_SET_FLAG ; -else - opcode =UPIU_QUERY_OPCODE_CLEAR_FLAG ; +return ; - index =ufshcd_wb_get_query_index (hba); - ret =ufshcd_query_flag_retry (hba, opcode, -QUERY_FLAG_IDN_WB_BUFF_FLUSH_EN , index, -NULL ); + ret = __ufshcd_wb_toggle(hba, enable,QUERY_FLAG_IDN_WB_BUFF_FLUSH_EN); if (ret) { dev_err(hba->dev, "%s WB-Buf Flush %s failed %d\n", __func__, enable ? "enable" : "disable", ret);drivers/scsi/ufs/ufshcd.c +3
-5- goto out; +return ; } hba->dev_info.wb_buf_flush_enabled = enable; -dev_dbg (hba->dev,"WB-Buf Flush %s\n" , enable ?"enabled" :"disabled" ); -out: -return ret; - +dev_dbg (hba->dev,"%s WB-Buf Flush %s\n" , + __func__, enable ?"enabled" :"disabled" ); } static bool ufshcd_wb_presrv_usrspc_keep_vcc_on(struct ufs_hba *hba,drivers/scsi/ufs/ufshcd.h +1
-1@@ -1099,7 +1099,7 @@ int ufshcd_exec_raw_upiu_cmd(struct ufs_hba *hba, u8 *desc_buff, int *buff_len, enum query_opcode desc_op); -int ufshcd_wb_ctrl (struct ufs_hba *hba,bool enable); +int ufshcd_wb_toggle (struct ufs_hba *hba,bool enable);/* Wrapper functions for safely calling variant operations */ static inline const char *ufshcd_get_var_name(struct
ufs_hba*hba)
--
1.9.1