June 2011 - flashrom - mail.coreboot.org

Re: [flashrom] [PATCH 2/3] add a success indicator to the "Reading old flash chip contents..." message
by Carl-Daniel Hailfinger June 26, 2011

June 26, 2011

Am 25.06.2011 03:36 schrieb Stefan Tauner: > Signed-off-by: Stefan Tauner <stefan.tauner(a)student.tuwien.ac.at> > Good idea. Acked-by: Carl-Daniel Hailfinger <c-d.hailfinger.devel.2006(a)gmx.net> Regards, Carl-Daniel -- http://www.hailfinger.org/

2 1

[commit] r1355 - trunk
by repository service June 26, 2011

June 26, 2011

Author: stefanct Date: Sun Jun 26 19:47:40 2011 New Revision: 1355 URL: http://flashrom.org/trac/flashrom/changeset/1355 Log: add a success indicator to the "Reading old flash chip contents..." message Signed-off-by: Stefan Tauner <stefan.tauner(a)student.tuwien.ac.at> Acked-by: Carl-Daniel Hailfinger <c-d.hailfinger.devel.2006(a)gmx.net> Modified: trunk/flashrom.c Modified: trunk/flashrom.c ============================================================================== --- trunk/flashrom.c Sun Jun 26 19:38:17 2011 (r1354) +++ trunk/flashrom.c Sun Jun 26 19:47:40 2011 (r1355) @@ -1914,11 +1914,13 @@ * preserved, but in that case we might perform unneeded erase which * takes time as well. */ - msg_cdbg("Reading old flash chip contents...\n"); + msg_cdbg("Reading old flash chip contents... "); if (flash->read(flash, oldcontents, 0, size)) { ret = 1; + msg_cdbg("FAILED.\n"); goto out; } + msg_cdbg("done.\n"); // This should be moved into each flash part's code to do it // cleanly. This does the job.

1 0

Re: [flashrom] [PATCH 1/3] constify (a few) parameters in flashrom.c where possible
by Carl-Daniel Hailfinger June 26, 2011

June 26, 2011

Am 25.06.2011 03:36 schrieb Stefan Tauner: > Signed-off-by: Stefan Tauner <stefan.tauner(a)student.tuwien.ac.at> > Good idea. This may also give the compile additional optimization possibilities. Acked-by: Carl-Daniel Hailfinger <c-d.hailfinger.devel.2006(a)gmx.net> Regards, Carl-Daniel -- http://www.hailfinger.org/

2 1

[commit] r1354 - trunk
by repository service June 26, 2011

June 26, 2011

