flashrom

flashrom@flashrom.org

1 participants
9182 discussions

[PATCH] Reduce realloc syscall overhead for ft2232 and bitbang
by Carl-Daniel Hailfinger 25 Nov '09

25 Nov '09

Reduce realloc syscall overhead for FT2232 and bitbang. FT2232 ran realloc() for every executed command. Start with a big enough buffer and don't touch buffer size unless it needs to grow. Bitbang was slightly better: It only ran realloc() if buffer size changed. Still, the solution above improves performance and reliability. Signed-off-by: Carl-Daniel Hailfinger <c-d.hailfinger.devel.2006(a)gmx.net> Index: flashrom-realloc_overhead/bitbang_spi.c =================================================================== --- flashrom-realloc_overhead/bitbang_spi.c (Revision 777) +++ flashrom-realloc_overhead/bitbang_spi.c (Arbeitskopie) @@ -87,14 +87,16 @@ static unsigned char *bufout = NULL; static unsigned char *bufin = NULL; static int oldbufsize = 0; - int bufsize = max(writecnt + readcnt, 260); + int bufsize; int i; /* Arbitrary size limitation here. We're only constrained by memory. */ if (writecnt > 65536 || readcnt > 65536) return SPI_INVALID_LENGTH; - if (bufsize != oldbufsize) { + bufsize = max(writecnt + readcnt, 260); + /* Never shrink. realloc() calls are expensive. */ + if (bufsize > oldbufsize) { bufout = realloc(bufout, bufsize); if (!bufout) { fprintf(stderr, "Out of memory!\n"); @@ -109,6 +111,7 @@ free(bufout); exit(1); } + oldbufsize = bufsize; } memcpy(bufout, writearr, writecnt); Index: flashrom-realloc_overhead/ft2232_spi.c =================================================================== --- flashrom-realloc_overhead/ft2232_spi.c (Revision 777) +++ flashrom-realloc_overhead/ft2232_spi.c (Arbeitskopie) @@ -200,14 +200,22 @@ static unsigned char *buf = NULL; /* failed is special. We use bitwise ops, but it is essentially bool. */ int i = 0, ret = 0, failed = 0; + int bufsize; + static int oldbufsize = 0; if (writecnt > 65536 || readcnt > 65536) return SPI_INVALID_LENGTH; - buf = realloc(buf, writecnt + readcnt + 100); - if (!buf) { - fprintf(stderr, "Out of memory!\n"); - exit(1); // -1 + /* buf is not used for the response from the chip. */ + bufsize = max(writecnt + 9, 260); + /* Never shrink. realloc() calls are expensive. */ + if (bufsize > oldbufsize) { + buf = realloc(buf, bufsize); + if (!buf) { + fprintf(stderr, "Out of memory!\n"); + exit(1); + } + oldbufsize = bufsize; } /* -- Developer quote of the month: "We are juggling too many chainsaws and flaming arrows and tigers."

3 4

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

25 Nov '09

Author: hailfinger Date: 2009-11-25 17:58:17 +0100 (Wed, 25 Nov 2009) New Revision: 780 Modified: trunk/bitbang_spi.c trunk/ft2232_spi.c Log: Reduce realloc syscall overhead for FT2232 and bitbang. FT2232 ran realloc() for every executed command. Start with a big enough buffer and don't touch buffer size unless it needs to grow. Bitbang was slightly better: It only ran realloc() if buffer size changed. Still, the solution above improves performance and reliability. Signed-off-by: Carl-Daniel Hailfinger <c-d.hailfinger.devel.2006(a)gmx.net> Acked-by: Sean Nelson <audiohacked(a)gmail.com> Modified: trunk/bitbang_spi.c =================================================================== --- trunk/bitbang_spi.c 2009-11-25 16:41:50 UTC (rev 779) +++ trunk/bitbang_spi.c 2009-11-25 16:58:17 UTC (rev 780) @@ -87,14 +87,16 @@ static unsigned char *bufout = NULL; static unsigned char *bufin = NULL; static int oldbufsize = 0; - int bufsize = max(writecnt + readcnt, 260); + int bufsize; int i; /* Arbitrary size limitation here. We're only constrained by memory. */ if (writecnt > 65536 || readcnt > 65536) return SPI_INVALID_LENGTH; - if (bufsize != oldbufsize) { + bufsize = max(writecnt + readcnt, 260); + /* Never shrink. realloc() calls are expensive. */ + if (bufsize > oldbufsize) { bufout = realloc(bufout, bufsize); if (!bufout) { fprintf(stderr, "Out of memory!\n"); @@ -109,6 +111,7 @@ free(bufout); exit(1); } + oldbufsize = bufsize; } memcpy(bufout, writearr, writecnt); Modified: trunk/ft2232_spi.c =================================================================== --- trunk/ft2232_spi.c 2009-11-25 16:41:50 UTC (rev 779) +++ trunk/ft2232_spi.c 2009-11-25 16:58:17 UTC (rev 780) @@ -200,14 +200,22 @@ static unsigned char *buf = NULL; /* failed is special. We use bitwise ops, but it is essentially bool. */ int i = 0, ret = 0, failed = 0; + int bufsize; + static int oldbufsize = 0; if (writecnt > 65536 || readcnt > 65536) return SPI_INVALID_LENGTH; - buf = realloc(buf, writecnt + readcnt + 100); - if (!buf) { - fprintf(stderr, "Out of memory!\n"); - exit(1); // -1 + /* buf is not used for the response from the chip. */ + bufsize = max(writecnt + 9, 260 + 9); + /* Never shrink. realloc() calls are expensive. */ + if (bufsize > oldbufsize) { + buf = realloc(buf, bufsize); + if (!buf) { + fprintf(stderr, "Out of memory!\n"); + exit(1); + } + oldbufsize = bufsize; } /*

1 0

[PATCH] Clean up and fix jedec.c error handling
by Carl-Daniel Hailfinger 25 Nov '09

25 Nov '09

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> Index: flashrom-jedec_errorhandling/jedec.c =================================================================== --- flashrom-jedec_errorhandling/jedec.c (Revision 777) +++ flashrom-jedec_errorhandling/jedec.c (Arbeitskopie) @@ -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,30 @@ } 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; 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", dst); - 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 +361,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; } -- Developer quote of the month: "We are juggling too many chainsaws and flaming arrows and tigers."

2 3

[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 24 Nov '09

24 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 24 Nov '09

24 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 24 Nov '09

24 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

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

flashrom