flashrom June 2013

flashrom@flashrom.org

29 participants
125 discussions

Start a nNew thread

Asrock Fatal1ty Z77 Performance > unsupported - logs attached
by "Jürgen Dorn" 01 Jun '13

01 Jun '13

regards, Jürgen

2 1

[PATCH 2/2] Introduce serialport_config().
by Stefan Tauner 01 Jun '13

01 Jun '13

This allows to easily reconfigure a serial port as needed in the Bus Pirate speedup. Signed-off-by: Stefan Tauner <stefan.tauner(a)student.tuwien.ac.at> --- programmer.h | 1 + serial.c | 105 +++++++++++++++++++++++++++++++++------------------------- 2 files changed, 60 insertions(+), 46 deletions(-) diff --git a/programmer.h b/programmer.h index 2ea7b48..6361eb8 100644 --- a/programmer.h +++ b/programmer.h @@ -656,6 +656,7 @@ typedef int fdtype; void sp_flush_incoming(void); fdtype sp_openserport(char *dev, unsigned int baud); +int serialport_config(fdtype fd, unsigned int baud); void __attribute__((noreturn)) sp_die(char *msg); extern fdtype sp_fd; /* expose serialport_shutdown as it's currently used by buspirate */ diff --git a/serial.c b/serial.c index 5f74fd1..0504aaa 100644 --- a/serial.c +++ b/serial.c @@ -160,35 +160,18 @@ static void msg_perr_strerror(const char *msg) #endif } -fdtype sp_openserport(char *dev, unsigned int baud) +int serialport_config(fdtype fd, unsigned int baud) { -#ifdef _WIN32 - HANDLE fd; - char *dev2 = dev; - if ((strlen(dev) > 3) && - (tolower((unsigned char)dev[0]) == 'c') && - (tolower((unsigned char)dev[1]) == 'o') && - (tolower((unsigned char)dev[2]) == 'm')) { - dev2 = malloc(strlen(dev) + 5); - if (!dev2) { - msg_perr_strerror("Out of memory: "); - return SER_INV_FD; - } - strcpy(dev2, "\\\\.\\"); - strcpy(dev2 + 4, dev); - } - fd = CreateFile(dev2, GENERIC_READ | GENERIC_WRITE, 0, NULL, - OPEN_EXISTING, 0, NULL); - if (dev2 != dev) - free(dev2); - if (fd == INVALID_HANDLE_VALUE) { - msg_perr_strerror("Cannot open serial port: "); - return SER_INV_FD; + if (fd == SER_INV_FD) { + msg_perr("%s: File descriptor is invalid.\n", __func__); + return 1; } + +#ifdef _WIN32 DCB dcb; if (!GetCommState(fd, &dcb)) { msg_perr_strerror("Could not fetch original serial port configuration: "); - goto out_close; + return 1; } const struct baudentry *entry = round_baud(baud); dcb.BaudRate = entry->flag; @@ -197,35 +180,25 @@ fdtype sp_openserport(char *dev, unsigned int baud) dcb.StopBits = ONESTOPBIT; if (!SetCommState(fd, &dcb)) { msg_perr_strerror("Could not change serial port configuration: "); - goto out_close; + return 1; } if (!GetCommState(fd, &dcb)) { msg_perr_strerror("Could not fetch new serial port configuration: "); - goto out_close; + return 1; } msg_pdbg("Baud rate is %ld.\n", dcb.BaudRate); - return fd; -out_close: - CloseHandle(sp_fd); - return SER_INV_FD; #else struct termios wanted, observed; - int fd; - fd = open(dev, O_RDWR | O_NOCTTY | O_NDELAY); - if (fd < 0) { - msg_perr_strerror("Cannot open serial port: "); - return SER_INV_FD; - } fcntl(fd, F_SETFL, 0); if (tcgetattr(fd, &observed) != 0) { msg_perr_strerror("Could not fetch original serial port configuration: "); - goto out_close; + return 1; } wanted = observed; const struct baudentry *entry = round_baud(baud); if (cfsetispeed(&wanted, entry->flag) != 0 || cfsetospeed(&wanted, entry->flag) != 0) { msg_perr_strerror("Could not set serial baud rate: "); - goto out_close; + return 1; } wanted.c_cflag &= ~(PARENB | CSTOPB | CSIZE | CRTSCTS); wanted.c_cflag |= (CS8 | CLOCAL | CREAD); @@ -234,11 +207,11 @@ out_close: wanted.c_oflag &= ~OPOST; if (tcsetattr(fd, TCSANOW, &wanted) != 0) { msg_perr_strerror("Could not change serial port configuration: "); - goto out_close; + return 1; } if (tcgetattr(fd, &observed) != 0) { msg_perr_strerror("Could not fetch new serial port configuration: "); - goto out_close; + return 1; } if (observed.c_cflag != wanted.c_cflag || observed.c_lflag != wanted.c_lflag || @@ -246,14 +219,54 @@ out_close: observed.c_oflag != wanted.c_oflag || cfgetispeed(&observed) != cfgetispeed(&wanted)) { msg_perr("%s: Some requested options did not stick.\n", __func__); - goto out_close; + return 1; } - msg_pdbg("Baud rate is %d.\n", entry->baud); - return fd; + msg_pdbg("Baud rate is %d now.\n", entry->baud); +#endif + return 0; +} -out_close: - close(sp_fd); - return SER_INV_FD; +fdtype sp_openserport(char *dev, unsigned int baud) +{ + fdtype fd; +#ifdef _WIN32 + char *dev2 = dev; + if ((strlen(dev) > 3) && + (tolower((unsigned char)dev[0]) == 'c') && + (tolower((unsigned char)dev[1]) == 'o') && + (tolower((unsigned char)dev[2]) == 'm')) { + dev2 = malloc(strlen(dev) + 5); + if (!dev2) { + msg_perr_strerror("Out of memory: "); + return SER_INV_FD; + } + strcpy(dev2, "\\\\.\\"); + strcpy(dev2 + 4, dev); + } + fd = CreateFile(dev2, GENERIC_READ | GENERIC_WRITE, 0, NULL, + OPEN_EXISTING, 0, NULL); + if (dev2 != dev) + free(dev2); + if (fd == INVALID_HANDLE_VALUE) { + msg_perr_strerror("Cannot open serial port: "); + return SER_INV_FD; + } + if (serialport_config(fd, baud) != 0) { + CloseHandle(fd); + return SER_INV_FD; + } + return fd; +#else + fd = open(dev, O_RDWR | O_NOCTTY | O_NDELAY); + if (fd < 0) { + msg_perr_strerror("Cannot open serial port: "); + return SER_INV_FD; + } + if (serialport_config(fd, baud) != 0) { + close(fd); + return SER_INV_FD; + } + return fd; #endif } -- Kind regards, Stefan Tauner

