openwrt/flashrom
1
0
Fork 0
mirror of https://review.coreboot.org/flashrom.git synced 2025-04-27 23:22:37 +02:00
Code Issues Releases Wiki Activity

tree/: Rename ERROR_NONFATAL to ERROR_FLASHROM_NONFATAL

Browse Source 
Change-Id: I5c30fec0cebab2b7d10e2789761889abc3a14dd3
Signed-off-by: Edward O'Callaghan <quasisec@google.com>
Reviewed-on: https://review.coreboot.org/c/flashrom/+/68777
Reviewed-by: Angel Pons <th3fanbus@gmail.com>
Reviewed-by: Anastasia Klimchuk <aklm@chromium.org>
Reviewed-by: Felix Singer <felixsinger@posteo.net>
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
This commit is contained in:
Edward O'Callaghan 2022-10-25 10:39:46 +11:00 committed by Felix Singer
parent 80b1024dac
commit 7c9cd29460
3 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
chipset_enable.c
View File

@ -822,7 +822,7 @@ static int enable_flash_ich_spi(const struct programmer_cfg *cfg, struct pci_dev
return ret_spi; return ret_spi;
if (((boot_buses & BUS_FWH) && ret_fwh) || ((boot_buses & BUS_SPI) && ret_spi)) if (((boot_buses & BUS_FWH) && ret_fwh) || ((boot_buses & BUS_SPI) && ret_spi))
return ERROR_NONFATAL; return ERROR_FLASHROM_NONFATAL;
/* Suppress unknown laptop warning if we booted from SPI. */ /* Suppress unknown laptop warning if we booted from SPI. */
if (boot_buses & BUS_SPI) if (boot_buses & BUS_SPI)
@ -964,7 +964,7 @@ static int enable_flash_pch100_or_c620(const struct programmer_cfg *cfg,
const int ret_spi = ich_init_spi(cfg, spibar, pch_generation); const int ret_spi = ich_init_spi(cfg, spibar, pch_generation);
if (ret_spi != ERROR_FLASHROM_FATAL) { if (ret_spi != ERROR_FLASHROM_FATAL) {
if (ret_bc || ret_spi) if (ret_bc || ret_spi)
ret = ERROR_NONFATAL; ret = ERROR_FLASHROM_NONFATAL;
else else
ret = 0; ret = 0;
} }
@ -1083,7 +1083,7 @@ static int enable_flash_silvermont(const struct programmer_cfg *cfg, struct pci_
return ret_spi; return ret_spi;
if (((boot_buses & BUS_FWH) && ret_fwh) || ((boot_buses & BUS_SPI) && ret_spi)) if (((boot_buses & BUS_FWH) && ret_fwh) || ((boot_buses & BUS_SPI) && ret_spi))
return ERROR_NONFATAL; return ERROR_FLASHROM_NONFATAL;
/* Suppress unknown laptop warning if we booted from SPI. */ /* Suppress unknown laptop warning if we booted from SPI. */
if (boot_buses & BUS_SPI) if (boot_buses & BUS_SPI)
@ -1346,7 +1346,7 @@ static int enable_flash_amd_via(const struct programmer_cfg *cfg, struct pci_dev
if (pci_read_byte(dev, AMD_ENREG) != new) { if (pci_read_byte(dev, AMD_ENREG) != new) {
msg_pwarn("Setting register 0x%x to 0x%02x on %s failed (WARNING ONLY).\n", msg_pwarn("Setting register 0x%x to 0x%02x on %s failed (WARNING ONLY).\n",
AMD_ENREG, new, name); AMD_ENREG, new, name);
return ERROR_NONFATAL; return ERROR_FLASHROM_NONFATAL;
} }
msg_pdbg2("Set ROM enable bit successfully.\n"); msg_pdbg2("Set ROM enable bit successfully.\n");
@ -1470,7 +1470,7 @@ static int enable_flash_nvidia_nforce2(const struct programmer_cfg *cfg, struct
{ {
rpci_write_byte(dev, 0x92, 0); rpci_write_byte(dev, 0x92, 0);
if (enable_flash_nvidia_common(cfg, dev, name)) if (enable_flash_nvidia_common(cfg, dev, name))
return ERROR_NONFATAL; return ERROR_FLASHROM_NONFATAL;
else else
return 0; return 0;
} }
@ -1545,7 +1545,7 @@ static int enable_flash_ck804(const struct programmer_cfg *cfg, struct pci_dev *
err++; err++;
if (err > 0) if (err > 0)
return ERROR_NONFATAL; return ERROR_FLASHROM_NONFATAL;
else else
return 0; return 0;
} }
@ -1620,7 +1620,7 @@ static int enable_flash_mcp55(const struct programmer_cfg *cfg, struct pci_dev *
rpci_write_word(dev, 0x90, wordval); rpci_write_word(dev, 0x90, wordval);
if (enable_flash_nvidia_common(cfg, dev, name)) if (enable_flash_nvidia_common(cfg, dev, name))
return ERROR_NONFATAL; return ERROR_FLASHROM_NONFATAL;
else else
return 0; return 0;
} }
@ -1661,7 +1661,7 @@ static int enable_flash_mcp6x_7x(const struct programmer_cfg *cfg, struct pci_de
msg_pinfo("Please send the log files created by \"flashrom -p internal -o logfile\" to\n" msg_pinfo("Please send the log files created by \"flashrom -p internal -o logfile\" to\n"
"flashrom@flashrom.org with \"your board name: flashrom -V\" as the subject to\n" "flashrom@flashrom.org with \"your board name: flashrom -V\" as the subject to\n"
"help us finish support for your chipset. Thanks.\n"); "help us finish support for your chipset. Thanks.\n");
return ERROR_NONFATAL; return ERROR_FLASHROM_NONFATAL;
} }
/* Force enable SPI and disable LPC? Not a good idea. */ /* Force enable SPI and disable LPC? Not a good idea. */
@ -2240,7 +2240,7 @@ int chipset_flash_enable(const struct programmer_cfg *cfg)
msg_pinfo("FAILED!\n"); msg_pinfo("FAILED!\n");
else if (ret == 0) else if (ret == 0)
msg_pinfo("OK.\n"); msg_pinfo("OK.\n");
else if (ret == ERROR_NONFATAL) else if (ret == ERROR_FLASHROM_NONFATAL)
msg_pinfo("PROBLEMS, continuing anyway\n"); msg_pinfo("PROBLEMS, continuing anyway\n");
if (ret == ERROR_FLASHROM_FATAL) { if (ret == ERROR_FLASHROM_FATAL) {
msg_perr("FATAL ERROR!\n"); msg_perr("FATAL ERROR!\n");

2
include/flash.h
View File

@ -495,7 +495,7 @@ void finalize_flash_access(struct flashctx *);
int register_chip_restore(chip_restore_fn_cb_t func, struct flashctx *flash, uint8_t status); int register_chip_restore(chip_restore_fn_cb_t func, struct flashctx *flash, uint8_t status);
/* Something happened that shouldn't happen, but we can go on. */ /* Something happened that shouldn't happen, but we can go on. */
#define ERROR_NONFATAL 0x100 #define ERROR_FLASHROM_NONFATAL 0x100
/* Something happened that shouldn't happen, we'll abort. */ /* Something happened that shouldn't happen, we'll abort. */
#define ERROR_FLASHROM_FATAL -0xee #define ERROR_FLASHROM_FATAL -0xee

6
sb600spi.c
View File

@ -665,7 +665,7 @@ int sb600_probe_spi(const struct programmer_cfg *cfg, struct pci_dev *dev)
enum amd_chipset amd_gen = determine_generation(dev); enum amd_chipset amd_gen = determine_generation(dev);
if (amd_gen == CHIPSET_AMD_UNKNOWN) if (amd_gen == CHIPSET_AMD_UNKNOWN)
return ERROR_NONFATAL; return ERROR_FLASHROM_NONFATAL;
/* How to read the following table and similar ones in this file: /* How to read the following table and similar ones in this file:
* "?" means we have no datasheet for this chipset generation or it doesn't have any relevant info. * "?" means we have no datasheet for this chipset generation or it doesn't have any relevant info.
@ -748,7 +748,7 @@ int sb600_probe_spi(const struct programmer_cfg *cfg, struct pci_dev *dev)
if (((tmp >> 22) & 0x1) == 0 || ((tmp >> 23) & 0x1) == 0) { if (((tmp >> 22) & 0x1) == 0 || ((tmp >> 23) & 0x1) == 0) {
msg_perr("ERROR: State of SpiAccessMacRomEn or SpiHostAccessRomEn prohibits full access.\n"); msg_perr("ERROR: State of SpiAccessMacRomEn or SpiHostAccessRomEn prohibits full access.\n");
return ERROR_NONFATAL; return ERROR_FLASHROM_NONFATAL;
} }
if (amd_gen >= CHIPSET_SB89XX) { if (amd_gen >= CHIPSET_SB89XX) {
@ -765,7 +765,7 @@ int sb600_probe_spi(const struct programmer_cfg *cfg, struct pci_dev *dev)
smbus_dev = pcidev_find(0x1022, 0x790b); /* AMD FP4 */ smbus_dev = pcidev_find(0x1022, 0x790b); /* AMD FP4 */
if (!smbus_dev) { if (!smbus_dev) {
msg_perr("ERROR: SMBus device not found. Not enabling SPI.\n"); msg_perr("ERROR: SMBus device not found. Not enabling SPI.\n");
return ERROR_NONFATAL; return ERROR_FLASHROM_NONFATAL;
} }
/* Note about the bit tests below: If a bit is zero, the GPIO is SPI. */ /* Note about the bit tests below: If a bit is zero, the GPIO is SPI. */