diff options
| -rw-r--r-- | Makefile.inc | 2 | ||||
| -rw-r--r-- | src/cpu/x86/smm/smiutil.c | 102 | ||||
| -rw-r--r-- | src/lib/Makefile.inc | 39 | ||||
| -rw-r--r-- | src/lib/uart8250.c | 4 |
4 files changed, 46 insertions, 101 deletions
diff --git a/Makefile.inc b/Makefile.inc index 4f3f54c0ff..6c4a16ac0c 100644 --- a/Makefile.inc +++ b/Makefile.inc @@ -52,6 +52,8 @@ classes-y := ramstage romstage driver smm romstage-c-ccopts:=-D__PRE_RAM__ romstage-S-ccopts:=-D__PRE_RAM__ +smm-c-ccopts:=-D__SMM__ +smm-S-ccopts:=-D__SMM__ ramstage-c-deps:=$$(OPTION_TABLE_H) romstage-c-deps:=$$(OPTION_TABLE_H) diff --git a/src/cpu/x86/smm/smiutil.c b/src/cpu/x86/smm/smiutil.c index 980ea69f51..cf951f4518 100644 --- a/src/cpu/x86/smm/smiutil.c +++ b/src/cpu/x86/smm/smiutil.c @@ -21,110 +21,52 @@ #include <arch/io.h> #include <arch/romcc_io.h> -#include <console/console.h> #include <cpu/x86/cache.h> #include <cpu/x86/smm.h> -/* ********************* smi_util ************************* */ - -/* Data */ -#define UART_RBR 0x00 -#define UART_TBR 0x00 - -/* Control */ -#define UART_IER 0x01 -#define UART_IIR 0x02 -#define UART_FCR 0x02 -#define UART_LCR 0x03 -#define UART_MCR 0x04 -#define UART_DLL 0x00 -#define UART_DLM 0x01 - -/* Status */ -#define UART_LSR 0x05 -#define UART_MSR 0x06 -#define UART_SCR 0x07 - -#ifndef CONFIG_TTYS0_BASE -#define CONFIG_TTYS0_BASE 0x3f8 -#endif - -#ifndef CONFIG_TTYS0_BAUD -#define CONFIG_TTYS0_BAUD 115200 +#include <console/console.h> +#include <console/vtxprintf.h> +#if CONFIG_CONSOLE_SERIAL8250 +#include <uart8250.h> #endif - -#ifndef CONFIG_TTYS0_DIV -#define CONFIG_TTYS0_DIV (115200/CONFIG_TTYS0_BAUD) +#if CONFIG_USBDEBUG +#include <usbdebug.h> #endif - -/* Line Control Settings */ -#ifndef CONFIG_TTYS0_LCS -/* Set 8bit, 1 stop bit, no parity */ -#define CONFIG_TTYS0_LCS 0x3 +#if CONFIG_CONSOLE_NE2K +#include <console/ne2k.h> #endif -#define UART_LCS CONFIG_TTYS0_LCS - -static int uart_can_tx_byte(void) -{ - return inb(CONFIG_TTYS0_BASE + UART_LSR) & 0x20; -} - -static void uart_wait_to_tx_byte(void) -{ - while(!uart_can_tx_byte()) - ; -} - -static void uart_wait_until_sent(void) -{ - while(!(inb(CONFIG_TTYS0_BASE + UART_LSR) & 0x40)) - ; -} - -static void uart_tx_byte(unsigned char data) -{ - uart_wait_to_tx_byte(); - outb(data, CONFIG_TTYS0_BASE + UART_TBR); - /* Make certain the data clears the fifos */ - uart_wait_until_sent(); -} - void console_tx_flush(void) { - uart_wait_to_tx_byte(); + // the tx_byte functions take care of the flush. + // if not, this should be implemented. } void console_tx_byte(unsigned char byte) { if (byte == '\n') - uart_tx_byte('\r'); - uart_tx_byte(byte); -} + console_tx_byte('\r'); -#if CONFIG_DEBUG_SMI -static void uart_init(void) -{ - /* disable interrupts */ - outb(0x0, CONFIG_TTYS0_BASE + UART_IER); - /* enable fifo's */ - outb(0x01, CONFIG_TTYS0_BASE + UART_FCR); - /* Set Baud Rate Divisor to 12 ==> 115200 Baud */ - outb(0x80 | UART_LCS, CONFIG_TTYS0_BASE + UART_LCR); - outb(CONFIG_TTYS0_DIV & 0xFF, CONFIG_TTYS0_BASE + UART_DLL); - outb((CONFIG_TTYS0_DIV >> 8) & 0xFF, CONFIG_TTYS0_BASE + UART_DLM); - outb(UART_LCS, CONFIG_TTYS0_BASE + UART_LCR); -} +#if CONFIG_CONSOLE_SERIAL8250 + uart8250_tx_byte(CONFIG_TTYS0_BASE, byte); +#endif +#if CONFIG_USBDEBUG + usbdebug_tx_byte(byte); #endif +#if CONFIG_CONSOLE_NE2K + ne2k_append_data(&byte, 1, CONFIG_CONSOLE_NE2K_IO_PORT); +#endif +} void console_init(void) { #if CONFIG_DEBUG_SMI console_loglevel = CONFIG_DEFAULT_CONSOLE_LOGLEVEL; +#if CONFIG_CONSOLE_SERIAL8250 uart_init(); +#endif #else console_loglevel = 1; #endif } -/* ********************* smi_util ************************* */ diff --git a/src/lib/Makefile.inc b/src/lib/Makefile.inc index 307423dba4..2d7936bbda 100644 --- a/src/lib/Makefile.inc +++ b/src/lib/Makefile.inc @@ -1,5 +1,18 @@ -ramstage-y += clog2.c -ramstage-y += uart8250.c + + +romstage-y += memset.c +romstage-y += memcpy.c +romstage-y += memcmp.c +romstage-y += cbfs.c +romstage-y += lzma.c +#romstage-y += lzmadecode.c +romstage-$(CONFIG_CACHE_AS_RAM) += ramtest.c +romstage-$(CONFIG_HAVE_ACPI_RESUME) += cbmem.c +romstage-$(CONFIG_CONSOLE_SERIAL8250) += uart8250.c +romstage-$(CONFIG_CONSOLE_NE2K) += ne2k.c +romstage-$(CONFIG_CONSOLE_NE2K) += compute_ip_checksum.c +romstage-$(CONFIG_USBDEBUG) += usbdebug.c + ramstage-y += memset.c ramstage-y += memcpy.c ramstage-y += memcmp.c @@ -13,27 +26,15 @@ ramstage-y += cbfs.c ramstage-y += lzma.c #ramstage-y += lzmadecode.c ramstage-y += gcc.c +ramstage-y += clog2.c ramstage-y += cbmem.c - -romstage-$(CONFIG_HAVE_ACPI_RESUME) += cbmem.c -romstage-y += uart8250.c -romstage-y += memset.c -romstage-y += memcpy.c -romstage-y += memcmp.c -romstage-y += cbfs.c -romstage-y += lzma.c -romstage-$(CONFIG_CACHE_AS_RAM) += ramtest.c -#romstage-y += lzmadecode.c -romstage-$(CONFIG_CONSOLE_NE2K) += ne2k.c -romstage-$(CONFIG_CONSOLE_NE2K) += compute_ip_checksum.c - -driver-$(CONFIG_CONSOLE_NE2K) += ne2k.c - -romstage-$(CONFIG_USBDEBUG) += usbdebug.c +ramstage-$(CONFIG_CONSOLE_SERIAL8250) += uart8250.c ramstage-$(CONFIG_USBDEBUG) += usbdebug.c - ramstage-$(CONFIG_BOOTSPLASH) += jpeg.c +driver-$(CONFIG_CONSOLE_NE2K) += ne2k.c + smm-y += memcpy.c +smm-$(CONFIG_CONSOLE_SERIAL8250) += uart8250.c $(obj)/lib/version.ramstage.o : $(obj)/build.h diff --git a/src/lib/uart8250.c b/src/lib/uart8250.c index 28989b24ee..8149b03aa6 100644 --- a/src/lib/uart8250.c +++ b/src/lib/uart8250.c @@ -103,10 +103,10 @@ void init_uart8250(unsigned base_port, struct uart8250 *uart) } #endif -#ifdef __PRE_RAM__ +#if defined(__PRE_RAM__) || defined(__SMM__) void uart_init(void) { -#if CONFIG_USE_OPTION_TABLE +#if CONFIG_USE_OPTION_TABLE && !defined(__SMM__) static const unsigned char divisor[] = { 1, 2, 3, 6, 12, 24, 48, 96 }; unsigned ttys0_div, ttys0_index; ttys0_index = read_option(CMOS_VSTART_baud_rate, CMOS_VLEN_baud_rate, 0); |