Skip to contentSkip to conversation

cxl/list: add firmware_version to default memdev listing

PATCH In review [email protected] 5 participants 5 messages Jul 25, 2024 – Aug 9, 2024 libnvdimm: non-volatile memory device

lore
Share & tools
lore

[email protected]

author maintainer
#0 lore raw

PATCH 1/1 cxl/list: add firmware_version to default memdev listing

From: Alison Schofield <[email protected]>

cxl list users may discover the firmware revision of a memory device by using the -F option to cxl list. That option uses the CXL GET_FW_INFO command and emits this json:

"firmware":{
      "num_slots":2,
      "active_slot":1,
      "staged_slot":1,
      "online_activate_capable":false,
      "slot_1_version":"BWFW VERSION 0",
      "fw_update_in_progress":false
    }

Since device support for GET_FW_INFO is optional, the above method is not guaranteed. However, the IDENTIFY command is mandatory and provides the current firmware revision.

Accessors already exist for retrieval from sysfs so simply add the new json member to the default memdev listing.

This means users of the -F option will get the same info twice if GET_FW_INFO is supported.

[

  {
    "memdev":"mem9",
    "pmem_size":268435456,
    "serial":0,
    "host":"0000:c0:00.0"
    "firmware_version":"BWFW VERSION 00",

}
]

---
 cxl/json.c | 8 ++++++++
 1 file changed, 8 insertions(+)
