flashrom April 2013

flashrom@flashrom.org

36 participants
119 discussions

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

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

31 Mar '13

Author: stefanct Date: Mon Apr 1 02:45:38 2013 New Revision: 1661 URL: http://flashrom.org/trac/flashrom/changeset/1661 Log: Replace sp_sync_read_timeout() with serialport_read_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 read part. It stores the current blocking properties before disabling blocking and restores them after reading. The timeout is implemented as previously by retrying every millisecond until the timeout is reached or enough characters are available. 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:32 2013 (r1660) +++ trunk/programmer.h Mon Apr 1 02:45:38 2013 (r1661) @@ -661,6 +661,7 @@ int serialport_shutdown(void *data); int serialport_write(unsigned char *buf, unsigned int writecnt); 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); /* Serial port/pin mapping: Modified: trunk/serial.c ============================================================================== --- trunk/serial.c Mon Apr 1 02:45:32 2013 (r1660) +++ trunk/serial.c Mon Apr 1 02:45:38 2013 (r1661) @@ -361,3 +361,73 @@ return 0; } + +/* 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. */ +int serialport_read_nonblock(unsigned char *c, unsigned int readcnt, unsigned int timeout, unsigned int *really_read) +{ + 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)) { +#else + ssize_t rv; + const int flags = fcntl(sp_fd, F_GETFL); + if (fcntl(sp_fd, F_SETFL, flags | O_NONBLOCK) != 0) { +#endif + msg_perr_strerror("Could not set serial port timeout settings %s"); + return -1; + } + + int i; + int rd_bytes = 0; + for (i = 0; i < timeout; i++) { + msg_pspew("readcnt %d rd_bytes %d\n", readcnt, rd_bytes); +#ifdef _WIN32 + ReadFile(sp_fd, c + rd_bytes, readcnt - rd_bytes, &rv, NULL); + msg_pspew("read %lu bytes\n", rv); +#else + rv = read(sp_fd, c + rd_bytes, readcnt - rd_bytes); + msg_pspew("read %zd bytes\n", rv); +#endif + if ((rv == -1) && (errno != EAGAIN)) { + msg_perr_strerror("Serial port read error: "); + ret = -1; + break; + } + if (rv > 0) + rd_bytes += rv; + if (rd_bytes == readcnt) { + ret = 0; + break; + } + internal_delay(1000); /* 1ms units */ + } + if (really_read != NULL) + *really_read = rd_bytes; + + /* restore original blocking behavior */ +#ifdef _WIN32 + if (!SetCommTimeouts(sp_fd, &oldTimeout)) { +#else + if (fcntl(sp_fd, F_SETFL, flags) != 0) { +#endif + msg_perr_strerror("Could not restore serial port timeout settings: %s\n"); + ret = -1; + } + return ret; +} Modified: trunk/serprog.c ============================================================================== --- trunk/serprog.c Mon Apr 1 02:45:32 2013 (r1660) +++ trunk/serprog.c Mon Apr 1 02:45:38 2013 (r1661) @@ -115,26 +115,6 @@ return sock; } -/* Returns 0 on success and places the character read into the location pointed to by c. - * Returns positive values on temporary errors and negative ones on permanent errors. - * An iteration of one loop takes up to 1ms. */ -static int sp_sync_read_timeout(unsigned int loops, unsigned char *c) -{ - int i; - for (i = 0; i < loops; i++) { - ssize_t rv; - rv = read(sp_fd, c, 1); - if (rv == 1) - return 0; - if ((rv == -1) && (errno != EAGAIN)) { - msg_perr("read: %s\n", strerror(errno)); - return -1; - } - usleep(1000); /* 1ms units */ - } - return 1; -} - /* 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 * @@ -174,12 +154,12 @@ msg_pdbg("."); fflush(stdout); for (n = 0; n < 10; n++) { - int ret = sp_sync_read_timeout(50, &c); + int ret = serialport_read_nonblock(&c, 1, 50, NULL); if (ret < 0) goto err_out; if (ret > 0 || c != S_NAK) continue; - ret = sp_sync_read_timeout(20, &c); + ret = serialport_read_nonblock(&c, 1, 20, NULL); if (ret < 0) goto err_out; if (ret > 0 || c != S_ACK) @@ -189,12 +169,12 @@ msg_perr("sync write: %s\n", strerror(errno)); return 1; } - ret = sp_sync_read_timeout(500, &c); + ret = serialport_read_nonblock(&c, 1, 500, NULL); if (ret < 0) goto err_out; if (ret > 0 || c != S_NAK) break; /* fail */ - ret = sp_sync_read_timeout(100, &c); + ret = serialport_read_nonblock(&c, 1, 100, NULL); if (ret > 0 || ret < 0) goto err_out; if (c != S_ACK)

1 0

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

31 Mar '13

