July 2021 - flashrom-gerrit - mail.coreboot.org

Change in flashrom[master]: programmer.h: Minor tidy up
by Edward O'Callaghan (Code Review) 21 Jul '21

21 Jul '21

Edward O'Callaghan has uploaded this change for review. ( https://review.coreboot.org/c/flashrom/+/56466 ) Change subject: programmer.h: Minor tidy up ...................................................................... programmer.h: Minor tidy up Align comments and #ifdef terminations to be clear. BUG=none BRANCH=none TEST=builds Change-Id: I7ceda32b66d17318d42b94a1fab621a9a926fa77 Signed-off-by: Edward O'Callaghan <quasisec(a)google.com> --- M programmer.h 1 file changed, 3 insertions(+), 5 deletions(-) git pull ssh://review.coreboot.org:29418/flashrom refs/changes/66/56466/1 diff --git a/programmer.h b/programmer.h index 95e2cda..61673a8 100644 --- a/programmer.h +++ b/programmer.h @@ -397,8 +397,8 @@ CHIPSET_GEMINI_LAKE, }; -/* ichspi.c */ #if CONFIG_INTERNAL == 1 +/* ichspi.c */ int ich_init_spi(void *spibar, enum ich_chipset ich_generation); int via_init_spi(uint32_t mmio_base); @@ -419,19 +419,17 @@ static inline int try_mtd(void) { return programmer_linux_mtd.init(); }; #else static inline int try_mtd(void) { return 1; }; -#endif +#endif /* CONFIG_LINUX_MTD == 1 */ /* mcp6x_spi.c */ int mcp6x_spi_init(int want_spi); - - /* sb600spi.c */ int sb600_probe_spi(struct pci_dev *dev); /* wbsio_spi.c */ int wbsio_check_for_spi(void); -#endif +#endif /* CONFIG_INTERNAL == 1 */ /* opaque.c */ struct opaque_master { -- To view, visit https://review.coreboot.org/c/flashrom/+/56466 To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: flashrom Gerrit-Branch: master Gerrit-Change-Id: I7ceda32b66d17318d42b94a1fab621a9a926fa77 Gerrit-Change-Number: 56466 Gerrit-PatchSet: 1 Gerrit-Owner: Edward O'Callaghan <quasisec(a)chromium.org> Gerrit-MessageType: newchange

1 0

Change in flashrom[master]: tests: Trim excessive new lines from layout test output
by Edward O'Callaghan (Code Review) 21 Jul '21

21 Jul '21

Attention is currently required from: Nico Huber, Angel Pons, Anastasia Klimchuk. Edward O'Callaghan has posted comments on this change. ( https://review.coreboot.org/c/flashrom/+/56439 ) Change subject: tests: Trim excessive new lines from layout test output ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://review.coreboot.org/c/flashrom/+/56439 To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: flashrom Gerrit-Branch: master Gerrit-Change-Id: I36a39505f8db508672cde5a848684a3a22f5ccc4 Gerrit-Change-Number: 56439 Gerrit-PatchSet: 2 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-Attention: Nico Huber <nico.h(a)gmx.de> Gerrit-Attention: Angel Pons <th3fanbus(a)gmail.com> Gerrit-Attention: Anastasia Klimchuk <aklm(a)chromium.org> Gerrit-Comment-Date: Wed, 21 Jul 2021 00:06:14 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 0

Change in flashrom[master]: tests: Add unit tests for layout sanity checks
by Edward O'Callaghan (Code Review) 21 Jul '21

21 Jul '21

Attention is currently required from: Nico Huber, Angel Pons, Anastasia Klimchuk. Edward O'Callaghan has posted comments on this change. ( https://review.coreboot.org/c/flashrom/+/56440 ) Change subject: tests: Add unit tests for layout sanity checks ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://review.coreboot.org/c/flashrom/+/56440 To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: flashrom Gerrit-Branch: master Gerrit-Change-Id: Ia21585d60443b2741f3868d7887476090e35f79b Gerrit-Change-Number: 56440 Gerrit-PatchSet: 2 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-Attention: Nico Huber <nico.h(a)gmx.de> Gerrit-Attention: Angel Pons <th3fanbus(a)gmail.com> Gerrit-Attention: Anastasia Klimchuk <aklm(a)chromium.org> Gerrit-Comment-Date: Wed, 21 Jul 2021 00:06:07 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 0

Change in flashrom[master]: dediprog.c: Drop dediprog_ prefix for spi data struct members
by Edward O'Callaghan (Code Review) 20 Jul '21

20 Jul '21

