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

/: Remove "ERROR: "/"WARNING: " prefixes from log messages

Browse source 
It is no longer necessary to explicitly add "ERROR: "/"WARNING: " in
front of every BIOS_ERR/BIOS_WARN message.

Change-Id: I22ee6ae15c3d3a848853c5460b3b3c1795adf2f5
Signed-off-by: Elyes Haouas <ehaouas@noos.fr>
Reviewed-on: https://review.coreboot.org/c/coreboot/+/69405
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Reviewed-by: Fred Reitberger <reitbergerfred@gmail.com>
Reviewed-by: Eric Lai <eric_lai@quanta.corp-partner.google.com>
This commit is contained in:
Elyes Haouas 2022-11-09 15:05:23 +01:00 committed by Felix Held
parent 1d3c2e6572
commit aba1c945cd
16 changed files with 32 additions and 32 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/commonlib/fsp_relocate.c
View file

@ -259,10 +259,10 @@ static int pe_relocate(uintptr_t new_addr, void *pe, void *fsp, size_t fih_off)
write_le32(&pe_base[aoff], val + delta); write_le32(&pe_base[aoff], val + delta);
break; break;
case EFI_IMAGE_REL_BASED_DIR64: case EFI_IMAGE_REL_BASED_DIR64:
printk(BIOS_ERR, "Error: Unsupported DIR64\n"); printk(BIOS_ERR, "Unsupported DIR64\n");
break; break;
default: default:
printk(BIOS_ERR, "Error: Unsupported relocation type %d\n", printk(BIOS_ERR, "Unsupported relocation type %d\n",
rtype); rtype);
return -1; return -1;
} }

4
src/device/pci_device.c
View file