Author: stefanct Date: Mon Apr 1 02:45:32 2013 New Revision: 1660 URL: http://flashrom.org/trac/flashrom/changeset/1660 Log: serial.c: round baudrates to valid ones. MSDN says: "The baud rate at which the communications device operates. This member can be an actual baud rate value, or one of the following indexes." But it is not specified what happens for different values, so we round down to valid ones (or to the minimum of 9600) by reusing the existing struct baudentry sp_baudtable[] and the new function round_baud(). Do similarly on non-Windows where arbitrary values are not allowed anyway. 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:08 2013 (r1659) +++ trunk/serial.c Mon Apr 1 02:45:32 2013 (r1660) @@ -47,62 +47,95 @@ exit(1); } -#ifndef _WIN32 +#ifdef _WIN32 +struct baudentry { + DWORD flag; + unsigned int baud; +}; +#define BAUDENTRY(baud) { CBR_##baud, baud }, +#else struct baudentry { int flag; unsigned int baud; }; - -/* I'd like if the C preprocessor could have directives in macros */ #define BAUDENTRY(baud) { B##baud, baud }, +#endif + +/* I'd like if the C preprocessor could have directives in macros. + * See TERMIOS(3) and http://msdn.microsoft.com/en-us/library/windows/desktop/aa363214(v=vs.85).a… and + * http://git.kernel.org/?p=linux/kernel/git/torvalds/linux.git;a=blob;f=inclu… */ static const struct baudentry sp_baudtable[] = { - BAUDENTRY(9600) + BAUDENTRY(9600) /* unconditional default */ +#if defined(B19200) || defined(CBR_19200) BAUDENTRY(19200) +#endif +#if defined(B38400) || defined(CBR_38400) BAUDENTRY(38400) +#endif +#if defined(B57600) || defined(CBR_57600) BAUDENTRY(57600) +#endif +#if defined(B115200) || defined(CBR_115200) BAUDENTRY(115200) -#ifdef B230400 +#endif +#if defined(B230400) || defined(CBR_230400) BAUDENTRY(230400) #endif -#ifdef B460800 +#if defined(B460800) || defined(CBR_460800) BAUDENTRY(460800) #endif -#ifdef B500000 +#if defined(B500000) || defined(CBR_500000) BAUDENTRY(500000) #endif -#ifdef B576000 +#if defined(B576000) || defined(CBR_576000) BAUDENTRY(576000) #endif -#ifdef B921600 +#if defined(B921600) || defined(CBR_921600) BAUDENTRY(921600) #endif -#ifdef B1000000 +#if defined(B1000000) || defined(CBR_1000000) BAUDENTRY(1000000) #endif -#ifdef B1152000 +#if defined(B1152000) || defined(CBR_1152000) BAUDENTRY(1152000) #endif -#ifdef B1500000 +#if defined(B1500000) || defined(CBR_1500000) BAUDENTRY(1500000) #endif -#ifdef B2000000 +#if defined(B2000000) || defined(CBR_2000000) BAUDENTRY(2000000) #endif -#ifdef B2500000 +#if defined(B2500000) || defined(CBR_2500000) BAUDENTRY(2500000) #endif -#ifdef B3000000 +#if defined(B3000000) || defined(CBR_3000000) BAUDENTRY(3000000) #endif -#ifdef B3500000 +#if defined(B3500000) || defined(CBR_3500000) BAUDENTRY(3500000) #endif -#ifdef B4000000 +#if defined(B4000000) || defined(CBR_4000000) BAUDENTRY(4000000) #endif {0, 0} /* Terminator */ }; -#endif + +const struct baudentry *round_baud(unsigned int baud) +{ + int i; + /* Round baud rate to next lower entry in sp_baudtable if it exists, else use the lowest entry. */ + for (i = ARRAY_SIZE(sp_baudtable) - 2; i >= 0 ; i--) { + if (sp_baudtable[i].baud == baud) + return &sp_baudtable[i]; + + if (sp_baudtable[i].baud < baud) { + msg_pinfo("Warning: given baudrate %d rounded down to %d.\n", + baud, sp_baudtable[i].baud); + return &sp_baudtable[i]; + } + } + return &sp_baudtable[0]; +} /* Uses msg_perr to print the last system error. * Prints "Error: " followed first by \c msg and then by the description of the last error retrieved via @@ -155,15 +188,8 @@ msg_perr_strerror("Could not fetch serial port configuration: "); return SER_INV_FD; } - switch (baud) { - case 9600: dcb.BaudRate = CBR_9600; break; - case 19200: dcb.BaudRate = CBR_19200; break; - case 38400: dcb.BaudRate = CBR_38400; break; - case 57600: dcb.BaudRate = CBR_57600; break; - case 115200: dcb.BaudRate = CBR_115200; break; - default: msg_perr("Error: Could not set baud rate: %s\n", strerror(errno)); - return SER_INV_FD; - } + const struct baudentry *entry = round_baud(baud); + dcb.BaudRate = entry->baud; dcb.ByteSize = 8; dcb.Parity = NOPARITY; dcb.StopBits = ONESTOPBIT; @@ -171,10 +197,15 @@ msg_perr_strerror("Could not change serial port configuration: "); return SER_INV_FD; } + if (!GetCommState(fd, &dcb)) { + msg_perr_strerror("Could not fetch serial port configuration: "); + return SER_INV_FD; + } + msg_pdbg("Baud rate is %ld.\n", dcb.BaudRate); return fd; #else struct termios options; - int fd, i; + int fd; fd = open(dev, O_RDWR | O_NOCTTY | O_NDELAY); if (fd < 0) { msg_perr_strerror("Cannot open serial port: "); @@ -182,18 +213,10 @@ } fcntl(fd, F_SETFL, 0); tcgetattr(fd, &options); - for (i = 0;; i++) { - if (sp_baudtable[i].baud == 0) { - close(fd); - msg_perr("Error: cannot configure for baudrate %d\n", baud); - return SER_INV_FD; - } - if (sp_baudtable[i].baud == baud) { - cfsetispeed(&options, sp_baudtable[i].flag); - cfsetospeed(&options, sp_baudtable[i].flag); - break; - } - } + 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);

