flashrom October 2010

flashrom@flashrom.org

66 participants
181 discussions

flashrom.log DMI string system-manufacturer: "TsingHua TongFang Computer"
by Qian Hong 15 Oct '10

15 Oct '10

DMI string system-manufacturer: "TsingHua TongFang Computer" DMI string system-product-name: "K400" DMI string system-version: "REFERENCE" DMI string baseboard-manufacturer: "NVIDIA " DMI string baseboard-product-name: "MCP67" DMI string baseboard-version: "REFERENCE" DMI string chassis-type: "Desktop"

1 0

P4B533 details
by peter＠ddcrew.com 15 Oct '10

15 Oct '10

Official latest (non-beta) bios: http://dlsvr.asus.com/pub/ASUS/mb/sock478/p4b533/1015.zip Board name: P4B533

1 1

[PATCH] Clean up doit()
by Carl-Daniel Hailfinger 15 Oct '10

15 Oct '10

doit() is the monster function we split off from main() when we created cli_classic() and tried to introduce some abstraction. doit() is a poster child of WTFs on an astronomic scale. Make doit() marginally less bad by factoring out self-contained code. Should have no functional changes. The new code flow is designed to make partial writes easier to implement. Tests appreciated. Signed-off-by: Carl-Daniel Hailfinger <c-d.hailfinger.devel.2006(a)gmx.net> Index: flashrom-doit_refactor/flashrom.c =================================================================== --- flashrom-doit_refactor/flashrom.c (Revision 1211) +++ flashrom-doit_refactor/flashrom.c (Arbeitskopie) @@ -1116,6 +1116,39 @@ return ret; } +int read_buf_from_file(unsigned char *buf, unsigned long size, char *filename) +{ + unsigned long numbytes; + FILE *image; + struct stat image_stat; + + if ((image = fopen(filename, "rb")) == NULL) { + perror(filename); + return 1; + } + if (fstat(fileno(image), &image_stat) != 0) { + perror(filename); + fclose(image); + return 1; + } + if (image_stat.st_size != size) { + msg_gerr("Error: Image size doesn't match\n"); + fclose(image); + return 1; + } + numbytes = fread(buf, 1, size, image); + if (fclose(image)) { + perror(filename); + return 1; + } + if (numbytes != size) { + msg_gerr("Error: Failed to read complete file. Got %ld bytes, " + "wanted %ld!\n", numbytes, size); + return 1; + } + return 0; +} + int write_buf_to_file(unsigned char *buf, unsigned long size, char *filename) { unsigned long numbytes; @@ -1514,8 +1547,6 @@ int doit(struct flashchip *flash, int force, char *filename, int read_it, int write_it, int erase_it, int verify_it) { uint8_t *buf; - unsigned long numbytes; - FILE *image; int ret = 0; unsigned long size; @@ -1537,7 +1568,19 @@ } } - if (erase_it) { + /* Given the existence of read locks, we want to unlock for read, + * erase and write. + */ + if (flash->unlock) + flash->unlock(flash); + + if (read_it) { + ret = read_flash_to_file(flash, filename); + programmer_shutdown(); + return ret; + } + if (erase_it || write_it) { + /* Write needs erase. */ if (flash->tested & TEST_BAD_ERASE) { msg_cerr("Erase is not working on this chip. "); if (!force) { @@ -1548,34 +1591,9 @@ msg_cerr("Continuing anyway.\n"); } } - if (flash->unlock) - flash->unlock(flash); - - if (erase_flash(flash)) { - emergency_help_message(); - programmer_shutdown(); - return 1; - } - } else if (read_it) { - if (flash->unlock) - flash->unlock(flash); - - if (read_flash_to_file(flash, filename)) { - programmer_shutdown(); - return 1; - } - } 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. "); - if (!force) { - msg_cerr("Aborting.\n"); - programmer_shutdown(); - return 1; - } else { - msg_cerr("Continuing anyway.\n"); - } - } + /* FIXME: Check if at least one erase function exists. */ + } + if (write_it) { if (flash->tested & TEST_BAD_WRITE) { msg_cerr("Write is not working on this chip. "); if (!force) { @@ -1591,39 +1609,25 @@ 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); + if (erase_it) { + if (erase_flash(flash)) { + emergency_help_message(); programmer_shutdown(); - exit(1); + return 1; } - if (fstat(fileno(image), &image_stat) != 0) { - perror(filename); + } + + if (write_it || verify_it) { + if (read_buf_from_file(buf, flash->total_size * 1024, filename)) { programmer_shutdown(); - exit(1); + return 1; } - if (image_stat.st_size != flash->total_size * 1024) { - msg_gerr("Error: Image size doesn't match\n"); - programmer_shutdown(); - exit(1); - } - numbytes = fread(buf, 1, size, image); #if CONFIG_INTERNAL == 1 show_id(buf, size, force); #endif - fclose(image); - if (numbytes != size) { - msg_gerr("Error: Failed to read file. Got %ld bytes, wanted %ld!\n", numbytes, size); - programmer_shutdown(); - return 1; - } } // This should be moved into each flash part's code to do it -- http://www.hailfinger.org/

2 3

[commit] r1212 - trunk
by repository service 15 Oct '10

15 Oct '10

Author: hailfinger Date: Fri Oct 15 02:01:14 2010 New Revision: 1212 URL: http://flashrom.org/trac/flashrom/changeset/1212 Log: doit() is the monster function we split off from main() when we created cli_classic() and tried to introduce some abstraction. doit() is a poster child of WTFs on an astronomic scale. Make doit() less bad by factoring out self-contained code. Signed-off-by: Carl-Daniel Hailfinger <c-d.hailfinger.devel.2006(a)gmx.net> Acked-by: Sean Nelson <audiohacked(a)gmail.com> Modified: trunk/flashrom.c Modified: trunk/flashrom.c ============================================================================== --- trunk/flashrom.c Thu Oct 14 00:26:56 2010 (r1211) +++ trunk/flashrom.c Fri Oct 15 02:01:14 2010 (r1212) @@ -1116,6 +1116,39 @@ return ret; } +int read_buf_from_file(unsigned char *buf, unsigned long size, char *filename) +{ + unsigned long numbytes; + FILE *image; + struct stat image_stat; + + if ((image = fopen(filename, "rb")) == NULL) { + perror(filename); + return 1; + } + if (fstat(fileno(image), &image_stat) != 0) { + perror(filename); + fclose(image); + return 1; + } + if (image_stat.st_size != size) { + msg_gerr("Error: Image size doesn't match\n"); + fclose(image); + return 1; + } + numbytes = fread(buf, 1, size, image); + if (fclose(image)) { + perror(filename); + return 1; + } + if (numbytes != size) { + msg_gerr("Error: Failed to read complete file. Got %ld bytes, " + "wanted %ld!\n", numbytes, size); + return 1; + } + return 0; +} + int write_buf_to_file(unsigned char *buf, unsigned long size, char *filename) { unsigned long numbytes; @@ -1507,123 +1540,109 @@ return cli_classic(argc, argv); } -/* 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. +/* FIXME: This function signature needs to be improved once doit() has a better + * function signature. */ -int doit(struct flashchip *flash, int force, char *filename, int read_it, int write_it, int erase_it, int verify_it) +int chip_safety_check(struct flashchip *flash, int force, char *filename, int read_it, int write_it, int erase_it, int verify_it) { - uint8_t *buf; - unsigned long numbytes; - FILE *image; - int ret = 0; - unsigned long size; - - size = flash->total_size * 1024; - buf = (uint8_t *) calloc(size, sizeof(char)); - if (!programmer_may_write && (write_it || erase_it)) { msg_perr("Write/erase is not working yet on your programmer in " "its current configuration.\n"); /* --force is the wrong approach, but it's the best we can do * until the generic programmer parameter parser is merged. */ - if (!force) { - msg_perr("Aborting.\n"); - programmer_shutdown(); + if (!force) return 1; - } else { - msg_cerr("Continuing anyway.\n"); - } + msg_cerr("Continuing anyway.\n"); } - if (erase_it) { - if (flash->tested & TEST_BAD_ERASE) { - msg_cerr("Erase is not working on this chip. "); - if (!force) { - msg_cerr("Aborting.\n"); - programmer_shutdown(); + if (read_it || erase_it || write_it || verify_it) { + /* Everything needs read. */ + if (flash->tested & TEST_BAD_READ) { + msg_cerr("Read is not working on this chip. "); + if (!force) return 1; - } else { - msg_cerr("Continuing anyway.\n"); - } - } - if (flash->unlock) - flash->unlock(flash); - - if (erase_flash(flash)) { - emergency_help_message(); - programmer_shutdown(); - return 1; + msg_cerr("Continuing anyway.\n"); } - } else if (read_it) { - if (flash->unlock) - flash->unlock(flash); - - if (read_flash_to_file(flash, filename)) { - programmer_shutdown(); + if (!flash->read) { + msg_cerr("flashrom has no read function for this " + "flash chip.\n"); return 1; } - } else if (write_it) { + } + if (erase_it || write_it) { + /* Write needs erase. */ if (flash->tested & TEST_BAD_ERASE) { - msg_cerr("Erase is not working on this chip " - "and erase is needed for write. "); - if (!force) { - msg_cerr("Aborting.\n"); - programmer_shutdown(); + msg_cerr("Erase is not working on this chip. "); + if (!force) return 1; - } else { - msg_cerr("Continuing anyway.\n"); - } + msg_cerr("Continuing anyway.\n"); } + /* FIXME: Check if at least one erase function exists. */ + } + if (write_it) { if (flash->tested & TEST_BAD_WRITE) { msg_cerr("Write is not working on this chip. "); - if (!force) { - msg_cerr("Aborting.\n"); - programmer_shutdown(); + if (!force) return 1; - } else { - msg_cerr("Continuing anyway.\n"); - } + msg_cerr("Continuing anyway.\n"); } if (!flash->write) { - msg_cerr("Error: flashrom has no write function for this flash chip.\n"); - programmer_shutdown(); + msg_cerr("flashrom has no write function for this " + "flash chip.\n"); return 1; } - if (flash->unlock) - flash->unlock(flash); + } + return 0; +} + +/* 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) +{ + uint8_t *buf; + int ret = 0; + unsigned long size; + if (chip_safety_check(flash, force, filename, read_it, write_it, erase_it, verify_it)) { + msg_cerr("Aborting.\n"); + programmer_shutdown(); + return 1; } - if (write_it || verify_it) { - struct stat image_stat; - if ((image = fopen(filename, "rb")) == NULL) { - perror(filename); - programmer_shutdown(); - exit(1); - } - if (fstat(fileno(image), &image_stat) != 0) { - perror(filename); + size = flash->total_size * 1024; + buf = (uint8_t *) calloc(size, sizeof(char)); + + /* Given the existence of read locks, we want to unlock for read, + * erase and write. + */ + if (flash->unlock) + flash->unlock(flash); + + if (read_it) { + ret = read_flash_to_file(flash, filename); + programmer_shutdown(); + return ret; + } + if (erase_it) { + if (erase_flash(flash)) { + emergency_help_message(); programmer_shutdown(); - exit(1); + return 1; } - if (image_stat.st_size != flash->total_size * 1024) { - msg_gerr("Error: Image size doesn't match\n"); + } + + if (write_it || verify_it) { + if (read_buf_from_file(buf, flash->total_size * 1024, filename)) { programmer_shutdown(); - exit(1); + return 1; } - numbytes = fread(buf, 1, size, image); #if CONFIG_INTERNAL == 1 show_id(buf, size, force); #endif - fclose(image); - if (numbytes != size) { - msg_gerr("Error: Failed to read file. Got %ld bytes, wanted %ld!\n", numbytes, size); - programmer_shutdown(); - return 1; - } } // This should be moved into each flash part's code to do it

1 0

[patch] EPoX EP-8NPA7I board enable (v2)
by Jonathan A. Kollasch 14 Oct '10

14 Oct '10

Add board enable for EPoX EP-8NPA7I (and possibly other similar EPoX boards). Signed-off-by: Jonathan Kollasch <jakllsch(a)kollasch.net> ---

1 0

[PATCH] Switch all chips to partial write
by Carl-Daniel Hailfinger 14 Oct '10

14 Oct '10

Switch all flash chips to partial write. The inner write functions which handle partial write are renamed to the original name of their wrappers. The write wrappers are removed. This patch depends on Re: [flashrom] [PATCH] Refactor remaining write wrappers Tests are appreciated. Signed-off-by: Carl-Daniel Hailfinger <c-d.hailfinger.devel.2006(a)gmx.net> --- flashrom-partial_write_inner_function_cleanup_annotate/82802ab.c 2010-10-10 22:33:45.000000000 +0200 +++ flashrom-partial_write_switchover/82802ab.c 2010-10-11 14:16:48.000000000 +0200 @@ -144,7 +144,8 @@ return 0; } -int write_page_82802ab(struct flashchip *flash, uint8_t *src, int start, int len) +/* chunksize is 1 */ +int write_82802ab(struct flashchip *flash, uint8_t *src, int start, int len) { int i; chipaddr dst = flash->virtual_memory + start; @@ -160,12 +161,6 @@ return 0; } -/* chunksize is 1 */ -int write_82802ab(struct flashchip *flash, uint8_t *buf) -{ - return write_page_82802ab(flash, buf, 0, flash->total_size * 1024); -} - int unlock_28f004s5(struct flashchip *flash) { chipaddr bios = flash->virtual_memory; --- flashrom-partial_write_inner_function_cleanup_annotate/chipdrivers.h 2010-10-10 22:25:29.000000000 +0200 +++ flashrom-partial_write_switchover/chipdrivers.h 2010-10-11 14:19:04.000000000 +0200 @@ -39,10 +39,8 @@ int spi_block_erase_d8(struct flashchip *flash, unsigned int addr, unsigned int blocklen); int spi_block_erase_60(struct flashchip *flash, unsigned int addr, unsigned int blocklen); int spi_block_erase_c7(struct flashchip *flash, unsigned int addr, unsigned int blocklen); -int spi_chip_write_1(struct flashchip *flash, uint8_t *buf); -int spi_chip_write_256(struct flashchip *flash, uint8_t *buf); -int spi_chip_write_1_new(struct flashchip *flash, uint8_t *buf, int start, int len); -int spi_chip_write_256_new(struct flashchip *flash, uint8_t *buf, int start, int len); +int spi_chip_write_1(struct flashchip *flash, uint8_t *buf, int start, int len); +int spi_chip_write_256(struct flashchip *flash, uint8_t *buf, int start, int len); int spi_chip_read(struct flashchip *flash, uint8_t *buf, int start, int len); uint8_t spi_read_status_register(void); int spi_prettyprint_status_register_at25df(struct flashchip *flash); @@ -61,16 +59,14 @@ int spi_nbyte_read(int addr, uint8_t *bytes, int len); int spi_read_chunked(struct flashchip *flash, uint8_t *buf, int start, int len, int chunksize); int spi_write_chunked(struct flashchip *flash, uint8_t *buf, int start, int len, int chunksize); -int spi_aai_write_new(struct flashchip *flash, uint8_t *buf, int start, int len); -int spi_aai_write(struct flashchip *flash, uint8_t *buf); +int spi_aai_write(struct flashchip *flash, uint8_t *buf, int start, int len); /* 82802ab.c */ 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); +int write_82802ab(struct flashchip *flash, uint8_t *buf, int start, int len); void print_status_82802ab(uint8_t status); -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); @@ -81,21 +77,18 @@ int write_byte_program_jedec(chipaddr bios, uint8_t *src, chipaddr dst); int probe_jedec(struct flashchip *flash); -int write_jedec(struct flashchip *flash, uint8_t *buf); -int write_jedec_1(struct flashchip *flash, uint8_t *buf); +int write_jedec(struct flashchip *flash, uint8_t *buf, int start, int len); +int write_jedec_1(struct flashchip *flash, uint8_t *buf, int start, int len); 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, int start, int len); -int write_page_write_jedec_common(struct flashchip *flash, uint8_t *src, int start, int page_size); /* m29f400bt.c */ int probe_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); +int write_m29f400bt(struct flashchip *flash, uint8_t *buf, int start, int len); void protect_m29f400bt(chipaddr bios); -int write_page_m29f400bt(struct flashchip *flash, uint8_t *src, int start, int len); /* pm49fl00x.c */ int unlock_49fl00x(struct flashchip *flash); @@ -104,8 +97,7 @@ /* sst28sf040.c */ 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); +int write_28sf040(struct flashchip *flash, uint8_t *buf, int start, int len); int unprotect_28sf040(struct flashchip *flash); int protect_28sf040(struct flashchip *flash); --- flashrom-partial_write_inner_function_cleanup_annotate/flash.h 2010-10-10 18:30:10.000000000 +0200 +++ flashrom-partial_write_switchover/flash.h 2010-10-11 14:15:07.000000000 +0200 @@ -135,7 +135,7 @@ int (*printlock) (struct flashchip *flash); int (*unlock) (struct flashchip *flash); - int (*write) (struct flashchip *flash, uint8_t *buf); + int (*write) (struct flashchip *flash, uint8_t *buf, int start, int len); int (*read) (struct flashchip *flash, uint8_t *buf, int start, int len); /* Some flash devices have an additional register space. */ --- flashrom-partial_write_inner_function_cleanup_annotate/flashrom.c 2010-10-08 23:34:41.000000000 +0200 +++ flashrom-partial_write_switchover/flashrom.c 2010-10-11 14:24:06.000000000 +0200 @@ -1639,7 +1639,7 @@ return 1; } msg_cinfo("Writing flash chip... "); - ret = flash->write(flash, buf); + ret = flash->write(flash, buf, 0, flash->total_size * 1024); if (ret) { msg_cerr("FAILED!\n"); emergency_help_message(); --- flashrom-partial_write_inner_function_cleanup_annotate/jedec.c 2010-10-11 14:13:31.000000000 +0200 +++ flashrom-partial_write_switchover/jedec.c 2010-10-11 14:16:16.000000000 +0200 @@ -336,7 +336,8 @@ return failed; } -int write_sector_jedec_common(struct flashchip *flash, uint8_t *src, int start, int len) +/* chunksize is 1 */ +int write_jedec_1(struct flashchip *flash, uint8_t *src, int start, int len) { int i, failed = 0; chipaddr dst = flash->virtual_memory + start; @@ -398,13 +399,14 @@ return failed; } +/* chunksize is page_size */ /* * Write a part of the flash chip. * FIXME: Use the chunk code from Michael Karcher instead. * This function is a slightly modified copy of spi_write_chunked. * Each page is written separately in chunks with a maximum size of chunksize. */ -int write_jedec_pages(struct flashchip *flash, uint8_t *buf, int start, int len) +int write_jedec(struct flashchip *flash, uint8_t *buf, int start, int len) { int i, starthere, lenhere; /* FIXME: page_size is the wrong variable. We need max_writechunk_size @@ -437,18 +439,6 @@ return 0; } -/* chunksize is page_size */ -int write_jedec(struct flashchip *flash, uint8_t *buf) -{ - return write_jedec_pages(flash, buf, 0, flash->total_size * 1024); -} - -/* chunksize is 1 */ -int write_jedec_1(struct flashchip *flash, uint8_t * buf) -{ - return write_sector_jedec_common(flash, buf, 0, flash->total_size * 1024); -} - /* erase chip with block_erase() prototype */ int erase_chip_block_jedec(struct flashchip *flash, unsigned int addr, unsigned int blocksize) --- flashrom-partial_write_inner_function_cleanup_annotate/m29f400bt.c 2010-10-10 22:33:58.000000000 +0200 +++ flashrom-partial_write_switchover/m29f400bt.c 2010-10-11 14:19:52.000000000 +0200 @@ -27,7 +27,8 @@ 0x555 instead of 0x2AA. Do *not* blindly replace with standard JEDEC functions. */ -int write_page_m29f400bt(struct flashchip *flash, uint8_t *src, int start, int len) +/* chunksize is 1 */ +int write_m29f400bt(struct flashchip *flash, uint8_t *src, int start, int len) { int i; chipaddr bios = flash->virtual_memory; @@ -139,9 +140,3 @@ } return erase_m29f400bt(flash); } - -/* chunksize is 1 */ -int write_m29f400bt(struct flashchip *flash, uint8_t *buf) -{ - return write_page_m29f400bt(flash, buf, 0, flash->total_size * 1024); -} --- flashrom-partial_write_inner_function_cleanup_annotate/spi25.c 2010-10-08 23:34:42.000000000 +0200 +++ flashrom-partial_write_switchover/spi25.c 2010-10-11 14:22:43.000000000 +0200 @@ -1304,7 +1304,7 @@ * (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_new(struct flashchip *flash, uint8_t *buf, int start, int len) +int spi_chip_write_1(struct flashchip *flash, uint8_t *buf, int start, int len) { int i, result = 0; @@ -1319,12 +1319,7 @@ return 0; } -int spi_chip_write_1(struct flashchip *flash, uint8_t *buf) -{ - return spi_chip_write_1_new(flash, buf, 0, flash->total_size * 1024); -} - -int spi_aai_write_new(struct flashchip *flash, uint8_t *buf, int start, int len) +int spi_aai_write(struct flashchip *flash, uint8_t *buf, int start, int len) { uint32_t pos = start; int result; @@ -1363,7 +1358,7 @@ case SPI_CONTROLLER_WBSIO: msg_perr("%s: impossible with this SPI controller," " degrading to byte program\n", __func__); - return spi_chip_write_1_new(flash, buf, start, len); + return spi_chip_write_1(flash, buf, start, len); #endif #endif default: @@ -1415,9 +1410,3 @@ spi_write_disable(); return 0; } - -int spi_aai_write(struct flashchip *flash, uint8_t *buf) -{ - return spi_aai_write_new(flash, buf, 0, flash->total_size * 1024); -} - --- flashrom-partial_write_inner_function_cleanup_annotate/spi.c 2010-10-08 23:34:42.000000000 +0200 +++ flashrom-partial_write_switchover/spi.c 2010-10-11 14:21:30.000000000 +0200 @@ -245,7 +245,7 @@ * .write_256 = spi_chip_write_1 */ /* real chunksize is up to 256, logical chunksize is 256 */ -int spi_chip_write_256_new(struct flashchip *flash, uint8_t *buf, int start, int len) +int spi_chip_write_256(struct flashchip *flash, uint8_t *buf, int start, int len) { if (!spi_programmer[spi_controller].write_256) { msg_perr("%s called, but SPI page write is unsupported on this " @@ -257,20 +257,6 @@ return spi_programmer[spi_controller].write_256(flash, buf, start, len); } -/* Wrapper function until the generic code is converted to partial writes. */ -int spi_chip_write_256(struct flashchip *flash, uint8_t *buf) -{ - int ret; - - msg_pinfo("Programming flash... "); - ret = spi_chip_write_256_new(flash, buf, 0, flash->total_size * 1024); - if (!ret) - msg_pinfo("done.\n"); - else - msg_pinfo("\n"); - return ret; -} - /* * Get the lowest allowed address for read accesses. This often happens to * be the lowest allowed address for all commands which take an address. --- flashrom-partial_write_inner_function_cleanup_annotate/sst28sf040.c 2010-10-10 22:40:48.000000000 +0200 +++ flashrom-partial_write_switchover/sst28sf040.c 2010-10-11 14:20:24.000000000 +0200 @@ -78,7 +78,8 @@ return 0; } -int write_sector_28sf040(struct flashchip *flash, uint8_t *src, int start, int len) +/* chunksize is 1 */ +int write_28sf040(struct flashchip *flash, uint8_t *src, int start, int len) { int i; chipaddr bios = flash->virtual_memory; @@ -119,12 +120,6 @@ return 0; } -/* chunksize is 1 */ -int write_28sf040(struct flashchip *flash, uint8_t *buf) -{ - return write_sector_28sf040(flash, buf, 0, flash->total_size * 1024); -} - int erase_chip_28sf040(struct flashchip *flash, unsigned int addr, unsigned int blocklen) { if ((addr != 0) || (blocklen != flash->total_size * 1024)) { -- http://www.hailfinger.org/

7 10

[commit] r1211 - trunk
by repository service 13 Oct '10

13 Oct '10

Author: hailfinger Date: Thu Oct 14 00:26:56 2010 New Revision: 1211 URL: http://flashrom.org/trac/flashrom/changeset/1211 Log: Switch all flash chips to partial write. The inner write functions which handle partial write are renamed to the original name of their wrappers. The write wrappers are removed. Signed-off-by: Carl-Daniel Hailfinger <c-d.hailfinger.devel.2006(a)gmx.net> Tested-by: Maciej Pijanka <maciej.pijanka(a)gmail.com> Tested-by: Andrew Morgan <ziltro(a)ziltro.com> Tested-by: Idwer Vollering <vidwer(a)gmail.com> Acked-by: Idwer Vollering <vidwer(a)gmail.com> Tested-by: Sean Nelson <audiohacked(a)gmail.com> Acked-by: Sean Nelson <audiohacked(a)gmail.com> Modified: trunk/82802ab.c trunk/chipdrivers.h trunk/flash.h trunk/flashrom.c trunk/it87spi.c trunk/jedec.c trunk/m29f400bt.c trunk/spi.c trunk/spi25.c trunk/sst28sf040.c Modified: trunk/82802ab.c ============================================================================== --- trunk/82802ab.c Wed Oct 13 23:49:30 2010 (r1210) +++ trunk/82802ab.c Thu Oct 14 00:26:56 2010 (r1211) @@ -144,7 +144,8 @@ return 0; } -int write_page_82802ab(struct flashchip *flash, uint8_t *src, int start, int len) +/* chunksize is 1 */ +int write_82802ab(struct flashchip *flash, uint8_t *src, int start, int len) { int i; chipaddr dst = flash->virtual_memory + start; @@ -160,12 +161,6 @@ return 0; } -/* chunksize is 1 */ -int write_82802ab(struct flashchip *flash, uint8_t *buf) -{ - return write_page_82802ab(flash, buf, 0, flash->total_size * 1024); -} - int unlock_28f004s5(struct flashchip *flash) { chipaddr bios = flash->virtual_memory; Modified: trunk/chipdrivers.h ============================================================================== --- trunk/chipdrivers.h Wed Oct 13 23:49:30 2010 (r1210) +++ trunk/chipdrivers.h Thu Oct 14 00:26:56 2010 (r1211) @@ -39,10 +39,8 @@ int spi_block_erase_d8(struct flashchip *flash, unsigned int addr, unsigned int blocklen); int spi_block_erase_60(struct flashchip *flash, unsigned int addr, unsigned int blocklen); int spi_block_erase_c7(struct flashchip *flash, unsigned int addr, unsigned int blocklen); -int spi_chip_write_1(struct flashchip *flash, uint8_t *buf); -int spi_chip_write_256(struct flashchip *flash, uint8_t *buf); -int spi_chip_write_1_new(struct flashchip *flash, uint8_t *buf, int start, int len); -int spi_chip_write_256_new(struct flashchip *flash, uint8_t *buf, int start, int len); +int spi_chip_write_1(struct flashchip *flash, uint8_t *buf, int start, int len); +int spi_chip_write_256(struct flashchip *flash, uint8_t *buf, int start, int len); int spi_chip_read(struct flashchip *flash, uint8_t *buf, int start, int len); uint8_t spi_read_status_register(void); int spi_prettyprint_status_register_at25df(struct flashchip *flash); @@ -61,16 +59,14 @@ int spi_nbyte_read(int addr, uint8_t *bytes, int len); int spi_read_chunked(struct flashchip *flash, uint8_t *buf, int start, int len, int chunksize); int spi_write_chunked(struct flashchip *flash, uint8_t *buf, int start, int len, int chunksize); -int spi_aai_write_new(struct flashchip *flash, uint8_t *buf, int start, int len); -int spi_aai_write(struct flashchip *flash, uint8_t *buf); +int spi_aai_write(struct flashchip *flash, uint8_t *buf, int start, int len); /* 82802ab.c */ 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); +int write_82802ab(struct flashchip *flash, uint8_t *buf, int start, int len); void print_status_82802ab(uint8_t status); -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); @@ -81,21 +77,18 @@ int write_byte_program_jedec(chipaddr bios, uint8_t *src, chipaddr dst); int probe_jedec(struct flashchip *flash); -int write_jedec(struct flashchip *flash, uint8_t *buf); -int write_jedec_1(struct flashchip *flash, uint8_t *buf); +int write_jedec(struct flashchip *flash, uint8_t *buf, int start, int len); +int write_jedec_1(struct flashchip *flash, uint8_t *buf, int start, int len); 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, int start, int len); -int write_page_write_jedec_common(struct flashchip *flash, uint8_t *src, int start, int page_size); /* m29f400bt.c */ int probe_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); +int write_m29f400bt(struct flashchip *flash, uint8_t *buf, int start, int len); void protect_m29f400bt(chipaddr bios); -int write_page_m29f400bt(struct flashchip *flash, uint8_t *src, int start, int len); /* pm49fl00x.c */ int unlock_49fl00x(struct flashchip *flash); @@ -104,8 +97,7 @@ /* sst28sf040.c */ 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); +int write_28sf040(struct flashchip *flash, uint8_t *buf, int start, int len); int unprotect_28sf040(struct flashchip *flash); int protect_28sf040(struct flashchip *flash); Modified: trunk/flash.h ============================================================================== --- trunk/flash.h Wed Oct 13 23:49:30 2010 (r1210) +++ trunk/flash.h Thu Oct 14 00:26:56 2010 (r1211) @@ -135,7 +135,7 @@ int (*printlock) (struct flashchip *flash); int (*unlock) (struct flashchip *flash); - int (*write) (struct flashchip *flash, uint8_t *buf); + int (*write) (struct flashchip *flash, uint8_t *buf, int start, int len); int (*read) (struct flashchip *flash, uint8_t *buf, int start, int len); /* Some flash devices have an additional register space. */ Modified: trunk/flashrom.c ============================================================================== --- trunk/flashrom.c Wed Oct 13 23:49:30 2010 (r1210) +++ trunk/flashrom.c Thu Oct 14 00:26:56 2010 (r1211) @@ -1639,7 +1639,7 @@ return 1; } msg_cinfo("Writing flash chip... "); - ret = flash->write(flash, buf); + ret = flash->write(flash, buf, 0, flash->total_size * 1024); if (ret) { msg_cerr("FAILED!\n"); emergency_help_message(); Modified: trunk/it87spi.c ============================================================================== --- trunk/it87spi.c Wed Oct 13 23:49:30 2010 (r1210) +++ trunk/it87spi.c Thu Oct 14 00:26:56 2010 (r1211) @@ -305,7 +305,7 @@ /* FIXME: The command below seems to be redundant or wrong. */ OUTB(0x06, it8716f_flashport + 1); OUTB(((2 + (fast_spi ? 1 : 0)) << 4), it8716f_flashport); - for (i = 0; i < 256; i++) { + for (i = 0; i < flash->page_size; i++) { chip_writeb(buf[i], bios + start + i); } OUTB(0, it8716f_flashport); @@ -339,34 +339,36 @@ { /* * IT8716F only allows maximum of 512 kb SPI chip size for memory - * mapped access. + * mapped access. It also can't write more than 1+3+256 bytes at once. */ - if ((programmer == PROGRAMMER_IT87SPI) || (flash->total_size * 1024 > 512 * 1024)) { - spi_chip_write_1_new(flash, buf, start, len); + if ((programmer == PROGRAMMER_IT87SPI) || + (flash->total_size * 1024 > 512 * 1024) || + (flash->page_size > 256)) { + spi_chip_write_1(flash, buf, start, len); } else { int lenhere; - if (start % 256) { + if (start % flash->page_size) { /* start to the end of the page or start + len, * whichever is smaller. Page length is hardcoded to * 256 bytes (IT87 SPI hardware limitation). */ - lenhere = min(len, (start | 0xff) - start + 1); - spi_chip_write_1_new(flash, buf, start, lenhere); + lenhere = min(len, flash->page_size - start % flash->page_size); + spi_chip_write_1(flash, buf, start, lenhere); start += lenhere; len -= lenhere; buf += lenhere; } /* FIXME: Handle chips which have max writechunk size >1 and <256. */ - while (len >= 256) { + while (len >= flash->page_size) { it8716f_spi_page_program(flash, buf, start); - start += 256; - len -= 256; - buf += 256; + start += flash->page_size; + len -= flash->page_size; + buf += flash->page_size; } if (len) - spi_chip_write_1_new(flash, buf, start, len); + spi_chip_write_1(flash, buf, start, len); } return 0; Modified: trunk/jedec.c ============================================================================== --- trunk/jedec.c Wed Oct 13 23:49:30 2010 (r1210) +++ trunk/jedec.c Thu Oct 14 00:26:56 2010 (r1211) @@ -336,7 +336,8 @@ return failed; } -int write_sector_jedec_common(struct flashchip *flash, uint8_t *src, int start, int len) +/* chunksize is 1 */ +int write_jedec_1(struct flashchip *flash, uint8_t *src, int start, int len) { int i, failed = 0; chipaddr dst = flash->virtual_memory + start; @@ -398,13 +399,14 @@ return failed; } +/* chunksize is page_size */ /* * Write a part of the flash chip. * FIXME: Use the chunk code from Michael Karcher instead. * This function is a slightly modified copy of spi_write_chunked. * Each page is written separately in chunks with a maximum size of chunksize. */ -int write_jedec_pages(struct flashchip *flash, uint8_t *buf, int start, int len) +int write_jedec(struct flashchip *flash, uint8_t *buf, int start, int len) { int i, starthere, lenhere; /* FIXME: page_size is the wrong variable. We need max_writechunk_size @@ -437,18 +439,6 @@ return 0; } -/* chunksize is page_size */ -int write_jedec(struct flashchip *flash, uint8_t *buf) -{ - return write_jedec_pages(flash, buf, 0, flash->total_size * 1024); -} - -/* chunksize is 1 */ -int write_jedec_1(struct flashchip *flash, uint8_t * buf) -{ - return write_sector_jedec_common(flash, buf, 0, flash->total_size * 1024); -} - /* erase chip with block_erase() prototype */ int erase_chip_block_jedec(struct flashchip *flash, unsigned int addr, unsigned int blocksize) Modified: trunk/m29f400bt.c ============================================================================== --- trunk/m29f400bt.c Wed Oct 13 23:49:30 2010 (r1210) +++ trunk/m29f400bt.c Thu Oct 14 00:26:56 2010 (r1211) @@ -27,7 +27,8 @@ 0x555 instead of 0x2AA. Do *not* blindly replace with standard JEDEC functions. */ -int write_page_m29f400bt(struct flashchip *flash, uint8_t *src, int start, int len) +/* chunksize is 1 */ +int write_m29f400bt(struct flashchip *flash, uint8_t *src, int start, int len) { int i; chipaddr bios = flash->virtual_memory; @@ -139,9 +140,3 @@ } return erase_m29f400bt(flash); } - -/* chunksize is 1 */ -int write_m29f400bt(struct flashchip *flash, uint8_t *buf) -{ - return write_page_m29f400bt(flash, buf, 0, flash->total_size * 1024); -} Modified: trunk/spi.c ============================================================================== --- trunk/spi.c Wed Oct 13 23:49:30 2010 (r1210) +++ trunk/spi.c Thu Oct 14 00:26:56 2010 (r1211) @@ -80,7 +80,7 @@ .command = wbsio_spi_send_command, .multicommand = default_spi_send_multicommand, .read = wbsio_spi_read, - .write_256 = spi_chip_write_1_new, + .write_256 = spi_chip_write_1, }, { /* SPI_CONTROLLER_MCP6X_BITBANG */ @@ -124,7 +124,7 @@ .command = dediprog_spi_send_command, .multicommand = default_spi_send_multicommand, .read = dediprog_spi_read, - .write_256 = spi_chip_write_1_new, + .write_256 = spi_chip_write_1, }, #endif @@ -245,7 +245,7 @@ * .write_256 = spi_chip_write_1 */ /* real chunksize is up to 256, logical chunksize is 256 */ -int spi_chip_write_256_new(struct flashchip *flash, uint8_t *buf, int start, int len) +int spi_chip_write_256(struct flashchip *flash, uint8_t *buf, int start, int len) { if (!spi_programmer[spi_controller].write_256) { msg_perr("%s called, but SPI page write is unsupported on this " @@ -257,20 +257,6 @@ return spi_programmer[spi_controller].write_256(flash, buf, start, len); } -/* Wrapper function until the generic code is converted to partial writes. */ -int spi_chip_write_256(struct flashchip *flash, uint8_t *buf) -{ - int ret; - - msg_pinfo("Programming flash... "); - ret = spi_chip_write_256_new(flash, buf, 0, flash->total_size * 1024); - if (!ret) - msg_pinfo("done.\n"); - else - msg_pinfo("\n"); - return ret; -} - /* * Get the lowest allowed address for read accesses. This often happens to * be the lowest allowed address for all commands which take an address. Modified: trunk/spi25.c ============================================================================== --- trunk/spi25.c Wed Oct 13 23:49:30 2010 (r1210) +++ trunk/spi25.c Thu Oct 14 00:26:56 2010 (r1211) @@ -1304,7 +1304,7 @@ * (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_new(struct flashchip *flash, uint8_t *buf, int start, int len) +int spi_chip_write_1(struct flashchip *flash, uint8_t *buf, int start, int len) { int i, result = 0; @@ -1319,12 +1319,7 @@ return 0; } -int spi_chip_write_1(struct flashchip *flash, uint8_t *buf) -{ - return spi_chip_write_1_new(flash, buf, 0, flash->total_size * 1024); -} - -int spi_aai_write_new(struct flashchip *flash, uint8_t *buf, int start, int len) +int spi_aai_write(struct flashchip *flash, uint8_t *buf, int start, int len) { uint32_t pos = start; int result; @@ -1363,7 +1358,7 @@ case SPI_CONTROLLER_WBSIO: msg_perr("%s: impossible with this SPI controller," " degrading to byte program\n", __func__); - return spi_chip_write_1_new(flash, buf, start, len); + return spi_chip_write_1(flash, buf, start, len); #endif #endif default: @@ -1373,18 +1368,24 @@ /* The even start address and even length requirements can be either * honored outside this function, or we can call spi_byte_program * for the first and/or last byte and use AAI for the rest. + * FIXME: Move this to generic code. */ /* The data sheet requires a start address with the low bit cleared. */ if (start % 2) { msg_cerr("%s: start address not even! Please report a bug at " "flashrom(a)flashrom.org\n", __func__); - return SPI_GENERIC_ERROR; + if (spi_chip_write_1(flash, buf, start, start % 2)) + return SPI_GENERIC_ERROR; + pos += start % 2; + /* Do not return an error for now. */ + //return SPI_GENERIC_ERROR; } /* The data sheet requires total AAI write length to be even. */ if (len % 2) { msg_cerr("%s: total write length not even! Please report a " "bug at flashrom(a)flashrom.org\n", __func__); - return SPI_GENERIC_ERROR; + /* Do not return an error for now. */ + //return SPI_GENERIC_ERROR; } @@ -1403,7 +1404,8 @@ /* We already wrote 2 bytes in the multicommand step. */ pos += 2; - while (pos < start + len) { + /* Are there at least two more bytes to write? */ + while (pos < start + len - 1) { cmd[1] = buf[pos++]; cmd[2] = buf[pos++]; spi_send_command(JEDEC_AAI_WORD_PROGRAM_CONT_OUTSIZE, 0, cmd, NULL); @@ -1411,13 +1413,17 @@ programmer_delay(10); } - /* Use WRDI to exit AAI mode. */ + /* Use WRDI to exit AAI mode. This needs to be done before issuing any + * other non-AAI command. + */ spi_write_disable(); - return 0; -} -int spi_aai_write(struct flashchip *flash, uint8_t *buf) -{ - return spi_aai_write_new(flash, buf, 0, flash->total_size * 1024); -} + /* Write remaining byte (if any). */ + if (pos < start + len) { + if (spi_chip_write_1(flash, buf + pos, pos, pos % 2)) + return SPI_GENERIC_ERROR; + pos += pos % 2; + } + return 0; +} Modified: trunk/sst28sf040.c ============================================================================== --- trunk/sst28sf040.c Wed Oct 13 23:49:30 2010 (r1210) +++ trunk/sst28sf040.c Thu Oct 14 00:26:56 2010 (r1211) @@ -78,7 +78,8 @@ return 0; } -int write_sector_28sf040(struct flashchip *flash, uint8_t *src, int start, int len) +/* chunksize is 1 */ +int write_28sf040(struct flashchip *flash, uint8_t *src, int start, int len) { int i; chipaddr bios = flash->virtual_memory; @@ -119,12 +120,6 @@ return 0; } -/* chunksize is 1 */ -int write_28sf040(struct flashchip *flash, uint8_t *buf) -{ - return write_sector_28sf040(flash, buf, 0, flash->total_size * 1024); -} - int erase_chip_28sf040(struct flashchip *flash, unsigned int addr, unsigned int blocklen) { if ((addr != 0) || (blocklen != flash->total_size * 1024)) {

1 0

[PATCH] Refactor remaining write wrappers
by Carl-Daniel Hailfinger 13 Oct '10

13 Oct '10

Refactor remaining write wrappers. Kill duplicated code. Depends on Re: [flashrom] [PATCH] Use common function signature for inner write functions [flashrom] [PATCH] Simplify calls to inner write functions Signed-off-by: Carl-Daniel Hailfinger <c-d.hailfinger.devel.2006(a)gmx.net> --- flashrom-partial_write_inner_function_signature_simplify_calls/chipdrivers.h 2010-10-09 02:16:56.000000000 +0200 +++ flashrom-partial_write_inner_function_signature_simplify_calls_simplify/chipdrivers.h 2010-10-09 19:34:40.000000000 +0200 @@ -106,10 +106,11 @@ 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); +int unprotect_28sf040(struct flashchip *flash); +int protect_28sf040(struct flashchip *flash); /* sst49lfxxxc.c */ int erase_sector_49lfxxxc(struct flashchip *flash, unsigned int address, unsigned int sector_size); -int write_49lfxxxc(struct flashchip *flash, uint8_t *buf); int unlock_49lfxxxc(struct flashchip *flash); /* sst_fwhub.c */ --- flashrom-partial_write_inner_function_signature_simplify_calls/flashchips.c 2010-10-08 23:34:41.000000000 +0200 +++ flashrom-partial_write_inner_function_signature_simplify_calls_simplify/flashchips.c 2010-10-09 19:26:17.000000000 +0200 @@ -5107,6 +5107,8 @@ .block_erase = erase_chip_28sf040, } }, + .unlock = unprotect_28sf040, + .lock = protect_28sf040, .write = write_28sf040, .read = read_memmapped, }, @@ -5564,7 +5566,7 @@ } }, .unlock = unlock_49lfxxxc, - .write = write_49lfxxxc, + .write = write_82802ab, .read = read_memmapped, }, @@ -5627,7 +5629,7 @@ } }, .unlock = unlock_49lfxxxc, - .write = write_49lfxxxc, + .write = write_82802ab, .read = read_memmapped, }, @@ -5659,7 +5661,7 @@ } }, .unlock = unlock_49lfxxxc, - .write = write_49lfxxxc, + .write = write_82802ab, .read = read_memmapped, }, @@ -5837,7 +5839,7 @@ } }, .unlock = unlock_49lfxxxc, - .write = write_49lfxxxc, + .write = write_82802ab, .read = read_memmapped, }, --- flashrom-partial_write_inner_function_signature_simplify_calls/flash.h 2010-10-08 02:44:28.000000000 +0200 +++ flashrom-partial_write_inner_function_signature_simplify_calls_simplify/flash.h 2010-10-09 18:58:56.000000000 +0200 @@ -135,6 +135,7 @@ int (*printlock) (struct flashchip *flash); int (*unlock) (struct flashchip *flash); + int (*lock) (struct flashchip *flash); int (*write) (struct flashchip *flash, uint8_t *buf); int (*read) (struct flashchip *flash, uint8_t *buf, int start, int len); --- flashrom-partial_write_inner_function_signature_simplify_calls/sst28sf040.c 2010-10-09 02:00:30.000000000 +0200 +++ flashrom-partial_write_inner_function_signature_simplify_calls_simplify/sst28sf040.c 2010-10-09 19:35:09.000000000 +0200 @@ -30,7 +30,7 @@ #define RESET 0xFF #define READ_ID 0x90 -static void protect_28sf040(struct flashchip *flash) +int protect_28sf040(struct flashchip *flash) { chipaddr bios = flash->virtual_memory; @@ -41,9 +41,11 @@ chip_readb(bios + 0x041B); chip_readb(bios + 0x0419); chip_readb(bios + 0x040A); + + return 0; } -static void unprotect_28sf040(struct flashchip *flash) +int unprotect_28sf040(struct flashchip *flash) { chipaddr bios = flash->virtual_memory; @@ -54,12 +56,15 @@ chip_readb(bios + 0x041B); chip_readb(bios + 0x0419); chip_readb(bios + 0x041A); + + return 0; } int erase_sector_28sf040(struct flashchip *flash, unsigned int address, unsigned int sector_size) { chipaddr bios = flash->virtual_memory; + /* This command sequence is very similar to erase_block_82802ab. */ chip_writeb(AUTO_PG_ERASE1, bios); chip_writeb(AUTO_PG_ERASE2, bios + address); @@ -118,13 +123,7 @@ int write_28sf040(struct flashchip *flash, uint8_t *buf) { - unprotect_28sf040(flash); - - write_sector_28sf040(flash, buf, 0, flash->total_size * 1024); - - protect_28sf040(flash); - - return 0; + return write_sector_28sf040(flash, buf, 0, flash->total_size * 1024); } int erase_chip_28sf040(struct flashchip *flash, unsigned int addr, unsigned int blocklen) --- flashrom-partial_write_inner_function_signature_simplify_calls/sst49lfxxxc.c 2010-10-09 02:00:06.000000000 +0200 +++ flashrom-partial_write_inner_function_signature_simplify_calls_simplify/sst49lfxxxc.c 2010-10-09 19:27:34.000000000 +0200 @@ -75,15 +75,3 @@ } return 0; } - -int write_49lfxxxc(struct flashchip *flash, uint8_t *buf) -{ - chipaddr bios = flash->virtual_memory; - - write_lockbits_49lfxxxc(flash, 0); - write_page_82802ab(flash, buf, 0, flash->total_size * 1024); - - chip_writeb(0xFF, bios); - - return 0; -} -- http://www.hailfinger.org/

