From: jinhua2021 <87847578+jinhua2021@users.noreply.github.com>
Date: Wed, 22 Dec 2021 13:37:19 +0000 (+0800)
Subject: memblaze-nvme: remove power loss protection from smart-log-add (#1292)
X-Git-Tag: v2.0-rc0~16
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=efed8082838e1567f690038eda8642177e3a8fc0;p=users%2Fsagi%2Fnvme-cli.git

memblaze-nvme: remove power loss protection from smart-log-add (#1292)

* remove power loss protection from smart-log-add

Signed-off-by: jinhua2021 <jinhua.huang@memblaze.com>
---

diff --git a/plugins/memblaze/memblaze-nvme.c b/plugins/memblaze/memblaze-nvme.c
index 85ed642a..55080b29 100644
--- a/plugins/memblaze/memblaze-nvme.c
+++ b/plugins/memblaze/memblaze-nvme.c
@@ -78,9 +78,14 @@ static int compare_fw_version(const char *fw1, const char *fw2)
 int getlogpage_format_type(char *model_name)
 {
     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;
+    const char *boundary_model_name1 = "P"; // MEMBLAZE P7936DT0640M00
+    const char *boundary_model_name2 = "P5920"; // Use INTEL_FORMAT from Raisin P5920.
+    if (0 == strncmp(model_name, boundary_model_name1, strlen(boundary_model_name1)))
+    {
+        if (strncmp(model_name, boundary_model_name2, strlen(boundary_model_name2)) < 0)
+        {
+            logpage_format_type = MEMBLAZE_FORMAT;
+        }
     }
     return logpage_format_type;
 }
@@ -220,8 +225,6 @@ static void show_memblaze_smart_log_new(struct nvme_memblaze_smart_log *s,
     printf("%-32s: %3d%%       %s%u%s%u%s%u\n", STR17_01,  *nm, STR17_03, *raw,
         STR17_04, *(raw+2), STR17_05, *(raw+4));
     /* 18 RAISIN_SI_VD_POWER_LOSS_PROTECTION */
-    get_memblaze_new_smart_info(smart, RAISIN_SI_VD_POWER_LOSS_PROTECTION, nm, raw);
-    printf("%-32s: %3d%%       %"PRIu64"\n", STR18_01, *nm, int48_to_long(raw));
     /* 19 RAISIN_SI_VD_READ_FAIL */
     get_memblaze_new_smart_info(smart, RAISIN_SI_VD_READ_FAIL, nm, raw);
     printf("%-32s: %3d%%       %"PRIu64"\n", STR19_01, *nm, int48_to_long(raw));