leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

scsi: ufs: Cleanup WB buffer flush toggle implementation

Browse Source 
Delete ufshcd_wb_buf_flush_enable() and ufshcd_wb_buf_flush_disable(). Move
the implementation into ufshcd_wb_toggle_flush().

Link: https://lore.kernel.org/r/20210121185736.12471-1-huobean@gmail.com
Reviewed-by: Stanley Chu <stanley.chu@mediatek.com>
Reviewed-by: Can Guo <cang@codeaurora.org>
Signed-off-by: Bean Huo <beanhuo@micron.com>
Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>
This commit is contained in:
Bean Huo 2021-01-21 19:57:36 +01:00 committed by Martin K. Petersen
parent c750a9c9c5
commit d3ba622db8
1 changed files with 23 additions and 46 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

69
drivers/scsi/ufs/ufshcd.c
View File

@ -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, static inline int ufshcd_config_vreg_hpm(struct ufs_hba *hba,
struct ufs_vreg *vreg); struct ufs_vreg *vreg);
static int ufshcd_try_to_abort_task(struct ufs_hba *hba, int tag); 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 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_lpm(struct ufs_hba *hba);
static void ufshcd_hba_vreg_set_hpm(struct ufs_hba *hba); static void ufshcd_hba_vreg_set_hpm(struct ufs_hba *hba);
@ -5474,58 +5472,37 @@ static int ufshcd_wb_toggle_flush_during_h8(struct ufs_hba *hba, bool set)
index, NULL); index, NULL);
} }
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)
{ {
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) if (enable)
ufshcd_wb_buf_flush_enable(hba); opcode = UPIU_QUERY_OPCODE_SET_FLAG;
else else
ufshcd_wb_buf_flush_disable(hba); opcode = UPIU_QUERY_OPCODE_CLEAR_FLAG;
}
static int ufshcd_wb_buf_flush_enable(struct ufs_hba *hba)
{
int ret;
u8 index;
if (!ufshcd_is_wb_allowed(hba) || hba->dev_info.wb_buf_flush_enabled)
return 0;
index = ufshcd_wb_get_query_index(hba); index = ufshcd_wb_get_query_index(hba);
ret = ufshcd_query_flag_retry(hba, UPIU_QUERY_OPCODE_SET_FLAG, ret = ufshcd_query_flag_retry(hba, opcode,
QUERY_FLAG_IDN_WB_BUFF_FLUSH_EN, QUERY_FLAG_IDN_WB_BUFF_FLUSH_EN, index,
index, NULL); 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)
return 0;
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);
if (ret) { if (ret) {
dev_warn(hba->dev, "%s: WB - buf flush disable failed %d\n", dev_err(hba->dev, "%s WB-Buf Flush %s failed %d\n", __func__,
__func__, ret); enable ? "enable" : "disable", ret);
} else { goto out;
hba->dev_info.wb_buf_flush_enabled = false;
dev_dbg(hba->dev, "WB - Flush disabled: %d\n", ret);
} }
hba->dev_info.wb_buf_flush_enabled = enable;
dev_dbg(hba->dev, "WB-Buf Flush %s\n", enable ? "enabled" : "disabled");
out:
return ret; return ret;
} }
static bool ufshcd_wb_presrv_usrspc_keep_vcc_on(struct ufs_hba *hba, static bool ufshcd_wb_presrv_usrspc_keep_vcc_on(struct ufs_hba *hba,