Author: stefanct Date: Sun Jun 26 19:38:17 2011 New Revision: 1354 URL: http://flashrom.org/trac/flashrom/changeset/1354 Log: constify (a few) parameters in flashrom.c where possible Signed-off-by: Stefan Tauner <stefan.tauner(a)student.tuwien.ac.at> Acked-by: Carl-Daniel Hailfinger <c-d.hailfinger.devel.2006(a)gmx.net> Modified: trunk/flash.h trunk/flashrom.c trunk/programmer.h Modified: trunk/flash.h ============================================================================== --- trunk/flash.h Sun Jun 26 19:04:16 2011 (r1353) +++ trunk/flash.h Sun Jun 26 19:38:17 2011 (r1354) @@ -205,21 +205,21 @@ int read_memmapped(struct flashchip *flash, uint8_t *buf, int start, int len); int erase_flash(struct flashchip *flash); int probe_flash(int startchip, struct flashchip *fill_flash, int force); -int read_flash_to_file(struct flashchip *flash, char *filename); +int read_flash_to_file(struct flashchip *flash, const char *filename); int min(int a, int b); int max(int a, int b); void tolower_string(char *str); -char *extract_param(char **haystack, char *needle, char *delim); -int verify_range(struct flashchip *flash, uint8_t *cmpbuf, int start, int len, char *message); +char *extract_param(char **haystack, const char *needle, const char *delim); +int verify_range(struct flashchip *flash, uint8_t *cmpbuf, int start, int len, const char *message); int need_erase(uint8_t *have, uint8_t *want, int len, enum write_granularity gran); char *strcat_realloc(char *dest, const char *src); void print_version(void); void print_banner(void); void list_programmers_linebreak(int startcol, int cols, int paren); int selfcheck(void); -int doit(struct flashchip *flash, int force, char *filename, int read_it, int write_it, int erase_it, int verify_it); -int read_buf_from_file(unsigned char *buf, unsigned long size, char *filename); -int write_buf_to_file(unsigned char *buf, unsigned long size, char *filename); +int doit(struct flashchip *flash, int force, const char *filename, int read_it, int write_it, int erase_it, int verify_it); +int read_buf_from_file(unsigned char *buf, unsigned long size, const char *filename); +int write_buf_to_file(unsigned char *buf, unsigned long size, const char *filename); #define OK 0 #define NT 1 /* Not tested */ Modified: trunk/flashrom.c ============================================================================== --- trunk/flashrom.c Sun Jun 26 19:04:16 2011 (r1353) +++ trunk/flashrom.c Sun Jun 26 19:38:17 2011 (r1354) @@ -649,7 +649,7 @@ * needle and remove everything from the first occurrence of needle to the next * delimiter from haystack. */ -char *extract_param(char **haystack, char *needle, char *delim) +char *extract_param(char **haystack, const char *needle, const char *delim) { char *param_pos, *opt_pos, *rest; char *opt = NULL; @@ -706,7 +706,7 @@ return opt; } -char *extract_programmer_param(char *param_name) +char *extract_programmer_param(const char *param_name) { return extract_param(&programmer_param, param_name, ","); } @@ -735,7 +735,7 @@ * @message string to print in the "FAILED" message * @return 0 for success, -1 for failure */ -int verify_range(struct flashchip *flash, uint8_t *cmpbuf, int start, int len, char *message) +int verify_range(struct flashchip *flash, uint8_t *cmpbuf, int start, int len, const char *message) { int i, ret = 0; uint8_t *readbuf = malloc(len); @@ -1217,7 +1217,7 @@ return ret; } -int read_buf_from_file(unsigned char *buf, unsigned long size, char *filename) +int read_buf_from_file(unsigned char *buf, unsigned long size, const char *filename) { unsigned long numbytes; FILE *image; @@ -1250,7 +1250,7 @@ return 0; } -int write_buf_to_file(unsigned char *buf, unsigned long size, char *filename) +int write_buf_to_file(unsigned char *buf, unsigned long size, const char *filename) { unsigned long numbytes; FILE *image; @@ -1274,7 +1274,7 @@ return 0; } -int read_flash_to_file(struct flashchip *flash, char *filename) +int read_flash_to_file(struct flashchip *flash, const char *filename) { unsigned long size = flash->total_size * 1024; unsigned char *buf = calloc(size, sizeof(char)); @@ -1577,7 +1577,7 @@ } /* The way to go if you want a delimited list of programmers*/ -void list_programmers(char *delim) +void list_programmers(const char *delim) { enum programmer p; for (p = 0; p < PROGRAMMER_INVALID; p++) { @@ -1846,7 +1846,7 @@ * 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) +int doit(struct flashchip *flash, int force, const char *filename, int read_it, int write_it, int erase_it, int verify_it) { uint8_t *oldcontents; uint8_t *newcontents; Modified: trunk/programmer.h ============================================================================== --- trunk/programmer.h Sun Jun 26 19:04:16 2011 (r1353) +++ trunk/programmer.h Sun Jun 26 19:38:17 2011 (r1354) @@ -505,7 +505,7 @@ extern unsigned long flashbase; void check_chip_supported(const struct flashchip *flash); int check_max_decode(enum chipbustype buses, uint32_t size); -char *extract_programmer_param(char *param_name); +char *extract_programmer_param(const char *param_name); /* layout.c */ int show_id(uint8_t *bios, int size, int force);

1 0

[PATCH] fixup! add support for SFDP (JESD216)
by Stefan Tauner June 26, 2011

June 26, 2011

