nvme: fix directive receive identify offsets

The persistent fields start at offset 64. Signed-off-by: Keith Busch <[email protected]>
linux-nvme · Feb 2, 2024 · c9750d5 · c9750d5
1 parent 6cbe764
commit c9750d5
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 6 deletions.
diff --git a/nvme-print-json.c b/nvme-print-json.c
@@ -4148,11 +4148,11 @@ static void json_directive_show_fields_identify(__u8 doper, __u8 *field, struct
 		obj_add_array(r, "Directive Persistent Across Controller Level Resets",
 			      persistent);
 		obj_add_str(persistent, "Identify Directive",
-			    *(field + 32) & 0x1 ? "Enabled" : "Disabled");
+			    *(field + 64) & 0x1 ? "Enabled" : "Disabled");
 		obj_add_str(persistent, "Stream Directive",
-			    *(field + 32) & 0x2 ? "Enabled" : "Disabled");
+			    *(field + 64) & 0x2 ? "Enabled" : "Disabled");
 		obj_add_str(persistent, "Data Placement Directive",
-			    *(field + 32) & 0x4 ? "Enabled" : "Disabled");
+			    *(field + 64) & 0x4 ? "Enabled" : "Disabled");
 		break;
 	default:
 		obj_add_str(r, "Error", "invalid directive operations for Identify Directives");

diff --git a/nvme-print-stdout.c b/nvme-print-stdout.c
@@ -4227,11 +4227,11 @@ static void stdout_directive_show_fields(__u8 dtype, __u8 doper,
 				(*(field + 32) & 0x4) ? "enabled" : "disabled");
 			printf("\tDirective Persistent Across Controller Level Resets \n");
 			printf("\t\tIdentify Directive       : %s\n",
-				(*(field + 32) & 0x1) ? "enabled" : "disabled");
+				(*(field + 64) & 0x1) ? "enabled" : "disabled");
 			printf("\t\tStream Directive         : %s\n",
-				(*(field + 32) & 0x2) ? "enabled" : "disabled");
+				(*(field + 64) & 0x2) ? "enabled" : "disabled");
 			printf("\t\tData Placement Directive : %s\n",
-				(*(field + 32) & 0x4) ? "enabled" : "disabled");
+				(*(field + 64) & 0x4) ? "enabled" : "disabled");
 			break;
 		default:
 			fprintf(stderr,