May 2022 - flashrom-gerrit - mail.coreboot.org

Change in flashrom[master]: libflashrom: Return progress state to the library user
by Edward O'Callaghan (Code Review) 13 May '22

13 May '22

Attention is currently required from: Richard Hughes, Daniel Campello, Angel Pons, Anastasia Klimchuk, Patrick Rudolph. Edward O'Callaghan has posted comments on this change. ( https://review.coreboot.org/c/flashrom/+/49643 ) Change subject: libflashrom: Return progress state to the library user ...................................................................... Patch Set 17: Code-Review+2 -- To view, visit https://review.coreboot.org/c/flashrom/+/49643 To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: flashrom Gerrit-Branch: master Gerrit-Change-Id: I7197572bb7f19e3bdb2bde855d70a0f50fd3854c Gerrit-Change-Number: 49643 Gerrit-PatchSet: 17 Gerrit-Owner: Richard Hughes <richard(a)hughsie.com> Gerrit-Reviewer: Anastasia Klimchuk <aklm(a)chromium.org> Gerrit-Reviewer: Angel Pons <th3fanbus(a)gmail.com> Gerrit-Reviewer: Daniel Campello <campello(a)chromium.org> Gerrit-Reviewer: Edward O'Callaghan <quasisec(a)chromium.org> Gerrit-Reviewer: Patrick Rudolph <siro(a)das-labor.org> Gerrit-Reviewer: build bot (Jenkins) <no-reply(a)coreboot.org> Gerrit-CC: Paul Menzel <paulepanter(a)mailbox.org> Gerrit-CC: Peter Marheine <pmarheine(a)chromium.org> Gerrit-CC: Richard Hughes <hughsient(a)gmail.com> Gerrit-CC: Thomas Heijligen <src(a)posteo.de> Gerrit-Attention: Richard Hughes <richard(a)hughsie.com> Gerrit-Attention: Daniel Campello <campello(a)chromium.org> Gerrit-Attention: Angel Pons <th3fanbus(a)gmail.com> Gerrit-Attention: Anastasia Klimchuk <aklm(a)chromium.org> Gerrit-Attention: Patrick Rudolph <siro(a)das-labor.org> Gerrit-Comment-Date: Fri, 13 May 2022 02:35:56 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 0

Change in flashrom[master]: flashrom: Drop read_flash_to_file() usage
by Edward O'Callaghan (Code Review) 13 May '22

13 May '22

