]> www.infradead.org Git - users/sagi/nvme-cli.git/commitdiff
nvme-print-stdout: fix ASQB, ACQB and BMBBA prints
authorTokunori Ikegami <ikegami.t@gmail.com>
Wed, 1 May 2024 10:58:43 +0000 (19:58 +0900)
committerDaniel Wagner <wagi@monom.org>
Fri, 3 May 2024 12:19:28 +0000 (14:19 +0200)
The fields needed be output only as the 52 most significant bits.

Signed-off-by: Tokunori Ikegami <ikegami.t@gmail.com>
nvme-print-stdout.c

index 6f9bb92ee64002bd61e9c14eee8740c66fae1acc..71783236e9f7fcff2241e1511e0d56b5effd114d 100644 (file)
@@ -1230,6 +1230,16 @@ static void stdout_registers_aqa(__u32 aqa)
        printf("\tAdmin Submission Queue Size (ASQS): %u\n\n", NVME_AQA_ASQS(aqa) + 1);
 }
 
+static void stdout_registers_asq(uint64_t asq)
+{
+       printf("\tAdmin Submission Queue Base (ASQB): %"PRIx64"\n", (uint64_t)NVME_ASQ_ASQB(asq));
+}
+
+static void stdout_registers_acq(uint64_t acq)
+{
+       printf("\tAdmin Completion Queue Base (ACQB): %"PRIx64"\n", (uint64_t)NVME_ACQ_ACQB(acq));
+}
+
 static void stdout_registers_cmbloc(__u32 cmbloc, bool support)
 {
        static const char * const enforced[] = { "Enforced", "Not Enforced" };
@@ -1324,7 +1334,8 @@ static void stdout_registers_bprsel(__u32 bprsel)
 
 static void stdout_registers_bpmbl(uint64_t bpmbl)
 {
-       printf("\tBoot Partition Memory Buffer Base Address (BMBBA): %"PRIx64"\n", bpmbl);
+       printf("\tBoot Partition Memory Buffer Base Address (BMBBA): %"PRIx64"\n",
+              (uint64_t)NVME_BPMBL_BMBBA(bpmbl));
 }
 
 static void stdout_registers_cmbmsc(uint64_t cmbmsc)
@@ -1456,10 +1467,10 @@ static void stdout_ctrl_register_human(int offset, uint64_t value, bool support)
                stdout_registers_aqa(value);
                break;
        case NVME_REG_ASQ:
-               printf("\tAdmin Submission Queue Base (ASQB): %#"PRIx64"\n\n", value);
+               stdout_registers_asq(value);
                break;
        case NVME_REG_ACQ:
-               printf("\tAdmin Completion Queue Base (ACQB): %#"PRIx64"\n\n", value);
+               stdout_registers_acq(value);
                break;
        case NVME_REG_CMBLOC:
                stdout_registers_cmbloc(value, support);