September 2022 - flashrom-gerrit

[S] Change in flashrom[master]: buspirate_spi.c: Retype appropriate variables with bool
by Felix Singer (Code Review) 07 Sep '22

07 Sep '22

Attention is currently required from: Felix Singer, Angel Pons. Hello build bot (Jenkins), Thomas Heijligen, Edward O'Callaghan, Angel Pons, Anastasia Klimchuk, I'd like you to reexamine a change. Please visit https://review.coreboot.org/c/flashrom/+/66868 to look at the new patch set (#11). Change subject: buspirate_spi.c: Retype appropriate variables with bool ...................................................................... buspirate_spi.c: Retype appropriate variables with bool Use the bool type instead of integer for appropriate variables, since this represents their purpose much better. Signed-off-by: Felix Singer <felixsinger(a)posteo.net> Change-Id: I245616168796f2c7fe99388688b0f606bd3405bf --- M buspirate_spi.c 1 file changed, 21 insertions(+), 7 deletions(-) git pull ssh://review.coreboot.org:29418/flashrom refs/changes/68/66868/11 -- To view, visit https://review.coreboot.org/c/flashrom/+/66868 To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: flashrom Gerrit-Branch: master Gerrit-Change-Id: I245616168796f2c7fe99388688b0f606bd3405bf Gerrit-Change-Number: 66868 Gerrit-PatchSet: 11 Gerrit-Owner: Felix Singer <felixsinger(a)posteo.net> 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: 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: Angel Pons <th3fanbus(a)gmail.com> Gerrit-MessageType: newpatchset

1 0

[M] Change in flashrom[master]: drivers/: Make 'internal_delay' the default unless defined
by Felix Singer (Code Review) 07 Sep '22

07 Sep '22

Attention is currently required from: Edward O'Callaghan, Nikolai Artemiev, Peter Marheine. Felix Singer has posted comments on this change. ( https://review.coreboot.org/c/flashrom/+/67391 ) Change subject: drivers/: Make 'internal_delay' the default unless defined ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://review.coreboot.org/c/flashrom/+/67391 To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: flashrom Gerrit-Branch: master Gerrit-Change-Id: I17460bc2c0aebcbb48c8dfa052b260991525cc49 Gerrit-Change-Number: 67391 Gerrit-PatchSet: 1 Gerrit-Owner: Edward O'Callaghan <quasisec(a)chromium.org> Gerrit-Reviewer: Felix Singer <felixsinger(a)posteo.net> Gerrit-Reviewer: Nikolai Artemiev <nartemiev(a)google.com> Gerrit-Reviewer: Peter Marheine <pmarheine(a)chromium.org> Gerrit-Reviewer: build bot (Jenkins) <no-reply(a)coreboot.org> Gerrit-Attention: Edward O'Callaghan <quasisec(a)chromium.org> Gerrit-Attention: Nikolai Artemiev <nartemiev(a)google.com> Gerrit-Attention: Peter Marheine <pmarheine(a)chromium.org> Gerrit-Comment-Date: Wed, 07 Sep 2022 03:54:59 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 0

[M] Change in flashrom[master]: tree/: Move programmer_delay() out of programmer state machine
by Edward O'Callaghan (Code Review) 07 Sep '22

07 Sep '22

