LinuxLists.cc - [PATCH v1 0/4] scsi: ufs: support LU Dedicated buffer type for WriteBooster

2020-04-28 11:15:53

Subject: [PATCH v1 0/4] scsi: ufs: support LU Dedicated buffer type for WriteBooster

Hi,

This patchset adds LU dedicated buffer type support for WriteBooster.

In the meanwhile, enable WriteBooster capability on MediaTek UFS platforms.

Stanley Chu (4):
scsi: ufs: allow legacy UFS devices to enable WriteBooster
scsi: ufs: add "index" in parameter list of ufshcd_query_flag()
scsi: ufs: add LU Dedicated buffer type support for WriteBooster
scsi: ufs-mediatek: enable WriteBooster capability

drivers/scsi/ufs/ufs-mediatek.c | 3 +
drivers/scsi/ufs/ufs-sysfs.c | 2 +-
drivers/scsi/ufs/ufs.h | 7 +++
drivers/scsi/ufs/ufshcd.c | 98 +++++++++++++++++++++++++--------
drivers/scsi/ufs/ufshcd.h | 2 +-
5 files changed, 86 insertions(+), 26 deletions(-)

--
2.18.0

2020-04-28 11:16:00

by Stanley Chu

[permalink] [raw]

Subject: [PATCH v1 2/4] scsi: ufs: add "index" in parameter list of ufshcd_query_flag()

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

Signed-off-by: Stanley Chu <[email protected]>
---
drivers/scsi/ufs/ufs-sysfs.c | 2 +-
drivers/scsi/ufs/ufshcd.c | 28 +++++++++++++++-------------
drivers/scsi/ufs/ufshcd.h | 2 +-
3 files changed, 17 insertions(+), 15 deletions(-)

diff --git a/drivers/scsi/ufs/ufs-sysfs.c b/drivers/scsi/ufs/ufs-sysfs.c
index 93484408bc40..b86b6a40d7e6 100644
--- a/drivers/scsi/ufs/ufs-sysfs.c
+++ b/drivers/scsi/ufs/ufs-sysfs.c
@@ -631,7 +631,7 @@ static ssize_t _name##_show(struct device *dev, \
struct ufs_hba *hba = dev_get_drvdata(dev); \
pm_runtime_get_sync(hba->dev); \
ret = ufshcd_query_flag(hba, UPIU_QUERY_OPCODE_READ_FLAG, \
- QUERY_FLAG_IDN##_uname, &flag); \
+ QUERY_FLAG_IDN##_uname, 0, &flag); \
pm_runtime_put_sync(hba->dev); \
if (ret) \
return -EINVAL; \
diff --git a/drivers/scsi/ufs/ufshcd.c b/drivers/scsi/ufs/ufshcd.c
index 111812c5304a..465ee023ea4b 100644
--- a/drivers/scsi/ufs/ufshcd.c
+++ b/drivers/scsi/ufs/ufshcd.c
@@ -2782,13 +2782,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",
@@ -2809,16 +2809,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);
@@ -4175,7 +4176,7 @@ static int ufshcd_complete_dev_init(struct ufs_hba *hba)
bool flag_res = true;

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",
@@ -4186,7 +4187,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,
@@ -5001,7 +5002,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);
@@ -5051,7 +5052,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);
@@ -5217,7 +5218,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);
@@ -5241,7 +5242,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);
}

@@ -5262,7 +5263,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);
@@ -5281,7 +5283,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);
@@ -7254,7 +7256,7 @@ static int ufshcd_device_params_init(struct ufs_hba *hba)
ufs_fixup_device_setup(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 */
diff --git a/drivers/scsi/ufs/ufshcd.h b/drivers/scsi/ufs/ufshcd.h
index 056537e52c19..e555d794d441 100644
--- a/drivers/scsi/ufs/ufshcd.h
+++ b/drivers/scsi/ufs/ufshcd.h
@@ -946,7 +946,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);
--
2.18.0

2020-04-28 11:16:06

by Stanley Chu

[permalink] [raw]

Subject: [PATCH v1 3/4] scsi: ufs: add LU Dedicated buffer type support for WriteBooster

According to UFS specification, there are two WriteBooster mode of
operations: "LU dedicated buffer" mode and "shared buffer" mode.
In the "LU dedicated buffer" mode, the WriteBooster Buffer is
dedicated to a logical unit.

