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

Change in flashrom[master]: [RFC] spi_master: Add shutdown function in spi_master struct
by Anastasia Klimchuk (Code Review) June 28, 2021

June 28, 2021

Anastasia Klimchuk has uploaded this change for review. ( https://review.coreboot.org/c/flashrom/+/55932 ) Change subject: [RFC] spi_master: Add shutdown function in spi_master struct ...................................................................... [RFC] spi_master: Add shutdown function in spi_master struct With this, register_spi_master can take care of register_shutdown as well, and every spi master only needs to call register_spi_master instead of calling both register_spi_master and register_shutdown. This is alternative approach to CB:51761 which does not require adding another argument to register_spi_master. Testing: when I comment out free(data) in linux_spi_shutdown, test fails with error ../linux_spi.c:235: note: block 0x55a4db276510 allocated here ERROR: linux_spi_init_and_shutdown_test_success leaked 1 block(s) Means, shutdown function is invoked. Same for dummy: comment out free(data) in shutdown. It is also caught in test ../dummyflasher.c:949: note: block 0x55e0727a6e40 allocated here ERROR: dummy_init_and_shutdown_test_success leaked 1 block(s) Means, shutdown function is invoked even for drivers with "old" API (so, transition from old to new is not breaking anything). Change-Id: I2dc80dceca2f8204bcd0dad1f51753d7e79f1af5 Signed-off-by: Anastasia Klimchuk <aklm(a)chromium.org> --- M linux_spi.c M programmer.h M spi.c 3 files changed, 10 insertions(+), 5 deletions(-) git pull ssh://review.coreboot.org:29418/flashrom refs/changes/32/55932/1 diff --git a/linux_spi.c b/linux_spi.c index 46779a0..16a83af 100644 --- a/linux_spi.c +++ b/linux_spi.c @@ -122,6 +122,7 @@ .read = linux_spi_read, .write_256 = linux_spi_write_256, .write_aai = default_spi_write_aai, + .shutdown = linux_spi_shutdown, }; /* Read max buffer size from sysfs, or use page size as fallback. */ @@ -239,11 +240,8 @@ spi_data->fd = fd; spi_data->max_kernel_buf_size = max_kernel_buf_size; - if (register_shutdown(linux_spi_shutdown, spi_data)) { - free(spi_data); - goto init_err; - } - register_spi_master(&spi_master_linux, spi_data); + if (register_spi_master(&spi_master_linux, spi_data)) + return 1; /* core does cleanup */ return 0; init_err: diff --git a/programmer.h b/programmer.h index 95e2cda..ec55987 100644 --- a/programmer.h +++ b/programmer.h @@ -356,6 +356,7 @@ int (*read)(struct flashctx *flash, uint8_t *buf, unsigned int start, unsigned int len); int (*write_256)(struct flashctx *flash, const uint8_t *buf, unsigned int start, unsigned int len); int (*write_aai)(struct flashctx *flash, const uint8_t *buf, unsigned int start, unsigned int len); + int (*shutdown)(void *data); void *data; }; diff --git a/spi.c b/spi.c index 4ac3914..99d036e 100644 --- a/spi.c +++ b/spi.c @@ -135,6 +135,12 @@ { struct registered_master rmst = {0}; + if (mst->shutdown) + if (register_shutdown(mst->shutdown, data)) { + mst->shutdown(data); /* cleanup */ + return 1; + } + if (!mst->write_aai || !mst->write_256 || !mst->read || !mst->command || !mst->multicommand || ((mst->command == default_spi_send_command) && -- To view, visit https://review.coreboot.org/c/flashrom/+/55932 To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: flashrom Gerrit-Branch: master Gerrit-Change-Id: I2dc80dceca2f8204bcd0dad1f51753d7e79f1af5 Gerrit-Change-Number: 55932 Gerrit-PatchSet: 1 Gerrit-Owner: Anastasia Klimchuk <aklm(a)chromium.org> Gerrit-MessageType: newchange

1 0

Change in flashrom[master]: util: Name udev-rules file accordingly
by Paul Menzel (Code Review) June 28, 2021

June 28, 2021

Attention is currently required from: Felix Singer. Paul Menzel has posted comments on this change. ( https://review.coreboot.org/c/flashrom/+/55866 ) Change subject: util: Name udev-rules file accordingly ...................................................................... Patch Set 4: (2 comments) Commit Message: https://review.coreboot.org/c/flashrom/+/55866/comment/8f00046e_17d8f550 PS1, Line 9: Rename `z60_flashrom.rules` to `flashrom_udev.rules`. > They have to read the file first anyway. Not every distro uses the same […] As upstream systemd/udev uses ordering, I think that is the way to do it. There is no reason specified, why all distributions already packaging flashrom have to adapt their packaging scripts to use the new name. The commit message does not say, why the new name is better, and I still do not see a reason. [1]: https://github.com/systemd/systemd/tree/main/rules.d Commit Message: https://review.coreboot.org/c/flashrom/+/55866/comment/eb92b1c3_c0c12144 PS4, Line 7: accordingly Just saw this now. This is missing something. “accordingly” to what? -- To view, visit https://review.coreboot.org/c/flashrom/+/55866 To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: flashrom Gerrit-Branch: master Gerrit-Change-Id: I1e7918d3121d89d3c388745e433a3a413eac0e21 Gerrit-Change-Number: 55866 Gerrit-PatchSet: 4 Gerrit-Owner: Felix Singer <felixsinger(a)posteo.net> Gerrit-Reviewer: Angel Pons <th3fanbus(a)gmail.com> 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: Felix Singer <felixsinger(a)posteo.net> Gerrit-Comment-Date: Mon, 28 Jun 2021 22:40:58 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: Felix Singer <felixsinger(a)posteo.net> Comment-In-Reply-To: Nico Huber <nico.h(a)gmx.de> Comment-In-Reply-To: Paul Menzel <paulepanter(a)mailbox.org> Gerrit-MessageType: comment

1 0

Change in flashrom[master]: dediprog: Separate shutdown from failed init cleanup
by Nico Huber (Code Review) June 28, 2021

June 28, 2021

Attention is currently required from: Edward O'Callaghan, Anastasia Klimchuk. Nico Huber has posted comments on this change. ( https://review.coreboot.org/c/flashrom/+/55887 ) Change subject: dediprog: Separate shutdown from failed init cleanup ...................................................................... Patch Set 1: Code-Review+1 (1 comment) Patchset: PS1: > This is actually *the last one* which unlocks API change for register_shutdown! Grats! -- To view, visit https://review.coreboot.org/c/flashrom/+/55887 To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: flashrom Gerrit-Branch: master Gerrit-Change-Id: I3273da907614a042d50090338c337dfd64695354 Gerrit-Change-Number: 55887 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: Edward O'Callaghan <quasisec(a)chromium.org> Gerrit-Attention: Anastasia Klimchuk <aklm(a)chromium.org> Gerrit-Comment-Date: Mon, 28 Jun 2021 20:12:13 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Comment-In-Reply-To: Anastasia Klimchuk <aklm(a)chromium.org> Gerrit-MessageType: comment

1 0

Change in flashrom[master]: util: Name udev-rules file accordingly
by Nico Huber (Code Review) June 28, 2021

June 28, 2021

Nico Huber has posted comments on this change. ( https://review.coreboot.org/c/flashrom/+/55866 ) Change subject: util: Name udev-rules file accordingly ...................................................................... Patch Set 4: (1 comment) Commit Message: https://review.coreboot.org/c/flashrom/+/55866/comment/73f04446_ae87372b PS1, Line 9: Rename `z60_flashrom.rules` to `flashrom_udev.rules`. > If a distro uses any ordering concept (some also don't), then package maintainers _have_ to deal wit […] They have to read the file first anyway. Not every distro uses the same group names for instance. -- To view, visit https://review.coreboot.org/c/flashrom/+/55866 To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: flashrom Gerrit-Branch: master Gerrit-Change-Id: I1e7918d3121d89d3c388745e433a3a413eac0e21 Gerrit-Change-Number: 55866 Gerrit-PatchSet: 4 Gerrit-Owner: Felix Singer <felixsinger(a)posteo.net> Gerrit-Reviewer: Angel Pons <th3fanbus(a)gmail.com> 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-Comment-Date: Mon, 28 Jun 2021 16:48:40 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: Felix Singer <felixsinger(a)posteo.net> Comment-In-Reply-To: Nico Huber <nico.h(a)gmx.de> Comment-In-Reply-To: Paul Menzel <paulepanter(a)mailbox.org> Gerrit-MessageType: comment

1 0

Change in flashrom[master]: util: Name udev-rules file accordingly
by Angel Pons (Code Review) June 28, 2021

June 28, 2021

Angel Pons has submitted this change. ( https://review.coreboot.org/c/flashrom/+/55866 ) Change subject: util: Name udev-rules file accordingly ...................................................................... util: Name udev-rules file accordingly Rename `z60_flashrom.rules` to `flashrom_udev.rules`. Change-Id: I1e7918d3121d89d3c388745e433a3a413eac0e21 Signed-off-by: Felix Singer <felixsinger(a)posteo.net> Reviewed-on: https://review.coreboot.org/c/flashrom/+/55866 Reviewed-by: Angel Pons <th3fanbus(a)gmail.com> Reviewed-by: Nico Huber <nico.h(a)gmx.de> Tested-by: build bot (Jenkins) <no-reply(a)coreboot.org> --- R util/flashrom_udev.rules 1 file changed, 0 insertions(+), 0 deletions(-) Approvals: build bot (Jenkins): Verified Nico Huber: Looks good to me, approved Angel Pons: Looks good to me, approved diff --git a/util/z60_flashrom.rules b/util/flashrom_udev.rules similarity index 100% rename from util/z60_flashrom.rules rename to util/flashrom_udev.rules -- To view, visit https://review.coreboot.org/c/flashrom/+/55866 To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: flashrom Gerrit-Branch: master Gerrit-Change-Id: I1e7918d3121d89d3c388745e433a3a413eac0e21 Gerrit-Change-Number: 55866 Gerrit-PatchSet: 4 Gerrit-Owner: Felix Singer <felixsinger(a)posteo.net> Gerrit-Reviewer: Angel Pons <th3fanbus(a)gmail.com> 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-MessageType: merged

1 0

Change in flashrom[master]: util: Name udev-rules file accordingly
by Angel Pons (Code Review) June 28, 2021

June 28, 2021

Attention is currently required from: Felix Singer, Nico Huber, Paul Menzel. Angel Pons has posted comments on this change. ( https://review.coreboot.org/c/flashrom/+/55866 ) Change subject: util: Name udev-rules file accordingly ...................................................................... Patch Set 3: Code-Review+2 -- To view, visit https://review.coreboot.org/c/flashrom/+/55866 To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: flashrom Gerrit-Branch: master Gerrit-Change-Id: I1e7918d3121d89d3c388745e433a3a413eac0e21 Gerrit-Change-Number: 55866 Gerrit-PatchSet: 3 Gerrit-Owner: Felix Singer <felixsinger(a)posteo.net> Gerrit-Reviewer: Angel Pons <th3fanbus(a)gmail.com> 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: Felix Singer <felixsinger(a)posteo.net> Gerrit-Attention: Nico Huber <nico.h(a)gmx.de> Gerrit-Attention: Paul Menzel <paulepanter(a)mailbox.org> Gerrit-Comment-Date: Mon, 28 Jun 2021 16:16:11 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 0

Change in flashrom[master]: [DRAFT] Split Makefile
by Angel Pons (Code Review) June 28, 2021

June 28, 2021

Attention is currently required from: Nico Huber. Angel Pons has posted comments on this change. ( https://review.coreboot.org/c/flashrom/+/55882 ) Change subject: [DRAFT] Split Makefile ...................................................................... Patch Set 2: Code-Review+1 -- To view, visit https://review.coreboot.org/c/flashrom/+/55882 To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: flashrom Gerrit-Branch: master Gerrit-Change-Id: I2fa86f8b686f61f09a8a5c929587ea71f3e59e78 Gerrit-Change-Number: 55882 Gerrit-PatchSet: 2 Gerrit-Owner: Nico Huber <nico.h(a)gmx.de> Gerrit-Reviewer: Angel Pons <th3fanbus(a)gmail.com> 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-Comment-Date: Mon, 28 Jun 2021 16:13:24 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 0

Change in flashrom[master]: Makefile: Use dependency lists to generate NEED_<library> vars
by Angel Pons (Code Review) June 28, 2021

June 28, 2021

Attention is currently required from: Nico Huber. Angel Pons has posted comments on this change. ( https://review.coreboot.org/c/flashrom/+/55881 ) Change subject: Makefile: Use dependency lists to generate NEED_<library> vars ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://review.coreboot.org/c/flashrom/+/55881 To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: flashrom Gerrit-Branch: master Gerrit-Change-Id: I30e6430a7e833a7f74eb973fb55bf1947ae2d87b Gerrit-Change-Number: 55881 Gerrit-PatchSet: 2 Gerrit-Owner: Nico Huber <nico.h(a)gmx.de> Gerrit-Reviewer: Angel Pons <th3fanbus(a)gmail.com> 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-Comment-Date: Mon, 28 Jun 2021 16:13:05 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 0

Change in flashrom[master]: Makefile: Enable bitbang_spi based on its dependency list
by Angel Pons (Code Review) June 28, 2021

June 28, 2021

Attention is currently required from: Nico Huber. Angel Pons has posted comments on this change. ( https://review.coreboot.org/c/flashrom/+/55880 ) Change subject: Makefile: Enable bitbang_spi based on its dependency list ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://review.coreboot.org/c/flashrom/+/55880 To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: flashrom Gerrit-Branch: master Gerrit-Change-Id: I2a22667cfe14e4c5816b3bce13de632941690d17 Gerrit-Change-Number: 55880 Gerrit-PatchSet: 2 Gerrit-Owner: Nico Huber <nico.h(a)gmx.de> Gerrit-Reviewer: Angel Pons <th3fanbus(a)gmail.com> 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-Comment-Date: Mon, 28 Jun 2021 16:12:35 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 0

Change in flashrom[master]: Makefile: Disable libusb/libpci programmers via dependency lists
by Angel Pons (Code Review) June 28, 2021

June 28, 2021

Attention is currently required from: Nico Huber. Angel Pons has posted comments on this change. ( https://review.coreboot.org/c/flashrom/+/55879 ) Change subject: Makefile: Disable libusb/libpci programmers via dependency lists ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://review.coreboot.org/c/flashrom/+/55879 To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: flashrom Gerrit-Branch: master Gerrit-Change-Id: Ic2e56059a5cd7bd9f3d74d27866ded97e86d6ef1 Gerrit-Change-Number: 55879 Gerrit-PatchSet: 2 Gerrit-Owner: Nico Huber <nico.h(a)gmx.de> Gerrit-Reviewer: Angel Pons <th3fanbus(a)gmail.com> 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-Comment-Date: Mon, 28 Jun 2021 16:12:12 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 0