January 2023 - flashrom-gerrit

[S] Change in flashrom[master]: MAINTAINERS: Add Alexander Goncharov for bash completion
by Anastasia Klimchuk (Code Review) 24 Jan '23

24 Jan '23

Attention is currently required from: Felix Singer, Alexander Goncharov. Anastasia Klimchuk has posted comments on this change. ( https://review.coreboot.org/c/flashrom/+/72393 ) Change subject: MAINTAINERS: Add Alexander Goncharov for bash completion ...................................................................... Patch Set 3: Code-Review+2 -- To view, visit https://review.coreboot.org/c/flashrom/+/72393 To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: flashrom Gerrit-Branch: master Gerrit-Change-Id: I5cdae05a46dbd61060ff2b84accb9297334a6301 Gerrit-Change-Number: 72393 Gerrit-PatchSet: 3 Gerrit-Owner: Alexander Goncharov <chat(a)joursoir.net> Gerrit-Reviewer: Anastasia Klimchuk <aklm(a)chromium.org> Gerrit-Reviewer: Felix Singer <felixsinger(a)posteo.net> Gerrit-Reviewer: build bot (Jenkins) <no-reply(a)coreboot.org> Gerrit-Attention: Felix Singer <felixsinger(a)posteo.net> Gerrit-Attention: Alexander Goncharov <chat(a)joursoir.net> Gerrit-Comment-Date: Tue, 24 Jan 2023 22:45:07 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 0

[S] Change in flashrom[1.3.x]: libflashrom: Fix comparison of layout entries
by Nico Huber (Code Review) 24 Jan '23

24 Jan '23

Nico Huber has uploaded this change for review. ( https://review.coreboot.org/c/flashrom/+/72433 ) Change subject: libflashrom: Fix comparison of layout entries ...................................................................... libflashrom: Fix comparison of layout entries A `next` pointer was added to `struct romentry` in commit 953c5ad44058 (layout: Use linked list for `struct romentry`). Hence, comparing the whole contents to match entries doesn't work anymore. Solve that by comparing the `start`, `end` and `name` fields individually. The introduced layout_cmp() function could be made a new API, but that's not necessary for the release branch. Change-Id: I125d3892d9efc68e8fc19eef559c82d46c3bdc94 Signed-off-by: Nico Huber <nico.h(a)gmx.de> --- M libflashrom.c 1 file changed, 34 insertions(+), 1 deletion(-) git pull ssh://review.coreboot.org:29418/flashrom refs/changes/33/72433/1 diff --git a/libflashrom.c b/libflashrom.c index ce9d351..60edb66 100644 --- a/libflashrom.c +++ b/libflashrom.c @@ -266,6 +266,21 @@ } } +static int layout_cmp(const struct romentry *const a, const struct romentry *const b) +{ + int ret; + + ret = (int)a->start - (int)b->start; + if (ret) + return ret; + + ret = (int)a->end - (int)b->end; + if (ret) + return ret; + + return strcmp(a->name, b->name); +} + int flashrom_layout_read_from_ifd(struct flashrom_layout **const layout, struct flashctx *const flashctx, const void *const dump, const size_t len) { @@ -303,7 +318,7 @@ const struct romentry *chip_entry = layout_next(chip_layout, NULL); const struct romentry *dump_entry = layout_next(dump_layout, NULL); - while (chip_entry && dump_entry && !memcmp(chip_entry, dump_entry, sizeof(*chip_entry))) { + while (chip_entry && dump_entry && !layout_cmp(chip_entry, dump_entry)) { chip_entry = layout_next(chip_layout, chip_entry); dump_entry = layout_next(dump_layout, dump_entry); } -- To view, visit https://review.coreboot.org/c/flashrom/+/72433 To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: flashrom Gerrit-Branch: 1.3.x Gerrit-Change-Id: I125d3892d9efc68e8fc19eef559c82d46c3bdc94 Gerrit-Change-Number: 72433 Gerrit-PatchSet: 1 Gerrit-Owner: Nico Huber <nico.h(a)gmx.de> Gerrit-MessageType: newchange

1 0

[M] Change in flashrom[master]: flashrom.c: Supplement `chip->unlock()` calls with wp unlocking
by Sergii Dmytruk (Code Review) 24 Jan '23

24 Jan '23

Attention is currently required from: Edward O'Callaghan, Nikolai Artemiev. Sergii Dmytruk has posted comments on this change. ( https://review.coreboot.org/c/flashrom/+/69517 ) Change subject: flashrom.c: Supplement `chip->unlock()` calls with wp unlocking ...................................................................... Patch Set 13: Code-Review+1 (1 comment) File flashrom.c: https://review.coreboot.org/c/flashrom/+/69517/comment/aed41875_d43267f2 PS13, Line 1931: restore_flash_wp(flash, initial_wp_cfg); Indirectly calling `flashrom_wp_write_cfg` is intentional here? I guess it won't hurt, just looks weird to read configuration and then write it back. -- To view, visit https://review.coreboot.org/c/flashrom/+/69517 To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: flashrom Gerrit-Branch: master Gerrit-Change-Id: I74b3f5d3a17749ea60485b916b2d87467a5d8b2f Gerrit-Change-Number: 69517 Gerrit-PatchSet: 13 Gerrit-Owner: Edward O'Callaghan <quasisec(a)chromium.org> Gerrit-Reviewer: Anastasia Klimchuk <aklm(a)chromium.org> Gerrit-Reviewer: Edward O'Callaghan <quasisec(a)chromium.org> Gerrit-Reviewer: Nikolai Artemiev <nartemiev(a)google.com> Gerrit-Reviewer: Sergii Dmytruk <sergii.dmytruk(a)3mdeb.com> Gerrit-Reviewer: build bot (Jenkins) <no-reply(a)coreboot.org> Gerrit-Attention: Edward O'Callaghan <quasisec(a)chromium.org> Gerrit-Attention: Nikolai Artemiev <nartemiev(a)google.com> Gerrit-Comment-Date: Tue, 24 Jan 2023 15:51:06 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 0

[M] Change in flashrom[master]: ni845x_spi: refactor singleton states into reentrant pattern
by Alexander Goncharov (Code Review) 24 Jan '23

24 Jan '23

Hello build bot (Jenkins), I'd like you to reexamine a change. Please visit https://review.coreboot.org/c/flashrom/+/72160 to look at the new patch set (#2). Change subject: ni845x_spi: refactor singleton states into reentrant pattern ...................................................................... ni845x_spi: refactor singleton states into reentrant pattern Move global singleton states into a struct and store within the spi_master data field for the life-time of the driver. TOPIC=register_master_api Change-Id: I45fcb8e20582cb0c532c4a9f0c78543a25f8d484 Signed-off-by: Alexander Goncharov <chat(a)joursoir.net> Ticket: https://ticket.coreboot.org/issues/391 --- M ni845x_spi.c 1 file changed, 75 insertions(+), 32 deletions(-) git pull ssh://review.coreboot.org:29418/flashrom refs/changes/60/72160/2 -- To view, visit https://review.coreboot.org/c/flashrom/+/72160 To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: flashrom Gerrit-Branch: master Gerrit-Change-Id: I45fcb8e20582cb0c532c4a9f0c78543a25f8d484 Gerrit-Change-Number: 72160 Gerrit-PatchSet: 2 Gerrit-Owner: Alexander Goncharov <chat(a)joursoir.net> Gerrit-Reviewer: build bot (Jenkins) <no-reply(a)coreboot.org> Gerrit-MessageType: newpatchset

1 0

[S] Change in flashrom[master]: ni845x_spi: introduce a separate func for cleaning up
by Alexander Goncharov (Code Review) 24 Jan '23

24 Jan '23

Hello build bot (Jenkins), I'd like you to reexamine a change. Please visit https://review.coreboot.org/c/flashrom/+/72159 to look at the new patch set (#2). Change subject: ni845x_spi: introduce a separate func for cleaning up ...................................................................... ni845x_spi: introduce a separate func for cleaning up Shutdown function of programmer shouldn't be used as a clean-up routine. This is due to the fact that the programmer's data is passed there, ready only at the end of the initialization. TOPIC=register_master_api Change-Id: I8b32129b8d0dff9a7516973893fa4bf92f9e64db Signed-off-by: Alexander Goncharov <chat(a)joursoir.net> Ticket: https://ticket.coreboot.org/issues/391 --- M ni845x_spi.c 1 file changed, 25 insertions(+), 2 deletions(-) git pull ssh://review.coreboot.org:29418/flashrom refs/changes/59/72159/2 -- To view, visit https://review.coreboot.org/c/flashrom/+/72159 To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: flashrom Gerrit-Branch: master Gerrit-Change-Id: I8b32129b8d0dff9a7516973893fa4bf92f9e64db Gerrit-Change-Number: 72159 Gerrit-PatchSet: 2 Gerrit-Owner: Alexander Goncharov <chat(a)joursoir.net> Gerrit-Reviewer: build bot (Jenkins) <no-reply(a)coreboot.org> Gerrit-MessageType: newpatchset

1 0

[S] Change in flashrom[master]: MAINTAINERS: Add Alexander Goncharov for bash completion
by Alexander Goncharov (Code Review) 24 Jan '23

24 Jan '23

Attention is currently required from: Felix Singer, Anastasia Klimchuk. Alexander Goncharov has posted comments on this change. ( https://review.coreboot.org/c/flashrom/+/72393 ) Change subject: MAINTAINERS: Add Alexander Goncharov for bash completion ...................................................................... Patch Set 3: (2 comments) Commit Message: https://review.coreboot.org/c/flashrom/+/72393/comment/9b36e4a1_a895e785 PS1, Line 7: maintainers > Uppercase: it's the name of the file. Done File MAINTAINERS: https://review.coreboot.org/c/flashrom/+/72393/comment/7d4ac4f3_f43a03d1 PS1, Line 156: BASH COMPLETION > Your entry should go first (abc order). […] Got it! Done. -- To view, visit https://review.coreboot.org/c/flashrom/+/72393 To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: flashrom Gerrit-Branch: master Gerrit-Change-Id: I5cdae05a46dbd61060ff2b84accb9297334a6301 Gerrit-Change-Number: 72393 Gerrit-PatchSet: 3 Gerrit-Owner: Alexander Goncharov <chat(a)joursoir.net> Gerrit-Reviewer: Anastasia Klimchuk <aklm(a)chromium.org> Gerrit-Reviewer: Felix Singer <felixsinger(a)posteo.net> Gerrit-Reviewer: build bot (Jenkins) <no-reply(a)coreboot.org> Gerrit-Attention: Felix Singer <felixsinger(a)posteo.net> Gerrit-Attention: Anastasia Klimchuk <aklm(a)chromium.org> Gerrit-Comment-Date: Tue, 24 Jan 2023 10:53:51 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: Anastasia Klimchuk <aklm(a)chromium.org> Gerrit-MessageType: comment

1 0

[S] Change in flashrom[master]: MAINTAINERS: Add Alexander Goncharov for bash completion
by Alexander Goncharov (Code Review) 24 Jan '23

24 Jan '23

Attention is currently required from: Felix Singer, Alexander Goncharov. Hello Felix Singer, build bot (Jenkins), Anastasia Klimchuk, I'd like you to reexamine a change. Please visit https://review.coreboot.org/c/flashrom/+/72393 to look at the new patch set (#3). Change subject: MAINTAINERS: Add Alexander Goncharov for bash completion ...................................................................... MAINTAINERS: Add Alexander Goncharov for bash completion Change-Id: I5cdae05a46dbd61060ff2b84accb9297334a6301 Signed-off-by: Alexander Goncharov <chat(a)joursoir.net> --- M MAINTAINERS 1 file changed, 15 insertions(+), 0 deletions(-) git pull ssh://review.coreboot.org:29418/flashrom refs/changes/93/72393/3 -- To view, visit https://review.coreboot.org/c/flashrom/+/72393 To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: flashrom Gerrit-Branch: master Gerrit-Change-Id: I5cdae05a46dbd61060ff2b84accb9297334a6301 Gerrit-Change-Number: 72393 Gerrit-PatchSet: 3 Gerrit-Owner: Alexander Goncharov <chat(a)joursoir.net> Gerrit-Reviewer: Anastasia Klimchuk <aklm(a)chromium.org> Gerrit-Reviewer: Felix Singer <felixsinger(a)posteo.net> Gerrit-Reviewer: build bot (Jenkins) <no-reply(a)coreboot.org> Gerrit-Attention: Felix Singer <felixsinger(a)posteo.net> Gerrit-Attention: Alexander Goncharov <chat(a)joursoir.net> Gerrit-MessageType: newpatchset

1 0

[S] Change in flashrom[master]: MAINTAINERS: Add Alexander Goncharov for bash completion
by Alexander Goncharov (Code Review) 24 Jan '23

24 Jan '23

Attention is currently required from: Felix Singer, Alexander Goncharov. Hello Felix Singer, build bot (Jenkins), Anastasia Klimchuk, I'd like you to reexamine a change. Please visit https://review.coreboot.org/c/flashrom/+/72393 to look at the new patch set (#2). Change subject: MAINTAINERS: Add Alexander Goncharov for bash completion ...................................................................... MAINTAINERS: Add Alexander Goncharov for bash completion Change-Id: I5cdae05a46dbd61060ff2b84accb9297334a6301 Signed-off-by: Alexander Goncharov <chat(a)joursoir.net> --- M MAINTAINERS 1 file changed, 15 insertions(+), 0 deletions(-) git pull ssh://review.coreboot.org:29418/flashrom refs/changes/93/72393/2 -- To view, visit https://review.coreboot.org/c/flashrom/+/72393 To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: flashrom Gerrit-Branch: master Gerrit-Change-Id: I5cdae05a46dbd61060ff2b84accb9297334a6301 Gerrit-Change-Number: 72393 Gerrit-PatchSet: 2 Gerrit-Owner: Alexander Goncharov <chat(a)joursoir.net> Gerrit-Reviewer: Anastasia Klimchuk <aklm(a)chromium.org> Gerrit-Reviewer: Felix Singer <felixsinger(a)posteo.net> Gerrit-Reviewer: build bot (Jenkins) <no-reply(a)coreboot.org> Gerrit-Attention: Felix Singer <felixsinger(a)posteo.net> Gerrit-Attention: Alexander Goncharov <chat(a)joursoir.net> Gerrit-MessageType: newpatchset

1 0

[S] Change in flashrom[master]: dummyflasher: fix propagation of register_*_master() return values
by Alexander Goncharov (Code Review) 24 Jan '23

24 Jan '23

Alexander Goncharov has uploaded this change for review. ( https://review.coreboot.org/c/flashrom/+/72430 ) Change subject: dummyflasher: fix propagation of register_*_master() return values ...................................................................... dummyflasher: fix propagation of register_*_master() return values This patch checks return value of register_*_master() so that in case of an error this error is not ignored anymore. TEST=ninja test Change-Id: I3a7eeb3cdd814db18b0717ae8b40ecadb4c32f7c Signed-off-by: Alexander Goncharov <chat(a)joursoir.net> --- M dummyflasher.c 1 file changed, 22 insertions(+), 6 deletions(-) git pull ssh://review.coreboot.org:29418/flashrom refs/changes/30/72430/1 diff --git a/dummyflasher.c b/dummyflasher.c index 1960e92..93f183a 100644 --- a/dummyflasher.c +++ b/dummyflasher.c @@ -1345,6 +1345,7 @@ static int dummy_init(const struct programmer_cfg *cfg) { + int ret = 0; struct stat image_stat; struct emu_data *data = calloc(1, sizeof(*data)); @@ -1410,15 +1411,15 @@ } if (dummy_buses_supported & BUS_PROG) - register_opaque_master(&opaque_master_dummyflasher, data); + ret |= register_opaque_master(&opaque_master_dummyflasher, data); if (dummy_buses_supported & BUS_NONSPI) - register_par_master(&par_master_dummyflasher, - dummy_buses_supported & BUS_NONSPI, - data); + ret |= register_par_master(&par_master_dummyflasher, + dummy_buses_supported & BUS_NONSPI, + data); if (dummy_buses_supported & BUS_SPI) - register_spi_master(&spi_master_dummyflasher, data); + ret |= register_spi_master(&spi_master_dummyflasher, data); - return 0; + return ret; } const struct programmer_entry programmer_dummy = { -- To view, visit https://review.coreboot.org/c/flashrom/+/72430 To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: flashrom Gerrit-Branch: master Gerrit-Change-Id: I3a7eeb3cdd814db18b0717ae8b40ecadb4c32f7c Gerrit-Change-Number: 72430 Gerrit-PatchSet: 1 Gerrit-Owner: Alexander Goncharov <chat(a)joursoir.net> Gerrit-MessageType: newchange

1 0

[S] Change in flashrom[master]: dummyflasher: use new API to register shutdown function
by Alexander Goncharov (Code Review) 24 Jan '23

24 Jan '23

Alexander Goncharov has uploaded this change for review. ( https://review.coreboot.org/c/flashrom/+/72408 ) Change subject: dummyflasher: use new API to register shutdown function ...................................................................... dummyflasher: use new API to register shutdown function This allows masters to register shutdown function in *_master struct, which means there is no need to call register_shutdown in init function, since this call is now a part of register_*_master. A dummy programmer can register masters for multiple buses that share a programmer's data (a pointer to struct emu_data) with each other. To avoid unexpected memory freeing by shutdown function, we need to keep track of how many buses are using the shared resource. Use the reference counting technique to achieve this. TEST=ninja test Change-Id: I0c67c25b0f53cd8c564c4ea0f09f2728e856f6ea Signed-off-by: Alexander Goncharov <chat(a)joursoir.net> --- M dummyflasher.c 1 file changed, 41 insertions(+), 6 deletions(-) git pull ssh://review.coreboot.org:29418/flashrom refs/changes/08/72408/1 diff --git a/dummyflasher.c b/dummyflasher.c index 1960e92..7305b46 100644 --- a/dummyflasher.c +++ b/dummyflasher.c @@ -75,6 +75,8 @@ unsigned int spi_write_256_chunksize; uint8_t *flashchip_contents; + + uint8_t refs_cnt; }; /* A legit complete SFDP table based on the MX25L6436E (rev. 1.8) datasheet. */ @@ -905,6 +907,11 @@ { msg_pspew("%s\n", __func__); struct emu_data *emu_data = (struct emu_data *)data; + + emu_data->refs_cnt--; + if (emu_data->refs_cnt != 0) + return 0; + if (emu_data->emu_chip != EMULATE_NONE) { if (emu_data->emu_persistent_image && emu_data->emu_modified) { msg_pdbg("Writing %s\n", emu_data->emu_persistent_image); @@ -929,6 +936,7 @@ .multicommand = default_spi_send_multicommand, .read = default_spi_read, .write_256 = dummy_spi_write_256, + .shutdown = dummy_shutdown, .probe_opcode = dummy_spi_probe_opcode, }; @@ -943,6 +951,7 @@ .chip_writew = dummy_chip_writew, .chip_writel = dummy_chip_writel, .chip_writen = dummy_chip_writen, + .shutdown = dummy_shutdown, }; static const struct opaque_master opaque_master_dummyflasher = { @@ -950,6 +959,7 @@ .read = dummy_opaque_read, .write = dummy_opaque_write, .erase = dummy_opaque_erase, + .shutdown = dummy_shutdown, }; static int init_data(const struct programmer_cfg *cfg, @@ -1402,12 +1412,15 @@ } dummy_init_out: - if (register_shutdown(dummy_shutdown, data)) { - free(data->emu_persistent_image); - free(data->flashchip_contents); - free(data); - return 1; - } + data->refs_cnt += ((dummy_buses_supported & BUS_PROG) != BUS_NONE); + data->refs_cnt += ((dummy_buses_supported & BUS_NONSPI) != BUS_NONE); + data->refs_cnt += ((dummy_buses_supported & BUS_SPI) != BUS_NONE); + +#if 0 + data->refs_cnt += (dummy_buses_supported & BUS_PROG) ? 1 : 0; + data->refs_cnt += (dummy_buses_supported & BUS_NONSPI) ? 1 : 0; + data->refs_cnt += (dummy_buses_supported & BUS_SPI) ? 1 : 0; +#endif if (dummy_buses_supported & BUS_PROG) register_opaque_master(&opaque_master_dummyflasher, data); -- To view, visit https://review.coreboot.org/c/flashrom/+/72408 To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: flashrom Gerrit-Branch: master Gerrit-Change-Id: I0c67c25b0f53cd8c564c4ea0f09f2728e856f6ea Gerrit-Change-Number: 72408 Gerrit-PatchSet: 1 Gerrit-Owner: Alexander Goncharov <chat(a)joursoir.net> Gerrit-MessageType: newchange

1 0

2024

2023

2022

2021

2020

2019

2018

2017

flashrom-gerrit January 2023