diff options
Diffstat (limited to 'src/soc/amd')
31 files changed, 74 insertions, 78 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; } |