From: Keith Busch <keith.busch@gmail.com>
Date: Sat, 3 Feb 2018 17:56:49 +0000 (-0700)
Subject: Add decoding for new controller attributes
X-Git-Tag: v1.6~83
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=94f25a8602368ca9068d025abedf044ef12941f9;p=users%2Fsagi%2Fnvme-cli.git

Add decoding for new controller attributes

Attributes added in 1.3 and TP4003: non-operational powerstates and
IO determinism.

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

diff --git a/linux/nvme.h b/linux/nvme.h
index 537217af..228391e9 100644
--- a/linux/nvme.h
+++ b/linux/nvme.h
@@ -279,6 +279,12 @@ enum {
 	NVME_CTRL_OACS_DIRECTIVES		= 1 << 5,
 	NVME_CTRL_OACS_DBBUF_SUPP		= 1 << 8,
 	NVME_CTRL_LPA_CMD_EFFECTS_LOG		= 1 << 1,
+	NVME_CTRL_CTRATT_128_ID			= 1 << 0,
+	NVME_CTRL_CTRATT_NON_OP_PSP		= 1 << 1,
+	NVME_CTRL_CTRATT_NVM_SETS		= 1 << 2,
+	NVME_CTRL_CTRATT_READ_RECV_LVLS		= 1 << 3,
+	NVME_CTRL_CTRATT_ENDURANCE_GROUPS	= 1 << 4,
+	NVME_CTRL_CTRATT_PREDICTABLE_LAT	= 1 << 5,
 };
 
 struct nvme_lbaf {
diff --git a/nvme-print.c b/nvme-print.c
index 1f99ed1a..7527f36d 100644
--- a/nvme-print.c
+++ b/nvme-print.c
@@ -110,11 +110,26 @@ static void show_nvme_id_ctrl_oaes(__le32 ctrl_oaes)
 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;
+	__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;
 
 	if (rsvd0)
-		printf(" [31:1] : %#x\tReserved\n", rsvd0);
+		printf(" [31:6] : %#x\tReserved\n", rsvd0);
+	printf("  [5:5] : %#x\tPredictable Latency Mode %sSupported\n",
+		iod, iod ? "" : "Not ");
+	printf("  [4:4] : %#x\tEndurance Groups %sSupported\n",
+		eg, eg ? "" : "Not ");
+	printf("  [3:3] : %#x\tRead Recovery Levels %sSupported\n",
+		rrl, rrl ? "" : "Not ");
+	printf("  [2:2] : %#x\tNVM Sets %sSupported\n",
+		sets, sets ? "" : "Not ");
+	printf("  [1:1] : %#x\tNon-Operational Power State Permissive %sSupported\n",
+		psp, psp ? "" : "Not ");
 	printf("  [0:0] : %#x\t128-bit Host Identifier %sSupported\n",
 		hostid128, hostid128 ? "" : "Not ");
 	printf("\n");