ufs: Changes to support provision for UFS3.1 and UFS2.1

Get the device UFS spec and populate the descriptor offsets as per
the respective specs.

Bug 200765373

Change-Id: Id9a0d90d1aaf465cc6e581f7155b98cc5bcf0182
Signed-off-by: Mallikarjun Kasoju <mkasoju@nvidia.com>
Reviewed-on: https://git-master.nvidia.com/r/c/linux-nvidia/+/2645541
Tested-by: Prakhar Gupta <prakharg@nvidia.com>
Tested-by: mobile promotions <svcmobile_promotions@nvidia.com>
Reviewed-by: Vikram Kanigiri <vkanigiri@nvidia.com>
Reviewed-by: Rohit Upadhyay <rupadhyay@nvidia.com>
Reviewed-by: mobile promotions <svcmobile_promotions@nvidia.com>
GVS: Gerrit_Virtual_Submit

2 files changed, 93 insertions, 16 deletions

diff --git a/drivers/scsi/ufs/ufs-provision.c b/drivers/scsi/ufs/ufs-provision.c
index e42ea57a8..3af4175fc 100644
--- a/drivers/scsi/ufs/ufs-provision.c
+++ b/drivers/scsi/ufs/ufs-provision.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017-2018, NVIDIA CORPORATION.  All rights reserved.
+ * Copyright (c) 2017-2022, NVIDIA CORPORATION.  All rights reserved.
  *
  * Author:
  *      Abhinav Site    <asite@nvidia.com>
@@ -19,6 +19,7 @@
 #ifdef CONFIG_DEBUG_FS
 
 #include "ufs-tegra.h"
