Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 003f641e authored by Stanley Chu's avatar Stanley Chu Committed by Greg Kroah-Hartman
Browse files

BACKPORT: scsi: ufs: Add "index" in parameter list of ufshcd_query_flag() 

For preparation of LU Dedicated buffer mode support on WriteBooster
feature, "index" parameter shall be added and allowed to be specified by
callers.

Link: https://lore.kernel.org/r/20200508080115.24233-6-stanley.chu@mediatek.com


Reviewed-by: default avatarBean Huo <beanhuo@micron.com>
Reviewed-by: default avatarAvri Altman <avri.altman@wdc.com>
Reviewed-by: default avatarCan Guo <cang@codeaurora.org>
Reviewed-by: default avatarAsutosh Das <asutoshd@codeaurora.org>
Signed-off-by: default avatarStanley Chu <stanley.chu@mediatek.com>
Signed-off-by: default avatarMartin K. Petersen <martin.petersen@oracle.com>

Bug: 151050916
(cherry picked from commit 1f34eedf9bc15d238aece3308aba0a21a1ef5fe2)
[ Resolved minor conflict in drivers/scsi/ufs/ufshcd.c ]
[ Resolved minor conflict in drivers/scsi/ufs/ufs-sysfs.c ]
Change-Id: I81f0d6c5b66d1b6733bedd3151a7784529b5bc3f
Signed-off-by: default avatarStanley Chu <stanley.chu@mediatek.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@google.com>
parent 5698f58e

drivers/scsi/ufs/ufs-sysfs.c

+1 −1
Original line number Diff line number Diff line
@@ -625,7 +625,7 @@ static ssize_t _name##_show(struct device *dev, \ 
	bool flag;							\

	struct ufs_hba *hba = dev_get_drvdata(dev);			\

	if (ufshcd_query_flag(hba, UPIU_QUERY_OPCODE_READ_FLAG,		\

		QUERY_FLAG_IDN##_uname, &flag))				\

		QUERY_FLAG_IDN##_uname, 0, &flag))				\

		return -EINVAL;						\

	return sprintf(buf, "%s\n", flag ? "true" : "false"); \

}									\

drivers/scsi/ufs/ufshcd.c

+15 −13
Original line number Diff line number Diff line
@@ -2868,13 +2868,13 @@ static inline void ufshcd_init_query(struct ufs_hba *hba, 
}



static int ufshcd_query_flag_retry(struct ufs_hba *hba,

	enum query_opcode opcode, enum flag_idn idn, bool *flag_res)

	enum query_opcode opcode, enum flag_idn idn, u8 index, bool *flag_res)

{

	int ret;

	int retries;



