nvme-cli: id-ctrl: display additional fields

Additional fields displayed: ctratt, maxcmd, ioccsz, iorcsz, icdoff,
ctrattr, msdbd
Additional human-readable decode for lpa and sgls fields.

Signed-off-by: Keith Busch <keith.busch@intel.com>

diff --git a/nvme-print.c b/nvme-print.c
index ffa63adc66169000886eee203c9d25459d53e2b7..48e0c2834ab4eb2cc25ed89ee52f3e23bc569930 100644 (file)
--- a/nvme-print.c
+++ b/nvme-print.c
@@ -106,6 +106,19 @@ static void show_nvme_id_ctrl_oaes(__le32 ctrl_oaes)
        printf("\n");
 }
 
+static void show_nvme_id_ctrl_ctratt(__le32 ctrl_ctratt)
+{
+       __u32 ctratt = le32_to_cpu(ctrl_ctratt);
+       __u32 rsvd0 = (ctratt & 0xFFFFFFFE) >> 1;
+       __u32 hostid128 = ctratt & 0x1;
+
+       if (rsvd0)
+               printf(" [31:1] : %#x\tReserved\n", rsvd0);
+       printf("  [0:0] : %#x\t128-bit Host Identifier %sSupported\n",
+               hostid128, hostid128 ? "" : "Not ");
+       printf("\n");
+}
+
 static void show_nvme_id_ctrl_oacs(__le16 ctrl_oacs)
 {
        __u16 oacs = le16_to_cpu(ctrl_oacs);
@@ -146,11 +159,14 @@ static void show_nvme_id_ctrl_frmw(__u8 frmw)
 
 static void show_nvme_id_ctrl_lpa(__u8 lpa)
 {
-       __u8 rsvd = (lpa & 0xFC) >> 2;
+       __u8 rsvd = (lpa & 0xF8) >> 3;
+       __u8 ed = (lpa & 0x4) >> 2;
        __u8 celp = (lpa & 0x2) >> 1;
        __u8 smlp = lpa & 0x1;
        if (rsvd)
-               printf("  [7:2] : %#x\tReserved\n", rsvd);
+               printf("  [7:3] : %#x\tReserved\n", rsvd);
+       printf("  [2:2] : %#x\tExtended data for Get Log Page %sSupported\n",
+               ed, ed ? "" : "Not ");
        printf("  [1:1] : %#x\tCommand Effects Log Page %sSupported\n",
                celp, celp ? "" : "Not ");
        printf("  [0:0] : %#x\tSMART/Health Log Page per NS %sSupported\n",
@@ -335,7 +351,9 @@ static void show_nvme_id_ctrl_sgls(__le32 ctrl_sgls)
        __u32 sglltb = (sgls & 0x40000) >> 18;
        __u32 bacmdb = (sgls & 0x20000) >> 17;
        __u32 bbs = (sgls & 0x10000) >> 16;
-       __u32 rsvd1 = (sgls & 0xFFFE) >> 1;
+       __u32 rsvd1 = (sgls & 0xFFF8) >> 3;
+       __u32 key = (sgls & 0x4) >> 2;
+       __u32 rsvd2 = (sgls & 0x2) >> 1;
        __u32 sglsp = sgls & 0x1;
 
        if (rsvd0)
@@ -350,12 +368,28 @@ static void show_nvme_id_ctrl_sgls(__le32 ctrl_sgls)
                printf(" [16:16]: %#x\tSGL Bit-Bucket %sSupported\n",
                        bbs, bbs ? "" : "Not ");
        if (rsvd1)
-               printf(" [15:1] : %#x\tReserved\n", rsvd1);
+               printf(" [15:3] : %#x\tReserved\n", rsvd1);
+       if (sglsp || (!sglsp && key))
+               printf(" [16:16]: %#x\tKeyed SGL Data Block descriptor %sSupported\n",
+                       key, key ? "" : "Not ");
+       if (rsvd2)
+               printf(" [1:1] : %#x\tReserved\n", rsvd2);
        printf("  [0:0] : %#x\tScatter-Gather Lists %sSupported\n",
                sglsp, sglsp ? "" : "Not ");
        printf("\n");
 }
 
+static void show_nvme_id_ctrl_ctrattr(__u8 ctrattr)
+{
+       __u8 rsvd = (ctrattr & 0xFE) >> 1;
+       __u8 scm = ctrattr & 0x1;
+       if (rsvd)
+               printf("  [7:1] : %#x\tReserved\n", rsvd);
+       printf("  [0:0] : %#x\t%s Controller Model\n",
+               scm, scm ? "Static" : "Dynamic");
+       printf("\n");
+}
+
 static void show_nvme_id_ns_nsfeat(__u8 nsfeat)
 {
        __u8 rsvd = (nsfeat & 0xF8) >> 3;
@@ -646,6 +680,9 @@ void __show_nvme_id_ctrl(struct nvme_id_ctrl *ctrl, unsigned int mode, void (*ve
        printf("oaes    : %#x\n", le32_to_cpu(ctrl->oaes));
        if (human)
                show_nvme_id_ctrl_oaes(ctrl->oaes);
+       printf("ctratt  : %#x\n", le32_to_cpu(ctrl->ctratt));
+       if (human)
+               show_nvme_id_ctrl_ctratt(ctrl->ctratt);
        printf("oacs    : %#x\n", le16_to_cpu(ctrl->oacs));
        if (human)
                show_nvme_id_ctrl_oacs(ctrl->oacs);
@@ -693,6 +730,7 @@ void __show_nvme_id_ctrl(struct nvme_id_ctrl *ctrl, unsigned int mode, void (*ve
        printf("cqes    : %#x\n", ctrl->cqes);
        if (human)
                show_nvme_id_ctrl_cqes(ctrl->cqes);
+       printf("maxcmd  : %d\n", le16_to_cpu(ctrl->maxcmd));
        printf("nn      : %d\n", le32_to_cpu(ctrl->nn));
        printf("oncs    : %#x\n", le16_to_cpu(ctrl->oncs));
        if (human)
@@ -715,8 +753,14 @@ void __show_nvme_id_ctrl(struct nvme_id_ctrl *ctrl, unsigned int mode, void (*ve
        printf("sgls    : %x\n", le32_to_cpu(ctrl->sgls));
        if (human)
                show_nvme_id_ctrl_sgls(ctrl->sgls);
-
        printf("subnqn  : %-.*s\n", (int)sizeof(ctrl->subnqn), ctrl->subnqn);
+       printf("ioccsz  : %d\n", le32_to_cpu(ctrl->ioccsz));
+       printf("iorcsz  : %d\n", le32_to_cpu(ctrl->iorcsz));
+       printf("icdoff  : %d\n", le16_to_cpu(ctrl->icdoff));
+       printf("ctrattr : %x\n", ctrl->ctrattr);
+       if (human)
+               show_nvme_id_ctrl_ctrattr(ctrl->ctrattr);
+       printf("msdbd   : %d\n", ctrl->msdbd);
 
        show_nvme_id_ctrl_power(ctrl);
        if (vendor_show)
@@ -1296,6 +1340,7 @@ void json_nvme_id_ctrl(struct nvme_id_ctrl *ctrl, unsigned int mode, void (*vs)(
        json_object_add_value_int(root, "rtd3r", le32_to_cpu(ctrl->rtd3r));
        json_object_add_value_int(root, "rtd3e", le32_to_cpu(ctrl->rtd3e));
        json_object_add_value_int(root, "oaes", le32_to_cpu(ctrl->oaes));
+       json_object_add_value_int(root, "ctratt", le32_to_cpu(ctrl->ctratt));
        json_object_add_value_int(root, "oacs", le16_to_cpu(ctrl->oacs));
        json_object_add_value_int(root, "acl", ctrl->acl);
        json_object_add_value_int(root, "aerl", ctrl->aerl);
@@ -1323,6 +1368,7 @@ void json_nvme_id_ctrl(struct nvme_id_ctrl *ctrl, unsigned int mode, void (*vs)(
        json_object_add_value_int(root, "sanicap", le32_to_cpu(ctrl->sanicap));
        json_object_add_value_int(root, "sqes", ctrl->sqes);
        json_object_add_value_int(root, "cqes", ctrl->cqes);
+       json_object_add_value_int(root, "maxcmd", le16_to_cpu(ctrl->maxcmd));
        json_object_add_value_int(root, "nn", le32_to_cpu(ctrl->nn));
        json_object_add_value_int(root, "oncs", le16_to_cpu(ctrl->oncs));
        json_object_add_value_int(root, "fuses", le16_to_cpu(ctrl->fuses));
@@ -1337,6 +1383,12 @@ void json_nvme_id_ctrl(struct nvme_id_ctrl *ctrl, unsigned int mode, void (*vs)(
        if (strlen(subnqn))
                json_object_add_value_string(root, "subnqn", subnqn);
 
+       json_object_add_value_int(root, "ioccsz", le32_to_cpu(ctrl->ioccsz));
+       json_object_add_value_int(root, "iorcsz", le32_to_cpu(ctrl->iorcsz));
+       json_object_add_value_int(root, "icdoff", le16_to_cpu(ctrl->icdoff));
+       json_object_add_value_int(root, "ctrattr", ctrl->ctrattr);
+       json_object_add_value_int(root, "msdbd", ctrl->msdbd);
+
        psds = json_create_array();
        json_object_add_value_array(root, "psds", psds);