- flashrom-gerrit - mail.coreboot.org

[S] Change in flashrom[master]: cli_classic.c: Replace weird strtok() implementation with canonical
by Edward O'Callaghan (Code Review) 04 Feb '23

04 Feb '23

Edward O'Callaghan has uploaded this change for review. ( https://review.coreboot.org/c/flashrom/+/72822 ) Change subject: cli_classic.c: Replace weird strtok() implementation with canonical ...................................................................... cli_classic.c: Replace weird strtok() implementation with canonical Prepare to use libflashrom flashrom_programmer_init() API over internal programmer_init() implementation from flashrom.c Change-Id: Icc9473b5b60012a736371dc8545ee0491cb06dc4 Signed-off-by: Edward O'Callaghan <quasisec(a)google.com> --- M cli_classic.c 1 file changed, 20 insertions(+), 28 deletions(-) git pull ssh://review.coreboot.org:29418/flashrom refs/changes/22/72822/1 diff --git a/cli_classic.c b/cli_classic.c index c72836f..d4aa27a 100644 --- a/cli_classic.c +++ b/cli_classic.c @@ -572,7 +572,7 @@ struct flashctx flashes[8] = {{0}}; struct flashctx *fill_flash; const char *name; - int namelen, opt, i, j; + int opt, i, j; int startchip = -1, chipcount = 0, option_index = 0; int operation_specified = 0; unsigned int wp_start = 0, wp_len = 0; @@ -825,33 +825,11 @@ "with \",\". Please see the man page " "for details.\n"); } - size_t p; - for (p = 0; p < programmer_table_size; p++) { - name = programmer_table[p]->name; - namelen = strlen(name); - if (strncmp(optarg, name, namelen) == 0) { - switch (optarg[namelen]) { - case ':': - pparam = strdup(optarg + namelen + 1); - if (!strlen(pparam)) { - free(pparam); - pparam = NULL; - } - prog = programmer_table[p]; - break; - case '\0': - prog = programmer_table[p]; - break; - default: - /* The continue refers to the - * for loop. It is here to be - * able to differentiate between - * foo and foobar. - */ - continue; - } - break; - } + name = strtok(optarg, ":"); + if (name) { + const char *params = strtok(NULL, ":"); + pparam = params ? strdup(params) : NULL; + prog = programmer_name_to_entry(name); } if (prog == NULL) { fprintf(stderr, "Error: Unknown programmer \"%s\". Valid choices are:\n", -- To view, visit https://review.coreboot.org/c/flashrom/+/72822 To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: flashrom Gerrit-Branch: master Gerrit-Change-Id: Icc9473b5b60012a736371dc8545ee0491cb06dc4 Gerrit-Change-Number: 72822 Gerrit-PatchSet: 1 Gerrit-Owner: Edward O'Callaghan <quasisec(a)chromium.org> Gerrit-MessageType: newchange

1 0

[S] Change in flashrom[master]: programmer_table.c: Allow name_to_entry() to return default when set
by Edward O'Callaghan (Code Review) 04 Feb '23

04 Feb '23

Edward O'Callaghan has uploaded this change for review. ( https://review.coreboot.org/c/flashrom/+/72821 ) Change subject: programmer_table.c: Allow name_to_entry() to return default when set ...................................................................... programmer_table.c: Allow name_to_entry() to return default when set Change-Id: I75fd24a76d0f6f25072428a8d992a1977c4ad1f8 Signed-off-by: Edward O'Callaghan <quasisec(a)google.com> --- M programmer_table.c 1 file changed, 16 insertions(+), 0 deletions(-) git pull ssh://review.coreboot.org:29418/flashrom refs/changes/21/72821/1 diff --git a/programmer_table.c b/programmer_table.c index 46f7c61..c4834d0 100644 --- a/programmer_table.c +++ b/programmer_table.c @@ -181,6 +181,12 @@ { unsigned prog; + if (strlen(name) == 0) { + const struct programmer_entry *const default_programmer = CONFIG_DEFAULT_PROGRAMMER_NAME; + if (default_programmer) + return default_programmer; + } + for (prog = 0; prog < programmer_table_size; prog++) { if (strcmp(name, programmer_table[prog]->name) == 0) break; -- To view, visit https://review.coreboot.org/c/flashrom/+/72821 To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: flashrom Gerrit-Branch: master Gerrit-Change-Id: I75fd24a76d0f6f25072428a8d992a1977c4ad1f8 Gerrit-Change-Number: 72821 Gerrit-PatchSet: 1 Gerrit-Owner: Edward O'Callaghan <quasisec(a)chromium.org> Gerrit-MessageType: newchange

1 0

[S] Change in flashrom[master]: programmer_table.c: Move name to entry to own function
by Edward O'Callaghan (Code Review) 04 Feb '23

04 Feb '23

Edward O'Callaghan has uploaded this change for review. ( https://review.coreboot.org/c/flashrom/+/72820 ) Change subject: programmer_table.c: Move name to entry to own function ...................................................................... programmer_table.c: Move name to entry to own function Change-Id: I5da3861b47d0d0b527e7cde5dd61bb696de6fedb Signed-off-by: Edward O'Callaghan <quasisec(a)google.com> --- M include/programmer.h M libflashrom.c M programmer_table.c 3 files changed, 32 insertions(+), 10 deletions(-) git pull ssh://review.coreboot.org:29418/flashrom refs/changes/20/72820/1 diff --git a/include/programmer.h b/include/programmer.h index db32b2c..84d8fa9 100644 --- a/include/programmer.h +++ b/include/programmer.h @@ -53,6 +53,7 @@ extern const struct programmer_entry *const programmer_table[]; extern const size_t programmer_table_size; +const struct programmer_entry *programmer_name_to_entry(const char *name); /* programmer drivers */ extern const struct programmer_entry programmer_atahpt; diff --git a/libflashrom.c b/libflashrom.c index 2e89fe5..090dbd4 100644 --- a/libflashrom.c +++ b/libflashrom.c @@ -193,18 +193,11 @@ int flashrom_programmer_init(struct flashrom_programmer **const flashprog, const char *const prog_name, const char *const prog_param) { - unsigned prog; - - for (prog = 0; prog < programmer_table_size; prog++) { - if (strcmp(prog_name, programmer_table[prog]->name) == 0) - break; - } - if (prog >= programmer_table_size) { - msg_ginfo("Error: Unknown programmer \"%s\". Valid choices are:\n", prog_name); - list_programmers_linebreak(0, 80, 0); + const struct programmer_entry *entry = programmer_name_to_entry(prog_name); + if (!entry) { return 1; } - return programmer_init(programmer_table[prog], prog_param); + return programmer_init(entry, prog_param); } int flashrom_programmer_shutdown(struct flashrom_programmer *const flashprog) diff --git a/programmer_table.c b/programmer_table.c index d58a155..46f7c61 100644 --- a/programmer_table.c +++ b/programmer_table.c @@ -12,6 +12,8 @@ * GNU General Public License for more details. */ +#include <string.h> + #include "programmer.h" const struct programmer_entry *const programmer_table[] = { @@ -174,3 +176,19 @@ }; const size_t programmer_table_size = ARRAY_SIZE(programmer_table); + +const struct programmer_entry *programmer_name_to_entry(const char *name) +{ + unsigned prog; + + for (prog = 0; prog < programmer_table_size; prog++) { + if (strcmp(name, programmer_table[prog]->name) == 0) + break; + } + if (prog >= programmer_table_size) { + msg_ginfo("Error: Unknown programmer \"%s\". Valid choices are:\n", name); + list_programmers_linebreak(0, 80, 0); + return NULL; + } + return programmer_table[prog]; +} -- To view, visit https://review.coreboot.org/c/flashrom/+/72820 To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: flashrom Gerrit-Branch: master Gerrit-Change-Id: I5da3861b47d0d0b527e7cde5dd61bb696de6fedb Gerrit-Change-Number: 72820 Gerrit-PatchSet: 1 Gerrit-Owner: Edward O'Callaghan <quasisec(a)chromium.org> Gerrit-MessageType: newchange

1 0

[S] Change in flashrom[master]: pcidev: Pass flashprg down to pcidev_init() entry
by Edward O'Callaghan (Code Review) 04 Feb '23

04 Feb '23

Attention is currently required from: Anastasia Klimchuk. Edward O'Callaghan has uploaded this change for review. ( https://review.coreboot.org/c/flashrom/+/72819 ) Change subject: pcidev: Pass flashprg down to pcidev_init() entry ...................................................................... pcidev: Pass flashprg down to pcidev_init() entry MAYBE needed to remove singletons. Change-Id: I77bd8e85db770d1105a0c49838b2559aa2615cf1 Signed-off-by: Edward O'Callaghan <quasisec(a)google.com> --- M atahpt.c M atapromise.c M atavia.c M drkaiser.c M gfxnvidia.c M include/programmer.h M it8212.c M nic3com.c M nicintel.c M nicintel_eeprom.c M nicintel_spi.c M nicnatsemi.c M nicrealtek.c M ogp_spi.c M pcidev.c M satamv.c M satasii.c M tests/tests.c 18 files changed, 30 insertions(+), 18 deletions(-) git pull ssh://review.coreboot.org:29418/flashrom refs/changes/19/72819/1 diff --git a/atahpt.c b/atahpt.c index f059b19..8283c40 100644 --- a/atahpt.c +++ b/atahpt.c @@ -86,7 +86,7 @@ if (rget_io_perms()) return 1; - dev = pcidev_init(cfg, ata_hpt, PCI_BASE_ADDRESS_4); + dev = pcidev_init(flashprog, cfg, ata_hpt, PCI_BASE_ADDRESS_4); if (!dev) return 1; diff --git a/atapromise.c b/atapromise.c index 208597b..fe97b69 100644 --- a/atapromise.c +++ b/atapromise.c @@ -128,7 +128,7 @@ if (rget_io_perms()) return 1; - dev = pcidev_init(cfg, ata_promise, PCI_BASE_ADDRESS_4); + dev = pcidev_init(flashprog, cfg, ata_promise, PCI_BASE_ADDRESS_4); if (!dev) return 1; diff --git a/atavia.c b/atavia.c index ba3c2ec..bc38cc0 100644 --- a/atavia.c +++ b/atavia.c @@ -158,7 +158,7 @@ } free(arg); - dev = pcidev_init(cfg, ata_via, PCI_ROM_ADDRESS); /* Actually no BAR setup needed at all. */ + dev = pcidev_init(flashprog, cfg, ata_via, PCI_ROM_ADDRESS); /* Actually no BAR setup needed at all. */ if (!dev) return 1; diff --git a/drkaiser.c b/drkaiser.c index 8be5dba..96178fc 100644 --- a/drkaiser.c +++ b/drkaiser.c @@ -81,7 +81,7 @@ uint32_t addr; uint8_t *bar; - dev = pcidev_init(cfg, drkaiser_pcidev, PCI_BASE_ADDRESS_2); + dev = pcidev_init(flashprog, cfg, drkaiser_pcidev, PCI_BASE_ADDRESS_2); if (!dev) return 1; diff --git a/gfxnvidia.c b/gfxnvidia.c index d445ab7..24063d4 100644 --- a/gfxnvidia.c +++ b/gfxnvidia.c @@ -106,7 +106,7 @@ uint32_t reg32; uint8_t *bar; - dev = pcidev_init(cfg, gfx_nvidia, PCI_BASE_ADDRESS_0); + dev = pcidev_init(flashprog, cfg, gfx_nvidia, PCI_BASE_ADDRESS_0); if (!dev) return 1; diff --git a/include/programmer.h b/include/programmer.h index 4e8aedd..f658882 100644 --- a/include/programmer.h +++ b/include/programmer.h @@ -121,7 +121,7 @@ extern struct pci_access *pacc; int pci_init_common(void); uintptr_t pcidev_readbar(struct pci_dev *dev, int bar); -struct pci_dev *pcidev_init(const struct programmer_cfg *cfg, const struct dev_entry *devs, int bar); +struct pci_dev *pcidev_init(struct flashrom_programmer *, const struct programmer_cfg *cfg, const struct dev_entry *devs, int bar); struct pci_dev *pcidev_scandev(struct pci_filter *filter, struct pci_dev *start); struct pci_dev *pcidev_getdevfn(struct pci_dev *dev, const int func); struct pci_dev *pcidev_find_vendorclass(uint16_t vendor, uint16_t devclass); diff --git a/it8212.c b/it8212.c index 9528b4d..9e1a9c4 100644 --- a/it8212.c +++ b/it8212.c @@ -72,7 +72,7 @@ { uint8_t *bar; - struct pci_dev *dev = pcidev_init(cfg, devs_it8212, PCI_ROM_ADDRESS); + struct pci_dev *dev = pcidev_init(flashprog, cfg, devs_it8212, PCI_ROM_ADDRESS); if (!dev) return 1; diff --git a/nic3com.c b/nic3com.c index de9762e..9c24f3c 100644 --- a/nic3com.c +++ b/nic3com.c @@ -105,7 +105,7 @@ if (rget_io_perms()) return 1; - dev = pcidev_init(cfg, nics_3com, PCI_BASE_ADDRESS_0); + dev = pcidev_init(flashprog, cfg, nics_3com, PCI_BASE_ADDRESS_0); if (!dev) return 1; diff --git a/nicintel.c b/nicintel.c index 444b894..0940d39 100644 --- a/nicintel.c +++ b/nicintel.c @@ -79,7 +79,7 @@ uint8_t *control_bar; /* FIXME: BAR2 is not available if the device uses the CardBus function. */ - dev = pcidev_init(cfg, nics_intel, PCI_BASE_ADDRESS_2); + dev = pcidev_init(flashprog, cfg, nics_intel, PCI_BASE_ADDRESS_2); if (!dev) return 1; diff --git a/nicintel_eeprom.c b/nicintel_eeprom.c index 58a14fd..cc1c7ce 100644 --- a/nicintel_eeprom.c +++ b/nicintel_eeprom.c @@ -485,7 +485,7 @@ uint32_t eec = 0; uint8_t *eebar; - struct pci_dev *dev = pcidev_init(cfg, nics_intel_ee, PCI_BASE_ADDRESS_0); + struct pci_dev *dev = pcidev_init(flashprog, cfg, nics_intel_ee, PCI_BASE_ADDRESS_0); if (!dev) return 1; diff --git a/nicintel_spi.c b/nicintel_spi.c index 16cf5f6..643bb2e 100644 --- a/nicintel_spi.c +++ b/nicintel_spi.c @@ -289,7 +289,7 @@ { struct pci_dev *dev = NULL; - dev = pcidev_init(cfg, nics_intel_spi, PCI_BASE_ADDRESS_0); + dev = pcidev_init(flashprog, cfg, nics_intel_spi, PCI_BASE_ADDRESS_0); if (!dev) return 1; diff --git a/nicnatsemi.c b/nicnatsemi.c index 5ec356a..3455ee5 100644 --- a/nicnatsemi.c +++ b/nicnatsemi.c @@ -90,7 +90,7 @@ if (rget_io_perms()) return 1; - dev = pcidev_init(cfg, nics_natsemi, PCI_BASE_ADDRESS_0); + dev = pcidev_init(flashprog, cfg, nics_natsemi, PCI_BASE_ADDRESS_0); if (!dev) return 1; diff --git a/nicrealtek.c b/nicrealtek.c index 68868e5..25f0fa0 100644 --- a/nicrealtek.c +++ b/nicrealtek.c @@ -101,7 +101,7 @@ if (rget_io_perms()) return 1; - dev = pcidev_init(cfg, nics_realtek, PCI_BASE_ADDRESS_0); + dev = pcidev_init(flashprog, cfg, nics_realtek, PCI_BASE_ADDRESS_0); if (!dev) return 1; diff --git a/ogp_spi.c b/ogp_spi.c index bee97ec..4b9ad8d 100644 --- a/ogp_spi.c +++ b/ogp_spi.c @@ -140,7 +140,7 @@ } free(type); - dev = pcidev_init(cfg, ogp_spi, PCI_BASE_ADDRESS_0); + dev = pcidev_init(flashprog, cfg, ogp_spi, PCI_BASE_ADDRESS_0); if (!dev) return 1; diff --git a/pcidev.c b/pcidev.c index 0b35944..8d7ddbe 100644 --- a/pcidev.c +++ b/pcidev.c @@ -257,7 +257,7 @@ * also matches the specified bus:device.function. * For convenience, this function also registers its own undo handlers. */ -struct pci_dev *pcidev_init(const struct programmer_cfg *cfg, const struct dev_entry *devs, int bar) +struct pci_dev *pcidev_init(struct flashrom_programmer *flashprog, const struct programmer_cfg *cfg, const struct dev_entry *devs, int bar) { struct pci_dev *dev; struct pci_dev *found_dev = NULL; diff --git a/satamv.c b/satamv.c index c2592d4..8bb92ee 100644 --- a/satamv.c +++ b/satamv.c @@ -120,7 +120,7 @@ return 1; /* BAR0 has all internal registers memory mapped. */ - dev = pcidev_init(cfg, satas_mv, PCI_BASE_ADDRESS_0); + dev = pcidev_init(flashprog, cfg, satas_mv, PCI_BASE_ADDRESS_0); if (!dev) return 1; diff --git a/satasii.c b/satasii.c index 8b9c794..214d4c9 100644 --- a/satasii.c +++ b/satasii.c @@ -106,7 +106,7 @@ uint16_t reg_offset, id; uint8_t *bar; - dev = pcidev_init(cfg, satas_sii, PCI_BASE_ADDRESS_0); + dev = pcidev_init(flashprog, cfg, satas_sii, PCI_BASE_ADDRESS_0); if (!dev) return 1; diff --git a/tests/tests.c b/tests/tests.c index 0912f35..76430b7 100644 --- a/tests/tests.c +++ b/tests/tests.c @@ -53,7 +53,7 @@ .device_id = NON_ZERO, }; -struct pci_dev *__wrap_pcidev_init(const struct programmer_cfg *cfg, void *devs, int bar) +struct pci_dev *__wrap_pcidev_init(struct flashrom_programmer *flashprog, const struct programmer_cfg *cfg, void *devs, int bar) { LOG_ME; return &mock_pci_dev; -- To view, visit https://review.coreboot.org/c/flashrom/+/72819 To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: flashrom Gerrit-Branch: master Gerrit-Change-Id: I77bd8e85db770d1105a0c49838b2559aa2615cf1 Gerrit-Change-Number: 72819 Gerrit-PatchSet: 1 Gerrit-Owner: Edward O'Callaghan <quasisec(a)chromium.org> Gerrit-Reviewer: Anastasia Klimchuk <aklm(a)chromium.org> Gerrit-Attention: Anastasia Klimchuk <aklm(a)chromium.org> Gerrit-MessageType: newchange