Edward O'Callaghan has submitted this change. ( https://review.coreboot.org/c/flashrom/+/59291 ) Change subject: flashrom: Drop read_flash_to_file() usage ...................................................................... flashrom: Drop read_flash_to_file() usage Aspire towards a goal of making cli_classic more of just a user of libflashrom than having quasi-parallel paths in flashrom.c This converts remaining read_flash_to_file() usage to the do_read() provider wrapper around libflashrom. BUG=b:208132085 TEST=` sudo ./flashrom -p ft2232_spi:type=232H,divisor=1000 -f -r out -c W25X05 Flashrom output: No EEPROM/flash device found. Force read (-f -r -c) requested, pretending the chip is there: Assuming Winbond flash chip "W25X05" (64 kB, SPI) on ft2232_spi. Please note that forced reads most likely contain garbage. Block protection could not be disabled! Reading flash... done. Data read: xxd out-1khz 00000000: 0000 07ff ffff e000 0000 7fff fffe 0000 ................ 00000010: 0007 ffff ffe0 0000 007f ffff fe00 0000 ................ 00000020: 07ff ffff e000 0000 7fff fffe 0000 0007 ................ 00000030: ffff ffe0 0000 007f ffff fe00 0000 0fff ................ xxd out-100khz 00000000: b6db 6db6 db6d b6db 6db6 db6d b6db 6db6 ..m..m..m..m..m. 00000010: db6d b6db 6db6 db6d b6db 6db6 db6d b6db .m..m..m..m..m.. 00000020: 6db6 db6d b6db 6db6 db24 9249 2492 4924 m..m..m..$.I$.I$ 00000030: 9249 2492 4924 9249 2492 4924 9249 2492 .I$.I$.I$.I$.I$. ` Change-Id: I4b690b688acf9d5deb46e8642a252a2132ea8c73 Signed-off-by: Edward O'Callaghan <quasisec(a)google.com> Tested-by: Nikolai Artemiev <nartemiev(a)google.com> Reviewed-on: https://review.coreboot.org/c/flashrom/+/59291 Tested-by: build bot (Jenkins) <no-reply(a)coreboot.org> Reviewed-by: Anastasia Klimchuk <aklm(a)chromium.org> --- M cli_classic.c M dummyflasher.c M flashrom.c M include/flash.h 4 files changed, 3 insertions(+), 44 deletions(-) Approvals: build bot (Jenkins): Verified Anastasia Klimchuk: Looks good to me, approved diff --git a/cli_classic.c b/cli_classic.c index a0c18d4..9543009 100644 --- a/cli_classic.c +++ b/cli_classic.c @@ -916,14 +916,9 @@ ret = 1; goto out_shutdown; } - if (map_flash(&flashes[0]) != 0) { - free(flashes[0].chip); - ret = 1; - goto out_shutdown; - } msg_cinfo("Please note that forced reads most likely contain garbage.\n"); - ret = read_flash_to_file(&flashes[0], filename); - unmap_flash(&flashes[0]); + flashrom_flag_set(&flashes[0], FLASHROM_FLAG_FORCE, !!force); + ret = do_read(&flashes[0], filename); free(flashes[0].chip); goto out_shutdown; } diff --git a/dummyflasher.c b/dummyflasher.c index 1ee9d3e..50a84d4 100644 --- a/dummyflasher.c +++ b/dummyflasher.c @@ -1265,7 +1265,7 @@ * Once that happens, we need to have special hacks in functions: * * erase_and_write_flash() in flashrom.c - * read_flash_to_file() + * do_read() * handle_romentries() * ... * diff --git a/flashrom.c b/flashrom.c index 9b136a0..e8ed87e 100644 --- a/flashrom.c +++ b/flashrom.c @@ -1070,41 +1070,6 @@ return 0; } -int read_flash_to_file(struct flashctx *flash, const char *filename) -{ - unsigned long size = flash->chip->total_size * 1024; - unsigned char *buf = calloc(size, sizeof(unsigned char)); - int ret = 0; - - msg_cinfo("Reading flash... "); - if (!buf) { - msg_gerr("Memory allocation failed!\n"); - msg_cinfo("FAILED.\n"); - return 1; - } - if (!flash->chip->read) { - msg_cerr("No read function available for this flash chip.\n"); - ret = 1; - goto out_free; - } - if (read_by_layout(flash, buf)) { - msg_cerr("Read operation failed!\n"); - ret = 1; - goto out_free; - } - if (write_buf_to_include_args(flash, buf)) { - ret = 1; - goto out_free; - } - - if (filename) - ret = write_buf_to_file(buf, size, filename); -out_free: - free(buf); - msg_cinfo("%s.\n", ret ? "FAILED" : "done"); - return ret; -} - /* Even if an error is found, the function will keep going and check the rest. */ static int selfcheck_eraseblocks(const struct flashchip *chip) { diff --git a/include/flash.h b/include/flash.h index 805387f..5170ba7 100644 --- a/include/flash.h +++ b/include/flash.h @@ -410,7 +410,6 @@ 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 read_flash_to_file(struct flashctx *flash, const char *filename); int verify_range(struct flashctx *flash, const uint8_t *cmpbuf, unsigned int start, unsigned int len); int need_erase(const uint8_t *have, const uint8_t *want, unsigned int len, enum write_granularity gran, const uint8_t erased_value); void emergency_help_message(void); -- To view, visit https://review.coreboot.org/c/flashrom/+/59291 To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: flashrom Gerrit-Branch: master Gerrit-Change-Id: I4b690b688acf9d5deb46e8642a252a2132ea8c73 Gerrit-Change-Number: 59291 Gerrit-PatchSet: 18 Gerrit-Owner: Edward O'Callaghan <quasisec(a)chromium.org> Gerrit-Reviewer: Anastasia Klimchuk <aklm(a)chromium.org> Gerrit-Reviewer: Angel Pons <th3fanbus(a)gmail.com> Gerrit-Reviewer: Daniel Campello <campello(a)chromium.org> Gerrit-Reviewer: Edward O'Callaghan <quasisec(a)chromium.org> Gerrit-Reviewer: Nikolai Artemiev <nartemiev(a)google.com> Gerrit-Reviewer: Thomas Heijligen <src(a)posteo.de> Gerrit-Reviewer: build bot (Jenkins) <no-reply(a)coreboot.org> Gerrit-CC: Nico Huber <nico.h(a)gmx.de> Gerrit-CC: Paul Menzel <paulepanter(a)mailbox.org> Gerrit-MessageType: merged

