scsi: ufs: cleanup ufs initialization path
PATCH 1/1 scsi: ufs: cleanup ufs initialization path
From: Bean Huo <[email protected]>
At UFS initialization stage, to get the length of the descriptor, ufshcd_read_desc_length() being called 6 times, this is exactly useless. This patch is to delete unnecessary reductant code, remove ufshcd_read_desc_length() and boost UFS initialization.
--- drivers/scsi/ufs/ufshcd.c | 165 ++++++++------------------------------ drivers/scsi/ufs/ufshcd.h | 12 +-- 2 files changed, 34 insertions(+), 143 deletions(-)
drivers/scsi/ufs/ufshcd.c +33 -132
@@ -3052,47 +3052,6 @@ int ufshcd_query_descriptor_retry(struct ufs_hba *hba,return err; } -/** -* ufshcd_read_desc_length - read the specified descriptor length from header -* @hba: Pointer to adapter instance -* @desc_id: descriptor idn value -* @desc_index: descriptor index -* @desc_length: pointer to variable to read the length of descriptor -* -* Return 0 in case of success, non-zero otherwise -*/ -static int ufshcd_read_desc_length (struct ufs_hba *hba, -enum desc_idn desc_id, -int desc_index, -int *desc_length) -{ -int ret; -u8 header[QUERY_DESC_HDR_SIZE ]; -int header_len =QUERY_DESC_HDR_SIZE ; - -if (desc_id >=QUERY_DESC_IDN_MAX ) -return -EINVAL ; - - ret =ufshcd_query_descriptor_retry (hba,UPIU_QUERY_OPCODE_READ_DESC , - desc_id, desc_index,0 , header, - &header_len); - -if (ret) { -dev_err (hba->dev,"%s: Failed to get descriptor header id %d" , - __func__, desc_id); -return ret; - }else if (desc_id != header[QUERY_DESC_DESC_TYPE_OFFSET ]) { -dev_warn (hba->dev,"%s: descriptor header id %d and desc_id %d mismatch" , - __func__, header[QUERY_DESC_DESC_TYPE_OFFSET ], - desc_id); - ret = -EINVAL ; - } - - *desc_length = header[QUERY_DESC_LENGTH_OFFSET ]; -return ret; - -} -/** * ufshcd_map_desc_id_to_length - map descriptor IDN to its length * @hba: Pointer to adapter instance
@@ -3101,46 +3060,27 @@ static int ufshcd_read_desc_length(struct ufs_hba *hba,* * Return 0 in case of success, non-zero otherwise */ -int ufshcd_map_desc_id_to_length (struct ufs_hba *hba, -enum desc_idn desc_id,int *desc_len) +int ufshcd_map_desc_id_to_length (struct ufs_hba *hba,enum desc_idn desc_id, +int *desc_len) { -switch (desc_id) { -case QUERY_DESC_IDN_DEVICE : - *desc_len = hba->desc_size.dev_desc; -break ; -case QUERY_DESC_IDN_POWER : - *desc_len = hba->desc_size.pwr_desc; -break ; -case QUERY_DESC_IDN_GEOMETRY : - *desc_len = hba->desc_size.geom_desc; -break ; -case QUERY_DESC_IDN_CONFIGURATION : - *desc_len = hba->desc_size.conf_desc; -break ; -case QUERY_DESC_IDN_UNIT : - *desc_len = hba->desc_size.unit_desc; -break ; -case QUERY_DESC_IDN_INTERCONNECT : - *desc_len = hba->desc_size.interc_desc; -break ; -case QUERY_DESC_IDN_STRING : - *desc_len =QUERY_DESC_MAX_SIZE ; -break ; -case QUERY_DESC_IDN_HEALTH : - *desc_len = hba->desc_size.hlth_desc; -break ; -case QUERY_DESC_IDN_RFU_0 : -case QUERY_DESC_IDN_RFU_1 : - *desc_len =0 ; -break ; -default : +if (desc_id >=QUERY_DESC_IDN_MAX ) { *desc_len =0 ;return -EINVAL ; } + + *desc_len = hba->desc_size[desc_id];return 0 ; }EXPORT_SYMBOL (ufshcd_map_desc_id_to_length); +static void ufshcd_update_desc_length (struct ufs_hba *hba, +enum desc_idn desc_id,int desc_len) +{ +if (hba->desc_size[desc_id] ==QUERY_DESC_MAX_SIZE && + desc_id !=QUERY_DESC_IDN_STRING ) + hba->desc_size[desc_id] = desc_len; +} +/** * ufshcd_read_desc_param - read the specified descriptor parameter * @hba: Pointer to adapter instance
@@ -3209,6 +3149,9 @@ int ufshcd_read_desc_param(struct ufs_hba *hba, goto out; } +ufshcd_update_desc_length (hba, desc_id, + desc_buf[QUERY_DESC_LENGTH_OFFSET ]); +/* Check wherher we will not copy more data, than available */ if (is_kmalloc && param_size > buff_len) param_size = buff_len;
@@ -3221,16 +3164,6 @@ int ufshcd_read_desc_param(struct ufs_hba *hba,return ret; } -static inline int ufshcd_read_desc (struct ufs_hba *hba, -enum desc_idn desc_id, -int desc_index, -void *buf, -u32 size) -{ -return ufshcd_read_desc_param (hba, desc_id, desc_index,0 , buf, size); -} - -/** * struct uc_string_id - unicode string *
@@ -3278,9 +3211,8 @@ int ufshcd_read_string_desc(struct ufs_hba *hba, u8 desc_index,if (!uc_str)return -ENOMEM ; - ret =ufshcd_read_desc (hba,QUERY_DESC_IDN_STRING , - desc_index, uc_str, -QUERY_DESC_MAX_SIZE ); + ret =ufshcd_read_desc_param (hba,QUERY_DESC_IDN_STRING , desc_index,0 , + (u8 *)uc_str,QUERY_DESC_MAX_SIZE );if (ret <0 ) {dev_err (hba->dev,"Reading String Desc failed after %d retries. err = %d\n" ,QUERY_REQ_RETRIES , ret);
@@ -6676,7 +6608,7 @@ static u32 ufshcd_find_max_sup_active_icc_level(struct ufs_hba *hba,static void ufshcd_set_active_icc_lvl (struct ufs_hba *hba) {int ret; -int buff_len = hba->desc_size.pwr_desc; +int buff_len = hba->desc_size[QUERY_DESC_IDN_POWER ];u8 *desc_buf;u32 icc_level;
@@ -6684,8 +6616,8 @@ static void ufshcd_set_active_icc_lvl(struct ufs_hba *hba)if (!desc_buf)return ; - ret =ufshcd_read_desc (hba,QUERY_DESC_IDN_POWER ,0 , - desc_buf, buff_len); + ret =ufshcd_read_desc_param (hba,QUERY_DESC_IDN_POWER ,0 ,0 , + desc_buf, buff_len);if (ret) { dev_err(hba->dev, "%s: Failed reading power descriptor.len = %d ret = %d",
@@ -6794,7 +6726,8 @@ static void ufshcd_wb_probe(struct ufs_hba *hba, u8 *desc_buf)if (!ufshcd_is_wb_allowed (hba))return ; -if (hba->desc_size.dev_desc <DEVICE_DESC_PARAM_EXT_UFS_FEATURE_SUP +4 ) +if (hba->desc_size[QUERY_DESC_IDN_DEVICE ] < +DEVICE_DESC_PARAM_EXT_UFS_FEATURE_SUP +4 ) goto wb_disabled; hba->dev_info.d_ext_ufs_feature_sup =
@@ -6881,7 +6814,7 @@ static int ufs_get_device_desc(struct ufs_hba *hba)u8 *desc_buf;struct ufs_dev_info *dev_info = &hba->dev_info; - buff_len =max_t (size_t, hba->desc_size.dev_desc, + buff_len =max_t (size_t, hba->desc_size[QUERY_DESC_IDN_DEVICE ],QUERY_DESC_MAX_SIZE +1 ); desc_buf =kmalloc (buff_len,GFP_KERNEL );if (!desc_buf) {
@@ -6889,8 +6822,8 @@ static int ufs_get_device_desc(struct ufs_hba *hba) goto out; } - err =ufshcd_read_desc (hba,QUERY_DESC_IDN_DEVICE ,0 , desc_buf, - hba->desc_size.dev_desc); + err =ufshcd_read_desc_param (hba,QUERY_DESC_IDN_DEVICE ,0 ,0 , desc_buf, + hba->desc_size[QUERY_DESC_IDN_DEVICE ]);if (err) {dev_err (hba->dev,"%s: Failed reading Device Desc. err = %d\n" , __func__, err);
@@ -7120,42 +7053,10 @@ static void ufshcd_clear_dbg_ufs_stats(struct ufs_hba *hba)static void ufshcd_init_desc_sizes (struct ufs_hba *hba) { -int err; - - err =ufshcd_read_desc_length (hba,QUERY_DESC_IDN_DEVICE ,0 , - &hba->desc_size.dev_desc); -if (err) - hba->desc_size.dev_desc =QUERY_DESC_DEVICE_DEF_SIZE ; - - err =ufshcd_read_desc_length (hba,QUERY_DESC_IDN_POWER ,0 , - &hba->desc_size.pwr_desc); -if (err) - hba->desc_size.pwr_desc =QUERY_DESC_POWER_DEF_SIZE ; - - err =ufshcd_read_desc_length (hba,QUERY_DESC_IDN_INTERCONNECT ,0 , - &hba->desc_size.interc_desc); -if (err) - hba->desc_size.interc_desc =QUERY_DESC_INTERCONNECT_DEF_SIZE ; - - err =ufshcd_read_desc_length (hba,QUERY_DESC_IDN_CONFIGURATION ,0 , - &hba->desc_size.conf_desc); -if (err) - hba->desc_size.conf_desc =QUERY_DESC_CONFIGURATION_DEF_SIZE ; - - err =ufshcd_read_desc_length (hba,QUERY_DESC_IDN_UNIT ,0 , - &hba->desc_size.unit_desc); -if (err) - hba->desc_size.unit_desc =QUERY_DESC_UNIT_DEF_SIZE ; - - err =ufshcd_read_desc_length (hba,QUERY_DESC_IDN_GEOMETRY ,0 , - &hba->desc_size.geom_desc); -if (err) - hba->desc_size.geom_desc =QUERY_DESC_GEOMETRY_DEF_SIZE ; +int i; - err =ufshcd_read_desc_length (hba,QUERY_DESC_IDN_HEALTH ,0 , - &hba->desc_size.hlth_desc); -if (err) - hba->desc_size.hlth_desc =QUERY_DESC_HEALTH_DEF_SIZE ; +for (i =0 ; i <QUERY_DESC_IDN_MAX ; i++) + hba->desc_size[i] =QUERY_DESC_MAX_SIZE ; }static int ufshcd_device_geo_params_init (struct ufs_hba *hba)
@@ -7164,15 +7065,15 @@ static int ufshcd_device_geo_params_init(struct ufs_hba *hba)size_t buff_len;u8 *desc_buf; - buff_len = hba->desc_size.geom_desc; + buff_len = hba->desc_size[QUERY_DESC_IDN_GEOMETRY ]; desc_buf =kmalloc (buff_len,GFP_KERNEL );if (!desc_buf) { err = -ENOMEM ; goto out; } - err =ufshcd_read_desc (hba,QUERY_DESC_IDN_GEOMETRY ,0 , - desc_buf, buff_len); + err =ufshcd_read_desc_param (hba,QUERY_DESC_IDN_GEOMETRY ,0 ,0 , + desc_buf, buff_len);if (err) {dev_err (hba->dev,"%s: Failed reading Geometry Desc. err = %d\n" , __func__, err);
@@ -7265,7 +7166,7 @@ static int ufshcd_device_params_init(struct ufs_hba *hba)/* Clear any previous UFS device information */ memset (&hba->dev_info,0 ,sizeof (hba->dev_info)); -/* Init check for device descriptor sizes */ +/* Init device descriptor sizes */ ufshcd_init_desc_sizes (hba);/* Init UFS geometry descriptor related parameters */
drivers/scsi/ufs/ufshcd.h +1 -11
@@ -236,16 +236,6 @@ struct ufs_dev_cmd {struct ufs_query query; }; -struct ufs_desc_size { -int dev_desc; -int pwr_desc; -int geom_desc; -int interc_desc; -int unit_desc; -int conf_desc; -int hlth_desc; -}; -/** * struct ufs_clk_info - UFS clock related info * @list: list headed by hba->clk_list_head
@@ -738,7 +728,7 @@ struct ufs_hba {bool is_urgent_bkops_lvl_checked;struct rw_semaphore clk_scaling_lock; -struct ufs_desc_size desc_size; +u8 desc_size[QUERY_DESC_IDN_MAX ];atomic_t scsi_block_reqs_cnt;struct device bsg_dev;
Signature · 1 line
2.17.1
kbuild test robot
build botThank you for the patch! Perhaps something to improve:
Hi Bean,
Thank you for the patch! Perhaps something to improve:
[auto build test WARNING on scsi/for-next]
[also build test WARNING on next-20200526]
[cannot apply to mkp-scsi/for-next v5.7-rc7]
[if your patch is applied to the wrong git tree, please drop us a note to help improve the system. BTW, we also suggest to use '--base' option to specify the base tree in git format-patch, please see https://stackoverflow.com/a/37406982]
url: https://github.com/0day-ci/linux/commits/Bean-Huo/scsi-ufs-cleanup-ufs-initialization-path/20200528-003043 base: https://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi.git for-next config: i386-randconfig-a003-20200527 (attached as .config) compiler: gcc-5 (Ubuntu 5.5.0-12ubuntu1) 5.5.0 20171010 reproduce (this is a W=1 build): # save the attached .config to linux build tree make W=1 ARCH=i386
If you fix the issue, kindly add following tag as appropriate
All warnings (new ones prefixed by >>, old ones prefixed by <<):
In file included from include/linux/list.h:9:0,
from include/linux/async.h:12,
from drivers/scsi/ufs/ufshcd.c:40:drivers/scsi/ufs/ufshcd.c: In function 'ufs_get_device_desc':include/linux/kernel.h:942:63: warning: comparison is always false due to limited range of data type [-Wtype-limits] #define max_t(type, x, y) __careful_cmp((type)(x), (type)(y), >)
^include/linux/kernel.h:858:30: note: in definition of macro '__cmp'
#define __cmp(x, y, op) ((x) op (y) ? (x) : (y))
^include/linux/kernel.h:942:27: note: in expansion of macro '__careful_cmp'
#define max_t(type, x, y) __careful_cmp((type)(x), (type)(y), >)
^
>> drivers/scsi/ufs/ufshcd.c:6834:13: note: in expansion of macro 'max_t'
buff_len = max_t(size_t, hba->desc_size[QUERY_DESC_IDN_DEVICE], ^
vim +/max_t +6834 drivers/scsi/ufs/ufshcd.c
6825
6826 static int ufs_get_device_desc(struct ufs_hba *hba)
6827 {
6828 int err;
6829 size_t buff_len;
6830 u8 model_index;
6831 u8 *desc_buf;
6832 struct ufs_dev_info *dev_info = &hba->dev_info;
6833
> 6834 buff_len = max_t(size_t, hba->desc_size[QUERY_DESC_IDN_DEVICE],
6835 QUERY_DESC_MAX_SIZE + 1);
6836 desc_buf = kmalloc(buff_len, GFP_KERNEL);
6837 if (!desc_buf) {
6838 err = -ENOMEM;
6839 goto out;
6840 }
6841
6842 err = ufshcd_read_desc_param(hba, QUERY_DESC_IDN_DEVICE, 0, 0, desc_buf,
6843 hba->desc_size[QUERY_DESC_IDN_DEVICE]);
6844 if (err) {
6845 dev_err(hba->dev, "%s: Failed reading Device Desc. err = %d\n",
6846 __func__, err);
6847 goto out;
6848 }
6849
6850 /*
6851 * getting vendor (manufacturerID) and Bank Index in big endian
6852 * format
6853 */
6854 dev_info->wmanufacturerid = desc_buf[DEVICE_DESC_PARAM_MANF_ID] << 8 |
6855 desc_buf[DEVICE_DESC_PARAM_MANF_ID + 1];
6856
6857 /* getting Specification Version in big endian format */
6858 dev_info->wspecversion = desc_buf[DEVICE_DESC_PARAM_SPEC_VER] << 8 |
6859 desc_buf[DEVICE_DESC_PARAM_SPEC_VER + 1];
6860
6861 model_index = desc_buf[DEVICE_DESC_PARAM_PRDCT_NAME];
6862
6863 err = ufshcd_read_string_desc(hba, model_index,
6864 &dev_info->model, SD_ASCII_STD);
6865 if (err < 0) {
6866 dev_err(hba->dev, "%s: Failed reading Product Name. err = %d\n",
6867 __func__, err);
6868 goto out;
6869 }
6870
6871 ufs_fixup_device_setup(hba);
6872
6873 /*
6874 * Probe WB only for UFS-3.1 devices or UFS devices with quirk
6875 * UFS_DEVICE_QUIRK_SUPPORT_EXTENDED_FEATURES enabled
6876 */
6877 if (dev_info->wspecversion >= 0x310 ||
6878 (hba->dev_quirks & UFS_DEVICE_QUIRK_SUPPORT_EXTENDED_FEATURES))
6879 ufshcd_wb_probe(hba, desc_buf);
6880
6881 /*
6882 * ufshcd_read_string_desc returns size of the string
6883 * reset the error value
6884 */
6885 err = 0;
6886
6887 out:
6888 kfree(desc_buf);
6889 return err;
6890 }
6891
---
0-DAY CI Kernel Test Service, Intel Corporation
https://lists.01.org/hyperkitty/list/kbuild-all(a)lists.01.org