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

54
tests/dummyflasher.c
View File

@ -42,6 +42,57 @@ void dummy_probe_lifecycle_test_success(void **state)
run_probe_lifecycle(state, &dummy_io, &programmer_dummy, "bus=spi,emulate=W25Q128FV", "W25Q128.V");
}
void dummy_probe_v2_one_match_for_W25Q128FV(void **state)
{
struct io_mock_fallback_open_state dummy_fallback_open_state = {
.noc = 0,
.paths = { NULL },
};
const struct io_mock dummy_io = {
.fallback_open_state = &dummy_fallback_open_state,
};
const char *expected_matched_names[1] = {"W25Q128.V"};
run_probe_v2_lifecycle(state, &dummy_io, &programmer_dummy, "bus=spi,emulate=W25Q128FV",
NULL, /* any chip name */
expected_matched_names, 1);
}
void dummy_probe_v2_six_matches_for_MX25L6436(void **state)
{
struct io_mock_fallback_open_state dummy_fallback_open_state = {
.noc = 0,
.paths = { NULL },
};
const struct io_mock dummy_io = {
.fallback_open_state = &dummy_fallback_open_state,
};
const char *expected_matched_names[6] = {"MX25L6405",
"MX25L6405D",
"MX25L6406E/MX25L6408E",
"MX25L6436E/MX25L6445E/MX25L6465E",
"MX25L6473E",
"MX25L6473F"};
run_probe_v2_lifecycle(state, &dummy_io, &programmer_dummy, "bus=spi,emulate=MX25L6436",
NULL, /* any chip name */
expected_matched_names, 6);
}
void dummy_probe_v2_no_matches_found(void **state)
{
struct io_mock_fallback_open_state dummy_fallback_open_state = {
.noc = 0,
.paths = { NULL },
};
const struct io_mock dummy_io = {
.fallback_open_state = &dummy_fallback_open_state,
};
run_probe_v2_lifecycle(state, &dummy_io, &programmer_dummy, "bus=spi,emulate=MX25L6436",
"NONEXISTENT", NULL /* no matched names */, 0);
}
void dummy_probe_variable_size_test_success(void **state)
{
struct io_mock_fallback_open_state dummy_fallback_open_state = {
@ -163,6 +214,9 @@ void dummy_freq_param_init(void **state)
#else
SKIP_TEST(dummy_basic_lifecycle_test_success)
SKIP_TEST(dummy_probe_lifecycle_test_success)
SKIP_TEST(dummy_probe_v2_one_match_for_W25Q128FV)
SKIP_TEST(dummy_probe_v2_six_matches_for_MX25L6436)
SKIP_TEST(dummy_probe_v2_no_matches_found)
SKIP_TEST(dummy_probe_variable_size_test_success)
SKIP_TEST(dummy_init_fails_unhandled_param_test_success)
SKIP_TEST(dummy_init_success_invalid_param_test_success)

64
tests/lifecycle.c
View File

@ -17,22 +17,61 @@
static void probe_chip(const struct programmer_entry *prog,
struct flashrom_programmer *flashprog,
const char *const chip_name)
const char *const chip_name,
const char **expected_matched_names, /* unused in probe v1 */
unsigned int expected_matched_count /* unused in probe v1 */)
{
struct flashrom_flashctx *flashctx;
printf("Testing flashrom_flash_probe for programmer=%s, chip=%s ... \n", prog->name, chip_name);
assert_int_equal(0, flashrom_flash_probe(&flashctx, flashprog, chip_name));
if (chip_name)
assert_int_equal(0, strcmp(chip_name, flashctx->chip->name));
printf("... flashrom_flash_probe for programmer=%s successful\n", prog->name);
flashrom_flash_release(flashctx); /* cleanup */
}
static void probe_chip_v2(const struct programmer_entry *prog,
struct flashrom_programmer *flashprog,
const char *const chip_name,
const char **expected_matched_names,
unsigned int expected_matched_count)
{
struct flashrom_flashctx flashctx = { 0 };
const char **all_matched_names = NULL;
printf("Testing flashrom_flash_probe_v2 for programmer=%s, chip=%s ... \n", prog->name, chip_name);
assert_int_equal(expected_matched_count, flashrom_flash_probe_v2(&flashctx, &all_matched_names,
flashprog, chip_name));
for (unsigned int i = 0; i < expected_matched_count; i++)
assert_int_equal(0, strcmp(expected_matched_names[i], all_matched_names[i]));
assert_null(all_matched_names[expected_matched_count]);
if (chip_name && expected_matched_count > 0)
assert_int_equal(0, strcmp(chip_name, flashctx.chip->name));
printf("... flashrom_flash_probe_v2 for programmer=%s successful\n", prog->name);
/* cleanup */
flashrom_data_free(all_matched_names);
flashrom_layout_release(flashctx.default_layout);
free(flashctx.chip);
}
static void run_lifecycle(void **state, const struct io_mock *io, const struct programmer_entry *prog,
const char *param, const char *const chip_name,
const char **expected_matched_names,
unsigned int expected_matched_count,
void (*action)(const struct programmer_entry *prog,
struct flashrom_programmer *flashprog,
const char *const chip_name))
const char *const chip_name,
const char **expected_matched_names,
unsigned int expected_matched_count))
{
(void) state; /* unused */
@ -45,7 +84,7 @@ static void run_lifecycle(void **state, const struct io_mock *io, const struct p
printf("... flashrom_programmer_init for programmer=%s successful\n", prog->name);
if (action)
action(prog, flashprog, chip_name);
action(prog, flashprog, chip_name, expected_matched_names, expected_matched_count);
printf("Testing flashrom_programmer_shutdown for programmer=%s ...\n", prog->name);
assert_int_equal(0, flashrom_programmer_shutdown(flashprog));
@ -59,7 +98,9 @@ void run_basic_lifecycle(void **state, const struct io_mock *io,
{
/* Basic lifecycle only does init and shutdown,
* so neither chip name nor action is needed. */
run_lifecycle(state, io, prog, param, NULL /* chip_name */, NULL /* action */);
run_lifecycle(state, io, prog, param, NULL /* chip_name */,
NULL /* expected_matched_names, */, 0 /* expected_matched_count, */,
NULL /* action */);
}
void run_probe_lifecycle(void **state, const struct io_mock *io,
@ -67,7 +108,20 @@ void run_probe_lifecycle(void **state, const struct io_mock *io,
{
/* Each probe lifecycle should run independently, without cache. */
clear_spi_id_cache();
run_lifecycle(state, io, prog, param, chip_name, &probe_chip);
run_lifecycle(state, io, prog, param, chip_name,
NULL /* expected_matched_names, */, 0 /* expected_matched_count, */,
&probe_chip);
}
void run_probe_v2_lifecycle(void **state, const struct io_mock *io,
const struct programmer_entry *prog, const char *param,
const char *const chip_name,
const char **expected_matched_names, unsigned int expected_matched_count)
{
/* Each probe lifecycle should run independently, without cache. */
clear_spi_id_cache();
run_lifecycle(state, io, prog, param, chip_name,
expected_matched_names, expected_matched_count, &probe_chip_v2);
}
void run_init_error_path(void **state, const struct io_mock *io, const struct programmer_entry *prog,

5
tests/lifecycle.h
View File

@ -34,6 +34,11 @@ void run_basic_lifecycle(void **state, const struct io_mock *io,
void run_probe_lifecycle(void **state, const struct io_mock *io,
const struct programmer_entry *prog, const char *param, const char *const chip_name);
void run_probe_v2_lifecycle(void **state, const struct io_mock *io,
const struct programmer_entry *prog, const char *param,
const char *const chip_name,
const char **expected_matched_names, unsigned int expected_matched_count);
void run_init_error_path(void **state, const struct io_mock *io,
const struct programmer_entry *prog, const char *param, const int error_code);
#endif /* __LIFECYCLE_H__ */

3
tests/tests.c
View File

@ -504,6 +504,9 @@ int main(int argc, char *argv[])
const struct CMUnitTest lifecycle_tests[] = {
cmocka_unit_test(dummy_basic_lifecycle_test_success),
cmocka_unit_test(dummy_probe_lifecycle_test_success),
cmocka_unit_test(dummy_probe_v2_one_match_for_W25Q128FV),
cmocka_unit_test(dummy_probe_v2_six_matches_for_MX25L6436),
cmocka_unit_test(dummy_probe_v2_no_matches_found),
cmocka_unit_test(dummy_probe_variable_size_test_success),
cmocka_unit_test(dummy_init_fails_unhandled_param_test_success),
cmocka_unit_test(dummy_init_success_invalid_param_test_success),

3
tests/tests.h
View File

@ -53,6 +53,9 @@ void probe_spi_st95_test_success(void **state); /* spi95.c */
/* lifecycle.c */
void dummy_basic_lifecycle_test_success(void **state);
void dummy_probe_lifecycle_test_success(void **state);
void dummy_probe_v2_one_match_for_W25Q128FV(void **state);
void dummy_probe_v2_six_matches_for_MX25L6436(void **state);
void dummy_probe_v2_no_matches_found(void **state);
void dummy_probe_variable_size_test_success(void **state);
void dummy_init_fails_unhandled_param_test_success(void **state);
void dummy_init_success_invalid_param_test_success(void **state);