Attention is currently required from: Nico Huber, Angel Pons, Anastasia Klimchuk. Edward O'Callaghan has posted comments on this change. ( https://review.coreboot.org/c/flashrom/+/56415 ) Change subject: dediprog.c: Drop dediprog_ prefix for spi data struct members ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://review.coreboot.org/c/flashrom/+/56415 To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: flashrom Gerrit-Branch: master Gerrit-Change-Id: I688d50926b78a6c3f1c5a8ba4ef88a0d5b495bd0 Gerrit-Change-Number: 56415 Gerrit-PatchSet: 2 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: Nico Huber <nico.h(a)gmx.de> Gerrit-Attention: Angel Pons <th3fanbus(a)gmail.com> Gerrit-Attention: Anastasia Klimchuk <aklm(a)chromium.org> Gerrit-Comment-Date: Tue, 20 Jul 2021 23:58:39 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 0

Change in flashrom[master]: dediprog.c: Refactor singleton states into reentrant pattern
by Edward O'Callaghan (Code Review) 20 Jul '21

20 Jul '21

Attention is currently required from: Nico Huber, Angel Pons, Anastasia Klimchuk. Edward O'Callaghan has posted comments on this change. ( https://review.coreboot.org/c/flashrom/+/56414 ) Change subject: dediprog.c: Refactor singleton states into reentrant pattern ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://review.coreboot.org/c/flashrom/+/56414 To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: flashrom Gerrit-Branch: master Gerrit-Change-Id: I72085e750af97b94dfa94f2ebf2a134e41a2ec8d Gerrit-Change-Number: 56414 Gerrit-PatchSet: 2 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: Nico Huber <nico.h(a)gmx.de> Gerrit-Attention: Angel Pons <th3fanbus(a)gmail.com> Gerrit-Attention: Anastasia Klimchuk <aklm(a)chromium.org> Gerrit-Comment-Date: Tue, 20 Jul 2021 23:58:20 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 0

Change in flashrom[master]: tests: Trim excessive new lines from layout test output
by Anastasia Klimchuk (Code Review) 20 Jul '21

20 Jul '21

Attention is currently required from: Nico Huber, Edward O'Callaghan, Angel Pons. Anastasia Klimchuk has posted comments on this change. ( https://review.coreboot.org/c/flashrom/+/56439 ) Change subject: tests: Trim excessive new lines from layout test output ...................................................................... Patch Set 2: (1 comment) File tests/layout.c: https://review.coreboot.org/c/flashrom/+/56439/comment/2f10f7bf_8d1bf60c PS1, Line 26: printf("Creating layout..."); > nit: Print a space afterwards? […] Done. I also did the same for the next patch in this chain, it was in the same situation. -- To view, visit https://review.coreboot.org/c/flashrom/+/56439 To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: flashrom Gerrit-Branch: master Gerrit-Change-Id: I36a39505f8db508672cde5a848684a3a22f5ccc4 Gerrit-Change-Number: 56439 Gerrit-PatchSet: 2 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-Attention: Nico Huber <nico.h(a)gmx.de> Gerrit-Attention: Edward O'Callaghan <quasisec(a)chromium.org> Gerrit-Attention: Angel Pons <th3fanbus(a)gmail.com> Gerrit-Comment-Date: Tue, 20 Jul 2021 23:08:31 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: Angel Pons <th3fanbus(a)gmail.com> Gerrit-MessageType: comment

1 0

Change in flashrom[master]: tests: Add unit tests for layout sanity checks
by Anastasia Klimchuk (Code Review) 20 Jul '21

20 Jul '21

Attention is currently required from: Nico Huber, Edward O'Callaghan, Angel Pons. Hello build bot (Jenkins), Nico Huber, Edward O'Callaghan, Angel Pons, I'd like you to reexamine a change. Please visit https://review.coreboot.org/c/flashrom/+/56440 to look at the new patch set (#2). Change subject: tests: Add unit tests for layout sanity checks ...................................................................... tests: Add unit tests for layout sanity checks Three more tests in this patch where layout does / does not pass sanity checks. BUG=b:193584590 TEST=ninja test Change-Id: Ia21585d60443b2741f3868d7887476090e35f79b Signed-off-by: Anastasia Klimchuk <aklm(a)chromium.org> --- M tests/layout.c M tests/tests.c M tests/tests.h 3 files changed, 111 insertions(+), 0 deletions(-) git pull ssh://review.coreboot.org:29418/flashrom refs/changes/40/56440/2 -- To view, visit https://review.coreboot.org/c/flashrom/+/56440 To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: flashrom Gerrit-Branch: master Gerrit-Change-Id: Ia21585d60443b2741f3868d7887476090e35f79b Gerrit-Change-Number: 56440 Gerrit-PatchSet: 2 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-Attention: Nico Huber <nico.h(a)gmx.de> Gerrit-Attention: Edward O'Callaghan <quasisec(a)chromium.org> Gerrit-Attention: Angel Pons <th3fanbus(a)gmail.com> Gerrit-MessageType: newpatchset

