October 2021 - flashrom-gerrit

Change in flashrom[master]: gfxnvidia: Fix indents
by Nico Huber (Code Review) 15 Oct '21

15 Oct '21

Nico Huber has submitted this change. ( https://review.coreboot.org/c/flashrom/+/58301 ) Change subject: gfxnvidia: Fix indents ...................................................................... gfxnvidia: Fix indents Change-Id: I18f916923d3574dd8c68019e4db3985444dd7bee Signed-off-by: Felix Singer <felix.singer(a)secunet.com> Reviewed-on: https://review.coreboot.org/c/flashrom/+/58301 Tested-by: build bot (Jenkins) <no-reply(a)coreboot.org> Reviewed-by: Thomas Heijligen <src(a)posteo.de> --- M gfxnvidia.c 1 file changed, 8 insertions(+), 8 deletions(-) Approvals: build bot (Jenkins): Verified Thomas Heijligen: Looks good to me, approved diff --git a/gfxnvidia.c b/gfxnvidia.c index 760b76b..048471d 100644 --- a/gfxnvidia.c +++ b/gfxnvidia.c @@ -71,14 +71,14 @@ } static const struct par_master par_master_gfxnvidia = { - .chip_readb = gfxnvidia_chip_readb, - .chip_readw = fallback_chip_readw, - .chip_readl = fallback_chip_readl, - .chip_readn = fallback_chip_readn, - .chip_writeb = gfxnvidia_chip_writeb, - .chip_writew = fallback_chip_writew, - .chip_writel = fallback_chip_writel, - .chip_writen = fallback_chip_writen, + .chip_readb = gfxnvidia_chip_readb, + .chip_readw = fallback_chip_readw, + .chip_readl = fallback_chip_readl, + .chip_readn = fallback_chip_readn, + .chip_writeb = gfxnvidia_chip_writeb, + .chip_writew = fallback_chip_writew, + .chip_writel = fallback_chip_writel, + .chip_writen = fallback_chip_writen, }; static int gfxnvidia_init(void) 1 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/+/58301 To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: flashrom Gerrit-Branch: master Gerrit-Change-Id: I18f916923d3574dd8c68019e4db3985444dd7bee Gerrit-Change-Number: 58301 Gerrit-PatchSet: 3 Gerrit-Owner: Felix Singer <felixsinger(a)posteo.net> Gerrit-Reviewer: Nico Huber <nico.h(a)gmx.de> Gerrit-Reviewer: Thomas Heijligen <src(a)posteo.de> Gerrit-Reviewer: build bot (Jenkins) <no-reply(a)coreboot.org> Gerrit-CC: Paul Menzel <paulepanter(a)mailbox.org> Gerrit-MessageType: merged

1 0

Change in flashrom[master]: serprog: Move content of programmer specific header to C file
by Thomas Heijligen (Code Review) 15 Oct '21

15 Oct '21

Attention is currently required from: Felix Singer. Thomas Heijligen has posted comments on this change. ( https://review.coreboot.org/c/flashrom/+/58300 ) Change subject: serprog: Move content of programmer specific header to C file ...................................................................... Patch Set 6: Code-Review+2 -- To view, visit https://review.coreboot.org/c/flashrom/+/58300 To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: flashrom Gerrit-Branch: master Gerrit-Change-Id: I5c65f43db200129489d487ff948daa08bd0e92fa Gerrit-Change-Number: 58300 Gerrit-PatchSet: 6 Gerrit-Owner: Felix Singer <felixsinger(a)posteo.net> Gerrit-Reviewer: Nico Huber <nico.h(a)gmx.de> Gerrit-Reviewer: Thomas Heijligen <src(a)posteo.de> Gerrit-Reviewer: build bot (Jenkins) <no-reply(a)coreboot.org> Gerrit-CC: Paul Menzel <paulepanter(a)mailbox.org> Gerrit-Attention: Felix Singer <felixsinger(a)posteo.net> Gerrit-Comment-Date: Fri, 15 Oct 2021 13:51:31 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 0

Change in flashrom[master]: tests: Fix fread wrap to return success by default
by Angel Pons (Code Review) 15 Oct '21

15 Oct '21

Attention is currently required from: Edward O'Callaghan, Anastasia Klimchuk. Angel Pons has posted comments on this change. ( https://review.coreboot.org/c/flashrom/+/58356 ) Change subject: tests: Fix fread wrap to return success by default ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://review.coreboot.org/c/flashrom/+/58356 To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: flashrom Gerrit-Branch: master Gerrit-Change-Id: I17d82d281a87129843f547b87c18f52aca23314d Gerrit-Change-Number: 58356 Gerrit-PatchSet: 1 Gerrit-Owner: 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: Nico Huber <nico.h(a)gmx.de> Gerrit-Reviewer: build bot (Jenkins) <no-reply(a)coreboot.org> Gerrit-CC: Paul Menzel <paulepanter(a)mailbox.org> Gerrit-Attention: Edward O'Callaghan <quasisec(a)chromium.org> Gerrit-Attention: Anastasia Klimchuk <aklm(a)chromium.org> Gerrit-Comment-Date: Fri, 15 Oct 2021 10:13:45 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 0

Change in flashrom[master]: tests: Fix fread wrap to return success by default
by Nico Huber (Code Review) 15 Oct '21

15 Oct '21

Attention is currently required from: Edward O'Callaghan, Angel Pons, Anastasia Klimchuk. Nico Huber has posted comments on this change. ( https://review.coreboot.org/c/flashrom/+/58356 ) Change subject: tests: Fix fread wrap to return success by default ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://review.coreboot.org/c/flashrom/+/58356 To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: flashrom Gerrit-Branch: master Gerrit-Change-Id: I17d82d281a87129843f547b87c18f52aca23314d Gerrit-Change-Number: 58356 Gerrit-PatchSet: 1 Gerrit-Owner: 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: Nico Huber <nico.h(a)gmx.de> Gerrit-Reviewer: build bot (Jenkins) <no-reply(a)coreboot.org> Gerrit-CC: Paul Menzel <paulepanter(a)mailbox.org> Gerrit-Attention: Edward O'Callaghan <quasisec(a)chromium.org> Gerrit-Attention: Angel Pons <th3fanbus(a)gmail.com> Gerrit-Attention: Anastasia Klimchuk <aklm(a)chromium.org> Gerrit-Comment-Date: Fri, 15 Oct 2021 09:44:28 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 0

Change in flashrom[master]: tests: Add tests to write on chip
by Anastasia Klimchuk (Code Review) 15 Oct '21

15 Oct '21

Anastasia Klimchuk has uploaded this change for review. ( https://review.coreboot.org/c/flashrom/+/58357 ) Change subject: tests: Add tests to write on chip ...................................................................... tests: Add tests to write on chip This patch adds two tests and initialises page_size in mock chip chip_W25Q128_V. page_size was not needed for previous tests (erase and read). page_size only needed to execute writing on chip with dummyflasher, so it is added here. BUG=b:181803212 TEST=ninja test Change-Id: I6f0336613ab16a7e59857006496e3590ddb14d00 Signed-off-by: Anastasia Klimchuk <aklm(a)chromium.org> --- M tests/chip.c M tests/meson.build M tests/tests.c M tests/tests.h 4 files changed, 72 insertions(+), 0 deletions(-) git pull ssh://review.coreboot.org:29418/flashrom refs/changes/57/58357/1 diff --git a/tests/chip.c b/tests/chip.c index 54e14d2..4181aed 100644 --- a/tests/chip.c +++ b/tests/chip.c @@ -148,6 +148,7 @@ .read = spi_chip_read, .write = spi_chip_write_256, .unlock = spi_disable_blockprotect, + .page_size = 256, .block_erasers = { { @@ -256,3 +257,63 @@ free(param_dup); } + +void write_chip_test_success(void **state) +{ + (void) state; /* unused */ + + struct flashrom_flashctx flash = { 0 }; + struct flashrom_layout *layout; + struct flashchip mock_chip = chip_8MiB; + const char *param = ""; /* Default values for all params. */ + + setup_chip(&flash, &layout, &mock_chip, param); + + /* + * Providing filename "-" means content is taken from standard input. + * This doesn't change much because all file operations are mocked. + * However filename "-" makes a difference for + * flashrom.c#read_buf_from_file and allows to avoid mocking + * image_stat.st_size. + * + * Now this does mean test covers successful path only, but this test + * is designed to cover only successful write operation anyway. + * + * To cover error path of image_stat.st_size != flash size, filename + * needs to be provided and image_stat.st_size needs to be mocked. + */ + const char *const filename = "-"; + + printf("Write chip operation started.\n"); + assert_int_equal(0, do_write(&flash, filename, NULL)); + printf("Write chip operation done.\n"); + + teardown(&layout); +} + +void write_chip_with_dummyflasher_test_success(void **state) +{ + (void) state; /* unused */ + + struct flashrom_flashctx flash = { 0 }; + struct flashrom_layout *layout; + struct flashchip mock_chip = chip_W25Q128_V; + /* + * Dummyflasher is capable to emulate W25Q128.V, so we ask it to do this. + * Nothing to mock, dummy is taking care of this already. + */ + char *param_dup = strdup("bus=spi,emulate=W25Q128FV"); + + setup_chip(&flash, &layout, &mock_chip, param_dup); + + /* See comment in write_chip_test_success */ + const char *const filename = "-"; + + printf("Write chip operation started.\n"); + assert_int_equal(0, do_write(&flash, filename, NULL)); + printf("Write chip operation done.\n"); + + teardown(&layout); + + free(param_dup); +} diff --git a/tests/meson.build b/tests/meson.build index 8019bd3..0783c60 100644 --- a/tests/meson.build +++ b/tests/meson.build @@ -39,6 +39,7 @@ '-Wl,--wrap=write', '-Wl,--wrap=fopen', '-Wl,--wrap=fopen64', + '-Wl,--wrap=fdopen', '-Wl,--wrap=fwrite', '-Wl,--wrap=fflush', '-Wl,--wrap=stat', diff --git a/tests/tests.c b/tests/tests.c index 920d40f..cf50954 100644 --- a/tests/tests.c +++ b/tests/tests.c @@ -142,6 +142,12 @@ return (void *)MOCK_HANDLE; } +FILE *__wrap_fdopen(int fd, const char *mode) +{ + LOG_ME; + return (void *)MOCK_HANDLE; +} + int __wrap_stat(const char *path, void *buf) { LOG_ME; @@ -395,6 +401,8 @@ cmocka_unit_test(erase_chip_with_dummyflasher_test_success), cmocka_unit_test(read_chip_test_success), cmocka_unit_test(read_chip_with_dummyflasher_test_success), + cmocka_unit_test(write_chip_test_success), + cmocka_unit_test(write_chip_with_dummyflasher_test_success), }; ret |= cmocka_run_group_tests_name("chip.c tests", chip_tests, NULL, NULL); diff --git a/tests/tests.h b/tests/tests.h index c142b45..732920a 100644 --- a/tests/tests.h +++ b/tests/tests.h @@ -61,5 +61,7 @@ void erase_chip_with_dummyflasher_test_success(void **state); void read_chip_test_success(void **state); void read_chip_with_dummyflasher_test_success(void **state); +void write_chip_test_success(void **state); +void write_chip_with_dummyflasher_test_success(void **state); #endif /* TESTS_H */ -- To view, visit https://review.coreboot.org/c/flashrom/+/58357 To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: flashrom Gerrit-Branch: master Gerrit-Change-Id: I6f0336613ab16a7e59857006496e3590ddb14d00 Gerrit-Change-Number: 58357 Gerrit-PatchSet: 1 Gerrit-Owner: Anastasia Klimchuk <aklm(a)chromium.org> Gerrit-MessageType: newchange

1 0

Change in flashrom[master]: tests: Fix fread wrap to return success by default
by Anastasia Klimchuk (Code Review) 15 Oct '21

15 Oct '21

Anastasia Klimchuk has uploaded this change for review. ( https://review.coreboot.org/c/flashrom/+/58356 ) Change subject: tests: Fix fread wrap to return success by default ...................................................................... tests: Fix fread wrap to return success by default Successful return value for fread is the number of items read, and default behaviour for all wraps is to return success. This worked previously because all existing tests have custom mocks for fread, so default behaviour hasn't been used. However next patch in this chain adds new test which needs default fread wrap. BUG=b:181803212 TEST=ninja test Change-Id: I17d82d281a87129843f547b87c18f52aca23314d Signed-off-by: Anastasia Klimchuk <aklm(a)chromium.org> --- M tests/tests.c 1 file changed, 3 insertions(+), 3 deletions(-) git pull ssh://review.coreboot.org:29418/flashrom refs/changes/56/58356/1 diff --git a/tests/tests.c b/tests/tests.c index ac59470..920d40f 100644 --- a/tests/tests.c +++ b/tests/tests.c @@ -174,12 +174,12 @@ return NULL; } -size_t __wrap_fread(void *ptr, size_t size, size_t len, FILE *fp) +size_t __wrap_fread(void *ptr, size_t size, size_t nmemb, FILE *fp) { LOG_ME; if (current_io && current_io->fread) - return current_io->fread(current_io->state, ptr, size, len, fp); - return 0; + return current_io->fread(current_io->state, ptr, size, nmemb, fp); + return nmemb; } size_t __wrap_fwrite(const void *ptr, size_t size, size_t nmemb, FILE *fp) -- To view, visit https://review.coreboot.org/c/flashrom/+/58356 To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: flashrom Gerrit-Branch: master Gerrit-Change-Id: I17d82d281a87129843f547b87c18f52aca23314d Gerrit-Change-Number: 58356 Gerrit-PatchSet: 1 Gerrit-Owner: Anastasia Klimchuk <aklm(a)chromium.org> Gerrit-MessageType: newchange

1 0

Change in flashrom[master]: tests: Add wrap for libusb_init and use it in dediprog test
by Nico Huber (Code Review) 14 Oct '21

14 Oct '21

Attention is currently required from: Edward O'Callaghan, Angel Pons, Anastasia Klimchuk. Nico Huber has posted comments on this change. ( https://review.coreboot.org/c/flashrom/+/57917 ) Change subject: tests: Add wrap for libusb_init and use it in dediprog test ...................................................................... Patch Set 4: Code-Review+2 -- To view, visit https://review.coreboot.org/c/flashrom/+/57917 To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: flashrom Gerrit-Branch: master Gerrit-Change-Id: I51c9cb96db1afb3298f4d098df96509d3cb3c046 Gerrit-Change-Number: 57917 Gerrit-PatchSet: 4 Gerrit-Owner: 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: Nico Huber <nico.h(a)gmx.de> Gerrit-Reviewer: build bot (Jenkins) <no-reply(a)coreboot.org> Gerrit-CC: Paul Menzel <paulepanter(a)mailbox.org> Gerrit-Attention: Edward O'Callaghan <quasisec(a)chromium.org> Gerrit-Attention: Angel Pons <th3fanbus(a)gmail.com> Gerrit-Attention: Anastasia Klimchuk <aklm(a)chromium.org> Gerrit-Comment-Date: Thu, 14 Oct 2021 14:57:09 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 0

Change in flashrom[master]: tests: Move current_io to io_mock.c be visible across tests
by Nico Huber (Code Review) 14 Oct '21

14 Oct '21

Attention is currently required from: Angel Pons, Anastasia Klimchuk. Nico Huber has posted comments on this change. ( https://review.coreboot.org/c/flashrom/+/57915 ) Change subject: tests: Move current_io to io_mock.c be visible across tests ...................................................................... Patch Set 4: Code-Review+2 -- To view, visit https://review.coreboot.org/c/flashrom/+/57915 To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: flashrom Gerrit-Branch: master Gerrit-Change-Id: I5327b5de430afe13a8cc931c8b4b188dcb8c8cf6 Gerrit-Change-Number: 57915 Gerrit-PatchSet: 4 Gerrit-Owner: 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: Nico Huber <nico.h(a)gmx.de> Gerrit-Reviewer: build bot (Jenkins) <no-reply(a)coreboot.org> Gerrit-CC: Paul Menzel <paulepanter(a)mailbox.org> Gerrit-Attention: Angel Pons <th3fanbus(a)gmail.com> Gerrit-Attention: Anastasia Klimchuk <aklm(a)chromium.org> Gerrit-Comment-Date: Thu, 14 Oct 2021 14:54:04 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 0

Change in flashrom[master]: tests: Move LOG_ME to include/tests.h to be available everywhere
by Nico Huber (Code Review) 14 Oct '21

14 Oct '21

Attention is currently required from: Angel Pons, Anastasia Klimchuk. Nico Huber has posted comments on this change. ( https://review.coreboot.org/c/flashrom/+/57914 ) Change subject: tests: Move LOG_ME to include/tests.h to be available everywhere ...................................................................... Patch Set 4: Code-Review+2 -- To view, visit https://review.coreboot.org/c/flashrom/+/57914 To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: flashrom Gerrit-Branch: master Gerrit-Change-Id: If7f3d256161bc8b81e996328e445cccab9a82174 Gerrit-Change-Number: 57914 Gerrit-PatchSet: 4 Gerrit-Owner: 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: Nico Huber <nico.h(a)gmx.de> Gerrit-Reviewer: build bot (Jenkins) <no-reply(a)coreboot.org> Gerrit-CC: Paul Menzel <paulepanter(a)mailbox.org> Gerrit-Attention: Angel Pons <th3fanbus(a)gmail.com> Gerrit-Attention: Anastasia Klimchuk <aklm(a)chromium.org> Gerrit-Comment-Date: Thu, 14 Oct 2021 14:51:43 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 0

Change in flashrom[master]: tests: Add NON_ZERO macro and not_null function instead of MOCK_HANDLE
by Nico Huber (Code Review) 14 Oct '21

14 Oct '21

Attention is currently required from: Angel Pons, Anastasia Klimchuk. Nico Huber has posted comments on this change. ( https://review.coreboot.org/c/flashrom/+/57269 ) Change subject: tests: Add NON_ZERO macro and not_null function instead of MOCK_HANDLE ...................................................................... Patch Set 6: Code-Review+2 -- To view, visit https://review.coreboot.org/c/flashrom/+/57269 To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: flashrom Gerrit-Branch: master Gerrit-Change-Id: I5ad6ee4aa9091447c6c9108c92bf7f6e755fca48 Gerrit-Change-Number: 57269 Gerrit-PatchSet: 6 Gerrit-Owner: 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: Nico Huber <nico.h(a)gmx.de> Gerrit-Reviewer: build bot (Jenkins) <no-reply(a)coreboot.org> Gerrit-CC: Paul Menzel <paulepanter(a)mailbox.org> Gerrit-Attention: Angel Pons <th3fanbus(a)gmail.com> Gerrit-Attention: Anastasia Klimchuk <aklm(a)chromium.org> Gerrit-Comment-Date: Thu, 14 Oct 2021 14:51:14 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 0

2025

2024

2023

2022

2021

2020

2019

2018

2017

flashrom-gerrit October 2021