November 2017 - flashrom-gerrit

Change in flashrom[master]: Add a file utility library
by David Hendricks (Code Review) 17 Nov '17

17 Nov '17

Hello Louis Yung-Chieh Lo, I'd like you to do a code review. Please visit https://review.coreboot.org/22490 to review the following change. Change subject: Add a file utility library ...................................................................... Add a file utility library This adds a library for BSD-licensed helper functions for dealing with files. Currently the library only has scanft() which was ported over from mosys. This function recursively scans files in a filesystem tree and can optionally match the beginning content. This is particularly useful for searching for devices in sysfs, which may be infinitely recursive (due to symlinks) and typically contain single values, such as a module alias. BUG=none TEST=used in follow-up CLs to find I2C and SPI buses and addresses Example test output using /sys/bus/i2c/devices/ as root path, following 2 levels of symbolic links, physical i2c bus is 4 but got shifted to 6: gec_i2c_probe_programmer: probing for GEC on I2C... gec_i2c_probe_programmer: chromeos-ec found in \ "/sys/bus/i2c/devices/i2c-6/6-001e/name" gec_i2c_probe_programmer: bus: 6, addr: 0x1e Change-Id: I6c86ad3a50748e6bdbaa6675b05e75ef714b3994 Reviewed-on: https://gerrit.chromium.org/gerrit/23466 Reviewed-by: Yung-Chieh Lo <yjlou%chromium.org(a)gtempaccount.com> Commit-Ready: David Hendricks <dhendrix(a)chromium.org> Tested-by: David Hendricks <dhendrix(a)chromium.org> --- M Makefile A file.c A file.h 3 files changed, 175 insertions(+), 1 deletion(-) git pull ssh://review.coreboot.org:29418/flashrom refs/changes/90/22490/1 diff --git a/Makefile b/Makefile index 5bd7158..26bf343 100644 --- a/Makefile +++ b/Makefile @@ -519,7 +519,7 @@ ############################################################################### # Library code. -LIB_OBJS = libflashrom.o layout.o flashrom.o udelay.o programmer.o helpers.o ich_descriptors.o +LIB_OBJS = libflashrom.o layout.o flashrom.o udelay.o programmer.o helpers.o ich_descriptors.o file.o ############################################################################### # Frontend related stuff. diff --git a/file.c b/file.c new file mode 100644 index 0000000..6f15ff9 --- /dev/null +++ b/file.c @@ -0,0 +1,141 @@ +/* + * Copyright 2012, The Chromium OS Authors + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions are + * met: + * + * * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * * Redistributions in binary form must reproduce the above + * copyright notice, this list of conditions and the following + * disclaimer in the documentation and/or other materials provided + * with the distribution. + * * Neither the name of Google Inc. nor the names of its + * contributors may be used to endorse or promote products derived + * from this software without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR + * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT + * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, + * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT + * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, + * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY + * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT + * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE + * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + * + * scanft() is derived from mosys source,s which were released under the + * BSD license + */ + +#include <dirent.h> +#include <errno.h> +#include <limits.h> +#include <stdio.h> +#include <stdlib.h> +#include <string.h> +#include <unistd.h> +#include <sys/fcntl.h> +#include <sys/stat.h> +#include <sys/types.h> + +#include "flash.h" + +/*returns 1 if contents matches, 0 if not, and <0 to indicate error */ +static int file_contents_match(const char *path, const char *str) +{ + FILE *fp; + char *content; + int len = strlen(str); + int ret = -1; + + content = malloc(len); + if (!content) + return -1; + + if ((fp = fopen(path, "r")) == NULL) { + msg_pdbg("Error opening %s: %s\n", path, strerror(errno)); + goto file_contents_match_done; + } + if (fread(content, 1, len, fp) < 1) { + msg_pdbg("Error reading %s: %s\n", path, strerror(ferror(fp))); + goto file_contents_match_done; + } + + if (!strncmp(str, content, len)) + ret = 1; + else + ret = 0; + +file_contents_match_done: + fclose(fp); + free(content); + return ret; +} + + /* + * scanft - scan filetree for file with option to parse some content + * + * @root: Where to begin search + * @filename: Name of file to search for + * @str: Optional NULL terminated string to check at the beginning + * of the file + * @symdepth: Maximum depth of symlinks to follow. A negative value means + * follow indefinitely. Zero means do not follow symlinks. + * + * The caller should be specific enough with root and symdepth arguments + * to avoid finding duplicate information (especially in sysfs). + * + * returns allocated string with path of matching file if successful + * returns NULL to indicate failure + */ +const char *scanft(const char *root, const char *filename, + const char *str, int symdepth) +{ + DIR *dp; + struct dirent *d; + struct stat s; + const char *ret = NULL; + + if (lstat(root, &s) < 0) { + msg_pdbg("%s: Error stat'ing %s: %s\n", + __func__, root, strerror(errno)); + return NULL; + } + + if (S_ISLNK(s.st_mode)) { + if (symdepth == 0) /* Leaf has been reached */ + return NULL; + else if (symdepth > 0) /* Follow if not too deep in */ + symdepth--; + } + + if ((dp = opendir(root)) == NULL) + return NULL; + + while (!ret && (d = readdir(dp))) { + char newpath[PATH_MAX]; + + /* Skip "." and ".." */ + if (!(strcmp(d->d_name, ".")) || + !(strcmp(d->d_name, ".."))) + continue; + + snprintf(newpath, sizeof(newpath), "%s/%s", root, d->d_name); + + if (!strcmp(d->d_name, filename)) { + if (!str || file_contents_match(newpath, str)) + ret = strdup(newpath); + } + + if (!ret) + ret = scanft(newpath, filename, str, symdepth); + } + + closedir(dp); + return ret; +} diff --git a/file.h b/file.h new file mode 100644 index 0000000..ea37084 --- /dev/null +++ b/file.h @@ -0,0 +1,33 @@ +/* + * Copyright 2012, The Chromium OS Authors + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions are + * met: + * + * * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * * Redistributions in binary form must reproduce the above + * copyright notice, this list of conditions and the following + * disclaimer in the documentation and/or other materials provided + * with the distribution. + * * Neither the name of Google Inc. nor the names of its + * contributors may be used to endorse or promote products derived + * from this software without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR + * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT + * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, + * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT + * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, + * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY + * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT + * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE + * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + */ + +const char *scanft(const char *root, const char *filename, + const char *str, int symdepth); -- To view, visit https://review.coreboot.org/22490 To unsubscribe, visit https://review.coreboot.org/settings Gerrit-Project: flashrom Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I6c86ad3a50748e6bdbaa6675b05e75ef714b3994 Gerrit-Change-Number: 22490 Gerrit-PatchSet: 1 Gerrit-Owner: David Hendricks <david.hendricks(a)gmail.com> Gerrit-Reviewer: Louis Yung-Chieh Lo <yjlou(a)chromium.org>

