This patch drops arch/i386/lib/console.c and arch/i386/lib/console_print.c and
makes include/console/console.h and console/console.c usable both in __PRE_RAM__ and coreboot_ram stages. While debugging this, I removed an indirection from the e7520 ram init code (same as we did on a couple of other chipsets, removes some register pressure from romcc) Also, drop remainders of CONFIG_USE_INIT (except the one odd piece of dead code in cache_as_ram.inc) Then some ap_romstage.c fixes, at least the nvidia/l1_2pvv compiled for me with CONFIG_AP_CODE_IN_CAR set in Kconfig which it did not before. Signed-off-by: Stefan Reinauer <stepan@coresystems.de> Acked-by: Myles Watson <mylesgw@gmail.com> git-svn-id: svn://svn.coreboot.org/coreboot/trunk@5341 2b7e53f0-3cfb-0310-b3e9-8179ed1497e1
This commit is contained in:
Stefan Reinauer
committed by
Stefan Reinauer
Stefan Reinauer
parent
b8ac05d187
commit
5a1f597085
@ -33,6 +33,7 @@ extern struct console_driver econsole_drivers[];
|
||||
extern int console_loglevel;
|
||||
#endif /* !__PRE_RAM__ */
|
||||
|
||||
#ifndef __ROMCC__
|
||||
int do_printk(int msg_level, const char *fmt, ...) __attribute__((format(printf, 2, 3)));
|
||||
|
||||
#undef WE_CLEANED_UP_ALL_SIDE_EFFECTS
|
||||
@ -40,6 +41,10 @@ int do_printk(int msg_level, const char *fmt, ...) __attribute__((format(printf,
|
||||
* 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.
|
||||
* Our favorite reason to do it this way was:
|
||||
* disable_car();
|
||||
* printk(BIOS_DEBUG, "CAR disabled\n"); // oops, garbage stack pointer
|
||||
* move_stack();
|
||||
* 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
|
||||
@ -66,35 +71,35 @@ int do_printk(int msg_level, const char *fmt, ...) __attribute__((format(printf,
|
||||
} while(0)
|
||||
#endif
|
||||
|
||||
#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(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_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_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))
|
||||
@ -115,5 +120,182 @@ int do_printk(int msg_level, const char *fmt, ...) __attribute__((format(printf,
|
||||
#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))
|
||||
#else
|
||||
/* __ROMCC__ */
|
||||
static void __console_tx_byte(unsigned char byte)
|
||||
{
|
||||
uart_tx_byte(byte);
|
||||
}
|
||||
|
||||
static void __console_tx_nibble(unsigned nibble)
|
||||
{
|
||||
unsigned char digit;
|
||||
digit = nibble + '0';
|
||||
if (digit > '9') {
|
||||
digit += 39;
|
||||
}
|
||||
__console_tx_byte(digit);
|
||||
}
|
||||
|
||||
static void __console_tx_char(int loglevel, unsigned char byte)
|
||||
{
|
||||
if (ASM_CONSOLE_LOGLEVEL >= loglevel) {
|
||||
uart_tx_byte(byte);
|
||||
}
|
||||
}
|
||||
|
||||
static void __console_tx_hex8(int loglevel, unsigned char value)
|
||||
{
|
||||
if (ASM_CONSOLE_LOGLEVEL >= loglevel) {
|
||||
__console_tx_nibble((value >> 4U) & 0x0fU);
|
||||
__console_tx_nibble(value & 0x0fU);
|
||||
}
|
||||
}
|
||||
|
||||
static void __console_tx_hex16(int loglevel, unsigned short value)
|
||||
{
|
||||
if (ASM_CONSOLE_LOGLEVEL >= loglevel) {
|
||||
__console_tx_nibble((value >> 12U) & 0x0fU);
|
||||
__console_tx_nibble((value >> 8U) & 0x0fU);
|
||||
__console_tx_nibble((value >> 4U) & 0x0fU);
|
||||
__console_tx_nibble(value & 0x0fU);
|
||||
}
|
||||
}
|
||||
|
||||
static void __console_tx_hex32(int loglevel, unsigned int value)
|
||||
{
|
||||
if (ASM_CONSOLE_LOGLEVEL >= loglevel) {
|
||||
__console_tx_nibble((value >> 28U) & 0x0fU);
|
||||
__console_tx_nibble((value >> 24U) & 0x0fU);
|
||||
__console_tx_nibble((value >> 20U) & 0x0fU);
|
||||
__console_tx_nibble((value >> 16U) & 0x0fU);
|
||||
__console_tx_nibble((value >> 12U) & 0x0fU);
|
||||
__console_tx_nibble((value >> 8U) & 0x0fU);
|
||||
__console_tx_nibble((value >> 4U) & 0x0fU);
|
||||
__console_tx_nibble(value & 0x0fU);
|
||||
}
|
||||
}
|
||||
|
||||
static void __console_tx_string(int loglevel, const char *str)
|
||||
{
|
||||
if (ASM_CONSOLE_LOGLEVEL >= loglevel) {
|
||||
unsigned char ch;
|
||||
while((ch = *str++) != '\0') {
|
||||
if (ch == '\n')
|
||||
__console_tx_byte('\r');
|
||||
__console_tx_byte(ch);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
#define FUNCTIONS_FOR_PRINT
|
||||
#ifdef FUNCTIONS_FOR_PRINT
|
||||
static void print_emerg_char(unsigned char byte) { __console_tx_char(BIOS_EMERG, byte); }
|
||||
static void print_emerg_hex8(unsigned char value){ __console_tx_hex8(BIOS_EMERG, value); }
|
||||
static void print_emerg_hex16(unsigned short value){ __console_tx_hex16(BIOS_EMERG, value); }
|
||||
static void print_emerg_hex32(unsigned int value) { __console_tx_hex32(BIOS_EMERG, value); }
|
||||
static void print_emerg(const char *str) { __console_tx_string(BIOS_EMERG, str); }
|
||||
|
||||
static void print_alert_char(unsigned char byte) { __console_tx_char(BIOS_ALERT, byte); }
|
||||
static void print_alert_hex8(unsigned char value) { __console_tx_hex8(BIOS_ALERT, value); }
|
||||
static void print_alert_hex16(unsigned short value){ __console_tx_hex16(BIOS_ALERT, value); }
|
||||
static void print_alert_hex32(unsigned int value) { __console_tx_hex32(BIOS_ALERT, value); }
|
||||
static void print_alert(const char *str) { __console_tx_string(BIOS_ALERT, str); }
|
||||
|
||||
static void print_crit_char(unsigned char byte) { __console_tx_char(BIOS_CRIT, byte); }
|
||||
static void print_crit_hex8(unsigned char value) { __console_tx_hex8(BIOS_CRIT, value); }
|
||||
static void print_crit_hex16(unsigned short value){ __console_tx_hex16(BIOS_CRIT, value); }
|
||||
static void print_crit_hex32(unsigned int value) { __console_tx_hex32(BIOS_CRIT, value); }
|
||||
static void print_crit(const char *str) { __console_tx_string(BIOS_CRIT, str); }
|
||||
|
||||
static void print_err_char(unsigned char byte) { __console_tx_char(BIOS_ERR, byte); }
|
||||
static void print_err_hex8(unsigned char value) { __console_tx_hex8(BIOS_ERR, value); }
|
||||
static void print_err_hex16(unsigned short value){ __console_tx_hex16(BIOS_ERR, value); }
|
||||
static void print_err_hex32(unsigned int value) { __console_tx_hex32(BIOS_ERR, value); }
|
||||
static void print_err(const char *str) { __console_tx_string(BIOS_ERR, str); }
|
||||
|
||||
static void print_warning_char(unsigned char byte) { __console_tx_char(BIOS_WARNING, byte); }
|
||||
static void print_warning_hex8(unsigned char value) { __console_tx_hex8(BIOS_WARNING, value); }
|
||||
static void print_warning_hex16(unsigned short value){ __console_tx_hex16(BIOS_WARNING, value); }
|
||||
static void print_warning_hex32(unsigned int value) { __console_tx_hex32(BIOS_WARNING, value); }
|
||||
static void print_warning(const char *str) { __console_tx_string(BIOS_WARNING, str); }
|
||||
|
||||
static void print_notice_char(unsigned char byte) { __console_tx_char(BIOS_NOTICE, byte); }
|
||||
static void print_notice_hex8(unsigned char value) { __console_tx_hex8(BIOS_NOTICE, value); }
|
||||
static void print_notice_hex16(unsigned short value){ __console_tx_hex16(BIOS_NOTICE, value); }
|
||||
static void print_notice_hex32(unsigned int value) { __console_tx_hex32(BIOS_NOTICE, value); }
|
||||
static void print_notice(const char *str) { __console_tx_string(BIOS_NOTICE, str); }
|
||||
|
||||
static void print_info_char(unsigned char byte) { __console_tx_char(BIOS_INFO, byte); }
|
||||
static void print_info_hex8(unsigned char value) { __console_tx_hex8(BIOS_INFO, value); }
|
||||
static void print_info_hex16(unsigned short value){ __console_tx_hex16(BIOS_INFO, value); }
|
||||
static void print_info_hex32(unsigned int value) { __console_tx_hex32(BIOS_INFO, value); }
|
||||
static void print_info(const char *str) { __console_tx_string(BIOS_INFO, str); }
|
||||
|
||||
static void print_debug_char(unsigned char byte) { __console_tx_char(BIOS_DEBUG, byte); }
|
||||
static void print_debug_hex8(unsigned char value) { __console_tx_hex8(BIOS_DEBUG, value); }
|
||||
static void print_debug_hex16(unsigned short value){ __console_tx_hex16(BIOS_DEBUG, value); }
|
||||
static void print_debug_hex32(unsigned int value) { __console_tx_hex32(BIOS_DEBUG, value); }
|
||||
static void print_debug(const char *str) { __console_tx_string(BIOS_DEBUG, str); }
|
||||
|
||||
static void print_spew_char(unsigned char byte) { __console_tx_char(BIOS_SPEW, byte); }
|
||||
static void print_spew_hex8(unsigned char value) { __console_tx_hex8(BIOS_SPEW, value); }
|
||||
static void print_spew_hex16(unsigned short value){ __console_tx_hex16(BIOS_SPEW, value); }
|
||||
static void print_spew_hex32(unsigned int value) { __console_tx_hex32(BIOS_SPEW, value); }
|
||||
static void print_spew(const char *str) { __console_tx_string(BIOS_SPEW, str); }
|
||||
|
||||
#else
|
||||
#define print_emerg(STR) __console_tx_string(BIOS_EMERG, STR)
|
||||
#define print_alert(STR) __console_tx_string(BIOS_ALERT, STR)
|
||||
#define print_crit(STR) __console_tx_string(BIOS_CRIT, STR)
|
||||
#define print_err(STR) __console_tx_string(BIOS_ERR, STR)
|
||||
#define print_warning(STR) __console_tx_string(BIOS_WARNING, STR)
|
||||
#define print_notice(STR) __console_tx_string(BIOS_NOTICE, STR)
|
||||
#define print_info(STR) __console_tx_string(BIOS_INFO, STR)
|
||||
#define print_debug(STR) __console_tx_string(BIOS_DEBUG, STR)
|
||||
#define print_spew(STR) __console_tx_string(BIOS_SPEW, STR)
|
||||
|
||||
#define print_emerg_char(CH) __console_tx_char(BIOS_EMERG, CH)
|
||||
#define print_alert_char(CH) __console_tx_char(BIOS_ALERT, CH)
|
||||
#define print_crit_char(CH) __console_tx_char(BIOS_CRIT, CH)
|
||||
#define print_err_char(CH) __console_tx_char(BIOS_ERR, CH)
|
||||
#define print_warning_char(CH) __console_tx_char(BIOS_WARNING, CH)
|
||||
#define print_notice_char(CH) __console_tx_char(BIOS_NOTICE, CH)
|
||||
#define print_info_char(CH) __console_tx_char(BIOS_INFO, CH)
|
||||
#define print_debug_char(CH) __console_tx_char(BIOS_DEBUG, CH)
|
||||
#define print_spew_char(CH) __console_tx_char(BIOS_SPEW, CH)
|
||||
|
||||
#define print_emerg_hex8(HEX) __console_tx_hex8(BIOS_EMERG, HEX)
|
||||
#define print_alert_hex8(HEX) __console_tx_hex8(BIOS_ALERT, HEX)
|
||||
#define print_crit_hex8(HEX) __console_tx_hex8(BIOS_CRIT, HEX)
|
||||
#define print_err_hex8(HEX) __console_tx_hex8(BIOS_ERR, HEX)
|
||||
#define print_warning_hex8(HEX) __console_tx_hex8(BIOS_WARNING, HEX)
|
||||
#define print_notice_hex8(HEX) __console_tx_hex8(BIOS_NOTICE, HEX)
|
||||
#define print_info_hex8(HEX) __console_tx_hex8(BIOS_INFO, HEX)
|
||||
#define print_debug_hex8(HEX) __console_tx_hex8(BIOS_DEBUG, HEX)
|
||||
#define print_spew_hex8(HEX) __console_tx_hex8(BIOS_SPEW, HEX)
|
||||
|
||||
#define print_emerg_hex16(HEX) __console_tx_hex16(BIOS_EMERG, HEX)
|
||||
#define print_alert_hex16(HEX) __console_tx_hex16(BIOS_ALERT, HEX)
|
||||
#define print_crit_hex16(HEX) __console_tx_hex16(BIOS_CRIT, HEX)
|
||||
#define print_err_hex16(HEX) __console_tx_hex16(BIOS_ERR, HEX)
|
||||
#define print_warning_hex16(HEX) __console_tx_hex16(BIOS_WARNING, HEX)
|
||||
#define print_notice_hex16(HEX) __console_tx_hex16(BIOS_NOTICE, HEX)
|
||||
#define print_info_hex16(HEX) __console_tx_hex16(BIOS_INFO, HEX)
|
||||
#define print_debug_hex16(HEX) __console_tx_hex16(BIOS_DEBUG, HEX)
|
||||
#define print_spew_hex16(HEX) __console_tx_hex16(BIOS_SPEW, HEX)
|
||||
|
||||
#define print_emerg_hex32(HEX) __console_tx_hex32(BIOS_EMERG, HEX)
|
||||
#define print_alert_hex32(HEX) __console_tx_hex32(BIOS_ALERT, HEX)
|
||||
#define print_crit_hex32(HEX) __console_tx_hex32(BIOS_CRIT, HEX)
|
||||
#define print_err_hex32(HEX) __console_tx_hex32(BIOS_ERR, HEX)
|
||||
#define print_warning_hex32(HEX) __console_tx_hex32(BIOS_WARNING, HEX)
|
||||
#define print_notice_hex32(HEX) __console_tx_hex32(BIOS_NOTICE, HEX)
|
||||
#define print_info_hex32(HEX) __console_tx_hex32(BIOS_INFO, HEX)
|
||||
#define print_debug_hex32(HEX) __console_tx_hex32(BIOS_DEBUG, HEX)
|
||||
#define print_spew_hex32(HEX) __console_tx_hex32(BIOS_SPEW, HEX)
|
||||
#endif
|
||||
|
||||
#endif
|
||||
|
||||
#endif /* CONSOLE_CONSOLE_H_ */
|
||||
|
||||
Reference in New Issue
Block a user