- flashrom-gerrit - mail.coreboot.org

Change in flashrom[master]: dummyflasher: Replace another case of `sizeof(struct ...)`
by Angel Pons (Code Review) 09 Jun '21

09 Jun '21

Attention is currently required from: Nico Huber, Anastasia Klimchuk. Angel Pons has posted comments on this change. ( https://review.coreboot.org/c/flashrom/+/55358 ) Change subject: dummyflasher: Replace another case of `sizeof(struct ...)` ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://review.coreboot.org/c/flashrom/+/55358 To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: flashrom Gerrit-Branch: master Gerrit-Change-Id: If88ba394095f86c598dcc5cf1751e1c23b132d04 Gerrit-Change-Number: 55358 Gerrit-PatchSet: 1 Gerrit-Owner: Nico Huber <nico.h(a)gmx.de> Gerrit-Reviewer: Anastasia Klimchuk <aklm(a)chromium.org> Gerrit-Reviewer: Angel Pons <th3fanbus(a)gmail.com> Gerrit-Reviewer: build bot (Jenkins) <no-reply(a)coreboot.org> Gerrit-Attention: Nico Huber <nico.h(a)gmx.de> Gerrit-Attention: Anastasia Klimchuk <aklm(a)chromium.org> Gerrit-Comment-Date: Wed, 09 Jun 2021 16:20:44 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 0

Change in flashrom[master]: programmer_table: move each entry to the associated programmer source
by Thomas Heijligen (Code Review) 09 Jun '21

09 Jun '21

Attention is currently required from: Thomas Heijligen, Anastasia Klimchuk. Hello build bot (Jenkins), Nico Huber, Edward O'Callaghan, Anastasia Klimchuk, I'd like you to reexamine a change. Please visit https://review.coreboot.org/c/flashrom/+/52946 to look at the new patch set (#9). Change subject: programmer_table: move each entry to the associated programmer source ...................................................................... programmer_table: move each entry to the associated programmer source Change-Id: I3d02bd789f0299e936eb86819b3b15b5ea2bb921 Signed-off-by: Thomas Heijligen <thomas.heijligen(a)secunet.de> --- 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 drkaiser.c M dummyflasher.c M ene_lpc.c M ft2232_spi.c M gfxnvidia.c M internal.c M it8212.c M jlink_spi.c M linux_mtd.c M linux_spi.c M lspcon_i2c_spi.c M mec1308.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 pickit2_spi.c M pony_spi.c M programmer.h M programmer_table.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, 506 insertions(+), 617 deletions(-) git pull ssh://review.coreboot.org:29418/flashrom refs/changes/46/52946/9 -- To view, visit https://review.coreboot.org/c/flashrom/+/52946 To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: flashrom Gerrit-Branch: master Gerrit-Change-Id: I3d02bd789f0299e936eb86819b3b15b5ea2bb921 Gerrit-Change-Number: 52946 Gerrit-PatchSet: 9 Gerrit-Owner: Thomas Heijligen <src(a)posteo.de> Gerrit-Reviewer: Anastasia Klimchuk <aklm(a)chromium.org> Gerrit-Reviewer: Edward O'Callaghan <quasisec(a)chromium.org> Gerrit-Reviewer: Nico Huber <nico.h(a)gmx.de> Gerrit-Reviewer: build bot (Jenkins) <no-reply(a)coreboot.org> Gerrit-CC: Angel Pons <th3fanbus(a)gmail.com> Gerrit-CC: Paul Menzel <paulepanter(a)mailbox.org> Gerrit-CC: Xiang W <wxjstz(a)126.com> Gerrit-Attention: Thomas Heijligen <src(a)posteo.de> Gerrit-Attention: Anastasia Klimchuk <aklm(a)chromium.org> Gerrit-MessageType: newpatchset

1 0

Change in flashrom[master]: dummyflasher: Re-arrange includes
by Nico Huber (Code Review) 09 Jun '21

09 Jun '21

Attention is currently required from: Angel Pons, Anastasia Klimchuk. Hello Angel Pons, Anastasia Klimchuk, I'd like you to do a code review. Please visit https://review.coreboot.org/c/flashrom/+/55359 to review the following change. Change subject: dummyflasher: Re-arrange includes ...................................................................... dummyflasher: Re-arrange includes Gather library includes at the top. Change-Id: Ib20a3245cae3206dca1d8f88f705ac3628473f43 Signed-off-by: Nico Huber <nico.huber(a)secunet.com> --- M dummyflasher.c 1 file changed, 2 insertions(+), 3 deletions(-) git pull ssh://review.coreboot.org:29418/flashrom refs/changes/59/55359/1 diff --git a/dummyflasher.c b/dummyflasher.c index eb3789c..036add6 100644 --- a/dummyflasher.c +++ b/dummyflasher.c @@ -18,15 +18,14 @@ #include <stdio.h> #include <ctype.h> #include <errno.h> +#include <sys/types.h> +#include <sys/stat.h> #include "flash.h" #include "chipdrivers.h" #include "programmer.h" #include "flashchips.h" #include "spi.h" -#include <sys/types.h> -#include <sys/stat.h> - enum emu_chip { EMULATE_NONE, EMULATE_ST_M25P10_RES, -- To view, visit https://review.coreboot.org/c/flashrom/+/55359 To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: flashrom Gerrit-Branch: master Gerrit-Change-Id: Ib20a3245cae3206dca1d8f88f705ac3628473f43 Gerrit-Change-Number: 55359 Gerrit-PatchSet: 1 Gerrit-Owner: Nico Huber <nico.h(a)gmx.de> Gerrit-Reviewer: Anastasia Klimchuk <aklm(a)chromium.org> Gerrit-Reviewer: Angel Pons <th3fanbus(a)gmail.com> Gerrit-Attention: Angel Pons <th3fanbus(a)gmail.com> Gerrit-Attention: Anastasia Klimchuk <aklm(a)chromium.org> Gerrit-MessageType: newchange

1 0

Change in flashrom[master]: dummyflasher: Replace another case of `sizeof(struct ...)`
by Nico Huber (Code Review) 09 Jun '21

09 Jun '21

Attention is currently required from: Angel Pons, Anastasia Klimchuk. Hello Angel Pons, Anastasia Klimchuk, I'd like you to do a code review. Please visit https://review.coreboot.org/c/flashrom/+/55358 to review the following change. Change subject: dummyflasher: Replace another case of `sizeof(struct ...)` ...................................................................... dummyflasher: Replace another case of `sizeof(struct ...)` Using the pointer's type instead ensures that we get the right size even if code changes in the future. Change-Id: If88ba394095f86c598dcc5cf1751e1c23b132d04 Signed-off-by: Nico Huber <nico.huber(a)secunet.com> --- M dummyflasher.c 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://review.coreboot.org:29418/flashrom refs/changes/58/55358/1 diff --git a/dummyflasher.c b/dummyflasher.c index ba06e7c..eb3789c 100644 --- a/dummyflasher.c +++ b/dummyflasher.c @@ -947,7 +947,7 @@ { struct stat image_stat; - struct emu_data *data = calloc(1, sizeof(struct emu_data)); + struct emu_data *data = calloc(1, sizeof(*data)); if (!data) { msg_perr("Out of memory!\n"); return 1; -- To view, visit https://review.coreboot.org/c/flashrom/+/55358 To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: flashrom Gerrit-Branch: master Gerrit-Change-Id: If88ba394095f86c598dcc5cf1751e1c23b132d04 Gerrit-Change-Number: 55358 Gerrit-PatchSet: 1 Gerrit-Owner: Nico Huber <nico.h(a)gmx.de> Gerrit-Reviewer: Anastasia Klimchuk <aklm(a)chromium.org> Gerrit-Reviewer: Angel Pons <th3fanbus(a)gmail.com> Gerrit-Attention: Angel Pons <th3fanbus(a)gmail.com> Gerrit-Attention: Anastasia Klimchuk <aklm(a)chromium.org> Gerrit-MessageType: newchange

1 0

Change in flashrom[master]: treewide: Drop unnecessary uses of memset/memcpy
by Nico Huber (Code Review) 09 Jun '21

09 Jun '21

Nico Huber has submitted this change. ( https://review.coreboot.org/c/flashrom/+/55267 ) Change subject: treewide: Drop unnecessary uses of memset/memcpy ...................................................................... treewide: Drop unnecessary uses of memset/memcpy Simply provide an initialiser or use a direct assignment instead. Change-Id: I07385375cd8eec8a95874001b402b2c17ec09e09 Signed-off-by: Angel Pons <th3fanbus(a)gmail.com> Reviewed-on: https://review.coreboot.org/c/flashrom/+/55267 Tested-by: build bot (Jenkins) <no-reply(a)coreboot.org> Reviewed-by: Nico Huber <nico.h(a)gmx.de> --- M flashrom.c M ichspi.c M jlink_spi.c M linux_mtd.c M physmap.c M raiden_debug_spi.c M stlinkv3_spi.c M usbblaster_spi.c 8 files changed, 21 insertions(+), 49 deletions(-) Approvals: build bot (Jenkins): Verified Nico Huber: Looks good to me, approved diff --git a/flashrom.c b/flashrom.c index cd2e9a7..b804e2d 100644 --- a/flashrom.c +++ b/flashrom.c @@ -761,7 +761,7 @@ msg_gerr("Out of memory!\n"); exit(1); } - memcpy(flash->chip, chip, sizeof(*flash->chip)); + *flash->chip = *chip; flash->mst = mst; if (map_flash(flash) != 0) @@ -1619,11 +1619,9 @@ static void print_sysinfo(void) { #if IS_WINDOWS - SYSTEM_INFO si; - OSVERSIONINFOEX osvi; + SYSTEM_INFO si = { 0 }; + OSVERSIONINFOEX osvi = { 0 }; - memset(&si, 0, sizeof(SYSTEM_INFO)); - memset(&osvi, 0, sizeof(OSVERSIONINFOEX)); msg_ginfo(" on Windows"); /* Tell Windows which version of the structure we want. */ osvi.dwOSVersionInfoSize = sizeof(OSVERSIONINFOEX); diff --git a/ichspi.c b/ichspi.c index 20dac1b..091e4e2 100644 --- a/ichspi.c +++ b/ichspi.c @@ -1720,7 +1720,7 @@ char *arg; int ich_spi_rw_restricted = 0; int desc_valid = 0; - struct ich_descriptors desc; + struct ich_descriptors desc = { 0 }; enum ich_spi_mode { ich_auto, ich_hwseq, @@ -1731,8 +1731,6 @@ ich_generation = ich_gen; ich_spibar = spibar; - memset(&desc, 0x00, sizeof(desc)); - /* Moving registers / bits */ switch (ich_gen) { case CHIPSET_100_SERIES_SUNRISE_POINT: diff --git a/jlink_spi.c b/jlink_spi.c index 6342e7f..0b862cf 100644 --- a/jlink_spi.c +++ b/jlink_spi.c @@ -358,9 +358,8 @@ goto init_err; } - uint8_t caps[JAYLINK_DEV_EXT_CAPS_SIZE]; + uint8_t caps[JAYLINK_DEV_EXT_CAPS_SIZE] = { 0 }; - memset(caps, 0, sizeof(caps)); ret = jaylink_get_caps(jaylink_devh, caps); if (ret != JAYLINK_OK) { diff --git a/linux_mtd.c b/linux_mtd.c index a1af069..b068164 100644 --- a/linux_mtd.c +++ b/linux_mtd.c @@ -315,8 +315,7 @@ if (snprintf(sysfs_path, sizeof(sysfs_path), "%s/mtd%d/", LINUX_MTD_SYSFS_ROOT, dev_num) < 0) goto linux_mtd_setup_exit; - char buf[4]; - memset(buf, 0, sizeof(buf)); + char buf[4] = { 0 }; if (read_sysfs_string(sysfs_path, "type", buf, sizeof(buf))) return 1; diff --git a/physmap.c b/physmap.c index 6c36814..796860c 100644 --- a/physmap.c +++ b/physmap.c @@ -433,8 +433,7 @@ int setup_cpu_msr(int cpu) { - char msrfilename[64]; - memset(msrfilename, 0, sizeof(msrfilename)); + char msrfilename[64] = { 0 }; snprintf(msrfilename, sizeof(msrfilename), "/dev/cpu/%d/msr", cpu); if (fd_msr != -1) { @@ -509,8 +508,7 @@ int setup_cpu_msr(int cpu) { - char msrfilename[64]; - memset(msrfilename, 0, sizeof(msrfilename)); + char msrfilename[64] = { 0 }; snprintf(msrfilename, sizeof(msrfilename), "/dev/amdmsr"); if (fd_msr != -1) { @@ -591,8 +589,7 @@ int setup_cpu_msr(int cpu) { - char msrfilename[64]; - memset(msrfilename, 0, sizeof(msrfilename)); + char msrfilename[64] = { 0 }; snprintf(msrfilename, sizeof(msrfilename), "/dev/cpu%d", cpu); if (fd_msr != -1) { diff --git a/raiden_debug_spi.c b/raiden_debug_spi.c index 950b8af..4e177e5 100644 --- a/raiden_debug_spi.c +++ b/raiden_debug_spi.c @@ -1510,12 +1510,10 @@ found = 1; goto loop_end; } else { - unsigned char dev_serial[32]; + unsigned char dev_serial[32] = { 0 }; struct libusb_device_descriptor descriptor; int rc; - memset(dev_serial, 0, sizeof(dev_serial)); - if (libusb_get_device_descriptor(device->device, &descriptor)) { msg_pdbg("USB: Failed to get device descriptor.\n"); goto loop_end; @@ -1591,7 +1589,7 @@ return SPI_GENERIC_ERROR; } - memcpy(spi_config, &spi_master_raiden_debug, sizeof(*spi_config)); + *spi_config = spi_master_raiden_debug; data->dev = device; data->in_ep = in_endpoint; diff --git a/stlinkv3_spi.c b/stlinkv3_spi.c index 2453162..8b62740 100644 --- a/stlinkv3_spi.c +++ b/stlinkv3_spi.c @@ -156,14 +156,12 @@ */ static int stlinkv3_get_clk(uint32_t *bridge_input_clk, libusb_device_handle *stlinkv3_handle) { - uint8_t command[16]; + uint8_t command[16] = { 0 }; uint8_t answer[12]; if (bridge_input_clk == NULL) return -1; - memset(command, 0, sizeof(command)); - command[0] = STLINK_BRIDGE_COMMAND; command[1] = STLINK_BRIDGE_GET_CLOCK; command[2] = STLINK_SPI_COM; @@ -234,9 +232,7 @@ static int stlinkv3_check_version(enum fw_version_check_result *result, libusb_device_handle *stlinkv3_handle) { uint8_t answer[12]; - uint8_t command[16]; - - memset(command, 0, sizeof(command)); + uint8_t command[16] = { 0 }; command[0] = ST_GETVERSION_EXT; command[1] = 0x80; @@ -256,7 +252,7 @@ static int stlinkv3_spi_open(uint16_t reqested_freq_in_kHz, libusb_device_handle *stlinkv3_handle) { - uint8_t command[16]; + uint8_t command[16] = { 0 }; uint8_t answer[2]; uint16_t SCK_freq_in_kHz; enum spi_prescaler prescaler; @@ -284,8 +280,6 @@ } msg_pinfo("SCK frequency set to %d kHz\n", SCK_freq_in_kHz); - memset(command, 0, sizeof(command)); - command[0] = STLINK_BRIDGE_COMMAND; command[1] = STLINK_BRIDGE_INIT_SPI; command[2] = SPI_DIRECTION_2LINES_FULLDUPLEX; @@ -305,11 +299,9 @@ static int stlinkv3_get_last_readwrite_status(uint32_t *status, libusb_device_handle *stlinkv3_handle) { - uint8_t command[16]; + uint8_t command[16] = { 0 }; uint16_t answer[4]; - memset(command, 0, sizeof(command)); - command[0] = STLINK_BRIDGE_COMMAND; command[1] = STLINK_BRIDGE_GET_RWCMD_STATUS; @@ -325,11 +317,9 @@ static int stlinkv3_spi_set_SPI_NSS(enum spi_nss_level nss_level, libusb_device_handle *stlinkv3_handle) { - uint8_t command[16]; + uint8_t command[16] = { 0 }; uint8_t answer[2]; - memset(command, 0, sizeof(command)); - command[0] = STLINK_BRIDGE_COMMAND; command[1] = STLINK_BRIDGE_CS_SPI; command[2] = (uint8_t) (nss_level); @@ -350,7 +340,7 @@ { struct stlinkv3_spi_data *stlinkv3_data = flash->mst->spi.data; libusb_device_handle *stlinkv3_handle = stlinkv3_data->handle; - uint8_t command[16]; + uint8_t command[16] = { 0 }; int rc = 0; int actual_length = 0; uint32_t rw_status = 0; @@ -361,8 +351,6 @@ return -1; } - memset(command, 0, sizeof(command)); - command[0] = STLINK_BRIDGE_COMMAND; command[1] = STLINK_BRIDGE_WRITE_SPI; command[2] = (uint8_t)write_cnt; @@ -452,11 +440,9 @@ static int stlinkv3_spi_shutdown(void *data) { struct stlinkv3_spi_data *stlinkv3_data = data; - uint8_t command[16]; + uint8_t command[16] = { 0 }; uint8_t answer[2]; - memset(command, 0, sizeof(command)); - command[0] = STLINK_BRIDGE_COMMAND; command[1] = STLINK_BRIDGE_CLOSE; command[2] = STLINK_SPI_COM; diff --git a/usbblaster_spi.c b/usbblaster_spi.c index 115876e..5f240df 100644 --- a/usbblaster_spi.c +++ b/usbblaster_spi.c @@ -74,9 +74,8 @@ static int send_write(unsigned int writecnt, const unsigned char *writearr, struct ftdi_context ftdic) { - uint8_t buf[BUF_SIZE]; + uint8_t buf[BUF_SIZE] = { 0 }; - memset(buf, 0, sizeof(buf)); while (writecnt) { unsigned int i; unsigned int n_write = min(writecnt, BUF_SIZE - 1); @@ -101,8 +100,7 @@ { int i; unsigned int n_read; - uint8_t buf[BUF_SIZE]; - memset(buf, 0, sizeof(buf)); + uint8_t buf[BUF_SIZE] = { 0 }; n_read = readcnt; while (n_read) { @@ -181,7 +179,7 @@ /* Returns 0 upon success, a negative number upon errors. */ int usbblaster_spi_init(void) { - uint8_t buf[BUF_SIZE + 1]; + uint8_t buf[BUF_SIZE + 1] = { 0 }; struct ftdi_context ftdic; struct usbblaster_spi_data *usbblaster_data; @@ -209,7 +207,6 @@ return -1; } - memset(buf, 0, sizeof(buf)); buf[sizeof(buf)-1] = BIT_LED | BIT_CS; if (ftdi_write_data(&ftdic, buf, sizeof(buf)) < 0) { msg_perr("USB-Blaster reset write failed\n"); -- To view, visit https://review.coreboot.org/c/flashrom/+/55267 To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: flashrom Gerrit-Branch: master Gerrit-Change-Id: I07385375cd8eec8a95874001b402b2c17ec09e09 Gerrit-Change-Number: 55267 Gerrit-PatchSet: 5 Gerrit-Owner: Angel Pons <th3fanbus(a)gmail.com> Gerrit-Reviewer: Nico Huber <nico.h(a)gmx.de> Gerrit-Reviewer: build bot (Jenkins) <no-reply(a)coreboot.org> Gerrit-CC: Paul Menzel <paulepanter(a)mailbox.org> Gerrit-MessageType: merged

1 0

Change in flashrom[master]: treewide: Drop most cases of `sizeof(struct ...)`
by Nico Huber (Code Review) 09 Jun '21

09 Jun '21

Nico Huber has submitted this change. ( https://review.coreboot.org/c/flashrom/+/55266 ) Change subject: treewide: Drop most cases of `sizeof(struct ...)` ...................................................................... treewide: Drop most cases of `sizeof(struct ...)` Spelling out the struct type name hurts readability and introduces opportunities for bugs to happen when the pointer variable type is changed but the corresponding sizeof is (are) not. TEST=`make CONFIG_EVERYTHING=yes CONFIG_JLINK_SPI=no VERSION=none -j` with and without this patch; the flashrom executable does not change. Change-Id: Icc0b60ca6ef9f5ece6ed2a0e03600bb6ccd7dcc6 Signed-off-by: Angel Pons <th3fanbus(a)gmail.com> Reviewed-on: https://review.coreboot.org/c/flashrom/+/55266 Tested-by: build bot (Jenkins) <no-reply(a)coreboot.org> Reviewed-by: Nico Huber <nico.h(a)gmx.de> Reviewed-by: Edward O'Callaghan <quasisec(a)chromium.org> --- M bitbang_spi.c M flashrom.c M fmap.c M hwaccess.c M ichspi.c M it85spi.c M it87spi.c M layout.c M libflashrom.c M lspcon_i2c_spi.c M pcidev.c M physmap.c M raiden_debug_spi.c M realtek_mst_i2c_spi.c M sb600spi.c M sfdp.c M usb_device.c M wbsio_spi.c 18 files changed, 21 insertions(+), 21 deletions(-) Approvals: build bot (Jenkins): Verified Nico Huber: Looks good to me, approved Edward O'Callaghan: Looks good to me, approved diff --git a/bitbang_spi.c b/bitbang_spi.c index e941910..3d973c5 100644 --- a/bitbang_spi.c +++ b/bitbang_spi.c @@ -162,7 +162,7 @@ return ERROR_FLASHROM_BUG; } - struct bitbang_spi_master_data *data = calloc(1, sizeof(struct bitbang_spi_master_data)); + struct bitbang_spi_master_data *data = calloc(1, sizeof(*data)); data->master = master; if (spi_data) data->spi_data = spi_data; diff --git a/flashrom.c b/flashrom.c index f5a39b8..cd2e9a7 100644 --- a/flashrom.c +++ b/flashrom.c @@ -756,12 +756,12 @@ } /* Start filling in the dynamic data. */ - flash->chip = calloc(1, sizeof(struct flashchip)); + flash->chip = calloc(1, sizeof(*flash->chip)); if (!flash->chip) { msg_gerr("Out of memory!\n"); exit(1); } - memcpy(flash->chip, chip, sizeof(struct flashchip)); + memcpy(flash->chip, chip, sizeof(*flash->chip)); flash->mst = mst; if (map_flash(flash) != 0) diff --git a/fmap.c b/fmap.c index 2f34a5c..b18cbf7 100644 --- a/fmap.c +++ b/fmap.c @@ -195,7 +195,7 @@ if (prepare_flash_access(flashctx, true, false, false, false)) return 1; - fmap = malloc(sizeof(struct fmap)); + fmap = malloc(sizeof(*fmap)); if (!fmap) { msg_gerr("Out of memory.\n"); goto _free_ret; diff --git a/hwaccess.c b/hwaccess.c index 48ccb34..3a9ca57 100644 --- a/hwaccess.c +++ b/hwaccess.c @@ -247,7 +247,7 @@ #define register_undo_mmio_write(a, c) \ { \ struct undo_mmio_write_data *undo_mmio_write_data; \ - undo_mmio_write_data = malloc(sizeof(struct undo_mmio_write_data)); \ + undo_mmio_write_data = malloc(sizeof(*undo_mmio_write_data)); \ if (!undo_mmio_write_data) { \ msg_gerr("Out of memory!\n"); \ exit(1); \ diff --git a/ichspi.c b/ichspi.c index 80fcff5..20dac1b 100644 --- a/ichspi.c +++ b/ichspi.c @@ -1731,7 +1731,7 @@ ich_generation = ich_gen; ich_spibar = spibar; - memset(&desc, 0x00, sizeof(struct ich_descriptors)); + memset(&desc, 0x00, sizeof(desc)); /* Moving registers / bits */ switch (ich_gen) { diff --git a/it85spi.c b/it85spi.c index 810f062..9812fc7 100644 --- a/it85spi.c +++ b/it85spi.c @@ -341,7 +341,7 @@ (unsigned int)base); #endif - data = calloc(1, sizeof(struct it85spi_data)); + data = calloc(1, sizeof(*data)); if (!data) { msg_perr("Unable to allocate space for extra SPI master data.\n"); return SPI_GENERIC_ERROR; diff --git a/it87spi.c b/it87spi.c index 92c95fa..cbf830b 100644 --- a/it87spi.c +++ b/it87spi.c @@ -411,7 +411,7 @@ free(param); exit_conf_mode_ite(port); - struct it8716f_spi_data *data = calloc(1, sizeof(struct it8716f_spi_data)); + struct it8716f_spi_data *data = calloc(1, sizeof(*data)); if (!data) { msg_perr("Unable to allocate space for extra SPI master data.\n"); return SPI_GENERIC_ERROR; diff --git a/layout.c b/layout.c index 4d1dd56..cd6b458 100644 --- a/layout.c +++ b/layout.c @@ -135,7 +135,7 @@ } } - tmp = malloc(sizeof(struct layout_include_args)); + tmp = malloc(sizeof(*tmp)); if (tmp == NULL) { msg_gerr("Could not allocate memory"); goto error; diff --git a/libflashrom.c b/libflashrom.c index 09a4e4d..d0296d0 100644 --- a/libflashrom.c +++ b/libflashrom.c @@ -182,7 +182,7 @@ ++boards_known_size; struct flashrom_board_info *supported_boards = - malloc(boards_known_size * sizeof(struct flashrom_board_info)); + malloc(boards_known_size * sizeof(*supported_boards)); if (supported_boards != NULL) { for (; i < boards_known_size; ++i) { diff --git a/lspcon_i2c_spi.c b/lspcon_i2c_spi.c index 7f5e3ef..9a66b31 100644 --- a/lspcon_i2c_spi.c +++ b/lspcon_i2c_spi.c @@ -446,7 +446,7 @@ return ret; } - struct lspcon_i2c_spi_data *data = calloc(1, sizeof(struct lspcon_i2c_spi_data)); + struct lspcon_i2c_spi_data *data = calloc(1, sizeof(*data)); if (!data) { msg_perr("Unable to allocate space for extra SPI master data.\n"); i2c_close(fd); diff --git a/pcidev.c b/pcidev.c index 892f7b1..9ffe05c 100644 --- a/pcidev.c +++ b/pcidev.c @@ -296,7 +296,7 @@ #define register_undo_pci_write(a, b, c) \ { \ struct undo_pci_write_data *undo_pci_write_data; \ - undo_pci_write_data = malloc(sizeof(struct undo_pci_write_data)); \ + undo_pci_write_data = malloc(sizeof(*undo_pci_write_data)); \ if (!undo_pci_write_data) { \ msg_gerr("Out of memory!\n"); \ exit(1); \ diff --git a/physmap.c b/physmap.c index 72d5899..6c36814 100644 --- a/physmap.c +++ b/physmap.c @@ -292,7 +292,7 @@ } if (autocleanup) { - struct undo_physmap_data *d = malloc(sizeof(struct undo_physmap_data)); + struct undo_physmap_data *d = malloc(sizeof(*d)); if (d == NULL) { msg_perr("%s: Out of memory!\n", __func__); physunmap_unaligned(virt_addr, len); diff --git a/raiden_debug_spi.c b/raiden_debug_spi.c index f67bbe5..950b8af 100644 --- a/raiden_debug_spi.c +++ b/raiden_debug_spi.c @@ -1579,19 +1579,19 @@ (request_enable == RAIDEN_DEBUG_SPI_REQ_ENABLE_EC)) usleep(50 * 1000); - struct spi_master *spi_config = calloc(1, sizeof(struct spi_master)); + struct spi_master *spi_config = calloc(1, sizeof(*spi_config)); if (!spi_config) { msg_perr("Unable to allocate space for SPI master.\n"); return SPI_GENERIC_ERROR; } - struct raiden_debug_spi_data *data = calloc(1, sizeof(struct raiden_debug_spi_data)); + struct raiden_debug_spi_data *data = calloc(1, sizeof(*data)); if (!data) { free(spi_config); msg_perr("Unable to allocate space for extra SPI master data.\n"); return SPI_GENERIC_ERROR; } - memcpy(spi_config, &spi_master_raiden_debug, sizeof(struct spi_master)); + memcpy(spi_config, &spi_master_raiden_debug, sizeof(*spi_config)); data->dev = device; data->in_ep = in_endpoint; diff --git a/realtek_mst_i2c_spi.c b/realtek_mst_i2c_spi.c index 95c017f..91c8aa5 100644 --- a/realtek_mst_i2c_spi.c +++ b/realtek_mst_i2c_spi.c @@ -504,7 +504,7 @@ return ret; } - struct realtek_mst_i2c_spi_data *data = calloc(1, sizeof(struct realtek_mst_i2c_spi_data)); + struct realtek_mst_i2c_spi_data *data = calloc(1, sizeof(*data)); if (!data) { msg_perr("Unable to allocate space for extra SPI master data.\n"); return SPI_GENERIC_ERROR; diff --git a/sb600spi.c b/sb600spi.c index c057947..c4b25e5 100644 --- a/sb600spi.c +++ b/sb600spi.c @@ -777,7 +777,7 @@ if (handle_imc(dev, amd_gen) != 0) return ERROR_FATAL; - struct sb600spi_data *data = calloc(1, sizeof(struct sb600spi_data)); + struct sb600spi_data *data = calloc(1, sizeof(*data)); if (!data) { msg_perr("Unable to allocate space for extra SPI master data.\n"); return SPI_GENERIC_ERROR; diff --git a/sfdp.c b/sfdp.c index 97f5620..530588f 100644 --- a/sfdp.c +++ b/sfdp.c @@ -300,7 +300,7 @@ /* Fetch all parameter headers, even if we don't use them all (yet). */ hbuf = malloc((nph + 1) * 8); - hdrs = malloc((nph + 1) * sizeof(struct sfdp_tbl_hdr)); + hdrs = malloc((nph + 1) * sizeof(*hdrs)); if (hbuf == NULL || hdrs == NULL ) { msg_gerr("Out of memory!\n"); goto cleanup_hdrs; diff --git a/usb_device.c b/usb_device.c index 5a468dd..a4f6d12 100644 --- a/usb_device.c +++ b/usb_device.c @@ -99,7 +99,7 @@ static void add_device(struct usb_device *device, struct usb_device **devices) { - struct usb_device *copy = malloc(sizeof(struct usb_device)); + struct usb_device *copy = malloc(sizeof(*copy)); assert(copy != NULL); diff --git a/wbsio_spi.c b/wbsio_spi.c index d17d49d..c3814aa 100644 --- a/wbsio_spi.c +++ b/wbsio_spi.c @@ -207,7 +207,7 @@ "1024 kB!\n", __func__); max_rom_decode.spi = 1024 * 1024; - struct wbsio_spi_data * data = calloc(1, sizeof(struct wbsio_spi_data)); + struct wbsio_spi_data *data = calloc(1, sizeof(*data)); if (!data) { msg_perr("Unable to allocate space for extra SPI master data.\n"); return SPI_GENERIC_ERROR; -- To view, visit https://review.coreboot.org/c/flashrom/+/55266 To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: flashrom Gerrit-Branch: master Gerrit-Change-Id: Icc0b60ca6ef9f5ece6ed2a0e03600bb6ccd7dcc6 Gerrit-Change-Number: 55266 Gerrit-PatchSet: 4 Gerrit-Owner: Angel Pons <th3fanbus(a)gmail.com> Gerrit-Reviewer: Anastasia Klimchuk <aklm(a)chromium.org> Gerrit-Reviewer: Arthur Heymans <arthur(a)aheymans.xyz> Gerrit-Reviewer: Edward O'Callaghan <quasisec(a)chromium.org> Gerrit-Reviewer: Nico Huber <nico.h(a)gmx.de> Gerrit-Reviewer: build bot (Jenkins) <no-reply(a)coreboot.org> Gerrit-CC: Paul Menzel <paulepanter(a)mailbox.org> Gerrit-MessageType: merged

1 0

Change in flashrom[master]: dummyflasher.c: Drop useless macros
by Nico Huber (Code Review) 09 Jun '21

09 Jun '21

Nico Huber has submitted this change. ( https://review.coreboot.org/c/flashrom/+/55265 ) Change subject: dummyflasher.c: Drop useless macros ...................................................................... dummyflasher.c: Drop useless macros The `EMULATE_CHIP` and `EMULATE_SPI_CHIP` macros are unconditionally defined as `1`, with no way to change their values. Since this means that the code never gets build-tested using other values, drop these noisy macros. TEST=Build with `make distclean && make VERSION=none -j` with and without this patch, the flashrom executable does not change. Change-Id: If46e1c37c3b04b28b4ba1f82c9b3def1e549368f Signed-off-by: Angel Pons <th3fanbus(a)gmail.com> Reviewed-on: https://review.coreboot.org/c/flashrom/+/55265 Tested-by: build bot (Jenkins) <no-reply(a)coreboot.org> Reviewed-by: Nico Huber <nico.h(a)gmx.de> Reviewed-by: Edward O'Callaghan <quasisec(a)chromium.org> Reviewed-by: Namyoon Woo <namyoon(a)google.com> --- M dummyflasher.c 1 file changed, 1 insertion(+), 37 deletions(-) Approvals: build bot (Jenkins): Verified Nico Huber: Looks good to me, approved Namyoon Woo: Looks good to me, but someone else must approve Edward O'Callaghan: Looks good to me, approved diff --git a/dummyflasher.c b/dummyflasher.c index e2f38f5..ba06e7c 100644 --- a/dummyflasher.c +++ b/dummyflasher.c @@ -22,21 +22,11 @@ #include "chipdrivers.h" #include "programmer.h" #include "flashchips.h" - -/* Remove the #define below if you don't want SPI flash chip emulation. */ -#define EMULATE_SPI_CHIP 1 - -#if EMULATE_SPI_CHIP -#define EMULATE_CHIP 1 #include "spi.h" -#endif -#if EMULATE_CHIP #include <sys/types.h> #include <sys/stat.h> -#endif -#if EMULATE_CHIP enum emu_chip { EMULATE_NONE, EMULATE_ST_M25P10_RES, @@ -73,7 +63,6 @@ uint8_t *flashchip_contents; }; -#if EMULATE_SPI_CHIP /* A legit complete SFDP table based on the MX25L6436E (rev. 1.8) datasheet. */ static const uint8_t sfdp_table[] = { 0x53, 0x46, 0x44, 0x50, // @0x00: SFDP signature @@ -100,9 +89,6 @@ 0xFF, 0xFF, 0xFF, 0xFF, // @0x54: Macronix parameter table end }; -#endif -#endif - void *dummy_map(const char *descr, uintptr_t phys_addr, size_t len) { msg_pspew("%s: Mapping %s, 0x%zx bytes at 0x%0*" PRIxPTR "\n", @@ -173,7 +159,6 @@ return; } -#if EMULATE_SPI_CHIP static int emulate_spi_chip_response(unsigned int writecnt, unsigned int readcnt, const unsigned char *writearr, @@ -550,7 +535,6 @@ data->emu_status &= ~SPI_SR_WEL; return 0; } -#endif static int dummy_spi_send_command(const struct flashctx *flash, unsigned int writecnt, unsigned int readcnt, @@ -572,7 +556,6 @@ /* Response for unknown commands and missing chip is 0xff. */ memset(readarr, 0xff, readcnt); -#if EMULATE_SPI_CHIP switch (emu_data->emu_chip) { case EMULATE_ST_M25P10_RES: case EMULATE_SST_SST25VF040_REMS: @@ -589,7 +572,6 @@ default: break; } -#endif msg_pspew(" reading %u bytes:", readcnt); for (i = 0; i < readcnt; i++) msg_pspew(" 0x%02x", readarr[i]); @@ -626,7 +608,6 @@ static int dummy_shutdown(void *data) { msg_pspew("%s\n", __func__); -#if EMULATE_CHIP struct emu_data *emu_data = (struct emu_data *)data; if (emu_data->emu_chip != EMULATE_NONE) { if (emu_data->emu_persistent_image && emu_data->emu_modified) { @@ -638,7 +619,6 @@ free(emu_data->emu_persistent_image); free(emu_data->flashchip_contents); } -#endif free(data); return 0; } @@ -650,10 +630,8 @@ char *tmp = NULL; unsigned int i; char *endptr; -#if EMULATE_SPI_CHIP char *status = NULL; int size = -1; /* size for VARIABLE_SIZE chip device */ -#endif bustext = extract_programmer_param("bus"); msg_pdbg("Requested buses are: %s\n", bustext ? bustext : "default"); @@ -812,8 +790,6 @@ } free(tmp); -#if EMULATE_CHIP -#if EMULATE_SPI_CHIP tmp = extract_programmer_param("size"); if (tmp) { size = strtol(tmp, NULL, 10); @@ -825,7 +801,6 @@ } free(tmp); } -#endif /* EMULATE_SPI_CHIP */ tmp = extract_programmer_param("emulate"); if (!tmp) { @@ -834,7 +809,6 @@ return 0; } -#if EMULATE_SPI_CHIP if (!strcmp(tmp, "M25P10.RES")) { data->emu_chip = EMULATE_ST_M25P10_RES; data->emu_chip_size = 128 * 1024; @@ -921,7 +895,7 @@ msg_pdbg("Emulating generic SPI flash chip (size=%d bytes)\n", data->emu_chip_size); } -#endif /* EMULATE_SPI_CHIP */ + if (data->emu_chip == EMULATE_NONE) { msg_perr("Invalid chip specified for emulation: %s\n", tmp); free(tmp); @@ -945,7 +919,6 @@ } free(tmp); -#ifdef EMULATE_SPI_CHIP status = extract_programmer_param("spi_status"); if (status) { errno = 0; @@ -960,7 +933,6 @@ msg_pdbg("Initial status register is set to 0x%02x.\n", data->emu_status); } -#endif /* EMULATE_SPI_CHIP */ data->flashchip_contents = malloc(data->emu_chip_size); if (!data->flashchip_contents) { @@ -968,16 +940,12 @@ return 1; } -#endif /* EMULATE_CHIP */ - return 0; } int dummy_init(void) { -#if EMULATE_CHIP struct stat image_stat; -#endif struct emu_data *data = calloc(1, sizeof(struct emu_data)); if (!data) { @@ -996,7 +964,6 @@ return 1; } -#if EMULATE_CHIP if (data->emu_chip == EMULATE_NONE) { msg_pdbg("Not emulating any flash chip.\n"); /* Nothing else to do. */ @@ -1033,7 +1000,6 @@ msg_pdbg("doesn't match.\n"); } } -#endif /* EMULATE_CHIP */ dummy_init_out: if (register_shutdown(dummy_shutdown, data)) { @@ -1052,7 +1018,6 @@ return 0; } -#if EMULATE_CHIP && EMULATE_SPI_CHIP int probe_variable_size(struct flashctx *flash) { unsigned int i; @@ -1095,4 +1060,3 @@ return 1; } -#endif -- To view, visit https://review.coreboot.org/c/flashrom/+/55265 To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: flashrom Gerrit-Branch: master Gerrit-Change-Id: If46e1c37c3b04b28b4ba1f82c9b3def1e549368f Gerrit-Change-Number: 55265 Gerrit-PatchSet: 3 Gerrit-Owner: Angel Pons <th3fanbus(a)gmail.com> Gerrit-Reviewer: Anastasia Klimchuk <aklm(a)chromium.org> Gerrit-Reviewer: Arthur Heymans <arthur(a)aheymans.xyz> Gerrit-Reviewer: Edward O'Callaghan <quasisec(a)chromium.org> Gerrit-Reviewer: Namyoon Woo <namyoon(a)google.com> Gerrit-Reviewer: Nico Huber <nico.h(a)gmx.de> Gerrit-Reviewer: build bot (Jenkins) <no-reply(a)coreboot.org> Gerrit-CC: Paul Menzel <paulepanter(a)mailbox.org> Gerrit-MessageType: merged

1 0

Change in flashrom[master]: nic3com.c: Refactor singleton states into reentrant pattern
by Nico Huber (Code Review) 09 Jun '21

09 Jun '21

Nico Huber has submitted this change. ( https://review.coreboot.org/c/flashrom/+/55107 ) Change subject: nic3com.c: Refactor singleton states into reentrant pattern ...................................................................... nic3com.c: Refactor singleton states into reentrant pattern Move global singleton states into a struct and store within the par_master data field for the life-time of the driver. This is one of the steps on the way to move par_master data memory management behind the initialisation API, for more context see other patches under the same topic "register_master_api". BUG=b:185191942 TEST=builds Change-Id: I9834b82650cd070556cf82207796bc6bd6b31b28 Signed-off-by: Anastasia Klimchuk <aklm(a)chromium.org> Reviewed-on: https://review.coreboot.org/c/flashrom/+/55107 Tested-by: build bot (Jenkins) <no-reply(a)coreboot.org> Reviewed-by: Nico Huber <nico.h(a)gmx.de> --- M nic3com.c 1 file changed, 47 insertions(+), 13 deletions(-) Approvals: build bot (Jenkins): Verified Nico Huber: Looks good to me, approved diff --git a/nic3com.c b/nic3com.c index d60b03c..6e3fc8b 100644 --- a/nic3com.c +++ b/nic3com.c @@ -29,9 +29,11 @@ #define PCI_VENDOR_ID_3COM 0x10b7 -static uint32_t io_base_addr = 0; -static uint32_t internal_conf; -static uint16_t id; +struct nic3com_data { + uint32_t io_base_addr; + uint32_t internal_conf; + uint16_t id; +}; const struct dev_entry nics_3com[] = { /* 3C90xB */ @@ -56,15 +58,19 @@ static void nic3com_chip_writeb(const struct flashctx *flash, uint8_t val, chipaddr addr) { - OUTL((uint32_t)addr, io_base_addr + BIOS_ROM_ADDR); - OUTB(val, io_base_addr + BIOS_ROM_DATA); + struct nic3com_data *data = flash->mst->par.data; + + OUTL((uint32_t)addr, data->io_base_addr + BIOS_ROM_ADDR); + OUTB(val, data->io_base_addr + BIOS_ROM_DATA); } static uint8_t nic3com_chip_readb(const struct flashctx *flash, const chipaddr addr) { - OUTL((uint32_t)addr, io_base_addr + BIOS_ROM_ADDR); - return INB(io_base_addr + BIOS_ROM_DATA); + struct nic3com_data *data = flash->mst->par.data; + + OUTL((uint32_t)addr, data->io_base_addr + BIOS_ROM_ADDR); + return INB(data->io_base_addr + BIOS_ROM_DATA); } static const struct par_master par_master_nic3com = { @@ -78,22 +84,29 @@ .chip_writen = fallback_chip_writen, }; -static int nic3com_shutdown(void *data) +static int nic3com_shutdown(void *par_data) { + struct nic3com_data *data = par_data; + const uint16_t id = data->id; + /* 3COM 3C90xB cards need a special fixup. */ if (id == 0x9055 || id == 0x9001 || id == 0x9004 || id == 0x9005 || id == 0x9006 || id == 0x900a || id == 0x905a || id == 0x9058) { /* Select register window 3 and restore the receiver status. */ - OUTW(SELECT_REG_WINDOW + 3, io_base_addr + INT_STATUS); - OUTL(internal_conf, io_base_addr + INTERNAL_CONFIG); + OUTW(SELECT_REG_WINDOW + 3, data->io_base_addr + INT_STATUS); + OUTL(data->internal_conf, data->io_base_addr + INTERNAL_CONFIG); } + free(data); return 0; } int nic3com_init(void) { struct pci_dev *dev = NULL; + uint32_t io_base_addr = 0; + uint32_t internal_conf = 0; + uint16_t id; if (rget_io_perms()) return 1; @@ -126,13 +139,34 @@ */ OUTW(SELECT_REG_WINDOW + 0, io_base_addr + INT_STATUS); - if (register_shutdown(nic3com_shutdown, NULL)) - return 1; + struct nic3com_data *data = calloc(1, sizeof(*data)); + if (!data) { + msg_perr("Unable to allocate space for PAR master data\n"); + goto init_err_cleanup_exit; + } + data->io_base_addr = io_base_addr; + data->internal_conf = internal_conf; + data->id = id; max_rom_decode.parallel = 128 * 1024; - register_par_master(&par_master_nic3com, BUS_PARALLEL, NULL); + + if (register_shutdown(nic3com_shutdown, data)) { + free(data); + goto init_err_cleanup_exit; + } + register_par_master(&par_master_nic3com, BUS_PARALLEL, data); return 0; + +init_err_cleanup_exit: + /* 3COM 3C90xB cards need a special fixup. */ + if (id == 0x9055 || id == 0x9001 || id == 0x9004 || id == 0x9005 + || id == 0x9006 || id == 0x900a || id == 0x905a || id == 0x9058) { + /* Select register window 3 and restore the receiver status. */ + OUTW(SELECT_REG_WINDOW + 3, io_base_addr + INT_STATUS); + OUTL(internal_conf, io_base_addr + INTERNAL_CONFIG); + } + return 1; } #else -- To view, visit https://review.coreboot.org/c/flashrom/+/55107 To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: flashrom Gerrit-Branch: master Gerrit-Change-Id: I9834b82650cd070556cf82207796bc6bd6b31b28 Gerrit-Change-Number: 55107 Gerrit-PatchSet: 5 Gerrit-Owner: Anastasia Klimchuk <aklm(a)chromium.org> Gerrit-Reviewer: Angel Pons <th3fanbus(a)gmail.com> Gerrit-Reviewer: Edward O'Callaghan <quasisec(a)chromium.org> Gerrit-Reviewer: Nico Huber <nico.h(a)gmx.de> Gerrit-Reviewer: build bot (Jenkins) <no-reply(a)coreboot.org> Gerrit-CC: Paul Menzel <paulepanter(a)mailbox.org> Gerrit-MessageType: merged

1 0

Change in flashrom[master]: programmer_table: move each entry to the associated programmer source
by Nico Huber (Code Review) 09 Jun '21

09 Jun '21

Attention is currently required from: Thomas Heijligen, Anastasia Klimchuk. Nico Huber has posted comments on this change. ( https://review.coreboot.org/c/flashrom/+/52946 ) Change subject: programmer_table: move each entry to the associated programmer source ...................................................................... Patch Set 8: (1 comment) Patchset: PS8: Needs a manual rebase, alas. -- To view, visit https://review.coreboot.org/c/flashrom/+/52946 To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: flashrom Gerrit-Branch: master Gerrit-Change-Id: I3d02bd789f0299e936eb86819b3b15b5ea2bb921 Gerrit-Change-Number: 52946 Gerrit-PatchSet: 8 Gerrit-Owner: Thomas Heijligen <src(a)posteo.de> Gerrit-Reviewer: Anastasia Klimchuk <aklm(a)chromium.org> Gerrit-Reviewer: Edward O'Callaghan <quasisec(a)chromium.org> Gerrit-Reviewer: Nico Huber <nico.h(a)gmx.de> Gerrit-Reviewer: build bot (Jenkins) <no-reply(a)coreboot.org> Gerrit-CC: Angel Pons <th3fanbus(a)gmail.com> Gerrit-CC: Paul Menzel <paulepanter(a)mailbox.org> Gerrit-CC: Xiang W <wxjstz(a)126.com> Gerrit-Attention: Thomas Heijligen <src(a)posteo.de> Gerrit-Attention: Anastasia Klimchuk <aklm(a)chromium.org> Gerrit-Comment-Date: Wed, 09 Jun 2021 15:56:12 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment

1 0

Change in flashrom[master]: programmer_table: convert entries to pointers
by Nico Huber (Code Review) 09 Jun '21

09 Jun '21

Nico Huber has submitted this change. ( https://review.coreboot.org/c/flashrom/+/52945 ) Change subject: programmer_table: convert entries to pointers ...................................................................... programmer_table: convert entries to pointers Allows us to move the individual entries into their respective driver files. Change-Id: Ifbb0ee4db5a85b1cd2afeafe4dca838579f79878 Signed-off-by: Thomas Heijligen <thomas.heijligen(a)secunet.de> Reviewed-on: https://review.coreboot.org/c/flashrom/+/52945 Tested-by: build bot (Jenkins) <no-reply(a)coreboot.org> Reviewed-by: Nico Huber <nico.h(a)gmx.de> --- M cli_classic.c M flashrom.c M libflashrom.c M print.c M print_wiki.c M programmer.h M programmer_table.c 7 files changed, 572 insertions(+), 410 deletions(-) Approvals: build bot (Jenkins): Verified Nico Huber: Looks good to me, approved diff --git a/cli_classic.c b/cli_classic.c index 5fd8092..bc2d40d 100644 --- a/cli_classic.c +++ b/cli_classic.c @@ -407,7 +407,7 @@ "for details.\n"); } for (prog = 0; prog < PROGRAMMER_INVALID; prog++) { - name = programmer_table[prog].name; + name = programmer_table[prog]->name; namelen = strlen(name); if (strncmp(optarg, name, namelen) == 0) { switch (optarg[namelen]) { @@ -545,7 +545,7 @@ /* We need to strdup here because we free(pparam) unconditionally later. */ pparam = strdup(CONFIG_DEFAULT_PROGRAMMER_ARGS); msg_pinfo("Using default programmer \"%s\" with arguments \"%s\".\n", - programmer_table[CONFIG_DEFAULT_PROGRAMMER].name, pparam); + programmer_table[CONFIG_DEFAULT_PROGRAMMER]->name, pparam); } else { msg_perr("Please select a programmer with the --programmer parameter.\n" #if CONFIG_INTERNAL == 1 diff --git a/flashrom.c b/flashrom.c index 9cd1003..f5a39b8 100644 --- a/flashrom.c +++ b/flashrom.c @@ -155,8 +155,8 @@ programmer_may_write = 1; programmer_param = param; - msg_pdbg("Initializing %s programmer\n", programmer_table[programmer].name); - ret = programmer_table[programmer].init(); + msg_pdbg("Initializing %s programmer\n", programmer_table[programmer]->name); + ret = programmer_table[programmer]->init(); if (programmer_param && strlen(programmer_param)) { if (ret != 0) { /* It is quite possible that any unhandled programmer parameter would have been valid, @@ -200,7 +200,7 @@ void *programmer_map_flash_region(const char *descr, uintptr_t phys_addr, size_t len) { - void *ret = programmer_table[programmer].map_flash_region(descr, phys_addr, len); + void *ret = programmer_table[programmer]->map_flash_region(descr, phys_addr, len); msg_gspew("%s: mapping %s from 0x%0*" PRIxPTR " to 0x%0*" PRIxPTR "\n", __func__, descr, PRIxPTR_WIDTH, phys_addr, PRIxPTR_WIDTH, (uintptr_t) ret); return ret; @@ -208,7 +208,7 @@ void programmer_unmap_flash_region(void *virt_addr, size_t len) { - programmer_table[programmer].unmap_flash_region(virt_addr, len); + programmer_table[programmer]->unmap_flash_region(virt_addr, len); msg_gspew("%s: unmapped 0x%0*" PRIxPTR "\n", __func__, PRIxPTR_WIDTH, (uintptr_t)virt_addr); } @@ -256,7 +256,7 @@ void programmer_delay(unsigned int usecs) { if (usecs > 0) - programmer_table[programmer].delay(usecs); + programmer_table[programmer]->delay(usecs); } int read_memmapped(struct flashctx *flash, uint8_t *buf, unsigned int start, @@ -840,12 +840,12 @@ flash->chip->vendor, flash->chip->name, flash->chip->total_size, tmp); free(tmp); #if CONFIG_INTERNAL == 1 - if (programmer_table[programmer].map_flash_region == physmap) + if (programmer_table[programmer]->map_flash_region == physmap) msg_cinfo("mapped at physical address 0x%0*" PRIxPTR ".\n", PRIxPTR_WIDTH, flash->physical_memory); else #endif - msg_cinfo("on %s.\n", programmer_table[programmer].name); + msg_cinfo("on %s.\n", programmer_table[programmer]->name); /* Flash registers may more likely not be mapped if the chip was forced. * Lock info may be stored in registers, so avoid lock info printing. */ @@ -1586,7 +1586,7 @@ int i; for (p = 0; p < PROGRAMMER_INVALID; p++) { - pname = programmer_table[p].name; + pname = programmer_table[p]->name; pnamelen = strlen(pname); if (remaining - pnamelen - 2 < 0) { if (firstline) @@ -1718,45 +1718,50 @@ ret = 1; } for (i = 0; i < PROGRAMMER_INVALID; i++) { - const struct programmer_entry p = programmer_table[i]; - if (p.name == NULL) { + const struct programmer_entry *const p = programmer_table[i]; + if (p == NULL) { + msg_gerr("Programmer with index %d is NULL instead of a valid pointer!\n", i); + ret = 1; + continue; + } + if (p->name == NULL) { msg_gerr("All programmers need a valid name, but the one with index %d does not!\n", i); ret = 1; /* This might hide other problems with this programmer, but allows for better error * messages below without jumping through hoops. */ continue; } - switch (p.type) { + switch (p->type) { case USB: case PCI: case OTHER: - if (p.devs.note == NULL) { - if (strcmp("internal", p.name) == 0) + if (p->devs.note == NULL) { + if (strcmp("internal", p->name) == 0) break; /* This one has its device list stored separately. */ msg_gerr("Programmer %s has neither a device list nor a textual description!\n", - p.name); + p->name); ret = 1; } break; default: - msg_gerr("Programmer %s does not have a valid type set!\n", p.name); + msg_gerr("Programmer %s does not have a valid type set!\n", p->name); ret = 1; break; } - if (p.init == NULL) { - msg_gerr("Programmer %s does not have a valid init function!\n", p.name); + if (p->init == NULL) { + msg_gerr("Programmer %s does not have a valid init function!\n", p->name); ret = 1; } - if (p.delay == NULL) { - msg_gerr("Programmer %s does not have a valid delay function!\n", p.name); + if (p->delay == NULL) { + msg_gerr("Programmer %s does not have a valid delay function!\n", p->name); ret = 1; } - if (p.map_flash_region == NULL) { - msg_gerr("Programmer %s does not have a valid map_flash_region function!\n", p.name); + if (p->map_flash_region == NULL) { + msg_gerr("Programmer %s does not have a valid map_flash_region function!\n", p->name); ret = 1; } - if (p.unmap_flash_region == NULL) { - msg_gerr("Programmer %s does not have a valid unmap_flash_region function!\n", p.name); + if (p->unmap_flash_region == NULL) { + msg_gerr("Programmer %s does not have a valid unmap_flash_region function!\n", p->name); ret = 1; } } diff --git a/libflashrom.c b/libflashrom.c index 23358c9..09a4e4d 100644 --- a/libflashrom.c +++ b/libflashrom.c @@ -124,7 +124,7 @@ if (supported_programmers != NULL) { for (; p < PROGRAMMER_INVALID; ++p) { - supported_programmers[p] = programmer_table[p].name; + supported_programmers[p] = programmer_table[p]->name; } } else { msg_gerr("Memory allocation error!\n"); @@ -279,7 +279,7 @@ unsigned prog; for (prog = 0; prog < PROGRAMMER_INVALID; prog++) { - if (strcmp(prog_name, programmer_table[prog].name) == 0) + if (strcmp(prog_name, programmer_table[prog]->name) == 0) break; } if (prog >= PROGRAMMER_INVALID) { diff --git a/print.c b/print.c index feca45e..77cf3d5 100644 --- a/print.c +++ b/print.c @@ -425,10 +425,10 @@ } #endif -static void print_supported_devs(const struct programmer_entry prog, const char *const type) +static void print_supported_devs(const struct programmer_entry *const prog, const char *const type) { - const struct dev_entry *const devs = prog.devs.dev; - msg_ginfo("\nSupported %s devices for the %s programmer:\n", type, prog.name); + const struct dev_entry *const devs = prog->devs.dev; + msg_ginfo("\nSupported %s devices for the %s programmer:\n", type, prog->name); unsigned int maxvendorlen = strlen("Vendor") + 1; unsigned int maxdevlen = strlen("Device") + 1; @@ -475,7 +475,7 @@ msg_ginfo("\n"); #if CONFIG_INTERNAL == 1 msg_ginfo("\nSupported devices for the %s programmer:\n\n", - programmer_table[PROGRAMMER_INTERNAL].name); + programmer_table[PROGRAMMER_INTERNAL]->name); print_supported_chipsets(); msg_ginfo("\n"); print_supported_boards_helper(boards_known, "mainboards"); @@ -483,8 +483,8 @@ print_supported_boards_helper(laptops_known, "mobile devices"); #endif for (i = 0; i < PROGRAMMER_INVALID; i++) { - const struct programmer_entry prog = programmer_table[i]; - switch (prog.type) { + const struct programmer_entry *const prog = programmer_table[i]; + switch (prog->type) { case USB: print_supported_devs(prog, "USB"); break; @@ -492,14 +492,14 @@ print_supported_devs(prog, "PCI"); break; case OTHER: - if (prog.devs.note != NULL) { - msg_ginfo("\nSupported devices for the %s programmer:\n", prog.name); - msg_ginfo("%s", prog.devs.note); + if (prog->devs.note != NULL) { + msg_ginfo("\nSupported devices for the %s programmer:\n", prog->name); + msg_ginfo("%s", prog->devs.note); } break; default: msg_gerr("\n%s: %s: Uninitialized programmer type! Please report a bug at " - "flashrom(a)flashrom.org\n", __func__, prog.name); + "flashrom(a)flashrom.org\n", __func__, prog->name); break; } } diff --git a/print_wiki.c b/print_wiki.c index b2ac65c..3610135 100644 --- a/print_wiki.c +++ b/print_wiki.c @@ -355,11 +355,11 @@ return count; } -static void print_supported_devs_wiki_helper(const struct programmer_entry prog) +static void print_supported_devs_wiki_helper(const struct programmer_entry *const prog) { int i = 0; static int c = 0; - const struct dev_entry *devs = prog.devs.dev; + const struct dev_entry *devs = prog->devs.dev; const unsigned int count = count_supported_devs_wiki(devs); /* Alternate colors if the vendor changes. */ @@ -368,7 +368,7 @@ for (i = 0; devs[i].vendor_id != 0; i++) { printf("|- bgcolor=\"#%s\"\n", (c) ? "eeeeee" : "dddddd"); if (i == 0) - printf("| rowspan=\"%u\" | %s |", count, prog.name); + printf("| rowspan=\"%u\" | %s |", count, prog->name); printf("| %s || %s || %04x:%04x || {{%s}}\n", devs[i].vendor_name, devs[i].device_name, devs[i].vendor_id, devs[i].device_id, test_state_to_template(devs[i].status)); } @@ -381,13 +381,13 @@ unsigned int i; for (i = 0; i < PROGRAMMER_INVALID; i++) { - const struct programmer_entry prog = programmer_table[i]; - switch (prog.type) { + const struct programmer_entry *const prog = programmer_table[i]; + switch (prog->type) { case USB: - usb_count += count_supported_devs_wiki(prog.devs.dev); + usb_count += count_supported_devs_wiki(prog->devs.dev); break; case PCI: - pci_count += count_supported_devs_wiki(prog.devs.dev); + pci_count += count_supported_devs_wiki(prog->devs.dev); break; case OTHER: default: @@ -400,8 +400,8 @@ "{%s%s", pci_count, th_start, programmer_th); for (i = 0; i < PROGRAMMER_INVALID; i++) { - const struct programmer_entry prog = programmer_table[i]; - if (prog.type == PCI) { + const struct programmer_entry *const prog = programmer_table[i]; + if (prog->type == PCI) { print_supported_devs_wiki_helper(prog); } } @@ -412,8 +412,8 @@ "{%s%s", usb_count, th_start, programmer_th); for (i = 0; i < PROGRAMMER_INVALID; i++) { - const struct programmer_entry prog = programmer_table[i]; - if (prog.type == USB) { + const struct programmer_entry *const prog = programmer_table[i]; + if (prog->type == USB) { print_supported_devs_wiki_helper(prog); } } @@ -426,11 +426,11 @@ for (i = 0; i < PROGRAMMER_INVALID; i++) { static int c = 0; - const struct programmer_entry prog = programmer_table[i]; - if (prog.type == OTHER && prog.devs.note != NULL) { + const struct programmer_entry *const prog = programmer_table[i]; + if (prog->type == OTHER && prog->devs.note != NULL) { c = !c; printf("|- bgcolor=\"#%s\"\n", (c) ? "eeeeee" : "dddddd"); - printf("| %s || %s", prog.name, prog.devs.note); + printf("| %s || %s", prog->name, prog->devs.note); } } printf("\n|}\n\n|}\n"); diff --git a/programmer.h b/programmer.h index 945d0a7..324b953 100644 --- a/programmer.h +++ b/programmer.h @@ -175,7 +175,7 @@ void (*delay) (unsigned int usecs); }; -extern const struct programmer_entry programmer_table[]; +extern const struct programmer_entry *const programmer_table[]; extern const size_t programmer_table_size; int programmer_init(enum programmer prog, const char *param); diff --git a/programmer_table.c b/programmer_table.c index 3c6dd58..5c7f0f1 100644 --- a/programmer_table.c +++ b/programmer_table.c @@ -14,479 +14,636 @@ #include "programmer.h" -const struct programmer_entry programmer_table[] = { #if CONFIG_INTERNAL == 1 - { - .name = "internal", - .type = OTHER, - .devs.note = NULL, - .init = internal_init, - .map_flash_region = physmap, - .unmap_flash_region = physunmap, - .delay = internal_delay, - }, +const struct programmer_entry programmer_internal = { + .name = "internal", + .type = OTHER, + .devs.note = NULL, + .init = internal_init, + .map_flash_region = physmap, + .unmap_flash_region = physunmap, + .delay = internal_delay, +}; #endif #if CONFIG_DUMMY == 1 - { - .name = "dummy", - .type = OTHER, - /* FIXME */ - .devs.note = "Dummy device, does nothing and logs all accesses\n", - .init = dummy_init, - .map_flash_region = dummy_map, - .unmap_flash_region = dummy_unmap, - .delay = internal_delay, - }, +const struct programmer_entry programmer_dummy = { + .name = "dummy", + .type = OTHER, + /* FIXME */ + .devs.note = "Dummy device, does nothing and logs all accesses\n", + .init = dummy_init, + .map_flash_region = dummy_map, + .unmap_flash_region = dummy_unmap, + .delay = internal_delay, +}; #endif #if CONFIG_MEC1308 == 1 - { - .name = "mec1308", - .type = OTHER, - .devs.note = "Microchip MEC1308 Embedded Controller.\n", - .init = mec1308_init, - .map_flash_region = fallback_map, - .unmap_flash_region = fallback_unmap, - .delay = internal_delay, - }, +const struct programmer_entry programmer_mec1308 = { + .name = "mec1308", + .type = OTHER, + .devs.note = "Microchip MEC1308 Embedded Controller.\n", + .init = mec1308_init, + .map_flash_region = fallback_map, + .unmap_flash_region = fallback_unmap, + .delay = internal_delay, +}; #endif #if CONFIG_NIC3COM == 1 - { - .name = "nic3com", - .type = PCI, - .devs.dev = nics_3com, - .init = nic3com_init, - .map_flash_region = fallback_map, - .unmap_flash_region = fallback_unmap, - .delay = internal_delay, - }, +const struct programmer_entry programmer_nic3com = { + .name = "nic3com", + .type = PCI, + .devs.dev = nics_3com, + .init = nic3com_init, + .map_flash_region = fallback_map, + .unmap_flash_region = fallback_unmap, + .delay = internal_delay, +}; #endif #if CONFIG_NICREALTEK == 1 - { - /* This programmer works for Realtek RTL8139 and SMC 1211. */ - .name = "nicrealtek", - .type = PCI, - .devs.dev = nics_realtek, - .init = nicrealtek_init, - .map_flash_region = fallback_map, - .unmap_flash_region = fallback_unmap, - .delay = internal_delay, - }, +const struct programmer_entry programmer_nicrealtek = { + /* This programmer works for Realtek RTL8139 and SMC 1211. */ + .name = "nicrealtek", + .type = PCI, + .devs.dev = nics_realtek, + .init = nicrealtek_init, + .map_flash_region = fallback_map, + .unmap_flash_region = fallback_unmap, + .delay = internal_delay, +}; #endif #if CONFIG_NICNATSEMI == 1 - { - .name = "nicnatsemi", - .type = PCI, - .devs.dev = nics_natsemi, - .init = nicnatsemi_init, - .map_flash_region = fallback_map, - .unmap_flash_region = fallback_unmap, - .delay = internal_delay, - }, +const struct programmer_entry programmer_nicnatsemi = { + .name = "nicnatsemi", + .type = PCI, + .devs.dev = nics_natsemi, + .init = nicnatsemi_init, + .map_flash_region = fallback_map, + .unmap_flash_region = fallback_unmap, + .delay = internal_delay, +}; #endif #if CONFIG_GFXNVIDIA == 1 - { - .name = "gfxnvidia", - .type = PCI, - .devs.dev = gfx_nvidia, - .init = gfxnvidia_init, - .map_flash_region = fallback_map, - .unmap_flash_region = fallback_unmap, - .delay = internal_delay, - }, +const struct programmer_entry programmer_gfxnvidia = { + .name = "gfxnvidia", + .type = PCI, + .devs.dev = gfx_nvidia, + .init = gfxnvidia_init, + .map_flash_region = fallback_map, + .unmap_flash_region = fallback_unmap, + .delay = internal_delay, +}; #endif #if CONFIG_RAIDEN_DEBUG_SPI == 1 - { - .name = "raiden_debug_spi", - .type = USB, - .devs.dev = devs_raiden, - .init = raiden_debug_spi_init, - .map_flash_region = fallback_map, - .unmap_flash_region = fallback_unmap, - .delay = internal_delay, - }, +const struct programmer_entry programmer_raiden_debug_spi = { + .name = "raiden_debug_spi", + .type = USB, + .devs.dev = devs_raiden, + .init = raiden_debug_spi_init, + .map_flash_region = fallback_map, + .unmap_flash_region = fallback_unmap, + .delay = internal_delay, +}; #endif #if CONFIG_DRKAISER == 1 - { - .name = "drkaiser", - .type = PCI, - .devs.dev = drkaiser_pcidev, - .init = drkaiser_init, - .map_flash_region = fallback_map, - .unmap_flash_region = fallback_unmap, - .delay = internal_delay, - }, +const struct programmer_entry programmer_drkaiser = { + .name = "drkaiser", + .type = PCI, + .devs.dev = drkaiser_pcidev, + .init = drkaiser_init, + .map_flash_region = fallback_map, + .unmap_flash_region = fallback_unmap, + .delay = internal_delay, +}; #endif #if CONFIG_SATASII == 1 - { - .name = "satasii", - .type = PCI, - .devs.dev = satas_sii, - .init = satasii_init, - .map_flash_region = fallback_map, - .unmap_flash_region = fallback_unmap, - .delay = internal_delay, - }, +const struct programmer_entry programmer_satasii = { + .name = "satasii", + .type = PCI, + .devs.dev = satas_sii, + .init = satasii_init, + .map_flash_region = fallback_map, + .unmap_flash_region = fallback_unmap, + .delay = internal_delay, +}; #endif #if CONFIG_ATAHPT == 1 - { - .name = "atahpt", - .type = PCI, - .devs.dev = ata_hpt, - .init = atahpt_init, - .map_flash_region = fallback_map, - .unmap_flash_region = fallback_unmap, - .delay = internal_delay, - }, +const struct programmer_entry programmer_atahpt = { + .name = "atahpt", + .type = PCI, + .devs.dev = ata_hpt, + .init = atahpt_init, + .map_flash_region = fallback_map, + .unmap_flash_region = fallback_unmap, + .delay = internal_delay, +}; #endif #if CONFIG_ATAVIA == 1 - { - .name = "atavia", - .type = PCI, - .devs.dev = ata_via, - .init = atavia_init, - .map_flash_region = atavia_map, - .unmap_flash_region = fallback_unmap, - .delay = internal_delay, - }, +const struct programmer_entry programmer_atavia = { + .name = "atavia", + .type = PCI, + .devs.dev = ata_via, + .init = atavia_init, + .map_flash_region = atavia_map, + .unmap_flash_region = fallback_unmap, + .delay = internal_delay, +}; #endif #if CONFIG_ATAPROMISE == 1 - { - .name = "atapromise", - .type = PCI, - .devs.dev = ata_promise, - .init = atapromise_init, - .map_flash_region = atapromise_map, - .unmap_flash_region = fallback_unmap, - .delay = internal_delay, - }, +const struct programmer_entry programmer_atapromise = { + .name = "atapromise", + .type = PCI, + .devs.dev = ata_promise, + .init = atapromise_init, + .map_flash_region = atapromise_map, + .unmap_flash_region = fallback_unmap, + .delay = internal_delay, +}; #endif #if CONFIG_IT8212 == 1 - { - .name = "it8212", - .type = PCI, - .devs.dev = devs_it8212, - .init = it8212_init, - .map_flash_region = fallback_map, - .unmap_flash_region = fallback_unmap, - .delay = internal_delay, - }, +const struct programmer_entry programmer_it8212 = { + .name = "it8212", + .type = PCI, + .devs.dev = devs_it8212, + .init = it8212_init, + .map_flash_region = fallback_map, + .unmap_flash_region = fallback_unmap, + .delay = internal_delay, +}; #endif #if CONFIG_FT2232_SPI == 1 - { - .name = "ft2232_spi", - .type = USB, - .devs.dev = devs_ft2232spi, - .init = ft2232_spi_init, - .map_flash_region = fallback_map, - .unmap_flash_region = fallback_unmap, - .delay = internal_delay, - }, +const struct programmer_entry programmer_ft2232_spi = { + .name = "ft2232_spi", + .type = USB, + .devs.dev = devs_ft2232spi, + .init = ft2232_spi_init, + .map_flash_region = fallback_map, + .unmap_flash_region = fallback_unmap, + .delay = internal_delay, +}; #endif #if CONFIG_SERPROG == 1 - { - .name = "serprog", - .type = OTHER, - /* FIXME */ - .devs.note = "All programmer devices speaking the serprog protocol\n", - .init = serprog_init, - .map_flash_region = serprog_map, - .unmap_flash_region = fallback_unmap, - .delay = serprog_delay, - }, +const struct programmer_entry programmer_serprog = { + .name = "serprog", + .type = OTHER, + /* FIXME */ + .devs.note = "All programmer devices speaking the serprog protocol\n", + .init = serprog_init, + .map_flash_region = serprog_map, + .unmap_flash_region = fallback_unmap, + .delay = serprog_delay, +}; #endif #if CONFIG_BUSPIRATE_SPI == 1 - { - .name = "buspirate_spi", - .type = OTHER, - /* FIXME */ - .devs.note = "Dangerous Prototypes Bus Pirate\n", - .init = buspirate_spi_init, - .map_flash_region = fallback_map, - .unmap_flash_region = fallback_unmap, - .delay = internal_delay, - }, +const struct programmer_entry programmer_buspirate_spi = { + .name = "buspirate_spi", + .type = OTHER, + /* FIXME */ + .devs.note = "Dangerous Prototypes Bus Pirate\n", + .init = buspirate_spi_init, + .map_flash_region = fallback_map, + .unmap_flash_region = fallback_unmap, + .delay = internal_delay, +}; #endif #if CONFIG_DEDIPROG == 1 - { - .name = "dediprog", - .type = USB, - .devs.dev = devs_dediprog, - .init = dediprog_init, - .map_flash_region = fallback_map, - .unmap_flash_region = fallback_unmap, - .delay = internal_delay, - }, +const struct programmer_entry programmer_dediprog = { + .name = "dediprog", + .type = USB, + .devs.dev = devs_dediprog, + .init = dediprog_init, + .map_flash_region = fallback_map, + .unmap_flash_region = fallback_unmap, + .delay = internal_delay, +}; #endif #if CONFIG_DEVELOPERBOX_SPI == 1 - { - .name = "developerbox", - .type = USB, - .devs.dev = devs_developerbox_spi, - .init = developerbox_spi_init, - .map_flash_region = fallback_map, - .unmap_flash_region = fallback_unmap, - .delay = internal_delay, - }, +const struct programmer_entry programmer_developerbox = { + .name = "developerbox", + .type = USB, + .devs.dev = devs_developerbox_spi, + .init = developerbox_spi_init, + .map_flash_region = fallback_map, + .unmap_flash_region = fallback_unmap, + .delay = internal_delay, +}; #endif #if CONFIG_ENE_LPC == 1 - { - .name = "ene_lpc", - .type = OTHER, - .devs.note = "ENE LPC interface keyboard controller\n", - .init = ene_lpc_init, - .map_flash_region = fallback_map, - .unmap_flash_region = fallback_unmap, - .delay = internal_delay, - }, +const struct programmer_entry programmer_ene_lpc = { + .name = "ene_lpc", + .type = OTHER, + .devs.note = "ENE LPC interface keyboard controller\n", + .init = ene_lpc_init, + .map_flash_region = fallback_map, + .unmap_flash_region = fallback_unmap, + .delay = internal_delay, +}; #endif #if CONFIG_RAYER_SPI == 1 - { - .name = "rayer_spi", - .type = OTHER, - /* FIXME */ - .devs.note = "RayeR parallel port programmer\n", - .init = rayer_spi_init, - .map_flash_region = fallback_map, - .unmap_flash_region = fallback_unmap, - .delay = internal_delay, - }, +const struct programmer_entry programmer_rayer_spi = { + .name = "rayer_spi", + .type = OTHER, + /* FIXME */ + .devs.note = "RayeR parallel port programmer\n", + .init = rayer_spi_init, + .map_flash_region = fallback_map, + .unmap_flash_region = fallback_unmap, + .delay = internal_delay, +}; #endif #if CONFIG_PONY_SPI == 1 - { - .name = "pony_spi", - .type = OTHER, - /* FIXME */ - .devs.note = "Programmers compatible with SI-Prog, serbang or AJAWe\n", - .init = pony_spi_init, - .map_flash_region = fallback_map, - .unmap_flash_region = fallback_unmap, - .delay = internal_delay, - }, +const struct programmer_entry programmer_pony_spi = { + .name = "pony_spi", + .type = OTHER, + /* FIXME */ + .devs.note = "Programmers compatible with SI-Prog, serbang or AJAWe\n", + .init = pony_spi_init, + .map_flash_region = fallback_map, + .unmap_flash_region = fallback_unmap, + .delay = internal_delay, +}; #endif #if CONFIG_NICINTEL == 1 - { - .name = "nicintel", - .type = PCI, - .devs.dev = nics_intel, - .init = nicintel_init, - .map_flash_region = fallback_map, - .unmap_flash_region = fallback_unmap, - .delay = internal_delay, - }, +const struct programmer_entry programmer_nicintel = { + .name = "nicintel", + .type = PCI, + .devs.dev = nics_intel, + .init = nicintel_init, + .map_flash_region = fallback_map, + .unmap_flash_region = fallback_unmap, + .delay = internal_delay, +}; #endif #if CONFIG_NICINTEL_SPI == 1 - { - .name = "nicintel_spi", - .type = PCI, - .devs.dev = nics_intel_spi, - .init = nicintel_spi_init, - .map_flash_region = fallback_map, - .unmap_flash_region = fallback_unmap, - .delay = internal_delay, - }, +const struct programmer_entry programmer_nicintel_spi = { + .name = "nicintel_spi", + .type = PCI, + .devs.dev = nics_intel_spi, + .init = nicintel_spi_init, + .map_flash_region = fallback_map, + .unmap_flash_region = fallback_unmap, + .delay = internal_delay, +}; #endif #if CONFIG_NICINTEL_EEPROM == 1 - { - .name = "nicintel_eeprom", - .type = PCI, - .devs.dev = nics_intel_ee, - .init = nicintel_ee_init, - .map_flash_region = fallback_map, - .unmap_flash_region = fallback_unmap, - .delay = internal_delay, - }, +const struct programmer_entry programmer_nicintel_eeprom = { + .name = "nicintel_eeprom", + .type = PCI, + .devs.dev = nics_intel_ee, + .init = nicintel_ee_init, + .map_flash_region = fallback_map, + .unmap_flash_region = fallback_unmap, + .delay = internal_delay, +}; #endif #if CONFIG_OGP_SPI == 1 - { - .name = "ogp_spi", - .type = PCI, - .devs.dev = ogp_spi, - .init = ogp_spi_init, - .map_flash_region = fallback_map, - .unmap_flash_region = fallback_unmap, - .delay = internal_delay, - }, +const struct programmer_entry programmer_ogp_spi = { + .name = "ogp_spi", + .type = PCI, + .devs.dev = ogp_spi, + .init = ogp_spi_init, + .map_flash_region = fallback_map, + .unmap_flash_region = fallback_unmap, + .delay = internal_delay, +}; #endif #if CONFIG_SATAMV == 1 - { - .name = "satamv", - .type = PCI, - .devs.dev = satas_mv, - .init = satamv_init, - .map_flash_region = fallback_map, - .unmap_flash_region = fallback_unmap, - .delay = internal_delay, - }, +const struct programmer_entry programmer_satamv = { + .name = "satamv", + .type = PCI, + .devs.dev = satas_mv, + .init = satamv_init, + .map_flash_region = fallback_map, + .unmap_flash_region = fallback_unmap, + .delay = internal_delay, +}; #endif #if CONFIG_LINUX_MTD == 1 - { - .name = "linux_mtd", - .type = OTHER, - .devs.note = "Device files /dev/mtd*\n", - .init = linux_mtd_init, - .map_flash_region = fallback_map, - .unmap_flash_region = fallback_unmap, - .delay = internal_delay, - }, +const struct programmer_entry programmer_linux_mtd = { + .name = "linux_mtd", + .type = OTHER, + .devs.note = "Device files /dev/mtd*\n", + .init = linux_mtd_init, + .map_flash_region = fallback_map, + .unmap_flash_region = fallback_unmap, + .delay = internal_delay, +}; #endif #if CONFIG_LINUX_SPI == 1 - { - .name = "linux_spi", - .type = OTHER, - .devs.note = "Device files /dev/spidev*.*\n", - .init = linux_spi_init, - .map_flash_region = fallback_map, - .unmap_flash_region = fallback_unmap, - .delay = internal_delay, - }, +const struct programmer_entry programmer_linux_spi = { + .name = "linux_spi", + .type = OTHER, + .devs.note = "Device files /dev/spidev*.*\n", + .init = linux_spi_init, + .map_flash_region = fallback_map, + .unmap_flash_region = fallback_unmap, + .delay = internal_delay, +}; #endif #if CONFIG_LSPCON_I2C_SPI == 1 - { - .name = "lspcon_i2c_spi", - .type = OTHER, - .devs.note = "Device files /dev/i2c-*.\n", - .init = lspcon_i2c_spi_init, - .map_flash_region = fallback_map, - .unmap_flash_region = fallback_unmap, - .delay = internal_delay, - }, +const struct programmer_entry programmer_lspcon_i2c_spi = { + .name = "lspcon_i2c_spi", + .type = OTHER, + .devs.note = "Device files /dev/i2c-*.\n", + .init = lspcon_i2c_spi_init, + .map_flash_region = fallback_map, + .unmap_flash_region = fallback_unmap, + .delay = internal_delay, +}; #endif #if CONFIG_REALTEK_MST_I2C_SPI == 1 - { - .name = "realtek_mst_i2c_spi", - .type = OTHER, - .devs.note = "Device files /dev/i2c-*.\n", - .init = realtek_mst_i2c_spi_init, - .map_flash_region = fallback_map, - .unmap_flash_region = fallback_unmap, - .delay = internal_delay, - }, +const struct programmer_entry programmer_realtek_mst_i2c_spi = { + .name = "realtek_mst_i2c_spi", + .type = OTHER, + .devs.note = "Device files /dev/i2c-*.\n", + .init = realtek_mst_i2c_spi_init, + .map_flash_region = fallback_map, + .unmap_flash_region = fallback_unmap, + .delay = internal_delay, +}; #endif #if CONFIG_USBBLASTER_SPI == 1 - { - .name = "usbblaster_spi", - .type = USB, - .devs.dev = devs_usbblasterspi, - .init = usbblaster_spi_init, - .map_flash_region = fallback_map, - .unmap_flash_region = fallback_unmap, - .delay = internal_delay, - }, +const struct programmer_entry programmer_usbblaster_spi = { + .name = "usbblaster_spi", + .type = USB, + .devs.dev = devs_usbblasterspi, + .init = usbblaster_spi_init, + .map_flash_region = fallback_map, + .unmap_flash_region = fallback_unmap, + .delay = internal_delay, +}; #endif #if CONFIG_MSTARDDC_SPI == 1 - { - .name = "mstarddc_spi", - .type = OTHER, - .devs.note = "MSTAR DDC devices addressable via /dev/i2c-* on Linux.\n", - .init = mstarddc_spi_init, - .map_flash_region = fallback_map, - .unmap_flash_region = fallback_unmap, - .delay = internal_delay, - }, +const struct programmer_entry programmer_mstarddc_spi = { + .name = "mstarddc_spi", + .type = OTHER, + .devs.note = "MSTAR DDC devices addressable via /dev/i2c-* on Linux.\n", + .init = mstarddc_spi_init, + .map_flash_region = fallback_map, + .unmap_flash_region = fallback_unmap, + .delay = internal_delay, +}; #endif #if CONFIG_PICKIT2_SPI == 1 - { - .name = "pickit2_spi", - .type = USB, - .devs.dev = devs_pickit2_spi, - .init = pickit2_spi_init, - .map_flash_region = fallback_map, - .unmap_flash_region = fallback_unmap, - .delay = internal_delay, - }, +const struct programmer_entry programmer_pickit2_spi = { + .name = "pickit2_spi", + .type = USB, + .devs.dev = devs_pickit2_spi, + .init = pickit2_spi_init, + .map_flash_region = fallback_map, + .unmap_flash_region = fallback_unmap, + .delay = internal_delay, +}; #endif #if CONFIG_CH341A_SPI == 1 - { - .name = "ch341a_spi", - .type = USB, - .devs.dev = devs_ch341a_spi, - .init = ch341a_spi_init, - .map_flash_region = fallback_map, - .unmap_flash_region = fallback_unmap, - .delay = ch341a_spi_delay, - }, +const struct programmer_entry programmer_ch341a_spi = { + .name = "ch341a_spi", + .type = USB, + .devs.dev = devs_ch341a_spi, + .init = ch341a_spi_init, + .map_flash_region = fallback_map, + .unmap_flash_region = fallback_unmap, + .delay = ch341a_spi_delay, +}; #endif #if CONFIG_DIGILENT_SPI == 1 - { - .name = "digilent_spi", - .type = USB, - .devs.dev = devs_digilent_spi, - .init = digilent_spi_init, - .map_flash_region = fallback_map, - .unmap_flash_region = fallback_unmap, - .delay = internal_delay, - }, +const struct programmer_entry programmer_digilent_spi = { + .name = "digilent_spi", + .type = USB, + .devs.dev = devs_digilent_spi, + .init = digilent_spi_init, + .map_flash_region = fallback_map, + .unmap_flash_region = fallback_unmap, + .delay = internal_delay, +}; #endif #if CONFIG_JLINK_SPI == 1 - { - .name = "jlink_spi", - .type = OTHER, - .init = jlink_spi_init, - .devs.note = "SEGGER J-Link and compatible devices\n", - .map_flash_region = fallback_map, - .unmap_flash_region = fallback_unmap, - .delay = internal_delay, - }, +const struct programmer_entry programmer_jlink_spi = { + .name = "jlink_spi", + .type = OTHER, + .init = jlink_spi_init, + .devs.note = "SEGGER J-Link and compatible devices\n", + .map_flash_region = fallback_map, + .unmap_flash_region = fallback_unmap, + .delay = internal_delay, +}; #endif #if CONFIG_NI845X_SPI == 1 - { - .name = "ni845x_spi", - .type = OTHER, // choose other because NI-845x uses own USB implementation - .devs.note = "National Instruments USB-845x\n", - .init = ni845x_spi_init, - .map_flash_region = fallback_map, - .unmap_flash_region = fallback_unmap, - .delay = internal_delay, - }, +const struct programmer_entry programmer_ni845x_spi = { + .name = "ni845x_spi", + .type = OTHER, // choose other because NI-845x uses own USB implementation + .devs.note = "National Instruments USB-845x\n", + .init = ni845x_spi_init, + .map_flash_region = fallback_map, + .unmap_flash_region = fallback_unmap, + .delay = internal_delay, +}; #endif #if CONFIG_STLINKV3_SPI == 1 - { - .name = "stlinkv3_spi", - .type = USB, - .devs.dev = devs_stlinkv3_spi, - .init = stlinkv3_spi_init, - .map_flash_region = fallback_map, - .unmap_flash_region = fallback_unmap, - .delay = internal_delay, - }, +const struct programmer_entry programmer_stlinkv3_spi = { + .name = "stlinkv3_spi", + .type = USB, + .devs.dev = devs_stlinkv3_spi, + .init = stlinkv3_spi_init, + .map_flash_region = fallback_map, + .unmap_flash_region = fallback_unmap, + .delay = internal_delay, +}; +#endif + +const struct programmer_entry *const programmer_table[] = { + +#if CONFIG_INTERNAL == 1 + &programmer_internal, +#endif + +#if CONFIG_DUMMY == 1 + &programmer_dummy, +#endif + +#if CONFIG_MEC1308 == 1 + &programmer_mec1308, +#endif + +#if CONFIG_NIC3COM == 1 + &programmer_nic3com, +#endif + +#if CONFIG_NICREALTEK == 1 + & programmer_nicrealtek, +#endif + +#if CONFIG_NICNATSEMI == 1 + &programmer_nicnatsemi, +#endif + +#if CONFIG_GFXNVIDIA == 1 + &programmer_gfxnvidia, +#endif + +#if CONFIG_RAIDEN_DEBUG_SPI == 1 + &programmer_raiden_debug_spi, +#endif + +#if CONFIG_DRKAISER == 1 + &programmer_drkaiser, +#endif + +#if CONFIG_SATASII == 1 + &programmer_satasii, +#endif + +#if CONFIG_ATAHPT == 1 + &programmer_atahpt, +#endif + +#if CONFIG_ATAVIA == 1 + &programmer_atavia, +#endif + +#if CONFIG_ATAPROMISE == 1 + &programmer_atapromise, +#endif + +#if CONFIG_IT8212 == 1 + &programmer_it8212, +#endif + +#if CONFIG_FT2232_SPI == 1 + &programmer_ft2232_spi, +#endif + +#if CONFIG_SERPROG == 1 + &programmer_serprog, +#endif + +#if CONFIG_BUSPIRATE_SPI == 1 + &programmer_buspirate_spi, +#endif + +#if CONFIG_DEDIPROG == 1 + &programmer_dediprog, +#endif + +#if CONFIG_DEVELOPERBOX_SPI == 1 + &programmer_developerbox, +#endif + +#if CONFIG_ENE_LPC == 1 + &programmer_ene_lpc, +#endif + +#if CONFIG_RAYER_SPI == 1 + &programmer_rayer_spi, +#endif + +#if CONFIG_PONY_SPI == 1 + &programmer_pony_spi, +#endif + +#if CONFIG_NICINTEL == 1 + &programmer_nicintel, +#endif + +#if CONFIG_NICINTEL_SPI == 1 + &programmer_nicintel_spi, +#endif + +#if CONFIG_NICINTEL_EEPROM == 1 + &programmer_nicintel_eeprom, +#endif + +#if CONFIG_OGP_SPI == 1 + &programmer_ogp_spi, +#endif + +#if CONFIG_SATAMV == 1 + &programmer_satamv, +#endif + +#if CONFIG_LINUX_MTD == 1 + &programmer_linux_mtd, +#endif + +#if CONFIG_LINUX_SPI == 1 + &programmer_linux_spi, +#endif + +#if CONFIG_LSPCON_I2C_SPI == 1 + &programmer_lspcon_i2c_spi, +#endif + +#if CONFIG_REALTEK_MST_I2C_SPI == 1 + &programmer_realtek_mst_i2c_spi, +#endif + +#if CONFIG_USBBLASTER_SPI == 1 + &programmer_usbblaster_spi, +#endif + +#if CONFIG_MSTARDDC_SPI == 1 + &programmer_mstarddc_spi, +#endif + +#if CONFIG_PICKIT2_SPI == 1 + &programmer_pickit2_spi, +#endif + +#if CONFIG_CH341A_SPI == 1 + &programmer_ch341a_spi, +#endif + +#if CONFIG_DIGILENT_SPI == 1 + &programmer_digilent_spi, +#endif + +#if CONFIG_JLINK_SPI == 1 + &programmer_jlink_spi, +#endif + +#if CONFIG_NI845X_SPI == 1 + &programmer_ni845x_spi, +#endif + +#if CONFIG_STLINKV3_SPI == 1 + &programmer_stlinkv3_spi, #endif }; -- To view, visit https://review.coreboot.org/c/flashrom/+/52945 To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: flashrom Gerrit-Branch: master Gerrit-Change-Id: Ifbb0ee4db5a85b1cd2afeafe4dca838579f79878 Gerrit-Change-Number: 52945 Gerrit-PatchSet: 7 Gerrit-Owner: Thomas Heijligen <src(a)posteo.de> Gerrit-Reviewer: Anastasia Klimchuk <aklm(a)chromium.org> Gerrit-Reviewer: Angel Pons <th3fanbus(a)gmail.com> Gerrit-Reviewer: Edward O'Callaghan <quasisec(a)chromium.org> Gerrit-Reviewer: Nico Huber <nico.h(a)gmx.de> Gerrit-Reviewer: build bot (Jenkins) <no-reply(a)coreboot.org> Gerrit-CC: Paul Menzel <paulepanter(a)mailbox.org> Gerrit-CC: Xiang W <wxjstz(a)126.com> Gerrit-MessageType: merged

1 0

2024

2023

2022

2021

2020

2019

2018

2017

flashrom-gerrit