flashrom

flashrom@flashrom.org

5 participants
9161 discussions

[commit] r1209 - trunk
by repository service 10 Oct '10

10 Oct '10

Author: hailfinger Date: Sun Oct 10 18:10:49 2010 New Revision: 1209 URL: http://flashrom.org/trac/flashrom/changeset/1209 Log: Simplify calls to inner write functions. No behavioural changes, just equivalence transformations. Signed-off-by: Carl-Daniel Hailfinger <c-d.hailfinger.devel.2006(a)gmx.net> Acked-by: Uwe Hermann <uwe(a)hermann-uwe.de> Modified: trunk/82802ab.c trunk/jedec.c trunk/m29f400bt.c trunk/sharplhf00l04.c trunk/sst28sf040.c trunk/sst49lfxxxc.c Modified: trunk/82802ab.c ============================================================================== --- trunk/82802ab.c Sun Oct 10 16:02:27 2010 (r1208) +++ trunk/82802ab.c Sun Oct 10 18:10:49 2010 (r1209) @@ -162,13 +162,7 @@ int write_82802ab(struct flashchip *flash, uint8_t *buf) { - int i; - - for (i = 0; i < flash->total_size; i++) { - write_page_82802ab(flash, buf + i * 1024, i * 1024, 1024); - } - - return 0; + return write_page_82802ab(flash, buf, 0, flash->total_size * 1024); } int unlock_28f004s5(struct flashchip *flash) Modified: trunk/jedec.c ============================================================================== --- trunk/jedec.c Sun Oct 10 16:02:27 2010 (r1208) +++ trunk/jedec.c Sun Oct 10 18:10:49 2010 (r1209) @@ -411,16 +411,11 @@ int write_jedec_1(struct flashchip *flash, uint8_t * buf) { - int i; int mask; mask = getaddrmask(flash); - for (i = 0; i < flash->total_size; i++) { - write_sector_jedec_common(flash, buf + i * 1024, i * 1024, 1024, mask); - } - - return 0; + return write_sector_jedec_common(flash, buf, 0, flash->total_size * 1024, mask); } /* erase chip with block_erase() prototype */ Modified: trunk/m29f400bt.c ============================================================================== --- trunk/m29f400bt.c Sun Oct 10 16:02:27 2010 (r1208) +++ trunk/m29f400bt.c Sun Oct 10 18:10:49 2010 (r1209) @@ -142,18 +142,5 @@ int write_m29f400bt(struct flashchip *flash, uint8_t *buf) { - int i; - int total_size = flash->total_size * 1024; - int page_size = flash->page_size; - - for (i = 0; i < (total_size / page_size) - 1; i++) { - write_page_m29f400bt(flash, buf + i * page_size, i * page_size, page_size); - } - - write_page_m29f400bt(flash, buf + 0x70000, 0x70000, 32 * 1024); - write_page_m29f400bt(flash, buf + 0x78000, 0x78000, 8 * 1024); - write_page_m29f400bt(flash, buf + 0x7a000, 0x7a000, 8 * 1024); - write_page_m29f400bt(flash, buf + 0x7c000, 0x7c000, 16 * 1024); - - return 0; + return write_page_m29f400bt(flash, buf, 0, flash->total_size * 1024); } Modified: trunk/sharplhf00l04.c ============================================================================== --- trunk/sharplhf00l04.c Sun Oct 10 16:02:27 2010 (r1208) +++ trunk/sharplhf00l04.c Sun Oct 10 18:10:49 2010 (r1209) @@ -56,16 +56,3 @@ } return 0; } - -int write_lhf00l04(struct flashchip *flash, uint8_t *buf) -{ - int i; - int total_size = flash->total_size * 1024; - int page_size = flash->page_size; - - for (i = 0; i < total_size / page_size; i++) { - write_page_82802ab(flash, buf + i * page_size, i * page_size, page_size); - } - - return 0; -} Modified: trunk/sst28sf040.c ============================================================================== --- trunk/sst28sf040.c Sun Oct 10 16:02:27 2010 (r1208) +++ trunk/sst28sf040.c Sun Oct 10 18:10:49 2010 (r1209) @@ -118,15 +118,9 @@ int write_28sf040(struct flashchip *flash, uint8_t *buf) { - int i; - int total_size = flash->total_size * 1024; - int page_size = flash->page_size; - unprotect_28sf040(flash); - for (i = 0; i < total_size / page_size; i++) { - write_sector_28sf040(flash, buf + i * page_size, i * page_size, page_size); - } + write_sector_28sf040(flash, buf, 0, flash->total_size * 1024); protect_28sf040(flash); Modified: trunk/sst49lfxxxc.c ============================================================================== --- trunk/sst49lfxxxc.c Sun Oct 10 16:02:27 2010 (r1208) +++ trunk/sst49lfxxxc.c Sun Oct 10 18:10:49 2010 (r1209) @@ -78,15 +78,10 @@ int write_49lfxxxc(struct flashchip *flash, uint8_t *buf) { - int i; - int total_size = flash->total_size * 1024; - int page_size = flash->page_size; chipaddr bios = flash->virtual_memory; write_lockbits_49lfxxxc(flash, 0); - for (i = 0; i < total_size / page_size; i++) { - write_page_82802ab(flash, buf + i * page_size, i * page_size, page_size); - } + write_page_82802ab(flash, buf, 0, flash->total_size * 1024); chip_writeb(0xFF, bios);

1 0

[PATCH] Use common function signature for inner write functions
by Carl-Daniel Hailfinger 10 Oct '10

10 Oct '10

