nvme-print: print new fields of Asynchronous Event Configuration

Print the newly added fields of Asynchronous Event Configuration
feature (FID - 0Bh)
NVM Express Base Specification 2.1.

Signed-off-by: Francis Pravin <francis.p@samsung.com>

diff --git a/nvme-print-json.c b/nvme-print-json.c
index ff34304f6b5fdc6a8848cdd1935137d7dd4ea947..4ac24146a9c6fcc954f938ab9487f64a4c3bd322 100644 (file)
--- a/nvme-print-json.c
+++ b/nvme-print-json.c
@@ -3353,24 +3353,36 @@ static void json_feature_show_fields_write_atomic(struct json_object *r, unsigne
 
 static void json_feature_show_fields_async_event(struct json_object *r, unsigned int result)
 {
-       obj_add_str(r, "Discovery Log Page Change Notices", (result & 0x80000000) >> 31 ?
-                    "Send async event" : "Do not send async event");
-       obj_add_str(r, "Endurance Group Event Aggregate Log Change Notices", (result & 0x4000) >> 14 ?
-                    "Send async event" : "Do not send async event");
-       obj_add_str(r, "LBA Status Information Notices", (result & 0x2000) >> 13 ?
-                    "Send async event" : "Do not send async event");
+       const char *async = "Send async event";
+       const char *no_async = "Do not send async event";
+
+       obj_add_str(r, "Discovery Log Page Change Notices", NVME_FEAT_AE_DLPCN(result) ?
+                       async : no_async);
+       obj_add_str(r, "Host Discovery Log Page Change Notification", NVME_FEAT_AE_HDLPCN(result) ?
+                       async : no_async);
+       obj_add_str(r, "AVE Discovery Log Page Change Notification", NVME_FEAT_AE_ADLPCN(result) ?
+                       async : no_async);
+       obj_add_str(r, "Pull Model DDC Request Log Page Change Notification",
+                       NVME_FEAT_AE_PMDRLPCN(result) ? async : no_async);
+       obj_add_str(r, "Zone Descriptor Changed Notices", NVME_FEAT_AE_ZDCN(result) ?
+                       async : no_async);
+       obj_add_str(r, "Reachability Group", NVME_FEAT_AE_RGRP0(result) ? async : no_async);
+       obj_add_str(r, "Reachability Association", NVME_FEAT_AE_RASSN(result) ? async : no_async);
+       obj_add_str(r, "Normal NVM Subsystem Shutdown", NVME_FEAT_AE_NNSSHDN(result) ?
+                       async : no_async);
+       obj_add_str(r, "Endurance Group Event Aggregate Log Change Notices",
+                       NVME_FEAT_AE_EGA(result) ? async : no_async);
+       obj_add_str(r, "LBA Status Information Notices", NVME_FEAT_AE_LBAS(result) ?
+                       async : no_async);
        obj_add_str(r, "Predictable Latency Event Aggregate Log Change Notices",
-                    (result & 0x1000) >> 12 ? "Send async event" : "Do not send async event");
-       obj_add_str(r, "Asymmetric Namespace Access Change Notices", (result & 0x800) >> 11 ?
-                    "Send async event" : "Do not send async event");
-       obj_add_str(r, "Telemetry Log Notices", (result & 0x400) >> 10 ? "Send async event" :
-                    "Do not send async event");
-       obj_add_str(r, "Firmware Activation Notices", (result & 0x200) >> 9 ? "Send async event" :
-                    "Do not send async event");
-       obj_add_str(r, "Namespace Attribute Notices", (result & 0x100) >> 8 ? "Send async event" :
-                    "Do not send async event");
-       obj_add_str(r, "SMART / Health Critical Warnings", result & 0xff ? "Send async event" :
-                    "Do not send async event");
+                       NVME_FEAT_AE_PLA(result) ? async : no_async);
+       obj_add_str(r, "Asymmetric Namespace Access Change Notices", NVME_FEAT_AE_ANA(result) ?
+                       async : no_async);
+       obj_add_str(r, "Telemetry Log Notices", NVME_FEAT_AE_TELEM(result) ? async : no_async);
+       obj_add_str(r, "Firmware Activation Notices", NVME_FEAT_AE_FW(result) ? async : no_async);
+       obj_add_str(r, "Namespace Attribute Notices", NVME_FEAT_AE_NAN(result) ? async : no_async);
+       obj_add_str(r, "SMART / Health Critical Warnings", NVME_FEAT_AE_SMART(result) ?
+                       async : no_async);
 }
 
 static void json_auto_pst(struct nvme_feat_auto_pst *apst, struct json_object *r)