If the device supports the "LU dedicated buffer" mode, this mode is
configured by setting bWriteBoosterBufferType to 00h. The logical
unit WriteBooster Buffer size is configured by setting the
dLUNumWriteBoosterBufferAllocUnits field of the related Unit
Descriptor. Only a value greater than zero enables the WriteBooster
feature in the logical unit.

Modify ufshcd_wb_probe() as above description to support LU Dedicated
buffer type.

Signed-off-by: Stanley Chu <[email protected]>
---
drivers/scsi/ufs/ufs.h | 7 +++++
drivers/scsi/ufs/ufshcd.c | 63 ++++++++++++++++++++++++++++++++-------
2 files changed, 59 insertions(+), 11 deletions(-)

diff --git a/drivers/scsi/ufs/ufs.h b/drivers/scsi/ufs/ufs.h
index daac5053b850..0dcb22bd46b9 100644
--- a/drivers/scsi/ufs/ufs.h
+++ b/drivers/scsi/ufs/ufs.h
@@ -330,6 +330,12 @@ enum health_desc_param {
HEALTH_DESC_PARAM_LIFE_TIME_EST_B = 0x4,
};

+/* WriteBooster buffer type */
+enum {
+ WB_TYPE_LU_DEDICATED = 0x0,
+ WB_TYPE_SINGLE_SHARED = 0x1
+};
+
/*
* Logical Unit Write Protect
* 00h: LU not write protected
@@ -559,6 +565,7 @@ struct ufs_dev_info {
bool is_lu_power_on_wp;
/* Maximum number of general LU supported by the UFS device */
u8 max_lu_supported;
+ u8 wb_dedicated_lu;
u16 wmanufacturerid;
/*UFS device Product Name */
u8 *model;
diff --git a/drivers/scsi/ufs/ufshcd.c b/drivers/scsi/ufs/ufshcd.c
index 465ee023ea4b..a665586e047b 100644
--- a/drivers/scsi/ufs/ufshcd.c
+++ b/drivers/scsi/ufs/ufshcd.c
@@ -5202,9 +5202,18 @@ static bool ufshcd_wb_sup(struct ufs_hba *hba)
return ufshcd_is_wb_allowed(hba);
}

+static int ufshcd_wb_get_index(struct ufs_hba *hba)
+{
+ if (hba->dev_info.b_wb_buffer_type == WB_TYPE_LU_DEDICATED)
+ return hba->dev_info.wb_dedicated_lu;
+ else
+ return 0;
+}
+
static int ufshcd_wb_ctrl(struct ufs_hba *hba, bool enable)
{
int ret;
+ u8 index;
enum query_opcode opcode;

if (!ufshcd_wb_sup(hba))
@@ -5217,8 +5226,9 @@ static int ufshcd_wb_ctrl(struct ufs_hba *hba, bool enable)
else
opcode = UPIU_QUERY_OPCODE_CLEAR_FLAG;

+ index = ufshcd_wb_get_index(hba);
ret = ufshcd_query_flag_retry(hba, opcode,
- QUERY_FLAG_IDN_WB_EN, 0, NULL);
+ QUERY_FLAG_IDN_WB_EN, index, NULL);
if (ret) {
dev_err(hba->dev, "%s write booster %s failed %d\n",
__func__, enable ? "enable" : "disable", ret);
@@ -5235,15 +5245,17 @@ static int ufshcd_wb_ctrl(struct ufs_hba *hba, bool enable)
static int 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;

+ index = ufshcd_wb_get_index(hba);
return ufshcd_query_flag_retry(hba, val,
- QUERY_FLAG_IDN_WB_BUFF_FLUSH_DURING_HIBERN8, 0,
- NULL);
+ QUERY_FLAG_IDN_WB_BUFF_FLUSH_DURING_HIBERN8,
+ index, NULL);
}