The currently used write functions (wrappers) all use helpers which perform the actual write (inner functions). The signature of the write wrappers is: int write_chip(struct flashchip *flash, uint8_t * buf); The signature of the inner write functions varied a lot. This patch changes them to: int write_part(struct flashchip *flash, uint8_t *src, int start, int len); Did you know that flashrom has only 8 inner write functions for all flash chips? write_page_write_jedec_common write_sector_jedec_common write_sector_28sf040 spi_chip_write_256_new spi_chip_write_1_new spi_aai_write_new write_page_82802ab write_page_m29f400bt Change the function signature of wait_82802ab to eliminate single-use variables. Add sharplhf00l04.c to the list of flash chip drivers in the Makefile. While the functions in there are unused, I suspect we will need them later, and by hooking the file up we ensure that compilation won't break. With these changes it becomes easy to remove the wrappers in the next step and use the inner write functions directly to allow partial write. The 80 column limit is ignored in a few places to help with readability while the code is in flux. Signed-off-by: Carl-Daniel Hailfinger <c-d.hailfinger.devel.2006(a)gmx.net> Index: flashrom-partial_write_inner_function_signature/jedec.c =================================================================== --- flashrom-partial_write_inner_function_signature/jedec.c (Revision 1207) +++ flashrom-partial_write_inner_function_signature/jedec.c (Arbeitskopie) @@ -317,14 +317,14 @@ return failed; } -int write_sector_jedec_common(struct flashchip *flash, uint8_t *src, - chipaddr dst, unsigned int page_size, unsigned int mask) +int write_sector_jedec_common(struct flashchip *flash, uint8_t *src, int start, int len, unsigned int mask) { int i, failed = 0; + chipaddr dst = flash->virtual_memory + start; chipaddr olddst; olddst = dst; - for (i = 0; i < page_size; i++) { + for (i = 0; i < len; i++) { if (write_byte_program_jedec_common(flash, src, dst, mask)) failed = 1; dst++, src++; @@ -335,8 +335,7 @@ return failed; } -static int write_page_write_jedec_common(struct flashchip *flash, uint8_t *src, - int start, int page_size, unsigned int mask) +static int write_page_write_jedec_common(struct flashchip *flash, uint8_t *src, int start, int page_size, unsigned int mask) { int i, tried = 0, failed; uint8_t *s = src; @@ -403,8 +402,7 @@ mask = getaddrmask(flash); for (i = 0; i < total_size / page_size; i++) { - if (write_page_write_jedec_common(flash, buf + i * page_size, - i * page_size, page_size, mask)) + if (write_page_write_jedec_common(flash, buf + i * page_size, i * page_size, page_size, mask)) failed = 1; } @@ -414,14 +412,12 @@ int write_jedec_1(struct flashchip *flash, uint8_t * buf) { int i; - chipaddr bios = flash->virtual_memory; - chipaddr dst = bios; int mask; mask = getaddrmask(flash); for (i = 0; i < flash->total_size; i++) { - write_sector_jedec_common(flash, buf + i * 1024, dst + i * 1024, 1024, mask); + write_sector_jedec_common(flash, buf + i * 1024, i * 1024, 1024, mask); } return 0; Index: flashrom-partial_write_inner_function_signature/sst49lfxxxc.c =================================================================== --- flashrom-partial_write_inner_function_signature/sst49lfxxxc.c (Revision 1207) +++ flashrom-partial_write_inner_function_signature/sst49lfxxxc.c (Arbeitskopie) @@ -67,7 +67,7 @@ chip_writeb(0x30, bios); chip_writeb(0xD0, bios + address); - status = wait_82802ab(bios); + status = wait_82802ab(flash); if (check_erased_range(flash, address, sector_size)) { msg_cerr("ERASE FAILED!\n"); @@ -85,9 +85,7 @@ write_lockbits_49lfxxxc(flash, 0); for (i = 0; i < total_size / page_size; i++) { - /* write to the sector */ - write_page_82802ab(bios, buf + i * page_size, - bios + i * page_size, page_size); + write_page_82802ab(flash, buf + i * page_size, i * page_size, page_size); } chip_writeb(0xFF, bios); Index: flashrom-partial_write_inner_function_signature/sharplhf00l04.c =================================================================== --- flashrom-partial_write_inner_function_signature/sharplhf00l04.c (Revision 1207) +++ flashrom-partial_write_inner_function_signature/sharplhf00l04.c (Arbeitskopie) @@ -23,6 +23,7 @@ /* FIXME: The datasheet is unclear whether we should use toggle_ready_jedec * or wait_82802ab. + * FIXME: This file is unused. */ int erase_lhf00l04_block(struct flashchip *flash, unsigned int blockaddr, unsigned int blocklen) @@ -33,7 +34,7 @@ // clear status register chip_writeb(0x50, bios); - status = wait_82802ab(flash->virtual_memory); + status = wait_82802ab(flash); print_status_82802ab(status); // clear write protect msg_cspew("write protect is at 0x%lx\n", (wrprotect)); @@ -46,7 +47,7 @@ chip_writeb(0xd0, bios); programmer_delay(10); // now let's see what the register is - status = wait_82802ab(flash->virtual_memory); + status = wait_82802ab(flash); print_status_82802ab(status); if (check_erased_range(flash, blockaddr, blocklen)) { @@ -61,11 +62,9 @@ int i; int total_size = flash->total_size * 1024; int page_size = flash->page_size; - chipaddr bios = flash->virtual_memory; for (i = 0; i < total_size / page_size; i++) { - write_page_82802ab(bios, buf + i * page_size, - bios + i * page_size, page_size); + write_page_82802ab(flash, buf + i * page_size, i * page_size, page_size); } return 0; Index: flashrom-partial_write_inner_function_signature/Makefile =================================================================== --- flashrom-partial_write_inner_function_signature/Makefile (Revision 1207) +++ flashrom-partial_write_inner_function_signature/Makefile (Arbeitskopie) @@ -84,7 +84,7 @@ CHIP_OBJS = jedec.o stm50flw0x0x.o w39v040c.o w39v080fa.o w29ee011.o \ sst28sf040.o m29f400bt.o 82802ab.o pm49fl00x.o \ - sst49lfxxxc.o sst_fwhub.o flashchips.o spi.o spi25.o + sst49lfxxxc.o sst_fwhub.o flashchips.o spi.o spi25.o sharplhf00l04.o LIB_OBJS = layout.o Index: flashrom-partial_write_inner_function_signature/82802ab.c =================================================================== --- flashrom-partial_write_inner_function_signature/82802ab.c (Revision 1207) +++ flashrom-partial_write_inner_function_signature/82802ab.c (Arbeitskopie) @@ -88,9 +88,10 @@ return 1; } -uint8_t wait_82802ab(chipaddr bios) +uint8_t wait_82802ab(struct flashchip *flash) { uint8_t status; + chipaddr bios = flash->virtual_memory; chip_writeb(0x70, bios); if ((chip_readb(bios) & 0x80) == 0) { // it's busy @@ -132,7 +133,7 @@ programmer_delay(10); // now let's see what the register is - status = wait_82802ab(bios); + status = wait_82802ab(flash); print_status_82802ab(status); if (check_erased_range(flash, page, pagesize)) { @@ -143,26 +144,25 @@ return 0; } -void write_page_82802ab(chipaddr bios, uint8_t *src, - chipaddr dst, int page_size) +void write_page_82802ab(struct flashchip *flash, uint8_t *src, int start, int len) { int i; + chipaddr dst = flash->virtual_memory + start; - for (i = 0; i < page_size; i++) { + for (i = 0; i < len; i++) { /* transfer data from source to destination */ chip_writeb(0x40, dst); chip_writeb(*src++, dst++); - wait_82802ab(bios); + wait_82802ab(flash); } } int write_82802ab(struct flashchip *flash, uint8_t *buf) { int i; - chipaddr bios = flash->virtual_memory; for (i = 0; i < flash->total_size; i++) { - write_page_82802ab(bios, buf + i * 1024, bios + i * 1024, 1024); + write_page_82802ab(flash, buf + i * 1024, i * 1024, 1024); } return 0; Index: flashrom-partial_write_inner_function_signature/sst28sf040.c =================================================================== --- flashrom-partial_write_inner_function_signature/sst28sf040.c (Revision 1207) +++ flashrom-partial_write_inner_function_signature/sst28sf040.c (Arbeitskopie) @@ -30,8 +30,10 @@ #define RESET 0xFF #define READ_ID 0x90 -static void protect_28sf040(chipaddr bios) +static void protect_28sf040(struct flashchip *flash) { + chipaddr bios = flash->virtual_memory; + chip_readb(bios + 0x1823); chip_readb(bios + 0x1820); chip_readb(bios + 0x1822); @@ -41,8 +43,10 @@ chip_readb(bios + 0x040A); } -static void unprotect_28sf040(chipaddr bios) +static void unprotect_28sf040(struct flashchip *flash) { + chipaddr bios = flash->virtual_memory; + chip_readb(bios + 0x1823); chip_readb(bios + 0x1820); chip_readb(bios + 0x1822); @@ -59,7 +63,7 @@ chip_writeb(AUTO_PG_ERASE1, bios); chip_writeb(AUTO_PG_ERASE2, bios + address); - /* wait for Toggle bit ready */ + /* wait for Toggle bit ready */ toggle_ready_jedec(bios); if (check_erased_range(flash, address, sector_size)) { @@ -69,12 +73,13 @@ return 0; } -static int write_sector_28sf040(chipaddr bios, uint8_t *src, chipaddr dst, - unsigned int page_size) +static int write_sector_28sf040(struct flashchip *flash, uint8_t *src, int start, int len) { int i; + chipaddr bios = flash->virtual_memory; + chipaddr dst = flash->virtual_memory + start; - for (i = 0; i < page_size; i++) { + for (i = 0; i < len; i++) { /* transfer data from source to destination */ if (*src == 0xFF) { dst++, src++; @@ -96,10 +101,10 @@ { chipaddr bios = flash->virtual_memory; - unprotect_28sf040(bios); + unprotect_28sf040(flash); chip_writeb(CHIP_ERASE, bios); chip_writeb(CHIP_ERASE, bios); - protect_28sf040(bios); + protect_28sf040(flash); programmer_delay(10); toggle_ready_jedec(bios); @@ -116,17 +121,14 @@ int i; int total_size = flash->total_size * 1024; int page_size = flash->page_size; - chipaddr bios = flash->virtual_memory; - unprotect_28sf040(bios); + unprotect_28sf040(flash); for (i = 0; i < total_size / page_size; i++) { - /* write to the sector */ - write_sector_28sf040(bios, buf + i * page_size, - bios + i * page_size, page_size); + write_sector_28sf040(flash, buf + i * page_size, i * page_size, page_size); } - protect_28sf040(bios); + protect_28sf040(flash); return 0; } Index: flashrom-partial_write_inner_function_signature/stm50flw0x0x.c =================================================================== --- flashrom-partial_write_inner_function_signature/stm50flw0x0x.c (Revision 1207) +++ flashrom-partial_write_inner_function_signature/stm50flw0x0x.c (Arbeitskopie) @@ -105,7 +105,7 @@ chip_writeb(0xd0, bios); programmer_delay(10); - wait_82802ab(flash->virtual_memory); + wait_82802ab(flash); if (check_erased_range(flash, sector, sectorsize)) { msg_cerr("ERASE FAILED!\n"); Index: flashrom-partial_write_inner_function_signature/m29f400bt.c =================================================================== --- flashrom-partial_write_inner_function_signature/m29f400bt.c (Revision 1207) +++ flashrom-partial_write_inner_function_signature/m29f400bt.c (Arbeitskopie) @@ -27,12 +27,13 @@ 0x555 instead of 0x2AA. Do *not* blindly replace with standard JEDEC functions. */ -void write_page_m29f400bt(chipaddr bios, uint8_t *src, - chipaddr dst, int page_size) +void write_page_m29f400bt(struct flashchip *flash, uint8_t *src, int start, int len) { int i; + chipaddr bios = flash->virtual_memory; + chipaddr dst = flash->virtual_memory + start; - for (i = 0; i < page_size; i++) { + for (i = 0; i < len; i++) { chip_writeb(0xAA, bios + 0xAAA); chip_writeb(0x55, bios + 0x555); chip_writeb(0xA0, bios + 0xAAA); @@ -138,20 +139,15 @@ int i; int total_size = flash->total_size * 1024; int page_size = flash->page_size; - chipaddr bios = flash->virtual_memory; for (i = 0; i < (total_size / page_size) - 1; i++) { - write_page_m29f400bt(bios, buf + i * page_size, - bios + i * page_size, page_size); + write_page_m29f400bt(flash, buf + i * page_size, i * page_size, page_size); } - write_page_m29f400bt(bios, buf + 0x70000, bios + 0x70000, 32 * 1024); + write_page_m29f400bt(flash, buf + 0x70000, 0x70000, 32 * 1024); + write_page_m29f400bt(flash, buf + 0x78000, 0x78000, 8 * 1024); + write_page_m29f400bt(flash, buf + 0x7a000, 0x7a000, 8 * 1024); + write_page_m29f400bt(flash, buf + 0x7c000, 0x7c000, 16 * 1024); - write_page_m29f400bt(bios, buf + 0x78000, bios + 0x78000, 8 * 1024); - - write_page_m29f400bt(bios, buf + 0x7a000, bios + 0x7a000, 8 * 1024); - - write_page_m29f400bt(bios, buf + 0x7c000, bios + 0x7c000, 16 * 1024); - return 0; } Index: flashrom-partial_write_inner_function_signature/chipdrivers.h =================================================================== --- flashrom-partial_write_inner_function_signature/chipdrivers.h (Revision 1207) +++ flashrom-partial_write_inner_function_signature/chipdrivers.h (Arbeitskopie) @@ -65,12 +65,12 @@ int spi_aai_write(struct flashchip *flash, uint8_t *buf); /* 82802ab.c */ -uint8_t wait_82802ab(chipaddr bios); +uint8_t wait_82802ab(struct flashchip *flash); int probe_82802ab(struct flashchip *flash); int erase_block_82802ab(struct flashchip *flash, unsigned int page, unsigned int pagesize); int write_82802ab(struct flashchip *flash, uint8_t *buf); void print_status_82802ab(uint8_t status); -void write_page_82802ab(chipaddr bios, uint8_t *src, chipaddr dst, int page_size); +void write_page_82802ab(struct flashchip *flash, uint8_t *src, int start, int len); int unlock_82802ab(struct flashchip *flash); int unlock_28f004s5(struct flashchip *flash); @@ -86,7 +86,7 @@ int erase_sector_jedec(struct flashchip *flash, unsigned int page, unsigned int pagesize); int erase_block_jedec(struct flashchip *flash, unsigned int page, unsigned int blocksize); int erase_chip_block_jedec(struct flashchip *flash, unsigned int page, unsigned int blocksize); -int write_sector_jedec_common(struct flashchip *flash, uint8_t *src, chipaddr dst, unsigned int page_size, unsigned int mask); +int write_sector_jedec_common(struct flashchip *flash, uint8_t *src, int start, int len, unsigned int mask); /* m29f400bt.c */ int probe_m29f400bt(struct flashchip *flash); @@ -94,8 +94,7 @@ int block_erase_chip_m29f400bt(struct flashchip *flash, unsigned int start, unsigned int len); int write_m29f400bt(struct flashchip *flash, uint8_t *buf); void protect_m29f400bt(chipaddr bios); -void write_page_m29f400bt(chipaddr bios, uint8_t *src, - chipaddr dst, int page_size); +void write_page_m29f400bt(struct flashchip *flash, uint8_t *src, int start, int len); /* pm49fl00x.c */ int unlock_49fl00x(struct flashchip *flash); -- http://www.hailfinger.org/

2 3

[commit] r1208 - trunk
by repository service 10 Oct '10

10 Oct '10

Author: hailfinger Date: Sun Oct 10 16:02:27 2010 New Revision: 1208 URL: http://flashrom.org/trac/flashrom/changeset/1208 Log: The currently used write functions (wrappers) all use helpers which perform the actual write (inner functions). The signature of the write wrappers is: int write_chip(struct flashchip *flash, uint8_t * buf); The signature of the inner write functions varied a lot. This patch changes them to: int write_part(struct flashchip *flash, uint8_t *src, int start, int len); Did you know that flashrom has only 8 inner write functions for all flash chips? write_page_write_jedec_common write_sector_jedec_common write_sector_28sf040 spi_chip_write_256_new spi_chip_write_1_new spi_aai_write_new write_page_82802ab write_page_m29f400bt Export all inner write functions. Change the function signature of wait_82802ab to eliminate single-use variables. Remove an error message in write_page_m29f400bt which was printed for every byte written regardless of success. Add sharplhf00l04.c to the list of flash chip drivers in the Makefile. While the functions in there are unused, I suspect we will need them later, and by hooking the file up we ensure that compilation won't break. Signed-off-by: Carl-Daniel Hailfinger <c-d.hailfinger.devel.2006(a)gmx.net> Acked-by: Uwe Hermann <uwe(a)hermann-uwe.de> Modified: trunk/82802ab.c trunk/Makefile trunk/chipdrivers.h trunk/jedec.c trunk/m29f400bt.c trunk/sharplhf00l04.c trunk/sst28sf040.c trunk/sst49lfxxxc.c trunk/stm50flw0x0x.c Modified: trunk/82802ab.c ============================================================================== --- trunk/82802ab.c Fri Oct 8 22:29:57 2010 (r1207) +++ trunk/82802ab.c Sun Oct 10 16:02:27 2010 (r1208) @@ -88,9 +88,10 @@ return 1; } -uint8_t wait_82802ab(chipaddr bios) +uint8_t wait_82802ab(struct flashchip *flash) { uint8_t status; + chipaddr bios = flash->virtual_memory; chip_writeb(0x70, bios); if ((chip_readb(bios) & 0x80) == 0) { // it's busy @@ -132,7 +133,7 @@ programmer_delay(10); // now let's see what the register is - status = wait_82802ab(bios); + status = wait_82802ab(flash); print_status_82802ab(status); if (check_erased_range(flash, page, pagesize)) { @@ -143,26 +144,28 @@ return 0; } -void write_page_82802ab(chipaddr bios, uint8_t *src, - chipaddr dst, int page_size) +int write_page_82802ab(struct flashchip *flash, uint8_t *src, int start, int len) { int i; + chipaddr dst = flash->virtual_memory + start; - for (i = 0; i < page_size; i++) { + for (i = 0; i < len; i++) { /* transfer data from source to destination */ chip_writeb(0x40, dst); chip_writeb(*src++, dst++); - wait_82802ab(bios); + wait_82802ab(flash); } + + /* FIXME: Ignore errors for now. */ + return 0; } int write_82802ab(struct flashchip *flash, uint8_t *buf) { int i; - chipaddr bios = flash->virtual_memory; for (i = 0; i < flash->total_size; i++) { - write_page_82802ab(bios, buf + i * 1024, bios + i * 1024, 1024); + write_page_82802ab(flash, buf + i * 1024, i * 1024, 1024); } return 0; Modified: trunk/Makefile ============================================================================== --- trunk/Makefile Fri Oct 8 22:29:57 2010 (r1207) +++ trunk/Makefile Sun Oct 10 16:02:27 2010 (r1208) @@ -84,7 +84,7 @@ CHIP_OBJS = jedec.o stm50flw0x0x.o w39v040c.o w39v080fa.o w29ee011.o \ sst28sf040.o m29f400bt.o 82802ab.o pm49fl00x.o \ - sst49lfxxxc.o sst_fwhub.o flashchips.o spi.o spi25.o + sst49lfxxxc.o sst_fwhub.o flashchips.o spi.o spi25.o sharplhf00l04.o LIB_OBJS = layout.o Modified: trunk/chipdrivers.h ============================================================================== --- trunk/chipdrivers.h Fri Oct 8 22:29:57 2010 (r1207) +++ trunk/chipdrivers.h Sun Oct 10 16:02:27 2010 (r1208) @@ -65,12 +65,12 @@ int spi_aai_write(struct flashchip *flash, uint8_t *buf); /* 82802ab.c */ -uint8_t wait_82802ab(chipaddr bios); +uint8_t wait_82802ab(struct flashchip *flash); int probe_82802ab(struct flashchip *flash); int erase_block_82802ab(struct flashchip *flash, unsigned int page, unsigned int pagesize); int write_82802ab(struct flashchip *flash, uint8_t *buf); void print_status_82802ab(uint8_t status); -void write_page_82802ab(chipaddr bios, uint8_t *src, chipaddr dst, int page_size); +int write_page_82802ab(struct flashchip *flash, uint8_t *src, int start, int len); int unlock_82802ab(struct flashchip *flash); int unlock_28f004s5(struct flashchip *flash); @@ -86,7 +86,8 @@ int erase_sector_jedec(struct flashchip *flash, unsigned int page, unsigned int pagesize); int erase_block_jedec(struct flashchip *flash, unsigned int page, unsigned int blocksize); int erase_chip_block_jedec(struct flashchip *flash, unsigned int page, unsigned int blocksize); -int write_sector_jedec_common(struct flashchip *flash, uint8_t *src, chipaddr dst, unsigned int page_size, unsigned int mask); +int write_sector_jedec_common(struct flashchip *flash, uint8_t *src, int start, int len, unsigned int mask); +int write_page_write_jedec_common(struct flashchip *flash, uint8_t *src, int start, int page_size, unsigned int mask); /* m29f400bt.c */ int probe_m29f400bt(struct flashchip *flash); @@ -94,8 +95,7 @@ int block_erase_chip_m29f400bt(struct flashchip *flash, unsigned int start, unsigned int len); int write_m29f400bt(struct flashchip *flash, uint8_t *buf); void protect_m29f400bt(chipaddr bios); -void write_page_m29f400bt(chipaddr bios, uint8_t *src, - chipaddr dst, int page_size); +int write_page_m29f400bt(struct flashchip *flash, uint8_t *src, int start, int len); /* pm49fl00x.c */ int unlock_49fl00x(struct flashchip *flash); @@ -105,6 +105,7 @@ int erase_chip_28sf040(struct flashchip *flash, unsigned int addr, unsigned int blocklen); int erase_sector_28sf040(struct flashchip *flash, unsigned int address, unsigned int sector_size); int write_28sf040(struct flashchip *flash, uint8_t *buf); +int write_sector_28sf040(struct flashchip *flash, uint8_t *src, int start, int len); /* sst49lfxxxc.c */ int erase_sector_49lfxxxc(struct flashchip *flash, unsigned int address, unsigned int sector_size); Modified: trunk/jedec.c ============================================================================== --- trunk/jedec.c Fri Oct 8 22:29:57 2010 (r1207) +++ trunk/jedec.c Sun Oct 10 16:02:27 2010 (r1208) @@ -317,14 +317,14 @@ return failed; } -int write_sector_jedec_common(struct flashchip *flash, uint8_t *src, - chipaddr dst, unsigned int page_size, unsigned int mask) +int write_sector_jedec_common(struct flashchip *flash, uint8_t *src, int start, int len, unsigned int mask) { int i, failed = 0; + chipaddr dst = flash->virtual_memory + start; chipaddr olddst; olddst = dst; - for (i = 0; i < page_size; i++) { + for (i = 0; i < len; i++) { if (write_byte_program_jedec_common(flash, src, dst, mask)) failed = 1; dst++, src++; @@ -335,8 +335,7 @@ return failed; } -static int write_page_write_jedec_common(struct flashchip *flash, uint8_t *src, - int start, int page_size, unsigned int mask) +int write_page_write_jedec_common(struct flashchip *flash, uint8_t *src, int start, int page_size, unsigned int mask) { int i, tried = 0, failed; uint8_t *s = src; @@ -403,8 +402,7 @@ mask = getaddrmask(flash); for (i = 0; i < total_size / page_size; i++) { - if (write_page_write_jedec_common(flash, buf + i * page_size, - i * page_size, page_size, mask)) + if (write_page_write_jedec_common(flash, buf + i * page_size, i * page_size, page_size, mask)) failed = 1; } @@ -414,14 +412,12 @@ int write_jedec_1(struct flashchip *flash, uint8_t * buf) { int i; - chipaddr bios = flash->virtual_memory; - chipaddr dst = bios; int mask; mask = getaddrmask(flash); for (i = 0; i < flash->total_size; i++) { - write_sector_jedec_common(flash, buf + i * 1024, dst + i * 1024, 1024, mask); + write_sector_jedec_common(flash, buf + i * 1024, i * 1024, 1024, mask); } return 0; Modified: trunk/m29f400bt.c ============================================================================== --- trunk/m29f400bt.c Fri Oct 8 22:29:57 2010 (r1207) +++ trunk/m29f400bt.c Sun Oct 10 16:02:27 2010 (r1208) @@ -27,12 +27,13 @@ 0x555 instead of 0x2AA. Do *not* blindly replace with standard JEDEC functions. */ -void write_page_m29f400bt(chipaddr bios, uint8_t *src, - chipaddr dst, int page_size) +int write_page_m29f400bt(struct flashchip *flash, uint8_t *src, int start, int len) { int i; + chipaddr bios = flash->virtual_memory; + chipaddr dst = flash->virtual_memory + start; - for (i = 0; i < page_size; i++) { + for (i = 0; i < len; i++) { chip_writeb(0xAA, bios + 0xAAA); chip_writeb(0x55, bios + 0x555); chip_writeb(0xA0, bios + 0xAAA); @@ -40,11 +41,17 @@ /* transfer data from source to destination */ chip_writeb(*src, dst); toggle_ready_jedec(dst); +#if 0 + /* We only want to print something in the error case. */ msg_cerr("Value in the flash at address 0x%lx = %#x, want %#x\n", (dst - bios), chip_readb(dst), *src); +#endif dst++; src++; } + + /* FIXME: Ignore errors for now. */ + return 0; } int probe_m29f400bt(struct flashchip *flash) @@ -138,20 +145,15 @@ int i; int total_size = flash->total_size * 1024; int page_size = flash->page_size; - chipaddr bios = flash->virtual_memory; for (i = 0; i < (total_size / page_size) - 1; i++) { - write_page_m29f400bt(bios, buf + i * page_size, - bios + i * page_size, page_size); + write_page_m29f400bt(flash, buf + i * page_size, i * page_size, page_size); } - write_page_m29f400bt(bios, buf + 0x70000, bios + 0x70000, 32 * 1024); - - write_page_m29f400bt(bios, buf + 0x78000, bios + 0x78000, 8 * 1024); - - write_page_m29f400bt(bios, buf + 0x7a000, bios + 0x7a000, 8 * 1024); - - write_page_m29f400bt(bios, buf + 0x7c000, bios + 0x7c000, 16 * 1024); + write_page_m29f400bt(flash, buf + 0x70000, 0x70000, 32 * 1024); + write_page_m29f400bt(flash, buf + 0x78000, 0x78000, 8 * 1024); + write_page_m29f400bt(flash, buf + 0x7a000, 0x7a000, 8 * 1024); + write_page_m29f400bt(flash, buf + 0x7c000, 0x7c000, 16 * 1024); return 0; } Modified: trunk/sharplhf00l04.c ============================================================================== --- trunk/sharplhf00l04.c Fri Oct 8 22:29:57 2010 (r1207) +++ trunk/sharplhf00l04.c Sun Oct 10 16:02:27 2010 (r1208) @@ -23,6 +23,7 @@ /* FIXME: The datasheet is unclear whether we should use toggle_ready_jedec * or wait_82802ab. + * FIXME: This file is unused. */ int erase_lhf00l04_block(struct flashchip *flash, unsigned int blockaddr, unsigned int blocklen) @@ -33,7 +34,7 @@ // clear status register chip_writeb(0x50, bios); - status = wait_82802ab(flash->virtual_memory); + status = wait_82802ab(flash); print_status_82802ab(status); // clear write protect msg_cspew("write protect is at 0x%lx\n", (wrprotect)); @@ -46,7 +47,7 @@ chip_writeb(0xd0, bios); programmer_delay(10); // now let's see what the register is - status = wait_82802ab(flash->virtual_memory); + status = wait_82802ab(flash); print_status_82802ab(status); if (check_erased_range(flash, blockaddr, blocklen)) { @@ -61,11 +62,9 @@ int i; int total_size = flash->total_size * 1024; int page_size = flash->page_size; - chipaddr bios = flash->virtual_memory; for (i = 0; i < total_size / page_size; i++) { - write_page_82802ab(bios, buf + i * page_size, - bios + i * page_size, page_size); + write_page_82802ab(flash, buf + i * page_size, i * page_size, page_size); } return 0; Modified: trunk/sst28sf040.c ============================================================================== --- trunk/sst28sf040.c Fri Oct 8 22:29:57 2010 (r1207) +++ trunk/sst28sf040.c Sun Oct 10 16:02:27 2010 (r1208) @@ -30,8 +30,10 @@ #define RESET 0xFF #define READ_ID 0x90 -static void protect_28sf040(chipaddr bios) +static void protect_28sf040(struct flashchip *flash) { + chipaddr bios = flash->virtual_memory; + chip_readb(bios + 0x1823); chip_readb(bios + 0x1820); chip_readb(bios + 0x1822); @@ -41,8 +43,10 @@ chip_readb(bios + 0x040A); } -static void unprotect_28sf040(chipaddr bios) +static void unprotect_28sf040(struct flashchip *flash) { + chipaddr bios = flash->virtual_memory; + chip_readb(bios + 0x1823); chip_readb(bios + 0x1820); chip_readb(bios + 0x1822); @@ -59,7 +63,7 @@ chip_writeb(AUTO_PG_ERASE1, bios); chip_writeb(AUTO_PG_ERASE2, bios + address); - /* wait for Toggle bit ready */ + /* wait for Toggle bit ready */ toggle_ready_jedec(bios); if (check_erased_range(flash, address, sector_size)) { @@ -69,12 +73,13 @@ return 0; } -static int write_sector_28sf040(chipaddr bios, uint8_t *src, chipaddr dst, - unsigned int page_size) +int write_sector_28sf040(struct flashchip *flash, uint8_t *src, int start, int len) { int i; + chipaddr bios = flash->virtual_memory; + chipaddr dst = flash->virtual_memory + start; - for (i = 0; i < page_size; i++) { + for (i = 0; i < len; i++) { /* transfer data from source to destination */ if (*src == 0xFF) { dst++, src++; @@ -96,10 +101,10 @@ { chipaddr bios = flash->virtual_memory; - unprotect_28sf040(bios); + unprotect_28sf040(flash); chip_writeb(CHIP_ERASE, bios); chip_writeb(CHIP_ERASE, bios); - protect_28sf040(bios); + protect_28sf040(flash); programmer_delay(10); toggle_ready_jedec(bios); @@ -116,17 +121,14 @@ int i; int total_size = flash->total_size * 1024; int page_size = flash->page_size; - chipaddr bios = flash->virtual_memory; - unprotect_28sf040(bios); + unprotect_28sf040(flash); for (i = 0; i < total_size / page_size; i++) { - /* write to the sector */ - write_sector_28sf040(bios, buf + i * page_size, - bios + i * page_size, page_size); + write_sector_28sf040(flash, buf + i * page_size, i * page_size, page_size); } - protect_28sf040(bios); + protect_28sf040(flash); return 0; } Modified: trunk/sst49lfxxxc.c ============================================================================== --- trunk/sst49lfxxxc.c Fri Oct 8 22:29:57 2010 (r1207) +++ trunk/sst49lfxxxc.c Sun Oct 10 16:02:27 2010 (r1208) @@ -67,7 +67,7 @@ chip_writeb(0x30, bios); chip_writeb(0xD0, bios + address); - status = wait_82802ab(bios); + status = wait_82802ab(flash); if (check_erased_range(flash, address, sector_size)) { msg_cerr("ERASE FAILED!\n"); @@ -85,9 +85,7 @@ write_lockbits_49lfxxxc(flash, 0); for (i = 0; i < total_size / page_size; i++) { - /* write to the sector */ - write_page_82802ab(bios, buf + i * page_size, - bios + i * page_size, page_size); + write_page_82802ab(flash, buf + i * page_size, i * page_size, page_size); } chip_writeb(0xFF, bios); Modified: trunk/stm50flw0x0x.c ============================================================================== --- trunk/stm50flw0x0x.c Fri Oct 8 22:29:57 2010 (r1207) +++ trunk/stm50flw0x0x.c Sun Oct 10 16:02:27 2010 (r1208) @@ -105,7 +105,7 @@ chip_writeb(0xd0, bios); programmer_delay(10); - wait_82802ab(flash->virtual_memory); + wait_82802ab(flash); if (check_erased_range(flash, sector, sectorsize)) { msg_cerr("ERASE FAILED!\n");

1 0

Manually setting upper address lines (parallel flash)
by max 10 Oct '10

10 Oct '10

Suppose you want to program a 2mb parallel flash chip but the board only supports 1mb. Assuming the flash chip ignores the upper address line when decoding the command addresses (e.g. 5555) - then it should be possible to manually tie the upper address line to 0V/5V and program half at a time, yes? For programming software to allow this trick, it is required that a "write without chip erase" option be available. Then the user can run the program twice, first with chip erase and the second time (after manually changing the upper address line) without chip erase. Thanks, Dan

2 1

DOS binary doesn't work?
by max 10 Oct '10

10 Oct '10

I tried to run the DOS binary found here: http://khepri.coresystems.de/~idwer/flashrom/ But it gave this message: No coreboot table found. DMI pipe open error Is this version supposed to work? Something I'm doing wrong? Thanks, Dan

4 18

[PATCH] Remove progress printing
by Carl-Daniel Hailfinger 08 Oct '10

08 Oct '10

Remove progress printing from individual flash chip drivers. Progress printing should be handled in the generic code, and will end up there once partial write is possible. In the meantime, progress printing in flash chip drivers makes conversion to partial write difficult and that's why I want to kill it. Signed-off-by: Carl-Daniel Hailfinger <c-d.hailfinger.devel.2006(a)gmx.net> Index: flashrom-kill_progressprinting/jedec.c =================================================================== --- flashrom-kill_progressprinting/jedec.c (Revision 1206) +++ flashrom-kill_progressprinting/jedec.c (Arbeitskopie) @@ -402,15 +402,11 @@ mask = getaddrmask(flash); - msg_cinfo("Programming page: "); for (i = 0; i < total_size / page_size; i++) { - msg_cinfo("%04d at address: 0x%08x", i, i * page_size); if (write_page_write_jedec_common(flash, buf + i * page_size, i * page_size, page_size, mask)) failed = 1; - msg_cinfo("\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"); } - msg_cinfo("DONE!\n"); return failed; } @@ -424,18 +420,10 @@ mask = getaddrmask(flash); - msg_cinfo("Programming page: "); for (i = 0; i < flash->total_size; i++) { - if ((i & 0x3) == 0) - msg_cinfo("address: 0x%08lx", (unsigned long)i * 1024); - write_sector_jedec_common(flash, buf + i * 1024, dst + i * 1024, 1024, mask); - - if ((i & 0x3) == 0) - msg_cinfo("\b\b\b\b\b\b\b\b\b\b\b\b\b\b\b\b\b\b\b"); } - msg_cinfo("DONE!\n"); return 0; } Index: flashrom-kill_progressprinting/sst49lfxxxc.c =================================================================== --- flashrom-kill_progressprinting/sst49lfxxxc.c (Revision 1206) +++ flashrom-kill_progressprinting/sst49lfxxxc.c (Arbeitskopie) @@ -84,16 +84,11 @@ chipaddr bios = flash->virtual_memory; write_lockbits_49lfxxxc(flash, 0); - msg_cinfo("Programming page: "); for (i = 0; i < total_size / page_size; i++) { - /* write to the sector */ - msg_cinfo("%04d at address: 0x%08x", i, i * page_size); write_page_82802ab(bios, buf + i * page_size, bios + i * page_size, page_size); - msg_cinfo("\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"); } - msg_cinfo("\n"); chip_writeb(0xFF, bios); Index: flashrom-kill_progressprinting/sharplhf00l04.c =================================================================== --- flashrom-kill_progressprinting/sharplhf00l04.c (Revision 1206) +++ flashrom-kill_progressprinting/sharplhf00l04.c (Arbeitskopie) @@ -33,7 +33,6 @@ // clear status register chip_writeb(0x50, bios); - msg_cdbg("Erase at 0x%lx\n", bios); status = wait_82802ab(flash->virtual_memory); print_status_82802ab(status); // clear write protect @@ -49,7 +48,6 @@ // now let's see what the register is status = wait_82802ab(flash->virtual_memory); print_status_82802ab(status); - msg_cinfo("DONE BLOCK 0x%x\n", blockaddr); if (check_erased_range(flash, blockaddr, blocklen)) { msg_cerr("ERASE FAILED!\n"); @@ -65,14 +63,10 @@ int page_size = flash->page_size; chipaddr bios = flash->virtual_memory; - msg_cinfo("Programming page: "); for (i = 0; i < total_size / page_size; i++) { - msg_cinfo("%04d at address: 0x%08x", i, i * page_size); write_page_82802ab(bios, buf + i * page_size, bios + i * page_size, page_size); - msg_cinfo("\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"); } - msg_cinfo("\n"); return 0; } Index: flashrom-kill_progressprinting/82802ab.c =================================================================== --- flashrom-kill_progressprinting/82802ab.c (Revision 1206) +++ flashrom-kill_progressprinting/82802ab.c (Arbeitskopie) @@ -139,7 +139,6 @@ msg_cerr("ERASE FAILED!\n"); return -1; } - msg_cinfo("DONE BLOCK 0x%x\n", page); return 0; } @@ -162,18 +161,10 @@ int i; chipaddr bios = flash->virtual_memory; - msg_cinfo("Programming at: "); for (i = 0; i < flash->total_size; i++) { - if ((i & 0x3) == 0) - msg_cinfo("address: 0x%08lx", (unsigned long)i * 1024); - write_page_82802ab(bios, buf + i * 1024, bios + i * 1024, 1024); - - if ((i & 0x3) == 0) - msg_cinfo("\b\b\b\b\b\b\b\b\b\b\b\b\b\b\b\b\b\b\b"); } - msg_cinfo("DONE!\n"); return 0; } Index: flashrom-kill_progressprinting/sst28sf040.c =================================================================== --- flashrom-kill_progressprinting/sst28sf040.c (Revision 1206) +++ flashrom-kill_progressprinting/sst28sf040.c (Arbeitskopie) @@ -120,15 +120,11 @@ unprotect_28sf040(bios); - msg_cinfo("Programming page: "); for (i = 0; i < total_size / page_size; i++) { /* write to the sector */ - msg_cinfo("%04d at address: 0x%08x", i, i * page_size); write_sector_28sf040(bios, buf + i * page_size, bios + i * page_size, page_size); - msg_cinfo("\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"); } - msg_cinfo("\n"); protect_28sf040(bios); Index: flashrom-kill_progressprinting/stm50flw0x0x.c =================================================================== --- flashrom-kill_progressprinting/stm50flw0x0x.c (Revision 1206) +++ flashrom-kill_progressprinting/stm50flw0x0x.c (Arbeitskopie) @@ -100,7 +100,6 @@ // clear status register chip_writeb(0x50, bios); - msg_cdbg("Erase at 0x%lx\n", bios); // now start it chip_writeb(0x32, bios); chip_writeb(0xd0, bios); @@ -112,7 +111,6 @@ msg_cerr("ERASE FAILED!\n"); return -1; } - msg_cinfo("DONE BLOCK 0x%x\n", sector); return 0; } @@ -130,10 +128,7 @@ return -1; } - msg_cinfo("Erasing page:\n"); for (i = 0; i < total_size / page_size; i++) { - msg_cinfo("\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"); - msg_cinfo("%04d at address: 0x%08x ", i, i * page_size); //if (unlock_block_stm50flw0x0x(flash, i * page_size)) { // msg_cerr("UNLOCK FAILED!\n"); // return -1; @@ -143,7 +138,6 @@ return -1; } } - msg_cinfo("\n"); return 0; } Index: flashrom-kill_progressprinting/m29f400bt.c =================================================================== --- flashrom-kill_progressprinting/m29f400bt.c (Revision 1206) +++ flashrom-kill_progressprinting/m29f400bt.c (Arbeitskopie) @@ -39,8 +39,6 @@ /* transfer data from source to destination */ chip_writeb(*src, dst); - //chip_writeb(0xF0, bios); - //programmer_delay(5); toggle_ready_jedec(dst); msg_cerr("Value in the flash at address 0x%lx = %#x, want %#x\n", (dst - bios), chip_readb(dst), *src); @@ -113,7 +111,6 @@ chip_writeb(0xAA, bios + 0xAAA); chip_writeb(0x55, bios + 0x555); - //chip_writeb(0x10, bios + 0xAAA); chip_writeb(0x30, dst); programmer_delay(10); @@ -143,43 +140,18 @@ int page_size = flash->page_size; chipaddr bios = flash->virtual_memory; - msg_cinfo("Programming page:\n "); - /********************************* - *Pages for M29F400BT: - * 16 0x7c000 0x7ffff TOP - * 8 0x7a000 0x7bfff - * 8 0x78000 0x79fff - * 32 0x70000 0x77fff - * 64 0x60000 0x6ffff - * 64 0x50000 0x5ffff - * 64 0x40000 0x4ffff - *--------------------------------- - * 64 0x30000 0x3ffff - * 64 0x20000 0x2ffff - * 64 0x10000 0x1ffff - * 64 0x00000 0x0ffff BOTTOM - *********************************/ - msg_cinfo("total_size/page_size = %d\n", total_size / page_size); for (i = 0; i < (total_size / page_size) - 1; i++) { - msg_cinfo("%04d at address: 0x%08x\n", i, i * page_size); write_page_m29f400bt(bios, buf + i * page_size, bios + i * page_size, page_size); - msg_cinfo("\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"); } - msg_cinfo("%04d at address: 0x%08x\n", 7, 0x70000); write_page_m29f400bt(bios, buf + 0x70000, bios + 0x70000, 32 * 1024); - msg_cinfo("%04d at address: 0x%08x\n", 8, 0x78000); write_page_m29f400bt(bios, buf + 0x78000, bios + 0x78000, 8 * 1024); - msg_cinfo("%04d at address: 0x%08x\n", 9, 0x7a000); write_page_m29f400bt(bios, buf + 0x7a000, bios + 0x7a000, 8 * 1024); - msg_cinfo("%04d at address: 0x%08x\n", 10, 0x7c000); write_page_m29f400bt(bios, buf + 0x7c000, bios + 0x7c000, 16 * 1024); - msg_cinfo("\n"); - return 0; } -- http://www.hailfinger.org/

