plugin/ocp: Added OCP 2.7 smart extended log changes

ocp_smart_extended_log strcuture enhancement and print statement
modification in stdout_smart_extended_log and json_smart_extended_log_v1

Reviewed-by: Karthik Balan <[email protected]>
Reviewed-by: Arunpandian J <[email protected]>
Signed-off-by: Gopinath P <[email protected]>

Author: Gopinath P

plugins/ocp/ocp-print-json.c

@@ -243,6 +243,8 @@ static void json_smart_extended_log_v1(struct ocp_smart_extended_log *log)
 						le16_to_cpu(log->media_dies_offline));
 		json_object_add_value_uint(root, "Max temperature recorded",
 						log->max_temperature_recorded);
+		json_object_add_value_uint(root, "Form factor",
+						log->form_factor);
 		json_object_add_value_uint64(root, "Nand avg erase count",
 						le64_to_cpu(log->nand_avg_erase_count));
 		json_object_add_value_uint(root, "Command timeouts",
@@ -276,6 +278,8 @@ static void json_smart_extended_log_v1(struct ocp_smart_extended_log *log)
 		for (i = 0; i < 64; i++)
 			ascii += sprintf(ascii, "%c", log->dssd_firmware_build_label[i]);
 		json_object_add_value_string(root, "Dssd firmware build label", ascii_arr);
+		json_object_add_value_uint(root, "Die in use bad nand block",
+						le64_to_cpu(log->die_in_use_bad_nand_block));
 		fallthrough;
 	case 2 ... 3:
 		json_object_add_value_uint(root, "Errata Version Field",

plugins/ocp/ocp-print-stdout.c

@@ -185,6 +185,8 @@ static void stdout_smart_extended_log(struct ocp_smart_extended_log *log, unsign
 			le16_to_cpu(log->media_dies_offline));
 		printf("  Max temperature recorded			%d\n",
 			log->max_temperature_recorded);
+		printf("  Form factor					%d\n",
+			log->form_factor);
 		printf("  Nand avg erase count				%"PRIu64"\n",
 			le64_to_cpu(log->nand_avg_erase_count));
 		printf("  Command timeouts				%"PRIu32"\n",
@@ -217,6 +219,8 @@ static void stdout_smart_extended_log(struct ocp_smart_extended_log *log, unsign
 		for (i = 0; i < sizeof(log->dssd_firmware_build_label); i++)
 			printf("%c", log->dssd_firmware_build_label[i]);
 		printf("\n");
+		printf("  Die in use bad nand block			%"PRIu64"\n",
+			le64_to_cpu(log->die_in_use_bad_nand_block));
 		fallthrough;
 	case 2 ... 3:
 		printf("  Errata Version Field                          %d\n",

plugins/ocp/ocp-smart-extended-log.h

@@ -128,7 +128,7 @@ struct ocp_smart_extended_log {
 	__le16 total_die_failure_tolerance;		/* [219:218] */
 	__le16 media_dies_offline;			/* [221:220] */
 	__u8   max_temperature_recorded;		/* [222] */
-	__u8   rsvd223;					/* [223] */
+	__u8   form_factor;				/* [223] */
 	__le64 nand_avg_erase_count;			/* [231:224] */
 	__le32 command_timeouts;			/* [235:232] */
 	__le32 sys_area_program_fail_count_raw;		/* [239:236] */
@@ -145,8 +145,9 @@ struct ocp_smart_extended_log {
 	__u8   lifetime_power_consumed[6];		/* [269:264] */
 	__u8   dssd_firmware_revision[8];		/* [277:270] */
 	__u8   dssd_firmware_build_uuid[16];		/* [293:278] */
-	__u8   dssd_firmware_build_label[64];		/* [375:294] */
-	__u8   rsvd358[136];				/* [493:358] */
+	__u8   dssd_firmware_build_label[64];		/* [357:294] */
+	__le64 die_in_use_bad_nand_block;		/* [365:358] */
+	__u8   rsvd358[128];				/* [493:366] */
 	__le16 log_page_version;			/* [495:494] */
 	__u8   log_page_guid[16];			/* [511:496] */
 };