March 2026 - flashrom-gerrit - mail.coreboot.org

Change in flashrom[master]: print.c: Fix alignment in print_supported_boards_helper()
by David Hendricks (Code Review) July 2, 2026

July 2, 2026

David Hendricks has uploaded this change for review. ( https://review.coreboot.org/c/flashrom/+/37407 ) Change subject: print.c: Fix alignment in print_supported_boards_helper() ...................................................................... print.c: Fix alignment in print_supported_boards_helper() Commit 61e16e5 eliminated some duplicate logic for printing test status, but in doing so introduced a regression where some entries in `flashrom -L` output became unaligned. Up until then, it was assumed that the status field will always be 8-wide, including space for padding. This patch fixes alignment when using test_state_to_text() by making the padding consistent with other fields where a for-loop is used to pad the field up to a maximum width. Change-Id: Ie0a0b45c6466d14447aca443c2697e2048c6ef14 Signed-off-by: David Hendricks <david.hendricks(a)gmail.com> --- M flash.h M print.c 2 files changed, 29 insertions(+), 14 deletions(-) git pull ssh://review.coreboot.org:29418/flashrom refs/changes/07/37407/1 diff --git a/flash.h b/flash.h index 1a9bd9f..e7b1c89 100644 --- a/flash.h +++ b/flash.h @@ -145,10 +145,11 @@ enum test_state { OK = 0, - NT = 1, /* Not tested */ - BAD, /* Known to not work */ - DEP, /* Support depends on configuration (e.g. Intel flash descriptor) */ - NA, /* Not applicable (e.g. write support on ROM chips) */ + NT = 1, /* Not tested */ + BAD, /* Known to not work */ + DEP, /* Support depends on configuration (e.g. Intel flash descriptor) */ + NA, /* Not applicable (e.g. write support on ROM chips) */ + TEST_STATE_END, /* Not a test state, just an indicator of how many are defined. */ }; #define TEST_UNTESTED (struct tested){ .probe = NT, .read = NT, .erase = NT, .write = NT } diff --git a/print.c b/print.c index 6a7ff5d..e5be6b6 100644 --- a/print.c +++ b/print.c @@ -35,6 +35,20 @@ } } +static size_t max_test_state_len(void) +{ + int i; + size_t max_len; + + for (i = max_len = 0; i < TEST_STATE_END; i++) { + size_t len = strlen(test_state_to_text(i)); + if (len > max_len) + max_len = len; + } + + return max_len; +} + static int print_supported_chips(void) { const char *delim = "/"; @@ -388,8 +402,12 @@ for (i = strlen("Board"); i < maxboardlen; i++) msg_ginfo(" "); - msg_ginfo("Status Required value for\n"); - for (i = 0; i < maxvendorlen + maxboardlen + strlen("Status "); i++) + msg_ginfo("Status"); + for (i = strlen("Status"); i < max_test_state_len(); i++) + msg_ginfo(" "); + + msg_ginfo("Required value for\n"); + for (i = 0; i < maxvendorlen + maxboardlen + max_test_state_len(); i++) msg_ginfo(" "); msg_ginfo("-p internal:mainboard=\n"); @@ -401,14 +419,10 @@ for (i = 0; i < maxboardlen - strlen(b->name); i++) msg_ginfo(" "); - switch (b->working) { - case OK: msg_ginfo("OK "); break; - case NT: msg_ginfo("NT "); break; - case DEP: msg_ginfo("DEP "); break; - case NA: msg_ginfo("N/A "); break; - case BAD: - default: msg_ginfo("BAD "); break; - } + const char *test_state = test_state_to_text(b->working); + msg_ginfo("%s", test_state); + for (i = 0; i < max_test_state_len() - strlen(test_state); i++) + msg_ginfo(" "); for (e = board_matches; e->vendor_name != NULL; e++) { if (strcmp(e->vendor_name, b->vendor) -- To view, visit https://review.coreboot.org/c/flashrom/+/37407 To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: flashrom Gerrit-Branch: master Gerrit-Change-Id: Ie0a0b45c6466d14447aca443c2697e2048c6ef14 Gerrit-Change-Number: 37407 Gerrit-PatchSet: 1 Gerrit-Owner: David Hendricks <david.hendricks(a)gmail.com> Gerrit-MessageType: newchange

5 8

[XS] Change in flashrom[main]: serial.h: Unify header guards style
by Antonio Vázquez Blanco (Code Review) March 31, 2026

March 31, 2026

Antonio Vázquez Blanco has uploaded this change for review. ( https://review.coreboot.org/c/flashrom/+/91953?usp=email ) Change subject: serial.h: Unify header guards style ...................................................................... serial.h: Unify header guards style Use the same guard style in all include/platform/ header files. Change-Id: I8bd310c6969b73d3a192298020045f67ba93af25 Signed-off-by: Antonio Vázquez Blanco <antoniovazquezblanco(a)gmail.com> --- M include/serial.h 1 file changed, 2 insertions(+), 2 deletions(-) git pull ssh://review.coreboot.org:29418/flashrom refs/changes/53/91953/1 diff --git a/include/serial.h b/include/serial.h index 500368c..b74e4ea 100644 --- a/include/serial.h +++ b/include/serial.h @@ -5,7 +5,7 @@ */ #ifndef __SERIAL_H__ -#define __SERIAL_H__ 1 +#define __SERIAL_H__ #if IS_WINDOWS #include <windows.h> @@ -53,4 +53,4 @@ void sp_set_pin(enum SP_PIN pin, int val); int sp_get_pin(enum SP_PIN pin); -#endif /* !__SERIAL_H__ */ +#endif /* __SERIAL_H__ */ -- To view, visit https://review.coreboot.org/c/flashrom/+/91953?usp=email To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings?usp=email Gerrit-MessageType: newchange Gerrit-Project: flashrom Gerrit-Branch: main Gerrit-Change-Id: I8bd310c6969b73d3a192298020045f67ba93af25 Gerrit-Change-Number: 91953 Gerrit-PatchSet: 1 Gerrit-Owner: Antonio Vázquez Blanco <antoniovazquezblanco(a)gmail.com>

1 0

[XS] Change in flashrom[main]: custom_baud.h: Unify header guards style
by Antonio Vázquez Blanco (Code Review) March 31, 2026

March 31, 2026

Antonio Vázquez Blanco has uploaded this change for review. ( https://review.coreboot.org/c/flashrom/+/91952?usp=email ) Change subject: custom_baud.h: Unify header guards style ...................................................................... custom_baud.h: Unify header guards style Use the same guard style in all include/platform/ header files. Change-Id: I34b97ea0cd937a0785097b1188af8b3d2f70622b Signed-off-by: Antonio Vázquez Blanco <antoniovazquezblanco(a)gmail.com> --- M include/custom_baud.h 1 file changed, 2 insertions(+), 2 deletions(-) git pull ssh://review.coreboot.org:29418/flashrom refs/changes/52/91952/1 diff --git a/include/custom_baud.h b/include/custom_baud.h index f16cf0b..6957874 100644 --- a/include/custom_baud.h +++ b/include/custom_baud.h @@ -6,7 +6,7 @@ */ #ifndef __CUSTOM_BAUD_H__ -#define __CUSTOM_BAUD_H__ 1 +#define __CUSTOM_BAUD_H__ struct baudentry { int flag; @@ -25,4 +25,4 @@ The baudtable must be in ascending order and terminated with a 0-baud entry. */ int use_custom_baud(unsigned int baud, const struct baudentry *baudtable); -#endif +#endif /* __CUSTOM_BAUD_H__ */ -- To view, visit https://review.coreboot.org/c/flashrom/+/91952?usp=email To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings?usp=email Gerrit-MessageType: newchange Gerrit-Project: flashrom Gerrit-Branch: main Gerrit-Change-Id: I34b97ea0cd937a0785097b1188af8b3d2f70622b Gerrit-Change-Number: 91952 Gerrit-PatchSet: 1 Gerrit-Owner: Antonio Vázquez Blanco <antoniovazquezblanco(a)gmail.com>

1 0

[S] Change in flashrom[main]: platform/serial: Move platform dependent code to the platform folder
by Antonio Vázquez Blanco (Code Review) March 31, 2026

March 31, 2026

Antonio Vázquez Blanco has uploaded this change for review. ( https://review.coreboot.org/c/flashrom/+/91951?usp=email ) Change subject: platform/serial: Move platform dependent code to the platform folder ...................................................................... platform/serial: Move platform dependent code to the platform folder Move all serial platform dependent code from serial.h and serial.c to platform/serial.h and platform/serial.c. Change-Id: Iec7bfa16d8d358890140828f85751d88ede5c82f Signed-off-by: Antonio Vázquez Blanco <antoniovazquezblanco(a)gmail.com> --- R include/platform/serial.h M meson.build M platform/meson.build R platform/serial.c M programmers/buspirate_spi.c M programmers/pony_spi.c M programmers/serprog.c M programmers/spidriver.c 8 files changed, 13 insertions(+), 9 deletions(-) git pull ssh://review.coreboot.org:29418/flashrom refs/changes/51/91951/1 diff --git a/include/serial.h b/include/platform/serial.h similarity index 100% rename from include/serial.h rename to include/platform/serial.h diff --git a/meson.build b/meson.build index f87a86e..0207156 100644 --- a/meson.build +++ b/meson.build @@ -258,7 +258,7 @@ 'buspirate_spi' : { 'systems' : systems_serial, 'groups' : [ group_serial, group_external ], - 'srcs' : files('programmers/buspirate_spi.c', 'serial.c', custom_baud_c), + 'srcs' : files('programmers/buspirate_spi.c', custom_baud_c), 'flags' : [ '-DCONFIG_BUSPIRATE_SPI=1' ], }, 'ch341a_spi' : { @@ -494,7 +494,7 @@ 'pony_spi' : { 'systems' : systems_serial, 'groups' : [ group_serial, group_external ], - 'srcs' : files('programmers/pony_spi.c', 'serial.c', custom_baud_c), + 'srcs' : files('programmers/pony_spi.c', custom_baud_c), 'flags' : [ '-DCONFIG_PONY_SPI=1' ], }, 'raiden_debug_spi' : { @@ -538,13 +538,13 @@ 'serprog' : { 'systems' : systems_serial, 'groups' : [ group_serial, group_external ], - 'srcs' : files('programmers/serprog.c', 'serial.c', custom_baud_c), + 'srcs' : files('programmers/serprog.c', custom_baud_c), 'flags' : [ '-DCONFIG_SERPROG=1' ], }, 'spidriver' : { 'systems' : systems_serial, 'groups' : [ group_serial, group_external ], - 'srcs' : files('programmers/spidriver.c', 'serial.c', custom_baud_c), + 'srcs' : files('programmers/spidriver.c', custom_baud_c), 'test_srcs' : files('tests/spidriver.c'), 'flags' : [ '-DCONFIG_SPIDRIVER=1' ], }, diff --git a/platform/meson.build b/platform/meson.build index ca240c1..d711b7b 100644 --- a/platform/meson.build +++ b/platform/meson.build @@ -6,6 +6,10 @@ # __FLASHROM_LITTLE_ENDIAN__ / __FLASHROM_BIG_ENDIAN__ add_project_arguments('-D__FLASHROM_' + host_machine.endian().to_upper() + '_ENDIAN__=1', language : 'c') +# Serial +srcs += files('serial.c') + +# Udelay # Select an appropriate delay implementation for the target OS if target_machine.system() == 'dos' srcs += files('udelay_dos.c') diff --git a/serial.c b/platform/serial.c similarity index 99% rename from serial.c rename to platform/serial.c index 925b742..73ba0f7 100644 --- a/serial.c +++ b/platform/serial.c @@ -6,7 +6,7 @@ * SPDX-FileCopyrightText: 2009,2010 Carl-Daniel Hailfinger */ -#include "serial.h" +#include "platform/serial.h" #include <stdio.h> #include <stdlib.h> diff --git a/programmers/buspirate_spi.c b/programmers/buspirate_spi.c index c0683d3..4bd146f 100644 --- a/programmers/buspirate_spi.c +++ b/programmers/buspirate_spi.c @@ -15,7 +15,7 @@ #include "programmer.h" #include "spi.h" #include "platform/udelay.h" -#include "serial.h" +#include "platform/serial.h" #include "helpers.h" /* Change this to #define if you want to test without a serial implementation */ diff --git a/programmers/pony_spi.c b/programmers/pony_spi.c index 4d0397f..ef5be6c 100644 --- a/programmers/pony_spi.c +++ b/programmers/pony_spi.c @@ -36,7 +36,7 @@ #include "flash.h" #include "programmer.h" #include "platform/udelay.h" -#include "serial.h" +#include "platform/serial.h" enum pony_type { TYPE_SI_PROG, diff --git a/programmers/serprog.c b/programmers/serprog.c index 82b538f..8c4208f 100644 --- a/programmers/serprog.c +++ b/programmers/serprog.c @@ -30,7 +30,7 @@ #include "programmer.h" #include "chipdrivers.h" #include "platform/udelay.h" -#include "serial.h" +#include "platform/serial.h" /* According to Serial Flasher Protocol Specification - version 1 */ #define S_ACK 0x06 diff --git a/programmers/spidriver.c b/programmers/spidriver.c index 7b097f2..4c5e1e6 100644 --- a/programmers/spidriver.c +++ b/programmers/spidriver.c @@ -23,7 +23,7 @@ #include "programmer.h" #include "spi.h" #include "platform/udelay.h" -#include "serial.h" +#include "platform/serial.h" static int spidriver_serialport_setup(char *dev) { -- To view, visit https://review.coreboot.org/c/flashrom/+/91951?usp=email To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings?usp=email Gerrit-MessageType: newchange Gerrit-Project: flashrom Gerrit-Branch: main Gerrit-Change-Id: Iec7bfa16d8d358890140828f85751d88ede5c82f Gerrit-Change-Number: 91951 Gerrit-PatchSet: 1 Gerrit-Owner: Antonio Vázquez Blanco <antoniovazquezblanco(a)gmail.com>

1 0

[S] Change in flashrom[main]: include/platform/: Unify header guards style
by Anastasia Klimchuk (Code Review) March 31, 2026

March 31, 2026

Anastasia Klimchuk has submitted this change. ( https://review.coreboot.org/c/flashrom/+/91687?usp=email ) ( 1 is the latest approved patch-set. No files were changed between the latest approved patch-set and the submitted one. )Change subject: include/platform/: Unify header guards style ...................................................................... include/platform/: Unify header guards style Use the same guard style in all include/platform/ header files. Change-Id: I8bce5aff2f13f1a3be4fb0fed4f2a5d33e5ffddb Signed-off-by: Antonio Vázquez <antoniovazquezblanco(a)gmail.com> Reviewed-on: https://review.coreboot.org/c/flashrom/+/91687 Reviewed-by: Anastasia Klimchuk <aklm(a)chromium.org> Tested-by: build bot (Jenkins) <no-reply(a)coreboot.org> --- M include/platform/endian.h M include/platform/swap.h M include/platform/udelay.h 3 files changed, 8 insertions(+), 8 deletions(-) Approvals: build bot (Jenkins): Verified Anastasia Klimchuk: Looks good to me, approved diff --git a/include/platform/endian.h b/include/platform/endian.h index 60f3443..34ca6e3 100644 --- a/include/platform/endian.h +++ b/include/platform/endian.h @@ -11,7 +11,7 @@ */ #ifndef __PLATFORM_ENDIAN_H__ -#define __PLATFORM_ENDIAN_H__ 1 +#define __PLATFORM_ENDIAN_H__ #include <stddef.h> #include <stdint.h> @@ -194,4 +194,4 @@ */ uint64_t read_be64(const void *base, size_t offset); -#endif /* !__PLATFORM_ENDIAN_H__ */ +#endif /* __PLATFORM_ENDIAN_H__ */ diff --git a/include/platform/swap.h b/include/platform/swap.h index 3a66fa0..91a850e 100644 --- a/include/platform/swap.h +++ b/include/platform/swap.h @@ -10,8 +10,8 @@ * inline functions and macros shared by endian conversion functions */ -#ifndef ___SWAP_H___ -#define ___SWAP_H___ 1 +#ifndef __PLATFORM_SWAP_H__ +#define __PLATFORM_SWAP_H__ #include <stdint.h> @@ -68,4 +68,4 @@ #define ___return_swapped(name, bits) \ uint##bits##_t name##bits (const uint##bits##_t value) { return ___swap##bits (value); } -#endif /* !___SWAP_H___ */ +#endif /* __PLATFORM_SWAP_H__ */ diff --git a/include/platform/udelay.h b/include/platform/udelay.h index 4771e0d..4702b04 100644 --- a/include/platform/udelay.h +++ b/include/platform/udelay.h @@ -8,8 +8,8 @@ * microsecond-level timing delays in a platform-independent manner. */ -#ifndef __UDELAY_H__ -#define __UDELAY_H__ +#ifndef __PLATFORM_UDELAY_H__ +#define __PLATFORM_UDELAY_H__ /** * @brief Delay for at least the specified number of microseconds. @@ -22,4 +22,4 @@ */ void default_delay(unsigned int usecs); -#endif +#endif /* __PLATFORM_UDELAY_H__ */ -- To view, visit https://review.coreboot.org/c/flashrom/+/91687?usp=email To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings?usp=email Gerrit-MessageType: merged Gerrit-Project: flashrom Gerrit-Branch: main Gerrit-Change-Id: I8bce5aff2f13f1a3be4fb0fed4f2a5d33e5ffddb Gerrit-Change-Number: 91687 Gerrit-PatchSet: 3 Gerrit-Owner: Antonio Vázquez Blanco <antoniovazquezblanco(a)gmail.com> Gerrit-Reviewer: Anastasia Klimchuk <aklm(a)chromium.org> Gerrit-Reviewer: build bot (Jenkins) <no-reply(a)coreboot.org>

1 0

[S] Change in flashrom[main]: tests: Replace deprecated assertions with backward compatible ones
by Anastasia Klimchuk (Code Review) March 31, 2026

March 31, 2026

Anastasia Klimchuk has submitted this change. ( https://review.coreboot.org/c/flashrom/+/91825?usp=email ) ( 2 is the latest approved patch-set. No files were changed between the latest approved patch-set and the submitted one. )Change subject: tests: Replace deprecated assertions with backward compatible ones ...................................................................... tests: Replace deprecated assertions with backward compatible ones assert_in_range and assert_in_set are used on older versions of cmocka (for example jenkins currently has 1.1.7), but deprecated for newer versions. So depending on the version on the local environment these assert macros may or may not work. assert_true works for any version, so this commit aims to unblock everyone to be able to run tests. For the long term we will need to upgrade to newer cmocka version and upgrade jenkins environment. Tested on cmocka version 1.1.7 and 2.0.2, all tests pass. Change-Id: Idb5fdd8151699f298da66b0aaf9a3e391c1adf10 Signed-off-by: Anastasia Klimchuk <aklm(a)flashrom.org> Reviewed-on: https://review.coreboot.org/c/flashrom/+/91825 Reviewed-by: Antonio Vázquez Blanco <antoniovazquezblanco(a)gmail.com> Reviewed-by: Peter Marheine <pmarheine(a)chromium.org> Tested-by: build bot (Jenkins) <no-reply(a)coreboot.org> Reviewed-by: Abdelkader Boudih <coreboot(a)seuros.com> --- M tests/chip.c M tests/erase_func_algo.c M tests/probe_spi.c M tests/realtek_mst_i2c_spi.c M tests/udelay.c 5 files changed, 30 insertions(+), 19 deletions(-) Approvals: build bot (Jenkins): Verified Abdelkader Boudih: Looks good to me, but someone else must approve Peter Marheine: Looks good to me, approved Antonio Vázquez Blanco: Looks good to me, but someone else must approve diff --git a/tests/chip.c b/tests/chip.c index adda48a..acaadf3 100644 --- a/tests/chip.c +++ b/tests/chip.c @@ -47,7 +47,7 @@ { printf("Read chip called with start=0x%x, len=0x%x\n", start, len); - assert_in_range(start + len, 0, MOCK_CHIP_SIZE); + assert_true(start + len <= MOCK_CHIP_SIZE); memcpy(buf, &g_chip_state.buf[start], len); return 0; @@ -57,7 +57,7 @@ { printf("Write chip called with start=0x%x, len=0x%x\n", start, len); - assert_in_range(start + len, 0, MOCK_CHIP_SIZE); + assert_true(start + len <= MOCK_CHIP_SIZE); memcpy(&g_chip_state.buf[start], buf, len); return 0; @@ -67,7 +67,7 @@ { printf("Block erase called with blockaddr=0x%x, blocklen=0x%x\n", blockaddr, blocklen); - assert_in_range(blockaddr + blocklen, 0, MOCK_CHIP_SIZE); + assert_true(blockaddr + blocklen <= MOCK_CHIP_SIZE); memset(&g_chip_state.buf[blockaddr], 0xff, blocklen); return 0; diff --git a/tests/erase_func_algo.c b/tests/erase_func_algo.c index f75fb9f..b0cfbc3 100644 --- a/tests/erase_func_algo.c +++ b/tests/erase_func_algo.c @@ -65,7 +65,7 @@ if (start < MOCK_CHIP_SIZE) LOG_READ_WRITE_FUNC; - assert_in_range(start + len, 0, MIN_REAL_CHIP_SIZE); + assert_true(start + len <= MIN_REAL_CHIP_SIZE); memcpy(buf, &g_state.buf[start], len); @@ -87,7 +87,7 @@ if (start < MOCK_CHIP_SIZE) LOG_READ_WRITE_FUNC; - assert_in_range(start + len, 0, MIN_REAL_CHIP_SIZE); + assert_true(start + len <= MIN_REAL_CHIP_SIZE); memcpy(&g_state.buf[start], buf, len); @@ -113,7 +113,7 @@ g_state.eraseblocks_actual_ind++; } - assert_in_range(blockaddr + blocklen, 0, MIN_REAL_CHIP_SIZE); + assert_true(blockaddr + blocklen <= MIN_REAL_CHIP_SIZE); memset(&g_state.buf[blockaddr], ERASE_VALUE, blocklen); @@ -1438,7 +1438,7 @@ g_state.eraseblocks_actual_ind++; } - assert_in_range(blockaddr + blocklen, 0, MIN_REAL_CHIP_SIZE); + assert_true(blockaddr + blocklen <= MIN_REAL_CHIP_SIZE); // Check we are not trying to erase protected region. This should not happen, // because the logic should handle protected regions and never invoke erasefn diff --git a/tests/probe_spi.c b/tests/probe_spi.c index 0e6dcbd..6a435b2 100644 --- a/tests/probe_spi.c +++ b/tests/probe_spi.c @@ -217,8 +217,10 @@ // FIXME: change to assert_int_equal after caching is fully implemented. // At the moment the number of opcode calls are greater than, because not all // probing functions are using cache. - assert_in_range(probe_io_state.opcode_counter, PROBE_COUNT_JEDEC_RDID_3, flashchips_size); - assert_in_range(probe_io_state.counter, PROBE_COUNT_ALL_SPI_OPCODES, flashchips_size); + assert_true((probe_io_state.opcode_counter >= PROBE_COUNT_JEDEC_RDID_3) + && (probe_io_state.opcode_counter <= flashchips_size)); + assert_true((probe_io_state.counter >= PROBE_COUNT_ALL_SPI_OPCODES) + && (probe_io_state.counter <= flashchips_size)); } void probe_jedec_rdid3_no_matches_found(void **state) @@ -254,8 +256,10 @@ // FIXME: change to assert_int_equal after caching is fully implemented. // At the moment the number of opcode calls are greater than, because not all // probing functions are using cache. - assert_in_range(probe_io_state.opcode_counter, PROBE_COUNT_JEDEC_RDID_3, flashchips_size); - assert_in_range(probe_io_state.counter, PROBE_COUNT_ALL_SPI_OPCODES, flashchips_size); + assert_true((probe_io_state.opcode_counter >= PROBE_COUNT_JEDEC_RDID_3) + && (probe_io_state.opcode_counter <= flashchips_size)); + assert_true((probe_io_state.counter >= PROBE_COUNT_ALL_SPI_OPCODES) + && (probe_io_state.counter <= flashchips_size)); } void probe_jedec_res1_fixed_chipname(void **state) @@ -328,8 +332,10 @@ // FIXME: change to assert_int_equal after caching is fully implemented. // At the moment the number of opcode calls are greater than, because not all // probing functions are using cache. - assert_in_range(probe_io_state.opcode_counter, PROBE_COUNT_JEDEC_RES_1, flashchips_size); - assert_in_range(probe_io_state.counter, PROBE_COUNT_ALL_SPI_OPCODES, flashchips_size); + assert_true((probe_io_state.opcode_counter >= PROBE_COUNT_JEDEC_RES_1) + && (probe_io_state.opcode_counter <= flashchips_size)); + assert_true((probe_io_state.counter >= PROBE_COUNT_ALL_SPI_OPCODES) + && (probe_io_state.counter <= flashchips_size)); } void probe_jedec_res1_no_matches_found(void **state) @@ -365,8 +371,10 @@ // FIXME: change to assert_int_equal after caching is fully implemented. // At the moment the number of opcode calls are greater than, because not all // probing functions are using cache. - assert_in_range(probe_io_state.opcode_counter, PROBE_COUNT_JEDEC_RES_1, flashchips_size); - assert_in_range(probe_io_state.counter, PROBE_COUNT_ALL_SPI_OPCODES, flashchips_size); + assert_true((probe_io_state.opcode_counter >= PROBE_COUNT_JEDEC_RES_1) + && (probe_io_state.opcode_counter <= flashchips_size)); + assert_true((probe_io_state.counter >= PROBE_COUNT_ALL_SPI_OPCODES) + && (probe_io_state.counter <= flashchips_size)); } #else diff --git a/tests/realtek_mst_i2c_spi.c b/tests/realtek_mst_i2c_spi.c index 74a7a55..81ea735 100644 --- a/tests/realtek_mst_i2c_spi.c +++ b/tests/realtek_mst_i2c_spi.c @@ -29,8 +29,11 @@ static int realtek_mst_write(void *state, int fd, const void *buf, size_t sz) { assert_int_equal(fd, MOCK_FD); - const LargestIntegralType accepted_sizes[] = {1, 2}; - assert_in_set(sz, accepted_sizes, ARRAY_SIZE(accepted_sizes)); + + //const LargestIntegralType accepted_sizes[] = {1, 2}; + //assert_in_set(sz, accepted_sizes, ARRAY_SIZE(accepted_sizes)); + // TODO: return the assert_in_set back after upgrading cmocka version + assert_true((sz == 1) || (sz == 2)); return sz; } diff --git a/tests/udelay.c b/tests/udelay.c index 84fa3e1..112f482 100644 --- a/tests/udelay.c +++ b/tests/udelay.c @@ -42,7 +42,7 @@ * It's not useful to test the sleep path because we assume the OS won't * sleep for less time than we ask. */ - int64_t delay_us = 100; + uint64_t delay_us = 100; if (delay_us >= min_sleep) delay_us = min_sleep - 1; /* No point in running this test if delay always sleeps. */ @@ -53,5 +53,5 @@ default_delay(delay_us); uint64_t elapsed = now_us() - start; - assert_in_range(elapsed, delay_us, 10 * delay_us); + assert_true((elapsed >= delay_us) && (elapsed <= 10 * delay_us)); } -- To view, visit https://review.coreboot.org/c/flashrom/+/91825?usp=email To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings?usp=email Gerrit-MessageType: merged Gerrit-Project: flashrom Gerrit-Branch: main Gerrit-Change-Id: Idb5fdd8151699f298da66b0aaf9a3e391c1adf10 Gerrit-Change-Number: 91825 Gerrit-PatchSet: 4 Gerrit-Owner: Anastasia Klimchuk <aklm(a)chromium.org> Gerrit-Reviewer: Abdelkader Boudih <coreboot(a)seuros.com> Gerrit-Reviewer: Anastasia Klimchuk <aklm(a)chromium.org> Gerrit-Reviewer: Antonio Vázquez Blanco <antoniovazquezblanco(a)gmail.com> Gerrit-Reviewer: Peter Marheine <pmarheine(a)chromium.org> Gerrit-Reviewer: build bot (Jenkins) <no-reply(a)coreboot.org>

1 0

[M] Change in flashrom[main]: Serial: Reorder declarations and document functions
by Alejandro (Code Review) March 30, 2026

March 30, 2026

Attention is currently required from: Anastasia Klimchuk. Alejandro has posted comments on this change by Alejandro. ( https://review.coreboot.org/c/flashrom/+/90802?usp=email ) Change subject: Serial: Reorder declarations and document functions ...................................................................... Patch Set 3: (8 comments) Patchset: PS3: > I deleted the old branch by error, when i pushed it created a new ticket: […] @aklm@chromium.org ok now it should be done, Sorry for these mistakes and for making you spend time on me, but I'm not used to this platform Commit Message: https://review.coreboot.org/c/flashrom/+/90802/comment/914357b1_cd3a26be?us… : PS3, Line 7: Reorder declarations and document > Ideally you do two things is two commits (reorder first, document second) […] Done File include/serial.h: https://review.coreboot.org/c/flashrom/+/90802/comment/dc19d814_a817eb9d?us… : PS3, Line 56: > what has changed here, have you removed new line at the end? why? Done https://review.coreboot.org/c/flashrom/+/90802/comment/8026c1dd_abda96c2?us… : PS3, Line 14: /* Includes */ > not needed Done https://review.coreboot.org/c/flashrom/+/90802/comment/70788b1c_773a742a?us… : PS3, Line 19: /* Type definitions */ > not needed Done https://review.coreboot.org/c/flashrom/+/90802/comment/fd593f0c_863c6649?us… : PS3, Line 52: /* Variable declarations */ > this is not needed (it is obvious from the next lines) Done https://review.coreboot.org/c/flashrom/+/90802/comment/f491c37a_78bead1f?us… : PS3, Line 56: /* Function declarations */ > also not needed (same reason) Done https://review.coreboot.org/c/flashrom/+/90802/comment/7c7f1bbc_926892ea?us… : PS3, Line 127: void sp_set_pin(enum SP_PIN pin, int val); : : /** : * @brief Get serial port pin state : * @param pin Pin to read (PIN_CTS, PIN_DSR) : * @return 1 if pin is high, 0 if pin is low : */ : int sp_get_pin(enum SP_PIN pin); > I think these two should be next to enum definition. […] Done -- To view, visit https://review.coreboot.org/c/flashrom/+/90802?usp=email To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings?usp=email Gerrit-MessageType: comment Gerrit-Project: flashrom Gerrit-Branch: main Gerrit-Change-Id: I2b59cd9ddc32d88ef1f58046e55f21f2f3b3920e Gerrit-Change-Number: 90802 Gerrit-PatchSet: 3 Gerrit-Owner: Alejandro <alexing9(a)gmail.com> Gerrit-Reviewer: Alejandro <alexing9(a)gmail.com> Gerrit-Reviewer: Anastasia Klimchuk <aklm(a)chromium.org> Gerrit-Reviewer: Antonio Vázquez Blanco <antoniovazquezblanco(a)gmail.com> Gerrit-Reviewer: build bot (Jenkins) <no-reply(a)coreboot.org> Gerrit-Attention: Anastasia Klimchuk <aklm(a)chromium.org> Gerrit-Comment-Date: Mon, 30 Mar 2026 17:52:24 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: Anastasia Klimchuk <aklm(a)chromium.org> Comment-In-Reply-To: Alejandro <alexing9(a)gmail.com>

1 0

[M] Change in flashrom[main]: serial: Refactor to use consistent naming
by Antonio Vázquez Blanco (Code Review) March 29, 2026

March 29, 2026

Attention is currently required from: Anastasia Klimchuk, David Reguera Garcia (Dreg). Antonio Vázquez Blanco has posted comments on this change by Antonio Vázquez Blanco. ( https://review.coreboot.org/c/flashrom/+/90680?usp=email ) Change subject: serial: Refactor to use consistent naming ...................................................................... Patch Set 5: (1 comment) Patchset: PS5: > Hi there @aklm@chromium.org! Sorry to ping, just to make sure we do not forget about this one :) […] . -- To view, visit https://review.coreboot.org/c/flashrom/+/90680?usp=email To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings?usp=email Gerrit-MessageType: comment Gerrit-Project: flashrom Gerrit-Branch: main Gerrit-Change-Id: I987e315e6605753f964b62b2d0e44235768ca672 Gerrit-Change-Number: 90680 Gerrit-PatchSet: 5 Gerrit-Owner: Antonio Vázquez Blanco <antoniovazquezblanco(a)gmail.com> Gerrit-Reviewer: Anastasia Klimchuk <aklm(a)chromium.org> Gerrit-Reviewer: David Reguera Garcia (Dreg) <regueragarciadavid(a)gmail.com> Gerrit-Reviewer: build bot (Jenkins) <no-reply(a)coreboot.org> Gerrit-Attention: Anastasia Klimchuk <aklm(a)chromium.org> Gerrit-Attention: David Reguera Garcia (Dreg) <regueragarciadavid(a)gmail.com> Gerrit-Comment-Date: Sun, 29 Mar 2026 16:21:42 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: Antonio Vázquez Blanco <antoniovazquezblanco(a)gmail.com>

1 0

[S] Change in flashrom[main]: platform/udelay: Extract libpayload implementation to a separate file
by Antonio Vázquez Blanco (Code Review) March 29, 2026

March 29, 2026

Attention is currently required from: Peter Marheine. Antonio Vázquez Blanco has posted comments on this change by Antonio Vázquez Blanco. ( https://review.coreboot.org/c/flashrom/+/91909?usp=email ) Change subject: platform/udelay: Extract libpayload implementation to a separate file ...................................................................... Patch Set 1: (1 comment) Patchset: PS1: After a quick look into libpayload, it seems that the ability to compile against it has been lost in the transition from Makefiles to meson... This PR avoids removing libpayload support but it cannot asure builds against libpayload will work... Let me know if you prefer libpayload support gone. -- To view, visit https://review.coreboot.org/c/flashrom/+/91909?usp=email To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings?usp=email Gerrit-MessageType: comment Gerrit-Project: flashrom Gerrit-Branch: main Gerrit-Change-Id: I199ce62cbc90bba9ad38174156b7545358620094 Gerrit-Change-Number: 91909 Gerrit-PatchSet: 1 Gerrit-Owner: Antonio Vázquez Blanco <antoniovazquezblanco(a)gmail.com> Gerrit-Reviewer: Peter Marheine <pmarheine(a)chromium.org> Gerrit-Attention: Peter Marheine <pmarheine(a)chromium.org> Gerrit-Comment-Date: Sun, 29 Mar 2026 15:36:06 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No

1 0

[S] Change in flashrom[main]: platform/udelay: Extract libpayload implementation to a separate file
by Antonio Vázquez Blanco (Code Review) March 29, 2026

March 29, 2026

Antonio Vázquez Blanco has uploaded this change for review. ( https://review.coreboot.org/c/flashrom/+/91909?usp=email ) Change subject: platform/udelay: Extract libpayload implementation to a separate file ...................................................................... platform/udelay: Extract libpayload implementation to a separate file Currently, multiple platform implementations reside in platform/udelay.c. Extract libpayload implementation to platform/udelay_libpayload.c and let meson handle implementation selection instead of using preprocesor conditionals. Change-Id: I199ce62cbc90bba9ad38174156b7545358620094 Signed-off-by: Antonio Vázquez Blanco <antoniovazquezblanco(a)gmail.com> --- M platform/meson.build M platform/udelay.c A platform/udelay_libpayload.c 3 files changed, 19 insertions(+), 11 deletions(-) git pull ssh://review.coreboot.org:29418/flashrom refs/changes/09/91909/1 diff --git a/platform/meson.build b/platform/meson.build index ca240c1..a0965c5 100644 --- a/platform/meson.build +++ b/platform/meson.build @@ -11,6 +11,8 @@ srcs += files('udelay_dos.c') elif target_machine.system() == 'windows' srcs += files('udelay_windows.c') +elif target_machine.system() == 'libpayload' + srcs += files('udelay_libpayload.c') else srcs += files('udelay.c') endif diff --git a/platform/udelay.c b/platform/udelay.c index 0627681..c85d7c8 100644 --- a/platform/udelay.c +++ b/platform/udelay.c @@ -7,8 +7,6 @@ * SPDX-FileCopyrightText: 2024 Google LLC */ -#ifndef __LIBPAYLOAD__ - #include "platform/udelay.h" #include <stddef.h> @@ -68,12 +66,3 @@ internal_sleep(usecs); } } - -#else -#include <libpayload.h> - -void default_delay(unsigned int usecs) -{ - udelay(usecs); -} -#endif diff --git a/platform/udelay_libpayload.c b/platform/udelay_libpayload.c new file mode 100644 index 0000000..145c24c --- /dev/null +++ b/platform/udelay_libpayload.c @@ -0,0 +1,17 @@ +/* + * This file is part of the flashrom project. + * + * SPDX-License-Identifier: GPL-2.0-or-later + * SPDX-FileCopyrightText: 2000 Silicon Integrated System Corporation + * SPDX-FileCopyrightText: 2009,2010 Carl-Daniel Hailfinger + * SPDX-FileCopyrightText: 2024 Google LLC + */ + +#include "platform/udelay.h" + +#include <libpayload.h> + +void default_delay(unsigned int usecs) +{ + udelay(usecs); +} -- To view, visit https://review.coreboot.org/c/flashrom/+/91909?usp=email To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings?usp=email Gerrit-MessageType: newchange Gerrit-Project: flashrom Gerrit-Branch: main Gerrit-Change-Id: I199ce62cbc90bba9ad38174156b7545358620094 Gerrit-Change-Number: 91909 Gerrit-PatchSet: 1 Gerrit-Owner: Antonio Vázquez Blanco <antoniovazquezblanco(a)gmail.com>

1 0