From c83239eabc3b09273294a013c4dcb84f09ab0241 Mon Sep 17 00:00:00 2001 From: Nico Huber Date: Wed, 5 Oct 2016 17:46:49 +0200 Subject: Hook up libhwbase in ramstage It's hidden behind a configuration option `CONFIG_RAMSTAGE_LIBHWBASE`. This also adds some glue code to use the coreboot console for debug output and our monotonic timer framework as timer backend. v2: Also update 3rdparty/libhwbase to the latest master commit. Change-Id: I8e8d50271b46aac1141f95ab55ad323ac0889a8d Signed-off-by: Nico Huber Reviewed-on: https://review.coreboot.org/16951 Tested-by: build bot (Jenkins) Reviewed-by: Paul Menzel Reviewed-by: Ronald G. Minnich --- src/console/Kconfig | 9 +++++++ src/console/Makefile.inc | 4 +++ src/console/hw-debug_sink.adb | 59 +++++++++++++++++++++++++++++++++++++++++++ src/console/hw-debug_sink.ads | 24 ++++++++++++++++++ 4 files changed, 96 insertions(+) create mode 100644 src/console/hw-debug_sink.adb create mode 100644 src/console/hw-debug_sink.ads (limited to 'src/console') diff --git a/src/console/Kconfig b/src/console/Kconfig index 8f74613847..caf91ab252 100644 --- a/src/console/Kconfig +++ b/src/console/Kconfig @@ -399,4 +399,13 @@ config NO_EARLY_BOOTBLOCK_POSTCODES POST codes that go out before the chipset's bootblock initialization can happen. This option suppresses those POST codes. +config HWBASE_DEBUG_CB + bool + default y if DEFAULT_CONSOLE_LOGLEVEL_7 || DEFAULT_CONSOLE_LOGLEVEL_8 + default n + +config HWBASE_DEBUG_NULL + def_bool y + depends on !HWBASE_DEBUG_CB + endmenu diff --git a/src/console/Makefile.inc b/src/console/Makefile.inc index 059dea544c..aa0dbf5f72 100644 --- a/src/console/Makefile.inc +++ b/src/console/Makefile.inc @@ -2,6 +2,10 @@ ramstage-y += vtxprintf.c printk.c vsprintf.c ramstage-y += init.c console.c ramstage-y += post.c ramstage-y += die.c +ifeq ($(CONFIG_HWBASE_DEBUG_CB),y) +ramstage-$(CONFIG_RAMSTAGE_LIBHWBASE) += hw-debug_sink.ads +ramstage-$(CONFIG_RAMSTAGE_LIBHWBASE) += hw-debug_sink.adb +endif smm-$(CONFIG_DEBUG_SMI) += init.c console.c vtxprintf.c printk.c smm-$(CONFIG_SMM_TSEG) += die.c diff --git a/src/console/hw-debug_sink.adb b/src/console/hw-debug_sink.adb new file mode 100644 index 0000000000..5a165562dc --- /dev/null +++ b/src/console/hw-debug_sink.adb @@ -0,0 +1,59 @@ +-- +-- This file is part of the coreboot project. +-- +-- Copyright (C) 2015 secunet Security Networks AG +-- +-- 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. +-- + +with Interfaces.C; + +use type Interfaces.C.int; + +package body HW.Debug_Sink is + + Sink_Enabled : Boolean; + + procedure console_tx_byte (chr : Interfaces.C.char); + pragma Import (C, console_tx_byte, "console_tx_byte"); + + procedure Put (Item : String) is + begin + if Sink_Enabled then + for Idx in Item'Range loop + console_tx_byte (Interfaces.C.To_C (Item (Idx))); + end loop; + end if; + end Put; + + procedure Put_Char (Item : Character) is + begin + if Sink_Enabled then + console_tx_byte (Interfaces.C.To_C (Item)); + end if; + end Put_Char; + + procedure New_Line is + begin + Put_Char (Character'Val (16#0a#)); + end New_Line; + + ---------------------------------------------------------------------------- + + function console_log_level + (msg_level : Interfaces.C.int) + return Interfaces.C.int; + pragma Import (C, console_log_level, "console_log_level"); + + Msg_Level_BIOS_DEBUG : constant := 7; + +begin + Sink_Enabled := console_log_level (Msg_Level_BIOS_DEBUG) /= 0; +end HW.Debug_Sink; diff --git a/src/console/hw-debug_sink.ads b/src/console/hw-debug_sink.ads new file mode 100644 index 0000000000..322249e1cb --- /dev/null +++ b/src/console/hw-debug_sink.ads @@ -0,0 +1,24 @@ +-- +-- This file is part of the coreboot project. +-- +-- Copyright (C) 2015 secunet Security Networks AG +-- +-- 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. +-- + +package HW.Debug_Sink is + + procedure Put (Item : String); + + procedure Put_Char (Item : Character); + + procedure New_Line; + +end HW.Debug_Sink; -- cgit v1.2.3