| Message ID | 20200428111355.1776-3-stanley.chu@mediatek.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | scsi: ufs: support LU Dedicated buffer type for WriteBooster | expand |
> -----Original Message----- > From: Stanley Chu <stanley.chu@mediatek.com> > Sent: Tuesday, April 28, 2020 1:14 PM > To: linux-scsi@vger.kernel.org; martin.petersen@oracle.com; > avri.altman@wdc.com; alim.akhtar@samsung.com; jejb@linux.ibm.com; > asutoshd@codeaurora.org > Cc: Bean Huo (beanhuo) <beanhuo@micron.com>; cang@codeaurora.org; > matthias.bgg@gmail.com; bvanassche@acm.org; linux- > mediatek@lists.infradead.org; linux-arm-kernel@lists.infradead.org; linux- > kernel@vger.kernel.org; kuohong.wang@mediatek.com; > peter.wang@mediatek.com; chun-hung.wu@mediatek.com; > andy.teng@mediatek.com; Stanley Chu <stanley.chu@mediatek.com> > 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 <stanley.chu@mediatek.com> > --- > 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 <beanhuo@micron.com>
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);
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 <stanley.chu@mediatek.com> --- 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(-)