Edward O'Callaghan has uploaded this change for review. ( https://review.coreboot.org/c/flashrom/+/67393 ) Change subject: tree/: Move programmer_delay() out of programmer state machine ...................................................................... tree/: Move programmer_delay() out of programmer state machine squash, fix serprog and ch341a_spi Change-Id: Id059abb58b31a066a408009073912da2b224d40c Signed-off-by: Edward O'Callaghan <quasisec(a)google.com> --- M ch341a_spi.c M flashrom.c M include/programmer.h M serprog.c 4 files changed, 45 insertions(+), 28 deletions(-) git pull ssh://review.coreboot.org:29418/flashrom refs/changes/93/67393/1 diff --git a/ch341a_spi.c b/ch341a_spi.c index 78b9cee..49f794e 100644 --- a/ch341a_spi.c +++ b/ch341a_spi.c @@ -418,6 +418,7 @@ .write_aai = default_spi_write_aai, .shutdown = ch341a_spi_shutdown, .probe_opcode = default_spi_probe_opcode, + .delay = ch341a_spi_delay, }; static int ch341a_spi_init(const struct programmer_cfg *cfg) @@ -526,5 +527,4 @@ .init = ch341a_spi_init, .map_flash_region = fallback_map, .unmap_flash_region = fallback_unmap, - .delay = ch341a_spi_delay, }; diff --git a/flashrom.c b/flashrom.c index ce10cea..3ad07da 100644 --- a/flashrom.c +++ b/flashrom.c @@ -210,9 +210,13 @@ void programmer_delay(const struct flashctx *flash, unsigned int usecs) { if (usecs > 0) { - if (programmer->delay) - programmer->delay(usecs); - else + if (flash->mst->buses_supported & BUS_SPI) { + if (flash->mst->spi.delay) + flash->mst->spi.delay(usecs); + } else if (flash->mst->buses_supported & BUS_PARALLEL) { + if (flash->mst->par.delay) + flash->mst->par.delay(usecs); + } else internal_delay(usecs); } } diff --git a/include/programmer.h b/include/programmer.h index 5331a12..2308a98 100644 --- a/include/programmer.h +++ b/include/programmer.h @@ -51,8 +51,6 @@ void *(*map_flash_region) (const char *descr, uintptr_t phys_addr, size_t len); void (*unmap_flash_region) (void *virt_addr, size_t len); - - void (*delay) (unsigned int usecs); }; extern const struct programmer_entry *const programmer_table[]; @@ -313,6 +311,7 @@ int (*write_aai)(struct flashctx *flash, const uint8_t *buf, unsigned int start, unsigned int len); int (*shutdown)(void *data); bool (*probe_opcode)(struct flashctx *flash, uint8_t opcode); + void (*delay) (unsigned int usecs); void *data; }; @@ -429,6 +428,7 @@ uint32_t (*chip_readl) (const struct flashctx *flash, const chipaddr addr); void (*chip_readn) (const struct flashctx *flash, uint8_t *buf, const chipaddr addr, size_t len); int (*shutdown)(void *data); + void (*delay) (unsigned int usecs); void *data; }; int register_par_master(const struct par_master *mst, const enum chipbustype buses, void *data); diff --git a/serprog.c b/serprog.c index c68449a..a8c31b6 100644 --- a/serprog.c +++ b/serprog.c @@ -551,6 +551,27 @@ sp_do_read_n(&(buf[addrm-addr]), addrm, lenm); // FIXME: return error } +static void serprog_delay(unsigned int usecs) +{ + unsigned char buf[4]; + msg_pspew("%s usecs=%d\n", __func__, usecs); + if (!sp_check_commandavail(S_CMD_O_DELAY)) { + msg_pdbg2("serprog_delay used, but programmer doesn't support delays natively - emulating\n"); + internal_delay(usecs); + return; + } + if ((sp_max_write_n) && (sp_write_n_bytes)) + sp_pass_writen(); + sp_check_opbuf_usage(5); + buf[0] = ((usecs >> 0) & 0xFF); + buf[1] = ((usecs >> 8) & 0xFF); + buf[2] = ((usecs >> 16) & 0xFF); + buf[3] = ((usecs >> 24) & 0xFF); + sp_stream_buffer_op(S_CMD_O_DELAY, 4, buf); + sp_opbuf_usage += 5; + sp_prev_was_write = 0; +} + static const struct par_master par_master_serprog = { .chip_readb = serprog_chip_readb, .chip_readw = fallback_chip_readw, @@ -560,6 +581,7 @@ .chip_writew = fallback_chip_writew, .chip_writel = fallback_chip_writel, .chip_writen = fallback_chip_writen, + .delay = serprog_delay, }; static enum chipbustype serprog_buses_supported = BUS_NONE; @@ -923,27 +945,6 @@ return 1; } -static void serprog_delay(unsigned int usecs) -{ - unsigned char buf[4]; - msg_pspew("%s usecs=%d\n", __func__, usecs); - if (!sp_check_commandavail(S_CMD_O_DELAY)) { - msg_pdbg2("serprog_delay used, but programmer doesn't support delays natively - emulating\n"); - internal_delay(usecs); - return; - } - if ((sp_max_write_n) && (sp_write_n_bytes)) - sp_pass_writen(); - sp_check_opbuf_usage(5); - buf[0] = ((usecs >> 0) & 0xFF); - buf[1] = ((usecs >> 8) & 0xFF); - buf[2] = ((usecs >> 16) & 0xFF); - buf[3] = ((usecs >> 24) & 0xFF); - sp_stream_buffer_op(S_CMD_O_DELAY, 4, buf); - sp_opbuf_usage += 5; - sp_prev_was_write = 0; -} - static void *serprog_map(const char *descr, uintptr_t phys_addr, size_t len) { /* Serprog transmits 24 bits only and assumes the underlying implementation handles any remaining bits @@ -967,5 +968,4 @@ .init = serprog_init, .map_flash_region = serprog_map, .unmap_flash_region = fallback_unmap, - .delay = serprog_delay, }; -- To view, visit https://review.coreboot.org/c/flashrom/+/67393 To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: flashrom Gerrit-Branch: master Gerrit-Change-Id: Id059abb58b31a066a408009073912da2b224d40c Gerrit-Change-Number: 67393 Gerrit-PatchSet: 1 Gerrit-Owner: Edward O'Callaghan <quasisec(a)chromium.org> Gerrit-MessageType: newchange

1 0

[M] Change in flashrom[master]: tree/: plumb flashctx into programmer_delay()
by Edward O'Callaghan (Code Review) 07 Sep '22

07 Sep '22

