From: Tokunori Ikegami <ikegami.t@gmail.com>
Date: Fri, 13 Oct 2023 16:46:57 +0000 (+0900)
Subject: nvme-print-json: Add id_ctrl_rpmbs print function
X-Git-Tag: v2.7~79
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=c5a01e2620e6c0685e4441ab704d6859bc270644;p=users%2Fsagi%2Fnvme-cli.git

nvme-print-json: Add id_ctrl_rpmbs print function

Signed-off-by: Tokunori Ikegami <ikegami.t@gmail.com>
---

diff --git a/nvme-print-json.c b/nvme-print-json.c
index 2a47df06..b7d09d31 100644
--- a/nvme-print-json.c
+++ b/nvme-print-json.c
@@ -28,6 +28,7 @@
 #define root_add_uint(k, v) json_object_add_value_uint(root, k, v)
 #define root_add_uint64(k, v) json_object_add_value_uint64(root, k, v)
 #define root_add_uint_0x(k, v) obj_add_uint_0x(root, k, v)
+#define root_add_uint_nx(k, v) obj_add_uint_nx(root, k, v)
 #define root_add_uint_x(k, v) obj_add_uint_x(root, k, v)
 
 static const uint8_t zero_uuid[16] = { 0 };
@@ -61,6 +62,14 @@ static void obj_add_uint_0x(struct json_object *o, const char *k, __u32 v)
 	obj_add_str(o, k, str);
 }
 
+static void obj_add_uint_nx(struct json_object *o, const char *k, __u32 v)
+{
+	char str[STR_LEN];
+
+	sprintf(str, "%#x", v);
+	obj_add_str(o, k, str);
+}
+
 static void obj_add_prix64(struct json_object *o, const char *k, uint64_t v)
 {
 	char str[STR_LEN];
@@ -3301,6 +3310,28 @@ static void json_feature_show_fields(enum nvme_features_id fid, unsigned int res
 	}
 }
 
+void json_id_ctrl_rpmbs(__le32 ctrl_rpmbs)
+{
+	struct json_object *root = json_create_object();
+	__u32 rpmbs = le32_to_cpu(ctrl_rpmbs);
+	__u32 asz = (rpmbs & 0xFF000000) >> 24;
+	__u32 tsz = (rpmbs & 0xFF0000) >> 16;
+	__u32 rsvd = (rpmbs & 0xFFC0) >> 6;
+	__u32 auth = (rpmbs & 0x38) >> 3;
+	__u32 rpmb = rpmbs & 7;
+
+	root_add_uint_nx("[31:24]: Access Size", asz);
+	root_add_uint_nx("[23:16]: Total Size", tsz);
+
+	if (rsvd)
+		root_add_uint_nx("[15:6] :Reserved", rsvd);
+
+	root_add_uint_nx("[5:3] : Authentication Method", auth);
+	root_add_uint_nx("[2:0] : Number of RPMB Units", rpmb);
+
+	json_print(root);
+}
+
 void json_d(unsigned char *buf, int len, int width, int group)
 {
 	struct json_object *root = json_create_object();
@@ -4176,7 +4207,7 @@ static struct print_ops json_print_ops = {
 	.zns_report_zones		= json_nvme_zns_report_zones,
 	.show_feature			= json_feature_show,
 	.show_feature_fields		= json_feature_show_fields,
-	.id_ctrl_rpmbs			= NULL,
+	.id_ctrl_rpmbs			= json_id_ctrl_rpmbs,
 	.lba_range			= NULL,
 	.lba_status_info		= NULL,
 	.d				= json_d,