scsi: ufs: Delete struct ufs_dev_desc

In consideration of UFS host driver uses parameters of struct ufs_dev_desc,
move its parameters to struct ufs_dev_info, delete struct ufs_dev_desc.

Link: https://lore.kernel.org/r/20200120130820.1737-3-huobean@gmail.com
Reviewed-by: Bart Van Assche <bvanassche@acm.org>
Reviewed-by: Asutosh Das <asutoshd@codeaurora.org>
Reviewed-by: Alim Akhtar <alim.akhtar@samsung.com>
Reviewed-by: Stanley Chu <stanley.chu@mediatek.com>
Signed-off-by: Bean Huo <beanhuo@micron.com>
Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>

diff --git a/drivers/scsi/ufs/ufs-mediatek.c b/drivers/scsi/ufs/ufs-mediatek.c
index f32f3f34f6d0ef22cc73277069b66d32bc11e0a2..53eae5fe2ade2547020ebc8b10126b2ff61ddec1 100644 (file)
--- a/drivers/scsi/ufs/ufs-mediatek.c
+++ b/drivers/scsi/ufs/ufs-mediatek.c
@@ -474,10 +474,11 @@ static void ufs_mtk_dbg_register_dump(struct ufs_hba *hba)
        ufshcd_dump_regs(hba, REG_UFS_PROBE, 0x4, "Debug Probe ");
 }
 
-static int ufs_mtk_apply_dev_quirks(struct ufs_hba *hba,
-                                   struct ufs_dev_desc *card)
+static int ufs_mtk_apply_dev_quirks(struct ufs_hba *hba)
 {
-       if (card->wmanufacturerid == UFS_VENDOR_SAMSUNG)
+       struct ufs_dev_info *dev_info = &hba->dev_info;
+
+       if (dev_info->wmanufacturerid == UFS_VENDOR_SAMSUNG)
                ufshcd_dme_set(hba, UIC_ARG_MIB(PA_TACTIVATE), 6);
 
        return 0;

diff --git a/drivers/scsi/ufs/ufs-qcom.c b/drivers/scsi/ufs/ufs-qcom.c
index ebb5c66e069fa48c30f81acde6d410900d7cec76..c69c29a1ceb904814c77a3fb6dd0c4295cdf46ff 100644 (file)
--- a/drivers/scsi/ufs/ufs-qcom.c
+++ b/drivers/scsi/ufs/ufs-qcom.c
@@ -949,8 +949,7 @@ out:
        return err;
 }
 
-static int ufs_qcom_apply_dev_quirks(struct ufs_hba *hba,
-                                    struct ufs_dev_desc *card)
+static int ufs_qcom_apply_dev_quirks(struct ufs_hba *hba)
 {
        int err = 0;
 

diff --git a/drivers/scsi/ufs/ufs.h b/drivers/scsi/ufs/ufs.h
index c89f21698629fe00a6d5c564014895e489258e5a..fcc9b4d4e56fededf202d4546cc43d5f16d8a899 100644 (file)
--- a/drivers/scsi/ufs/ufs.h
+++ b/drivers/scsi/ufs/ufs.h
@@ -530,17 +530,8 @@ struct ufs_dev_info {
        bool f_power_on_wp_en;
        /* Keeps information if any of the LU is power on write protected */
        bool is_lu_power_on_wp;
-};
-
-#define MAX_MODEL_LEN 16
-/**
- * ufs_dev_desc - ufs device details from the device descriptor
- *
- * @wmanufacturerid: card details
- * @model: card model
- */
-struct ufs_dev_desc {
        u16 wmanufacturerid;
+       /*UFS device Product Name */
        u8 *model;
 };
 

diff --git a/drivers/scsi/ufs/ufs_quirks.h b/drivers/scsi/ufs/ufs_quirks.h
index fe6cad9b2a0d269d84aa1ed97e274c6f9c3c639e..d0ab147f98d3ecddd7c75594c74f08044e01da14 100644 (file)
--- a/drivers/scsi/ufs/ufs_quirks.h
+++ b/drivers/scsi/ufs/ufs_quirks.h
@@ -22,16 +22,17 @@
  * @quirk: device quirk
  */
 struct ufs_dev_fix {
-       struct ufs_dev_desc card;
+       u16 wmanufacturerid;
+       u8 *model;
        unsigned int quirk;
 };
 
-#define END_FIX { { 0 }, 0 }
+#define END_FIX { }
 
 /* add specific device quirk */
 #define UFS_FIX(_vendor, _model, _quirk) { \
-       .card.wmanufacturerid = (_vendor),\
-       .card.model = (_model),            \
+       .wmanufacturerid = (_vendor),\
+       .model = (_model),                 \
        .quirk = (_quirk),                 \
 }
 