1 0

Change in flashrom[master]: tests: Trim excessive new lines from layout test output
by Anastasia Klimchuk (Code Review) 20 Jul '21

20 Jul '21

Attention is currently required from: Nico Huber, Edward O'Callaghan, Anastasia Klimchuk. Hello build bot (Jenkins), Nico Huber, Edward O'Callaghan, Angel Pons, I'd like you to reexamine a change. Please visit https://review.coreboot.org/c/flashrom/+/56439 to look at the new patch set (#2). Change subject: tests: Trim excessive new lines from layout test output ...................................................................... tests: Trim excessive new lines from layout test output This patch is making layout test output more compact, spanning less vertical lines while logging the same information. No changes made to the test functionality. BUG=b:193584590 TEST=ninja test Change-Id: I36a39505f8db508672cde5a848684a3a22f5ccc4 Signed-off-by: Anastasia Klimchuk <aklm(a)chromium.org> --- M tests/layout.c 1 file changed, 18 insertions(+), 18 deletions(-) git pull ssh://review.coreboot.org:29418/flashrom refs/changes/39/56439/2 -- To view, visit https://review.coreboot.org/c/flashrom/+/56439 To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: flashrom Gerrit-Branch: master Gerrit-Change-Id: I36a39505f8db508672cde5a848684a3a22f5ccc4 Gerrit-Change-Number: 56439 Gerrit-PatchSet: 2 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-Attention: Nico Huber <nico.h(a)gmx.de> Gerrit-Attention: Edward O'Callaghan <quasisec(a)chromium.org> Gerrit-Attention: Anastasia Klimchuk <aklm(a)chromium.org> Gerrit-MessageType: newpatchset

1 0

Change in flashrom[master]: tests: Trim excessive new lines from layout test output
by Angel Pons (Code Review) 20 Jul '21

20 Jul '21

Attention is currently required from: Nico Huber, Edward O'Callaghan, Anastasia Klimchuk. Angel Pons has posted comments on this change. ( https://review.coreboot.org/c/flashrom/+/56439 ) Change subject: tests: Trim excessive new lines from layout test output ...................................................................... Patch Set 1: Code-Review+1 (1 comment) File tests/layout.c: https://review.coreboot.org/c/flashrom/+/56439/comment/f45af773_1c3e5f69 PS1, Line 26: printf("Creating layout..."); nit: Print a space afterwards? printf("Creating layout... "); ^ Otherwise, the next print is contiguous: Creating layout...done -- To view, visit https://review.coreboot.org/c/flashrom/+/56439 To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: flashrom Gerrit-Branch: master Gerrit-Change-Id: I36a39505f8db508672cde5a848684a3a22f5ccc4 Gerrit-Change-Number: 56439 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-Attention: Nico Huber <nico.h(a)gmx.de> Gerrit-Attention: Edward O'Callaghan <quasisec(a)chromium.org> Gerrit-Attention: Anastasia Klimchuk <aklm(a)chromium.org> Gerrit-Comment-Date: Tue, 20 Jul 2021 08:37:38 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 0

Change in flashrom[master]: tests: Add unit tests for layout sanity checks
by Anastasia Klimchuk (Code Review) 20 Jul '21

20 Jul '21

