nvme-print: Added print for two new fields for HMB feature

As per TP4104, added print for two new fields for HMB feature
HMNARE (Host Memory Non-operational Access Restriction Enable) and
HMNAR (Host Memory Non-operational Access Restricted) with 1 bit
each. Bit 1 is not used for Get Feature command and will be 0.
And added print for HMBR field in stdout_id_ctrl_ctratt.

Signed-off-by: Nitin Sao <nitin.sao@samsung.com>
Reviewed-by: Steven Seungcheol Lee <sc108.lee@samsung.com>
Reviewed-by: Mohit Kapoor <mohit.kap@samsung.com>

diff --git a/nvme-print-json.c b/nvme-print-json.c
index efd340a5ecf09b6d9e1715b0f96a3841aa8e15a3..6c3e45f463413784eaa008ad1ddf48429f4102cb 100644 (file)
--- a/nvme-print-json.c
+++ b/nvme-print-json.c
@@ -3425,6 +3425,10 @@ static void json_feature_show_fields_host_mem_buf(struct json_object *r, unsigne
                                                  unsigned char *buf)
 {
        obj_add_str(r, "Enable Host Memory (EHM)", result & 1 ? "Enabled" : "Disabled");
+       obj_add_str(r, "Host Memory Non-operational Access Restriction Enable (HMNARE)",
+                       (result & 0x00000004) ? "True" : "False");
+       obj_add_str(r, "Host Memory Non-operational Access Restricted (HMNAR)",
+                       (result & 0x00000008) ? "True" : "False");
 
        if (buf)
                json_host_mem_buffer((struct nvme_host_mem_buf_attrs *)buf, r);

diff --git a/nvme-print-stdout.c b/nvme-print-stdout.c
index 17461de1a8295576a15e53822513908d297541ef..57c9127b14529f232be784713cd98584de095dc0 100644 (file)
--- a/nvme-print-stdout.c
+++ b/nvme-print-stdout.c
@@ -1714,7 +1714,8 @@ static void stdout_id_ctrl_ctratt(__le32 ctrl_ctratt)
        __u32 ctratt = le32_to_cpu(ctrl_ctratt);
        __u32 rsvd20 = (ctratt >> 20);
        __u32 fdps = (ctratt >> 19) & 0x1;
-       __u32 rsvd17 = (ctratt >> 17) & 0x3;
+       __u32 rsvd18 = (ctratt >> 18) & 0x1;
+       __u32 hmbr = (ctratt >> 17) & 0x1;
        __u32 mem = (ctratt >> 16) & 0x1;
        __u32 elbas = (ctratt >> 15) & 0x1;
        __u32 delnvmset = (ctratt >> 14) & 0x1;
@@ -1737,8 +1738,10 @@ static void stdout_id_ctrl_ctratt(__le32 ctrl_ctratt)
                printf(" [31:20] : %#x\tReserved\n", rsvd20);
        printf("  [19:19] : %#x\tFlexible Data Placement %sSupported\n",
                fdps, fdps ? "" : "Not ");
-       if (rsvd17)
-               printf("  [18:17] : %#x\tReserved\n", rsvd17);
+       if (rsvd18)
+               printf("  [18:18] : %#x\tReserved\n", rsvd18);
+       printf("  [17:17] : %#x\tHMB Restrict Non-Operational Power State Access %sSupported\n",
+               hmbr, hmbr ? "" : "Not ");
        printf("  [16:16] : %#x\tMDTS and Size Limits Exclude Metadata %sSupported\n",
                mem, mem ? "" : "Not ");
        printf("  [15:15] : %#x\tExtended LBA Formats %sSupported\n",
@@ -4511,6 +4514,10 @@ static void stdout_feature_show_fields(enum nvme_features_id fid,
                break;
        case NVME_FEAT_FID_HOST_MEM_BUF:
                printf("\tEnable Host Memory (EHM): %s\n", (result & 0x00000001) ? "Enabled" : "Disabled");
+               printf("\tHost Memory Non-operational Access Restriction Enable (HMNARE): %s\n",
+                               (result & 0x00000004) ? "True" : "False");
+               printf("\tHost Memory Non-operational Access Restricted (HMNAR): %s\n",
+                               (result & 0x00000008) ? "True" : "False");
                if (buf)
                        stdout_host_mem_buffer((struct nvme_host_mem_buf_attrs *)buf);
                break;