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/cezanne/data_fabric.c b/src/soc/amd/cezanne/data_fabric.c
index 2a13d20..97cff28 100644
--- a/src/soc/amd/cezanne/data_fabric.c
+++ b/src/soc/amd/cezanne/data_fabric.c
@@ -66,8 +66,7 @@
/* Although a pair could be freed later, this condition is
* very unusual and deserves analysis. Flag an error and
* leave the topmost part unconfigured. */
- printk(BIOS_ERR,
- "Error: Not enough NB MMIO routing registers\n");
+ printk(BIOS_ERR, "Not enough NB MMIO routing registers\n");
continue;
}
data_fabric_broadcast_write32(0, NB_MMIO_BASE(reg), np_top + 1);
@@ -85,7 +84,7 @@
reg = data_fabric_find_unused_mmio_reg();
if (reg < 0) {
- printk(BIOS_ERR, "Error: cannot configure region as NP\n");
+ printk(BIOS_ERR, "cannot configure region as NP\n");
return;
}
diff --git a/src/soc/amd/cezanne/i2c.c b/src/soc/amd/cezanne/i2c.c
index bf47b81..ae49a06 100644
--- a/src/soc/amd/cezanne/i2c.c
+++ b/src/soc/amd/cezanne/i2c.c
@@ -24,7 +24,7 @@
void i2c_set_bar(unsigned int bus, uintptr_t bar)
{
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;
}
diff --git a/src/soc/amd/cezanne/root_complex.c b/src/soc/amd/cezanne/root_complex.c
index f101680..dde59d4 100644
--- a/src/soc/amd/cezanne/root_complex.c
+++ b/src/soc/amd/cezanne/root_complex.c
@@ -141,7 +141,7 @@
mmconf_resource(dev, MMIO_CONF_BASE);
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__);
return;
}
@@ -163,7 +163,7 @@
else if (res->type == EFI_RESOURCE_MEMORY_RESERVED)
reserved_ram_resource(dev, idx++, res->addr / KiB, res->length / KiB);
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);
}
diff --git a/src/soc/amd/cezanne/smihandler.c b/src/soc/amd/cezanne/smihandler.c
index 2549ef8..509a1d4 100644
--- a/src/soc/amd/cezanne/smihandler.c
+++ b/src/soc/amd/cezanne/smihandler.c
@@ -121,7 +121,7 @@
psp_notify_sx_info(ACPI_S3);
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();
}
}
diff --git a/src/soc/amd/common/block/acpi/bert.c b/src/soc/amd/common/block/acpi/bert.c
index 968c9a6..f20a454 100644
--- a/src/soc/amd/common/block/acpi/bert.c
+++ b/src/soc/amd/common/block/acpi/bert.c
@@ -17,7 +17,7 @@
bert_errors_region(region, length);
if (!*region) {
- printk(BIOS_ERR, "Error: Can't find BERT storage area\n");
+ printk(BIOS_ERR, "Can't find BERT storage area\n");
return CB_ERR;
}
diff --git a/src/soc/amd/common/block/acpi/gpio.c b/src/soc/amd/common/block/acpi/gpio.c
index b5167b8..c4e3801 100644
--- a/src/soc/amd/common/block/acpi/gpio.c
+++ b/src/soc/amd/common/block/acpi/gpio.c
@@ -7,13 +7,13 @@
static int acpigen_soc_gpio_op(const char *op, unsigned int gpio_num)
{
if (gpio_num >= SOC_GPIO_TOTAL_PINS) {
- printk(BIOS_WARNING, "Warning: Pin %d should be smaller than"
+ printk(BIOS_WARNING, "Pin %d should be smaller than"
" %d\n", gpio_num, SOC_GPIO_TOTAL_PINS);
return -1;
}
if (SOC_GPIO_TOTAL_PINS >= AMD_GPIO_FIRST_REMOTE_GPIO_NUMBER &&
gpio_num >= SOC_GPIO_TOTAL_PINS) {
- printk(BIOS_WARNING, "Warning: Pin %d is a remote GPIO which isn't supported"
+ printk(BIOS_WARNING, "Pin %d is a remote GPIO which isn't supported"
" yet.\n", gpio_num);
return -1;
}
@@ -26,13 +26,13 @@
static int acpigen_soc_get_gpio_state(const char *op, unsigned int gpio_num)
{
if (gpio_num >= SOC_GPIO_TOTAL_PINS) {
- printk(BIOS_WARNING, "Warning: Pin %d should be smaller than"
+ printk(BIOS_WARNING, "Pin %d should be smaller than"
" %d\n", gpio_num, SOC_GPIO_TOTAL_PINS);
return -1;
}
if (SOC_GPIO_TOTAL_PINS >= AMD_GPIO_FIRST_REMOTE_GPIO_NUMBER &&
gpio_num >= SOC_GPIO_TOTAL_PINS) {
- printk(BIOS_WARNING, "Warning: Pin %d is a remote GPIO which isn't supported"
+ printk(BIOS_WARNING, "Pin %d is a remote GPIO which isn't supported"
" yet.\n", gpio_num);
return -1;
}
diff --git a/src/soc/amd/common/block/apob/apob_cache.c b/src/soc/amd/common/block/apob/apob_cache.c
index d538207..bdacd81 100644
--- a/src/soc/amd/common/block/apob/apob_cache.c
+++ b/src/soc/amd/common/block/apob/apob_cache.c
@@ -67,7 +67,7 @@
static int get_nv_rdev(struct region_device *r)
{
if (fmap_locate_area_as_rdev(DEFAULT_MRC_CACHE, r) < 0) {
- printk(BIOS_ERR, "Error: No APOB NV region is found in flash\n");
+ printk(BIOS_ERR, "No APOB NV region is found in flash\n");
return -1;
}
@@ -180,7 +180,7 @@
region_device_offset(&read_rdev), region_device_sz(&read_rdev));
if (fmap_locate_area_as_rdev_rw(DEFAULT_MRC_CACHE, &write_rdev) < 0) {
- printk(BIOS_ERR, "Error: No RW APOB NV region is found in flash\n");
+ printk(BIOS_ERR, "No RW APOB NV region is found in flash\n");
return;
}
@@ -188,14 +188,14 @@
/* write data to flash region */
if (rdev_eraseat(&write_rdev, 0, DEFAULT_MRC_CACHE_SIZE) < 0) {
- printk(BIOS_ERR, "Error: APOB flash region erase failed\n");
+ printk(BIOS_ERR, "APOB flash region erase failed\n");
return;
}
timestamp_add_now(TS_AMD_APOB_WRITE_START);
if (rdev_writeat(&write_rdev, apob_src_ram, 0, apob_src_ram->size) < 0) {
- printk(BIOS_ERR, "Error: APOB flash region update failed\n");
+ printk(BIOS_ERR, "APOB flash region update failed\n");
return;
}
diff --git a/src/soc/amd/common/block/cpu/mca/mca_bert.c b/src/soc/amd/common/block/cpu/mca/mca_bert.c
index 93d5749..5ec68e5 100644
--- a/src/soc/amd/common/block/cpu/mca/mca_bert.c
+++ b/src/soc/amd/common/block/cpu/mca/mca_bert.c
@@ -91,5 +91,5 @@
failed:
/* We're here because of a hardware error, don't break something else */
- printk(BIOS_ERR, "Error: Not enough room in BERT region for Machine Check error\n");
+ printk(BIOS_ERR, "Not enough room in BERT region for Machine Check error\n");
}
diff --git a/src/soc/amd/common/block/cpu/mca/mcax_bert.c b/src/soc/amd/common/block/cpu/mca/mcax_bert.c
index 8d864e8..af2bee4 100644
--- a/src/soc/amd/common/block/cpu/mca/mcax_bert.c
+++ b/src/soc/amd/common/block/cpu/mca/mcax_bert.c
@@ -91,5 +91,5 @@
failed:
/* We're here because of a hardware error, don't break something else */
- printk(BIOS_ERR, "Error: Not enough room in BERT region for Machine Check error\n");
+ printk(BIOS_ERR, "Not enough room in BERT region for Machine Check error\n");
}
diff --git a/src/soc/amd/common/block/cpu/noncar/memmap.c b/src/soc/amd/common/block/cpu/noncar/memmap.c
index 325e36b..8f37f1a 100644
--- a/src/soc/amd/common/block/cpu/noncar/memmap.c
+++ b/src/soc/amd/common/block/cpu/noncar/memmap.c
@@ -47,7 +47,7 @@
status = fsp_find_range_hob(&tseg, AMD_FSP_TSEG_HOB_GUID.b);
if (status < 0) {
- printk(BIOS_ERR, "Error: unable to find TSEG HOB\n");
+ printk(BIOS_ERR, "unable to find TSEG HOB\n");
return;
}
diff --git a/src/soc/amd/common/block/cpu/smm/smm_helper.c b/src/soc/amd/common/block/cpu/smm/smm_helper.c
index bf01b8b..ce80f16 100644
--- a/src/soc/amd/common/block/cpu/smm/smm_helper.c
+++ b/src/soc/amd/common/block/cpu/smm/smm_helper.c
@@ -19,7 +19,7 @@
if (!tvalid) /* not valid but locked means still accessible */
return;
- printk(BIOS_ERR, "Error: can't clear TValid, already locked\n");
+ printk(BIOS_ERR, "can't clear TValid, already locked\n");
return;
}
diff --git a/src/soc/amd/common/block/gpio/gpio.c b/src/soc/amd/common/block/gpio/gpio.c
index 163de2d..bc3bcab 100644
--- a/src/soc/amd/common/block/gpio/gpio.c
+++ b/src/soc/amd/common/block/gpio/gpio.c
@@ -85,7 +85,7 @@
uint8_t level;
if (!is_gpio_event_level_triggered(flags)) {
- printk(BIOS_ERR, "ERROR: %s - Only level trigger allowed for SMI!\n", __func__);
+ printk(BIOS_ERR, "%s - Only level trigger allowed for SMI!\n", __func__);
BUG();
return;
}
@@ -247,7 +247,7 @@
gevent_num = get_gpio_gevent(g->gpio, gev_tbl, gev_items);
if (gevent_num < 0) {
- printk(BIOS_WARNING, "Warning: GPIO pin %d has no associated gevent!\n",
+ printk(BIOS_WARNING, "GPIO pin %d has no associated gevent!\n",
g->gpio);
return;
}
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;
}
diff --git a/src/soc/amd/common/block/lpc/spi_dma.c b/src/soc/amd/common/block/lpc/spi_dma.c
index 2c183ee..97ba2be 100644
--- a/src/soc/amd/common/block/lpc/spi_dma.c
+++ b/src/soc/amd/common/block/lpc/spi_dma.c
@@ -147,8 +147,7 @@
thread_mutex_unlock(&spi_hw_mutex);
if (spi_dma_has_error()) {
- printk(BIOS_ERR,
- "ERROR: SPI DMA failure: dest: %p, source: %#zx, size: %zu\n",
+ printk(BIOS_ERR, "SPI DMA failure: dest: %p, source: %#zx, size: %zu\n",
transaction->destination, transaction->source,
transaction->transfer_size);
return false;
diff --git a/src/soc/amd/common/block/pci/amd_pci_util.c b/src/soc/amd/common/block/pci/amd_pci_util.c
index 9c80ef8..6c5565f 100644
--- a/src/soc/amd/common/block/pci/amd_pci_util.c
+++ b/src/soc/amd/common/block/pci/amd_pci_util.c
@@ -97,7 +97,7 @@
idx_name = sb_get_apic_reg_association(&limit);
if (pirq_data_ptr == NULL) {
- printk(BIOS_WARNING, "Warning: Can't write PCI IRQ assignments"
+ printk(BIOS_WARNING, "Can't write PCI IRQ assignments"
" because 'mainboard_pirq_data' structure does"
" not exist\n");
return;
diff --git a/src/soc/amd/common/block/pm/pmlib.c b/src/soc/amd/common/block/pm/pmlib.c
index f1b0b27..5ce6b7b 100644
--- a/src/soc/amd/common/block/pm/pmlib.c
+++ b/src/soc/amd/common/block/pm/pmlib.c
@@ -31,7 +31,7 @@
pwr_fail |= PWR_FAIL_PREV;
break;
default:
- printk(BIOS_WARNING, "WARNING: Unknown power-failure state: %d\n",
+ printk(BIOS_WARNING, "Unknown power-failure state: %d\n",
CONFIG_MAINBOARD_POWER_FAILURE_STATE);
pwr_fail |= PWR_FAIL_OFF;
break;
diff --git a/src/soc/amd/common/block/smu/smu.c b/src/soc/amd/common/block/smu/smu.c
index f48a9d5..d68867c 100644
--- a/src/soc/amd/common/block/smu/smu.c
+++ b/src/soc/amd/common/block/smu/smu.c
@@ -29,7 +29,7 @@
}
} while (!stopwatch_expired(&sw));
- printk(BIOS_ERR, "Error: timeout sending SMU message\n");
+ printk(BIOS_ERR, "timeout sending SMU message\n");
return SMU_MESG_RESP_TIMEOUT;
}
diff --git a/src/soc/amd/common/fsp/dmi.c b/src/soc/amd/common/fsp/dmi.c
index b96b047..64a5685 100644
--- a/src/soc/amd/common/fsp/dmi.c
+++ b/src/soc/amd/common/fsp/dmi.c
@@ -28,7 +28,7 @@
case MEMORY_TYPE_LPDDR4:
return lpddr4_speed_mhz_to_reported_mts(speed);
default:
- printk(BIOS_ERR, "ERROR: Unknown memory type %x", ddr_type);
+ printk(BIOS_ERR, "Unknown memory type %x", ddr_type);
return 0;
}
}
diff --git a/src/soc/amd/common/fsp/fsp_reset.c b/src/soc/amd/common/fsp/fsp_reset.c
index 62480bf..0a89dc7 100644
--- a/src/soc/amd/common/fsp/fsp_reset.c
+++ b/src/soc/amd/common/fsp/fsp_reset.c
@@ -8,7 +8,7 @@
void chipset_handle_reset(uint32_t status)
{
- printk(BIOS_ERR, "Error: unexpected call to %s(0x%08x). Doing cold reset.\n",
+ printk(BIOS_ERR, "unexpected call to %s(0x%08x). Doing cold reset.\n",
__func__, status);
BUG();
do_cold_reset();
diff --git a/src/soc/amd/common/fsp/pci/pci_routing_info.c b/src/soc/amd/common/fsp/pci/pci_routing_info.c
index 2ea8dfc..5e3c368 100644
--- a/src/soc/amd/common/fsp/pci/pci_routing_info.c
+++ b/src/soc/amd/common/fsp/pci/pci_routing_info.c
@@ -26,7 +26,7 @@
&hob_size);
if (routing_hob == NULL || hob_size == 0 || routing_hob->num_of_entries == 0) {
- printk(BIOS_ERR, "ERROR: Couldn't find valid PCIe interrupt routing HOB.\n");
+ printk(BIOS_ERR, "Couldn't find valid PCIe interrupt routing HOB.\n");
return NULL;
}
diff --git a/src/soc/amd/common/pi/agesawrapper.c b/src/soc/amd/common/pi/agesawrapper.c
index 1859801..8ee962b 100644
--- a/src/soc/amd/common/pi/agesawrapper.c
+++ b/src/soc/amd/common/pi/agesawrapper.c
@@ -78,7 +78,7 @@
status = module_dispatch(AMD_CREATE_STRUCT, &aip->StdHeader);
if (status != AGESA_SUCCESS) {
- printk(BIOS_ERR, "Error: AmdCreateStruct() for 0x%x returned 0x%x. "
+ printk(BIOS_ERR, "AmdCreateStruct() for 0x%x returned 0x%x. "
"Proper system initialization may not be possible.\n",
aip->AgesaFunctionName, status);
}
diff --git a/src/soc/amd/common/pi/def_callouts.c b/src/soc/amd/common/pi/def_callouts.c
index 0d799b9..414de6f 100644
--- a/src/soc/amd/common/pi/def_callouts.c
+++ b/src/soc/amd/common/pi/def_callouts.c
@@ -72,7 +72,7 @@
}
if (i >= BiosCalloutsLen) {
- printk(BIOS_ERR, "ERROR: AGESA Callout Not Supported: 0x%x\n",
+ printk(BIOS_ERR, "AGESA Callout Not Supported: 0x%x\n",
(u32)Func);
return AGESA_UNSUPPORTED;
}
diff --git a/src/soc/amd/common/pi/s3_resume.c b/src/soc/amd/common/pi/s3_resume.c
index 2094931..b7df396 100644
--- a/src/soc/amd/common/pi/s3_resume.c
+++ b/src/soc/amd/common/pi/s3_resume.c
@@ -53,7 +53,7 @@
stage_cache_get_raw(STAGE_S3_DATA, &base, &size);
if (!base || !size) {
- printk(BIOS_ERR, "Error: S3 volatile data not found\n");
+ printk(BIOS_ERR, "S3 volatile data not found\n");
return AGESA_FATAL;
}
diff --git a/src/soc/amd/common/psp_verstage/psp_verstage.c b/src/soc/amd/common/psp_verstage/psp_verstage.c
index 9f34700..30dc115 100644
--- a/src/soc/amd/common/psp_verstage/psp_verstage.c
+++ b/src/soc/amd/common/psp_verstage/psp_verstage.c
@@ -100,12 +100,12 @@
amdfw_location = cbfs_map(fname, NULL);
if (!amdfw_location) {
- printk(BIOS_ERR, "Error: AMD Firmware table not found.\n");
+ printk(BIOS_ERR, "AMD Firmware table not found.\n");
return POSTCODE_AMD_FW_MISSING;
}
ef_table = (struct embedded_firmware *)amdfw_location;
if (ef_table->signature != EMBEDDED_FW_SIGNATURE) {
- printk(BIOS_ERR, "Error: ROMSIG address is not correct.\n");
+ printk(BIOS_ERR, "ROMSIG address is not correct.\n");
return POSTCODE_ROMSIG_MISMATCH_ERROR;
}
@@ -116,11 +116,11 @@
bios_dir_in_spi = (uint32_t *)((bios_dir_addr & SPI_ADDR_MASK) +
(uint32_t)boot_dev_base);
if (*psp_dir_in_spi != PSP_COOKIE) {
- printk(BIOS_ERR, "Error: PSP Directory address is not correct.\n");
+ printk(BIOS_ERR, "PSP Directory address is not correct.\n");
return POSTCODE_PSP_COOKIE_MISMATCH_ERROR;
}
if (*bios_dir_in_spi != BDT1_COOKIE) {
- printk(BIOS_ERR, "Error: BIOS Directory address is not correct.\n");
+ printk(BIOS_ERR, "BIOS Directory address is not correct.\n");
return POSTCODE_BDT1_COOKIE_MISMATCH_ERROR;
}
@@ -131,7 +131,7 @@
}
if (update_psp_bios_dir(&psp_dir_addr, &bios_dir_addr)) {
- printk(BIOS_ERR, "Error: Updated BIOS Directory could not be set.\n");
+ printk(BIOS_ERR, "Updated BIOS Directory could not be set.\n");
return POSTCODE_UPDATE_PSP_BIOS_DIR_ERROR;
}
@@ -183,7 +183,7 @@
}
if (buffer_size > max_buffer_size) {
- printk(BIOS_ERR, "Error: Buffer is larger than max buffer size.\n");
+ printk(BIOS_ERR, "Buffer is larger than max buffer size.\n");
post_code(POSTCODE_WORKBUF_BUFFER_SIZE_ERROR);
return POSTCODE_WORKBUF_BUFFER_SIZE_ERROR;
}
@@ -198,7 +198,7 @@
retval = save_uapp_data((void *)_transfer_buffer, buffer_size);
if (retval) {
- printk(BIOS_ERR, "Error: Could not save workbuf. Error code 0x%08x\n", retval);
+ printk(BIOS_ERR, "Could not save workbuf. Error code 0x%08x\n", retval);
return POSTCODE_WORKBUF_SAVE_ERROR;
}
diff --git a/src/soc/amd/common/psp_verstage/vboot_crypto.c b/src/soc/amd/common/psp_verstage/vboot_crypto.c
index 581d924..d872678 100644
--- a/src/soc/amd/common/psp_verstage/vboot_crypto.c
+++ b/src/soc/amd/common/psp_verstage/vboot_crypto.c
@@ -50,7 +50,7 @@
sha_op.Data = (uint8_t *) buf;
if (!sha_op_size_remaining) {
- printk(BIOS_ERR, "ERROR: got more data than expected.\n");
+ printk(BIOS_ERR, "got more data than expected.\n");
return VB2_ERROR_UNKNOWN;
}
@@ -65,7 +65,7 @@
retval = svc_crypto_sha(&sha_op, SHA_GENERIC);
if (retval) {
- printk(BIOS_ERR, "ERROR: HW crypto failed - errorcode: %#x\n",
+ printk(BIOS_ERR, "HW crypto failed - errorcode: %#x\n",
retval);
return VB2_ERROR_UNKNOWN;
}
@@ -84,12 +84,12 @@
vb2_error_t vb2ex_hwcrypto_digest_finalize(uint8_t *digest, uint32_t digest_size)
{
if (sha_op.Eom == 0) {
- printk(BIOS_ERR, "ERROR: Got less data than expected.\n");
+ printk(BIOS_ERR, "Got less data than expected.\n");
return VB2_ERROR_UNKNOWN;
}
if (digest_size != sha_op.DigestLen) {
- printk(BIOS_ERR, "ERROR: Digest size does not match expected length.\n");
+ printk(BIOS_ERR, "Digest size does not match expected length.\n");
return VB2_ERROR_UNKNOWN;
}
@@ -134,7 +134,7 @@
retval = svc_modexp(&mod_exp_param);
if (retval) {
- printk(BIOS_ERR, "ERROR: HW crypto failed - errorcode: %#x\n",
+ printk(BIOS_ERR, "HW crypto failed - errorcode: %#x\n",
retval);
return VB2_ERROR_EX_HWCRYPTO_UNSUPPORTED;
}
diff --git a/src/soc/amd/common/vboot/vboot_bootblock.c b/src/soc/amd/common/vboot/vboot_bootblock.c
index 9d1d347..e3705d1 100644
--- a/src/soc/amd/common/vboot/vboot_bootblock.c
+++ b/src/soc/amd/common/vboot/vboot_bootblock.c
@@ -35,7 +35,7 @@
CMOS_RECOVERY_MAGIC_VAL)
die("Error: Reboot into recovery was unsuccessful. Halting.");
- printk(BIOS_ERR, "ERROR: VBOOT workbuf not valid.\n");
+ printk(BIOS_ERR, "VBOOT workbuf not valid.\n");
printk(BIOS_DEBUG, "Signature: %#08x\n", *(uint32_t *)_vboot2_work);
cmos_init(0);
cmos_write(CMOS_RECOVERY_MAGIC_VAL, CMOS_RECOVERY_BYTE);
diff --git a/src/soc/amd/picasso/data_fabric.c b/src/soc/amd/picasso/data_fabric.c
index aec8a9e..f8204ff 100644
--- a/src/soc/amd/picasso/data_fabric.c
+++ b/src/soc/amd/picasso/data_fabric.c
@@ -66,8 +66,7 @@
/* Although a pair could be freed later, this condition is
* very unusual and deserves analysis. Flag an error and
* leave the topmost part unconfigured. */
- printk(BIOS_ERR,
- "Error: Not enough NB MMIO routing registers\n");
+ printk(BIOS_ERR, "Not enough NB MMIO routing registers\n");
continue;
}
data_fabric_broadcast_write32(0, NB_MMIO_BASE(reg), np_top + 1);
@@ -85,7 +84,7 @@
reg = data_fabric_find_unused_mmio_reg();
if (reg < 0) {
- printk(BIOS_ERR, "Error: cannot configure region as NP\n");
+ printk(BIOS_ERR, "cannot configure region as NP\n");
return;
}
diff --git a/src/soc/amd/picasso/i2c.c b/src/soc/amd/picasso/i2c.c
index ebc833d..afbc8bd 100644
--- a/src/soc/amd/picasso/i2c.c
+++ b/src/soc/amd/picasso/i2c.c
@@ -30,7 +30,7 @@
void i2c_set_bar(unsigned int bus, uintptr_t bar)
{
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;
}
diff --git a/src/soc/amd/picasso/root_complex.c b/src/soc/amd/picasso/root_complex.c
index eee2036..4ea8bc2 100644
--- a/src/soc/amd/picasso/root_complex.c
+++ b/src/soc/amd/picasso/root_complex.c
@@ -139,7 +139,7 @@
mmconf_resource(dev, MMIO_CONF_BASE);
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__);
return;
}
@@ -161,7 +161,7 @@
else if (res->type == EFI_RESOURCE_MEMORY_RESERVED)
reserved_ram_resource(dev, idx++, res->addr / KiB, res->length / KiB);
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);
}
diff --git a/src/soc/amd/picasso/smihandler.c b/src/soc/amd/picasso/smihandler.c
index f9f5fc0..08f805b 100644
--- a/src/soc/amd/picasso/smihandler.c
+++ b/src/soc/amd/picasso/smihandler.c
@@ -124,7 +124,7 @@
psp_notify_sx_info(ACPI_S3);
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();
}
diff --git a/src/soc/amd/stoneyridge/romstage.c b/src/soc/amd/stoneyridge/romstage.c
index c732f75..8ac2eb5 100644
--- a/src/soc/amd/stoneyridge/romstage.c
+++ b/src/soc/amd/stoneyridge/romstage.c
@@ -151,7 +151,7 @@
const struct device *dev = pcidev_path_on_root(GNB_DEVFN);
if (!dev || !dev->chip_info) {
- printk(BIOS_ERR, "ERROR: Cannot find SoC devicetree config\n");
+ printk(BIOS_ERR, "Cannot find SoC devicetree config\n");
/* In case of a BIOS error, only attempt to set UMA. */
PostParams->MemConfig.UmaMode = CONFIG(GFXUMA) ?
UMA_AUTO : UMA_NONE;
@@ -189,7 +189,7 @@
struct _PLATFORM_CONFIGURATION *platform;
if (!dev || !dev->chip_info) {
- printk(BIOS_WARNING, "Warning: Cannot find SoC devicetree"
+ printk(BIOS_WARNING, "Cannot find SoC devicetree"
" config, STAPM unchanged\n");
return;
}