Anastasia Klimchuk has uploaded this change for review. ( https://review.coreboot.org/c/flashrom/+/56440 ) Change subject: tests: Add unit tests for layout sanity checks ...................................................................... tests: Add unit tests for layout sanity checks Three more tests in this patch where layout does / does not pass sanity checks. BUG=b:193584590 TEST=ninja test Change-Id: Ia21585d60443b2741f3868d7887476090e35f79b Signed-off-by: Anastasia Klimchuk <aklm(a)chromium.org> --- M tests/layout.c M tests/tests.c M tests/tests.h 3 files changed, 111 insertions(+), 0 deletions(-) git pull ssh://review.coreboot.org:29418/flashrom refs/changes/40/56440/1 diff --git a/tests/layout.c b/tests/layout.c index 03a61c7..98c726e 100644 --- a/tests/layout.c +++ b/tests/layout.c @@ -16,6 +16,7 @@ #include <include/test.h> #include <stdio.h> +#include "flash.h" #include "layout.h" #include "libflashrom.h" @@ -101,3 +102,107 @@ flashrom_layout_release(layout); printf("done\n"); } + +void layout_pass_sanity_checks_test_success(void **state) +{ + (void) state; /* unused */ + + unsigned int region_start = 0x00021000; + unsigned int region_end = 0x00031000; + unsigned int start = 0; + unsigned int len = 0; + + struct flashrom_layout *layout; + + printf("Creating layout with one included region..."); + assert_int_equal(0, flashrom_layout_new(&layout)); + assert_int_equal(0, flashrom_layout_add_region(layout, region_start, region_end, "region")); + assert_int_equal(0, flashrom_layout_include_region(layout, "region")); + printf("done\n"); + + printf("Asserting region range..."); + get_region_range(layout, "region", &start, &len); + assert_int_equal(start, region_start); + assert_int_equal(len, region_end - region_start + 1); + printf("done\n"); + + printf("Layout passes sanity checks..."); + + struct flashchip chip = { + .total_size = 1024, + }; + struct flashrom_flashctx flash = { + .chip = &chip, + }; + flashrom_layout_set(&flash, layout); + assert_int_equal(0, layout_sanity_checks(&flash)); + + printf("done\n"); + + printf("Releasing layout..."); + flashrom_layout_release(layout); + printf("done\n"); +} + +void layout_region_invalid_address_test_success(void **state) +{ + (void) state; /* unused */ + + struct flashrom_layout *layout; + + printf("Creating layout with one included region..."); + assert_int_equal(0, flashrom_layout_new(&layout)); + assert_int_equal(0, flashrom_layout_add_region(layout, 0x60000000, 0x70000000, "region")); + assert_int_equal(0, flashrom_layout_include_region(layout, "region")); + printf("done\n"); + + printf("Layout does not pass sanity checks..."); + + struct flashchip chip = { + /* Make sure layout region addresses exceed total size on chip. */ + .total_size = 1, + }; + struct flashrom_flashctx flash = { + .chip = &chip, + }; + flashrom_layout_set(&flash, layout); + assert_int_equal(1, layout_sanity_checks(&flash)); + + printf("done\n"); + + printf("Releasing layout..."); + flashrom_layout_release(layout); + printf("done\n"); +} + +void layout_region_invalid_range_test_success(void **state) +{ + (void) state; /* unused */ + + struct flashrom_layout *layout; + + printf("Creating layout with one included region..."); + assert_int_equal(0, flashrom_layout_new(&layout)); + /* Make sure address range of region is not positive i.e. start > end. */ + assert_int_equal(0, flashrom_layout_add_region(layout, 0x00000020, 0x00000010, "region")); + assert_int_equal(0, flashrom_layout_include_region(layout, "region")); + printf("done\n"); + + printf("Layout does not pass sanity checks..."); + + struct flashchip chip = { + /* Make sure layout region addresses fit into total size on chip. */ + .total_size = 1024, + }; + struct flashrom_flashctx flash = { + .chip = &chip, + }; + flashrom_layout_set(&flash, layout); + assert_int_equal(1, layout_sanity_checks(&flash)); + + printf("done\n"); + + printf("Releasing layout..."); + flashrom_layout_release(layout); + printf("done\n"); +} diff --git a/tests/tests.c b/tests/tests.c index 78258b0..00c987c 100644 --- a/tests/tests.c +++ b/tests/tests.c @@ -240,6 +240,9 @@ cmocka_unit_test(included_regions_dont_overlap_test_success), cmocka_unit_test(included_regions_overlap_test_success), cmocka_unit_test(region_not_included_overlap_test_success), + cmocka_unit_test(layout_pass_sanity_checks_test_success), + cmocka_unit_test(layout_region_invalid_address_test_success), + cmocka_unit_test(layout_region_invalid_range_test_success), }; ret |= cmocka_run_group_tests_name("layout.c tests", layout_tests, NULL, NULL); diff --git a/tests/tests.h b/tests/tests.h index eccc05f..14cfee0 100644 --- a/tests/tests.h +++ b/tests/tests.h @@ -51,5 +51,8 @@ void included_regions_dont_overlap_test_success(void **state); void included_regions_overlap_test_success(void **state); void region_not_included_overlap_test_success(void **state); +void layout_pass_sanity_checks_test_success(void **state); +void layout_region_invalid_address_test_success(void **state); +void layout_region_invalid_range_test_success(void **state); #endif /* TESTS_H */ -- To view, visit https://review.coreboot.org/c/flashrom/+/56440 To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: flashrom Gerrit-Branch: master Gerrit-Change-Id: Ia21585d60443b2741f3868d7887476090e35f79b Gerrit-Change-Number: 56440 Gerrit-PatchSet: 1 Gerrit-Owner: Anastasia Klimchuk <aklm(a)chromium.org> Gerrit-MessageType: newchange

1 0

2024

2023

2022

2021

2020

2019

2018

2017

flashrom-gerrit July 2021