From 0c781b2694b2c137d9761704954ea38be5ba8a15 Mon Sep 17 00:00:00 2001 From: Stefan Reinauer Date: Thu, 1 Apr 2010 09:50:32 +0000 Subject: [PATCH] =?utf8?q?-=C3=82=C2=A0get=20rid=20of=20ASM=5FCONSOLE=5FLO?= =?utf8?q?GLEVEL=20except=20in=20two=20assembler=20files.=20-=20start=20na?= =?utf8?q?ming=20all=20versions=20of=20post=20code=20output=20"post=5Fcode?= =?utf8?q?()"?= MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Signed-off-by: Stefan Reinauer Acked-by: Stefan Reinauer git-svn-id: svn://svn.coreboot.org/coreboot/trunk@5344 2b7e53f0-3cfb-0310-b3e9-8179ed1497e1 --- src/arch/i386/include/arch/intel.h | 6 +- src/arch/i386/init/bootblock_prologue.c | 2 +- src/arch/i386/init/car.S | 2 +- src/arch/i386/init/crt0.S.lb | 10 +- src/arch/i386/lib/c_start.S | 6 +- src/arch/i386/lib/printk_init.c | 11 -- src/arch/i386/llshell/console.inc | 174 ------------------ src/arch/i386/llshell/ramtest.inc | 2 +- src/arch/i386/llshell/readme.coreboot | 2 +- src/console/console.c | 2 +- src/cpu/amd/model_lx/cache_as_ram.inc | 8 +- src/cpu/intel/model_106cx/cache_as_ram.inc | 1 - src/cpu/intel/model_6ex/cache_as_ram.inc | 1 - src/cpu/intel/model_6fx/cache_as_ram.inc | 1 - src/cpu/x86/32bit/entry32.inc | 2 +- src/include/console/console.h | 23 ++- src/include/console/loglevel.h | 5 - src/mainboard/amd/db800/romstage.c | 3 +- src/mainboard/amd/dbm690t/romstage.c | 2 - src/mainboard/amd/mahogany/romstage.c | 2 - src/mainboard/amd/norwich/romstage.c | 4 +- src/mainboard/amd/pistachio/romstage.c | 2 - src/mainboard/artecgroup/dbe61/romstage.c | 4 +- src/mainboard/broadcom/blast/romstage.c | 11 -- .../digitallogic/adl855pc/romstage.c | 1 - .../digitallogic/msm586seg/romstage.c | 1 - .../digitallogic/msm800sev/romstage.c | 5 +- src/mainboard/iei/pcisa-lx-800-r10/romstage.c | 3 +- src/mainboard/kontron/kt690/romstage.c | 2 - .../lippert/roadrunner-lx/romstage.c | 4 +- .../lippert/spacerunner-lx/romstage.c | 4 +- src/mainboard/msi/ms9185/romstage.c | 11 -- src/mainboard/newisys/khepri/romstage.c | 11 -- src/mainboard/pcengines/alix1c/romstage.c | 5 +- src/mainboard/technexion/tim5690/romstage.c | 2 - src/mainboard/technexion/tim8690/romstage.c | 2 - src/mainboard/technologic/ts5300/romstage.c | 1 - src/mainboard/tyan/s2850/romstage.c | 11 -- src/mainboard/tyan/s2881/romstage.c | 11 -- src/mainboard/tyan/s2885/romstage.c | 11 -- src/mainboard/winent/pl6064/romstage.c | 3 +- src/northbridge/amd/gx2/pll_reset.c | 7 +- src/northbridge/amd/lx/pll_reset.c | 8 +- src/northbridge/amd/lx/raminit.c | 36 ++-- 44 files changed, 76 insertions(+), 349 deletions(-) diff --git a/src/arch/i386/include/arch/intel.h b/src/arch/i386/include/arch/intel.h index d276b3259..c6f90cca2 100644 --- a/src/arch/i386/include/arch/intel.h +++ b/src/arch/i386/include/arch/intel.h @@ -45,10 +45,8 @@ label##_done: jmp *%esp -/* originally this macro was from STPC BIOS */ -#define intel_chip_post_macro(value) \ - movb $value, %al ; \ +#define post_code(value) \ + movb $value, %al; \ outb %al, $0x80 - #endif /* ROM_INTEL_H */ diff --git a/src/arch/i386/init/bootblock_prologue.c b/src/arch/i386/init/bootblock_prologue.c index f921c3f8d..4baaa08a6 100644 --- a/src/arch/i386/init/bootblock_prologue.c +++ b/src/arch/i386/init/bootblock_prologue.c @@ -33,5 +33,5 @@ .section ".rom.data", "a", @progbits .section ".rom.text", "ax", @progbits - intel_chip_post_macro(0x01) /* delay for chipsets */ + post_code(0x01) /* delay for chipsets */ diff --git a/src/arch/i386/init/car.S b/src/arch/i386/init/car.S index 107da7b22..64743ef8f 100644 --- a/src/arch/i386/init/car.S +++ b/src/arch/i386/init/car.S @@ -54,7 +54,7 @@ __protected_stage0: /* Save the BIST result. */ movl %eax, %ebp - intel_chip_post_macro(0x01) + post_code(0x01) movw $ROM_DATA_SEG, %ax movw %ax, %ds diff --git a/src/arch/i386/init/crt0.S.lb b/src/arch/i386/init/crt0.S.lb index c4206bf00..5e7a5fa8c 100644 --- a/src/arch/i386/init/crt0.S.lb +++ b/src/arch/i386/init/crt0.S.lb @@ -25,6 +25,10 @@ #include #include +#ifndef ASM_CONSOLE_LOGLEVEL +#define ASM_CONSOLE_LOGLEVEL CONFIG_MAXIMUM_CONSOLE_LOGLEVEL +#endif + /* * This is the entry code the code in .reset section * jumps to this address. @@ -33,7 +37,7 @@ .section ".rom.data", "a", @progbits .section ".rom.text", "ax", @progbits - intel_chip_post_macro(0x01) /* delay for chipsets */ + post_code(0x01) /* delay for chipsets */ #include "crt0_includes.h" @@ -61,7 +65,7 @@ __main: * isn\'t really that big we just copy/clear using bytes, not * double words. */ - intel_chip_post_macro(0x11) /* post 11 */ + post_code(0x11) /* post 11 */ cld /* clear direction flag */ @@ -78,7 +82,7 @@ __main: call cbfs_and_run_core .Lhlt: - intel_chip_post_macro(0xee) /* post fe */ + post_code(0xee) /* post fe */ hlt jmp .Lhlt diff --git a/src/arch/i386/lib/c_start.S b/src/arch/i386/lib/c_start.S index 4ef59799a..312f0cb20 100644 --- a/src/arch/i386/lib/c_start.S +++ b/src/arch/i386/lib/c_start.S @@ -15,7 +15,7 @@ _start: movl %eax, %fs movl %eax, %gs - intel_chip_post_macro(0x13) /* post 13 */ + post_code(0x13) /* post 13 */ /** clear stack */ cld @@ -74,7 +74,7 @@ _start: * bss is cleared. Now we call the main routine and * let it do the rest. */ - intel_chip_post_macro(0xfe) /* post fe */ + post_code(0xfe) /* post fe */ /* Restore the stack location */ movl %ebp, %esp @@ -83,7 +83,7 @@ _start: call hardwaremain /*NOTREACHED*/ .Lhlt: - intel_chip_post_macro(0xee) /* post ee */ + post_code(0xee) /* post ee */ hlt jmp .Lhlt diff --git a/src/arch/i386/lib/printk_init.c b/src/arch/i386/lib/printk_init.c index f3add8711..d3064046f 100644 --- a/src/arch/i386/lib/printk_init.c +++ b/src/arch/i386/lib/printk_init.c @@ -19,19 +19,8 @@ #include #include -#include #include -/* Using a global varible can cause problems when we reset the stack - * from cache as ram to ram. If we make this a define USE_SHARED_STACK - * we could use the same code on all architectures. - */ -#if 0 -int console_loglevel = CONFIG_DEFAULT_CONSOLE_LOGLEVEL; -#else -#define console_loglevel CONFIG_DEFAULT_CONSOLE_LOGLEVEL -#endif - static void console_tx_byte(unsigned char byte) { if (byte == '\n') diff --git a/src/arch/i386/llshell/console.inc b/src/arch/i386/llshell/console.inc index fbe9d632b..774c9cb15 100644 --- a/src/arch/i386/llshell/console.inc +++ b/src/arch/i386/llshell/console.inc @@ -234,180 +234,6 @@ jmp console0 #define CONSOLE_SPEW_TX_STRING(string) __CONSOLE_TX_STRING(string) #define CONSOLE_SPEW_INLINE_TX_STRING(string) __CONSOLE_INLINE_TX_STRING(string) -#if 0 -#if ASM_CONSOLE_LOGLEVEL <= BIOS_EMERG -#undef CONSOLE_EMERG_TX_CHAR -#undef CONSOLE_EMERG_INLINE_TX_CHAR -#undef CONSOLE_EMERG_TX_HEX8 -#undef CONSOLE_EMERG_INLINE_TX_HEX8 -#undef CONSOLE_EMERG_TX_HEX32 -#undef CONSOLE_EMERG_INLINE_TX_HEX32 -#undef CONSOLE_EMERG_TX_STRING -#undef CONSOLE_EMERG_INLINE_TX_STRING -#define CONSOLE_EMERG_TX_CHAR(byte) -#define CONSOLE_EMERG_INLINE_TX_CHAR(byte) -#define CONSOLE_EMERG_TX_HEX8(byte) -#define CONSOLE_EMERG_INLINE_TX_HEX8(byte) -#define CONSOLE_EMERG_TX_HEX32(lword) -#define CONSOLE_EMERG_INLINE_TX_HEX32(lword) -#define CONSOLE_EMERG_TX_STRING(string) -#define CONSOLE_EMERG_INLINE_TX_STRING(string) -#endif - - -#if ASM_CONSOLE_LOGLEVEL <= BIOS_ALERT -#undef CONSOLE_ALERT_TX_CHAR -#undef CONSOLE_ALERT_INLINE_TX_CHAR -#undef CONSOLE_ALERT_TX_HEX8 -#undef CONSOLE_ALERT_INLINE_TX_HEX8 -#undef CONSOLE_ALERT_TX_HEX32 -#undef CONSOLE_ALERT_INLINE_TX_HEX32 -#undef CONSOLE_ALERT_TX_STRING -#undef CONSOLE_ALERT_INLINE_TX_STRING -#define CONSOLE_ALERT_TX_CHAR(byte) -#define CONSOLE_ALERT_INLINE_TX_CHAR(byte) -#define CONSOLE_ALERT_TX_HEX8(byte) -#define CONSOLE_ALERT_INLINE_TX_HEX8(byte) -#define CONSOLE_ALERT_TX_HEX32(lword) -#define CONSOLE_ALERT_INLINE_TX_HEX32(lword) -#define CONSOLE_ALERT_TX_STRING(string) -#define CONSOLE_ALERT_INLINE_TX_STRING(string) -#endif - -#if ASM_CONSOLE_LOGLEVEL <= BIOS_CRIT -#undef CONSOLE_CRIT_TX_CHAR -#undef CONSOLE_CRIT_INLINE_TX_CHAR -#undef CONSOLE_CRIT_TX_HEX8 -#undef CONSOLE_CRIT_INLINE_TX_HEX8 -#undef CONSOLE_CRIT_TX_HEX32 -#undef CONSOLE_CRIT_INLINE_TX_HEX32 -#undef CONSOLE_CRIT_TX_STRING -#undef CONSOLE_CRIT_INLINE_TX_STRING -#define CONSOLE_CRIT_TX_CHAR(byte) -#define CONSOLE_CRIT_INLINE_TX_CHAR(byte) -#define CONSOLE_CRIT_TX_HEX8(byte) -#define CONSOLE_CRIT_INLINE_TX_HEX8(byte) -#define CONSOLE_CRIT_TX_HEX32(lword) -#define CONSOLE_CRIT_INLINE_TX_HEX32(lword) -#define CONSOLE_CRIT_TX_STRING(string) -#define CONSOLE_CRIT_INLINE_TX_STRING(string) -#endif - -#if ASM_CONSOLE_LOGLEVEL <= BIOS_ERR -#undef CONSOLE_ERR_TX_CHAR -#undef CONSOLE_ERR_INLINE_TX_CHAR -#undef CONSOLE_ERR_TX_HEX8 -#undef CONSOLE_ERR_INLINE_TX_HEX8 -#undef CONSOLE_ERR_TX_HEX32 -#undef CONSOLE_ERR_INLINE_TX_HEX32 -#undef CONSOLE_ERR_TX_STRING -#undef CONSOLE_ERR_INLINE_TX_STRING -#define CONSOLE_ERR_TX_CHAR(byte) -#define CONSOLE_ERR_INLINE_TX_CHAR(byte) -#define CONSOLE_ERR_TX_HEX8(byte) -#define CONSOLE_ERR_INLINE_TX_HEX8(byte) -#define CONSOLE_ERR_TX_HEX32(lword) -#define CONSOLE_ERR_INLINE_TX_HEX32(lword) -#define CONSOLE_ERR_TX_STRING(string) -#define CONSOLE_ERR_INLINE_TX_STRING(string) -#endif - -#if ASM_CONSOLE_LOGLEVEL <= BIOS_WARNING -#undef CONSOLE_WARNING_TX_CHAR -#undef CONSOLE_WARNING_INLINE_TX_CHAR -#undef CONSOLE_WARNING_TX_HEX8 -#undef CONSOLE_WARNING_INLINE_TX_HEX8 -#undef CONSOLE_WARNING_TX_HEX32 -#undef CONSOLE_WARNING_INLINE_TX_HEX32 -#undef CONSOLE_WARNING_TX_STRING -#undef CONSOLE_WARNING_INLINE_TX_STRING -#define CONSOLE_WARNING_TX_CHAR(byte) -#define CONSOLE_WARNING_INLINE_TX_CHAR(byte) -#define CONSOLE_WARNING_TX_HEX8(byte) -#define CONSOLE_WARNING_INLINE_TX_HEX8(byte) -#define CONSOLE_WARNING_TX_HEX32(lword) -#define CONSOLE_WARNING_INLINE_TX_HEX32(lword) -#define CONSOLE_WARNING_TX_STRING(string) -#define CONSOLE_WARNING_INLINE_TX_STRING(string) -#endif - -#if ASM_CONSOLE_LOGLEVEL <= BIOS_NOTICE -#undef CONSOLE_NOTICE_TX_CHAR -#undef CONSOLE_NOTICE_INLINE_TX_CHAR -#undef CONSOLE_NOTICE_TX_HEX8 -#undef CONSOLE_NOTICE_INLINE_TX_HEX8 -#undef CONSOLE_NOTICE_TX_HEX32 -#undef CONSOLE_NOTICE_INLINE_TX_HEX32 -#undef CONSOLE_NOTICE_TX_STRING -#undef CONSOLE_NOTICE_INLINE_TX_STRING -#define CONSOLE_NOTICE_TX_CHAR(byte) -#define CONSOLE_NOTICE_INLINE_TX_CHAR(byte) -#define CONSOLE_NOTICE_TX_HEX8(byte) -#define CONSOLE_NOTICE_INLINE_TX_HEX8(byte) -#define CONSOLE_NOTICE_TX_HEX32(lword) -#define CONSOLE_NOTICE_INLINE_TX_HEX32(lword) -#define CONSOLE_NOTICE_TX_STRING(string) -#define CONSOLE_NOTICE_INLINE_TX_STRING(string) -#endif - -#if ASM_CONSOLE_LOGLEVEL <= BIOS_INFO -#undef CONSOLE_INFO_TX_CHAR -#undef CONSOLE_INFO_INLINE_TX_CHAR -#undef CONSOLE_INFO_TX_HEX8 -#undef CONSOLE_INFO_INLINE_TX_HEX8 -#undef CONSOLE_INFO_TX_HEX32 -#undef CONSOLE_INFO_INLINE_TX_HEX32 -#undef CONSOLE_INFO_TX_STRING -#undef CONSOLE_INFO_INLINE_TX_STRING -#define CONSOLE_INFO_TX_CHAR(byte) -#define CONSOLE_INFO_INLINE_TX_CHAR(byte) -#define CONSOLE_INFO_TX_HEX8(byte) -#define CONSOLE_INFO_INLINE_TX_HEX8(byte) -#define CONSOLE_INFO_TX_HEX32(lword) -#define CONSOLE_INFO_INLINE_TX_HEX32(lword) -#define CONSOLE_INFO_TX_STRING(string) -#define CONSOLE_INFO_INLINE_TX_STRING(string) -#endif - -#if ASM_CONSOLE_LOGLEVEL <= BIOS_DEBUG -#undef CONSOLE_DEBUG_TX_CHAR -#undef CONSOLE_DEBUG_INLINE_TX_CHAR -#undef CONSOLE_DEBUG_TX_HEX8 -#undef CONSOLE_DEBUG_INLINE_TX_HEX8 -#undef CONSOLE_DEBUG_TX_HEX32 -#undef CONSOLE_DEBUG_INLINE_TX_HEX32 -#undef CONSOLE_DEBUG_TX_STRING -#undef CONSOLE_DEBUG_INLINE_TX_STRING -#define CONSOLE_DEBUG_TX_CHAR(byte) -#define CONSOLE_DEBUG_INLINE_TX_CHAR(byte) -#define CONSOLE_DEBUG_TX_HEX8(byte) -#define CONSOLE_DEBUG_INLINE_TX_HEX8(byte) -#define CONSOLE_DEBUG_TX_HEX32(lword) -#define CONSOLE_DEBUG_INLINE_TX_HEX32(lword) -#define CONSOLE_DEBUG_TX_STRING(string) -#define CONSOLE_DEBUG_INLINE_TX_STRING(string) -#endif - -#if ASM_CONSOLE_LOGLEVEL <= BIOS_SPEW -#undef CONSOLE_SPEW_TX_CHAR -#undef CONSOLE_SPEW_INLINE_TX_CHAR -#undef CONSOLE_SPEW_TX_HEX8 -#undef CONSOLE_SPEW_INLINE_TX_HEX8 -#undef CONSOLE_SPEW_TX_HEX32 -#undef CONSOLE_SPEW_INLINE_TX_HEX32 -#undef CONSOLE_SPEW_TX_STRING -#undef CONSOLE_SPEW_INLINE_TX_STRING -#define CONSOLE_SPEW_TX_CHAR(byte) -#define CONSOLE_SPEW_INLINE_TX_CHAR(byte) -#define CONSOLE_SPEW_TX_HEX8(byte) -#define CONSOLE_SPEW_INLINE_TX_HEX8(byte) -#define CONSOLE_SPEW_TX_HEX32(lword) -#define CONSOLE_SPEW_INLINE_TX_HEX32(lword) -#define CONSOLE_SPEW_TX_STRING(string) -#define CONSOLE_SPEW_INLINE_TX_STRING(string) -#endif -#endif - /* uses: esp, ax, dx */ console_tx_al: __CONSOLE_INLINE_TX_AL diff --git a/src/arch/i386/llshell/ramtest.inc b/src/arch/i386/llshell/ramtest.inc index dfe06adf7..910f01608 100644 --- a/src/arch/i386/llshell/ramtest.inc +++ b/src/arch/i386/llshell/ramtest.inc @@ -112,7 +112,7 @@ ramtest: jmp 3b 5: CONSOLE_INFO_TX_STRING($rt_toomany) - intel_chip_post_macro(0xf1) + post_code(0xf1) jmp .Lhlt 6: diff --git a/src/arch/i386/llshell/readme.coreboot b/src/arch/i386/llshell/readme.coreboot index fb23d1a9d..ae7dcbecd 100644 --- a/src/arch/i386/llshell/readme.coreboot +++ b/src/arch/i386/llshell/readme.coreboot @@ -16,7 +16,7 @@ llshell_ret1: 3) Optionally, comment out two lines in ramtest.inc: 5: CONSOLE_INFO_TX_STRING($rt_toomany) - // intel_chip_post_macro(0xf1) + // post_code(0xf1) // jmp .Lhlt otherwise, a ramtest failure will hang diff --git a/src/console/console.c b/src/console/console.c index 6b4173c86..327ad1901 100644 --- a/src/console/console.c +++ b/src/console/console.c @@ -76,7 +76,7 @@ int console_tst_byte(void) /* * Write POST information */ -void post_code(uint8_t value) +void post_code(u8 value) { #if !defined(CONFIG_NO_POST) || CONFIG_NO_POST==0 #if CONFIG_SERIAL_POST==1 diff --git a/src/cpu/amd/model_lx/cache_as_ram.inc b/src/cpu/amd/model_lx/cache_as_ram.inc index 659e0141a..7e6a68a5a 100644 --- a/src/cpu/amd/model_lx/cache_as_ram.inc +++ b/src/cpu/amd/model_lx/cache_as_ram.inc @@ -17,6 +17,10 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ +#ifndef ASM_CONSOLE_LOGLEVEL +#define ASM_CONSOLE_LOGLEVEL CONFIG_MAXIMUM_CONSOLE_LOGLEVEL +#endif + #define LX_STACK_BASE CONFIG_DCACHE_RAM_BASE /* this is where the DCache will be mapped and be used as stack, It would be cool if it was the same base as coreboot normal stack */ #define LX_STACK_END LX_STACK_BASE+(CONFIG_DCACHE_RAM_SIZE-1) @@ -206,7 +210,7 @@ __main: * isn\'t really that big we just copy/clear using bytes, not * double words. */ - intel_chip_post_macro(0x11) /* post 11 */ + post_code(0x11) /* post 11 */ cld /* clear direction flag */ @@ -220,7 +224,7 @@ __main: call cbfs_and_run_core .Lhlt: - intel_chip_post_macro(0xee) /* post fail ee */ + post_code(0xee) /* post fail ee */ hlt jmp .Lhlt diff --git a/src/cpu/intel/model_106cx/cache_as_ram.inc b/src/cpu/intel/model_106cx/cache_as_ram.inc index 4781b0521..da42d4dc6 100644 --- a/src/cpu/intel/model_106cx/cache_as_ram.inc +++ b/src/cpu/intel/model_106cx/cache_as_ram.inc @@ -20,7 +20,6 @@ #define CACHE_AS_RAM_SIZE CONFIG_DCACHE_RAM_SIZE #define CACHE_AS_RAM_BASE CONFIG_DCACHE_RAM_BASE -#define post_code(x) intel_chip_post_macro(x) #include #include diff --git a/src/cpu/intel/model_6ex/cache_as_ram.inc b/src/cpu/intel/model_6ex/cache_as_ram.inc index 848c84d2c..ad0567e10 100644 --- a/src/cpu/intel/model_6ex/cache_as_ram.inc +++ b/src/cpu/intel/model_6ex/cache_as_ram.inc @@ -20,7 +20,6 @@ #define CACHE_AS_RAM_SIZE CONFIG_DCACHE_RAM_SIZE #define CACHE_AS_RAM_BASE CONFIG_DCACHE_RAM_BASE -#define post_code(x) intel_chip_post_macro(x) #include #include diff --git a/src/cpu/intel/model_6fx/cache_as_ram.inc b/src/cpu/intel/model_6fx/cache_as_ram.inc index 50f9608dc..b902b1dbf 100644 --- a/src/cpu/intel/model_6fx/cache_as_ram.inc +++ b/src/cpu/intel/model_6fx/cache_as_ram.inc @@ -20,7 +20,6 @@ #define CACHE_AS_RAM_SIZE CONFIG_DCACHE_RAM_SIZE #define CACHE_AS_RAM_BASE CONFIG_DCACHE_RAM_BASE -#define post_code(x) intel_chip_post_macro(x) #include #include diff --git a/src/cpu/x86/32bit/entry32.inc b/src/cpu/x86/32bit/entry32.inc index 2cea40f8a..bc5e4436a 100644 --- a/src/cpu/x86/32bit/entry32.inc +++ b/src/cpu/x86/32bit/entry32.inc @@ -50,7 +50,7 @@ __protected_start: /* Save the BIST value */ movl %eax, %ebp - intel_chip_post_macro(0x10) /* post 10 */ + post_code(0x10) /* post 10 */ movw $ROM_DATA_SEG, %ax movw %ax, %ds diff --git a/src/include/console/console.h b/src/include/console/console.h index fe7ea0b1e..98ee4581f 100644 --- a/src/include/console/console.h +++ b/src/include/console/console.h @@ -10,7 +10,7 @@ void console_tx_byte(unsigned char byte); void console_tx_flush(void); unsigned char console_rx_byte(void); int console_tst_byte(void); -void post_code(uint8_t value); +void post_code(u8 value); void __attribute__ ((noreturn)) die(const char *msg); #if CONFIG_CONSOLE_VGA == 1 void vga_console_init(void); @@ -31,7 +31,14 @@ extern struct console_driver console_drivers[]; extern struct console_driver econsole_drivers[]; extern int console_loglevel; -#endif /* !__PRE_RAM__ */ +#else +/* __PRE_RAM__ */ +/* Using a global varible can cause problems when we reset the stack + * from cache as ram to ram. If we make this a define USE_SHARED_STACK + * we could use the same code on all architectures. + */ +#define console_loglevel CONFIG_DEFAULT_CONSOLE_LOGLEVEL +#endif #ifndef __ROMCC__ int do_printk(int msg_level, const char *fmt, ...) __attribute__((format(printf, 2, 3))); @@ -121,6 +128,8 @@ int do_printk(int msg_level, const char *fmt, ...) __attribute__((format(printf, #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) { @@ -139,14 +148,14 @@ static void __console_tx_nibble(unsigned nibble) static void __console_tx_char(int loglevel, unsigned char byte) { - if (ASM_CONSOLE_LOGLEVEL >= loglevel) { + if (console_loglevel >= loglevel) { uart_tx_byte(byte); } } static void __console_tx_hex8(int loglevel, unsigned char value) { - if (ASM_CONSOLE_LOGLEVEL >= loglevel) { + if (console_loglevel >= loglevel) { __console_tx_nibble((value >> 4U) & 0x0fU); __console_tx_nibble(value & 0x0fU); } @@ -154,7 +163,7 @@ static void __console_tx_hex8(int loglevel, unsigned char value) static void __console_tx_hex16(int loglevel, unsigned short value) { - if (ASM_CONSOLE_LOGLEVEL >= loglevel) { + if (console_loglevel >= loglevel) { __console_tx_nibble((value >> 12U) & 0x0fU); __console_tx_nibble((value >> 8U) & 0x0fU); __console_tx_nibble((value >> 4U) & 0x0fU); @@ -164,7 +173,7 @@ static void __console_tx_hex16(int loglevel, unsigned short value) static void __console_tx_hex32(int loglevel, unsigned int value) { - if (ASM_CONSOLE_LOGLEVEL >= loglevel) { + if (console_loglevel >= loglevel) { __console_tx_nibble((value >> 28U) & 0x0fU); __console_tx_nibble((value >> 24U) & 0x0fU); __console_tx_nibble((value >> 20U) & 0x0fU); @@ -178,7 +187,7 @@ static void __console_tx_hex32(int loglevel, unsigned int value) static void __console_tx_string(int loglevel, const char *str) { - if (ASM_CONSOLE_LOGLEVEL >= loglevel) { + if (console_loglevel >= loglevel) { unsigned char ch; while((ch = *str++) != '\0') { if (ch == '\n') diff --git a/src/include/console/loglevel.h b/src/include/console/loglevel.h index f306744d9..290cd891e 100644 --- a/src/include/console/loglevel.h +++ b/src/include/console/loglevel.h @@ -2,11 +2,6 @@ #define LOGLEVEL_H /* Safe for inclusion in assembly */ - -#ifndef ASM_CONSOLE_LOGLEVEL -#define ASM_CONSOLE_LOGLEVEL CONFIG_MAXIMUM_CONSOLE_LOGLEVEL -#endif - #define BIOS_EMERG 0 /* system is unusable */ #define BIOS_ALERT 1 /* action must be taken immediately */ #define BIOS_CRIT 2 /* critical conditions */ diff --git a/src/mainboard/amd/db800/romstage.c b/src/mainboard/amd/db800/romstage.c index 510b8f86f..33ca9a221 100644 --- a/src/mainboard/amd/db800/romstage.c +++ b/src/mainboard/amd/db800/romstage.c @@ -33,7 +33,6 @@ #include "southbridge/amd/cs5536/cs5536.h" #define ARRAY_SIZE(a) (sizeof(a) / sizeof((a)[0])) -#define POST_CODE(x) outb(x, 0x80) #define SERIAL_DEV PNP_DEV(0x2e, W83627HF_SP1) #include "southbridge/amd/cs5536/cs5536_early_smbus.c" @@ -98,7 +97,7 @@ static void mb_gpio_init(void) void cache_as_ram_main(void) { - POST_CODE(0x01); + post_code(0x01); static const struct mem_controller memctrl[] = { {.channel0 = {(0xa << 3) | 0, (0xa << 3) | 1}} diff --git a/src/mainboard/amd/dbm690t/romstage.c b/src/mainboard/amd/dbm690t/romstage.c index 3c808d41c..676ce4ef9 100644 --- a/src/mainboard/amd/dbm690t/romstage.c +++ b/src/mainboard/amd/dbm690t/romstage.c @@ -45,8 +45,6 @@ #include "pc80/serial.c" #include "console/console.c" -#define post_code(x) outb(x, 0x80) - #include #include "northbridge/amd/amdk8/raminit.h" #include "cpu/amd/model_fxx/apic_timer.c" diff --git a/src/mainboard/amd/mahogany/romstage.c b/src/mainboard/amd/mahogany/romstage.c index 3dc280154..97c198895 100644 --- a/src/mainboard/amd/mahogany/romstage.c +++ b/src/mainboard/amd/mahogany/romstage.c @@ -45,8 +45,6 @@ #include "pc80/serial.c" #include "console/console.c" -#define post_code(x) outb(x, 0x80) - #include #include "northbridge/amd/amdk8/raminit.h" #include "cpu/amd/model_fxx/apic_timer.c" diff --git a/src/mainboard/amd/norwich/romstage.c b/src/mainboard/amd/norwich/romstage.c index 8c17b0aff..d742f5002 100644 --- a/src/mainboard/amd/norwich/romstage.c +++ b/src/mainboard/amd/norwich/romstage.c @@ -32,8 +32,6 @@ #include #include "southbridge/amd/cs5536/cs5536.h" -#define POST_CODE(x) outb(x, 0x80) - #include "southbridge/amd/cs5536/cs5536_early_smbus.c" #include "southbridge/amd/cs5536/cs5536_early_setup.c" @@ -95,7 +93,7 @@ static void mb_gpio_init(void) void cache_as_ram_main(void) { - POST_CODE(0x01); + post_code(0x01); static const struct mem_controller memctrl[] = { {.channel0 = {(0xa << 3) | 0, (0xa << 3) | 1}} diff --git a/src/mainboard/amd/pistachio/romstage.c b/src/mainboard/amd/pistachio/romstage.c index 6cdaf42df..a3a34d698 100644 --- a/src/mainboard/amd/pistachio/romstage.c +++ b/src/mainboard/amd/pistachio/romstage.c @@ -39,8 +39,6 @@ #include "pc80/serial.c" #include "console/console.c" -#define post_code(x) outb(x, 0x80) - #include #include "northbridge/amd/amdk8/raminit.h" #include "cpu/amd/model_fxx/apic_timer.c" diff --git a/src/mainboard/artecgroup/dbe61/romstage.c b/src/mainboard/artecgroup/dbe61/romstage.c index 217233868..2fb86f1da 100644 --- a/src/mainboard/artecgroup/dbe61/romstage.c +++ b/src/mainboard/artecgroup/dbe61/romstage.c @@ -35,8 +35,6 @@ #include "southbridge/amd/cs5536/cs5536.h" #include "spd_table.h" -#define POST_CODE(x) outb(x, 0x80) - #include "southbridge/amd/cs5536/cs5536_early_smbus.c" #include "southbridge/amd/cs5536/cs5536_early_setup.c" @@ -112,7 +110,7 @@ static void mb_gpio_init(void) void cache_as_ram_main(void) { - POST_CODE(0x01); + post_code(0x01); static const struct mem_controller memctrl[] = { {.channel0 = {(0xa << 3) | 0, (0xa << 3) | 1}} diff --git a/src/mainboard/broadcom/blast/romstage.c b/src/mainboard/broadcom/blast/romstage.c index 37751ce27..03a328835 100644 --- a/src/mainboard/broadcom/blast/romstage.c +++ b/src/mainboard/broadcom/blast/romstage.c @@ -17,17 +17,6 @@ #include "console/console.c" #include "lib/ramtest.c" -#if 0 -static void post_code(uint8_t value) { -#if 0 - int i; - for(i=0;i<0x80000;i++) { - outb(value, 0x80); - } -#endif -} -#endif - #include #include "northbridge/amd/amdk8/incoherent_ht.c" #include "southbridge/broadcom/bcm5785/bcm5785_early_smbus.c" diff --git a/src/mainboard/digitallogic/adl855pc/romstage.c b/src/mainboard/digitallogic/adl855pc/romstage.c index 6bd7068a8..59e21388e 100644 --- a/src/mainboard/digitallogic/adl855pc/romstage.c +++ b/src/mainboard/digitallogic/adl855pc/romstage.c @@ -1,4 +1,3 @@ -#define ASM_CONSOLE_LOGLEVEL 8 #include #include #include diff --git a/src/mainboard/digitallogic/msm586seg/romstage.c b/src/mainboard/digitallogic/msm586seg/romstage.c index 181463427..0859e370c 100644 --- a/src/mainboard/digitallogic/msm586seg/romstage.c +++ b/src/mainboard/digitallogic/msm586seg/romstage.c @@ -1,4 +1,3 @@ -#define ASM_CONSOLE_LOGLEVEL 8 #include #include #include diff --git a/src/mainboard/digitallogic/msm800sev/romstage.c b/src/mainboard/digitallogic/msm800sev/romstage.c index 1983b9678..1e4ee4c7e 100644 --- a/src/mainboard/digitallogic/msm800sev/romstage.c +++ b/src/mainboard/digitallogic/msm800sev/romstage.c @@ -13,7 +13,6 @@ #include #include "southbridge/amd/cs5536/cs5536.h" -#define POST_CODE(x) outb(x, 0x80) #define SERIAL_DEV PNP_DEV(0x2e, W83627HF_SP1) #include "southbridge/amd/cs5536/cs5536_early_smbus.c" @@ -63,7 +62,7 @@ static void mb_gpio_init(void) void cache_as_ram_main(void) { extern void RestartCAR(); - POST_CODE(0x01); + post_code(0x01); static const struct mem_controller memctrl [] = { {.channel0 = {(0xa<<3)|0, (0xa<<3)|1}} @@ -105,7 +104,7 @@ void cache_as_ram_main(void) We use method 1 on Norwich. */ - POST_CODE(0x02); + post_code(0x02); print_err("POST 02\n"); __asm__("wbinvd\n"); print_err("Past wbinvd\n"); diff --git a/src/mainboard/iei/pcisa-lx-800-r10/romstage.c b/src/mainboard/iei/pcisa-lx-800-r10/romstage.c index 80226a940..f5fa9e9b0 100644 --- a/src/mainboard/iei/pcisa-lx-800-r10/romstage.c +++ b/src/mainboard/iei/pcisa-lx-800-r10/romstage.c @@ -32,7 +32,6 @@ #include #include "southbridge/amd/cs5536/cs5536.h" -#define POST_CODE(x) outb(x, 0x80) #define SERIAL_DEV PNP_DEV(0x2e, W83627HF_SP1) #include "southbridge/amd/cs5536/cs5536_early_smbus.c" @@ -102,7 +101,7 @@ static void mb_gpio_init(void) void cache_as_ram_main(void) { - POST_CODE(0x01); + post_code(0x01); static const struct mem_controller memctrl[] = { {.channel0 = {(0xa << 3) | 0, (0xa << 3) | 1}} diff --git a/src/mainboard/kontron/kt690/romstage.c b/src/mainboard/kontron/kt690/romstage.c index 753488933..4b82aa4d8 100644 --- a/src/mainboard/kontron/kt690/romstage.c +++ b/src/mainboard/kontron/kt690/romstage.c @@ -46,8 +46,6 @@ #include "pc80/serial.c" #include "console/console.c" -#define post_code(x) outb(x, 0x80) - #include #include "northbridge/amd/amdk8/raminit.h" #include "cpu/amd/model_fxx/apic_timer.c" diff --git a/src/mainboard/lippert/roadrunner-lx/romstage.c b/src/mainboard/lippert/roadrunner-lx/romstage.c index 67f4c3c38..efaf1dd6b 100644 --- a/src/mainboard/lippert/roadrunner-lx/romstage.c +++ b/src/mainboard/lippert/roadrunner-lx/romstage.c @@ -36,8 +36,6 @@ #include #include "southbridge/amd/cs5536/cs5536.h" -#define POST_CODE(x) outb(x, 0x80) - #include "southbridge/amd/cs5536/cs5536_early_smbus.c" #include "southbridge/amd/cs5536/cs5536_early_setup.c" #include "superio/ite/it8712f/it8712f_early_serial.c" @@ -132,7 +130,7 @@ static void mb_gpio_init(void) void cache_as_ram_main(void) { - POST_CODE(0x01); + post_code(0x01); static const struct mem_controller memctrl[] = { {.channel0 = {(0xa << 3) | 0, (0xa << 3) | 1}} diff --git a/src/mainboard/lippert/spacerunner-lx/romstage.c b/src/mainboard/lippert/spacerunner-lx/romstage.c index 344e0eed8..51b1cf6d1 100644 --- a/src/mainboard/lippert/spacerunner-lx/romstage.c +++ b/src/mainboard/lippert/spacerunner-lx/romstage.c @@ -37,8 +37,6 @@ #include #include "southbridge/amd/cs5536/cs5536.h" -#define POST_CODE(x) outb(x, 0x80) - #include "southbridge/amd/cs5536/cs5536_early_smbus.c" #include "southbridge/amd/cs5536/cs5536_early_setup.c" #include "superio/ite/it8712f/it8712f_early_serial.c" @@ -194,7 +192,7 @@ static void mb_gpio_init(void) void cache_as_ram_main(void) { int err; - POST_CODE(0x01); + post_code(0x01); static const struct mem_controller memctrl[] = { {.channel0 = {(0xa << 3) | 0, (0xa << 3) | 1}} diff --git a/src/mainboard/msi/ms9185/romstage.c b/src/mainboard/msi/ms9185/romstage.c index ecc95d5d6..04c8dbd54 100644 --- a/src/mainboard/msi/ms9185/romstage.c +++ b/src/mainboard/msi/ms9185/romstage.c @@ -52,17 +52,6 @@ #include "pc80/serial.c" #include "console/console.c" -#if 0 -static void post_code(uint8_t value) { -#if 1 - int i; - for(i=0;i<0x80000;i++) { - outb(value, 0x80); - } -#endif -} -#endif - #include #include "southbridge/broadcom/bcm5785/bcm5785_early_smbus.c" #include "northbridge/amd/amdk8/raminit.h" diff --git a/src/mainboard/newisys/khepri/romstage.c b/src/mainboard/newisys/khepri/romstage.c index 0174b7b56..00e5991bf 100644 --- a/src/mainboard/newisys/khepri/romstage.c +++ b/src/mainboard/newisys/khepri/romstage.c @@ -18,17 +18,6 @@ #include "console/console.c" #include "lib/ramtest.c" -#if 0 -static void post_code(uint8_t value) { -#if 1 - int i; - for(i=0;i<0x80000;i++) { - outb(value, 0x80); - } -#endif -} -#endif - #include #include "northbridge/amd/amdk8/incoherent_ht.c" diff --git a/src/mainboard/pcengines/alix1c/romstage.c b/src/mainboard/pcengines/alix1c/romstage.c index 236e53025..1ba444032 100644 --- a/src/mainboard/pcengines/alix1c/romstage.c +++ b/src/mainboard/pcengines/alix1c/romstage.c @@ -33,7 +33,6 @@ #include #include "southbridge/amd/cs5536/cs5536.h" -#define POST_CODE(x) outb(x, 0x80) #define SERIAL_DEV PNP_DEV(0x2e, W83627HF_SP1) /* The ALIX1.C has no SMBus; the setup is hard-wired. */ @@ -148,7 +147,7 @@ void cache_as_ram_main(void) extern void RestartCAR(); - POST_CODE(0x01); + post_code(0x01); SystemPreInit(); msr_init(); @@ -195,7 +194,7 @@ void cache_as_ram_main(void) * * We use method 1 on Norwich and on this board too. */ - POST_CODE(0x02); + post_code(0x02); print_err("POST 02\n"); __asm__("wbinvd\n"); print_err("Past wbinvd\n"); diff --git a/src/mainboard/technexion/tim5690/romstage.c b/src/mainboard/technexion/tim5690/romstage.c index f3d6be0a1..2b7ede214 100644 --- a/src/mainboard/technexion/tim5690/romstage.c +++ b/src/mainboard/technexion/tim5690/romstage.c @@ -45,8 +45,6 @@ #include "pc80/serial.c" #include "console/console.c" -#define post_code(x) outb(x, 0x80) - #include #include "northbridge/amd/amdk8/raminit.h" #include "cpu/amd/model_fxx/apic_timer.c" diff --git a/src/mainboard/technexion/tim8690/romstage.c b/src/mainboard/technexion/tim8690/romstage.c index a16bf7ca5..71ae749ca 100644 --- a/src/mainboard/technexion/tim8690/romstage.c +++ b/src/mainboard/technexion/tim8690/romstage.c @@ -45,8 +45,6 @@ #include "pc80/serial.c" #include "console/console.c" -#define post_code(x) outb(x, 0x80) - #include #include "northbridge/amd/amdk8/raminit.h" #include "cpu/amd/model_fxx/apic_timer.c" diff --git a/src/mainboard/technologic/ts5300/romstage.c b/src/mainboard/technologic/ts5300/romstage.c index d585edd47..4379c2457 100644 --- a/src/mainboard/technologic/ts5300/romstage.c +++ b/src/mainboard/technologic/ts5300/romstage.c @@ -4,7 +4,6 @@ * (c) 2006 coresystems GmbH */ -#define ASM_CONSOLE_LOGLEVEL 6 #include #include #include diff --git a/src/mainboard/tyan/s2850/romstage.c b/src/mainboard/tyan/s2850/romstage.c index c251e6dce..750ca9c49 100644 --- a/src/mainboard/tyan/s2850/romstage.c +++ b/src/mainboard/tyan/s2850/romstage.c @@ -13,17 +13,6 @@ #include "console/console.c" #include "lib/ramtest.c" -#if 0 -static void post_code(uint8_t value) { -#if 1 - int i; - for(i=0;i<0x80000;i++) { - outb(value, 0x80); - } -#endif -} -#endif - #include #include "northbridge/amd/amdk8/incoherent_ht.c" #include "southbridge/amd/amd8111/amd8111_early_smbus.c" diff --git a/src/mainboard/tyan/s2881/romstage.c b/src/mainboard/tyan/s2881/romstage.c index bb13bb424..eb6873c4e 100644 --- a/src/mainboard/tyan/s2881/romstage.c +++ b/src/mainboard/tyan/s2881/romstage.c @@ -17,17 +17,6 @@ #include "console/console.c" #include "lib/ramtest.c" -#if 0 -static void post_code(uint8_t value) { -#if 1 - int i; - for(i=0;i<0x80000;i++) { - outb(value, 0x80); - } -#endif -} -#endif - #include #include "northbridge/amd/amdk8/incoherent_ht.c" diff --git a/src/mainboard/tyan/s2885/romstage.c b/src/mainboard/tyan/s2885/romstage.c index 0f1b09e20..eafe326c7 100644 --- a/src/mainboard/tyan/s2885/romstage.c +++ b/src/mainboard/tyan/s2885/romstage.c @@ -12,17 +12,6 @@ #include "console/console.c" #include "lib/ramtest.c" -#if 0 -static void post_code(uint8_t value) { -#if 1 - int i; - for(i=0;i<0x80000;i++) { - outb(value, 0x80); - } -#endif -} -#endif - #include #include "northbridge/amd/amdk8/incoherent_ht.c" diff --git a/src/mainboard/winent/pl6064/romstage.c b/src/mainboard/winent/pl6064/romstage.c index 5a8e94bde..60f2d2109 100644 --- a/src/mainboard/winent/pl6064/romstage.c +++ b/src/mainboard/winent/pl6064/romstage.c @@ -34,7 +34,6 @@ #include "southbridge/amd/cs5536/cs5536.h" #define ARRAY_SIZE(a) (sizeof(a) / sizeof((a)[0])) -#define POST_CODE(x) outb(x, 0x80) #define SERIAL_DEV PNP_DEV(0x2e, W83627HF_SP1) #include "southbridge/amd/cs5536/cs5536_early_smbus.c" @@ -99,7 +98,7 @@ static void mb_gpio_init(void) void cache_as_ram_main(void) { - POST_CODE(0x01); + post_code(0x01); static const struct mem_controller memctrl[] = { {.channel0 = {(0xa << 3) | 0, (0xa << 3) | 1}} diff --git a/src/northbridge/amd/gx2/pll_reset.c b/src/northbridge/amd/gx2/pll_reset.c index 040d7b7a4..898e31dcd 100644 --- a/src/northbridge/amd/gx2/pll_reset.c +++ b/src/northbridge/amd/gx2/pll_reset.c @@ -115,7 +115,6 @@ static unsigned int get_memory_speed(void) #if USE_GOODRICH_VERSION /////////////////////////////////////////////////////////////////////////////// // Goodrich Version of pll_reset -#define POST_CODE(x) outb(x, 0x80) // PLLCHECK_COMPLETED is the "we've already done this" flag #define PLLCHECK_COMPLETED (1 << RSTPLL_LOWER_SWFLAGS_SHIFT) @@ -149,7 +148,7 @@ static void pll_reset(void) // Store PCI33(0)/66(1), SDR(0)/DDR(1), and CRT(0)/TFT(1) in upper esi to get to the // correct Strap Table. - POST_CODE(POST_PLL_INIT); + post_code(POST_PLL_INIT); // configure for DDR msrGlcpSysRstpll.lo &= ~(1 << RSTPPL_LOWER_SDRMODE_SHIFT); @@ -157,7 +156,7 @@ static void pll_reset(void) // Use Manual settings // UseManual: - POST_CODE(POST_PLL_MANUAL); + post_code(POST_PLL_MANUAL); // DIV settings manually entered. // ax = VDIV, upper eax = MDIV, upper ecx = FbDIV @@ -237,7 +236,7 @@ static void pll_reset(void) wrmsr(GLCP_SYS_RSTPLL, msrGlcpSysRstpll); // You should never get here..... The chip has reset. - POST_CODE(POST_PLL_RESET_FAIL); + post_code(POST_PLL_RESET_FAIL); while (1); } // we haven't configured the PLL; do it now diff --git a/src/northbridge/amd/lx/pll_reset.c b/src/northbridge/amd/lx/pll_reset.c index 08c19b48e..188a96e85 100644 --- a/src/northbridge/amd/lx/pll_reset.c +++ b/src/northbridge/amd/lx/pll_reset.c @@ -31,12 +31,12 @@ static void pll_reset(char manualconf) print_debug(":"); print_debug_hex32(msrGlcpSysRstpll.lo); print_debug("\n"); - POST_CODE(POST_PLL_INIT); + post_code(POST_PLL_INIT); if (!(msrGlcpSysRstpll.lo & (1 << RSTPLL_LOWER_SWFLAGS_SHIFT))) { print_debug("Configuring PLL\n"); if (manualconf) { - POST_CODE(POST_PLL_MANUAL); + post_code(POST_PLL_MANUAL); /* CPU and GLIU mult/div (GLMC_CLK = GLIU_CLK / 2) */ msrGlcpSysRstpll.hi = PLLMSRhi; @@ -44,7 +44,7 @@ static void pll_reset(char manualconf) msrGlcpSysRstpll.lo = PLLMSRlo; } else { /*automatic configuration (straps) */ - POST_CODE(POST_PLL_STRAP); + post_code(POST_PLL_STRAP); msrGlcpSysRstpll.lo &= ~(0xFF << RSTPPL_LOWER_HOLD_COUNT_SHIFT); msrGlcpSysRstpll.lo |= @@ -64,7 +64,7 @@ static void pll_reset(char manualconf) /* You should never get here..... The chip has reset. */ print_debug("CONFIGURING PLL FAILURE\n"); - POST_CODE(POST_PLL_RESET_FAIL); + post_code(POST_PLL_RESET_FAIL); __asm__ __volatile__("hlt\n"); } diff --git a/src/northbridge/amd/lx/raminit.c b/src/northbridge/amd/lx/raminit.c index 15b5be6ea..10717add0 100644 --- a/src/northbridge/amd/lx/raminit.c +++ b/src/northbridge/amd/lx/raminit.c @@ -67,7 +67,7 @@ static void auto_size_dimm(unsigned int dimm) spd_byte = spd_read_byte(dimm, SPD_NUM_DIMM_BANKS); if ((MIN_MOD_BANKS > spd_byte) || (spd_byte > MAX_MOD_BANKS)) { print_emerg("Number of module banks not compatible\n"); - POST_CODE(ERROR_BANK_SET); + post_code(ERROR_BANK_SET); hcf(); } dimm_setting |= (spd_byte >> 1) << CF07_UPPER_D0_MB_SHIFT; @@ -78,7 +78,7 @@ static void auto_size_dimm(unsigned int dimm) spd_byte = spd_read_byte(dimm, SPD_NUM_BANKS_PER_SDRAM); if ((MIN_DEV_BANKS > spd_byte) || (spd_byte > MAX_DEV_BANKS)) { print_emerg("Number of device banks not compatible\n"); - POST_CODE(ERROR_BANK_SET); + post_code(ERROR_BANK_SET); hcf(); } dimm_setting |= (spd_byte >> 2) << CF07_UPPER_D0_CB_SHIFT; @@ -94,7 +94,7 @@ static void auto_size_dimm(unsigned int dimm) if ((spd_read_byte(dimm, SPD_NUM_ROWS) & 0xF0) || (spd_read_byte(dimm, SPD_NUM_COLUMNS) & 0xF0)) { print_emerg("Assymetirc DIMM not compatible\n"); - POST_CODE(ERROR_UNSUPPORTED_DIMM); + post_code(ERROR_UNSUPPORTED_DIMM); hcf(); } banner("SPDBANKDENSITY"); @@ -111,7 +111,7 @@ static void auto_size_dimm(unsigned int dimm) banner("TEST DIMM SIZE>8"); if (dimm_size > 8) { /* 8 is 1GB only support 1GB per DIMM */ print_emerg("Only support up to 1 GB per DIMM\n"); - POST_CODE(ERROR_DENSITY_DIMM); + post_code(ERROR_DENSITY_DIMM); hcf(); } dimm_setting |= dimm_size << CF07_UPPER_D0_SZ_SHIFT; @@ -144,7 +144,7 @@ static void auto_size_dimm(unsigned int dimm) banner("MAXCOLADDR"); if (spd_byte > MAX_COL_ADDR) { print_emerg("DIMM page size not compatible\n"); - POST_CODE(ERROR_SET_PAGE); + post_code(ERROR_SET_PAGE); hcf(); } banner(">12address test"); @@ -186,7 +186,7 @@ static void checkDDRMax(void) /* I don't think you need this check. if (spd_byte0 >= 0xA0 || spd_byte1 >= 0xA0){ print_emerg("DIMM overclocked. Check GeodeLink Speed\n"); - POST_CODE(POST_PLL_MEM_FAIL); + post_code(POST_PLL_MEM_FAIL); hcf(); } */ @@ -201,7 +201,7 @@ static void checkDDRMax(void) /* current speed > max speed? */ if (GeodeLinkSpeed() > speed) { print_emerg("DIMM overclocked. Check GeodeLink Speed\n"); - POST_CODE(POST_PLL_MEM_FAIL); + post_code(POST_PLL_MEM_FAIL); hcf(); } } @@ -341,7 +341,7 @@ static void setCAS(void) spd_byte = CASDDR[__builtin_ctz((uint32_t) casmap0)]; } else { print_emerg("DIMM CAS Latencies not compatible\n"); - POST_CODE(ERROR_DIFF_DIMMS); + post_code(ERROR_DIFF_DIMMS); hcf(); } @@ -570,41 +570,41 @@ static void sdram_set_spd_registers(const struct mem_controller *ctrl) uint8_t spd_byte; banner("sdram_set_spd_register\n"); - POST_CODE(POST_MEM_SETUP); // post_70h + post_code(POST_MEM_SETUP); // post_70h spd_byte = spd_read_byte(DIMM0, SPD_MODULE_ATTRIBUTES); banner("Check DIMM 0"); /* Check DIMM is not Register and not Buffered DIMMs. */ if ((spd_byte != 0xFF) && (spd_byte & 3)) { print_emerg("DIMM0 NOT COMPATIBLE\n"); - POST_CODE(ERROR_UNSUPPORTED_DIMM); + post_code(ERROR_UNSUPPORTED_DIMM); hcf(); } banner("Check DIMM 1"); spd_byte = spd_read_byte(DIMM1, SPD_MODULE_ATTRIBUTES); if ((spd_byte != 0xFF) && (spd_byte & 3)) { print_emerg("DIMM1 NOT COMPATIBLE\n"); - POST_CODE(ERROR_UNSUPPORTED_DIMM); + post_code(ERROR_UNSUPPORTED_DIMM); hcf(); } - POST_CODE(POST_MEM_SETUP2); // post_72h + post_code(POST_MEM_SETUP2); // post_72h banner("Check DDR MAX"); /* Check that the memory is not overclocked. */ checkDDRMax(); /* Size the DIMMS */ - POST_CODE(POST_MEM_SETUP3); // post_73h + post_code(POST_MEM_SETUP3); // post_73h banner("AUTOSIZE DIMM 0"); auto_size_dimm(DIMM0); - POST_CODE(POST_MEM_SETUP4); // post_74h + post_code(POST_MEM_SETUP4); // post_74h banner("AUTOSIZE DIMM 1"); auto_size_dimm(DIMM1); /* Set CAS latency */ banner("set cas latency"); - POST_CODE(POST_MEM_SETUP5); // post_75h + post_code(POST_MEM_SETUP5); // post_75h setCAS(); /* Set all the other latencies here (tRAS, tRP....) */ @@ -640,7 +640,7 @@ static void sdram_enable(int controllers, const struct mem_controller *ctrl) ;* 9) MRS w/ memory config & reset DLL clear ;* 8) DDR SDRAM ready for normal operation ;********************************************************************/ - POST_CODE(POST_MEM_ENABLE); // post_76h + post_code(POST_MEM_ENABLE); // post_76h /* Only enable MTest for TLA memory debug */ /*EnableMTest(); */ @@ -650,7 +650,7 @@ static void sdram_enable(int controllers, const struct mem_controller *ctrl) if ((msr.hi & ((7 << CF07_UPPER_D1_PSZ_SHIFT) | (7 << CF07_UPPER_D0_PSZ_SHIFT))) == ((7 << CF07_UPPER_D1_PSZ_SHIFT) | (7 << CF07_UPPER_D0_PSZ_SHIFT))) { print_emerg("No memory in the system\n"); - POST_CODE(ERROR_NO_DIMMS); + post_code(ERROR_NO_DIMMS); hcf(); } @@ -760,7 +760,7 @@ static void sdram_enable(int controllers, const struct mem_controller *ctrl) wrmsr(msrnum, msr); print_emerg("DRAM controller init done.\n"); - POST_CODE(POST_MEM_SETUP_GOOD); //0x7E + post_code(POST_MEM_SETUP_GOOD); //0x7E /* make sure there is nothing stale in the cache */ /* CAR stack is in the cache __asm__ __volatile__("wbinvd\n"); */ -- 2.25.1