diff options
Diffstat (limited to 'src/soc')
71 files changed, 140 insertions, 147 deletions
diff --git a/src/soc/amd/cezanne/data_fabric.c b/src/soc/amd/cezanne/data_fabric.c index 2a13d2053f..97cff28584 100644 --- a/src/soc/amd/cezanne/data_fabric.c +++ b/src/soc/amd/cezanne/data_fabric.c @@ -66,8 +66,7 @@ void data_fabric_set_mmio_np(void) /* 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 @@ void data_fabric_set_mmio_np(void) 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 bf47b81462..ae49a064e0 100644 --- a/src/soc/amd/cezanne/i2c.c +++ b/src/soc/amd/cezanne/i2c.c @@ -24,7 +24,7 @@ static struct soc_i2c_ctrlr_info i2c_ctrlr[I2C_CTRLR_COUNT] = { 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 f101680228..dde59d4dee 100644 --- a/src/soc/amd/cezanne/root_complex.c +++ b/src/soc/amd/cezanne/root_complex.c @@ -141,7 +141,7 @@ static void read_resources(struct device *dev) 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 @@ static void read_resources(struct device *dev) 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 2549ef8e2e..509a1d404a 100644 --- a/src/soc/amd/cezanne/smihandler.c +++ b/src/soc/amd/cezanne/smihandler.c @@ -121,7 +121,7 @@ static void fch_slp_typ_handler(void) 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 968c9a6dc0..f20a4546b3 100644 --- a/src/soc/amd/common/block/acpi/bert.c +++ b/src/soc/amd/common/block/acpi/bert.c @@ -17,7 +17,7 @@ enum cb_err acpi_soc_get_bert_region(void **region, size_t *length) 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 b5167b8743..c4e3801545 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_gpio_op(const char *op, unsigned int gpio_num) 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 d538207f15..bdacd81ba4 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 void *get_apob_dram_address(void) 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 @@ static void soc_update_apob_cache(void *unused) 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 @@ static void soc_update_apob_cache(void *unused) /* 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 93d5749f54..5ec68e58f0 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 @@ void build_bert_mca_error(struct mca_bank_status *mci) 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 8d864e855e..af2bee407d 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 @@ void build_bert_mca_error(struct mca_bank_status *mci) 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 325e36b106..8f37f1ab42 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 @@ void smm_region(uintptr_t *start, size_t *size) 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 bf01b8b965..ce80f1613c 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 @@ void clear_tvalid(void) 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 163de2de58..bc3bcab035 100644 --- a/src/soc/amd/common/block/gpio/gpio.c +++ b/src/soc/amd/common/block/gpio/gpio.c @@ -85,7 +85,7 @@ static void program_smi(uint32_t flags, unsigned int gevent_num) 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 @@ static void set_single_gpio(const struct soc_amd_gpio *g) 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 ae742c5e88..c1d0a5799a 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 @@ static enum cb_err espi_open_generic_io_window(uint16_t base, size_t size) 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 @@ enum cb_err espi_open_mmio_window(uint32_t base, size_t size) 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 @@ static enum cb_err espi_poll_status(uint32_t *status) 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 @@ static void espi_set_io_mode_config(enum espi_io_mode mb_io_mode, uint32_t slave *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 @@ static void espi_set_io_mode_config(enum espi_io_mode mb_io_mode, uint32_t slave *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 @@ static void espi_set_op_freq_config(enum espi_op_freq mb_op_freq, uint32_t slave *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 @@ static void espi_set_op_freq_config(enum espi_op_freq mb_op_freq, uint32_t slave *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 @@ static enum cb_err espi_wait_channel_ready(uint16_t slave_reg_addr) 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 @@ static enum cb_err espi_setup_vw_channel(const struct espi_config *mb_cfg, uint3 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 @@ static enum cb_err espi_setup_periph_channel(const struct espi_config *mb_cfg, */ 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 @@ static enum cb_err espi_setup_oob_channel(const struct espi_config *mb_cfg, uint 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 @@ static enum cb_err espi_setup_flash_channel(const struct espi_config *mb_cfg, 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 @@ enum cb_err espi_setup(void) * 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 @@ enum cb_err espi_setup(void) * 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 @@ enum cb_err espi_setup(void) * 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 @@ enum cb_err espi_setup(void) */ /* 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 2c183ee705..97ba2be244 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 @@ static bool continue_spi_dma_transaction(const struct region_device *rd, 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 9c80ef8fa4..6c5565f268 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 @@ void write_pci_cfg_irqs(void) 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 f1b0b27d6a..5ce6b7bd0e 100644 --- a/src/soc/amd/common/block/pm/pmlib.c +++ b/src/soc/amd/common/block/pm/pmlib.c @@ -31,7 +31,7 @@ void pm_set_power_failure_state(void) 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 f48a9d5c45..d68867cae9 100644 --- a/src/soc/amd/common/block/smu/smu.c +++ b/src/soc/amd/common/block/smu/smu.c @@ -29,7 +29,7 @@ static int32_t smu_poll_response(bool print_command_duration) } } 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 b96b047627..64a568556b 100644 --- a/src/soc/amd/common/fsp/dmi.c +++ b/src/soc/amd/common/fsp/dmi.c @@ -28,7 +28,7 @@ static uint16_t ddr_speed_mhz_to_reported_mts(uint16_t ddr_type, uint16_t speed) 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 62480bf319..0a89dc728a 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 2ea8dfcdbf..5e3c368c0f 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 @@ const struct pci_routing_info *get_pci_routing_table(size_t *entries) &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 18598015cb..8ee962b7b0 100644 --- a/src/soc/amd/common/pi/agesawrapper.c +++ b/src/soc/amd/common/pi/agesawrapper.c @@ -78,7 +78,7 @@ static AGESA_STATUS amd_create_struct(AMD_INTERFACE_PARAMS *aip, 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 0d799b94d2..414de6f8ce 100644 --- a/src/soc/amd/common/pi/def_callouts.c +++ b/src/soc/amd/common/pi/def_callouts.c @@ -72,7 +72,7 @@ AGESA_STATUS GetBiosCallout(uint32_t Func, uintptr_t Data, void *ConfigPtr) } 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 2094931dca..b7df396650 100644 --- a/src/soc/amd/common/pi/s3_resume.c +++ b/src/soc/amd/common/pi/s3_resume.c @@ -53,7 +53,7 @@ AGESA_STATUS OemS3LateRestore(S3_DATA_BLOCK *dataBlock) 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 9f347009a2..30dc115131 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 @@ static uint32_t update_boot_region(struct vb2_context *ctx) 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 @@ static uint32_t update_boot_region(struct vb2_context *ctx) 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 @@ static uint32_t update_boot_region(struct vb2_context *ctx) } 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 @@ static uint32_t save_buffers(struct vb2_context **ctx) } 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 @@ static uint32_t save_buffers(struct vb2_context **ctx) 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 581d92485f..d872678856 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 @@ vb2_error_t vb2ex_hwcrypto_digest_extend(const uint8_t *buf, uint32_t size) 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 @@ vb2_error_t vb2ex_hwcrypto_digest_extend(const uint8_t *buf, uint32_t size) 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_extend(const uint8_t *buf, uint32_t size) 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 @@ vb2_error_t vb2ex_hwcrypto_modexp(const struct vb2_public_key *key, 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 9d1d34710d..e3705d1d6a 100644 --- a/src/soc/amd/common/vboot/vboot_bootblock.c +++ b/src/soc/amd/common/vboot/vboot_bootblock.c @@ -35,7 +35,7 @@ void verify_psp_transfer_buf(void) 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 aec8a9e626..f8204ffbc3 100644 --- a/src/soc/amd/picasso/data_fabric.c +++ b/src/soc/amd/picasso/data_fabric.c @@ -66,8 +66,7 @@ void data_fabric_set_mmio_np(void) /* 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 @@ void data_fabric_set_mmio_np(void) 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 ebc833df2a..afbc8bd379 100644 --- a/src/soc/amd/picasso/i2c.c +++ b/src/soc/amd/picasso/i2c.c @@ -30,7 +30,7 @@ static struct soc_i2c_ctrlr_info i2c_ctrlr[I2C_CTRLR_COUNT] = { 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 eee203684b..4ea8bc22c7 100644 --- a/src/soc/amd/picasso/root_complex.c +++ b/src/soc/amd/picasso/root_complex.c @@ -139,7 +139,7 @@ static void read_resources(struct device *dev) 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 @@ static void read_resources(struct device *dev) 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 f9f5fc0210..08f805bf76 100644 --- a/src/soc/amd/picasso/smihandler.c +++ b/src/soc/amd/picasso/smihandler.c @@ -124,7 +124,7 @@ static void fch_slp_typ_handler(void) 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 c732f7546e..8ac2eb5a04 100644 --- a/src/soc/amd/stoneyridge/romstage.c +++ b/src/soc/amd/stoneyridge/romstage.c @@ -151,7 +151,7 @@ void SetMemParams(AMD_POST_PARAMS *PostParams) 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 @@ void soc_customize_init_early(AMD_EARLY_PARAMS *InitEarly) 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; } diff --git a/src/soc/cavium/cn81xx/cpu.c b/src/soc/cavium/cn81xx/cpu.c index 0dd6ce4dc4..bb85029783 100644 --- a/src/soc/cavium/cn81xx/cpu.c +++ b/src/soc/cavium/cn81xx/cpu.c @@ -97,7 +97,7 @@ size_t start_cpu(size_t cpu, void (*entry_64)(size_t core_id)) } while (!stopwatch_expired(&sw) && (pending & coremask)); if (stopwatch_expired(&sw)) { - printk(BIOS_ERR, "ERROR: Timeout waiting for reset " + printk(BIOS_ERR, "Timeout waiting for reset " "pending to clear."); return 1; } @@ -113,7 +113,7 @@ size_t start_cpu(size_t cpu, void (*entry_64)(size_t core_id)) dmb(); if (!read64(&secondary_booted)) { - printk(BIOS_ERR, "ERROR: Core %zu failed to start.\n", cpu); + printk(BIOS_ERR, "Core %zu failed to start.\n", cpu); return 1; } diff --git a/src/soc/cavium/cn81xx/ecam0.c b/src/soc/cavium/cn81xx/ecam0.c index 943e1c9ed6..e789fd8db1 100644 --- a/src/soc/cavium/cn81xx/ecam0.c +++ b/src/soc/cavium/cn81xx/ecam0.c @@ -163,7 +163,7 @@ static size_t ecam0_pci_enable_msix(struct device *dev, } nr_entries = pci_msix_table_size(dev); if (nvec > nr_entries) { - printk(BIOS_ERR, "ERROR: %s: Specified to many table entries\n", + printk(BIOS_ERR, "%s: Specified to many table entries\n", dev_path(dev)); return nr_entries; } @@ -177,13 +177,13 @@ static size_t ecam0_pci_enable_msix(struct device *dev, offset = 0; bar_idx = 0; if (pci_msix_table_bar(dev, &offset, &bar_idx)) { - printk(BIOS_ERR, "ERROR: %s: Failed to find MSI-X entry\n", + printk(BIOS_ERR, "%s: Failed to find MSI-X entry\n", dev_path(dev)); return -1; } bar = ecam0_get_bar_val(dev, bar_idx); if (!bar) { - printk(BIOS_ERR, "ERROR: %s: Failed to find MSI-X bar\n", + printk(BIOS_ERR, "%s: Failed to find MSI-X bar\n", dev_path(dev)); return -1; } diff --git a/src/soc/intel/alderlake/chip.c b/src/soc/intel/alderlake/chip.c index 9127c5e302..3f5c36597a 100644 --- a/src/soc/intel/alderlake/chip.c +++ b/src/soc/intel/alderlake/chip.c @@ -150,7 +150,7 @@ void soc_init_pre_device(void *chip_info) static void cpu_fill_ssdt(const struct device *dev) { if (!generate_pin_irq_map()) - printk(BIOS_ERR, "ERROR: Failed to generate ACPI _PRT table!\n"); + printk(BIOS_ERR, "Failed to generate ACPI _PRT table!\n"); generate_cpu_entries(dev); } diff --git a/src/soc/intel/alderlake/romstage/fsp_params.c b/src/soc/intel/alderlake/romstage/fsp_params.c index 790aa99bb9..9a42642265 100644 --- a/src/soc/intel/alderlake/romstage/fsp_params.c +++ b/src/soc/intel/alderlake/romstage/fsp_params.c @@ -284,17 +284,17 @@ static void fill_fspm_vtd_params(FSP_M_CONFIG *m_cfg, if (m_cfg->VtdIgdEnable && m_cfg->VtdBaseAddress[VTD_GFX] == 0) { m_cfg->VtdIgdEnable = 0; - printk(BIOS_ERR, "ERROR: Requested IGD VT-d, but GFXVT_BASE_ADDRESS is 0\n"); + printk(BIOS_ERR, "Requested IGD VT-d, but GFXVT_BASE_ADDRESS is 0\n"); } if (m_cfg->VtdIpuEnable && m_cfg->VtdBaseAddress[VTD_IPU] == 0) { m_cfg->VtdIpuEnable = 0; - printk(BIOS_ERR, "ERROR: Requested IPU VT-d, but IPUVT_BASE_ADDRESS is 0\n"); + printk(BIOS_ERR, "Requested IPU VT-d, but IPUVT_BASE_ADDRESS is 0\n"); } if (!m_cfg->VtdDisable && m_cfg->VtdBaseAddress[VTD_VTVCO] == 0) { m_cfg->VtdDisable = 1; - printk(BIOS_ERR, "ERROR: Requested VT-d, but VTVCO_BASE_ADDRESS is 0\n"); + printk(BIOS_ERR, "Requested VT-d, but VTVCO_BASE_ADDRESS is 0\n"); } if (m_cfg->TcssDma0En || m_cfg->TcssDma1En) diff --git a/src/soc/intel/alderlake/systemagent.c b/src/soc/intel/alderlake/systemagent.c index 1736e32e71..1bbd62af70 100644 --- a/src/soc/intel/alderlake/systemagent.c +++ b/src/soc/intel/alderlake/systemagent.c @@ -87,7 +87,7 @@ void soc_systemagent_init(struct device *dev) } if (i == ARRAY_SIZE(cpuid_to_adl)) { - printk(BIOS_ERR, "ERROR: unknown SA ID: 0x%4x, skipped power limits configuration.\n", + printk(BIOS_ERR, "unknown SA ID: 0x%4x, skipped power limits configuration.\n", sa_pci_id); return; } diff --git a/src/soc/intel/alderlake/vr_config.c b/src/soc/intel/alderlake/vr_config.c index 44e4528eb3..c0058cdba6 100644 --- a/src/soc/intel/alderlake/vr_config.c +++ b/src/soc/intel/alderlake/vr_config.c @@ -53,7 +53,7 @@ static uint32_t load_table(const struct vr_lookup *tbl, const int tbl_entries, c return tbl[i].conf[domain]; } - printk(BIOS_ERR, "ERROR: Unknown MCH (0x%x) in %s\n", mch_id, __func__); + printk(BIOS_ERR, "Unknown MCH (0x%x) in %s\n", mch_id, __func__); return 0; } diff --git a/src/soc/intel/braswell/southcluster.c b/src/soc/intel/braswell/southcluster.c index 25868640a4..4c6cbee343 100644 --- a/src/soc/intel/braswell/southcluster.c +++ b/src/soc/intel/braswell/southcluster.c @@ -106,7 +106,7 @@ static void write_pci_config_irqs(void) const struct soc_irq_route *ir = &global_soc_irq_route; if (ir == NULL) { - printk(BIOS_WARNING, "Warning: Can't write PCI IRQ assignments " + printk(BIOS_WARNING, "Can't write PCI IRQ assignments " "because 'global_braswell_irq_route' structure does not exist\n"); return; } @@ -142,8 +142,7 @@ static void write_pci_config_irqs(void) device_num = PCI_SLOT(parent_bdf); if (ir->pcidev[device_num] == 0) { - printk(BIOS_WARNING, - "Warning: PCI Device %d does not have an IRQ entry, " + printk(BIOS_WARNING, "PCI Device %d does not have an IRQ entry, " "skipping it\n", device_num); continue; } diff --git a/src/soc/intel/broadwell/pch/me_status.c b/src/soc/intel/broadwell/pch/me_status.c index fa44c7c79d..ef6a0f3473 100644 --- a/src/soc/intel/broadwell/pch/me_status.c +++ b/src/soc/intel/broadwell/pch/me_status.c @@ -307,7 +307,7 @@ void intel_me_hsio_version(uint16_t *version, uint16_t *checksum) udelay(ME_DELAY); } if (!count) { - printk(BIOS_ERR, "ERROR: ME failed to respond\n"); + printk(BIOS_ERR, "ME failed to respond\n"); return; } diff --git a/src/soc/intel/cannonlake/chip.c b/src/soc/intel/cannonlake/chip.c index 80a6c01ce8..27c49b174d 100644 --- a/src/soc/intel/cannonlake/chip.c +++ b/src/soc/intel/cannonlake/chip.c @@ -162,7 +162,7 @@ static void cpu_fill_ssdt(const struct device *dev) generate_cpu_entries(dev); if (!generate_pin_irq_map()) - printk(BIOS_ERR, "ERROR: Failed to generate ACPI _PRT table!\n"); + printk(BIOS_ERR, "Failed to generate ACPI _PRT table!\n"); } static void cpu_set_north_irqs(struct device *dev) diff --git a/src/soc/intel/cannonlake/vr_config.c b/src/soc/intel/cannonlake/vr_config.c index 7ba73eac3f..ade1ef6277 100644 --- a/src/soc/intel/cannonlake/vr_config.c +++ b/src/soc/intel/cannonlake/vr_config.c @@ -107,7 +107,7 @@ static uint16_t load_table(const struct vr_lookup *tbl, break; } - printk(BIOS_ERR, "ERROR: Unknown MCH (0x%x) in %s\n", mch_id, __func__); + printk(BIOS_ERR, "Unknown MCH (0x%x) in %s\n", mch_id, __func__); return 0; } diff --git a/src/soc/intel/common/block/acpi/acpi_bert.c b/src/soc/intel/common/block/acpi/acpi_bert.c index 85fbc03f6e..beb131ee1b 100644 --- a/src/soc/intel/common/block/acpi/acpi_bert.c +++ b/src/soc/intel/common/block/acpi/acpi_bert.c @@ -39,7 +39,7 @@ enum cb_err acpi_soc_get_bert_region(void **region, size_t *length) } if (!cl_get_total_data_size()) { - printk(BIOS_ERR, "Error: No crashlog record present\n"); + printk(BIOS_ERR, "No crashlog record present\n"); return CB_ERR; } @@ -47,12 +47,12 @@ enum cb_err acpi_soc_get_bert_region(void **region, size_t *length) gesb_header_size = sizeof(*status); if (!status) { - printk(BIOS_ERR, "Error: unable to allocate GSB\n"); + printk(BIOS_ERR, "unable to allocate GSB\n"); return CB_ERR; } if (cl_get_total_data_size() > bert_storage_remaining()) { - printk(BIOS_ERR, "Error: Crashlog entry would exceed " + printk(BIOS_ERR, "Crashlog entry would exceed " "available region\n"); return CB_ERR; } @@ -61,7 +61,7 @@ enum cb_err acpi_soc_get_bert_region(void **region, size_t *length) if (cpu_record_size) { cl_data = new_cper_fw_error_crashlog(status, cpu_record_size); if (!cl_data) { - printk(BIOS_ERR, "Error: Crashlog CPU entry(size %lu) " + printk(BIOS_ERR, "Crashlog CPU entry(size %lu) " "would exceed available region\n", cpu_record_size); return CB_ERR; @@ -75,14 +75,14 @@ enum cb_err acpi_soc_get_bert_region(void **region, size_t *length) if (pmc_record_size) { /* Allocate new FW ERR structure in case CPU crashlog is present */ if (cpu_record_size && !bert_append_fw_err(status)) { - printk(BIOS_ERR, "Error: Crashlog PMC entry would " + printk(BIOS_ERR, "Crashlog PMC entry would " "exceed available region\n"); return CB_ERR; } cl_data = new_cper_fw_error_crashlog(status, pmc_record_size); if (!cl_data) { - printk(BIOS_ERR, "Error: Crashlog PMC entry(size %lu) " + printk(BIOS_ERR, "Crashlog PMC entry(size %lu) " "would exceed available region\n", pmc_record_size); return CB_ERR; diff --git a/src/soc/intel/common/block/cse/cse.c b/src/soc/intel/common/block/cse/cse.c index 6dfe329fc4..a9a619c24e 100644 --- a/src/soc/intel/common/block/cse/cse.c +++ b/src/soc/intel/common/block/cse/cse.c @@ -1051,7 +1051,7 @@ static void me_reset_with_count(void) * If the (CS)ME fails to change states after 3 attempts, it will * likely need a cold boot, or recovering. */ - printk(BIOS_ERR, "Error: Failed to change ME state in %u attempts!\n", + printk(BIOS_ERR, "Failed to change ME state in %u attempts!\n", ME_DISABLE_ATTEMPTS); } diff --git a/src/soc/intel/common/block/cse/cse_eop.c b/src/soc/intel/common/block/cse/cse_eop.c index 3fc4e2b270..5d6a4a7886 100644 --- a/src/soc/intel/common/block/cse/cse_eop.c +++ b/src/soc/intel/common/block/cse/cse_eop.c @@ -172,7 +172,7 @@ static void handle_cse_eop_result(enum cse_eop_result result) break; case CSE_EOP_RESULT_ERROR: /* fallthrough */ default: - printk(BIOS_ERR, "ERROR: Failed to send EOP to CSE, %d\n", result); + printk(BIOS_ERR, "Failed to send EOP to CSE, %d\n", result); /* For vboot, trigger recovery mode if applicable, as there is likely something very broken in this case. */ if (CONFIG(VBOOT) && !vboot_recovery_mode_enabled()) diff --git a/src/soc/intel/common/block/fast_spi/fast_spi_flash.c b/src/soc/intel/common/block/fast_spi/fast_spi_flash.c index 1b0652d5ad..aead8debc9 100644 --- a/src/soc/intel/common/block/fast_spi/fast_spi_flash.c +++ b/src/soc/intel/common/block/fast_spi/fast_spi_flash.c @@ -350,7 +350,7 @@ static int fast_spi_flash_protect(const struct spi_flash *flash, } if (fpr >= SPIBAR_FPR_MAX) { - printk(BIOS_ERR, "ERROR: No SPI FPR free!\n"); + printk(BIOS_ERR, "No SPI FPR free!\n"); return -1; } @@ -365,7 +365,7 @@ static int fast_spi_flash_protect(const struct spi_flash *flash, protect_mask |= (SPI_FPR_RPE | SPI_FPR_WPE); break; default: - printk(BIOS_ERR, "ERROR: Seeking invalid protection!\n"); + printk(BIOS_ERR, "Seeking invalid protection!\n"); return -1; } @@ -376,7 +376,7 @@ static int fast_spi_flash_protect(const struct spi_flash *flash, write32((void *)fpr_base, reg); reg = read32((void *)fpr_base); if (!(reg & protect_mask)) { - printk(BIOS_ERR, "ERROR: Unable to set SPI FPR %d\n", fpr); + printk(BIOS_ERR, "Unable to set SPI FPR %d\n", fpr); return -1; } diff --git a/src/soc/intel/common/block/irq/irq.c b/src/soc/intel/common/block/irq/irq.c index 007445116a..8b0642f149 100644 --- a/src/soc/intel/common/block/irq/irq.c +++ b/src/soc/intel/common/block/irq/irq.c @@ -128,7 +128,7 @@ static int pirq_to_irq(enum pirq pirq) static bool assign_pirq(struct pin_info pin_info[PCI_INT_MAX], enum pci_pin pin, enum pirq pirq) { if (pirq < PIRQ_A || pirq > PIRQ_H) { - printk(BIOS_ERR, "ERROR: Invalid pirq constraint %u\n", pirq); + printk(BIOS_ERR, "Invalid pirq constraint %u\n", pirq); return false; } @@ -143,7 +143,7 @@ static bool assign_pin(enum pci_pin pin, unsigned int fn, enum pin_state state, enum pci_pin fn_pin_map[MAX_FNS]) { if (pin < PCI_INT_A || pin > PCI_INT_D) { - printk(BIOS_ERR, "ERROR: Invalid pin constraint %u\n", pin); + printk(BIOS_ERR, "Invalid pin constraint %u\n", pin); return false; } @@ -182,7 +182,7 @@ static bool assign_fixed_pirqs(const struct slot_irq_constraints *constraints, fixed pin */ const enum pci_pin pin = fn_pin_map[i]; if (pin == PCI_INT_NONE) { - printk(BIOS_ERR, "ERROR: Slot %u, pirq %u, no pin for function %zu\n", + printk(BIOS_ERR, "Slot %u, pirq %u, no pin for function %zu\n", constraints->slot, fixed_pirq, i); return false; } @@ -210,7 +210,7 @@ static bool assign_direct_irqs(const struct slot_irq_constraints *constraints, const int irq = find_free_unique_irq(); if (irq == INVALID_IRQ) { - printk(BIOS_ERR, "ERROR: No free unique IRQs found\n"); + printk(BIOS_ERR, "No free unique IRQs found\n"); return false; } @@ -234,7 +234,7 @@ static bool assign_shareable_pins(const struct slot_irq_constraints *constraints pin = find_shareable_pin(pin_info); if (pin == PCI_INT_NONE) { - printk(BIOS_ERR, "ERROR: No shareable pins found\n"); + printk(BIOS_ERR, "No shareable pins found\n"); return false; } } diff --git a/src/soc/intel/common/block/pcie/pcie_helpers.c b/src/soc/intel/common/block/pcie/pcie_helpers.c index e8ed3be56d..00bef42a79 100644 --- a/src/soc/intel/common/block/pcie/pcie_helpers.c +++ b/src/soc/intel/common/block/pcie/pcie_helpers.c @@ -29,7 +29,7 @@ uint32_t pcie_rp_enable_mask(const struct pcie_rp_group *const groups) for (group = groups; group->count; ++group) { if (group->count + offset >= sizeof(mask) * 8) { - printk(BIOS_ERR, "ERROR: %s: Root port count greater than mask size!\n", + printk(BIOS_ERR, "%s: Root port count greater than mask size!\n", __func__); break; } diff --git a/src/soc/intel/common/block/pmc/pmclib.c b/src/soc/intel/common/block/pmc/pmclib.c index f7efeb78da..da78d5c424 100644 --- a/src/soc/intel/common/block/pmc/pmclib.c +++ b/src/soc/intel/common/block/pmc/pmclib.c @@ -611,7 +611,7 @@ void pmc_set_power_failure_state(const bool target_on) pmc_soc_set_afterg3_en(target_on); break; default: - printk(BIOS_WARNING, "WARNING: Unknown power-failure state: %d\n", state); + printk(BIOS_WARNING, "Unknown power-failure state: %d\n", state); break; } } diff --git a/src/soc/intel/common/block/thermal/thermal_pci.c b/src/soc/intel/common/block/thermal/thermal_pci.c index 1b9f28a176..04203fe136 100644 --- a/src/soc/intel/common/block/thermal/thermal_pci.c +++ b/src/soc/intel/common/block/thermal/thermal_pci.c @@ -19,13 +19,13 @@ void pch_thermal_configuration(void) dev = pcidev_path_on_root(PCH_DEVFN_THERMAL); if (!dev) { - printk(BIOS_ERR, "ERROR: PCH_DEVFN_THERMAL device not found!\n"); + printk(BIOS_ERR, "PCH_DEVFN_THERMAL device not found!\n"); return; } res = probe_resource(dev, PCI_BASE_ADDRESS_0); if (!res) { - printk(BIOS_ERR, "ERROR: PCH thermal device not found!\n"); + printk(BIOS_ERR, "PCH thermal device not found!\n"); return; } diff --git a/src/soc/intel/quark/storage_test.c b/src/soc/intel/quark/storage_test.c index 1eed84e9b2..e7e464601c 100644 --- a/src/soc/intel/quark/storage_test.c +++ b/src/soc/intel/quark/storage_test.c @@ -195,8 +195,7 @@ void storage_test(uint32_t bar, int full_initialization) err = storage_setup_media(media, &sdhci_ctrlr->sd_mmc_ctrlr); if (err) { display_log(); - printk(BIOS_ERR, - "ERROR: Device failed to initialize, err = %d\n", + printk(BIOS_ERR, "Device failed to initialize, err = %d\n", err); return; } diff --git a/src/soc/intel/skylake/vr_config.c b/src/soc/intel/skylake/vr_config.c index b807f54be3..89d85cffd7 100644 --- a/src/soc/intel/skylake/vr_config.c +++ b/src/soc/intel/skylake/vr_config.c @@ -222,7 +222,7 @@ static uint16_t get_sku_icc_max(int domain) return icc_max[domain]; } default: - printk(BIOS_ERR, "ERROR: Unknown MCH (0x%x) in %s\n", mch_id, __func__); + printk(BIOS_ERR, "Unknown MCH (0x%x) in %s\n", mch_id, __func__); } return 0; } @@ -292,7 +292,7 @@ static uint16_t get_sku_ac_dc_loadline(const int domain) return loadline[domain]; } default: - printk(BIOS_ERR, "ERROR: Unknown MCH (0x%x) in %s\n", mch_id, __func__); + printk(BIOS_ERR, "Unknown MCH (0x%x) in %s\n", mch_id, __func__); } return 0; } diff --git a/src/soc/intel/tigerlake/chip.c b/src/soc/intel/tigerlake/chip.c index 459452455c..9343ecfbba 100644 --- a/src/soc/intel/tigerlake/chip.c +++ b/src/soc/intel/tigerlake/chip.c @@ -164,7 +164,7 @@ void soc_init_pre_device(void *chip_info) static void cpu_fill_ssdt(const struct device *dev) { if (!generate_pin_irq_map()) - printk(BIOS_ERR, "ERROR: Failed to generate ACPI _PRT table!\n"); + printk(BIOS_ERR, "Failed to generate ACPI _PRT table!\n"); generate_cpu_entries(dev); } diff --git a/src/soc/mediatek/common/include/soc/msdc.h b/src/soc/mediatek/common/include/soc/msdc.h index b7f7fd7b0b..798b0f61fe 100644 --- a/src/soc/mediatek/common/include/soc/msdc.h +++ b/src/soc/mediatek/common/include/soc/msdc.h @@ -162,7 +162,7 @@ struct msdc_ctrlr { #define msdc_debug(format...) printk(BIOS_DEBUG, format) #define msdc_trace(format...) printk(BIOS_DEBUG, format) -#define msdc_error(format...) printk(BIOS_ERR, "ERROR: " format) +#define msdc_error(format...) printk(BIOS_ERR, format) int mtk_emmc_early_init(void *base, void *top_base); void mtk_msdc_configure_emmc(bool is_early_init); diff --git a/src/soc/mediatek/mt8173/da9212.c b/src/soc/mediatek/mt8173/da9212.c index e44a76f592..5028f18792 100644 --- a/src/soc/mediatek/mt8173/da9212.c +++ b/src/soc/mediatek/mt8173/da9212.c @@ -46,7 +46,7 @@ static void da9212_hw_init(uint8_t i2c_num, unsigned char variant_id) DA9212_BUCK_MODE_MASK, DA9212_BUCK_MODE_SHIFT); if (ret) - printk(BIOS_ERR, "ERROR: %s failed\n", __func__); + printk(BIOS_ERR, "%s failed\n", __func__); } @@ -74,7 +74,7 @@ void da9212_probe(uint8_t i2c_num) /* Check device ID is DA9212 */ if (device_id != DA9212_ID || ret) { - printk(BIOS_ERR, "ERROR: unknown DA9212 device_id\n"); + printk(BIOS_ERR, "unknown DA9212 device_id\n"); return; } diff --git a/src/soc/mediatek/mt8173/mt6311.c b/src/soc/mediatek/mt8173/mt6311.c index 3e61f8c399..05149dc46c 100644 --- a/src/soc/mediatek/mt8173/mt6311.c +++ b/src/soc/mediatek/mt8173/mt6311.c @@ -97,7 +97,7 @@ static void mt6311_hw_init(uint8_t i2c_num) MT6311_LDO_CON3, 0, 0x1, 0); if (ret) - printk(BIOS_ERR, "ERROR: %s failed\n", __func__); + printk(BIOS_ERR, "%s failed\n", __func__); } void mt6311_probe(uint8_t i2c_num) @@ -109,7 +109,7 @@ void mt6311_probe(uint8_t i2c_num) printk(BIOS_INFO, "%s: device ID = %#x\n", __func__, val); if (val < MT6311_E1_CID_CODE) { - printk(BIOS_ERR, "ERROR: unknown MT6311 device_id\n"); + printk(BIOS_ERR, "unknown MT6311 device_id\n"); return; } diff --git a/src/soc/mediatek/mt8195/dpm_4ch.c b/src/soc/mediatek/mt8195/dpm_4ch.c index 78895c8466..f13337d8b7 100644 --- a/src/soc/mediatek/mt8195/dpm_4ch.c +++ b/src/soc/mediatek/mt8195/dpm_4ch.c @@ -28,7 +28,7 @@ static int wake_dpm_sram_up(void) } if (loop == 0) { - printk(BIOS_ERR, "ERROR: failed to wake DPM up.\n"); + printk(BIOS_ERR, "failed to wake DPM up.\n"); return -1; } diff --git a/src/soc/mediatek/mt8195/dptx.c b/src/soc/mediatek/mt8195/dptx.c index edb3f7ef3a..f2c0905cc4 100644 --- a/src/soc/mediatek/mt8195/dptx.c +++ b/src/soc/mediatek/mt8195/dptx.c @@ -431,7 +431,7 @@ static void dptx_setsdp_downcnt_init_inhblanking(struct mtk_dp *mtk_dp) 0x08 : 0x00; if (pixclk_mhz > mtk_dp->train_info.linkrate * 27) { count = 0x8; - printk(BIOS_ERR, "ERROR: Pixclk > LinkRateChange\n"); + printk(BIOS_ERR, "Pixclk > LinkRateChange\n"); } else { count = 0x10 + offset; } diff --git a/src/soc/mediatek/mt8195/dptx_hal.c b/src/soc/mediatek/mt8195/dptx_hal.c index 385e88cbdb..b246c20119 100644 --- a/src/soc/mediatek/mt8195/dptx_hal.c +++ b/src/soc/mediatek/mt8195/dptx_hal.c @@ -719,7 +719,7 @@ void dptx_hal_set_txlane(struct mtk_dp *mtk_dp, int value) mtk_dp_write_byte(mtk_dp, REG_34A4_DP_TRANS_P0, value << 2, BIT(3) | BIT(2)); } else { - printk(BIOS_ERR, "ERROR: [%s]value << 2 > 0xff\n", __func__); + printk(BIOS_ERR, "[%s]value << 2 > 0xff\n", __func__); } } @@ -742,7 +742,7 @@ void dptx_hal_set_txrate(struct mtk_dp *mtk_dp, int value) mtk_dp_write(mtk_dp, 0x103C, 0x3); break; default: - printk(BIOS_ERR, "ERROR: Link rate not support(%d)\n", value); + printk(BIOS_ERR, "Link rate not support(%d)\n", value); break; } diff --git a/src/soc/mediatek/mt8195/mt6691.c b/src/soc/mediatek/mt8195/mt6691.c index 3f224215ef..3b3ccf1623 100644 --- a/src/soc/mediatek/mt8195/mt6691.c +++ b/src/soc/mediatek/mt8195/mt6691.c @@ -65,7 +65,7 @@ void mt6691_probe(uint8_t i2c_num) { /* Check device ID is MT6691 */ if (!get_mt6691_chip_id(i2c_num)) { - printk(BIOS_ERR, "ERROR: unknown MT6691 chip_id\n"); + printk(BIOS_ERR, "unknown MT6691 chip_id\n"); return; } /* Slew rate 12mV */ diff --git a/src/soc/nvidia/tegra/usb.c b/src/soc/nvidia/tegra/usb.c index ac61c54688..9f10b388fc 100644 --- a/src/soc/nvidia/tegra/usb.c +++ b/src/soc/nvidia/tegra/usb.c @@ -115,7 +115,7 @@ static void usb_ehci_reset_and_prepare(struct usb_ctlr *usb, enum usb_phy_type t /* wait for HC to reset */; if (!timeout) { - printk(BIOS_ERR, "ERROR: EHCI(%p) reset timeout", usb); + printk(BIOS_ERR, "EHCI(%p) reset timeout", usb); return; } diff --git a/src/soc/nvidia/tegra210/dp.c b/src/soc/nvidia/tegra210/dp.c index a2b06b160e..f3bc208128 100644 --- a/src/soc/nvidia/tegra210/dp.c +++ b/src/soc/nvidia/tegra210/dp.c @@ -1575,7 +1575,7 @@ void dp_display_startup(struct device *dev) __func__, disp_ctrl); if (disp_ctrl == NULL) { - printk(BIOS_ERR, "Error: No dc is assigned by dt.\n"); + printk(BIOS_ERR, "No dc is assigned by dt.\n"); return; } diff --git a/src/soc/nvidia/tegra210/dsi.c b/src/soc/nvidia/tegra210/dsi.c index 5026ef4b58..b9bbea3756 100644 --- a/src/soc/nvidia/tegra210/dsi.c +++ b/src/soc/nvidia/tegra210/dsi.c @@ -963,7 +963,7 @@ void dsi_display_startup(struct device *dev) __func__, disp_ctrl); if (disp_ctrl == NULL) { - printk(BIOS_ERR, "Error: No dc is assigned by dt.\n"); + printk(BIOS_ERR, "No dc is assigned by dt.\n"); return; } diff --git a/src/soc/nvidia/tegra210/funitcfg.c b/src/soc/nvidia/tegra210/funitcfg.c index 0ca43cd06d..ba6408f702 100644 --- a/src/soc/nvidia/tegra210/funitcfg.c +++ b/src/soc/nvidia/tegra210/funitcfg.c @@ -140,7 +140,7 @@ void soc_configure_funits(const struct funit_cfg * const entries, size_t num) int funit_usb = is_usb(entry->funit_index); if (entry->funit_index >= FUNIT_INDEX_MAX) { - printk(BIOS_ERR, "Error: Index out of bounds\n"); + printk(BIOS_ERR, "Index out of bounds\n"); continue; } diff --git a/src/soc/qualcomm/common/clock.c b/src/soc/qualcomm/common/clock.c index 09cd95c88a..e06a954f3c 100644 --- a/src/soc/qualcomm/common/clock.c +++ b/src/soc/qualcomm/common/clock.c @@ -27,7 +27,7 @@ enum cb_err clock_enable_vote(void *cbcr_addr, void *vote_addr, return CB_SUCCESS; udelay(1); } - printk(BIOS_ERR, "ERROR: Failed to enable clock, register val: 0x%x\n", + printk(BIOS_ERR, "Failed to enable clock, register val: 0x%x\n", read32(cbcr_addr)); return CB_ERR; } @@ -45,7 +45,7 @@ enum cb_err clock_enable(void *cbcr_addr) return CB_SUCCESS; udelay(1); } - printk(BIOS_ERR, "ERROR: Failed to enable clock, register val: 0x%x\n", + printk(BIOS_ERR, "Failed to enable clock, register val: 0x%x\n", read32(cbcr_addr)); return CB_ERR; } @@ -207,7 +207,7 @@ enum cb_err clock_configure_enable_gpll(struct alpha_pll_reg_val_config *cfg, /* Wait for Lock Detection */ if (!wait_us(100, read32(cfg->reg_mode) & PLL_LOCK_DET_BMSK)) { - printk(BIOS_ERR, "ERROR: PLL did not lock!\n"); + printk(BIOS_ERR, "PLL did not lock!\n"); return CB_ERR; } } @@ -227,7 +227,7 @@ enum cb_err agera_pll_enable(struct alpha_pll_reg_val_config *cfg) setbits32(cfg->reg_mode, BIT(PLL_RESET_SHFT)); if (!wait_us(100, read32(cfg->reg_mode) & PLL_LOCK_DET_BMSK)) { - printk(BIOS_ERR, "ERROR: CPU PLL did not lock!\n"); + printk(BIOS_ERR, "CPU PLL did not lock!\n"); return CB_ERR; } @@ -249,7 +249,7 @@ enum cb_err zonda_pll_enable(struct alpha_pll_reg_val_config *cfg) setbits32(cfg->reg_opmode, PLL_RUN_MODE); if (!wait_us(100, read32(cfg->reg_mode) & PLL_LOCK_DET_BMSK)) { - printk(BIOS_ERR, "ERROR: CPU PLL did not lock!\n"); + printk(BIOS_ERR, "CPU PLL did not lock!\n"); return CB_ERR; } diff --git a/src/soc/qualcomm/common/usb/qmpv3_usb_phy.c b/src/soc/qualcomm/common/usb/qmpv3_usb_phy.c index fc560ffae7..c1782be790 100644 --- a/src/soc/qualcomm/common/usb/qmpv3_usb_phy.c +++ b/src/soc/qualcomm/common/usb/qmpv3_usb_phy.c @@ -408,7 +408,7 @@ void ss_qmp_phy_init(void) !(read32(&ss_phy_reg->qmp_pcs_reg->pcs_ready_status) & USB3_PCS_PHYSTATUS)); if (!lock_us) - printk(BIOS_ERR, "ERROR: QMP PHY PLL LOCK fails:\n"); + printk(BIOS_ERR, "QMP PHY PLL LOCK fails:\n"); else printk(BIOS_DEBUG, "QMP PHY initialized and locked in %ldus\n", lock_us); diff --git a/src/soc/qualcomm/common/usb/qmpv4_usb_phy.c b/src/soc/qualcomm/common/usb/qmpv4_usb_phy.c index 031e2cfb2b..23ab75ad2a 100644 --- a/src/soc/qualcomm/common/usb/qmpv4_usb_phy.c +++ b/src/soc/qualcomm/common/usb/qmpv4_usb_phy.c @@ -404,7 +404,7 @@ void ss_qmp_phy_init(void) !(read32(&ss_phy_reg->qmp_pcs_reg->pcs_ready_status) & USB3_PCS_PHYSTATUS)); if (!lock_us) - printk(BIOS_ERR, "ERROR: QMP PHY PLL LOCK fails:\n"); + printk(BIOS_ERR, "QMP PHY PLL LOCK fails:\n"); else printk(BIOS_DEBUG, "QMP PHY initialized and locked in %ldus\n", lock_us); diff --git a/src/soc/qualcomm/common/usb/qusb_phy.c b/src/soc/qualcomm/common/usb/qusb_phy.c index c8a56b019a..494f7cd3b3 100644 --- a/src/soc/qualcomm/common/usb/qusb_phy.c +++ b/src/soc/qualcomm/common/usb/qusb_phy.c @@ -132,7 +132,7 @@ void hs_usb_phy_init(void *board_data) long lock_us = wait_us(160, read32(&hs_phy_reg->phy_dig->debug_stat5) & VSTATUS_PLL_LOCK_STATUS_MASK); if (!lock_us) - printk(BIOS_ERR, "ERROR: QUSB PHY PLL LOCK fails\n"); + printk(BIOS_ERR, "QUSB PHY PLL LOCK fails\n"); else printk(BIOS_DEBUG, "QUSB PHY initialized and locked in %ldus\n", lock_us); diff --git a/src/soc/rockchip/common/rk808.c b/src/soc/rockchip/common/rk808.c index 73c2312307..022529f187 100644 --- a/src/soc/rockchip/common/rk808.c +++ b/src/soc/rockchip/common/rk808.c @@ -54,7 +54,7 @@ static void rk808_clrsetbits(uint8_t reg, uint8_t clr, uint8_t set) uint8_t value; if (rk808_read(reg, &value) || rk808_write(reg, (value & ~clr) | set)) - printk(BIOS_ERR, "ERROR: Cannot set Rk808[%#x]!\n", reg); + printk(BIOS_ERR, "Cannot set Rk808[%#x]!\n", reg); } void rk808_configure_switch(int sw, int enabled) diff --git a/src/soc/rockchip/rk3288/crypto.c b/src/soc/rockchip/rk3288/crypto.c index 96a089b955..6ce6a27c95 100644 --- a/src/soc/rockchip/rk3288/crypto.c +++ b/src/soc/rockchip/rk3288/crypto.c @@ -94,7 +94,7 @@ vb2_error_t vb2ex_hwcrypto_digest_extend(const uint8_t *buf, uint32_t size) do { intsts = read32(&crypto->intsts); if (intsts & HRDMA_ERR) { - printk(BIOS_ERR, "ERROR: DMA error during HW crypto\n"); + printk(BIOS_ERR, "DMA error during HW crypto\n"); return VB2_ERROR_UNKNOWN; } } while (!(intsts & HRDMA_DONE)); /* wait for DMA to finish */ diff --git a/src/soc/rockchip/rk3399/display.c b/src/soc/rockchip/rk3399/display.c index c300726140..728f45d1a0 100644 --- a/src/soc/rockchip/rk3399/display.c +++ b/src/soc/rockchip/rk3399/display.c @@ -72,8 +72,7 @@ retry_edp: break; } if (retry_count_init == 3) { - printk(BIOS_WARNING, - "Warning: EDP initialization failed.\n"); + printk(BIOS_WARNING, "EDP initialization failed.\n"); return; } else { reset_edp(); diff --git a/src/soc/ti/am335x/mmc.c b/src/soc/ti/am335x/mmc.c index b7b4f97c70..b65030e7d8 100644 --- a/src/soc/ti/am335x/mmc.c +++ b/src/soc/ti/am335x/mmc.c @@ -265,7 +265,7 @@ int am335x_mmc_init_storage(struct am335x_mmc_host *mmc_host) err = am335x_mmc_init(mmc_host->reg); if (err != 0) { - printk(BIOS_ERR, "ERROR: Initialising AM335X SD failed.\n"); + printk(BIOS_ERR, "Initialising AM335X SD failed.\n"); return err; } |