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

Change in flashrom[master]: tests: Mock file i/o for linux_mtd and linux_spi tests
by Anastasia Klimchuk (Code Review) 19 Jul '21

19 Jul '21

Anastasia Klimchuk has uploaded this change for review. ( https://review.coreboot.org/c/flashrom/+/56413 ) Change subject: tests: Mock file i/o for linux_mtd and linux_spi tests ...................................................................... tests: Mock file i/o for linux_mtd and linux_spi tests This patch adds an init-shutdown test for linux_mtd. Since linux_mtd is using file i/o operations, those are added to the framework and mocked. Another driver linux_spi which is also using file i/o, got an upgrade in this patch, and it is now reading pagesize from sysfs (using mocked file i/o). A good side-effect is that linux_mtd is the first test for opaque masters, which is great to have in preparation for a change like CB:56103 but for opaque masters. BUG=b:181803212 TEST=builds and ninja test Change-Id: I73f0d6ff2ad5074add7a721ed3416230d3647e3f Signed-off-by: Anastasia Klimchuk <aklm(a)chromium.org> --- M tests/init_shutdown.c M tests/io_mock.h M tests/meson.build M tests/tests.c M tests/tests.h 5 files changed, 169 insertions(+), 4 deletions(-) git pull ssh://review.coreboot.org:29418/flashrom refs/changes/13/56413/1 diff --git a/tests/init_shutdown.c b/tests/init_shutdown.c index 8469902..29ca06d 100644 --- a/tests/init_shutdown.c +++ b/tests/init_shutdown.c @@ -182,16 +182,103 @@ #endif } +struct linux_mtd_io_state { + const char *fopen_path; +}; + +FILE *linux_mtd_fopen(void *state, const char *pathname, const char *mode) +{ + struct linux_mtd_io_state *io_state = state; + + io_state->fopen_path = pathname; + + return (void *)2021; +} + +size_t linux_mtd_fread(void *state, void *buf, size_t size, size_t len, FILE *fp) +{ + struct linux_mtd_io_state *io_state = state; + int num_bytes = 0; + + if (!io_state->fopen_path) + return 0; + + if (!strcmp(io_state->fopen_path, "/sys/class/mtd/mtd0//type")) { + num_bytes = 3; + memcpy(buf, "nor", num_bytes); + } + + if (!strcmp(io_state->fopen_path, "/sys/class/mtd/mtd0//name")) { + num_bytes = 6; + memcpy(buf, "Device", num_bytes); + } + + if (!strcmp(io_state->fopen_path, "/sys/class/mtd/mtd0//flags")) { + num_bytes = 0; + memcpy(buf, "", num_bytes); + } + + if (!strcmp(io_state->fopen_path, "/sys/class/mtd/mtd0//size")) { + num_bytes = 4; + memcpy(buf, "1024", num_bytes); + } + + if (!strcmp(io_state->fopen_path, "/sys/class/mtd/mtd0//erasesize")) { + num_bytes = 3; + memcpy(buf, "512", num_bytes); + } + + if (!strcmp(io_state->fopen_path, "/sys/class/mtd/mtd0//numeraseregions")) { + num_bytes = 1; + memcpy(buf, "0", num_bytes); + } + + return num_bytes; +} + +void linux_mtd_init_and_shutdown_test_success(void **state) +{ +#if CONFIG_LINUX_MTD == 1 + struct linux_mtd_io_state linux_mtd_io_state = { NULL }; + const struct io_mock linux_mtd_io = { + .state = &linux_mtd_io_state, + .fopen = linux_mtd_fopen, + .fread = linux_mtd_fread, + }; + + io_mock_register(&linux_mtd_io); + + run_lifecycle(state, &programmer_linux_mtd, ""); + + io_mock_register(NULL); +#else + skip(); +#endif +} + +char *linux_spi_fgets(void *state, char *buf, int len, FILE *fp) +{ + /* Provide pagesize into buf. */ + memcpy(buf, "1048576", len); + return buf; +} + void linux_spi_init_and_shutdown_test_success(void **state) { /* * Current implementation tests a particular path of the init procedure. - * There are two ways for it to succeed: reading the buffer size from sysfs - * and the fallback to getpagesize(). This test does the latter (fallback to - * getpagesize). + * Specifically, it is reading the buffer size from sysfs. */ #if CONFIG_LINUX_SPI == 1 + const struct io_mock linux_spi_io = { + .fgets = linux_spi_fgets, + }; + + io_mock_register(&linux_spi_io); + run_lifecycle(state, &programmer_linux_spi, "dev=/dev/null"); + + io_mock_register(NULL); #else skip(); #endif diff --git a/tests/io_mock.h b/tests/io_mock.h index 72d89c5..4b54516 100644 --- a/tests/io_mock.h +++ b/tests/io_mock.h @@ -37,6 +37,8 @@ struct libusb_context; typedef struct libusb_context libusb_context; +#include <stdio.h> + struct io_mock { void *state; @@ -60,6 +62,10 @@ unsigned char *data, uint16_t wLength, unsigned int timeout); + /* File I/O */ + FILE* (*fopen)(void *state, const char *pathname, const char *mode); + char* (*fgets)(void *state, char *buf, int len, FILE *fp); + size_t (*fread)(void *state, void *buf, size_t size, size_t len, FILE *fp); }; void io_mock_register(const struct io_mock *io); diff --git a/tests/meson.build b/tests/meson.build index a18bc45..7206296 100644 --- a/tests/meson.build +++ b/tests/meson.build @@ -32,6 +32,15 @@ '-Wl,--wrap=ioctl', '-Wl,--wrap=fopen', '-Wl,--wrap=fopen64', + '-Wl,--wrap=stat', + '-Wl,--wrap=stat64', + '-Wl,--wrap=fread', + '-Wl,--wrap=fgets', + '-Wl,--wrap=fclose', + '-Wl,--wrap=feof', + '-Wl,--wrap=ferror', + '-Wl,--wrap=clearerr', + '-Wl,--wrap=setvbuf', '-Wl,--wrap=rget_io_perms', '-Wl,--wrap=test_outb', '-Wl,--wrap=test_inb', diff --git a/tests/tests.c b/tests/tests.c index cde696f..93c3490 100644 --- a/tests/tests.c +++ b/tests/tests.c @@ -74,15 +74,76 @@ FILE *__wrap_fopen(const char *pathname, const char *mode) { LOG_ME; - return NULL; + if (current_io && current_io->fopen) + return current_io->fopen(current_io->state, pathname, mode); + return (void *)MOCK_HANDLE; } FILE *__wrap_fopen64(const char *pathname, const char *mode) { LOG_ME; + if (current_io && current_io->fopen) + return current_io->fopen(current_io->state, pathname, mode); + return (void *)MOCK_HANDLE; +} + +int __wrap_stat(const char *path, void *buf) +{ + LOG_ME; + return 0; +} + +int __wrap_stat64(const char *path, void *buf) +{ + LOG_ME; + return 0; +} + +char *__wrap_fgets(char *buf, int len, FILE *fp) +{ + LOG_ME; + if (current_io && current_io->fgets) + return current_io->fgets(current_io->state, buf, len, fp); return NULL; } +size_t __wrap_fread(void *ptr, size_t size, size_t len, FILE *fp) +{ + LOG_ME; + if (current_io && current_io->fread) + return current_io->fread(current_io->state, ptr, size, len, fp); + return 0; +} + +int __wrap_setvbuf(FILE *fp, char *buf, int type, size_t size) +{ + LOG_ME; + return 0; +} + +int __wrap_fclose(FILE *fp) +{ + LOG_ME; + return 0; +} + +int __wrap_feof(FILE *fp) +{ + /* LOG_ME; */ + return 0; +} + +int __wrap_ferror(FILE *fp) +{ + /* LOG_ME; */ + return 0; +} +void __wrap_clearerr(FILE *fp) +{ + /* LOG_ME; */ + return; +} + int __wrap_rget_io_perms(void) { LOG_ME; @@ -221,6 +282,7 @@ cmocka_unit_test(mec1308_init_and_shutdown_test_success), cmocka_unit_test(dediprog_init_and_shutdown_test_success), cmocka_unit_test(ene_lpc_init_and_shutdown_test_success), + cmocka_unit_test(linux_mtd_init_and_shutdown_test_success), cmocka_unit_test(linux_spi_init_and_shutdown_test_success), }; ret |= cmocka_run_group_tests_name("init_shutdown.c tests", init_shutdown_tests, NULL, NULL); diff --git a/tests/tests.h b/tests/tests.h index 2007695..95b6cc3 100644 --- a/tests/tests.h +++ b/tests/tests.h @@ -45,6 +45,7 @@ void mec1308_init_and_shutdown_test_success(void **state); void dediprog_init_and_shutdown_test_success(void **state); void ene_lpc_init_and_shutdown_test_success(void **state); +void linux_mtd_init_and_shutdown_test_success(void **state); void linux_spi_init_and_shutdown_test_success(void **state); #endif /* TESTS_H */ -- To view, visit https://review.coreboot.org/c/flashrom/+/56413 To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: flashrom Gerrit-Branch: master Gerrit-Change-Id: I73f0d6ff2ad5074add7a721ed3416230d3647e3f Gerrit-Change-Number: 56413 Gerrit-PatchSet: 1 Gerrit-Owner: Anastasia Klimchuk <aklm(a)chromium.org> Gerrit-MessageType: newchange

1 0

Change in flashrom[master]: dediprog: Init-shutdown test for dediprog
by Edward O'Callaghan (Code Review) 19 Jul '21

19 Jul '21

Edward O'Callaghan has submitted this change. ( https://review.coreboot.org/c/flashrom/+/55934 ) Change subject: dediprog: Init-shutdown test for dediprog ...................................................................... dediprog: Init-shutdown test for dediprog This patch adds mocks for libusb functions. To avoid dependency on libusb.h, libusb symbols for context and device handle are redefined. Real libusb functions are never called in tests anyway, cmocka wraps work with this without complaints. BUG=b:181803212 TEST=builds and ninja test Change-Id: I38508dfb6d7c24d42522f22fcae0c5e410c5f7ea Signed-off-by: Anastasia Klimchuk <aklm(a)chromium.org> Reviewed-on: https://review.coreboot.org/c/flashrom/+/55934 Tested-by: build bot (Jenkins) <no-reply(a)coreboot.org> Reviewed-by: Nico Huber <nico.h(a)gmx.de> Reviewed-by: Edward O'Callaghan <quasisec(a)chromium.org> --- M tests/init_shutdown.c M tests/io_mock.h M tests/meson.build M tests/tests.c M tests/tests.h 5 files changed, 111 insertions(+), 3 deletions(-) Approvals: build bot (Jenkins): Verified Nico Huber: Looks good to me, approved Edward O'Callaghan: Looks good to me, approved diff --git a/tests/init_shutdown.c b/tests/init_shutdown.c index 48448f8..8469902 100644 --- a/tests/init_shutdown.c +++ b/tests/init_shutdown.c @@ -85,6 +85,40 @@ #endif } +int dediprog_libusb_control_transfer(void *state, + libusb_device_handle *devh, + uint8_t bmRequestType, + uint8_t bRequest, + uint16_t wValue, + uint16_t wIndex, + unsigned char *data, + uint16_t wLength, + unsigned int timeout) +{ + if (bRequest == 0x08 /* dediprog_cmds CMD_READ_PROG_INFO */) { + /* Provide dediprog Device String into data buffer */ + memcpy(data, "SF600 V:7.2.2 ", wLength); + } + return wLength; +} + +void dediprog_init_and_shutdown_test_success(void **state) +{ +#if CONFIG_DEDIPROG == 1 + const struct io_mock dediprog_io = { + .libusb_control_transfer = dediprog_libusb_control_transfer, + }; + + io_mock_register(&dediprog_io); + + run_lifecycle(state, &programmer_dediprog, "voltage=3.5V"); + + io_mock_register(NULL); +#else + skip(); +#endif +} + struct ene_lpc_io_state { unsigned char outb_val; int pause_cmd; diff --git a/tests/io_mock.h b/tests/io_mock.h index 69045a2..72d89c5 100644 --- a/tests/io_mock.h +++ b/tests/io_mock.h @@ -31,9 +31,16 @@ #ifndef _IO_MOCK_H_ #define _IO_MOCK_H_ +/* Define libusb symbols to avoid dependency on libusb.h */ +struct libusb_device_handle; +typedef struct libusb_device_handle libusb_device_handle; +struct libusb_context; +typedef struct libusb_context libusb_context; + struct io_mock { void *state; + /* Port I/O */ void (*outb)(void *state, unsigned char value, unsigned short port); unsigned char (*inb)(void *state, unsigned short port); @@ -42,6 +49,17 @@ void (*outl)(void *state, unsigned int value, unsigned short port); unsigned int (*inl)(void *state, unsigned short port); + + /* USB I/O */ + int (*libusb_control_transfer)(void *state, + libusb_device_handle *devh, + uint8_t bmRequestType, + uint8_t bRequest, + uint16_t wValue, + uint16_t wIndex, + unsigned char *data, + uint16_t wLength, + unsigned int timeout); }; void io_mock_register(const struct io_mock *io); diff --git a/tests/meson.build b/tests/meson.build index 852fd4c..a18bc45 100644 --- a/tests/meson.build +++ b/tests/meson.build @@ -39,6 +39,13 @@ '-Wl,--wrap=test_inw', '-Wl,--wrap=test_outl', '-Wl,--wrap=test_inl', + '-Wl,--wrap=usb_dev_get_by_vid_pid_number', + '-Wl,--wrap=libusb_set_configuration', + '-Wl,--wrap=libusb_claim_interface', + '-Wl,--wrap=libusb_control_transfer', + '-Wl,--wrap=libusb_release_interface', + '-Wl,--wrap=libusb_close', + '-Wl,--wrap=libusb_exit', '-Wl,--gc-sections', ] diff --git a/tests/tests.c b/tests/tests.c index dcbd5af..cde696f 100644 --- a/tests/tests.c +++ b/tests/tests.c @@ -22,6 +22,7 @@ /* redefinitions/wrapping */ #define LOG_ME printf("%s is called\n", __func__) +#define MOCK_HANDLE 2021 static const struct io_mock *current_io = NULL; @@ -55,19 +56,19 @@ int __wrap_open(const char *pathname, int flags) { LOG_ME; - return 2021; + return MOCK_HANDLE; } int __wrap_open64(const char *pathname, int flags) { LOG_ME; - return 2021; + return MOCK_HANDLE; } int __wrap_ioctl(int fd, unsigned long int request, ...) { LOG_ME; - return 2021; + return MOCK_HANDLE; } FILE *__wrap_fopen(const char *pathname, const char *mode) @@ -133,6 +134,52 @@ return 0; } +void *__wrap_usb_dev_get_by_vid_pid_number( + libusb_context *usb_ctx, uint16_t vid, uint16_t pid, unsigned int num) +{ + LOG_ME; + return (void *)MOCK_HANDLE; +} + +int __wrap_libusb_set_configuration(libusb_device_handle *devh, int config) +{ + LOG_ME; + return 0; +} + +int __wrap_libusb_claim_interface(libusb_device_handle *devh, int interface_number) +{ + LOG_ME; + return 0; +} + +int __wrap_libusb_control_transfer(libusb_device_handle *devh, uint8_t bmRequestType, + uint8_t bRequest, uint16_t wValue, uint16_t wIndex, unsigned char *data, + uint16_t wLength, unsigned int timeout) +{ + LOG_ME; + if (current_io && current_io->libusb_control_transfer) + return current_io->libusb_control_transfer(current_io->state, + devh, bmRequestType, bRequest, wValue, wIndex, data, wLength, timeout); + return 0; +} + +int __wrap_libusb_release_interface(libusb_device_handle *devh, int interface_number) +{ + LOG_ME; + return 0; +} + +void __wrap_libusb_close(libusb_device_handle *devh) +{ + LOG_ME; +} + +void __wrap_libusb_exit(libusb_context *ctx) +{ + LOG_ME; +} + int main(void) { int ret = 0; @@ -172,6 +219,7 @@ const struct CMUnitTest init_shutdown_tests[] = { cmocka_unit_test(dummy_init_and_shutdown_test_success), cmocka_unit_test(mec1308_init_and_shutdown_test_success), + cmocka_unit_test(dediprog_init_and_shutdown_test_success), cmocka_unit_test(ene_lpc_init_and_shutdown_test_success), cmocka_unit_test(linux_spi_init_and_shutdown_test_success), }; diff --git a/tests/tests.h b/tests/tests.h index da4f4a9..2007695 100644 --- a/tests/tests.h +++ b/tests/tests.h @@ -43,6 +43,7 @@ /* init_shutdown.c */ void dummy_init_and_shutdown_test_success(void **state); void mec1308_init_and_shutdown_test_success(void **state); +void dediprog_init_and_shutdown_test_success(void **state); void ene_lpc_init_and_shutdown_test_success(void **state); void linux_spi_init_and_shutdown_test_success(void **state); -- To view, visit https://review.coreboot.org/c/flashrom/+/55934 To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: flashrom Gerrit-Branch: master Gerrit-Change-Id: I38508dfb6d7c24d42522f22fcae0c5e410c5f7ea Gerrit-Change-Number: 55934 Gerrit-PatchSet: 5 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-CC: Paul Menzel <paulepanter(a)mailbox.org> Gerrit-MessageType: merged

1 0

Change in flashrom[master]: dediprog: Init-shutdown test for dediprog
by Edward O'Callaghan (Code Review) 17 Jul '21

17 Jul '21

Attention is currently required from: Angel Pons, Anastasia Klimchuk. Edward O'Callaghan has posted comments on this change. ( https://review.coreboot.org/c/flashrom/+/55934 ) Change subject: dediprog: Init-shutdown test for dediprog ...................................................................... Patch Set 4: Code-Review+2 -- To view, visit https://review.coreboot.org/c/flashrom/+/55934 To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: flashrom Gerrit-Branch: master Gerrit-Change-Id: I38508dfb6d7c24d42522f22fcae0c5e410c5f7ea Gerrit-Change-Number: 55934 Gerrit-PatchSet: 4 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-CC: Paul Menzel <paulepanter(a)mailbox.org> Gerrit-Attention: Angel Pons <th3fanbus(a)gmail.com> Gerrit-Attention: Anastasia Klimchuk <aklm(a)chromium.org> Gerrit-Comment-Date: Sat, 17 Jul 2021 01:11:34 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 0

Change in flashrom[master]: ite_ec: Implement support for flashing ITE ECs found on TUXEDO laptops
by Michael Niewöhner (Code Review) 16 Jul '21

16 Jul '21

Attention is currently required from: Nico Huber, Michał Żygowski, Paul Menzel. Michael Niewöhner has posted comments on this change. ( https://review.coreboot.org/c/flashrom/+/55715 ) Change subject: ite_ec: Implement support for flashing ITE ECs found on TUXEDO laptops ...................................................................... Patch Set 13: (1 comment) File ite_ec.c: https://review.coreboot.org/c/flashrom/+/55715/comment/a9260ea9_773456f9 PS13, Line 78: struct ite_string { L140CU signatures: eflash: A5 A5 A5 A5 A5 A5 A5 94 85 12 5A 5A AA 00 55 55 spi: A5 A5 A5 A5 A5 A5 A5 95 85 12 5A 5A AA 7F 55 55 Some details on the signature: Mirroring is done from external SPI flash to eFlash. There's a "mirror once" or "always mirror" feature, controlled by the FW. A5 A5 A5 A5 A5 A5 TT UU 85 12 VV WW AA XX YY ZZ TT: bit 0: eSPI/LPC mode 0: eSPI -> TT=A4 1: LPC -> TT=A5 UU: bit 7: PWM blinking during mirroring 0: enable 1: disable bit 6: use internal clock until external crystal is ready 0: disable 1: enable (only valid when bit 4 = 0) bit 5: FSPI mirror function 0: enable (XX must be set) 1: disable (XX must be AA) bit 4: 32.768 kHz source 0: external crystal 1: internal OSC, crystal-free mode bit 3: ec code base mode 0: implicit - YYZZ must be 5555 1: explicit bit 2: CRC-16 check after mirror 0: enable, VVWW must be CRC-16 of mirrored region 1: disable bit 1: must be 0 bit 0: PWM selector for blinking 0: PWM0 1: PWM1 XX: mirror size if mirror enabled: XX = (size - 1); e.g. 128k = 7F must be a multiple of 4k else AA VVWW: CRC-16 of mirrored region, if CRC enabled; else 5A 5A YYZZ: 5555 if implicit format used or signature on e-flash (code base is the start of the 4k block, where the signature is located) else if explicit format: YYZZ = BASE[23:12] -- To view, visit https://review.coreboot.org/c/flashrom/+/55715 To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: flashrom Gerrit-Branch: master Gerrit-Change-Id: I0e42260155ffea38a6f60790871cd8da7b657031 Gerrit-Change-Number: 55715 Gerrit-PatchSet: 13 Gerrit-Owner: Michał Żygowski <michal.zygowski(a)3mdeb.com> Gerrit-Reviewer: Felix Singer <felixsinger(a)posteo.net> Gerrit-Reviewer: Nico Huber <nico.h(a)gmx.de> Gerrit-Reviewer: build bot (Jenkins) <no-reply(a)coreboot.org> Gerrit-CC: Michael Niewöhner <foss(a)mniewoehner.de> Gerrit-CC: Paul Menzel <paulepanter(a)mailbox.org> Gerrit-Attention: Nico Huber <nico.h(a)gmx.de> Gerrit-Attention: Michał Żygowski <michal.zygowski(a)3mdeb.com> Gerrit-Attention: Paul Menzel <paulepanter(a)mailbox.org> Gerrit-Comment-Date: Fri, 16 Jul 2021 20:24:12 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment

1 0

Change in flashrom[master]: tests: Add layout tests for overlapping regions
by Angel Pons (Code Review) 16 Jul '21

16 Jul '21

Attention is currently required from: Nico Huber, Anastasia Klimchuk. Angel Pons has posted comments on this change. ( https://review.coreboot.org/c/flashrom/+/56324 ) Change subject: tests: Add layout tests for overlapping regions ...................................................................... Patch Set 3: Code-Review+2 -- To view, visit https://review.coreboot.org/c/flashrom/+/56324 To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: flashrom Gerrit-Branch: master Gerrit-Change-Id: I7aa8dc0c9bc5a22fe5deea757eea1a151b969cea Gerrit-Change-Number: 56324 Gerrit-PatchSet: 3 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-CC: Nikolai Artemiev <nartemiev(a)google.com> Gerrit-CC: Peter Marheine <pmarheine(a)chromium.org> Gerrit-Attention: Nico Huber <nico.h(a)gmx.de> Gerrit-Attention: Anastasia Klimchuk <aklm(a)chromium.org> Gerrit-Comment-Date: Fri, 16 Jul 2021 08:47:15 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 0

Change in flashrom[master]: tests: Wrap strdup to help cmocka recognise memory allocation
by Angel Pons (Code Review) 16 Jul '21

16 Jul '21

Attention is currently required from: Nico Huber, Anastasia Klimchuk. Angel Pons has posted comments on this change. ( https://review.coreboot.org/c/flashrom/+/56323 ) Change subject: tests: Wrap strdup to help cmocka recognise memory allocation ...................................................................... Patch Set 2: Code-Review+2 (1 comment) File tests/tests.c: https://review.coreboot.org/c/flashrom/+/56323/comment/61638c6d_3e1aebe4 PS1, Line 34: char *__wrap_strdup(const char *s) > Done. […] Sounds good. -- To view, visit https://review.coreboot.org/c/flashrom/+/56323 To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: flashrom Gerrit-Branch: master Gerrit-Change-Id: I56aef6b342752d80995c36ab075b12198fc101d9 Gerrit-Change-Number: 56323 Gerrit-PatchSet: 2 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: Nico Huber <nico.h(a)gmx.de> Gerrit-Attention: Anastasia Klimchuk <aklm(a)chromium.org> Gerrit-Comment-Date: Fri, 16 Jul 2021 08:46:41 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Comment-In-Reply-To: Angel Pons <th3fanbus(a)gmail.com> Comment-In-Reply-To: Anastasia Klimchuk <aklm(a)chromium.org> Gerrit-MessageType: comment

1 0

Change in flashrom[master]: flashrom.c: Reorder check_block_eraser() to avoid forward decl
by Angel Pons (Code Review) 16 Jul '21

16 Jul '21

Angel Pons has posted comments on this change. ( https://review.coreboot.org/c/flashrom/+/56296 ) Change subject: flashrom.c: Reorder check_block_eraser() to avoid forward decl ...................................................................... Patch Set 3: (1 comment) Patchset: PS2: > I guess the package isn't installed on the buildbot and so meson is sourcing it for the test environ […] I poked Patrick Georgi about it, no replies yet -- To view, visit https://review.coreboot.org/c/flashrom/+/56296 To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: flashrom Gerrit-Branch: master Gerrit-Change-Id: I0906a6e581ce5135b58f6acc6339908dfa770a59 Gerrit-Change-Number: 56296 Gerrit-PatchSet: 3 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: Edward O'Callaghan <quasisec(a)chromium.org> Gerrit-Reviewer: build bot (Jenkins) <no-reply(a)coreboot.org> Gerrit-Comment-Date: Fri, 16 Jul 2021 08:46:00 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: Edward O'Callaghan <quasisec(a)chromium.org> Comment-In-Reply-To: Angel Pons <th3fanbus(a)gmail.com> Comment-In-Reply-To: Anastasia Klimchuk <aklm(a)chromium.org> Gerrit-MessageType: comment

1 0

Change in flashrom[master]: tests: Wrap strdup to help cmocka recognise memory allocation
by Edward O'Callaghan (Code Review) 16 Jul '21

16 Jul '21

Attention is currently required from: Nico Huber, Angel Pons, Anastasia Klimchuk. Edward O'Callaghan has posted comments on this change. ( https://review.coreboot.org/c/flashrom/+/56323 ) Change subject: tests: Wrap strdup to help cmocka recognise memory allocation ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://review.coreboot.org/c/flashrom/+/56323 To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: flashrom Gerrit-Branch: master Gerrit-Change-Id: I56aef6b342752d80995c36ab075b12198fc101d9 Gerrit-Change-Number: 56323 Gerrit-PatchSet: 2 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: Nico Huber <nico.h(a)gmx.de> Gerrit-Attention: Angel Pons <th3fanbus(a)gmail.com> Gerrit-Attention: Anastasia Klimchuk <aklm(a)chromium.org> Gerrit-Comment-Date: Fri, 16 Jul 2021 04:34:09 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 0

Change in flashrom[master]: tests: Add layout tests for overlapping regions
by Edward O'Callaghan (Code Review) 16 Jul '21

16 Jul '21

Attention is currently required from: Nico Huber, Anastasia Klimchuk. Edward O'Callaghan has posted comments on this change. ( https://review.coreboot.org/c/flashrom/+/56324 ) Change subject: tests: Add layout tests for overlapping regions ...................................................................... Patch Set 3: Code-Review+2 -- To view, visit https://review.coreboot.org/c/flashrom/+/56324 To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: flashrom Gerrit-Branch: master Gerrit-Change-Id: I7aa8dc0c9bc5a22fe5deea757eea1a151b969cea Gerrit-Change-Number: 56324 Gerrit-PatchSet: 3 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-CC: Nikolai Artemiev <nartemiev(a)google.com> Gerrit-CC: Peter Marheine <pmarheine(a)chromium.org> Gerrit-Attention: Nico Huber <nico.h(a)gmx.de> Gerrit-Attention: Anastasia Klimchuk <aklm(a)chromium.org> Gerrit-Comment-Date: Fri, 16 Jul 2021 04:33:52 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 0

Change in flashrom[master]: flashrom.c: Reorder read_by_layout() to avoid forward decl
by Edward O'Callaghan (Code Review) 16 Jul '21

16 Jul '21

Edward O'Callaghan has submitted this change. ( https://review.coreboot.org/c/flashrom/+/56297 ) Change subject: flashrom.c: Reorder read_by_layout() to avoid forward decl ...................................................................... flashrom.c: Reorder read_by_layout() to avoid forward decl Help make groking flashrom.c fractionaly easier. BUG=none BRANCH=none TEST=builds Change-Id: Ifd6c152e3a1d84b59a876997e543127387f24d40 Signed-off-by: Edward O'Callaghan <quasisec(a)google.com> Reviewed-on: https://review.coreboot.org/c/flashrom/+/56297 Tested-by: build bot (Jenkins) <no-reply(a)coreboot.org> Reviewed-by: Anastasia Klimchuk <aklm(a)chromium.org> --- M flashrom.c 1 file changed, 26 insertions(+), 27 deletions(-) Approvals: build bot (Jenkins): Verified Anastasia Klimchuk: Looks good to me, approved diff --git a/flashrom.c b/flashrom.c index 8d44c3d..debe60c 100644 --- a/flashrom.c +++ b/flashrom.c @@ -1047,7 +1047,32 @@ return 0; } -static int read_by_layout(struct flashctx *, uint8_t *); +/** + * @brief Reads the included layout regions into a buffer. + * + * If there is no layout set in the given flash context, the whole chip will + * be read. + * + * @param flashctx Flash context to be used. + * @param buffer Buffer of full chip size to read into. + * @return 0 on success, + * 1 if any read fails. + */ +static int read_by_layout(struct flashctx *const flashctx, uint8_t *const buffer) +{ + const struct flashrom_layout *const layout = get_layout(flashctx); + const struct romentry *entry = NULL; + + while ((entry = layout_next_included(layout, entry))) { + const chipoff_t region_start = entry->start; + const chipsize_t region_len = entry->end - entry->start + 1; + + if (flashctx->chip->read(flashctx, buffer + region_start, region_start, region_len)) + return 1; + } + return 0; +} + int read_flash_to_file(struct flashctx *flash, const char *filename) { unsigned long size = flash->chip->total_size * 1024; @@ -1148,32 +1173,6 @@ return ret; } -/** - * @brief Reads the included layout regions into a buffer. - * - * If there is no layout set in the given flash context, the whole chip will - * be read. - * - * @param flashctx Flash context to be used. - * @param buffer Buffer of full chip size to read into. - * @return 0 on success, - * 1 if any read fails. - */ -static int read_by_layout(struct flashctx *const flashctx, uint8_t *const buffer) -{ - const struct flashrom_layout *const layout = get_layout(flashctx); - const struct romentry *entry = NULL; - - while ((entry = layout_next_included(layout, entry))) { - const chipoff_t region_start = entry->start; - const chipsize_t region_len = entry->end - entry->start + 1; - - if (flashctx->chip->read(flashctx, buffer + region_start, region_start, region_len)) - return 1; - } - return 0; -} - typedef int (*erasefn_t)(struct flashctx *, unsigned int addr, unsigned int len); /** * @private -- To view, visit https://review.coreboot.org/c/flashrom/+/56297 To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: flashrom Gerrit-Branch: master Gerrit-Change-Id: Ifd6c152e3a1d84b59a876997e543127387f24d40 Gerrit-Change-Number: 56297 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: Edward O'Callaghan <quasisec(a)chromium.org> 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 July 2021