1 0

[S] Change in flashrom[master]: superio/: Pass flashprog to drv init() entry
by Edward O'Callaghan (Code Review) 04 Feb '23

04 Feb '23

Edward O'Callaghan has uploaded this change for review. ( https://review.coreboot.org/c/flashrom/+/72818 ) Change subject: superio/: Pass flashprog to drv init() entry ...................................................................... superio/: Pass flashprog to drv init() entry MAYBE needed to remove singletons. Change-Id: I81f39789152ac6d44a44197fa25154597e8855fa Signed-off-by: Edward O'Callaghan <quasisec(a)google.com> --- M include/programmer.h M internal.c M it87spi.c 3 files changed, 18 insertions(+), 6 deletions(-) git pull ssh://review.coreboot.org:29418/flashrom refs/changes/18/72818/1 diff --git a/include/programmer.h b/include/programmer.h index b4a4cfb..4e8aedd 100644 --- a/include/programmer.h +++ b/include/programmer.h @@ -372,7 +372,7 @@ void enter_conf_mode_ite(uint16_t port); void exit_conf_mode_ite(uint16_t port); void probe_superio_ite(void); -int init_superio_ite(const struct programmer_cfg *cfg); +int init_superio_ite(struct flashrom_programmer *, const struct programmer_cfg *cfg); /* trivial wrapper to avoid cluttering internal_init() with #if */ static inline int try_mtd(struct flashrom_programmer *flashprog, const struct programmer_cfg *cfg) diff --git a/internal.c b/internal.c index 0928f6e..654f696 100644 --- a/internal.c +++ b/internal.c @@ -270,7 +270,7 @@ #if defined(__i386__) || defined(__x86_64__) /* Probe unconditionally for ITE Super I/O chips. This enables LPC->SPI translation on IT87* and * parallel writes on IT8705F. Also, this handles the manual chip select for Gigabyte's DualBIOS. */ - init_superio_ite(cfg); + init_superio_ite(flashprog, cfg); if (board_flash_enable(board_vendor, board_model, cb_vendor, cb_model, force_boardenable)) { msg_perr("Aborting to be safe.\n"); diff --git a/it87spi.c b/it87spi.c index 1820ef4..1f38336 100644 --- a/it87spi.c +++ b/it87spi.c @@ -324,7 +324,7 @@ .probe_opcode = default_spi_probe_opcode, }; -static uint16_t it87spi_probe(const struct programmer_cfg *cfg, uint16_t port) +static uint16_t it87spi_probe(struct flashrom_programmer *flashprog, const struct programmer_cfg *cfg, uint16_t port) { uint8_t tmp = 0; uint16_t flashport = 0; @@ -440,10 +440,10 @@ if (internal_buses_supported & BUS_SPI) msg_pdbg("Overriding chipset SPI with IT87 SPI.\n"); /* FIXME: Add the SPI bus or replace the other buses with it? */ - return register_spi_master(NULL, &spi_master_it87xx, data); /* FIXME(quasisec): pass flashprog. */ + return register_spi_master(flashprog, &spi_master_it87xx, data); } -int init_superio_ite(const struct programmer_cfg *cfg) +int init_superio_ite(struct flashrom_programmer *flashprog, const struct programmer_cfg *cfg) { int i; int ret = 0; @@ -461,7 +461,7 @@ case 0x8718: case 0x8720: case 0x8728: - ret |= it87spi_probe(cfg, superios[i].port); + ret |= it87spi_probe(flashprog, cfg, superios[i].port); break; default: msg_pdbg2("Super I/O ID 0x%04hx is not on the list of flash-capable controllers.\n", -- To view, visit https://review.coreboot.org/c/flashrom/+/72818 To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: flashrom Gerrit-Branch: master Gerrit-Change-Id: I81f39789152ac6d44a44197fa25154597e8855fa Gerrit-Change-Number: 72818 Gerrit-PatchSet: 1 Gerrit-Owner: Edward O'Callaghan <quasisec(a)chromium.org> Gerrit-MessageType: newchange

1 0

[M] Change in flashrom[master]: register/: Pass flashprog though register_X_master() helpers
by Edward O'Callaghan (Code Review) 04 Feb '23

04 Feb '23

Attention is currently required from: Nikolai Artemiev. Edward O'Callaghan has uploaded this change for review. ( https://review.coreboot.org/c/flashrom/+/72817 ) Change subject: register/: Pass flashprog though register_X_master() helpers ...................................................................... register/: Pass flashprog though register_X_master() helpers Change-Id: I2ee5c8801d17512e6949e6ed7050c9162c107af3 Signed-off-by: Edward O'Callaghan <quasisec(a)google.com> --- M atahpt.c M atapromise.c M atavia.c M drkaiser.c M dummyflasher.c M gfxnvidia.c M ichspi.c M include/programmer.h M internal.c M it8212.c M linux_mtd.c M nic3com.c M nicintel.c M nicintel_eeprom.c M nicnatsemi.c M nicrealtek.c M opaque.c M parallel.c M satamv.c M satasii.c M serprog.c 21 files changed, 36 insertions(+), 23 deletions(-) git pull ssh://review.coreboot.org:29418/flashrom refs/changes/17/72817/1 diff --git a/atahpt.c b/atahpt.c index 43a10ad..f059b19 100644 --- a/atahpt.c +++ b/atahpt.c @@ -106,7 +106,7 @@ data->flash_access = pci_read_long(dev, REG_FLASH_ACCESS); pci_write_long(dev, REG_FLASH_ACCESS, data->flash_access | BIT_FLASH_ACCESS); - return register_par_master(&par_master_atahpt, BUS_PARALLEL, data); + return register_par_master(flashprog, &par_master_atahpt, BUS_PARALLEL, data); } const struct programmer_entry programmer_atahpt = { diff --git a/atapromise.c b/atapromise.c index 9deed47..208597b 100644 --- a/atapromise.c +++ b/atapromise.c @@ -170,7 +170,7 @@ data->rom_size = rom_size; max_rom_decode.parallel = rom_size; - return register_par_master(&par_master_atapromise, BUS_PARALLEL, data); + return register_par_master(flashprog, &par_master_atapromise, BUS_PARALLEL, data); } const struct programmer_entry programmer_atapromise = { diff --git a/atavia.c b/atavia.c index 92ac261..ba3c2ec 100644 --- a/atavia.c +++ b/atavia.c @@ -176,7 +176,7 @@ return 1; } - return register_par_master(&lpc_master_atavia, BUS_LPC, NULL); + return register_par_master(flashprog, &lpc_master_atavia, BUS_LPC, NULL); } const struct programmer_entry programmer_atavia = { diff --git a/drkaiser.c b/drkaiser.c index 2e5dd1a..8be5dba 100644 --- a/drkaiser.c +++ b/drkaiser.c @@ -108,7 +108,7 @@ max_rom_decode.parallel = 128 * 1024; - return register_par_master(&par_master_drkaiser, BUS_PARALLEL, data); + return register_par_master(flashprog, &par_master_drkaiser, BUS_PARALLEL, data); } const struct programmer_entry programmer_drkaiser = { diff --git a/dummyflasher.c b/dummyflasher.c index 149811c..bd4b94a 100644 --- a/dummyflasher.c +++ b/dummyflasher.c @@ -1418,9 +1418,9 @@ } if (dummy_buses_supported & BUS_PROG) - ret |= register_opaque_master(&opaque_master_dummyflasher, data); + ret |= register_opaque_master(flashprog, &opaque_master_dummyflasher, data); if (dummy_buses_supported & BUS_NONSPI) - ret |= register_par_master(&par_master_dummyflasher, + ret |= register_par_master(flashprog, &par_master_dummyflasher, dummy_buses_supported & BUS_NONSPI, data); if (dummy_buses_supported & BUS_SPI) diff --git a/gfxnvidia.c b/gfxnvidia.c index 7d8eb59..d445ab7 100644 --- a/gfxnvidia.c +++ b/gfxnvidia.c @@ -136,7 +136,7 @@ /* Write/erase doesn't work. */ programmer_may_write = false; - return register_par_master(&par_master_gfxnvidia, BUS_PARALLEL, data); + return register_par_master(flashprog, &par_master_gfxnvidia, BUS_PARALLEL, data); } const struct programmer_entry programmer_gfxnvidia = { diff --git a/ichspi.c b/ichspi.c index 1aae99b..877064a 100644 --- a/ichspi.c +++ b/ichspi.c @@ -2348,7 +2348,7 @@ if (!opaque_hwseq_data) return ERROR_FLASHROM_FATAL; memcpy(opaque_hwseq_data, &hwseq_data, sizeof(*opaque_hwseq_data)); - register_opaque_master(&opaque_master_ich_hwseq, opaque_hwseq_data); + register_opaque_master(flashprog, &opaque_master_ich_hwseq, opaque_hwseq_data); } else { register_spi_master(&spi_master_ich9, NULL); } diff --git a/include/programmer.h b/include/programmer.h index 9f807c5..56c6524 100644 --- a/include/programmer.h +++ b/include/programmer.h @@ -421,7 +421,8 @@ void (*delay) (const struct flashctx *flash, unsigned int usecs); void *data; }; -int register_opaque_master(const struct opaque_master *mst, void *data); +int register_opaque_master(struct flashrom_programmer *flashprog, + const struct opaque_master *mst, void *data); /* parallel.c */ struct par_master { @@ -439,7 +440,7 @@ void (*delay) (const struct flashctx *flash, unsigned int usecs); void *data; }; -int register_par_master(const struct par_master *mst, const enum chipbustype buses, void *data); +int register_par_master(struct flashrom_programmer *flashprog, const struct par_master *mst, const enum chipbustype buses, void *data); /* programmer.c */ struct registered_master { diff --git a/internal.c b/internal.c index c2e428f..0928f6e 100644 --- a/internal.c +++ b/internal.c @@ -280,7 +280,7 @@ #endif if (internal_buses_supported & BUS_NONSPI) - register_par_master(&par_master_internal, internal_buses_supported, NULL); + register_par_master(flashprog, &par_master_internal, internal_buses_supported, NULL); /* Report if a non-whitelisted laptop is detected that likely uses a legacy bus. */ if (is_laptop && !laptop_ok) { diff --git a/it8212.c b/it8212.c index 2450454..9528b4d 100644 --- a/it8212.c +++ b/it8212.c @@ -98,7 +98,7 @@ pci_write_long(dev, PCI_ROM_ADDRESS, io_base_addr | 0x01); max_rom_decode.parallel = IT8212_MEMMAP_SIZE; - return register_par_master(&par_master_it8212, BUS_PARALLEL, data); + return register_par_master(flashprog, &par_master_it8212, BUS_PARALLEL, data); } const struct programmer_entry programmer_it8212 = { .name = "it8212", diff --git a/linux_mtd.c b/linux_mtd.c index 0e68cc7..4d79114 100644 --- a/linux_mtd.c +++ b/linux_mtd.c @@ -545,7 +545,7 @@ return 1; } - return register_opaque_master(&linux_mtd_opaque_master, data); + return register_opaque_master(flashprog, &linux_mtd_opaque_master, data); linux_mtd_init_exit: free(param_str); diff --git a/nic3com.c b/nic3com.c index 8ca79ae..de9762e 100644 --- a/nic3com.c +++ b/nic3com.c @@ -144,7 +144,7 @@ max_rom_decode.parallel = 128 * 1024; - return register_par_master(&par_master_nic3com, BUS_PARALLEL, data); + return register_par_master(flashprog, &par_master_nic3com, BUS_PARALLEL, data); init_err_cleanup_exit: /* 3COM 3C90xB cards need a special fixup. */ diff --git a/nicintel.c b/nicintel.c index 0e19856..444b894 100644 --- a/nicintel.c +++ b/nicintel.c @@ -119,7 +119,7 @@ data->nicintel_control_bar = control_bar; max_rom_decode.parallel = NICINTEL_MEMMAP_SIZE; - return register_par_master(&par_master_nicintel, BUS_PARALLEL, data); + return register_par_master(flashprog, &par_master_nicintel, BUS_PARALLEL, data); } const struct programmer_entry programmer_nicintel = { diff --git a/nicintel_eeprom.c b/nicintel_eeprom.c index 2a7861c..58a14fd 100644 --- a/nicintel_eeprom.c +++ b/nicintel_eeprom.c @@ -530,7 +530,7 @@ data->eec = eec; data->done_i210_write = false; - return register_opaque_master(mst, data); + return register_opaque_master(flashprog, mst, data); } const struct programmer_entry programmer_nicintel_eeprom = { diff --git a/nicnatsemi.c b/nicnatsemi.c index 817855e..5ec356a 100644 --- a/nicnatsemi.c +++ b/nicnatsemi.c @@ -112,7 +112,7 @@ * functions below wants to be 0x0000FFFF. */ max_rom_decode.parallel = 131072; - return register_par_master(&par_master_nicnatsemi, BUS_PARALLEL, data); + return register_par_master(flashprog, &par_master_nicnatsemi, BUS_PARALLEL, data); } diff --git a/nicrealtek.c b/nicrealtek.c index d2c7850..68868e5 100644 --- a/nicrealtek.c +++ b/nicrealtek.c @@ -132,7 +132,7 @@ data->bios_rom_addr = bios_rom_addr; data->bios_rom_data = bios_rom_data; - return register_par_master(&par_master_nicrealtek, BUS_PARALLEL, data); + return register_par_master(flashprog, &par_master_nicrealtek, BUS_PARALLEL, data); } const struct programmer_entry programmer_nicrealtek = { diff --git a/opaque.c b/opaque.c index 7704ec7..d7c3322 100644 --- a/opaque.c +++ b/opaque.c @@ -21,6 +21,7 @@ */ #include <stdint.h> + #include "flash.h" #include "flashchips.h" #include "chipdrivers.h" @@ -46,7 +47,8 @@ return flash->mst->opaque.erase(flash, blockaddr, blocklen); } -int register_opaque_master(const struct opaque_master *mst, void *data) +int register_opaque_master(struct flashrom_programmer *flashprog, + const struct opaque_master *mst, void *data) { struct registered_master rmst = {0}; diff --git a/parallel.c b/parallel.c index b193723..ce0749d 100644 --- a/parallel.c +++ b/parallel.c @@ -126,7 +126,7 @@ fallback_chip_readn(flash, buf, addr, len); } -int register_par_master(const struct par_master *mst, +int register_par_master(struct flashrom_programmer *flashprog, const struct par_master *mst, const enum chipbustype buses, void *data) { diff --git a/satamv.c b/satamv.c index 0aee07f..c2592d4 100644 --- a/satamv.c +++ b/satamv.c @@ -197,7 +197,7 @@ /* 512 kByte with two 8-bit latches, and * 4 MByte with additional 3-bit latch. */ max_rom_decode.parallel = 4 * 1024 * 1024; - return register_par_master(&par_master_satamv, BUS_PARALLEL, data); + return register_par_master(flashprog, &par_master_satamv, BUS_PARALLEL, data); } const struct programmer_entry programmer_satamv = { diff --git a/satasii.c b/satasii.c index 4e6b7de..8b9c794 100644 --- a/satasii.c +++ b/satasii.c @@ -140,7 +140,7 @@ } data->bar = bar; - return register_par_master(&par_master_satasii, BUS_PARALLEL, data); + return register_par_master(flashprog, &par_master_satasii, BUS_PARALLEL, data); } const struct programmer_entry programmer_satasii = { .name = "satasii", diff --git a/serprog.c b/serprog.c index 2b1b7f1..8f9e09d 100644 --- a/serprog.c +++ b/serprog.c @@ -952,7 +952,7 @@ if (serprog_buses_supported & BUS_SPI) register_spi_master(&spi_master_serprog, NULL); if (serprog_buses_supported & BUS_NONSPI) - register_par_master(&par_master_serprog, serprog_buses_supported & BUS_NONSPI, NULL); + register_par_master(flashprog, &par_master_serprog, serprog_buses_supported & BUS_NONSPI, NULL); return 0; init_err_cleanup_exit: -- To view, visit https://review.coreboot.org/c/flashrom/+/72817 To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: flashrom Gerrit-Branch: master Gerrit-Change-Id: I2ee5c8801d17512e6949e6ed7050c9162c107af3 Gerrit-Change-Number: 72817 Gerrit-PatchSet: 1 Gerrit-Owner: Edward O'Callaghan <quasisec(a)chromium.org> Gerrit-Reviewer: Nikolai Artemiev <nartemiev(a)google.com> Gerrit-Attention: Nikolai Artemiev <nartemiev(a)google.com> Gerrit-MessageType: newchange