Edward O'Callaghan has uploaded this change for review. ( https://review.coreboot.org/c/flashrom/+/67392 ) Change subject: tree/: plumb flashctx into programmer_delay() ...................................................................... tree/: plumb flashctx into programmer_delay() Change-Id: I51792168525c145092f78236265ba43acf70bfad Signed-off-by: Edward O'Callaghan <quasisec(a)google.com> --- 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, 106 insertions(+), 96 deletions(-) git pull ssh://review.coreboot.org:29418/flashrom refs/changes/92/67392/1 diff --git a/82802ab.c b/82802ab.c index 1db69e6..a600dc5 100644 --- a/82802ab.c +++ b/82802ab.c @@ -44,11 +44,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)); @@ -56,7 +56,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); @@ -113,7 +113,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 a0be396..2148147 100644 --- a/atavia.c +++ b/atavia.c @@ -90,7 +90,7 @@ ready = true; break; } else { - programmer_delay(1); + programmer_delay(NULL, 1); continue; } } @@ -169,7 +169,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..832bfde 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(flash, master->half_period); bitbang_spi_set_cs(master, 1, data->spi_data); - programmer_delay(master->half_period); + programmer_delay(flash, 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 bac31d1..3a5be73 100644 --- a/cli_classic.c +++ b/cli_classic.c @@ -1140,7 +1140,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 99c91e0..092e8c2 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 d42f344..100613c 100644 --- a/dummyflasher.c +++ b/dummyflasher.c @@ -896,7 +896,7 @@ msg_pspew(" 0x%02x", readarr[i]); msg_pspew("\n"); - programmer_delay((writecnt + readcnt) * emu_data->delay_us); + programmer_delay(flash, (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 7921082..ce10cea 100644 --- a/flashrom.c +++ b/flashrom.c @@ -207,7 +207,7 @@ msg_gspew("%s: unmapped 0x%0*" PRIxPTR "\n", __func__, PRIxPTR_WIDTH, (uintptr_t)virt_addr); } -void programmer_delay(unsigned int usecs) +void programmer_delay(const struct flashctx *flash, unsigned int usecs) { if (usecs > 0) { if (programmer->delay) @@ -1746,7 +1746,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 855b7fb..2479e97 100644 --- a/ichspi.c +++ b/ichspi.c @@ -874,7 +874,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"); @@ -950,7 +950,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)); @@ -990,7 +990,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"); @@ -1070,7 +1070,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)); @@ -1318,7 +1318,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 79aaa64..71cef8d 100644 --- a/include/flash.h +++ b/include/flash.h @@ -57,7 +57,7 @@ int register_shutdown(int (*function) (void *data), void *data); void *programmer_map_flash_region(const char *descr, uintptr_t phys_addr, size_t len); void programmer_unmap_flash_region(void *virt_addr, size_t len); -void programmer_delay(unsigned int usecs); +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 eb04141..a529fba 100644 --- a/it87spi.c +++ b/it87spi.c @@ -145,7 +145,7 @@ if((status & SPI_SR_WIP) == 0) return 0; - programmer_delay(1000); + programmer_delay(flash, 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 01f9075..1efcbe0 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(flash, 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(flash, 1); if (nicintel_ee_ready(eebar)) goto out; } diff --git a/pony_spi.c b/pony_spi.c index 05d7cc6..a1668c3 100644 --- a/pony_spi.c +++ b/pony_spi.c @@ -243,7 +243,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 1c8b3b6..66164fb 100644 --- a/raiden_debug_spi.c +++ b/raiden_debug_spi.c @@ -887,7 +887,7 @@ /* Reattempting will not result in a recovery. */ return status; } - programmer_delay(RETRY_INTERVAL_US); + programmer_delay(flash, RETRY_INTERVAL_US); continue; } @@ -922,7 +922,7 @@ /* Reattempting will not result in a recovery. */ return status; } - programmer_delay(RETRY_INTERVAL_US); + programmer_delay(flash, RETRY_INTERVAL_US); } } @@ -957,7 +957,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; } @@ -967,7 +967,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; } @@ -1011,7 +1011,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; } @@ -1235,7 +1235,7 @@ /* Reattempting will not result in a recovery. */ return status; } - programmer_delay(RETRY_INTERVAL_US); + programmer_delay(flash, RETRY_INTERVAL_US); continue; } for (read_attempt = 0; read_attempt < READ_RETRY_ATTEMPTS; @@ -1272,7 +1272,7 @@ } /* Device needs to reset its transmit index. */ restart_response_v2(ctx_data); - programmer_delay(RETRY_INTERVAL_US); + programmer_delay(flash, RETRY_INTERVAL_US); } } } diff --git a/s25f.c b/s25f.c index 67715ed..23df191 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 4454106..13a18f7 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 95ca1e9..a78c135 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(flash, 10); if (!readcnt) return 0; -- To view, visit https://review.coreboot.org/c/flashrom/+/67392 To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: flashrom Gerrit-Branch: master Gerrit-Change-Id: I51792168525c145092f78236265ba43acf70bfad Gerrit-Change-Number: 67392 Gerrit-PatchSet: 1 Gerrit-Owner: Edward O'Callaghan <quasisec(a)chromium.org> Gerrit-MessageType: newchange

1 0

[M] Change in flashrom[master]: drivers/: Make 'internal_delay' the default unless defined
by Edward O'Callaghan (Code Review) 07 Sep '22

07 Sep '22