1 0

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

31 Mar '13

Author: stefanct Date: Mon Apr 1 02:45:08 2013 New Revision: 1659 URL: http://flashrom.org/trac/flashrom/changeset/1659 Log: serial.c: abstract system error printing. Windows is awkward. The win32 API does not support errno/strerror as one might expect. Introduce a new msg_* function that alleviates the pain a bit (my head still hurts very badly). 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 Wed Mar 27 14:00:23 2013 (r1658) +++ trunk/serial.c Mon Apr 1 02:45:08 2013 (r1659) @@ -104,17 +104,39 @@ }; #endif +/* Uses msg_perr to print the last system error. + * Prints "Error: " followed first by \c msg and then by the description of the last error retrieved via + * strerror() or FormatMessage() and ending with a linebreak. */ +static void msg_perr_strerror(const char *msg) +{ + msg_perr("Error: %s", msg); +#ifdef _WIN32 + char *lpMsgBuf; + DWORD nErr = GetLastError(); + FormatMessage(FORMAT_MESSAGE_ALLOCATE_BUFFER | FORMAT_MESSAGE_FROM_SYSTEM, NULL, nErr, + MAKELANGID(LANG_NEUTRAL, SUBLANG_DEFAULT), (LPTSTR) &lpMsgBuf, 0, NULL); + msg_perr(lpMsgBuf); + /* At least some formatted messages contain a line break at the end. Make sure to always print one */ + if (lpMsgBuf[strlen(lpMsgBuf)-1] != '\n') + msg_perr("\n"); + LocalFree(lpMsgBuf); +#else + msg_perr("%s\n", strerror(errno)); +#endif +} + fdtype sp_openserport(char *dev, unsigned int baud) { #ifdef _WIN32 HANDLE fd; char *dev2 = dev; - if ((strlen(dev) > 3) && (tolower((unsigned char)dev[0]) == 'c') && + 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("Error: Out of memory: %s\n", strerror(errno)); + msg_perr_strerror("Out of memory: "); return SER_INV_FD; } strcpy(dev2, "\\\\.\\"); @@ -125,12 +147,12 @@ if (dev2 != dev) free(dev2); if (fd == INVALID_HANDLE_VALUE) { - msg_perr("Error: cannot open serial port: %s\n", strerror(errno)); + msg_perr_strerror("Cannot open serial port: "); return SER_INV_FD; } DCB dcb; if (!GetCommState(fd, &dcb)) { - msg_perr("Error: Could not fetch serial port configuration: %s\n", strerror(errno)); + msg_perr_strerror("Could not fetch serial port configuration: "); return SER_INV_FD; } switch (baud) { @@ -146,7 +168,7 @@ dcb.Parity = NOPARITY; dcb.StopBits = ONESTOPBIT; if (!SetCommState(fd, &dcb)) { - msg_perr("Error: Could not change serial port configuration: %s\n", strerror(errno)); + msg_perr_strerror("Could not change serial port configuration: "); return SER_INV_FD; } return fd; @@ -155,7 +177,7 @@ int fd, i; fd = open(dev, O_RDWR | O_NOCTTY | O_NDELAY); if (fd < 0) { - msg_perr("Error: cannot open serial port: %s\n", strerror(errno)); + msg_perr_strerror("Cannot open serial port: "); return SER_INV_FD; } fcntl(fd, F_SETFL, 0);

1 0

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

flashrom April 2013