1 0

[L] Change in flashrom[master]: internal/chipset_enable: Pass flashprog to drv init() entry
by Edward O'Callaghan (Code Review) 04 Feb '23

04 Feb '23

Attention is currently required from: Arthur Heymans. Edward O'Callaghan has uploaded this change for review. ( https://review.coreboot.org/c/flashrom/+/72816 ) Change subject: internal/chipset_enable: Pass flashprog to drv init() entry ...................................................................... internal/chipset_enable: Pass flashprog to drv init() entry Change-Id: I07c968fd77960b7c1d1dddb1009fac68e6c45bf2 Signed-off-by: Edward O'Callaghan <quasisec(a)google.com> --- M chipset_enable.c M ichspi.c M include/programmer.h M internal.c M sb600spi.c 5 files changed, 135 insertions(+), 125 deletions(-) git pull ssh://review.coreboot.org:29418/flashrom refs/changes/16/72816/1 diff --git a/chipset_enable.c b/chipset_enable.c index 480113a..f7e0916 100644 --- a/chipset_enable.c +++ b/chipset_enable.c @@ -44,7 +44,7 @@ #include "hwaccess_x86_io.h" #include "hwaccess_x86_msr.h" -static int enable_flash_ali_m1533(const struct programmer_cfg *cfg, struct pci_dev *dev, const char *name) +static int enable_flash_ali_m1533(struct flashrom_programmer *flashprog, const struct programmer_cfg *cfg, struct pci_dev *dev, const char *name) { uint8_t tmp; @@ -59,7 +59,7 @@ return 0; } -static int enable_flash_rdc_r8610(const struct programmer_cfg *cfg, struct pci_dev *dev, const char *name) +static int enable_flash_rdc_r8610(struct flashrom_programmer *flashprog, const struct programmer_cfg *cfg, struct pci_dev *dev, const char *name) { uint8_t tmp; @@ -85,7 +85,7 @@ return 0; } -static int enable_flash_sis85c496(const struct programmer_cfg *cfg, struct pci_dev *dev, const char *name) +static int enable_flash_sis85c496(struct flashrom_programmer *flashprog, const struct programmer_cfg *cfg, struct pci_dev *dev, const char *name) { uint8_t tmp; @@ -96,7 +96,7 @@ return 0; } -static int enable_flash_sis_mapping(const struct programmer_cfg *cfg, struct pci_dev *dev, const char *name) +static int enable_flash_sis_mapping(struct flashrom_programmer *flashprog, const struct programmer_cfg *cfg, struct pci_dev *dev, const char *name) { #define SIS_MAPREG 0x40 uint8_t new, newer; @@ -135,7 +135,7 @@ return sbdev; } -static int enable_flash_sis501(const struct programmer_cfg *cfg, struct pci_dev *dev, const char *name) +static int enable_flash_sis501(struct flashrom_programmer *flashprog, const struct programmer_cfg *cfg, struct pci_dev *dev, const char *name) { uint8_t tmp; int ret = 0; @@ -145,7 +145,7 @@ if (!sbdev) return -1; - ret = enable_flash_sis_mapping(cfg, sbdev, name); + ret = enable_flash_sis_mapping(flashprog, cfg, sbdev, name); tmp = sio_read(0x22, 0x80); tmp &= (~0x20); @@ -160,7 +160,7 @@ return ret; } -static int enable_flash_sis5511(const struct programmer_cfg *cfg, struct pci_dev *dev, const char *name) +static int enable_flash_sis5511(struct flashrom_programmer *flashprog, const struct programmer_cfg *cfg, struct pci_dev *dev, const char *name) { uint8_t tmp; int ret = 0; @@ -170,7 +170,7 @@ if (!sbdev) return -1; - ret = enable_flash_sis_mapping(cfg, sbdev, name); + ret = enable_flash_sis_mapping(flashprog, cfg, sbdev, name); tmp = sio_read(0x22, 0x50); tmp &= (~0x20); @@ -180,7 +180,7 @@ return ret; } -static int enable_flash_sis5x0(const struct programmer_cfg *cfg, struct pci_dev *dev, const char *name, uint8_t dis_mask, uint8_t en_mask) +static int enable_flash_sis5x0(struct flashrom_programmer *flashprog, const struct programmer_cfg *cfg, struct pci_dev *dev, const char *name, uint8_t dis_mask, uint8_t en_mask) { #define SIS_REG 0x45 uint8_t new, newer; @@ -191,7 +191,7 @@ if (!sbdev) return -1; - ret = enable_flash_sis_mapping(cfg, sbdev, name); + ret = enable_flash_sis_mapping(flashprog, cfg, sbdev, name); new = pci_read_byte(sbdev, SIS_REG); new &= (~dis_mask); @@ -207,14 +207,14 @@ return ret; } -static int enable_flash_sis530(const struct programmer_cfg *cfg, struct pci_dev *dev, const char *name) +static int enable_flash_sis530(struct flashrom_programmer *flashprog, const struct programmer_cfg *cfg, struct pci_dev *dev, const char *name) { - return enable_flash_sis5x0(cfg, dev, name, 0x20, 0x04); + return enable_flash_sis5x0(flashprog, cfg, dev, name, 0x20, 0x04); } -static int enable_flash_sis540(const struct programmer_cfg *cfg, struct pci_dev *dev, const char *name) +static int enable_flash_sis540(struct flashrom_programmer *flashprog, const struct programmer_cfg *cfg, struct pci_dev *dev, const char *name) { - return enable_flash_sis5x0(cfg, dev, name, 0x80, 0x40); + return enable_flash_sis5x0(flashprog, cfg, dev, name, 0x80, 0x40); } /* Datasheet: @@ -223,7 +223,7 @@ * - PDF: http://www.intel.com/design/intarch/datashts/29056201.pdf * - Order Number: 290562-001 */ -static int enable_flash_piix4(const struct programmer_cfg *cfg, struct pci_dev *dev, const char *name) +static int enable_flash_piix4(struct flashrom_programmer *flashprog, const struct programmer_cfg *cfg, struct pci_dev *dev, const char *name) { uint16_t old, new; uint16_t xbcs = 0x4e; /* X-Bus Chip Select register. */ @@ -380,7 +380,7 @@ return enable_flash_ich_bios_cntl_common(ich_generation, addr, NULL, 0); } -static int enable_flash_ich_fwh_decode(const struct programmer_cfg *cfg, struct pci_dev *dev, enum ich_chipset ich_generation) +static int enable_flash_ich_fwh_decode(struct flashrom_programmer *flashprog, const struct programmer_cfg *cfg, struct pci_dev *dev, enum ich_chipset ich_generation) { uint8_t fwh_sel1 = 0, fwh_sel2 = 0, fwh_dec_en_lo = 0, fwh_dec_en_hi = 0; /* silence compilers */ bool implemented = 0; @@ -555,36 +555,36 @@ return 0; } -static int enable_flash_ich_fwh(const struct programmer_cfg *cfg, struct pci_dev *dev, enum ich_chipset ich_generation, uint8_t bios_cntl) +static int enable_flash_ich_fwh(struct flashrom_programmer *flashprog, const struct programmer_cfg *cfg, struct pci_dev *dev, enum ich_chipset ich_generation, uint8_t bios_cntl) { int err; /* Configure FWH IDSEL decoder maps. */ - if ((err = enable_flash_ich_fwh_decode(cfg, dev, ich_generation)) != 0) + if ((err = enable_flash_ich_fwh_decode(flashprog, cfg, dev, ich_generation)) != 0) return err; internal_buses_supported &= BUS_FWH; return enable_flash_ich_bios_cntl_config_space(dev, ich_generation, bios_cntl); } -static int enable_flash_ich0(const struct programmer_cfg *cfg, struct pci_dev *dev, const char *name) +static int enable_flash_ich0(struct flashrom_programmer *flashprog, const struct programmer_cfg *cfg, struct pci_dev *dev, const char *name) { - return enable_flash_ich_fwh(cfg, dev, CHIPSET_ICH, 0x4e); + return enable_flash_ich_fwh(flashprog, cfg, dev, CHIPSET_ICH, 0x4e); } -static int enable_flash_ich2345(const struct programmer_cfg *cfg, struct pci_dev *dev, const char *name) +static int enable_flash_ich2345(struct flashrom_programmer *flashprog, const struct programmer_cfg *cfg, struct pci_dev *dev, const char *name) { - return enable_flash_ich_fwh(cfg, dev, CHIPSET_ICH2345, 0x4e); + return enable_flash_ich_fwh(flashprog, cfg, dev, CHIPSET_ICH2345, 0x4e); } -static int enable_flash_ich6(const struct programmer_cfg *cfg, struct pci_dev *dev, const char *name) +static int enable_flash_ich6(struct flashrom_programmer *flashprog, const struct programmer_cfg *cfg, struct pci_dev *dev, const char *name) { - return enable_flash_ich_fwh(cfg, dev, CHIPSET_ICH6, 0xdc); + return enable_flash_ich_fwh(flashprog, cfg, dev, CHIPSET_ICH6, 0xdc); } -static int enable_flash_poulsbo(const struct programmer_cfg *cfg, struct pci_dev *dev, const char *name) +static int enable_flash_poulsbo(struct flashrom_programmer *flashprog, const struct programmer_cfg *cfg, struct pci_dev *dev, const char *name) { - return enable_flash_ich_fwh(cfg, dev, CHIPSET_POULSBO, 0xd8); + return enable_flash_ich_fwh(flashprog, cfg, dev, CHIPSET_POULSBO, 0xd8); } static enum chipbustype enable_flash_ich_report_gcs( @@ -770,7 +770,7 @@ return boot_straps[bbs].bus; } -static int enable_flash_ich_spi(const struct programmer_cfg *cfg, struct pci_dev *dev, enum ich_chipset ich_generation, uint8_t bios_cntl) +static int enable_flash_ich_spi(struct flashrom_programmer *flashprog, const struct programmer_cfg *cfg, struct pci_dev *dev, enum ich_chipset ich_generation, uint8_t bios_cntl) { /* Get physical address of Root Complex Register Block */ uint32_t rcra = pci_read_long(dev, 0xf0) & 0xffffc000; @@ -784,7 +784,7 @@ const enum chipbustype boot_buses = enable_flash_ich_report_gcs(dev, ich_generation, rcrb); /* Handle FWH-related parameters and initialization */ - int ret_fwh = enable_flash_ich_fwh(cfg, dev, ich_generation, bios_cntl); + int ret_fwh = enable_flash_ich_fwh(flashprog, cfg, dev, ich_generation, bios_cntl); if (ret_fwh == ERROR_FLASHROM_FATAL) return ret_fwh; @@ -817,7 +817,7 @@ void *spibar = rcrb + spibar_offset; /* This adds BUS_SPI */ - int ret_spi = ich_init_spi(cfg, spibar, ich_generation); + int ret_spi = ich_init_spi(flashprog, cfg, spibar, ich_generation); if (ret_spi == ERROR_FLASHROM_FATAL) return ret_spi; @@ -831,82 +831,82 @@ return 0; } -static int enable_flash_tunnelcreek(const struct programmer_cfg *cfg, struct pci_dev *dev, const char *name) +static int enable_flash_tunnelcreek(struct flashrom_programmer *flashprog, const struct programmer_cfg *cfg, struct pci_dev *dev, const char *name) { - return enable_flash_ich_spi(cfg, dev, CHIPSET_TUNNEL_CREEK, 0xd8); + return enable_flash_ich_spi(flashprog, cfg, dev, CHIPSET_TUNNEL_CREEK, 0xd8); } -static int enable_flash_s12x0(const struct programmer_cfg *cfg, struct pci_dev *dev, const char *name) +static int enable_flash_s12x0(struct flashrom_programmer *flashprog, const struct programmer_cfg *cfg, struct pci_dev *dev, const char *name) { - return enable_flash_ich_spi(cfg, dev, CHIPSET_CENTERTON, 0xd8); + return enable_flash_ich_spi(flashprog, cfg, dev, CHIPSET_CENTERTON, 0xd8); } -static int enable_flash_ich7(const struct programmer_cfg *cfg, struct pci_dev *dev, const char *name) +static int enable_flash_ich7(struct flashrom_programmer *flashprog, const struct programmer_cfg *cfg, struct pci_dev *dev, const char *name) { - return enable_flash_ich_spi(cfg, dev, CHIPSET_ICH7, 0xdc); + return enable_flash_ich_spi(flashprog, cfg, dev, CHIPSET_ICH7, 0xdc); } -static int enable_flash_ich8(const struct programmer_cfg *cfg, struct pci_dev *dev, const char *name) +static int enable_flash_ich8(struct flashrom_programmer *flashprog, const struct programmer_cfg *cfg, struct pci_dev *dev, const char *name) { - return enable_flash_ich_spi(cfg, dev, CHIPSET_ICH8, 0xdc); + return enable_flash_ich_spi(flashprog, cfg, dev, CHIPSET_ICH8, 0xdc); } -static int enable_flash_ich9(const struct programmer_cfg *cfg, struct pci_dev *dev, const char *name) +static int enable_flash_ich9(struct flashrom_programmer *flashprog, const struct programmer_cfg *cfg, struct pci_dev *dev, const char *name) { - return enable_flash_ich_spi(cfg, dev, CHIPSET_ICH9, 0xdc); + return enable_flash_ich_spi(flashprog, cfg, dev, CHIPSET_ICH9, 0xdc); } -static int enable_flash_ich10(const struct programmer_cfg *cfg, struct pci_dev *dev, const char *name) +static int enable_flash_ich10(struct flashrom_programmer *flashprog, const struct programmer_cfg *cfg, struct pci_dev *dev, const char *name) { - return enable_flash_ich_spi(cfg, dev, CHIPSET_ICH10, 0xdc); + return enable_flash_ich_spi(flashprog, cfg, dev, CHIPSET_ICH10, 0xdc); } /* Ibex Peak aka. 5 series & 3400 series */ -static int enable_flash_pch5(const struct programmer_cfg *cfg, struct pci_dev *dev, const char *name) +static int enable_flash_pch5(struct flashrom_programmer *flashprog, const struct programmer_cfg *cfg, struct pci_dev *dev, const char *name) { - return enable_flash_ich_spi(cfg, dev, CHIPSET_5_SERIES_IBEX_PEAK, 0xdc); + return enable_flash_ich_spi(flashprog, cfg, dev, CHIPSET_5_SERIES_IBEX_PEAK, 0xdc); } /* Cougar Point aka. 6 series & c200 series */ -static int enable_flash_pch6(const struct programmer_cfg *cfg, struct pci_dev *dev, const char *name) +static int enable_flash_pch6(struct flashrom_programmer *flashprog, const struct programmer_cfg *cfg, struct pci_dev *dev, const char *name) { - return enable_flash_ich_spi(cfg, dev, CHIPSET_6_SERIES_COUGAR_POINT, 0xdc); + return enable_flash_ich_spi(flashprog, cfg, dev, CHIPSET_6_SERIES_COUGAR_POINT, 0xdc); } /* Panther Point aka. 7 series */ -static int enable_flash_pch7(const struct programmer_cfg *cfg, struct pci_dev *dev, const char *name) +static int enable_flash_pch7(struct flashrom_programmer *flashprog, const struct programmer_cfg *cfg, struct pci_dev *dev, const char *name) { - return enable_flash_ich_spi(cfg, dev, CHIPSET_7_SERIES_PANTHER_POINT, 0xdc); + return enable_flash_ich_spi(flashprog, cfg, dev, CHIPSET_7_SERIES_PANTHER_POINT, 0xdc); } /* Lynx Point aka. 8 series */ -static int enable_flash_pch8(const struct programmer_cfg *cfg, struct pci_dev *dev, const char *name) +static int enable_flash_pch8(struct flashrom_programmer *flashprog, const struct programmer_cfg *cfg, struct pci_dev *dev, const char *name) { - return enable_flash_ich_spi(cfg, dev, CHIPSET_8_SERIES_LYNX_POINT, 0xdc); + return enable_flash_ich_spi(flashprog, cfg, dev, CHIPSET_8_SERIES_LYNX_POINT, 0xdc); } /* Lynx Point LP aka. 8 series low-power */ -static int enable_flash_pch8_lp(const struct programmer_cfg *cfg, struct pci_dev *dev, const char *name) +static int enable_flash_pch8_lp(struct flashrom_programmer *flashprog, const struct programmer_cfg *cfg, struct pci_dev *dev, const char *name) { - return enable_flash_ich_spi(cfg, dev, CHIPSET_8_SERIES_LYNX_POINT_LP, 0xdc); + return enable_flash_ich_spi(flashprog, cfg, dev, CHIPSET_8_SERIES_LYNX_POINT_LP, 0xdc); } /* Wellsburg (for Haswell-EP Xeons) */ -static int enable_flash_pch8_wb(const struct programmer_cfg *cfg, struct pci_dev *dev, const char *name) +static int enable_flash_pch8_wb(struct flashrom_programmer *flashprog, const struct programmer_cfg *cfg, struct pci_dev *dev, const char *name) { - return enable_flash_ich_spi(cfg, dev, CHIPSET_8_SERIES_WELLSBURG, 0xdc); + return enable_flash_ich_spi(flashprog, cfg, dev, CHIPSET_8_SERIES_WELLSBURG, 0xdc); } /* Wildcat Point */ -static int enable_flash_pch9(const struct programmer_cfg *cfg, struct pci_dev *dev, const char *name) +static int enable_flash_pch9(struct flashrom_programmer *flashprog, const struct programmer_cfg *cfg, struct pci_dev *dev, const char *name) { - return enable_flash_ich_spi(cfg, dev, CHIPSET_9_SERIES_WILDCAT_POINT, 0xdc); + return enable_flash_ich_spi(flashprog, cfg, dev, CHIPSET_9_SERIES_WILDCAT_POINT, 0xdc); } /* Wildcat Point LP */ -static int enable_flash_pch9_lp(const struct programmer_cfg *cfg, struct pci_dev *dev, const char *name) +static int enable_flash_pch9_lp(struct flashrom_programmer *flashprog, const struct programmer_cfg *cfg, struct pci_dev *dev, const char *name) { - return enable_flash_ich_spi(cfg, dev, CHIPSET_9_SERIES_WILDCAT_POINT_LP, 0xdc); + return enable_flash_ich_spi(flashprog, cfg, dev, CHIPSET_9_SERIES_WILDCAT_POINT_LP, 0xdc); } /* Sunrise Point */ @@ -916,7 +916,7 @@ return 0; } -static int enable_flash_pch100_or_c620(const struct programmer_cfg *cfg, +static int enable_flash_pch100_or_c620(struct flashrom_programmer *flashprog, const struct programmer_cfg *cfg, struct pci_dev *const dev, const char *const name, const int slot, const int func, const enum ich_chipset pch_generation) { @@ -961,7 +961,7 @@ msg_pdbg("SPIBAR = 0x%0*" PRIxPTR " (phys = 0x%08x)\n", PRIxPTR_WIDTH, (uintptr_t)spibar, phys_spibar); /* This adds BUS_SPI */ - const int ret_spi = ich_init_spi(cfg, spibar, pch_generation); + const int ret_spi = ich_init_spi(flashprog, cfg, spibar, pch_generation); if (ret_spi != ERROR_FLASHROM_FATAL) { if (ret_bc || ret_spi) ret = ERROR_FLASHROM_NONFATAL; @@ -979,59 +979,59 @@ return ret; } -static int enable_flash_pch100(const struct programmer_cfg *cfg, struct pci_dev *const dev, const char *const name) +static int enable_flash_pch100(struct flashrom_programmer *flashprog, const struct programmer_cfg *cfg, struct pci_dev *const dev, const char *const name) { - return enable_flash_pch100_or_c620(cfg, dev, name, 0x1f, 5, CHIPSET_100_SERIES_SUNRISE_POINT); + return enable_flash_pch100_or_c620(flashprog, cfg, dev, name, 0x1f, 5, CHIPSET_100_SERIES_SUNRISE_POINT); } -static int enable_flash_c620(const struct programmer_cfg *cfg, struct pci_dev *const dev, const char *const name) +static int enable_flash_c620(struct flashrom_programmer *flashprog, const struct programmer_cfg *cfg, struct pci_dev *const dev, const char *const name) { - return enable_flash_pch100_or_c620(cfg, dev, name, 0x1f, 5, CHIPSET_C620_SERIES_LEWISBURG); + return enable_flash_pch100_or_c620(flashprog, cfg, dev, name, 0x1f, 5, CHIPSET_C620_SERIES_LEWISBURG); } -static int enable_flash_pch300(const struct programmer_cfg *cfg, struct pci_dev *const dev, const char *const name) +static int enable_flash_pch300(struct flashrom_programmer *flashprog, const struct programmer_cfg *cfg, struct pci_dev *const dev, const char *const name) { - return enable_flash_pch100_or_c620(cfg, dev, name, 0x1f, 5, CHIPSET_300_SERIES_CANNON_POINT); + return enable_flash_pch100_or_c620(flashprog, cfg, dev, name, 0x1f, 5, CHIPSET_300_SERIES_CANNON_POINT); } -static int enable_flash_pch400(const struct programmer_cfg *cfg, struct pci_dev *const dev, const char *const name) +static int enable_flash_pch400(struct flashrom_programmer *flashprog, const struct programmer_cfg *cfg, struct pci_dev *const dev, const char *const name) { - return enable_flash_pch100_or_c620(cfg, dev, name, 0x1f, 5, CHIPSET_400_SERIES_COMET_POINT); + return enable_flash_pch100_or_c620(flashprog, cfg, dev, name, 0x1f, 5, CHIPSET_400_SERIES_COMET_POINT); } -static int enable_flash_pch500(const struct programmer_cfg *cfg, struct pci_dev *const dev, const char *const name) +static int enable_flash_pch500(struct flashrom_programmer *flashprog, const struct programmer_cfg *cfg, struct pci_dev *const dev, const char *const name) { - return enable_flash_pch100_or_c620(cfg, dev, name, 0x1f, 5, CHIPSET_500_SERIES_TIGER_POINT); + return enable_flash_pch100_or_c620(flashprog, cfg, dev, name, 0x1f, 5, CHIPSET_500_SERIES_TIGER_POINT); } -static int enable_flash_pch600(const struct programmer_cfg *cfg, struct pci_dev *const dev, const char *const name) +static int enable_flash_pch600(struct flashrom_programmer *flashprog, const struct programmer_cfg *cfg, struct pci_dev *const dev, const char *const name) { - return enable_flash_pch100_or_c620(cfg, dev, name, 0x1f, 5, CHIPSET_600_SERIES_ALDER_POINT); + return enable_flash_pch100_or_c620(flashprog, cfg, dev, name, 0x1f, 5, CHIPSET_600_SERIES_ALDER_POINT); } -static int enable_flash_mtl(const struct programmer_cfg *cfg, struct pci_dev *const dev, const char *const name) +static int enable_flash_mtl(struct flashrom_programmer *flashprog, const struct programmer_cfg *cfg, struct pci_dev *const dev, const char *const name) { - return enable_flash_pch100_or_c620(cfg, dev, name, 0x1f, 5, CHIPSET_METEOR_LAKE); + return enable_flash_pch100_or_c620(flashprog, cfg, dev, name, 0x1f, 5, CHIPSET_METEOR_LAKE); } -static int enable_flash_mcc(const struct programmer_cfg *cfg, struct pci_dev *const dev, const char *const name) +static int enable_flash_mcc(struct flashrom_programmer *flashprog, const struct programmer_cfg *cfg, struct pci_dev *const dev, const char *const name) { - return enable_flash_pch100_or_c620(cfg, dev, name, 0x1f, 5, CHIPSET_ELKHART_LAKE); + return enable_flash_pch100_or_c620(flashprog, cfg, dev, name, 0x1f, 5, CHIPSET_ELKHART_LAKE); } -static int enable_flash_jsl(const struct programmer_cfg *cfg, struct pci_dev *const dev, const char *const name) +static int enable_flash_jsl(struct flashrom_programmer *flashprog, const struct programmer_cfg *cfg, struct pci_dev *const dev, const char *const name) { - return enable_flash_pch100_or_c620(cfg, dev, name, 0x1f, 5, CHIPSET_JASPER_LAKE); + return enable_flash_pch100_or_c620(flashprog, cfg, dev, name, 0x1f, 5, CHIPSET_JASPER_LAKE); } -static int enable_flash_apl(const struct programmer_cfg *cfg, struct pci_dev *const dev, const char *const name) +static int enable_flash_apl(struct flashrom_programmer *flashprog, const struct programmer_cfg *cfg, struct pci_dev *const dev, const char *const name) { - return enable_flash_pch100_or_c620(cfg, dev, name, 0x0d, 2, CHIPSET_APOLLO_LAKE); + return enable_flash_pch100_or_c620(flashprog, cfg, dev, name, 0x0d, 2, CHIPSET_APOLLO_LAKE); } -static int enable_flash_glk(const struct programmer_cfg *cfg, struct pci_dev *const dev, const char *const name) +static int enable_flash_glk(struct flashrom_programmer *flashprog, const struct programmer_cfg *cfg, struct pci_dev *const dev, const char *const name) { - return enable_flash_pch100_or_c620(cfg, dev, name, 0x0d, 2, CHIPSET_GEMINI_LAKE); + return enable_flash_pch100_or_c620(flashprog, cfg, dev, name, 0x0d, 2, CHIPSET_GEMINI_LAKE); } /* Silvermont architecture: Bay Trail(-T/-I), Avoton/Rangeley. @@ -1044,7 +1044,7 @@ * - SPIBAR (coined SBASE) at LPC config 0x54 (instead of [RCRB] + 0x3800). * - BIOS_CNTL (coined BCR) at [SPIBAR] + 0xFC (instead of LPC config 0xDC). */ -static int enable_flash_silvermont(const struct programmer_cfg *cfg, struct pci_dev *dev, const char *name) +static int enable_flash_silvermont(struct flashrom_programmer *flashprog, const struct programmer_cfg *cfg, struct pci_dev *dev, const char *name) { enum ich_chipset ich_generation = CHIPSET_BAYTRAIL; @@ -1060,7 +1060,7 @@ physunmap(rcrb, 4); /* Handle fwh_idsel parameter */ - int ret_fwh = enable_flash_ich_fwh_decode(cfg, dev, ich_generation); + int ret_fwh = enable_flash_ich_fwh_decode(flashprog, cfg, dev, ich_generation); if (ret_fwh == ERROR_FLASHROM_FATAL) return ret_fwh; @@ -1078,7 +1078,7 @@ */ enable_flash_ich_bios_cntl_memmapped(ich_generation, spibar + 0xFC); - int ret_spi = ich_init_spi(cfg, spibar, ich_generation); + int ret_spi = ich_init_spi(flashprog, cfg, spibar, ich_generation); if (ret_spi == ERROR_FLASHROM_FATAL) return ret_spi; @@ -1092,7 +1092,7 @@ return 0; } -static int via_no_byte_merge(const struct programmer_cfg *cfg, struct pci_dev *dev, const char *name) +static int via_no_byte_merge(struct flashrom_programmer *flashprog, const struct programmer_cfg *cfg, struct pci_dev *dev, const char *name) { uint8_t val; @@ -1105,7 +1105,7 @@ return NOT_DONE_YET; /* need to find south bridge, too */ } -static int enable_flash_vt823x(const struct programmer_cfg *cfg, struct pci_dev *dev, const char *name) +static int enable_flash_vt823x(struct flashrom_programmer *flashprog, const struct programmer_cfg *cfg, struct pci_dev *dev, const char *name) { uint8_t val; @@ -1132,7 +1132,7 @@ return 0; } -static int enable_flash_vt_vx(const struct programmer_cfg *cfg, struct pci_dev *dev, const char *name) +static int enable_flash_vt_vx(struct flashrom_programmer *flashprog, const struct programmer_cfg *cfg, struct pci_dev *dev, const char *name) { struct pci_dev *south_north = pcidev_find(0x1106, 0xa353); if (south_north == NULL) { @@ -1143,7 +1143,7 @@ msg_pdbg("Strapped to "); if ((pci_read_byte(south_north, 0x56) & 0x01) == 0) { msg_pdbg("LPC.\n"); - return enable_flash_vt823x(cfg, dev, name); + return enable_flash_vt823x(flashprog, cfg, dev, name); } msg_pdbg("SPI.\n"); @@ -1196,12 +1196,12 @@ return via_init_spi(spi0_mm_base); } -static int enable_flash_vt8237s_spi(const struct programmer_cfg *cfg, struct pci_dev *dev, const char *name) +static int enable_flash_vt8237s_spi(struct flashrom_programmer *flashprog, const struct programmer_cfg *cfg, struct pci_dev *dev, const char *name) { return via_init_spi(pci_read_long(dev, 0xbc) << 8); } -static int enable_flash_cs5530(const struct programmer_cfg *cfg, struct pci_dev *dev, const char *name) +static int enable_flash_cs5530(struct flashrom_programmer *flashprog, const struct programmer_cfg *cfg, struct pci_dev *dev, const char *name) { uint8_t reg8; @@ -1265,7 +1265,7 @@ * To enable write to NOR Boot flash for the benefit of systems that have such * a setup, raise MSR 0x51400018 WE_CS3 (write enable Boot Flash Chip Select). */ -static int enable_flash_cs5536(const struct programmer_cfg *cfg, struct pci_dev *dev, const char *name) +static int enable_flash_cs5536(struct flashrom_programmer *flashprog, const struct programmer_cfg *cfg, struct pci_dev *dev, const char *name) { #define MSR_RCONF_DEFAULT 0x1808 #define MSR_NORF_CTL 0x51400018 @@ -1294,7 +1294,7 @@ return 0; } -static int enable_flash_sc1100(const struct programmer_cfg *cfg, struct pci_dev *dev, const char *name) +static int enable_flash_sc1100(struct flashrom_programmer *flashprog, const struct programmer_cfg *cfg, struct pci_dev *dev, const char *name) { #define SC_REG 0x52 uint8_t new; @@ -1319,7 +1319,7 @@ * 6 FFB0_0000h–FFBF_FFFFh <- FFF80000h-FFFDFFFFh <- <- * 5 00E8... <- <- FFF00000h-FFF7FFFFh <- */ -static int enable_flash_amd_via(const struct programmer_cfg *cfg, struct pci_dev *dev, const char *name, uint8_t decode_val) +static int enable_flash_amd_via(struct flashrom_programmer *flashprog, const struct programmer_cfg *cfg, struct pci_dev *dev, const char *name, uint8_t decode_val) { #define AMD_MAPREG 0x43 #define AMD_ENREG 0x40 @@ -1353,29 +1353,29 @@ return 0; } -static int enable_flash_amd_768_8111(const struct programmer_cfg *cfg, struct pci_dev *dev, const char *name) +static int enable_flash_amd_768_8111(struct flashrom_programmer *flashprog, const struct programmer_cfg *cfg, struct pci_dev *dev, const char *name) { /* Enable decoding of 0xFFB00000 to 0xFFFFFFFF (5 MB). */ max_rom_decode.lpc = 5 * 1024 * 1024; - return enable_flash_amd_via(cfg, dev, name, 0xC0); + return enable_flash_amd_via(flashprog, cfg, dev, name, 0xC0); } -static int enable_flash_vt82c586(const struct programmer_cfg *cfg, struct pci_dev *dev, const char *name) +static int enable_flash_vt82c586(struct flashrom_programmer *flashprog, const struct programmer_cfg *cfg, struct pci_dev *dev, const char *name) { /* Enable decoding of 0xFFF80000 to 0xFFFFFFFF. (512 kB) */ max_rom_decode.parallel = 512 * 1024; - return enable_flash_amd_via(cfg, dev, name, 0xC0); + return enable_flash_amd_via(flashprog, cfg, dev, name, 0xC0); } /* Works for VT82C686A/B too. */ -static int enable_flash_vt82c596(const struct programmer_cfg *cfg, struct pci_dev *dev, const char *name) +static int enable_flash_vt82c596(struct flashrom_programmer *flashprog, const struct programmer_cfg *cfg, struct pci_dev *dev, const char *name) { /* Enable decoding of 0xFFF00000 to 0xFFFFFFFF. (1 MB) */ max_rom_decode.parallel = 1024 * 1024; - return enable_flash_amd_via(cfg, dev, name, 0xE0); + return enable_flash_amd_via(flashprog, cfg, dev, name, 0xE0); } -static int enable_flash_sb600(const struct programmer_cfg *cfg, struct pci_dev *dev, const char *name) +static int enable_flash_sb600(struct flashrom_programmer *flashprog, const struct programmer_cfg *cfg, struct pci_dev *dev, const char *name) { uint32_t prot; uint8_t reg; @@ -1408,7 +1408,7 @@ internal_buses_supported &= BUS_LPC | BUS_FWH; - ret = sb600_probe_spi(cfg, dev); + ret = sb600_probe_spi(flashprog, cfg, dev); /* Read ROM strap override register. */ OUTB(0x8f, 0xcd6); @@ -1449,7 +1449,7 @@ } /* sets bit 0 in 0x6d */ -static int enable_flash_nvidia_common(const struct programmer_cfg *cfg, struct pci_dev *dev, const char *name) +static int enable_flash_nvidia_common(struct flashrom_programmer *flashprog, const struct programmer_cfg *cfg, struct pci_dev *dev, const char *name) { uint8_t old, new; @@ -1466,16 +1466,16 @@ return 0; } -static int enable_flash_nvidia_nforce2(const struct programmer_cfg *cfg, struct pci_dev *dev, const char *name) +static int enable_flash_nvidia_nforce2(struct flashrom_programmer *flashprog, const struct programmer_cfg *cfg, struct pci_dev *dev, const char *name) { rpci_write_byte(dev, 0x92, 0); - if (enable_flash_nvidia_common(cfg, dev, name)) + if (enable_flash_nvidia_common(flashprog, cfg, dev, name)) return ERROR_FLASHROM_NONFATAL; else return 0; } -static int enable_flash_ck804(const struct programmer_cfg *cfg, struct pci_dev *dev, const char *name) +static int enable_flash_ck804(struct flashrom_programmer *flashprog, const struct programmer_cfg *cfg, struct pci_dev *dev, const char *name) { uint32_t segctrl; uint8_t reg, old, new; @@ -1541,7 +1541,7 @@ } } - if (enable_flash_nvidia_common(cfg, dev, name)) + if (enable_flash_nvidia_common(flashprog, cfg, dev, name)) err++; if (err > 0) @@ -1550,7 +1550,7 @@ return 0; } -static int enable_flash_osb4(const struct programmer_cfg *cfg, struct pci_dev *dev, const char *name) +static int enable_flash_osb4(struct flashrom_programmer *flashprog, const struct programmer_cfg *cfg, struct pci_dev *dev, const char *name) { uint8_t tmp; @@ -1568,7 +1568,7 @@ } /* ATI Technologies Inc IXP SB400 PCI-ISA Bridge (rev 80) */ -static int enable_flash_sb400(const struct programmer_cfg *cfg, struct pci_dev *dev, const char *name) +static int enable_flash_sb400(struct flashrom_programmer *flashprog, const struct programmer_cfg *cfg, struct pci_dev *dev, const char *name) { uint8_t tmp; struct pci_dev *smbusdev; @@ -1603,7 +1603,7 @@ return 0; } -static int enable_flash_mcp55(const struct programmer_cfg *cfg, struct pci_dev *dev, const char *name) +static int enable_flash_mcp55(struct flashrom_programmer *flashprog, const struct programmer_cfg *cfg, struct pci_dev *dev, const char *name) { uint8_t val; uint16_t wordval; @@ -1619,7 +1619,7 @@ wordval |= 0x7fff; /* 16M */ rpci_write_word(dev, 0x90, wordval); - if (enable_flash_nvidia_common(cfg, dev, name)) + if (enable_flash_nvidia_common(flashprog, cfg, dev, name)) return ERROR_FLASHROM_NONFATAL; else return 0; @@ -1630,7 +1630,7 @@ * It is assumed that LPC chips need the MCP55 code and SPI chips need the * code provided in enable_flash_mcp6x_7x_common. */ -static int enable_flash_mcp6x_7x(const struct programmer_cfg *cfg, struct pci_dev *dev, const char *name) +static int enable_flash_mcp6x_7x(struct flashrom_programmer *flashprog, const struct programmer_cfg *cfg, struct pci_dev *dev, const char *name) { int ret = 0, want_spi = 0; uint8_t val; @@ -1642,7 +1642,7 @@ switch ((val >> 5) & 0x3) { case 0x0: - ret = enable_flash_mcp55(cfg, dev, name); + ret = enable_flash_mcp55(flashprog, cfg, dev, name); internal_buses_supported &= BUS_LPC; msg_pdbg("Flash bus type is LPC\n"); break; @@ -1681,7 +1681,7 @@ return ret; } -static int enable_flash_ht1000(const struct programmer_cfg *cfg, struct pci_dev *dev, const char *name) +static int enable_flash_ht1000(struct flashrom_programmer *flashprog, const struct programmer_cfg *cfg, struct pci_dev *dev, const char *name) { uint8_t val; @@ -1704,7 +1704,7 @@ * complete flash is mapped somewhere below 1G. The position can be determined * by the BOOTCS PAR register. */ -static int get_flashbase_sc520(const struct programmer_cfg *cfg, struct pci_dev *dev, const char *name) +static int get_flashbase_sc520(struct flashrom_programmer *flashprog, const struct programmer_cfg *cfg, struct pci_dev *dev, const char *name) { int i, bootcs_found = 0; uint32_t parx = 0; @@ -2184,7 +2184,7 @@ {0}, }; -int chipset_flash_enable(const struct programmer_cfg *cfg) +int chipset_flash_enable(struct flashrom_programmer *flashprog, const struct programmer_cfg *cfg) { struct pci_dev *dev = NULL; int ret = -2; /* Nothing! */ @@ -2233,7 +2233,7 @@ continue; } msg_pinfo("Enabling flash write... "); - ret = chipset_enables[i].doit(cfg, dev, chipset_enables[i].device_name); + ret = chipset_enables[i].doit(flashprog, cfg, dev, chipset_enables[i].device_name); if (ret == NOT_DONE_YET) { ret = -2; msg_pinfo("OK - searching further chips.\n"); diff --git a/ichspi.c b/ichspi.c index 1522d2b..1aae99b 100644 --- a/ichspi.c +++ b/ichspi.c @@ -2104,7 +2104,7 @@ } } -static int init_ich_default(const struct programmer_cfg *cfg, void *spibar, enum ich_chipset ich_gen) +static int init_ich_default(struct flashrom_programmer *flashprog, const struct programmer_cfg *cfg, void *spibar, enum ich_chipset ich_gen) { unsigned int i; uint16_t tmp2; @@ -2356,7 +2356,7 @@ return 0; } -int ich_init_spi(const struct programmer_cfg *cfg, void *spibar, enum ich_chipset ich_gen) +int ich_init_spi(struct flashrom_programmer *flashprog, const struct programmer_cfg *cfg, void *spibar, enum ich_chipset ich_gen) { ich_generation = ich_gen; ich_spibar = spibar; @@ -2368,7 +2368,7 @@ return init_ich7_spi(spibar, ich_gen); case CHIPSET_ICH8: default: /* Future version might behave the same */ - return init_ich_default(cfg, spibar, ich_gen); + return init_ich_default(flashprog, cfg, spibar, ich_gen); } } diff --git a/include/programmer.h b/include/programmer.h index 712aee6..9f807c5 100644 --- a/include/programmer.h +++ b/include/programmer.h @@ -147,7 +147,7 @@ const enum test_state status; const char *vendor_name; const char *device_name; - int (*doit) (const struct programmer_cfg *cfg, struct pci_dev *dev, const char *name); + int (*doit) (struct flashrom_programmer *flashprog, const struct programmer_cfg *cfg, struct pci_dev *dev, const char *name); }; extern const struct penable chipset_enables[]; @@ -229,7 +229,7 @@ int board_flash_enable(const char *vendor, const char *model, const char *cb_vendor, const char *cb_model, bool force_boardenable); /* chipset_enable.c */ -int chipset_flash_enable(const struct programmer_cfg *cfg); +int chipset_flash_enable(struct flashrom_programmer *, const struct programmer_cfg *cfg); /* processor_enable.c */ int processor_flash_enable(void); @@ -362,7 +362,7 @@ /* ichspi.c */ #if CONFIG_INTERNAL == 1 -int ich_init_spi(const struct programmer_cfg *cfg, void *spibar, enum ich_chipset ich_generation); +int ich_init_spi(struct flashrom_programmer *, const struct programmer_cfg *cfg, void *spibar, enum ich_chipset ich_generation); int via_init_spi(uint32_t mmio_base); /* amd_imc.c */ @@ -390,7 +390,7 @@ /* sb600spi.c */ -int sb600_probe_spi(const struct programmer_cfg *cfg, struct pci_dev *dev); +int sb600_probe_spi(struct flashrom_programmer *, const struct programmer_cfg *cfg, struct pci_dev *dev); /* wbsio_spi.c */ int wbsio_check_for_spi(void); diff --git a/internal.c b/internal.c index c096475..c2e428f 100644 --- a/internal.c +++ b/internal.c @@ -259,7 +259,7 @@ /* try to enable it. Failure IS an option, since not all motherboards * really need this to be done, etc., etc. */ - ret = chipset_flash_enable(cfg); + ret = chipset_flash_enable(flashprog, cfg); if (ret == -2) { msg_perr("WARNING: No chipset found. Flash detection " "will most likely fail.\n"); diff --git a/sb600spi.c b/sb600spi.c index 5b9ac45..5809431 100644 --- a/sb600spi.c +++ b/sb600spi.c @@ -634,7 +634,7 @@ .probe_opcode = default_spi_probe_opcode, }; -int sb600_probe_spi(const struct programmer_cfg *cfg, struct pci_dev *dev) +int sb600_probe_spi(struct flashrom_programmer *flashprog, const struct programmer_cfg *cfg, struct pci_dev *dev) { struct pci_dev *smbus_dev; uint32_t tmp; -- To view, visit https://review.coreboot.org/c/flashrom/+/72816 To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: flashrom Gerrit-Branch: master Gerrit-Change-Id: I07c968fd77960b7c1d1dddb1009fac68e6c45bf2 Gerrit-Change-Number: 72816 Gerrit-PatchSet: 1 Gerrit-Owner: Edward O'Callaghan <quasisec(a)chromium.org> Gerrit-Reviewer: Arthur Heymans <arthur(a)aheymans.xyz> Gerrit-Attention: Arthur Heymans <arthur(a)aheymans.xyz> Gerrit-MessageType: newchange