2 2

[commit] r1207 - trunk
by repository service 08 Oct '10

08 Oct '10

Author: hailfinger Date: Fri Oct 8 22:29:57 2010 New Revision: 1207 URL: http://flashrom.org/trac/flashrom/changeset/1207 Log: Remove progress printing from individual flash chip drivers. Progress printing should be handled in the generic code, and will end up there once partial write is possible. Signed-off-by: Carl-Daniel Hailfinger <c-d.hailfinger.devel.2006(a)gmx.net> Acked-by: Sean Nelson <audiohacked(a)gmail.com> Modified: trunk/82802ab.c trunk/jedec.c trunk/m29f400bt.c trunk/sharplhf00l04.c trunk/sst28sf040.c trunk/sst49lfxxxc.c trunk/stm50flw0x0x.c Modified: trunk/82802ab.c ============================================================================== --- trunk/82802ab.c Fri Oct 8 20:52:29 2010 (r1206) +++ trunk/82802ab.c Fri Oct 8 22:29:57 2010 (r1207) @@ -139,7 +139,6 @@ msg_cerr("ERASE FAILED!\n"); return -1; } - msg_cinfo("DONE BLOCK 0x%x\n", page); return 0; } @@ -162,18 +161,10 @@ int i; chipaddr bios = flash->virtual_memory; - msg_cinfo("Programming at: "); for (i = 0; i < flash->total_size; i++) { - if ((i & 0x3) == 0) - msg_cinfo("address: 0x%08lx", (unsigned long)i * 1024); - write_page_82802ab(bios, buf + i * 1024, bios + i * 1024, 1024); - - if ((i & 0x3) == 0) - msg_cinfo("\b\b\b\b\b\b\b\b\b\b\b\b\b\b\b\b\b\b\b"); } - msg_cinfo("DONE!\n"); return 0; } Modified: trunk/jedec.c ============================================================================== --- trunk/jedec.c Fri Oct 8 20:52:29 2010 (r1206) +++ trunk/jedec.c Fri Oct 8 22:29:57 2010 (r1207) @@ -402,15 +402,11 @@ mask = getaddrmask(flash); - msg_cinfo("Programming page: "); for (i = 0; i < total_size / page_size; i++) { - msg_cinfo("%04d at address: 0x%08x", i, i * page_size); if (write_page_write_jedec_common(flash, buf + i * page_size, i * page_size, page_size, mask)) failed = 1; - msg_cinfo("\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"); } - msg_cinfo("DONE!\n"); return failed; } @@ -424,18 +420,10 @@ mask = getaddrmask(flash); - msg_cinfo("Programming page: "); for (i = 0; i < flash->total_size; i++) { - if ((i & 0x3) == 0) - msg_cinfo("address: 0x%08lx", (unsigned long)i * 1024); - write_sector_jedec_common(flash, buf + i * 1024, dst + i * 1024, 1024, mask); - - if ((i & 0x3) == 0) - msg_cinfo("\b\b\b\b\b\b\b\b\b\b\b\b\b\b\b\b\b\b\b"); } - msg_cinfo("DONE!\n"); return 0; } Modified: trunk/m29f400bt.c ============================================================================== --- trunk/m29f400bt.c Fri Oct 8 20:52:29 2010 (r1206) +++ trunk/m29f400bt.c Fri Oct 8 22:29:57 2010 (r1207) @@ -39,8 +39,6 @@ /* transfer data from source to destination */ chip_writeb(*src, dst); - //chip_writeb(0xF0, bios); - //programmer_delay(5); toggle_ready_jedec(dst); msg_cerr("Value in the flash at address 0x%lx = %#x, want %#x\n", (dst - bios), chip_readb(dst), *src); @@ -113,7 +111,6 @@ chip_writeb(0xAA, bios + 0xAAA); chip_writeb(0x55, bios + 0x555); - //chip_writeb(0x10, bios + 0xAAA); chip_writeb(0x30, dst); programmer_delay(10); @@ -143,43 +140,18 @@ int page_size = flash->page_size; chipaddr bios = flash->virtual_memory; - msg_cinfo("Programming page:\n "); - /********************************* - *Pages for M29F400BT: - * 16 0x7c000 0x7ffff TOP - * 8 0x7a000 0x7bfff - * 8 0x78000 0x79fff - * 32 0x70000 0x77fff - * 64 0x60000 0x6ffff - * 64 0x50000 0x5ffff - * 64 0x40000 0x4ffff - *--------------------------------- - * 64 0x30000 0x3ffff - * 64 0x20000 0x2ffff - * 64 0x10000 0x1ffff - * 64 0x00000 0x0ffff BOTTOM - *********************************/ - msg_cinfo("total_size/page_size = %d\n", total_size / page_size); for (i = 0; i < (total_size / page_size) - 1; i++) { - msg_cinfo("%04d at address: 0x%08x\n", i, i * page_size); write_page_m29f400bt(bios, buf + i * page_size, bios + i * page_size, page_size); - msg_cinfo("\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"); } - msg_cinfo("%04d at address: 0x%08x\n", 7, 0x70000); write_page_m29f400bt(bios, buf + 0x70000, bios + 0x70000, 32 * 1024); - msg_cinfo("%04d at address: 0x%08x\n", 8, 0x78000); write_page_m29f400bt(bios, buf + 0x78000, bios + 0x78000, 8 * 1024); - msg_cinfo("%04d at address: 0x%08x\n", 9, 0x7a000); write_page_m29f400bt(bios, buf + 0x7a000, bios + 0x7a000, 8 * 1024); - msg_cinfo("%04d at address: 0x%08x\n", 10, 0x7c000); write_page_m29f400bt(bios, buf + 0x7c000, bios + 0x7c000, 16 * 1024); - msg_cinfo("\n"); - return 0; } Modified: trunk/sharplhf00l04.c ============================================================================== --- trunk/sharplhf00l04.c Fri Oct 8 20:52:29 2010 (r1206) +++ trunk/sharplhf00l04.c Fri Oct 8 22:29:57 2010 (r1207) @@ -33,7 +33,6 @@ // clear status register chip_writeb(0x50, bios); - msg_cdbg("Erase at 0x%lx\n", bios); status = wait_82802ab(flash->virtual_memory); print_status_82802ab(status); // clear write protect @@ -49,7 +48,6 @@ // now let's see what the register is status = wait_82802ab(flash->virtual_memory); print_status_82802ab(status); - msg_cinfo("DONE BLOCK 0x%x\n", blockaddr); if (check_erased_range(flash, blockaddr, blocklen)) { msg_cerr("ERASE FAILED!\n"); @@ -65,14 +63,10 @@ int page_size = flash->page_size; chipaddr bios = flash->virtual_memory; - msg_cinfo("Programming page: "); for (i = 0; i < total_size / page_size; i++) { - msg_cinfo("%04d at address: 0x%08x", i, i * page_size); write_page_82802ab(bios, buf + i * page_size, bios + i * page_size, page_size); - msg_cinfo("\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"); } - msg_cinfo("\n"); return 0; } Modified: trunk/sst28sf040.c ============================================================================== --- trunk/sst28sf040.c Fri Oct 8 20:52:29 2010 (r1206) +++ trunk/sst28sf040.c Fri Oct 8 22:29:57 2010 (r1207) @@ -120,15 +120,11 @@ unprotect_28sf040(bios); - msg_cinfo("Programming page: "); for (i = 0; i < total_size / page_size; i++) { /* write to the sector */ - msg_cinfo("%04d at address: 0x%08x", i, i * page_size); write_sector_28sf040(bios, buf + i * page_size, bios + i * page_size, page_size); - msg_cinfo("\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"); } - msg_cinfo("\n"); protect_28sf040(bios); Modified: trunk/sst49lfxxxc.c ============================================================================== --- trunk/sst49lfxxxc.c Fri Oct 8 20:52:29 2010 (r1206) +++ trunk/sst49lfxxxc.c Fri Oct 8 22:29:57 2010 (r1207) @@ -84,16 +84,11 @@ chipaddr bios = flash->virtual_memory; write_lockbits_49lfxxxc(flash, 0); - msg_cinfo("Programming page: "); for (i = 0; i < total_size / page_size; i++) { - /* write to the sector */ - msg_cinfo("%04d at address: 0x%08x", i, i * page_size); write_page_82802ab(bios, buf + i * page_size, bios + i * page_size, page_size); - msg_cinfo("\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"); } - msg_cinfo("\n"); chip_writeb(0xFF, bios); Modified: trunk/stm50flw0x0x.c ============================================================================== --- trunk/stm50flw0x0x.c Fri Oct 8 20:52:29 2010 (r1206) +++ trunk/stm50flw0x0x.c Fri Oct 8 22:29:57 2010 (r1207) @@ -100,7 +100,6 @@ // clear status register chip_writeb(0x50, bios); - msg_cdbg("Erase at 0x%lx\n", bios); // now start it chip_writeb(0x32, bios); chip_writeb(0xd0, bios); @@ -112,7 +111,6 @@ msg_cerr("ERASE FAILED!\n"); return -1; } - msg_cinfo("DONE BLOCK 0x%x\n", sector); return 0; } @@ -130,10 +128,7 @@ return -1; } - msg_cinfo("Erasing page:\n"); for (i = 0; i < total_size / page_size; i++) { - msg_cinfo("\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"); - msg_cinfo("%04d at address: 0x%08x ", i, i * page_size); //if (unlock_block_stm50flw0x0x(flash, i * page_size)) { // msg_cerr("UNLOCK FAILED!\n"); // return -1; @@ -143,7 +138,6 @@ return -1; } } - msg_cinfo("\n"); return 0; }