static inline void ufshcd_wb_toggle_flush(struct ufs_hba *hba, bool enable)
@@ -5258,13 +5270,15 @@ static inline void ufshcd_wb_toggle_flush(struct ufs_hba *hba, bool enable)
static int ufshcd_wb_buf_flush_enable(struct ufs_hba *hba)
{
int ret;
+ u8 index;

if (!ufshcd_wb_sup(hba) || hba->wb_buf_flush_enabled)
return 0;

+ index = ufshcd_wb_get_index(hba);
ret = ufshcd_query_flag_retry(hba, UPIU_QUERY_OPCODE_SET_FLAG,
QUERY_FLAG_IDN_WB_BUFF_FLUSH_EN,
- 0, NULL);
+ index, NULL);
if (ret)
dev_err(hba->dev, "%s WB - buf flush enable failed %d\n",
__func__, ret);
@@ -5278,12 +5292,15 @@ static int ufshcd_wb_buf_flush_enable(struct ufs_hba *hba)
static int ufshcd_wb_buf_flush_disable(struct ufs_hba *hba)
{
int ret;
+ u8 index;

if (!ufshcd_wb_sup(hba) || !hba->wb_buf_flush_enabled)
return 0;

+ index = ufshcd_wb_get_index(hba);
ret = ufshcd_query_flag_retry(hba, UPIU_QUERY_OPCODE_CLEAR_FLAG,
- QUERY_FLAG_IDN_WB_BUFF_FLUSH_EN, 0, NULL);
+ 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);
@@ -6802,6 +6819,10 @@ static int ufshcd_scsi_add_wlus(struct ufs_hba *hba)

