flashrom January 2016

flashrom@flashrom.org

37 participants
98 discussions

[commit] r1907 - trunk
by repository service 03 Jan '16

03 Jan '16

Author: stefanct Date: Mon Jan 4 04:05:15 2016 New Revision: 1907 URL: http://flashrom.org/trac/flashrom/changeset/1907 Log: serprog: allow to omit specifying a baud rate. On USB-based serial connections (VCP) the requested baud rate usually does not matter (much). Remove the arbitrary restriction and use whatever default values the OS/hardware provides. Signed-off-by: Stefan Tauner <stefan.tauner(a)alumni.tuwien.ac.at> Acked-by: Urja Rannikko <urjaman(a)gmail.com> Modified: trunk/flashrom.8.tmpl trunk/programmer.h trunk/serial.c trunk/serprog.c Modified: trunk/flashrom.8.tmpl ============================================================================== --- trunk/flashrom.8.tmpl Mon Jan 4 04:05:06 2016 (r1906) +++ trunk/flashrom.8.tmpl Mon Jan 4 04:05:15 2016 (r1907) @@ -203,10 +203,9 @@ Olimex ARM-USB-TINY/-H, Olimex ARM-USB-OCD/-H, TIAO/DIYGADGET USB Multi-Protocol Adapter (TUMPA), TUMPA Lite, and GOEPEL PicoTAP. .sp -.BR "* serprog" " (for flash ROMs attached to a programmer speaking serprog), \ -including AVR flasher by Urja Rannikko, AVR flasher by eightdot, \ -Arduino Mega flasher by fritz, InSystemFlasher by Juhana Helovuo, and \ -atmegaXXu2-flasher by Stefan Tauner." +.BR "* serprog" " (for flash ROMs attached to a programmer speaking serprog, \ +including Arduino-based devices as well as various programmers by Urja Rannikko, \ +Juhana Helovuo, Stefan Tauner and others)." .sp .BR "* buspirate_spi" " (for SPI flash ROMs attached to a Bus Pirate)" .sp @@ -683,19 +682,22 @@ syntax. .SS .BR "serprog " programmer -A mandatory parameter specifies either a serial -device/baud combination or an IP/port combination for communication with the -programmer. In the device/baud combination, the device has to start with a -slash. For serial, you have to use the +A mandatory parameter specifies either a serial device (and baud rate) or an IP/port combination for +communicating with the programmer. +The device/baud combination has to start with +.B dev= +and separate the optional baud rate with a colon. +For example .sp -.B " flashrom \-p serprog:dev=/dev/device:baud" +.B " flashrom \-p serprog:dev=/dev/ttyS0:115200" .sp -syntax and for IP, you have to use +If no baud rate is given the default values by the operating system/hardware will be used. +For IP connections you have to use the .sp .B " flashrom \-p serprog:ip=ipaddr:port" .sp -instead. In case the device supports it, you can set the SPI clock frequency -with the optional +syntax. +In case the device supports it, you can set the SPI clock frequency with the optional .B spispeed parameter. The frequency is parsed as hertz, unless an .BR M ", or " k Modified: trunk/programmer.h ============================================================================== --- trunk/programmer.h Mon Jan 4 04:05:06 2016 (r1906) +++ trunk/programmer.h Mon Jan 4 04:05:15 2016 (r1907) @@ -719,10 +719,8 @@ #endif void sp_flush_incoming(void); -fdtype sp_openserport(char *dev, unsigned int baud); -int serialport_config(fdtype fd, unsigned int baud); +fdtype sp_openserport(char *dev, int baud); extern fdtype sp_fd; -/* expose serialport_shutdown as it's currently used by buspirate */ int serialport_shutdown(void *data); int serialport_write(const unsigned char *buf, unsigned int writecnt); int serialport_write_nonblock(const unsigned char *buf, unsigned int writecnt, unsigned int timeout, unsigned int *really_wrote); Modified: trunk/serial.c ============================================================================== --- trunk/serial.c Mon Jan 4 04:05:06 2016 (r1906) +++ trunk/serial.c Mon Jan 4 04:05:15 2016 (r1907) @@ -116,7 +116,7 @@ {0, 0} /* Terminator */ }; -const struct baudentry *round_baud(unsigned int baud) +static 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. */ @@ -125,11 +125,12 @@ return &sp_baudtable[i]; if (sp_baudtable[i].baud < baud) { - msg_pinfo("Warning: given baudrate %d rounded down to %d.\n", + msg_pwarn("Warning: given baudrate %d rounded down to %d.\n", baud, sp_baudtable[i].baud); return &sp_baudtable[i]; } } + msg_pinfo("Using slowest possible baudrate: %d.\n", sp_baudtable[0].baud); return &sp_baudtable[0]; } @@ -154,7 +155,7 @@ #endif } -int serialport_config(fdtype fd, unsigned int baud) +int serialport_config(fdtype fd, int baud) { if (fd == SER_INV_FD) { msg_perr("%s: File descriptor is invalid.\n", __func__); @@ -167,8 +168,10 @@ msg_perr_strerror("Could not fetch original serial port configuration: "); return 1; } - const struct baudentry *entry = round_baud(baud); - dcb.BaudRate = entry->flag; + if (baud >= 0) { + const struct baudentry *entry = round_baud(baud); + dcb.BaudRate = entry->flag; + } dcb.ByteSize = 8; dcb.Parity = NOPARITY; dcb.StopBits = ONESTOPBIT; @@ -188,10 +191,12 @@ 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: "); - return 1; + if (baud >= 0) { + 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: "); + return 1; + } } wanted.c_cflag &= ~(PARENB | CSTOPB | CSIZE | CRTSCTS); wanted.c_cflag |= (CS8 | CLOCAL | CREAD); @@ -232,7 +237,7 @@ return 0; } -fdtype sp_openserport(char *dev, unsigned int baud) +fdtype sp_openserport(char *dev, int baud) { fdtype fd; #if IS_WINDOWS Modified: trunk/serprog.c ============================================================================== --- trunk/serprog.c Mon Jan 4 04:05:06 2016 (r1906) +++ trunk/serprog.c Mon Jan 4 04:05:15 2016 (r1907) @@ -342,26 +342,28 @@ unsigned char rbuf[3]; unsigned char c; char *device; - char *baudport; int have_device = 0; - /* the parameter is either of format "dev=/dev/device:baud" or "ip=ip:port" */ + /* the parameter is either of format "dev=/dev/device[:baud]" or "ip=ip:port" */ device = extract_programmer_param("dev"); if (device && strlen(device)) { - baudport = strstr(device, ":"); - if (baudport) { + char *baud_str = strstr(device, ":"); + if (baud_str != NULL) { /* Split device from baudrate. */ - *baudport = '\0'; - baudport++; + *baud_str = '\0'; + baud_str++; } - if (!baudport || !strlen(baudport)) { - msg_perr("Error: No baudrate specified.\n" - "Use flashrom -p serprog:dev=/dev/device:baud\n"); - free(device); - return 1; - } - if (strlen(device)) { - sp_fd = sp_openserport(device, atoi(baudport)); + int baud; + /* Convert baud string to value. + * baud_str is either NULL (if strstr can't find the colon), points to the \0 after the colon + * if no characters where given after the colon, or a string to convert... */ + if (baud_str == NULL || *baud_str == '\0') { + baud = -1; + msg_pdbg("No baudrate specified, using the hardware's defaults.\n"); + } else + baud = atoi(baud_str); // FIXME: replace atoi with strtoul + if (strlen(device) > 0) { + sp_fd = sp_openserport(device, baud); if (sp_fd == SER_INV_FD) { free(device); return 1; @@ -371,7 +373,7 @@ } if (device && !strlen(device)) { msg_perr("Error: No device specified.\n" - "Use flashrom -p serprog:dev=/dev/device:baud\n"); + "Use flashrom -p serprog:dev=/dev/device[:baud]\n"); free(device); return 1; } @@ -386,20 +388,20 @@ return 1; } if (device && strlen(device)) { - baudport = strstr(device, ":"); - if (baudport) { + char *port = strstr(device, ":"); + if (port != NULL) { /* Split host from port. */ - *baudport = '\0'; - baudport++; + *port = '\0'; + port++; } - if (!baudport || !strlen(baudport)) { + if (!port || !strlen(port)) { msg_perr("Error: No port specified.\n" "Use flashrom -p serprog:ip=ipaddr:port\n"); free(device); return 1; } if (strlen(device)) { - sp_fd = sp_opensocket(device, atoi(baudport)); + sp_fd = sp_opensocket(device, atoi(port)); // FIXME: replace atoi with strtoul if (sp_fd < 0) { free(device); return 1;

