nvme-print: Decode 2 new bits in ctratt.

Add decoding of Power Measurement Support (PMS) and
Power Limit Support (PLS) bits in Controller Attributes
(CTRATT) field of Identify Controller Data Structure.

Signed-off-by: Jim Munn <[email protected]>

Author: jimmunn

libnvme/src/nvme/types.h

@@ -1821,6 +1821,8 @@ enum nvme_id_ctrl_oaes {
  * @NVME_CTRL_CTRATT_HMBR: HMB Restrict Non-Operational Power State Access
  * @NVME_CTRL_CTRATT_RHII: Reservations and Host Identifier Interaction
  * @NVME_CTRL_CTRATT_FDPS: Flexible Data Placement supported
+ * @NVME_CTRL_CTRATT_PLS: Power Limit Support
+ * @NVME_CTRL_CTRATT_PMS: Power Measurement Support
  */
 enum nvme_id_ctrl_ctratt {
 	NVME_CTRL_CTRATT_128_ID			= 1 << 0,
@@ -1843,6 +1845,8 @@ enum nvme_id_ctrl_ctratt {
 	NVME_CTRL_CTRATT_HMBR			= 1 << 17,
 	NVME_CTRL_CTRATT_RHII			= 1 << 18,
 	NVME_CTRL_CTRATT_FDPS			= 1 << 19,
+	NVME_CTRL_CTRATT_PLS			= 1 << 20,
+	NVME_CTRL_CTRATT_PMS			= 1 << 21,
 };
 
 /**

nvme-print-stdout.c

@@ -1925,7 +1925,9 @@ static void stdout_id_ctrl_oaes(__le32 ctrl_oaes)
 static void stdout_id_ctrl_ctratt(__le32 ctrl_ctratt)
 {
 	__u32 ctratt = le32_to_cpu(ctrl_ctratt);
-	__u32 rsvd20 = (ctratt >> 20);
+	__u32 rsvd22 = (ctratt >> 22);
+	__u32 pms = (ctratt & NVME_CTRL_CTRATT_PMS) >> 21;
+	__u32 pls = (ctratt & NVME_CTRL_CTRATT_PLS) >> 20;
 	__u32 fdps = (ctratt & NVME_CTRL_CTRATT_FDPS) >> 19;
 	__u32 rhii = (ctratt & NVME_CTRL_CTRATT_RHII) >> 18;
 	__u32 hmbr = (ctratt & NVME_CTRL_CTRATT_HMBR) >> 17;
@@ -1947,8 +1949,12 @@ static void stdout_id_ctrl_ctratt(__le32 ctrl_ctratt)
 	__u32 nopspm = (ctratt & NVME_CTRL_CTRATT_NON_OP_PSP) >> 1;
 	__u32 hids = (ctratt & NVME_CTRL_CTRATT_128_ID) >> 0;
 
-	if (rsvd20)
-		printf(" [31:20] : %#x\tReserved\n", rsvd20);
+	if (rsvd22)
+		printf("  [31:22] : %#x\tReserved\n", rsvd22);
+	printf("  [21:21] : %#x\tPower Measurement %sSupported\n",
+		pms, pms ? "" : "Not ");
+	printf("  [20:20] : %#x\tPower Limit %sSupported\n",
+		pls, pls ? "" : "Not ");
 	printf("  [19:19] : %#x\tFlexible Data Placement %sSupported\n",
 		fdps, fdps ? "" : "Not ");
 	printf("  [18:18] : %#x\tReservations and Host Identifier Interaction %sSupported\n",