Edward O'Callaghan has uploaded this change for review. ( https://review.coreboot.org/c/flashrom/+/67391 ) Change subject: drivers/: Make 'internal_delay' the default unless defined ...................................................................... drivers/: Make 'internal_delay' the default unless defined Drop the explicit need to specify the default 'internal_delay' callback function pointer. This is a reasonable default for every other driver in the tree with only two exceptions. Thus this simplifies driver development and paves way to remove the 'programmer' global handle. Change-Id: I17460bc2c0aebcbb48c8dfa052b260991525cc49 Signed-off-by: Edward O'Callaghan <quasisec(a)google.com> --- M atahpt.c M atapromise.c M atavia.c M buspirate_spi.c M dediprog.c M developerbox_spi.c M digilent_spi.c M drkaiser.c M dummyflasher.c M flashrom.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 mediatek_i2c_spi.c M mstarddc_spi.c M ni845x_spi.c M nic3com.c M nicintel.c M nicintel_eeprom.c M nicintel_spi.c M nicnatsemi.c M nicrealtek.c M ogp_spi.c M parade_lspcon.c M pickit2_spi.c M pony_spi.c M raiden_debug_spi.c M rayer_spi.c M realtek_mst_i2c_spi.c M satamv.c M satasii.c M stlinkv3_spi.c M usbblaster_spi.c 37 files changed, 23 insertions(+), 42 deletions(-) git pull ssh://review.coreboot.org:29418/flashrom refs/changes/91/67391/1 diff --git a/atahpt.c b/atahpt.c index 5c636d1..fa69137 100644 --- a/atahpt.c +++ b/atahpt.c @@ -122,5 +122,4 @@ .init = atahpt_init, .map_flash_region = fallback_map, .unmap_flash_region = fallback_unmap, - .delay = internal_delay, }; diff --git a/atapromise.c b/atapromise.c index 63463f5..9a83820 100644 --- a/atapromise.c +++ b/atapromise.c @@ -192,5 +192,4 @@ .init = atapromise_init, .map_flash_region = atapromise_map, .unmap_flash_region = fallback_unmap, - .delay = internal_delay, }; diff --git a/atavia.c b/atavia.c index 51530a4..a0be396 100644 --- a/atavia.c +++ b/atavia.c @@ -191,5 +191,4 @@ .init = atavia_init, .map_flash_region = atavia_map, .unmap_flash_region = fallback_unmap, - .delay = internal_delay, }; diff --git a/buspirate_spi.c b/buspirate_spi.c index 8fa60f6..041b8db 100644 --- a/buspirate_spi.c +++ b/buspirate_spi.c @@ -715,5 +715,4 @@ .init = buspirate_spi_init, .map_flash_region = fallback_map, .unmap_flash_region = fallback_unmap, - .delay = internal_delay, }; diff --git a/dediprog.c b/dediprog.c index f957be6..99c91e0 100644 --- a/dediprog.c +++ b/dediprog.c @@ -1321,5 +1321,4 @@ .init = dediprog_init, .map_flash_region = fallback_map, .unmap_flash_region = fallback_unmap, - .delay = internal_delay, }; diff --git a/developerbox_spi.c b/developerbox_spi.c index 3774d04..04957a3 100644 --- a/developerbox_spi.c +++ b/developerbox_spi.c @@ -195,5 +195,4 @@ .init = developerbox_spi_init, .map_flash_region = fallback_map, .unmap_flash_region = fallback_unmap, - .delay = internal_delay, }; diff --git a/digilent_spi.c b/digilent_spi.c index 41342a8..85f3884 100644 --- a/digilent_spi.c +++ b/digilent_spi.c @@ -470,5 +470,4 @@ .init = digilent_spi_init, .map_flash_region = fallback_map, .unmap_flash_region = fallback_unmap, - .delay = internal_delay, }; diff --git a/drkaiser.c b/drkaiser.c index b121eec..039e686 100644 --- a/drkaiser.c +++ b/drkaiser.c @@ -124,5 +124,4 @@ .init = drkaiser_init, .map_flash_region = fallback_map, .unmap_flash_region = fallback_unmap, - .delay = internal_delay, }; diff --git a/dummyflasher.c b/dummyflasher.c index 07fcd72..d42f344 100644 --- a/dummyflasher.c +++ b/dummyflasher.c @@ -1425,5 +1425,4 @@ .init = dummy_init, .map_flash_region = dummy_map, .unmap_flash_region = dummy_unmap, - .delay = internal_delay, }; diff --git a/flashrom.c b/flashrom.c index 0e2fa42..7921082 100644 --- a/flashrom.c +++ b/flashrom.c @@ -209,8 +209,12 @@ void programmer_delay(unsigned int usecs) { - if (usecs > 0) - programmer->delay(usecs); + if (usecs > 0) { + if (programmer->delay) + programmer->delay(usecs); + else + internal_delay(usecs); + } } int read_memmapped(struct flashctx *flash, uint8_t *buf, unsigned int start, @@ -1409,10 +1413,6 @@ 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); - ret = 1; - } if (p->map_flash_region == NULL) { msg_gerr("Programmer %s does not have a valid map_flash_region function!\n", p->name); ret = 1; diff --git a/ft2232_spi.c b/ft2232_spi.c index 2971c2e..5a6177c 100644 --- a/ft2232_spi.c +++ b/ft2232_spi.c @@ -712,5 +712,4 @@ .init = ft2232_spi_init, .map_flash_region = fallback_map, .unmap_flash_region = fallback_unmap, - .delay = internal_delay, }; diff --git a/gfxnvidia.c b/gfxnvidia.c index 941f0e8..ca432ac 100644 --- a/gfxnvidia.c +++ b/gfxnvidia.c @@ -151,5 +151,4 @@ .init = gfxnvidia_init, .map_flash_region = fallback_map, .unmap_flash_region = fallback_unmap, - .delay = internal_delay, }; diff --git a/internal.c b/internal.c index 426730f..29e3095 100644 --- a/internal.c +++ b/internal.c @@ -348,5 +348,4 @@ .init = internal_init, .map_flash_region = physmap, .unmap_flash_region = physunmap, - .delay = internal_delay, }; diff --git a/it8212.c b/it8212.c index 18d1173..9b4a263 100644 --- a/it8212.c +++ b/it8212.c @@ -113,5 +113,4 @@ .init = it8212_init, .map_flash_region = fallback_map, .unmap_flash_region = fallback_unmap, - .delay = internal_delay, }; diff --git a/jlink_spi.c b/jlink_spi.c index 52fc786..ef4d9ca 100644 --- a/jlink_spi.c +++ b/jlink_spi.c @@ -538,5 +538,4 @@ .devs.note = "SEGGER J-Link and compatible devices\n", .map_flash_region = fallback_map, .unmap_flash_region = fallback_unmap, - .delay = internal_delay, }; diff --git a/linux_mtd.c b/linux_mtd.c index c5dc451..dfcfd05 100644 --- a/linux_mtd.c +++ b/linux_mtd.c @@ -558,5 +558,4 @@ .init = linux_mtd_init, .map_flash_region = fallback_map, .unmap_flash_region = fallback_unmap, - .delay = internal_delay, }; diff --git a/linux_spi.c b/linux_spi.c index 09ee8a0..b51d9e9 100644 --- a/linux_spi.c +++ b/linux_spi.c @@ -253,5 +253,4 @@ .init = linux_spi_init, .map_flash_region = fallback_map, .unmap_flash_region = fallback_unmap, - .delay = internal_delay, }; diff --git a/mediatek_i2c_spi.c b/mediatek_i2c_spi.c index 39a9cea..727f933 100644 --- a/mediatek_i2c_spi.c +++ b/mediatek_i2c_spi.c @@ -544,5 +544,4 @@ .init = mediatek_init, .map_flash_region = fallback_map, .unmap_flash_region = fallback_unmap, - .delay = internal_delay, }; diff --git a/mstarddc_spi.c b/mstarddc_spi.c index ee5779c..fab002f 100644 --- a/mstarddc_spi.c +++ b/mstarddc_spi.c @@ -256,5 +256,4 @@ .init = mstarddc_spi_init, .map_flash_region = fallback_map, .unmap_flash_region = fallback_unmap, - .delay = internal_delay, }; diff --git a/ni845x_spi.c b/ni845x_spi.c index 3d74fd9..b5cfc06 100644 --- a/ni845x_spi.c +++ b/ni845x_spi.c @@ -637,5 +637,4 @@ .init = ni845x_spi_init, .map_flash_region = fallback_map, .unmap_flash_region = fallback_unmap, - .delay = internal_delay, }; diff --git a/nic3com.c b/nic3com.c index 44710ed..8fafef9 100644 --- a/nic3com.c +++ b/nic3com.c @@ -170,5 +170,4 @@ .init = nic3com_init, .map_flash_region = fallback_map, .unmap_flash_region = fallback_unmap, - .delay = internal_delay, }; diff --git a/nicintel.c b/nicintel.c index 16cb5e4..fa91ff1 100644 --- a/nicintel.c +++ b/nicintel.c @@ -135,5 +135,4 @@ .init = nicintel_init, .map_flash_region = fallback_map, .unmap_flash_region = fallback_unmap, - .delay = internal_delay, }; diff --git a/nicintel_eeprom.c b/nicintel_eeprom.c index 4d3e7d5..01f9075 100644 --- a/nicintel_eeprom.c +++ b/nicintel_eeprom.c @@ -540,5 +540,4 @@ .init = nicintel_ee_init, .map_flash_region = fallback_map, .unmap_flash_region = fallback_unmap, - .delay = internal_delay, }; diff --git a/nicintel_spi.c b/nicintel_spi.c index 851b525..b99da53 100644 --- a/nicintel_spi.c +++ b/nicintel_spi.c @@ -339,5 +339,4 @@ .init = nicintel_spi_init, .map_flash_region = fallback_map, .unmap_flash_region = fallback_unmap, - .delay = internal_delay, }; diff --git a/nicnatsemi.c b/nicnatsemi.c index 779fb33..7236d4d 100644 --- a/nicnatsemi.c +++ b/nicnatsemi.c @@ -129,5 +129,4 @@ .init = nicnatsemi_init, .map_flash_region = fallback_map, .unmap_flash_region = fallback_unmap, - .delay = internal_delay, }; diff --git a/nicrealtek.c b/nicrealtek.c index 7bf1ac9..c96f998 100644 --- a/nicrealtek.c +++ b/nicrealtek.c @@ -148,5 +148,4 @@ .init = nicrealtek_init, .map_flash_region = fallback_map, .unmap_flash_region = fallback_unmap, - .delay = internal_delay, }; diff --git a/ogp_spi.c b/ogp_spi.c index 94915a3..52b1d4e 100644 --- a/ogp_spi.c +++ b/ogp_spi.c @@ -180,5 +180,4 @@ .init = ogp_spi_init, .map_flash_region = fallback_map, .unmap_flash_region = fallback_unmap, - .delay = internal_delay, }; diff --git a/parade_lspcon.c b/parade_lspcon.c index 761e46b..72f7600 100644 --- a/parade_lspcon.c +++ b/parade_lspcon.c @@ -509,5 +509,4 @@ .init = parade_lspcon_init, .map_flash_region = fallback_map, .unmap_flash_region = fallback_unmap, - .delay = internal_delay, }; diff --git a/pickit2_spi.c b/pickit2_spi.c index b838234..f550b4f 100644 --- a/pickit2_spi.c +++ b/pickit2_spi.c @@ -513,5 +513,4 @@ .init = pickit2_spi_init, .map_flash_region = fallback_map, .unmap_flash_region = fallback_unmap, - .delay = internal_delay, }; diff --git a/pony_spi.c b/pony_spi.c index 04c3236..05d7cc6 100644 --- a/pony_spi.c +++ b/pony_spi.c @@ -273,5 +273,4 @@ .init = pony_spi_init, .map_flash_region = fallback_map, .unmap_flash_region = fallback_unmap, - .delay = internal_delay, }; diff --git a/raiden_debug_spi.c b/raiden_debug_spi.c index 161471c..1c8b3b6 100644 --- a/raiden_debug_spi.c +++ b/raiden_debug_spi.c @@ -1650,5 +1650,4 @@ .init = raiden_debug_spi_init, .map_flash_region = fallback_map, .unmap_flash_region = fallback_unmap, - .delay = internal_delay, }; diff --git a/rayer_spi.c b/rayer_spi.c index 3867cfc..cd7a066 100644 --- a/rayer_spi.c +++ b/rayer_spi.c @@ -331,5 +331,4 @@ .init = rayer_spi_init, .map_flash_region = fallback_map, .unmap_flash_region = fallback_unmap, - .delay = internal_delay, }; diff --git a/realtek_mst_i2c_spi.c b/realtek_mst_i2c_spi.c index 74458c8..9637eca 100644 --- a/realtek_mst_i2c_spi.c +++ b/realtek_mst_i2c_spi.c @@ -546,5 +546,4 @@ .init = realtek_mst_i2c_spi_init, .map_flash_region = fallback_map, .unmap_flash_region = fallback_unmap, - .delay = internal_delay, }; diff --git a/satamv.c b/satamv.c index f886076..c3831d1 100644 --- a/satamv.c +++ b/satamv.c @@ -213,5 +213,4 @@ .init = satamv_init, .map_flash_region = fallback_map, .unmap_flash_region = fallback_unmap, - .delay = internal_delay, }; diff --git a/satasii.c b/satasii.c index 44b7331..0f3311f 100644 --- a/satasii.c +++ b/satasii.c @@ -155,5 +155,4 @@ .init = satasii_init, .map_flash_region = fallback_map, .unmap_flash_region = fallback_unmap, - .delay = internal_delay, }; diff --git a/stlinkv3_spi.c b/stlinkv3_spi.c index 38fe9f9..dcbed6d 100644 --- a/stlinkv3_spi.c +++ b/stlinkv3_spi.c @@ -558,5 +558,4 @@ .init = stlinkv3_spi_init, .map_flash_region = fallback_map, .unmap_flash_region = fallback_unmap, - .delay = internal_delay, }; diff --git a/usbblaster_spi.c b/usbblaster_spi.c index 2880a3c..c5914c4 100644 --- a/usbblaster_spi.c +++ b/usbblaster_spi.c @@ -234,5 +234,4 @@ .init = usbblaster_spi_init, .map_flash_region = fallback_map, .unmap_flash_region = fallback_unmap, - .delay = internal_delay, }; -- To view, visit https://review.coreboot.org/c/flashrom/+/67391 To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: flashrom Gerrit-Branch: master Gerrit-Change-Id: I17460bc2c0aebcbb48c8dfa052b260991525cc49 Gerrit-Change-Number: 67391 Gerrit-PatchSet: 1 Gerrit-Owner: Edward O'Callaghan <quasisec(a)chromium.org> Gerrit-MessageType: newchange