1 0

[PATCH] Move implicit erase out of chip drivers, clean up
by Carl-Daniel Hailfinger 08 Oct '10

08 Oct '10

flashrom had an implicit erase-on-write for most flash chip and programmer drivers, but it was not entirely consistent. Some drivers had their own hand-rolled partial update functionality which made handling partial updates from generic code impossible. Move implicit erase out of chip drivers, clean up the chip write functions at the same time. A full chip erase is now performed in the generic code for all flash chips on write, and after that the whole chip is written. This is needed before we can change write function signature of the write functions to take start+len. Side note: With this patch and one or two followup patches, more functions will be easily recognizable as duplicates and can be eliminated. Compile tested and proofread, but that's it. The patch may cause flashrom to eat your dog or it may cause your dog to eat burned flash chips. Please test on real hardware. Thanks! Signed-off-by: Carl-Daniel Hailfinger <c-d.hailfinger.devel.2006(a)gmx.net> Index: flashrom-partial_write_no_autoerase/flash.h =================================================================== --- flashrom-partial_write_no_autoerase/flash.h (Revision 1005) +++ flashrom-partial_write_no_autoerase/flash.h (Arbeitskopie) @@ -676,7 +676,7 @@ int sb600_spi_send_command(unsigned int writecnt, unsigned int readcnt, const unsigned char *writearr, unsigned char *readarr); int sb600_spi_read(struct flashchip *flash, uint8_t *buf, int start, int len); -int sb600_spi_write_1(struct flashchip *flash, uint8_t *buf); +int sb600_spi_write_256(struct flashchip *flash, uint8_t *buf); extern uint8_t *sb600_spibar; /* wbsio_spi.c */ Index: flashrom-partial_write_no_autoerase/spi25.c =================================================================== --- flashrom-partial_write_no_autoerase/spi25.c (Revision 1005) +++ flashrom-partial_write_no_autoerase/spi25.c (Arbeitskopie) @@ -875,6 +875,7 @@ /* * Read a part of the flash chip. + * FIXME: Use the chunk code from Michael Karcher instead. * Each page is read separately in chunks with a maximum size of chunksize. */ int spi_read_chunked(struct flashchip *flash, uint8_t *buf, int start, int len, int chunksize) @@ -914,6 +915,7 @@ /* * Write a part of the flash chip. + * FIXME: Use the chunk code from Michael Karcher instead. * Each page is written separately in chunks with a maximum size of chunksize. */ int spi_write_chunked(struct flashchip *flash, uint8_t *buf, int start, int len, int chunksize) @@ -964,20 +966,13 @@ * and for chips where memory mapped programming is impossible * (e.g. due to size constraints in IT87* for over 512 kB) */ +/* real chunksize is 1, logical chunksize is 1 */ int spi_chip_write_1(struct flashchip *flash, uint8_t *buf) { - int total_size = 1024 * flash->total_size; int i, result = 0; spi_disable_blockprotect(); - /* Erase first */ - msg_cinfo("Erasing flash before programming... "); - if (erase_flash(flash)) { - msg_cerr("ERASE FAILED!\n"); - return -1; - } - msg_cinfo("done.\n"); - for (i = 0; i < total_size; i++) { + for (i = 0; i < flash->total_size * 1024; i++) { result = spi_byte_program(i, buf[i]); if (result) return 1; @@ -988,6 +983,7 @@ return 0; } +/* FIXME: Unused function, not easily convertable to partial write. */ int spi_aai_write(struct flashchip *flash, uint8_t *buf) { uint32_t pos = 2, size = flash->total_size * 1024; @@ -1004,10 +1000,6 @@ default: break; } - if (erase_flash(flash)) { - msg_cerr("ERASE FAILED!\n"); - return -1; - } /* FIXME: This will fail on ICH/VIA SPI. */ result = spi_write_enable(); if (result) Index: flashrom-partial_write_no_autoerase/it87spi.c =================================================================== --- flashrom-partial_write_no_autoerase/it87spi.c (Revision 1005) +++ flashrom-partial_write_no_autoerase/it87spi.c (Arbeitskopie) @@ -326,25 +326,19 @@ int it8716f_spi_chip_write_256(struct flashchip *flash, uint8_t *buf) { - int total_size = 1024 * flash->total_size; int i; /* * IT8716F only allows maximum of 512 kb SPI chip size for memory * mapped access. */ - if ((programmer == PROGRAMMER_IT87SPI) || (total_size > 512 * 1024)) { + if ((programmer == PROGRAMMER_IT87SPI) || (flash->total_size * 1024 > 512 * 1024)) { spi_chip_write_1(flash, buf); } else { spi_disable_blockprotect(); - /* Erase first */ - msg_pinfo("Erasing flash before programming... "); - if (erase_flash(flash)) { - msg_perr("ERASE FAILED!\n"); - return -1; - } - msg_pinfo("done.\n"); - for (i = 0; i < total_size / 256; i++) { + + /* FIXME: Handle chips which have max writechunk size >1 and <256. */ + for (i = 0; i < flash->total_size * 1024 / 256; i++) { it8716f_spi_page_program(flash, i, buf); } } Index: flashrom-partial_write_no_autoerase/buspirate_spi.c =================================================================== --- flashrom-partial_write_no_autoerase/buspirate_spi.c (Revision 1005) +++ flashrom-partial_write_no_autoerase/buspirate_spi.c (Arbeitskopie) @@ -318,16 +318,6 @@ int buspirate_spi_write_256(struct flashchip *flash, uint8_t *buf) { - int total_size = 1024 * flash->total_size; - spi_disable_blockprotect(); - /* Erase first. */ - msg_pinfo("Erasing flash before programming... "); - if (erase_flash(flash)) { - msg_perr("ERASE FAILED!\n"); - return -1; - } - msg_pinfo("done.\n"); - - return spi_write_chunked(flash, buf, 0, total_size, 12); + return spi_write_chunked(flash, buf, 0, flash->total_size * 1024, 12); } Index: flashrom-partial_write_no_autoerase/jedec.c =================================================================== --- flashrom-partial_write_no_autoerase/jedec.c (Revision 1005) +++ flashrom-partial_write_no_autoerase/jedec.c (Arbeitskopie) @@ -393,6 +393,7 @@ } } +/* real chunksize is page_size, logical chunksize is page_size */ int write_jedec(struct flashchip *flash, uint8_t *buf) { int mask; @@ -402,52 +403,23 @@ mask = getaddrmask(flash); - if (erase_chip_jedec(flash)) { - msg_cerr("ERASE FAILED!\n"); - return -1; - } - - msg_cinfo("Programming page: "); for (i = 0; i < total_size / page_size; i++) { - msg_cinfo("%04d at address: 0x%08x", i, i * page_size); - if (write_page_write_jedec_common(flash, buf + i * page_size, - i * page_size, page_size, mask)) + if (write_page_write_jedec_common(flash, buf + i * page_size, i * page_size, page_size, mask)) failed = 1; - msg_cinfo("\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"); } - msg_cinfo("DONE!\n"); return failed; } +/* real chunksize is 1, logical chunksize is 1 */ int write_jedec_1(struct flashchip *flash, uint8_t * buf) { - int i; - chipaddr bios = flash->virtual_memory; - chipaddr dst = bios; + chipaddr dst = flash->virtual_memory; int mask; mask = getaddrmask(flash); - programmer_delay(10); - if (erase_flash(flash)) { - msg_cerr("ERASE FAILED!\n"); - return -1; - } - - msg_cinfo("Programming page: "); - for (i = 0; i < flash->total_size; i++) { - if ((i & 0x3) == 0) - msg_cinfo("address: 0x%08lx", (unsigned long)i * 1024); - - write_sector_jedec_common(flash, buf + i * 1024, dst + i * 1024, 1024, mask); - - if ((i & 0x3) == 0) - msg_cinfo("\b\b\b\b\b\b\b\b\b\b\b\b\b\b\b\b\b\b\b"); - } - - msg_cinfo("DONE!\n"); - return 0; + return write_sector_jedec_common(flash, buf, dst, flash->total_size * 1024, mask); } /* erase chip with block_erase() prototype */ Index: flashrom-partial_write_no_autoerase/bitbang_spi.c =================================================================== --- flashrom-partial_write_no_autoerase/bitbang_spi.c (Revision 1005) +++ flashrom-partial_write_no_autoerase/bitbang_spi.c (Arbeitskopie) @@ -141,8 +141,5 @@ int bitbang_spi_write_256(struct flashchip *flash, uint8_t *buf) { - int total_size = 1024 * flash->total_size; - - msg_pdbg("total_size is %d\n", total_size); - return spi_write_chunked(flash, buf, 0, total_size, 256); + return spi_write_chunked(flash, buf, 0, flash->total_size * 1024, 256); } Index: flashrom-partial_write_no_autoerase/sst49lfxxxc.c =================================================================== --- flashrom-partial_write_no_autoerase/sst49lfxxxc.c (Revision 1005) +++ flashrom-partial_write_no_autoerase/sst49lfxxxc.c (Arbeitskopie) @@ -92,6 +92,7 @@ return 0; } +/* real chunksize is 1, logical chunksize is page_size */ int write_49lfxxxc(struct flashchip *flash, uint8_t *buf) { int i; @@ -100,21 +101,10 @@ chipaddr bios = flash->virtual_memory; write_lockbits_49lfxxxc(flash, 0); - msg_cinfo("Programming page: "); for (i = 0; i < total_size / page_size; i++) { - /* erase the page before programming */ - if (erase_sector_49lfxxxc(flash, i * page_size, flash->page_size)) { - msg_cerr("ERASE FAILED!\n"); - return -1; - } - /* write to the sector */ - msg_cinfo("%04d at address: 0x%08x", i, i * page_size); - write_page_82802ab(bios, buf + i * page_size, - bios + i * page_size, page_size); - msg_cinfo("\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"); + write_page_82802ab(bios, buf + i * page_size, bios + i * page_size, page_size); } - msg_cinfo("\n"); chip_writeb(0xFF, bios); Index: flashrom-partial_write_no_autoerase/spi.c =================================================================== --- flashrom-partial_write_no_autoerase/spi.c (Revision 1005) +++ flashrom-partial_write_no_autoerase/spi.c (Arbeitskopie) @@ -67,7 +67,7 @@ .command = sb600_spi_send_command, .multicommand = default_spi_send_multicommand, .read = sb600_spi_read, - .write_256 = sb600_spi_write_1, + .write_256 = sb600_spi_write_256, }, { /* SPI_CONTROLLER_VIA */ @@ -194,6 +194,7 @@ * Program chip using page (256 bytes) programming. * Some SPI masters can't do this, they use single byte programming instead. */ +/* real chunksize is up to 256, logical chunksize is 256 */ int spi_chip_write_256(struct flashchip *flash, uint8_t *buf) { if (!spi_programmer[spi_controller].write_256) { Index: flashrom-partial_write_no_autoerase/ft2232_spi.c =================================================================== --- flashrom-partial_write_no_autoerase/ft2232_spi.c (Revision 1005) +++ flashrom-partial_write_no_autoerase/ft2232_spi.c (Arbeitskopie) @@ -287,18 +287,8 @@ int ft2232_spi_write_256(struct flashchip *flash, uint8_t *buf) { - int total_size = 1024 * flash->total_size; - spi_disable_blockprotect(); - /* Erase first. */ - msg_pinfo("Erasing flash before programming... "); - if (erase_flash(flash)) { - msg_perr("ERASE FAILED!\n"); - return -1; - } - msg_pinfo("done.\n"); - msg_pdbg("total_size is %d\n", total_size); - return spi_write_chunked(flash, buf, 0, total_size, 256); + return spi_write_chunked(flash, buf, 0, flash->total_size * 1024, 256); } #endif Index: flashrom-partial_write_no_autoerase/sst28sf040.c =================================================================== --- flashrom-partial_write_no_autoerase/sst28sf040.c (Revision 1005) +++ flashrom-partial_write_no_autoerase/sst28sf040.c (Arbeitskopie) @@ -111,6 +111,7 @@ return 0; } +/* real chunksize is 1, logical chunksize is page_size */ int write_28sf040(struct flashchip *flash, uint8_t *buf) { int i; @@ -120,21 +121,9 @@ unprotect_28sf040(bios); - msg_cinfo("Programming page: "); for (i = 0; i < total_size / page_size; i++) { - /* erase the page before programming */ - if (erase_sector_28sf040(flash, i * page_size, page_size)) { - msg_cerr("ERASE FAILED!\n"); - return -1; - } - - /* write to the sector */ - msg_cinfo("%04d at address: 0x%08x", i, i * page_size); - write_sector_28sf040(bios, buf + i * page_size, - bios + i * page_size, page_size); - msg_cinfo("\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"); + write_sector_28sf040(bios, buf + i * page_size, bios + i * page_size, page_size); } - msg_cinfo("\n"); protect_28sf040(bios); Index: flashrom-partial_write_no_autoerase/sb600spi.c =================================================================== --- flashrom-partial_write_no_autoerase/sb600spi.c (Revision 1005) +++ flashrom-partial_write_no_autoerase/sb600spi.c (Arbeitskopie) @@ -47,25 +47,10 @@ return spi_read_chunked(flash, buf, start, len, 8); } -/* FIXME: SB600 can write 5 bytes per transaction. */ -int sb600_spi_write_1(struct flashchip *flash, uint8_t *buf) +int sb600_spi_write_256(struct flashchip *flash, uint8_t *buf) { - int total_size = flash->total_size * 1024; - int result = 0; - spi_disable_blockprotect(); - /* Erase first */ - msg_pinfo("Erasing flash before programming... "); - if (erase_flash(flash)) { - msg_perr("ERASE FAILED!\n"); - return -1; - } - msg_pinfo("done.\n"); - - msg_pinfo("Programming flash"); - result = spi_write_chunked(flash, buf, 0, total_size, 5); - msg_pinfo(" done.\n"); - return result; + return spi_write_chunked(flash, buf, 0, flash->total_size * 1024, 5); } static void reset_internal_fifo_pointer(void) Index: flashrom-partial_write_no_autoerase/flashrom.c =================================================================== --- flashrom-partial_write_no_autoerase/flashrom.c (Revision 1005) +++ flashrom-partial_write_no_autoerase/flashrom.c (Arbeitskopie) @@ -1319,6 +1319,7 @@ /* This function signature is horrible. We need to design a better interface, * but right now it allows us to split off the CLI code. + * Besides that, the function itself is a textbook example of abysmal code flow. */ int doit(struct flashchip *flash, int force, char *filename, int read_it, int write_it, int erase_it, int verify_it) { @@ -1358,12 +1359,7 @@ programmer_shutdown(); return 1; } - } else { - struct stat image_stat; - - if (flash->unlock) - flash->unlock(flash); - + } else if (write_it) { if (flash->tested & TEST_BAD_ERASE) { msg_cerr("Erase is not working on this chip " "and erase is needed for write. "); @@ -1385,6 +1381,18 @@ msg_cerr("Continuing anyway.\n"); } } + if (!flash->write) { + msg_cerr("Error: flashrom has no write function for this flash chip.\n"); + programmer_shutdown(); + return 1; + } + if (flash->unlock) + flash->unlock(flash); + + } + if (write_it || verify_it) { + struct stat image_stat; + if ((image = fopen(filename, "rb")) == NULL) { perror(filename); programmer_shutdown(); @@ -1420,12 +1428,12 @@ // //////////////////////////////////////////////////////////// if (write_it) { - msg_cinfo("Writing flash chip... "); - if (!flash->write) { - msg_cerr("Error: flashrom has no write function for this flash chip.\n"); + if (erase_flash(flash)) { + emergency_help_message(); programmer_shutdown(); return 1; } + msg_cinfo("Writing flash chip... "); ret = flash->write(flash, buf); if (ret) { msg_cerr("FAILED!\n"); Index: flashrom-partial_write_no_autoerase/ichspi.c =================================================================== --- flashrom-partial_write_no_autoerase/ichspi.c (Revision 1005) +++ flashrom-partial_write_no_autoerase/ichspi.c (Arbeitskopie) @@ -646,34 +646,13 @@ int ich_spi_write_256(struct flashchip *flash, uint8_t * buf) { - int i, ret = 0; - int total_size = flash->total_size * 1024; - int erase_size = 64 * 1024; int maxdata = 64; if (spi_controller == SPI_CONTROLLER_VIA) maxdata = 16; spi_disable_blockprotect(); - /* Erase first */ - msg_pinfo("Erasing flash before programming... "); - if (erase_flash(flash)) { - msg_perr("ERASE FAILED!\n"); - return -1; - } - msg_pinfo("done.\n"); - - msg_pinfo("Programming page: \n"); - for (i = 0; i < total_size / erase_size; i++) { - ret = spi_write_chunked(flash, buf + (i * erase_size), - i * erase_size, erase_size, maxdata); - if (ret) - break; - } - - msg_pinfo("\n"); - - return ret; + return spi_write_chunked(flash, buf, 0, flash->total_size * 1024, maxdata); } int ich_spi_send_command(unsigned int writecnt, unsigned int readcnt, Index: flashrom-partial_write_no_autoerase/82802ab.c =================================================================== --- flashrom-partial_write_no_autoerase/82802ab.c (Revision 1005) +++ flashrom-partial_write_no_autoerase/82802ab.c (Arbeitskopie) @@ -176,28 +176,16 @@ } } +/* real chunksize is 1, logical chunksize is 1024 */ int write_82802ab(struct flashchip *flash, uint8_t *buf) { int i; chipaddr bios = flash->virtual_memory; - if (erase_flash(flash)) { - msg_cerr("ERASE FAILED!\n"); - return -1; - } - - msg_cinfo("Programming at: "); for (i = 0; i < flash->total_size; i++) { - if ((i & 0x3) == 0) - msg_cinfo("address: 0x%08lx", (unsigned long)i * 1024); - write_page_82802ab(bios, buf + i * 1024, bios + i * 1024, 1024); - - if ((i & 0x3) == 0) - msg_cinfo("\b\b\b\b\b\b\b\b\b\b\b\b\b\b\b\b\b\b\b"); } - msg_cinfo("DONE!\n"); return 0; } Index: flashrom-partial_write_no_autoerase/m29f400bt.c =================================================================== --- flashrom-partial_write_no_autoerase/m29f400bt.c (Revision 1005) +++ flashrom-partial_write_no_autoerase/m29f400bt.c (Arbeitskopie) @@ -39,8 +39,6 @@ /* transfer data from source to destination */ chip_writeb(*src, dst); - //chip_writeb(0xF0, bios); - //programmer_delay(5); toggle_ready_jedec(dst); msg_cerr("Value in the flash at address 0x%lx = %#x, want %#x\n", (dst - bios), chip_readb(dst), *src); @@ -113,7 +111,6 @@ chip_writeb(0xAA, bios + 0xAAA); chip_writeb(0x55, bios + 0x555); - //chip_writeb(0x10, bios + 0xAAA); chip_writeb(0x30, dst); programmer_delay(10); @@ -136,6 +133,7 @@ return erase_m29f400bt(flash); } +/* real chunksize is 1, logical chunksize is 8k-64k */ int write_m29f400bt(struct flashchip *flash, uint8_t *buf) { int i; @@ -143,117 +141,27 @@ int page_size = flash->page_size; chipaddr bios = flash->virtual_memory; - //erase_m29f400bt (flash); - msg_cinfo("Programming page:\n "); - /********************************* - *Pages for M29F400BT: - * 16 0x7c000 0x7ffff TOP - * 8 0x7a000 0x7bfff - * 8 0x78000 0x79fff - * 32 0x70000 0x77fff - * 64 0x60000 0x6ffff - * 64 0x50000 0x5ffff - * 64 0x40000 0x4ffff - *--------------------------------- - * 64 0x30000 0x3ffff - * 64 0x20000 0x2ffff - * 64 0x10000 0x1ffff - * 64 0x00000 0x0ffff BOTTOM - *********************************/ - msg_cinfo("total_size/page_size = %d\n", total_size / page_size); for (i = 0; i < (total_size / page_size) - 1; i++) { - msg_cinfo("%04d at address: 0x%08x\n", i, i * page_size); - if (block_erase_m29f400bt(flash, i * page_size, page_size)) { - msg_cerr("ERASE FAILED!\n"); - return -1; - } - write_page_m29f400bt(bios, buf + i * page_size, - bios + i * page_size, page_size); - msg_cinfo("\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"); + write_page_m29f400bt(bios, buf + i * page_size, bios + i * page_size, page_size); } - msg_cinfo("%04d at address: 0x%08x\n", 7, 0x70000); - if (block_erase_m29f400bt(flash, 0x70000, 32 * 1024)) { - msg_cerr("ERASE FAILED!\n"); - return -1; - } write_page_m29f400bt(bios, buf + 0x70000, bios + 0x70000, 32 * 1024); - - msg_cinfo("%04d at address: 0x%08x\n", 8, 0x78000); - if (block_erase_m29f400bt(flash, 0x78000, 8 * 1024)) { - msg_cerr("ERASE FAILED!\n"); - return -1; - } write_page_m29f400bt(bios, buf + 0x78000, bios + 0x78000, 8 * 1024); - - msg_cinfo("%04d at address: 0x%08x\n", 9, 0x7a000); - if (block_erase_m29f400bt(flash, 0x7a000, 8 * 1024)) { - msg_cerr("ERASE FAILED!\n"); - return -1; - } write_page_m29f400bt(bios, buf + 0x7a000, bios + 0x7a000, 8 * 1024); - - msg_cinfo("%04d at address: 0x%08x\n", 10, 0x7c000); - if (block_erase_m29f400bt(flash, 0x7c000, 16 * 1024)) { - msg_cerr("ERASE FAILED!\n"); - return -1; - } write_page_m29f400bt(bios, buf + 0x7c000, bios + 0x7c000, 16 * 1024); - msg_cinfo("\n"); - return 0; } +/* real chunksize is 1, logical chunksize is 64k */ int write_coreboot_m29f400bt(struct flashchip *flash, uint8_t *buf) { chipaddr bios = flash->virtual_memory; - msg_cinfo("Programming page:\n "); - /********************************* - *Pages for M29F400BT: - * 16 0x7c000 0x7ffff TOP - * 8 0x7a000 0x7bfff - * 8 0x78000 0x79fff - * 32 0x70000 0x77fff - * 64 0x60000 0x6ffff - * 64 0x50000 0x5ffff - * 64 0x40000 0x4ffff - *--------------------------------- - * 64 0x30000 0x3ffff - * 64 0x20000 0x2ffff - * 64 0x10000 0x1ffff - * 64 0x00000 0x0ffff BOTTOM - *********************************/ - msg_cinfo("%04d at address: 0x%08x\n", 7, 0x00000); - if (block_erase_m29f400bt(flash, 0x00000, 64 * 1024)) { - msg_cerr("ERASE FAILED!\n"); - return -1; - } write_page_m29f400bt(bios, buf + 0x00000, bios + 0x00000, 64 * 1024); - - msg_cinfo("%04d at address: 0x%08x\n", 7, 0x10000); - if (block_erase_m29f400bt(flash, 0x10000, 64 * 1024)) { - msg_cerr("ERASE FAILED!\n"); - return -1; - } write_page_m29f400bt(bios, buf + 0x10000, bios + 0x10000, 64 * 1024); - - msg_cinfo("%04d at address: 0x%08x\n", 7, 0x20000); - if (block_erase_m29f400bt(flash, 0x20000, 64 * 1024)) { - msg_cerr("ERASE FAILED!\n"); - return -1; - } write_page_m29f400bt(bios, buf + 0x20000, bios + 0x20000, 64 * 1024); - - msg_cinfo("%04d at address: 0x%08x\n", 7, 0x30000); - if (block_erase_m29f400bt(flash, 0x30000, 64 * 1024)) { - msg_cerr("ERASE FAILED!\n"); - return -1; - } write_page_m29f400bt(bios, buf + 0x30000, bios + 0x30000, 64 * 1024); - msg_cinfo("\n"); - return 0; } -- http://www.hailfinger.org/

3 9

[commit] r1206 - trunk
by repository service 08 Oct '10

08 Oct '10

Author: hailfinger Date: Fri Oct 8 20:52:29 2010 New Revision: 1206 URL: http://flashrom.org/trac/flashrom/changeset/1206 Log: flashrom had an implicit erase-on-write for most flash chip and programmer drivers, but it was not entirely consistent. Some drivers had their own hand-rolled partial update functionality which made handling partial updates from generic code impossible. Move implicit erase out of chip drivers, and kill some dead erase functions at the same time. A full chip erase is now performed in the generic code for all flash chips on write, and after that the whole chip is written. Signed-off-by: Carl-Daniel Hailfinger <c-d.hailfinger.devel.2006(a)gmx.net> Acked-by: Uwe Hermann <uwe(a)hermann-uwe.de> Modified: trunk/82802ab.c trunk/chipdrivers.h trunk/flashchips.c trunk/flashrom.c trunk/jedec.c trunk/m29f400bt.c trunk/sharplhf00l04.c trunk/spi.c trunk/spi25.c trunk/sst28sf040.c trunk/sst49lfxxxc.c trunk/stm50flw0x0x.c Modified: trunk/82802ab.c ============================================================================== --- trunk/82802ab.c Fri Oct 8 18:37:10 2010 (r1205) +++ trunk/82802ab.c Fri Oct 8 20:52:29 2010 (r1206) @@ -144,23 +144,6 @@ return 0; } -int erase_82802ab(struct flashchip *flash) -{ - int i; - unsigned int total_size = flash->total_size * 1024; - - msg_cspew("total_size is %d; flash->page_size is %d\n", - total_size, flash->page_size); - for (i = 0; i < total_size; i += flash->page_size) - if (erase_block_82802ab(flash, i, flash->page_size)) { - msg_cerr("ERASE FAILED!\n"); - return -1; - } - msg_cinfo("DONE ERASE\n"); - - return 0; -} - void write_page_82802ab(chipaddr bios, uint8_t *src, chipaddr dst, int page_size) { @@ -179,11 +162,6 @@ int i; chipaddr bios = flash->virtual_memory; - if (erase_flash(flash)) { - msg_cerr("ERASE FAILED!\n"); - return -1; - } - msg_cinfo("Programming at: "); for (i = 0; i < flash->total_size; i++) { if ((i & 0x3) == 0) Modified: trunk/chipdrivers.h ============================================================================== --- trunk/chipdrivers.h Fri Oct 8 18:37:10 2010 (r1205) +++ trunk/chipdrivers.h Fri Oct 8 20:52:29 2010 (r1206) @@ -33,8 +33,6 @@ int probe_spi_res2(struct flashchip *flash); int spi_write_enable(void); int spi_write_disable(void); -int spi_chip_erase_60(struct flashchip *flash); -int spi_chip_erase_c7(struct flashchip *flash); int spi_block_erase_20(struct flashchip *flash, unsigned int addr, unsigned int blocklen); int spi_block_erase_52(struct flashchip *flash, unsigned int addr, unsigned int blocklen); int spi_block_erase_d7(struct flashchip *flash, unsigned int addr, unsigned int blocklen); @@ -69,7 +67,6 @@ /* 82802ab.c */ uint8_t wait_82802ab(chipaddr bios); int probe_82802ab(struct flashchip *flash); -int erase_82802ab(struct flashchip *flash); int erase_block_82802ab(struct flashchip *flash, unsigned int page, unsigned int pagesize); int write_82802ab(struct flashchip *flash, uint8_t *buf); void print_status_82802ab(uint8_t status); @@ -84,7 +81,6 @@ int write_byte_program_jedec(chipaddr bios, uint8_t *src, chipaddr dst); int probe_jedec(struct flashchip *flash); -int erase_chip_jedec(struct flashchip *flash); int write_jedec(struct flashchip *flash, uint8_t *buf); int write_jedec_1(struct flashchip *flash, uint8_t *buf); int erase_sector_jedec(struct flashchip *flash, unsigned int page, unsigned int pagesize); @@ -94,7 +90,6 @@ /* m29f400bt.c */ int probe_m29f400bt(struct flashchip *flash); -int erase_m29f400bt(struct flashchip *flash); int block_erase_m29f400bt(struct flashchip *flash, unsigned int start, unsigned int len); int block_erase_chip_m29f400bt(struct flashchip *flash, unsigned int start, unsigned int len); int write_m29f400bt(struct flashchip *flash, uint8_t *buf); Modified: trunk/flashchips.c ============================================================================== --- trunk/flashchips.c Fri Oct 8 18:37:10 2010 (r1205) +++ trunk/flashchips.c Fri Oct 8 20:52:29 2010 (r1206) @@ -65,7 +65,7 @@ .total_size = 128, .page_size = 16 * 1024, .feature_bits = FEATURE_ADDR_2AA | FEATURE_EITHER_RESET, - .tested = TEST_OK_PREW, + .tested = TEST_OK_PRE, .probe = probe_jedec, .probe_timing = TIMING_ZERO, .block_erasers = @@ -231,7 +231,7 @@ .total_size = 512, .page_size = 64 * 1024, .feature_bits = FEATURE_ADDR_2AA | FEATURE_SHORT_RESET, - .tested = TEST_OK_PREW, + .tested = TEST_OK_PRE, .probe = probe_jedec, .probe_timing = TIMING_IGNORED, /* routine don't use probe_timing (am29f040b.c) */ .block_erasers = @@ -477,7 +477,7 @@ .model_id = AMIC_A25L40PT, .total_size = 512, .page_size = 256, - .tested = TEST_OK_PRW, + .tested = TEST_OK_PR, .probe = probe_spi_rdid4, .probe_timing = TIMING_ZERO, .block_erasers = @@ -509,7 +509,7 @@ .model_id = AMIC_A25L40PU, .total_size = 512, .page_size = 256, - .tested = TEST_OK_PRW, + .tested = TEST_OK_PR, .probe = probe_spi_rdid4, .probe_timing = TIMING_ZERO, .block_erasers = @@ -541,7 +541,7 @@ .model_id = AMIC_A25L80P, .total_size = 1024, .page_size = 256, - .tested = TEST_OK_PREW, + .tested = TEST_OK_PRE, .probe = probe_spi_rdid4, .probe_timing = TIMING_ZERO, .block_erasers = @@ -608,7 +608,7 @@ .model_id = AMIC_A25L16PU, .total_size = 2048, .page_size = 256, - .tested = TEST_OK_PRW, + .tested = TEST_OK_PR, .probe = probe_spi_rdid4, .probe_timing = TIMING_ZERO, .block_erasers = @@ -927,7 +927,7 @@ .total_size = 256, .page_size = 64 * 1024, .feature_bits = FEATURE_ADDR_2AA | FEATURE_SHORT_RESET, - .tested = TEST_OK_PRW, + .tested = TEST_OK_PR, .probe = probe_jedec, .probe_timing = TIMING_IGNORED, /* routine don't use probe_timing (mx29f002.c) */ .block_erasers = @@ -984,7 +984,7 @@ .total_size = 512, .page_size = 64 * 1024, .feature_bits = FEATURE_REGISTERMAP | FEATURE_EITHER_RESET, - .tested = TEST_OK_PREW, + .tested = TEST_OK_PRE, .probe = probe_jedec, .probe_timing = TIMING_ZERO, /* routine is wrapper to probe_jedec (pm49fl00x.c) */ .block_erasers = @@ -1196,7 +1196,7 @@ .total_size = 4096, .page_size = 256, .feature_bits = FEATURE_WRSR_WREN, - .tested = TEST_OK_PREW, + .tested = TEST_OK_PRE, .probe = probe_spi_rdid, .probe_timing = TIMING_ZERO, .block_erasers = @@ -1658,7 +1658,7 @@ .total_size = 128, .page_size = 128, .feature_bits = FEATURE_LONG_RESET, - .tested = TEST_OK_PREW, + .tested = TEST_OK_PRE, .probe = probe_jedec, .probe_timing = 10000, /* 10mS, Enter=Exec */ .block_erasers = @@ -1885,7 +1885,7 @@ .total_size = 256, .page_size = 256, .feature_bits = FEATURE_EITHER_RESET, - .tested = TEST_OK_PREW, + .tested = TEST_OK_PRE, .probe = probe_jedec, .probe_timing = TIMING_ZERO, /* Datasheet has no timing info specified */ .block_erasers = @@ -1939,7 +1939,7 @@ .total_size = 256, .page_size = 256, .feature_bits = FEATURE_EITHER_RESET, - .tested = TEST_OK_PRW, + .tested = TEST_OK_PR, .probe = probe_jedec, .probe_timing = TIMING_ZERO, /* Datasheet has no timing info specified */ .block_erasers = @@ -2744,7 +2744,7 @@ .total_size = 1024, .page_size = 256, .feature_bits = FEATURE_WRSR_WREN, - .tested = TEST_OK_PREW, + .tested = TEST_OK_PRE, .probe = probe_spi_rdid, .probe_timing = TIMING_ZERO, .block_erasers = @@ -2843,7 +2843,7 @@ .total_size = 128, .page_size = 128, .feature_bits = FEATURE_ADDR_2AA | FEATURE_EITHER_RESET, - .tested = TEST_OK_PREW, + .tested = TEST_OK_PRE, .probe = probe_jedec, .probe_timing = TIMING_ZERO, /* Datasheet has no timing info specified */ .block_erasers = @@ -2870,7 +2870,7 @@ .total_size = 256, .page_size = 256, .feature_bits = FEATURE_ADDR_AAA | FEATURE_EITHER_RESET, - .tested = TEST_OK_PRW, + .tested = TEST_OK_PR, .probe = probe_jedec, .probe_timing = TIMING_ZERO, /* Datasheet has no timing info specified */ .block_erasers = @@ -2901,7 +2901,7 @@ .total_size = 256, .page_size = 256, .feature_bits = FEATURE_ADDR_AAA | FEATURE_EITHER_RESET, - .tested = TEST_OK_PRW, + .tested = TEST_OK_PR, .probe = probe_jedec, .probe_timing = TIMING_ZERO, /* Datasheet has no timing info specified */ .block_erasers = @@ -3057,7 +3057,7 @@ .total_size = 256, .page_size = 256 * 1024, .feature_bits = FEATURE_EITHER_RESET, /* Some revisions may need FEATURE_ADDR_2AA */ - .tested = TEST_OK_PREW, + .tested = TEST_OK_PRE, .probe = probe_jedec, .probe_timing = TIMING_ZERO, /* Datasheet has no timing info specified */ .block_erasers = @@ -3196,7 +3196,7 @@ .model_id = INTEL_28F002T, .total_size = 256, .page_size = 256 * 1024, - .tested = TEST_OK_PREW, + .tested = TEST_OK_PRE, .probe = probe_82802ab, .probe_timing = TIMING_ZERO, /* Datasheet has no timing info specified */ .block_erasers = @@ -3510,7 +3510,7 @@ .total_size = 512, .page_size = 256, .feature_bits = FEATURE_WRSR_WREN, - .tested = TEST_OK_PRW, + .tested = TEST_OK_PR, .probe = probe_spi_rdid, .probe_timing = TIMING_ZERO, .block_erasers = @@ -3546,7 +3546,7 @@ .total_size = 1024, .page_size = 256, .feature_bits = FEATURE_WRSR_WREN, - .tested = TEST_OK_PREW, + .tested = TEST_OK_PRE, .probe = probe_spi_rdid, .probe_timing = TIMING_ZERO, .block_erasers = @@ -3582,7 +3582,7 @@ .total_size = 2048, .page_size = 256, .feature_bits = FEATURE_WRSR_WREN, - .tested = TEST_OK_PRW, + .tested = TEST_OK_PR, .probe = probe_spi_rdid, .probe_timing = TIMING_ZERO, .block_erasers = @@ -3684,7 +3684,7 @@ .total_size = 4096, .page_size = 256, .feature_bits = FEATURE_WRSR_WREN, - .tested = TEST_OK_PRW, + .tested = TEST_OK_PR, .probe = probe_spi_rdid, .probe_timing = TIMING_ZERO, .block_erasers = @@ -3911,7 +3911,7 @@ .total_size = 256, .page_size = 64 * 1024, .feature_bits = FEATURE_ADDR_2AA | FEATURE_SHORT_RESET, - .tested = TEST_OK_PRW, + .tested = TEST_OK_PR, .probe = probe_jedec, .probe_timing = TIMING_IGNORED, /* routine don't use probe_timing (mx29f002.c) */ .block_erasers = @@ -4262,7 +4262,7 @@ .model_id = ST_M25PE80, .total_size = 1024, .page_size = 256, - .tested = TEST_OK_PREW, + .tested = TEST_OK_PRE, .probe = probe_spi_rdid, .probe_timing = TIMING_ZERO, .block_erasers = @@ -4507,7 +4507,7 @@ .total_size = 256, .page_size = 8 * 1024, .feature_bits = FEATURE_ADDR_2AA | FEATURE_EITHER_RESET, - .tested = TEST_OK_PREW, + .tested = TEST_OK_PRE, .probe = probe_jedec, .probe_timing = TIMING_FIXME, .block_erasers = @@ -4569,7 +4569,7 @@ .total_size = 128, .page_size = 4096, .feature_bits = FEATURE_ADDR_2AA | FEATURE_EITHER_RESET, - .tested = TEST_OK_PREW, + .tested = TEST_OK_PRE, .probe = probe_jedec, .probe_timing = TIMING_ZERO, /* Datasheet has no timing info specified */ .block_erasers = @@ -4656,7 +4656,7 @@ .total_size = 256, .page_size = 16 * 1024, .feature_bits = FEATURE_REGISTERMAP | FEATURE_EITHER_RESET, - .tested = TEST_OK_PREW, + .tested = TEST_OK_PRE, .probe = probe_jedec, .probe_timing = TIMING_ZERO, /* routine is wrapper to probe_jedec (pm49fl00x.c) */ .block_erasers = @@ -4686,7 +4686,7 @@ .total_size = 512, .page_size = 64 * 1024, .feature_bits = FEATURE_REGISTERMAP | FEATURE_EITHER_RESET, - .tested = TEST_OK_PREW, + .tested = TEST_OK_PRE, .probe = probe_jedec, .probe_timing = TIMING_ZERO, /* routine is wrapper to probe_jedec (pm49fl00x.c) */ .block_erasers = @@ -4773,7 +4773,7 @@ .model_id = SPANSION_S25FL008A, .total_size = 1024, .page_size = 256, - .tested = TEST_OK_PREW, + .tested = TEST_OK_PRE, .probe = probe_spi_rdid, .probe_timing = TIMING_ZERO, .block_erasers = @@ -4799,7 +4799,7 @@ .model_id = SPANSION_S25FL016A, .total_size = 2048, .page_size = 256, - .tested = TEST_OK_PRW, + .tested = TEST_OK_PR, .probe = probe_spi_rdid, .probe_timing = TIMING_ZERO, .block_erasers = @@ -4825,7 +4825,7 @@ .model_id = SST_SST25VF016B, .total_size = 2048, .page_size = 256, - .tested = TEST_OK_PREW, + .tested = TEST_OK_PRE, .probe = probe_spi_rdid, .probe_timing = TIMING_ZERO, .block_erasers = @@ -4860,7 +4860,7 @@ .model_id = SST_SST25VF032B, .total_size = 4096, .page_size = 256, - .tested = TEST_OK_PREW, + .tested = TEST_OK_PRE, .probe = probe_spi_rdid, .probe_timing = TIMING_ZERO, .block_erasers = @@ -4895,7 +4895,7 @@ .model_id = SST_SST25VF064C, .total_size = 8192, .page_size = 256, - .tested = TEST_OK_PREW, + .tested = TEST_OK_PRE, .probe = probe_spi_rdid, .probe_timing = TIMING_ZERO, .block_erasers = @@ -5058,7 +5058,7 @@ .model_id = SST_SST25VF080B, .total_size = 1024, .page_size = 256, - .tested = TEST_OK_PREW, + .tested = TEST_OK_PRE, .probe = probe_spi_rdid, .probe_timing = TIMING_ZERO, .block_erasers = @@ -5120,7 +5120,7 @@ .total_size = 128, .page_size = 128, .feature_bits = FEATURE_LONG_RESET, - .tested = TEST_OK_PRW, + .tested = TEST_OK_PR, .probe = probe_jedec, .probe_timing = 10, .block_erasers = @@ -5166,7 +5166,7 @@ .total_size = 256, .page_size = 128, .feature_bits = FEATURE_LONG_RESET, - .tested = TEST_OK_PREW, + .tested = TEST_OK_PRE, .probe = probe_jedec, .probe_timing = 10, .block_erasers = @@ -5189,7 +5189,7 @@ .total_size = 256, .page_size = 128, .feature_bits = FEATURE_LONG_RESET, - .tested = TEST_OK_PREW, + .tested = TEST_OK_PRE, .probe = probe_jedec, .probe_timing = 10, .block_erasers = @@ -5238,7 +5238,7 @@ .total_size = 128, .page_size = 4096, .feature_bits = FEATURE_EITHER_RESET, - .tested = TEST_OK_PRW, + .tested = TEST_OK_PR, .probe = probe_jedec, .probe_timing = 1, /* 150 ns */ .block_erasers = @@ -5264,7 +5264,7 @@ .total_size = 256, .page_size = 4096, .feature_bits = FEATURE_EITHER_RESET, - .tested = TEST_OK_PREW, + .tested = TEST_OK_PRE, .probe = probe_jedec, .probe_timing = 1, /* 150 ns */ .block_erasers = @@ -5290,7 +5290,7 @@ .total_size = 512, .page_size = 4096, .feature_bits = FEATURE_EITHER_RESET, - .tested = TEST_OK_PREW, + .tested = TEST_OK_PRE, .probe = probe_jedec, .probe_timing = 1, /* 150 ns */ .block_erasers = @@ -5316,7 +5316,7 @@ .total_size = 64, .page_size = 4096, .feature_bits = FEATURE_EITHER_RESET, - .tested = TEST_OK_PREW, + .tested = TEST_OK_PRE, .probe = probe_jedec, .probe_timing = 1, /* 150 ns */ .block_erasers = @@ -5342,7 +5342,7 @@ .total_size = 128, .page_size = 4096, .feature_bits = FEATURE_EITHER_RESET, - .tested = TEST_OK_PREW, + .tested = TEST_OK_PRE, .probe = probe_jedec, .probe_timing = 1, /* 150 ns */ .block_erasers = @@ -5449,7 +5449,7 @@ .total_size = 256, .page_size = 16 * 1024, .feature_bits = FEATURE_REGISTERMAP | FEATURE_EITHER_RESET, - .tested = TEST_OK_PREW, + .tested = TEST_OK_PRE, .probe = probe_jedec, .probe_timing = 1, /* 150 ns */ .block_erasers = @@ -5514,7 +5514,7 @@ .total_size = 512, .page_size = 64 * 1024, .feature_bits = FEATURE_REGISTERMAP | FEATURE_EITHER_RESET, - .tested = TEST_OK_PREW, + .tested = TEST_OK_PRE, .probe = probe_jedec, .probe_timing = 1, /* 150 ns */ .block_erasers = @@ -5577,7 +5577,7 @@ .total_size = 1024, .page_size = 64 * 1024, .feature_bits = FEATURE_REGISTERMAP | FEATURE_EITHER_RESET, - .tested = TEST_OK_PREW, + .tested = TEST_OK_PRE, .probe = probe_jedec, .probe_timing = 1, /* 150 ns */ .block_erasers = @@ -5640,7 +5640,7 @@ .total_size = 2048, .page_size = 4 * 1024, .feature_bits = FEATURE_REGISTERMAP, - .tested = TEST_OK_PRW, + .tested = TEST_OK_PR, .probe = probe_82802ab, .probe_timing = TIMING_IGNORED, /* routine don't use probe_timing (sst49lfxxxc.c) */ .block_erasers = @@ -5672,7 +5672,7 @@ .total_size = 256, .page_size = 16 * 1024, .feature_bits = FEATURE_EITHER_RESET, - .tested = TEST_OK_PREW, + .tested = TEST_OK_PRE, .probe = probe_jedec, .probe_timing = 1, /* 150 ns */ .block_erasers = @@ -5701,7 +5701,7 @@ .total_size = 256, .page_size = 4 * 1024, .feature_bits = FEATURE_EITHER_RESET, - .tested = TEST_OK_PREW, + .tested = TEST_OK_PRE, .probe = probe_jedec, .probe_timing = 1, /* 150 ns */ .block_erasers = @@ -5730,7 +5730,7 @@ .total_size = 512, .page_size = 4096, .feature_bits = FEATURE_EITHER_RESET, - .tested = TEST_OK_PREW, + .tested = TEST_OK_PRE, .probe = probe_jedec, .probe_timing = 1, /* 150 ns */ .block_erasers = @@ -5759,7 +5759,7 @@ .total_size = 512, .page_size = 64 * 1024, .feature_bits = FEATURE_EITHER_RESET | FEATURE_REGISTERMAP, - .tested = TEST_OK_PREW, + .tested = TEST_OK_PRE, .probe = probe_jedec, .probe_timing = 1, /* 150ns */ .block_erasers = @@ -5789,7 +5789,7 @@ .total_size = 1024, .page_size = 4096, .feature_bits = FEATURE_EITHER_RESET, - .tested = TEST_OK_PREW, + .tested = TEST_OK_PRE, .probe = probe_jedec, .probe_timing = TIMING_FIXME, .block_erasers = @@ -5818,7 +5818,7 @@ .total_size = 2048, .page_size = 4 * 1024, .feature_bits = FEATURE_REGISTERMAP, - .tested = TEST_OK_PREW, + .tested = TEST_OK_PRE, .probe = probe_82802ab, .probe_timing = TIMING_IGNORED, /* routine don't use probe_timing (sst49lfxxxc.c) */ .block_erasers = @@ -5906,7 +5906,7 @@ .model_id = ST_M25P10A, .total_size = 128, .page_size = 256, - .tested = TEST_OK_PREW, + .tested = TEST_OK_PRE, .probe = probe_spi_rdid, .probe_timing = TIMING_ZERO, .block_erasers = @@ -5985,7 +5985,7 @@ .model_id = ST_M25P40, .total_size = 512, .page_size = 256, - .tested = TEST_OK_PRW, + .tested = TEST_OK_PR, .probe = probe_spi_rdid, .probe_timing = TIMING_ZERO, .block_erasers = @@ -6037,7 +6037,7 @@ .model_id = ST_M25P80, .total_size = 1024, .page_size = 256, - .tested = TEST_OK_PRW, + .tested = TEST_OK_PR, .probe = probe_spi_rdid, .probe_timing = TIMING_ZERO, .block_erasers = @@ -6063,7 +6063,7 @@ .model_id = ST_M25P16, .total_size = 2048, .page_size = 256, - .tested = TEST_OK_PRW, + .tested = TEST_OK_PR, .probe = probe_spi_rdid, .probe_timing = TIMING_ZERO, .block_erasers = @@ -6089,7 +6089,7 @@ .model_id = ST_M25P32, .total_size = 4096, .page_size = 256, - .tested = TEST_OK_PRW, + .tested = TEST_OK_PR, .probe = probe_spi_rdid, .probe_timing = TIMING_ZERO, .block_erasers = @@ -6167,7 +6167,7 @@ .model_id = ST_M25PX32, .total_size = 4096, .page_size = 256, - .tested = TEST_OK_PREW, + .tested = TEST_OK_PRE, .probe = probe_spi_rdid, .probe_timing = TIMING_ZERO, .block_erasers = @@ -6196,7 +6196,7 @@ .model_id = ST_M25PX64, .total_size = 8192, .page_size = 256, - .tested = TEST_OK_PREW, + .tested = TEST_OK_PRE, .probe = probe_spi_rdid, .probe_timing = TIMING_ZERO, .block_erasers = @@ -6429,7 +6429,7 @@ .total_size = 64, .page_size = 64 * 1024, .feature_bits = FEATURE_ADDR_2AA | FEATURE_EITHER_RESET, - .tested = TEST_OK_PREW, + .tested = TEST_OK_PRE, .probe = probe_jedec, .probe_timing = TIMING_ZERO, .block_erasers = @@ -6522,7 +6522,7 @@ .total_size = 1024, .page_size = 64 * 1024, .feature_bits = FEATURE_REGISTERMAP, - .tested = TEST_OK_PREW, + .tested = TEST_OK_PRE, .probe = probe_82802ab, .probe_timing = TIMING_FIXME, .block_erasers = @@ -6816,7 +6816,7 @@ .total_size = 256, .page_size = 512, .feature_bits = FEATURE_EITHER_RESET, - .tested = TEST_OK_PREW, + .tested = TEST_OK_PRE, .probe = probe_jedec, .probe_timing = TIMING_ZERO, /* Datasheet has no timing info specified */ .block_erasers = @@ -7008,7 +7008,7 @@ .total_size = 1024, .page_size = 256, .feature_bits = FEATURE_WRSR_WREN, - .tested = TEST_OK_PREW, + .tested = TEST_OK_PRE, .probe = probe_spi_rdid, .probe_timing = TIMING_ZERO, .block_erasers = @@ -7080,7 +7080,7 @@ .total_size = 4096, .page_size = 256, .feature_bits = FEATURE_WRSR_WREN, - .tested = TEST_OK_PREW, + .tested = TEST_OK_PRE, .probe = probe_spi_rdid, .probe_timing = TIMING_ZERO, .block_erasers = @@ -7116,7 +7116,7 @@ .total_size = 8192, .page_size = 256, .feature_bits = FEATURE_WRSR_WREN, - .tested = TEST_OK_PRW, + .tested = TEST_OK_PR, .probe = probe_spi_rdid, .probe_timing = TIMING_ZERO, .block_erasers = @@ -7212,7 +7212,7 @@ .total_size = 512, .page_size = 256, .feature_bits = FEATURE_WRSR_WREN, - .tested = TEST_OK_PREW, + .tested = TEST_OK_PRE, .probe = probe_spi_rdid, .probe_timing = TIMING_ZERO, .block_erasers = @@ -7242,7 +7242,7 @@ .total_size = 1024, .page_size = 256, .feature_bits = FEATURE_WRSR_WREN, - .tested = TEST_OK_PREW, + .tested = TEST_OK_PRE, .probe = probe_spi_rdid, .probe_timing = TIMING_ZERO, .block_erasers = @@ -7272,7 +7272,7 @@ .total_size = 2048, .page_size = 256, .feature_bits = FEATURE_WRSR_WREN, - .tested = TEST_OK_PREW, + .tested = TEST_OK_PRE, .probe = probe_spi_rdid, .probe_timing = TIMING_ZERO, .block_erasers = @@ -7380,7 +7380,7 @@ .total_size = 128, .page_size = 128, .feature_bits = FEATURE_LONG_RESET, - .tested = TEST_OK_PRW, + .tested = TEST_OK_PR, .probe = probe_jedec, .probe_timing = 10, /* used datasheet for the W29C011A */ .block_erasers = @@ -7403,7 +7403,7 @@ .total_size = 256, .page_size = 128, .feature_bits = FEATURE_LONG_RESET, - .tested = TEST_OK_PREW, + .tested = TEST_OK_PRE, .probe = probe_jedec, .probe_timing = 10, .block_erasers = @@ -7449,7 +7449,7 @@ .total_size = 128, .page_size = 128, .feature_bits = FEATURE_LONG_RESET, - .tested = TEST_OK_PREW, + .tested = TEST_OK_PRE, .probe = probe_w29ee011, .probe_timing = TIMING_IGNORED, /* routine don't use probe_timing (w29ee011.c) */ .block_erasers = @@ -7472,7 +7472,7 @@ .total_size = 512, .page_size = 64 * 1024, .feature_bits = FEATURE_EITHER_RESET, - .tested = TEST_OK_PRW, + .tested = TEST_OK_PR, .probe = probe_jedec, .probe_timing = 10, .block_erasers = @@ -7498,7 +7498,7 @@ .total_size = 512, .page_size = 64 * 1024, .feature_bits = FEATURE_EITHER_RESET, - .tested = TEST_OK_PREW, + .tested = TEST_OK_PRE, .probe = probe_jedec, .probe_timing = 10, .block_erasers = @@ -7551,7 +7551,7 @@ .total_size = 512, .page_size = 64 * 1024, .feature_bits = FEATURE_REGISTERMAP | FEATURE_EITHER_RESET, - .tested = TEST_OK_PREW, + .tested = TEST_OK_PRE, .probe = probe_jedec, .probe_timing = 10, .block_erasers = @@ -7608,7 +7608,7 @@ .total_size = 256, .page_size = 128, .feature_bits = FEATURE_EITHER_RESET, - .tested = TEST_OK_PREW, + .tested = TEST_OK_PRE, .probe = probe_jedec, .probe_timing = 10, .block_erasers = @@ -7662,7 +7662,7 @@ .total_size = 256, .page_size = 128, .feature_bits = FEATURE_EITHER_RESET, - .tested = TEST_OK_PREW, + .tested = TEST_OK_PRE, .probe = probe_jedec, .probe_timing = 10, .block_erasers = @@ -7693,7 +7693,7 @@ .total_size = 256, .page_size = 128, .feature_bits = FEATURE_EITHER_RESET, - .tested = TEST_OK_PRW, + .tested = TEST_OK_PR, .probe = probe_jedec, .probe_timing = 10, .block_erasers = @@ -7724,7 +7724,7 @@ .total_size = 1024, .page_size = 64 * 1024, .feature_bits = FEATURE_REGISTERMAP | FEATURE_EITHER_RESET, - .tested = TEST_OK_PREW, + .tested = TEST_OK_PRE, .probe = probe_jedec, .probe_timing = TIMING_FIXME, .block_erasers = Modified: trunk/flashrom.c ============================================================================== --- trunk/flashrom.c Fri Oct 8 18:37:10 2010 (r1205) +++ trunk/flashrom.c Fri Oct 8 20:52:29 2010 (r1206) @@ -1509,6 +1509,7 @@ /* This function signature is horrible. We need to design a better interface, * but right now it allows us to split off the CLI code. + * Besides that, the function itself is a textbook example of abysmal code flow. */ int doit(struct flashchip *flash, int force, char *filename, int read_it, int write_it, int erase_it, int verify_it) { @@ -1563,12 +1564,7 @@ programmer_shutdown(); return 1; } - } else { - struct stat image_stat; - - if (flash->unlock) - flash->unlock(flash); - + } else if (write_it) { if (flash->tested & TEST_BAD_ERASE) { msg_cerr("Erase is not working on this chip " "and erase is needed for write. "); @@ -1590,6 +1586,18 @@ msg_cerr("Continuing anyway.\n"); } } + if (!flash->write) { + msg_cerr("Error: flashrom has no write function for this flash chip.\n"); + programmer_shutdown(); + return 1; + } + if (flash->unlock) + flash->unlock(flash); + + } + if (write_it || verify_it) { + struct stat image_stat; + if ((image = fopen(filename, "rb")) == NULL) { perror(filename); programmer_shutdown(); @@ -1625,12 +1633,12 @@ // //////////////////////////////////////////////////////////// if (write_it) { - msg_cinfo("Writing flash chip... "); - if (!flash->write) { - msg_cerr("Error: flashrom has no write function for this flash chip.\n"); + if (erase_flash(flash)) { + emergency_help_message(); programmer_shutdown(); return 1; } + msg_cinfo("Writing flash chip... "); ret = flash->write(flash, buf); if (ret) { msg_cerr("FAILED!\n"); Modified: trunk/jedec.c ============================================================================== --- trunk/jedec.c Fri Oct 8 18:37:10 2010 (r1205) +++ trunk/jedec.c Fri Oct 8 20:52:29 2010 (r1206) @@ -402,11 +402,6 @@ mask = getaddrmask(flash); - if (erase_chip_jedec(flash)) { - msg_cerr("ERASE FAILED!\n"); - return -1; - } - msg_cinfo("Programming page: "); for (i = 0; i < total_size / page_size; i++) { msg_cinfo("%04d at address: 0x%08x", i, i * page_size); @@ -429,12 +424,6 @@ mask = getaddrmask(flash); - programmer_delay(10); - if (erase_flash(flash)) { - msg_cerr("ERASE FAILED!\n"); - return -1; - } - msg_cinfo("Programming page: "); for (i = 0; i < flash->total_size; i++) { if ((i & 0x3) == 0) Modified: trunk/m29f400bt.c ============================================================================== --- trunk/m29f400bt.c Fri Oct 8 18:37:10 2010 (r1205) +++ trunk/m29f400bt.c Fri Oct 8 20:52:29 2010 (r1206) @@ -143,7 +143,6 @@ int page_size = flash->page_size; chipaddr bios = flash->virtual_memory; - //erase_m29f400bt (flash); msg_cinfo("Programming page:\n "); /********************************* *Pages for M29F400BT: @@ -163,41 +162,21 @@ msg_cinfo("total_size/page_size = %d\n", total_size / page_size); for (i = 0; i < (total_size / page_size) - 1; i++) { msg_cinfo("%04d at address: 0x%08x\n", i, i * page_size); - if (block_erase_m29f400bt(flash, i * page_size, page_size)) { - msg_cerr("ERASE FAILED!\n"); - return -1; - } write_page_m29f400bt(bios, buf + i * page_size, bios + i * page_size, page_size); msg_cinfo("\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"); } msg_cinfo("%04d at address: 0x%08x\n", 7, 0x70000); - if (block_erase_m29f400bt(flash, 0x70000, 32 * 1024)) { - msg_cerr("ERASE FAILED!\n"); - return -1; - } write_page_m29f400bt(bios, buf + 0x70000, bios + 0x70000, 32 * 1024); msg_cinfo("%04d at address: 0x%08x\n", 8, 0x78000); - if (block_erase_m29f400bt(flash, 0x78000, 8 * 1024)) { - msg_cerr("ERASE FAILED!\n"); - return -1; - } write_page_m29f400bt(bios, buf + 0x78000, bios + 0x78000, 8 * 1024); msg_cinfo("%04d at address: 0x%08x\n", 9, 0x7a000); - if (block_erase_m29f400bt(flash, 0x7a000, 8 * 1024)) { - msg_cerr("ERASE FAILED!\n"); - return -1; - } write_page_m29f400bt(bios, buf + 0x7a000, bios + 0x7a000, 8 * 1024); msg_cinfo("%04d at address: 0x%08x\n", 10, 0x7c000); - if (block_erase_m29f400bt(flash, 0x7c000, 16 * 1024)) { - msg_cerr("ERASE FAILED!\n"); - return -1; - } write_page_m29f400bt(bios, buf + 0x7c000, bios + 0x7c000, 16 * 1024); msg_cinfo("\n"); Modified: trunk/sharplhf00l04.c ============================================================================== --- trunk/sharplhf00l04.c Fri Oct 8 18:37:10 2010 (r1205) +++ trunk/sharplhf00l04.c Fri Oct 8 20:52:29 2010 (r1206) @@ -65,10 +65,6 @@ int page_size = flash->page_size; chipaddr bios = flash->virtual_memory; - if (erase_flash(flash)) { - msg_cerr("ERASE FAILED!\n"); - return -1; - } msg_cinfo("Programming page: "); for (i = 0; i < total_size / page_size; i++) { msg_cinfo("%04d at address: 0x%08x", i, i * page_size); Modified: trunk/spi.c ============================================================================== --- trunk/spi.c Fri Oct 8 18:37:10 2010 (r1205) +++ trunk/spi.c Fri Oct 8 20:52:29 2010 (r1206) @@ -262,12 +262,6 @@ { int ret; - msg_pinfo("Erasing flash before programming... "); - if (erase_flash(flash)) { - msg_perr("ERASE FAILED!\n"); - return -1; - } - msg_pinfo("done.\n"); msg_pinfo("Programming flash... "); ret = spi_chip_write_256_new(flash, buf, 0, flash->total_size * 1024); if (!ret) Modified: trunk/spi25.c ============================================================================== --- trunk/spi25.c Fri Oct 8 18:37:10 2010 (r1205) +++ trunk/spi25.c Fri Oct 8 20:52:29 2010 (r1206) @@ -1321,14 +1321,6 @@ int spi_chip_write_1(struct flashchip *flash, uint8_t *buf) { - /* Erase first */ - msg_cinfo("Erasing flash before programming... "); - if (erase_flash(flash)) { - msg_cerr("ERASE FAILED!\n"); - return -1; - } - msg_cinfo("done.\n"); - return spi_chip_write_1_new(flash, buf, 0, flash->total_size * 1024); } @@ -1426,14 +1418,6 @@ int spi_aai_write(struct flashchip *flash, uint8_t *buf) { - /* Erase first */ - msg_cinfo("Erasing flash before programming... "); - if (erase_flash(flash)) { - msg_cerr("ERASE FAILED!\n"); - return -1; - } - msg_cinfo("done.\n"); - return spi_aai_write_new(flash, buf, 0, flash->total_size * 1024); } Modified: trunk/sst28sf040.c ============================================================================== --- trunk/sst28sf040.c Fri Oct 8 18:37:10 2010 (r1205) +++ trunk/sst28sf040.c Fri Oct 8 20:52:29 2010 (r1206) @@ -122,12 +122,6 @@ msg_cinfo("Programming page: "); for (i = 0; i < total_size / page_size; i++) { - /* erase the page before programming */ - if (erase_sector_28sf040(flash, i * page_size, page_size)) { - msg_cerr("ERASE FAILED!\n"); - return -1; - } - /* write to the sector */ msg_cinfo("%04d at address: 0x%08x", i, i * page_size); write_sector_28sf040(bios, buf + i * page_size, Modified: trunk/sst49lfxxxc.c ============================================================================== --- trunk/sst49lfxxxc.c Fri Oct 8 18:37:10 2010 (r1205) +++ trunk/sst49lfxxxc.c Fri Oct 8 20:52:29 2010 (r1206) @@ -86,11 +86,6 @@ write_lockbits_49lfxxxc(flash, 0); msg_cinfo("Programming page: "); for (i = 0; i < total_size / page_size; i++) { - /* erase the page before programming */ - if (erase_sector_49lfxxxc(flash, i * page_size, flash->page_size)) { - msg_cerr("ERASE FAILED!\n"); - return -1; - } /* write to the sector */ msg_cinfo("%04d at address: 0x%08x", i, i * page_size); Modified: trunk/stm50flw0x0x.c ============================================================================== --- trunk/stm50flw0x0x.c Fri Oct 8 18:37:10 2010 (r1205) +++ trunk/stm50flw0x0x.c Fri Oct 8 20:52:29 2010 (r1206) @@ -93,6 +93,7 @@ return 0; } +/* This function is unused. */ int erase_sector_stm50flw0x0x(struct flashchip *flash, unsigned int sector, unsigned int sectorsize) { chipaddr bios = flash->virtual_memory + sector; @@ -116,6 +117,7 @@ return 0; } +/* FIXME: This function is not a real chip erase function. */ int erase_chip_stm50flw0x0x(struct flashchip *flash, unsigned int addr, unsigned int blocklen) { int i;

1 0

[PATCH] flashrom 0.9.3
by Carl-Daniel Hailfinger 08 Oct '10

08 Oct '10

Increase flashrom release number to 0.9.3. Signed-off-by: Carl-Daniel Hailfinger <c-d.hailfinger.devel.2006(a)gmx.net> Index: flashrom-0.9.3/Makefile =================================================================== --- flashrom-0.9.3/Makefile (Revision 1199) +++ flashrom-0.9.3/Makefile (Arbeitskopie) @@ -100,7 +100,7 @@ # will not require subversion. The downloadable snapshots are already exported. SVNVERSION := $(shell LC_ALL=C svnversion -cn . 2>/dev/null | sed -e "s/.*://" -e "s/$[0-9]*$.*/\1/" | grep "[0-9]" || LC_ALL=C svn info . 2>/dev/null | awk '/^Revision:/ {print $$2 }' | grep "[0-9]" || LC_ALL=C git svn info . 2>/dev/null | awk '/^Revision:/ {print $$2 }' | grep "[0-9]" || echo unknown) -RELEASE := 0.9.2 +RELEASE := 0.9.3 VERSION := $(RELEASE)-r$(SVNVERSION) RELEASENAME ?= $(VERSION) -- http://www.hailfinger.org/

2 2

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

flashrom