]> www.infradead.org Git - users/sagi/nvme-cli.git/commitdiff
nvme-print: Fix evaluation of ctratt on pretty print
authorRoy Shterman <roys@lightbitslabs.com>
Mon, 4 Mar 2019 12:10:34 +0000 (14:10 +0200)
committerRoy Shterman <roys@lightbitslabs.com>
Mon, 4 Mar 2019 12:10:34 +0000 (14:10 +0200)
We accidantly evaluated SHIFT operation before AND
operation which caused wrong values to be printed
using Human Readable output (-H).

Signed-off-by: Roy Shterman <roys@lightbitslabs.com>
nvme-print.c

index 025d8da527e3685f81c7549b1a753e2efa8ec734..5ebff8f78c40cdd42b199d253266dd4af82418c9 100644 (file)
@@ -132,12 +132,12 @@ static void show_nvme_id_ctrl_ctratt(__le32 ctrl_ctratt)
 {
        __u32 ctratt = le32_to_cpu(ctrl_ctratt);
        __u32 rsvd0 = ctratt >> 6;
-       __u32 hostid128 = ctratt & NVME_CTRL_CTRATT_128_ID >> 0;
-       __u32 psp = ctratt & NVME_CTRL_CTRATT_NON_OP_PSP >> 1;
-       __u32 sets = ctratt & NVME_CTRL_CTRATT_NVM_SETS >> 2;
-       __u32 rrl = ctratt & NVME_CTRL_CTRATT_READ_RECV_LVLS >> 3;
-       __u32 eg = ctratt & NVME_CTRL_CTRATT_ENDURANCE_GROUPS >> 4;
-       __u32 iod = ctratt & NVME_CTRL_CTRATT_PREDICTABLE_LAT >> 5;
+       __u32 hostid128 = (ctratt & NVME_CTRL_CTRATT_128_ID) >> 0;
+       __u32 psp = (ctratt & NVME_CTRL_CTRATT_NON_OP_PSP) >> 1;
+       __u32 sets = (ctratt & NVME_CTRL_CTRATT_NVM_SETS) >> 2;
+       __u32 rrl = (ctratt & NVME_CTRL_CTRATT_READ_RECV_LVLS) >> 3;
+       __u32 eg = (ctratt & NVME_CTRL_CTRATT_ENDURANCE_GROUPS) >> 4;
+       __u32 iod = (ctratt & NVME_CTRL_CTRATT_PREDICTABLE_LAT) >> 5;
 
        if (rsvd0)
                printf(" [31:6] : %#x\tReserved\n", rsvd0);