- flashrom-gerrit - mail.coreboot.org

[M] Change in flashrom[master]: tests: Add prefix to io_mock functions not to clash with macros
by Anastasia Klimchuk (Code Review) 17 Oct '22

17 Oct '22

Anastasia Klimchuk has uploaded this change for review. ( https://review.coreboot.org/c/flashrom/+/68433 ) Change subject: tests: Add prefix to io_mock functions not to clash with macros ...................................................................... tests: Add prefix to io_mock functions not to clash with macros Flashrom I/O mock functions need to be renamed so that they do not have name clash with standard I/O, because the latter are allowed to be macros. Adding a prefix to flashrom mock functions avoids them being accidentally expanded. Standard I/O functions are expanded and flashrom mocks stays as they are. BUG=b:237606255 TEST=ninja test 1) gcc 12.2.0 on Debian 2) Ticket: https://ticket.coreboot.org/issues/411 Change-Id: I7998a8fb1b9e65621e12adbfab5460a245d5606b Signed-off-by: Anastasia Klimchuk <aklm(a)chromium.org> --- M tests/chip.c M tests/io_mock.c M tests/io_mock.h M tests/linux_mtd.c M tests/linux_spi.c M tests/parade_lspcon.c M tests/realtek_mst_i2c_spi.c M tests/tests.c 8 files changed, 71 insertions(+), 49 deletions(-) git pull ssh://review.coreboot.org:29418/flashrom refs/changes/33/68433/1 diff --git a/tests/chip.c b/tests/chip.c index 6f03172..8ddf469 100644 --- a/tests/chip.c +++ b/tests/chip.c @@ -425,7 +425,7 @@ .paths = { NULL }, }; const struct io_mock verify_chip_io = { - .fread = verify_chip_fread, + .iom_fread = verify_chip_fread, .fallback_open_state = &data, }; @@ -460,7 +460,7 @@ .paths = { NULL }, }; const struct io_mock verify_chip_io = { - .fread = verify_chip_fread, + .iom_fread = verify_chip_fread, .fallback_open_state = &data, }; diff --git a/tests/io_mock.c b/tests/io_mock.c index 9f86fcd..c04e9c5 100644 --- a/tests/io_mock.c +++ b/tests/io_mock.c @@ -22,7 +22,7 @@ void io_mock_register(const struct io_mock *io) { /* A test can either register its own mock open function or fallback_open_state. */ - assert_true(io == NULL || io->open == NULL || io->fallback_open_state == NULL); + assert_true(io == NULL || io->iom_open == NULL || io->fallback_open_state == NULL); current_io = io; } diff --git a/tests/io_mock.h b/tests/io_mock.h index 9e92a9d..644da74 100644 --- a/tests/io_mock.h +++ b/tests/io_mock.h @@ -101,17 +101,17 @@ void (*libusb_free_config_descriptor)(void *state, struct libusb_config_descriptor *); /* POSIX File I/O */ - int (*open)(void *state, const char *pathname, int flags); - int (*ioctl)(void *state, int fd, unsigned long request, va_list args); - int (*read)(void *state, int fd, void *buf, size_t sz); - int (*write)(void *state, int fd, const void *buf, size_t sz); + int (*iom_open)(void *state, const char *pathname, int flags); + int (*iom_ioctl)(void *state, int fd, unsigned long request, va_list args); + int (*iom_read)(void *state, int fd, void *buf, size_t sz); + int (*iom_write)(void *state, int fd, const void *buf, size_t sz); /* Standard I/O */ - FILE* (*fopen)(void *state, const char *pathname, const char *mode); - char* (*fgets)(void *state, char *buf, int len, FILE *fp); - size_t (*fread)(void *state, void *buf, size_t size, size_t len, FILE *fp); - int (*fprintf)(void *state, FILE *fp, const char *fmt, va_list args); - int (*fclose)(void *state, FILE *fp); + FILE* (*iom_fopen)(void *state, const char *pathname, const char *mode); + char* (*iom_fgets)(void *state, char *buf, int len, FILE *fp); + size_t (*iom_fread)(void *state, void *buf, size_t size, size_t len, FILE *fp); + int (*iom_fprintf)(void *state, FILE *fp, const char *fmt, va_list args); + int (*iom_fclose)(void *state, FILE *fp); /* * An alternative to custom open mock. A test can either register its diff --git a/tests/linux_mtd.c b/tests/linux_mtd.c index 10ccb5e..3aaa5ab 100644 --- a/tests/linux_mtd.c +++ b/tests/linux_mtd.c @@ -81,9 +81,9 @@ }; const struct io_mock linux_mtd_io = { .state = &linux_mtd_io_state, - .fopen = linux_mtd_fopen, - .fread = linux_mtd_fread, - .fclose = linux_mtd_fclose, + .iom_fopen = linux_mtd_fopen, + .iom_fread = linux_mtd_fread, + .iom_fclose = linux_mtd_fclose, .fallback_open_state = &linux_mtd_fallback_open_state, }; diff --git a/tests/linux_spi.c b/tests/linux_spi.c index 2e3dc95..1009634 100644 --- a/tests/linux_spi.c +++ b/tests/linux_spi.c @@ -60,8 +60,8 @@ .flags = { O_RDWR }, }; const struct io_mock linux_spi_io = { - .fgets = linux_spi_fgets, - .ioctl = linux_spi_ioctl, + .iom_fgets = linux_spi_fgets, + .iom_ioctl = linux_spi_ioctl, .fallback_open_state = &linux_spi_fallback_open_state, }; diff --git a/tests/parade_lspcon.c b/tests/parade_lspcon.c index 9d7bd23..980e128 100644 --- a/tests/parade_lspcon.c +++ b/tests/parade_lspcon.c @@ -108,9 +108,9 @@ }; const struct io_mock parade_lspcon_io = { .state = &parade_lspcon_io_state, - .ioctl = parade_lspcon_ioctl, - .read = parade_lspcon_read, - .write = parade_lspcon_write, + .iom_ioctl = parade_lspcon_ioctl, + .iom_read = parade_lspcon_read, + .iom_write = parade_lspcon_write, .fallback_open_state = &parade_lspcon_fallback_open_state, }; diff --git a/tests/realtek_mst_i2c_spi.c b/tests/realtek_mst_i2c_spi.c index 0526124..753f06b 100644 --- a/tests/realtek_mst_i2c_spi.c +++ b/tests/realtek_mst_i2c_spi.c @@ -50,9 +50,9 @@ .flags = { O_RDWR }, }; const struct io_mock realtek_mst_io = { - .ioctl = realtek_mst_ioctl, - .read = realtek_mst_read, - .write = realtek_mst_write, + .iom_ioctl = realtek_mst_ioctl, + .iom_read = realtek_mst_read, + .iom_write = realtek_mst_write, .fallback_open_state = &realtek_mst_fallback_open_state, }; diff --git a/tests/tests.c b/tests/tests.c index c110e48..69c2b87 100644 --- a/tests/tests.c +++ b/tests/tests.c @@ -77,8 +77,8 @@ static int mock_open(const char *pathname, int flags) { - if (get_io() && get_io()->open) - return get_io()->open(get_io()->state, pathname, flags); + if (get_io() && get_io()->iom_open) + return get_io()->iom_open(get_io()->state, pathname, flags); if (get_io() && get_io()->fallback_open_state) { struct io_mock_fallback_open_state *io_state; @@ -117,11 +117,11 @@ int __wrap_ioctl(int fd, unsigned long int request, ...) { LOG_ME; - if (get_io() && get_io()->ioctl) { + if (get_io() && get_io()->iom_ioctl) { va_list args; int out; va_start(args, request); - out = get_io()->ioctl(get_io()->state, fd, request, args); + out = get_io()->iom_ioctl(get_io()->state, fd, request, args); va_end(args); return out; } @@ -131,32 +131,32 @@ int __wrap_write(int fd, const void *buf, size_t sz) { LOG_ME; - if (get_io() && get_io()->write) - return get_io()->write(get_io()->state, fd, buf, sz); + if (get_io() && get_io()->iom_write) + return get_io()->iom_write(get_io()->state, fd, buf, sz); return sz; } int __wrap_read(int fd, void *buf, size_t sz) { LOG_ME; - if (get_io() && get_io()->read) - return get_io()->read(get_io()->state, fd, buf, sz); + if (get_io() && get_io()->iom_read) + return get_io()->iom_read(get_io()->state, fd, buf, sz); return sz; } FILE *__wrap_fopen(const char *pathname, const char *mode) { LOG_ME; - if (get_io() && get_io()->fopen) - return get_io()->fopen(get_io()->state, pathname, mode); + if (get_io() && get_io()->iom_fopen) + return get_io()->iom_fopen(get_io()->state, pathname, mode); return not_null(); } FILE *__wrap_fopen64(const char *pathname, const char *mode) { LOG_ME; - if (get_io() && get_io()->fopen) - return get_io()->fopen(get_io()->state, pathname, mode); + if (get_io() && get_io()->iom_fopen) + return get_io()->iom_fopen(get_io()->state, pathname, mode); return not_null(); } @@ -217,24 +217,24 @@ char *__wrap_fgets(char *buf, int len, FILE *fp) { LOG_ME; - if (get_io() && get_io()->fgets) - return get_io()->fgets(get_io()->state, buf, len, fp); + if (get_io() && get_io()->iom_fgets) + return get_io()->iom_fgets(get_io()->state, buf, len, fp); return NULL; } char *__wrap___fgets_chk(char *buf, int len, FILE *fp) { LOG_ME; - if (get_io() && get_io()->fgets) - return get_io()->fgets(get_io()->state, buf, len, fp); + if (get_io() && get_io()->iom_fgets) + return get_io()->iom_fgets(get_io()->state, buf, len, fp); return NULL; } size_t __wrap_fread(void *ptr, size_t size, size_t nmemb, FILE *fp) { LOG_ME; - if (get_io() && get_io()->fread) - return get_io()->fread(get_io()->state, ptr, size, nmemb, fp); + if (get_io() && get_io()->iom_fread) + return get_io()->iom_fread(get_io()->state, ptr, size, nmemb, fp); return nmemb; } @@ -271,11 +271,11 @@ int __wrap_fprintf(FILE *fp, const char *fmt, ...) { LOG_ME; - if (get_io() && get_io()->fprintf) { + if (get_io() && get_io()->iom_fprintf) { va_list args; int out; va_start(args, fmt); - out = get_io()->fprintf(get_io()->state, fp, fmt, args); + out = get_io()->iom_fprintf(get_io()->state, fp, fmt, args); va_end(args); return out; } @@ -285,24 +285,24 @@ int __wrap___vfprintf_chk(FILE *fp, const char *fmt, va_list args) { LOG_ME; - if (get_io() && get_io()->fprintf) - return get_io()->fprintf(get_io()->state, fp, fmt, args); + if (get_io() && get_io()->iom_fprintf) + return get_io()->iom_fprintf(get_io()->state, fp, fmt, args); return 0; } int __wrap___fprintf_chk(FILE *fp, const char *fmt, va_list args) { LOG_ME; - if (get_io() && get_io()->fprintf) - return get_io()->fprintf(get_io()->state, fp, fmt, args); + if (get_io() && get_io()->iom_fprintf) + return get_io()->iom_fprintf(get_io()->state, fp, fmt, args); return 0; } int __wrap_fclose(FILE *fp) { LOG_ME; - if (get_io() && get_io()->fclose) - return get_io()->fclose(get_io()->state, fp); + if (get_io() && get_io()->iom_fclose) + return get_io()->iom_fclose(get_io()->state, fp); return 0; } -- To view, visit https://review.coreboot.org/c/flashrom/+/68433 To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: flashrom Gerrit-Branch: master Gerrit-Change-Id: I7998a8fb1b9e65621e12adbfab5460a245d5606b Gerrit-Change-Number: 68433 Gerrit-PatchSet: 1 Gerrit-Owner: Anastasia Klimchuk <aklm(a)chromium.org> Gerrit-MessageType: newchange

1 0

[S] Change in flashrom[master]: tests: Add wrap for __fprintf_chk
by Anastasia Klimchuk (Code Review) 17 Oct '22

17 Oct '22

Anastasia Klimchuk has uploaded this change for review. ( https://review.coreboot.org/c/flashrom/+/68432 ) Change subject: tests: Add wrap for __fprintf_chk ...................................................................... tests: Add wrap for __fprintf_chk The wrap for __fprintf_chk is needed for clang on Linux, it is used instead of fprintf function. BUG=b:237606255 TEST=ninja test on 1) gcc 12.2.0 on Debian 2) Ticket: https://ticket.coreboot.org/issues/411 Change-Id: I70cb1cd90d1f377ff4606acad3c1b514120ae4f7 Signed-off-by: Anastasia Klimchuk <aklm(a)chromium.org> --- M tests/meson.build M tests/tests.c M tests/wraps.h 3 files changed, 29 insertions(+), 0 deletions(-) git pull ssh://review.coreboot.org:29418/flashrom refs/changes/32/68432/1 diff --git a/tests/meson.build b/tests/meson.build index c62cc1b..74001cb 100644 --- a/tests/meson.build +++ b/tests/meson.build @@ -72,6 +72,7 @@ '-Wl,--wrap=__fgets_chk', '-Wl,--wrap=fprintf', '-Wl,--wrap=__vfprintf_chk', + '-Wl,--wrap=__fprintf_chk', '-Wl,--wrap=fclose', '-Wl,--wrap=feof', '-Wl,--wrap=ferror', diff --git a/tests/tests.c b/tests/tests.c index 53bad65..c110e48 100644 --- a/tests/tests.c +++ b/tests/tests.c @@ -290,6 +290,14 @@ return 0; } +int __wrap___fprintf_chk(FILE *fp, const char *fmt, va_list args) +{ + LOG_ME; + if (get_io() && get_io()->fprintf) + return get_io()->fprintf(get_io()->state, fp, fmt, args); + return 0; +} + int __wrap_fclose(FILE *fp) { LOG_ME; diff --git a/tests/wraps.h b/tests/wraps.h index f97eaba..10a5165 100644 --- a/tests/wraps.h +++ b/tests/wraps.h @@ -55,6 +55,7 @@ int __wrap_setvbuf(FILE *fp, char *buf, int type, size_t size); int __wrap_fprintf(FILE *fp, const char *fmt, ...); int __wrap___vfprintf_chk(FILE *fp, const char *fmt, va_list args); +int __wrap___fprintf_chk(FILE *fp, const char *fmt, va_list args); int __wrap_fclose(FILE *fp); int __wrap_feof(FILE *fp); int __wrap_ferror(FILE *fp); -- To view, visit https://review.coreboot.org/c/flashrom/+/68432 To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: flashrom Gerrit-Branch: master Gerrit-Change-Id: I70cb1cd90d1f377ff4606acad3c1b514120ae4f7 Gerrit-Change-Number: 68432 Gerrit-PatchSet: 1 Gerrit-Owner: Anastasia Klimchuk <aklm(a)chromium.org> Gerrit-MessageType: newchange

1 0

[M] Change in flashrom[master]: tree: provide flashrom context into programmer_delay()
by Edward O'Callaghan (Code Review) 17 Oct '22

17 Oct '22

Edward O'Callaghan has submitted this change. ( https://review.coreboot.org/c/flashrom/+/66373 ) Change subject: tree: provide flashrom context into programmer_delay() ...................................................................... tree: provide flashrom context into programmer_delay() Modify the `programmer_delay` function signature to allow passing the flashrom context. Programmers that depend on internal delay should provide NULL as a context. The use of this function parameter will be introduced in CB:67393. TOPIC=programmer_handle_global TEST=builds Change-Id: Ibb0bce26ce2052853ee52158d7ba742967a9e229 Signed-off-by: Alexander Goncharov <chat(a)joursoir.net> Reviewed-on: https://review.coreboot.org/c/flashrom/+/66373 Tested-by: build bot (Jenkins) <no-reply(a)coreboot.org> Reviewed-by: Edward O'Callaghan <quasisec(a)chromium.org> Reviewed-by: Felix Singer <felixsinger(a)posteo.net> --- M 82802ab.c M amd_imc.c M at45db.c M atavia.c M bitbang_spi.c M cli_classic.c M dediprog.c M dummyflasher.c M edi.c M en29lv640b.c M flashrom.c M ichspi.c M include/flash.h M it87spi.c M jedec.c M nicintel_eeprom.c M pony_spi.c M raiden_debug_spi.c M s25f.c M spi25.c M spi25_statusreg.c M sst28sf040.c M stm50.c M w29ee011.c M w39.c M wbsio_spi.c 26 files changed, 119 insertions(+), 96 deletions(-) Approvals: build bot (Jenkins): Verified Felix Singer: Looks good to me, approved Edward O'Callaghan: Looks good to me, approved diff --git a/82802ab.c b/82802ab.c index 0b4de49..90c9cf0 100644 --- a/82802ab.c +++ b/82802ab.c @@ -45,11 +45,11 @@ /* Reset to get a clean state */ chip_writeb(flash, 0xFF, bios); - programmer_delay(10); + programmer_delay(flash, 10); /* Enter ID mode */ chip_writeb(flash, 0x90, bios); - programmer_delay(10); + programmer_delay(flash, 10); id1 = chip_readb(flash, bios + (0x00 << shifted)); id2 = chip_readb(flash, bios + (0x01 << shifted)); @@ -57,7 +57,7 @@ /* Leave ID mode */ chip_writeb(flash, 0xFF, bios); - programmer_delay(10); + programmer_delay(flash, 10); msg_cdbg("%s: id1 0x%02x, id2 0x%02x", __func__, id1, id2); @@ -114,7 +114,7 @@ // now start it chip_writeb(flash, 0x20, bios + page); chip_writeb(flash, 0xd0, bios + page); - programmer_delay(10); + programmer_delay(flash, 10); // now let's see what the register is status = wait_82802ab(flash); diff --git a/amd_imc.c b/amd_imc.c index 4d3715e..b11eca3 100644 --- a/amd_imc.c +++ b/amd_imc.c @@ -60,7 +60,7 @@ msg_pwarn("IMC MBOX: Timeout!\n"); return 1; } - programmer_delay(1000); + programmer_delay(NULL, 1000); } return 0; } diff --git a/at45db.c b/at45db.c index 3f586a2..992f3a4 100644 --- a/at45db.c +++ b/at45db.c @@ -309,7 +309,7 @@ return 0; if (ret != 0 || retries-- == 0) return 1; - programmer_delay(us); + programmer_delay(flash, us); } } diff --git a/atavia.c b/atavia.c index 5cbe058..b392999 100644 --- a/atavia.c +++ b/atavia.c @@ -90,7 +90,7 @@ ready = true; break; } else { - programmer_delay(1); + programmer_delay(NULL, 1); continue; } } @@ -170,7 +170,7 @@ /* Test if a flash chip is attached. */ pci_write_long(dev, PCI_ROM_ADDRESS, (uint32_t)PCI_ROM_ADDRESS_MASK); - programmer_delay(90); + programmer_delay(NULL, 90); uint32_t base = pci_read_long(dev, PCI_ROM_ADDRESS); msg_pdbg2("BROM base=0x%08x\n", base); if ((base & PCI_ROM_ADDRESS_MASK) == 0) { diff --git a/bitbang_spi.c b/bitbang_spi.c index a926b10..10c1087 100644 --- a/bitbang_spi.c +++ b/bitbang_spi.c @@ -76,10 +76,10 @@ bitbang_spi_set_sck_set_mosi(master, 0, 0, spi_data); else bitbang_spi_set_sck(master, 0, spi_data); - programmer_delay(master->half_period); + programmer_delay(NULL, master->half_period); ret <<= 1; ret |= bitbang_spi_set_sck_get_miso(master, 1, spi_data); - programmer_delay(master->half_period); + programmer_delay(NULL, master->half_period); } return ret; } @@ -90,9 +90,9 @@ for (i = 7; i >= 0; i--) { bitbang_spi_set_sck_set_mosi(master, 0, (val >> i) & 1, spi_data); - programmer_delay(master->half_period); + programmer_delay(NULL, master->half_period); bitbang_spi_set_sck(master, 1, spi_data); - programmer_delay(master->half_period); + programmer_delay(NULL, master->half_period); } } @@ -122,9 +122,9 @@ readarr[i] = bitbang_spi_read_byte(master, data->spi_data); bitbang_spi_set_sck(master, 0, data->spi_data); - programmer_delay(master->half_period); + programmer_delay(NULL, master->half_period); bitbang_spi_set_cs(master, 1, data->spi_data); - programmer_delay(master->half_period); + programmer_delay(NULL, master->half_period); /* FIXME: Run bitbang_spi_release_bus here or in programmer init? */ bitbang_spi_release_bus(master, data->spi_data); diff --git a/cli_classic.c b/cli_classic.c index 3de0020..d258cb4 100644 --- a/cli_classic.c +++ b/cli_classic.c @@ -1148,7 +1148,7 @@ * done once we have a .reset function in struct flashchip. * Give the chip time to settle. */ - programmer_delay(100000); + programmer_delay(fill_flash, 100000); if (read_it) ret = do_read(fill_flash, filename); else if (extract_it) diff --git a/dediprog.c b/dediprog.c index ae9e448..b4279d8 100644 --- a/dediprog.c +++ b/dediprog.c @@ -316,7 +316,7 @@ if (voltage_selector == 0) { /* Wait some time as the original driver does. */ - programmer_delay(200 * 1000); + programmer_delay(NULL, 200 * 1000); } ret = dediprog_write(dediprog_handle, CMD_SET_VCC, voltage_selector, 0, NULL, 0); if (ret != 0x0) { @@ -326,7 +326,7 @@ } if (voltage_selector != 0) { /* Wait some time as the original driver does. */ - programmer_delay(200 * 1000); + programmer_delay(NULL, 200 * 1000); } return 0; } diff --git a/dummyflasher.c b/dummyflasher.c index 22f392a..110a88c 100644 --- a/dummyflasher.c +++ b/dummyflasher.c @@ -897,7 +897,7 @@ msg_pspew(" 0x%02x", readarr[i]); msg_pspew("\n"); - programmer_delay((writecnt + readcnt) * emu_data->delay_us); + programmer_delay(NULL, (writecnt + readcnt) * emu_data->delay_us); return 0; } diff --git a/edi.c b/edi.c index a2219ac..56ed62c 100644 --- a/edi.c +++ b/edi.c @@ -304,7 +304,7 @@ return -1; while (edi_spi_busy(flash) == 1 && timeout) { - programmer_delay(10); + programmer_delay(flash, 10); timeout--; } @@ -379,7 +379,7 @@ return -1; while (edi_spi_busy(flash) == 1 && timeout) { - programmer_delay(10); + programmer_delay(flash, 10); timeout--; } @@ -435,7 +435,7 @@ /* Just in case. */ while (edi_spi_busy(flash) == 1 && timeout) { - programmer_delay(10); + programmer_delay(flash, 10); timeout--; } diff --git a/en29lv640b.c b/en29lv640b.c index 6c0a565..8a8d641 100644 --- a/en29lv640b.c +++ b/en29lv640b.c @@ -64,7 +64,7 @@ chip_writeb(flash, 0x55, bios + 0x555); chip_writeb(flash, 0x90, bios + 0xAAA); - programmer_delay(10); + programmer_delay(flash, 10); id1 = chip_readb(flash, bios + 0x200); id1 |= (chip_readb(flash, bios) << 8); @@ -73,7 +73,7 @@ chip_writeb(flash, 0xF0, bios + 0xAAA); - programmer_delay(10); + programmer_delay(flash, 10); msg_cdbg("%s: id1 0x%04x, id2 0x%04x\n", __func__, id1, id2); diff --git a/flashrom.c b/flashrom.c index 6dae5e3..624c463 100644 --- a/flashrom.c +++ b/flashrom.c @@ -253,7 +253,7 @@ return false; } -void programmer_delay(unsigned int usecs) +void programmer_delay(const struct flashctx *flash, unsigned int usecs) { if (usecs > 0) { if (programmer->delay) @@ -1794,7 +1794,7 @@ msg_cinfo("Verifying flash... "); /* Work around chips which need some time to calm down. */ - programmer_delay(1000*1000); + programmer_delay(flashctx, 1000*1000); if (verify_all) combine_image_by_layout(flashctx, newcontents, oldcontents); diff --git a/ichspi.c b/ichspi.c index aefbe2f..6d3535c 100644 --- a/ichspi.c +++ b/ichspi.c @@ -875,7 +875,7 @@ timeout = 100 * 60; /* 60 ms are 9.6 million cycles at 16 MHz. */ while ((REGREAD16(ICH7_REG_SPIS) & SPIS_SCIP) && --timeout) { - programmer_delay(10); + programmer_delay(NULL, 10); } if (!timeout) { msg_perr("Error: SCIP never cleared!\n"); @@ -951,7 +951,7 @@ /* Wait for Cycle Done Status or Flash Cycle Error. */ while (((REGREAD16(ICH7_REG_SPIS) & (SPIS_CDS | SPIS_FCERR)) == 0) && --timeout) { - programmer_delay(10); + programmer_delay(NULL, 10); } if (!timeout) { msg_perr("timeout, ICH7_REG_SPIS=0x%04x\n", REGREAD16(ICH7_REG_SPIS)); @@ -991,7 +991,7 @@ timeout = 100 * 60; /* 60 ms are 9.6 million cycles at 16 MHz. */ while ((REGREAD8(swseq_data.reg_ssfsc) & SSFS_SCIP) && --timeout) { - programmer_delay(10); + programmer_delay(NULL, 10); } if (!timeout) { msg_perr("Error: SCIP never cleared!\n"); @@ -1071,7 +1071,7 @@ /* Wait for Cycle Done Status or Flash Cycle Error. */ while (((REGREAD32(swseq_data.reg_ssfsc) & (SSFS_FDONE | SSFS_FCERR)) == 0) && --timeout) { - programmer_delay(10); + programmer_delay(NULL, 10); } if (!timeout) { msg_perr("timeout, REG_SSFS=0x%08x\n", REGREAD32(swseq_data.reg_ssfsc)); @@ -1319,7 +1319,7 @@ while ((((hsfs = REGREAD16(ICH9_REG_HSFS)) & (HSFS_FDONE | HSFS_FCERR)) == 0) && --timeout_us) { - programmer_delay(8); + programmer_delay(NULL, 8); } REGWRITE16(ICH9_REG_HSFS, REGREAD16(ICH9_REG_HSFS)); if (!timeout_us) { diff --git a/include/flash.h b/include/flash.h index c696f64..cd7f994 100644 --- a/include/flash.h +++ b/include/flash.h @@ -60,7 +60,8 @@ const char *descr, uintptr_t phys_addr, size_t len); void master_unmap_flash_region(const struct registered_master *mast, void *virt_addr, size_t len); -void programmer_delay(unsigned int usecs); +/* NOTE: flashctx is not used in internal_delay. In this case, a context should be NULL. */ +void programmer_delay(const struct flashrom_flashctx *flash, unsigned int usecs); #define ARRAY_SIZE(a) (sizeof(a) / sizeof((a)[0])) diff --git a/it87spi.c b/it87spi.c index 5acaea6..a022041 100644 --- a/it87spi.c +++ b/it87spi.c @@ -146,7 +146,7 @@ if((status & SPI_SR_WIP) == 0) return 0; - programmer_delay(1000); + programmer_delay(NULL, 1000); } return 0; } diff --git a/jedec.c b/jedec.c index 2542f3e..c4ee0c7 100644 --- a/jedec.c +++ b/jedec.c @@ -44,7 +44,7 @@ while (i++ < 0xFFFFFFF) { if (delay) - programmer_delay(delay); + programmer_delay(flash, delay); tmp2 = chip_readb(flash, dst) & 0x40; if (tmp1 == tmp2) { break; @@ -193,31 +193,31 @@ * reset command. */ if (probe_timing_enter) - programmer_delay(probe_timing_enter); + programmer_delay(flash, probe_timing_enter); /* Reset chip to a clean slate */ if ((chip->feature_bits & FEATURE_RESET_MASK) == FEATURE_LONG_RESET) { chip_writeb(flash, 0xAA, bios + ((shifted ? 0x2AAA : 0x5555) & mask)); if (probe_timing_exit) - programmer_delay(10); + programmer_delay(flash, 10); chip_writeb(flash, 0x55, bios + ((shifted ? 0x5555 : 0x2AAA) & mask)); if (probe_timing_exit) - programmer_delay(10); + programmer_delay(flash, 10); } chip_writeb(flash, 0xF0, bios + ((shifted ? 0x2AAA : 0x5555) & mask)); if (probe_timing_exit) - programmer_delay(probe_timing_exit); + programmer_delay(flash, probe_timing_exit); /* Issue JEDEC Product ID Entry command */ chip_writeb(flash, 0xAA, bios + ((shifted ? 0x2AAA : 0x5555) & mask)); if (probe_timing_enter) - programmer_delay(10); + programmer_delay(flash, 10); chip_writeb(flash, 0x55, bios + ((shifted ? 0x5555 : 0x2AAA) & mask)); if (probe_timing_enter) - programmer_delay(10); + programmer_delay(flash, 10); chip_writeb(flash, 0x90, bios + ((shifted ? 0x2AAA : 0x5555) & mask)); if (probe_timing_enter) - programmer_delay(probe_timing_enter); + programmer_delay(flash, probe_timing_enter); /* Read product ID */ id1 = chip_readb(flash, bios + (0x00 << shifted)); @@ -242,14 +242,14 @@ { chip_writeb(flash, 0xAA, bios + ((shifted ? 0x2AAA : 0x5555) & mask)); if (probe_timing_exit) - programmer_delay(10); + programmer_delay(flash, 10); chip_writeb(flash, 0x55, bios + ((shifted ? 0x5555 : 0x2AAA) & mask)); if (probe_timing_exit) - programmer_delay(10); + programmer_delay(flash, 10); } chip_writeb(flash, 0xF0, bios + ((shifted ? 0x2AAA : 0x5555) & mask)); if (probe_timing_exit) - programmer_delay(probe_timing_exit); + programmer_delay(flash, probe_timing_exit); msg_cdbg("%s: id1 0x%02x, id2 0x%02x", __func__, largeid1, largeid2); if (!oddparity(id1)) @@ -293,18 +293,18 @@ /* Issue the Sector Erase command */ chip_writeb(flash, 0xAA, bios + ((shifted ? 0x2AAA : 0x5555) & mask)); - programmer_delay(delay_us); + programmer_delay(flash, delay_us); chip_writeb(flash, 0x55, bios + ((shifted ? 0x5555 : 0x2AAA) & mask)); - programmer_delay(delay_us); + programmer_delay(flash, delay_us); chip_writeb(flash, 0x80, bios + ((shifted ? 0x2AAA : 0x5555) & mask)); - programmer_delay(delay_us); + programmer_delay(flash, delay_us); chip_writeb(flash, 0xAA, bios + ((shifted ? 0x2AAA : 0x5555) & mask)); - programmer_delay(delay_us); + programmer_delay(flash, delay_us); chip_writeb(flash, 0x55, bios + ((shifted ? 0x5555 : 0x2AAA) & mask)); - programmer_delay(delay_us); + programmer_delay(flash, delay_us); chip_writeb(flash, 0x30, bios + page); - programmer_delay(delay_us); + programmer_delay(flash, delay_us); /* wait for Toggle bit ready */ toggle_ready_jedec_slow(flash, bios); @@ -325,18 +325,18 @@ /* Issue the Sector Erase command */ chip_writeb(flash, 0xAA, bios + ((shifted ? 0x2AAA : 0x5555) & mask)); - programmer_delay(delay_us); + programmer_delay(flash, delay_us); chip_writeb(flash, 0x55, bios + ((shifted ? 0x5555 : 0x2AAA) & mask)); - programmer_delay(delay_us); + programmer_delay(flash, delay_us); chip_writeb(flash, 0x80, bios + ((shifted ? 0x2AAA : 0x5555) & mask)); - programmer_delay(delay_us); + programmer_delay(flash, delay_us); chip_writeb(flash, 0xAA, bios + ((shifted ? 0x2AAA : 0x5555) & mask)); - programmer_delay(delay_us); + programmer_delay(flash, delay_us); chip_writeb(flash, 0x55, bios + ((shifted ? 0x5555 : 0x2AAA) & mask)); - programmer_delay(delay_us); + programmer_delay(flash, delay_us); chip_writeb(flash, 0x50, bios + block); - programmer_delay(delay_us); + programmer_delay(flash, delay_us); /* wait for Toggle bit ready */ toggle_ready_jedec_slow(flash, bios); @@ -356,18 +356,18 @@ /* Issue the JEDEC Chip Erase command */ chip_writeb(flash, 0xAA, bios + ((shifted ? 0x2AAA : 0x5555) & mask)); - programmer_delay(delay_us); + programmer_delay(flash, delay_us); chip_writeb(flash, 0x55, bios + ((shifted ? 0x5555 : 0x2AAA) & mask)); - programmer_delay(delay_us); + programmer_delay(flash, delay_us); chip_writeb(flash, 0x80, bios + ((shifted ? 0x2AAA : 0x5555) & mask)); - programmer_delay(delay_us); + programmer_delay(flash, delay_us); chip_writeb(flash, 0xAA, bios + ((shifted ? 0x2AAA : 0x5555) & mask)); - programmer_delay(delay_us); + programmer_delay(flash, delay_us); chip_writeb(flash, 0x55, bios + ((shifted ? 0x5555 : 0x2AAA) & mask)); - programmer_delay(delay_us); + programmer_delay(flash, delay_us); chip_writeb(flash, 0x10, bios + ((shifted ? 0x2AAA : 0x5555) & mask)); - programmer_delay(delay_us); + programmer_delay(flash, delay_us); toggle_ready_jedec_slow(flash, bios); diff --git a/nicintel_eeprom.c b/nicintel_eeprom.c index a254420..d93f8e0 100644 --- a/nicintel_eeprom.c +++ b/nicintel_eeprom.c @@ -213,7 +213,7 @@ eewr |= BIT(EEWR_CMDV); pci_mmio_writel(eewr, eebar + EEWR); - programmer_delay(5); + programmer_delay(NULL, 5); int i; for (i = 0; i < MAX_ATTEMPTS; i++) if (pci_mmio_readl(eebar + EEWR) & BIT(EEWR_DONE)) @@ -338,7 +338,7 @@ nicintel_ee_bitbang(eebar, 0x00, &rdsr); nicintel_ee_bitset(eebar, EEC, EE_CS, 1); - programmer_delay(1); + programmer_delay(NULL, 1); if (!(rdsr & SPI_SR_WIP)) { return 0; } @@ -379,7 +379,7 @@ nicintel_ee_bitset(eebar, EEC, EE_CS, 0); nicintel_ee_bitbang(eebar, JEDEC_WREN, NULL); nicintel_ee_bitset(eebar, EEC, EE_CS, 1); - programmer_delay(1); + programmer_delay(NULL, 1); /* data */ nicintel_ee_bitset(eebar, EEC, EE_CS, 0); @@ -394,7 +394,7 @@ break; } nicintel_ee_bitset(eebar, EEC, EE_CS, 1); - programmer_delay(1); + programmer_delay(NULL, 1); if (nicintel_ee_ready(eebar)) goto out; } diff --git a/pony_spi.c b/pony_spi.c index 3a85eeb..fc27fc4 100644 --- a/pony_spi.c +++ b/pony_spi.c @@ -244,7 +244,7 @@ for (i = 1; i <= 10; i++) { data_out = i & 1; sp_set_pin(PIN_RTS, data_out); - programmer_delay(1000); + programmer_delay(NULL, 1000); /* If DSR does not change, we are not connected to what we think */ if (data_out != sp_get_pin(PIN_DSR)) { diff --git a/raiden_debug_spi.c b/raiden_debug_spi.c index a2e5e84..fb068c8 100644 --- a/raiden_debug_spi.c +++ b/raiden_debug_spi.c @@ -888,7 +888,7 @@ /* Reattempting will not result in a recovery. */ return status; } - programmer_delay(RETRY_INTERVAL_US); + programmer_delay(NULL, RETRY_INTERVAL_US); continue; } @@ -923,7 +923,7 @@ /* Reattempting will not result in a recovery. */ return status; } - programmer_delay(RETRY_INTERVAL_US); + programmer_delay(NULL, RETRY_INTERVAL_US); } } @@ -958,7 +958,7 @@ " config attempt = %d\n" " status = 0x%05x\n", config_attempt + 1, status); - programmer_delay(RETRY_INTERVAL_US); + programmer_delay(NULL, RETRY_INTERVAL_US); continue; } @@ -968,7 +968,7 @@ " config attempt = %d\n" " status = 0x%05x\n", config_attempt + 1, status); - programmer_delay(RETRY_INTERVAL_US); + programmer_delay(NULL, RETRY_INTERVAL_US); continue; } @@ -1012,7 +1012,7 @@ config_attempt + 1, rsp_config.packet_v2.packet_id, rsp_config.packet_size); - programmer_delay(RETRY_INTERVAL_US); + programmer_delay(NULL, RETRY_INTERVAL_US); } return USB_SPI_HOST_INIT_FAILURE; } @@ -1236,7 +1236,7 @@ /* Reattempting will not result in a recovery. */ return status; } - programmer_delay(RETRY_INTERVAL_US); + programmer_delay(NULL, RETRY_INTERVAL_US); continue; } for (read_attempt = 0; read_attempt < READ_RETRY_ATTEMPTS; @@ -1273,7 +1273,7 @@ } /* Device needs to reset its transmit index. */ restart_response_v2(ctx_data); - programmer_delay(RETRY_INTERVAL_US); + programmer_delay(NULL, RETRY_INTERVAL_US); } } } diff --git a/s25f.c b/s25f.c index 1133ef8..605a560 100644 --- a/s25f.c +++ b/s25f.c @@ -93,7 +93,7 @@ /* Allow time for reset command to execute. The datasheet specifies * Trph = 35us, double that to be safe. */ - programmer_delay(T_RPH * 2); + programmer_delay(flash, T_RPH * 2); return 0; } @@ -126,7 +126,7 @@ } /* Allow time for reset command to execute. Double tRPH to be safe. */ - programmer_delay(T_RPH * 2); + programmer_delay(flash, T_RPH * 2); return 0; } @@ -160,7 +160,7 @@ return -1; } - programmer_delay(1000 * 10); + programmer_delay(flash, 1000 * 10); } return 0; @@ -226,7 +226,7 @@ return -1; } - programmer_delay(T_W); + programmer_delay(flash, T_W); return s25f_poll_status(flash); } @@ -299,7 +299,7 @@ return result; } - programmer_delay(S25FS_T_SE); + programmer_delay(flash, S25FS_T_SE); return s25f_poll_status(flash); } @@ -337,7 +337,7 @@ return result; } - programmer_delay(S25FL_T_SE); + programmer_delay(flash, S25FL_T_SE); return s25f_poll_status(flash); } diff --git a/spi25.c b/spi25.c index 6d160eb..061a326 100644 --- a/spi25.c +++ b/spi25.c @@ -313,7 +313,7 @@ if (!(status & SPI_SR_WIP)) return 0; - programmer_delay(poll_delay); + programmer_delay(flash, poll_delay); } } diff --git a/spi25_statusreg.c b/spi25_statusreg.c index 5dbba75..d0ce859 100644 --- a/spi25_statusreg.c +++ b/spi25_statusreg.c @@ -152,7 +152,7 @@ */ int delay_ms = 5000; if (reg == STATUS1) { - programmer_delay(100 * 1000); + programmer_delay(flash, 100 * 1000); delay_ms -= 100; } @@ -163,7 +163,7 @@ return result; if ((status & SPI_SR_WIP) == 0) return 0; - programmer_delay(10 * 1000); + programmer_delay(flash, 10 * 1000); } diff --git a/sst28sf040.c b/sst28sf040.c index 9a08d6b..9080684 100644 --- a/sst28sf040.c +++ b/sst28sf040.c @@ -105,7 +105,7 @@ chip_writeb(flash, CHIP_ERASE, bios); chip_writeb(flash, CHIP_ERASE, bios); - programmer_delay(10); + programmer_delay(flash, 10); toggle_ready_jedec(flash, bios); /* FIXME: Check the status register for errors. */ diff --git a/stm50.c b/stm50.c index 37e560c..d495e09 100644 --- a/stm50.c +++ b/stm50.c @@ -34,7 +34,7 @@ // now start it chip_writeb(flash, 0x32, bios); chip_writeb(flash, 0xd0, bios); - programmer_delay(10); + programmer_delay(flash, 10); uint8_t status = wait_82802ab(flash); print_status_82802ab(status); diff --git a/w29ee011.c b/w29ee011.c index a570bd6..62d7a0f 100644 --- a/w29ee011.c +++ b/w29ee011.c @@ -36,17 +36,17 @@ /* Issue JEDEC Product ID Entry command */ chip_writeb(flash, 0xAA, bios + 0x5555); - programmer_delay(10); + programmer_delay(flash, 10); chip_writeb(flash, 0x55, bios + 0x2AAA); - programmer_delay(10); + programmer_delay(flash, 10); chip_writeb(flash, 0x80, bios + 0x5555); - programmer_delay(10); + programmer_delay(flash, 10); chip_writeb(flash, 0xAA, bios + 0x5555); - programmer_delay(10); + programmer_delay(flash, 10); chip_writeb(flash, 0x55, bios + 0x2AAA); - programmer_delay(10); + programmer_delay(flash, 10); chip_writeb(flash, 0x60, bios + 0x5555); - programmer_delay(10); + programmer_delay(flash, 10); /* Read product ID */ id1 = chip_readb(flash, bios); @@ -54,11 +54,11 @@ /* Issue JEDEC Product ID Exit command */ chip_writeb(flash, 0xAA, bios + 0x5555); - programmer_delay(10); + programmer_delay(flash, 10); chip_writeb(flash, 0x55, bios + 0x2AAA); - programmer_delay(10); + programmer_delay(flash, 10); chip_writeb(flash, 0xF0, bios + 0x5555); - programmer_delay(10); + programmer_delay(flash, 10); msg_cdbg("%s: id1 0x%02x, id2 0x%02x\n", __func__, id1, id2); diff --git a/w39.c b/w39.c index f58c495..114d0b5 100644 --- a/w39.c +++ b/w39.c @@ -27,7 +27,7 @@ chip_writeb(flash, 0xAA, bios + 0x5555); chip_writeb(flash, 0x55, bios + 0x2AAA); chip_writeb(flash, 0x90, bios + 0x5555); - programmer_delay(10); + programmer_delay(flash, 10); /* Read something, maybe hardware lock bits */ val = chip_readb(flash, bios + offset); @@ -36,7 +36,7 @@ chip_writeb(flash, 0xAA, bios + 0x5555); chip_writeb(flash, 0x55, bios + 0x2AAA); chip_writeb(flash, 0xF0, bios + 0x5555); - programmer_delay(10); + programmer_delay(flash, 10); return val; } diff --git a/wbsio_spi.c b/wbsio_spi.c index 661ecbb..1aa8729 100644 --- a/wbsio_spi.c +++ b/wbsio_spi.c @@ -155,7 +155,7 @@ OUTB(writearr[0], data->spibase); OUTB(mode, data->spibase + 1); - programmer_delay(10); + programmer_delay(NULL, 10); if (!readcnt) return 0; -- To view, visit https://review.coreboot.org/c/flashrom/+/66373 To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: flashrom Gerrit-Branch: master Gerrit-Change-Id: Ibb0bce26ce2052853ee52158d7ba742967a9e229 Gerrit-Change-Number: 66373 Gerrit-PatchSet: 15 Gerrit-Owner: Alexander Goncharov <chat(a)joursoir.net> Gerrit-Reviewer: Alexander Goncharov <chat(a)joursoir.net> Gerrit-Reviewer: Anastasia Klimchuk <aklm(a)chromium.org> Gerrit-Reviewer: Edward O'Callaghan <quasisec(a)chromium.org> Gerrit-Reviewer: Felix Singer <felixsinger(a)posteo.net> Gerrit-Reviewer: Thomas Heijligen <src(a)posteo.de> Gerrit-Reviewer: build bot (Jenkins) <no-reply(a)coreboot.org> Gerrit-MessageType: merged

1 0

[S] Change in flashrom[master]: raiden_debug_spi: Remove fixme with explanation
by Nikolai Artemiev (Code Review) 16 Oct '22

16 Oct '22

Attention is currently required from: Thomas Heijligen, Edward O'Callaghan, Liam Flaherty. Nikolai Artemiev has posted comments on this change. ( https://review.coreboot.org/c/flashrom/+/68364 ) Change subject: raiden_debug_spi: Remove fixme with explanation ...................................................................... Patch Set 2: Code-Review+1 -- To view, visit https://review.coreboot.org/c/flashrom/+/68364 To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: flashrom Gerrit-Branch: master Gerrit-Change-Id: I43e364c02f42dd499d3c9ca3e0a03ead673da3e6 Gerrit-Change-Number: 68364 Gerrit-PatchSet: 2 Gerrit-Owner: Liam Flaherty <liamflaherty(a)chromium.org> 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: Nikolai Artemiev <nartemiev(a)google.com> Gerrit-Reviewer: Thomas Heijligen <src(a)posteo.de> Gerrit-Reviewer: build bot (Jenkins) <no-reply(a)coreboot.org> Gerrit-Attention: Thomas Heijligen <src(a)posteo.de> Gerrit-Attention: Edward O'Callaghan <quasisec(a)chromium.org> Gerrit-Attention: Liam Flaherty <liamflaherty(a)chromium.org> Gerrit-Comment-Date: Sun, 16 Oct 2022 23:51:42 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 0

[S] Change in flashrom[master]: raiden_debug_spi: Remove fixme with explanation
by Anastasia Klimchuk (Code Review) 16 Oct '22

16 Oct '22

Attention is currently required from: Thomas Heijligen, Edward O'Callaghan, Liam Flaherty, Nikolai Artemiev. Anastasia Klimchuk has posted comments on this change. ( https://review.coreboot.org/c/flashrom/+/68364 ) Change subject: raiden_debug_spi: Remove fixme with explanation ...................................................................... Patch Set 2: Code-Review+1 (1 comment) Patchset: PS2: Thomas, I remember the idea to "Fix this Fixme" came up in a conversation some time ago. What do you think about this patch? (which is adding a comment to explain why things are as they are). -- To view, visit https://review.coreboot.org/c/flashrom/+/68364 To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: flashrom Gerrit-Branch: master Gerrit-Change-Id: I43e364c02f42dd499d3c9ca3e0a03ead673da3e6 Gerrit-Change-Number: 68364 Gerrit-PatchSet: 2 Gerrit-Owner: Liam Flaherty <liamflaherty(a)chromium.org> 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: Nikolai Artemiev <nartemiev(a)google.com> Gerrit-Reviewer: Thomas Heijligen <src(a)posteo.de> Gerrit-Reviewer: build bot (Jenkins) <no-reply(a)coreboot.org> Gerrit-Attention: Thomas Heijligen <src(a)posteo.de> Gerrit-Attention: Edward O'Callaghan <quasisec(a)chromium.org> Gerrit-Attention: Liam Flaherty <liamflaherty(a)chromium.org> Gerrit-Attention: Nikolai Artemiev <nartemiev(a)google.com> Gerrit-Comment-Date: Sun, 16 Oct 2022 23:49:32 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 0

[S] Change in flashrom[master]: raiden_debug_spi: Remove fixme with explanation
by Angel Pons (Code Review) 16 Oct '22

16 Oct '22

Attention is currently required from: Edward O'Callaghan, Liam Flaherty, Anastasia Klimchuk, Nikolai Artemiev. Angel Pons has posted comments on this change. ( https://review.coreboot.org/c/flashrom/+/68364 ) Change subject: raiden_debug_spi: Remove fixme with explanation ...................................................................... Patch Set 2: Code-Review+1 -- To view, visit https://review.coreboot.org/c/flashrom/+/68364 To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: flashrom Gerrit-Branch: master Gerrit-Change-Id: I43e364c02f42dd499d3c9ca3e0a03ead673da3e6 Gerrit-Change-Number: 68364 Gerrit-PatchSet: 2 Gerrit-Owner: Liam Flaherty <liamflaherty(a)chromium.org> 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: Nikolai Artemiev <nartemiev(a)google.com> Gerrit-Reviewer: build bot (Jenkins) <no-reply(a)coreboot.org> Gerrit-Attention: Edward O'Callaghan <quasisec(a)chromium.org> Gerrit-Attention: Liam Flaherty <liamflaherty(a)chromium.org> Gerrit-Attention: Anastasia Klimchuk <aklm(a)chromium.org> Gerrit-Attention: Nikolai Artemiev <nartemiev(a)google.com> Gerrit-Comment-Date: Sun, 16 Oct 2022 23:22:49 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 0

[S] Change in flashrom[master]: raiden_debug_spi: Remove fixme with explanation
by Liam Flaherty (Code Review) 16 Oct '22

16 Oct '22

Attention is currently required from: Edward O'Callaghan, Angel Pons, Anastasia Klimchuk, Nikolai Artemiev. Liam Flaherty has posted comments on this change. ( https://review.coreboot.org/c/flashrom/+/68364 ) Change subject: raiden_debug_spi: Remove fixme with explanation ...................................................................... Patch Set 2: (4 comments) Commit Message: https://review.coreboot.org/c/flashrom/+/68364/comment/e9dd127e_6f87e10b PS1, Line 7: debug_raiden_spi > raiden_debug_spi (should be the programmer name) Done https://review.coreboot.org/c/flashrom/+/68364/comment/e28f99c5_2ca66cc3 PS1, Line 9: The raiden_debug_spi programmer will query the connected USB devices and : match against criteria other than the pid rather than iterate through the : vid:pid table. > Max width of commit message is 72 chars (see https://www.flashrom. […] Done https://review.coreboot.org/c/flashrom/+/68364/comment/f0385318_93f71a0f PS1, Line 14: TICKET=https://ticket.coreboot.org/issues/394 > I am terribly sorry, I made a mistake and told you to do the wrong thing, it actually should be […] Done File raiden_debug_spi.c: https://review.coreboot.org/c/flashrom/+/68364/comment/aee1b36a_b19850fc PS1, Line 354: // rather than looking for a device with a specific vid:pid. > Either approach seems fine. But if you want to go with `1. […] Done -- To view, visit https://review.coreboot.org/c/flashrom/+/68364 To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: flashrom Gerrit-Branch: master Gerrit-Change-Id: I43e364c02f42dd499d3c9ca3e0a03ead673da3e6 Gerrit-Change-Number: 68364 Gerrit-PatchSet: 2 Gerrit-Owner: Liam Flaherty <liamflaherty(a)chromium.org> 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: Nikolai Artemiev <nartemiev(a)google.com> Gerrit-Reviewer: build bot (Jenkins) <no-reply(a)coreboot.org> Gerrit-Attention: Edward O'Callaghan <quasisec(a)chromium.org> Gerrit-Attention: Angel Pons <th3fanbus(a)gmail.com> Gerrit-Attention: Anastasia Klimchuk <aklm(a)chromium.org> Gerrit-Attention: Nikolai Artemiev <nartemiev(a)google.com> Gerrit-Comment-Date: Sun, 16 Oct 2022 23:22:07 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: Angel Pons <th3fanbus(a)gmail.com> Comment-In-Reply-To: Liam Flaherty <liamflaherty(a)chromium.org> Comment-In-Reply-To: Anastasia Klimchuk <aklm(a)chromium.org> Gerrit-MessageType: comment

1 0

[S] Change in flashrom[master]: raiden_debug_spi: Remove fixme with explanation
by Liam Flaherty (Code Review) 16 Oct '22

16 Oct '22

Attention is currently required from: Edward O'Callaghan, Liam Flaherty, Nikolai Artemiev. Hello build bot (Jenkins), Edward O'Callaghan, Angel Pons, Anastasia Klimchuk, Nikolai Artemiev, I'd like you to reexamine a change. Please visit https://review.coreboot.org/c/flashrom/+/68364 to look at the new patch set (#2). Change subject: raiden_debug_spi: Remove fixme with explanation ...................................................................... raiden_debug_spi: Remove fixme with explanation The raiden_debug_spi programmer will query the connected USB devices and match against criteria other than the pid rather than iterate through the vid:pid table. The fixme has been updated to explain why the dev_entry table is empty. TICKET: https://ticket.coreboot.org/issues/394 BUG=b:253320285 TEST=build Change-Id: I43e364c02f42dd499d3c9ca3e0a03ead673da3e6 Signed-off-by: Liam Flaherty <liamflaherty(a)chromium.org> --- M raiden_debug_spi.c 1 file changed, 24 insertions(+), 1 deletion(-) git pull ssh://review.coreboot.org:29418/flashrom refs/changes/64/68364/2 -- To view, visit https://review.coreboot.org/c/flashrom/+/68364 To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: flashrom Gerrit-Branch: master Gerrit-Change-Id: I43e364c02f42dd499d3c9ca3e0a03ead673da3e6 Gerrit-Change-Number: 68364 Gerrit-PatchSet: 2 Gerrit-Owner: Liam Flaherty <liamflaherty(a)chromium.org> 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: Nikolai Artemiev <nartemiev(a)google.com> Gerrit-Reviewer: build bot (Jenkins) <no-reply(a)coreboot.org> Gerrit-Attention: Edward O'Callaghan <quasisec(a)chromium.org> Gerrit-Attention: Liam Flaherty <liamflaherty(a)chromium.org> Gerrit-Attention: Nikolai Artemiev <nartemiev(a)google.com> Gerrit-MessageType: newpatchset

1 0

[M] Change in flashrom[master]: tree: provide flashrom context into programmer_delay()
by Felix Singer (Code Review) 16 Oct '22

16 Oct '22

Attention is currently required from: Thomas Heijligen, Anastasia Klimchuk, Alexander Goncharov. Felix Singer has posted comments on this change. ( https://review.coreboot.org/c/flashrom/+/66373 ) Change subject: tree: provide flashrom context into programmer_delay() ...................................................................... Patch Set 14: Code-Review+2 -- To view, visit https://review.coreboot.org/c/flashrom/+/66373 To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: flashrom Gerrit-Branch: master Gerrit-Change-Id: Ibb0bce26ce2052853ee52158d7ba742967a9e229 Gerrit-Change-Number: 66373 Gerrit-PatchSet: 14 Gerrit-Owner: Alexander Goncharov <chat(a)joursoir.net> Gerrit-Reviewer: Alexander Goncharov <chat(a)joursoir.net> Gerrit-Reviewer: Anastasia Klimchuk <aklm(a)chromium.org> Gerrit-Reviewer: Edward O'Callaghan <quasisec(a)chromium.org> Gerrit-Reviewer: Felix Singer <felixsinger(a)posteo.net> Gerrit-Reviewer: Thomas Heijligen <src(a)posteo.de> Gerrit-Reviewer: build bot (Jenkins) <no-reply(a)coreboot.org> Gerrit-Attention: Thomas Heijligen <src(a)posteo.de> Gerrit-Attention: Anastasia Klimchuk <aklm(a)chromium.org> Gerrit-Attention: Alexander Goncharov <chat(a)joursoir.net> Gerrit-Comment-Date: Sun, 16 Oct 2022 23:05:51 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 0

[M] Change in flashrom[master]: tree: provide flashrom context into programmer_delay()
by Edward O'Callaghan (Code Review) 16 Oct '22

16 Oct '22

Attention is currently required from: Felix Singer, Thomas Heijligen, Anastasia Klimchuk, Alexander Goncharov. Edward O'Callaghan has posted comments on this change. ( https://review.coreboot.org/c/flashrom/+/66373 ) Change subject: tree: provide flashrom context into programmer_delay() ...................................................................... Patch Set 14: Code-Review+2 (1 comment) File bitbang_spi.c: https://review.coreboot.org/c/flashrom/+/66373/comment/ea433cf1_42cf4eed PS11, Line 80: flash, > Yeah, I agree. […] Perfect thanks. -- To view, visit https://review.coreboot.org/c/flashrom/+/66373 To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: flashrom Gerrit-Branch: master Gerrit-Change-Id: Ibb0bce26ce2052853ee52158d7ba742967a9e229 Gerrit-Change-Number: 66373 Gerrit-PatchSet: 14 Gerrit-Owner: Alexander Goncharov <chat(a)joursoir.net> Gerrit-Reviewer: Alexander Goncharov <chat(a)joursoir.net> Gerrit-Reviewer: Anastasia Klimchuk <aklm(a)chromium.org> Gerrit-Reviewer: Edward O'Callaghan <quasisec(a)chromium.org> Gerrit-Reviewer: Felix Singer <felixsinger(a)posteo.net> Gerrit-Reviewer: Thomas Heijligen <src(a)posteo.de> Gerrit-Reviewer: build bot (Jenkins) <no-reply(a)coreboot.org> Gerrit-Attention: Felix Singer <felixsinger(a)posteo.net> Gerrit-Attention: Thomas Heijligen <src(a)posteo.de> Gerrit-Attention: Anastasia Klimchuk <aklm(a)chromium.org> Gerrit-Attention: Alexander Goncharov <chat(a)joursoir.net> Gerrit-Comment-Date: Sun, 16 Oct 2022 22:54:10 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Comment-In-Reply-To: Edward O'Callaghan <quasisec(a)chromium.org> Comment-In-Reply-To: Alexander Goncharov <chat(a)joursoir.net> Gerrit-MessageType: comment

1 0

2024

2023

2022

2021

2020

2019

2018

2017

flashrom-gerrit