Added device support check for temp stats command

diff --git a/plugins/wdc/wdc-nvme.c b/plugins/wdc/wdc-nvme.c
index 0329488449c410fb1801fcc245da0c5e51cb7119..63454630b060b493b06746b32f6345ae70612485 100644 (file)
--- a/plugins/wdc/wdc-nvme.c
+++ b/plugins/wdc/wdc-nvme.c
@@ -19,6 +19,7 @@
  *   Author: Chaitanya Kulkarni <chaitanya.kulkarni@hgst.com>,
  *           Dong Ho <dong.ho@hgst.com>,
  *           Jeff Lien <jeff.lien@wdc.com>
+ *                      Brandon Paupore <brandon.paupore@wdc.com>
  */
 #include <stdio.h>
 #include <string.h>
@@ -106,6 +107,8 @@
 #define WDC_DRIVE_CAP_INFO                  0x0000000000080000
 #define WDC_DRIVE_CAP_C0_LOG_PAGE           0x0000000000100000
 
+#define WDC_DRIVE_CAP_TEMP_STATS                       0x0000000000200000
+
 #define WDC_DRIVE_CAP_DRIVE_ESSENTIALS      0x0000000100000000
 #define WDC_DRIVE_CAP_DUI_DATA                         0x0000000200000000
 #define WDC_SN730B_CAP_VUC_LOG                         0x0000000400000000
