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

Make CBFS output more consistent 

- Prefix all CBFS output messages with CBFS:
- Add an option DEBUG_CBFS that is off by default. Without DEBUG_CBFS
  enabled, the code will no longer print all the files it walks for
  every file lookup.
- Add DEBUG() macro next to LOG() and ERROR() to specify which messages
  should only be visible with DEBUG_CBFS printed.
- Actually print a message when the file we're looking for was found. :)

old:
Searching for fallback/coreboot_ram
Check cmos_layout.bin
Check pci8086,0106.rom
Check fallback/romstage
Check fallback/coreboot_ram

Change-Id: I2d731fae17a5f6ca51d435cfb7a58d6e017efa24
Stage: loading fallback/coreboot_ram @ 0x100000 (540672 bytes), entry @ 0x100000
Stage: done loading.
new:
CBFS: Looking for 'fallback/coreboot_ram'
CBFS: found.
CBFS: loading stage fallback/coreboot_ram @ 0x100000 (507904 bytes), entry @ 0x100000
CBFS: stage loaded.
Signed-off-by: Stefan Reinauer <reinauer@google.com>
Reviewed-on: http://review.coreboot.org/993
Tested-by: build bot (Jenkins)
Reviewed-by: Ronald G. Minnich <rminnich@gmail.com>
This commit is contained in:
Stefan Reinauer 2012-05-02 16:33:18 -07:00 committed by Patrick Georgi
parent 872eb79393
commit fe4221848f
3 changed files with 24 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/Kconfig
View File

@ -664,6 +664,13 @@ config GDB_STUB
If enabled, you will be able to set breakpoints for gdb debugging.
See src/arch/x86/lib/c_start.S for details.
config DEBUG_CBFS
bool "Output verbose CBFS debug messages"
default n
depends on TPM
help
This option enables additional CBFS related debug messages.
config HAVE_DEBUG_RAM_SETUP
def_bool n

17
src/lib/cbfs.c
View File

@ -30,8 +30,13 @@
#endif
#define phys_to_virt(x) (void*)(x)
#define virt_to_phys(x) (uint32_t)(x)
#define ERROR(x...) printk(BIOS_ERR, x)
#define LOG(x...) printk(BIOS_INFO, x)
#define ERROR(x...) printk(BIOS_ERR, "CBFS: " x)
#define LOG(x...) printk(BIOS_INFO, "CBFS: " x)
#if CONFIG_DEBUG_CBFS
#define DEBUG(x...) printk(BIOS_SPEW, "CBFS: " x)
#else
#define DEBUG(x...)
#endif
// FIXME: romstart/romend are fine on x86, but not on ARM
#define romstart() 0xffffffff
#define romend() 0
@ -100,7 +105,7 @@ void * cbfs_load_stage(const char *name)
if (stage == NULL)
return (void *) -1;
printk(BIOS_INFO, "Stage: loading %s @ 0x%x (%d bytes), entry @ 0x%llx\n",
LOG("loading stage %s @ 0x%x (%d bytes), entry @ 0x%llx\n",
name,
(u32) stage->load, stage->memlen,
stage->entry);
@ -113,7 +118,7 @@ void * cbfs_load_stage(const char *name)
stage->len))
return (void *) -1;
printk(BIOS_DEBUG, "Stage: done loading.\n");
DEBUG("stage loaded.\n");
entry = stage->entry;
// entry = ntohll(stage->entry);
@ -130,13 +135,13 @@ int cbfs_execute_stage(const char *name)
return 1;
if (ntohl(stage->compression) != CBFS_COMPRESS_NONE) {
printk(BIOS_INFO, "CBFS: Unable to run %s: Compressed file"
LOG("Unable to run %s: Compressed file"
"Not supported for in-place execution\n", name);
return 1;
}
/* FIXME: This isn't right */
printk(BIOS_INFO, "CBFS: run @ %p\n", (void *) ntohl((u32) stage->entry));
LOG("run @ %p\n", (void *) ntohl((u32) stage->entry));
return run_address((void *) (intptr_t)ntohll(stage->entry));
}

8
src/lib/cbfs_core.c
View File

@ -40,6 +40,9 @@
* print an error message x (in printf format)
*
* LOG(x...)
* print a message x (in printf format)
*
* DEBUG(x...)
* print a debug message x (in printf format)
*
* romstart()
@ -86,7 +89,7 @@ struct cbfs_file *cbfs_find(const char *name)
struct cbfs_header *header = get_cbfs_header();
if (header == (void*)0xffffffff) return NULL;
LOG("Searching for %s\n", name);
LOG("Looking for '%s'\n", name);
void *data, *dataend, *origdata;
/* find first entry */
@ -111,8 +114,9 @@ struct cbfs_file *cbfs_find(const char *name)
data = phys_to_virt(CBFS_ALIGN_UP(virt_to_phys(data), align));
continue;
}
LOG("Check %s\n", CBFS_NAME(file));
DEBUG("Check '%s'\n", CBFS_NAME(file));
if (strcmp(CBFS_NAME(file), name) == 0) {
LOG("found.\n");
return file;
}
void *olddata = data;