Lee Leahy (leroy.p.leahy@intel.com) just uploaded a new patch set to gerrit, which you can find at https://review.coreboot.org/16003
-gerrit
commit 9e2d40864f6fad1a151f8679416688d135b9231d Author: Lee Leahy leroy.p.leahy@intel.com Date: Sun Jul 31 16:49:28 2016 -0700
drivers/intel/fsp2_0: Update the debug levels
Choose appropriate debug levels for the various messages in the FSP driver. Change:
* BIOS_DEBUG --> BIOS_SPEW: Normal FSP driver output level, allows builder to disable FSP driver output by selecting CONFIG_DEFAULT_CONSOLE_LOGLEVEL_7
* BIOS_ERROR --> BIOS_CRIT: These errors will prevent coreboot and the payload from successfully booting
TEST=Build and run on Galileo Gen2
Change-Id: Ic3352de2022e16482bf47fc953aedeef8f0c2880 Signed-off-by: Lee Leahy leroy.p.leahy@intel.com --- src/drivers/intel/fsp2_0/hand_off_block.c | 10 +++++----- src/drivers/intel/fsp2_0/memory_init.c | 6 +++--- src/drivers/intel/fsp2_0/util.c | 6 +++--- 3 files changed, 11 insertions(+), 11 deletions(-)
diff --git a/src/drivers/intel/fsp2_0/hand_off_block.c b/src/drivers/intel/fsp2_0/hand_off_block.c index 9693cd2..9ecf702 100644 --- a/src/drivers/intel/fsp2_0/hand_off_block.c +++ b/src/drivers/intel/fsp2_0/hand_off_block.c @@ -223,7 +223,7 @@ void fsp_print_guid(const void *base) mid[0] = read16(id + 4); mid[1] = read16(id + 6);
- printk(BIOS_DEBUG, "%08x-%04x-%04x-%02x%02x%02x%02x%02x%02x%02x%02x", + printk(BIOS_SPEW, "%08x-%04x-%04x-%02x%02x%02x%02x%02x%02x%02x%02x", big, mid[0], mid[1], id[8], id[9], id[10], id[11], id[12], id[13], id[14], id[15]); } @@ -234,13 +234,13 @@ void fsp_print_resource_descriptor(const void *base)
res = fsp_hob_header_to_resource(base);
- printk(BIOS_DEBUG, "Resource %s, attribute %x\n", + printk(BIOS_SPEW, "Resource %s, attribute %x\n", resource_name(res->type), res->attribute_type); - printk(BIOS_DEBUG, "\t0x%08llx + 0x%08llx\n", res->addr, res->length); + printk(BIOS_SPEW, "\t0x%08llx + 0x%08llx\n", res->addr, res->length); if (!fsp_uuid_compare(res->owner_guid, empty_uuid)) { - printk(BIOS_DEBUG, "\tOwner GUID: "); + printk(BIOS_SPEW, "\tOwner GUID: "); fsp_print_guid(res->owner_guid); - printk(BIOS_DEBUG, " (%s)\n", uuid_name(res->owner_guid)); + printk(BIOS_SPEW, " (%s)\n", uuid_name(res->owner_guid)); } }
diff --git a/src/drivers/intel/fsp2_0/memory_init.c b/src/drivers/intel/fsp2_0/memory_init.c index 0677e74..9041cbf 100644 --- a/src/drivers/intel/fsp2_0/memory_init.c +++ b/src/drivers/intel/fsp2_0/memory_init.c @@ -144,7 +144,7 @@ static enum cb_err check_region_overlap(const struct memranges *ranges, continue; if (begin >= range_entry_end(r)) continue; - printk(BIOS_ERR, "'%s' overlaps currently running program: " + printk(BIOS_CRIT, "'%s' overlaps currently running program: " "[%p, %p)\n", description, (void *)begin, (void *)end); return CB_ERR; } @@ -270,7 +270,7 @@ static enum cb_err load_fspm_xip(struct fsp_header *hdr,
base = rdev_mmap_full(rdev); if ((uintptr_t)base != hdr->image_base) { - printk(BIOS_ERR, "FSPM XIP base does not match: %p vs %p\n", + printk(BIOS_CRIT, "FSPM XIP base does not match: %p vs %p\n", (void *)(uintptr_t)hdr->image_base, base); return CB_ERR; } @@ -293,7 +293,7 @@ void fsp_memory_init(bool s3wake) struct range_entry freeranges[2];
if (cbfs_boot_locate(&file_desc, name, NULL)) { - printk(BIOS_ERR, "Could not locate %s in CBFS\n", name); + printk(BIOS_CRIT, "Could not locate %s in CBFS\n", name); die("FSPM not available!\n"); }
diff --git a/src/drivers/intel/fsp2_0/util.c b/src/drivers/intel/fsp2_0/util.c index 7f064a5..b31e571 100644 --- a/src/drivers/intel/fsp2_0/util.c +++ b/src/drivers/intel/fsp2_0/util.c @@ -68,13 +68,13 @@ enum cb_err fsp_validate_component(struct fsp_header *hdr, membase = rdev_mmap(rdev, FSP_HDR_OFFSET, FSP_HDR_LEN);
if (membase == NULL) { - printk(BIOS_ERR, "Could not mmap() FSP header.\n"); + printk(BIOS_CRIT, "Could not mmap() FSP header.\n"); return CB_ERR; }
if (fsp_identify(hdr, membase) != CB_SUCCESS) { rdev_munmap(rdev, membase); - printk(BIOS_ERR, "No valid FSP header\n"); + printk(BIOS_CRIT, "No valid FSP header\n"); return CB_ERR; }
@@ -84,7 +84,7 @@ enum cb_err fsp_validate_component(struct fsp_header *hdr,
/* Check if size specified in the header matches the cbfs file size */ if (region_device_sz(rdev) < hdr->image_size) { - printk(BIOS_ERR, "Component size bigger than cbfs file.\n"); + printk(BIOS_CRIT, "Component size bigger than cbfs file.\n"); return CB_ERR; }