1 0

[M] Change in flashrom[master]: tree/: Pass flashprog down to drv init() entry-points
by Edward O'Callaghan (Code Review) 04 Feb '23

04 Feb '23

Edward O'Callaghan has uploaded this change for review. ( https://review.coreboot.org/c/flashrom/+/72815 ) Change subject: tree/: Pass flashprog down to drv init() entry-points ...................................................................... tree/: Pass flashprog down to drv init() entry-points Note, linux_mtd specialisation path fixed for new func signatures. Change-Id: I482340ac43381ad4cb5c8544545222fdb9fe83ed Signed-off-by: Edward O'Callaghan <quasisec(a)google.com> --- M atahpt.c M atapromise.c M atavia.c M buspirate_spi.c M ch341a_spi.c M dediprog.c M developerbox_spi.c M digilent_spi.c M dirtyjtag_spi.c M drkaiser.c M dummyflasher.c M flashrom.c M ft2232_spi.c M gfxnvidia.c M include/programmer.h M internal.c M it8212.c M jlink_spi.c M linux_mtd.c M linux_spi.c M mediatek_i2c_spi.c M mstarddc_spi.c M ni845x_spi.c M nic3com.c M nicintel.c M nicintel_eeprom.c M nicintel_spi.c M nicnatsemi.c M nicrealtek.c M ogp_spi.c M parade_lspcon.c M pickit2_spi.c M pony_spi.c M raiden_debug_spi.c M rayer_spi.c M realtek_mst_i2c_spi.c M satamv.c M satasii.c M serprog.c M stlinkv3_spi.c M usbblaster_spi.c 41 files changed, 57 insertions(+), 44 deletions(-) git pull ssh://review.coreboot.org:29418/flashrom refs/changes/15/72815/1 diff --git a/atahpt.c b/atahpt.c index 71fd4d5..43a10ad 100644 --- a/atahpt.c +++ b/atahpt.c @@ -78,7 +78,7 @@ .shutdown = atahpt_shutdown, }; -static int atahpt_init(const struct programmer_cfg *cfg) +static int atahpt_init(struct flashrom_programmer *flashprog, const struct programmer_cfg *cfg) { struct pci_dev *dev = NULL; uint32_t io_base_addr; diff --git a/atapromise.c b/atapromise.c index 9beebf1..9deed47 100644 --- a/atapromise.c +++ b/atapromise.c @@ -117,7 +117,7 @@ .shutdown = atapromise_shutdown, }; -static int atapromise_init(const struct programmer_cfg *cfg) +static int atapromise_init(struct flashrom_programmer *flashprog, const struct programmer_cfg *cfg) { struct pci_dev *dev = NULL; uint32_t io_base_addr; diff --git a/atavia.c b/atavia.c index f35771a..92ac261 100644 --- a/atavia.c +++ b/atavia.c @@ -138,7 +138,7 @@ .chip_writeb = atavia_chip_writeb, }; -static int atavia_init(const struct programmer_cfg *cfg) +static int atavia_init(struct flashrom_programmer *flashprog, const struct programmer_cfg *cfg) { char *arg = extract_programmer_param_str(cfg, "offset"); if (arg) { diff --git a/buspirate_spi.c b/buspirate_spi.c index a40fb70..68cea11 100644 --- a/buspirate_spi.c +++ b/buspirate_spi.c @@ -314,7 +314,7 @@ */ #define BP_DIVISOR(baud) ((4000000/(baud)) - 1) -static int buspirate_spi_init(const struct programmer_cfg *cfg) +static int buspirate_spi_init(struct flashrom_programmer *flashprog, const struct programmer_cfg *cfg) { char *tmp; char *dev; diff --git a/ch341a_spi.c b/ch341a_spi.c index 75eaf86..c2b3943 100644 --- a/ch341a_spi.c +++ b/ch341a_spi.c @@ -421,7 +421,7 @@ .delay = ch341a_spi_delay, }; -static int ch341a_spi_init(const struct programmer_cfg *cfg) +static int ch341a_spi_init(struct flashrom_programmer *flashprog, const struct programmer_cfg *cfg) { if (handle != NULL) { msg_cerr("%s: handle already set! Please report a bug at flashrom(a)flashrom.org\n", __func__); diff --git a/dediprog.c b/dediprog.c index 723f4a8..51529e9 100644 --- a/dediprog.c +++ b/dediprog.c @@ -1076,7 +1076,7 @@ return 0; } -static int dediprog_init(const struct programmer_cfg *cfg) +static int dediprog_init(struct flashrom_programmer *flashprog, const struct programmer_cfg *cfg) { char *param_str; int spispeed_idx = 1; diff --git a/developerbox_spi.c b/developerbox_spi.c index 64b7e8a..0729117 100644 --- a/developerbox_spi.c +++ b/developerbox_spi.c @@ -142,7 +142,7 @@ return 0; } -static int developerbox_spi_init(const struct programmer_cfg *cfg) +static int developerbox_spi_init(struct flashrom_programmer *flashprog, const struct programmer_cfg *cfg) { struct libusb_context *usb_ctx; libusb_device_handle *cp210x_handle; diff --git a/digilent_spi.c b/digilent_spi.c index 55cb6ec..4545d1c 100644 --- a/digilent_spi.c +++ b/digilent_spi.c @@ -373,7 +373,7 @@ { NULL, 0 }, }; -static int digilent_spi_init(const struct programmer_cfg *cfg) +static int digilent_spi_init(struct flashrom_programmer *flashprog, const struct programmer_cfg *cfg) { char *param_str; uint32_t speed_hz = spispeeds[0].speed; diff --git a/dirtyjtag_spi.c b/dirtyjtag_spi.c index 42169ed..e822217 100644 --- a/dirtyjtag_spi.c +++ b/dirtyjtag_spi.c @@ -201,7 +201,7 @@ .probe_opcode = default_spi_probe_opcode, }; -static int dirtyjtag_spi_init(const struct programmer_cfg *cfg) +static int dirtyjtag_spi_init(struct flashrom_programmer *flashprog, const struct programmer_cfg *cfg) { struct libusb_device_handle *handle = NULL; struct dirtyjtag_spi_data *djtag_data = NULL; diff --git a/drkaiser.c b/drkaiser.c index ebf5119..2e5dd1a 100644 --- a/drkaiser.c +++ b/drkaiser.c @@ -75,7 +75,7 @@ .shutdown = drkaiser_shutdown, }; -static int drkaiser_init(const struct programmer_cfg *cfg) +static int drkaiser_init(struct flashrom_programmer *flashprog, const struct programmer_cfg *cfg) { struct pci_dev *dev = NULL; uint32_t addr; diff --git a/dummyflasher.c b/dummyflasher.c index 2bdd10c..149811c 100644 --- a/dummyflasher.c +++ b/dummyflasher.c @@ -1350,7 +1350,7 @@ return 0; } -static int dummy_init(const struct programmer_cfg *cfg) +static int dummy_init(struct flashrom_programmer *flashprog, const struct programmer_cfg *cfg) { int ret = 0; struct stat image_stat; diff --git a/flashrom.c b/flashrom.c index a0754e6..20f7b43 100644 --- a/flashrom.c +++ b/flashrom.c @@ -159,7 +159,7 @@ } msg_pdbg("Initializing %s programmer\n", prog->name); - ret = prog->init(&cfg); + ret = prog->init(*flashprog, &cfg); if (cfg.params && strlen(cfg.params)) { if (ret != 0) { /* It is quite possible that any unhandled programmer parameter would have been valid, diff --git a/ft2232_spi.c b/ft2232_spi.c index dfec1a0..685963d 100644 --- a/ft2232_spi.c +++ b/ft2232_spi.c @@ -304,7 +304,7 @@ }; /* Returns 0 upon success, a negative number upon errors. */ -static int ft2232_spi_init(const struct programmer_cfg *cfg) +static int ft2232_spi_init(struct flashrom_programmer *flashprog, const struct programmer_cfg *cfg) { int ret = 0; unsigned char buf[512]; diff --git a/gfxnvidia.c b/gfxnvidia.c index b420975..7d8eb59 100644 --- a/gfxnvidia.c +++ b/gfxnvidia.c @@ -100,7 +100,7 @@ .shutdown = gfxnvidia_shutdown, }; -static int gfxnvidia_init(const struct programmer_cfg *cfg) +static int gfxnvidia_init(struct flashrom_programmer *flashprog, const struct programmer_cfg *cfg) { struct pci_dev *dev = NULL; uint32_t reg32; diff --git a/include/programmer.h b/include/programmer.h index 233a6fe..712aee6 100644 --- a/include/programmer.h +++ b/include/programmer.h @@ -48,7 +48,7 @@ const char *const note; } devs; - int (*init) (const struct programmer_cfg *cfg); + int (*init) (struct flashrom_programmer *flashprog, const struct programmer_cfg *cfg); }; extern const struct programmer_entry *const programmer_table[]; @@ -375,10 +375,10 @@ int init_superio_ite(const struct programmer_cfg *cfg); /* trivial wrapper to avoid cluttering internal_init() with #if */ -static inline int try_mtd(const struct programmer_cfg *cfg) +static inline int try_mtd(struct flashrom_programmer *flashprog, const struct programmer_cfg *cfg) { #if CONFIG_LINUX_MTD == 1 - return programmer_linux_mtd.init(cfg); + return programmer_linux_mtd.init(flashprog, cfg); #else return 1; #endif diff --git a/internal.c b/internal.c index c5fdb74..c096475 100644 --- a/internal.c +++ b/internal.c @@ -162,7 +162,7 @@ return 0; } -static int internal_init(const struct programmer_cfg *cfg) +static int internal_init(struct flashrom_programmer *flashprog, const struct programmer_cfg *cfg) { int ret = 0; bool force_laptop; @@ -191,7 +191,7 @@ */ internal_buses_supported = BUS_NONSPI; - if (try_mtd(cfg) == 0) { + if (try_mtd(flashprog, cfg) == 0) { ret = 0; goto internal_init_exit; } diff --git a/it8212.c b/it8212.c index 3c1161d..2450454 100644 --- a/it8212.c +++ b/it8212.c @@ -68,7 +68,7 @@ .shutdown = it8212_shutdown, }; -static int it8212_init(const struct programmer_cfg *cfg) +static int it8212_init(struct flashrom_programmer *flashprog, const struct programmer_cfg *cfg) { uint8_t *bar; diff --git a/jlink_spi.c b/jlink_spi.c index ad2ca78..86bdb6a 100644 --- a/jlink_spi.c +++ b/jlink_spi.c @@ -192,7 +192,7 @@ .probe_opcode = default_spi_probe_opcode, }; -static int jlink_spi_init(const struct programmer_cfg *cfg) +static int jlink_spi_init(struct flashrom_programmer *flashprog, const struct programmer_cfg *cfg) { char *arg; unsigned long speed = 0; diff --git a/linux_mtd.c b/linux_mtd.c index 495db9a..0e68cc7 100644 --- a/linux_mtd.c +++ b/linux_mtd.c @@ -494,7 +494,7 @@ return ret; } -static int linux_mtd_init(const struct programmer_cfg *cfg) +static int linux_mtd_init(struct flashrom_programmer *flashprog, const struct programmer_cfg *cfg) { char *param_str; int dev_num = 0; diff --git a/linux_spi.c b/linux_spi.c index d65b3e8..40f2532 100644 --- a/linux_spi.c +++ b/linux_spi.c @@ -164,7 +164,7 @@ return result; } -static int linux_spi_init(const struct programmer_cfg *cfg) +static int linux_spi_init(struct flashrom_programmer *flashprog, const struct programmer_cfg *cfg) { char *param_str, *endp; uint32_t speed_hz = 2 * 1000 * 1000; diff --git a/mediatek_i2c_spi.c b/mediatek_i2c_spi.c index c15df05..5f1321b 100644 --- a/mediatek_i2c_spi.c +++ b/mediatek_i2c_spi.c @@ -483,7 +483,7 @@ return ret; } -static int mediatek_init(const struct programmer_cfg *cfg) +static int mediatek_init(struct flashrom_programmer *flashprog, const struct programmer_cfg *cfg) { int ret; bool allow_brick; diff --git a/mstarddc_spi.c b/mstarddc_spi.c index bd65281..e94eb3b 100644 --- a/mstarddc_spi.c +++ b/mstarddc_spi.c @@ -150,7 +150,7 @@ }; /* Returns 0 upon success, a negative number upon errors. */ -static int mstarddc_spi_init(const struct programmer_cfg *cfg) +static int mstarddc_spi_init(struct flashrom_programmer *flashprog, const struct programmer_cfg *cfg) { int ret = 0; int mstarddc_fd = -1; diff --git a/ni845x_spi.c b/ni845x_spi.c index fd5057d..0193134 100644 --- a/ni845x_spi.c +++ b/ni845x_spi.c @@ -539,7 +539,7 @@ .probe_opcode = default_spi_probe_opcode, }; -static int ni845x_spi_init(const struct programmer_cfg *cfg) +static int ni845x_spi_init(struct flashrom_programmer *flashprog, const struct programmer_cfg *cfg) { char *speed_str = NULL; char *CS_str = NULL; diff --git a/nic3com.c b/nic3com.c index a578d48..8ca79ae 100644 --- a/nic3com.c +++ b/nic3com.c @@ -95,7 +95,7 @@ .shutdown = nic3com_shutdown, }; -static int nic3com_init(const struct programmer_cfg *cfg) +static int nic3com_init(struct flashrom_programmer *flashprog, const struct programmer_cfg *cfg) { struct pci_dev *dev = NULL; uint32_t io_base_addr = 0; diff --git a/nicintel.c b/nicintel.c index feb07b6..0e19856 100644 --- a/nicintel.c +++ b/nicintel.c @@ -71,7 +71,7 @@ .shutdown = nicintel_shutdown, }; -static int nicintel_init(const struct programmer_cfg *cfg) +static int nicintel_init(struct flashrom_programmer *flashprog, const struct programmer_cfg *cfg) { struct pci_dev *dev = NULL; uintptr_t addr; diff --git a/nicintel_eeprom.c b/nicintel_eeprom.c index 80ccd88..2a7861c 100644 --- a/nicintel_eeprom.c +++ b/nicintel_eeprom.c @@ -479,7 +479,7 @@ .shutdown = nicintel_ee_shutdown_i210, }; -static int nicintel_ee_init(const struct programmer_cfg *cfg) +static int nicintel_ee_init(struct flashrom_programmer *flashprog, const struct programmer_cfg *cfg) { const struct opaque_master *mst; uint32_t eec = 0; diff --git a/nicintel_spi.c b/nicintel_spi.c index 2821d23..a3d1b1c 100644 --- a/nicintel_spi.c +++ b/nicintel_spi.c @@ -285,7 +285,7 @@ return 0; } -static int nicintel_spi_init(const struct programmer_cfg *cfg) +static int nicintel_spi_init(struct flashrom_programmer *flashprog, const struct programmer_cfg *cfg) { struct pci_dev *dev = NULL; diff --git a/nicnatsemi.c b/nicnatsemi.c index 65377dc..817855e 100644 --- a/nicnatsemi.c +++ b/nicnatsemi.c @@ -82,7 +82,7 @@ .shutdown = nicnatsemi_shutdown, }; -static int nicnatsemi_init(const struct programmer_cfg *cfg) +static int nicnatsemi_init(struct flashrom_programmer *flashprog, const struct programmer_cfg *cfg) { struct pci_dev *dev = NULL; uint32_t io_base_addr; diff --git a/nicrealtek.c b/nicrealtek.c index 5937e35..d2c7850 100644 --- a/nicrealtek.c +++ b/nicrealtek.c @@ -91,7 +91,7 @@ .shutdown = nicrealtek_shutdown, }; -static int nicrealtek_init(const struct programmer_cfg *cfg) +static int nicrealtek_init(struct flashrom_programmer *flashprog, const struct programmer_cfg *cfg) { struct pci_dev *dev = NULL; uint32_t io_base_addr = 0; diff --git a/ogp_spi.c b/ogp_spi.c index d85c823..2dcc5ea 100644 --- a/ogp_spi.c +++ b/ogp_spi.c @@ -107,7 +107,7 @@ return 0; } -static int ogp_spi_init(const struct programmer_cfg *cfg) +static int ogp_spi_init(struct flashrom_programmer *flashprog, const struct programmer_cfg *cfg) { struct pci_dev *dev = NULL; char *type; diff --git a/parade_lspcon.c b/parade_lspcon.c index a50346e..ded8453 100644 --- a/parade_lspcon.c +++ b/parade_lspcon.c @@ -460,7 +460,7 @@ return ret; } -static int parade_lspcon_init(const struct programmer_cfg *cfg) +static int parade_lspcon_init(struct flashrom_programmer *flashprog, const struct programmer_cfg *cfg) { bool allow_brick; diff --git a/pickit2_spi.c b/pickit2_spi.c index 86c5403..10695c7 100644 --- a/pickit2_spi.c +++ b/pickit2_spi.c @@ -387,7 +387,7 @@ .probe_opcode = default_spi_probe_opcode, }; -static int pickit2_spi_init(const struct programmer_cfg *cfg) +static int pickit2_spi_init(struct flashrom_programmer *flashprog, const struct programmer_cfg *cfg) { uint8_t buf[CMD_LENGTH] = { CMD_EXEC_SCRIPT, diff --git a/pony_spi.c b/pony_spi.c index 0647f91..1869d21 100644 --- a/pony_spi.c +++ b/pony_spi.c @@ -160,7 +160,7 @@ return ret; } -static int pony_spi_init(const struct programmer_cfg *cfg) +static int pony_spi_init(struct flashrom_programmer *flashprog, const struct programmer_cfg *cfg) { int i, data_out; enum pony_type type; diff --git a/raiden_debug_spi.c b/raiden_debug_spi.c index d1a09d7..f604c75 100644 --- a/raiden_debug_spi.c +++ b/raiden_debug_spi.c @@ -1486,7 +1486,7 @@ dev = usb_device_free(dev); } -static int raiden_debug_spi_init(const struct programmer_cfg *cfg) +static int raiden_debug_spi_init(struct flashrom_programmer *flashprog, const struct programmer_cfg *cfg) { struct usb_match match; char *serial = extract_programmer_param_str(cfg, "serial"); diff --git a/rayer_spi.c b/rayer_spi.c index 27caf2b..e0f37d1 100644 --- a/rayer_spi.c +++ b/rayer_spi.c @@ -296,7 +296,7 @@ return *prog ? 0 : -1; } -static int rayer_spi_init(const struct programmer_cfg *cfg) +static int rayer_spi_init(struct flashrom_programmer *flashprog, const struct programmer_cfg *cfg) { const struct rayer_programmer *prog; struct rayer_pinout *pinout = NULL; diff --git a/realtek_mst_i2c_spi.c b/realtek_mst_i2c_spi.c index 2a5d5ed..6bfe536 100644 --- a/realtek_mst_i2c_spi.c +++ b/realtek_mst_i2c_spi.c @@ -492,7 +492,7 @@ return ret; } -static int realtek_mst_i2c_spi_init(const struct programmer_cfg *cfg) +static int realtek_mst_i2c_spi_init(struct flashrom_programmer *flashprog, const struct programmer_cfg *cfg) { int ret = 0; bool reset, enter_isp, allow_brick; diff --git a/satamv.c b/satamv.c index fea4c2b..0aee07f 100644 --- a/satamv.c +++ b/satamv.c @@ -108,7 +108,7 @@ * 0xc08 PCI BAR2 (Flash/NVRAM) Control * 0x1046c Flash Parameters */ -static int satamv_init(const struct programmer_cfg *cfg) +static int satamv_init(struct flashrom_programmer *flashprog, const struct programmer_cfg *cfg) { struct pci_dev *dev = NULL; uintptr_t addr; diff --git a/satasii.c b/satasii.c index e881f96..4e6b7de 100644 --- a/satasii.c +++ b/satasii.c @@ -99,7 +99,7 @@ .shutdown = satasii_shutdown, }; -static int satasii_init(const struct programmer_cfg *cfg) +static int satasii_init(struct flashrom_programmer *flashprog, const struct programmer_cfg *cfg) { struct pci_dev *dev = NULL; uint32_t addr; diff --git a/serprog.c b/serprog.c index 5ddbe3d..2b1b7f1 100644 --- a/serprog.c +++ b/serprog.c @@ -601,7 +601,7 @@ static enum chipbustype serprog_buses_supported = BUS_NONE; -static int serprog_init(const struct programmer_cfg *cfg) +static int serprog_init(struct flashrom_programmer *flashprog, const struct programmer_cfg *cfg) { uint16_t iface; unsigned char pgmname[17]; diff --git a/stlinkv3_spi.c b/stlinkv3_spi.c index 16a66b4..578e041 100644 --- a/stlinkv3_spi.c +++ b/stlinkv3_spi.c @@ -473,7 +473,7 @@ .probe_opcode = default_spi_probe_opcode, }; -static int stlinkv3_spi_init(const struct programmer_cfg *cfg) +static int stlinkv3_spi_init(struct flashrom_programmer *flashprog, const struct programmer_cfg *cfg) { uint16_t sck_freq_kHz = 1000; // selecting 1 MHz SCK is a good bet char *param_str; diff --git a/usbblaster_spi.c b/usbblaster_spi.c index 75d5be7..a64a694 100644 --- a/usbblaster_spi.c +++ b/usbblaster_spi.c @@ -176,7 +176,7 @@ }; /* Returns 0 upon success, a negative number upon errors. */ -static int usbblaster_spi_init(const struct programmer_cfg *cfg) +static int usbblaster_spi_init(struct flashrom_programmer *flashprog, const struct programmer_cfg *cfg) { uint8_t buf[BUF_SIZE + 1] = { 0 }; struct ftdi_context ftdic; -- To view, visit https://review.coreboot.org/c/flashrom/+/72815 To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: flashrom Gerrit-Branch: master Gerrit-Change-Id: I482340ac43381ad4cb5c8544545222fdb9fe83ed Gerrit-Change-Number: 72815 Gerrit-PatchSet: 1 Gerrit-Owner: Edward O'Callaghan <quasisec(a)chromium.org> Gerrit-MessageType: newchange