@ -408,7 +408,7 @@ static void configure_adjustable_base(const struct device *dev,
int max_requested_bits = __fls64(size_mask); int max_requested_bits = __fls64(size_mask);
if (max_requested_bits > CONFIG_PCIEXP_DEFAULT_MAX_RESIZABLE_BAR_BITS) { if (max_requested_bits > CONFIG_PCIEXP_DEFAULT_MAX_RESIZABLE_BAR_BITS) {
printk(BIOS_WARNING, "WARNING: Device %s requests a BAR with" printk(BIOS_WARNING, "Device %s requests a BAR with"
" %u bits of address space, which coreboot is not" " %u bits of address space, which coreboot is not"
" configured to hand out, truncating to %u bits\n", " configured to hand out, truncating to %u bits\n",
dev_path(dev), max_requested_bits, dev_path(dev), max_requested_bits,
@ -417,7 +417,7 @@ static void configure_adjustable_base(const struct device *dev,
} }
if (!(res->flags & IORESOURCE_PCI64) && max_requested_bits > 32) { if (!(res->flags & IORESOURCE_PCI64) && max_requested_bits > 32) {
printk(BIOS_ERR, "ERROR: Resizable BAR requested" printk(BIOS_ERR, "Resizable BAR requested"
" above 32 bits, but PCI function reported a" " above 32 bits, but PCI function reported a"
" 32-bit BAR."); " 32-bit BAR.");
return; return;

2
src/soc/amd/glinda/i2c.c
View file

@ -34,7 +34,7 @@ static struct soc_i2c_ctrlr_info i2c_ctrlr[I2C_CTRLR_COUNT] = {
void i2c_set_bar(unsigned int bus, uintptr_t bar) void i2c_set_bar(unsigned int bus, uintptr_t bar)
{ {
if (bus >= ARRAY_SIZE(i2c_ctrlr)) { if (bus >= ARRAY_SIZE(i2c_ctrlr)) {
printk(BIOS_ERR, "Error: i2c index out of bounds: %u.", bus); printk(BIOS_ERR, "i2c index out of bounds: %u.", bus);
return; return;
} }

6
src/soc/amd/glinda/psp_verstage/chipset.c
View file

@ -24,7 +24,7 @@ void update_psp_fw_hash_table(const char *fname)
uint32_t len; uint32_t len;
if (!spi_ptr) { if (!spi_ptr) {
printk(BIOS_ERR, "Error: AMD Firmware hash table %s not found\n", fname); printk(BIOS_ERR, "AMD Firmware hash table %s not found\n", fname);
/* /*
* If we don't supply hash table, the PSP will refuse to boot. * If we don't supply hash table, the PSP will refuse to boot.
* So returning here is safe to do. * So returning here is safe to do.
@ -36,7 +36,7 @@ void update_psp_fw_hash_table(const char *fname)
if (hash_table.no_of_entries_256 > MAX_NUM_HASH_ENTRIES || if (hash_table.no_of_entries_256 > MAX_NUM_HASH_ENTRIES ||
hash_table.no_of_entries_384 > MAX_NUM_HASH_ENTRIES) { hash_table.no_of_entries_384 > MAX_NUM_HASH_ENTRIES) {
printk(BIOS_ERR, "Error: Too many entries in AMD Firmware hash table" printk(BIOS_ERR, "Too many entries in AMD Firmware hash table"
" (SHA256:%d, SHA384:%d)\n", " (SHA256:%d, SHA384:%d)\n",
hash_table.no_of_entries_256, hash_table.no_of_entries_384); hash_table.no_of_entries_256, hash_table.no_of_entries_384);
return; return;
@ -44,7 +44,7 @@ void update_psp_fw_hash_table(const char *fname)
if (hash_table.no_of_entries_256 == 0 && if (hash_table.no_of_entries_256 == 0 &&
hash_table.no_of_entries_384 == 0) { hash_table.no_of_entries_384 == 0) {
printk(BIOS_ERR, "Error: No entries in AMD Firmware hash table" printk(BIOS_ERR, "No entries in AMD Firmware hash table"
" (SHA256:%d, SHA384:%d)\n", " (SHA256:%d, SHA384:%d)\n",
hash_table.no_of_entries_256, hash_table.no_of_entries_384); hash_table.no_of_entries_256, hash_table.no_of_entries_384);
return; return;

4
src/soc/amd/glinda/root_complex.c
View file

@ -158,7 +158,7 @@ static void read_resources(struct device *dev)
mmconf_resource(dev, idx++); mmconf_resource(dev, idx++);
if (!hob) { if (!hob) {
printk(BIOS_ERR, "Error: %s incomplete because no HOB list was found\n", printk(BIOS_ERR, "%s incomplete because no HOB list was found\n",
__func__); __func__);
return; return;
} }
@ -180,7 +180,7 @@ static void read_resources(struct device *dev)
else if (res->type == EFI_RESOURCE_MEMORY_RESERVED) else if (res->type == EFI_RESOURCE_MEMORY_RESERVED)
reserved_ram_resource_kb(dev, idx++, res->addr / KiB, res->length / KiB); reserved_ram_resource_kb(dev, idx++, res->addr / KiB, res->length / KiB);
else else
printk(BIOS_ERR, "Error: failed to set resources for type %d\n", printk(BIOS_ERR, "Failed to set resources for type %d\n",
res->type); res->type);
} }

2
src/soc/amd/glinda/smihandler.c
View file

@ -100,7 +100,7 @@ static void fch_slp_typ_handler(void)
psp_notify_sx_info(ACPI_S3); psp_notify_sx_info(ACPI_S3);
smu_sx_entry(); /* Leave SlpTypeEn clear, SMU will set */ smu_sx_entry(); /* Leave SlpTypeEn clear, SMU will set */
printk(BIOS_ERR, "Error: System did not go to sleep\n"); printk(BIOS_ERR, "System did not go to sleep\n");
hlt(); hlt();
} }
} }

2
src/soc/amd/mendocino/i2c.c
View file

@ -32,7 +32,7 @@ static struct soc_i2c_ctrlr_info i2c_ctrlr[I2C_CTRLR_COUNT] = {
void i2c_set_bar(unsigned int bus, uintptr_t bar) void i2c_set_bar(unsigned int bus, uintptr_t bar)
{ {
if (bus >= ARRAY_SIZE(i2c_ctrlr)) { if (bus >= ARRAY_SIZE(i2c_ctrlr)) {
printk(BIOS_ERR, "Error: i2c index out of bounds: %u.", bus); printk(BIOS_ERR, "i2c index out of bounds: %u.", bus);
return; return;
} }

6
src/soc/amd/mendocino/psp_verstage/chipset.c
View file

@ -24,7 +24,7 @@ void update_psp_fw_hash_table(const char *fname)
uint32_t len; uint32_t len;
if (!spi_ptr) { if (!spi_ptr) {
printk(BIOS_ERR, "Error: AMD Firmware hash table %s not found\n", fname); printk(BIOS_ERR, "AMD Firmware hash table %s not found\n", fname);
/* /*
* If we don't supply hash table, the PSP will refuse to boot. * If we don't supply hash table, the PSP will refuse to boot.
* So returning here is safe to do. * So returning here is safe to do.
@ -36,7 +36,7 @@ void update_psp_fw_hash_table(const char *fname)
if (hash_table.no_of_entries_256 > MAX_NUM_HASH_ENTRIES || if (hash_table.no_of_entries_256 > MAX_NUM_HASH_ENTRIES ||
hash_table.no_of_entries_384 > MAX_NUM_HASH_ENTRIES) { hash_table.no_of_entries_384 > MAX_NUM_HASH_ENTRIES) {
printk(BIOS_ERR, "Error: Too many entries in AMD Firmware hash table" printk(BIOS_ERR, "Too many entries in AMD Firmware hash table"
" (SHA256:%d, SHA384:%d)\n", " (SHA256:%d, SHA384:%d)\n",
hash_table.no_of_entries_256, hash_table.no_of_entries_384); hash_table.no_of_entries_256, hash_table.no_of_entries_384);
return; return;
@ -44,7 +44,7 @@ void update_psp_fw_hash_table(const char *fname)
if (hash_table.no_of_entries_256 == 0 && if (hash_table.no_of_entries_256 == 0 &&
hash_table.no_of_entries_384 == 0) { hash_table.no_of_entries_384 == 0) {
printk(BIOS_ERR, "Error: No entries in AMD Firmware hash table" printk(BIOS_ERR, "No entries in AMD Firmware hash table"
" (SHA256:%d, SHA384:%d)\n", " (SHA256:%d, SHA384:%d)\n",
hash_table.no_of_entries_256, hash_table.no_of_entries_384); hash_table.no_of_entries_256, hash_table.no_of_entries_384);
return; return;

4
src/soc/amd/mendocino/root_complex.c
View file

@ -158,7 +158,7 @@ static void read_resources(struct device *dev)
mmconf_resource(dev, idx++); mmconf_resource(dev, idx++);
if (!hob) { if (!hob) {
printk(BIOS_ERR, "Error: %s incomplete because no HOB list was found\n", printk(BIOS_ERR, "%s incomplete because no HOB list was found\n",
__func__); __func__);
return; return;
} }
@ -180,7 +180,7 @@ static void read_resources(struct device *dev)
else if (res->type == EFI_RESOURCE_MEMORY_RESERVED) else if (res->type == EFI_RESOURCE_MEMORY_RESERVED)
reserved_ram_resource_kb(dev, idx++, res->addr / KiB, res->length / KiB); reserved_ram_resource_kb(dev, idx++, res->addr / KiB, res->length / KiB);
else else
printk(BIOS_ERR, "Error: failed to set resources for type %d\n", printk(BIOS_ERR, "Failed to set resources for type %d\n",
res->type); res->type);
} }

2
src/soc/amd/mendocino/smihandler.c
View file

@ -100,7 +100,7 @@ static void fch_slp_typ_handler(void)
psp_notify_sx_info(ACPI_S3); psp_notify_sx_info(ACPI_S3);
smu_sx_entry(); /* Leave SlpTypeEn clear, SMU will set */ smu_sx_entry(); /* Leave SlpTypeEn clear, SMU will set */
printk(BIOS_ERR, "Error: System did not go to sleep\n"); printk(BIOS_ERR, "System did not go to sleep\n");
hlt(); hlt();
} }
} }

2
src/soc/amd/morgana/i2c.c
View file

@ -32,7 +32,7 @@ static struct soc_i2c_ctrlr_info i2c_ctrlr[I2C_CTRLR_COUNT] = {
void i2c_set_bar(unsigned int bus, uintptr_t bar) void i2c_set_bar(unsigned int bus, uintptr_t bar)
{ {
if (bus >= ARRAY_SIZE(i2c_ctrlr)) { if (bus >= ARRAY_SIZE(i2c_ctrlr)) {
printk(BIOS_ERR, "Error: i2c index out of bounds: %u.", bus); printk(BIOS_ERR, "i2c index out of bounds: %u.", bus);
return; return;
} }

6
src/soc/amd/morgana/psp_verstage/chipset.c
View file

@ -24,7 +24,7 @@ void update_psp_fw_hash_table(const char *fname)
uint32_t len; uint32_t len;
if (!spi_ptr) { if (!spi_ptr) {
printk(BIOS_ERR, "Error: AMD Firmware hash table %s not found\n", fname); printk(BIOS_ERR, "AMD Firmware hash table %s not found\n", fname);
/* /*
* If we don't supply hash table, the PSP will refuse to boot. * If we don't supply hash table, the PSP will refuse to boot.
* So returning here is safe to do. * So returning here is safe to do.
@ -36,7 +36,7 @@ void update_psp_fw_hash_table(const char *fname)
if (hash_table.no_of_entries_256 > MAX_NUM_HASH_ENTRIES || if (hash_table.no_of_entries_256 > MAX_NUM_HASH_ENTRIES ||
hash_table.no_of_entries_384 > MAX_NUM_HASH_ENTRIES) { hash_table.no_of_entries_384 > MAX_NUM_HASH_ENTRIES) {
printk(BIOS_ERR, "Error: Too many entries in AMD Firmware hash table" printk(BIOS_ERR, "Too many entries in AMD Firmware hash table"
" (SHA256:%d, SHA384:%d)\n", " (SHA256:%d, SHA384:%d)\n",
hash_table.no_of_entries_256, hash_table.no_of_entries_384); hash_table.no_of_entries_256, hash_table.no_of_entries_384);
return; return;
@ -44,7 +44,7 @@ void update_psp_fw_hash_table(const char *fname)
if (hash_table.no_of_entries_256 == 0 && if (hash_table.no_of_entries_256 == 0 &&
hash_table.no_of_entries_384 == 0) { hash_table.no_of_entries_384 == 0) {
printk(BIOS_ERR, "Error: No entries in AMD Firmware hash table" printk(BIOS_ERR, "No entries in AMD Firmware hash table"
" (SHA256:%d, SHA384:%d)\n", " (SHA256:%d, SHA384:%d)\n",
hash_table.no_of_entries_256, hash_table.no_of_entries_384); hash_table.no_of_entries_256, hash_table.no_of_entries_384);
return; return;

4
src/soc/amd/morgana/root_complex.c
View file

@ -158,7 +158,7 @@ static void read_resources(struct device *dev)
mmconf_resource(dev, idx++); mmconf_resource(dev, idx++);
if (!hob) { if (!hob) {
printk(BIOS_ERR, "Error: %s incomplete because no HOB list was found\n", printk(BIOS_ERR, "%s incomplete because no HOB list was found\n",
__func__); __func__);
return; return;
} }
@ -180,7 +180,7 @@ static void read_resources(struct device *dev)
else if (res->type == EFI_RESOURCE_MEMORY_RESERVED) else if (res->type == EFI_RESOURCE_MEMORY_RESERVED)
reserved_ram_resource_kb(dev, idx++, res->addr / KiB, res->length / KiB); reserved_ram_resource_kb(dev, idx++, res->addr / KiB, res->length / KiB);
else else
printk(BIOS_ERR, "Error: failed to set resources for type %d\n", printk(BIOS_ERR, "Failed to set resources for type %d\n",
res->type); res->type);
} }

2
src/soc/amd/morgana/smihandler.c
View file

@ -100,7 +100,7 @@ static void fch_slp_typ_handler(void)
psp_notify_sx_info(ACPI_S3); psp_notify_sx_info(ACPI_S3);
smu_sx_entry(); /* Leave SlpTypeEn clear, SMU will set */ smu_sx_entry(); /* Leave SlpTypeEn clear, SMU will set */
printk(BIOS_ERR, "Error: System did not go to sleep\n"); printk(BIOS_ERR, "System did not go to sleep\n");
hlt(); hlt();
} }
} }

8
src/soc/qualcomm/sc7280/display/edp_aux.c
View file

@ -32,13 +32,13 @@ static void edp_wait_for_aux_done(void)
u32 intr_status = 0; u32 intr_status = 0;
if (!wait_ms(100, read32(&edp_auxclk->status) & EDP_AUX_INTERRUPT)) { if (!wait_ms(100, read32(&edp_auxclk->status) & EDP_AUX_INTERRUPT)) {
printk(BIOS_ERR, "ERROR: AUX SEND not acknowledged\n"); printk(BIOS_ERR, "AUX SEND not acknowledged\n");
return; return;
} }
intr_status = read32(&edp_auxclk->status); intr_status = read32(&edp_auxclk->status);
if (!(intr_status & AUX_INTR_I2C_DONE)) { if (!(intr_status & AUX_INTR_I2C_DONE)) {
printk(BIOS_ERR, "ERROR: AUX command failed, status = %#x\n", intr_status); printk(BIOS_ERR, "AUX command failed, status = %#x\n", intr_status);
return; return;
} }
@ -176,7 +176,7 @@ int edp_read_edid(struct edid *out)
err = edp_aux_transfer(EDID_I2C_ADDR, DP_AUX_I2C_READ, edid, EDID_LENGTH); err = edp_aux_transfer(EDID_I2C_ADDR, DP_AUX_I2C_READ, edid, EDID_LENGTH);
if (err < EDID_LENGTH) { if (err < EDID_LENGTH) {
printk(BIOS_ERR, "ERROR: Failed to read EDID. :%d\n", err); printk(BIOS_ERR, "Failed to read EDID. :%d\n", err);
return err; return err;
} }
@ -196,7 +196,7 @@ int edp_read_edid(struct edid *out)
} }
if (decode_edid(edid, edid_size, out) != EDID_CONFORMANT) { if (decode_edid(edid, edid_size, out) != EDID_CONFORMANT) {
printk(BIOS_ERR, "ERROR: Failed to decode EDID.\n"); printk(BIOS_ERR, "Failed to decode EDID.\n");
return CB_ERR; return CB_ERR;
} }

6
src/soc/qualcomm/sc7280/display/edp_ctrl.c
View file

@ -1375,7 +1375,7 @@ static int edp_ctrl_on(struct edp_ctrl *ctrl, struct edid *edid, uint8_t *dpcd)
if (dpcd[DP_DPCD_REV] >= 0x11) { if (dpcd[DP_DPCD_REV] >= 0x11) {
ret = edp_aux_transfer(DP_SET_POWER, DP_AUX_NATIVE_READ, &value, 1); ret = edp_aux_transfer(DP_SET_POWER, DP_AUX_NATIVE_READ, &value, 1);
if (ret < 0) { if (ret < 0) {
printk(BIOS_ERR, "ERROR: edp native read failure\n"); printk(BIOS_ERR, "edp native read failure\n");
return -1; return -1;
} }
@ -1384,7 +1384,7 @@ static int edp_ctrl_on(struct edp_ctrl *ctrl, struct edid *edid, uint8_t *dpcd)
ret = edp_aux_transfer(DP_SET_POWER, DP_AUX_NATIVE_WRITE, &value, 1); ret = edp_aux_transfer(DP_SET_POWER, DP_AUX_NATIVE_WRITE, &value, 1);
if (ret < 0) { if (ret < 0) {
printk(BIOS_ERR, "ERROR: edp native read failure\n"); printk(BIOS_ERR, "edp native read failure\n");
return -1; return -1;
} }
@ -1401,7 +1401,7 @@ static int edp_ctrl_on(struct edp_ctrl *ctrl, struct edid *edid, uint8_t *dpcd)
/* Start link training */ /* Start link training */
ret = edp_ctrl_training(ctrl, edid, dpcd); ret = edp_ctrl_training(ctrl, edid, dpcd);
if (ret != EDP_TRAIN_SUCCESS) { if (ret != EDP_TRAIN_SUCCESS) {
printk(BIOS_ERR, "ERROR: edp training failure\n"); printk(BIOS_ERR, "edp training failure\n");
return -1; return -1;
} }