1 0

[M] Change in flashrom[master]: pony_spi.c: Retype appropiate variables with bool
by Felix Singer (Code Review) 07 Sep '22

07 Sep '22

Attention is currently required from: Felix Singer. Hello build bot (Jenkins), Edward O'Callaghan, Anastasia Klimchuk, I'd like you to reexamine a change. Please visit https://review.coreboot.org/c/flashrom/+/66875 to look at the new patch set (#14). Change subject: pony_spi.c: Retype appropiate variables with bool ...................................................................... pony_spi.c: Retype appropiate variables with bool Use the bool type instead of an integer for appropiate variables and attributes, since this represents their purpose much better. Signed-off-by: Felix Singer <felixsinger(a)posteo.net> Change-Id: Iecd98c391a74794647caeeb2715707ccd681463c --- M pony_spi.c 1 file changed, 42 insertions(+), 28 deletions(-) git pull ssh://review.coreboot.org:29418/flashrom refs/changes/75/66875/14 -- To view, visit https://review.coreboot.org/c/flashrom/+/66875 To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: flashrom Gerrit-Branch: master Gerrit-Change-Id: Iecd98c391a74794647caeeb2715707ccd681463c Gerrit-Change-Number: 66875 Gerrit-PatchSet: 14 Gerrit-Owner: Felix Singer <felixsinger(a)posteo.net> Gerrit-Reviewer: Anastasia Klimchuk <aklm(a)chromium.org> Gerrit-Reviewer: Edward O'Callaghan <quasisec(a)chromium.org> Gerrit-Reviewer: build bot (Jenkins) <no-reply(a)coreboot.org> Gerrit-Attention: Felix Singer <felixsinger(a)posteo.net> Gerrit-MessageType: newpatchset

