treewide: Remove "ERROR: "/"WARN: " prefixes from log messages
Now that the console system itself will clearly differentiate loglevels,
it is no longer necessary to explicitly add "ERROR: " in front of every
BIOS_ERR message to help it stand out more (and allow automated tooling
to grep for it). Removing all these extra .rodata characters should save
us a nice little amount of binary size.
This patch was created by running
find src/ -type f -exec perl -0777 -pi -e 's/printk\(\s*BIOS_ERR,\s*"ERROR: /printk\(BIOS_ERR, "/gi' '{}' ';'
and doing some cursory review/cleanup on the result. Then doing the same
thing for BIOS_WARN with
's/printk\(\s*BIOS_WARNING,\s*"WARN(ING)?: /printk\(BIOS_WARNING, "/gi'
Signed-off-by: Julius Werner <jwerner@chromium.org>
Change-Id: I3d0573acb23d2df53db6813cb1a5fc31b5357db8
Reviewed-on: https://review.coreboot.org/c/coreboot/+/61309
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Reviewed-by: HAOUAS Elyes <ehaouas@noos.fr>
Reviewed-by: Lance Zhao
Reviewed-by: Jason Glenesk <jason.glenesk@gmail.com>
diff --git a/src/soc/amd/common/block/lpc/espi_util.c b/src/soc/amd/common/block/lpc/espi_util.c
index ae742c5..c1d0a57 100644
--- a/src/soc/amd/common/block/lpc/espi_util.c
+++ b/src/soc/amd/common/block/lpc/espi_util.c
@@ -187,7 +187,7 @@
if (idx == -1) {
printk(BIOS_ERR, "Cannot open IO window base %x size %zx\n", base,
size);
- printk(BIOS_ERR, "ERROR: No more available IO windows!\n");
+ printk(BIOS_ERR, "No more available IO windows!\n");
return CB_ERR;
}
@@ -279,7 +279,7 @@
if (idx == -1) {
printk(BIOS_ERR, "Cannot open IO window base %x size %zx\n", base,
size);
- printk(BIOS_ERR, "ERROR: No more available MMIO windows!\n");
+ printk(BIOS_ERR, "No more available MMIO windows!\n");
return CB_ERR;
}
@@ -418,7 +418,7 @@
return CB_SUCCESS;
} while (!stopwatch_expired(&sw));
- printk(BIOS_ERR, "Error: eSPI timed out waiting for status update.\n");
+ printk(BIOS_ERR, "eSPI timed out waiting for status update.\n");
return CB_ERR;
}
@@ -609,7 +609,7 @@
*ctrlr_config |= ESPI_IO_MODE_QUAD;
break;
}
- printk(BIOS_ERR, "Error: eSPI Quad I/O not supported. Dropping to dual mode.\n");
+ printk(BIOS_ERR, "eSPI Quad I/O not supported. Dropping to dual mode.\n");
/* Intentional fall-through */
case ESPI_IO_MODE_DUAL:
if (espi_slave_supports_dual_io(slave_caps)) {
@@ -617,8 +617,7 @@
*ctrlr_config |= ESPI_IO_MODE_DUAL;
break;
}
- printk(BIOS_ERR,
- "Error: eSPI Dual I/O not supported. Dropping to single mode.\n");
+ printk(BIOS_ERR, "eSPI Dual I/O not supported. Dropping to single mode.\n");
/* Intentional fall-through */
case ESPI_IO_MODE_SINGLE:
/* Single I/O mode is always supported. */
@@ -642,7 +641,7 @@
*ctrlr_config |= ESPI_OP_FREQ_66_MHZ;
break;
}
- printk(BIOS_ERR, "Error: eSPI 66MHz not supported. Dropping to 33MHz.\n");
+ printk(BIOS_ERR, "eSPI 66MHz not supported. Dropping to 33MHz.\n");
/* Intentional fall-through */
case ESPI_OP_FREQ_33_MHZ:
if (slave_max_speed_mhz >= 33) {
@@ -650,7 +649,7 @@
*ctrlr_config |= ESPI_OP_FREQ_33_MHZ;
break;
}
- printk(BIOS_ERR, "Error: eSPI 33MHz not supported. Dropping to 16MHz.\n");
+ printk(BIOS_ERR, "eSPI 33MHz not supported. Dropping to 16MHz.\n");
/* Intentional fall-through */
case ESPI_OP_FREQ_16_MHZ:
/*
@@ -732,7 +731,7 @@
return CB_SUCCESS;
} while (!stopwatch_expired(&sw));
- printk(BIOS_ERR, "Error: Channel is not ready after %d usec (slave addr: 0x%x)\n",
+ printk(BIOS_ERR, "Channel is not ready after %d usec (slave addr: 0x%x)\n",
ESPI_CH_READY_TIMEOUT_US, slave_reg_addr);
return CB_ERR;
@@ -777,7 +776,7 @@
return CB_SUCCESS;
if (!espi_slave_supports_vw_channel(slave_caps)) {
- printk(BIOS_ERR, "Error: eSPI slave doesn't support VW channel!\n");
+ printk(BIOS_ERR, "eSPI slave doesn't support VW channel!\n");
return CB_ERR;
}
@@ -812,7 +811,7 @@
*/
if (mb_cfg->periph_ch_en) {
if (!espi_slave_supports_periph_channel(slave_caps)) {
- printk(BIOS_ERR, "Error: eSPI slave doesn't support periph channel!\n");
+ printk(BIOS_ERR, "eSPI slave doesn't support periph channel!\n");
return CB_ERR;
}
slave_config |= slave_en_mask;
@@ -834,7 +833,7 @@
return CB_SUCCESS;
if (!espi_slave_supports_oob_channel(slave_caps)) {
- printk(BIOS_ERR, "Error: eSPI slave doesn't support OOB channel!\n");
+ printk(BIOS_ERR, "eSPI slave doesn't support OOB channel!\n");
return CB_ERR;
}
@@ -856,7 +855,7 @@
return CB_SUCCESS;
if (!espi_slave_supports_flash_channel(slave_caps)) {
- printk(BIOS_ERR, "Error: eSPI slave doesn't support flash channel!\n");
+ printk(BIOS_ERR, "eSPI slave doesn't support flash channel!\n");
return CB_ERR;
}
@@ -928,7 +927,7 @@
* The resets affects both host and slave devices, so set initial config again.
*/
if (espi_send_reset() != CB_SUCCESS) {
- printk(BIOS_ERR, "Error: In-band reset failed!\n");
+ printk(BIOS_ERR, "In-band reset failed!\n");
return CB_ERR;
}
espi_set_initial_config(cfg);
@@ -938,7 +937,7 @@
* Get configuration of slave device.
*/
if (espi_get_general_configuration(&slave_caps) != CB_SUCCESS) {
- printk(BIOS_ERR, "Error: Slave GET_CONFIGURATION failed!\n");
+ printk(BIOS_ERR, "Slave GET_CONFIGURATION failed!\n");
return CB_ERR;
}
@@ -948,7 +947,7 @@
* Step 5: Set host slave config
*/
if (espi_set_general_configuration(cfg, slave_caps) != CB_SUCCESS) {
- printk(BIOS_ERR, "Error: Slave SET_CONFIGURATION failed!\n");
+ printk(BIOS_ERR, "Slave SET_CONFIGURATION failed!\n");
return CB_ERR;
}
@@ -964,39 +963,39 @@
*/
/* Set up VW first so we can deassert PLTRST#. */
if (espi_setup_vw_channel(cfg, slave_caps) != CB_SUCCESS) {
- printk(BIOS_ERR, "Error: Setup VW channel failed!\n");
+ printk(BIOS_ERR, "Setup VW channel failed!\n");
return CB_ERR;
}
/* Assert PLTRST# if VW channel is enabled by mainboard. */
if (espi_send_pltrst(cfg, true) != CB_SUCCESS) {
- printk(BIOS_ERR, "Error: PLTRST# assertion failed!\n");
+ printk(BIOS_ERR, "PLTRST# assertion failed!\n");
return CB_ERR;
}
/* De-assert PLTRST# if VW channel is enabled by mainboard. */
if (espi_send_pltrst(cfg, false) != CB_SUCCESS) {
- printk(BIOS_ERR, "Error: PLTRST# deassertion failed!\n");
+ printk(BIOS_ERR, "PLTRST# deassertion failed!\n");
return CB_ERR;
}
if (espi_setup_periph_channel(cfg, slave_caps) != CB_SUCCESS) {
- printk(BIOS_ERR, "Error: Setup Periph channel failed!\n");
+ printk(BIOS_ERR, "Setup Periph channel failed!\n");
return CB_ERR;
}
if (espi_setup_oob_channel(cfg, slave_caps) != CB_SUCCESS) {
- printk(BIOS_ERR, "Error: Setup OOB channel failed!\n");
+ printk(BIOS_ERR, "Setup OOB channel failed!\n");
return CB_ERR;
}
if (espi_setup_flash_channel(cfg, slave_caps) != CB_SUCCESS) {
- printk(BIOS_ERR, "Error: Setup Flash channel failed!\n");
+ printk(BIOS_ERR, "Setup Flash channel failed!\n");
return CB_ERR;
}
if (espi_configure_decodes(cfg) != CB_SUCCESS) {
- printk(BIOS_ERR, "Error: Configuring decodes failed!\n");
+ printk(BIOS_ERR, "Configuring decodes failed!\n");
return CB_ERR;
}