nvme-cli: Update nvme_endurance_group_log structure

	* Update show_endurance_log
	* Update json_endurance_log

Signed-off-by: Revanth Rajashekar <revanth.rajashekar@intel.com>

diff --git a/linux/nvme.h b/linux/nvme.h
index 888c2f3aba08fa1c2ee2194df151807f746f2554..475913da1778fa4db01cc5f9db21d363b31ef1ee 100644 (file)
--- a/linux/nvme.h
+++ b/linux/nvme.h
@@ -508,7 +508,9 @@ struct nvme_telemetry_log_page_hdr {
 };
 
 struct nvme_endurance_group_log {
-       __u32   rsvd0;
+       __u8    critical_warning;
+       __u8    rsvd1[2];
+       __u8    avl_spare;
        __u8    avl_spare_threshold;
        __u8    percent_used;
        __u8    rsvd6[26];
@@ -516,7 +518,11 @@ struct nvme_endurance_group_log {
        __u8    data_units_read[16];
        __u8    data_units_written[16];
        __u8    media_units_written[16];
-       __u8    rsvd96[416];
+       __u8    host_read_cmds[16];
+       __u8    host_write_cmds[16];
+       __u8    media_data_integrity_err[16];
+       __u8    num_err_info_log_entries[16];
+       __u8    rsvd160[352];
 };
 
 struct nvme_smart_log {

diff --git a/nvme-print.c b/nvme-print.c
index 302ba501b7b8238c90df16fe11ea8fe0fa97f40b..7e7649b677286635e8282f914bf385559c039fce 100644 (file)
--- a/nvme-print.c
+++ b/nvme-print.c
@@ -1685,16 +1685,26 @@ void show_endurance_log(struct nvme_endurance_group_log *endurance_group,
                        __u16 group_id, const char *devname)
 {
        printf("Endurance Group Log for NVME device:%s Group ID:%x\n", devname, group_id);
-       printf("avl_spare_threshold   : %u\n", endurance_group->avl_spare_threshold);
-       printf("percent_used          : %u%%\n", endurance_group->percent_used);
-       printf("endurance_estimate    : %'.0Lf\n",
+       printf("critical warning        : %u\n", endurance_group->critical_warning);
+       printf("avl_spare               : %u\n", endurance_group->avl_spare);
+       printf("avl_spare_threshold     : %u\n", endurance_group->avl_spare_threshold);
+       printf("percent_used            : %u%%\n", endurance_group->percent_used);
+       printf("endurance_estimate      : %'.0Lf\n",
                int128_to_double(endurance_group->endurance_estimate));
-       printf("data_units_read       : %'.0Lf\n",
+       printf("data_units_read         : %'.0Lf\n",
                int128_to_double(endurance_group->data_units_read));
-       printf("data_units_written    : %'.0Lf\n",
+       printf("data_units_written      : %'.0Lf\n",
                int128_to_double(endurance_group->data_units_written));
-       printf("media_units_written   : %'.0Lf\n",
+       printf("media_units_written     : %'.0Lf\n",
                int128_to_double(endurance_group->media_units_written));
+       printf("host_read_cmds          : %'.0Lf\n",
+               int128_to_double(endurance_group->host_read_cmds));
+       printf("host_write_cmds         : %'.0Lf\n",
+               int128_to_double(endurance_group->host_write_cmds));
+       printf("media_data_integrity_err: %'.0Lf\n",
+               int128_to_double(endurance_group->media_data_integrity_err));
+       printf("num_err_info_log_entries: %'.0Lf\n",
+               int128_to_double(endurance_group->num_err_info_log_entries));
 }
 
 void show_smart_log(struct nvme_smart_log *smart, unsigned int nsid, const char *devname)
@@ -3168,15 +3178,25 @@ void json_endurance_log(struct nvme_endurance_group_log *endurance_group,
        long double data_units_read= int128_to_double(endurance_group->data_units_read);
        long double data_units_written= int128_to_double(endurance_group->data_units_written);
        long double media_units_written= int128_to_double(endurance_group->media_units_written);
+       long double host_read_cmds = int128_to_double(endurance_group->host_read_cmds);
+       long double host_write_cmds = int128_to_double(endurance_group->host_write_cmds);
+       long double media_data_integrity_err = int128_to_double(endurance_group->media_data_integrity_err);
+       long double num_err_info_log_entries = int128_to_double(endurance_group->num_err_info_log_entries);
 
        root = json_create_object();
 
+       json_object_add_value_int(root, "critical_warning", endurance_group->critical_warning);
+       json_object_add_value_int(root, "avl_spare", endurance_group->avl_spare);
        json_object_add_value_int(root, "avl_spare_threshold", endurance_group->avl_spare_threshold);
        json_object_add_value_int(root, "percent_used", endurance_group->percent_used);
        json_object_add_value_float(root, "endurance_estimate", endurance_estimate);
        json_object_add_value_float(root, "data_units_read", data_units_read);
        json_object_add_value_float(root, "data_units_written", data_units_written);
        json_object_add_value_float(root, "mediate_write_commands", media_units_written);
+       json_object_add_value_float(root, "host_read_cmds", host_read_cmds);
+       json_object_add_value_float(root, "host_write_cmds", host_write_cmds);
+       json_object_add_value_float(root, "media_data_integrity_err", media_data_integrity_err);
+       json_object_add_value_float(root, "num_err_info_log_entries", num_err_info_log_entries);
 
        json_print_object(root, NULL);
        printf("\n");