1 0

[commit] r1906 - trunk
by repository service 03 Jan '16

03 Jan '16

Author: stefanct Date: Mon Jan 4 04:05:06 2016 New Revision: 1906 URL: http://flashrom.org/trac/flashrom/changeset/1906 Log: serprog: ignore failures when setting serial port options. There is no good reason to abort earlier just because some options did not stick. This should improve compatibility without negative effects. If communication is affected by the missing flag(s) then we abort later anyway. Signed-off-by: Stefan Tauner <stefan.tauner(a)alumni.tuwien.ac.at> Acked-by: Urja Rannikko <urjaman(a)gmail.com> Modified: trunk/serial.c Modified: trunk/serial.c ============================================================================== --- trunk/serial.c Mon Jan 4 04:04:36 2016 (r1905) +++ trunk/serial.c Mon Jan 4 04:05:06 2016 (r1906) @@ -209,12 +209,25 @@ 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__); - return 1; + observed.c_oflag != wanted.c_oflag) { + msg_pwarn("Some requested serial options did not stick, continuing anyway.\n"); + msg_pdbg(" observed wanted\n" + "c_cflag: 0x%08lX 0x%08lX\n" + "c_lflag: 0x%08lX 0x%08lX\n" + "c_iflag: 0x%08lX 0x%08lX\n" + "c_oflag: 0x%08lX 0x%08lX\n", + (long)observed.c_cflag, (long)wanted.c_cflag, + (long)observed.c_lflag, (long)wanted.c_lflag, + (long)observed.c_iflag, (long)wanted.c_iflag, + (long)observed.c_oflag, (long)wanted.c_oflag + ); + } + if (cfgetispeed(&observed) != cfgetispeed(&wanted) || + cfgetospeed(&observed) != cfgetospeed(&wanted)) { + msg_pwarn("Could not set baud rates exactly.\n"); + msg_pdbg("Actual baud flags are: ispeed: 0x%08lX, ospeed: 0x%08lX\n", + (long)cfgetispeed(&observed), (long)cfgetospeed(&observed)); } - msg_pdbg("Baud rate is %d now.\n", entry->baud); #endif return 0; }

