October 2022 - flashrom-gerrit

[L] Change in flashrom[master]: flashrom.c: Add wrapper function to use the erase algorithm
by Aarya (Code Review) 28 Oct '22

28 Oct '22

Attention is currently required from: Simon Buhrow, Nico Huber, Thomas Heijligen, Anastasia Klimchuk. Aarya has posted comments on this change. ( https://review.coreboot.org/c/flashrom/+/66104 ) Change subject: flashrom.c: Add wrapper function to use the erase algorithm ...................................................................... Patch Set 66: (1 comment) File flashrom.c: https://review.coreboot.org/c/flashrom/+/66104/comment/af0bd04d_062621e0 PS66, Line 1204: msg_cerr("Write failed at %#lx, Abort.\n", i); > I got an error on this line when building for arm board (ignore the line number): […] Done -- To view, visit https://review.coreboot.org/c/flashrom/+/66104 To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: flashrom Gerrit-Branch: master Gerrit-Change-Id: I29e3f2bd796759794184b125741a5abaac6f3ce8 Gerrit-Change-Number: 66104 Gerrit-PatchSet: 66 Gerrit-Owner: Aarya <aarya.chaumal(a)gmail.com> Gerrit-Reviewer: Simon Buhrow Gerrit-Reviewer: Thomas Heijligen <src(a)posteo.de> Gerrit-Reviewer: build bot (Jenkins) <no-reply(a)coreboot.org> Gerrit-CC: Anastasia Klimchuk <aklm(a)chromium.org> Gerrit-CC: Nico Huber <nico.h(a)gmx.de> Gerrit-CC: Paul Menzel <paulepanter(a)mailbox.org> Gerrit-Attention: Simon Buhrow Gerrit-Attention: Nico Huber <nico.h(a)gmx.de> Gerrit-Attention: Thomas Heijligen <src(a)posteo.de> Gerrit-Attention: Anastasia Klimchuk <aklm(a)chromium.org> Gerrit-Comment-Date: Fri, 28 Oct 2022 15:40:19 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: Anastasia Klimchuk <aklm(a)chromium.org> Gerrit-MessageType: comment

1 0

[L] Change in flashrom[master]: flashrom.c: Add wrapper function to use the erase algorithm
by Aarya (Code Review) 28 Oct '22

28 Oct '22

Attention is currently required from: Simon Buhrow, Nico Huber, Thomas Heijligen, Aarya. Hello build bot (Jenkins), Simon Buhrow, Thomas Heijligen, I'd like you to reexamine a change. Please visit https://review.coreboot.org/c/flashrom/+/66104 to look at the new patch set (#67). Change subject: flashrom.c: Add wrapper function to use the erase algorithm ...................................................................... flashrom.c: Add wrapper function to use the erase algorithm Add a function to call the erase algorithm. Change-Id: I29e3f2bd796759794184b125741a5abaac6f3ce8 Signed-off-by: Aarya Chaumal <aarya.chaumal(a)gmail.com> --- M flashrom.c M tests/chip_wp.c 2 files changed, 144 insertions(+), 289 deletions(-) git pull ssh://review.coreboot.org:29418/flashrom refs/changes/04/66104/67 -- To view, visit https://review.coreboot.org/c/flashrom/+/66104 To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: flashrom Gerrit-Branch: master Gerrit-Change-Id: I29e3f2bd796759794184b125741a5abaac6f3ce8 Gerrit-Change-Number: 66104 Gerrit-PatchSet: 67 Gerrit-Owner: Aarya <aarya.chaumal(a)gmail.com> Gerrit-Reviewer: Simon Buhrow Gerrit-Reviewer: Thomas Heijligen <src(a)posteo.de> Gerrit-Reviewer: build bot (Jenkins) <no-reply(a)coreboot.org> Gerrit-CC: Anastasia Klimchuk <aklm(a)chromium.org> Gerrit-CC: Nico Huber <nico.h(a)gmx.de> Gerrit-CC: Paul Menzel <paulepanter(a)mailbox.org> Gerrit-Attention: Simon Buhrow Gerrit-Attention: Nico Huber <nico.h(a)gmx.de> Gerrit-Attention: Thomas Heijligen <src(a)posteo.de> Gerrit-Attention: Aarya <aarya.chaumal(a)gmail.com> Gerrit-MessageType: newpatchset

1 0

[M] Change in flashrom[master]: tests: add probe lifecycle test for ch341a_spi
by Anastasia Klimchuk (Code Review) 28 Oct '22

28 Oct '22

Attention is currently required from: Alexander Goncharov. Anastasia Klimchuk has posted comments on this change. ( https://review.coreboot.org/c/flashrom/+/68755 ) Change subject: tests: add probe lifecycle test for ch341a_spi ...................................................................... Patch Set 2: (1 comment) File tests/ch341a_spi.c: https://review.coreboot.org/c/flashrom/+/68755/comment/c289bf39_85f5bf89 PS2, Line 26: struct libusb_transfer *transfer_in; I see the programmer has an array of these, but io_state has one. Is that because only one iteration of the loop is needed in `usb_transfer`? (I am guessing). So programmer reserves an array, but to run this unit test only one item of `transfer_in` is needed? If yes, all good, just please add a comment. -- To view, visit https://review.coreboot.org/c/flashrom/+/68755 To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: flashrom Gerrit-Branch: master Gerrit-Change-Id: I0a2d5591d097435fc69719e1d9bd153433425821 Gerrit-Change-Number: 68755 Gerrit-PatchSet: 2 Gerrit-Owner: Alexander Goncharov <chat(a)joursoir.net> Gerrit-Reviewer: Anastasia Klimchuk <aklm(a)chromium.org> Gerrit-Reviewer: build bot (Jenkins) <no-reply(a)coreboot.org> Gerrit-Attention: Alexander Goncharov <chat(a)joursoir.net> Gerrit-Comment-Date: Fri, 28 Oct 2022 07:39:04 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment

1 0

[M] Change in flashrom[master]: tests: add basic lifecycle test for ch341a_spi
by Anastasia Klimchuk (Code Review) 28 Oct '22

28 Oct '22

Attention is currently required from: Felix Singer, Thomas Heijligen, Alexander Goncharov. Anastasia Klimchuk has posted comments on this change. ( https://review.coreboot.org/c/flashrom/+/67664 ) Change subject: tests: add basic lifecycle test for ch341a_spi ...................................................................... Patch Set 8: (1 comment) File tests/ch341a_spi.c: https://review.coreboot.org/c/flashrom/+/67664/comment/0aee38dd_335adbb8 PS8, Line 38: if (transfer->endpoint == WRITE_EP) Just wanted to mention: the assertion on the previous line makes sure this condition is always true. Technically this "if" is not needed in this patch. However, I see that it becomes needed in the next patch. My preference would be to introduce this "if" condition in the next patch, so that it would be very clear why the code is there. But if other people have strong opposite opinions, I can live with "if" in this patch. -- To view, visit https://review.coreboot.org/c/flashrom/+/67664 To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: flashrom Gerrit-Branch: master Gerrit-Change-Id: If28fbe09ad685082152aa3a7e8d5a150169aee9e Gerrit-Change-Number: 67664 Gerrit-PatchSet: 8 Gerrit-Owner: Alexander Goncharov <chat(a)joursoir.net> Gerrit-Reviewer: Anastasia Klimchuk <aklm(a)chromium.org> Gerrit-Reviewer: Thomas Heijligen <src(a)posteo.de> 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: Alexander Goncharov <chat(a)joursoir.net> Gerrit-Comment-Date: Fri, 28 Oct 2022 07:20:31 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment

1 0

[M] Change in flashrom[master]: tests: add basic lifecycle test for ch341a_spi
by Anastasia Klimchuk (Code Review) 28 Oct '22

28 Oct '22

Attention is currently required from: Felix Singer, Thomas Heijligen, Alexander Goncharov. Anastasia Klimchuk has posted comments on this change. ( https://review.coreboot.org/c/flashrom/+/67664 ) Change subject: tests: add basic lifecycle test for ch341a_spi ...................................................................... Patch Set 8: (1 comment) Patchset: PS8: Just to check: I see you uploaded new patchset, but there are some unresolved comments at the moment. Do you mean this is ready for the next iteration of reviews, or should reviewers wait until you resolve the comments? Thanks! -- To view, visit https://review.coreboot.org/c/flashrom/+/67664 To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: flashrom Gerrit-Branch: master Gerrit-Change-Id: If28fbe09ad685082152aa3a7e8d5a150169aee9e Gerrit-Change-Number: 67664 Gerrit-PatchSet: 8 Gerrit-Owner: Alexander Goncharov <chat(a)joursoir.net> Gerrit-Reviewer: Anastasia Klimchuk <aklm(a)chromium.org> Gerrit-Reviewer: Thomas Heijligen <src(a)posteo.de> 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: Alexander Goncharov <chat(a)joursoir.net> Gerrit-Comment-Date: Fri, 28 Oct 2022 07:10:56 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment

1 0

[S] Change in flashrom[master]: tests: Add wrap for __fprintf_chk
by Anastasia Klimchuk (Code Review) 28 Oct '22

28 Oct '22

Attention is currently required from: Felix Singer, Thomas Heijligen, Peter Marheine. Anastasia Klimchuk has posted comments on this change. ( https://review.coreboot.org/c/flashrom/+/68432 ) Change subject: tests: Add wrap for __fprintf_chk ...................................................................... Patch Set 2: (1 comment) Patchset: PS2: > This doesn't seem clang-specific; it looks like glibc does this if `_FORTIFY_SOURCE` is enabled (som […] Thank you, that's an interesting idea, I decided to try. At the moment I am getting `error: "_FORTIFY_SOURCE" redefined` (when I set it in tests/meson.build), it does not build. Maybe I am missing something, I can look once again later. -- To view, visit https://review.coreboot.org/c/flashrom/+/68432 To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: flashrom Gerrit-Branch: master Gerrit-Change-Id: I70cb1cd90d1f377ff4606acad3c1b514120ae4f7 Gerrit-Change-Number: 68432 Gerrit-PatchSet: 2 Gerrit-Owner: Anastasia Klimchuk <aklm(a)chromium.org> Gerrit-Reviewer: Angel Pons <th3fanbus(a)gmail.com> Gerrit-Reviewer: Felix Singer <felixsinger(a)posteo.net> 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-Attention: Felix Singer <felixsinger(a)posteo.net> Gerrit-Attention: Thomas Heijligen <src(a)posteo.de> Gerrit-Attention: Peter Marheine <pmarheine(a)chromium.org> Gerrit-Comment-Date: Fri, 28 Oct 2022 06:02:04 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: Peter Marheine <pmarheine(a)chromium.org> Gerrit-MessageType: comment

1 0

[S] Change in flashrom[master]: ichspi.c: plumb flashctx through hwseq xfer helper
by Edward O'Callaghan (Code Review) 28 Oct '22

28 Oct '22

Attention is currently required from: Angel Pons, Anastasia Klimchuk. Edward O'Callaghan has posted comments on this change. ( https://review.coreboot.org/c/flashrom/+/68772 ) Change subject: ichspi.c: plumb flashctx through hwseq xfer helper ...................................................................... Patch Set 2: (2 comments) Commit Message: https://review.coreboot.org/c/flashrom/+/68772/comment/a1be592a_61ee57e1 PS1, Line 7: though > th*r*ough Done https://review.coreboot.org/c/flashrom/+/68772/comment/2e940ddb_81f72911 PS1, Line 9: prepare ichspi to remove hwseq_data being : a global symbol. > Please mention the patch where this is done. CB:68774. Done -- To view, visit https://review.coreboot.org/c/flashrom/+/68772 To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: flashrom Gerrit-Branch: master Gerrit-Change-Id: I67b5aa6350930d912e5036473ac3e792debac0bd Gerrit-Change-Number: 68772 Gerrit-PatchSet: 2 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: Felix Singer <felixsinger(a)posteo.net> Gerrit-Reviewer: build bot (Jenkins) <no-reply(a)coreboot.org> Gerrit-CC: Subrata Banik <subratabanik(a)google.com> Gerrit-Attention: Angel Pons <th3fanbus(a)gmail.com> Gerrit-Attention: Anastasia Klimchuk <aklm(a)chromium.org> Gerrit-Comment-Date: Fri, 28 Oct 2022 05:37:45 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: Felix Singer <felixsinger(a)posteo.net> Gerrit-MessageType: comment

1 0

[S] Change in flashrom[master]: ichspi.c: plumb flashctx through hwseq xfer helper
by Edward O'Callaghan (Code Review) 28 Oct '22

28 Oct '22

Attention is currently required from: Edward O'Callaghan, Angel Pons, Anastasia Klimchuk. Hello Felix Singer, build bot (Jenkins), Angel Pons, Anastasia Klimchuk, I'd like you to reexamine a change. Please visit https://review.coreboot.org/c/flashrom/+/68772 to look at the new patch set (#2). Change subject: ichspi.c: plumb flashctx through hwseq xfer helper ...................................................................... ichspi.c: plumb flashctx through hwseq xfer helper Change is a NOP to prepare ichspi to remove hwseq_data being a global symbol in CB:68774. This allows for the helper functions to derive their data from the driver data context. Change-Id: I67b5aa6350930d912e5036473ac3e792debac0bd Signed-off-by: Edward O'Callaghan <quasisec(a)google.com> --- M ichspi.c 1 file changed, 23 insertions(+), 8 deletions(-) git pull ssh://review.coreboot.org:29418/flashrom refs/changes/72/68772/2 -- To view, visit https://review.coreboot.org/c/flashrom/+/68772 To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: flashrom Gerrit-Branch: master Gerrit-Change-Id: I67b5aa6350930d912e5036473ac3e792debac0bd Gerrit-Change-Number: 68772 Gerrit-PatchSet: 2 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: Felix Singer <felixsinger(a)posteo.net> Gerrit-Reviewer: build bot (Jenkins) <no-reply(a)coreboot.org> Gerrit-CC: Subrata Banik <subratabanik(a)google.com> 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-MessageType: newpatchset

1 0

[M] Change in flashrom[master]: tree/: Convert flashchip decode range func ptr to enum
by Edward O'Callaghan (Code Review) 28 Oct '22

28 Oct '22

Edward O'Callaghan has submitted this change. ( https://review.coreboot.org/c/flashrom/+/67195 ) ( 8 is the latest approved patch-set. No files were changed between the latest approved patch-set and the submitted one. )Change subject: tree/: Convert flashchip decode range func ptr to enum ...................................................................... tree/: Convert flashchip decode range func ptr to enum Replace the `decode_range` function pointer in `struct flashchip` to an enum value. The enum value can be used to find the corresponding function pointer by passing it to `lookup_decode_range_func_ptr()`. Removing function pointers like `decode_range` makes it possible to represent chip data in a declarative format that does not have to be stored as C source code. BUG=b:242479049 BRANCH=none TEST=ninja && ninja test Signed-off-by: Nikolai Artemiev <nartemiev(a)google.com> Change-Id: If6d08d414d3d1ddadc95ca1d407fc87c23ab543d Reviewed-on: https://review.coreboot.org/c/flashrom/+/67195 Reviewed-by: Edward O'Callaghan <quasisec(a)chromium.org> Reviewed-by: Felix Singer <felixsinger(a)posteo.net> Tested-by: build bot (Jenkins) <no-reply(a)coreboot.org> --- M flashchips.c M include/flash.h M tests/chip_wp.c M writeprotect.c 4 files changed, 76 insertions(+), 28 deletions(-) Approvals: build bot (Jenkins): Verified Felix Singer: Looks good to me, but someone else must approve Edward O'Callaghan: Looks good to me, approved diff --git a/flashchips.c b/flashchips.c index 41e4c42..cbfbc7b 100644 --- a/flashchips.c +++ b/flashchips.c @@ -2451,7 +2451,7 @@ .sec = {STATUS1, 6, RW}, .cmp = {STATUS2, 6, RW}, }, - .decode_range = decode_range_spi25, + .decode_range = DECODE_RANGE_SPI25, }, { @@ -5183,7 +5183,7 @@ .bp = {{STATUS1, 2, RW}, {STATUS1, 3, RW}, {STATUS1, 4, RW}}, .tb = {STATUS1, 5, RW}, /* Called BP3 in datasheet, acts like TB */ }, - .decode_range = decode_range_spi25, + .decode_range = DECODE_RANGE_SPI25, }, { @@ -6371,7 +6371,7 @@ .sec = {STATUS1, 6, RW}, /* Called BP4 in datasheet, acts like SEC */ .cmp = {STATUS2, 6, RW}, }, - .decode_range = decode_range_spi25, + .decode_range = DECODE_RANGE_SPI25, }, { @@ -6537,7 +6537,7 @@ .sec = {STATUS1, 6, RW}, /* Called BP4 in datasheet, acts like SEC */ .cmp = {STATUS2, 6, RW}, }, - .decode_range = decode_range_spi25, + .decode_range = DECODE_RANGE_SPI25, }, { @@ -6665,7 +6665,7 @@ .sec = {STATUS1, 6, RW}, /* Called BP4 in datasheet, acts like SEC */ .cmp = {STATUS2, 6, RW}, }, - .decode_range = decode_range_spi25, + .decode_range = DECODE_RANGE_SPI25, }, { @@ -6798,7 +6798,7 @@ .bp = {{STATUS1, 2, RW}, {STATUS1, 3, RW}, {STATUS1, 4, RW}, {STATUS1, 5, RW}}, .tb = {STATUS1, 6, RW}, }, - .decode_range = decode_range_spi25, + .decode_range = DECODE_RANGE_SPI25, }, { @@ -6847,7 +6847,7 @@ .sec = {STATUS1, 6, RW}, /* Called BP4 in datasheet, acts like SEC */ .cmp = {STATUS2, 6, RW}, }, - .decode_range = decode_range_spi25, + .decode_range = DECODE_RANGE_SPI25, }, { @@ -6969,7 +6969,7 @@ .sec = {STATUS1, 6, RW}, /* Called BP4 in datasheet, acts like SEC */ .cmp = {STATUS2, 6, RW}, }, - .decode_range = decode_range_spi25, + .decode_range = DECODE_RANGE_SPI25, }, { @@ -16236,7 +16236,7 @@ .cmp = {STATUS2, 6, RW}, .wps = {STATUS3, 2, RW}, }, - .decode_range = decode_range_spi25, + .decode_range = DECODE_RANGE_SPI25, }, { @@ -16729,7 +16729,7 @@ .cmp = {STATUS2, 6, RW}, .wps = {STATUS3, 2, RW}, }, - .decode_range = decode_range_spi25, + .decode_range = DECODE_RANGE_SPI25, }, { @@ -17347,7 +17347,7 @@ .cmp = {STATUS2, 6, RW}, .wps = {STATUS3, 2, RW}, }, - .decode_range = decode_range_spi25, + .decode_range = DECODE_RANGE_SPI25, }, { @@ -17395,7 +17395,7 @@ .sec = {STATUS1, 6, RW}, .cmp = {STATUS2, 6, RW}, }, - .decode_range = decode_range_spi25, + .decode_range = DECODE_RANGE_SPI25, }, { @@ -17445,7 +17445,7 @@ .sec = {STATUS1, 6, RW}, .cmp = {STATUS2, 6, RW}, }, - .decode_range = decode_range_spi25, + .decode_range = DECODE_RANGE_SPI25, }, { @@ -17493,7 +17493,7 @@ .sec = {STATUS1, 6, RW}, .cmp = {STATUS2, 6, RW}, }, - .decode_range = decode_range_spi25, + .decode_range = DECODE_RANGE_SPI25, }, { @@ -17663,7 +17663,7 @@ .tb = {STATUS1, 6, RW}, .cmp = {STATUS2, 6, RW}, }, - .decode_range = decode_range_spi25, + .decode_range = DECODE_RANGE_SPI25, }, { @@ -17718,7 +17718,7 @@ .tb = {STATUS1, 6, RW}, .cmp = {STATUS2, 6, RW}, }, - .decode_range = decode_range_spi25, + .decode_range = DECODE_RANGE_SPI25, }, { @@ -17773,7 +17773,7 @@ .tb = {STATUS1, 6, RW}, .cmp = {STATUS2, 6, RW}, }, - .decode_range = decode_range_spi25, + .decode_range = DECODE_RANGE_SPI25, }, { @@ -18238,7 +18238,7 @@ .sec = {STATUS1, 6, RW}, .cmp = {STATUS2, 6, RW}, }, - .decode_range = decode_range_spi25, + .decode_range = DECODE_RANGE_SPI25, }, { @@ -18290,7 +18290,7 @@ .cmp = {STATUS2, 6, RW}, .wps = {STATUS3, 2, RW}, }, - .decode_range = decode_range_spi25, + .decode_range = DECODE_RANGE_SPI25, }, { @@ -18380,7 +18380,7 @@ .sec = {STATUS1, 6, RW}, .cmp = {STATUS2, 6, RW}, }, - .decode_range = decode_range_spi25, + .decode_range = DECODE_RANGE_SPI25, }, { @@ -19752,7 +19752,7 @@ .sec = {STATUS1, 6, RW}, .cmp = {STATUS2, 6, RW}, }, - .decode_range = decode_range_spi25, + .decode_range = DECODE_RANGE_SPI25, }, { @@ -19842,7 +19842,7 @@ .bp = {{STATUS1, 2, RW}, {STATUS1, 3, RW}, {STATUS1, 4, RW}, {STATUS1, 5, RW}}, .tb = {STATUS1, 6, RW}, }, - .decode_range = decode_range_spi25, + .decode_range = DECODE_RANGE_SPI25, }, { diff --git a/include/flash.h b/include/flash.h index 633601d..32290e4 100644 --- a/include/flash.h +++ b/include/flash.h @@ -211,6 +211,12 @@ struct wp_bits; +enum decode_range_func { + NO_DECODE_RANGE_FUNC = 0, /* 0 indicates no range decode funciton is set. */ + DECODE_RANGE_SPI25 = 1, +}; +typedef void (decode_range_func_t)(size_t *start, size_t *len, const struct wp_bits *, size_t chip_len); + struct flashchip { const char *vendor; const char *name; @@ -321,9 +327,11 @@ struct reg_bit_info wps; } reg_bits; - /* Function that takes a set of WP config bits (e.g. BP, SEC, TB, etc) */ - /* and determines what protection range they select. */ - void (*decode_range)(size_t *start, size_t *len, const struct wp_bits *, size_t chip_len); + /* + * Function that takes a set of WP config bits (e.g. BP, SEC, TB, etc) + * and determines what protection range they select. + */ + enum decode_range_func decode_range; }; typedef int (*chip_restore_fn_cb_t)(struct flashctx *flash, uint8_t status); diff --git a/tests/chip_wp.c b/tests/chip_wp.c index 95e6b05..e4eff99 100644 --- a/tests/chip_wp.c +++ b/tests/chip_wp.c @@ -97,7 +97,7 @@ .cmp = {STATUS2, 6, RW}, .wps = {STATUS3, 2, RW}, }, - .decode_range = decode_range_spi25, + .decode_range = DECODE_RANGE_SPI25, }; /* Trying to set an unsupported WP range fails */ diff --git a/writeprotect.c b/writeprotect.c index 57d0f9b..dcffe03 100644 --- a/writeprotect.c +++ b/writeprotect.c @@ -174,11 +174,26 @@ return FLASHROM_WP_OK; } +static decode_range_func_t *lookup_decode_range_func_ptr(const struct flashchip *chip) +{ + switch (chip->decode_range) { + case DECODE_RANGE_SPI25: return &decode_range_spi25; + /* default: total function, 0 indicates no decode range function set. */ + case NO_DECODE_RANGE_FUNC: return NULL; + }; + + return NULL; +} + + /** Get the range selected by a WP configuration. */ static enum flashrom_wp_result get_wp_range(struct wp_range *range, struct flashctx *flash, const struct wp_bits *bits) { - flash->chip->decode_range(&range->start, &range->len, bits, flashrom_flash_getsize(flash)); + decode_range_func_t *decode_range = lookup_decode_range_func_ptr(flash->chip); + if (decode_range == NULL) + return FLASHROM_WP_ERR_OTHER; + decode_range(&range->start, &range->len, bits, flashrom_flash_getsize(flash)); return FLASHROM_WP_OK; } @@ -424,7 +439,7 @@ static bool chip_supported(struct flashctx *flash) { - return (flash->chip != NULL) && (flash->chip->decode_range != NULL); + return (flash->chip != NULL) && (flash->chip->decode_range != NO_DECODE_RANGE_FUNC); } -- To view, visit https://review.coreboot.org/c/flashrom/+/67195 To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: flashrom Gerrit-Branch: master Gerrit-Change-Id: If6d08d414d3d1ddadc95ca1d407fc87c23ab543d Gerrit-Change-Number: 67195 Gerrit-PatchSet: 14 Gerrit-Owner: Nikolai Artemiev <nartemiev(a)google.com> Gerrit-Reviewer: Anastasia Klimchuk <aklm(a)chromium.org> Gerrit-Reviewer: Edward O'Callaghan <quasisec(a)chromium.org> Gerrit-Reviewer: Felix Singer <felixsinger(a)posteo.net> Gerrit-Reviewer: build bot (Jenkins) <no-reply(a)coreboot.org> Gerrit-MessageType: merged

1 0

[M] Change in flashrom[master]: flashrom_tester: Use Path type for test data
by Peter Marheine (Code Review) 28 Oct '22

28 Oct '22

Attention is currently required from: Angel Pons, Evan Benn. Peter Marheine has posted comments on this change. ( https://review.coreboot.org/c/flashrom/+/68643 ) Change subject: flashrom_tester: Use Path type for test data ...................................................................... Patch Set 3: Code-Review+1 -- To view, visit https://review.coreboot.org/c/flashrom/+/68643 To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: flashrom Gerrit-Branch: master Gerrit-Change-Id: I4a0b25c8c70fa6dfd682fba3db7d3bf06b2eb7ac Gerrit-Change-Number: 68643 Gerrit-PatchSet: 3 Gerrit-Owner: Evan Benn <evanbenn(a)google.com> Gerrit-Reviewer: Angel Pons <th3fanbus(a)gmail.com> Gerrit-Reviewer: Peter Marheine <pmarheine(a)chromium.org> Gerrit-Reviewer: build bot (Jenkins) <no-reply(a)coreboot.org> Gerrit-Attention: Angel Pons <th3fanbus(a)gmail.com> Gerrit-Attention: Evan Benn <evanbenn(a)google.com> Gerrit-Comment-Date: Fri, 28 Oct 2022 00:29:22 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 0

2024

2023

2022

2021

2020

2019

2018

2017

flashrom-gerrit October 2022