flashrom

flashrom@flashrom.org

8 participants
9164 discussions

Re: [flashrom] Successful read on HP ProBook 4320s (HM57)
by Stefan Tauner 01 Apr '13

01 Apr '13

On Wed, 20 Mar 2013 21:12:51 +0400 Vasiliy Vylegzhanin <coder(a)npo-echelon.ru> wrote: > Hi, > appying patches from http://patchwork.coreboot.org/user/bundle/37/ > makes it possible to read non-blocked regions on HP ProBook 4320s. Thanks, I hope to get them merged in the next weeks eventually. > HM57 is marked untested, so here is read log (attached). Our policy is to mark them tested only when we get successful *writes*. In the case of Intel chipsets the policy and the whole status is rather useless though. The will (most probably) all work, but only if the configuration allows to access all regions... -- Kind regards/Mit freundlichen Grüßen, Stefan Tauner

1 0

Re: [flashrom] [PATCH] Refine granularity handling in preparation of AT45DB series support.
by Carl-Daniel Hailfinger 01 Apr '13

01 Apr '13

Am 14.03.2013 12:13 schrieb Stefan Tauner: > This adds a number of new granularities in a rather inelegant way. > Until we figure out how to better handle various granularities this has > to be accepted. I think it's pretty good and I definitely don't consider it to be inelegant. > It also refactors the handling of n-byte granularities by extracting the > checking code into a helper function which reduces the pain of the above > significantly. > > 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> with one small change (see below). > --- > This is one possibility to solve the granularity issue and i think the > most likely to get the patch series in fastest... > > --- a/flashrom.c > +++ b/flashrom.c > @@ -676,6 +676,23 @@ out_free: > return ret; > } > > +/* Helper function for need_erase() that focuses on granularities of n bytes. */ > +static int need_erase_n_bytes(uint8_t *have, uint8_t *want, unsigned int len, unsigned int n) Can you please rename n to gran or something similar (don't forget the comment as well)? That would improve readability. No need to repost. > +{ > + unsigned int i, j, limit; > + for (j = 0; j < len / n; j++) { > + limit = min (n, len - j * n); > + /* Are 'have' and 'want' identical? */ > + if (!memcmp(have + j * n, want + j * n, limit)) > + continue; > + /* have needs to be in erased state. */ > + for (i = 0; i < limit; i++) > + if (have[j * n + i] != 0xff) > + return 1; > + } > + return 0; > +} > + > /* > * Check if the buffer @have can be programmed to the content of @want without > * erasing. This is only possible if all chunks of size @gran are either kept > Regards, Carl-Daniel -- http://www.hailfinger.org/

2 1

[commit] r1666 - trunk
by repository service 01 Apr '13

01 Apr '13

Author: stefanct Date: Mon Apr 1 21:34:53 2013 New Revision: 1666 URL: http://flashrom.org/trac/flashrom/changeset/1666 Log: Refine granularity handling in preparation of AT45DB series support. This adds a number of new granularitie and refines the handling of n-byte granularities by extracting the respective code into a helper function which reduces the pain of the above significantly. 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> Modified: trunk/flash.h trunk/flashrom.c Modified: trunk/flash.h ============================================================================== --- trunk/flash.h Mon Apr 1 02:46:05 2013 (r1665) +++ trunk/flash.h Mon Apr 1 21:34:53 2013 (r1666) @@ -59,18 +59,22 @@ }; /* - * The following write granularities are known: - * - 1 bit: Each bit can be cleared individually. - * - 1 byte: A byte can be written once. Further writes to an already written byte cause its contents to be - * either undefined or to stay unchanged. - * - 128 bytes: If less than 128 bytes are written, the rest will be erased. Each write to a 128-byte region - * will trigger an automatic erase before anything is written. Very uncommon behaviour. - * - 256 bytes: If less than 256 bytes are written, the contents of the unwritten bytes are undefined. + * The following enum defines possible write granularities of flash chips. These tend to reflect the properties + * of the actual hardware not necesserily the write function(s) defined by the respective struct flashchip. + * The latter might (and should) be more precisely specified, e.g. they might bail out early if their execution + * would result in undefined chip contents. */ enum write_granularity { - write_gran_256bytes = 0, /* We assume 256 byte granularity by default. */ - write_gran_1bit, - write_gran_1byte, + /* We assume 256 byte granularity by default. */ + write_gran_256bytes = 0,/* If less than 256 bytes are written, the unwritten bytes are undefined. */ + write_gran_1bit, /* Each bit can be cleared individually. */ + write_gran_1byte, /* A byte can be written once. Further writes to an already written byte cause + * its contents to be either undefined or to stay unchanged. */ + write_gran_264bytes, /* If less than 264 bytes are written, the unwritten bytes are undefined. */ + write_gran_512bytes, /* If less than 512 bytes are written, the unwritten bytes are undefined. */ + write_gran_528bytes, /* If less than 528 bytes are written, the unwritten bytes are undefined. */ + write_gran_1024bytes, /* If less than 1024 bytes are written, the unwritten bytes are undefined. */ + write_gran_1056bytes, /* If less than 1056 bytes are written, the unwritten bytes are undefined. */ }; /* Modified: trunk/flashrom.c ============================================================================== --- trunk/flashrom.c Mon Apr 1 02:46:05 2013 (r1665) +++ trunk/flashrom.c Mon Apr 1 21:34:53 2013 (r1666) @@ -688,6 +688,23 @@ return ret; } +/* Helper function for need_erase() that focuses on granularities of gran bytes. */ +static int need_erase_gran_bytes(uint8_t *have, uint8_t *want, unsigned int len, unsigned int gran) +{ + unsigned int i, j, limit; + for (j = 0; j < len / gran; j++) { + limit = min (gran, len - j * gran); + /* Are 'have' and 'want' identical? */ + if (!memcmp(have + j * gran, want + j * gran, limit)) + continue; + /* have needs to be in erased state. */ + for (i = 0; i < limit; i++) + if (have[j * gran + i] != 0xff) + return 1; + } + return 0; +} + /* * Check if the buffer @have can be programmed to the content of @want without * erasing. This is only possible if all chunks of size @gran are either kept @@ -705,7 +722,7 @@ int need_erase(uint8_t *have, uint8_t *want, unsigned int len, enum write_granularity gran) { int result = 0; - unsigned int i, j, limit; + unsigned int i; switch (gran) { case write_gran_1bit: @@ -723,20 +740,22 @@ } break; case write_gran_256bytes: - for (j = 0; j < len / 256; j++) { - limit = min (256, len - j * 256); - /* Are 'have' and 'want' identical? */ - if (!memcmp(have + j * 256, want + j * 256, limit)) - continue; - /* have needs to be in erased state. */ - for (i = 0; i < limit; i++) - if (have[j * 256 + i] != 0xff) { - result = 1; - break; - } - if (result) - break; - } + result = need_erase_gran_bytes(have, want, len, 256); + break; + case write_gran_264bytes: + result = need_erase_gran_bytes(have, want, len, 264); + break; + case write_gran_512bytes: + result = need_erase_gran_bytes(have, want, len, 512); + break; + case write_gran_528bytes: + result = need_erase_gran_bytes(have, want, len, 528); + break; + case write_gran_1024bytes: + result = need_erase_gran_bytes(have, want, len, 1024); + break; + case write_gran_1056bytes: + result = need_erase_gran_bytes(have, want, len, 1056); break; default: msg_cerr("%s: Unsupported granularity! Please report a bug at " @@ -784,6 +803,21 @@ case write_gran_256bytes: stride = 256; break; + case write_gran_264bytes: + stride = 264; + break; + case write_gran_512bytes: + stride = 512; + break; + case write_gran_528bytes: + stride = 528; + break; + case write_gran_1024bytes: + stride = 1024; + break; + case write_gran_1056bytes: + stride = 1056; + break; default: msg_cerr("%s: Unsupported granularity! Please report a bug at " "flashrom(a)flashrom.org\n", __func__);

1 0

[PATCH] Bus Pirate UART speedup.
by Stefan Tauner 01 Apr '13

01 Apr '13

Increase PIC/FT232 UART speed to 2 Mbaud (instead of 115200 baud) in firmware 5.5 and newer. Given that UART speed is the biggest bottleneck for Bus Pirate communication (right now 90% of the read time is caused by slow BP<->host communication), this patch is absolutely needed to get any decent speed out of the Bus Pirate. WARNING: This patch may hang flashrom or corrupt data for any non-v3 Bus Pirate model. I haven't tested such models, and it might work without problems. Who knows. We would have to find someone with a v2 (or earlier) Bus Pirate and a firmware version >=v5.5 to test this. For Bus Pirate model v4 this patch may be completely superfluous. Anyway, activating fast UART only for some models is probably the way to go. We already have code to determine the hardware model in the init function, this just needs to be stored in some variable. Signed-off-by: Carl-Daniel Hailfinger <c-d.hailfinger.devel.2006(a)gmx.net> Signed-off-by: Stefan Tauner <stefan.tauner(a)student.tuwien.ac.at> --- buspirate_spi.c | 44 +++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 43 insertions(+), 1 deletion(-) diff --git a/buspirate_spi.c b/buspirate_spi.c index d2ebc75..57da63a 100644 --- a/buspirate_spi.c +++ b/buspirate_spi.c @@ -178,7 +178,10 @@ static int buspirate_spi_shutdown(void *data) } /* Reset Bus Pirate (return to user terminal) */ bp_commbuf[0] = 0x0f; - ret = buspirate_sendrecv(bp_commbuf, 1, 0); + if ((ret = buspirate_sendrecv(bp_commbuf, 1, 0))) + goto out_shutdown; + if ((ret = serialport_config(sp_fd, 115200))) + goto out_shutdown; out_shutdown: /* Shut down serial port communication */ @@ -365,6 +368,45 @@ int buspirate_spi_init(void) spi_programmer_buspirate.command = buspirate_spi_send_command_v1; } + /* Increase PIC/FT232 UART speed to 2 Mbaud (instead of 115200 baud) in firmware 5.5 and newer. + * Although this is already possible in firmware 5.2, fast UART in combination with the old SPI + * command set causes hangs for bigger transactions. This is caused by a UART buffer overrun + * in the PIC, and all firmware versions up to (hopefully not including) 6.2 are affected. + */ + if (BP_FWVERSION(fw_version_major, fw_version_minor) >= BP_FWVERSION(5, 5)) { + // FIXME: Do this only for USB-based Bus Pirates... unless you're sure the UART can handle more. + int cmdlen; + /* Request setting the UART baud rate. */ + cmdlen = snprintf((char *)bp_commbuf, DEFAULT_BUFSIZE, "b\n"); + if ((ret = buspirate_sendrecv(bp_commbuf, cmdlen, 0))) + return ret; + if ((ret = buspirate_wait_for_string(bp_commbuf, ">"))) + return ret; + /* Request setting the UART clock divisor manually. */ + cmdlen = snprintf((char *)bp_commbuf, DEFAULT_BUFSIZE, "10\n"); + if ((ret = buspirate_sendrecv(bp_commbuf, cmdlen, 0))) + return ret; + if ((ret = buspirate_wait_for_string(bp_commbuf, ">"))) + return ret; + /* Set the UART clock divisor. New clock is 4000000/(divisor+1). */ + cmdlen = snprintf((char *)bp_commbuf, DEFAULT_BUFSIZE, "%i\n", 1); + if ((ret = buspirate_sendrecv(bp_commbuf, cmdlen, 0))) + return ret; + sleep(1); + if (serialport_config(sp_fd, 115200) != 0) + return 1; + bp_commbuf[0] = ' '; + if ((ret = buspirate_sendrecv(bp_commbuf, 1, 0))) + return ret; + if ((ret = buspirate_wait_for_string(bp_commbuf, "HiZ>"))) + return ret; + msg_pdbg("Using fast 2 Mbaud for Bus Pirate <-> host communication.\n"); + } else { + msg_pinfo("Bus Pirate firmware 5.4 and older does not support fast Bus Pirate <-> host " + "communication. Limiting UART speed to 115200 Baud.\n"); + msg_pinfo("It is recommended to upgrade to firmware 6.2 or newer.\n"); + } + /* Workaround for broken speed settings in firmware 6.1 and older. */ if (BP_FWVERSION(fw_version_major, fw_version_minor) < BP_FWVERSION(6, 2)) if (spispeed > 0x4) { -- Kind regards, Stefan Tauner

1 0

Re: [flashrom] [PATCH 0/7] Port serprog to Windows 2.0
by Stefan Tauner 01 Apr '13

01 Apr '13

On Thu, 3 Jan 2013 21:37:18 +0100 Stefan Tauner <stefan.tauner(a)student.tuwien.ac.at> wrote: > Developing cross-platform is great! > If you look at 1/7 and have to puke, please don't blame me. > I got the win32 calls right eventually and tested this with wine > and my serprog flasher (which uses serial over USB). > I repeat: I used serial over USB inside wine to talk serprog. haha. > Tests with programmers using serial.c (e.g. buspirate) on all platforms > warmly welcomed. > > Stefan Tauner (7): > serial.c: abstract system error printing. > serial.c: round baudrates to valid ones. > Replace sp_sync_read_timeout() with serialport_read_nonblock(). > Introduce serialport_write_nonblock(). > Replace native calls in serprog with wrapper calls. > serial.c: be more pedantic. > Enable serprog on Windows. Self-acked and committed in r1659 to r1665 after testing it on real windows too. -- Kind regards/Mit freundlichen Grüßen, Stefan Tauner

2 3

[PATCH] RFC: be extra pedantic about the chip being ready before issuing chip-modifying commands
by Stefan Tauner 01 Apr '13

01 Apr '13

This can dramatically reduce the wait time on failures in some cases: 1. issue erase command that never succeeds but times out eventually 2. whole flash gets reread due to the erase not erasing as expected 3. next eraser is issued and flashrom waits for it to finish, although the transaction is not even considered by the chip because it is still busy 4. whole chip gets reread... we also can not really be sure which erase opcode succeed (if it does eventuall) in this situation. this patch shows said pedantry for the at45db family (which has not been merged to svn as of this writing). if we want such a feature (which costs some performance in non-error cases!) i would suggest creating a is_ready function pointer in the struct flashchip to be called in the generic code path and note like in this patch. this might actually be a good idea anyway. i cant tell a useful use case off the top of my head, do you? Signed-off-by: Stefan Tauner <stefan.tauner(a)student.tuwien.ac.at> --- at45db.c | 16 ++++++++++++++-- 1 file changed, 14 insertions(+), 2 deletions(-) diff --git a/at45db.c b/at45db.c index 4ff25be..b41ec73 100644 --- a/at45db.c +++ b/at45db.c @@ -324,6 +324,12 @@ static int at45db_wait_ready (struct flashctx *flash, unsigned int us, unsigned static int at45db_erase(struct flashctx *flash, uint8_t opcode, unsigned int at45db_addr, unsigned int stepsize, unsigned int retries) { + int ret = at45db_wait_ready(flash, 0, 0); + if (ret != 0) { + msg_cerr("%s: chip not ready before sending erase command!\n", __func__); + return ret; + } + const uint8_t cmd[] = { opcode, (at45db_addr >> 16) & 0xff, @@ -332,7 +338,7 @@ static int at45db_erase(struct flashctx *flash, uint8_t opcode, unsigned int at4 }; /* Send erase command. */ - int ret = spi_send_command(flash, sizeof(cmd), 0, cmd, NULL); + ret = spi_send_command(flash, sizeof(cmd), 0, cmd, NULL); if (ret != 0) { msg_cerr("%s: error sending erase command!\n", __func__); return ret; @@ -496,6 +502,12 @@ static int at45db_fill_buffer1(struct flashctx *flash, uint8_t *bytes, unsigned static int at45db_commit_buffer1(struct flashctx *flash, unsigned int at45db_addr) { + int ret = at45db_wait_ready(flash, 0, 0); + if (ret != 0) { + msg_cerr("%s: chip not ready before sending (write) commit command!\n", __func__); + return ret; + } + const uint8_t cmd[] = { AT45DB_BUFFER1_PAGE_PROGRAM, (at45db_addr >> 16) & 0xff, @@ -504,7 +516,7 @@ static int at45db_commit_buffer1(struct flashctx *flash, unsigned int at45db_add }; /* Send buffer to device. */ - int ret = spi_send_command(flash, sizeof(cmd), 0, cmd, NULL); + ret = spi_send_command(flash, sizeof(cmd), 0, cmd, NULL); if (ret != 0) { msg_cerr("%s: error sending buffer to main memory command!\n", __func__); return ret; -- Kind regards, Stefan Tauner

1 0

[commit] r1665 - trunk
by repository service 31 Mar '13

31 Mar '13

Author: stefanct Date: Mon Apr 1 02:46:05 2013 New Revision: 1665 URL: http://flashrom.org/trac/flashrom/changeset/1665 Log: Enable serprog on Windows. Sockets are not ported (yet). Tested on Windows 7 with my Atmega32U2 serprog implementation. http://paste.flashrom.org/view.php?id=1566 Signed-off-by: Stefan Tauner <stefan.tauner(a)student.tuwien.ac.at> Signed-off-by: Idwer Vollering <vidwer(a)gmail.com> Acked-by: Stefan Tauner <stefan.tauner(a)student.tuwien.ac.at> Modified: trunk/Makefile trunk/serprog.c Modified: trunk/Makefile ============================================================================== --- trunk/Makefile Mon Apr 1 02:45:57 2013 (r1664) +++ trunk/Makefile Mon Apr 1 02:46:05 2013 (r1665) @@ -143,12 +143,6 @@ # libusb-win32/libftdi stuff is usually installed in /usr/local. CPPFLAGS += -I/usr/local/include LDFLAGS += -L/usr/local/lib -# Serprog is not supported under Windows/MinGW (missing sockets support). -ifeq ($(CONFIG_SERPROG), yes) -UNSUPPORTED_FEATURES += CONFIG_SERPROG=yes -else -override CONFIG_SERPROG = no -endif # For now we disable all PCI-based programmers on Windows/MinGW (no libpci). ifeq ($(CONFIG_INTERNAL), yes) UNSUPPORTED_FEATURES += CONFIG_INTERNAL=yes @@ -334,7 +328,7 @@ # Always enable internal/onboard support for now. CONFIG_INTERNAL ?= yes -# Always enable serprog for now. Needs to be disabled on Windows. +# Always enable serprog for now. CONFIG_SERPROG ?= yes # RayeR SPIPGM hardware support Modified: trunk/serprog.c ============================================================================== --- trunk/serprog.c Mon Apr 1 02:45:57 2013 (r1664) +++ trunk/serprog.c Mon Apr 1 02:46:05 2013 (r1665) @@ -20,21 +20,23 @@ */ #include <stdio.h> +#ifndef _WIN32 /* stuff (presumably) needed for sockets only */ #include <stdlib.h> #include <unistd.h> -#include <strings.h> -#include <string.h> -#include <ctype.h> #include <fcntl.h> #include <sys/socket.h> #include <arpa/inet.h> #include <netinet/in.h> #include <netinet/tcp.h> #include <netdb.h> -#include <sys/stat.h> -#include <errno.h> -#include <inttypes.h> +#endif +#ifdef _WIN32 +#include <conio.h> +#else #include <termios.h> +#endif +#include <string.h> +#include <errno.h> #include "flash.h" #include "programmer.h" #include "chipdrivers.h" @@ -81,6 +83,7 @@ whether the command is supported before doing it */ static int sp_check_avail_automatic = 0; +#ifndef WIN32 static int sp_opensocket(char *ip, unsigned int port) { int flag = 1; @@ -114,6 +117,7 @@ setsockopt(sock, IPPROTO_TCP, TCP_NODELAY, &flag, sizeof(int)); return sock; } +#endif /* Synchronize: a bit tricky algorithm that tries to (and in my tests has * * always succeeded in) bring the serial protocol to known waiting-for- * @@ -351,6 +355,7 @@ } free(device); +#ifndef _WIN32 device = extract_programmer_param("ip"); if (have_device && device) { msg_perr("Error: Both host and device specified.\n" @@ -394,6 +399,7 @@ "flashrom -p serprog:ip=ipaddr:port\n"); return 1; } +#endif if (register_shutdown(serprog_shutdown, NULL)) return 1;

1 0

[commit] r1664 - trunk
by repository service 31 Mar '13

31 Mar '13

Author: stefanct Date: Mon Apr 1 02:45:57 2013 New Revision: 1664 URL: http://flashrom.org/trac/flashrom/changeset/1664 Log: serial.c: be more pedantic. Check more return codes and close the file handle in case of errors in sp_openserport(). 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/serial.c Modified: trunk/serial.c ============================================================================== --- trunk/serial.c Mon Apr 1 02:45:51 2013 (r1663) +++ trunk/serial.c Mon Apr 1 02:45:57 2013 (r1664) @@ -185,8 +185,8 @@ } DCB dcb; if (!GetCommState(fd, &dcb)) { - msg_perr_strerror("Could not fetch serial port configuration: "); - return SER_INV_FD; + msg_perr_strerror("Could not fetch original serial port configuration: "); + goto out_close; } const struct baudentry *entry = round_baud(baud); dcb.BaudRate = entry->baud; @@ -195,16 +195,19 @@ dcb.StopBits = ONESTOPBIT; if (!SetCommState(fd, &dcb)) { msg_perr_strerror("Could not change serial port configuration: "); - return SER_INV_FD; + goto out_close; } if (!GetCommState(fd, &dcb)) { - msg_perr_strerror("Could not fetch serial port configuration: "); - return SER_INV_FD; + msg_perr_strerror("Could not fetch new serial port configuration: "); + goto out_close; } msg_pdbg("Baud rate is %ld.\n", dcb.BaudRate); return fd; +out_close: + CloseHandle(sp_fd); + return SER_INV_FD; #else - struct termios options; + struct termios wanted, observed; int fd; fd = open(dev, O_RDWR | O_NOCTTY | O_NDELAY); if (fd < 0) { @@ -212,18 +215,43 @@ return SER_INV_FD; } fcntl(fd, F_SETFL, 0); - tcgetattr(fd, &options); + if (tcgetattr(fd, &observed) != 0) { + msg_perr_strerror("Could not fetch original serial port configuration: "); + goto out_close; + } + wanted = observed; const struct baudentry *entry = round_baud(baud); - cfsetispeed(&options, entry->flag); - cfsetospeed(&options, entry->flag); - msg_pdbg("Setting baud rate to %d.\n", entry->baud); - options.c_cflag &= ~(PARENB | CSTOPB | CSIZE | CRTSCTS); - options.c_cflag |= (CS8 | CLOCAL | CREAD); - options.c_lflag &= ~(ICANON | ECHO | ECHOE | ISIG); - options.c_iflag &= ~(IXON | IXOFF | IXANY | ICRNL | IGNCR | INLCR); - options.c_oflag &= ~OPOST; - tcsetattr(fd, TCSANOW, &options); + if (cfsetispeed(&wanted, entry->flag) != 0 || cfsetospeed(&wanted, entry->flag) != 0) { + msg_perr_strerror("Could not set serial baud rate: "); + goto out_close; + } + wanted.c_cflag &= ~(PARENB | CSTOPB | CSIZE | CRTSCTS); + wanted.c_cflag |= (CS8 | CLOCAL | CREAD); + wanted.c_lflag &= ~(ICANON | ECHO | ECHOE | ISIG); + wanted.c_iflag &= ~(IXON | IXOFF | IXANY | ICRNL | IGNCR | INLCR); + wanted.c_oflag &= ~OPOST; + if (tcsetattr(fd, TCSANOW, &wanted) != 0) { + msg_perr_strerror("Could not change serial port configuration: "); + goto out_close; + } + if (tcgetattr(fd, &observed) != 0) { + msg_perr_strerror("Could not fetch new serial port configuration: "); + goto out_close; + } + if (observed.c_cflag != wanted.c_cflag || + observed.c_lflag != wanted.c_lflag || + observed.c_iflag != wanted.c_iflag || + observed.c_oflag != wanted.c_oflag || + cfgetispeed(&observed) != cfgetispeed(&wanted)) { + msg_perr("%s: Some requested options did not stick.\n", __func__); + goto out_close; + } + msg_pdbg("Baud rate is %d.\n", entry->baud); return fd; + +out_close: + close(sp_fd); + return SER_INV_FD; #endif }

1 0

[commit] r1663 - trunk
by repository service 31 Mar '13

31 Mar '13

Author: stefanct Date: Mon Apr 1 02:45:51 2013 New Revision: 1663 URL: http://flashrom.org/trac/flashrom/changeset/1663 Log: Replace native calls in serprog with wrapper calls. read(), write(), usleep() are replaced. Signed-off-by: Stefan Tauner <stefan.tauner(a)student.tuwien.ac.at> Signed-off-by: Idwer Vollering <vidwer(a)gmail.com> Acked-by: Stefan Tauner <stefan.tauner(a)student.tuwien.ac.at> Modified: trunk/serial.c trunk/serprog.c Modified: trunk/serial.c ============================================================================== --- trunk/serial.c Mon Apr 1 02:45:45 2013 (r1662) +++ trunk/serial.c Mon Apr 1 02:45:51 2013 (r1663) @@ -354,7 +354,7 @@ return 1; } if (!tmp) - msg_pdbg("Empty read\n"); + msg_pdbg2("Empty read\n"); readcnt -= tmp; buf += tmp; } Modified: trunk/serprog.c ============================================================================== --- trunk/serprog.c Mon Apr 1 02:45:45 2013 (r1662) +++ trunk/serprog.c Mon Apr 1 02:45:51 2013 (r1663) @@ -133,7 +133,7 @@ goto err_out; } /* A second should be enough to get all the answers to the buffer */ - usleep(1000 * 1000); + internal_delay(1000 * 1000); sp_flush_incoming(); /* Then try up to 8 times to send syncnop and get the correct special * @@ -206,15 +206,15 @@ unsigned char c; if (sp_automatic_cmdcheck(command)) return 1; - if (write(sp_fd, &command, 1) != 1) { + if (serialport_write(&command, 1) != 0) { msg_perr("Error: cannot write op code: %s\n", strerror(errno)); return 1; } - if (write(sp_fd, params, parmlen) != (parmlen)) { + if (serialport_write(params, parmlen) != 0) { msg_perr("Error: cannot write parameters: %s\n", strerror(errno)); return 1; } - if (read(sp_fd, &c, 1) != 1) { + if (serialport_read(&c, 1) != 0) { msg_perr("Error: cannot read from device: %s\n", strerror(errno)); return 1; } @@ -225,17 +225,10 @@ return 1; } if (retlen) { - int rd_bytes = 0; - do { - int r; - r = read(sp_fd, retparms + rd_bytes, - retlen - rd_bytes); - if (r <= 0) { - msg_perr("Error: cannot read return parameters: %s\n", strerror(errno)); - return 1; - } - rd_bytes += r; - } while (rd_bytes != retlen); + if (serialport_read(retparms, retlen) != 0) { + msg_perr("Error: cannot read return parameters: %s\n", strerror(errno)); + return 1; + } } return 0; } @@ -245,7 +238,7 @@ if (sp_streamed_transmit_ops) do { unsigned char c; - if (read(sp_fd, &c, 1) != 1) { + if (serialport_read(&c, 1) != 0) { sp_die("Error: cannot read from device (flushing stream)"); } if (c == S_NAK) { @@ -272,7 +265,7 @@ memcpy(&(sp[1]), parms, parmlen); if (sp_streamed_transmit_bytes >= (1 + parmlen + sp_device_serbuf_size)) sp_flush_stream(); - if (write(sp_fd, sp, 1 + parmlen) != (1 + parmlen)) + if (serialport_write(sp, 1 + parmlen) != 0) sp_die("Error: cannot write command"); free(sp); sp_streamed_transmit_ops += 1; @@ -685,10 +678,9 @@ header[4] = (sp_write_n_addr >> 0) & 0xFF; header[5] = (sp_write_n_addr >> 8) & 0xFF; header[6] = (sp_write_n_addr >> 16) & 0xFF; - if (write(sp_fd, header, 7) != 7) + if (serialport_write(header, 7) != 0) sp_die("Error: cannot write write-n command\n"); - if (write(sp_fd, sp_write_n_buf, sp_write_n_bytes) != - sp_write_n_bytes) + if (serialport_write(sp_write_n_buf, sp_write_n_bytes) != 0) sp_die("Error: cannot write write-n data"); sp_streamed_transmit_bytes += 7 + sp_write_n_bytes; sp_streamed_transmit_ops += 1; @@ -789,7 +781,7 @@ buf[2] = ((addr >> 16) & 0xFF); sp_stream_buffer_op(S_CMD_R_BYTE, 3, buf); sp_flush_stream(); - if (read(sp_fd, &c, 1) != 1) + if (serialport_read(&c, 1) != 0) sp_die("readb byteread"); msg_pspew("%s addr=0x%lx returning 0x%02X\n", __func__, addr, c); return c; @@ -798,7 +790,6 @@ /* Local version that really does the job, doesn't care of max_read_n. */ static void sp_do_read_n(uint8_t * buf, const chipaddr addr, size_t len) { - int rd_bytes = 0; unsigned char sbuf[6]; msg_pspew("%s: addr=0x%lx len=%lu\n", __func__, addr, (unsigned long)len); /* Stream the read-n -- as above. */ @@ -812,12 +803,8 @@ sbuf[5] = ((len >> 16) & 0xFF); sp_stream_buffer_op(S_CMD_R_NBYTES, 6, sbuf); sp_flush_stream(); - do { - int r = read(sp_fd, buf + rd_bytes, len - rd_bytes); - if (r <= 0) - sp_die("Error: cannot read read-n data"); - rd_bytes += r; - } while (rd_bytes != len); + if (serialport_read(buf, len) != 0) + sp_die("Error: cannot read read-n data"); return; }

1 0

[commit] r1662 - trunk
by repository service 31 Mar '13

31 Mar '13

Author: stefanct Date: Mon Apr 1 02:45:45 2013 New Revision: 1662 URL: http://flashrom.org/trac/flashrom/changeset/1662 Log: Introduce serialport_write_nonblock(). It seems useful to have a generic and platform-independent method to read and write to a serial port without blocking. This is the write part. This allows to get rid of the explicit temporary disabling of blocking I/O in serprog's sp_synchronize(). 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/programmer.h trunk/serial.c trunk/serprog.c Modified: trunk/programmer.h ============================================================================== --- trunk/programmer.h Mon Apr 1 02:45:38 2013 (r1661) +++ trunk/programmer.h Mon Apr 1 02:45:45 2013 (r1662) @@ -660,6 +660,7 @@ /* expose serialport_shutdown as it's currently used by buspirate */ int serialport_shutdown(void *data); int serialport_write(unsigned char *buf, unsigned int writecnt); +int serialport_write_nonblock(unsigned char *buf, unsigned int writecnt, unsigned int timeout, unsigned int *really_wrote); int serialport_read(unsigned char *buf, unsigned int readcnt); int serialport_read_nonblock(unsigned char *c, unsigned int readcnt, unsigned int timeout, unsigned int *really_read); Modified: trunk/serial.c ============================================================================== --- trunk/serial.c Mon Apr 1 02:45:38 2013 (r1661) +++ trunk/serial.c Mon Apr 1 02:45:45 2013 (r1662) @@ -431,3 +431,75 @@ } return ret; } + +/* Tries up to timeout ms to write writecnt characters from the array starting at buf. Returns + * 0 on success, positive values on temporary errors (e.g. timeouts) and negative ones on permanent errors. + * If really_wrote is not NULL, this function sets its contents to the number of bytes written successfully. */ +int serialport_write_nonblock(unsigned char *buf, unsigned int writecnt, unsigned int timeout, unsigned int *really_wrote) +{ + int ret = 1; + /* disable blocked i/o and declare platform-specific variables */ +#ifdef _WIN32 + DWORD rv; + COMMTIMEOUTS oldTimeout; + COMMTIMEOUTS newTimeout = { + .ReadIntervalTimeout = MAXDWORD, + .ReadTotalTimeoutMultiplier = 0, + .ReadTotalTimeoutConstant = 0, + .WriteTotalTimeoutMultiplier = 0, + .WriteTotalTimeoutConstant = 0 + }; + if(!GetCommTimeouts(sp_fd, &oldTimeout)) { + msg_perr_strerror("Could not get serial port timeout settings: "); + return -1; + } + if(!SetCommTimeouts(sp_fd, &newTimeout)) { + msg_perr_strerror("Could not set serial port timeout settings: "); + return -1; + } +#else + ssize_t rv; + const int flags = fcntl(sp_fd, F_GETFL); + fcntl(sp_fd, F_SETFL, flags | O_NONBLOCK); +#endif + + int i; + int wr_bytes = 0; + for (i = 0; i < timeout; i++) { + msg_pspew("writecnt %d wr_bytes %d\n", writecnt, wr_bytes); +#ifdef _WIN32 + WriteFile(sp_fd, buf + wr_bytes, writecnt - wr_bytes, &rv, NULL); + msg_pspew("wrote %lu bytes\n", rv); +#else + rv = write(sp_fd, buf + wr_bytes, writecnt - wr_bytes); + msg_pspew("wrote %zd bytes\n", rv); +#endif + if ((rv == -1) && (errno != EAGAIN)) { + msg_perr_strerror("Serial port write error: "); + ret = -1; + break; + } + if (rv > 0) { + wr_bytes += rv; + if (wr_bytes == writecnt) { + msg_pspew("write successful\n"); + ret = 0; + break; + } + } + internal_delay(1000); /* 1ms units */ + } + if (really_wrote != NULL) + *really_wrote = wr_bytes; + + /* restore original blocking behavior */ +#ifdef _WIN32 + if (!SetCommTimeouts(sp_fd, &oldTimeout)) { + msg_perr_strerror("Could not restore serial port timeout settings: "); +#else + if (fcntl(sp_fd, F_SETFL, flags) != 0) { +#endif + return -1; + } + return ret; +} Modified: trunk/serprog.c ============================================================================== --- trunk/serprog.c Mon Apr 1 02:45:38 2013 (r1661) +++ trunk/serprog.c Mon Apr 1 02:45:45 2013 (r1662) @@ -117,23 +117,19 @@ /* Synchronize: a bit tricky algorithm that tries to (and in my tests has * * always succeeded in) bring the serial protocol to known waiting-for- * - * command state - uses nonblocking read - rest of the driver uses * + * command state - uses nonblocking I/O - rest of the driver uses * * blocking read - TODO: add an alarm() timer for the rest of the app on * * serial operations, though not such a big issue as the first thing to * * do is synchronize (eg. check that device is alive). */ static int sp_synchronize(void) { int i; - int flags = fcntl(sp_fd, F_GETFL); unsigned char buf[8]; - flags |= O_NONBLOCK; - fcntl(sp_fd, F_SETFL, flags); /* First sends 8 NOPs, then flushes the return data - should cause * * the device serial parser to get to a sane state, unless if it * * is waiting for a real long write-n. */ memset(buf, S_CMD_NOP, 8); - if (write(sp_fd, buf, 8) != 8) { - msg_perr("flush write: %s\n", strerror(errno)); + if (serialport_write_nonblock(buf, 8, 1, NULL) != 0) { goto err_out; } /* A second should be enough to get all the answers to the buffer */ @@ -147,8 +143,7 @@ for (i = 0; i < 8; i++) { int n; unsigned char c = S_CMD_SYNCNOP; - if (write(sp_fd, &c, 1) != 1) { - msg_perr("sync write: %s\n", strerror(errno)); + if (serialport_write_nonblock(&c, 1, 1, NULL) != 0) { goto err_out; } msg_pdbg("."); @@ -165,9 +160,8 @@ if (ret > 0 || c != S_ACK) continue; c = S_CMD_SYNCNOP; - if (write(sp_fd, &c, 1) != 1) { - msg_perr("sync write: %s\n", strerror(errno)); - return 1; + if (serialport_write_nonblock(&c, 1, 1, NULL) != 0) { + goto err_out; } ret = serialport_read_nonblock(&c, 1, 500, NULL); if (ret < 0) @@ -179,9 +173,6 @@ goto err_out; if (c != S_ACK) break; /* fail */ - /* Ok, synchronized; back to blocking reads and return. */ - flags &= ~O_NONBLOCK; - fcntl(sp_fd, F_SETFL, flags); msg_pdbg("\n"); return 0; }

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

flashrom