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

Change in flashrom[master]: tests: Mark all static functions as static
by Anastasia Klimchuk (Code Review) 29 Apr '22

29 Apr '22

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) 29 Apr '22

29 Apr '22

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) 29 Apr '22

29 Apr '22

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) 29 Apr '22

29 Apr '22

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) 29 Apr '22

29 Apr '22

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) 29 Apr '22

29 Apr '22

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) 29 Apr '22

29 Apr '22

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

Change in flashrom[master]: Introduce an `include` directory for header files
by Anastasia Klimchuk (Code Review) 29 Apr '22

29 Apr '22

Attention is currently required from: Felix Singer. Anastasia Klimchuk has uploaded a new patch set (#7) to the change originally created by Felix Singer. ( 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> --- 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(-) git pull ssh://review.coreboot.org:29418/flashrom refs/changes/22/58622/7 -- 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-MessageType: newpatchset

1 0

Change in flashrom[master]: Introduce an `include` directory for header files
by Anastasia Klimchuk (Code Review) 29 Apr '22

29 Apr '22

Attention is currently required from: Felix Singer, Thomas Heijligen. 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 6: Code-Review+2 -- 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: 6 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: Thomas Heijligen <src(a)posteo.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-Attention: Felix Singer <felixsinger(a)posteo.net> Gerrit-Attention: Thomas Heijligen <src(a)posteo.de> Gerrit-Comment-Date: Fri, 29 Apr 2022 01:26:45 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 0

Change in flashrom[master]: writeprotect: add WPS bit and always set it to zero
by Anastasia Klimchuk (Code Review) 29 Apr '22

29 Apr '22

Anastasia Klimchuk has submitted this change. ( https://review.coreboot.org/c/flashrom/+/60231 ) Change subject: writeprotect: add WPS bit and always set it to zero ...................................................................... writeprotect: add WPS bit and always set it to zero WPS bit controls use of individual block protection which is mutually exclusive with protection based on ranges. Proper support requires extension of the API as well as implementation, so here we're just making sure that range-based protection is enabled and our WP configuration is not ignored by the chip. Change-Id: I2c26ec65d64a3b6fb1f1a73690bc771415db2744 Signed-off-by: Sergii Dmytruk <sergii.dmytruk(a)3mdeb.com> Reviewed-on: https://review.coreboot.org/c/flashrom/+/60231 Tested-by: build bot (Jenkins) <no-reply(a)coreboot.org> Reviewed-by: Nikolai Artemiev <nartemiev(a)google.com> Reviewed-by: Anastasia Klimchuk <aklm(a)chromium.org> --- M flash.h M writeprotect.c 2 files changed, 9 insertions(+), 0 deletions(-) Approvals: build bot (Jenkins): Verified Nikolai Artemiev: Looks good to me, but someone else must approve Anastasia Klimchuk: Looks good to me, approved diff --git a/flash.h b/flash.h index 509f226..9493fd2 100644 --- a/flash.h +++ b/flash.h @@ -307,6 +307,9 @@ /* Complement bit (CMP) */ struct reg_bit_info cmp; + + /* Write Protect Selection (per sector protection when set) */ + struct reg_bit_info wps; } reg_bits; /* Function that takes a set of WP config bits (e.g. BP, SEC, TB, etc) */ diff --git a/writeprotect.c b/writeprotect.c index 5893593..ab6b176 100644 --- a/writeprotect.c +++ b/writeprotect.c @@ -73,6 +73,8 @@ if (ret != FLASHROM_WP_OK) return ret; + /* Note: WPS bit isn't read here, because it's not part of any range. */ + for (i = 0; i < ARRAY_SIZE(bits->bp); i++) { if (bit_map->bp[i].reg == INVALID_REG) break; @@ -115,6 +117,8 @@ set_reg_bit(reg_values, write_masks, reg_bits->cmp, bits.cmp); set_reg_bit(reg_values, write_masks, reg_bits->srp, bits.srp); set_reg_bit(reg_values, write_masks, reg_bits->srl, bits.srl); + /* Note: always setting WPS bit to zero until its fully supported. */ + set_reg_bit(reg_values, write_masks, reg_bits->wps, 0); /* Write each register */ for (enum flash_reg reg = STATUS1; reg < MAX_REGISTERS; reg++) { @@ -253,6 +257,8 @@ *count = 1 << bit_count; *ranges = calloc(*count, sizeof(struct wp_range_and_bits)); + /* TODO: take WPS bit into account. */ + for (size_t range_index = 0; range_index < *count; range_index++) { /* * Extract bits from the range index and assign them to members 9 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/+/60231 To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: flashrom Gerrit-Branch: master Gerrit-Change-Id: I2c26ec65d64a3b6fb1f1a73690bc771415db2744 Gerrit-Change-Number: 60231 Gerrit-PatchSet: 14 Gerrit-Owner: Sergii Dmytruk <sergii.dmytruk(a)3mdeb.com> Gerrit-Reviewer: Anastasia Klimchuk <aklm(a)chromium.org> Gerrit-Reviewer: Nico Huber <nico.h(a)gmx.de> Gerrit-Reviewer: Nikolai Artemiev <nartemiev(a)chromium.org> Gerrit-Reviewer: Nikolai Artemiev <nartemiev(a)google.com> Gerrit-Reviewer: build bot (Jenkins) <no-reply(a)coreboot.org> Gerrit-CC: Edward O'Callaghan <quasisec(a)chromium.org> Gerrit-CC: Maciej Pijanowski <maciej.pijanowski(a)3mdeb.com> Gerrit-CC: Paul Menzel <paulepanter(a)mailbox.org> Gerrit-MessageType: merged

1 0

2024

2023

2022

2021

2020

2019

2018

2017

flashrom-gerrit April 2022