ocp: fix Ext SMART log page version 5 checking

The fields added in version 5 of the log page with the OCP 2.6 spec were
added under the version 4 checking, which this updates to avoid issues
reporting those fields with OCP 2.5 compliant drives.

Signed-off-by: Brandon Paupore <[email protected]>

Author: brandon-paupore-sndk

plugins/ocp/ocp-print-json.c

@@ -226,11 +226,7 @@ static void json_smart_extended_log_v1(struct ocp_smart_extended_log *log)
 	case 0 ... 1:
 		break;
 	default:
-	case 4:
-		json_object_add_value_uint(root, "NVMe Command Set Errata Version",
-						log->nvme_cmdset_errata_version);
-		json_object_add_value_uint(root, "Lowest Permitted Firmware Revision",
-						le64_to_cpu(log->lowest_permitted_fw_rev));
+	case 5:
 		json_object_add_value_uint(root, "NVMe Over Pcie Errata Version",
 						log->nvme_over_pcie_errate_version);
 		json_object_add_value_uint(root, "NVMe Mi Errata Version",
@@ -277,6 +273,12 @@ static void json_smart_extended_log_v1(struct ocp_smart_extended_log *log)
 			ascii += sprintf(ascii, "%c", log->dssd_firmware_build_label[i]);
 		json_object_add_value_string(root, "Dssd firmware build label", ascii_arr);
 		fallthrough;
+	case 4:
+		json_object_add_value_uint(root, "NVMe Command Set Errata Version",
+						log->nvme_cmdset_errata_version);
+		json_object_add_value_uint(root, "Lowest Permitted Firmware Revision",
+						le64_to_cpu(log->lowest_permitted_fw_rev));
+		fallthrough;
 	case 2 ... 3:
 		json_object_add_value_uint(root, "Errata Version Field",
 						log->dssd_errata_version);
@@ -388,11 +390,7 @@ static void json_smart_extended_log_v2(struct ocp_smart_extended_log *log)
 	case 0 ... 1:
 		break;
 	default:
-	case 4:
-		json_object_add_value_uint(root, "nvme_command_set_errata_version",
-						log->nvme_cmdset_errata_version);
-		json_object_add_value_uint(root, "lowest_permitted_firmware_revision",
-						le64_to_cpu(log->lowest_permitted_fw_rev));
+	case 5:
 		json_object_add_value_uint(root, "nvme_over_pcie_errata_version",
 						log->nvme_over_pcie_errate_version);
 		json_object_add_value_uint(root, "nvme_mi_errata_version",
@@ -439,6 +437,12 @@ static void json_smart_extended_log_v2(struct ocp_smart_extended_log *log)
 			ascii += sprintf(ascii, "%c", log->dssd_firmware_build_label[i]);
 		json_object_add_value_string(root, "dssd_firmware_build_label", ascii_arr);
 		fallthrough;
+	case 4:
+		json_object_add_value_uint(root, "nvme_command_set_errata_version",
+						log->nvme_cmdset_errata_version);
+		json_object_add_value_uint(root, "lowest_permitted_firmware_revision",
+						le64_to_cpu(log->lowest_permitted_fw_rev));
+		fallthrough;
 	case 2 ... 3:
 		json_object_add_value_uint(root, "errata_version_field",
 						log->dssd_errata_version);

plugins/ocp/ocp-print-stdout.c

@@ -168,11 +168,7 @@ static void stdout_smart_extended_log(struct ocp_smart_extended_log *log, unsign
 	case 0 ... 1:
 		break;
 	default:
-	case 4:
-		printf("  NVMe Command Set Errata Version               %d\n",
-			log->nvme_cmdset_errata_version);
-		printf("  Lowest Permitted Firmware Revision            %"PRIu64"\n",
-			le64_to_cpu(log->lowest_permitted_fw_rev));
+	case 5:
 		printf("  NVMe Over Pcie Errata Version			%d\n",
 			log->nvme_over_pcie_errate_version);
 		printf("  NVMe Mi Errata Version			%d\n",
@@ -218,6 +214,12 @@ static void stdout_smart_extended_log(struct ocp_smart_extended_log *log, unsign
 			printf("%c", log->dssd_firmware_build_label[i]);
 		printf("\n");
 		fallthrough;
+	case 4:
+		printf("  NVMe Command Set Errata Version               %d\n",
+			log->nvme_cmdset_errata_version);
+		printf("  Lowest Permitted Firmware Revision            %"PRIu64"\n",
+			le64_to_cpu(log->lowest_permitted_fw_rev));
+		fallthrough;
 	case 2 ... 3:
 		printf("  Errata Version Field                          %d\n",
 			log->dssd_errata_version);