From: Jinhua Huang <jinhua.huang@memblaze.com>
Date: Mon, 23 Aug 2021 10:04:10 +0000 (+0800)
Subject: nvme-plugins: add project info for smart-log-add
X-Git-Tag: v2.0-rc0~98
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=0230e8157acf495a3c0e6155d2ced1dc3476c327;p=users%2Fsagi%2Fnvme-cli.git

nvme-plugins: add project info for smart-log-add

add project info for smart-log-add command to get the correct log page format
---

diff --git a/plugins/memblaze/memblaze-nvme.c b/plugins/memblaze/memblaze-nvme.c
index 1d45ee74..95ba281f 100644
--- a/plugins/memblaze/memblaze-nvme.c
+++ b/plugins/memblaze/memblaze-nvme.c
@@ -75,22 +75,14 @@ static int compare_fw_version(const char *fw1, const char *fw2)
 
 #define STR_VER_SIZE            (5)
 
-int getlogpage_format_type(char *fw_ver)
+int getlogpage_format_type(char *model_name)
 {
-    char fw_ver_local[STR_VER_SIZE];
-    strncpy(fw_ver_local, fw_ver, STR_VER_SIZE);
-    *(fw_ver_local + STR_VER_SIZE - 1) = '\0';
-    if ( IS_RAISIN(fw_ver_local)
-        || IS_KUMQUAT(fw_ver_local)
-        || IS_LOQUAT(fw_ver_local)
-        )
-    {
-        return INTEL_FORMAT;
-    }
-    else
-    {
-        return MEMBLAZE_FORMAT;
+    int logpage_format_type = INTEL_FORMAT;
+    const char *boundary_model_name = "P5920"; // Use INTEL_FORMAT from Raisin P5920.
+    if (strncmp(model_name, boundary_model_name, strlen(boundary_model_name)) < 0) {
+        logpage_format_type = MEMBLAZE_FORMAT;
     }
+    return logpage_format_type;
 }
 
 static __u32 item_id_2_u32(struct nvme_memblaze_smart_log_item *item)
@@ -388,7 +380,7 @@ static int show_memblaze_smart_log(int fd, __u32 nsid, const char *devname,
         ctrl.fr[0], ctrl.fr[1], ctrl.fr[2], ctrl.fr[3],
         ctrl.fr[4], ctrl.fr[5], ctrl.fr[6]);
 
-    if (getlogpage_format_type(fw_ver)) // Intel Format & new format
+    if (getlogpage_format_type(ctrl.mn)) // Intel Format & new format
     {
         show_memblaze_smart_log_new(smart, nsid, devname);
     }