September 2022 - flashrom-gerrit

[S] Change in flashrom[master]: spi.c: Add erasefn and opcodes for AT45 and S25F
by Aarya (Code Review) 06 Sep '22

06 Sep '22

Attention is currently required from: Aarya. Hello build bot (Jenkins), I'd like you to reexamine a change. Please visit https://review.coreboot.org/c/flashrom/+/67354 to look at the new patch set (#2). Change subject: spi.c: Add erasefn and opcodes for AT45 and S25F ...................................................................... spi.c: Add erasefn and opcodes for AT45 and S25F Add opcode and erasefn for AT45 and S25F to the lookup list. Change-Id: Ief25932120f940dea0ffe161a79219deecb2e8ab Signed-off-by: Aarya Chaumal <aarya.chaumal(a)gmail.com> --- M spi.c 1 file changed, 23 insertions(+), 0 deletions(-) git pull ssh://review.coreboot.org:29418/flashrom refs/changes/54/67354/2 -- To view, visit https://review.coreboot.org/c/flashrom/+/67354 To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: flashrom Gerrit-Branch: master Gerrit-Change-Id: Ief25932120f940dea0ffe161a79219deecb2e8ab Gerrit-Change-Number: 67354 Gerrit-PatchSet: 2 Gerrit-Owner: Aarya <aarya.chaumal(a)gmail.com> Gerrit-Reviewer: build bot (Jenkins) <no-reply(a)coreboot.org> Gerrit-CC: Thomas Heijligen <src(a)posteo.de> Gerrit-Attention: Aarya <aarya.chaumal(a)gmail.com> Gerrit-MessageType: newpatchset

1 0

[L] Change in flashrom[master]: flashrom.c: Add wrapper function to use the erase algorithm
by Aarya (Code Review) 06 Sep '22

06 Sep '22

Attention is currently required from: Nico Huber, Paul Menzel. Hello build bot (Jenkins), Simon Buhrow, Thomas Heijligen, I'd like you to reexamine a change. Please visit https://review.coreboot.org/c/flashrom/+/66104 to look at the new patch set (#43). Change subject: flashrom.c: Add wrapper function to use the erase algorithm ...................................................................... flashrom.c: Add wrapper function to use the erase algorithm Add a function to call the erase algorithm. Change-Id: I29e3f2bd796759794184b125741a5abaac6f3ce8 Signed-off-by: Aarya Chaumal <aarya.chaumal(a)gmail.com> --- M flashrom.c 1 file changed, 122 insertions(+), 348 deletions(-) git pull ssh://review.coreboot.org:29418/flashrom refs/changes/04/66104/43 -- To view, visit https://review.coreboot.org/c/flashrom/+/66104 To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: flashrom Gerrit-Branch: master Gerrit-Change-Id: I29e3f2bd796759794184b125741a5abaac6f3ce8 Gerrit-Change-Number: 66104 Gerrit-PatchSet: 43 Gerrit-Owner: Aarya <aarya.chaumal(a)gmail.com> Gerrit-Reviewer: Simon Buhrow Gerrit-Reviewer: Thomas Heijligen <src(a)posteo.de> Gerrit-Reviewer: build bot (Jenkins) <no-reply(a)coreboot.org> Gerrit-CC: Nico Huber <nico.h(a)gmx.de> Gerrit-CC: Paul Menzel <paulepanter(a)mailbox.org> Gerrit-Attention: Nico Huber <nico.h(a)gmx.de> Gerrit-Attention: Paul Menzel <paulepanter(a)mailbox.org> Gerrit-MessageType: newpatchset

1 0

[M] Change in flashrom[master]: flashrom.c:Add function to get a flattened view of the chip erase blocks
by Aarya (Code Review) 06 Sep '22

06 Sep '22

