April 2022 - flashrom-gerrit - mail.coreboot.org

Change in flashrom[master]: raiden_debug_spi.c: Document where raiden_debug_spi_requests are handled
by Sam McNally (Code Review) April 29, 2022

April 29, 2022

Attention is currently required from: Edward O'Callaghan, Peter Marheine. Sam McNally has posted comments on this change. ( https://review.coreboot.org/c/flashrom/+/63902 ) Change subject: raiden_debug_spi.c: Document where raiden_debug_spi_requests are handled ...................................................................... Patch Set 3: Code-Review+2 -- To view, visit https://review.coreboot.org/c/flashrom/+/63902 To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: flashrom Gerrit-Branch: master Gerrit-Change-Id: I8cc78a85660190c9f750bf67994f0d59d69592d8 Gerrit-Change-Number: 63902 Gerrit-PatchSet: 3 Gerrit-Owner: Edward O'Callaghan <quasisec(a)chromium.org> Gerrit-Reviewer: Peter Marheine <pmarheine(a)chromium.org> Gerrit-Reviewer: Sam McNally <sammc(a)google.com> Gerrit-Reviewer: build bot (Jenkins) <no-reply(a)coreboot.org> Gerrit-CC: Anastasia Klimchuk <aklm(a)chromium.org> Gerrit-CC: Paul Menzel <paulepanter(a)mailbox.org> Gerrit-Attention: Edward O'Callaghan <quasisec(a)chromium.org> Gerrit-Attention: Peter Marheine <pmarheine(a)chromium.org> Gerrit-Comment-Date: Fri, 29 Apr 2022 05:10:04 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 0

Change in flashrom[master]: Add -W options from Makefile into meson warning_flags
by Anastasia Klimchuk (Code Review) April 29, 2022

April 29, 2022