	for (retries = 0; retries < QUERY_REQ_RETRIES; retries++) {

		ret = ufshcd_query_flag(hba, opcode, idn, flag_res);

		ret = ufshcd_query_flag(hba, opcode, idn, index, flag_res);

		if (ret)

			dev_dbg(hba->dev,

				"%s: failed with error %d, retries %d\n",
@@ -2895,16 +2895,17 @@ static int ufshcd_query_flag_retry(struct ufs_hba *hba, 
 * @hba: per-adapter instance

 * @opcode: flag query to perform

 * @idn: flag idn to access

 * @index: flag index to access

 * @flag_res: the flag value after the query request completes

 *

 * Returns 0 for success, non-zero in case of failure

 */

int ufshcd_query_flag(struct ufs_hba *hba, enum query_opcode opcode,

			enum flag_idn idn, bool *flag_res)

			enum flag_idn idn, u8 index, bool *flag_res)

{

	struct ufs_query_req *request = NULL;

	struct ufs_query_res *response = NULL;

	int err, index = 0, selector = 0;

	int err, selector = 0;

	int timeout = QUERY_REQ_TIMEOUT;



	BUG_ON(!hba);
@@ -4347,7 +4348,7 @@ static int ufshcd_complete_dev_init(struct ufs_hba *hba) 
	bool flag_res = 1;



	err = ufshcd_query_flag_retry(hba, UPIU_QUERY_OPCODE_SET_FLAG,

		QUERY_FLAG_IDN_FDEVICEINIT, NULL);

		QUERY_FLAG_IDN_FDEVICEINIT, 0, NULL);

	if (err) {

		dev_err(hba->dev,

			"%s setting fDeviceInit flag failed with error %d\n",
@@ -4358,7 +4359,7 @@ static int ufshcd_complete_dev_init(struct ufs_hba *hba) 
	/* poll for max. 1000 iterations for fDeviceInit flag to clear */

	for (i = 0; i < 1000 && !err && flag_res; i++)

		err = ufshcd_query_flag_retry(hba, UPIU_QUERY_OPCODE_READ_FLAG,

			QUERY_FLAG_IDN_FDEVICEINIT, &flag_res);

			QUERY_FLAG_IDN_FDEVICEINIT, 0, &flag_res);



	if (err)

		dev_err(hba->dev,
@@ -5220,7 +5221,7 @@ static int ufshcd_enable_auto_bkops(struct ufs_hba *hba) 
		goto out;



	err = ufshcd_query_flag_retry(hba, UPIU_QUERY_OPCODE_SET_FLAG,

			QUERY_FLAG_IDN_BKOPS_EN, NULL);

			QUERY_FLAG_IDN_BKOPS_EN, 0, NULL);

	if (err) {

		dev_err(hba->dev, "%s: failed to enable bkops %d\n",

				__func__, err);
@@ -5270,7 +5271,7 @@ static int ufshcd_disable_auto_bkops(struct ufs_hba *hba) 
	}



	err = ufshcd_query_flag_retry(hba, UPIU_QUERY_OPCODE_CLEAR_FLAG,

			QUERY_FLAG_IDN_BKOPS_EN, NULL);

			QUERY_FLAG_IDN_BKOPS_EN, 0, NULL);

	if (err) {

		dev_err(hba->dev, "%s: failed to disable bkops %d\n",

				__func__, err);
@@ -5435,7 +5436,7 @@ static int ufshcd_wb_ctrl(struct ufs_hba *hba, bool enable) 
		opcode = UPIU_QUERY_OPCODE_CLEAR_FLAG;



	ret = ufshcd_query_flag_retry(hba, opcode,

				      QUERY_FLAG_IDN_WB_EN, NULL);

				      QUERY_FLAG_IDN_WB_EN, 0, NULL);

	if (ret) {

		dev_err(hba->dev, "%s write booster %s failed %d\n",

			__func__, enable ? "enable" : "disable", ret);
@@ -5459,7 +5460,7 @@ static int ufshcd_wb_toggle_flush_during_h8(struct ufs_hba *hba, bool set) 
		val = UPIU_QUERY_OPCODE_CLEAR_FLAG;



	return ufshcd_query_flag_retry(hba, val,

			       QUERY_FLAG_IDN_WB_BUFF_FLUSH_DURING_HIBERN8,

			       QUERY_FLAG_IDN_WB_BUFF_FLUSH_DURING_HIBERN8, 0,

				       NULL);

}
@@ -5480,7 +5481,8 @@ static int ufshcd_wb_buf_flush_enable(struct ufs_hba *hba) 
		return 0;



	ret = ufshcd_query_flag_retry(hba, UPIU_QUERY_OPCODE_SET_FLAG,

				      QUERY_FLAG_IDN_WB_BUFF_FLUSH_EN, NULL);

				      QUERY_FLAG_IDN_WB_BUFF_FLUSH_EN,

				      0, NULL);

	if (ret)

		dev_err(hba->dev, "%s WB - buf flush enable failed %d\n",

			__func__, ret);
@@ -5499,7 +5501,7 @@ static int ufshcd_wb_buf_flush_disable(struct ufs_hba *hba) 
		return 0;



	ret = ufshcd_query_flag_retry(hba, UPIU_QUERY_OPCODE_CLEAR_FLAG,

				      QUERY_FLAG_IDN_WB_BUFF_FLUSH_EN, NULL);

				      QUERY_FLAG_IDN_WB_BUFF_FLUSH_EN, 0, NULL);

	if (ret) {

		dev_warn(hba->dev, "%s: WB - buf flush disable failed %d\n",

			 __func__, ret);
@@ -7420,7 +7422,7 @@ static int ufshcd_device_params_init(struct ufs_hba *hba) 
	}



	if (!ufshcd_query_flag_retry(hba, UPIU_QUERY_OPCODE_READ_FLAG,

			QUERY_FLAG_IDN_PWR_ON_WPE, &flag))

			QUERY_FLAG_IDN_PWR_ON_WPE, 0, &flag))

		hba->dev_info.f_power_on_wp_en = flag;



	/* Probe maximum power mode co-supported by both UFS host and device */

drivers/scsi/ufs/ufshcd.h

+1 −1
Original line number Diff line number Diff line
@@ -1051,7 +1051,7 @@ int ufshcd_read_desc_param(struct ufs_hba *hba, 
int ufshcd_query_attr(struct ufs_hba *hba, enum query_opcode opcode,

		      enum attr_idn idn, u8 index, u8 selector, u32 *attr_val);

int ufshcd_query_flag(struct ufs_hba *hba, enum query_opcode opcode,

	enum flag_idn idn, bool *flag_res);

	enum flag_idn idn, u8 index, bool *flag_res);



void ufshcd_auto_hibern8_enable(struct ufs_hba *hba);

void ufshcd_auto_hibern8_update(struct ufs_hba *hba, u32 ahit);