GNUBoot
/
coreboot-kgpe-d16
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

console: Drop driver list in ramstage 

This framework was only available in ramstage. So we had to define
console output functions separately for bootblock, romstage and SMM.
Follow-up patches will re-enable all the consoles removed here,
in a more flexible fashion, and with less lines-of-code and copy-paste.

Also the driver list is not in a well-defined order and some of the
loops could exit without visiting all drivers.

NOTE: This build has no console in ramstage.

Change-Id: Iaddc495aaca37e2a6c2c3f802a0dba27bf227a3e
Signed-off-by: Kyösti Mälkki <kyosti.malkki@gmail.com>
Reviewed-on: http://review.coreboot.org/5337
Tested-by: build bot (Jenkins)
Reviewed-by: Alexandru Gagniuc <mr.nuke.me@gmail.com>
This commit is contained in:
Kyösti Mälkki 2014-02-03 17:04:22 +02:00
parent aece3c931e
commit fd95624dae
15 changed files with 9 additions and 379 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/arch/armv7/coreboot_ram.ld
View File

@ -56,10 +56,6 @@ SECTIONS
.rodata : {
_rodata = .;
. = ALIGN(4);
console_drivers = .;
*(.rodata.console_drivers)
econsole_drivers = . ;
. = ALIGN(4);
pci_drivers = . ;
*(.rodata.pci_driver)
epci_drivers = . ;

4
src/arch/x86/coreboot_ram.ld
View File

@ -54,10 +54,6 @@ SECTIONS
/* If any changes are made to the driver start/symbols or the
* section names the equivalent changes need to made to
* rmodule.ld. */
console_drivers = .;
*(.rodata.console_drivers)
econsole_drivers = . ;
. = ALIGN(4);
pci_drivers = . ;
*(.rodata.pci_driver)
epci_drivers = . ;

8
src/console/Makefile.inc
View File

@ -15,14 +15,6 @@ bootblock-$(CONFIG_BOOTBLOCK_CONSOLE) += vtxprintf.c printk.c
bootblock-$(CONFIG_BOOTBLOCK_CONSOLE) += init.c console.c
bootblock-y += die.c
ramstage-$(CONFIG_CONSOLE_SERIAL) += uart_console.c
ramstage-$(CONFIG_SPKMODEM) += spkmodem_console.c
ramstage-$(CONFIG_CONSOLE_USB) += usbdebug_console.c
ramstage-$(CONFIG_CONSOLE_NE2K) += ne2k_console.c
ramstage-$(CONFIG_CONSOLE_CBMEM) += cbmem_console.c
ramstage-$(CONFIG_CONSOLE_QEMU_DEBUGCON) += qemu_debugcon_console.c
$(obj)/console/init.ramstage.o : $(obj)/build.h
$(obj)/console/init.romstage.o : $(obj)/build.h
$(obj)/console/init.bootblock.o : $(obj)/build.h

36
src/console/cbmem_console.c
View File

@ -1,36 +0,0 @@
/*
* This file is part of the coreboot project.
*
* Copyright (C) 2011 The ChromiumOS Authors. All rights reserved.
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation; version 2 of the License.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA, 02110-1301 USA
*/
#include <console/console.h>
#include <console/cbmem_console.h>
static void cbmemc_init_(void)
{
cbmemc_init();
}
static void cbmemc_tx_byte_(unsigned char data)
{
cbmemc_tx_byte(data);
}
static const struct console_driver cbmem_console __console = {
.init = cbmemc_init_,
.tx_byte = cbmemc_tx_byte_,
};

65
src/console/console.c
View File

@ -24,62 +24,6 @@
#include <console/ne2k.h>
#include <console/spkmodem.h>
#ifndef __PRE_RAM__
/* initialize the console */
void console_hw_init(void)
{
struct console_driver *driver;
for(driver = console_drivers; driver < econsole_drivers; driver++) {
if (!driver->init)
continue;
driver->init();
}
}
void console_tx_flush(void)
{
struct console_driver *driver;
for(driver = console_drivers; driver < econsole_drivers; driver++) {
if (!driver->tx_flush)
continue;
driver->tx_flush();
}
}
void console_tx_byte(unsigned char byte)
{
struct console_driver *driver;
for(driver = console_drivers; driver < econsole_drivers; driver++) {
driver->tx_byte(byte);
}
}
unsigned char console_rx_byte(void)
{
struct console_driver *driver;
for(driver = console_drivers; driver < econsole_drivers; driver++) {
if (driver->tst_byte)
break;
}
if (driver == econsole_drivers)
return 0;
while (!driver->tst_byte());
return driver->rx_byte();
}
int console_tst_byte(void)
{
struct console_driver *driver;
for(driver = console_drivers; driver < econsole_drivers; driver++)
if (driver->tst_byte)
return driver->tst_byte();
return 0;
}
#else // __PRE_RAM__ ^^^ NOT defined vvv defined
void console_hw_init(void)
{
#if CONFIG_CONSOLE_SERIAL
@ -98,4 +42,13 @@ void console_hw_init(void)
usbdebug_init();
#endif
}
#ifndef __PRE_RAM__
void console_tx_byte(unsigned char byte)
{
}
void console_tx_flush(void)
{
}
#endif

37
src/console/ne2k_console.c
View File

@ -1,37 +0,0 @@
/*
* This file is part of the coreboot project.
*
* Copyright (C) 2010 Advanced Micro Devices, Inc.
* Copyright (C) 2010 Rudolf Marek <r.marek@assembler.cz>
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation; version 2 of the License.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*/
#include <console/console.h>
#include <console/ne2k.h>
static void ne2k_tx_byte(unsigned char data)
{
ne2k_append_data(&data, 1, CONFIG_CONSOLE_NE2K_IO_PORT);
}
static void ne2k_tx_flush(void)
{
ne2k_transmit(CONFIG_CONSOLE_NE2K_IO_PORT);
}
static const struct console_driver ne2k_console __console = {
.tx_byte = ne2k_tx_byte,
.tx_flush = ne2k_tx_flush,
};

37
src/console/qemu_debugcon_console.c
View File

@ -1,37 +0,0 @@
/*
* This file is part of the coreboot project.
*
* Copyright (C) 2013 Red Hat Inc.
* Written by Gerd Hoffmann <kraxel@redhat.com>
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation; version 2 of the License.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*/
#include <console/console.h>
#include <console/qemu_debugcon.h>
static void debugcon_init(void)
{
qemu_debugcon_init();
}
static void debugcon_tx_byte(unsigned char data)
{
qemu_debugcon_tx_byte(data);
}
static const struct console_driver debugcon_console __console = {
.init = debugcon_init,
.tx_byte = debugcon_tx_byte,
};

46
src/console/spkmodem_console.c
View File

@ -1,46 +0,0 @@
/*
* This file is part of the coreboot project.
*
* Copyright (C) 2013 Vladimir Serbinenko
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation, either version 2 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*/
#include <console/console.h>
#include <console/spkmodem.h>
static void spkmodem_tx_flush(void)
{
}
static unsigned char spkmodem_rx_byte(void)
{
return 0;
}
static int spkmodem_tst_byte(void)
{
return 0;
}
static const struct console_driver spkmodem_console __console = {
.init = spkmodem_init,
.tx_byte = spkmodem_tx_byte,
.tx_flush = spkmodem_tx_flush,
.rx_byte = spkmodem_rx_byte,
.tst_byte = spkmodem_tst_byte,
};

59
src/console/uart_console.c
View File

@ -1,59 +0,0 @@
/*
* This file is part of the coreboot project.
*
* Copyright (C) 2003 Eric Biederman
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation; version 2 of the License.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*/
#include <console/console.h>
#include <console/uart.h>
static void uartmem_init(void)
{
uart_init();
}
static void uartmem_tx_byte(unsigned char data)
{
uart_tx_byte(data);
}
static void uartmem_tx_flush(void)
{
uart_tx_flush();
}
static unsigned char uartmem_rx_byte(void)
{
return uart_rx_byte();
}
/* This only relevant with x86 with GDB_STUB enabled.*/
static int uartmem_tst_byte(void)
{
#if CONFIG_DRIVERS_UART_8250IO || CONFIG_DRIVERS_UART_8250MEM
return uart_can_rx_byte();
#else
return 0;
#endif
}
static const struct console_driver uart_console __console = {
.init = uartmem_init,
.tx_byte = uartmem_tx_byte,
.tx_flush = uartmem_tx_flush,
.rx_byte = uartmem_rx_byte,
.tst_byte = uartmem_tst_byte,
};

56
src/console/usbdebug_console.c
View File

@ -1,56 +0,0 @@
/*
* This file is part of the coreboot project.
*
* Copyright (C) 2007 AMD
* Written by Yinghai Lu <yinghai.lu@amd.com> for AMD.
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation; version 2 of the License.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA, 02110-1301 USA
*/
#include <string.h>
#include <console/console.h>
#include <console/usb.h>
static void dbgp_init(void)
{
usbdebug_init();
}
static void dbgp_tx_byte(unsigned char data)
{
usb_tx_byte(0, data);
}
static unsigned char dbgp_rx_byte(void)
{
return usb_rx_byte(0);
}
static void dbgp_tx_flush(void)
{
usb_tx_flush(0);
}
static int dbgp_tst_byte(void)
{
return usb_can_rx_byte(0);
}
static const struct console_driver usbdebug_direct_console __console = {
.init = dbgp_init,
.tx_byte = dbgp_tx_byte,
.tx_flush = dbgp_tx_flush,
.rx_byte = dbgp_rx_byte,
.tst_byte = dbgp_tst_byte,
};

5
src/drivers/uart/uart8250io.c
View File

@ -129,11 +129,6 @@ unsigned char uart_rx_byte(void)
return uart8250_rx_byte(bases[0]);
}
int uart_can_rx_byte(void)
{
return uart8250_can_rx_byte(bases[0]);
}
void uart_tx_flush(void)
{
uart8250_tx_flush(bases[0]);

8
src/drivers/uart/uart8250mem.c
View File

@ -116,14 +116,6 @@ unsigned char uart_rx_byte(void)
return uart8250_mem_rx_byte(base);
}
int uart_can_rx_byte(void)
{
u32 base = uart_platform_base(0);
if (!base)
return 0;
return uart8250_mem_can_rx_byte(base);
}
void uart_tx_flush(void)
{
u32 base = uart_platform_base(0);

18
src/include/console/console.h
View File

@ -24,24 +24,6 @@
#include <console/loglevel.h>
#include <console/post_codes.h>
#ifndef __PRE_RAM__
unsigned char console_rx_byte(void);
int console_tst_byte(void);
struct console_driver {
void (*init)(void);
void (*tx_byte)(unsigned char byte);
void (*tx_flush)(void);
unsigned char (*rx_byte)(void);
int (*tst_byte)(void);
};
#define __console __attribute__((used, __section__ (".rodata.console_drivers")))
/* Defined by the linker... */
extern struct console_driver console_drivers[];
extern struct console_driver econsole_drivers[];
#endif
#ifndef __ROMCC__
int console_log_level(int msg_level);
void console_init(void);

1
src/include/console/uart.h
View File

@ -43,7 +43,6 @@ void uart_init(void);
void uart_tx_byte(unsigned char data);
void uart_tx_flush(void);
unsigned char uart_rx_byte(void);
int uart_can_rx_byte(void);
unsigned int uart_platform_base(int idx);

4
src/lib/rmodule.ld
View File

@ -35,10 +35,6 @@ SECTIONS
/* The driver sections are to allow linking coreboot's
* ramstage with the rmodule linker. Any changes made in
* coreboot_ram.ld should be made here as well. */
console_drivers = .;
*(.rodata.console_drivers)
econsole_drivers = . ;
. = ALIGN(4);
pci_drivers = . ;
*(.rodata.pci_driver)
epci_drivers = . ;