1 0

Re: [flashrom] [PATCH] Combine serialport_write and serialport_read into serialport_rw.
by Carl-Daniel Hailfinger 01 Jun '13

01 Jun '13

Am 01.04.2013 03:14 schrieb Stefan Tauner: > Because they share almost all code, combine them into serialport_rw > and export the old functions as wrappers. This makes reads "empty reads"- > aware and programmers able to detect such problems even on "blocking" > reads. > > Signed-off-by: Stefan Tauner <stefan.tauner(a)student.tuwien.ac.at> Acked-by: Carl-Daniel Hailfinger <c-d.hailfinger.devel.2006(a)gmx.net> > diff --git a/serial.c b/serial.c > index 49484f5..6679b7c 100644 > --- a/serial.c > +++ b/serial.c > @@ -28,6 +28,7 @@ > #include <sys/stat.h> > #include <errno.h> > #include <inttypes.h> > +#include <stdbool.h> > #ifdef _WIN32 > #include <conio.h> > #else > @@ -328,68 +329,61 @@ int serialport_shutdown(void *data) > return 0; > } > > -int serialport_write(unsigned char *buf, unsigned int writecnt) > +/* Writes (if \c outdir is true) or reads \c todo bytes from/into \c buf. > + * Tries up to 10 times with a timeout of \c ms ms between each try. */ > +static int serialport_rw(unsigned char *buf, unsigned int todo, bool outdir, unsigned int ms) > { > + const char * const op = outdir ? "write" : "read"; > #ifdef _WIN32 > - DWORD tmp = 0; > + DWORD cur = 0; > #else > - ssize_t tmp = 0; > + ssize_t cur = 0; > #endif > - unsigned int empty_writes = 250; /* results in a ca. 125ms timeout */ > + unsigned int empty_tries = 10; > > - while (writecnt > 0) { > + while (todo > 0) { > #ifdef _WIN32 > - WriteFile(sp_fd, buf, writecnt, &tmp, NULL); > + if (outdir) > + WriteFile(sp_fd, buf, todo, &cur, NULL); > + else > + ReadFile(sp_fd, buf, todo, &cur, NULL); > #else > - tmp = write(sp_fd, buf, writecnt); > + if (outdir) > + cur = write(sp_fd, buf, todo); > + else > + cur = read(sp_fd, buf, todo); > #endif > - if (tmp == -1) { > - msg_perr("Serial port write error!\n"); > + if (cur == -1) { > + msg_perr("Serial port %s error!\n", op); > return 1; The logic of error handling is non-portable (AFAICS the number of read/written bytes for the error case is 0 on Windows and -1 on POSIX). That said, it was non-portable before, so this patch doesn't change it for the worse. > } > - if (!tmp) { > - msg_pdbg2("Empty write\n"); > - empty_writes--; > - programmer_delay(500); > - if (empty_writes == 0) { > + if (cur == 0) { > + msg_pdbg2("Empty %s.\n", op); > + empty_tries--; > + programmer_delay(ms * 1000); > + if (empty_tries == 0) { > msg_perr("Serial port is unresponsive!\n"); That message is actually wrong for the read case. If the serial device (e.g. Bus Pirate) disappears, you'll get 0-byte reads forever, at least on Linux. AFAICS blocking reads shall either return an error or at least 1 byte. That rule seems to be valid on Linux and Windows. Errors can be transient, though (see EINTR and other fun stuff). Suggested alternative wording: "Serial port is unresponsive or disappeared" > return 1; > } > } > - writecnt -= tmp; > - buf += tmp; > + todo -= cur; > + buf += cur; > } > > return 0; > } > > -int serialport_read(unsigned char *buf, unsigned int readcnt) > +int serialport_write(unsigned char *buf, unsigned int writecnt) > { > -#ifdef _WIN32 > - DWORD tmp = 0; > -#else > - ssize_t tmp = 0; > -#endif > - > - while (readcnt > 0) { > -#ifdef _WIN32 > - ReadFile(sp_fd, buf, readcnt, &tmp, NULL); > -#else > - tmp = read(sp_fd, buf, readcnt); > -#endif > - if (tmp == -1) { > - msg_perr("Serial port read error!\n"); > - return 1; > - } > - if (!tmp) > - msg_pdbg2("Empty read\n"); > - readcnt -= tmp; > - buf += tmp; > - } > + return serialport_rw(buf, writecnt, true, 1); > +} > > - return 0; > +int serialport_read(unsigned char *buf, unsigned int readcnt) > +{ > + return serialport_rw(buf, readcnt, false, 10); > } > > + > /* Tries up to timeout ms to read readcnt characters and places them into the array starting at c. Returns > * 0 on success, positive values on temporary errors (e.g. timeouts) and negative ones on permanent errors. > * If really_read is not NULL, this function sets its contents to the number of bytes read successfully. */ Regards, Carl-Daniel -- http://www.hailfinger.org/