diff --git a/nvme-print-stdout.c b/nvme-print-stdout.c
index f341093dc51eb905a33a5d35057f1ef9a7093b70..e87c605db41c5e4badf4482e3d385da98b3731bb 100644 (file)
--- a/nvme-print-stdout.c
+++ b/nvme-print-stdout.c
@@ -4898,6 +4898,8 @@ static void stdout_feature_show_fields(enum nvme_features_id fid,
                                       unsigned int result,
                                       unsigned char *buf)
 {
+       const char *async = "Send async event";
+       const char *no_async = "Do not send async event";
        __u8 field;
        uint64_t ull;
 
@@ -4968,23 +4970,41 @@ static void stdout_feature_show_fields(enum nvme_features_id fid,
                break;
        case NVME_FEAT_FID_ASYNC_EVENT:
                printf("\tDiscovery Log Page Change Notices                         : %s\n",
-                       ((result & 0x80000000) >> 31) ? "Send async event" : "Do not send async event");
+                       NVME_FEAT_AE_DLPCN(result) ? async : no_async);
+               printf("\tHost Discovery Log Page Change Notification               : %s\n",
+                       NVME_FEAT_AE_HDLPCN(result) ? async : no_async);
+               printf("\tAVE Discovery Log Page Change Notification                : %s\n",
+                       NVME_FEAT_AE_ADLPCN(result) ? async : no_async);
+               printf("\tPull Model DDC Request Log Page Change Notification       : %s\n",
+                       NVME_FEAT_AE_PMDRLPCN(result) ? async : no_async);
+               printf("\tZone Descriptor Changed Notices                           : %s\n",
+                       NVME_FEAT_AE_ZDCN(result) ? async : no_async);
+               printf("\tAllocated Namespace Attribute Notices                     : %s\n",
+                       NVME_FEAT_AE_ANSAN(result) ? async : no_async);
+               printf("\tReachability Group                                        : %s\n",
+                       NVME_FEAT_AE_RGRP0(result) ? async : no_async);
+               printf("\tReachability Association                                  : %s\n",
+                       NVME_FEAT_AE_RASSN(result) ? async : no_async);
+               printf("\tTemperature Threshold Hysteresis Recovery                 : %s\n",
+                       NVME_FEAT_AE_TTHRY(result) ? async : no_async);
+               printf("\tNormal NVM Subsystem Shutdown                             : %s\n",
+                       NVME_FEAT_AE_NNSSHDN(result) ? async : no_async);
                printf("\tEndurance Group Event Aggregate Log Change Notices        : %s\n",
-                      NVME_FEAT_AE_EGA(result) ? "Send async event" : "Do not send async event");
+                      NVME_FEAT_AE_EGA(result) ? async : no_async);
                printf("\tLBA Status Information Notices                            : %s\n",
-                      NVME_FEAT_AE_LBAS(result) ? "Send async event" : "Do not send async event");
+                      NVME_FEAT_AE_LBAS(result) ? async : no_async);
                printf("\tPredictable Latency Event Aggregate Log Change Notices    : %s\n",
-                      NVME_FEAT_AE_PLA(result) ? "Send async event" : "Do not send async event");
+                      NVME_FEAT_AE_PLA(result) ? async : no_async);
                printf("\tAsymmetric Namespace Access Change Notices                : %s\n",
-                      NVME_FEAT_AE_ANA(result) ? "Send async event" : "Do not send async event");
+                      NVME_FEAT_AE_ANA(result) ? async : no_async);
                printf("\tTelemetry Log Notices                                     : %s\n",
-                      NVME_FEAT_AE_TELEM(result) ? "Send async event" : "Do not send async event");
+                      NVME_FEAT_AE_TELEM(result) ? async : no_async);
                printf("\tFirmware Activation Notices                               : %s\n",
-                      NVME_FEAT_AE_FW(result) ? "Send async event" : "Do not send async event");
+                      NVME_FEAT_AE_FW(result) ? async : no_async);
                printf("\tNamespace Attribute Notices                               : %s\n",
-                      NVME_FEAT_AE_NAN(result) ? "Send async event" : "Do not send async event");
+                      NVME_FEAT_AE_NAN(result) ? async : no_async);
                printf("\tSMART / Health Critical Warnings                          : %s\n",
-                      NVME_FEAT_AE_SMART(result) ? "Send async event" : "Do not send async event");
+                      NVME_FEAT_AE_SMART(result) ? async : no_async);
                break;
        case NVME_FEAT_FID_AUTO_PST:
                printf("\tAutonomous Power State Transition Enable (APSTE): %s\n",