1 0

Change in flashrom[master]: tests: Rearange CPP guards
by Edward O'Callaghan (Code Review) 13 May '22

13 May '22

Edward O'Callaghan has posted comments on this change. ( https://review.coreboot.org/c/flashrom/+/64224 ) Change subject: tests: Rearange CPP guards ...................................................................... Patch Set 4: (1 comment) File tests/lifecycle.c: https://review.coreboot.org/c/flashrom/+/64224/comment/420b0ec0_eff5a29c PS2, Line 87: #if CONFIG_DUMMY == 1 > Splitting the file is a good idea. I would be careful with the use of weak symbols. […] That's ok, I wasn't thinking of this change of course sorry if it sounded like that. Agree re weak symbols, definitely be extremely conservative with them as the same with the pre-processor but probably in this very specific case they _may_ indeed make sense. programmer_table is a interesting lens to look at the problem, ultimately it is subjective but best to have all the branching in one corner that across the whole file is the fundamental idea I had in mind. I created a issue to move the discussion over there https://ticket.coreboot.org/issues/380 and to track the idea and whatever comes of it. Cheers Thomas! -- To view, visit https://review.coreboot.org/c/flashrom/+/64224 To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: flashrom Gerrit-Branch: master Gerrit-Change-Id: I02880e73996b30df618738e86b8a52126fbe5b3b Gerrit-Change-Number: 64224 Gerrit-PatchSet: 4 Gerrit-Owner: Thomas Heijligen <src(a)posteo.de> 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-Comment-Date: Fri, 13 May 2022 00:51:40 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: Thomas Heijligen <src(a)posteo.de> Comment-In-Reply-To: Edward O'Callaghan <quasisec(a)chromium.org> Gerrit-MessageType: comment

1 0

Change in flashrom[master]: it87spi.c: Enable probing of IT8686E
by Pete Smith (Code Review) 12 May '22

12 May '22