Attention is currently required from: Simon Buhrow, Nico Huber, Thomas Heijligen. Aarya has posted comments on this change. ( https://review.coreboot.org/c/flashrom/+/65879 ) Change subject: flashrom.c:Add function to get a flattened view of the chip erase blocks ...................................................................... Patch Set 24: (1 comment) File flashrom.c: https://review.coreboot.org/c/flashrom/+/65879/comment/4a767302_de75ccd6 PS24, Line 1088: for (i = 0; i < NUM_ERASEFUNCTIONS; i++) { > Suggestion: […] But it will break at the first non-usable eraser, which could be the black listed one. -- To view, visit https://review.coreboot.org/c/flashrom/+/65879 To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: flashrom Gerrit-Branch: master Gerrit-Change-Id: Iafe78de00daa55f7114bd4ce09465dd88074ece4 Gerrit-Change-Number: 65879 Gerrit-PatchSet: 24 Gerrit-Owner: Aarya <aarya.chaumal(a)gmail.com> Gerrit-Reviewer: Simon Buhrow Gerrit-Reviewer: Thomas Heijligen <src(a)posteo.de> Gerrit-Reviewer: build bot (Jenkins) <no-reply(a)coreboot.org> Gerrit-CC: Nico Huber <nico.h(a)gmx.de> Gerrit-Attention: Simon Buhrow Gerrit-Attention: Nico Huber <nico.h(a)gmx.de> Gerrit-Attention: Thomas Heijligen <src(a)posteo.de> Gerrit-Comment-Date: Tue, 06 Sep 2022 07:16:47 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: Thomas Heijligen <src(a)posteo.de> Gerrit-MessageType: comment

1 0

[S] Change in flashrom[master]: flashrom.c: Plumb 'all_skipped' global state into func param
by Aarya (Code Review) 06 Sep '22

06 Sep '22

Attention is currently required from: Felix Singer, Thomas Heijligen, Edward O'Callaghan, Angel Pons. Aarya has posted comments on this change. ( https://review.coreboot.org/c/flashrom/+/67093 ) Change subject: flashrom.c: Plumb 'all_skipped' global state into func param ...................................................................... Patch Set 5: (1 comment) File flashrom.c: https://review.coreboot.org/c/flashrom/+/67093/comment/6b356711_a6ec6186 PS5, Line 1053: walk_eraseblocks > When you scroll to the top, there is this list of changes and on the right side there is this Downlo […] I created a new branch and cherry picked the patch on it, made changes committed them. But when I push the branch it shows "You need 'Create' rights to create new references." -- To view, visit https://review.coreboot.org/c/flashrom/+/67093 To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: flashrom Gerrit-Branch: master Gerrit-Change-Id: I2346c869c47b48604360b0facf9313aae086c8dd Gerrit-Change-Number: 67093 Gerrit-PatchSet: 5 Gerrit-Owner: Edward O'Callaghan <quasisec(a)chromium.org> Gerrit-Reviewer: Aarya <aarya.chaumal(a)gmail.com> Gerrit-Reviewer: Anastasia Klimchuk <aklm(a)chromium.org> Gerrit-Reviewer: Angel Pons <th3fanbus(a)gmail.com> Gerrit-Reviewer: Felix Singer <felixsinger(a)posteo.net> 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: Felix Singer <felixsinger(a)posteo.net> Gerrit-Attention: Thomas Heijligen <src(a)posteo.de> Gerrit-Attention: Edward O'Callaghan <quasisec(a)chromium.org> Gerrit-Attention: Angel Pons <th3fanbus(a)gmail.com> Gerrit-Comment-Date: Tue, 06 Sep 2022 07:12:51 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: Felix Singer <felixsinger(a)posteo.net> Comment-In-Reply-To: Edward O'Callaghan <quasisec(a)chromium.org> Comment-In-Reply-To: Aarya <aarya.chaumal(a)gmail.com> Gerrit-MessageType: comment

1 0

[S] Change in flashrom[master]: attempt to fix programmer global usage
by Edward O'Callaghan (Code Review) 06 Sep '22

06 Sep '22

Edward O'Callaghan has uploaded this change for review. ( https://review.coreboot.org/c/flashrom/+/67364 ) Change subject: attempt to fix programmer global usage ...................................................................... attempt to fix programmer global usage The map_flash() control flow and life-time is very ill conceived, same with programmer_delay(). Change-Id: I9206ca8ce306b07d2a5da495c900adf6890b3dae Signed-off-by: Edward O'Callaghan <quasisec(a)google.com> --- M flashrom.c 1 file changed, 29 insertions(+), 15 deletions(-) git pull ssh://review.coreboot.org:29418/flashrom refs/changes/64/67364/1 diff --git a/flashrom.c b/flashrom.c index 479d442..e72fdf1 100644 --- a/flashrom.c +++ b/flashrom.c @@ -189,17 +189,18 @@ return ret; } -static void *programmer_map_flash_region(const char *descr, uintptr_t phys_addr, size_t len) +static void *programmer_map_flash_region(const struct programmer_entry *prog, + const char *descr, uintptr_t phys_addr, size_t len) { - void *ret = programmer->map_flash_region(descr, phys_addr, len); + void *ret = prog->map_flash_region(descr, phys_addr, len); msg_gspew("%s: mapping %s from 0x%0*" PRIxPTR " to 0x%0*" PRIxPTR "\n", __func__, descr, PRIxPTR_WIDTH, phys_addr, PRIxPTR_WIDTH, (uintptr_t) ret); return ret; } -static void programmer_unmap_flash_region(void *virt_addr, size_t len) +static void programmer_unmap_flash_region(const struct programmer_entry *prog, void *virt_addr, size_t len) { - programmer->unmap_flash_region(virt_addr, len); + prog->unmap_flash_region(virt_addr, len); msg_gspew("%s: unmapped 0x%0*" PRIxPTR "\n", __func__, PRIxPTR_WIDTH, (uintptr_t)virt_addr); } @@ -619,22 +620,22 @@ return limitexceeded; } -static void unmap_flash(struct flashctx *flash) +static void unmap_flash(const struct programmer_entry *prog, struct flashctx *flash) { if (flash->virtual_registers != (chipaddr)ERROR_PTR) { - programmer_unmap_flash_region((void *)flash->virtual_registers, flash->chip->total_size * 1024); + programmer_unmap_flash_region(prog, (void *)flash->virtual_registers, flash->chip->total_size * 1024); flash->physical_registers = 0; flash->virtual_registers = (chipaddr)ERROR_PTR; } if (flash->virtual_memory != (chipaddr)ERROR_PTR) { - programmer_unmap_flash_region((void *)flash->virtual_memory, flash->chip->total_size * 1024); + programmer_unmap_flash_region(prog, (void *)flash->virtual_memory, flash->chip->total_size * 1024); flash->physical_memory = 0; flash->virtual_memory = (chipaddr)ERROR_PTR; } } -static int map_flash(struct flashctx *flash) +static int map_flash(const struct programmer_entry *prog, struct flashctx *flash) { /* Init pointers to the fail-safe state to distinguish them later from legit values. */ flash->virtual_memory = (chipaddr)ERROR_PTR; @@ -648,7 +649,7 @@ const chipsize_t size = flash->chip->total_size * 1024; uintptr_t base = flashbase ? flashbase : (0xffffffff - size + 1); - void *addr = programmer_map_flash_region(flash->chip->name, base, size); + void *addr = programmer_map_flash_region(prog, flash->chip->name, base, size); if (addr == ERROR_PTR) { msg_perr("Could not map flash chip %s at 0x%0*" PRIxPTR ".\n", flash->chip->name, PRIxPTR_WIDTH, base); @@ -662,7 +663,7 @@ * Ignore these problems for now and always report success. */ if (flash->chip->feature_bits & FEATURE_REGISTERMAP) { base = 0xffffffff - size - 0x400000 + 1; - addr = programmer_map_flash_region("flash chip registers", base, size); + addr = programmer_map_flash_region(prog, "flash chip registers", base, size); if (addr == ERROR_PTR) { msg_pdbg2("Could not map flash chip registers %s at 0x%0*" PRIxPTR ".\n", flash->chip->name, PRIxPTR_WIDTH, base); @@ -739,7 +740,7 @@ *flash->chip = *chip; flash->mst = mst; - if (map_flash(flash) != 0) + if (map_flash(prog, flash) != 0) goto notfound; /* We handle a forced match like a real match, we just avoid probing. Note that probe_flash() @@ -789,7 +790,7 @@ break; /* Not the first flash chip detected on this bus, and it's just a generic match. Ignore it. */ notfound: - unmap_flash(flash); + unmap_flash(prog, flash); free(flash->chip); flash->chip = NULL; } @@ -823,7 +824,7 @@ flash->chip->printlock(flash); /* Get out of the way for later runs. */ - unmap_flash(flash); + unmap_flash(prog, flash); /* Return position of matching chip. */ return chip - flashchips; @@ -1538,7 +1539,7 @@ return 1; } - if (map_flash(flash) != 0) + if (map_flash(programmer, flash) != 0) // TODO(quasiesec): wire though prog return 1; /* Initialize chip_restore_fn_count before chip unlock calls. */ @@ -1581,7 +1582,7 @@ void finalize_flash_access(struct flashctx *const flash) { deregister_chip_restore(flash); - unmap_flash(flash); + unmap_flash(programmer, flash); // TODO(quasiesec): wire though prog } int flashrom_flash_erase(struct flashctx *const flashctx) -- To view, visit https://review.coreboot.org/c/flashrom/+/67364 To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: flashrom Gerrit-Branch: master Gerrit-Change-Id: I9206ca8ce306b07d2a5da495c900adf6890b3dae Gerrit-Change-Number: 67364 Gerrit-PatchSet: 1 Gerrit-Owner: Edward O'Callaghan <quasisec(a)chromium.org> Gerrit-MessageType: newchange

1 0

[S] Change in flashrom[master]: flashrom.c: Make {un}map_flash() static local [WIP]
by Edward O'Callaghan (Code Review) 06 Sep '22

06 Sep '22

Edward O'Callaghan has uploaded this change for review. ( https://review.coreboot.org/c/flashrom/+/67363 ) Change subject: flashrom.c: Make {un}map_flash() static local [WIP] ...................................................................... flashrom.c: Make {un}map_flash() static local [WIP] Change-Id: Ib45bfd294acf72bb0cae4ae6b9137029e7702697 Signed-off-by: Edward O'Callaghan <quasisec(a)google.com> --- M flashrom.c M include/flash.h M sb600spi.c 3 files changed, 13 insertions(+), 5 deletions(-) git pull ssh://review.coreboot.org:29418/flashrom refs/changes/63/67363/1 diff --git a/flashrom.c b/flashrom.c index acc8f52..479d442 100644 --- a/flashrom.c +++ b/flashrom.c @@ -619,7 +619,7 @@ return limitexceeded; } -void unmap_flash(struct flashctx *flash) +static void unmap_flash(struct flashctx *flash) { if (flash->virtual_registers != (chipaddr)ERROR_PTR) { programmer_unmap_flash_region((void *)flash->virtual_registers, flash->chip->total_size * 1024); @@ -634,7 +634,7 @@ } } -int map_flash(struct flashctx *flash) +static int map_flash(struct flashctx *flash) { /* Init pointers to the fail-safe state to distinguish them later from legit values. */ flash->virtual_memory = (chipaddr)ERROR_PTR; diff --git a/include/flash.h b/include/flash.h index d1656e9..a894cfe 100644 --- a/include/flash.h +++ b/include/flash.h @@ -409,8 +409,6 @@ extern const char flashrom_version[]; extern const char *chip_to_probe; char *flashbuses_to_text(enum chipbustype bustype); -int map_flash(struct flashctx *flash); -void unmap_flash(struct flashctx *flash); int read_memmapped(struct flashctx *flash, uint8_t *buf, unsigned int start, unsigned int len); int erase_flash(struct flashctx *flash); int probe_flash(const struct flashrom_programmer *const flashprog, struct registered_master *mst, int startchip, struct flashctx *fill_flash, int force); diff --git a/sb600spi.c b/sb600spi.c index f218ca6..a5ac545 100644 --- a/sb600spi.c +++ b/sb600spi.c @@ -575,7 +575,7 @@ { struct sb600spi_data * data = (struct sb600spi_data *)flash->mst->spi.data; if (!data->flash) { - map_flash(flash); + //map_flash(flash); data->flash = flash; /* keep a copy of flashctx for unmap() on tear-down. */ } mmio_readn((void *)(flash->virtual_memory + start), buf, len); -- To view, visit https://review.coreboot.org/c/flashrom/+/67363 To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: flashrom Gerrit-Branch: master Gerrit-Change-Id: Ib45bfd294acf72bb0cae4ae6b9137029e7702697 Gerrit-Change-Number: 67363 Gerrit-PatchSet: 1 Gerrit-Owner: Edward O'Callaghan <quasisec(a)chromium.org> Gerrit-MessageType: newchange

1 0

[S] Change in flashrom[master]: flashrom.c: Make programmer_{un}map_flash_region() static local
by Edward O'Callaghan (Code Review) 06 Sep '22

06 Sep '22

Edward O'Callaghan has uploaded this change for review. ( https://review.coreboot.org/c/flashrom/+/67362 ) Change subject: flashrom.c: Make programmer_{un}map_flash_region() static local ...................................................................... flashrom.c: Make programmer_{un}map_flash_region() static local Change-Id: I93def3f0fd787b39bc5940b47eca060eb8d6ccbf Signed-off-by: Edward O'Callaghan <quasisec(a)google.com> --- M flashrom.c M include/flash.h 2 files changed, 12 insertions(+), 4 deletions(-) git pull ssh://review.coreboot.org:29418/flashrom refs/changes/62/67362/1 diff --git a/flashrom.c b/flashrom.c index 9cff43a..acc8f52 100644 --- a/flashrom.c +++ b/flashrom.c @@ -189,7 +189,7 @@ return ret; } -void *programmer_map_flash_region(const char *descr, uintptr_t phys_addr, size_t len) +static void *programmer_map_flash_region(const char *descr, uintptr_t phys_addr, size_t len) { void *ret = programmer->map_flash_region(descr, phys_addr, len); msg_gspew("%s: mapping %s from 0x%0*" PRIxPTR " to 0x%0*" PRIxPTR "\n", @@ -197,7 +197,7 @@ return ret; } -void programmer_unmap_flash_region(void *virt_addr, size_t len) +static void programmer_unmap_flash_region(void *virt_addr, size_t len) { programmer->unmap_flash_region(virt_addr, len); msg_gspew("%s: unmapped 0x%0*" PRIxPTR "\n", __func__, PRIxPTR_WIDTH, (uintptr_t)virt_addr); diff --git a/include/flash.h b/include/flash.h index ba1fb17..d1656e9 100644 --- a/include/flash.h +++ b/include/flash.h @@ -55,8 +55,6 @@ #define PRIxPTR_WIDTH ((int)(sizeof(uintptr_t)*2)) 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); #define ARRAY_SIZE(a) (sizeof(a) / sizeof((a)[0])) -- To view, visit https://review.coreboot.org/c/flashrom/+/67362 To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: flashrom Gerrit-Branch: master Gerrit-Change-Id: I93def3f0fd787b39bc5940b47eca060eb8d6ccbf Gerrit-Change-Number: 67362 Gerrit-PatchSet: 1 Gerrit-Owner: Edward O'Callaghan <quasisec(a)chromium.org> Gerrit-MessageType: newchange

1 0

[S] Change in flashrom[master]: flashrom: Fix probe_flash()
by Edward O'Callaghan (Code Review) 06 Sep '22

06 Sep '22

Edward O'Callaghan has uploaded this change for review. ( https://review.coreboot.org/c/flashrom/+/67361 ) Change subject: flashrom: Fix probe_flash() ...................................................................... flashrom: Fix probe_flash() Change-Id: I99f54ae0e70ec8d089a9113a6d9e96bd79994418 Signed-off-by: Edward O'Callaghan <quasisec(a)google.com> --- M cli_classic.c M flashrom.c M include/flash.h M libflashrom.c 4 files changed, 23 insertions(+), 8 deletions(-) git pull ssh://review.coreboot.org:29418/flashrom refs/changes/61/67361/1 diff --git a/cli_classic.c b/cli_classic.c index bac31d1..bb324f9 100644 --- a/cli_classic.c +++ b/cli_classic.c @@ -931,10 +931,13 @@ msg_pdbg("The following protocols are supported: %s.\n", tempstr); free(tempstr); + /* TODO(quasisec): This cast works for the moment while types are isomorphic. */ + struct flashrom_programmer *flashprog = (struct flashrom_programmer *)prog; + for (j = 0; j < registered_master_count; j++) { startchip = 0; while (chipcount < (int)ARRAY_SIZE(flashes)) { - startchip = probe_flash(&registered_masters[j], startchip, &flashes[chipcount], 0); + startchip = probe_flash(flashprog, &registered_masters[j], startchip, &flashes[chipcount], 0); if (startchip == -1) break; chipcount++; @@ -977,7 +980,7 @@ "chip, using the first one.\n"); for (j = 0; j < registered_master_count; j++) { mst = &registered_masters[j]; - startchip = probe_flash(mst, 0, &flashes[0], 1); + startchip = probe_flash(flashprog, mst, 0, &flashes[0], 1); if (startchip != -1) break; } diff --git a/flashrom.c b/flashrom.c index 4706d89..9cff43a 100644 --- a/flashrom.c +++ b/flashrom.c @@ -707,11 +707,13 @@ return ret; } -int probe_flash(struct registered_master *mst, int startchip, struct flashctx *flash, int force) +int probe_flash(const struct flashrom_programmer *const flashprog, struct registered_master *mst, + int startchip, struct flashctx *flash, int force) { const struct flashchip *chip; enum chipbustype buses_common; char *tmp; + const struct programmer_entry *prog = (struct programmer_entry *)flashprog; for (chip = flashchips + startchip; chip && chip->name; chip++) { if (chip_to_probe && strcmp(chip->name, chip_to_probe) != 0) @@ -807,12 +809,12 @@ flash->chip->vendor, flash->chip->name, flash->chip->total_size, tmp); free(tmp); #if CONFIG_INTERNAL == 1 - if (programmer->map_flash_region == physmap) + if (prog->map_flash_region == physmap) msg_cinfo("mapped at physical address 0x%0*" PRIxPTR ".\n", PRIxPTR_WIDTH, flash->physical_memory); else #endif - msg_cinfo("on %s.\n", programmer->name); + msg_cinfo("on %s.\n", prog->name); /* Flash registers may more likely not be mapped if the chip was forced. * Lock info may be stored in registers, so avoid lock info printing. */ diff --git a/include/flash.h b/include/flash.h index 79aaa64..ba1fb17 100644 --- a/include/flash.h +++ b/include/flash.h @@ -415,7 +415,7 @@ void unmap_flash(struct flashctx *flash); int read_memmapped(struct flashctx *flash, uint8_t *buf, unsigned int start, unsigned int len); int erase_flash(struct flashctx *flash); -int probe_flash(struct registered_master *mst, int startchip, struct flashctx *fill_flash, int force); +int probe_flash(const struct flashrom_programmer *const flashprog, struct registered_master *mst, int startchip, struct flashctx *fill_flash, int force); int verify_range(struct flashctx *flash, const uint8_t *cmpbuf, unsigned int start, unsigned int len); void emergency_help_message(void); void print_version(void); diff --git a/libflashrom.c b/libflashrom.c index 2febf30..50da72e 100644 --- a/libflashrom.c +++ b/libflashrom.c @@ -244,10 +244,10 @@ for (i = 0; i < registered_master_count; ++i) { int flash_idx = -1; - if (!ret || (flash_idx = probe_flash(&registered_masters[i], 0, *flashctx, 0)) != -1) { + if (!ret || (flash_idx = probe_flash(flashprog, &registered_masters[i], 0, *flashctx, 0)) != -1) { ret = 0; /* We found one chip, now check that there is no second match. */ - if (probe_flash(&registered_masters[i], flash_idx + 1, &second_flashctx, 0) != -1) { + if (probe_flash(flashprog, &registered_masters[i], flash_idx + 1, &second_flashctx, 0) != -1) { flashrom_layout_release(second_flashctx.default_layout); free(second_flashctx.chip); ret = 3; -- To view, visit https://review.coreboot.org/c/flashrom/+/67361 To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: flashrom Gerrit-Branch: master Gerrit-Change-Id: I99f54ae0e70ec8d089a9113a6d9e96bd79994418 Gerrit-Change-Number: 67361 Gerrit-PatchSet: 1 Gerrit-Owner: Edward O'Callaghan <quasisec(a)chromium.org> Gerrit-MessageType: newchange

1 0

[S] Change in flashrom[master]: libflashrom: Fix flashrom_programmer_init()
by Edward O'Callaghan (Code Review) 06 Sep '22

06 Sep '22

Edward O'Callaghan has uploaded this change for review. ( https://review.coreboot.org/c/flashrom/+/67360 ) Change subject: libflashrom: Fix flashrom_programmer_init() ...................................................................... libflashrom: Fix flashrom_programmer_init() Change-Id: Ibd61333c0f74086186a0f2f1f2c9cf780364f9d6 Signed-off-by: Edward O'Callaghan <quasisec(a)google.com> --- M flashrom.c M libflashrom.c 2 files changed, 32 insertions(+), 8 deletions(-) git pull ssh://review.coreboot.org:29418/flashrom refs/changes/60/67360/1 diff --git a/flashrom.c b/flashrom.c index ba363b2..4706d89 100644 --- a/flashrom.c +++ b/flashrom.c @@ -146,8 +146,8 @@ programmer_may_write = 1; programmer_param = param; - msg_pdbg("Initializing %s programmer\n", programmer->name); - ret = programmer->init(); + msg_pdbg("Initializing %s programmer\n", prog->name); + ret = prog->init(); if (programmer_param && strlen(programmer_param)) { if (ret != 0) { /* It is quite possible that any unhandled programmer parameter would have been valid, diff --git a/libflashrom.c b/libflashrom.c index 3e28938..2febf30 100644 --- a/libflashrom.c +++ b/libflashrom.c @@ -29,6 +29,10 @@ #include "writeprotect.h" +struct flashrom_programmer { + struct programmer_entry prog; /* the programmer_entry must be the first field! */ +}; + /** Pointer to log callback function. */ static flashrom_log_callback *global_log_callback = NULL; @@ -193,18 +197,28 @@ int flashrom_programmer_init(struct flashrom_programmer **const flashprog, const char *const prog_name, const char *const prog_param) { - unsigned prog; + unsigned prog_idx; - for (prog = 0; prog < programmer_table_size; prog++) { - if (strcmp(prog_name, programmer_table[prog]->name) == 0) + for (prog_idx = 0; prog_idx < programmer_table_size; prog_idx++) { + if (strcmp(prog_name, programmer_table[prog_idx]->name) == 0) break; } - if (prog >= programmer_table_size) { - msg_ginfo("Error: Unknown programmer \"%s\". Valid choices are:\n", prog_name); + if (prog_idx >= programmer_table_size) { + msg_gerr("%s: Error: Unknown programmer \"%s\". Valid choices are:\n", __func__, prog_name); list_programmers_linebreak(0, 80, 0); return 1; } - return programmer_init(programmer_table[prog], prog_param); + + if (!flashprog) { + msg_gerr("%s: call site did not allocate a valid flashrom_programmer entry!\n", __func__); + return -2; /* no valid flashrom_programmer allocated. */ + } + + /* Take a mutable copy out of the table of available programmers. */ + struct programmer_entry *pentry = &((*flashprog)->prog); + memcpy(pentry, programmer_table[prog_idx], sizeof(struct programmer_entry)); + + return programmer_init(pentry, prog_param); } int flashrom_programmer_shutdown(struct flashrom_programmer *const flashprog) -- To view, visit https://review.coreboot.org/c/flashrom/+/67360 To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: flashrom Gerrit-Branch: master Gerrit-Change-Id: Ibd61333c0f74086186a0f2f1f2c9cf780364f9d6 Gerrit-Change-Number: 67360 Gerrit-PatchSet: 1 Gerrit-Owner: Edward O'Callaghan <quasisec(a)chromium.org> Gerrit-MessageType: newchange

1 0

[S] Change in flashrom[master]: flashrom.c: Plumb 'all_skipped' global state into func param
by Felix Singer (Code Review) 05 Sep '22

05 Sep '22

Attention is currently required from: Thomas Heijligen, Edward O'Callaghan, Angel Pons, Aarya. Felix Singer has posted comments on this change. ( https://review.coreboot.org/c/flashrom/+/67093 ) Change subject: flashrom.c: Plumb 'all_skipped' global state into func param ...................................................................... Patch Set 5: (1 comment) File flashrom.c: https://review.coreboot.org/c/flashrom/+/67093/comment/4510d60f_e929c054 PS5, Line 1053: walk_eraseblocks > How do I upload changes to this patch 😕 When you scroll to the top, there is this list of changes and on the right side there is this Download button. There you can pick a method to download this patch so that you can work on it locally. I suggest you use the branch method. -- To view, visit https://review.coreboot.org/c/flashrom/+/67093 To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: flashrom Gerrit-Branch: master Gerrit-Change-Id: I2346c869c47b48604360b0facf9313aae086c8dd Gerrit-Change-Number: 67093 Gerrit-PatchSet: 5 Gerrit-Owner: Edward O'Callaghan <quasisec(a)chromium.org> Gerrit-Reviewer: Aarya <aarya.chaumal(a)gmail.com> Gerrit-Reviewer: Anastasia Klimchuk <aklm(a)chromium.org> Gerrit-Reviewer: Angel Pons <th3fanbus(a)gmail.com> Gerrit-Reviewer: Felix Singer <felixsinger(a)posteo.net> 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: Angel Pons <th3fanbus(a)gmail.com> Gerrit-Attention: Aarya <aarya.chaumal(a)gmail.com> Gerrit-Comment-Date: Mon, 05 Sep 2022 23:33:49 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: Edward O'Callaghan <quasisec(a)chromium.org> Comment-In-Reply-To: Aarya <aarya.chaumal(a)gmail.com> Gerrit-MessageType: comment

1 0

2024

2023

2022

2021

2020

2019

2018

2017

flashrom-gerrit September 2022