+#include "ufs.h"
 
 #define CHECK_NULL(expr) \
         { \
@@ -30,9 +31,14 @@
 
 #define START_PROVISIONING 1
 #define MAX_LUN_COUNT 8
+#define CONFIG_DESC_301_SIZE 230
+#define UNIT_DESC_301_SIZE 26
+#define CONFIG_DESC_HEADER_301_SIZE 22
+
 #define CONFIG_DESC_SIZE 144
 #define UNIT_DESC_SIZE 16
 #define CONFIG_DESC_HEADER_SIZE 16
+
 #define ACTIVE_MODE 0x01
 #define EQUAL_PRIORITY 0x7F
 
@@ -55,13 +61,52 @@
 #define INIT_PWR_MODE_OFFSET 5
 #define HIGH_PRIORITY_LUN_OFFSET 6
 
-void populate_desc_header(struct ufs_tegra_host *ufs_tegra)
+static inline u8 get_config_desc_size(const u16 spec_version)
+{
+        u8 desc_size;
+
+        if (spec_version >= 0x301)
+                desc_size = CONFIG_DESC_301_SIZE;
+        else
+                desc_size = CONFIG_DESC_SIZE;
+
+        return desc_size;
+}
+
+static inline u8 get_unit_desc_size(const u16 spec_version)
+{
+        u8 unit_desc_size;
+
+        if (spec_version >= 0x301)
+                unit_desc_size = UNIT_DESC_301_SIZE;
+        else
+                unit_desc_size = UNIT_DESC_SIZE;
+
+        return unit_desc_size;
+}
+
+static inline u8 get_config_desc_hdr_size(const u16 spec_version)
+{
+        u8 hdr_size;
+
+        if (spec_version >= 0x301)
+                hdr_size = CONFIG_DESC_HEADER_301_SIZE;
+        else
+                hdr_size = CONFIG_DESC_HEADER_SIZE;
+
+        return hdr_size;
+}
+
+static void populate_desc_header(struct ufs_tegra_host *ufs_tegra, const u16 spec_version)
 {
         u8 *lun_desc_buf;
+        u8 desc_size;
+
+        desc_size = get_config_desc_size(spec_version);
 
         if ((ufs_tegra != NULL) && (ufs_tegra->lun_desc_buf != NULL)) {
                 lun_desc_buf = ufs_tegra->lun_desc_buf;
-                lun_desc_buf[LENGTH_OFFSET] = CONFIG_DESC_SIZE;
+                lun_desc_buf[LENGTH_OFFSET] = desc_size;
                 lun_desc_buf[DESC_TYPE_OFFFSET] = QUERY_DESC_IDN_CONFIGURATION;
                 lun_desc_buf[BOOT_ENABLE_OFFFSET] = ufs_tegra->boot_enable;
                 lun_desc_buf[DESCR_ACCESS_EN_OFFFSET] =
@@ -103,13 +148,20 @@ int validate_bootlun_en_id_value(struct ufs_hba *hba, u32 bootlun_en_id)
         return 0;
 }
 
-int validate_desc_header(struct ufs_hba *hba, u8 *lun_desc_buf)
+static int validate_desc_header(struct ufs_hba *hba,
+                                        u8 *lun_desc_buf,
+                                        u16 spec_version)
 {
         int i, err = 0;
         u8 desc_param;
+        u8 desc_hdr_size, unit_desc_size;
+
+        desc_hdr_size = get_config_desc_hdr_size(spec_version);
+        unit_desc_size = get_unit_desc_size(spec_version);
 
         #define GET_PARAM_VAL(i, offset) \
-                        ((lun_desc_buf + (i+1)*(UNIT_DESC_SIZE))[(offset)])
+                        ((lun_desc_buf + desc_hdr_size + \
+                                (i * unit_desc_size))[(offset)])
 
         if (lun_desc_buf == NULL) {
                 dev_err(hba->dev, "lun_desc_buf is null\n");
@@ -198,7 +250,6 @@ int validate_desc_header(struct ufs_hba *hba, u8 *lun_desc_buf)
         }
 
         #undef GET_PARAM_VAL
-
         return err;
 }
 
@@ -224,6 +275,8 @@ static ssize_t program_lun_debugfs_write(struct file *file,
         u32 desc_lock;
         struct ufs_hba *hba;
         struct ufs_tegra_host *ufs_tegra;
+        u16 spec_version;
+        u8 desc_size;
 
         /*
          * PROGRAM_LUN is set to 1 to trigeer  programming of LUNS.
@@ -287,12 +340,19 @@ static ssize_t program_lun_debugfs_write(struct file *file,
                         goto out;
                 }
 
+                if (ufs_get_device_specversion(hba, &spec_version)) {
+                        dev_err(hba->dev, "%s: %d"
+                                " Read Specversion failed\n", __func__, __LINE__);
+                        goto out;
+                }
+
                 /* Populate Config Desc Header */
-                populate_desc_header(ufs_tegra);
+                populate_desc_header(ufs_tegra, spec_version);
 
                 /* Print descriptor array created */
                 dev_info(hba->dev, "Configuration Descriptor array:\n");
-                for (i = 0; i < CONFIG_DESC_SIZE; i++) {
+                desc_size = get_config_desc_size(spec_version);
+                for (i = 0; i < desc_size; i++) {
                         if ((i%16 == 0) && i)
                                 pr_info("\n");
                         pr_cont("0x%02x  ",
@@ -300,7 +360,8 @@ static ssize_t program_lun_debugfs_write(struct file *file,
                 }
 
                 /* Validate unit desc data given by user */
-                err = validate_desc_header(hba, ufs_tegra->lun_desc_buf);
+                err = validate_desc_header(hba,
+                                 ufs_tegra->lun_desc_buf, spec_version);
                 if (err) {
                         dev_err(hba->dev,
                                 "%s: Descriptor Valdiation Failed\n", __func__);
@@ -570,6 +631,8 @@ void debugfs_provision_init(struct ufs_hba *hba, struct dentry *device_root)
         struct ufs_tegra_host *ufs_tegra = (struct ufs_tegra_host *)hba->priv;
         char lun_name[5];
         int i, err;
+        u16 spec_version;
+        u8 desc_size, unit_desc_size, config_desc_hdr_size;
 
         refclk_root = debugfs_create_dir("ufs_refclk", device_root);
         CHECK_NULL(refclk_root);
@@ -585,9 +648,18 @@ void debugfs_provision_init(struct ufs_hba *hba, struct dentry *device_root)
         CHECK_NULL(debugfs_create_file("program_bootlun_en_id", 0644,
                         bootlun_en_id_root, hba, &bootlun_en_id_debugfs_ops));
 
+
+        err = ufs_get_device_specversion(hba, &spec_version);
+        if (err) {
+                dev_err(hba->dev, "%s: Read Specversion failed\n", __func__);
+                goto out;
+        }
+
+        desc_size = get_config_desc_size(spec_version);
+
         /* Create debugfs for LUN programming */
         ufs_tegra->lun_desc_buf = (u8 *)devm_kzalloc(hba->dev,
-                                        CONFIG_DESC_SIZE, GFP_KERNEL);
+                                                desc_size, GFP_KERNEL);
         if (!ufs_tegra->lun_desc_buf) {
                 dev_err(hba->dev,
                         "No memory for Configuration Descriptor Array\n");
@@ -604,6 +676,9 @@ void debugfs_provision_init(struct ufs_hba *hba, struct dentry *device_root)
         CHECK_NULL(debugfs_create_file("program_lun", 0644,
                         lun_root, hba, &program_lun_debugfs_ops));
 
+        unit_desc_size = get_unit_desc_size(spec_version);
+        config_desc_hdr_size = get_config_desc_hdr_size(spec_version);
+
         for (i = 0; i < MAX_LUN_COUNT; i++) {
 
                 snprintf(lun_name, sizeof(lun_name), "lun%d", i);
@@ -616,7 +691,7 @@ void debugfs_provision_init(struct ufs_hba *hba, struct dentry *device_root)
                  */
                 err = create_desc_debugfs_nodes(tmp_lun_root,
                                 ufs_tegra->lun_desc_buf +
-                                CONFIG_DESC_HEADER_SIZE + i*UNIT_DESC_SIZE);
+                                config_desc_hdr_size + i * unit_desc_size);
                 if (err)
                         goto out;
         }
diff --git a/drivers/scsi/ufs/ufs-tegra.c b/drivers/scsi/ufs/ufs-tegra.c
index d54b27b96..640c6508a 100644
--- a/drivers/scsi/ufs/ufs-tegra.c
+++ b/drivers/scsi/ufs/ufs-tegra.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015-2019, NVIDIA CORPORATION.  All rights reserved.
+ * Copyright (c) 2015-2022, NVIDIA CORPORATION.  All rights reserved.
  *
  * Authors:
  *      VenkataJagadish.p       <vjagadish@nvidia.com>
@@ -117,7 +117,7 @@ static const struct file_operations ufs_tegra_debugfs_ops = {
         .release        = single_release,
 };
 
-void ufs_tegra_init_debugfs(struct ufs_hba *hba)
+static int ufs_tegra_init_debugfs(struct ufs_hba *hba)
 {
         struct dentry *device_root;
         struct ufs_tegra_host *ufs_tegra = hba->priv;
@@ -127,6 +127,8 @@ void ufs_tegra_init_debugfs(struct ufs_hba *hba)
                         device_root, hba, &ufs_tegra_debugfs_ops);
         if (ufs_tegra->enable_ufs_provisioning)
                 debugfs_provision_init(hba, device_root);
+
+        return 0;
 }
 #endif
 
@@ -1548,9 +1550,6 @@ static int ufs_tegra_init(struct ufs_hba *hba)
                 ufs_tegra_aux_reset_enable(ufs_tegra);
                 ufs_tegra_ufs_aux_prog(ufs_tegra);
                 ufs_tegra_cfg_vendor_registers(hba);
-#ifdef CONFIG_DEBUG_FS
-                ufs_tegra_init_debugfs(hba);
-#endif
         }
         return err;
 
@@ -1587,6 +1586,9 @@ static void ufs_tegra_exit(struct ufs_hba *hba)
 struct ufs_hba_variant_ops ufs_hba_tegra_vops = {
         .name                   = "ufs-tegra",
         .init                   = ufs_tegra_init,
+#ifdef CONFIG_DEBUG_FS
+        .late_init              = ufs_tegra_init_debugfs,
+#endif
         .exit                   = ufs_tegra_exit,
         .suspend                = ufs_tegra_suspend,
         .resume                 = ufs_tegra_resume,