1 0

[S] Change in flashrom[master]: internal.c: Retype appropiate variables with bool
by Felix Singer (Code Review) 07 Sep '22

07 Sep '22

Attention is currently required from: Felix Singer. Hello build bot (Jenkins), Thomas Heijligen, Edward O'Callaghan, Anastasia Klimchuk, I'd like you to reexamine a change. Please visit https://review.coreboot.org/c/flashrom/+/66870 to look at the new patch set (#12). Change subject: internal.c: Retype appropiate variables with bool ...................................................................... internal.c: Retype appropiate variables with bool Use the bool type instead of an integer for the variables `force_laptop`, `not_a_laptop`, `force_boardenable` and `force_boardmismatch` since this represents their purpose much better. Signed-off-by: Felix Singer <felixsinger(a)posteo.net> Change-Id: I159d789112d7a778744b59b45133df3928b8445e --- M include/programmer.h M internal.c 2 files changed, 30 insertions(+), 14 deletions(-) git pull ssh://review.coreboot.org:29418/flashrom refs/changes/70/66870/12 -- To view, visit https://review.coreboot.org/c/flashrom/+/66870 To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: flashrom Gerrit-Branch: master Gerrit-Change-Id: I159d789112d7a778744b59b45133df3928b8445e Gerrit-Change-Number: 66870 Gerrit-PatchSet: 12 Gerrit-Owner: Felix Singer <felixsinger(a)posteo.net> Gerrit-Reviewer: Anastasia Klimchuk <aklm(a)chromium.org> Gerrit-Reviewer: Edward O'Callaghan <quasisec(a)chromium.org> 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-MessageType: newpatchset

1 0

[S] Change in flashrom[master]: chipset_enable.c: plumb programmer_cfg into sb600 and ich init
by Anastasia Klimchuk (Code Review) 07 Sep '22

07 Sep '22

