fix newly introduced printk_foo warnings..

Interesting enough, console_printk was only used in a single place and
duplicated a large part of console.h which is included in the same place.
Thus, just drop console_printk.c and we're one down with console complexity

Signed-off-by: Stefan Reinauer <stepan@coresystems.de>
Acked-by: Stefan Reinauer <stepan@coresystems.de>




git-svn-id: svn://svn.coreboot.org/coreboot/trunk@5274 2b7e53f0-3cfb-0310-b3e9-8179ed1497e1

2 files changed, 80 insertions, 97 deletions

diff --git a/src/include/console/console.h b/src/include/console/console.h
index 43c8a47fc1..2396336095 100644
--- a/src/include/console/console.h
+++ b/src/include/console/console.h
@@ -29,104 +29,86 @@ extern struct console_driver econsole_drivers[];
 extern int console_loglevel;
 int do_printk(int msg_level, const char *fmt, ...) __attribute__((format(printf, 2, 3)));
 
-#define printk(x...) do_printk(x)
-
-#define printk_emerg(fmt, arg...)   do_printk(BIOS_EMERG   ,fmt, ##arg)
-#define printk_alert(fmt, arg...)   do_printk(BIOS_ALERT   ,fmt, ##arg)
-#define printk_crit(fmt, arg...)    do_printk(BIOS_CRIT    ,fmt, ##arg)
-#define printk_err(fmt, arg...)     do_printk(BIOS_ERR     ,fmt, ##arg)
-#define printk_warning(fmt, arg...) do_printk(BIOS_WARNING ,fmt, ##arg)
-#define printk_notice(fmt, arg...)  do_printk(BIOS_NOTICE  ,fmt, ##arg)
-#define printk_info(fmt, arg...)    do_printk(BIOS_INFO    ,fmt, ##arg)
-#define printk_debug(fmt, arg...)   do_printk(BIOS_DEBUG   ,fmt, ##arg)
-#define printk_spew(fmt, arg...)    do_printk(BIOS_SPEW    ,fmt, ##arg)
-
-#if CONFIG_MAXIMUM_CONSOLE_LOGLEVEL < BIOS_EMERG
-#undef  printk_emerg
-#define printk_emerg(fmt, arg...)   do {} while(0)
-#endif
-#if CONFIG_MAXIMUM_CONSOLE_LOGLEVEL < BIOS_ALERT
-#undef  printk_alert
-#define printk_alert(fmt, arg...)   do {} while(0)
-#endif
-#if CONFIG_MAXIMUM_CONSOLE_LOGLEVEL < BIOS_CRIT
-#undef  printk_crit
-#define printk_crit(fmt, arg...)    do {} while(0)
-#endif
-#if CONFIG_MAXIMUM_CONSOLE_LOGLEVEL < BIOS_ERR
-#undef  printk_err
-#define printk_err(fmt, arg...)     do {} while(0)
-#endif
-#if CONFIG_MAXIMUM_CONSOLE_LOGLEVEL < BIOS_WARNING
-#undef  printk_warning
-#define printk_warning(fmt, arg...) do {} while(0)
-#endif
-#if CONFIG_MAXIMUM_CONSOLE_LOGLEVEL < BIOS_NOTICE
-#undef  printk_notice
-#define printk_notice(fmt, arg...)  do {} while(0)
-#endif
-#if CONFIG_MAXIMUM_CONSOLE_LOGLEVEL < BIOS_INFO
-#undef  printk_info
-#define printk_info(fmt, arg...)    do {} while(0)
-#endif
-#if CONFIG_MAXIMUM_CONSOLE_LOGLEVEL < BIOS_DEBUG
-#undef  printk_debug
-#define printk_debug(fmt, arg...)   do {} while(0)
-#endif
-#if CONFIG_MAXIMUM_CONSOLE_LOGLEVEL < BIOS_SPEW
-#undef  printk_spew
-#define printk_spew(fmt, arg...)    do {} while(0)
+#undef WE_CLEANED_UP_ALL_SIDE_EFFECTS
+/* We saw some strange effects in the past like coreboot crashing while
+ * disabling cache as ram for a maximum console log level of 6 and above while
+ * it worked fine without. In order to catch such issues reliably we are
+ * always doing a function call to do_printk with the full number of arguments.
+ * This slightly increases the code size and some unprinted strings will end
+ * up in the final coreboot binary (most of them compressed). If you want to
+ * avoid this, do a
+ * #define WE_CLEANED_UP_ALL_SIDE_EFFECTS
+ */
+#ifdef WE_CLEANED_UP_ALL_SIDE_EFFECTS
+
+#define printk(LEVEL, fmt, args...)				\
+	do {							\
+		if (CONFIG_MAXIMUM_CONSOLE_LOGLEVEL >= LEVEL) {	\
+			do_printk(LEVEL, fmt, ##args);		\
+		}						\
+	} while(0)
+
+#else
+
+#define printk(LEVEL, fmt, args...)				\
+	do {							\
+		if (CONFIG_MAXIMUM_CONSOLE_LOGLEVEL >= LEVEL) {	\
+			do_printk(LEVEL, fmt, ##args);		\
+		} else {					\
+			do_printk(BIOS_NEVER, fmt, ##args);	\
+		}						\
+	} while(0)
 #endif
 
-#define print_emerg(STR)   printk_emerg  ("%s", (STR))
-#define print_alert(STR)   printk_alert  ("%s", (STR))
-#define print_crit(STR)    printk_crit   ("%s", (STR))
-#define print_err(STR)     printk_err    ("%s", (STR))
-#define print_warning(STR) printk_warning("%s", (STR))
-#define print_notice(STR)  printk_notice ("%s", (STR))
-#define print_info(STR)    printk_info   ("%s", (STR))
-#define print_debug(STR)   printk_debug  ("%s", (STR))
-#define print_spew(STR)    printk_spew   ("%s", (STR))
-
-#define print_emerg_char(CH)   printk_emerg  ("%c", (CH))
-#define print_alert_char(CH)   printk_alert  ("%c", (CH))
-#define print_crit_char(CH)    printk_crit   ("%c", (CH))
-#define print_err_char(CH)     printk_err    ("%c", (CH))
-#define print_warning_char(CH) printk_warning("%c", (CH))
-#define print_notice_char(CH)  printk_notice ("%c", (CH))
-#define print_info_char(CH)    printk_info   ("%c", (CH))
-#define print_debug_char(CH)   printk_debug  ("%c", (CH))
-#define print_spew_char(CH)    printk_spew   ("%c", (CH))
-
-#define print_emerg_hex8(HEX)   printk_emerg  ("%02x",  (HEX))
-#define print_alert_hex8(HEX)   printk_alert  ("%02x",  (HEX))
-#define print_crit_hex8(HEX)    printk_crit   ("%02x",  (HEX))
-#define print_err_hex8(HEX)     printk_err    ("%02x",  (HEX))
-#define print_warning_hex8(HEX) printk_warning("%02x",  (HEX))
-#define print_notice_hex8(HEX)  printk_notice ("%02x",  (HEX))
-#define print_info_hex8(HEX)    printk_info   ("%02x",  (HEX))
-#define print_debug_hex8(HEX)   printk_debug  ("%02x",  (HEX))
-#define print_spew_hex8(HEX)    printk_spew   ("%02x",  (HEX))
-
-#define print_emerg_hex16(HEX)   printk_emerg  ("%04x", (HEX))
-#define print_alert_hex16(HEX)   printk_alert  ("%04x", (HEX))
-#define print_crit_hex16(HEX)    printk_crit   ("%04x", (HEX))
-#define print_err_hex16(HEX)     printk_err    ("%04x", (HEX))
-#define print_warning_hex16(HEX) printk_warning("%04x", (HEX))
-#define print_notice_hex16(HEX)  printk_notice ("%04x", (HEX))
-#define print_info_hex16(HEX)    printk_info   ("%04x", (HEX))
-#define print_debug_hex16(HEX)   printk_debug  ("%04x", (HEX))
-#define print_spew_hex16(HEX)    printk_spew   ("%04x", (HEX))
-
-#define print_emerg_hex32(HEX)   printk_emerg  ("%08x", (HEX))
-#define print_alert_hex32(HEX)   printk_alert  ("%08x", (HEX))
-#define print_crit_hex32(HEX)    printk_crit   ("%08x", (HEX))
-#define print_err_hex32(HEX)     printk_err    ("%08x", (HEX))
-#define print_warning_hex32(HEX) printk_warning("%08x", (HEX))
-#define print_notice_hex32(HEX)  printk_notice ("%08x", (HEX))
-#define print_info_hex32(HEX)    printk_info   ("%08x", (HEX))
-#define print_debug_hex32(HEX)   printk_debug  ("%08x", (HEX))
-#define print_spew_hex32(HEX)    printk_spew   ("%08x", (HEX))
+#define print_emerg(STR)   printk(BIOS_EMERG,  "%s", (STR))
+#define print_alert(STR)   printk(BIOS_ALERT,  "%s", (STR))
+#define print_crit(STR)    printk(BIOS_CRIT,   "%s", (STR))
+#define print_err(STR)     printk(BIOS_ERR,    "%s", (STR))
+#define print_warning(STR) printk(BIOS_WARNING,"%s", (STR))
+#define print_notice(STR)  printk(BIOS_NOTICE, "%s", (STR))
+#define print_info(STR)    printk(BIOS_INFO,   "%s", (STR))
+#define print_debug(STR)   printk(BIOS_DEBUG,  "%s", (STR))
+#define print_spew(STR)    printk(BIOS_SPEW,   "%s", (STR))
+
+#define print_emerg_char(CH)   printk(BIOS_EMERG,  "%c", (CH))
+#define print_alert_char(CH)   printk(BIOS_ALERT,  "%c", (CH))
+#define print_crit_char(CH)    printk(BIOS_CRIT,   "%c", (CH))
+#define print_err_char(CH)     printk(BIOS_ERR,    "%c", (CH))
+#define print_warning_char(CH) printk(BIOS_WARNING,"%c", (CH))
+#define print_notice_char(CH)  printk(BIOS_NOTICE, "%c", (CH))
+#define print_info_char(CH)    printk(BIOS_INFO,   "%c", (CH))
+#define print_debug_char(CH)   printk(BIOS_DEBUG,  "%c", (CH))
+#define print_spew_char(CH)    printk(BIOS_SPEW,   "%c", (CH))
+
+#define print_emerg_hex8(HEX)   printk(BIOS_EMERG,  "%02x",  (HEX))
+#define print_alert_hex8(HEX)   printk(BIOS_ALERT,  "%02x",  (HEX))
+#define print_crit_hex8(HEX)    printk(BIOS_CRIT,   "%02x",  (HEX))
+#define print_err_hex8(HEX)     printk(BIOS_ERR,    "%02x",  (HEX))
+#define print_warning_hex8(HEX) printk(BIOS_WARNING,"%02x",  (HEX))
+#define print_notice_hex8(HEX)  printk(BIOS_NOTICE, "%02x",  (HEX))
+#define print_info_hex8(HEX)    printk(BIOS_INFO,   "%02x",  (HEX))
+#define print_debug_hex8(HEX)   printk(BIOS_DEBUG,  "%02x",  (HEX))
+#define print_spew_hex8(HEX)    printk(BIOS_SPEW,   "%02x",  (HEX))
+
+#define print_emerg_hex16(HEX)   printk(BIOS_EMERG,  "%04x", (HEX))
+#define print_alert_hex16(HEX)   printk(BIOS_ALERT,  "%04x", (HEX))
+#define print_crit_hex16(HEX)    printk(BIOS_CRIT,   "%04x", (HEX))
+#define print_err_hex16(HEX)     printk(BIOS_ERR,    "%04x", (HEX))
+#define print_warning_hex16(HEX) printk(BIOS_WARNING,"%04x", (HEX))
+#define print_notice_hex16(HEX)  printk(BIOS_NOTICE, "%04x", (HEX))
+#define print_info_hex16(HEX)    printk(BIOS_INFO,   "%04x", (HEX))
+#define print_debug_hex16(HEX)   printk(BIOS_DEBUG,  "%04x", (HEX))
+#define print_spew_hex16(HEX)    printk(BIOS_SPEW,   "%04x", (HEX))
+
+#define print_emerg_hex32(HEX)   printk(BIOS_EMERG,  "%08x", (HEX))
+#define print_alert_hex32(HEX)   printk(BIOS_ALERT,  "%08x", (HEX))
+#define print_crit_hex32(HEX)    printk(BIOS_CRIT,   "%08x", (HEX))
+#define print_err_hex32(HEX)     printk(BIOS_ERR,    "%08x", (HEX))
+#define print_warning_hex32(HEX) printk(BIOS_WARNING,"%08x", (HEX))
+#define print_notice_hex32(HEX)  printk(BIOS_NOTICE, "%08x", (HEX))
+#define print_info_hex32(HEX)    printk(BIOS_INFO,   "%08x", (HEX))
+#define print_debug_hex32(HEX)   printk(BIOS_DEBUG,  "%08x", (HEX))
+#define print_spew_hex32(HEX)    printk(BIOS_SPEW,   "%08x", (HEX))
 
 #if CONFIG_CONSOLE_VGA == 1
 void vga_console_init(void);
diff --git a/src/include/console/loglevel.h b/src/include/console/loglevel.h
index 8e6a7c4866..f306744d9e 100644
--- a/src/include/console/loglevel.h
+++ b/src/include/console/loglevel.h
@@ -15,6 +15,7 @@
 #define BIOS_NOTICE     5   /* normal but significant condition     */
 #define BIOS_INFO       6   /* informational                        */
 #define BIOS_DEBUG      7   /* debug-level messages                 */
-#define BIOS_SPEW       8   /* Way too many details                 */
+#define BIOS_SPEW       8   /* way too many details                 */
+#define BIOS_NEVER	9   /* these messages are never printed     */
 
 #endif /* LOGLEVEL_H */