From: Sami Waheed <slw26c@gmail.com>
Date: Tue, 8 Dec 2015 22:51:24 +0000 (-0800)
Subject: Added decoding of temp sensors to the SMART log page (02h)
X-Git-Tag: v0.3~11^2
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=b6d8972687f5e65a56062422021b952bf344d2bf;p=users%2Fsagi%2Fnvme-cli.git

Added decoding of temp sensors to the SMART log page (02h)

- Display temperature sensors data using smart-log command
- Removed code that truncated the last byte of fr, mn, sn in id-ctrl.
Matched string format with list command
---

diff --git a/common.c b/common.c
index d9a0eec7..b0f5309a 100644
--- a/common.c
+++ b/common.c
@@ -502,15 +502,11 @@ void show_nvme_id_ctrl(struct nvme_id_ctrl *ctrl, unsigned int mode)
 	int human = mode&HUMAN,
 		vs = mode&VS;
 
-	ctrl->sn[sizeof(ctrl->sn)-1] = 0;
-	ctrl->mn[sizeof(ctrl->mn)-1] = 0;
-	ctrl->fr[sizeof(ctrl->fr)-1] = 0;
-
 	printf("vid     : %#x\n", ctrl->vid);
 	printf("ssvid   : %#x\n", ctrl->ssvid);
-	printf("sn      : %s\n", ctrl->sn);
-	printf("mn      : %s\n", ctrl->mn);
-	printf("fr      : %s\n", ctrl->fr);
+	printf("sn      : %-20.20s\n", ctrl->sn);
+	printf("mn      : %-20.20s\n", ctrl->mn);
+	printf("fr      : %-.8s\n", ctrl->fr);
 	printf("rab     : %d\n", ctrl->rab);
 	printf("ieee    : %02x%02x%02x\n",
 		ctrl->ieee[2], ctrl->ieee[1], ctrl->ieee[0]);
diff --git a/nvme.c b/nvme.c
index c72e6eb3..59cc051b 100644
--- a/nvme.c
+++ b/nvme.c
@@ -254,35 +254,40 @@ static unsigned long int48_to_long(__u8 *data)
 static void show_smart_log(struct nvme_smart_log *smart, unsigned int nsid)
 {
 	/* convert temperature from Kelvin to Celsius */
+	int c;
 	unsigned int temperature = ((smart->temperature[1] << 8) |
 		smart->temperature[0]) - 273;
 
 	printf("Smart Log for NVME device:%s namespace-id:%x\n", devicename, nsid);
-	printf("critical_warning          : %#x\n", smart->critical_warning);
-	printf("temperature               : %u C\n", temperature);
-	printf("available_spare           : %u%%\n", smart->avail_spare);
-	printf("available_spare_threshold : %u%%\n", smart->spare_thresh);
-	printf("percentage_used           : %u%%\n", smart->percent_used);
-	printf("data_units_read           : %'.0Lf\n",
+	printf("critical_warning                    : %#x\n", smart->critical_warning);
+	printf("temperature                         : %u C\n", temperature);
+	printf("available_spare                     : %u%%\n", smart->avail_spare);
+	printf("available_spare_threshold           : %u%%\n", smart->spare_thresh);
+	printf("percentage_used                     : %u%%\n", smart->percent_used);
+	printf("data_units_read                     : %'.0Lf\n",
 		int128_to_double(smart->data_units_read));
-	printf("data_units_written        : %'.0Lf\n",
+	printf("data_units_written                  : %'.0Lf\n",
 		int128_to_double(smart->data_units_written));
-	printf("host_read_commands        : %'.0Lf\n",
+	printf("host_read_commands                  : %'.0Lf\n",
 		int128_to_double(smart->host_reads));
-	printf("host_write_commands       : %'.0Lf\n",
+	printf("host_write_commands                 : %'.0Lf\n",
 		int128_to_double(smart->host_writes));
-	printf("controller_busy_time      : %'.0Lf\n",
+	printf("controller_busy_time                : %'.0Lf\n",
 		int128_to_double(smart->ctrl_busy_time));
-	printf("power_cycles              : %'.0Lf\n",
+	printf("power_cycles                        : %'.0Lf\n",
 		int128_to_double(smart->power_cycles));
-	printf("power_on_hours            : %'.0Lf\n",
+	printf("power_on_hours                      : %'.0Lf\n",
 		int128_to_double(smart->power_on_hours));
-	printf("unsafe_shutdowns          : %'.0Lf\n",
+	printf("unsafe_shutdowns                    : %'.0Lf\n",
 		int128_to_double(smart->unsafe_shutdowns));
-	printf("media_errors              : %'.0Lf\n",
+	printf("media_errors                        : %'.0Lf\n",
 		int128_to_double(smart->media_errors));
-	printf("num_err_log_entries       : %'.0Lf\n",
+	printf("num_err_log_entries                 : %'.0Lf\n",
 		int128_to_double(smart->num_err_log_entries));
+	printf("Critical Composite Temperature Time : %u\n", smart->warning_temp_time);
+	for (c=0; c < 8; c++) {
+	    printf("Temperature Sensor %d                : %u C\n", c+1, smart->temp_sensor[c] ? smart->temp_sensor[c]-273 : 0);
+	}
 }
 
 static void show_additional_smart_log(struct nvme_additional_smart_log *smart, unsigned int nsid)