- fix power of 2 bug in calculating the block size and add warning if block size is too big - rename i to dw - fix output - remove unnecessary code Signed-off-by: Stefan Tauner <stefan.tauner(a)student.tuwien.ac.at> --- spi25.c | 52 ++++++++++++++++++++++++++-------------------------- 1 files changed, 26 insertions(+), 26 deletions(-) diff --git a/spi25.c b/spi25.c index 7f648bf..ae59ce1 100644 --- a/spi25.c +++ b/spi25.c @@ -134,21 +134,13 @@ struct sfdp_tbl_hdr { uint32_t ptp; /* 24b pointer */ }; -struct sfdp_tbl_0 { - uint8_t id; - uint8_t v_minor; - uint8_t v_major; - uint8_t len; - uint32_t ptp; /* 24b pointer */ -}; - static int sfdp_fill_flash(struct flashchip *f, uint8_t *buf, uint16_t len) { uint32_t tmp32; uint8_t tmp8; uint32_t total_size; /* in bytes */ uint32_t bsize; - int i, j; + int dw, j; msg_cspew("Parsing JEDEC SFDP parameter table...\n"); if (len == 9 * 4) { @@ -157,11 +149,11 @@ static int sfdp_fill_flash(struct flashchip *f, uint8_t *buf, uint16_t len) } /* 1. double word */ - i = 0; - tmp32 = buf[(4 * i) + 0]; - tmp32 |= ((unsigned int)buf[(4 * i) + 1]) << 8; - tmp32 |= ((unsigned int)buf[(4 * i) + 2]) << 16; - tmp32 |= ((unsigned int)buf[(4 * i) + 3]) << 24; + dw = 0; + tmp32 = buf[(4 * dw) + 0]; + tmp32 |= ((unsigned int)buf[(4 * dw) + 1]) << 8; + tmp32 |= ((unsigned int)buf[(4 * dw) + 2]) << 16; + tmp32 |= ((unsigned int)buf[(4 * dw) + 3]) << 24; tmp8 = (tmp32 >> 17) & 0x3; switch (tmp8) { @@ -195,28 +187,36 @@ static int sfdp_fill_flash(struct flashchip *f, uint8_t *buf, uint16_t len) msg_cspew("not to be especially enabled.\n"); /* 2. double word */ - i = 1; - tmp32 = buf[(4 * i) + 0]; - tmp32 |= ((unsigned int)buf[(4 * i) + 1]) << 8; - tmp32 |= ((unsigned int)buf[(4 * i) + 2]) << 16; - tmp32 |= ((unsigned int)buf[(4 * i) + 3]) << 24; - - if (tmp32 & (1<<31)) { - msg_cdbg(" Flash chip size >= 4 Gb/ 500 MB not supported.\n"); + dw = 1; + tmp32 = buf[(4 * dw) + 0]; + tmp32 |= ((unsigned int)buf[(4 * dw) + 1]) << 8; + tmp32 |= ((unsigned int)buf[(4 * dw) + 2]) << 16; + tmp32 |= ((unsigned int)buf[(4 * dw) + 3]) << 24; + + if (tmp32 & (1 << 31)) { + msg_cdbg(" Flash chip size >= 4 Gb/500 MB not supported.\n"); return 1; } total_size = (tmp32 & 0x7FFFFFFF) / 8; f->total_size = total_size / 1024; msg_cspew(" Flash chip size is %d kB.\n", f->total_size); - i = 8; + dw = 8; for(j = 0; j < 4; j++) { /* 8 double words from the start + 2 words for every eraser */ - bsize = 2^(buf[(4 * i) + (2 * j)]); - if (bsize == 0) + tmp32 = buf[(4 * dw) + (2 * j)]; + if (tmp32 == 0) { + msg_cspew(" Block eraser %d is unused.\n", j); continue; + } + if (tmp32 >= 31) { + msg_cspew(" Block size of eraser %d (2^%d) is too big." + "\n", j, tmp32); + continue; + } + bsize = 1 << (tmp32); /* bsize = 2 ^ field */ - tmp32 = buf[(4 * i) + (2 * j) + 1]; + tmp32 = buf[(4 * dw) + (2 * j) + 1]; switch(tmp32){ case 0x00: case 0xff: -- 1.7.1

1 0

[PATCH] Move erase checks out of chip drivers
by Carl-Daniel Hailfinger June 26, 2011

June 26, 2011

Erase functions are no longer called from chip drivers and thus their internal erase verification can be moved to generic code. This also makes it easier to skip the verify step if desired. Signed-off-by: Carl-Daniel Hailfinger <c-d.hailfinger.devel.2006(a)gmx.net> Index: flashrom-generic_check_erased_range/jedec.c =================================================================== --- flashrom-generic_check_erased_range/jedec.c (revision 1216) +++ flashrom-generic_check_erased_range/jedec.c (working copy) @@ -261,10 +261,7 @@ /* wait for Toggle bit ready */ toggle_ready_jedec_slow(bios); - if (check_erased_range(flash, page, pagesize)) { - msg_cerr("ERASE FAILED!\n"); - return -1; - } + /* FIXME: Check the status register for errors. */ return 0; } @@ -291,16 +288,12 @@ /* wait for Toggle bit ready */ toggle_ready_jedec_slow(bios); - if (check_erased_range(flash, block, blocksize)) { - msg_cerr("ERASE FAILED!\n"); - return -1; - } + /* FIXME: Check the status register for errors. */ return 0; } static int erase_chip_jedec_common(struct flashchip *flash, unsigned int mask) { - int total_size = flash->total_size * 1024; chipaddr bios = flash->virtual_memory; /* Issue the JEDEC Chip Erase command */ @@ -320,10 +313,7 @@ toggle_ready_jedec_slow(bios); - if (check_erased_range(flash, 0, total_size)) { - msg_cerr("ERASE FAILED!\n"); - return -1; - } + /* FIXME: Check the status register for errors. */ return 0; } Index: flashrom-generic_check_erased_range/sst49lfxxxc.c =================================================================== --- flashrom-generic_check_erased_range/sst49lfxxxc.c (revision 1216) +++ flashrom-generic_check_erased_range/sst49lfxxxc.c (working copy) @@ -69,9 +69,6 @@ status = wait_82802ab(flash); - if (check_erased_range(flash, address, sector_size)) { - msg_cerr("ERASE FAILED!\n"); - return -1; - } + /* FIXME: Check the status register for errors. */ return 0; } Index: flashrom-generic_check_erased_range/sharplhf00l04.c =================================================================== --- flashrom-generic_check_erased_range/sharplhf00l04.c (revision 1216) +++ flashrom-generic_check_erased_range/sharplhf00l04.c (working copy) @@ -50,9 +50,6 @@ status = wait_82802ab(flash); print_status_82802ab(status); - if (check_erased_range(flash, blockaddr, blocklen)) { - msg_cerr("ERASE FAILED!\n"); - return -1; - } + /* FIXME: Check the status register for errors. */ return 0; } Index: flashrom-generic_check_erased_range/82802ab.c =================================================================== --- flashrom-generic_check_erased_range/82802ab.c (revision 1216) +++ flashrom-generic_check_erased_range/82802ab.c (working copy) @@ -136,11 +136,7 @@ status = wait_82802ab(flash); print_status_82802ab(status); - if (check_erased_range(flash, page, pagesize)) { - msg_cerr("ERASE FAILED!\n"); - return -1; - } - + /* FIXME: Check the status register for errors. */ return 0; } Index: flashrom-generic_check_erased_range/spi25.c =================================================================== --- flashrom-generic_check_erased_range/spi25.c (revision 1216) +++ flashrom-generic_check_erased_range/spi25.c (working copy) @@ -584,10 +584,7 @@ /* FIXME: We assume spi_read_status_register will never fail. */ while (spi_read_status_register() & JEDEC_RDSR_BIT_WIP) programmer_delay(1000 * 1000); - if (check_erased_range(flash, 0, flash->total_size * 1024)) { - msg_cerr("ERASE FAILED!\n"); - return -1; - } + /* FIXME: Check the status register for errors. */ return 0; } @@ -623,10 +620,7 @@ /* FIXME: We assume spi_read_status_register will never fail. */ while (spi_read_status_register() & JEDEC_RDSR_BIT_WIP) programmer_delay(1000 * 1000); - if (check_erased_range(flash, 0, flash->total_size * 1024)) { - msg_cerr("ERASE FAILED!\n"); - return -1; - } + /* FIXME: Check the status register for errors. */ return 0; } @@ -667,10 +661,7 @@ */ while (spi_read_status_register() & JEDEC_RDSR_BIT_WIP) programmer_delay(100 * 1000); - if (check_erased_range(flash, addr, blocklen)) { - msg_cerr("ERASE FAILED!\n"); - return -1; - } + /* FIXME: Check the status register for errors. */ return 0; } @@ -716,10 +707,7 @@ */ while (spi_read_status_register() & JEDEC_RDSR_BIT_WIP) programmer_delay(100 * 1000); - if (check_erased_range(flash, addr, blocklen)) { - msg_cerr("ERASE FAILED!\n"); - return -1; - } + /* FIXME: Check the status register for errors. */ return 0; } @@ -763,10 +751,7 @@ */ while (spi_read_status_register() & JEDEC_RDSR_BIT_WIP) programmer_delay(100 * 1000); - if (check_erased_range(flash, addr, blocklen)) { - msg_cerr("ERASE FAILED!\n"); - return -1; - } + /* FIXME: Check the status register for errors. */ return 0; } @@ -808,10 +793,7 @@ */ while (spi_read_status_register() & JEDEC_RDSR_BIT_WIP) programmer_delay(10 * 1000); - if (check_erased_range(flash, addr, blocklen)) { - msg_cerr("ERASE FAILED!\n"); - return -1; - } + /* FIXME: Check the status register for errors. */ return 0; } Index: flashrom-generic_check_erased_range/sst28sf040.c =================================================================== --- flashrom-generic_check_erased_range/sst28sf040.c (revision 1216) +++ flashrom-generic_check_erased_range/sst28sf040.c (working copy) @@ -71,10 +71,7 @@ /* wait for Toggle bit ready */ toggle_ready_jedec(bios); - if (check_erased_range(flash, address, sector_size)) { - msg_cerr("ERASE FAILED!\n"); - return -1; - } + /* FIXME: Check the status register for errors. */ return 0; } @@ -113,10 +110,7 @@ programmer_delay(10); toggle_ready_jedec(bios); - if (check_erased_range(flash, 0, flash->total_size * 1024)) { - msg_cerr("ERASE FAILED!\n"); - return -1; - } + /* FIXME: Check the status register for errors. */ return 0; } Index: flashrom-generic_check_erased_range/stm50flw0x0x.c =================================================================== --- flashrom-generic_check_erased_range/stm50flw0x0x.c (revision 1216) +++ flashrom-generic_check_erased_range/stm50flw0x0x.c (working copy) @@ -107,11 +107,7 @@ wait_82802ab(flash); - if (check_erased_range(flash, sector, sectorsize)) { - msg_cerr("ERASE FAILED!\n"); - return -1; - } - + /* FIXME: Check the status register for errors. */ return 0; } @@ -139,5 +135,6 @@ } } + /* FIXME: Check the status register for errors. */ return 0; } Index: flashrom-generic_check_erased_range/flashrom.c =================================================================== --- flashrom-generic_check_erased_range/flashrom.c (revision 1216) +++ flashrom-generic_check_erased_range/flashrom.c (working copy) @@ -1290,6 +1290,10 @@ start + len - 1); if (do_something(flash, start, len)) return 1; + if (check_erased_range(flash, start, len)) { + msg_cerr("ERASE FAILED!\n"); + return -1; + } start += len; } } Index: flashrom-generic_check_erased_range/m29f400bt.c =================================================================== --- flashrom-generic_check_erased_range/m29f400bt.c (revision 1216) +++ flashrom-generic_check_erased_range/m29f400bt.c (working copy) @@ -101,10 +101,7 @@ programmer_delay(10); toggle_ready_jedec(bios); - if (check_erased_range(flash, 0, flash->total_size * 1024)) { - msg_cerr("ERASE FAILED!\n"); - return -1; - } + /* FIXME: Check the status register for errors. */ return 0; } @@ -124,10 +121,7 @@ programmer_delay(10); toggle_ready_jedec(bios); - if (check_erased_range(flash, start, len)) { - msg_cerr("ERASE FAILED!\n"); - return -1; - } + /* FIXME: Check the status register for errors. */ return 0; } -- http://www.hailfinger.org/

