scsi: ufs: Fix WriteBooster and cleanup UFS driver
Subsystems (2)
v2 cover scsi: ufs: Fix WriteBooster and cleanup UFS driver
Hi,
This patch set fixes some WriteBooster issues and do small cleanup in UFS driver
v1 -> v2
- Remove dummy new line in patch [4] (Asutosh)
- Add more limitation to allow WriteBooster flush during Hibern8 in runtime-suspend. Now the device power mode is kept as Active power mode only if link is put in Hibern8 or Auto-Hibern8 is enabled during runtime-suspend (Asutosh)
Stanley Chu (4):
scsi: ufs: Remove unnecessary memset for dev_info
scsi: ufs: Allow WriteBooster on UFS 2.2 devices
scsi: ufs: Fix index of attributes query for WriteBooster feature
scsi: ufs: Fix WriteBooster flush during runtime suspend
drivers/scsi/ufs/ufs-sysfs.c | 13 ++++++-- drivers/scsi/ufs/ufs.h | 1 - drivers/scsi/ufs/ufshcd.c | 62 +++++++++++++++++++----------------- drivers/scsi/ufs/ufshcd.h | 2 +- 4 files changed, 45 insertions(+), 33 deletions(-)
Signature · 1 line
2.18.0
PATCH v2 1/4 scsi: ufs: Remove unnecessary memset for dev_info
The whole UFS host instance has been zero-initialized by scsi_host_alloc(), thus UFS driver does not need to clear "dev_info" member specifically in ufshcd_device_params_init().
Simply remove the unnecessary code.
--- drivers/scsi/ufs/ufshcd.c | 3 --- 1 file changed, 3 deletions(-)
drivers/scsi/ufs/ufshcd.c +0 -3
@@ -7279,9 +7279,6 @@ static int ufshcd_device_params_init(struct ufs_hba *hba)bool flag;int ret; -/* Clear any previous UFS device information */ -memset (&hba->dev_info,0 ,sizeof (hba->dev_info)); -/* Init check for device descriptor sizes */ ufshcd_init_desc_sizes (hba);
Signature · 1 line
2.18.0
PATCH v2 2/4 scsi: ufs: Allow WriteBooster on UFS 2.2 devices
In reply to Stanley ChuAccording to the UFS specification, WriteBooster is officially supported by UFS 2.2.
Since UFS 2.2 specification has been finalized in JEDEC and such devices have also showed up in the market, modify the checking rule for ufshcd_wb_probe() to allow these devices to enable WriteBooster.
--- drivers/scsi/ufs/ufshcd.c | 1 + 1 file changed, 1 insertion(+)
drivers/scsi/ufs/ufshcd.c +1 -0
@@ -6942,6 +6942,7 @@ static int ufs_get_device_desc(struct ufs_hba *hba)* UFS_DEVICE_QUIRK_SUPPORT_EXTENDED_FEATURES enabled */ if (dev_info->wspecversion >=0x310 || + dev_info->wspecversion ==0x220 || (hba->dev_quirks &UFS_DEVICE_QUIRK_SUPPORT_EXTENDED_FEATURES ))ufshcd_wb_probe (hba, desc_buf);
Signature · 1 line
2.18.0
PATCH v2 3/4 scsi: ufs: Fix index of attributes query for WriteBooster feature
In reply to Stanley ChuFor WriteBooster feature related attributes, the index used by query shall be LUN ID if LU Dedicated buffer mode is enabled.
--- drivers/scsi/ufs/ufs-sysfs.c | 13 +++++++++++-- drivers/scsi/ufs/ufshcd.c | 16 ++++++++++------ drivers/scsi/ufs/ufshcd.h | 2 +- 3 files changed, 22 insertions(+), 9 deletions(-)
drivers/scsi/ufs/ufs-sysfs.c +11 -2
@@ -637,7 +637,7 @@ static ssize_t _name##_show(struct device *dev, \int ret; \struct ufs_hba *hba =dev_get_drvdata (dev); \ if (ufshcd_is_wb_flags(QUERY_FLAG_IDN##_uname)) \ - index =ufshcd_wb_get_flag_index (hba); \ + index =ufshcd_wb_get_query_index (hba); \pm_runtime_get_sync (hba->dev); \ ret =ufshcd_query_flag (hba,UPIU_QUERY_OPCODE_READ_FLAG , \ QUERY_FLAG_IDN##_uname, index, &flag); \
@@ -680,6 +680,12 @@ static const struct attribute_group ufs_sysfs_flags_group = { .attrs = ufs_sysfs_device_flags, }; +static inline bool ufshcd_is_wb_attrs (enum attr_idn idn) +{ +return ((idn >=QUERY_ATTR_IDN_WB_FLUSH_STATUS ) && + (idn <=QUERY_ATTR_IDN_CURR_WB_BUFF_SIZE )); +} +#define UFS_ATTRIBUTE (_name, _uname) \ static ssize_t _name##_show(struct device *dev, \ struct device_attribute *attr, char *buf) \
@@ -687,9 +693,12 @@ static ssize_t _name##_show(struct device *dev, \struct ufs_hba *hba =dev_get_drvdata (dev); \u32 value; \int ret; \ +u8 index =0 ; \ + if (ufshcd_is_wb_attrs(QUERY_ATTR_IDN##_uname)) \ + index =ufshcd_wb_get_query_index (hba); \pm_runtime_get_sync (hba->dev); \ ret =ufshcd_query_attr (hba,UPIU_QUERY_OPCODE_READ_ATTR , \ - QUERY_ATTR_IDN##_uname, 0, 0, &value); \ + QUERY_ATTR_IDN##_uname, index, 0, &value); \pm_runtime_put_sync (hba->dev); \if (ret) \return -EINVAL ; \
drivers/scsi/ufs/ufshcd.c +10 -6
@@ -5212,7 +5212,7 @@ static int ufshcd_wb_ctrl(struct ufs_hba *hba, bool enable)else opcode =UPIU_QUERY_OPCODE_CLEAR_FLAG ; - index =ufshcd_wb_get_flag_index (hba); + index =ufshcd_wb_get_query_index (hba); ret =ufshcd_query_flag_retry (hba, opcode,QUERY_FLAG_IDN_WB_EN , index,NULL );if (ret) {
@@ -5238,7 +5238,7 @@ static int ufshcd_wb_toggle_flush_during_h8(struct ufs_hba *hba, bool set)else val =UPIU_QUERY_OPCODE_CLEAR_FLAG ; - index =ufshcd_wb_get_flag_index (hba); + index =ufshcd_wb_get_query_index (hba);return ufshcd_query_flag_retry (hba, val,QUERY_FLAG_IDN_WB_BUFF_FLUSH_DURING_HIBERN8 , index,NULL );
@@ -5261,7 +5261,7 @@ static int ufshcd_wb_buf_flush_enable(struct ufs_hba *hba)if (!ufshcd_is_wb_allowed (hba) || hba->wb_buf_flush_enabled)return 0 ; - index =ufshcd_wb_get_flag_index (hba); + 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 );
@@ -5283,7 +5283,7 @@ static int ufshcd_wb_buf_flush_disable(struct ufs_hba *hba)if (!ufshcd_is_wb_allowed (hba) || !hba->wb_buf_flush_enabled)return 0 ; - index =ufshcd_wb_get_flag_index (hba); + 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 );
@@ -5303,10 +5303,12 @@ static bool ufshcd_wb_presrv_usrspc_keep_vcc_on(struct ufs_hba *hba, {u32 cur_buf;int ret; +u8 index; + index =ufshcd_wb_get_query_index (hba); ret =ufshcd_query_attr_retry (hba,UPIU_QUERY_OPCODE_READ_ATTR ,QUERY_ATTR_IDN_CURR_WB_BUFF_SIZE , -0 ,0 , &cur_buf); + index,0 , &cur_buf);if (ret) {dev_err (hba->dev,"%s dCurWriteBoosterBufferSize read failed %d\n" , __func__, ret);
@@ -5329,6 +5331,7 @@ static bool ufshcd_wb_keep_vcc_on(struct ufs_hba *hba) {int ret;u32 avail_buf; +u8 index;if (!ufshcd_is_wb_allowed (hba))return false;
@@ -5343,9 +5346,10 @@ static bool ufshcd_wb_keep_vcc_on(struct ufs_hba *hba)* buffer (dCurrentWriteBoosterBufferSize). There's no point in * keeping vcc on when current buffer is empty. */ + index =ufshcd_wb_get_query_index (hba); ret =ufshcd_query_attr_retry (hba,UPIU_QUERY_OPCODE_READ_ATTR ,QUERY_ATTR_IDN_AVAIL_WB_BUFF_SIZE , -0 ,0 , &avail_buf); + index,0 , &avail_buf);if (ret) {dev_warn (hba->dev,"%s dAvailableWriteBoosterBufferSize read failed %d\n" , __func__, ret);
drivers/scsi/ufs/ufshcd.h +1 -1
@@ -861,7 +861,7 @@ static inline bool ufshcd_keep_autobkops_enabled_except_suspend(return hba->caps &UFSHCD_CAP_KEEP_AUTO_BKOPS_ENABLED_EXCEPT_SUSPEND ; } -static inline u8 ufshcd_wb_get_flag_index (struct ufs_hba *hba) +static inline u8 ufshcd_wb_get_query_index (struct ufs_hba *hba) {if (hba->dev_info.b_wb_buffer_type ==WB_BUF_MODE_LU_DEDICATED )return hba->dev_info.wb_dedicated_lu;
Signature · 1 line
2.18.0
PATCH v2 4/4 scsi: ufs: Fix WriteBooster flush during runtime suspend
In reply to Stanley ChuCurrently UFS host driver promises VCC supply if UFS device needs to do WriteBooster flush during runtime suspend.
However the UFS specification mentions,
"While the flushing operation is in progress, the device is in Active power mode."
Therefore UFS host driver needs to promise more: Keep UFS device as "Active power mode", otherwise UFS device shall not do any flush if device enters Sleep or PowerDown power mode.
Fix this by not changing device power mode if WriteBooster flush is required in ufshcd_suspend().
--- drivers/scsi/ufs/ufs.h | 1 - drivers/scsi/ufs/ufshcd.c | 42 ++++++++++++++++++++------------------- 2 files changed, 22 insertions(+), 21 deletions(-)
drivers/scsi/ufs/ufs.h +0 -1
@@ -577,7 +577,6 @@ struct ufs_dev_info {u32 d_ext_ufs_feature_sup;u8 b_wb_buffer_type;u32 d_wb_alloc_units; -bool keep_vcc_on;u8 b_presrv_uspc_en; };
drivers/scsi/ufs/ufshcd.c +22 -20
63 lines not on this page · raw message
Signature · 1 line
2.18.0
Re: [PATCH v2 4/4] scsi: ufs: Fix WriteBooster flush during runtime suspend
Quoted 70 lines · Stanley Chu
Currently UFS host driver promises VCC supply if UFS device needs to do WriteBooster flush during runtime suspend.
However the UFS specification mentions,
"While the flushing operation is in progress, the device is in Active power mode."
Therefore UFS host driver needs to promise more: Keep UFS device as "Active power mode", otherwise UFS device shall not do any flush if device enters Sleep or PowerDown power mode.
Fix this by not changing device power mode if WriteBooster flush is required in
ufshcd_suspend().Signed-off-by Stanley Chu <[email protected]>--- drivers/scsi/ufs/ufs.h | 1 - drivers/scsi/ufs/ufshcd.c | 42 ++++++++++++++++++++------------------- 2 files changed, 22 insertions(+), 21 deletions(-)drivers/scsi/ufs/ufs.h +0
-1@@ -577,7 +577,6 @@ struct ufs_dev_info {u32 d_ext_ufs_feature_sup;u8 b_wb_buffer_type;u32 d_wb_alloc_units; -bool keep_vcc_on;u8 b_presrv_uspc_en; };drivers/scsi/ufs/ufshcd.c +5
-9@@ -8101,8 +8101,7 @@ static void ufshcd_vreg_set_lpm(struct ufs_hba *hba) !hba->dev_info.is_lu_power_on_wp) {ufshcd_setup_vreg (hba, false); } else if (!ufshcd_is_ufs_dev_active(hba)) { -if (!hba->dev_info.keep_vcc_on) -ufshcd_toggle_vreg (hba->dev, hba->vreg_info.vcc, false); +ufshcd_toggle_vreg (hba->dev, hba->vreg_info.vcc, false);if (!ufshcd_is_link_active (hba)) {ufshcd_config_vreg_lpm (hba, hba->vreg_info.vccq);ufshcd_config_vreg_lpm (hba, hba->vreg_info.vccq2);@@ -8172,6 +8171,7 @@ static int ufshcd_suspend(struct ufs_hba *hba, enum ufs_pm_op pm_op)enum ufs_pm_level pm_lvl;enum ufs_dev_pwr_mode req_dev_pwr_mode;enum uic_link_state req_link_state; +bool keep_curr_dev_pwr_mode = false; hba->pm_op_in_progress =1 ;if (!ufshcd_is_shutdown_pm (pm_op)) {@@ -8227,27 +8227,29 @@ static int ufshcd_suspend(struct ufs_hba *hba, enum ufs_pm_op pm_op)ufshcd_disable_auto_bkops (hba); }/* -* With wb enabled, if the bkops is enabled or if the -* configured WB type is 70% full, keep vcc ON -* for the device to flush the wb buffer +* If device needs to do BKOP or WB buffer flush during +* Hibern8, keep device power mode as "active power mode" +* and VCC supply. */ -if ((hba->auto_bkops_enabled &&ufshcd_is_wb_allowed (hba)) || -ufshcd_wb_keep_vcc_on (hba)) - hba->dev_info.keep_vcc_on = true; -else
drivers/scsi/ufs/ufshcd.c static int ufshcd_suspend(struct ufs_hba *hba, enum ufs_pm_op pm_op) · line 8240
Quoted 10 lines
drivers/scsi/ufs/ufshcd.c +5
-3- hba->dev_info.keep_vcc_on = false; - }else { - hba->dev_info.keep_vcc_on = false; + keep_curr_dev_pwr_mode = hba->auto_bkops_enabled || + (((req_link_state ==UIC_LINK_HIBERN8_STATE ) || + ((req_link_state ==UIC_LINK_ACTIVE_STATE ) && +ufshcd_is_auto_hibern8_enabled (hba))) && +ufshcd_wb_keep_vcc_on (hba)); }
This looks fine.
But I still think the delayed check of flush status should be done to turn-off Vcc when flush is complete.
Quoted 24 lines
drivers/scsi/ufs/ufshcd.c +12
-8-if ((req_dev_pwr_mode != hba->curr_dev_pwr_mode) && - ((ufshcd_is_runtime_pm (pm_op) && !hba->auto_bkops_enabled) || - !ufshcd_is_runtime_pm (pm_op))) { -/* ensure that bkops is disabled */ -ufshcd_disable_auto_bkops (hba); - ret =ufshcd_set_dev_pwr_mode (hba, req_dev_pwr_mode); -if (ret) - goto enable_gating; +if (req_dev_pwr_mode != hba->curr_dev_pwr_mode) { +if ((ufshcd_is_runtime_pm (pm_op) && !hba->auto_bkops_enabled) || + !ufshcd_is_runtime_pm (pm_op)) { +/* ensure that bkops is disabled */ +ufshcd_disable_auto_bkops (hba); + } + +if (!keep_curr_dev_pwr_mode) { + ret =ufshcd_set_dev_pwr_mode (hba, req_dev_pwr_mode); +if (ret) + goto enable_gating; + } }flush_work (&hba->eeh_work);
Signature · 2 lines
The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum, Linux Foundation Collaborative Project