flashrom

flashrom@flashrom.org

9164 discussions

Re: [flashrom] Intel C602 support
by Stefan Tauner 02 Aug '12

02 Aug '12

On Thu, 28 Jun 2012 07:03:34 -0700 Greg Schardt <gschardt(a)ddn.com> wrote: > I apologize for the delay. likewise ;) > Here is the output: > > 00:1f.0 ISA bridge [0601]: Intel Corporation Patsburg LPC Controller [8086:1d41] (rev 06) > > Let me know if you need more information or would like me to test it. that one actually is already supported since september 2011, so the latest stable version should detect it and work correctly (as long as there are no locked regions). -- Kind regards/Mit freundlichen Grüßen, Stefan Tauner

2 2

Re: [flashrom] [PATCH 2/3] Not for merge: Warn if we skipped all blocks
by Idwer Vollering 02 Aug '12

02 Aug '12

2012/7/23 Stefan Tauner <stefan.tauner(a)student.tuwien.ac.at>: > Quick hack to print a warning if we skip all blocks because they are already > equal to the requested image. We want something like this to make users > aware... and some developers that regularly fall for this too *coughcough*. > > Signed-off-by: Stefan Tauner <stefan.tauner(a)student.tuwien.ac.at> > --- > flashrom.c | 5 +++++ > 1 file changed, 5 insertions(+) > > diff --git a/flashrom.c b/flashrom.c > index 70687ff..ebc3118 100644 > --- a/flashrom.c > +++ b/flashrom.c > @@ -1218,6 +1218,7 @@ static int selfcheck_eraseblocks(const struct flashchip *flash) > return ret; > } > > +static int all_skipped = 1; > static int erase_and_write_block_helper(struct flashctx *flash, > unsigned int start, unsigned int len, > uint8_t *curcontents, > @@ -1266,6 +1267,8 @@ static int erase_and_write_block_helper(struct flashctx *flash, > } > if (skip) > msg_cdbg("S"); > + else > + all_skipped = 0; > return ret; > } > > @@ -1391,6 +1394,8 @@ int erase_and_write_flash(struct flashctx *flash, uint8_t *oldcontents, > if (ret) { > msg_cerr("FAILED!\n"); > } else { > + if(all_skipped) > + msg_cinfo("\nWarning: Chip contents were already identical to the requested image.\n"); I would change "were already identical" to "are identical". Let's not (right now) digress about calling it chip contents or content. > msg_cinfo("Erase/write done.\n"); > } > return ret; > -- > Kind regards, Stefan Tauner After considering the above comment: Acked-by: Idwer Vollering <vidwer(a)gmail.com>

1 0

[PATCH] Fix VIA VX*** support.
by Stefan Tauner 31 Jul '12

31 Jul '12

Helge Wagner's patch that added VIA VX900 chipset support made me look closer at the datasheets which led to some concise documentation about newer VIA chipsets: http://flashrom.org/VIA Based on that this patch adds full support for VX800/VX820, VX855/VX875 and VX900, including SPI and LPC. VT8237S was not changed (SPI support only) because there is no public datasheet and it is not clear how to distinguish between LPC and SPI strapping and investigations in (NDAed) documents have not brought up anything conclusively. enable_flash_vt823x could probably be enhanced too due to various yet ignored LPC options of the chipset. Signed-off-by: Helge Wagner <Helge.Wagner(a)ge.com> Signed-off-by: Stefan Tauner <stefan.tauner(a)student.tuwien.ac.at> --- New version with tiny changes for 0.9.6... test status is NT and arguable... but since there are so few VIA users out there anyway i think we wont get too many mails anyway. chipset_enable.c | 80 +++++++++++++++++++++++++++++++++++++++++++++++------- ichspi.c | 11 +++----- programmer.h | 2 +- 3 files changed, 75 insertions(+), 18 deletions(-) diff --git a/chipset_enable.c b/chipset_enable.c index 936d7b8..0974427 100644 --- a/chipset_enable.c +++ b/chipset_enable.c @@ -6,6 +6,7 @@ * Copyright (C) 2006 Uwe Hermann <uwe(a)hermann-uwe.de> * Copyright (C) 2007,2008,2009 Carl-Daniel Hailfinger * Copyright (C) 2009 Kontron Modular Computers GmbH + * Copyright (C) 2011, 2012 Stefan Tauner * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -508,12 +509,6 @@ static int enable_flash_tunnelcreek(struct pci_dev *dev, const char *name) return ret; } -static int enable_flash_vt8237s_spi(struct pci_dev *dev, const char *name) -{ - /* Do we really need no write enable? */ - return via_init_spi(dev); -} - static int enable_flash_ich_dc_spi(struct pci_dev *dev, const char *name, enum ich_chipset ich_generation) { @@ -681,16 +676,80 @@ static int enable_flash_vt823x(struct pci_dev *dev, const char *name) return -1; } - if (dev->device_id == 0x3227) { /* VT8237R */ + if (dev->device_id == 0x3227) { /* VT8237 */ /* All memory cycles, not just ROM ones, go to LPC. */ val = pci_read_byte(dev, 0x59); val &= ~0x80; rpci_write_byte(dev, 0x59, val); } + internal_buses_supported = BUS_LPC | BUS_FWH; return 0; } +static int enable_flash_vt_vx(struct pci_dev *dev, const char *name) +{ + struct pci_dev *south_north = pci_dev_find(0x1106, 0xa353); + if (south_north == NULL) { + msg_perr("Could not find South-North Module Interface Control device!\n"); + return ERROR_FATAL; + } + + msg_pdbg("Strapped to "); + if ((pci_read_byte(south_north, 0x56) & 0x01) == 0) { + msg_pdbg("LPC.\n"); + return enable_flash_vt823x(dev, name); + } + msg_pdbg("SPI.\n"); + + uint32_t mmio_base; + void *mmio_base_physmapped; + uint32_t spi_cntl; + #define SPI_CNTL_LEN 0x08 + uint32_t spi0_mm_base = 0; + switch(dev->device_id) { + case 0x8353: /* VX800/VX820 */ + spi0_mm_base = pci_read_long(dev, 0xbc) << 8; + break; + case 0x8409: /* VX855/VX875 */ + case 0x8410: /* VX900 */ + mmio_base = pci_read_long(dev, 0xbc) << 8; + mmio_base_physmapped = physmap("VIA VX MMIO register", mmio_base, SPI_CNTL_LEN); + if (mmio_base_physmapped == ERROR_PTR) { + physunmap(mmio_base_physmapped, SPI_CNTL_LEN); + return ERROR_FATAL; + } + + /* Offset 0 - Bit 0 holds SPI Bus0 Enable Bit. */ + spi_cntl = mmio_readl(mmio_base_physmapped) + 0x00; + if ((spi_cntl & 0x01) == 0) { + msg_pdbg ("SPI Bus0 disabled!\n"); + physunmap(mmio_base_physmapped, SPI_CNTL_LEN); + return ERROR_FATAL; + } + /* Offset 1-3 has SPI Bus Memory Map Base Address: */ + spi0_mm_base = spi_cntl & 0xFFFFFF00; + + /* Offset 4 - Bit 0 holds SPI Bus1 Enable Bit. */ + spi_cntl = mmio_readl(mmio_base_physmapped) + 0x04; + if ((spi_cntl & 0x01) == 1) + msg_pdbg2("SPI Bus1 is enabled too.\n"); + + physunmap(mmio_base_physmapped, SPI_CNTL_LEN); + break; + default: + msg_perr("%s: Unsupported chipset %x:%x!\n", __func__, dev->vendor_id, dev->device_id); + return ERROR_FATAL; + } + + return via_init_spi(dev, spi0_mm_base); +} + +static int enable_flash_vt8237s_spi(struct pci_dev *dev, const char *name) +{ + return via_init_spi(dev, pci_read_long(dev, 0xbc) << 8); +} + static int enable_flash_cs5530(struct pci_dev *dev, const char *name) { uint8_t reg8; @@ -1263,7 +1322,7 @@ const struct penable chipset_enables[] = { {0x1106, 0x0586, OK, "VIA", "VT82C586A/B", enable_flash_amd8111}, {0x1106, 0x0596, OK, "VIA", "VT82C596", enable_flash_amd8111}, {0x1106, 0x0686, OK, "VIA", "VT82C686A/B", enable_flash_amd8111}, - {0x1106, 0x3074, OK, "VIA", "VT8233", enable_flash_vt823x}, + {0x1106, 0x3074, OK, "VIA", "VT8233/VT8237R", enable_flash_vt823x}, {0x1106, 0x3147, OK, "VIA", "VT8233A", enable_flash_vt823x}, {0x1106, 0x3177, OK, "VIA", "VT8235", enable_flash_vt823x}, {0x1106, 0x3227, OK, "VIA", "VT8237", enable_flash_vt823x}, @@ -1271,8 +1330,9 @@ const struct penable chipset_enables[] = { {0x1106, 0x3372, OK, "VIA", "VT8237S", enable_flash_vt8237s_spi}, {0x1106, 0x8231, NT, "VIA", "VT8231", enable_flash_vt823x}, {0x1106, 0x8324, OK, "VIA", "CX700", enable_flash_vt823x}, - {0x1106, 0x8353, OK, "VIA", "VX800/VX820", enable_flash_vt8237s_spi}, - {0x1106, 0x8409, OK, "VIA", "VX855/VX875", enable_flash_vt823x}, + {0x1106, 0x8353, NT, "VIA", "VX800/VX820", enable_flash_vt_vx}, + {0x1106, 0x8409, NT, "VIA", "VX855/VX875", enable_flash_vt_vx}, + {0x1106, 0x8410, NT, "VIA", "VX900", enable_flash_vt_vx}, {0x1166, 0x0200, OK, "Broadcom", "OSB4", enable_flash_osb4}, {0x1166, 0x0205, OK, "Broadcom", "HT-1000", enable_flash_ht1000}, {0x17f3, 0x6030, OK, "RDC", "R8610/R3210", enable_flash_rdc_r8610}, diff --git a/ichspi.c b/ichspi.c index 0223ae3..44d659b 100644 --- a/ichspi.c +++ b/ichspi.c @@ -1844,19 +1844,16 @@ static const struct spi_programmer spi_programmer_via = { .write_aai = default_spi_write_aai, }; -int via_init_spi(struct pci_dev *dev) +int via_init_spi(struct pci_dev *dev, uint32_t mmio_base) { - uint32_t mmio_base; int i; - mmio_base = (pci_read_long(dev, 0xbc)) << 8; - msg_pdbg("MMIO base at = 0x%x\n", mmio_base); - ich_spibar = physmap("VT8237S MMIO registers", mmio_base, 0x70); + ich_spibar = physmap("VIA SPI MMIO registers", mmio_base, 0x70); + /* Do we really need no write enable? Like the LPC one at D17F0 0x40 */ - /* Not sure if it speaks all these bus protocols. */ - internal_buses_supported = BUS_LPC | BUS_FWH; ich_generation = CHIPSET_ICH7; register_spi_programmer(&spi_programmer_via); + internal_buses_supported = BUS_SPI; msg_pdbg("0x00: 0x%04x (SPIS)\n", mmio_readw(ich_spibar + 0)); msg_pdbg("0x02: 0x%04x (SPIC)\n", mmio_readw(ich_spibar + 2)); diff --git a/programmer.h b/programmer.h index 5109ed9..ec29ed8 100644 --- a/programmer.h +++ b/programmer.h @@ -561,7 +561,7 @@ enum ich_chipset { extern uint32_t ichspi_bbar; int ich_init_spi(struct pci_dev *dev, uint32_t base, void *rcrb, enum ich_chipset ich_generation); -int via_init_spi(struct pci_dev *dev); +int via_init_spi(struct pci_dev *dev, uint32_t mmio_base); /* it85spi.c */ int it85xx_spi_init(struct superio s); -- Kind regards, Stefan Tauner

1 0

Tagging flashrom 0.9.6
by Carl-Daniel Hailfinger 31 Jul '12

31 Jul '12

I plan to tag and release flashrom 0.9.6 Real Soon Now (tm). If you need anything merged, tell me NOW. flashrom svn HEAD doesn't have any known regressions compared to 0.9.5, so it seems stable enough to ship. Regards, Carl-Daniel -- http://www.hailfinger.org/

1 0

[PATCH] remove exit calls from sp_docommand
by Niklas Söderlund 30 Jul '12

30 Jul '12

Adapted two callers to handle return codes instead of relying on the exit call. Rest of upstream callers are prepared to handle return values. Signed-off-by: Niklas Söderlund <niso(a)kth.se> --- serprog.c | 34 ++++++++++++++++++++++------------ 1 file changed, 22 insertions(+), 12 deletions(-) diff --git a/serprog.c b/serprog.c index f03d332..aac10af 100644 --- a/serprog.c +++ b/serprog.c @@ -246,17 +246,23 @@ static int sp_docommand(uint8_t command, uint32_t parmlen, unsigned char c; if (sp_automatic_cmdcheck(command)) return 1; - if (write(sp_fd, &command, 1) != 1) - sp_die("Error: cannot write op code"); - if (write(sp_fd, params, parmlen) != (parmlen)) - sp_die("Error: cannot write parameters"); - if (read(sp_fd, &c, 1) != 1) - sp_die("Error: cannot read from device"); + if (write(sp_fd, &command, 1) != 1) { + msg_perr("Error: cannot write op code: %s\n", strerror(errno)); + return 1; + } + if (write(sp_fd, params, parmlen) != (parmlen)) { + msg_perr("Error: cannot write parameters: %s\n", strerror(errno)); + return 1; + } + if (read(sp_fd, &c, 1) != 1) { + msg_perr("Error: cannot read from device: %s\n", strerror(errno)); + return 1; + } if (c == S_NAK) return 1; if (c != S_ACK) { - msg_perr("Error: invalid response 0x%02X from device\n",c); - exit(1); + msg_perr("Error: invalid response 0x%02X from device\n", c); + return 1; } if (retlen) { int rd_bytes = 0; @@ -264,8 +270,10 @@ static int sp_docommand(uint8_t command, uint32_t parmlen, int r; r = read(sp_fd, retparms + rd_bytes, retlen - rd_bytes); - if (r <= 0) - sp_die("Error: cannot read return parameters"); + if (r <= 0) { + msg_perr("Error: cannot read return parameters: %s\n", strerror(errno)); + return 1; + } rd_bytes += r; } while (rd_bytes != retlen); } @@ -491,7 +499,8 @@ int serprog_init(void) the programmer to tell us its limits, but if it doesn't, we will assume stuff, so it's in the programmers best interest to tell us. */ - sp_docommand(S_CMD_S_BUSTYPE, 1, &bt, 0, NULL); + if (sp_docommand(S_CMD_S_BUSTYPE, 1, &bt, 0, NULL)) + return 1; if (!sp_docommand(S_CMD_Q_WRNMAXLEN, 0, NULL, 3, rbuf)) { uint32_t v; v = ((unsigned int)(rbuf[0]) << 0); @@ -513,7 +522,8 @@ int serprog_init(void) msg_pdbg(MSGHEADER "Maximum read-n length is %d\n", v); } bt = serprog_buses_supported; - sp_docommand(S_CMD_S_BUSTYPE, 1, &bt, 0, NULL); + if (sp_docommand(S_CMD_S_BUSTYPE, 1, &bt, 0, NULL)) + return 1; } if (serprog_buses_supported & BUS_NONSPI) { -- 1.7.10.3

2 1

[PATCH] remove exit calls from sp_openserport
by Niklas Söderlund 30 Jul '12

30 Jul '12

Instead: - Print same error message as before but use msg_perr instead of perror - Return -1 instead of calling exit(1) All callers of sp_openserport where able to handle this change without much trouble. There already where other error cases that where taken care of, so adding one more will not change behavior of there callers. Signed-off-by: Niklas Söderlund <niso(a)kth.se> --- buspirate_spi.c | 2 ++ pony_spi.c | 3 ++- serial.c | 32 +++++++++++++++++++++++--------- serprog.c | 3 ++- 4 files changed, 29 insertions(+), 11 deletions(-) diff --git a/buspirate_spi.c b/buspirate_spi.c index f816afd..f18538a 100644 --- a/buspirate_spi.c +++ b/buspirate_spi.c @@ -39,6 +39,8 @@ static int buspirate_serialport_setup(char *dev) { /* 115200bps, 8 databits, no parity, 1 stopbit */ sp_fd = sp_openserport(dev, 115200); + if (sp_fd < 0) + return 1; return 0; } #else diff --git a/pony_spi.c b/pony_spi.c index b5dfc2f..3a413c7 100644 --- a/pony_spi.c +++ b/pony_spi.c @@ -99,7 +99,8 @@ int pony_spi_init(void) if (arg && strlen(arg)) { sp_fd = sp_openserport( arg, 9600 ); - have_device++; + if (sp_fd >= 0) + have_device++; } free(arg); diff --git a/serial.c b/serial.c index 0a56568..32d7e6a 100644 --- a/serial.c +++ b/serial.c @@ -113,8 +113,10 @@ fdtype sp_openserport(char *dev, unsigned int baud) (tolower((unsigned char)dev[1]) == 'o') && (tolower((unsigned char)dev[2]) == 'm')) { dev2 = malloc(strlen(dev) + 5); - if (!dev2) - sp_die("Error: Out of memory"); + if (!dev2) { + msg_perr("Error: Out of memory: %s\n", strerror(errno)); + return -1; + } strcpy(dev2, "\\\\.\\"); strcpy(dev2 + 4, dev); } @@ -123,33 +125,45 @@ fdtype sp_openserport(char *dev, unsigned int baud) if (dev2 != dev) free(dev2); if (fd == INVALID_HANDLE_VALUE) { - sp_die("Error: cannot open serial port"); + msg_perr("Error: cannot open serial port: %s\n", + strerror(errno)); + return -1; } DCB dcb; if (!GetCommState(fd, &dcb)) { - sp_die("Error: Could not fetch serial port configuration"); + msg_perr("Error: Could not fetch serial port configuration: %s\n", + strerror(errno)); + return -1; } + 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: sp_die("Error: Could not set baud rate"); + default: msg_perr("Error: Could not set baud rate: %s\n", + strerror(errno)); + return -1; } dcb.ByteSize = 8; dcb.Parity = NOPARITY; dcb.StopBits = ONESTOPBIT; if (!SetCommState(fd, &dcb)) { - sp_die("Error: Could not change serial port configuration"); + msg_perr("Error: Could not change serial port configuration: %s\n", + strerror(errno)); + return -1; } return fd; #else struct termios options; int fd, i; fd = open(dev, O_RDWR | O_NOCTTY | O_NDELAY); - if (fd < 0) - sp_die("Error: cannot open serial port"); + if (fd < 0) { + msg_perr("Error: cannot open serial port: %s\n", + strerror(errno)); + return -1; + } fcntl(fd, F_SETFL, 0); tcgetattr(fd, &options); for (i = 0;; i++) { @@ -157,7 +171,7 @@ fdtype sp_openserport(char *dev, unsigned int baud) close(fd); msg_perr("Error: cannot configure for baudrate %d\n", baud); - exit(1); + return -1; } if (sp_baudtable[i].baud == baud) { cfsetispeed(&options, sp_baudtable[i].flag); diff --git a/serprog.c b/serprog.c index 65539a1..baa1eab 100644 --- a/serprog.c +++ b/serprog.c @@ -361,7 +361,8 @@ int serprog_init(void) } if (strlen(device)) { sp_fd = sp_openserport(device, atoi(baudport)); - have_device++; + if (sp_fd >= 0) + have_device++; } } if (device && !strlen(device)) { -- 1.7.10.2

2 2

[PATCH] remove exit calls from sp_opensocket
by Niklas Söderlund 30 Jul '12

30 Jul '12

Replace with return statements and adopt the only upstream caller which in turn all plumbing is place for Signed-off-by: Niklas Söderlund <niso(a)kth.se> --- serprog.c | 19 ++++++++++++++----- 1 file changed, 14 insertions(+), 5 deletions(-) diff --git a/serprog.c b/serprog.c index d06fb0b..02996ea 100644 --- a/serprog.c +++ b/serprog.c @@ -110,20 +110,25 @@ static int sp_opensocket(char *ip, unsigned int port) int sock; msg_pdbg(MSGHEADER "IP %s port %d\n", ip, port); sock = socket(PF_INET, SOCK_STREAM, IPPROTO_TCP); - if (sock < 0) - sp_die("Error: serprog cannot open socket"); + if (sock < 0) { + msg_perr("Error: serprog cannot open socket: %s\n", strerror(errno)); + return -1; + } hostPtr = gethostbyname(ip); if (NULL == hostPtr) { hostPtr = gethostbyaddr(ip, strlen(ip), AF_INET); - if (NULL == hostPtr) - sp_die("Error: cannot resolve"); + if (NULL == hostPtr) { + msg_perr("Error: cannot resolve: %s\n", strerror(errno)); + return -1; + } } sp.si.sin_family = AF_INET; sp.si.sin_port = htons(port); (void)memcpy(&sp.si.sin_addr, hostPtr->h_addr, hostPtr->h_length); if (connect(sock, &sp.s, sizeof(sp.si)) < 0) { close(sock); - sp_die("Error: serprog cannot connect"); + msg_perr("Error: serprog cannot connect: %s\n", strerror(errno)); + return -1; } /* We are latency limited, and sometimes do write-write-read * * (write-n) - so enable TCP_NODELAY. */ @@ -398,6 +403,10 @@ int serprog_init(void) } if (strlen(device)) { sp_fd = sp_opensocket(device, atoi(baudport)); + if (sp_fd < 0) { + free(device); + return 1; + } have_device++; } } -- 1.7.10.3

2 1

Re: [flashrom] [PATCH] remove exit call from internal_init
by Stefan Tauner 30 Jul '12

30 Jul '12

On Wed, 30 May 2012 12:24:19 -0700 David Hendricks <dhendrix(a)google.com> wrote: > This seems trivial, as internal_init() already does the right thing when a > return value is used here. indeed. thanks niklas! i have applied it in r1557. -- Kind regards/Mit freundlichen Grüßen, Stefan Tauner

1 0

[commit] r1557 - trunk
by repository service 30 Jul '12

30 Jul '12

Author: stefanct Date: Mon Jul 30 21:42:33 2012 New Revision: 1557 URL: http://flashrom.org/trac/flashrom/changeset/1557 Log: Remove more exit calls. This patch removes the remaining exit calls from - sp_openserport - sp_opensocket - sp_docommand - internal_init Almost all of this was done by Niklas. Signed-off-by: Niklas Söderlund <niso(a)kth.se> 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/buspirate_spi.c trunk/internal.c trunk/pony_spi.c trunk/serial.c trunk/serprog.c Modified: trunk/buspirate_spi.c ============================================================================== --- trunk/buspirate_spi.c Sun Jul 29 04:04:21 2012 (r1556) +++ trunk/buspirate_spi.c Mon Jul 30 21:42:33 2012 (r1557) @@ -39,7 +39,8 @@ { /* 115200bps, 8 databits, no parity, 1 stopbit */ sp_fd = sp_openserport(dev, 115200); - /* FIXME: Error checking */ + if (sp_fd < 0) + return 1; return 0; } #else Modified: trunk/internal.c ============================================================================== --- trunk/internal.c Sun Jul 29 04:04:21 2012 (r1556) +++ trunk/internal.c Mon Jul 30 21:42:33 2012 (r1557) @@ -299,7 +299,7 @@ msg_perr("Proceeding anyway because user forced us to.\n"); } else { msg_perr("Aborting.\n"); - exit(1); + return 1; } } Modified: trunk/pony_spi.c ============================================================================== --- trunk/pony_spi.c Sun Jul 29 04:04:21 2012 (r1556) +++ trunk/pony_spi.c Mon Jul 30 21:42:33 2012 (r1557) @@ -99,6 +99,10 @@ if (arg && strlen(arg)) { sp_fd = sp_openserport( arg, 9600 ); + if (sp_fd < 0) { + free(arg); + return 1; + } have_device++; } free(arg); Modified: trunk/serial.c ============================================================================== --- trunk/serial.c Sun Jul 29 04:04:21 2012 (r1556) +++ trunk/serial.c Mon Jul 30 21:42:33 2012 (r1557) @@ -113,8 +113,10 @@ (tolower((unsigned char)dev[1]) == 'o') && (tolower((unsigned char)dev[2]) == 'm')) { dev2 = malloc(strlen(dev) + 5); - if (!dev2) - sp_die("Error: Out of memory"); + if (!dev2) { + msg_perr("Error: Out of memory: %s\n", strerror(errno)); + return -1; + } strcpy(dev2, "\\\\.\\"); strcpy(dev2 + 4, dev); } @@ -123,11 +125,13 @@ if (dev2 != dev) free(dev2); if (fd == INVALID_HANDLE_VALUE) { - sp_die("Error: cannot open serial port"); + msg_perr("Error: cannot open serial port: %s\n", strerror(errno)); + return -1; } DCB dcb; if (!GetCommState(fd, &dcb)) { - sp_die("Error: Could not fetch serial port configuration"); + msg_perr("Error: Could not fetch serial port configuration: %s\n", strerror(errno)); + return -1; } switch (baud) { case 9600: dcb.BaudRate = CBR_9600; break; @@ -135,29 +139,32 @@ case 38400: dcb.BaudRate = CBR_38400; break; case 57600: dcb.BaudRate = CBR_57600; break; case 115200: dcb.BaudRate = CBR_115200; break; - default: sp_die("Error: Could not set baud rate"); + default: msg_perr("Error: Could not set baud rate: %s\n", strerror(errno)); + return -1; } dcb.ByteSize = 8; dcb.Parity = NOPARITY; dcb.StopBits = ONESTOPBIT; if (!SetCommState(fd, &dcb)) { - sp_die("Error: Could not change serial port configuration"); + msg_perr("Error: Could not change serial port configuration: %s\n", strerror(errno)); + return -1; } return fd; #else struct termios options; int fd, i; fd = open(dev, O_RDWR | O_NOCTTY | O_NDELAY); - if (fd < 0) - sp_die("Error: cannot open serial port"); + if (fd < 0) { + msg_perr("Error: cannot open serial port: %s\n", strerror(errno)); + return -1; + } 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); - exit(1); + msg_perr("Error: cannot configure for baudrate %d\n", baud); + return -1; } if (sp_baudtable[i].baud == baud) { cfsetispeed(&options, sp_baudtable[i].flag); Modified: trunk/serprog.c ============================================================================== --- trunk/serprog.c Sun Jul 29 04:04:21 2012 (r1556) +++ trunk/serprog.c Mon Jul 30 21:42:33 2012 (r1557) @@ -110,20 +110,25 @@ int sock; msg_pdbg(MSGHEADER "IP %s port %d\n", ip, port); sock = socket(PF_INET, SOCK_STREAM, IPPROTO_TCP); - if (sock < 0) - sp_die("Error: serprog cannot open socket"); + if (sock < 0) { + msg_perr("Error: serprog cannot open socket: %s\n", strerror(errno)); + return -1; + } hostPtr = gethostbyname(ip); if (NULL == hostPtr) { hostPtr = gethostbyaddr(ip, strlen(ip), AF_INET); - if (NULL == hostPtr) - sp_die("Error: cannot resolve"); + if (NULL == hostPtr) { + msg_perr("Error: cannot resolve %s\n", ip); + return -1; + } } sp.si.sin_family = AF_INET; sp.si.sin_port = htons(port); (void)memcpy(&sp.si.sin_addr, hostPtr->h_addr, hostPtr->h_length); if (connect(sock, &sp.s, sizeof(sp.si)) < 0) { close(sock); - sp_die("Error: serprog cannot connect"); + msg_perr("Error: serprog cannot connect: %s\n", strerror(errno)); + return -1; } /* We are latency limited, and sometimes do write-write-read * * (write-n) - so enable TCP_NODELAY. */ @@ -233,17 +238,23 @@ unsigned char c; if (sp_automatic_cmdcheck(command)) return 1; - if (write(sp_fd, &command, 1) != 1) - sp_die("Error: cannot write op code"); - if (write(sp_fd, params, parmlen) != (parmlen)) - sp_die("Error: cannot write parameters"); - if (read(sp_fd, &c, 1) != 1) - sp_die("Error: cannot read from device"); + if (write(sp_fd, &command, 1) != 1) { + msg_perr("Error: cannot write op code: %s\n", strerror(errno)); + return 1; + } + if (write(sp_fd, params, parmlen) != (parmlen)) { + msg_perr("Error: cannot write parameters: %s\n", strerror(errno)); + return 1; + } + if (read(sp_fd, &c, 1) != 1) { + msg_perr("Error: cannot read from device: %s\n", strerror(errno)); + return 1; + } if (c == S_NAK) return 1; if (c != S_ACK) { - msg_perr("Error: invalid response 0x%02X from device\n",c); - exit(1); + msg_perr("Error: invalid response 0x%02X from device\n", c); + return 1; } if (retlen) { int rd_bytes = 0; @@ -251,8 +262,10 @@ int r; r = read(sp_fd, retparms + rd_bytes, retlen - rd_bytes); - if (r <= 0) - sp_die("Error: cannot read return parameters"); + if (r <= 0) { + msg_perr("Error: cannot read return parameters: %s\n", strerror(errno)); + return 1; + } rd_bytes += r; } while (rd_bytes != retlen); } @@ -362,6 +375,10 @@ } if (strlen(device)) { sp_fd = sp_openserport(device, atoi(baudport)); + if (sp_fd < 0) { + free(device); + return 1; + } have_device++; } } @@ -395,6 +412,10 @@ } if (strlen(device)) { sp_fd = sp_opensocket(device, atoi(baudport)); + if (sp_fd < 0) { + free(device); + return 1; + } have_device++; } } @@ -466,11 +487,12 @@ "bustype is SPI\n"); return 1; } + if (sp_docommand(S_CMD_S_BUSTYPE, 1, &bt, 0, NULL)) + return 1; /* Success of any of these commands is optional. We don't need the programmer to tell us its limits, but if it doesn't, we will assume stuff, so it's in the programmers best interest to tell us. */ - sp_docommand(S_CMD_S_BUSTYPE, 1, &bt, 0, NULL); if (!sp_docommand(S_CMD_Q_WRNMAXLEN, 0, NULL, 3, rbuf)) { uint32_t v; v = ((unsigned int)(rbuf[0]) << 0); @@ -492,7 +514,8 @@ msg_pdbg(MSGHEADER "Maximum read-n length is %d\n", v); } bt = serprog_buses_supported; - sp_docommand(S_CMD_S_BUSTYPE, 1, &bt, 0, NULL); + if (sp_docommand(S_CMD_S_BUSTYPE, 1, &bt, 0, NULL)) + return 1; } if (serprog_buses_supported & BUS_NONSPI) {

1 0

AT25DF321A with ASRock 880G Pro3 MB
by Roman Elshin 30 Jul '12

30 Jul '12

It looks like support for this flash part work correctly in flashrom (it is not native flash for this mb).

2 4

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

flashrom