6 7

[commit] r1210 - trunk
by repository service 13 Oct '10

13 Oct '10

Author: hailfinger Date: Wed Oct 13 23:49:30 2010 New Revision: 1210 URL: http://flashrom.org/trac/flashrom/changeset/1210 Log: Refactor remaining write wrappers. Kill duplicated code. Annotate write functions with their chunk size. Mark Fujitsu MBM29F400BC and ST M29F400BB as untested because their write code no longer uses a broken layout. Signed-off-by: Carl-Daniel Hailfinger <c-d.hailfinger.devel.2006(a)gmx.net> Acked-by: Uwe Hermann <uwe(a)hermann-uwe.de> Tested-by: Maciej Pijanka <maciej.pijanka(a)gmail.com> Tested-by: Idwer Vollering <vidwer(a)gmail.com> Acked-by: Idwer Vollering <vidwer(a)gmail.com> Tested-by: Sean Nelson <audiohacked(a)gmail.com> Acked-by: Sean Nelson <audiohacked(a)gmail.com> Modified: trunk/82802ab.c trunk/chipdrivers.h trunk/flashchips.c trunk/jedec.c trunk/m29f400bt.c trunk/sst28sf040.c trunk/sst49lfxxxc.c Modified: trunk/82802ab.c ============================================================================== --- trunk/82802ab.c Sun Oct 10 18:10:49 2010 (r1209) +++ trunk/82802ab.c Wed Oct 13 23:49:30 2010 (r1210) @@ -160,6 +160,7 @@ return 0; } +/* chunksize is 1 */ int write_82802ab(struct flashchip *flash, uint8_t *buf) { return write_page_82802ab(flash, buf, 0, flash->total_size * 1024); Modified: trunk/chipdrivers.h ============================================================================== --- trunk/chipdrivers.h Sun Oct 10 18:10:49 2010 (r1209) +++ trunk/chipdrivers.h Wed Oct 13 23:49:30 2010 (r1210) @@ -86,8 +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, 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); +int write_sector_jedec_common(struct flashchip *flash, uint8_t *src, int start, int len); +int write_page_write_jedec_common(struct flashchip *flash, uint8_t *src, int start, int page_size); /* m29f400bt.c */ int probe_m29f400bt(struct flashchip *flash); @@ -106,10 +106,11 @@ 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); +int unprotect_28sf040(struct flashchip *flash); +int protect_28sf040(struct flashchip *flash); /* sst49lfxxxc.c */ int erase_sector_49lfxxxc(struct flashchip *flash, unsigned int address, unsigned int sector_size); -int write_49lfxxxc(struct flashchip *flash, uint8_t *buf); int unlock_49lfxxxc(struct flashchip *flash); /* sst_fwhub.c */ Modified: trunk/flashchips.c ============================================================================== --- trunk/flashchips.c Sun Oct 10 18:10:49 2010 (r1209) +++ trunk/flashchips.c Wed Oct 13 23:49:30 2010 (r1210) @@ -2995,7 +2995,7 @@ .total_size = 512, .page_size = 64 * 1024, .feature_bits = FEATURE_ADDR_SHIFTED | FEATURE_EITHER_RESET, - .tested = TEST_BAD_WRITE, /* Implicit eraseblock layout in write_m29f400bt is broken. */ + .tested = TEST_UNTESTED, .probe = probe_m29f400bt, .probe_timing = TIMING_IGNORED, /* routine don't use probe_timing (m29f400bt.c) */ .block_erasers = @@ -3013,7 +3013,7 @@ .block_erase = block_erase_chip_m29f400bt, }, }, - .write = NULL, + .write = write_m29f400bt, .read = read_memmapped, }, @@ -5107,6 +5107,7 @@ .block_erase = erase_chip_28sf040, } }, + .unlock = unprotect_28sf040, .write = write_28sf040, .read = read_memmapped, }, @@ -5564,7 +5565,7 @@ } }, .unlock = unlock_49lfxxxc, - .write = write_49lfxxxc, + .write = write_82802ab, .read = read_memmapped, }, @@ -5627,7 +5628,7 @@ } }, .unlock = unlock_49lfxxxc, - .write = write_49lfxxxc, + .write = write_82802ab, .read = read_memmapped, }, @@ -5659,7 +5660,7 @@ } }, .unlock = unlock_49lfxxxc, - .write = write_49lfxxxc, + .write = write_82802ab, .read = read_memmapped, }, @@ -5837,7 +5838,7 @@ } }, .unlock = unlock_49lfxxxc, - .write = write_49lfxxxc, + .write = write_82802ab, .read = read_memmapped, }, @@ -6315,7 +6316,7 @@ .total_size = 512, .page_size = 64 * 1024, .feature_bits = FEATURE_ADDR_SHIFTED | FEATURE_EITHER_RESET, - .tested = TEST_BAD_WRITE, /* Implicit eraseblock layout in write_m29f400bt is broken. */ + .tested = TEST_UNTESTED, .probe = probe_m29f400bt, .probe_timing = TIMING_IGNORED, /* routine doesn't use probe_timing (m29f400bt.c) */ .block_erasers = @@ -6333,7 +6334,7 @@ .block_erase = block_erase_chip_m29f400bt, } }, - .write = NULL, + .write = write_m29f400bt, .read = read_memmapped, }, { Modified: trunk/jedec.c ============================================================================== --- trunk/jedec.c Sun Oct 10 18:10:49 2010 (r1209) +++ trunk/jedec.c Wed Oct 13 23:49:30 2010 (r1210) @@ -92,6 +92,25 @@ msg_cdbg("%s: excessive loops, i=0x%x\n", __func__, i); } +static int getaddrmask(struct flashchip *flash) +{ + switch (flash->feature_bits & FEATURE_ADDR_MASK) { + case FEATURE_ADDR_FULL: + return MASK_FULL; + break; + case FEATURE_ADDR_2AA: + return MASK_2AA; + break; + case FEATURE_ADDR_AAA: + return MASK_AAA; + break; + default: + msg_cerr("%s called with unknown mask\n", __func__); + return 0; + break; + } +} + static void start_program_jedec_common(struct flashchip *flash, unsigned int mask) { chipaddr bios = flash->virtual_memory; @@ -317,11 +336,14 @@ return failed; } -int write_sector_jedec_common(struct flashchip *flash, uint8_t *src, int start, int len, unsigned int mask) +int write_sector_jedec_common(struct flashchip *flash, uint8_t *src, int start, int len) { int i, failed = 0; chipaddr dst = flash->virtual_memory + start; chipaddr olddst; + int mask; + + mask = getaddrmask(flash); olddst = dst; for (i = 0; i < len; i++) { @@ -335,13 +357,16 @@ return failed; } -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) { int i, tried = 0, failed; uint8_t *s = src; chipaddr bios = flash->virtual_memory; chipaddr dst = bios + start; chipaddr d = dst; + int mask; + + mask = getaddrmask(flash); retry: /* Issue JEDEC Start Program command */ @@ -373,49 +398,55 @@ return failed; } -static int getaddrmask(struct flashchip *flash) -{ - switch (flash->feature_bits & FEATURE_ADDR_MASK) { - case FEATURE_ADDR_FULL: - return MASK_FULL; - break; - case FEATURE_ADDR_2AA: - return MASK_2AA; - break; - case FEATURE_ADDR_AAA: - return MASK_AAA; - break; - default: - msg_cerr("%s called with unknown mask\n", __func__); - return 0; - break; - } -} - -int write_jedec(struct flashchip *flash, uint8_t *buf) -{ - int mask; - int i, failed = 0; - int total_size = flash->total_size * 1024; +/* + * Write a part of the flash chip. + * FIXME: Use the chunk code from Michael Karcher instead. + * This function is a slightly modified copy of spi_write_chunked. + * Each page is written separately in chunks with a maximum size of chunksize. + */ +int write_jedec_pages(struct flashchip *flash, uint8_t *buf, int start, int len) +{ + int i, starthere, lenhere; + /* FIXME: page_size is the wrong variable. We need max_writechunk_size + * in struct flashchip to do this properly. All chips using + * write_jedec have page_size set to max_writechunk_size, so + * we're OK for now. + */ int page_size = flash->page_size; - mask = getaddrmask(flash); + /* Warning: This loop has a very unusual condition and body. + * The loop needs to go through each page with at least one affected + * byte. The lowest page number is (start / page_size) since that + * division rounds down. The highest page number we want is the page + * where the last byte of the range lives. That last byte has the + * address (start + len - 1), thus the highest page number is + * (start + len - 1) / page_size. Since we want to include that last + * page as well, the loop condition uses <=. + */ + for (i = start / page_size; i <= (start + len - 1) / page_size; i++) { + /* Byte position of the first byte in the range in this page. */ + /* starthere is an offset to the base address of the chip. */ + starthere = max(start, i * page_size); + /* Length of bytes in the range in this page. */ + lenhere = min(start + len, (i + 1) * page_size) - starthere; - 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)) - failed = 1; + if (write_page_write_jedec_common(flash, buf + starthere - start, starthere, lenhere)) + return 1; } - return failed; + return 0; } -int write_jedec_1(struct flashchip *flash, uint8_t * buf) +/* chunksize is page_size */ +int write_jedec(struct flashchip *flash, uint8_t *buf) { - int mask; - - mask = getaddrmask(flash); + return write_jedec_pages(flash, buf, 0, flash->total_size * 1024); +} - return write_sector_jedec_common(flash, buf, 0, flash->total_size * 1024, mask); +/* chunksize is 1 */ +int write_jedec_1(struct flashchip *flash, uint8_t * buf) +{ + return write_sector_jedec_common(flash, buf, 0, flash->total_size * 1024); } /* erase chip with block_erase() prototype */ Modified: trunk/m29f400bt.c ============================================================================== --- trunk/m29f400bt.c Sun Oct 10 18:10:49 2010 (r1209) +++ trunk/m29f400bt.c Wed Oct 13 23:49:30 2010 (r1210) @@ -140,6 +140,7 @@ return erase_m29f400bt(flash); } +/* chunksize is 1 */ int write_m29f400bt(struct flashchip *flash, uint8_t *buf) { return write_page_m29f400bt(flash, buf, 0, flash->total_size * 1024); Modified: trunk/sst28sf040.c ============================================================================== --- trunk/sst28sf040.c Sun Oct 10 18:10:49 2010 (r1209) +++ trunk/sst28sf040.c Wed Oct 13 23:49:30 2010 (r1210) @@ -30,7 +30,7 @@ #define RESET 0xFF #define READ_ID 0x90 -static void protect_28sf040(struct flashchip *flash) +int protect_28sf040(struct flashchip *flash) { chipaddr bios = flash->virtual_memory; @@ -41,9 +41,11 @@ chip_readb(bios + 0x041B); chip_readb(bios + 0x0419); chip_readb(bios + 0x040A); + + return 0; } -static void unprotect_28sf040(struct flashchip *flash) +int unprotect_28sf040(struct flashchip *flash) { chipaddr bios = flash->virtual_memory; @@ -54,12 +56,15 @@ chip_readb(bios + 0x041B); chip_readb(bios + 0x0419); chip_readb(bios + 0x041A); + + return 0; } int erase_sector_28sf040(struct flashchip *flash, unsigned int address, unsigned int sector_size) { chipaddr bios = flash->virtual_memory; + /* This command sequence is very similar to erase_block_82802ab. */ chip_writeb(AUTO_PG_ERASE1, bios); chip_writeb(AUTO_PG_ERASE2, bios + address); @@ -101,10 +106,8 @@ { chipaddr bios = flash->virtual_memory; - unprotect_28sf040(flash); chip_writeb(CHIP_ERASE, bios); chip_writeb(CHIP_ERASE, bios); - protect_28sf040(flash); programmer_delay(10); toggle_ready_jedec(bios); @@ -116,15 +119,10 @@ return 0; } +/* chunksize is 1 */ int write_28sf040(struct flashchip *flash, uint8_t *buf) { - unprotect_28sf040(flash); - - write_sector_28sf040(flash, buf, 0, flash->total_size * 1024); - - protect_28sf040(flash); - - return 0; + return write_sector_28sf040(flash, buf, 0, flash->total_size * 1024); } int erase_chip_28sf040(struct flashchip *flash, unsigned int addr, unsigned int blocklen) Modified: trunk/sst49lfxxxc.c ============================================================================== --- trunk/sst49lfxxxc.c Sun Oct 10 18:10:49 2010 (r1209) +++ trunk/sst49lfxxxc.c Wed Oct 13 23:49:30 2010 (r1210) @@ -75,15 +75,3 @@ } return 0; } - -int write_49lfxxxc(struct flashchip *flash, uint8_t *buf) -{ - chipaddr bios = flash->virtual_memory; - - write_lockbits_49lfxxxc(flash, 0); - write_page_82802ab(flash, buf, 0, flash->total_size * 1024); - - chip_writeb(0xFF, bios); - - return 0; -}

1 0

m2n-mx outputs
by Farkas Tama s 13 Oct '10

13 Oct '10

Hi, Here are the output s of flashrom -V, superiotool -deV and lspci -nnvvvxxx on an ASUS M2N-MX board. I hope you can help me. Thx: FT

1 0

← Newer
1
...
8
9
10
11
12
13
14
...
19
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

flashrom October 2010