1 0

[commit] r1905 - trunk
by repository service 03 Jan '16

03 Jan '16

Author: stefanct Date: Mon Jan 4 04:04:36 2016 New Revision: 1905 URL: http://flashrom.org/trac/flashrom/changeset/1905 Log: serprog: clear NDELAY flag only once after opening the port. Change sp_openserport() to directly clear the O_NONBLOCK flag that is potentially set by opening the device with O_NDELAY instead of clearing ALL flags in serialport_config() unconditionally. Signed-off-by: Stefan Tauner <stefan.tauner(a)alumni.tuwien.ac.at> Acked-by: Urja Rannikko <urjaman(a)gmail.com> Modified: trunk/serial.c Modified: trunk/serial.c ============================================================================== --- trunk/serial.c Fri Dec 25 23:42:45 2015 (r1904) +++ trunk/serial.c Mon Jan 4 04:04:36 2016 (r1905) @@ -183,10 +183,6 @@ msg_pdbg("Baud rate is %ld.\n", dcb.BaudRate); #else struct termios wanted, observed; - if (fcntl(fd, F_SETFL, 0) != 0) { - msg_perr_strerror("Could not clear serial port mode: "); - return 1; - } if (tcgetattr(fd, &observed) != 0) { msg_perr_strerror("Could not fetch original serial port configuration: "); return 1; @@ -254,11 +250,23 @@ } return fd; #else - fd = open(dev, O_RDWR | O_NOCTTY | O_NDELAY); + fd = open(dev, O_RDWR | O_NOCTTY | O_NDELAY); // Use O_NDELAY to ignore DCD state if (fd < 0) { msg_perr_strerror("Cannot open serial port: "); return SER_INV_FD; } + + /* Ensure that we use blocking I/O */ + const int flags = fcntl(fd, F_GETFL); + if (flags == -1) { + msg_perr_strerror("Could not get serial port mode: "); + return SER_INV_FD; + } + if (fcntl(fd, F_SETFL, flags & ~O_NONBLOCK) != 0) { + msg_perr_strerror("Could not set serial port mode to blocking: "); + return SER_INV_FD; + } + if (serialport_config(fd, baud) != 0) { close(fd); return SER_INV_FD;

1 0

Re: [flashrom] Issue with internal access to the W39V040FB
by Stefan Tauner 03 Jan '16

03 Jan '16