2 1

[commit] r1676 - branches/stuge
by repository service 01 Jun '13

01 Jun '13

Author: stefanct Date: Sat Jun 1 02:30:31 2013 New Revision: 1676 URL: http://flashrom.org/trac/flashrom/changeset/1676 Log: Remove Peter's obsolete branch. Signed-off-by: Stefan Tauner <stefan.tauner(a)student.tuwien.ac.at> Acked-by: Stefan Tauner <stefan.tauner(a)student.tuwien.ac.at> Deleted: branches/stuge/

1 0

[commit] r1675 - trunk
by repository service 01 Jun '13

01 Jun '13

Author: stefanct Date: Sat Jun 1 02:06:12 2013 New Revision: 1675 URL: http://flashrom.org/trac/flashrom/changeset/1675 Log: Change warning regarding protected ICH regions. There is no good reason to collect further log files of locked Intel- based boards. Forward affected users directly to an explanation in the wiki instead. Signed-off-by: Stefan Tauner <stefan.tauner(a)student.tuwien.ac.at> Acked-by: Stefan Tauner <stefan.tauner(a)student.tuwien.ac.at> Modified: trunk/ichspi.c Modified: trunk/ichspi.c ============================================================================== --- trunk/ichspi.c Thu May 23 23:47:46 2013 (r1674) +++ trunk/ichspi.c Sat Jun 1 02:06:12 2013 (r1675) @@ -1700,6 +1700,10 @@ /* Handle FREGx and FRAP registers */ for (i = 0; i < 5; i++) ich_spi_rw_restricted |= ich9_handle_frap(tmp, i); + if (ich_spi_rw_restricted) + msg_pwarn("Not all flash regions are freely accessible by flashrom. This is " + "most likely\ndue to an active ME. Please see http://flashrom.org/ME " + "for details.\n"); } /* Handle PR registers */ @@ -1711,11 +1715,6 @@ } if (ich_spi_rw_restricted) { - msg_pinfo("Please send a verbose log to " - "flashrom(a)flashrom.org if this board is not " - "listed on\n" - "http://flashrom.org/Supported_hardware#Supported_mainboards " - "yet.\n"); if (!ich_spi_force) programmer_may_write = 0; msg_pinfo("Writes have been disabled for safety reasons. You can enforce write\n"

1 0

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

flashrom June 2013