Kyösti Mälkki has uploaded this change for review.
lib/trace: Remove TRACE support
Looks like the option is generally not compatible with
garbage collections. Nothing is inlined, is_smp_boot()
no longer evaluates to constant false and thus the symbols
from secondary.S would need to be present for the build
to pass after we set SMP=n.
Change-Id: I0b6f310e15e6f4992cd054d288903fea8390e5cf
Signed-off-by: Kyösti Mälkki <kyosti.malkki@gmail.com>
---
M Makefile.inc
M src/Kconfig
M src/console/printk.c
M src/console/vsprintf.c
M src/drivers/uart/uart8250io.c
D src/include/trace.h
M src/lib/Makefile.inc
D src/lib/trace.c
8 files changed, 0 insertions(+), 75 deletions(-)
git pull ssh://review.coreboot.org:29418/coreboot refs/changes/57/45757/1
diff --git a/Makefile.inc b/Makefile.inc
index a43de5e..d2138a0 100644
--- a/Makefile.inc
+++ b/Makefile.inc
@@ -181,9 +181,6 @@
bootblock-generic-ccopts += -D__BOOTBLOCK__
romstage-generic-ccopts += -D__ROMSTAGE__
ramstage-generic-ccopts += -D__RAMSTAGE__
-ifeq ($(CONFIG_TRACE),y)
-ramstage-c-ccopts += -finstrument-functions
-endif
ifeq ($(CONFIG_COVERAGE),y)
ramstage-c-ccopts += -fprofile-arcs -ftest-coverage
endif
diff --git a/src/Kconfig b/src/Kconfig
index e46a6e6..45d23ae 100644
--- a/src/Kconfig
+++ b/src/Kconfig
@@ -1092,16 +1092,6 @@
is present on Intel 6-series chipsets.
endif
-config TRACE
- bool "Trace function calls"
- default n
- help
- If enabled, every function will print information to console once
- the function is entered. The syntax is ~0xaaaabbbb(0xccccdddd)
- the 0xaaaabbbb is the actual function and 0xccccdddd is EIP
- of calling function. Please note some printk related functions
- are omitted from trace to have good looking console dumps.
-
config DEBUG_COVERAGE
bool "Debug code coverage"
default n
diff --git a/src/console/printk.c b/src/console/printk.c
index 4a3de47..85d9bfb 100644
--- a/src/console/printk.c
+++ b/src/console/printk.c
@@ -10,7 +10,6 @@
#include <console/vtxprintf.h>
#include <smp/spinlock.h>
#include <smp/node.h>
-#include <trace.h>
#include <timer.h>
DECLARE_SPIN_LOCK(console_lock)
@@ -81,7 +80,6 @@
if (log_this < CONSOLE_LOG_FAST)
return 0;
- DISABLE_TRACE;
spin_lock(&console_lock);
console_time_run();
@@ -96,7 +94,6 @@
console_time_stop();
spin_unlock(&console_lock);
- ENABLE_TRACE;
return i;
}
diff --git a/src/console/vsprintf.c b/src/console/vsprintf.c
index d0c569b..06b9e49 100644
--- a/src/console/vsprintf.c
+++ b/src/console/vsprintf.c
@@ -2,7 +2,6 @@
#include <console/vtxprintf.h>
#include <string.h>
-#include <trace.h>
struct vsnprintf_context {
char *str_buf;
@@ -24,16 +23,12 @@
int i;
struct vsnprintf_context ctx;
- DISABLE_TRACE;
-
ctx.str_buf = buf;
ctx.buf_limit = size ? size - 1 : 0;
i = vtxprintf(str_tx_byte, fmt, args, &ctx);
if (size)
*ctx.str_buf = '\0';
- ENABLE_TRACE;
-
return i;
}
diff --git a/src/drivers/uart/uart8250io.c b/src/drivers/uart/uart8250io.c
index d0841de..aa8c969 100644
--- a/src/drivers/uart/uart8250io.c
+++ b/src/drivers/uart/uart8250io.c
@@ -3,7 +3,6 @@
#include <arch/io.h>
#include <boot/coreboot_tables.h>
#include <console/uart.h>
-#include <trace.h>
#include "uart8250reg.h"
/* Should support 8250, 16450, 16550, 16550A type UARTs */
@@ -54,7 +53,6 @@
static void uart8250_init(unsigned int base_port, unsigned int divisor)
{
- DISABLE_TRACE;
/* Disable interrupts */
outb(0x0, base_port + UART8250_IER);
/* Enable FIFOs */
@@ -72,7 +70,6 @@
/* Set to 3 for 8N1 */
outb(CONFIG_TTYS0_LCS, base_port + UART8250_LCR);
- ENABLE_TRACE;
}
static const unsigned int bases[] = { 0x3f8, 0x2f8, 0x3e8, 0x2e8 };
diff --git a/src/include/trace.h b/src/include/trace.h
deleted file mode 100644
index ece1b21..0000000
--- a/src/include/trace.h
+++ /dev/null
@@ -1,28 +0,0 @@
-/* SPDX-License-Identifier: GPL-2.0-only */
-
-#ifndef __TRACE_H
-#define __TRACE_H
-
-#if !ENV_ROMSTAGE_OR_BEFORE && CONFIG(TRACE)
-
-void __cyg_profile_func_enter(void *, void *)
- __attribute__((no_instrument_function));
-
-void __cyg_profile_func_exit(void *, void *)
- __attribute__((no_instrument_function));
-
-extern volatile int trace_dis;
-
-#define DISABLE_TRACE do { trace_dis = 1; } while (0);
-#define ENABLE_TRACE do { trace_dis = 0; } while (0);
-#define DISABLE_TRACE_ON_FUNCTION __attribute__((no_instrument_function));
-
-#else /* !CONFIG_TRACE */
-
-#define DISABLE_TRACE
-#define ENABLE_TRACE
-#define DISABLE_TRACE_ON_FUNCTION
-
-#endif
-
-#endif
diff --git a/src/lib/Makefile.inc b/src/lib/Makefile.inc
index 73077f7..f1653a1 100644
--- a/src/lib/Makefile.inc
+++ b/src/lib/Makefile.inc
@@ -139,8 +139,6 @@
ramstage-$(CONFIG_CONSOLE_CBMEM) += cbmem_console.c
ramstage-$(CONFIG_BOOTSPLASH) += bootsplash.c
ramstage-$(CONFIG_BOOTSPLASH) += jpeg.c
-ramstage-$(CONFIG_TRACE) += trace.c
-postcar-$(CONFIG_TRACE) += trace.c
ramstage-$(CONFIG_COLLECT_TIMESTAMPS) += timestamp.c
ramstage-$(CONFIG_COVERAGE) += libgcov.c
ramstage-y += edid.c
diff --git a/src/lib/trace.c b/src/lib/trace.c
deleted file mode 100644
index a3db40b..0000000
--- a/src/lib/trace.c
+++ /dev/null
@@ -1,21 +0,0 @@
-/* SPDX-License-Identifier: GPL-2.0-only */
-
-#include <console/console.h>
-#include <trace.h>
-
-int volatile trace_dis = 0;
-
-void __cyg_profile_func_enter(void *func, void *callsite)
-{
-
- if (trace_dis)
- return;
-
- DISABLE_TRACE
- printk(BIOS_INFO, "~%p(%p)\n", func, callsite);
- ENABLE_TRACE
-}
-
-void __cyg_profile_func_exit(void *func, void *callsite)
-{
-}
To view, visit change 45757. To unsubscribe, or for help writing mail filters, visit settings.