flashrom November 2009

flashrom@flashrom.org

47 participants
148 discussions

[commit] r779 - trunk
by svn＠flashrom.org 25 Nov '09

25 Nov '09

Author: hailfinger Date: 2009-11-25 17:41:50 +0100 (Wed, 25 Nov 2009) New Revision: 779 Modified: trunk/jedec.c Log: jedec.c was missing error handling in a few cases. Fix. jedec.c error handling used double negation in too many places for no good reason. Clean up. Signed-off-by: Carl-Daniel Hailfinger <c-d.hailfinger.devel.2006(a)gmx.net> Acked-by: Sean Nelson <audiohacked(a)gmail.com> Modified: trunk/jedec.c =================================================================== --- trunk/jedec.c 2009-11-25 15:04:28 UTC (rev 778) +++ trunk/jedec.c 2009-11-25 16:41:50 UTC (rev 779) @@ -262,7 +262,7 @@ int write_page_write_jedec(struct flashchip *flash, uint8_t *src, int start, int page_size) { - int i, tried = 0, ok; + int i, tried = 0, failed; uint8_t *s = src; chipaddr bios = flash->virtual_memory; chipaddr dst = bios + start; @@ -287,27 +287,27 @@ dst = d; src = s; - ok = !verify_range(flash, src, start, page_size, NULL); + failed = verify_range(flash, src, start, page_size, NULL); - if (!ok && tried++ < MAX_REFLASH_TRIES) { + if (failed && tried++ < MAX_REFLASH_TRIES) { fprintf(stderr, "retrying.\n"); goto retry; } - if (!ok) { + if (failed) { fprintf(stderr, " page 0x%lx failed!\n", (d - bios) / page_size); } - return !ok; + return failed; } int write_byte_program_jedec(chipaddr bios, uint8_t *src, chipaddr dst) { - int tried = 0, ok = 1; + int tried = 0, failed = 0; - /* If the data is 0xFF, don't program it */ + /* If the data is 0xFF, don't program it and don't complain. */ if (*src == 0xFF) { - return -1; + return 0; } retry: @@ -325,27 +325,32 @@ } if (tried >= MAX_REFLASH_TRIES) - ok = 0; + failed = 1; - return !ok; + return failed; } int write_sector_jedec(chipaddr bios, uint8_t *src, chipaddr dst, unsigned int page_size) { - int i; + int i, failed = 0; + chipaddr olddst; + olddst = dst; for (i = 0; i < page_size; i++) { - write_byte_program_jedec(bios, src, dst); + if (write_byte_program_jedec(bios, src, dst)) + failed = 1; dst++, src++; } + if (failed) + fprintf(stderr, " writing sector at 0x%lx failed!\n", olddst); - return 0; + return failed; } int write_jedec(struct flashchip *flash, uint8_t *buf) { - int i; + int i, failed = 0; int total_size = flash->total_size * 1024; int page_size = flash->page_size; chipaddr bios = flash->virtual_memory; @@ -358,12 +363,13 @@ printf("Programming page: "); for (i = 0; i < total_size / page_size; i++) { printf("%04d at address: 0x%08x", i, i * page_size); - write_page_write_jedec(flash, buf + i * page_size, - i * page_size, page_size); + if (write_page_write_jedec(flash, buf + i * page_size, + i * page_size, page_size)) + failed = 1; printf("\b\b\b\b\b\b\b\b\b\b\b\b\b\b\b\b\b\b\b\b\b\b\b\b\b\b\b"); } printf("\n"); protect_jedec(bios); - return 0; + return failed; }

1 0

[PATCH] write_sst_fwhub: optimized for safety and speed
by Adam Jurkowski 25 Nov '09

25 Nov '09

Moved from coreboot list Tested with SST49LF008A On 2009-11-24 00:02, Carl-Daniel Hailfinger wrote: > Hi Adam, > > thanks for your patch. It looks good. > Unfortunately, it conflicts with the new generic partial flashing > support which will be merged soon. However, given that the partial > flashing support is not completely ready yet, I think I'll apply your > patch now and revert it once the generic partial flashing support is ready. > > On 23.11.2009 16:20, Adam Jurkowski wrote: > >> Optimized write_sst_fwhub for safety and speed: >> Now uses block erase instead of chip erase. Also introduced auto skip >> feature. >> >> Signed-off-by: Adam Jurkowski <adam.jurkowski(a)kontron.pl> >> > > I'll give the other developers some time to comment, but I think this is > a good short-term solution. > > Regards, > Carl-Daniel >

2 1

[commit] r778 - trunk
by svn＠flashrom.org 25 Nov '09

25 Nov '09

Author: hailfinger Date: 2009-11-25 16:04:28 +0100 (Wed, 25 Nov 2009) New Revision: 778 Modified: trunk/sst_fwhub.c Log: Optimized write_sst_fwhub for safety and speed: Now uses block erase instead of chip erase. Also introduced auto skip feature. Signed-off-by: Adam Jurkowski <adam.jurkowski(a)kontron.pl> Acked-by: Carl-Daniel Hailfinger <c-d.hailfinger.devel.2006(a)gmx.net> Modified: trunk/sst_fwhub.c =================================================================== --- trunk/sst_fwhub.c 2009-11-25 02:07:30 UTC (rev 777) +++ trunk/sst_fwhub.c 2009-11-25 15:04:28 UTC (rev 778) @@ -2,6 +2,7 @@ * This file is part of the flashrom project. * * Copyright (C) 2000 Silicon Integrated System Corporation + * Copyright (C) 2009 Kontron Modular Computers * * 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 @@ -20,6 +21,8 @@ /* Adapted from the Intel FW hub stuff for 82802ax parts. */ +#include <stdlib.h> +#include <string.h> #include "flash.h" // I need that Berkeley bit-map printer @@ -130,28 +133,33 @@ int write_sst_fwhub(struct flashchip *flash, uint8_t *buf) { - int i; + int i, rc; int total_size = flash->total_size * 1024; int page_size = flash->page_size; chipaddr bios = flash->virtual_memory; - uint8_t blockstatus; - - // FIXME: We want block wide erase instead of ironing the whole chip - if (erase_sst_fwhub(flash)) { - fprintf(stderr, "ERASE FAILED!\n"); - return -1; - } - + uint8_t *readbuf = malloc(page_size); + printf("Programming page: "); for (i = 0; i < total_size / page_size; i++) { printf("%04d at address: 0x%08x", i, i * page_size); - blockstatus = clear_sst_fwhub_block_lock(flash, i * page_size); - if (blockstatus) { - printf(" is locked down permanently, aborting\n"); - return 1; + + /* Auto Skip Blocks, which already contain the desired data: + * Faster, because we only write, what has changed + * More secure, because blocks, which are excluded + * (with the exclude or layout feature) + * are not erased and rewritten; data is retained also + * in sudden power off situations + */ + flash->read(flash, readbuf, i * page_size, page_size); + if (memcmp((void *)(buf + i * page_size), + (void *)(readbuf), page_size)) { + rc = erase_sst_fwhub_block(flash, i * page_size, + page_size); + if (rc) + return 1; + write_sector_jedec(bios, buf + i * page_size, + bios + i * page_size, page_size); } - write_sector_jedec(bios, buf + i * page_size, - bios + i * page_size, page_size); printf("\b\b\b\b\b\b\b\b\b\b\b\b\b\b\b\b\b\b\b\b\b\b\b\b\b\b\b"); } printf("\n");

1 0

Help writing Atmel AT26DF321 and read/writing Winbond W25X32
by Nando 25 Nov '09

25 Nov '09

Hi flashrom, I've patched the latest flashrom to allow me to dump my bios from Winbond W25x32 SPI bios chip. Strange thing is I got it to work ONCE successfully, with a dump that looks good. This worked once, in between hotswaps of the AT25DF321 chip and I haven't been able to duplicate the read again. I get an OPCODE 0x03 error with bios dump containg some data at starting few blocks followed by FFs. Then I hotswap in a blank Atmel AT25DF321 and do a ./flashrom -w /2510P-F0A-DUMP.ROM -V to try to create a copy of my bios, but I get write error starting at 0x3f0000. Now can't AT26DF321 bombs out immediately. I've documented more details here <http://forums.mydigitallife.info/showthread.php?p=179288>. I haven't tried writing the original W25X32 but would like to with the SLIC 2.10 string which exists in the range after 0x3f0000 as would others in that linked thread. Perhaps you can advise on how I can write that string *ONLY* into the bios? I know VPRO has some protections it can assign to the bios too, which may prevent that from happening. Regards, Nando

1 1

[PATCH] Kill hardcoded block erase on ICH SPI
by Carl-Daniel Hailfinger 25 Nov '09

25 Nov '09

Kill hardcoded block erase on ICH SPI. The existing code does not work for all SPI chips, and it just was a band-aid to cope with locked down chipsets back in a time when there was no eraseblock infrastructure. Basically, this unbreaks a few SPI chips on ICH. Signed-off-by: Carl-Daniel Hailfinger <c-d.hailfinger.devel.2006(a)gmx.net> Index: flashrom-ich_spi_no_hardcoded_block_erase/ichspi.c =================================================================== --- flashrom-ich_spi_no_hardcoded_block_erase/ichspi.c (Revision 769) +++ flashrom-ich_spi_no_hardcoded_block_erase/ichspi.c (Arbeitskopie) @@ -658,20 +658,16 @@ int maxdata = 64; spi_disable_blockprotect(); + /* Erase first */ + printf("Erasing flash before programming... "); + if (erase_flash(flash)) { + fprintf(stderr, "ERASE FAILED!\n"); + return -1; + } + printf("done.\n"); printf("Programming page: \n"); - for (i = 0; i < total_size / erase_size; i++) { - /* FIMXE: call the chip-specific spi_block_erase_XX instead. - * For this, we need to add a block erase function to - * struct flashchip. - */ - rc = spi_block_erase_d8(flash, i * erase_size, erase_size); - if (rc) { - printf("Error erasing block at 0x%x\n", i); - break; - } - if (spi_controller == SPI_CONTROLLER_VIA) maxdata = 16; -- Developer quote of the month: "We are juggling too many chainsaws and flaming arrows and tigers."

3 4

[commit] r777 - trunk
by svn＠flashrom.org 25 Nov '09

25 Nov '09

Author: hailfinger Date: 2009-11-25 03:07:30 +0100 (Wed, 25 Nov 2009) New Revision: 777 Modified: trunk/ichspi.c Log: Kill hardcoded block erase on ICH SPI. The existing code does not work for all SPI chips, and it just was a band-aid to cope with locked down chipsets back in a time when there was no eraseblock infrastructure. Basically, this unbreaks a few SPI chips on ICH. Signed-off-by: Carl-Daniel Hailfinger <c-d.hailfinger.devel.2006(a)gmx.net> Acked-by: Maciej Pijanka <maciej.pijanka(a)gmail.com> Modified: trunk/ichspi.c =================================================================== --- trunk/ichspi.c 2009-11-24 18:27:10 UTC (rev 776) +++ trunk/ichspi.c 2009-11-25 02:07:30 UTC (rev 777) @@ -658,20 +658,16 @@ int maxdata = 64; spi_disable_blockprotect(); + /* Erase first */ + printf("Erasing flash before programming... "); + if (erase_flash(flash)) { + fprintf(stderr, "ERASE FAILED!\n"); + return -1; + } + printf("done.\n"); printf("Programming page: \n"); - for (i = 0; i < total_size / erase_size; i++) { - /* FIMXE: call the chip-specific spi_block_erase_XX instead. - * For this, we need to add a block erase function to - * struct flashchip. - */ - rc = spi_block_erase_d8(flash, i * erase_size, erase_size); - if (rc) { - printf("Error erasing block at 0x%x\n", i); - break; - } - if (spi_controller == SPI_CONTROLLER_VIA) maxdata = 16;

1 0

Error at verifyng Soltek 75FRN2-L
by Xangel2Net 25 Nov '09

25 Nov '09

When I tried to flash my BIOS with flashrom, i had received an error - Verifying flash... VERIFY FAILED at 0x00000000! Expected=0x25, Read=0xa5, failed byte count from 0x00000000-0x0003ffff: 0x2161f. Motherboard - Sotlek 75FRN2-L. BIOS - AWARD-Phoenix.

1 0

Re: [flashrom] [PATCH] Configurable SPI speed and man page for Bus Pirate
by Sean Nelson 24 Nov '09

24 Nov '09

Send Ack to list. And send Tested-by while I'm at it. Acked-by: Sean Nelson <audiohacked(a)gmail.com> Tested-by: Sean Nelson <audiohacked(a)gmail.com> On Tue, Nov 24, 2009 at 8:41 AM, Sean Nelson <audiohacked(a)gmail.com> wrote: > Acked-by: Sean Nelson <audiohacked(a)gmail.com> > > On Tue, Nov 24, 2009 at 4:59 AM, Carl-Daniel Hailfinger > <c-d.hailfinger.devel.2006(a)gmx.net> wrote: >> Add the ability to set Bus Pirate SPI speed via the command line. >> Example usage: >> flashrom -p buspiratespi:spispeed=2.6MHz,dev=/dev/foo >> flashrom -p buspiratespi:dev=/dev/foo,spispeed=2.6M >> >> Refactor programmer option parsing (this allows cleanups in other >> programmers as well). >> >> Increase SPI read size from 8 to 12 bytes (current single-transaction >> limit of the Bus Pirate raw SPI protocol). >> >> Add Bus Pirate to the list of programmers supporting 4 byte RDID. >> >> Add Bus Pirate syntax to the man page. >> >> Signed-off-by: Carl-Daniel Hailfinger <c-d.hailfinger.devel.2006(a)gmx.net> >> >> Index: flashrom-buspiratespi_spispeed_manpage/flashrom.8 >> =================================================================== >> --- flashrom-buspiratespi_spispeed_manpage/flashrom.8 (Revision 775) >> +++ flashrom-buspiratespi_spispeed_manpage/flashrom.8 (Arbeitskopie) >> @@ -152,6 +152,8 @@ >> .sp >> .BR "* serprog" " (for flash ROMs attached to Urja's AVR programmer)" >> .sp >> +.BR "* buspiratespi" " (for flash ROMs attached to a Bus Pirate)" >> +.sp >> The dummy programmer has an optional parameter specifying the bus types it >> should support. For that you have to use the >> .B "flashrom -p dummy:type" >> @@ -219,6 +221,16 @@ >> instead. More information about serprog is available in serprog-protocol.txt in >> the source distribution. >> .sp >> +The buspiratespi programmer has a required dev parameter specifying the Bus >> +Pirate device node and an optional spispeed parameter specifying the frequency >> +of the SPI bus. The parameter delimiter is a comma. Syntax is >> +.B "flashrom -p buspiratespi:dev=/dev/device,spispeed=frequency" >> +where >> +.B frequency >> +can be any of >> +.B 30k 125k 250k 1M 2M 2.6M 4M 8M >> +(in Hz). >> +.sp >> Support for some programmers can be disabled at compile time. >> .B "flashrom -h" >> lists all supported programmers. >> Index: flashrom-buspiratespi_spispeed_manpage/flash.h >> =================================================================== >> --- flashrom-buspiratespi_spispeed_manpage/flash.h (Revision 775) >> +++ flashrom-buspiratespi_spispeed_manpage/flash.h (Arbeitskopie) >> @@ -488,6 +488,10 @@ >> int bitbang_spi_write_256(struct flashchip *flash, uint8_t *buf); >> >> /* buspirate_spi.c */ >> +struct buspirate_spispeeds { >> + const char *name; >> + const int speed; >> +}; >> int buspirate_spi_init(void); >> int buspirate_spi_shutdown(void); >> int buspirate_spi_send_command(unsigned int writecnt, unsigned int readcnt, const unsigned char *writearr, unsigned char *readarr); >> @@ -503,6 +507,7 @@ >> int erase_flash(struct flashchip *flash); >> int min(int a, int b); >> int max(int a, int b); >> +char *extract_param(char **haystack, char *needle, char *delim); >> int check_erased_range(struct flashchip *flash, int start, int len); >> int verify_range(struct flashchip *flash, uint8_t *cmpbuf, int start, int len, char *message); >> char *strcat_realloc(char *dest, const char *src); >> Index: flashrom-buspiratespi_spispeed_manpage/buspirate_spi.c >> =================================================================== >> --- flashrom-buspiratespi_spispeed_manpage/buspirate_spi.c (Revision 775) >> +++ flashrom-buspiratespi_spispeed_manpage/buspirate_spi.c (Arbeitskopie) >> @@ -131,34 +131,37 @@ >> return 0; >> } >> >> +static const struct buspirate_spispeeds spispeeds[] = { >> + {"30k", 0x0}, >> + {"125k", 0x1}, >> + {"250k", 0x2}, >> + {"1M", 0x3}, >> + {"2M", 0x4}, >> + {"2.6M", 0x5}, >> + {"4M", 0x6}, >> + {"8M", 0x7}, >> + {NULL, 0x0} >> +}; >> + >> int buspirate_spi_init(void) >> { >> unsigned char buf[512]; >> int ret = 0; >> int i; >> - char *devpos = NULL; >> char *dev = NULL; >> - int devlen; >> + char *speed = NULL; >> + int spispeed = 0x7; >> >> if (programmer_param && !strlen(programmer_param)) { >> free(programmer_param); >> programmer_param = NULL; >> } >> if (programmer_param) { >> - devpos = strstr(programmer_param, "dev="); >> - if (devpos) { >> - devpos += 4; >> - devlen = strcspn(devpos, ",:"); >> - if (devlen) { >> - dev = malloc(devlen + 1); >> - if (!dev) { >> - fprintf(stderr, "Out of memory!\n"); >> - exit(1); >> - } >> - strncpy(dev, devpos, devlen); >> - dev[devlen] = '\0'; >> - } >> - } >> + dev = extract_param(&programmer_param, "dev=", ",:"); >> + speed = extract_param(&programmer_param, "spispeed=", ",:"); >> + if (strlen(programmer_param)) >> + fprintf(stderr, "Unhandled programmer parameters: %s\n", >> + programmer_param); >> free(programmer_param); >> programmer_param = NULL; >> } >> @@ -167,6 +170,18 @@ >> "buspiratespi:dev=/dev/ttyUSB0\n"); >> return 1; >> } >> + if (speed) { >> + for (i = 0; spispeeds[i].name; i++) >> + if (!strncasecmp(spispeeds[i].name, speed, >> + strlen(spispeeds[i].name))) { >> + spispeed = spispeeds[i].speed; >> + break; >> + } >> + if (!spispeeds[i].name) >> + fprintf(stderr, "Invalid SPI speed, using default.\n"); >> + } >> + /* This works because speeds numbering starts at 0 and is contiguous. */ >> + printf_debug("SPI speed is %sHz\n", spispeeds[spispeed].name); >> >> ret = buspirate_serialport_setup(dev); >> if (ret) >> @@ -224,8 +239,8 @@ >> return 1; >> } >> >> - /* Set speed to 8 MHz */ >> - buf[0] = 0x60 | 0x7; >> + /* Set SPI speed */ >> + buf[0] = 0x60 | spispeed; >> ret = buspirate_sendrecv(buf, 1, 1); >> if (ret) >> return 1; >> @@ -351,8 +366,7 @@ >> >> int buspirate_spi_read(struct flashchip *flash, uint8_t *buf, int start, int len) >> { >> - /* Maximum read length is 12 bytes, use 8 for now. */ >> - return spi_read_chunked(flash, buf, start, len, 8); >> + return spi_read_chunked(flash, buf, start, len, 12); >> } >> >> /* We could do 12-byte writes, but for now we use the generic 1-byte code. */ >> Index: flashrom-buspiratespi_spispeed_manpage/spi.c >> =================================================================== >> --- flashrom-buspiratespi_spispeed_manpage/spi.c (Revision 775) >> +++ flashrom-buspiratespi_spispeed_manpage/spi.c (Arbeitskopie) >> @@ -319,6 +319,9 @@ >> #if DUMMY_SUPPORT == 1 >> case SPI_CONTROLLER_DUMMY: >> #endif >> +#if BUSPIRATE_SPI_SUPPORT == 1 >> + case SPI_CONTROLLER_BUSPIRATE: >> +#endif >> return probe_spi_rdid_generic(flash, 4); >> default: >> printf_debug("4b ID not supported on this SPI controller\n"); >> Index: flashrom-buspiratespi_spispeed_manpage/flashrom.c >> =================================================================== >> --- flashrom-buspiratespi_spispeed_manpage/flashrom.c (Revision 775) >> +++ flashrom-buspiratespi_spispeed_manpage/flashrom.c (Arbeitskopie) >> @@ -336,6 +336,60 @@ >> return dest; >> } >> >> +/* This is a somewhat hacked function similar in some ways to strtok(). >> + * It will look for needle in haystack, return a copy of needle and remove >> + * everything from the first occurrence of needle to the next delimiter >> + * from haystack. >> + */ >> +char *extract_param(char **haystack, char *needle, char *delim) >> +{ >> + char *param_pos, *rest, *tmp; >> + char *dev = NULL; >> + int devlen; >> + >> + param_pos = strstr(*haystack, needle); >> + do { >> + if (!param_pos) >> + return NULL; >> + /* Beginning of the string? */ >> + if (param_pos == *haystack) >> + break; >> + /* After a delimiter? */ >> + if (strchr(delim, *(param_pos - 1))) >> + break; >> + /* Continue searching. */ >> + param_pos++; >> + param_pos = strstr(param_pos, needle); >> + } while (1); >> + >> + if (param_pos) { >> + param_pos += strlen(needle); >> + devlen = strcspn(param_pos, delim); >> + if (devlen) { >> + dev = malloc(devlen + 1); >> + if (!dev) { >> + fprintf(stderr, "Out of memory!\n"); >> + exit(1); >> + } >> + strncpy(dev, param_pos, devlen); >> + dev[devlen] = '\0'; >> + } >> + rest = param_pos + devlen; >> + rest += strspn(rest, delim); >> + param_pos -= strlen(needle); >> + memmove(param_pos, rest, strlen(rest) + 1); >> + tmp = realloc(*haystack, strlen(*haystack) + 1); >> + if (!tmp) { >> + fprintf(stderr, "Out of memory!\n"); >> + exit(1); >> + } >> + *haystack = tmp; >> + } >> + >> + >> + return dev; >> +} >> + >> /* start is an offset to the base address of the flash chip */ >> int check_erased_range(struct flashchip *flash, int start, int len) >> { >> >> >> -- >> Developer quote of the month: >> "We are juggling too many chainsaws and flaming arrows and tigers." >> >> >> _______________________________________________ >> flashrom mailing list >> flashrom(a)flashrom.org >> http://www.flashrom.org/mailman/listinfo/flashrom >> >

2 1

[commit] r776 - trunk
by svn＠flashrom.org 24 Nov '09

24 Nov '09

Author: hailfinger Date: 2009-11-24 19:27:10 +0100 (Tue, 24 Nov 2009) New Revision: 776 Modified: trunk/buspirate_spi.c trunk/flash.h trunk/flashrom.8 trunk/flashrom.c trunk/spi.c Log: Add the ability to set Bus Pirate SPI speed via the command line. Example usage: flashrom -p buspiratespi:spispeed=2.6MHz,dev=/dev/foo flashrom -p buspiratespi:dev=/dev/foo,spispeed=2.6M Refactor programmer option parsing (this allows cleanups in other programmers as well). Increase SPI read size from 8 to 12 bytes (current single-transaction limit of the Bus Pirate raw SPI protocol). Add Bus Pirate to the list of programmers supporting 4 byte RDID. Add Bus Pirate syntax to the man page. Signed-off-by: Carl-Daniel Hailfinger <c-d.hailfinger.devel.2006(a)gmx.net> Acked-by: Sean Nelson <audiohacked(a)gmail.com> Tested-by: Sean Nelson <audiohacked(a)gmail.com> Modified: trunk/buspirate_spi.c =================================================================== --- trunk/buspirate_spi.c 2009-11-24 02:11:08 UTC (rev 775) +++ trunk/buspirate_spi.c 2009-11-24 18:27:10 UTC (rev 776) @@ -131,34 +131,37 @@ return 0; } +static const struct buspirate_spispeeds spispeeds[] = { + {"30k", 0x0}, + {"125k", 0x1}, + {"250k", 0x2}, + {"1M", 0x3}, + {"2M", 0x4}, + {"2.6M", 0x5}, + {"4M", 0x6}, + {"8M", 0x7}, + {NULL, 0x0} +}; + int buspirate_spi_init(void) { unsigned char buf[512]; int ret = 0; int i; - char *devpos = NULL; char *dev = NULL; - int devlen; + char *speed = NULL; + int spispeed = 0x7; if (programmer_param && !strlen(programmer_param)) { free(programmer_param); programmer_param = NULL; } if (programmer_param) { - devpos = strstr(programmer_param, "dev="); - if (devpos) { - devpos += 4; - devlen = strcspn(devpos, ",:"); - if (devlen) { - dev = malloc(devlen + 1); - if (!dev) { - fprintf(stderr, "Out of memory!\n"); - exit(1); - } - strncpy(dev, devpos, devlen); - dev[devlen] = '\0'; - } - } + dev = extract_param(&programmer_param, "dev=", ",:"); + speed = extract_param(&programmer_param, "spispeed=", ",:"); + if (strlen(programmer_param)) + fprintf(stderr, "Unhandled programmer parameters: %s\n", + programmer_param); free(programmer_param); programmer_param = NULL; } @@ -167,6 +170,18 @@ "buspiratespi:dev=/dev/ttyUSB0\n"); return 1; } + if (speed) { + for (i = 0; spispeeds[i].name; i++) + if (!strncasecmp(spispeeds[i].name, speed, + strlen(spispeeds[i].name))) { + spispeed = spispeeds[i].speed; + break; + } + if (!spispeeds[i].name) + fprintf(stderr, "Invalid SPI speed, using default.\n"); + } + /* This works because speeds numbering starts at 0 and is contiguous. */ + printf_debug("SPI speed is %sHz\n", spispeeds[spispeed].name); ret = buspirate_serialport_setup(dev); if (ret) @@ -224,8 +239,8 @@ return 1; } - /* Set speed to 8 MHz */ - buf[0] = 0x60 | 0x7; + /* Set SPI speed */ + buf[0] = 0x60 | spispeed; ret = buspirate_sendrecv(buf, 1, 1); if (ret) return 1; @@ -351,8 +366,7 @@ int buspirate_spi_read(struct flashchip *flash, uint8_t *buf, int start, int len) { - /* Maximum read length is 12 bytes, use 8 for now. */ - return spi_read_chunked(flash, buf, start, len, 8); + return spi_read_chunked(flash, buf, start, len, 12); } /* We could do 12-byte writes, but for now we use the generic 1-byte code. */ Modified: trunk/flash.h =================================================================== --- trunk/flash.h 2009-11-24 02:11:08 UTC (rev 775) +++ trunk/flash.h 2009-11-24 18:27:10 UTC (rev 776) @@ -488,6 +488,10 @@ int bitbang_spi_write_256(struct flashchip *flash, uint8_t *buf); /* buspirate_spi.c */ +struct buspirate_spispeeds { + const char *name; + const int speed; +}; int buspirate_spi_init(void); int buspirate_spi_shutdown(void); int buspirate_spi_send_command(unsigned int writecnt, unsigned int readcnt, const unsigned char *writearr, unsigned char *readarr); @@ -503,6 +507,7 @@ int erase_flash(struct flashchip *flash); int min(int a, int b); int max(int a, int b); +char *extract_param(char **haystack, char *needle, char *delim); int check_erased_range(struct flashchip *flash, int start, int len); int verify_range(struct flashchip *flash, uint8_t *cmpbuf, int start, int len, char *message); char *strcat_realloc(char *dest, const char *src); Modified: trunk/flashrom.8 =================================================================== --- trunk/flashrom.8 2009-11-24 02:11:08 UTC (rev 775) +++ trunk/flashrom.8 2009-11-24 18:27:10 UTC (rev 776) @@ -152,6 +152,8 @@ .sp .BR "* serprog" " (for flash ROMs attached to Urja's AVR programmer)" .sp +.BR "* buspiratespi" " (for flash ROMs attached to a Bus Pirate)" +.sp The dummy programmer has an optional parameter specifying the bus types it should support. For that you have to use the .B "flashrom -p dummy:type" @@ -219,6 +221,16 @@ instead. More information about serprog is available in serprog-protocol.txt in the source distribution. .sp +The buspiratespi programmer has a required dev parameter specifying the Bus +Pirate device node and an optional spispeed parameter specifying the frequency +of the SPI bus. The parameter delimiter is a comma. Syntax is +.B "flashrom -p buspiratespi:dev=/dev/device,spispeed=frequency" +where +.B frequency +can be any of +.B 30k 125k 250k 1M 2M 2.6M 4M 8M +(in Hz). +.sp Support for some programmers can be disabled at compile time. .B "flashrom -h" lists all supported programmers. Modified: trunk/flashrom.c =================================================================== --- trunk/flashrom.c 2009-11-24 02:11:08 UTC (rev 775) +++ trunk/flashrom.c 2009-11-24 18:27:10 UTC (rev 776) @@ -336,6 +336,60 @@ return dest; } +/* This is a somewhat hacked function similar in some ways to strtok(). + * It will look for needle in haystack, return a copy of needle and remove + * everything from the first occurrence of needle to the next delimiter + * from haystack. + */ +char *extract_param(char **haystack, char *needle, char *delim) +{ + char *param_pos, *rest, *tmp; + char *dev = NULL; + int devlen; + + param_pos = strstr(*haystack, needle); + do { + if (!param_pos) + return NULL; + /* Beginning of the string? */ + if (param_pos == *haystack) + break; + /* After a delimiter? */ + if (strchr(delim, *(param_pos - 1))) + break; + /* Continue searching. */ + param_pos++; + param_pos = strstr(param_pos, needle); + } while (1); + + if (param_pos) { + param_pos += strlen(needle); + devlen = strcspn(param_pos, delim); + if (devlen) { + dev = malloc(devlen + 1); + if (!dev) { + fprintf(stderr, "Out of memory!\n"); + exit(1); + } + strncpy(dev, param_pos, devlen); + dev[devlen] = '\0'; + } + rest = param_pos + devlen; + rest += strspn(rest, delim); + param_pos -= strlen(needle); + memmove(param_pos, rest, strlen(rest) + 1); + tmp = realloc(*haystack, strlen(*haystack) + 1); + if (!tmp) { + fprintf(stderr, "Out of memory!\n"); + exit(1); + } + *haystack = tmp; + } + + + return dev; +} + /* start is an offset to the base address of the flash chip */ int check_erased_range(struct flashchip *flash, int start, int len) { Modified: trunk/spi.c =================================================================== --- trunk/spi.c 2009-11-24 02:11:08 UTC (rev 775) +++ trunk/spi.c 2009-11-24 18:27:10 UTC (rev 776) @@ -319,6 +319,9 @@ #if DUMMY_SUPPORT == 1 case SPI_CONTROLLER_DUMMY: #endif +#if BUSPIRATE_SPI_SUPPORT == 1 + case SPI_CONTROLLER_BUSPIRATE: +#endif return probe_spi_rdid_generic(flash, 4); default: printf_debug("4b ID not supported on this SPI controller\n");

1 0

Re: [flashrom] flash erase failure
by Thao Hoang 24 Nov '09

24 Nov '09

Here is the output for the MSI CR600 laptop. Both the chipset and the chip is not recognize by flashrom. I provide all the output you ask and also included the output of dmidecode. --- On Mon, 11/23/09, Adrian Glaubitz <adrian.glaubitz(a)googlemail.com> wrote: From: Adrian Glaubitz <adrian.glaubitz(a)googlemail.com> Subject: Re: [flashrom] flash erase failure To: "Thao Hoang" <thao_hoang(a)yahoo.com>, flashrom(a)flashrom.org Date: Monday, November 23, 2009, 5:57 PM Hi, On Mon, Nov 23, 2009 at 10:52 PM, Thao Hoang <thao_hoang(a)yahoo.com> wrote: > > Thanks Adrian! I appreciate the advice and insight. You're welcome, again. > I was not able to run superiotool because it wasn't install on my system, however I did run the other two. > See attachment. If you really need me to run superiotool, I can download it and run it. > Yes, please install it. It would be nice to have a full output of: lspci -nnvvvxx superiotool -dV flashrom -V By the way, I don't see your attachments, did you forget them (thats what I usually do :)). Please post the put of all three tools like I suggested to the mailing list (flashrom(a)flashrom.org), that will help us with your board. > Don't laugh... but I haven't used IRC chat before. Never had a reason to until now I guess. Is there a way to post the chats somewhere so that anyone with a similar problem can go there without taking up your time? hum... > Well, really, IRC is nothing magical or mystical. Just use any IRC-capable software to connect (like irssi, pidgin, xchat or mIRC). Set the server to irc.freenode.org and the channel to #flashrom. Then just start asking questions and many people will be happy to help you and answer all your questions. > Also, did I get the syntax correct to force a write <./flashrom -f -w (filename) -c (chipname)>. Yes, think so. Check the manpage. > I have a laptop also that doesn't seem to work off the bat. I was able to force the read and > find some chips that successfullly read the bios. (i.e.... forced read and compared the result > using the original binary which I extracted using a dos bios utility.) Mhh, okey. Don't hesitate to post all your results to the mailing list. Please post every laptop and mainboard and whatever your try to flash in a single mail to the mailing list. And seriously, join the IRC-channel. You'll learn alot of stuff there. Adrian

1 0

← Newer
1
...
5
6
7
8
9
10
11
...
15
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

flashrom November 2009