1 0

Change in flashrom[master]: spi25: Merge remainder of spi4ba in
by David Hendricks (Code Review) 16 Nov '17

16 Nov '17

David Hendricks has posted comments on this change. ( https://review.coreboot.org/22388 ) Change subject: spi25: Merge remainder of spi4ba in ...................................................................... Patch Set 3: Code-Review+2 -- To view, visit https://review.coreboot.org/22388 To unsubscribe, visit https://review.coreboot.org/settings Gerrit-Project: flashrom Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: If581e24347e45cbb27002ea99ffd70e334c110cf Gerrit-Change-Number: 22388 Gerrit-PatchSet: 3 Gerrit-Owner: Nico Huber <nico.h(a)gmx.de> Gerrit-Reviewer: David Hendricks <david.hendricks(a)gmail.com> Gerrit-Reviewer: Paul Menzel <paulepanter(a)users.sourceforge.net> Gerrit-Reviewer: build bot (Jenkins) <no-reply(a)coreboot.org> Gerrit-Comment-Date: Thu, 16 Nov 2017 06:59:13 +0000 Gerrit-HasComments: No

1 0

Change in flashrom[master]: spi4ba: Drop now obsolete, redundant functions
by David Hendricks (Code Review) 16 Nov '17

16 Nov '17

David Hendricks has posted comments on this change. ( https://review.coreboot.org/22387 ) Change subject: spi4ba: Drop now obsolete, redundant functions ...................................................................... Patch Set 3: Code-Review+2 -- To view, visit https://review.coreboot.org/22387 To unsubscribe, visit https://review.coreboot.org/settings Gerrit-Project: flashrom Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I1d04448fd1acbfc37b8e17288f497a4292dfd6d6 Gerrit-Change-Number: 22387 Gerrit-PatchSet: 3 Gerrit-Owner: Nico Huber <nico.h(a)gmx.de> Gerrit-Reviewer: David Hendricks <david.hendricks(a)gmail.com> Gerrit-Reviewer: Paul Menzel <paulepanter(a)users.sourceforge.net> Gerrit-Reviewer: build bot (Jenkins) <no-reply(a)coreboot.org> Gerrit-Comment-Date: Thu, 16 Nov 2017 06:55:13 +0000 Gerrit-HasComments: No

1 0

Change in flashrom[master]: spi25: Remove now obsolete `four_bytes_addr_funcs` path
by David Hendricks (Code Review) 16 Nov '17

16 Nov '17

David Hendricks has posted comments on this change. ( https://review.coreboot.org/22386 ) Change subject: spi25: Remove now obsolete `four_bytes_addr_funcs` path ...................................................................... Patch Set 3: Code-Review+2 -- To view, visit https://review.coreboot.org/22386 To unsubscribe, visit https://review.coreboot.org/settings Gerrit-Project: flashrom Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Idb7c576cb159630da2268813388b497cb5f46b43 Gerrit-Change-Number: 22386 Gerrit-PatchSet: 3 Gerrit-Owner: Nico Huber <nico.h(a)gmx.de> Gerrit-Reviewer: David Hendricks <david.hendricks(a)gmail.com> Gerrit-Reviewer: Paul Menzel <paulepanter(a)users.sourceforge.net> Gerrit-Reviewer: build bot (Jenkins) <no-reply(a)coreboot.org> Gerrit-Comment-Date: Thu, 16 Nov 2017 06:54:45 +0000 Gerrit-HasComments: No

1 0

Change in flashrom[master]: spi25: Enable native 4BA read and write using feature bits
by David Hendricks (Code Review) 16 Nov '17

16 Nov '17

David Hendricks has posted comments on this change. ( https://review.coreboot.org/22385 ) Change subject: spi25: Enable native 4BA read and write using feature bits ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://review.coreboot.org/22385 To unsubscribe, visit https://review.coreboot.org/settings Gerrit-Project: flashrom Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I2f6817ca198bf923671a7aa67e956e5477d71848 Gerrit-Change-Number: 22385 Gerrit-PatchSet: 2 Gerrit-Owner: Nico Huber <nico.h(a)gmx.de> Gerrit-Reviewer: David Hendricks <david.hendricks(a)gmail.com> Gerrit-Reviewer: Paul Menzel <paulepanter(a)users.sourceforge.net> Gerrit-Reviewer: build bot (Jenkins) <no-reply(a)coreboot.org> Gerrit-Comment-Date: Thu, 16 Nov 2017 06:52:36 +0000 Gerrit-HasComments: No

1 0

Change in flashrom[master]: spi25: Integrate 4BA support
by David Hendricks (Code Review) 16 Nov '17

16 Nov '17

David Hendricks has posted comments on this change. ( https://review.coreboot.org/22384 ) Change subject: spi25: Integrate 4BA support ...................................................................... Patch Set 2: Code-Review+2 (1 comment) Small nit, otherwise LGTM. https://review.coreboot.org/#/c/22384/2/flash.h File flash.h: https://review.coreboot.org/#/c/22384/2/flash.h@241 PS2, Line 241: int address_high_byte; : bool in_4ba_mode; A comment above these should be added to clarify how they affect the way the high address byte is communicated to the chip. Basically just restate here what you have in the commit message. -- To view, visit https://review.coreboot.org/22384 To unsubscribe, visit https://review.coreboot.org/settings Gerrit-Project: flashrom Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I644600beaab9a571b97b67f7516abe571d3460c1 Gerrit-Change-Number: 22384 Gerrit-PatchSet: 2 Gerrit-Owner: Nico Huber <nico.h(a)gmx.de> Gerrit-Reviewer: David Hendricks <david.hendricks(a)gmail.com> Gerrit-Reviewer: Paul Menzel <paulepanter(a)users.sourceforge.net> Gerrit-Reviewer: build bot (Jenkins) <no-reply(a)coreboot.org> Gerrit-Comment-Date: Thu, 16 Nov 2017 06:45:57 +0000 Gerrit-HasComments: Yes

1 0

Change in flashrom[master]: linux_spi: Dynamically detect max buffer size
by build bot (Jenkins) (Code Review) 16 Nov '17

16 Nov '17

build bot (Jenkins) has posted comments on this change. ( https://review.coreboot.org/22441 ) Change subject: linux_spi: Dynamically detect max buffer size ...................................................................... Patch Set 2: Build Successful https://qa.coreboot.org/job/flashrom-customrules/879/ : SUCCESS -- To view, visit https://review.coreboot.org/22441 To unsubscribe, visit https://review.coreboot.org/settings Gerrit-Project: flashrom Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ic541e548ced8488f074d388f1c92174cad123064 Gerrit-Change-Number: 22441 Gerrit-PatchSet: 2 Gerrit-Owner: David Hendricks <david.hendricks(a)gmail.com> Gerrit-Reviewer: David Hendricks <david.hendricks(a)gmail.com> Gerrit-Reviewer: Nico Huber <nico.h(a)gmx.de> Gerrit-Reviewer: Paul Menzel <paulepanter(a)users.sourceforge.net> Gerrit-Reviewer: build bot (Jenkins) <no-reply(a)coreboot.org> Gerrit-Comment-Date: Thu, 16 Nov 2017 06:28:13 +0000 Gerrit-HasComments: No

1 0

Change in flashrom[master]: linux_spi: Dynamically detect max buffer size
by David Hendricks (Code Review) 16 Nov '17

16 Nov '17

David Hendricks has submitted this change and it was merged. ( https://review.coreboot.org/22441 ) Change subject: linux_spi: Dynamically detect max buffer size ...................................................................... linux_spi: Dynamically detect max buffer size Read max buffer size from sysfs if available. Change-Id: Ic541e548ced8488f074d388f1c92174cad123064 Signed-off-by: Keno Fischer <keno(a)juliacomputing.com> Signed-off-by: David Hendricks <dhendricks(a)fb.com> Reviewed-on: https://review.coreboot.org/22441 Tested-by: build bot (Jenkins) <no-reply(a)coreboot.org> Reviewed-by: Nico Huber <nico.h(a)gmx.de> --- M linux_spi.c 1 file changed, 45 insertions(+), 7 deletions(-) Approvals: build bot (Jenkins): Verified Nico Huber: Looks good to me, approved diff --git a/linux_spi.c b/linux_spi.c index e51fbc4..611559a 100644 --- a/linux_spi.c +++ b/linux_spi.c @@ -42,6 +42,8 @@ */ static int fd = -1; +#define BUF_SIZE_FROM_SYSFS "/sys/module/spidev/parameters/bufsiz" +static size_t max_kernel_buf_size; static int linux_spi_shutdown(void *data); static int linux_spi_send_command(struct flashctx *flash, unsigned int writecnt, @@ -127,8 +129,45 @@ return 1; } - register_spi_master(&spi_master_linux); + /* Read max buffer size from sysfs, or use page size as fallback. */ + FILE *fp; + fp = fopen(BUF_SIZE_FROM_SYSFS, "r"); + if (!fp) { + msg_pwarn("Cannot open %s: %s.\n", BUF_SIZE_FROM_SYSFS, strerror(errno)); + goto out; + } + char buf[10]; + memset(buf, 0, sizeof(buf)); + if (!fread(buf, 1, sizeof(buf) - 1, fp)) { + if (feof(fp)) + msg_pwarn("Cannot read %s: file is empty.\n", BUF_SIZE_FROM_SYSFS); + else + msg_pwarn("Cannot read %s: %s.\n", BUF_SIZE_FROM_SYSFS, strerror(errno)); + goto out; + } + + long int tmp; + errno = 0; + tmp = strtol(buf, NULL, 0); + if ((tmp < 0) || errno) { + msg_pwarn("Buffer size %ld from %s seems wrong.\n", tmp, BUF_SIZE_FROM_SYSFS); + } else { + msg_pdbg("%s: Using value from %s as max buffer size.\n", __func__, BUF_SIZE_FROM_SYSFS); + max_kernel_buf_size = (size_t)tmp; + } + +out: + if (fp) + fclose(fp); + + if (!max_kernel_buf_size) { + msg_pdbg("%s: Using page size as max buffer size.\n", __func__); + max_kernel_buf_size = (size_t)getpagesize(); + } + + msg_pdbg("%s: max_kernel_buf_size: %zu\n", __func__, max_kernel_buf_size); + register_spi_master(&spi_master_linux); return 0; } @@ -179,17 +218,16 @@ return 0; } -static int linux_spi_read(struct flashctx *flash, uint8_t *buf, - unsigned int start, unsigned int len) +static int linux_spi_read(struct flashctx *flash, uint8_t *buf, unsigned int start, unsigned int len) { - return spi_read_chunked(flash, buf, start, len, - (unsigned int)getpagesize()); + /* Read buffer is fully utilized for data. */ + return spi_read_chunked(flash, buf, start, len, max_kernel_buf_size); } static int linux_spi_write_256(struct flashctx *flash, const uint8_t *buf, unsigned int start, unsigned int len) { - return spi_write_chunked(flash, buf, start, len, - ((unsigned int)getpagesize()) - 4); + /* 5 bytes must be reserved for longest possible command + address. */ + return spi_write_chunked(flash, buf, start, len, max_kernel_buf_size - 5); } #endif // CONFIG_LINUX_SPI == 1 -- To view, visit https://review.coreboot.org/22441 To unsubscribe, visit https://review.coreboot.org/settings Gerrit-Project: flashrom Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: Ic541e548ced8488f074d388f1c92174cad123064 Gerrit-Change-Number: 22441 Gerrit-PatchSet: 2 Gerrit-Owner: David Hendricks <david.hendricks(a)gmail.com> Gerrit-Reviewer: David Hendricks <david.hendricks(a)gmail.com> Gerrit-Reviewer: Nico Huber <nico.h(a)gmx.de> Gerrit-Reviewer: Paul Menzel <paulepanter(a)users.sourceforge.net> Gerrit-Reviewer: build bot (Jenkins) <no-reply(a)coreboot.org>

1 0

Change in flashrom[master]: linux_spi: Dynamically detect max buffer size
by David Hendricks (Code Review) 16 Nov '17

16 Nov '17

David Hendricks has posted comments on this change. ( https://review.coreboot.org/22441 ) Change subject: linux_spi: Dynamically detect max buffer size ...................................................................... Patch Set 1: -Code-Review -- To view, visit https://review.coreboot.org/22441 To unsubscribe, visit https://review.coreboot.org/settings Gerrit-Project: flashrom Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ic541e548ced8488f074d388f1c92174cad123064 Gerrit-Change-Number: 22441 Gerrit-PatchSet: 1 Gerrit-Owner: David Hendricks <david.hendricks(a)gmail.com> Gerrit-Reviewer: David Hendricks <david.hendricks(a)gmail.com> Gerrit-Reviewer: Nico Huber <nico.h(a)gmx.de> Gerrit-Reviewer: Paul Menzel <paulepanter(a)users.sourceforge.net> Gerrit-Reviewer: build bot (Jenkins) <no-reply(a)coreboot.org> Gerrit-Comment-Date: Thu, 16 Nov 2017 06:27:39 +0000 Gerrit-HasComments: No

1 0

Change in flashrom[staging]: spi: Add valid_addr_offset() to spi_master
by Nico Huber (Code Review) 14 Nov '17

14 Nov '17

Nico Huber has abandoned this change. ( https://review.coreboot.org/19418 ) Change subject: spi: Add valid_addr_offset() to spi_master ...................................................................... Abandoned superseded -- To view, visit https://review.coreboot.org/19418 To unsubscribe, visit https://review.coreboot.org/settings Gerrit-Project: flashrom Gerrit-Branch: staging Gerrit-MessageType: abandon Gerrit-Change-Id: Icbac513c5339e8aff624870252133284ef85ab73 Gerrit-Change-Number: 19418 Gerrit-PatchSet: 3 Gerrit-Owner: Nico Huber <nico.h(a)gmx.de> Gerrit-Reviewer: Nico Huber <nico.h(a)gmx.de> Gerrit-Reviewer: Paul Menzel <paulepanter(a)users.sourceforge.net> Gerrit-Reviewer: Stefan Reinauer <stefan.reinauer(a)coreboot.org> Gerrit-Reviewer: build bot (Jenkins) <no-reply(a)coreboot.org>

1 0

2024

2023

2022

2021

2020

2019

2018

2017

flashrom-gerrit November 2017