@@ -1071,7 +1074,8 @@ static __u64 wdc_get_drive_capabilities(int fd) {
                        capabilities = WDC_DRIVE_CAP_DUI_DATA | WDC_DRIVE_CAP_NAND_STATS | WDC_DRIVE_CAP_NS_RESIZE;
                        break;
                case WDC_NVME_SN730A_DEV_ID:
-                       capabilities = WDC_DRIVE_CAP_DUI | WDC_DRIVE_CAP_NAND_STATS | WDC_DRIVE_CAP_INFO;
+                       capabilities =  WDC_DRIVE_CAP_DUI | WDC_DRIVE_CAP_NAND_STATS | 
+                                       WDC_DRIVE_CAP_INFO | WDC_DRIVE_CAP_TEMP_STATS
                        break;
                case WDC_NVME_SN340_DEV_ID:
                        capabilities = WDC_DRIVE_CAP_DUI;
@@ -6550,8 +6554,9 @@ static int wdc_vs_temperature_stats(int argc, char **argv,
 {
        const char *desc = "Send a vs-temperature-stats command.";
        struct nvme_smart_log smart_log;
-        struct nvme_id_ctrl id_ctrl;
-        __u32 hctm_tmt;
+    struct nvme_id_ctrl id_ctrl;
+       uint64_t capabilities = 0;
+    __u32 hctm_tmt;
        int fd, ret;
 
        OPT_ARGS(opts) = {
@@ -6562,48 +6567,48 @@ static int wdc_vs_temperature_stats(int argc, char **argv,
        if (fd < 0)
                return fd;
 
+       /* check if command is supported */
        wdc_check_device(fd);
-        /* get the temperature stats or report errors */
+       capabilities = wdc_get_drive_capabilities(fd);
+       if ((capabilities & WDC_DRIVE_CAP_TEMP_STATS) != WDC_DRIVE_CAP_TEMP_STATS) {
+               fprintf(stderr, "ERROR : WDC: unsupported device for this command\n");
+               return -1;
+       } 
+
+    /* get the temperature stats or report errors */
+       ret = nvme_identify_ctrl(fd, &id_ctrl);
+    if (ret != 0)
+               goto END;
        ret = nvme_smart_log(fd, NVME_NSID_ALL, &smart_log);
-        if (ret != 0) 
-                goto END;
-        ret = nvme_identify_ctrl(fd, &id_ctrl);
-        if (ret != 0)
-                goto END;
-        /* print the temperature stats */
-        printf("Temperature Stats for NVME device:%s namespace-id:%x\n",
-                devicename, WDC_DE_GLOBAL_NSID);
-        /* convert from Kelvin to degrees Celsius */
-       int temperature = ((smart_log.temperature[1] << 8) |
-                                   smart_log.temperature[0]) - 273;
-       printf("Current Composite Temperature           : %d °C\n",
-               temperature);
-        printf("WCTEMP                                  : %"PRIu16" °C\n",
-                id_ctrl.wctemp - 273);
-       printf("CCTEMP                                  : %"PRIu16" °C\n", 
-                id_ctrl.cctemp - 273);
-        printf("DITT support                            : 0\n");
-        printf("HCTM support                            : %"PRIu16"\n",
-                id_ctrl.hctma);
+    if (ret != 0) 
+       goto END;
+
+    /* print the temperature stats */
+    printf("Temperature Stats for NVME device:%s namespace-id:%x\n",
+            devicename, WDC_DE_GLOBAL_NSID);
+
+    /* convert from Kelvin to degrees Celsius */
+       int temperature = ((smart_log.temperature[1] << 8) | smart_log.temperature[0]) - 273;
+       printf("Current Composite Temperature           : %d °C\n", temperature);
+    printf("WCTEMP                                  : %"PRIu16" °C\n", id_ctrl.wctemp - 273);
+       printf("CCTEMP                                  : %"PRIu16" °C\n",  id_ctrl.cctemp - 273);
+    printf("DITT support                            : 0\n");
+    printf("HCTM support                            : %"PRIu16"\n", id_ctrl.hctma);
+
        /* retrieve HCTM Thermal Management Temperatures */
-        nvme_get_feature(fd, 0, 0x10, 0, 0, 0, 0, &hctm_tmt);
-        temperature = ((hctm_tmt >> 16) & 0xffff) ? ((hctm_tmt >> 16) & 0xffff) - 273 : 0;     
-       printf("HCTM Light (TMT1)                       : %"PRIu16" °C\n",
-                temperature);
-        printf("TMT1 Transition Counter                 : %"PRIu32"\n",
-                smart_log.thm_temp1_trans_count);
-       printf("TMT1 Total Time                         : %"PRIu32"\n",
-                smart_log.thm_temp1_total_time);
-        temperature = (hctm_tmt & 0xffff) ? (hctm_tmt & 0xffff) - 273 : 0;     
-       printf("HCTM Heavy (TMT2)                       : %"PRIu16" °C\n",
-                temperature);
-        printf("TMT2 Transition Counter                 : %"PRIu32"\n",
-                smart_log.thm_temp2_trans_count);
-        printf("TMT2 Total Time                         : %"PRIu32"\n",
-                smart_log.thm_temp2_total_time);
-        printf("Thermal Shutdown Threshold              : 95 °C\n");  
+    nvme_get_feature(fd, 0, 0x10, 0, 0, 0, 0, &hctm_tmt);
+    temperature = ((hctm_tmt >> 16) & 0xffff) ? ((hctm_tmt >> 16) & 0xffff) - 273 : 0; 
+       printf("HCTM Light (TMT1)                       : %"PRIu16" °C\n", temperature);
+    printf("TMT1 Transition Counter                 : %"PRIu32"\n", smart_log.thm_temp1_trans_count);
+       printf("TMT1 Total Time                         : %"PRIu32"\n", smart_log.thm_temp1_total_time);
+
+    temperature = (hctm_tmt & 0xffff) ? (hctm_tmt & 0xffff) - 273 : 0; 
+       printf("HCTM Heavy (TMT2)                       : %"PRIu16" °C\n", temperature);
+    printf("TMT2 Transition Counter                 : %"PRIu32"\n", smart_log.thm_temp2_trans_count);
+    printf("TMT2 Total Time                         : %"PRIu32"\n", smart_log.thm_temp2_total_time);
+    printf("Thermal Shutdown Threshold              : 95 °C\n");      
        
-        END:
+    END:
        fprintf(stderr, "NVMe Status:%s(%x)\n", nvme_status_to_string(ret), ret);
        return ret;
 }