static void ufshcd_wb_probe(struct ufs_hba *hba, u8 *desc_buf)
{
+ int ret;
+ u8 lun;
+ u32 d_lu_wb_buf_alloc = 0;
+
if (hba->desc_size.dev_desc <= DEVICE_DESC_PARAM_EXT_UFS_FEATURE_SUP)
goto wb_disabled;

@@ -6821,15 +6842,35 @@ static void ufshcd_wb_probe(struct ufs_hba *hba, u8 *desc_buf)
hba->dev_info.b_wb_buffer_type =
desc_buf[DEVICE_DESC_PARAM_WB_TYPE];

- hba->dev_info.d_wb_alloc_units =
- get_unaligned_be32(desc_buf +
- DEVICE_DESC_PARAM_WB_SHARED_ALLOC_UNITS);
hba->dev_info.b_presrv_uspc_en =
desc_buf[DEVICE_DESC_PARAM_WB_PRESRV_USRSPC_EN];

- if (!(hba->dev_info.b_wb_buffer_type &&
- hba->dev_info.d_wb_alloc_units))
- goto wb_disabled;
+ if (hba->dev_info.b_wb_buffer_type == WB_TYPE_SINGLE_SHARED) {
+ hba->dev_info.d_wb_alloc_units =
+ get_unaligned_be32(desc_buf +
+ DEVICE_DESC_PARAM_WB_SHARED_ALLOC_UNITS);
+ if (!hba->dev_info.d_wb_alloc_units)
+ goto wb_disabled;
+ } else {
+ for (lun = 0; lun < hba->dev_info.max_lu_supported; lun++) {
+ ret = ufshcd_read_unit_desc_param(hba,
+ lun,
+ UNIT_DESC_PARAM_WB_BUF_ALLOC_UNITS,
+ (u8 *)&d_lu_wb_buf_alloc,
+ sizeof(d_lu_wb_buf_alloc));
+ if (ret)
+ goto wb_disabled;
+ if (d_lu_wb_buf_alloc) {
+ hba->dev_info.wb_dedicated_lu = lun;
+ break;
+ }
+ }
+
+ if (!d_lu_wb_buf_alloc)
+ goto wb_disabled;
+ }
+
+ return;

wb_disabled:
hba->caps &= ~UFSHCD_CAP_WB_EN;
--
2.18.0

2020-04-28 11:17:28

by Stanley Chu

[permalink] [raw]

Subject: [PATCH v1 1/4] scsi: ufs: allow legacy UFS devices to enable WriteBooster

WriteBooster feature may be supported by some legacy UFS devices
(i.e., < 3.1) by upgrading firmware.

To enable WriteBooster feature in such devices, relax the entrance
condition of ufshcd_wb_probe() to allow host driver to check those
devices' WriteBooster capability.

WriteBooster feature can be available if below both conditions are
satisfied,

1. Device descriptor has dExtendedUFSFeaturesSupport field.
2. WriteBooster support is specified in above field.

Signed-off-by: Stanley Chu <[email protected]>
---
drivers/scsi/ufs/ufshcd.c | 19 +++++++++++++------
1 file changed, 13 insertions(+), 6 deletions(-)

diff --git a/drivers/scsi/ufs/ufshcd.c b/drivers/scsi/ufs/ufshcd.c
index 915e963398c4..111812c5304a 100644
--- a/drivers/scsi/ufs/ufshcd.c
+++ b/drivers/scsi/ufs/ufshcd.c
@@ -6800,9 +6800,16 @@ static int ufshcd_scsi_add_wlus(struct ufs_hba *hba)

static void ufshcd_wb_probe(struct ufs_hba *hba, u8 *desc_buf)
{
+ if (hba->desc_size.dev_desc <= DEVICE_DESC_PARAM_EXT_UFS_FEATURE_SUP)
+ goto wb_disabled;
+
hba->dev_info.d_ext_ufs_feature_sup =
get_unaligned_be32(desc_buf +
DEVICE_DESC_PARAM_EXT_UFS_FEATURE_SUP);
+
+ if (!(hba->dev_info.d_ext_ufs_feature_sup & UFS_DEV_WRITE_BOOSTER_SUP))
+ goto wb_disabled;
+
/*
* WB may be supported but not configured while provisioning.
* The spec says, in dedicated wb buffer mode,
@@ -6818,11 +6825,12 @@ static void ufshcd_wb_probe(struct ufs_hba *hba, u8 *desc_buf)
hba->dev_info.b_presrv_uspc_en =
desc_buf[DEVICE_DESC_PARAM_WB_PRESRV_USRSPC_EN];

- if (!((hba->dev_info.d_ext_ufs_feature_sup &
- UFS_DEV_WRITE_BOOSTER_SUP) &&
- hba->dev_info.b_wb_buffer_type &&
+ if (!(hba->dev_info.b_wb_buffer_type &&
hba->dev_info.d_wb_alloc_units))
- hba->caps &= ~UFSHCD_CAP_WB_EN;
+ goto wb_disabled;
+
+wb_disabled:
+ hba->caps &= ~UFSHCD_CAP_WB_EN;
}

static int ufs_get_device_desc(struct ufs_hba *hba)
@@ -6862,8 +6870,7 @@ static int ufs_get_device_desc(struct ufs_hba *hba)

model_index = desc_buf[DEVICE_DESC_PARAM_PRDCT_NAME];

- /* Enable WB only for UFS-3.1 */
- if (dev_info->wspecversion >= 0x310)
+ if (ufshcd_is_wb_allowed(hba))
ufshcd_wb_probe(hba, desc_buf);

err = ufshcd_read_string_desc(hba, model_index,
--
2.18.0

2020-04-28 11:19:55

by Stanley Chu

[permalink] [raw]

Subject: [PATCH v1 4/4] scsi: ufs-mediatek: enable WriteBooster capability

Enable WriteBooster capability on MediaTek UFS platforms.

Signed-off-by: Stanley Chu <[email protected]>
---
drivers/scsi/ufs/ufs-mediatek.c | 3 +++
1 file changed, 3 insertions(+)

diff --git a/drivers/scsi/ufs/ufs-mediatek.c b/drivers/scsi/ufs/ufs-mediatek.c
index 673c16596fb2..15b9c420a3a5 100644
--- a/drivers/scsi/ufs/ufs-mediatek.c
+++ b/drivers/scsi/ufs/ufs-mediatek.c
@@ -263,6 +263,9 @@ static int ufs_mtk_init(struct ufs_hba *hba)
/* Enable clock-gating */
hba->caps |= UFSHCD_CAP_CLK_GATING;

+ /* Enable WriteBooster */
+ hba->caps |= UFSHCD_CAP_WB_EN;
+
/*
* ufshcd_vops_init() is invoked after
* ufshcd_setup_clock(true) in ufshcd_hba_init() thus
--
2.18.0

2020-04-29 09:26:37

by Bean Huo (beanhuo)

[permalink] [raw]

Subject: RE: [EXT] [PATCH v1 2/4] scsi: ufs: add "index" in parameter list of ufshcd_query_flag()

> -----Original Message-----
> From: Stanley Chu <[email protected]>
> Sent: Tuesday, April 28, 2020 1:14 PM
> To: [email protected]; [email protected];
> [email protected]; [email protected]; [email protected];
> [email protected]
> Cc: Bean Huo (beanhuo) <[email protected]>; [email protected];
> [email protected]; [email protected]; linux-
> [email protected]; [email protected]; linux-
> [email protected]; [email protected];
> [email protected]; [email protected];
> [email protected]; Stanley Chu <[email protected]>
> Subject: [EXT] [PATCH v1 2/4] scsi: ufs: add "index" in parameter list of
> ufshcd_query_flag()
>
> For preparation of Dedicated LU support on WriteBooster feature, "index"
> parameter shall be added and allowed to be specified by callers.
>
> Signed-off-by: Stanley Chu <[email protected]>
> ---
> drivers/scsi/ufs/ufs-sysfs.c | 2 +-
> drivers/scsi/ufs/ufshcd.c | 28 +++++++++++++++-------------
> drivers/scsi/ufs/ufshcd.h | 2 +-
> 3 files changed, 17 insertions(+), 15 deletions(-)
>
> diff --git a/drivers/scsi/ufs/ufs-sysfs.c b/drivers/scsi/ufs/ufs-sysfs.c index
> 93484408bc40..b86b6a40d7e6 100644
> --- a/drivers/scsi/ufs/ufs-sysfs.c
> +++ b/drivers/scsi/ufs/ufs-sysfs.c
> @@ -631,7 +631,7 @@ static ssize_t _name##_show(struct device *dev,
> \
> struct ufs_hba *hba = dev_get_drvdata(dev); \
> pm_runtime_get_sync(hba->dev);
> \
> ret = ufshcd_query_flag(hba, UPIU_QUERY_OPCODE_READ_FLAG,
> \
> - QUERY_FLAG_IDN##_uname, &flag);
> \
> + QUERY_FLAG_IDN##_uname, 0, &flag); \
> pm_runtime_put_sync(hba->dev);
> \
> if (ret) \
> return -EINVAL; \
> diff --git a/drivers/scsi/ufs/ufshcd.c b/drivers/scsi/ufs/ufshcd.c index
> 111812c5304a..465ee023ea4b 100644
> --- a/drivers/scsi/ufs/ufshcd.c
> +++ b/drivers/scsi/ufs/ufshcd.c
> @@ -2782,13 +2782,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", @@ -
> 2809,16 +2809,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);
> @@ -4175,7 +4176,7 @@ static int ufshcd_complete_dev_init(struct ufs_hba
> *hba)
> bool flag_res = true;
>
> 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", @@
> -4186,7 +4187,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,
> @@ -5001,7 +5002,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);
> @@ -5051,7 +5052,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);
> @@ -5217,7 +5218,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); @@ -
> 5241,7 +5242,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);
> }
>
> @@ -5262,7 +5263,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);
> @@ -5281,7 +5283,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);
> @@ -7254,7 +7256,7 @@ static int ufshcd_device_params_init(struct ufs_hba
> *hba)
> ufs_fixup_device_setup(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 */ diff --git a/drivers/scsi/ufs/ufshcd.h b/drivers/scsi/ufs/ufshcd.h index
> 056537e52c19..e555d794d441 100644
> --- a/drivers/scsi/ufs/ufshcd.h
> +++ b/drivers/scsi/ufs/ufshcd.h
> @@ -946,7 +946,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);
> --
> 2.18.0

Reviewed-by: Bean Huo <[email protected]>

2020-04-29 10:21:30

by Bean Huo (beanhuo)

[permalink] [raw]

Subject: RE: [EXT] [PATCH v1 1/4] scsi: ufs: allow legacy UFS devices to enable WriteBooster

2020-04-29 10:21:48

by Bean Huo (beanhuo)

[permalink] [raw]

Subject: RE: [EXT] [PATCH v1 4/4] scsi: ufs-mediatek: enable WriteBooster capability

2020-04-29 10:42:16

by Bean Huo (beanhuo)

[permalink] [raw]

Subject: RE: [EXT] [PATCH v1 3/4] scsi: ufs: add LU Dedicated buffer type support for WriteBooster

>
> +/* WriteBooster buffer type */
> +enum {
> + WB_TYPE_LU_DEDICATED = 0x0,
> + WB_TYPE_SINGLE_SHARED = 0x1
> +};

Hi, Stanly
WB_TYPE_SINGLE_SHARED might be WB_TYPE_SHARED_BUFFER. I think,
we should try to make the name definition correspond to Spec

thanks,

Bean

2020-04-29 13:08:05

by Stanley Chu

[permalink] [raw]

Subject: Re: [PATCH v1 3/4] scsi: ufs: add LU Dedicated buffer type support for WriteBooster

Hi Bean,

On Wed, 2020-04-29 at 10:39 +0000, Bean Huo (beanhuo) wrote:
> >
> > +/* WriteBooster buffer type */
> > +enum {
> > + WB_TYPE_LU_DEDICATED = 0x0,
> > + WB_TYPE_SINGLE_SHARED = 0x1
> > +};
>
>
> Hi, Stanly
> WB_TYPE_SINGLE_SHARED might be WB_TYPE_SHARED_BUFFER. I think,
> we should try to make the name definition correspond to Spec

Make sense. I will fix this in next version.

Thanks,
Stanley Chu