Anastasia Klimchuk has submitted this change. ( https://review.coreboot.org/c/flashrom/+/66674 ) Change subject: chipset_enable.c: plumb programmer_cfg into sb600 and ich init ...................................................................... chipset_enable.c: plumb programmer_cfg into sb600 and ich init Change-Id: Ic25014cbb983bda6e949bc62e30f2cca51f57a4c Signed-off-by: Edward O'Callaghan <quasisec(a)google.com> Reviewed-on: https://review.coreboot.org/c/flashrom/+/66674 Tested-by: build bot (Jenkins) <no-reply(a)coreboot.org> Reviewed-by: Anastasia Klimchuk <aklm(a)chromium.org> Reviewed-by: Felix Singer <felixsinger(a)posteo.net> --- M chipset_enable.c 1 file changed, 19 insertions(+), 5 deletions(-) Approvals: build bot (Jenkins): Verified Felix Singer: Looks good to me, approved Anastasia Klimchuk: Looks good to me, approved diff --git a/chipset_enable.c b/chipset_enable.c index d8aa53d..e205a83 100644 --- a/chipset_enable.c +++ b/chipset_enable.c @@ -428,7 +428,7 @@ break; } - char *idsel = extract_programmer_param_str(NULL, "fwh_idsel"); /* TODO(quasisec): pass prog_param */ + char *idsel = extract_programmer_param_str(cfg, "fwh_idsel"); if (idsel && strlen(idsel)) { if (!implemented) { msg_perr("Error: fwh_idsel= specified, but (yet) unsupported on this chipset.\n"); @@ -816,7 +816,7 @@ void *spibar = rcrb + spibar_offset; /* This adds BUS_SPI */ - int ret_spi = ich_init_spi(NULL, spibar, ich_generation); /* TODO(quasisec): pass prog_param */ + int ret_spi = ich_init_spi(cfg, spibar, ich_generation); if (ret_spi == ERROR_FATAL) return ret_spi; @@ -960,7 +960,7 @@ msg_pdbg("SPIBAR = 0x%0*" PRIxPTR " (phys = 0x%08x)\n", PRIxPTR_WIDTH, (uintptr_t)spibar, phys_spibar); /* This adds BUS_SPI */ - const int ret_spi = ich_init_spi(NULL, spibar, pch_generation); /* TODO(quasisec): pass prog_param */ + const int ret_spi = ich_init_spi(cfg, spibar, pch_generation); if (ret_spi != ERROR_FATAL) { if (ret_bc || ret_spi) ret = ERROR_NONFATAL; @@ -1077,7 +1077,7 @@ */ enable_flash_ich_bios_cntl_memmapped(ich_generation, spibar + 0xFC); - int ret_spi = ich_init_spi(NULL, spibar, ich_generation); /* TODO(quasisec): pass prog_param */ + int ret_spi = ich_init_spi(cfg, spibar, ich_generation); if (ret_spi == ERROR_FATAL) return ret_spi; @@ -1407,7 +1407,7 @@ internal_buses_supported &= BUS_LPC | BUS_FWH; - ret = sb600_probe_spi(NULL, dev); /* TODO(quasisec): pass prog_param */ + ret = sb600_probe_spi(cfg, dev); /* Read ROM strap override register. */ OUTB(0x8f, 0xcd6); -- To view, visit https://review.coreboot.org/c/flashrom/+/66674 To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: flashrom Gerrit-Branch: master Gerrit-Change-Id: Ic25014cbb983bda6e949bc62e30f2cca51f57a4c Gerrit-Change-Number: 66674 Gerrit-PatchSet: 11 Gerrit-Owner: Edward O'Callaghan <quasisec(a)chromium.org> Gerrit-Reviewer: Anastasia Klimchuk <aklm(a)chromium.org> Gerrit-Reviewer: Felix Singer <felixsinger(a)posteo.net> Gerrit-Reviewer: build bot (Jenkins) <no-reply(a)coreboot.org> Gerrit-MessageType: merged

1 0

[S] Change in flashrom[master]: tree: plumb programmer_cfg into chipset_flash_enable()
by Anastasia Klimchuk (Code Review) 07 Sep '22

07 Sep '22

Anastasia Klimchuk has submitted this change. ( https://review.coreboot.org/c/flashrom/+/66673 ) Change subject: tree: plumb programmer_cfg into chipset_flash_enable() ...................................................................... tree: plumb programmer_cfg into chipset_flash_enable() Change-Id: I963c674d212ce791ee155020fa97bcf26cefca0c Signed-off-by: Edward O'Callaghan <quasisec(a)google.com> Reviewed-on: https://review.coreboot.org/c/flashrom/+/66673 Tested-by: build bot (Jenkins) <no-reply(a)coreboot.org> Reviewed-by: Anastasia Klimchuk <aklm(a)chromium.org> Reviewed-by: Felix Singer <felixsinger(a)posteo.net> --- M chipset_enable.c M include/programmer.h M internal.c 3 files changed, 18 insertions(+), 4 deletions(-) Approvals: build bot (Jenkins): Verified Felix Singer: Looks good to me, approved Anastasia Klimchuk: Looks good to me, approved diff --git a/chipset_enable.c b/chipset_enable.c index 64af483..d8aa53d 100644 --- a/chipset_enable.c +++ b/chipset_enable.c @@ -2182,7 +2182,7 @@ {0}, }; -int chipset_flash_enable(void) +int chipset_flash_enable(const struct programmer_cfg *cfg) { struct pci_dev *dev = NULL; int ret = -2; /* Nothing! */ @@ -2231,7 +2231,7 @@ continue; } msg_pinfo("Enabling flash write... "); - ret = chipset_enables[i].doit(NULL, dev, chipset_enables[i].device_name); + ret = chipset_enables[i].doit(cfg, dev, chipset_enables[i].device_name); if (ret == NOT_DONE_YET) { ret = -2; msg_pinfo("OK - searching further chips.\n"); diff --git a/include/programmer.h b/include/programmer.h index 2a4b118..5331a12 100644 --- a/include/programmer.h +++ b/include/programmer.h @@ -231,7 +231,7 @@ int board_flash_enable(const char *vendor, const char *model, const char *cb_vendor, const char *cb_model); /* chipset_enable.c */ -int chipset_flash_enable(void); +int chipset_flash_enable(const struct programmer_cfg *cfg); /* processor_enable.c */ int processor_flash_enable(void); diff --git a/internal.c b/internal.c index 18ac088..426730f 100644 --- a/internal.c +++ b/internal.c @@ -282,7 +282,7 @@ /* try to enable it. Failure IS an option, since not all motherboards * really need this to be done, etc., etc. */ - ret = chipset_flash_enable(); + ret = chipset_flash_enable(cfg); if (ret == -2) { msg_perr("WARNING: No chipset found. Flash detection " "will most likely fail.\n"); -- To view, visit https://review.coreboot.org/c/flashrom/+/66673 To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: flashrom Gerrit-Branch: master Gerrit-Change-Id: I963c674d212ce791ee155020fa97bcf26cefca0c Gerrit-Change-Number: 66673 Gerrit-PatchSet: 10 Gerrit-Owner: Edward O'Callaghan <quasisec(a)chromium.org> Gerrit-Reviewer: Anastasia Klimchuk <aklm(a)chromium.org> Gerrit-Reviewer: Felix Singer <felixsinger(a)posteo.net> Gerrit-Reviewer: build bot (Jenkins) <no-reply(a)coreboot.org> Gerrit-MessageType: merged

1 0

[S] Change in flashrom[master]: ichspi.c: Allow passing programmer_cfg directly
by Anastasia Klimchuk (Code Review) 07 Sep '22

07 Sep '22

Anastasia Klimchuk has submitted this change. ( https://review.coreboot.org/c/flashrom/+/66661 ) Change subject: ichspi.c: Allow passing programmer_cfg directly ...................................................................... ichspi.c: Allow passing programmer_cfg directly Modify the type signature of the programmer entry-point xxx_init() functions to allow for the consumption of the programmer parameterisation string data. Also plumb programmer_cfg though get_params. Change-Id: I480589bb50b47fdf5af259d068f49fedfce88ea5 Signed-off-by: Edward O'Callaghan <quasisec(a)google.com> Reviewed-on: https://review.coreboot.org/c/flashrom/+/66661 Tested-by: build bot (Jenkins) <no-reply(a)coreboot.org> Reviewed-by: Anastasia Klimchuk <aklm(a)chromium.org> Reviewed-by: Felix Singer <felixsinger(a)posteo.net> --- M chipset_enable.c M ichspi.c M include/programmer.h 3 files changed, 29 insertions(+), 10 deletions(-) Approvals: build bot (Jenkins): Verified Felix Singer: Looks good to me, approved Anastasia Klimchuk: Looks good to me, approved diff --git a/chipset_enable.c b/chipset_enable.c index 3d7c49f..64af483 100644 --- a/chipset_enable.c +++ b/chipset_enable.c @@ -816,7 +816,7 @@ void *spibar = rcrb + spibar_offset; /* This adds BUS_SPI */ - int ret_spi = ich_init_spi(spibar, ich_generation); + int ret_spi = ich_init_spi(NULL, spibar, ich_generation); /* TODO(quasisec): pass prog_param */ if (ret_spi == ERROR_FATAL) return ret_spi; @@ -960,7 +960,7 @@ msg_pdbg("SPIBAR = 0x%0*" PRIxPTR " (phys = 0x%08x)\n", PRIxPTR_WIDTH, (uintptr_t)spibar, phys_spibar); /* This adds BUS_SPI */ - const int ret_spi = ich_init_spi(spibar, pch_generation); + const int ret_spi = ich_init_spi(NULL, spibar, pch_generation); /* TODO(quasisec): pass prog_param */ if (ret_spi != ERROR_FATAL) { if (ret_bc || ret_spi) ret = ERROR_NONFATAL; @@ -1077,7 +1077,7 @@ */ enable_flash_ich_bios_cntl_memmapped(ich_generation, spibar + 0xFC); - int ret_spi = ich_init_spi(spibar, ich_generation); + int ret_spi = ich_init_spi(NULL, spibar, ich_generation); /* TODO(quasisec): pass prog_param */ if (ret_spi == ERROR_FATAL) return ret_spi; diff --git a/ichspi.c b/ichspi.c index 78c446f..855b7fb 100644 --- a/ichspi.c +++ b/ichspi.c @@ -1872,9 +1872,9 @@ ich_swseq }; -static int get_ich_spi_mode_param(enum ich_spi_mode *ich_spi_mode) +static int get_ich_spi_mode_param(const struct programmer_cfg *cfg, enum ich_spi_mode *ich_spi_mode) { - char *const arg = extract_programmer_param_str(NULL, "ich_spi_mode"); + char *const arg = extract_programmer_param_str(cfg, "ich_spi_mode"); if (!arg) { return 0; } else if (!strcmp(arg, "hwseq")) { @@ -1964,7 +1964,7 @@ } } -static int init_ich_default(void *spibar, enum ich_chipset ich_gen) +static int init_ich_default(const struct programmer_cfg *cfg, void *spibar, enum ich_chipset ich_gen) { unsigned int i; uint16_t tmp2; @@ -1977,7 +1977,7 @@ init_chipset_properties(&swseq_data, &g_hwseq_data, &num_freg, &num_pr, &reg_pr0, ich_gen); - int ret = get_ich_spi_mode_param(&ich_spi_mode); + int ret = get_ich_spi_mode_param(cfg, &ich_spi_mode); if (ret) return ret; @@ -2212,7 +2212,7 @@ return 0; } -int ich_init_spi(void *spibar, enum ich_chipset ich_gen) +int ich_init_spi(const struct programmer_cfg *cfg, void *spibar, enum ich_chipset ich_gen) { ich_generation = ich_gen; ich_spibar = spibar; @@ -2224,7 +2224,7 @@ return init_ich7_spi(spibar, ich_gen); case CHIPSET_ICH8: default: /* Future version might behave the same */ - return init_ich_default(spibar, ich_gen); + return init_ich_default(cfg, spibar, ich_gen); } } diff --git a/include/programmer.h b/include/programmer.h index 9aba60f..2a4b118 100644 --- a/include/programmer.h +++ b/include/programmer.h @@ -362,7 +362,7 @@ /* ichspi.c */ #if CONFIG_INTERNAL == 1 -int ich_init_spi(void *spibar, enum ich_chipset ich_generation); +int ich_init_spi(const struct programmer_cfg *cfg, void *spibar, enum ich_chipset ich_generation); int via_init_spi(uint32_t mmio_base); /* amd_imc.c */ -- To view, visit https://review.coreboot.org/c/flashrom/+/66661 To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: flashrom Gerrit-Branch: master Gerrit-Change-Id: I480589bb50b47fdf5af259d068f49fedfce88ea5 Gerrit-Change-Number: 66661 Gerrit-PatchSet: 9 Gerrit-Owner: Edward O'Callaghan <quasisec(a)chromium.org> Gerrit-Reviewer: Anastasia Klimchuk <aklm(a)chromium.org> Gerrit-Reviewer: Felix Singer <felixsinger(a)posteo.net> Gerrit-Reviewer: build bot (Jenkins) <no-reply(a)coreboot.org> Gerrit-MessageType: merged

1 0

2024

2023

2022

2021

2020

2019

2018

2017

flashrom-gerrit September 2022