diff --git a/drivers/scsi/ufs/ufshcd.c b/drivers/scsi/ufs/ufshcd.c
index a2f17df9dc4cc4d56b5bc4c23930e14dcbb9244e..ea2a0e31a9e6acee9b5c790ffe300dd4a26445b9 100644 (file)
--- a/drivers/scsi/ufs/ufshcd.c
+++ b/drivers/scsi/ufs/ufshcd.c
@@ -6586,16 +6586,13 @@ out:
        return ret;
 }
 
-static int ufs_get_device_desc(struct ufs_hba *hba,
-                              struct ufs_dev_desc *dev_desc)
+static int ufs_get_device_desc(struct ufs_hba *hba)
 {
        int err;
        size_t buff_len;
        u8 model_index;
        u8 *desc_buf;
-
-       if (!dev_desc)
-               return -EINVAL;
+       struct ufs_dev_info *dev_info = &hba->dev_info;
 
        buff_len = max_t(size_t, hba->desc_size.dev_desc,
                         QUERY_DESC_MAX_SIZE + 1);
@@ -6616,12 +6613,12 @@ static int ufs_get_device_desc(struct ufs_hba *hba,
         * getting vendor (manufacturerID) and Bank Index in big endian
         * format
         */
-       dev_desc->wmanufacturerid = desc_buf[DEVICE_DESC_PARAM_MANF_ID] << 8 |
+       dev_info->wmanufacturerid = desc_buf[DEVICE_DESC_PARAM_MANF_ID] << 8 |
                                     desc_buf[DEVICE_DESC_PARAM_MANF_ID + 1];
 
        model_index = desc_buf[DEVICE_DESC_PARAM_PRDCT_NAME];
        err = ufshcd_read_string_desc(hba, model_index,
-                                     &dev_desc->model, SD_ASCII_STD);
+                                     &dev_info->model, SD_ASCII_STD);
        if (err < 0) {
                dev_err(hba->dev, "%s: Failed reading Product Name. err = %d\n",
                        __func__, err);
@@ -6639,23 +6636,25 @@ out:
        return err;
 }
 
-static void ufs_put_device_desc(struct ufs_dev_desc *dev_desc)
+static void ufs_put_device_desc(struct ufs_hba *hba)
 {
-       kfree(dev_desc->model);
-       dev_desc->model = NULL;
+       struct ufs_dev_info *dev_info = &hba->dev_info;
+
+       kfree(dev_info->model);
+       dev_info->model = NULL;
 }
 
-static void ufs_fixup_device_setup(struct ufs_hba *hba,
-                                  struct ufs_dev_desc *dev_desc)
+static void ufs_fixup_device_setup(struct ufs_hba *hba)
 {
        struct ufs_dev_fix *f;
+       struct ufs_dev_info *dev_info = &hba->dev_info;
 
        for (f = ufs_fixups; f->quirk; f++) {
-               if ((f->card.wmanufacturerid == dev_desc->wmanufacturerid ||
-                    f->card.wmanufacturerid == UFS_ANY_VENDOR) &&
-                    ((dev_desc->model &&
-                      STR_PRFX_EQUAL(f->card.model, dev_desc->model)) ||
-                     !strcmp(f->card.model, UFS_ANY_MODEL)))
+               if ((f->wmanufacturerid == dev_info->wmanufacturerid ||
+                    f->wmanufacturerid == UFS_ANY_VENDOR) &&
+                    ((dev_info->model &&
+                      STR_PRFX_EQUAL(f->model, dev_info->model)) ||
+                     !strcmp(f->model, UFS_ANY_MODEL)))
                        hba->dev_quirks |= f->quirk;
        }
 }
@@ -6807,8 +6806,7 @@ out:
        return ret;
 }
 