2 5

[commit] r1353 - trunk
by repository service June 26, 2011

June 26, 2011

Author: hailfinger Date: Sun Jun 26 19:04:16 2011 New Revision: 1353 URL: http://flashrom.org/trac/flashrom/changeset/1353 Log: Erase functions are no longer called from chip drivers and thus their internal erase verification can be moved to generic code. This also makes it easier to skip the verify step if desired and to differentiate between failed command submission and failed erase verification. Signed-off-by: Carl-Daniel Hailfinger <c-d.hailfinger.devel.2006(a)gmx.net> Acked-by: Stefan Tauner <stefan.tauner(a)student.tuwien.ac.at> Modified: trunk/82802ab.c trunk/flash.h trunk/flashrom.c trunk/jedec.c trunk/m29f400bt.c trunk/sharplhf00l04.c trunk/spi25.c trunk/sst28sf040.c trunk/sst49lfxxxc.c trunk/stm50flw0x0x.c Modified: trunk/82802ab.c ============================================================================== --- trunk/82802ab.c Sun Jun 26 13:50:10 2011 (r1352) +++ trunk/82802ab.c Sun Jun 26 19:04:16 2011 (r1353) @@ -136,11 +136,7 @@ status = wait_82802ab(flash); print_status_82802ab(status); - if (check_erased_range(flash, page, pagesize)) { - msg_cerr("ERASE FAILED!\n"); - return -1; - } - + /* FIXME: Check the status register for errors. */ return 0; } Modified: trunk/flash.h ============================================================================== --- trunk/flash.h Sun Jun 26 13:50:10 2011 (r1352) +++ trunk/flash.h Sun Jun 26 19:04:16 2011 (r1353) @@ -210,7 +210,6 @@ int max(int a, int b); void tolower_string(char *str); char *extract_param(char **haystack, char *needle, char *delim); -int check_erased_range(struct flashchip *flash, int start, int len); int verify_range(struct flashchip *flash, uint8_t *cmpbuf, int start, int len, char *message); int need_erase(uint8_t *have, uint8_t *want, int len, enum write_granularity gran); char *strcat_realloc(char *dest, const char *src); Modified: trunk/flashrom.c ============================================================================== --- trunk/flashrom.c Sun Jun 26 13:50:10 2011 (r1352) +++ trunk/flashrom.c Sun Jun 26 19:04:16 2011 (r1353) @@ -1400,6 +1400,10 @@ ret = erasefn(flash, start, len); if (ret) return ret; + if (check_erased_range(flash, start, len)) { + msg_cerr("ERASE FAILED!\n"); + return -1; + } /* Erase was successful. Adjust curcontents. */ memset(curcontents, 0xff, len); skip = 0; Modified: trunk/jedec.c ============================================================================== --- trunk/jedec.c Sun Jun 26 13:50:10 2011 (r1352) +++ trunk/jedec.c Sun Jun 26 19:04:16 2011 (r1353) @@ -264,10 +264,7 @@ /* wait for Toggle bit ready */ toggle_ready_jedec_slow(bios); - if (check_erased_range(flash, page, pagesize)) { - msg_cerr("ERASE FAILED!\n"); - return -1; - } + /* FIXME: Check the status register for errors. */ return 0; } @@ -297,16 +294,12 @@ /* wait for Toggle bit ready */ toggle_ready_jedec_slow(bios); - if (check_erased_range(flash, block, blocksize)) { - msg_cerr("ERASE FAILED!\n"); - return -1; - } + /* FIXME: Check the status register for errors. */ return 0; } static int erase_chip_jedec_common(struct flashchip *flash, unsigned int mask) { - int total_size = flash->total_size * 1024; chipaddr bios = flash->virtual_memory; int delay_us = 0; if(flash->probe_timing != TIMING_ZERO) @@ -329,10 +322,7 @@ toggle_ready_jedec_slow(bios); - if (check_erased_range(flash, 0, total_size)) { - msg_cerr("ERASE FAILED!\n"); - return -1; - } + /* FIXME: Check the status register for errors. */ return 0; } Modified: trunk/m29f400bt.c ============================================================================== --- trunk/m29f400bt.c Sun Jun 26 13:50:10 2011 (r1352) +++ trunk/m29f400bt.c Sun Jun 26 19:04:16 2011 (r1353) @@ -101,10 +101,7 @@ programmer_delay(10); toggle_ready_jedec(bios); - if (check_erased_range(flash, 0, flash->total_size * 1024)) { - msg_cerr("ERASE FAILED!\n"); - return -1; - } + /* FIXME: Check the status register for errors. */ return 0; } @@ -124,10 +121,7 @@ programmer_delay(10); toggle_ready_jedec(bios); - if (check_erased_range(flash, start, len)) { - msg_cerr("ERASE FAILED!\n"); - return -1; - } + /* FIXME: Check the status register for errors. */ return 0; } Modified: trunk/sharplhf00l04.c ============================================================================== --- trunk/sharplhf00l04.c Sun Jun 26 13:50:10 2011 (r1352) +++ trunk/sharplhf00l04.c Sun Jun 26 19:04:16 2011 (r1353) @@ -50,9 +50,6 @@ status = wait_82802ab(flash); print_status_82802ab(status); - if (check_erased_range(flash, blockaddr, blocklen)) { - msg_cerr("ERASE FAILED!\n"); - return -1; - } + /* FIXME: Check the status register for errors. */ return 0; } Modified: trunk/spi25.c ============================================================================== --- trunk/spi25.c Sun Jun 26 13:50:10 2011 (r1352) +++ trunk/spi25.c Sun Jun 26 19:04:16 2011 (r1353) @@ -481,10 +481,7 @@ /* FIXME: We assume spi_read_status_register will never fail. */ while (spi_read_status_register() & JEDEC_RDSR_BIT_WIP) programmer_delay(1000 * 1000); - if (check_erased_range(flash, 0, flash->total_size * 1024)) { - msg_cerr("ERASE FAILED!\n"); - return -1; - } + /* FIXME: Check the status register for errors. */ return 0; } @@ -520,10 +517,7 @@ /* FIXME: We assume spi_read_status_register will never fail. */ while (spi_read_status_register() & JEDEC_RDSR_BIT_WIP) programmer_delay(1000 * 1000); - if (check_erased_range(flash, 0, flash->total_size * 1024)) { - msg_cerr("ERASE FAILED!\n"); - return -1; - } + /* FIXME: Check the status register for errors. */ return 0; } @@ -564,10 +558,7 @@ */ while (spi_read_status_register() & JEDEC_RDSR_BIT_WIP) programmer_delay(100 * 1000); - if (check_erased_range(flash, addr, blocklen)) { - msg_cerr("ERASE FAILED!\n"); - return -1; - } + /* FIXME: Check the status register for errors. */ return 0; } @@ -613,10 +604,7 @@ */ while (spi_read_status_register() & JEDEC_RDSR_BIT_WIP) programmer_delay(100 * 1000); - if (check_erased_range(flash, addr, blocklen)) { - msg_cerr("ERASE FAILED!\n"); - return -1; - } + /* FIXME: Check the status register for errors. */ return 0; } @@ -660,10 +648,7 @@ */ while (spi_read_status_register() & JEDEC_RDSR_BIT_WIP) programmer_delay(100 * 1000); - if (check_erased_range(flash, addr, blocklen)) { - msg_cerr("ERASE FAILED!\n"); - return -1; - } + /* FIXME: Check the status register for errors. */ return 0; } @@ -705,10 +690,7 @@ */ while (spi_read_status_register() & JEDEC_RDSR_BIT_WIP) programmer_delay(10 * 1000); - if (check_erased_range(flash, addr, blocklen)) { - msg_cerr("ERASE FAILED!\n"); - return -1; - } + /* FIXME: Check the status register for errors. */ return 0; } Modified: trunk/sst28sf040.c ============================================================================== --- trunk/sst28sf040.c Sun Jun 26 13:50:10 2011 (r1352) +++ trunk/sst28sf040.c Sun Jun 26 19:04:16 2011 (r1353) @@ -71,10 +71,7 @@ /* wait for Toggle bit ready */ toggle_ready_jedec(bios); - if (check_erased_range(flash, address, sector_size)) { - msg_cerr("ERASE FAILED!\n"); - return -1; - } + /* FIXME: Check the status register for errors. */ return 0; } @@ -113,10 +110,7 @@ programmer_delay(10); toggle_ready_jedec(bios); - if (check_erased_range(flash, 0, flash->total_size * 1024)) { - msg_cerr("ERASE FAILED!\n"); - return -1; - } + /* FIXME: Check the status register for errors. */ return 0; } Modified: trunk/sst49lfxxxc.c ============================================================================== --- trunk/sst49lfxxxc.c Sun Jun 26 13:50:10 2011 (r1352) +++ trunk/sst49lfxxxc.c Sun Jun 26 19:04:16 2011 (r1353) @@ -70,9 +70,6 @@ status = wait_82802ab(flash); print_status_82802ab(status); - if (check_erased_range(flash, address, sector_size)) { - msg_cerr("ERASE FAILED!\n"); - return -1; - } + /* FIXME: Check the status register for errors. */ return 0; } Modified: trunk/stm50flw0x0x.c ============================================================================== --- trunk/stm50flw0x0x.c Sun Jun 26 13:50:10 2011 (r1352) +++ trunk/stm50flw0x0x.c Sun Jun 26 19:04:16 2011 (r1353) @@ -107,10 +107,6 @@ wait_82802ab(flash); - if (check_erased_range(flash, sector, sectorsize)) { - msg_cerr("ERASE FAILED!\n"); - return -1; - } - + /* FIXME: Check the status register for errors. */ return 0; }