Anastasia Klimchuk has submitted this change. ( https://review.coreboot.org/c/flashrom/+/58561 ) Change subject: Add -W options from Makefile into meson warning_flags ...................................................................... Add -W options from Makefile into meson warning_flags Makefile options were more restrictive and produced more warnings. This patch adds missing warning options into meson build. Makefile also has -Wall and -Wextra specified explicitly, however this is covered by warning_level=2 which is already set in meson.build. warning_level info: https://github.com/mesonbuild/meson/issues/3275 There are few warning options that are present in meson, but not in Makefile. These are left as is. TEST=ninja test shows no warnings and tests pass Change-Id: Id401bfd642dc3c13d85bd9a2dba56ada38714c25 Signed-off-by: Anastasia Klimchuk <aklm(a)chromium.org> Reviewed-on: https://review.coreboot.org/c/flashrom/+/58561 Tested-by: build bot (Jenkins) <no-reply(a)coreboot.org> Reviewed-by: Thomas Heijligen <src(a)posteo.de> --- M meson.build 1 file changed, 2 insertions(+), 0 deletions(-) Approvals: build bot (Jenkins): Verified Thomas Heijligen: Looks good to me, approved diff --git a/meson.build b/meson.build index 32e31df..e9eb4d2 100644 --- a/meson.build +++ b/meson.build @@ -13,6 +13,8 @@ # hide/enable some warnings warning_flags = [ + '-Wshadow', + '-Wmissing-prototypes', '-Wwrite-strings', '-Wno-unused-parameter', '-Wno-address-of-packed-member', 5 is the latest approved patch-set. No files were changed between the latest approved patch-set and the submitted one. -- To view, visit https://review.coreboot.org/c/flashrom/+/58561 To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: flashrom Gerrit-Branch: master Gerrit-Change-Id: Id401bfd642dc3c13d85bd9a2dba56ada38714c25 Gerrit-Change-Number: 58561 Gerrit-PatchSet: 8 Gerrit-Owner: Anastasia Klimchuk <aklm(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: Felix Singer <felixsinger(a)posteo.net> Gerrit-Reviewer: Thomas Heijligen <src(a)posteo.de> Gerrit-Reviewer: build bot (Jenkins) <no-reply(a)coreboot.org> Gerrit-CC: Nico Huber <nico.h(a)gmx.de> Gerrit-CC: Paul Menzel <paulepanter(a)mailbox.org> Gerrit-CC: Peter Marheine <pmarheine(a)chromium.org> Gerrit-MessageType: merged

1 0

Change in flashrom[master]: tests: Add and include headers with function prototypes
by Anastasia Klimchuk (Code Review) April 29, 2022

April 29, 2022

Anastasia Klimchuk has submitted this change. ( https://review.coreboot.org/c/flashrom/+/63489 ) Change subject: tests: Add and include headers with function prototypes ...................................................................... tests: Add and include headers with function prototypes Part 2 of fixing -Wmissing-prototypes warnings. This patch adds headers with function prototypes and includes the headers into source files. This fixes the warnings like this: warning: no previous prototype for ‘function_name’ [-Wmissing-prototypes] This patch is needed to sync compiler warning options between meson and makefile. TEST=running the following produces no warnings: meson setup --wipe (to clean build directory) ninja test Change-Id: Ia1ff22deb2354569f277649c6575ef2d5ffbb6e0 Signed-off-by: Anastasia Klimchuk <aklm(a)chromium.org> Reviewed-on: https://review.coreboot.org/c/flashrom/+/63489 Tested-by: build bot (Jenkins) <no-reply(a)coreboot.org> Reviewed-by: Thomas Heijligen <src(a)posteo.de> Reviewed-by: Felix Singer <felixsinger(a)posteo.net> Reviewed-by: Edward O'Callaghan <quasisec(a)chromium.org> --- M tests/chip.c M tests/flashrom.c M tests/helpers.c M tests/layout.c M tests/libusb_wraps.c A tests/libusb_wraps.h M tests/lifecycle.c M tests/spi25.c M tests/tests.c A tests/wraps.h 10 files changed, 126 insertions(+), 0 deletions(-) Approvals: build bot (Jenkins): Verified Felix Singer: Looks good to me, approved Thomas Heijligen: Looks good to me, approved Edward O'Callaghan: Looks good to me, approved diff --git a/tests/chip.c b/tests/chip.c index 444d411..6f03172 100644 --- a/tests/chip.c +++ b/tests/chip.c @@ -29,6 +29,7 @@ #include <stdio.h> #include <string.h> +#include "tests.h" #include "chipdrivers.h" #include "flash.h" #include "io_mock.h" diff --git a/tests/flashrom.c b/tests/flashrom.c index c3508c5..cc88831 100644 --- a/tests/flashrom.c +++ b/tests/flashrom.c @@ -14,6 +14,7 @@ */ #include <include/test.h> +#include "tests.h" #include "programmer.h" diff --git a/tests/helpers.c b/tests/helpers.c index 4376eee..e2e652e 100644 --- a/tests/helpers.c +++ b/tests/helpers.c @@ -15,6 +15,7 @@ #include <include/test.h> +#include "tests.h" #include "flash.h" #include <stdint.h> diff --git a/tests/layout.c b/tests/layout.c index 1e7e31d..e71debf 100644 --- a/tests/layout.c +++ b/tests/layout.c @@ -16,6 +16,7 @@ #include <include/test.h> #include <stdio.h> +#include "tests.h" #include "flash.h" #include "layout.h" #include "libflashrom.h" diff --git a/tests/libusb_wraps.c b/tests/libusb_wraps.c index 8f9e243..4e68ba7 100644 --- a/tests/libusb_wraps.c +++ b/tests/libusb_wraps.c @@ -17,6 +17,7 @@ #include <include/test.h> #include "io_mock.h" +#include "libusb_wraps.h" void *__wrap_usb_dev_get_by_vid_pid_number( libusb_context *usb_ctx, uint16_t vid, uint16_t pid, unsigned int num) diff --git a/tests/libusb_wraps.h b/tests/libusb_wraps.h new file mode 100644 index 0000000..b10b8c0 --- /dev/null +++ b/tests/libusb_wraps.h @@ -0,0 +1,46 @@ +/* + * This file is part of the flashrom project. + * + * Copyright 2022 Google LLC + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; version 2 of the License. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + */ + +#ifndef LIBUSB_WRAPS_H +#define LIBUSB_WRAPS_H + +#include <libusb.h> + +void *__wrap_usb_dev_get_by_vid_pid_number( + libusb_context *usb_ctx, uint16_t vid, uint16_t pid, unsigned int num); +int __wrap_libusb_init(libusb_context **ctx); +int __wrap_libusb_open(libusb_device *dev, libusb_device_handle **devh); +int __wrap_libusb_set_auto_detach_kernel_driver(libusb_device_handle *devh, int enable); +ssize_t __wrap_libusb_get_device_list(libusb_context *ctx, libusb_device ***list); +void __wrap_libusb_free_device_list(libusb_device **list, int unref_devices); +uint8_t __wrap_libusb_get_bus_number(libusb_device *dev); +uint8_t __wrap_libusb_get_device_address(libusb_device *dev); +int __wrap_libusb_get_device_descriptor(libusb_device *dev, struct libusb_device_descriptor *desc); +int __wrap_libusb_get_config_descriptor( + libusb_device *dev, uint8_t config_index, struct libusb_config_descriptor **config); +void __wrap_libusb_free_config_descriptor(struct libusb_config_descriptor *config); +int __wrap_libusb_get_configuration(libusb_device_handle *devh, int *config); +int __wrap_libusb_set_configuration(libusb_device_handle *devh, int config); +int __wrap_libusb_claim_interface(libusb_device_handle *devh, int interface_number); +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); +int __wrap_libusb_release_interface(libusb_device_handle *devh, int interface_number); +void __wrap_libusb_close(libusb_device_handle *devh); +libusb_device *__wrap_libusb_ref_device(libusb_device *dev); +void __wrap_libusb_unref_device(libusb_device *dev); +void __wrap_libusb_exit(libusb_context *ctx); + +#endif /* LIBUSB_WRAPS_H */ diff --git a/tests/lifecycle.c b/tests/lifecycle.c index 236d1d7..63fcc3c 100644 --- a/tests/lifecycle.c +++ b/tests/lifecycle.c @@ -17,6 +17,7 @@ #include <string.h> #include <linux/spi/spidev.h> +#include "tests.h" #include "libflashrom.h" #include "io_mock.h" #include "programmer.h" diff --git a/tests/spi25.c b/tests/spi25.c index 251c98c..f57251e 100644 --- a/tests/spi25.c +++ b/tests/spi25.c @@ -15,6 +15,8 @@ #include <include/test.h> +#include "wraps.h" +#include "tests.h" #include "programmer.h" #include "flashchips.h" #include "chipdrivers.h" diff --git a/tests/tests.c b/tests/tests.c index 3eef47e..6aabd90 100644 --- a/tests/tests.c +++ b/tests/tests.c @@ -16,6 +16,7 @@ #include <include/test.h> #include "io_mock.h" #include "tests.h" +#include "wraps.h" #include <stdio.h> #include <string.h> diff --git a/tests/wraps.h b/tests/wraps.h new file mode 100644 index 0000000..c088d98 --- /dev/null +++ b/tests/wraps.h @@ -0,0 +1,71 @@ +/* + * This file is part of the flashrom project. + * + * Copyright 2022 Google LLC + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; version 2 of the License. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + */ + +#ifndef WRAPS_H +#define WRAPS_H + +#include <stdio.h> +#include "flash.h" + +char *__wrap_strdup(const char *s); +void __wrap_physunmap(void *virt_addr, size_t len); +void *__wrap_physmap(const char *descr, uintptr_t phys_addr, size_t len); +struct pci_dev *__wrap_pcidev_init(void *devs, int bar); +uintptr_t __wrap_pcidev_readbar(void *dev, int bar); +void __wrap_sio_write(uint16_t port, uint8_t reg, uint8_t data); +uint8_t __wrap_sio_read(uint16_t port, uint8_t reg); +int __wrap_open(const char *pathname, int flags); +int __wrap_open64(const char *pathname, int flags); +int __wrap___open64_2(const char *pathname, int flags); +int __wrap_ioctl(int fd, unsigned long int request, ...); +int __wrap_write(int fd, const void *buf, size_t sz); +int __wrap_read(int fd, void *buf, size_t sz); +FILE *__wrap_fopen(const char *pathname, const char *mode); +FILE *__wrap_fopen64(const char *pathname, const char *mode); +FILE *__wrap_fdopen(int fd, const char *mode); +int __wrap_stat(const char *path, void *buf); +int __wrap_stat64(const char *path, void *buf); +int __wrap___xstat(const char *path, void *buf); +int __wrap___xstat64(const char *path, void *buf); +int __wrap_fstat(int fd, void *buf); +int __wrap_fstat64(int fd, void *buf); +int __wrap___fxstat(int fd, void *buf); +int __wrap___fxstat64(int fd, void *buf); +char *__wrap_fgets(char *buf, int len, FILE *fp); +char *__wrap___fgets_chk(char *buf, int len, FILE *fp); +size_t __wrap_fread(void *ptr, size_t size, size_t nmemb, FILE *fp); +size_t __wrap_fwrite(const void *ptr, size_t size, size_t nmemb, FILE *fp); +int __wrap_fflush(FILE *fp); +int __wrap_fileno(FILE *fp); +int __wrap_fsync(int fd); +int __wrap_setvbuf(FILE *fp, char *buf, int type, size_t size); +int __wrap_fprintf(FILE *fp, const char *fmt, ...); +int __wrap___vfprintf_chk(FILE *fp, const char *fmt, va_list args); +int __wrap_fclose(FILE *fp); +int __wrap_feof(FILE *fp); +int __wrap_ferror(FILE *fp); +void __wrap_clearerr(FILE *fp); +int __wrap_rget_io_perms(void); +void __wrap_test_outb(unsigned char value, unsigned short port); +unsigned char __wrap_test_inb(unsigned short port); +void __wrap_test_outw(unsigned short value, unsigned short port); +unsigned short __wrap_test_inw(unsigned short port); +void __wrap_test_outl(unsigned int value, unsigned short port); +unsigned int __wrap_test_inl(unsigned short port); +int __wrap_spi_send_command(const struct flashctx *flash, + unsigned int writecnt, unsigned int readcnt, + const unsigned char *writearr, unsigned char *readarr); + +#endif /* WRAPS_H */ 3 is the latest approved patch-set. No files were changed between the latest approved patch-set and the submitted one. -- To view, visit https://review.coreboot.org/c/flashrom/+/63489 To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: flashrom Gerrit-Branch: master Gerrit-Change-Id: Ia1ff22deb2354569f277649c6575ef2d5ffbb6e0 Gerrit-Change-Number: 63489 Gerrit-PatchSet: 8 Gerrit-Owner: Anastasia Klimchuk <aklm(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: Felix Singer <felixsinger(a)posteo.net> Gerrit-Reviewer: Thomas Heijligen <src(a)posteo.de> Gerrit-Reviewer: build bot (Jenkins) <no-reply(a)coreboot.org> Gerrit-CC: Nico Huber <nico.h(a)gmx.de> Gerrit-CC: Paul Menzel <paulepanter(a)mailbox.org> Gerrit-CC: Peter Marheine <pmarheine(a)chromium.org> Gerrit-MessageType: merged

1 0

Change in flashrom[master]: tests: Mark all static functions as static
by Anastasia Klimchuk (Code Review) April 29, 2022

April 29, 2022

Anastasia Klimchuk has submitted this change. ( https://review.coreboot.org/c/flashrom/+/63571 ) Change subject: tests: Mark all static functions as static ...................................................................... tests: Mark all static functions as static Part 1 of fixing -Wmissing-prototypes warnings. This patch is adding static to all functions which are actually static. This fixes the warnings like this: warning: no previous prototype for ‘function_name’ [-Wmissing-prototypes] This patch is needed to sync compiler warning options between meson and makefile. TEST=running the following produces no warnings: meson setup --wipe (to clean build directory) ninja test Change-Id: Ic54da5ac1b2a46f55e3e3bee4ed952bdf59e8444 Signed-off-by: Anastasia Klimchuk <aklm(a)chromium.org> Reviewed-on: https://review.coreboot.org/c/flashrom/+/63571 Tested-by: build bot (Jenkins) <no-reply(a)coreboot.org> Reviewed-by: Thomas Heijligen <src(a)posteo.de> Reviewed-by: Felix Singer <felixsinger(a)posteo.net> Reviewed-by: Edward O'Callaghan <quasisec(a)chromium.org> --- M tests/chip.c M tests/lifecycle.c 2 files changed, 11 insertions(+), 11 deletions(-) Approvals: build bot (Jenkins): Verified Felix Singer: Looks good to me, approved Thomas Heijligen: Looks good to me, approved Edward O'Callaghan: Looks good to me, approved diff --git a/tests/chip.c b/tests/chip.c index 03d604f..444d411 100644 --- a/tests/chip.c +++ b/tests/chip.c @@ -46,7 +46,7 @@ .buf = { 0 }, }; -int read_chip(struct flashctx *flash, uint8_t *buf, unsigned int start, unsigned int len) +static int read_chip(struct flashctx *flash, uint8_t *buf, unsigned int start, unsigned int len) { printf("Read chip called with start=0x%x, len=0x%x\n", start, len); if (!g_chip_state.unlock_calls) { @@ -60,7 +60,7 @@ return 0; } -int write_chip(struct flashctx *flash, const uint8_t *buf, unsigned int start, unsigned int len) +static int write_chip(struct flashctx *flash, const uint8_t *buf, unsigned int start, unsigned int len) { printf("Write chip called with start=0x%x, len=0x%x\n", start, len); if (!g_chip_state.unlock_calls) { @@ -74,7 +74,7 @@ return 0; } -int unlock_chip(struct flashctx *flash) +static int unlock_chip(struct flashctx *flash) { printf("Unlock chip called\n"); g_chip_state.unlock_calls++; @@ -87,7 +87,7 @@ return 0; } -int block_erase_chip(struct flashctx *flash, unsigned int blockaddr, unsigned int blocklen) +static int block_erase_chip(struct flashctx *flash, unsigned int blockaddr, unsigned int blocklen) { printf("Block erase called with blockaddr=0x%x, blocklen=0x%x\n", blockaddr, blocklen); if (!g_chip_state.unlock_calls) { @@ -404,7 +404,7 @@ free(newcontents); } -size_t verify_chip_fread(void *state, void *buf, size_t size, size_t len, FILE *fp) +static size_t verify_chip_fread(void *state, void *buf, size_t size, size_t len, FILE *fp) { /* * Verify operation compares contents of the file vs contents on the chip. diff --git a/tests/lifecycle.c b/tests/lifecycle.c index 825654f..236d1d7 100644 --- a/tests/lifecycle.c +++ b/tests/lifecycle.c @@ -228,13 +228,13 @@ #endif } -int dediprog_libusb_init(void *state, libusb_context **ctx) +static int dediprog_libusb_init(void *state, libusb_context **ctx) { *ctx = not_null(); return 0; } -int dediprog_libusb_control_transfer(void *state, +static int dediprog_libusb_control_transfer(void *state, libusb_device_handle *devh, uint8_t bmRequestType, uint8_t bRequest, @@ -274,7 +274,7 @@ char *fopen_path; }; -FILE *linux_mtd_fopen(void *state, const char *pathname, const char *mode) +static FILE *linux_mtd_fopen(void *state, const char *pathname, const char *mode) { struct linux_mtd_io_state *io_state = state; @@ -283,7 +283,7 @@ return not_null(); } -size_t linux_mtd_fread(void *state, void *buf, size_t size, size_t len, FILE *fp) +static size_t linux_mtd_fread(void *state, void *buf, size_t size, size_t len, FILE *fp) { struct linux_mtd_fread_mock_entry { const char *path; @@ -317,7 +317,7 @@ return 0; } -int linux_mtd_fclose(void *state, FILE *fp) +static int linux_mtd_fclose(void *state, FILE *fp) { struct linux_mtd_io_state *io_state = state; @@ -372,7 +372,7 @@ return 0; } -char *linux_spi_fgets(void *state, char *buf, int len, FILE *fp) +static char *linux_spi_fgets(void *state, char *buf, int len, FILE *fp) { /* Emulate reading max buffer size from sysfs. */ const char *max_buf_size = "1048576"; 2 is the latest approved patch-set. No files were changed between the latest approved patch-set and the submitted one. -- To view, visit https://review.coreboot.org/c/flashrom/+/63571 To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: flashrom Gerrit-Branch: master Gerrit-Change-Id: Ic54da5ac1b2a46f55e3e3bee4ed952bdf59e8444 Gerrit-Change-Number: 63571 Gerrit-PatchSet: 6 Gerrit-Owner: Anastasia Klimchuk <aklm(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: Felix Singer <felixsinger(a)posteo.net> Gerrit-Reviewer: Thomas Heijligen <src(a)posteo.de> Gerrit-Reviewer: build bot (Jenkins) <no-reply(a)coreboot.org> Gerrit-CC: Nico Huber <nico.h(a)gmx.de> Gerrit-CC: Paul Menzel <paulepanter(a)mailbox.org> Gerrit-CC: Peter Marheine <pmarheine(a)chromium.org> Gerrit-MessageType: merged

1 0

Change in flashrom[master]: ich_descriptors_tool: Fix -Wsign-compare warnings
by Anastasia Klimchuk (Code Review) April 29, 2022

April 29, 2022

Anastasia Klimchuk has submitted this change. ( https://review.coreboot.org/c/flashrom/+/63488 ) Change subject: ich_descriptors_tool: Fix -Wsign-compare warnings ...................................................................... ich_descriptors_tool: Fix -Wsign-compare warnings This patch is fixing -Wsign-compare warnings, specifically: warning: comparison of integer expressions of different signedness: ‘int’ and ‘uint32_t’ {aka ‘unsigned int’} [-Wsign-compare] Both instances in this patch produce the same warning. The patch is needed to sync compiler warning options between meson and makefile. TEST=running the following gives no warnings: meson setup --wipe (to clean build directory) ninja test Change-Id: I1f9325e9cf89f57f18d63cc3906a0958b47286d7 Signed-off-by: Anastasia Klimchuk <aklm(a)chromium.org> Reviewed-on: https://review.coreboot.org/c/flashrom/+/63488 Tested-by: build bot (Jenkins) <no-reply(a)coreboot.org> Reviewed-by: Thomas Heijligen <src(a)posteo.de> Reviewed-by: Felix Singer <felixsinger(a)posteo.net> --- M util/ich_descriptors_tool/ich_descriptors_tool.c 1 file changed, 4 insertions(+), 4 deletions(-) Approvals: build bot (Jenkins): Verified Felix Singer: Looks good to me, approved Thomas Heijligen: Looks good to me, approved diff --git a/util/ich_descriptors_tool/ich_descriptors_tool.c b/util/ich_descriptors_tool/ich_descriptors_tool.c index 4951206..a5a59ad 100644 --- a/util/ich_descriptors_tool/ich_descriptors_tool.c +++ b/util/ich_descriptors_tool/ich_descriptors_tool.c @@ -46,7 +46,6 @@ static void dump_file(const char *prefix, const uint32_t *dump, unsigned int len, const struct ich_desc_region *const reg, unsigned int i) { - int ret; char *fn; const char *reg_name; uint32_t file_len; @@ -85,8 +84,8 @@ } free(fn); - ret = write(fh, &dump[base >> 2], file_len); - if (ret != file_len) { + const ssize_t ret = write(fh, &dump[base >> 2], file_len); + if (ret < 0 || ((size_t) ret) != file_len) { fprintf(stderr, "FAILED.\n"); exit(1); } @@ -270,7 +269,8 @@ prettyprint_ich_descriptors(cs, &desc); pMAC = (uint8_t *) &buf[ICH_FREG_BASE(desc.region.FLREGs[3]) >> 2]; - if (len >= ICH_FREG_BASE(desc.region.FLREGs[3]) + 6 && pMAC[0] != 0xff) + /* The case len < 0 is handled above as error. At this point len is non-negative. */ + if (((size_t) len) >= ICH_FREG_BASE(desc.region.FLREGs[3]) + 6 && pMAC[0] != 0xff) printf("The MAC address might be at offset 0x%x: " "%02x:%02x:%02x:%02x:%02x:%02x\n", ICH_FREG_BASE(desc.region.FLREGs[3]), 3 is the latest approved patch-set. No files were changed between the latest approved patch-set and the submitted one. -- To view, visit https://review.coreboot.org/c/flashrom/+/63488 To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: flashrom Gerrit-Branch: master Gerrit-Change-Id: I1f9325e9cf89f57f18d63cc3906a0958b47286d7 Gerrit-Change-Number: 63488 Gerrit-PatchSet: 7 Gerrit-Owner: Anastasia Klimchuk <aklm(a)chromium.org> Gerrit-Reviewer: Anastasia Klimchuk <aklm(a)chromium.org> Gerrit-Reviewer: Felix Singer <felixsinger(a)posteo.net> Gerrit-Reviewer: Subrata Banik <subratabanik(a)google.com> Gerrit-Reviewer: Thomas Heijligen <src(a)posteo.de> Gerrit-Reviewer: build bot (Jenkins) <no-reply(a)coreboot.org> Gerrit-CC: Angel Pons <th3fanbus(a)gmail.com> Gerrit-CC: Nico Huber <nico.h(a)gmx.de> Gerrit-CC: Paul Menzel <paulepanter(a)mailbox.org> Gerrit-CC: Peter Marheine <pmarheine(a)chromium.org> Gerrit-MessageType: merged

1 0

Change in flashrom[master]: raiden_debug_spi.c: Document where raiden_debug_spi_requests are handled
by Edward O'Callaghan (Code Review) April 29, 2022

April 29, 2022

Attention is currently required from: Sam McNally, Peter Marheine. Edward O'Callaghan has posted comments on this change. ( https://review.coreboot.org/c/flashrom/+/63902 ) Change subject: raiden_debug_spi.c: Document where raiden_debug_spi_requests are handled ...................................................................... Patch Set 2: (2 comments) File raiden_debug_spi.c: https://review.coreboot.org/c/flashrom/+/63902/comment/728571b0_3a8f8d89 PS2, Line 402: /* Corresponds with 'enum usb_spi_request' in platform/cr50/chip/g/usb_spi.h */ > Also partially with platform/ec/chip/stm32/usb_spi.h. Done https://review.coreboot.org/c/flashrom/+/63902/comment/7994f7d1_b98c6f2c PS2, Line 1451: * by adapters that only support one target > Yes, my mistake! Done -- To view, visit https://review.coreboot.org/c/flashrom/+/63902 To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: flashrom Gerrit-Branch: master Gerrit-Change-Id: I8cc78a85660190c9f750bf67994f0d59d69592d8 Gerrit-Change-Number: 63902 Gerrit-PatchSet: 2 Gerrit-Owner: Edward O'Callaghan <quasisec(a)chromium.org> Gerrit-Reviewer: Peter Marheine <pmarheine(a)chromium.org> Gerrit-Reviewer: Sam McNally <sammc(a)google.com> Gerrit-Reviewer: build bot (Jenkins) <no-reply(a)coreboot.org> Gerrit-CC: Anastasia Klimchuk <aklm(a)chromium.org> Gerrit-CC: Paul Menzel <paulepanter(a)mailbox.org> Gerrit-Attention: Sam McNally <sammc(a)google.com> Gerrit-Attention: Peter Marheine <pmarheine(a)chromium.org> Gerrit-Comment-Date: Fri, 29 Apr 2022 03:59:01 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: Sam McNally <sammc(a)google.com> Comment-In-Reply-To: Peter Marheine <pmarheine(a)chromium.org> Gerrit-MessageType: comment

1 0

Change in flashrom[master]: raiden_debug_spi.c: Document where raiden_debug_spi_requests are handled
by Edward O'Callaghan (Code Review) April 29, 2022

April 29, 2022

Attention is currently required from: Sam McNally, Edward O'Callaghan. Hello Sam McNally, build bot (Jenkins), Peter Marheine, I'd like you to reexamine a change. Please visit https://review.coreboot.org/c/flashrom/+/63902 to look at the new patch set (#3). Change subject: raiden_debug_spi.c: Document where raiden_debug_spi_requests are handled ...................................................................... raiden_debug_spi.c: Document where raiden_debug_spi_requests are handled Because the enum is a different name to the one within cr50 it was entirely unclear where these values were handled at the end-point and what a untargetted REQ_ENABLE actually did. Comment to avoid needing to chase this again. BUG=b:224358254 TEST=builds Change-Id: I8cc78a85660190c9f750bf67994f0d59d69592d8 Signed-off-by: Edward O'Callaghan <quasisec(a)google.com> --- M raiden_debug_spi.c 1 file changed, 8 insertions(+), 0 deletions(-) git pull ssh://review.coreboot.org:29418/flashrom refs/changes/02/63902/3 -- To view, visit https://review.coreboot.org/c/flashrom/+/63902 To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: flashrom Gerrit-Branch: master Gerrit-Change-Id: I8cc78a85660190c9f750bf67994f0d59d69592d8 Gerrit-Change-Number: 63902 Gerrit-PatchSet: 3 Gerrit-Owner: Edward O'Callaghan <quasisec(a)chromium.org> Gerrit-Reviewer: Peter Marheine <pmarheine(a)chromium.org> Gerrit-Reviewer: Sam McNally <sammc(a)google.com> Gerrit-Reviewer: build bot (Jenkins) <no-reply(a)coreboot.org> Gerrit-CC: Anastasia Klimchuk <aklm(a)chromium.org> Gerrit-CC: Paul Menzel <paulepanter(a)mailbox.org> Gerrit-Attention: Sam McNally <sammc(a)google.com> Gerrit-Attention: Edward O'Callaghan <quasisec(a)chromium.org> Gerrit-MessageType: newpatchset

1 0

Change in flashrom[master]: flashchips: enable write-protection for W25Q{64,128}.V
by Anastasia Klimchuk (Code Review) April 29, 2022

April 29, 2022

Attention is currently required from: Nico Huber, Angel Pons, Sergii Dmytruk. Anastasia Klimchuk has posted comments on this change. ( https://review.coreboot.org/c/flashrom/+/59071 ) Change subject: flashchips: enable write-protection for W25Q{64,128}.V ...................................................................... Patch Set 28: (1 comment) Patchset: PS28: This patch has not been rebased on the latest flashchips.c it seems, so it is now "Merge Conflict". -- To view, visit https://review.coreboot.org/c/flashrom/+/59071 To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: flashrom Gerrit-Branch: master Gerrit-Change-Id: Iccb69a8d3a0dd2192e2c938caddaf07b1889ed35 Gerrit-Change-Number: 59071 Gerrit-PatchSet: 28 Gerrit-Owner: Sergii Dmytruk <sergii.dmytruk(a)3mdeb.com> 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: Nico Huber <nico.h(a)gmx.de> Gerrit-Reviewer: Nikolai Artemiev <nartemiev(a)google.com> Gerrit-Reviewer: build bot (Jenkins) <no-reply(a)coreboot.org> Gerrit-CC: Maciej Pijanowski <maciej.pijanowski(a)3mdeb.com> Gerrit-CC: Paul Menzel <paulepanter(a)mailbox.org> Gerrit-Attention: Nico Huber <nico.h(a)gmx.de> Gerrit-Attention: Angel Pons <th3fanbus(a)gmail.com> Gerrit-Attention: Sergii Dmytruk <sergii.dmytruk(a)3mdeb.com> Gerrit-Comment-Date: Fri, 29 Apr 2022 03:31:00 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment

1 0

Change in flashrom[master]: Introduce an `include` directory for header files
by Anastasia Klimchuk (Code Review) April 29, 2022

April 29, 2022

Anastasia Klimchuk has submitted this change. ( https://review.coreboot.org/c/flashrom/+/58622 ) Change subject: Introduce an `include` directory for header files ...................................................................... Introduce an `include` directory for header files Move all header files to the new `include` directory. Adapt include directives and build systems to the new directory. Change-Id: Iaddd6bbfa0624b166d422f665877f096983bf4cf Signed-off-by: Felix Singer <felix.singer(a)secunet.com> Signed-off-by: Thomas Heijligen <thomas.heijligen(a)secunet.com> Reviewed-on: https://review.coreboot.org/c/flashrom/+/58622 Tested-by: build bot (Jenkins) <no-reply(a)coreboot.org> Reviewed-by: Anastasia Klimchuk <aklm(a)chromium.org> --- M Makefile R include/chipdrivers.h R include/coreboot_tables.h R include/custom_baud.h R include/edi.h R include/ene.h R include/flash.h R include/flashchips.h R include/fmap.h R include/hwaccess_physmap.h R include/hwaccess_x86_io.h R include/hwaccess_x86_msr.h R include/i2c_helper.h R include/ich_descriptors.h R include/layout.h R include/libflashrom.h R include/platform.h R include/platform/pci.h R include/programmer.h R include/spi.h R include/usb_device.h R include/writeprotect.h M meson.build M platform/endian_big.c M platform/endian_little.c M platform/memaccess.c M util/ich_descriptors_tool/Makefile M util/ich_descriptors_tool/meson.build 28 files changed, 16 insertions(+), 9 deletions(-) Approvals: build bot (Jenkins): Verified Anastasia Klimchuk: Looks good to me, approved diff --git a/Makefile b/Makefile index 26c77d9..e4cfede 100644 --- a/Makefile +++ b/Makefile @@ -253,6 +253,8 @@ HAS_SERIAL := $(strip $(if $(filter $(TARGET_OS), DOS libpayload), no, yes)) EXEC_SUFFIX := $(strip $(if $(filter $(TARGET_OS), DOS MinGW), .exe)) +override CFLAGS += -Iinclude + ifeq ($(TARGET_OS), DOS) # DJGPP has odd uint*_t definitions which cause lots of format string warnings. override CFLAGS += -Wno-format @@ -985,11 +987,11 @@ $(INSTALL) -m 0755 $(PROGRAM)$(EXEC_SUFFIX) $(DESTDIR)$(PREFIX)/sbin $(INSTALL) -m 0644 $(PROGRAM).8 $(DESTDIR)$(MANDIR)/man8 -libinstall: libflashrom.a libflashrom.h +libinstall: libflashrom.a include/libflashrom.h mkdir -p $(DESTDIR)$(PREFIX)/lib $(INSTALL) -m 0644 libflashrom.a $(DESTDIR)$(PREFIX)/lib mkdir -p $(DESTDIR)$(PREFIX)/include - $(INSTALL) -m 0644 libflashrom.h $(DESTDIR)$(PREFIX)/include + $(INSTALL) -m 0644 include/libflashrom.h $(DESTDIR)$(PREFIX)/include _export: $(PROGRAM).8 @rm -rf "$(EXPORTDIR)/flashrom-$(RELEASENAME)" diff --git a/chipdrivers.h b/include/chipdrivers.h similarity index 100% rename from chipdrivers.h rename to include/chipdrivers.h diff --git a/coreboot_tables.h b/include/coreboot_tables.h similarity index 100% rename from coreboot_tables.h rename to include/coreboot_tables.h diff --git a/custom_baud.h b/include/custom_baud.h similarity index 100% rename from custom_baud.h rename to include/custom_baud.h diff --git a/edi.h b/include/edi.h similarity index 100% rename from edi.h rename to include/edi.h diff --git a/ene.h b/include/ene.h similarity index 100% rename from ene.h rename to include/ene.h diff --git a/flash.h b/include/flash.h similarity index 100% rename from flash.h rename to include/flash.h diff --git a/flashchips.h b/include/flashchips.h similarity index 100% rename from flashchips.h rename to include/flashchips.h diff --git a/fmap.h b/include/fmap.h similarity index 100% rename from fmap.h rename to include/fmap.h diff --git a/hwaccess_physmap.h b/include/hwaccess_physmap.h similarity index 100% rename from hwaccess_physmap.h rename to include/hwaccess_physmap.h diff --git a/hwaccess_x86_io.h b/include/hwaccess_x86_io.h similarity index 100% rename from hwaccess_x86_io.h rename to include/hwaccess_x86_io.h diff --git a/hwaccess_x86_msr.h b/include/hwaccess_x86_msr.h similarity index 100% rename from hwaccess_x86_msr.h rename to include/hwaccess_x86_msr.h diff --git a/i2c_helper.h b/include/i2c_helper.h similarity index 100% rename from i2c_helper.h rename to include/i2c_helper.h diff --git a/ich_descriptors.h b/include/ich_descriptors.h similarity index 100% rename from ich_descriptors.h rename to include/ich_descriptors.h diff --git a/layout.h b/include/layout.h similarity index 100% rename from layout.h rename to include/layout.h diff --git a/libflashrom.h b/include/libflashrom.h similarity index 100% rename from libflashrom.h rename to include/libflashrom.h diff --git a/platform.h b/include/platform.h similarity index 100% rename from platform.h rename to include/platform.h diff --git a/platform/pci.h b/include/platform/pci.h similarity index 100% rename from platform/pci.h rename to include/platform/pci.h diff --git a/programmer.h b/include/programmer.h similarity index 100% rename from programmer.h rename to include/programmer.h diff --git a/spi.h b/include/spi.h similarity index 100% rename from spi.h rename to include/spi.h diff --git a/usb_device.h b/include/usb_device.h similarity index 100% rename from usb_device.h rename to include/usb_device.h diff --git a/writeprotect.h b/include/writeprotect.h similarity index 100% rename from writeprotect.h rename to include/writeprotect.h diff --git a/meson.build b/meson.build index f8ca1d3..32e31df 100644 --- a/meson.build +++ b/meson.build @@ -379,10 +379,12 @@ mandir = join_paths(prefix, get_option('mandir')) install_headers([ - 'libflashrom.h', + 'include/libflashrom.h', ], ) +include_dir = include_directories('include') + # core modules needed by both the library and the CLI srcs += '82802ab.c' srcs += 'at45db.c' @@ -423,6 +425,7 @@ sources : [ srcs, ], + include_directories : include_dir, soversion : lt_current, version : lt_version, dependencies : [ @@ -466,7 +469,7 @@ flashrom_dep = declare_dependency( link_with : flashrom, - include_directories : include_directories('.'), + include_directories : include_dir, dependencies : deps ) @@ -493,6 +496,7 @@ 'cli_output.c', 'flashrom.c', ], + include_directories : include_dir, dependencies : [ deps, ], @@ -512,7 +516,7 @@ required: false ) flashrom_test_dep = declare_dependency( - include_directories : include_directories('.'), + include_directories : include_dir, sources : [ srcs, 'cli_common.c', diff --git a/platform/endian_big.c b/platform/endian_big.c index 5d65500..6541a83 100644 --- a/platform/endian_big.c +++ b/platform/endian_big.c @@ -15,7 +15,7 @@ * GNU General Public License for more details. */ -#include "../platform.h" +#include "platform.h" /* convert cpu native endian to little endian */ ___return_swapped(cpu_to_le, 8) diff --git a/platform/endian_little.c b/platform/endian_little.c index b7c0068..aeb9d57 100644 --- a/platform/endian_little.c +++ b/platform/endian_little.c @@ -15,7 +15,7 @@ * GNU General Public License for more details. */ -#include "../platform.h" +#include "platform.h" /* convert cpu native endian to little endian */ ___return_same(cpu_to_le, 8) diff --git a/platform/memaccess.c b/platform/memaccess.c index 44ef410..8368121 100644 --- a/platform/memaccess.c +++ b/platform/memaccess.c @@ -15,7 +15,7 @@ * GNU General Public License for more details. */ -#include "../platform.h" +#include "platform.h" /* * macro to return endian aware read function diff --git a/util/ich_descriptors_tool/Makefile b/util/ich_descriptors_tool/Makefile index 7f5814f..4d971f5 100644 --- a/util/ich_descriptors_tool/Makefile +++ b/util/ich_descriptors_tool/Makefile @@ -21,6 +21,7 @@ # If the user has specified custom CFLAGS, all CFLAGS settings below will be # completely ignored by gnumake. CFLAGS ?= -Os -Wall -Wshadow +CFLAGS += -I$(SHAREDSRCDIR)/include # Auto determine HOST_OS and TARGET_OS if they are not set as argument HOST_OS ?= $(shell uname) diff --git a/util/ich_descriptors_tool/meson.build b/util/ich_descriptors_tool/meson.build index b5bf09e..19097ee 100644 --- a/util/ich_descriptors_tool/meson.build +++ b/util/ich_descriptors_tool/meson.build @@ -7,7 +7,7 @@ dependencies : [ deps, ], - include_directories : include_directories('../..'), + include_directories : include_dir, c_args : [ '-DICH_DESCRIPTORS_FROM_DUMP_ONLY', ], -- To view, visit https://review.coreboot.org/c/flashrom/+/58622 To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: flashrom Gerrit-Branch: master Gerrit-Change-Id: Iaddd6bbfa0624b166d422f665877f096983bf4cf Gerrit-Change-Number: 58622 Gerrit-PatchSet: 8 Gerrit-Owner: Felix Singer <felixsinger(a)posteo.net> 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: 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: Martin L Roth <martinroth(a)google.com> Gerrit-CC: Peter Marheine <pmarheine(a)chromium.org> Gerrit-CC: Thomas Heijligen <src(a)posteo.de> Gerrit-MessageType: merged

1 0

Change in flashrom[master]: Introduce an `include` directory for header files
by Anastasia Klimchuk (Code Review) April 29, 2022

April 29, 2022

Attention is currently required from: Felix Singer. Anastasia Klimchuk has posted comments on this change. ( https://review.coreboot.org/c/flashrom/+/58622 ) Change subject: Introduce an `include` directory for header files ...................................................................... Patch Set 7: Code-Review+2 (1 comment) Patchset: PS7: I uploaded new patchset because flash.h has changed (SR3 support in CB:60230 and CB:60231) and gerrit marked this as conflict. I downloaded this patch on the top of the tree locally, it got applied automatically, no conflict resolutions were needed. I also checked that flash.h in latest patchset is up-to-date (contains SR3 support). -- To view, visit https://review.coreboot.org/c/flashrom/+/58622 To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: flashrom Gerrit-Branch: master Gerrit-Change-Id: Iaddd6bbfa0624b166d422f665877f096983bf4cf Gerrit-Change-Number: 58622 Gerrit-PatchSet: 7 Gerrit-Owner: Felix Singer <felixsinger(a)posteo.net> 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: 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: Martin L Roth <martinroth(a)google.com> Gerrit-CC: Peter Marheine <pmarheine(a)chromium.org> Gerrit-CC: Thomas Heijligen <src(a)posteo.de> Gerrit-Attention: Felix Singer <felixsinger(a)posteo.net> Gerrit-Comment-Date: Fri, 29 Apr 2022 01:47:58 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 0