scsi: ufs: core: Remove redundant desc_size variable from hba

Always read the descriptor with QUERY_DESC_MAX_SIZE.  According to the
spec, the device returns the actual size.

Signed-off-by: Arthur Simchaev <Arthur.Simchaev@wdc.com>
Reviewed-by: Bean Huo <beanhuo@micron.com>
Reviewed-by: Bart Van Assche <bvanassche@acm.org>
Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>

diff --git a/drivers/ufs/core/ufs_bsg.c b/drivers/ufs/core/ufs_bsg.c
index b99e3f3dc4efdc421b06ef8e1ffcdd97ad048811..7eec38c63d9f675070fa599cb1e1d44df800becf 100644 (file)
--- a/drivers/ufs/core/ufs_bsg.c
+++ b/drivers/ufs/core/ufs_bsg.c
@@ -21,11 +21,7 @@ static int ufs_bsg_get_query_desc_size(struct ufs_hba *hba, int *desc_len,
        if (desc_size <= 0)
                return -EINVAL;
 
-       ufshcd_map_desc_id_to_length(hba, desc_id, desc_len);
-       if (!*desc_len)
-               return -EINVAL;
-
-       *desc_len = min_t(int, *desc_len, desc_size);
+       *desc_len = min_t(int, QUERY_DESC_MAX_SIZE, desc_size);
 
        return 0;
 }