1 0

Re: [flashrom] [PATCH] Remove erase_chip_stm50flw0x0x
by Carl-Daniel Hailfinger June 26, 2011

June 26, 2011

Am 09.03.2011 02:52 schrieb Michael Karcher: > As the comment indicates, that function is not a chip erase function > at all, but a function calling a block eraser in a loop. So it adds > no extra value to what we already have in the block_eraser > infrastructure. > > Furthermore, that function assumes a uniform sector size layout, but > is referenced from flash chip with non-uniform sector size layout, which > is just wrong. > Great, even more code killed. Thanks for your patch. > Signed-off-by: Michael Karcher<flashrom(a)mkarcher.dialup.fu-berlin.de> > Acked-by: Carl-Daniel Hailfinger <c-d.hailfinger.devel.2006(a)gmx.net> Please compile test, then commit. Regards, Carl-Daniel -- http://www.hailfinger.org/

2 1

[RFC] forward declarations
by Carl-Daniel Hailfinger June 26, 2011

June 26, 2011

Hi, we have quite a few pending patches which just move code around to avoid forward declarations. The sad thing is that some of those pieces of code were already moved around in the past to avoid forward declarations. Tracking code history becomes unnecessarily hard with all those moves, and I expect lots of code to be moved again and again as flashrom evolves. Yes, forward declarations are ugly, but not moving code around makes patches smaller and reviews easier. We don't have enough reviewer capacity, and while I argued against forward declarations in the past, I have to admit they are a good way to keep code changes as small as possible. New code should preferably be inserted where it does not need forward declarations, but moving old code around inside the same file is not a good thing IMHO. (And yes, I have a few patches in my local queue which move lots of code around, so I'd have to redo them as well, but hopefully the result can be reviewed more easily.) Thoughts? Regards, Carl-Daniel -- http://www.hailfinger.org/

