Commit d3ba622d authored by Bean Huo's avatar Bean Huo Committed by Martin K. Petersen
Browse files

scsi: ufs: Cleanup WB buffer flush toggle implementation 

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: default avatarStanley Chu <stanley.chu@mediatek.com>
Reviewed-by: default avatarCan Guo <cang@codeaurora.org>
Signed-off-by: default avatarBean Huo <beanhuo@micron.com>
Signed-off-by: default avatarMartin K. Petersen <martin.petersen@oracle.com>
parent c750a9c9

drivers/scsi/ufs/ufshcd.c

+19 −42
Original line number Diff line number Diff line
@@ -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);
@@ -5474,58 +5472,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,