From: Tokunori Ikegami <ikegami.t@gmail.com>
Date: Mon, 26 Feb 2024 15:52:02 +0000 (+0900)
Subject: nvme-print: Add PEL RCI port identifier type printf function
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=a30b01f647524b4c69cf1ec7d3f2b344e1e0d182;p=users%2Fsagi%2Fnvme-cli.git

nvme-print: Add PEL RCI port identifier type printf function

Change to use NVME_PEL_RCI_RCPIT definitions.

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

diff --git a/nvme-print-stdout.c b/nvme-print-stdout.c
index e984fe56..37e019db 100644
--- a/nvme-print-stdout.c
+++ b/nvme-print-stdout.c
@@ -224,14 +224,11 @@ static void stdout_persistent_event_log_rci(__le32 pel_header_rci)
 	__u8 rcpit = NVME_PEL_RCI_RCPIT(rci);
 	__u16 rcpid = NVME_PEL_RCI_RCPID(rci);
 
-	if(rsvd19)
+	if (rsvd19)
 		printf("  [31:19] : %#x\tReserved\n", rsvd19);
-	printf("\tReporting Context Exists (RCE): %s(%u)\n",
-		rce ? "true" : "false", rce);
+	printf("\tReporting Context Exists (RCE): %s(%u)\n", rce ? "true" : "false", rce);
 	printf("\tReporting Context Port Identifier Type (RCPIT): %u(%s)\n", rcpit,
-		(rcpit == 0x00) ? "Does not already exist" :
-		(rcpit == 0x01) ? "NVM subsystem port" :
-		(rcpit == 0x02) ? "NVMe-MI port" : "Reserved");
+	       nvme_pel_rci_rcpit_to_string(rcpit));
 	printf("\tReporting Context Port Identifier (RCPID): %#x\n\n", rcpid);
 }
 
diff --git a/nvme-print.c b/nvme-print.c
index 1086aad2..1e9ae844 100644
--- a/nvme-print.c
+++ b/nvme-print.c
@@ -950,6 +950,21 @@ const char *nvme_host_metadata_type_to_string(enum nvme_features_id fid,
        }
 }
 
+const char *nvme_pel_rci_rcpit_to_string(enum nvme_pel_rci_rcpit rcpit)
+{
+	switch (rcpit) {
+	case NVME_PEL_RCI_RCPIT_NOT_EXIST:
+		return "Does not already exist";
+	case NVME_PEL_RCI_RCPIT_EST_PORT:
+		return "NVM subsystem port";
+	case NVME_PEL_RCI_RCPIT_EST_ME:
+		return "NVMe-MI port";
+	default:
+		break;
+	}
+	return "Reserved";
+}
+
 void nvme_feature_show(enum nvme_features_id fid, int sel, unsigned int result)
 {
 	nvme_print(show_feature, NORMAL, fid, sel, result);
diff --git a/nvme-print.h b/nvme-print.h
index 4533474e..5ded3b6b 100644
--- a/nvme-print.h
+++ b/nvme-print.h
@@ -302,6 +302,7 @@ const char *nvme_zone_state_to_string(__u8 state);
 const char *nvme_zone_type_to_string(__u8 cond);
 const char *nvme_plm_window_to_string(__u32 plm);
 const char *nvme_ns_wp_cfg_to_string(enum nvme_ns_write_protect_cfg state);
+const char *nvme_pel_rci_rcpit_to_string(enum nvme_pel_rci_rcpit rcpit);
 
 void nvme_dev_full_path(nvme_ns_t n, char *path, size_t len);
 void nvme_generic_full_path(nvme_ns_t n, char *path, size_t len);