cxl/json.c +8 -0
index 0c27abaea0bd..0b0b186a2594 100644
@@ -577,6 +577,7 @@ struct json_object *util_cxl_memdev_to_json(struct cxl_memdev *memdev,
 	const char *devname = cxl_memdev_get_devname(memdev);
 	struct json_object *jdev, *jobj;
 	unsigned long long serial, size;
+	const char *fw_version;
 	int numa_node;
 	int qos_class;
 
@@ -646,6 +647,13 @@ struct json_object *util_cxl_memdev_to_json(struct cxl_memdev *memdev,
 	if (jobj)
 		json_object_object_add(jdev, "host", jobj);
 
+	fw_version = cxl_memdev_get_firmware_version(memdev);
+	if (fw_version) {
+		jobj = json_object_new_string(fw_version);
+		if (jobj)
+			json_object_object_add(jdev, "firmware_version", jobj);
+	}
+
 	if (!cxl_memdev_is_enabled(memdev)) {
 		jobj = json_object_new_string("disabled");
 		if (jobj)
Signature · 1 line
2.37.3
Reviewed-by Tested-by on v1 1/1
#1 lore raw
Quoted 80 lines

-----Original Message-----
From: [email protected] <[email protected]>
Sent: Thursday, July 25, 2024 3:31 PM
To: [email protected]; [email protected]
Cc: Alison Schofield <[email protected]>; Dan Williams <[email protected]>
Subject: [ndctl PATCH] cxl/list: add firmware_version to default memdev listing

From: Alison Schofield <[email protected]>

cxl list users may discover the firmware revision of a memory device by using the -F option to cxl list. That option uses the CXL GET_FW_INFO command and emits this json:

"firmware":{
      "num_slots":2,
      "active_slot":1,
      "staged_slot":1,
      "online_activate_capable":false,
      "slot_1_version":"BWFW VERSION 0",
      "fw_update_in_progress":false
    }

Since device support for GET_FW_INFO is optional, the above method is not guaranteed. However, the IDENTIFY command is mandatory and provides the current firmware revision.

Accessors already exist for retrieval from sysfs so simply add the new json member to the default memdev listing.

This means users of the -F option will get the same info twice if GET_FW_INFO is supported.

[

  {
    "memdev":"mem9",
    "pmem_size":268435456,
    "serial":0,
    "host":"0000:c0:00.0"
    "firmware_version":"BWFW VERSION 00",

}
]

---
 cxl/json.c | 8 ++++++++
 1 file changed, 8 insertions(+)
cxl/json.c +8 -0
index 0c27abaea0bd..0b0b186a2594 100644
@@ -577,6 +577,7 @@ struct json_object *util_cxl_memdev_to_json(struct
 cxl_memdev *memdev,
 	const char *devname = cxl_memdev_get_devname(memdev);
 	struct json_object *jdev, *jobj;
 	unsigned long long serial, size;
+	const char *fw_version;
 	int numa_node;
 	int qos_class;
@@ -646,6 +647,13 @@ struct json_object *util_cxl_memdev_to_json(struct
 cxl_memdev *memdev,
 	if (jobj)
 		json_object_object_add(jdev, "host", jobj);
 
+	fw_version = cxl_memdev_get_firmware_version(memdev);
+	if (fw_version) {
+		jobj = json_object_new_string(fw_version);
+		if (jobj)
+			json_object_object_add(jdev, "firmware_version", jobj);
+	}
+
 	if (!cxl_memdev_is_enabled(memdev)) {
 		jobj = json_object_new_string("disabled");

if (jobj)
--
2.37.3

Reviewed-by Fan Ni on v1 1/1
#2 lore raw
In reply to [email protected]
Quoted 32 lines · On Thu, Jul 25, 2024 at 12:30:50AM -0700, [email protected] wrote:

From: Alison Schofield <[email protected]>

cxl list users may discover the firmware revision of a memory device by using the -F option to cxl list. That option uses the CXL GET_FW_INFO command and emits this json:

"firmware":{
      "num_slots":2,
      "active_slot":1,
      "staged_slot":1,
      "online_activate_capable":false,
      "slot_1_version":"BWFW VERSION 0",
      "fw_update_in_progress":false
    }

Since device support for GET_FW_INFO is optional, the above method is not guaranteed. However, the IDENTIFY command is mandatory and provides the current firmware revision.

Accessors already exist for retrieval from sysfs so simply add the new json member to the default memdev listing.

This means users of the -F option will get the same info twice if GET_FW_INFO is supported.

[

  {
    "memdev":"mem9",
    "pmem_size":268435456,
    "serial":0,
    "host":"0000:c0:00.0"
    "firmware_version":"BWFW VERSION 00",
Quoted 5 lines

}
]

Quoted 33 lines
---
 cxl/json.c | 8 ++++++++
 1 file changed, 8 insertions(+)
cxl/json.c +8 -0
index 0c27abaea0bd..0b0b186a2594 100644
@@ -577,6 +577,7 @@ struct json_object *util_cxl_memdev_to_json(struct cxl_memdev *memdev,
 	const char *devname = cxl_memdev_get_devname(memdev);
 	struct json_object *jdev, *jobj;
 	unsigned long long serial, size;
+	const char *fw_version;
 	int numa_node;
 	int qos_class;
 
@@ -646,6 +647,13 @@ struct json_object *util_cxl_memdev_to_json(struct cxl_memdev *memdev,
 	if (jobj)
 		json_object_object_add(jdev, "host", jobj);
 
+	fw_version = cxl_memdev_get_firmware_version(memdev);
+	if (fw_version) {
+		jobj = json_object_new_string(fw_version);
+		if (jobj)
+			json_object_object_add(jdev, "firmware_version", jobj);
+	}
+
 	if (!cxl_memdev_is_enabled(memdev)) {
 		jobj = json_object_new_string("disabled");
 		if (jobj)
Signature · 1 line
2.37.3
maintainer Reviewed-by on v1 1/1
#3 lore raw
In reply to [email protected]
Quoted 32 lines · On 7/25/24 12:30 AM, [email protected] wrote:

From: Alison Schofield <[email protected]>

cxl list users may discover the firmware revision of a memory device by using the -F option to cxl list. That option uses the CXL GET_FW_INFO command and emits this json:

"firmware":{
      "num_slots":2,
      "active_slot":1,
      "staged_slot":1,
      "online_activate_capable":false,
      "slot_1_version":"BWFW VERSION 0",
      "fw_update_in_progress":false
    }

Since device support for GET_FW_INFO is optional, the above method is not guaranteed. However, the IDENTIFY command is mandatory and provides the current firmware revision.

Accessors already exist for retrieval from sysfs so simply add the new json member to the default memdev listing.

This means users of the -F option will get the same info twice if GET_FW_INFO is supported.

[

  {
    "memdev":"mem9",
    "pmem_size":268435456,
    "serial":0,
    "host":"0000:c0:00.0"
    "firmware_version":"BWFW VERSION 00",
Quoted 5 lines

}
]

Quoted 30 lines
---
 cxl/json.c | 8 ++++++++
 1 file changed, 8 insertions(+)
cxl/json.c +8 -0
index 0c27abaea0bd..0b0b186a2594 100644
@@ -577,6 +577,7 @@ struct json_object *util_cxl_memdev_to_json(struct cxl_memdev *memdev,
 	const char *devname = cxl_memdev_get_devname(memdev);
 	struct json_object *jdev, *jobj;
 	unsigned long long serial, size;
+	const char *fw_version;
 	int numa_node;
 	int qos_class;
 
@@ -646,6 +647,13 @@ struct json_object *util_cxl_memdev_to_json(struct cxl_memdev *memdev,
 	if (jobj)
 		json_object_object_add(jdev, "host", jobj);
 
+	fw_version = cxl_memdev_get_firmware_version(memdev);
+	if (fw_version) {
+		jobj = json_object_new_string(fw_version);
+		if (jobj)
+			json_object_object_add(jdev, "firmware_version", jobj);
+	}
+
 	if (!cxl_memdev_is_enabled(memdev)) {
 		jobj = json_object_new_string("disabled");
 		if (jobj)
Reviewed-by on v1 1/1
#4 lore raw
In reply to [email protected]
Quoted 32 lines · alison.schofield@ wrote:

From: Alison Schofield <[email protected]>

cxl list users may discover the firmware revision of a memory device by using the -F option to cxl list. That option uses the CXL GET_FW_INFO command and emits this json:

"firmware":{
      "num_slots":2,
      "active_slot":1,
      "staged_slot":1,
      "online_activate_capable":false,
      "slot_1_version":"BWFW VERSION 0",
      "fw_update_in_progress":false
    }

Since device support for GET_FW_INFO is optional, the above method is not guaranteed. However, the IDENTIFY command is mandatory and provides the current firmware revision.

Accessors already exist for retrieval from sysfs so simply add the new json member to the default memdev listing.

This means users of the -F option will get the same info twice if GET_FW_INFO is supported.

[

  {
    "memdev":"mem9",
    "pmem_size":268435456,
    "serial":0,
    "host":"0000:c0:00.0"
    "firmware_version":"BWFW VERSION 00",
Quoted 5 lines

}
]

Looks good to me: