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>

diff --git a/include/asm-generic/global_data.h b/include/asm-generic/global_data.h
index 06523cab5225bb76c4bc6e7ee5f13206687e7b29..253dd21d880ed8bedcdf444d6e0ae5157ff071bb 100644 (file)
--- 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,44 +363,33 @@ struct global_data {
         * For logging devices without filters @default_log_level defines the
         * logging level, cf. &enum log_level_t.
         */
-       int default_log_level;
-       /**
-        * @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.
-        */
-       int log_fmt;
-
-       /**
-        * @processing_msg: a log message is being processed
-        *
-        * This flag is used to suppress the creation of additional messages
-        * while another message is being processed.
-        */
-       bool processing_msg;
+       char default_log_level;
+       char log_fmt;
        /**
         * @logc_prev: logging category of previous message
         *
         * This value is used as logging category for continuation messages.
         */
-       int logc_prev;
+       unsigned char logc_prev;
        /**
         * @logl_prev: logging level of the previous message
         *
         * This value is used as logging level for continuation messages.
         */
-       int logl_prev;
+       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
+        *
+        * This flag is used to suppress the creation of additional messages
+        * while another message is being processed.
+        */
+       bool processing_msg;
 #endif
 #if CONFIG_IS_ENABLED(BLOBLIST)
        /**

diff --git a/test/log/log_test.c b/test/log/log_test.c
index 7ef89941d4245014c59db77958ea02f5781f179e..18f8a2d9391ca4db1067c242c393711d0de9969c 100644 (file)
--- 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));