1 0

[M] Change in flashrom[master]: migrate register_spi_master() - wbsio_spi.c is broken
by Edward O'Callaghan (Code Review) 03 Feb '23

03 Feb '23

Attention is currently required from: Arthur Heymans, Peter Marheine. Edward O'Callaghan has uploaded this change for review. ( https://review.coreboot.org/c/flashrom/+/72783 ) Change subject: migrate register_spi_master() - wbsio_spi.c is broken ...................................................................... migrate register_spi_master() - wbsio_spi.c is broken Change-Id: I0ce26d39dff4de5ec7b71e7823e0a843237fffff Signed-off-by: Edward O'Callaghan <quasisec(a)google.com> --- M bitbang_spi.c M buspirate_spi.c M ch341a_spi.c M chipset_enable.c M dediprog.c M developerbox_spi.c M digilent_spi.c M dirtyjtag_spi.c M dummyflasher.c M ft2232_spi.c M ichspi.c M include/programmer.h M it87spi.c M jlink_spi.c M linux_spi.c M mcp6x_spi.c M mediatek_i2c_spi.c M mstarddc_spi.c M ni845x_spi.c M nicintel_spi.c M ogp_spi.c M parade_lspcon.c M pickit2_spi.c M pony_spi.c M raiden_debug_spi.c M rayer_spi.c M realtek_mst_i2c_spi.c M sb600spi.c M serprog.c M spi.c M stlinkv3_spi.c M usbblaster_spi.c M wbsio_spi.c 33 files changed, 61 insertions(+), 50 deletions(-) git pull ssh://review.coreboot.org:29418/flashrom refs/changes/83/72783/1 diff --git a/bitbang_spi.c b/bitbang_spi.c index 7919e45..8bb7ff6 100644 --- a/bitbang_spi.c +++ b/bitbang_spi.c @@ -150,7 +150,8 @@ .probe_opcode = default_spi_probe_opcode, }; -int register_spi_bitbang_master(const struct bitbang_spi_master *master, void *spi_data) +int register_spi_bitbang_master(struct flashrom_programmer *flashprog, + const struct bitbang_spi_master *master, void *spi_data) { struct spi_master mst = spi_master_bitbang; /* If someone forgot to initialize a bitbang function, we catch it here. */ @@ -171,7 +172,7 @@ if (spi_data) data->spi_data = spi_data; - register_spi_master(&mst, data); + register_spi_master(flashprog, &mst, data); /* Only mess with the bus if we're sure nobody else uses it. */ bitbang_spi_request_bus(master, spi_data); diff --git a/buspirate_spi.c b/buspirate_spi.c index 68cea11..626e819 100644 --- a/buspirate_spi.c +++ b/buspirate_spi.c @@ -700,7 +700,7 @@ goto init_err_cleanup_exit; } - return register_spi_master(&spi_master_buspirate, bp_data); + return register_spi_master(flashprog, &spi_master_buspirate, bp_data); init_err_cleanup_exit: buspirate_spi_shutdown(bp_data); diff --git a/ch341a_spi.c b/ch341a_spi.c index c2b3943..5fe5d3e 100644 --- a/ch341a_spi.c +++ b/ch341a_spi.c @@ -500,7 +500,7 @@ if ((config_stream(CH341A_STM_I2C_100K) < 0) || (enable_pins(true) < 0)) goto dealloc_transfers; - return register_spi_master(&spi_master_ch341a_spi, NULL); + return register_spi_master(flashprog, &spi_master_ch341a_spi, NULL); dealloc_transfers: for (i = 0; i < USB_IN_TRANSFERS; i++) { diff --git a/chipset_enable.c b/chipset_enable.c index f7e0916..899540f 100644 --- a/chipset_enable.c +++ b/chipset_enable.c @@ -1193,12 +1193,12 @@ return ERROR_FLASHROM_FATAL; } - return via_init_spi(spi0_mm_base); + return via_init_spi(flashprog, spi0_mm_base); } static int enable_flash_vt8237s_spi(struct flashrom_programmer *flashprog, const struct programmer_cfg *cfg, struct pci_dev *dev, const char *name) { - return via_init_spi(pci_read_long(dev, 0xbc) << 8); + return via_init_spi(flashprog, pci_read_long(dev, 0xbc) << 8); } static int enable_flash_cs5530(struct flashrom_programmer *flashprog, const struct programmer_cfg *cfg, struct pci_dev *dev, const char *name) @@ -1671,7 +1671,7 @@ rpci_write_byte(dev, 0x8a, val); #endif - if (mcp6x_spi_init(want_spi)) + if (mcp6x_spi_init(flashprog, want_spi)) ret = 1; /* Suppress unknown laptop warning if we booted from SPI. */ diff --git a/dediprog.c b/dediprog.c index 51529e9..9c7e7ab 100644 --- a/dediprog.c +++ b/dediprog.c @@ -1303,7 +1303,7 @@ if (dediprog_set_leds(LED_NONE, dp_data)) goto init_err_cleanup_exit; - return register_spi_master(&spi_master_dediprog, dp_data); + return register_spi_master(flashprog, &spi_master_dediprog, dp_data); init_err_cleanup_exit: dediprog_shutdown(dp_data); diff --git a/developerbox_spi.c b/developerbox_spi.c index 0729117..ec8ab4c 100644 --- a/developerbox_spi.c +++ b/developerbox_spi.c @@ -176,7 +176,7 @@ goto err_exit; } - if (register_spi_bitbang_master(&bitbang_spi_master_cp210x, data)) + if (register_spi_bitbang_master(flashprog, &bitbang_spi_master_cp210x, data)) return 1; /* shutdown function does the cleanup */ return 0; diff --git a/digilent_spi.c b/digilent_spi.c index 4545d1c..e468b1c 100644 --- a/digilent_spi.c +++ b/digilent_spi.c @@ -455,7 +455,7 @@ digilent_data->reset_board = reset_board; digilent_data->handle = handle; - return register_spi_master(&spi_master_digilent_spi, digilent_data); + return register_spi_master(flashprog, &spi_master_digilent_spi, digilent_data); close_handle: libusb_close(handle); diff --git a/dirtyjtag_spi.c b/dirtyjtag_spi.c index e822217..874a196 100644 --- a/dirtyjtag_spi.c +++ b/dirtyjtag_spi.c @@ -298,7 +298,7 @@ goto cleanup_libusb_handle; } - return register_spi_master(&spi_master_dirtyjtag_spi, (void*)djtag_data); + return register_spi_master(flashprog, &spi_master_dirtyjtag_spi, (void*)djtag_data); cleanup_libusb_handle: libusb_attach_kernel_driver(handle, 0); diff --git a/dummyflasher.c b/dummyflasher.c index bd4b94a..4ab7dbd 100644 --- a/dummyflasher.c +++ b/dummyflasher.c @@ -1424,7 +1424,7 @@ dummy_buses_supported & BUS_NONSPI, data); if (dummy_buses_supported & BUS_SPI) - ret |= register_spi_master(&spi_master_dummyflasher, data); + ret |= register_spi_master(flashprog, &spi_master_dummyflasher, data); return ret; } diff --git a/ft2232_spi.c b/ft2232_spi.c index 685963d..a216fd9 100644 --- a/ft2232_spi.c +++ b/ft2232_spi.c @@ -695,7 +695,7 @@ spi_data->pindir = pindir; spi_data->ftdic_context = ftdic; - return register_spi_master(&spi_master_ft2232, spi_data); + return register_spi_master(flashprog, &spi_master_ft2232, spi_data); ftdi_err: if ((f = ftdi_usb_close(&ftdic)) < 0) { diff --git a/ichspi.c b/ichspi.c index 877064a..cc87650 100644 --- a/ichspi.c +++ b/ichspi.c @@ -1974,7 +1974,7 @@ .shutdown = ich_hwseq_shutdown, }; -static int init_ich7_spi(void *spibar, enum ich_chipset ich_gen) +static int init_ich7_spi(struct flashrom_programmer *flashprog, void *spibar, enum ich_chipset ich_gen) { unsigned int i; @@ -2001,7 +2001,7 @@ } ich_init_opcodes(ich_gen); ich_set_bbar(0, ich_gen); - register_spi_master(&spi_master_ich7, NULL); + register_spi_master(flashprog, &spi_master_ich7, NULL); return 0; } @@ -2350,7 +2350,7 @@ memcpy(opaque_hwseq_data, &hwseq_data, sizeof(*opaque_hwseq_data)); register_opaque_master(flashprog, &opaque_master_ich_hwseq, opaque_hwseq_data); } else { - register_spi_master(&spi_master_ich9, NULL); + register_spi_master(flashprog, &spi_master_ich9, NULL); } return 0; @@ -2365,7 +2365,7 @@ case CHIPSET_ICH7: case CHIPSET_TUNNEL_CREEK: case CHIPSET_CENTERTON: - return init_ich7_spi(spibar, ich_gen); + return init_ich7_spi(flashprog, spibar, ich_gen); case CHIPSET_ICH8: default: /* Future version might behave the same */ return init_ich_default(flashprog, cfg, spibar, ich_gen); @@ -2384,7 +2384,7 @@ .probe_opcode = ich_spi_probe_opcode, }; -int via_init_spi(uint32_t mmio_base) +int via_init_spi(struct flashrom_programmer *flashprog, uint32_t mmio_base) { int i; @@ -2396,7 +2396,7 @@ /* Not sure if it speaks all these bus protocols. */ internal_buses_supported &= BUS_LPC | BUS_FWH; ich_generation = CHIPSET_ICH7; - register_spi_master(&spi_master_via, NULL); + register_spi_master(flashprog, &spi_master_via, NULL); msg_pdbg("0x00: 0x%04x (SPIS)\n", mmio_readw(ich_spibar + 0)); msg_pdbg("0x02: 0x%04x (SPIC)\n", mmio_readw(ich_spibar + 2)); diff --git a/include/programmer.h b/include/programmer.h index 4821689..777c677 100644 --- a/include/programmer.h +++ b/include/programmer.h @@ -270,8 +270,8 @@ #endif /* bitbang_spi.c */ -int register_spi_bitbang_master(const struct bitbang_spi_master *master, void *spi_data); - +int register_spi_bitbang_master(struct flashrom_programmer *flashprog, + const struct bitbang_spi_master *master, void *spi_data); /* flashrom.c */ struct decode_sizes { @@ -323,7 +323,7 @@ int default_spi_write_256(struct flashctx *flash, const uint8_t *buf, unsigned int start, unsigned int len); int default_spi_write_aai(struct flashctx *flash, const uint8_t *buf, unsigned int start, unsigned int len); bool default_spi_probe_opcode(const struct flashctx *flash, uint8_t opcode); -int register_spi_master(const struct spi_master *mst, void *data); +int register_spi_master(struct flashrom_programmer *flashprog, const struct spi_master *mst, void *data); /* The following enum is needed by ich_descriptor_tool and ich* code as well as in chipset_enable.c. */ enum ich_chipset { @@ -363,7 +363,7 @@ /* ichspi.c */ #if CONFIG_INTERNAL == 1 int ich_init_spi(struct flashrom_programmer *, const struct programmer_cfg *cfg, void *spibar, enum ich_chipset ich_generation); -int via_init_spi(uint32_t mmio_base); +int via_init_spi(struct flashrom_programmer *, uint32_t mmio_base); /* amd_imc.c */ int amd_imc_shutdown(struct pci_dev *dev); @@ -385,8 +385,7 @@ } /* mcp6x_spi.c */ -int mcp6x_spi_init(int want_spi); - +int mcp6x_spi_init(struct flashrom_programmer *, int want_spi); /* sb600spi.c */ diff --git a/it87spi.c b/it87spi.c index 38b03da..1f38336 100644 --- a/it87spi.c +++ b/it87spi.c @@ -440,7 +440,7 @@ if (internal_buses_supported & BUS_SPI) msg_pdbg("Overriding chipset SPI with IT87 SPI.\n"); /* FIXME: Add the SPI bus or replace the other buses with it? */ - return register_spi_master(&spi_master_it87xx, data); + return register_spi_master(flashprog, &spi_master_it87xx, data); } int init_superio_ite(struct flashrom_programmer *flashprog, const struct programmer_cfg *cfg) diff --git a/jlink_spi.c b/jlink_spi.c index 86bdb6a..eb52478 100644 --- a/jlink_spi.c +++ b/jlink_spi.c @@ -515,7 +515,7 @@ if (!deassert_cs(jlink_data)) goto init_err; - return register_spi_master(&spi_master_jlink_spi, jlink_data); + return register_spi_master(flashprog, &spi_master_jlink_spi, jlink_data); init_err: if (jaylink_devh) diff --git a/linux_spi.c b/linux_spi.c index 40f2532..8d93e9f 100644 --- a/linux_spi.c +++ b/linux_spi.c @@ -238,7 +238,7 @@ spi_data->fd = fd; spi_data->max_kernel_buf_size = max_kernel_buf_size; - return register_spi_master(&spi_master_linux, spi_data); + return register_spi_master(flashprog, &spi_master_linux, spi_data); init_err: close(fd); diff --git a/mcp6x_spi.c b/mcp6x_spi.c index 7869925..ac43ab3 100644 --- a/mcp6x_spi.c +++ b/mcp6x_spi.c @@ -115,7 +115,7 @@ return 0; } -int mcp6x_spi_init(int want_spi) +int mcp6x_spi_init(struct flashrom_programmer *flashprog, int want_spi) { uint16_t status; uint32_t mcp6x_spibaraddr; @@ -183,7 +183,7 @@ free(data); return 1; } - if (register_spi_bitbang_master(&bitbang_spi_master_mcp6x, data)) { + if (register_spi_bitbang_master(flashprog, &bitbang_spi_master_mcp6x, data)) { /* This should never happen. */ msg_perr("MCP6X bitbang SPI master init failed!\n"); return 1; diff --git a/mediatek_i2c_spi.c b/mediatek_i2c_spi.c index 5f1321b..488602f 100644 --- a/mediatek_i2c_spi.c +++ b/mediatek_i2c_spi.c @@ -533,7 +533,7 @@ return ret; } - return register_spi_master(&spi_master_i2c_mediatek, port); + return register_spi_master(flashprog, &spi_master_i2c_mediatek, port); } const struct programmer_entry programmer_mediatek_i2c_spi = { diff --git a/mstarddc_spi.c b/mstarddc_spi.c index e94eb3b..2a18232 100644 --- a/mstarddc_spi.c +++ b/mstarddc_spi.c @@ -241,7 +241,7 @@ mstarddc_data->doreset = mstarddc_doreset; // Register programmer - register_spi_master(&spi_master_mstarddc, mstarddc_data); + register_spi_master(flashprog, &spi_master_mstarddc, mstarddc_data); out: free(i2c_device); if (ret && (mstarddc_fd >= 0)) diff --git a/ni845x_spi.c b/ni845x_spi.c index 0193134..f33f8cf 100644 --- a/ni845x_spi.c +++ b/ni845x_spi.c @@ -626,7 +626,7 @@ return 1; } - return register_spi_master(&spi_programmer_ni845x, NULL); + return register_spi_master(flashprog, &spi_programmer_ni845x, NULL); } const struct programmer_entry programmer_ni845x_spi = { diff --git a/nicintel_spi.c b/nicintel_spi.c index 3722379..643bb2e 100644 --- a/nicintel_spi.c +++ b/nicintel_spi.c @@ -326,7 +326,7 @@ } } - if (register_spi_bitbang_master(&bitbang_spi_master_nicintel, data)) + if (register_spi_bitbang_master(flashprog, &bitbang_spi_master_nicintel, data)) return 1; /* shutdown function does cleanup */ return 0; diff --git a/ogp_spi.c b/ogp_spi.c index 3ea2cc6..4b9ad8d 100644 --- a/ogp_spi.c +++ b/ogp_spi.c @@ -167,7 +167,7 @@ return 1; } - if (register_spi_bitbang_master(&bitbang_spi_master_ogp, data)) + if (register_spi_bitbang_master(flashprog, &bitbang_spi_master_ogp, data)) return 1; return 0; diff --git a/parade_lspcon.c b/parade_lspcon.c index ded8453..acaf982 100644 --- a/parade_lspcon.c +++ b/parade_lspcon.c @@ -499,7 +499,7 @@ data->fd = fd; - return register_spi_master(&spi_master_parade_lspcon, data); + return register_spi_master(flashprog, &spi_master_parade_lspcon, data); } const struct programmer_entry programmer_parade_lspcon = { diff --git a/pickit2_spi.c b/pickit2_spi.c index 10695c7..7587bbc 100644 --- a/pickit2_spi.c +++ b/pickit2_spi.c @@ -498,7 +498,7 @@ goto init_err_cleanup_exit; } - return register_spi_master(&spi_master_pickit2, pickit2_data); + return register_spi_master(flashprog, &spi_master_pickit2, pickit2_data); init_err_cleanup_exit: pickit2_shutdown(pickit2_data); diff --git a/pony_spi.c b/pony_spi.c index 1869d21..1e31f91 100644 --- a/pony_spi.c +++ b/pony_spi.c @@ -260,7 +260,7 @@ return 1; } - if (register_spi_bitbang_master(&bitbang_spi_master_pony, data)) + if (register_spi_bitbang_master(flashprog, &bitbang_spi_master_pony, data)) return 1; return 0; diff --git a/raiden_debug_spi.c b/raiden_debug_spi.c index f604c75..397cba2 100644 --- a/raiden_debug_spi.c +++ b/raiden_debug_spi.c @@ -1644,7 +1644,7 @@ return SPI_GENERIC_ERROR; } - return register_spi_master(spi_config, data); + return register_spi_master(flashprog, spi_config, data); } const struct programmer_entry programmer_raiden_debug_spi = { diff --git a/rayer_spi.c b/rayer_spi.c index e0f37d1..0065015 100644 --- a/rayer_spi.c +++ b/rayer_spi.c @@ -332,7 +332,7 @@ if (pinout->preinit) pinout->preinit(data); - if (register_spi_bitbang_master(&bitbang_spi_master_rayer, data)) + if (register_spi_bitbang_master(flashprog, &bitbang_spi_master_rayer, data)) return 1; return 0; diff --git a/realtek_mst_i2c_spi.c b/realtek_mst_i2c_spi.c index 6bfe536..a3b94dc 100644 --- a/realtek_mst_i2c_spi.c +++ b/realtek_mst_i2c_spi.c @@ -536,7 +536,7 @@ data->fd = fd; data->reset = reset; - return register_spi_master(&spi_master_i2c_realtek_mst, data); + return register_spi_master(flashprog, &spi_master_i2c_realtek_mst, data); } const struct programmer_entry programmer_realtek_mst_i2c_spi = { diff --git a/sb600spi.c b/sb600spi.c index 5809431..d35a8d5 100644 --- a/sb600spi.c +++ b/sb600spi.c @@ -811,11 +811,11 @@ /* Starting with Yangtze the SPI controller got a different interface with a much bigger buffer. */ if (amd_gen < CHIPSET_YANGTZE) - register_spi_master(&spi_master_sb600, data); + register_spi_master(flashprog, &spi_master_sb600, data); else if (amd_gen == CHIPSET_YANGTZE) - register_spi_master(&spi_master_yangtze, data); + register_spi_master(flashprog, &spi_master_yangtze, data); else - register_spi_master(&spi_master_promontory, data); + register_spi_master(flashprog, &spi_master_promontory, data); return 0; } diff --git a/serprog.c b/serprog.c index 8f9e09d..e7a72e5 100644 --- a/serprog.c +++ b/serprog.c @@ -950,7 +950,7 @@ if (register_shutdown(serprog_shutdown, NULL)) goto init_err_cleanup_exit; if (serprog_buses_supported & BUS_SPI) - register_spi_master(&spi_master_serprog, NULL); + register_spi_master(flashprog, &spi_master_serprog, NULL); if (serprog_buses_supported & BUS_NONSPI) register_par_master(flashprog, &par_master_serprog, serprog_buses_supported & BUS_NONSPI, NULL); return 0; diff --git a/spi.c b/spi.c index 6c2c4c4..b211647 100644 --- a/spi.c +++ b/spi.c @@ -141,7 +141,8 @@ return true; } -int register_spi_master(const struct spi_master *mst, void *data) +int register_spi_master(struct flashrom_programmer *flashprog, + const struct spi_master *mst, void *data) { struct registered_master rmst = {0}; @@ -167,7 +168,7 @@ rmst.spi = *mst; if (data) rmst.spi.data = data; - return register_master(&rmst); + return register_driver(flashprog, &rmst); } /* diff --git a/stlinkv3_spi.c b/stlinkv3_spi.c index 578e041..87c0a42 100644 --- a/stlinkv3_spi.c +++ b/stlinkv3_spi.c @@ -542,7 +542,7 @@ stlinkv3_data->usb_ctx = usb_ctx; stlinkv3_data->handle = stlinkv3_handle; - return register_spi_master(&spi_programmer_stlinkv3, stlinkv3_data); + return register_spi_master(flashprog, &spi_programmer_stlinkv3, stlinkv3_data); init_err_exit: if (stlinkv3_handle) diff --git a/usbblaster_spi.c b/usbblaster_spi.c index a64a694..beaf4a3 100644 --- a/usbblaster_spi.c +++ b/usbblaster_spi.c @@ -223,7 +223,7 @@ } usbblaster_data->ftdic = ftdic; - return register_spi_master(&spi_master_usbblaster, usbblaster_data); + return register_spi_master(flashprog, &spi_master_usbblaster, usbblaster_data); } const struct programmer_entry programmer_usbblaster_spi = { diff --git a/wbsio_spi.c b/wbsio_spi.c index d635a09..91c4827 100644 --- a/wbsio_spi.c +++ b/wbsio_spi.c @@ -217,5 +217,5 @@ } data->spibase = wbsio_spibase; - return register_spi_master(&spi_master_wbsio, data); + return register_spi_master(NULL, &spi_master_wbsio, data); /* FIXME(quasisec) */ } -- To view, visit https://review.coreboot.org/c/flashrom/+/72783 To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: flashrom Gerrit-Branch: master Gerrit-Change-Id: I0ce26d39dff4de5ec7b71e7823e0a843237fffff Gerrit-Change-Number: 72783 Gerrit-PatchSet: 1 Gerrit-Owner: Edward O'Callaghan <quasisec(a)chromium.org> Gerrit-Reviewer: Arthur Heymans <arthur(a)aheymans.xyz> Gerrit-Reviewer: Peter Marheine <pmarheine(a)chromium.org> Gerrit-Attention: Arthur Heymans <arthur(a)aheymans.xyz> Gerrit-Attention: Peter Marheine <pmarheine(a)chromium.org> Gerrit-MessageType: newchange