diff --git a/drivers/ufs/core/ufshcd-priv.h b/drivers/ufs/core/ufshcd-priv.h
index a9e8e1f5afe7aa8def71d1648904f55ef66d2a35..c52e2f349aaae0bb13809388cf96ccc8a793f8cf 100644 (file)
--- a/drivers/ufs/core/ufshcd-priv.h
+++ b/drivers/ufs/core/ufshcd-priv.h
@@ -70,9 +70,6 @@ int ufshcd_read_string_desc(struct ufs_hba *hba, u8 desc_index,
 int ufshcd_hold(struct ufs_hba *hba, bool async);
 void ufshcd_release(struct ufs_hba *hba);
 
-void ufshcd_map_desc_id_to_length(struct ufs_hba *hba, enum desc_idn desc_id,
-                                 int *desc_length);
-
 int ufshcd_send_uic_cmd(struct ufs_hba *hba, struct uic_command *uic_cmd);
 
 int ufshcd_exec_raw_upiu_cmd(struct ufs_hba *hba,

diff --git a/drivers/ufs/core/ufshcd.c b/drivers/ufs/core/ufshcd.c
index 2e47c69d9b049c6a66f8cd4de046e2b74c41b124..bb032bc3948ebb722642abfdc20f6a973e31e4c1 100644 (file)
--- a/drivers/ufs/core/ufshcd.c
+++ b/drivers/ufs/core/ufshcd.c
@@ -3368,37 +3368,6 @@ int ufshcd_query_descriptor_retry(struct ufs_hba *hba,
        return err;
 }
 
-/**
- * ufshcd_map_desc_id_to_length - map descriptor IDN to its length
- * @hba: Pointer to adapter instance
- * @desc_id: descriptor idn value
- * @desc_len: mapped desc length (out)
- */
-void ufshcd_map_desc_id_to_length(struct ufs_hba *hba, enum desc_idn desc_id,
-                                 int *desc_len)
-{
-       if (desc_id >= QUERY_DESC_IDN_MAX || desc_id == QUERY_DESC_IDN_RFU_0 ||
-           desc_id == QUERY_DESC_IDN_RFU_1)
-               *desc_len = 0;
-       else
-               *desc_len = hba->desc_size[desc_id];
-}
-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_index,
-                                     unsigned char desc_len)
-{
-       if (hba->desc_size[desc_id] == QUERY_DESC_MAX_SIZE &&
-           desc_id != QUERY_DESC_IDN_STRING && desc_index != UFS_RPMB_UNIT)
-               /* For UFS 3.1, the normal unit descriptor is 10 bytes larger
-                * than the RPMB unit, however, both descriptors share the same
-                * desc_idn, to cover both unit descriptors with one length, we
-                * choose the normal unit descriptor length by desc_index.
-                */
-               hba->desc_size[desc_id] = desc_len;
-}
-
 /**
  * ufshcd_read_desc_param - read the specified descriptor parameter
  * @hba: Pointer to adapter instance
@@ -3419,20 +3388,13 @@ int ufshcd_read_desc_param(struct ufs_hba *hba,
 {
        int ret;
        u8 *desc_buf;
-       int buff_len;
+       int buff_len = QUERY_DESC_MAX_SIZE;
        bool is_kmalloc = true;
 
        /* Safety check */
        if (desc_id >= QUERY_DESC_IDN_MAX || !param_size)
                return -EINVAL;
 
-       /* Get the length of descriptor */
-       ufshcd_map_desc_id_to_length(hba, desc_id, &buff_len);
-       if (!buff_len) {
-               dev_err(hba->dev, "%s: Failed to get desc length\n", __func__);
-               return -EINVAL;
-       }
-
        if (param_offset >= buff_len) {
                dev_err(hba->dev, "%s: Invalid offset 0x%x in descriptor IDN 0x%x, length 0x%x\n",
                        __func__, param_offset, desc_id, buff_len);
@@ -3470,7 +3432,6 @@ int ufshcd_read_desc_param(struct ufs_hba *hba,
 
        /* Update descriptor length */
        buff_len = desc_buf[QUERY_DESC_LENGTH_OFFSET];
-       ufshcd_update_desc_length(hba, desc_id, desc_index, buff_len);
 
        if (is_kmalloc) {
                /* Make sure we don't copy more data than available */
@@ -4909,7 +4870,7 @@ static void ufshcd_setup_links(struct ufs_hba *hba, struct scsi_device *sdev)
  */
 static void ufshcd_lu_init(struct ufs_hba *hba, struct scsi_device *sdev)
 {
-       int len = hba->desc_size[QUERY_DESC_IDN_UNIT];
+       int len = QUERY_DESC_MAX_SIZE;
        u8 lun = ufshcd_scsi_to_upiu_lun(sdev->lun);
        u8 lun_qdepth = hba->nutrs;
        u8 *desc_buf;
@@ -7480,25 +7441,24 @@ out:
 static void ufshcd_set_active_icc_lvl(struct ufs_hba *hba)
 {
        int ret;
-       int buff_len = hba->desc_size[QUERY_DESC_IDN_POWER];
        u8 *desc_buf;
        u32 icc_level;
 
-       desc_buf = kmalloc(buff_len, GFP_KERNEL);
+       desc_buf = kzalloc(QUERY_DESC_MAX_SIZE, GFP_KERNEL);
        if (!desc_buf)
                return;
 
        ret = ufshcd_read_desc_param(hba, QUERY_DESC_IDN_POWER, 0, 0,
-                                    desc_buf, buff_len);
+                                    desc_buf, QUERY_DESC_MAX_SIZE);
        if (ret) {
                dev_err(hba->dev,
-                       "%s: Failed reading power descriptor.len = %d ret = %d",
-                       __func__, buff_len, ret);
+                       "%s: Failed reading power descriptor ret = %d",
+                       __func__, ret);
                goto out;
        }
 
        icc_level = ufshcd_find_max_sup_active_icc_level(hba, desc_buf,
-                                                        buff_len);
+                                                        QUERY_DESC_MAX_SIZE);
        dev_dbg(hba->dev, "%s: setting icc_level 0x%x", __func__, icc_level);
 
        ret = ufshcd_query_attr_retry(hba, UPIU_QUERY_OPCODE_WRITE_ATTR,
@@ -7715,14 +7675,14 @@ static int ufs_get_device_desc(struct ufs_hba *hba)
        u8 *desc_buf;
        struct ufs_dev_info *dev_info = &hba->dev_info;
 
-       desc_buf = kmalloc(QUERY_DESC_MAX_SIZE, GFP_KERNEL);
+       desc_buf = kzalloc(QUERY_DESC_MAX_SIZE, GFP_KERNEL);
        if (!desc_buf) {
                err = -ENOMEM;
                goto out;
        }
 
        err = ufshcd_read_desc_param(hba, QUERY_DESC_IDN_DEVICE, 0, 0, desc_buf,
-                                    hba->desc_size[QUERY_DESC_IDN_DEVICE]);
+                                    QUERY_DESC_MAX_SIZE);
        if (err) {
                dev_err(hba->dev, "%s: Failed reading Device Desc. err = %d\n",
                        __func__, err);
@@ -7969,18 +7929,16 @@ static void ufshcd_clear_dbg_ufs_stats(struct ufs_hba *hba)
 static int ufshcd_device_geo_params_init(struct ufs_hba *hba)
 {
        int err;
-       size_t buff_len;
        u8 *desc_buf;
 
-       buff_len = hba->desc_size[QUERY_DESC_IDN_GEOMETRY];
-       desc_buf = kmalloc(buff_len, GFP_KERNEL);
+       desc_buf = kzalloc(QUERY_DESC_MAX_SIZE, GFP_KERNEL);
        if (!desc_buf) {
                err = -ENOMEM;
                goto out;
        }
 
        err = ufshcd_read_desc_param(hba, QUERY_DESC_IDN_GEOMETRY, 0, 0,
-                                    desc_buf, buff_len);
+                                    desc_buf, QUERY_DESC_MAX_SIZE);
        if (err) {
                dev_err(hba->dev, "%s: Failed reading Geometry Desc. err = %d\n",
                                __func__, err);
@@ -7992,7 +7950,7 @@ static int ufshcd_device_geo_params_init(struct ufs_hba *hba)
        else if (desc_buf[GEOMETRY_DESC_PARAM_MAX_NUM_LUN] == 0)
                hba->dev_info.max_lu_supported = 8;
 
-       if (hba->desc_size[QUERY_DESC_IDN_GEOMETRY] >=
+       if (desc_buf[QUERY_DESC_LENGTH_OFFSET] >=
                GEOMETRY_DESC_PARAM_HPB_MAX_ACTIVE_REGS)
                ufshpb_get_geo_info(hba, desc_buf);
 
@@ -8077,11 +8035,7 @@ out:
 static int ufshcd_device_params_init(struct ufs_hba *hba)
 {
        bool flag;
-       int ret, i;
-
-        /* Init device descriptor sizes */
-       for (i = 0; i < QUERY_DESC_IDN_MAX; i++)
-               hba->desc_size[i] = QUERY_DESC_MAX_SIZE;
+       int ret;
 
        /* Init UFS geometry descriptor related parameters */
        ret = ufshcd_device_geo_params_init(hba);

diff --git a/drivers/ufs/core/ufshpb.c b/drivers/ufs/core/ufshpb.c
index be3fb24b93d8e56df343bee372275f766cc8297d..19c9b5d1dcf8209e489336ba4c751534140afb7a 100644 (file)
--- a/drivers/ufs/core/ufshpb.c
+++ b/drivers/ufs/core/ufshpb.c
@@ -2382,12 +2382,10 @@ static int ufshpb_get_lu_info(struct ufs_hba *hba, int lun,
 {
        u16 max_active_rgns;
        u8 lu_enable;
-       int size;
+       int size = QUERY_DESC_MAX_SIZE;
        int ret;
        char desc_buf[QUERY_DESC_MAX_SIZE];
 
-       ufshcd_map_desc_id_to_length(hba, QUERY_DESC_IDN_UNIT, &size);
-
        ufshcd_rpm_get_sync(hba);
        ret = ufshcd_query_descriptor_retry(hba, UPIU_QUERY_OPCODE_READ_DESC,
                                            QUERY_DESC_IDN_UNIT, lun, 0,

diff --git a/include/ufs/ufs.h b/include/ufs/ufs.h
index 1bba3fead2ce4a6eca38bf09a4d4fe26e840bdb1..2fc71075c5a1e09b779eb7e3139787824a6c27e1 100644 (file)
--- a/include/ufs/ufs.h
+++ b/include/ufs/ufs.h
@@ -38,7 +38,6 @@
 #define UFS_UPIU_MAX_UNIT_NUM_ID       0x7F
 #define UFS_MAX_LUNS           (SCSI_W_LUN_BASE + UFS_UPIU_MAX_UNIT_NUM_ID)
 #define UFS_UPIU_WLUN_ID       (1 << 7)
-#define UFS_RPMB_UNIT          0xC4
 
 /* WriteBooster buffer is available only for the logical unit from 0 to 7 */
 #define UFS_UPIU_MAX_WB_LUN_ID 8

diff --git a/include/ufs/ufshcd.h b/include/ufs/ufshcd.h
index 5cf81dff60aa07ce077dabf6d60a27d57d283ea8..830ababe993214ff48267f4c83433734ddd4b70f 100644 (file)
--- a/include/ufs/ufshcd.h
+++ b/include/ufs/ufshcd.h
@@ -952,7 +952,6 @@ struct ufs_hba {
        bool is_urgent_bkops_lvl_checked;
 
        struct rw_semaphore clk_scaling_lock;
-       unsigned char desc_size[QUERY_DESC_IDN_MAX];
        atomic_t scsi_block_reqs_cnt;
 
        struct device           bsg_dev;
@@ -1186,9 +1185,6 @@ void ufshcd_release(struct ufs_hba *hba);
 
 void ufshcd_clkgate_delay_set(struct device *dev, unsigned long value);
 
-void ufshcd_map_desc_id_to_length(struct ufs_hba *hba, enum desc_idn desc_id,
-                                 int *desc_length);
-
 u32 ufshcd_get_local_unipro_ver(struct ufs_hba *hba);
 
 int ufshcd_get_vreg(struct device *dev, struct ufs_vreg *vreg);