-static void ufshcd_tune_unipro_params(struct ufs_hba *hba,
-                                     struct ufs_dev_desc *card)
+static void ufshcd_tune_unipro_params(struct ufs_hba *hba)
 {
        if (ufshcd_is_unipro_pa_params_tuning_req(hba)) {
                ufshcd_tune_pa_tactivate(hba);
@@ -6822,7 +6820,7 @@ static void ufshcd_tune_unipro_params(struct ufs_hba *hba,
        if (hba->dev_quirks & UFS_DEVICE_QUIRK_HOST_PA_TACTIVATE)
                ufshcd_quirk_tune_host_pa_tactivate(hba);
 
-       ufshcd_vops_apply_dev_quirks(hba, card);
+       ufshcd_vops_apply_dev_quirks(hba);
 }
 
 static void ufshcd_clear_dbg_ufs_stats(struct ufs_hba *hba)
@@ -6948,7 +6946,6 @@ out:
  */
 static int ufshcd_probe_hba(struct ufs_hba *hba)
 {
-       struct ufs_dev_desc card = {0};
        int ret;
        ktime_t start = ktime_get();
 
@@ -6977,16 +6974,15 @@ static int ufshcd_probe_hba(struct ufs_hba *hba)
        /* Init check for device descriptor sizes */
        ufshcd_init_desc_sizes(hba);
 
-       ret = ufs_get_device_desc(hba, &card);
+       ret = ufs_get_device_desc(hba);
        if (ret) {
                dev_err(hba->dev, "%s: Failed getting device info. err = %d\n",
                        __func__, ret);
                goto out;
        }
 
-       ufs_fixup_device_setup(hba, &card);
-       ufshcd_tune_unipro_params(hba, &card);
-       ufs_put_device_desc(&card);
+       ufs_fixup_device_setup(hba);
+       ufshcd_tune_unipro_params(hba);
 
        /* UFS device is also active now */
        ufshcd_set_ufs_dev_active(hba);
@@ -7547,6 +7543,7 @@ static void ufshcd_hba_exit(struct ufs_hba *hba)
                ufshcd_setup_clocks(hba, false);
                ufshcd_setup_hba_vreg(hba, false);
                hba->is_powered = false;
+               ufs_put_device_desc(hba);
        }
 }
 

diff --git a/drivers/scsi/ufs/ufshcd.h b/drivers/scsi/ufs/ufshcd.h
index fca372d98495c411535e2dff83c6615534d3feec..961d6737cd1554d003f79b0ac8043973979f0d22 100644 (file)
--- a/drivers/scsi/ufs/ufshcd.h
+++ b/drivers/scsi/ufs/ufshcd.h
@@ -320,7 +320,7 @@ struct ufs_hba_variant_ops {
        void    (*setup_task_mgmt)(struct ufs_hba *, int, u8);
        void    (*hibern8_notify)(struct ufs_hba *, enum uic_cmd_dme,
                                        enum ufs_notify_change_status);
-       int     (*apply_dev_quirks)(struct ufs_hba *, struct ufs_dev_desc *);
+       int     (*apply_dev_quirks)(struct ufs_hba *hba);
        int     (*suspend)(struct ufs_hba *, enum ufs_pm_op);
        int     (*resume)(struct ufs_hba *, enum ufs_pm_op);
        void    (*dbg_register_dump)(struct ufs_hba *hba);
@@ -1057,11 +1057,10 @@ static inline void ufshcd_vops_hibern8_notify(struct ufs_hba *hba,
                return hba->vops->hibern8_notify(hba, cmd, status);
 }
 
-static inline int ufshcd_vops_apply_dev_quirks(struct ufs_hba *hba,
-                                              struct ufs_dev_desc *card)
+static inline int ufshcd_vops_apply_dev_quirks(struct ufs_hba *hba)
 {
        if (hba->vops && hba->vops->apply_dev_quirks)
-               return hba->vops->apply_dev_quirks(hba, card);
+               return hba->vops->apply_dev_quirks(hba);
        return 0;
 }