2 1

[PATCH] Use strlen for const strings
by Carl-Daniel Hailfinger June 26, 2011

June 26, 2011

Replace sizeof("string")-1 with strlen("string") We want to avoid calls to strlen at runtime if the string is already known at compile time. Turns out that gcc and clang will recognize constant strings and compute the strlen result already at compile time, so trickery with sizeof only reduces readability but does not improve the code. Signed-off-by: Carl-Daniel Hailfinger <c-d.hailfinger.devel.2006(a)gmx.net> Index: flashrom-const_strlen/processor_enable.c =================================================================== --- flashrom-const_strlen/processor_enable.c (Revision 1183) +++ flashrom-const_strlen/processor_enable.c (Arbeitskopie) @@ -56,13 +56,13 @@ while (*ptr && isspace(*ptr)) ptr++; /* "cpu" part appears only with some Linux versions. */ - if (strncmp(ptr, "cpu", sizeof("cpu") - 1) == 0) - ptr += sizeof("cpu") - 1; + if (strncmp(ptr, "cpu", strlen("cpu")) == 0) + ptr += strlen("cpu"); while (*ptr && isspace(*ptr)) ptr++; - if (strncmp(ptr, "model", sizeof("model") - 1) != 0) + if (strncmp(ptr, "model", strlen("model")) != 0) continue; - ptr += sizeof("model") - 1; + ptr += strlen("model"); while (*ptr && isspace(*ptr)) ptr++; if (*ptr != ':') @@ -72,9 +72,9 @@ ptr++; fclose(cpuinfo); return (strncmp(ptr, "ICT Loongson-2 V0.3", - sizeof("ICT Loongson-2 V0.3") - 1) == 0) + strlen("ICT Loongson-2 V0.3")) == 0) || (strncmp(ptr, "Godson2 V0.3 FPU V0.1", - sizeof("Godson2 V0.3 FPU V0.1") - 1) == 0); + strlen("Godson2 V0.3 FPU V0.1")) == 0); } fclose(cpuinfo); return 0; -- http://www.hailfinger.org/

4 5