openwrt/flashrom
1
0
Fork 0
mirror of https://review.coreboot.org/flashrom.git synced 2025-07-03 06:53:18 +02:00
Code Issues Releases Wiki Activity

libflashrom: Add probing v2 which can find all matching chips

Browse Source 
Probing v2 can (if requested) go through all flashchips and find
all the matching chip definitions. This is the way cli behaves,
so cli becomes a client of probing v2.

Previously cli and libflashrom had different probing logic, and
different code in different source files.

This patch also adds tests for probing v2.

Testing from the cli:
./flashrom -p dummy:emulate=W25Q128FV -r dump.rom
./flashrom -p dummy:emulate=MX25L6436 -r dump.rom
./flashrom -p dummy:emulate=MX25L6436 -c "MX25L6473E" -r dump.rom
./flashrom -p dummy:emulate=SST25VF032B -E
./flashrom -p dummy:emulate=S25FL128L -r dump.rom
./flashrom -p dummy:emulate=INVALID -r dump.rom
./flashrom -p dummy:emulate=MX25L6436 -c "NONEXISTENT" -r dump.rom

Change-Id: Idfcf377a8071e22028ba98515f08495ed2a6e9f0
Signed-off-by: Anastasia Klimchuk <aklm@flashrom.org>
Reviewed-on: https://review.coreboot.org/c/flashrom/+/87341
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Reviewed-by: Peter Marheine <pmarheine@chromium.org>
This commit is contained in:
Anastasia Klimchuk
2025-04-16 22:43:06 +10:00
parent b1f2cb7c1a
commit 18303f193a
9 changed files with 235 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

38
cli_classic.c
View File

@ -1050,9 +1050,10 @@ int main(int argc, char *argv[])
struct flashctx flashes[8] = {{0}};
struct flashctx *fill_flash;
char *tempstr = NULL;
int startchip = -1, chipcount = 0;
int i, j;
int ret = 0;
int all_matched_count = 0;
const char **all_matched_names = NULL;
struct cli_options options = { 0 };
static const char optstring[] = "r::Rw::v::nNVEfc:l:i:p:Lzho:x";
@ -1209,26 +1210,26 @@ int main(int argc, char *argv[])
msg_pdbg("The following protocols are supported: %s.\n", tempstr ? tempstr : "?");
free(tempstr);
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, options.chip_to_probe);
if (startchip == -1)
break;
chipcount++;
startchip++;
}
all_matched_count = flashrom_flash_probe_v2(&flashes[0], &all_matched_names,
NULL, options.chip_to_probe);
if (all_matched_count == -1) {
/* -1 is the ret code which means "something went wrong".
* Multiple match and no match are different ret codes.
* More details about the error were printed during actual probing. */
msg_cerr("Error: probing failed.\n");
ret = 1;
goto out_shutdown;
}
if (chipcount > 1) {
if (all_matched_count > 1) {
msg_cinfo("Multiple flash chip definitions match the detected chip(s): \"%s\"",
flashes[0].chip->name);
for (i = 1; i < chipcount; i++)
msg_cinfo(", \"%s\"", flashes[i].chip->name);
for (int ind = 1; ind < all_matched_count; ind++)
msg_cinfo(", \"%s\"", all_matched_names[ind]);
msg_cinfo("\nPlease specify which chip definition to use with the -c <chipname> option.\n");
ret = 1;
goto out_shutdown;
} else if (!chipcount) {
} else if (!all_matched_count) {
msg_cinfo("No EEPROM/flash device found.\n");
if (!options.force || !options.chip_to_probe) {
msg_cinfo("Note: flashrom can never write if the flash chip isn't found "
@ -1253,6 +1254,8 @@ int main(int argc, char *argv[])
if (compatible_masters > 1)
msg_cinfo("More than one compatible controller found for the requested flash "
"chip, using the first one.\n");
int startchip = -1;
for (j = 0; j < registered_master_count; j++) {
mst = &registered_masters[j];
startchip = probe_flash(mst, 0, &flashes[0], 1, options.chip_to_probe);
@ -1535,10 +1538,11 @@ out_release:
out_shutdown:
flashrom_programmer_shutdown(NULL);
out:
for (i = 0; i < chipcount; i++) {
flashrom_layout_release(flashes[i].default_layout);
free(flashes[i].chip);
for (int ind = 0; ind < all_matched_count; ind++) {
flashrom_layout_release(flashes[ind].default_layout);
free(flashes[ind].chip);
}
flashrom_data_free(all_matched_names);
free_options(&options);
ret |= close_logfile();