August 2023 - flashrom-gerrit - mail.coreboot.org

Change in flashrom[master]: dummyflasher.c: Use programmer logger functions
by Angel Pons (Code Review) 11 Apr '24

11 Apr '24

Angel Pons has uploaded this change for review. ( https://review.coreboot.org/c/flashrom/+/46523 ) Change subject: dummyflasher.c: Use programmer logger functions ...................................................................... dummyflasher.c: Use programmer logger functions All but three log messages use the programmer logger. Change the three outliers that were using the chip logger accordingly. Change-Id: Ia8668e05df2da739e6bb4c7d0fddad86e8d054a3 Signed-off-by: Angel Pons <th3fanbus(a)gmail.com> --- M dummyflasher.c 1 file changed, 3 insertions(+), 3 deletions(-) git pull ssh://review.coreboot.org:29418/flashrom refs/changes/23/46523/1 diff --git a/dummyflasher.c b/dummyflasher.c index 6426ad2..d233db4 100644 --- a/dummyflasher.c +++ b/dummyflasher.c @@ -610,7 +610,7 @@ } for (i = 0; i < data->spi_ignorelist_size; i++) { if (writearr[0] == data->spi_ignorelist[i]) { - msg_cdbg("Ignoring ignorelisted SPI command 0x%02x\n", + msg_pdbg("Ignoring ignorelisted SPI command 0x%02x\n", data->spi_ignorelist[i]); /* Return success because the command does not fail, * it is simply ignored. @@ -1050,7 +1050,7 @@ * Search "total_size * 1024" in code. */ flash->chip->total_size = emu_data->emu_chip_size / 1024; - msg_cdbg("%s: set flash->total_size to %dK bytes.\n", __func__, + msg_pdbg("%s: set flash->total_size to %dK bytes.\n", __func__, flash->chip->total_size); /* Update the first count of each of the block_erasers. */ @@ -1061,7 +1061,7 @@ eraser->eraseblocks[0].count = 1; eraser->eraseblocks[0].size = emu_data->emu_chip_size; - msg_cdbg("%s: eraser.size=%d, .count=%d\n", + msg_pdbg("%s: eraser.size=%d, .count=%d\n", __func__, eraser->eraseblocks[0].size, eraser->eraseblocks[0].count); } -- To view, visit https://review.coreboot.org/c/flashrom/+/46523 To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: flashrom Gerrit-Branch: master Gerrit-Change-Id: Ia8668e05df2da739e6bb4c7d0fddad86e8d054a3 Gerrit-Change-Number: 46523 Gerrit-PatchSet: 1 Gerrit-Owner: Angel Pons <th3fanbus(a)gmail.com> Gerrit-MessageType: newchange

3 3

Change in flashrom[master]: it85spi.c: Kill off dead code system() hack
by Edward O'Callaghan (Code Review) 08 Dec '23

08 Dec '23

Edward O'Callaghan has uploaded this change for review. ( https://review.coreboot.org/c/flashrom/+/46547 ) Change subject: it85spi.c: Kill off dead code system() hack ...................................................................... it85spi.c: Kill off dead code system() hack This is dead code sitting under a 'if 0' and is extremely hacky. One could argue this patch perhaps should include a update to documentation to stop powerd instead of keeping this rot around? BUG=none BRANCH=none TEST=builds Change-Id: I5761dea48d553b1334eef3c9cf0ad79cedbd7806 Signed-off-by: Edward O'Callaghan <quasisec(a)google.com> --- M it85spi.c 1 file changed, 0 insertions(+), 21 deletions(-) git pull ssh://review.coreboot.org:29418/flashrom refs/changes/47/46547/1 diff --git a/it85spi.c b/it85spi.c index b998790..1d93a5b 100644 --- a/it85spi.c +++ b/it85spi.c @@ -114,15 +114,6 @@ if (it85xx_scratch_rom_reenter > 0) return; -#if 0 - /* FIXME: this a workaround for the bug that SMBus signal would - * interfere the EC firmware update. Should be removed if - * we find out the root cause. */ - ret = system("stop powerd >&2"); - if (ret) - msg_perr("Cannot stop powerd.\n"); -#endif - for (tries = 0; tries < MAX_TRY; ++tries) { /* Wait until IBF (input buffer) is not full. */ if (wait_for(KB_IBF, 0, MAX_TIMEOUT, @@ -165,9 +156,6 @@ static void it85xx_exit_scratch_rom(void) { -#if 0 - int ret; -#endif int tries; msg_pdbg("%s():%d was called ...\n", __func__, __LINE__); @@ -204,15 +192,6 @@ } else { msg_perr("%s():%d * Max try reached.\n", __func__, __LINE__); } - -#if 0 - /* FIXME: this a workaround for the bug that SMBus signal would - * interfere the EC firmware update. Should be removed if - * we find out the root cause. */ - ret = system("start powerd >&2"); - if (ret) - msg_perr("Cannot start powerd again.\n"); -#endif } static int it85xx_shutdown(void *data) -- To view, visit https://review.coreboot.org/c/flashrom/+/46547 To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: flashrom Gerrit-Branch: master Gerrit-Change-Id: I5761dea48d553b1334eef3c9cf0ad79cedbd7806 Gerrit-Change-Number: 46547 Gerrit-PatchSet: 1 Gerrit-Owner: Edward O'Callaghan <quasisec(a)chromium.org> Gerrit-MessageType: newchange

4 8

Change in flashrom[master]: chipset_enable.c: Remove futile attempt to disable lock
by Andy Pont (Code Review) 25 Nov '23

25 Nov '23

Andy Pont has uploaded this change for review. ( https://review.coreboot.org/c/flashrom/+/48643 ) Change subject: chipset_enable.c: Remove futile attempt to disable lock ...................................................................... chipset_enable.c: Remove futile attempt to disable lock For all recent Intel chipsets (and possibly others) the ability to disable the lock fails. This leads to confusing messages being presented to the user where unlocking fails but the flash update process works correctly. Remove the unlock attempt which had alreayd been marked in the source code comments as "futile". Signed-off-by: Andy Pont <andy.pont(a)sdcsystems.com> Change-Id: Id70e132f8feb7b91cbf79d8cdf07744f8763e11b --- M chipset_enable.c 1 file changed, 0 insertions(+), 1 deletion(-) git pull ssh://review.coreboot.org:29418/flashrom refs/changes/43/48643/1 diff --git a/chipset_enable.c b/chipset_enable.c index 9205d0e..3ca6ba8 100644 --- a/chipset_enable.c +++ b/chipset_enable.c @@ -333,7 +333,6 @@ wanted |= (1 << 2); wanted |= (1 << 0); /* Set BIOS Write Enable */ - wanted &= ~(1 << 1); /* Disable lock (futile) */ /* Only write the register if it's necessary */ if (wanted != old) { -- To view, visit https://review.coreboot.org/c/flashrom/+/48643 To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: flashrom Gerrit-Branch: master Gerrit-Change-Id: Id70e132f8feb7b91cbf79d8cdf07744f8763e11b Gerrit-Change-Number: 48643 Gerrit-PatchSet: 1 Gerrit-Owner: Andy Pont <andy.pont(a)sdcsystems.com> Gerrit-MessageType: newchange

3 3

Change in flashrom[master]: dediprog: Fix SF600 4BA mode
by Patrick Rudolph (Code Review) 25 Nov '23

25 Nov '23

Hello Patrick Rudolph, I'd like you to do a code review. Please visit https://review.coreboot.org/c/flashrom/+/34629 to review the following change. Change subject: dediprog: Fix SF600 4BA mode ...................................................................... dediprog: Fix SF600 4BA mode Flash chips greater than 16MiB require 4BA mode support. Current master doesn't support such mode as the SF600 uses PROTOCOL_V3. Fix protocol version check to support 4BA on PROTOCOL_V3, too. Tested on SF600 V:7.2.45 Able to read and write "IS25WP256" (32768 kB, SPI). Change-Id: I2d3089693fbd2f8f7717a8f71be242be131ce707 Signed-off-by: Patrick Rudolph <patrick.rudolph(a)9elements.com> --- M dediprog.c 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://review.coreboot.org:29418/flashrom refs/changes/29/34629/1 diff --git a/dediprog.c b/dediprog.c index 3566109..add478d 100644 --- a/dediprog.c +++ b/dediprog.c @@ -1160,7 +1160,7 @@ if (dediprog_devicetype == DEV_SF100 && protocol() == PROTOCOL_V1) spi_master_dediprog.features &= ~SPI_MASTER_NO_4BA_MODES; - if (protocol() == PROTOCOL_V2) + if (protocol() >= PROTOCOL_V2) spi_master_dediprog.features |= SPI_MASTER_4BA; if (register_spi_master(&spi_master_dediprog) || dediprog_set_leds(LED_NONE)) -- To view, visit https://review.coreboot.org/c/flashrom/+/34629 To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: flashrom Gerrit-Branch: master Gerrit-Change-Id: I2d3089693fbd2f8f7717a8f71be242be131ce707 Gerrit-Change-Number: 34629 Gerrit-PatchSet: 1 Gerrit-Owner: Patrick Rudolph <siro(a)das-labor.org> Gerrit-Reviewer: Patrick Rudolph <patrick.rudolph(a)9elements.com> Gerrit-MessageType: newchange

4 7

[XS] Change in flashrom[master]: flashchips: Add WP features for Winbond W25X20
by Sergii Dmytruk (Code Review) 31 Aug '23

31 Aug '23

Attention is currently required from: Nikolai Artemiev, Stefan Reinauer, Vasily Galkin. Sergii Dmytruk has posted comments on this change. ( https://review.coreboot.org/c/flashrom/+/77530?usp=email ) Change subject: flashchips: Add WP features for Winbond W25X20 ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://review.coreboot.org/c/flashrom/+/77530?usp=email To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: flashrom Gerrit-Branch: master Gerrit-Change-Id: I82c0cc52ca2a78d27f513234cc12d3e09d8905a5 Gerrit-Change-Number: 77530 Gerrit-PatchSet: 1 Gerrit-Owner: Vasily Galkin Gerrit-Reviewer: Anastasia Klimchuk <aklm(a)chromium.org> Gerrit-Reviewer: Nikolai Artemiev <nartemiev(a)google.com> Gerrit-Reviewer: Sergii Dmytruk <sergii.dmytruk(a)3mdeb.com> Gerrit-Reviewer: Stefan Reinauer <stefan.reinauer(a)coreboot.org> Gerrit-Reviewer: build bot (Jenkins) <no-reply(a)coreboot.org> Gerrit-Attention: Vasily Galkin Gerrit-Attention: Stefan Reinauer <stefan.reinauer(a)coreboot.org> Gerrit-Attention: Nikolai Artemiev <nartemiev(a)google.com> Gerrit-Comment-Date: Thu, 31 Aug 2023 13:05:27 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 0

[XS] Change in flashrom[master]: spi25_statusreg: add verbose output on status registers read results
by Sergii Dmytruk (Code Review) 31 Aug '23

31 Aug '23

Attention is currently required from: Vasily Galkin. Sergii Dmytruk has posted comments on this change. ( https://review.coreboot.org/c/flashrom/+/77529?usp=email ) Change subject: spi25_statusreg: add verbose output on status registers read results ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://review.coreboot.org/c/flashrom/+/77529?usp=email To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: flashrom Gerrit-Branch: master Gerrit-Change-Id: Ibc8e9229ab5d6578479564d11cc7aff9442e24ad Gerrit-Change-Number: 77529 Gerrit-PatchSet: 1 Gerrit-Owner: Vasily Galkin Gerrit-Reviewer: Anastasia Klimchuk <aklm(a)chromium.org> Gerrit-Reviewer: Sergii Dmytruk <sergii.dmytruk(a)3mdeb.com> Gerrit-Reviewer: build bot (Jenkins) <no-reply(a)coreboot.org> Gerrit-Attention: Vasily Galkin Gerrit-Comment-Date: Thu, 31 Aug 2023 13:01:25 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 0

[S] Change in flashrom[master]: Remove dependency on C23 __has_include()
by Anton Samsonov (Code Review) 31 Aug '23

31 Aug '23

Attention is currently required from: Alexander Goncharov, Anton Samsonov. Anton Samsonov has posted comments on this change. ( https://review.coreboot.org/c/flashrom/+/77089?usp=email ) Change subject: Remove dependency on C23 __has_include() ...................................................................... Patch Set 1: (1 comment) Patchset: PS1: > Thanks for the patch! Can you please provide what compiler and version you used to test this patch? […] In my understanding, this patch may be needed for all compilers based on legacy versions of EDG frontend, such as version 4.14, which is somewhat on par with GCC 5.5, for example. Those still happen to be used in embedded / certified systems. Newer EDG versions like 5.1, which is somewhat on par with GCC 7.3, and of course the most recent versions like 6.4, which is somewhat on par with GCC 11.3, do not need this patch already. But those versions are not available on all target platforms. Do you think such details should be present in commit message? -- To view, visit https://review.coreboot.org/c/flashrom/+/77089?usp=email To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: flashrom Gerrit-Branch: master Gerrit-Change-Id: Ic544963ffd29626ae0a21bdddb1c78850cc43ec6 Gerrit-Change-Number: 77089 Gerrit-PatchSet: 1 Gerrit-Owner: Anton Samsonov <devel(a)zxlab.ru> Gerrit-Reviewer: Alexander Goncharov <chat(a)joursoir.net> Gerrit-Reviewer: build bot (Jenkins) <no-reply(a)coreboot.org> Gerrit-CC: Anastasia Klimchuk <aklm(a)chromium.org> Gerrit-CC: Anton Samsonov <avscomputing(a)gmail.com> Gerrit-Attention: Anton Samsonov <devel(a)zxlab.ru> Gerrit-Attention: Alexander Goncharov <chat(a)joursoir.net> Gerrit-Comment-Date: Thu, 31 Aug 2023 10:23:34 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: Alexander Goncharov <chat(a)joursoir.net> Gerrit-MessageType: comment

1 0

[S] Change in flashrom[master]: Remove dependency on C23 __has_include()
by Alexander Goncharov (Code Review) 31 Aug '23

31 Aug '23

Attention is currently required from: Anton Samsonov. Alexander Goncharov has posted comments on this change. ( https://review.coreboot.org/c/flashrom/+/77089?usp=email ) Change subject: Remove dependency on C23 __has_include() ...................................................................... Patch Set 1: (1 comment) Patchset: PS1: Thanks for the patch! Can you please provide what compiler and version you used to test this patch? It would be great to include that in the commit message. -- To view, visit https://review.coreboot.org/c/flashrom/+/77089?usp=email To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: flashrom Gerrit-Branch: master Gerrit-Change-Id: Ic544963ffd29626ae0a21bdddb1c78850cc43ec6 Gerrit-Change-Number: 77089 Gerrit-PatchSet: 1 Gerrit-Owner: Anton Samsonov <devel(a)zxlab.ru> Gerrit-Reviewer: Alexander Goncharov <chat(a)joursoir.net> Gerrit-Reviewer: build bot (Jenkins) <no-reply(a)coreboot.org> Gerrit-CC: Anastasia Klimchuk <aklm(a)chromium.org> Gerrit-Attention: Anton Samsonov <devel(a)zxlab.ru> Gerrit-Comment-Date: Thu, 31 Aug 2023 07:15:26 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment

1 0

[M] Change in flashrom[master]: flashrom: only perform WP unlock for write/erase operations
by Nikolai Artemiev (Code Review) 31 Aug '23

31 Aug '23

Nikolai Artemiev has submitted this change. ( https://review.coreboot.org/c/flashrom/+/75991?usp=email ) Change subject: flashrom: only perform WP unlock for write/erase operations ...................................................................... flashrom: only perform WP unlock for write/erase operations Don't unlock using WP for read/verify operations because WP will only disable write locks. Most chips don't have read locks anyway, but some do, so we still call the chip's unlock function for read/verify operations. Unconditionally unlocking using WP slows down flashrom significantly with some programmers, particularly linux_mtd due to inefficiency in the current kernel MTD interface. BUG=b:283779258 BRANCH=none TEST=`ninja test` TEST=`flashrom -{r,w,E,v}` on strongbad TEST=`flashrom --wp-enable; flashrom -{w,E}` on strongbad Change-Id: I5dc66474a0b7969b51b86ac9f5daa2c95ae968f1 Signed-off-by: Nikolai Artemiev <nartemiev(a)google.com> Reviewed-on: https://review.coreboot.org/c/flashrom/+/75991 Tested-by: build bot (Jenkins) <no-reply(a)coreboot.org> Reviewed-by: Edward O'Callaghan <quasisec(a)chromium.org> --- M flashrom.c 1 file changed, 41 insertions(+), 11 deletions(-) Approvals: build bot (Jenkins): Verified Edward O'Callaghan: Looks good to me, approved diff --git a/flashrom.c b/flashrom.c index b6e5cf8..630c69d 100644 --- a/flashrom.c +++ b/flashrom.c @@ -2052,24 +2052,49 @@ return 0; } -static int unlock_flash_wp(struct flashctx *const flash) +static int unlock_flash_wp(struct flashctx *const flash, + const bool write_it, const bool erase_it) + { - /* Save original WP state to be restored later */ - if (save_initial_flash_wp(flash)) + int ret = 0; + + /* WP only disables write protection, so only use WP to unlock + * for write/erase operations. + * + * For read/verify operations, we still call the chip's unlock + * function, which may disable read locks if the chip has them. + */ + if (!write_it && !erase_it) { + msg_cdbg("Skipping writeprotect-based unlocking for read/verify operations.\n"); return -1; + } + + /* Save original WP state to be restored later */ + if (save_initial_flash_wp(flash)) { + ret = -1; + goto warn_out; + } /* Disable WP */ struct flashrom_wp_cfg *unlocked_wp_cfg; - if (flashrom_wp_cfg_new(&unlocked_wp_cfg) != FLASHROM_WP_OK) - return -1; + if (flashrom_wp_cfg_new(&unlocked_wp_cfg) != FLASHROM_WP_OK) { + ret = -1; + goto warn_out; + } flashrom_wp_set_range(unlocked_wp_cfg, 0, 0); flashrom_wp_set_mode(unlocked_wp_cfg, FLASHROM_WP_MODE_DISABLED); - enum flashrom_wp_result ret = flashrom_wp_write_cfg(flash, unlocked_wp_cfg); + if (flashrom_wp_write_cfg(flash, unlocked_wp_cfg) != FLASHROM_WP_OK) { + ret = -1; + } flashrom_wp_cfg_release(unlocked_wp_cfg); - return (ret == FLASHROM_WP_OK) ? 0 : -1; +warn_out: + if (ret) + msg_cerr("Failed to unlock flash status reg with wp support.\n"); + + return ret; } int prepare_flash_access(struct flashctx *const flash, @@ -2092,14 +2117,19 @@ /* Initialize chip_restore_fn_count before chip unlock calls. */ flash->chip_restore_fn_count = 0; - /* Given the existence of read locks, we want to unlock for read, erase and write. */ int ret = 1; if (flash->chip->decode_range != NO_DECODE_RANGE_FUNC || (flash->mst->buses_supported & BUS_PROG && flash->mst->opaque.wp_write_cfg)) { - ret = unlock_flash_wp(flash); - if (ret) - msg_cerr("Failed to unlock flash status reg with wp support.\n"); + ret = unlock_flash_wp(flash, write_it, erase_it); } + /* + * Fall back to chip unlock function if we haven't already successfully + * unlocked using WP (e.g. WP unlocking failed, chip had no WP support, + * WP was skipped for read/verify ops). + * + * Given the existence of read locks, we want to unlock for read, + * erase, write, and verify. + */ blockprotect_func_t *bp_func = lookup_blockprotect_func_ptr(flash->chip); if (ret && bp_func) bp_func(flash); -- To view, visit https://review.coreboot.org/c/flashrom/+/75991?usp=email To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: flashrom Gerrit-Branch: master Gerrit-Change-Id: I5dc66474a0b7969b51b86ac9f5daa2c95ae968f1 Gerrit-Change-Number: 75991 Gerrit-PatchSet: 5 Gerrit-Owner: Nikolai Artemiev <nartemiev(a)google.com> Gerrit-Reviewer: Brian Norris <briannorris(a)chromium.org> Gerrit-Reviewer: Edward O'Callaghan <quasisec(a)chromium.org> Gerrit-Reviewer: Nikolai Artemiev <nartemiev(a)google.com> Gerrit-Reviewer: build bot (Jenkins) <no-reply(a)coreboot.org> Gerrit-CC: Alexander Goncharov <chat(a)joursoir.net> Gerrit-MessageType: merged

1 0

[XS] Change in flashrom[master]: doc: Fix nesting of About flashrom group of menu items
by Alexander Goncharov (Code Review) 30 Aug '23

30 Aug '23

Alexander Goncharov has submitted this change. ( https://review.coreboot.org/c/flashrom/+/77293?usp=email ) Change subject: doc: Fix nesting of About flashrom group of menu items ...................................................................... doc: Fix nesting of About flashrom group of menu items Adding the title to About flashrom index page allows the engine to recognise it as a group with a list of menu items inside, which is as expected. Without the title on the index page, all menu items inside About flashrom are inlined into the menu. Change-Id: I595acc282a536a6d5fa26cf2f8d18dbe549f9716 Signed-off-by: Anastasia Klimchuk <aklm(a)flashrom.org> Reviewed-on: https://review.coreboot.org/c/flashrom/+/77293 Reviewed-by: Edward O'Callaghan <quasisec(a)chromium.org> Tested-by: build bot (Jenkins) <no-reply(a)coreboot.org> Reviewed-by: Alexander Goncharov <chat(a)joursoir.net> --- M doc/about_flashrom/index.rst 1 file changed, 3 insertions(+), 0 deletions(-) Approvals: build bot (Jenkins): Verified Alexander Goncharov: Looks good to me, approved Edward O'Callaghan: Looks good to me, approved diff --git a/doc/about_flashrom/index.rst b/doc/about_flashrom/index.rst index 11d845f..de36fc2 100644 --- a/doc/about_flashrom/index.rst +++ b/doc/about_flashrom/index.rst @@ -1,3 +1,6 @@ +About flashrom +============== + .. toctree:: :maxdepth: 1 -- To view, visit https://review.coreboot.org/c/flashrom/+/77293?usp=email To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: flashrom Gerrit-Branch: master Gerrit-Change-Id: I595acc282a536a6d5fa26cf2f8d18dbe549f9716 Gerrit-Change-Number: 77293 Gerrit-PatchSet: 2 Gerrit-Owner: Anastasia Klimchuk <aklm(a)chromium.org> Gerrit-Reviewer: Alexander Goncharov <chat(a)joursoir.net> Gerrit-Reviewer: Edward O'Callaghan <quasisec(a)chromium.org> Gerrit-Reviewer: Thomas Heijligen <src(a)posteo.de> Gerrit-Reviewer: build bot (Jenkins) <no-reply(a)coreboot.org> Gerrit-MessageType: merged

1 0

2024

2023

2022

2021

2020

2019

2018

2017

flashrom-gerrit August 2023