From: Randy Bates <rbates@web-site.com>
Date: Thu, 21 May 2020 17:24:24 +0000 (-0500)
Subject: Bug fixes
X-Git-Tag: v1.12~12
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=e05d9e3695c2f304879b14b4d7a46301a9e9b02c;p=users%2Fsagi%2Fnvme-cli.git

Bug fixes

Signed-off-by: Randy Bates <rbates@web-site.com>
---

diff --git a/plugins/wdc/wdc-nvme.c b/plugins/wdc/wdc-nvme.c
index e6abb723..c28f6165 100644
--- a/plugins/wdc/wdc-nvme.c
+++ b/plugins/wdc/wdc-nvme.c
@@ -2952,6 +2952,9 @@ static void wdc_print_bd_ca_log_normal(void *data)
 		word_raw = (__u16*)&bd_data->raw_value[4];
 		printf("  Ave erase cycles                              %10"PRIu16"\n",
 				le16_to_cpu(*word_raw));
+		printf("  Wear Leveling Normalized 		               %3"PRIu8"\n",
+				bd_data->normalized_value);
+
 	} else {
 		goto invalid_id;
 	}
@@ -3088,6 +3091,7 @@ static void wdc_print_bd_ca_log_json(void *data)
 		json_object_add_value_int(root, "Max erase cycles", le16_to_cpu(*word_raw));
 		word_raw = (__u16*)&bd_data->raw_value[4];
 		json_object_add_value_int(root, "Ave erase cycles", le16_to_cpu(*word_raw));
+		json_object_add_value_int(root, "Wear Leveling Normalized",	bd_data->normalized_value);
 	} else {
 		goto invalid_id;
 	}
@@ -3610,7 +3614,7 @@ static int wdc_get_ca_log_page(int fd, char *format)
 
 			memset(data, 0, sizeof (__u8) * WDC_BD_CA_LOG_BUF_LEN);
 			ret = nvme_get_log(fd, 0xFFFFFFFF, WDC_NVME_GET_DEVICE_INFO_LOG_OPCODE,
-					   false, WDC_FB_CA_LOG_BUF_LEN, data);
+					   false, WDC_BD_CA_LOG_BUF_LEN, data);
 			if (strcmp(format, "json"))
 				fprintf(stderr, "NVMe Status:%s(%x)\n", nvme_status_to_string(ret), ret);