summaryrefslogtreecommitdiff
path: root/src/lib
diff options
context:
space:
mode:
authorAaron Durbin <adurbin@chromium.org>2013-04-24 16:28:52 -0500
committerRonald G. Minnich <rminnich@gmail.com>2013-05-01 07:08:44 +0200
commit4dd87fb2d852a61fd1677dd81e0a5573e9023eb1 (patch)
tree4e4a4b43c4b9081dbd4ce4ab1196a1927535beeb /src/lib
parent0a6c20a2a3bc16aa12b04dd3db1d1260777edf0e (diff)
coverage: use boot state callbacks
Utilize the static boot state callback scheduling to initialize and tear down the coverage infrastructure at the appropriate points. The coverage initialization is performed at BS_PRE_DEVICE which is the earliest point a callback can be called. The tear down occurs at the 2 exit points of ramstage: OS resume and payload boot. Change-Id: Ie5ee51268e1f473f98fa517710a266e38dc01b6d Signed-off-by: Aaron Durbin <adurbin@chromium.org> Reviewed-on: http://review.coreboot.org/3135 Tested-by: build bot (Jenkins) Reviewed-by: Ronald G. Minnich <rminnich@gmail.com>
Diffstat (limited to 'src/lib')
-rw-r--r--src/lib/gcov-glue.c12
-rw-r--r--src/lib/hardwaremain.c5
-rw-r--r--src/lib/selfboot.c4
3 files changed, 8 insertions, 13 deletions
diff --git a/src/lib/gcov-glue.c b/src/lib/gcov-glue.c
index 4e2b2908b3..ab9062b497 100644
--- a/src/lib/gcov-glue.c
+++ b/src/lib/gcov-glue.c
@@ -18,8 +18,8 @@
*/
#include <stdint.h>
+#include <bootstate.h>
#include <cbmem.h>
-#include <coverage.h>
typedef struct file {
uint32_t magic;
@@ -128,7 +128,7 @@ static void setbuf(FILE *stream, char *buf)
gcc_assert(buf == 0);
}
-void coverage_init(void)
+static void coverage_init(void *unused)
{
extern long __CTOR_LIST__;
typedef void (*func_ptr)(void) ;
@@ -142,7 +142,7 @@ void coverage_init(void)
}
void __gcov_flush(void);
-void coverage_exit(void)
+static void coverage_exit(void *unused)
{
#if CONFIG_DEBUG_COVERAGE
printk(BIOS_DEBUG, "Syncing coverage data.\n");
@@ -150,4 +150,8 @@ void coverage_exit(void)
__gcov_flush();
}
-
+BOOT_STATE_INIT_ENTRIES(gcov_bscb) = {
+ BOOT_STATE_INIT_ENTRY(BS_PRE_DEVICE, BS_ON_ENTRY, coverage_init, NULL),
+ BOOT_STATE_INIT_ENTRY(BS_OS_RESUME, BS_ON_ENTRY, coverage_exit, NULL),
+ BOOT_STATE_INIT_ENTRY(BS_PAYLOAD_LOAD, BS_ON_EXIT, coverage_exit, NULL),
+};
diff --git a/src/lib/hardwaremain.c b/src/lib/hardwaremain.c
index d8b9d433f6..e4b2659515 100644
--- a/src/lib/hardwaremain.c
+++ b/src/lib/hardwaremain.c
@@ -38,7 +38,6 @@
#include <arch/acpi.h>
#endif
#include <cbmem.h>
-#include <coverage.h>
#include <timestamp.h>
#if BOOT_STATE_DEBUG
@@ -331,10 +330,6 @@ void hardwaremain(int boot_complete)
timestamp_stash(TS_START_RAMSTAGE);
post_code(POST_ENTRY_RAMSTAGE);
-#if CONFIG_COVERAGE
- coverage_init();
-#endif
-
/* console_init() MUST PRECEDE ALL printk()! */
console_init();
diff --git a/src/lib/selfboot.c b/src/lib/selfboot.c
index be03b853a6..934c13196c 100644
--- a/src/lib/selfboot.c
+++ b/src/lib/selfboot.c
@@ -33,7 +33,6 @@
#if CONFIG_COLLECT_TIMESTAMPS
#include <timestamp.h>
#endif
-#include <coverage.h>
/* Maximum physical address we can use for the coreboot bounce buffer. */
#ifndef MAX_ADDR
@@ -537,9 +536,6 @@ int selfboot(struct lb_memory *mem, struct cbfs_payload *payload)
#if CONFIG_COLLECT_TIMESTAMPS
timestamp_add_now(TS_SELFBOOT_JUMP);
#endif
-#if CONFIG_COVERAGE
- coverage_exit();
-#endif
/* Tear down the caching of the ROM. */
if (disable_cache_rom)