On Fri, 1 Jan 2016 16:18:17 +0300 Andrey Korolyov <andrey(a)xdel.ru> wrote: > Hello and Happy New Year, > > a couple of days ago I acquired an old GeodeLX-based thin client > TONK-1202/ТОНК-1202 (cyr) for a purpose to put coreboot on it, because > board is very simular to existing ones in the coreboot tree and there > should be no big deal to make a port. Aside from very funny issue that > I am not able to boot modern 2.6.18+ i386 Linux kernel on it (ALIX > Geode board said to have same issue [0], but it has been reportedly > fixed by a vendor bios update), all other Linux variants (2.4.xx and > 2.6.13) and NetBSD 7.0 are somehow messing with the internal > interface, with no positive outcome as a result: > > ./flashrom -p internal:laptop=this_is_not_a_laptop -c W39V040FB -r bios.bin -V > .... > Probing for Winbond W39V040FB, 512 kB: probe_jedec_common: id1 0x25, > id2 0x6b, id1 is normal flash content, id2 is normal flash content > No EEPROM/flash device found > ... > > > NetBSD 5.1 with same flashrom version working just well, I was able to > read the chip contents and write them back without any issues. This is > not a blocker, as I would stick to the external programmer anyway, but > probably worth investigating as a regression - monolithic nature of > NetBSD releases and very limited board performance would not allow to > bisect this easily, so it`s better to narrow a debug field, if > possible, in advance. Hi Andrey, please post complete logs of a working and non-working probe as well as the exact flashrom version you are using. The output of lspci -nnv might become handy as well. -- Kind regards/Mit freundlichen Grüßen, Stefan Tauner

2 1

Re: [flashrom] Successful flashing of a Dell Latitude D630
by Stefan Tauner 03 Jan '16

03 Jan '16

On Mon, 28 Dec 2015 14:47:15 +0100 Márton Miklós <martonmiklosqdev(a)gmail.com> wrote: > Hello all, > > My "try to flash all old stuff at home with flashrom" project continued. > Today's victim was a Dell Latitude D630 with discrete VGA and BIOS version > A07. > > I have successfully updated to the A17 BIOS version with the latest flasrom > from svn. > > Now I have not forgotten to log the write so here it is: > http://paste.flashrom.org/view.php?id=2853 > > I have also created a board enable patch to whitelist this notebook: > http://paste.flashrom.org/view.php?id=2854 > > I have added the PCIe root hub's VID:PID without SSID and the SMBUS > controller with SSID to the whitelisting PCI devices. > Hi, thanks for your report and patch. The latter is not quite right. Have you tested it? Quote from the comment above the board_enable table: > * When a board is matched through DMI, the first and second main PCI IDs > * and the first subsystem PCI ID have to match as well. If you specify the > * first subsystem ID as 0x0:0x0, the DMI matching code expects that the > * subsystem ID of that device is indeed zero. So the two PCI device should be swapped (or the first one should be completed). I have implemented the swap locally. Also, the right function to call is p2_whitelist_laptop because that Dell thing is really a laptop (and not misdetected as one). Finally, the system should also be added to the laptop table in print.c I have done all that and will commit it later together with other small changes. -- Kind regards/Mit freundlichen Grüßen, Stefan Tauner

2 1

SST25VF080B: Gigabyte GA-G33M-S2 successfully reflashed
by Александр Трубицын 02 Jan '16

02 Jan '16

Hi, Stefan! With best regards, Alexander Trubitsyn

2 1

MX25L4006E: Gigabyte GA-P31DS3L successfully reflashed
by Александр Трубицын 02 Jan '16

02 Jan '16

Hi! -- With best regards, Alexander V. Trubitsyn

2 3

Issue with internal access to the W39V040FB
by Andrey Korolyov 01 Jan '16

01 Jan '16

Hello and Happy New Year, a couple of days ago I acquired an old GeodeLX-based thin client TONK-1202/ТОНК-1202 (cyr) for a purpose to put coreboot on it, because board is very simular to existing ones in the coreboot tree and there should be no big deal to make a port. Aside from very funny issue that I am not able to boot modern 2.6.18+ i386 Linux kernel on it (ALIX Geode board said to have same issue [0], but it has been reportedly fixed by a vendor bios update), all other Linux variants (2.4.xx and 2.6.13) and NetBSD 7.0 are somehow messing with the internal interface, with no positive outcome as a result: ./flashrom -p internal:laptop=this_is_not_a_laptop -c W39V040FB -r bios.bin -V .... Probing for Winbond W39V040FB, 512 kB: probe_jedec_common: id1 0x25, id2 0x6b, id1 is normal flash content, id2 is normal flash content No EEPROM/flash device found ... NetBSD 5.1 with same flashrom version working just well, I was able to read the chip contents and write them back without any issues. This is not a blocker, as I would stick to the external programmer anyway, but probably worth investigating as a regression - monolithic nature of NetBSD releases and very limited board performance would not allow to bisect this easily, so it`s better to narrow a debug field, if possible, in advance. Thanks! 0. http://www.twam.info/software/linux/gentoo/updating-bios-on-alix3d3-within-…

1 0

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

flashrom January 2016