From c283a2664eaa328a3767db667a7916c6d9021784 Mon Sep 17 00:00:00 2001
From: Simon Glass <sjg@chromium.org>
Date: Wed, 21 Aug 2024 10:19:17 -0600
Subject: [PATCH] global_data: log: Reorder and shrink fields

Some of the logging fields are larger than they need to be. Shrink them
and adjust the ordering to improve alignment.

Signed-off-by: Simon Glass <sjg@chromium.org>
---
 include/asm-generic/global_data.h | 55 +++++++++++++++----------------
 test/log/log_test.c               |  6 ++--
 2 files changed, 30 insertions(+), 31 deletions(-)

diff --git a/include/asm-generic/global_data.h b/include/asm-generic/global_data.h
index 06523cab522..253dd21d880 100644
--- a/include/asm-generic/global_data.h
+++ b/include/asm-generic/global_data.h
@@ -339,6 +339,16 @@ struct global_data {
 	struct bootstage_data *bootstage;
 #endif
 #ifdef CONFIG_LOG
+	/**
+	 * @log_head: list of logging devices
+	 */
+	struct list_head log_head;
+	/**
+	 * @log_fmt: bit mask for logging format
+	 *
+	 * The @log_fmt bit mask selects the fields to be shown in log messages.
+	 * &enum log_fmt defines the bits of the bit mask.
+	 */
 	/**
 	 * @log_drop_count: number of dropped log messages
 	 *
@@ -353,19 +363,26 @@ struct global_data {
 	 * For logging devices without filters @default_log_level defines the
 	 * logging level, cf. &enum log_level_t.
 	 */
-	int default_log_level;
+	char default_log_level;
+	char log_fmt;
 	/**
-	 * @log_head: list of logging devices
-	 */
-	struct list_head log_head;
-	/**
-	 * @log_fmt: bit mask for logging format
+	 * @logc_prev: logging category of previous message
 	 *
-	 * The @log_fmt bit mask selects the fields to be shown in log messages.
-	 * &enum log_fmt defines the bits of the bit mask.
+	 * This value is used as logging category for continuation messages.
 	 */
-	int log_fmt;
-
+	unsigned char logc_prev;
+	/**
+	 * @logl_prev: logging level of the previous message
+	 *
+	 * This value is used as logging level for continuation messages.
+	 */
+	unsigned char logl_prev;
+	/**
+	 * @log_cont: Previous log line did not finished wtih \n
+	 *
+	 * This allows for chained log messages on the same line
+	 */
+	bool log_cont;
 	/**
 	 * @processing_msg: a log message is being processed
 	 *
@@ -373,24 +390,6 @@ struct global_data {
 	 * while another message is being processed.
 	 */
 	bool processing_msg;
-	/**
-	 * @logc_prev: logging category of previous message
-	 *
-	 * This value is used as logging category for continuation messages.
-	 */
-	int logc_prev;
-	/**
-	 * @logl_prev: logging level of the previous message
-	 *
-	 * This value is used as logging level for continuation messages.
-	 */
-	int logl_prev;
-	/**
-	 * @log_cont: Previous log line did not finished wtih \n
-	 *
-	 * This allows for chained log messages on the same line
-	 */
-	bool log_cont;
 #endif
 #if CONFIG_IS_ENABLED(BLOBLIST)
 	/**
diff --git a/test/log/log_test.c b/test/log/log_test.c
index 7ef89941d42..18f8a2d9391 100644
--- a/test/log/log_test.c
+++ b/test/log/log_test.c
@@ -379,9 +379,9 @@ int log_test_level_deny(struct unit_test_state *uts)
 
 	ut_assertok(console_record_reset_enable());
 	log_run();
-	check_log_entries_flags_levels(EXPECT_LOG | EXPECT_DIRECT | EXPECT_FORCE,
-				       LOGL_WARNING + 1,
-				       min(gd->default_log_level, LOGL_INFO));
+	check_log_entries_flags_levels(
+		EXPECT_LOG | EXPECT_DIRECT | EXPECT_FORCE,
+		LOGL_WARNING + 1, min((int)gd->default_log_level, LOGL_INFO));
 
 	ut_assertok(log_remove_filter("console", filt1));
 	ut_assertok(log_remove_filter("console", filt2));