nvme-print: print the new fields added in TP4165

Print the new fields added in TP4165.

Signed-off-by: Francis Pravin <francis.p@samsung.com>
Reviewed-by: Steven Seungcheol Lee <sc108.lee@samsung.com>

Author: francispravin5

nvme-print-json.c

@@ -3033,6 +3033,7 @@ static void json_nvme_id_ctrl_nvm(struct nvme_id_ctrl_nvm *ctrl_nvm)
 	obj_add_uint(r, "dmrl", ctrl_nvm->dmrl);
 	obj_add_uint(r, "dmrsl", le32_to_cpu(ctrl_nvm->dmrsl));
 	obj_add_uint64(r, "dmsl", le64_to_cpu(ctrl_nvm->dmsl));
+	obj_add_uint(r, "aocs", le16_to_cpu(ctrl_nvm->aocs));
 
 	json_print(r);
 }
@@ -3066,6 +3067,7 @@ static void json_nvme_nvm_id_ns(struct nvme_nvm_id_ns *nvm_ns,
 	}
 	if (ns->nsfeat & 0x20)
 		obj_add_int(r, "npdgl", le32_to_cpu(nvm_ns->npdgl));
+	obj_add_uint(r, "tlbaag", le32_to_cpu(nvm_ns->tlbaag));
 
 	json_print(r);
 }

nvme-print-stdout.c

@@ -3053,15 +3053,32 @@ static void stdout_id_ctrl(struct nvme_id_ctrl *ctrl,
 	}
 }
 
+static void stdout_id_ctrl_nvm_aocs(__u16 aocs)
+{
+	__u16 rsvd = (aocs & 0xfffe) >> 1;
+	__u8 ralbas = aocs & 0x1;
+
+	if (rsvd)
+		printf("  [15:1] : %#x\tReserved\n", rsvd);
+	printf("  [0:0] : %#x\tReporting Allocated LBA %sSupported\n", ralbas,
+		ralbas ? "" : "Not ");
+	printf("\n");
+}
+
 static void stdout_id_ctrl_nvm(struct nvme_id_ctrl_nvm *ctrl_nvm)
 {
+	int verbose = stdout_print_ops.flags & VERBOSE;
+
 	printf("NVMe Identify Controller NVM:\n");
 	printf("vsl    : %u\n", ctrl_nvm->vsl);
 	printf("wzsl   : %u\n", ctrl_nvm->wzsl);
 	printf("wusl   : %u\n", ctrl_nvm->wusl);
 	printf("dmrl   : %u\n", ctrl_nvm->dmrl);
 	printf("dmrsl  : %u\n", le32_to_cpu(ctrl_nvm->dmrsl));
 	printf("dmsl   : %"PRIu64"\n", le64_to_cpu(ctrl_nvm->dmsl));
+	printf("aocs   : %u\n", le16_to_cpu(ctrl_nvm->aocs));
+	if (verbose)
+		stdout_id_ctrl_nvm_aocs(le16_to_cpu(ctrl_nvm->aocs));
 }
 
 static void stdout_nvm_id_ns_pic(__u8 pic)
@@ -3159,6 +3176,7 @@ static void stdout_nvm_id_ns(struct nvme_nvm_id_ns *nvm_ns, unsigned int nsid,
 	}
 	if (ns->nsfeat & 0x20)
 		printf("npdgl : %#x\n", le32_to_cpu(nvm_ns->npdgl));
+	printf("tlbaag: %#x\n", le32_to_cpu(nvm_ns->tlbaag));
 }
 
 static void stdout_zns_id_ctrl(struct nvme_zns_id_ctrl *ctrl)

nvme.c

@@ -3467,6 +3467,9 @@ static int nvm_id_ctrl(int argc, char **argv, struct command *cmd,
 		return err;
 	}
 
+	if (argconfig_parse_seen(opts, "verbose"))
+		flags |= VERBOSE;
+
 	ctrl_nvm = nvme_alloc(sizeof(*ctrl_nvm));
 	if (!ctrl_nvm)
 		return -ENOMEM;