1 0

[S] Change in flashrom[master]: migrate register_par_master()
by Edward O'Callaghan (Code Review) 03 Feb '23

03 Feb '23

Edward O'Callaghan has uploaded this change for review. ( https://review.coreboot.org/c/flashrom/+/72782 ) Change subject: migrate register_par_master() ...................................................................... migrate register_par_master() Change-Id: I3781dda4cbd7d07c350a1de47a7a8186ca3912f0 Signed-off-by: Edward O'Callaghan <quasisec(a)google.com> --- M atahpt.c M atapromise.c M atavia.c M drkaiser.c M dummyflasher.c M gfxnvidia.c M include/programmer.h M internal.c M it8212.c M nic3com.c M nicintel.c M nicnatsemi.c M nicrealtek.c M parallel.c M satamv.c M satasii.c M serprog.c 17 files changed, 27 insertions(+), 17 deletions(-) git pull ssh://review.coreboot.org:29418/flashrom refs/changes/82/72782/1 diff --git a/atahpt.c b/atahpt.c index 990338f..8283c40 100644 --- a/atahpt.c +++ b/atahpt.c @@ -106,7 +106,7 @@ data->flash_access = pci_read_long(dev, REG_FLASH_ACCESS); pci_write_long(dev, REG_FLASH_ACCESS, data->flash_access | BIT_FLASH_ACCESS); - return register_par_master(&par_master_atahpt, BUS_PARALLEL, data); + return register_par_master(flashprog, &par_master_atahpt, BUS_PARALLEL, data); } const struct programmer_entry programmer_atahpt = { diff --git a/atapromise.c b/atapromise.c index 5218f62..fe97b69 100644 --- a/atapromise.c +++ b/atapromise.c @@ -170,7 +170,7 @@ data->rom_size = rom_size; max_rom_decode.parallel = rom_size; - return register_par_master(&par_master_atapromise, BUS_PARALLEL, data); + return register_par_master(flashprog, &par_master_atapromise, BUS_PARALLEL, data); } const struct programmer_entry programmer_atapromise = { diff --git a/atavia.c b/atavia.c index 460f1a1..bc38cc0 100644 --- a/atavia.c +++ b/atavia.c @@ -176,7 +176,7 @@ return 1; } - return register_par_master(&lpc_master_atavia, BUS_LPC, NULL); + return register_par_master(flashprog, &lpc_master_atavia, BUS_LPC, NULL); } const struct programmer_entry programmer_atavia = { diff --git a/drkaiser.c b/drkaiser.c index 28684d2..96178fc 100644 --- a/drkaiser.c +++ b/drkaiser.c @@ -108,7 +108,7 @@ max_rom_decode.parallel = 128 * 1024; - return register_par_master(&par_master_drkaiser, BUS_PARALLEL, data); + return register_par_master(flashprog, &par_master_drkaiser, BUS_PARALLEL, data); } const struct programmer_entry programmer_drkaiser = { diff --git a/dummyflasher.c b/dummyflasher.c index 8e97e4a..bd4b94a 100644 --- a/dummyflasher.c +++ b/dummyflasher.c @@ -1420,7 +1420,7 @@ if (dummy_buses_supported & BUS_PROG) ret |= register_opaque_master(flashprog, &opaque_master_dummyflasher, data); if (dummy_buses_supported & BUS_NONSPI) - ret |= register_par_master(&par_master_dummyflasher, + ret |= register_par_master(flashprog, &par_master_dummyflasher, dummy_buses_supported & BUS_NONSPI, data); if (dummy_buses_supported & BUS_SPI) diff --git a/gfxnvidia.c b/gfxnvidia.c index 8ea76cc..24063d4 100644 --- a/gfxnvidia.c +++ b/gfxnvidia.c @@ -136,7 +136,7 @@ /* Write/erase doesn't work. */ programmer_may_write = false; - return register_par_master(&par_master_gfxnvidia, BUS_PARALLEL, data); + return register_par_master(flashprog, &par_master_gfxnvidia, BUS_PARALLEL, data); } const struct programmer_entry programmer_gfxnvidia = { diff --git a/include/programmer.h b/include/programmer.h index eb8eae9..4821689 100644 --- a/include/programmer.h +++ b/include/programmer.h @@ -440,7 +440,7 @@ void (*delay) (const struct flashctx *flash, unsigned int usecs); void *data; }; -int register_par_master(const struct par_master *mst, const enum chipbustype buses, void *data); +int register_par_master(struct flashrom_programmer *flashprog, const struct par_master *mst, const enum chipbustype buses, void *data); /* programmer.c */ struct registered_master { diff --git a/internal.c b/internal.c index 4dd8559..654f696 100644 --- a/internal.c +++ b/internal.c @@ -280,7 +280,7 @@ #endif if (internal_buses_supported & BUS_NONSPI) - register_par_master(&par_master_internal, internal_buses_supported, NULL); + register_par_master(flashprog, &par_master_internal, internal_buses_supported, NULL); /* Report if a non-whitelisted laptop is detected that likely uses a legacy bus. */ if (is_laptop && !laptop_ok) { diff --git a/it8212.c b/it8212.c index 00688b6..9e1a9c4 100644 --- a/it8212.c +++ b/it8212.c @@ -98,7 +98,7 @@ pci_write_long(dev, PCI_ROM_ADDRESS, io_base_addr | 0x01); max_rom_decode.parallel = IT8212_MEMMAP_SIZE; - return register_par_master(&par_master_it8212, BUS_PARALLEL, data); + return register_par_master(flashprog, &par_master_it8212, BUS_PARALLEL, data); } const struct programmer_entry programmer_it8212 = { .name = "it8212", diff --git a/nic3com.c b/nic3com.c index 4703073..9c24f3c 100644 --- a/nic3com.c +++ b/nic3com.c @@ -144,7 +144,7 @@ max_rom_decode.parallel = 128 * 1024; - return register_par_master(&par_master_nic3com, BUS_PARALLEL, data); + return register_par_master(flashprog, &par_master_nic3com, BUS_PARALLEL, data); init_err_cleanup_exit: /* 3COM 3C90xB cards need a special fixup. */ diff --git a/nicintel.c b/nicintel.c index fed3cfb..0940d39 100644 --- a/nicintel.c +++ b/nicintel.c @@ -119,7 +119,7 @@ data->nicintel_control_bar = control_bar; max_rom_decode.parallel = NICINTEL_MEMMAP_SIZE; - return register_par_master(&par_master_nicintel, BUS_PARALLEL, data); + return register_par_master(flashprog, &par_master_nicintel, BUS_PARALLEL, data); } const struct programmer_entry programmer_nicintel = { diff --git a/nicnatsemi.c b/nicnatsemi.c index 46e28ea..3455ee5 100644 --- a/nicnatsemi.c +++ b/nicnatsemi.c @@ -112,7 +112,7 @@ * functions below wants to be 0x0000FFFF. */ max_rom_decode.parallel = 131072; - return register_par_master(&par_master_nicnatsemi, BUS_PARALLEL, data); + return register_par_master(flashprog, &par_master_nicnatsemi, BUS_PARALLEL, data); } diff --git a/nicrealtek.c b/nicrealtek.c index fdda5ad..25f0fa0 100644 --- a/nicrealtek.c +++ b/nicrealtek.c @@ -132,7 +132,7 @@ data->bios_rom_addr = bios_rom_addr; data->bios_rom_data = bios_rom_data; - return register_par_master(&par_master_nicrealtek, BUS_PARALLEL, data); + return register_par_master(flashprog, &par_master_nicrealtek, BUS_PARALLEL, data); } const struct programmer_entry programmer_nicrealtek = { diff --git a/parallel.c b/parallel.c index b193723..ce0749d 100644 --- a/parallel.c +++ b/parallel.c @@ -126,7 +126,7 @@ fallback_chip_readn(flash, buf, addr, len); } -int register_par_master(const struct par_master *mst, +int register_par_master(struct flashrom_programmer *flashprog, const struct par_master *mst, const enum chipbustype buses, void *data) { diff --git a/satamv.c b/satamv.c index 53edb8a..8bb92ee 100644 --- a/satamv.c +++ b/satamv.c @@ -197,7 +197,7 @@ /* 512 kByte with two 8-bit latches, and * 4 MByte with additional 3-bit latch. */ max_rom_decode.parallel = 4 * 1024 * 1024; - return register_par_master(&par_master_satamv, BUS_PARALLEL, data); + return register_par_master(flashprog, &par_master_satamv, BUS_PARALLEL, data); } const struct programmer_entry programmer_satamv = { diff --git a/satasii.c b/satasii.c index f982281..214d4c9 100644 --- a/satasii.c +++ b/satasii.c @@ -140,7 +140,7 @@ } data->bar = bar; - return register_par_master(&par_master_satasii, BUS_PARALLEL, data); + return register_par_master(flashprog, &par_master_satasii, BUS_PARALLEL, data); } const struct programmer_entry programmer_satasii = { .name = "satasii", diff --git a/serprog.c b/serprog.c index 2b1b7f1..8f9e09d 100644 --- a/serprog.c +++ b/serprog.c @@ -952,7 +952,7 @@ if (serprog_buses_supported & BUS_SPI) register_spi_master(&spi_master_serprog, NULL); if (serprog_buses_supported & BUS_NONSPI) - register_par_master(&par_master_serprog, serprog_buses_supported & BUS_NONSPI, NULL); + register_par_master(flashprog, &par_master_serprog, serprog_buses_supported & BUS_NONSPI, NULL); return 0; init_err_cleanup_exit: -- To view, visit https://review.coreboot.org/c/flashrom/+/72782 To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: flashrom Gerrit-Branch: master Gerrit-Change-Id: I3781dda4cbd7d07c350a1de47a7a8186ca3912f0 Gerrit-Change-Number: 72782 Gerrit-PatchSet: 1 Gerrit-Owner: Edward O'Callaghan <quasisec(a)chromium.org> Gerrit-MessageType: newchange

1 0

2025

2024

2023

2022

2021

2020

2019

2018

2017

flashrom-gerrit