Skip to content

Commit cea7c35

Browse files
arbaz404igaw
authored andcommitted
type: Using enums of ANSAN and RGCNS bit for OAES
Using enums of ANSAN and RGCNS bit for OAES field based on NVM Express Base Specification 2.1 Signed-off-by: Arbaz Khan <[email protected]> Reviewed-by: Steven Seungcheol Lee <[email protected]> Reviewed-by: Francis Pravin <[email protected]>
1 parent c3e374a commit cea7c35

File tree

1 file changed

+26
-17
lines changed

1 file changed

+26
-17
lines changed

nvme-print-stdout.c

Lines changed: 26 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -1691,29 +1691,38 @@ static void stdout_id_ctrl_cmic(__u8 cmic)
16911691
static void stdout_id_ctrl_oaes(__le32 ctrl_oaes)
16921692
{
16931693
__u32 oaes = le32_to_cpu(ctrl_oaes);
1694-
__u32 disc = (oaes & NVME_CTRL_OAES_DL) >> 31;
1695-
__u32 rsvd0 = (oaes & 0x70000000) >> 28;
1696-
__u32 zicn = (oaes & NVME_CTRL_OAES_ZD) >> 27;
1697-
__u32 rsvd1 = (oaes & 0x7fe0000) >> 17;
1698-
__u32 tthr = (oaes & 0x10000) >> 16;
1694+
__u32 dlpcn = (oaes & NVME_CTRL_OAES_DL) >> 31;
1695+
__u32 rsvd28 = (oaes & 0x70000000) >> 28;
1696+
__u32 zdcn = (oaes & NVME_CTRL_OAES_ZD) >> 27;
1697+
__u32 rsvd20 = (oaes & 0x7fe0000) >> 20;
1698+
__u32 ansan = (oaes & NVME_CTRL_OAES_ANSAN) >> 19;
1699+
__u32 rsvd18 = (oaes >> 18) & 0x1;
1700+
__u32 rgcns = (oaes & NVME_CTRL_OAES_RGCNS) >> 17;
1701+
__u32 tthr = (oaes & NVME_CTRL_OAES_TTH) >> 16;
16991702
__u32 normal_shn = (oaes & NVME_CTRL_OAES_NS) >> 15;
17001703
__u32 egealpcn = (oaes & NVME_CTRL_OAES_EGE) >> 14;
17011704
__u32 lbasin = (oaes & NVME_CTRL_OAES_LBAS) >> 13;
17021705
__u32 plealcn = (oaes & NVME_CTRL_OAES_PLEA) >> 12;
17031706
__u32 anacn = (oaes & NVME_CTRL_OAES_ANA) >> 11;
1704-
__u32 rsvd2 = (oaes >> 10) & 0x1;
1707+
__u32 rsvd10 = (oaes >> 10) & 0x1;
17051708
__u32 fan = (oaes & NVME_CTRL_OAES_FA) >> 9;
17061709
__u32 nace = (oaes & NVME_CTRL_OAES_NA) >> 8;
1707-
__u32 rsvd3 = oaes & 0xFF;
1710+
__u32 rsvd0 = oaes & 0xFF;
17081711

17091712
printf(" [31:31] : %#x\tDiscovery Log Change Notice %sSupported\n",
1710-
disc, disc ? "" : "Not ");
1711-
if (rsvd0)
1712-
printf(" [30:28] : %#x\tReserved\n", rsvd0);
1713+
dlpcn, dlpcn ? "" : "Not ");
1714+
if (rsvd28)
1715+
printf(" [30:28] : %#x\tReserved\n", rsvd28);
17131716
printf(" [27:27] : %#x\tZone Descriptor Changed Notices %sSupported\n",
1714-
zicn, zicn ? "" : "Not ");
1715-
if (rsvd1)
1716-
printf(" [26:17] : %#x\tReserved\n", rsvd1);
1717+
zdcn, zdcn ? "" : "Not ");
1718+
if (rsvd20)
1719+
printf(" [26:20] : %#x\tReserved\n", rsvd20);
1720+
printf(" [19:19] : %#x\tAllocated Namespace Attribute Notices %sSupported\n",
1721+
ansan, ansan ? "" : "Not ");
1722+
if (rsvd18)
1723+
printf(" [18:18] : %#x\tReserved\n", rsvd18);
1724+
printf(" [17:17] : %#x\tReachability Groups Change Notices %sSupported\n",
1725+
rgcns, rgcns ? "" : "Not ");
17171726
printf(" [16:16] : %#x\tTemperature Threshold Hysteresis Recovery %sSupported\n",
17181727
tthr, tthr ? "" : "Not ");
17191728
printf(" [15:15] : %#x\tNormal NSS Shutdown Event %sSupported\n",
@@ -1728,14 +1737,14 @@ static void stdout_id_ctrl_oaes(__le32 ctrl_oaes)
17281737
plealcn, plealcn ? "" : "Not ");
17291738
printf(" [11:11] : %#x\tAsymmetric Namespace Access Change Notices"\
17301739
" %sSupported\n", anacn, anacn ? "" : "Not ");
1731-
if (rsvd2)
1732-
printf(" [10:10] : %#x\tReserved\n", rsvd2);
1740+
if (rsvd10)
1741+
printf(" [10:10] : %#x\tReserved\n", rsvd10);
17331742
printf(" [9:9] : %#x\tFirmware Activation Notices %sSupported\n",
17341743
fan, fan ? "" : "Not ");
17351744
printf(" [8:8] : %#x\tNamespace Attribute Changed Event %sSupported\n",
17361745
nace, nace ? "" : "Not ");
1737-
if (rsvd3)
1738-
printf(" [7:0] : %#x\tReserved\n", rsvd3);
1746+
if (rsvd0)
1747+
printf(" [7:0] : %#x\tReserved\n", rsvd0);
17391748
printf("\n");
17401749
}
17411750

0 commit comments

Comments
 (0)