Attention is currently required from: Nico Huber. Pete Smith has posted comments on this change. ( https://review.coreboot.org/c/flashrom/+/64254 ) Change subject: it87spi.c: Enable probing of IT8686E ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://review.coreboot.org/c/flashrom/+/64254 To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: flashrom Gerrit-Branch: master Gerrit-Change-Id: I5a1780275a92089c2d91c5da1c472f6d8bc39a56 Gerrit-Change-Number: 64254 Gerrit-PatchSet: 1 Gerrit-Owner: Pete Smith <zailawee(a)protonmail.com> Gerrit-Reviewer: Angel Pons <th3fanbus(a)gmail.com> Gerrit-Reviewer: Nico Huber <nico.h(a)gmx.de> Gerrit-Reviewer: Pete Smith <zailawee(a)protonmail.com> Gerrit-Reviewer: Thomas Heijligen <src(a)posteo.de> Gerrit-Reviewer: build bot (Jenkins) <no-reply(a)coreboot.org> Gerrit-Attention: Nico Huber <nico.h(a)gmx.de> Gerrit-Comment-Date: Thu, 12 May 2022 19:23:04 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 0

Change in flashrom[master]: libflashrom: Return progress state to the library user
by Daniel Campello (Code Review) 12 May '22

12 May '22

Attention is currently required from: Richard Hughes, Angel Pons, Anastasia Klimchuk, Patrick Rudolph. Daniel Campello has posted comments on this change. ( https://review.coreboot.org/c/flashrom/+/49643 ) Change subject: libflashrom: Return progress state to the library user ...................................................................... Patch Set 16: (1 comment) Commit Message: https://review.coreboot.org/c/flashrom/+/49643/comment/2676aaf9_9f76dcb8 PS11, Line 15: > Dummyflasher is useful for sure, thanks! I would still want to test on a real device. […] Done. Tested with lspcon_i2c_spi programmer on puff -- To view, visit https://review.coreboot.org/c/flashrom/+/49643 To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: flashrom Gerrit-Branch: master Gerrit-Change-Id: I7197572bb7f19e3bdb2bde855d70a0f50fd3854c Gerrit-Change-Number: 49643 Gerrit-PatchSet: 16 Gerrit-Owner: Richard Hughes <richard(a)hughsie.com> Gerrit-Reviewer: Anastasia Klimchuk <aklm(a)chromium.org> Gerrit-Reviewer: Angel Pons <th3fanbus(a)gmail.com> Gerrit-Reviewer: Daniel Campello <campello(a)chromium.org> Gerrit-Reviewer: Edward O'Callaghan <quasisec(a)chromium.org> Gerrit-Reviewer: Patrick Rudolph <siro(a)das-labor.org> Gerrit-Reviewer: build bot (Jenkins) <no-reply(a)coreboot.org> Gerrit-CC: Paul Menzel <paulepanter(a)mailbox.org> Gerrit-CC: Peter Marheine <pmarheine(a)chromium.org> Gerrit-CC: Richard Hughes <hughsient(a)gmail.com> Gerrit-CC: Thomas Heijligen <src(a)posteo.de> Gerrit-Attention: Richard Hughes <richard(a)hughsie.com> Gerrit-Attention: Angel Pons <th3fanbus(a)gmail.com> Gerrit-Attention: Anastasia Klimchuk <aklm(a)chromium.org> Gerrit-Attention: Patrick Rudolph <siro(a)das-labor.org> Gerrit-Comment-Date: Thu, 12 May 2022 16:12:09 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: Daniel Campello <campello(a)chromium.org> Comment-In-Reply-To: Anastasia Klimchuk <aklm(a)chromium.org> Gerrit-MessageType: comment

1 0

Change in flashrom[master]: libflashrom: Return progress state to the library user
by Daniel Campello (Code Review) 12 May '22

12 May '22

Attention is currently required from: Richard Hughes, Daniel Campello, Angel Pons, Patrick Rudolph. Daniel Campello has uploaded a new patch set (#16) to the change originally created by Richard Hughes. ( https://review.coreboot.org/c/flashrom/+/49643 ) Change subject: libflashrom: Return progress state to the library user ...................................................................... libflashrom: Return progress state to the library user Projects using libflashrom like fwupd expect the user to wait for the operation to complete. To avoid the user thinking the process has "hung" or "got stuck" report back the progress complete of the erase, write and read operations. Include a test for the dummy spi25 device. TEST=./test_build.sh; ./flashrom -p lspcon_i2c_spi:bus=7 -r /dev/null Change-Id: I7197572bb7f19e3bdb2bde855d70a0f50fd3854c Signed-off-by: Richard Hughes <richard(a)hughsie.com> Signed-off-by: Daniel Campello <campello(a)chromium.org> --- M 82802ab.c M at45db.c M cli_classic.c M cli_output.c M dediprog.c M en29lv640b.c M include/flash.h M include/libflashrom.h M it87spi.c M jedec.c M libflashrom.c M libflashrom.map M linux_mtd.c M lspcon_i2c_spi.c M realtek_mst_i2c_spi.c M spi.c M spi25.c M sst28sf040.c M tests/spi25.c M tests/tests.c M tests/tests.h 21 files changed, 170 insertions(+), 1 deletion(-) git pull ssh://review.coreboot.org:29418/flashrom refs/changes/43/49643/16 -- To view, visit https://review.coreboot.org/c/flashrom/+/49643 To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: flashrom Gerrit-Branch: master Gerrit-Change-Id: I7197572bb7f19e3bdb2bde855d70a0f50fd3854c Gerrit-Change-Number: 49643 Gerrit-PatchSet: 16 Gerrit-Owner: Richard Hughes <richard(a)hughsie.com> Gerrit-Reviewer: Anastasia Klimchuk <aklm(a)chromium.org> Gerrit-Reviewer: Angel Pons <th3fanbus(a)gmail.com> Gerrit-Reviewer: Daniel Campello <campello(a)chromium.org> Gerrit-Reviewer: Edward O'Callaghan <quasisec(a)chromium.org> Gerrit-Reviewer: Patrick Rudolph <siro(a)das-labor.org> Gerrit-Reviewer: build bot (Jenkins) <no-reply(a)coreboot.org> Gerrit-CC: Paul Menzel <paulepanter(a)mailbox.org> Gerrit-CC: Peter Marheine <pmarheine(a)chromium.org> Gerrit-CC: Richard Hughes <hughsient(a)gmail.com> Gerrit-CC: Thomas Heijligen <src(a)posteo.de> Gerrit-Attention: Richard Hughes <richard(a)hughsie.com> Gerrit-Attention: Daniel Campello <campello(a)chromium.org> Gerrit-Attention: Angel Pons <th3fanbus(a)gmail.com> Gerrit-Attention: Patrick Rudolph <siro(a)das-labor.org> Gerrit-MessageType: newpatchset

1 0

Change in flashrom[master]: [UGLY HACK] move structs and probe_variable_size() out of dummyflasher.c
by Thomas Heijligen (Code Review) 12 May '22

12 May '22

Attention is currently required from: Nico Huber, Namyoon Woo, Thomas Heijligen, Edward O'Callaghan. Hello build bot (Jenkins), Namyoon Woo, Edward O'Callaghan, Angel Pons, Anastasia Klimchuk, I'd like you to reexamine a change. Please visit https://review.coreboot.org/c/flashrom/+/63831 to look at the new patch set (#9). Change subject: [UGLY HACK] move structs and probe_variable_size() out of dummyflasher.c ...................................................................... [UGLY HACK] move structs and probe_variable_size() out of dummyflasher.c This makes flashrom buildable without the dummy programmer. It does NOT fix the underlaying bug. * BUG: https://ticket.coreboot.org/issues/365 * COMMIT: https://review.coreboot.org/c/flashrom/+/44879 * COMMIT: https://review.coreboot.org/c/flashrom/+/46536 Change-Id: Ic93c8b9ba7b9f7ce5fe49326c8de34070ca83a2e Signed-off-by: Thomas Heijligen <thomas.heijligen(a)secunet.com> --- M Makefile M dummyflasher.c M include/chipdrivers.h A include/you_need_to_fix_me.h M meson.build A you_need_to_fix_me.c 6 files changed, 124 insertions(+), 91 deletions(-) git pull ssh://review.coreboot.org:29418/flashrom refs/changes/31/63831/9 -- To view, visit https://review.coreboot.org/c/flashrom/+/63831 To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: flashrom Gerrit-Branch: master Gerrit-Change-Id: Ic93c8b9ba7b9f7ce5fe49326c8de34070ca83a2e Gerrit-Change-Number: 63831 Gerrit-PatchSet: 9 Gerrit-Owner: Thomas Heijligen <src(a)posteo.de> 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: Namyoon Woo <namyoon(a)google.com> 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: Namyoon Woo <namyoon(a)google.com> Gerrit-Attention: Thomas Heijligen <src(a)posteo.de> Gerrit-Attention: Edward O'Callaghan <quasisec(a)chromium.org> Gerrit-MessageType: newpatchset

1 0

Change in flashrom[master]: meson: use static library for tests
by Thomas Heijligen (Code Review) 12 May '22

12 May '22

Attention is currently required from: Felix Singer, Thomas Heijligen, Anastasia Klimchuk. Hello build bot (Jenkins), Edward O'Callaghan, Angel Pons, Anastasia Klimchuk, Peter Marheine, I'd like you to reexamine a change. Please visit https://review.coreboot.org/c/flashrom/+/64031 to look at the new patch set (#5). Change subject: meson: use static library for tests ...................................................................... meson: use static library for tests Change-Id: If10ed70e3bf629a6eb7e2c5bef3318d1e259dadd Signed-off-by: Thomas Heijligen <thomas.heijligen(a)secunet.com> --- M meson.build M tests/chip.c M tests/flashrom.c M tests/helpers.c M tests/lifecycle.c M tests/meson.build M tests/tests.c 7 files changed, 33 insertions(+), 44 deletions(-) git pull ssh://review.coreboot.org:29418/flashrom refs/changes/31/64031/5 -- To view, visit https://review.coreboot.org/c/flashrom/+/64031 To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: flashrom Gerrit-Branch: master Gerrit-Change-Id: If10ed70e3bf629a6eb7e2c5bef3318d1e259dadd Gerrit-Change-Number: 64031 Gerrit-PatchSet: 5 Gerrit-Owner: Thomas Heijligen <src(a)posteo.de> 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: Peter Marheine <pmarheine(a)chromium.org> Gerrit-Reviewer: build bot (Jenkins) <no-reply(a)coreboot.org> Gerrit-CC: Felix Singer <felixsinger(a)posteo.net> Gerrit-Attention: Felix Singer <felixsinger(a)posteo.net> Gerrit-Attention: Thomas Heijligen <src(a)posteo.de> Gerrit-Attention: Anastasia Klimchuk <aklm(a)chromium.org> Gerrit-MessageType: newpatchset

1 0

Change in flashrom[master]: tests: Rearange CPP guards
by Thomas Heijligen (Code Review) 12 May '22

12 May '22

Thomas Heijligen has submitted this change. ( https://review.coreboot.org/c/flashrom/+/64224 ) Change subject: tests: Rearange CPP guards ...................................................................... tests: Rearange CPP guards This fixes -Werror=unused-function when not all programmer tests are build. `run_basic_lifecycle` and `run_probe_lifecycle` need to have a prototype to not throw a -Werror=unused-function if no programmer needs them. Change-Id: I02880e73996b30df618738e86b8a52126fbe5b3b Signed-off-by: Thomas Heijligen <thomas.heijligen(a)secunet.com> Reviewed-on: https://review.coreboot.org/c/flashrom/+/64224 Tested-by: build bot (Jenkins) <no-reply(a)coreboot.org> Reviewed-by: Edward O'Callaghan <quasisec(a)chromium.org> Reviewed-by: Anastasia Klimchuk <aklm(a)chromium.org> --- M tests/lifecycle.c M tests/tests.h 2 files changed, 42 insertions(+), 34 deletions(-) Approvals: build bot (Jenkins): Verified Edward O'Callaghan: Looks good to me, approved Anastasia Klimchuk: Looks good to me, approved diff --git a/tests/lifecycle.c b/tests/lifecycle.c index 63fcc3c..4e191ed 100644 --- a/tests/lifecycle.c +++ b/tests/lifecycle.c @@ -23,6 +23,9 @@ #include "programmer.h" #include "spi.h" +#define SKIP_TEST(name) \ + void name (void **state) { skip(); } + static void probe_chip(const struct programmer_entry *prog, struct flashrom_programmer *flashprog, const char *const chip_name) @@ -65,7 +68,7 @@ io_mock_register(NULL); } -static void run_basic_lifecycle(void **state, const struct io_mock *io, +void run_basic_lifecycle(void **state, const struct io_mock *io, const struct programmer_entry *prog, const char *param) { /* Basic lifecycle only does init and shutdown, @@ -73,7 +76,7 @@ run_lifecycle(state, io, prog, param, NULL /* chip_name */, NULL /* action */); } -static void run_probe_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) { /* Each probe lifecycle should run independently, without cache. */ @@ -81,9 +84,9 @@ run_lifecycle(state, io, prog, param, chip_name, &probe_chip); } +#if CONFIG_DUMMY == 1 void dummy_basic_lifecycle_test_success(void **state) { -#if CONFIG_DUMMY == 1 static struct io_mock_fallback_open_state dummy_fallback_open_state = { .noc = 0, .paths = { NULL }, @@ -93,14 +96,10 @@ }; run_basic_lifecycle(state, &dummy_io, &programmer_dummy, "bus=parallel+lpc+fwh+spi"); -#else - skip(); -#endif } void dummy_probe_lifecycle_test_success(void **state) { -#if CONFIG_DUMMY == 1 static struct io_mock_fallback_open_state dummy_fallback_open_state = { .noc = 0, .paths = { NULL }, @@ -110,14 +109,16 @@ }; run_probe_lifecycle(state, &dummy_io, &programmer_dummy, "bus=spi,emulate=W25Q128FV", "W25Q128.V"); -#else - skip(); -#endif } +#else + SKIP_TEST(dummy_basic_lifecycle_test_success) + SKIP_TEST(dummy_probe_lifecycle_test_success) +#endif /* CONFIG_DUMMY */ + +#if CONFIG_NICREALTEK == 1 void nicrealtek_basic_lifecycle_test_success(void **state) { -#if CONFIG_NICREALTEK == 1 static struct io_mock_fallback_open_state nicrealtek_fallback_open_state = { .noc = 0, .paths = { NULL }, @@ -127,11 +128,12 @@ }; run_basic_lifecycle(state, &nicrealtek_io, &programmer_nicrealtek, ""); -#else - skip(); -#endif } +#else + SKIP_TEST(nicrealtek_basic_lifecycle_test_success) +#endif /* CONFIG_NICREALTEK */ +#if CONFIG_RAIDEN_DEBUG_SPI == 1 static ssize_t raiden_debug_libusb_get_device_list(void *state, libusb_context *ctx, libusb_device ***list) { *list = calloc(1, sizeof(**list)); @@ -202,7 +204,6 @@ void raiden_debug_basic_lifecycle_test_success(void **state) { -#if CONFIG_RAIDEN_DEBUG_SPI == 1 static struct io_mock_fallback_open_state raiden_debug_fallback_open_state = { .noc = 0, .paths = { NULL }, @@ -224,11 +225,12 @@ snprintf(raiden_debug_param, 12, "address=%d", USB_DEVICE_ADDRESS); run_basic_lifecycle(state, &raiden_debug_io, &programmer_raiden_debug_spi, raiden_debug_param); -#else - skip(); -#endif } +#else + SKIP_TEST(raiden_debug_basic_lifecycle_test_success) +#endif /* CONFIG_RAIDEN_DEBUG_SPI */ +#if CONFIG_DEDIPROG == 1 static int dediprog_libusb_init(void *state, libusb_context **ctx) { *ctx = not_null(); @@ -254,7 +256,6 @@ void dediprog_basic_lifecycle_test_success(void **state) { -#if CONFIG_DEDIPROG == 1 static struct io_mock_fallback_open_state dediprog_fallback_open_state = { .noc = 0, .paths = { NULL }, @@ -266,11 +267,12 @@ }; run_basic_lifecycle(state, &dediprog_io, &programmer_dediprog, "voltage=3.5V"); -#else - skip(); -#endif } +#else + SKIP_TEST(dediprog_basic_lifecycle_test_success) +#endif /* CONFIG_DEDIPROG */ +#if CONFIG_LINUX_MTD == 1 struct linux_mtd_io_state { char *fopen_path; }; @@ -329,7 +331,6 @@ void linux_mtd_probe_lifecycle_test_success(void **state) { -#if CONFIG_LINUX_MTD == 1 struct linux_mtd_io_state linux_mtd_io_state = { NULL }; static struct io_mock_fallback_open_state linux_mtd_fallback_open_state = { .noc = 0, @@ -344,11 +345,12 @@ }; run_probe_lifecycle(state, &linux_mtd_io, &programmer_linux_mtd, "", "Opaque flash chip"); -#else - skip(); -#endif } +#else + SKIP_TEST(linux_mtd_probe_lifecycle_test_success) +#endif /* CONFIG_LINUX_MTD */ +#if CONFIG_LINUX_SPI == 1 static int linux_spi_ioctl(void *state, int fd, unsigned long request, va_list args) { if (request == SPI_IOC_MESSAGE(2)) { /* ioctl code for read request */ @@ -387,7 +389,6 @@ * Current implementation tests a particular path of the init procedure. * Specifically, it is reading the buffer size from sysfs. */ -#if CONFIG_LINUX_SPI == 1 static struct io_mock_fallback_open_state linux_spi_fallback_open_state = { .noc = 0, .paths = { "/dev/null", NULL }, @@ -400,11 +401,12 @@ }; run_probe_lifecycle(state, &linux_spi_io, &programmer_linux_spi, "dev=/dev/null", "W25Q128.V"); -#else - skip(); -#endif } +#else + SKIP_TEST(linux_spi_probe_lifecycle_test_success) +#endif /* CONFIG_LINUX_SPI */ +#if CONFIG_REALTEK_MST_I2C_SPI == 1 static int realtek_mst_ioctl(void *state, int fd, unsigned long request, va_list args) { assert_int_equal(fd, MOCK_FD); @@ -433,7 +435,6 @@ void realtek_mst_basic_lifecycle_test_success(void **state) { -#if CONFIG_REALTEK_MST_I2C_SPI == 1 static struct io_mock_fallback_open_state realtek_mst_fallback_open_state = { .noc = 0, .paths = { "/dev/i2c-254", NULL }, @@ -447,7 +448,7 @@ }; run_basic_lifecycle(state, &realtek_mst_io, &programmer_realtek_mst_i2c_spi, "bus=254,enter-isp=0"); -#else - skip(); -#endif /* CONFIG_REALTEK_I2C_SPI */ } +#else + SKIP_TEST(realtek_mst_basic_lifecycle_test_success) +#endif /* CONFIG_REALTEK_I2C_SPI */ diff --git a/tests/tests.h b/tests/tests.h index 89e4095..e2b2211 100644 --- a/tests/tests.h +++ b/tests/tests.h @@ -41,6 +41,13 @@ void probe_spi_st95_test_success(void **state); /* spi95.c */ /* lifecycle.c */ +struct io_mock; +struct programmer_entry; +void run_basic_lifecycle(void **state, const struct io_mock *io, + const struct programmer_entry *prog, const char *param); +void run_probe_lifecycle(void **state, const struct io_mock *io, + const struct programmer_entry *prog, const char *param, const char *chip_name); + void dummy_basic_lifecycle_test_success(void **state); void dummy_probe_lifecycle_test_success(void **state); void nicrealtek_basic_lifecycle_test_success(void **state); 2 is the latest approved patch-set. No files were changed between the latest approved patch-set and the submitted one. -- To view, visit https://review.coreboot.org/c/flashrom/+/64224 To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: flashrom Gerrit-Branch: master Gerrit-Change-Id: I02880e73996b30df618738e86b8a52126fbe5b3b Gerrit-Change-Number: 64224 Gerrit-PatchSet: 4 Gerrit-Owner: Thomas Heijligen <src(a)posteo.de> 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-MessageType: merged

1 0

Change in flashrom[master]: meson: link flashrom binary against static libflashrom
by Thomas Heijligen (Code Review) 12 May '22

12 May '22

Thomas Heijligen has submitted this change. ( https://review.coreboot.org/c/flashrom/+/64030 ) Change subject: meson: link flashrom binary against static libflashrom ...................................................................... meson: link flashrom binary against static libflashrom TEST: meson build && ninja -C build Read chip successfully with ch341a_spi programmer Change-Id: Ic522610f59e00299ebfa1bd29482ff92120ec52b Signed-off-by: Thomas Heijligen <thomas.heijligen(a)secunet.com> Reviewed-on: https://review.coreboot.org/c/flashrom/+/64030 Reviewed-by: Edward O'Callaghan <quasisec(a)chromium.org> Reviewed-by: Anastasia Klimchuk <aklm(a)chromium.org> Reviewed-by: Peter Marheine <pmarheine(a)chromium.org> Tested-by: build bot (Jenkins) <no-reply(a)coreboot.org> --- M meson.build 1 file changed, 7 insertions(+), 20 deletions(-) Approvals: build bot (Jenkins): Verified Edward O'Callaghan: Looks good to me, approved Peter Marheine: Looks good to me, but someone else must approve Anastasia Klimchuk: Looks good to me, approved diff --git a/meson.build b/meson.build index 30ebb88..cbce8c1 100644 --- a/meson.build +++ b/meson.build @@ -425,7 +425,7 @@ mapfile = 'libflashrom.map' vflag = '-Wl,--version-script,@0@/@1@'.format(meson.current_source_dir(), mapfile) -flashrom = library( +libflashrom = both_libraries( 'flashrom', sources : [ srcs, @@ -455,7 +455,7 @@ pkgg = import('pkgconfig') pkgg.generate( - libraries : flashrom, + libraries : libflashrom, version : version, name : 'flashrom', filebase : 'flashrom', @@ -472,31 +472,18 @@ install_dir: join_paths(get_option('mandir'), 'man8'), ) -flashrom_dep = declare_dependency( - link_with : flashrom, - include_directories : include_dir, - dependencies : deps -) - -# we can't just link_with libflashrom as we require all the internal symbols... executable( 'flashrom', - sources : [ - srcs, + files( 'cli_classic.c', 'cli_common.c', 'cli_output.c', - 'flashrom.c', - ], + ), + c_args : cargs, include_directories : include_dir, - dependencies : [ - deps, - ], - c_args : [ - cargs - ], install : true, - install_dir : get_option('sbindir') + install_dir : get_option('sbindir'), + link_with : libflashrom.get_static_lib(), # flashrom needs internal symbols of libflashrom ) subdir('util') 4 is the latest approved patch-set. No files were changed between the latest approved patch-set and the submitted one. -- To view, visit https://review.coreboot.org/c/flashrom/+/64030 To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: flashrom Gerrit-Branch: master Gerrit-Change-Id: Ic522610f59e00299ebfa1bd29482ff92120ec52b Gerrit-Change-Number: 64030 Gerrit-PatchSet: 6 Gerrit-Owner: Thomas Heijligen <src(a)posteo.de> Gerrit-Reviewer: Anastasia Klimchuk <aklm(a)chromium.org> Gerrit-Reviewer: Edward O'Callaghan <quasisec(a)chromium.org> Gerrit-Reviewer: Peter Marheine <pmarheine(a)chromium.org> 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-MessageType: merged

1 0

2024

2023

2022

2021

2020

2019

2018

2017

flashrom-gerrit May 2022