flashrom

flashrom@flashrom.org

5 participants
9161 discussions

[commit] r1350 - trunk
by repository service 25 Jun '11

25 Jun '11

Author: stefanct Date: Sat Jun 25 19:04:26 2011 New Revision: 1350 URL: http://flashrom.org/trac/flashrom/changeset/1350 Log: fix probe_flash to report new values set by probing functions This is needed if the probing function changes its fill_flash parameter like in the pattern used to support Intel Hardware Sequencing and SFDP. 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 19 19:27:57 2011 (r1349) +++ trunk/flashrom.c Sat Jun 25 19:04:26 2011 (r1350) @@ -1188,8 +1188,8 @@ msg_cinfo("%s chip \"%s %s\" (%d kB, %s) %s.\n", force ? "Assuming" : "Found", - flash->vendor, flash->name, flash->total_size, - flashbuses_to_text(flash->bustype), location); + fill_flash->vendor, fill_flash->name, fill_flash->total_size, + flashbuses_to_text(fill_flash->bustype), location); /* Flash registers will not be mapped if the chip was forced. Lock info * may be stored in registers, so avoid lock info printing.

1 0

[PATCH 3/3] proof of concept patch for calculating and printing of MD5 hashes of flash and file contents
by Stefan Tauner 25 Jun '11

25 Jun '11

This patch is not for merge. It uses libmhash to calculate the MD5 hashes of the files read before write/validate and of the flash contents read to ease debugging and emergency recovery. open question: decide on which library to use - or if we want to just copy an implementation verbatim. if no one can think of a realistic use case for more advanced/crypto hashers or cryptography (like signing/verifying images), i think just copying a md5 implementation is fine. Signed-off-by: Stefan Tauner <stefan.tauner(a)student.tuwien.ac.at> --- Makefile | 2 +- flashrom.c | 36 +++++++++++++++++++++++++++++++++++- 2 files changed, 36 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index 6e6e2de..3f32349 100644 --- a/Makefile +++ b/Makefile @@ -361,7 +361,7 @@ ifeq ($(OS_ARCH), DOS) # FIXME There needs to be a better way to do this LIBS += ../libpci/lib/libpci.a else -LIBS += -lpci +LIBS += -lpci -lmhash ifeq ($(OS_ARCH), OpenBSD) # For (i386|amd64)_iopl(2). LIBS += -l$(shell uname -m) diff --git a/flashrom.c b/flashrom.c index c664a50..787bddb 100644 --- a/flashrom.c +++ b/flashrom.c @@ -34,6 +34,7 @@ #if HAVE_UTSNAME == 1 #include <sys/utsname.h> #endif +#include "mhash.h" #include "flash.h" #include "flashchips.h" #include "programmer.h" @@ -727,6 +728,32 @@ int check_erased_range(struct flashchip *flash, int start, int len) return ret; } +int md5_get_hash(const void *plaintext, unsigned int size, unsigned char *hash) +{ + MHASH td = mhash_init(MHASH_MD5); + if (td == MHASH_FAILED) + return 1; + + mhash(td, plaintext, size); + mhash_deinit(td, hash); + if (hash == NULL) + return 1; + return 0; +} + +/* Calculates and prints the MD5 hash of the given plaintext. */ +void md5_print_hash(const void *plaintext, unsigned int size, const char *text) +{ + unsigned char md5[16]; + int i; + if (md5_get_hash(plaintext, size, md5) == 0) { + msg_cinfo("MD5 hash of %s is ", text); + for (i = 0; i < 16; i++) + msg_cinfo("%02x", md5[i]); + msg_cinfo(".\n"); + } +} + /* * @cmpbuf buffer to compare against, cmpbuf[0] is expected to match the flash content at location start @@ -1299,8 +1326,9 @@ int read_flash_to_file(struct flashchip *flash, const char *filename) ret = write_buf_to_file(buf, size, filename); out_free: - free(buf); msg_cinfo("%s.\n", ret ? "FAILED" : "done"); + md5_print_hash(buf, size, "the flash content read"); + free(buf); return ret; } @@ -1898,6 +1926,8 @@ int doit(struct flashchip *flash, int force, const char *filename, int read_it, goto out; } + md5_print_hash(newcontents, size, filename); + #if CONFIG_INTERNAL == 1 if (programmer == PROGRAMMER_INTERNAL) show_id(newcontents, size, force); @@ -1918,6 +1948,8 @@ int doit(struct flashchip *flash, int force, const char *filename, int read_it, } msg_cdbg("done.\n"); + md5_print_hash(oldcontents, size, "the old flash chip contents"); + // This should be moved into each flash part's code to do it // cleanly. This does the job. handle_romentries(flash, oldcontents, newcontents); @@ -1929,6 +1961,8 @@ int doit(struct flashchip *flash, int force, const char *filename, int read_it, msg_cerr("Uh oh. Erase/write failed. Checking if " "anything changed.\n"); if (!flash->read(flash, newcontents, 0, size)) { + md5_print_hash(newcontents, size, + "the current flash chip contents"); if (!memcmp(oldcontents, newcontents, size)) { msg_cinfo("Good. It seems nothing was " "changed.\n"); -- 1.7.1

1 0

[PATCH 2/3] add a success indicator to the "Reading old flash chip contents..." message
by Stefan Tauner 25 Jun '11

25 Jun '11

Signed-off-by: Stefan Tauner <stefan.tauner(a)student.tuwien.ac.at> --- flashrom.c | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/flashrom.c b/flashrom.c index 6dc6fb8..c664a50 100644 --- a/flashrom.c +++ b/flashrom.c @@ -1910,11 +1910,13 @@ int doit(struct flashchip *flash, int force, const char *filename, int read_it, * 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.7.1

1 0

[PATCH 1/3] constify (a few) parameters in flashrom.c where possible
by Stefan Tauner 25 Jun '11

25 Jun '11

Signed-off-by: Stefan Tauner <stefan.tauner(a)student.tuwien.ac.at> --- flash.h | 12 ++++++------ flashrom.c | 16 ++++++++-------- programmer.h | 2 +- 3 files changed, 15 insertions(+), 15 deletions(-) diff --git a/flash.h b/flash.h index f875102..0630421 100644 --- a/flash.h +++ b/flash.h @@ -205,22 +205,22 @@ void map_flash_registers(struct flashchip *flash); 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); +char *extract_param(char **haystack, const char *needle, const 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 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 */ diff --git a/flashrom.c b/flashrom.c index cfee1a1..6dc6fb8 100644 --- a/flashrom.c +++ b/flashrom.c @@ -649,7 +649,7 @@ char *strcat_realloc(char *dest, const char *src) * 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 @@ char *extract_param(char **haystack, char *needle, char *delim) 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 @@ int check_erased_range(struct flashchip *flash, int start, int len) * @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 @@ int verify_flash(struct flashchip *flash, uint8_t *buf) 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 @@ int read_buf_from_file(unsigned char *buf, unsigned long size, char *filename) 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 @@ int write_buf_to_file(unsigned char *buf, unsigned long size, char *filename) 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)); @@ -1573,7 +1573,7 @@ void emergency_help_message(void) } /* 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++) { @@ -1842,7 +1842,7 @@ int chip_safety_check(struct flashchip *flash, int force, int read_it, int write * 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; diff --git a/programmer.h b/programmer.h index ce0ffa1..cd82dcb 100644 --- a/programmer.h +++ b/programmer.h @@ -505,7 +505,7 @@ extern int programmer_may_write; 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.7.1

1 0

[PATCH] make Makefile's test programs (more) -W safe
by Stefan Tauner 24 Jun '11

24 Jun '11

Signed-off-by: Stefan Tauner <stefan.tauner(a)student.tuwien.ac.at> --- Makefile | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index 3dda8c2..5cbe034 100644 --- a/Makefile +++ b/Makefile @@ -413,7 +413,7 @@ strip: $(PROGRAM)$(EXEC_SUFFIX) compiler: featuresavailable @printf "Checking for a C compiler... " @$(shell ( echo "int main(int argc, char **argv)"; \ - echo "{ return 0; }"; ) > .test.c ) + echo "{ (void) argc; (void) argv; return 0; }"; ) > .test.c ) @$(CC) $(CPPFLAGS) $(CFLAGS) $(LDFLAGS) .test.c -o .test$(EXEC_SUFFIX) >/dev/null && \ echo "found." || ( echo "not found."; \ rm -f .test.c .test$(EXEC_SUFFIX); exit 1) @@ -427,7 +427,7 @@ pciutils: compiler echo "#include <pci/pci.h>"; \ echo "struct pci_access *pacc;"; \ echo "int main(int argc, char **argv)"; \ - echo "{ pacc = pci_alloc(); return 0; }"; ) > .test.c ) + echo "{ (void) argc; (void) argv; pacc = pci_alloc(); return 0; }"; ) > .test.c ) @$(CC) -c $(CPPFLAGS) $(CFLAGS) .test.c -o .test.o >/dev/null 2>&1 && \ echo "found." || ( echo "not found."; echo; \ echo "Please install libpci headers (package pciutils-devel)."; \ -- 1.7.1

1 0

[PATCH] fix output for multiple found flash chips
by Stefan Tauner 24 Jun '11

24 Jun '11

- missing quotes - missing commas Signed-off-by: Stefan Tauner <stefan.tauner(a)student.tuwien.ac.at> --- cli_classic.c | 7 ++++--- 1 files changed, 4 insertions(+), 3 deletions(-) diff --git a/cli_classic.c b/cli_classic.c index 59096a0..aba6edf 100644 --- a/cli_classic.c +++ b/cli_classic.c @@ -373,9 +373,10 @@ int cli_classic(int argc, char *argv[]) } if (chipcount > 1) { - printf("Multiple flash chips were detected:"); - for (i = 0; i < chipcount; i++) - printf(" %s", flashes[i].name); + printf("Multiple flash chips were detected: \"%s\"", + flashes[0].name); + for (i = 1; i < chipcount; i++) + printf(", \"%s\"", flashes[i].name); printf("\nPlease specify which chip to use with the -c <chipname> option.\n"); programmer_shutdown(); exit(1); -- 1.7.1

1 0

Intel MBD question
by Ian Whitfield 24 Jun '11

24 Jun '11

Hi I have recently built a new Computer with an Intel DG41WV MBD. This has an 82G41 BIOS chip and a GMA X4500 video chip. My Operating System is Linux Mint 10 KDE. I have problems with the screen display not refreshing correctly leaving part of the old screen still showing. Forcing a refresh by moving the window off screen and back again cures this. Therefore I am wanting to update the BIOS to see if this will correct the problem. From recommendations on the Ubuntu Form it has been recommended that I use Flashrom to do this. However I can find no reference to either this Intel MBD or the Chipsets on your site. Can you please advise me on whether these are supported with Flashrom and if necessary recommend the correct method to do this. Thanks a lot. -- */_Ian Whitfield_/*/ *Pretoria, South Africa* *Tel* - +27 (0)12 817 2001 *Cell* - +27 (0)82 573 9142 *Fax* - +27 (0)86 651 4844 *Skype* - ianzs6cdx *SnailMail* - PO Box 72226, Lynnwood Ridge 0040 South Africa. /(No trees were harmed in the production of this message, however a large number of re-cycled electrons were temporarily inconvenienced) ////

3 8

[PATCH 3/3] add support for SFDP (JESD216)
by Stefan Tauner 24 Jun '11

24 Jun '11

Similar to ICH Hardware Sequencing this uses a generic struct flashchip element in flashrom.c with dummy values and a special probe function that fills the obtained values into that generic struct. Documentation used: http://www.jedec.org/standards-documents/docs/jesd216 (2011-04) W25Q32BV data sheet Revision F (2011-04-01) EN25QH16 data sheet Revision F (2011-06-01) Signed-off-by: Stefan Tauner <stefan.tauner(a)student.tuwien.ac.at> --- chipdrivers.h | 1 + flashchips.c | 24 +++++ flashchips.h | 1 + flashrom.c | 28 ++++++- spi.h | 5 + spi25.c | 273 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 6 files changed, 331 insertions(+), 1 deletions(-) diff --git a/chipdrivers.h b/chipdrivers.h index 92ddbea..0a3df50 100644 --- a/chipdrivers.h +++ b/chipdrivers.h @@ -26,6 +26,7 @@ #define __CHIPDRIVERS_H__ 1 /* spi.c, should probably be in spi_chip.c */ +int probe_spi_sfdp(struct flashchip *flash); int probe_spi_rdid(struct flashchip *flash); int probe_spi_rdid4(struct flashchip *flash); int probe_spi_rems(struct flashchip *flash); diff --git a/flashchips.c b/flashchips.c index 865ba2f..6fbbd2c 100644 --- a/flashchips.c +++ b/flashchips.c @@ -8507,6 +8507,30 @@ const struct flashchip flashchips[] = { .write = write_jedec_1, .read = read_memmapped, }, + + { + .vendor = "Unknown", + .name = "SFDP device", + .bustype = CHIP_BUSTYPE_SPI, + .manufacture_id = GENERIC_MANUF_ID, + .model_id = SFDP_DEVICE_ID, + /* We present our own "report this" text hence we do not + * want the default "This flash part has status UNTESTED..." + * text to be printed. */ + .tested = TEST_OK_PREW, + .probe = probe_spi_sfdp, + .page_size = 256, + .write = spi_chip_write_256, + .read = spi_chip_read, + /* FIXME: some vendor extensions define this */ + .voltage = {}, + /* Everything below will be set by the probing function. */ + .total_size = 0, + .feature_bits = 0, + .block_erasers = {}, + .unlock = NULL, + .printlock = NULL, + }, { .vendor = "AMIC", diff --git a/flashchips.h b/flashchips.h index 3b2b94f..82333c8 100644 --- a/flashchips.h +++ b/flashchips.h @@ -36,6 +36,7 @@ #define GENERIC_MANUF_ID 0xffff /* Check if there is a vendor ID */ #define GENERIC_DEVICE_ID 0xffff /* Only match the vendor ID */ +#define SFDP_DEVICE_ID 0xfffe #define ALLIANCE_ID 0x52 /* Alliance Semiconductor */ #define ALLIANCE_AS29F002B 0x34 diff --git a/flashrom.c b/flashrom.c index aed10aa..56af373 100644 --- a/flashrom.c +++ b/flashrom.c @@ -1206,7 +1206,33 @@ int probe_flash(int startchip, struct flashchip *fill_flash, int force) * probe_flash() is the first one and thus no chip has been * found before. */ - if (startchip == 0 || fill_flash->model_id != GENERIC_DEVICE_ID) + if (startchip == 0 && fill_flash->model_id == SFDP_DEVICE_ID) { + msg_cinfo("===\n" + "SFDP has autodetected a flash chip which is " + "not natively supported by flashrom yet.\n"); + if (!check_block_erasers(flash, 0)) + msg_cinfo("The standard operations read and " + "verify should work, but to support " + "erase, write and all other " + "possible features"); + else + msg_cinfo("All standard operations (read, " + "verify, erase and write) should " + "work, but to support all possible " + "features"); + + msg_cinfo(" we need to add them manually.\nYou " + "can help us by mailing us the output of " + "the following command to flashrom@flashrom." + "org: \n'flashrom -VV [plus the " + "-p/--programmer parameter (if needed)]" + "'\nThanks for your help!\n" + "===\n"); + } + + if (startchip == 0 || + ((fill_flash->model_id != GENERIC_DEVICE_ID) && + (fill_flash->model_id != SFDP_DEVICE_ID))) break; notfound: diff --git a/spi.h b/spi.h index b908603..5f07eae 100644 --- a/spi.h +++ b/spi.h @@ -40,6 +40,11 @@ #define JEDEC_REMS_OUTSIZE 0x04 #define JEDEC_REMS_INSIZE 0x02 +/* Read Serial Flash Discoverable Parameters (SFDP) */ +#define JEDEC_SFDP 0x5a +#define JEDEC_SFDP_OUTSIZE 0x05 /* 8b op, 24b addr, 8b dummy */ +/* JEDEC_SFDP_INSIZE : any length */ + /* Read Electronic Signature */ #define JEDEC_RES 0xab #define JEDEC_RES_OUTSIZE 0x04 diff --git a/spi25.c b/spi25.c index d3680fb..af81f19 100644 --- a/spi25.c +++ b/spi25.c @@ -23,6 +23,7 @@ */ #include <string.h> +#include <stdlib.h> #include "flash.h" #include "flashchips.h" #include "chipdrivers.h" @@ -113,6 +114,278 @@ int spi_write_disable(void) return spi_send_command(sizeof(cmd), 0, cmd, NULL); } +static int spi_sfdp(uint32_t address, uint8_t *buf, int len) +{ + const unsigned char cmd[JEDEC_SFDP_OUTSIZE] = { + JEDEC_SFDP, + (address >> 16) & 0xff, + (address >> 8) & 0xff, + (address >> 0) & 0xff, + 0 + }; + return spi_send_command(sizeof(cmd), len, cmd, buf); +} + +struct sfdp_tbl_hdr { + uint8_t id; + uint8_t v_minor; + uint8_t v_major; + uint8_t len; + 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; + + msg_cspew("Parsing JEDEC SFDP parameter table...\n"); + if (len == 9 * 4) { + msg_cerr("%s: len out of spec\n", __func__); + return 1; + } + + /* 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; + + tmp8 = (tmp32 >> 17) & 0x3; + switch (tmp8) { + case 0x0: + msg_cspew(" 3-Byte only addressing.\n"); + break; + case 0x1: + msg_cspew(" 3-Byte (and optionally 4-Byte) addressing.\n"); + break; + case 0x2: + msg_cdbg(" 4-Byte only addressing not supported.\n"); + return 1; + default: + msg_cdbg(" Required addressing mode (0x%x) not supported.\n", + tmp8); + return 1; + } + + msg_cspew(" Writes to the status register have "); + if (tmp32 & (1 << 3)) { + f->unlock = spi_disable_blockprotect; + msg_cspew("to be enabled with "); + if (tmp32 & (1 << 4)) { + f->feature_bits = FEATURE_WRSR_WREN; + msg_cspew("WREN (0x06).\n"); + } else { + f->feature_bits = FEATURE_WRSR_EWSR; + msg_cspew("EWSR (0x50).\n"); + } + } else + 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"); + 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; + 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) + continue; + + tmp32 = buf[(4 * i) + (2 * j) + 1]; + switch(tmp32){ + case 0x00: + case 0xff: + /* Not specified, assuming "not supported". */ + continue; + case 0x20: + f->block_erasers[j].block_erase = spi_block_erase_20; + break; + case 0x52: + f->block_erasers[j].block_erase = spi_block_erase_52; + break; + case 0x60: + f->block_erasers[j].block_erase = spi_block_erase_60; + break; + case 0xc7: + f->block_erasers[j].block_erase = spi_block_erase_c7; + break; + case 0xd7: + f->block_erasers[j].block_erase = spi_block_erase_d7; + break; + case 0xd8: + f->block_erasers[j].block_erase = spi_block_erase_d8; + break; + default: + msg_cinfo("%s: unknown opcode (0x%02x) in SFDP table. " + "Please report this at " + "flashrom(a)flashrom.org\n", + __func__, tmp32); + continue; + } + f->block_erasers[j].eraseblocks[0].size = bsize; + f->block_erasers[j].eraseblocks[0].count = total_size/bsize; + msg_cspew(" Block eraser %d: %d x %d B with opcode 0x%02x\n", + j, total_size/bsize, bsize, tmp32); + } + return 0; +} + +static int sfdp_fetch_pt(uint32_t addr, uint8_t *buf, uint16_t len) +{ + uint16_t i; + if (spi_sfdp(addr, buf, len)) { + msg_cerr("Receiving SFDP parameter table failed.\n"); + return 1; + } + msg_cspew(" Parameter table contents:\n"); + for(i = 0; i < len; i++) { + if ((i % 8) == 0) { + msg_cspew(" 0x%03x: ", i); + } + msg_cspew(" 0x%02x", buf[i]); + if ((i % 8) == 7) { + msg_cspew("\n"); + continue; + } + if ((i % 8) == 3) { + msg_cspew(" "); + continue; + } + } + msg_cspew("\n"); + return 0; +} + +int probe_spi_sfdp(struct flashchip *flash) +{ + int ret = 0; + uint8_t buf[8]; + uint16_t tmp16; + uint32_t tmp32; + uint8_t nph; + uint8_t i; + struct sfdp_tbl_hdr *hdrs; + uint8_t *hbuf; + uint8_t *tbuf; + + if (spi_sfdp(0x0, buf, 4)) { + msg_cerr("Receiving SFDP signature failed.\n"); + return 0; + } + tmp32 = buf[0]; + tmp32 |= ((unsigned int)buf[1]) << 8; + tmp32 |= ((unsigned int)buf[2]) << 16; + tmp32 |= ((unsigned int)buf[3]) << 24; + + msg_cspew("SFDP signature = 0x%08x (should be 0x50444653)\n", tmp32); + if (tmp32 != 0x50444653) { + msg_cdbg("No SFDP signature found.\n"); + return 0; + } + if (spi_sfdp(0x4, buf, 3)) { + msg_cerr("Receiving SFDP revision and number of parameter " + "headers (NPH) failed. "); + return 0; + } + msg_cspew("SFDP revision = %d.%d\n", buf[1], buf[0]); + nph = buf[3]; + msg_cspew("SFDP number of parameter headers (NPH) = %d (+ 1 mandatory)" + "\n", nph); + + /* Fetch all parameter headers, even if we don't use them all (yet). */ + hbuf = malloc(sizeof(struct sfdp_tbl_hdr) * (nph + 1)); + hdrs = malloc((nph + 1) * 8); + if (hbuf == NULL || hdrs == NULL ) { + msg_gerr("Out of memory!\n"); + exit(1); /* FIXME: shutdown gracefully */ + } + if (spi_sfdp(0x8, hbuf, (nph + 1) * 8)) { + msg_cerr("Receiving SFDP parameter table headers failed.\n"); + goto cleanup_hdrs; + } + + i = 0; + do{ + hdrs[i].id = hbuf[(8 * i) + 0]; + hdrs[i].v_minor = hbuf[(8 * i) + 1]; + hdrs[i].v_major = hbuf[(8 * i) + 2]; + hdrs[i].len = hbuf[(8 * i) + 3]; + hdrs[i].ptp = hbuf[(8 * i) + 4]; + hdrs[i].ptp |= ((unsigned int)hbuf[(8 * i) + 5]) << 8; + hdrs[i].ptp |= ((unsigned int)hbuf[(8 * i) + 6]) << 16; + msg_cspew("SFDP parameter table header %d:\n", i); + msg_cspew(" ID 0x%02x, version %d.%d\n", hdrs[i].id, + hdrs[i].v_major, hdrs[i].v_minor); + tmp16 = hdrs[i].len * 4; + tmp32 = hdrs[i].ptp; + msg_cspew(" Length %d B, Parameter Table Pointer 0x%06x\n", + tmp16, tmp32); + + tbuf = malloc(tmp16); + if (tbuf == NULL) { + msg_gerr("Out of memory!\n"); + exit(1); /* FIXME: shutdown gracefully */ + } + if (sfdp_fetch_pt(tmp32, tbuf, tmp16)){ + msg_cerr("Fetching SFDP parameter table %d failed.\n", + i); + free(tbuf); + break; + } + if (i == 0) { /* Mandatory JEDEC SFDP parameter table */ + if (hdrs[i].id != 0) + msg_cdbg("ID of the mandatory JEDEC SFDP " + "parameter table is not 0 as demanded " + "by JESD216 (warning only).\n"); + + if (hdrs[i].len != (9 * 4)) { + msg_cdbg("Length of the mandatory JEDEC SFDP " + "parameter table is not 24 B as " + "demanded by JESD216.\n"); + if (hdrs[i].len == (4 * 4)) + msg_cdbg("It seems like it is the " + "preliminary Intel version of " + "SFDP, which we don't support." + "\n"); + } else if (sfdp_fill_flash(flash, tbuf, tmp16) == 0) + ret = 1; + } + + free(tbuf); + i++; + } while(i <= nph); + +cleanup_hdrs: + free(hdrs); + free(hbuf); + return ret; +} + static int probe_spi_rdid_generic(struct flashchip *flash, int bytes) { unsigned char readarr[4]; -- 1.7.1

1 0

[PATCH 2/3] add check_block_erasers which returns the number of well-defined erasers for a chip
by Stefan Tauner 24 Jun '11

24 Jun '11

This can be used in various situations (including one in the upcoming SFDP patch) and removes one FIXME in current HEAD. Needed to move check_block_eraser (which checks a single eraser) up to avoid (upcoming) forward declaration(s). Signed-off-by: Stefan Tauner <stefan.tauner(a)student.tuwien.ac.at> --- flashrom.c | 70 ++++++++++++++++++++++++++++++++++------------------------- 1 files changed, 40 insertions(+), 30 deletions(-) diff --git a/flashrom.c b/flashrom.c index 6979d84..aed10aa 100644 --- a/flashrom.c +++ b/flashrom.c @@ -711,6 +711,43 @@ char *extract_programmer_param(char *param_name) return extract_param(&programmer_param, param_name, ","); } +static int check_block_eraser(const struct flashchip *flash, int k, int log) +{ + struct block_eraser eraser = flash->block_erasers[k]; + + if (!eraser.block_erase && !eraser.eraseblocks[0].count) { + if (log) + msg_cdbg("not defined. "); + return 1; + } + if (!eraser.block_erase && eraser.eraseblocks[0].count) { + if (log) + msg_cdbg("eraseblock layout is known, but matching " + "block erase function is not implemented. "); + return 1; + } + if (eraser.block_erase && !eraser.eraseblocks[0].count) { + if (log) + msg_cdbg("block erase function found, but " + "eraseblock layout is not defined. "); + return 1; + } + return 0; +} + +/* Returns the number of well-defined erasers for a chip. + * The log parameter controls output. */ +static int check_block_erasers(const struct flashchip *flash, int log) +{ + int usable_erasefunctions = 0; + int k; + for (k = 0; k < NUM_ERASEFUNCTIONS; k++) { + if (!check_block_eraser(flash, k, 0)) + usable_erasefunctions++; + } + return usable_erasefunctions; +} + /* start is an offset to the base address of the flash chip */ int check_erased_range(struct flashchip *flash, int start, int len) { @@ -1462,40 +1499,13 @@ static int walk_eraseregions(struct flashchip *flash, int erasefunction, return 0; } -static int check_block_eraser(struct flashchip *flash, int k, int log) -{ - struct block_eraser eraser = flash->block_erasers[k]; - - if (!eraser.block_erase && !eraser.eraseblocks[0].count) { - if (log) - msg_cdbg("not defined. "); - return 1; - } - if (!eraser.block_erase && eraser.eraseblocks[0].count) { - if (log) - msg_cdbg("eraseblock layout is known, but matching " - "block erase function is not implemented. "); - return 1; - } - if (eraser.block_erase && !eraser.eraseblocks[0].count) { - if (log) - msg_cdbg("block erase function found, but " - "eraseblock layout is not defined. "); - return 1; - } - return 0; -} - int erase_and_write_flash(struct flashchip *flash, uint8_t *oldcontents, uint8_t *newcontents) { int k, ret = 0; uint8_t *curcontents; unsigned long size = flash->total_size * 1024; - int usable_erasefunctions = 0; + int usable_erasefunctions = check_block_erasers(flash, 0); - for (k = 0; k < NUM_ERASEFUNCTIONS; k++) - if (!check_block_eraser(flash, k, 0)) - usable_erasefunctions++; msg_cinfo("Erasing and writing flash chip... "); if (!usable_erasefunctions) { msg_cerr("ERROR: flashrom has no erase function for this flash " @@ -1814,13 +1824,13 @@ int chip_safety_check(struct flashchip *flash, int force, int read_it, int write } if (erase_it || write_it) { /* Write needs erase. */ - if (flash->tested & TEST_BAD_ERASE) { + if (flash->tested & TEST_BAD_ERASE && + !check_block_erasers(flash, 0)) { msg_cerr("Erase is not working on this chip. "); if (!force) return 1; msg_cerr("Continuing anyway.\n"); } - /* FIXME: Check if at least one erase function exists. */ } if (write_it) { if (flash->tested & TEST_BAD_WRITE) { -- 1.7.1

1 0

[PATCH 1/3] fix probe_flash to report new values set by probing functions
by Stefan Tauner 24 Jun '11

24 Jun '11

This is needed if the probing function changes its fill_flash parameter like in the pattern used to support Intel Hardware Sequencing and SFDP. Signed-off-by: Stefan Tauner <stefan.tauner(a)student.tuwien.ac.at> --- flashrom.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/flashrom.c b/flashrom.c index cfee1a1..6979d84 100644 --- a/flashrom.c +++ b/flashrom.c @@ -1188,8 +1188,8 @@ notfound: msg_cinfo("%s chip \"%s %s\" (%d kB, %s) %s.\n", force ? "Assuming" : "Found", - flash->vendor, flash->name, flash->total_size, - flashbuses_to_text(flash->bustype), location); + fill_flash->vendor, fill_flash->name, fill_flash->total_size, + flashbuses_to_text(fill_flash->bustype), location); /* Flash registers will not be mapped if the chip was forced. Lock info * may be stored in registers, so avoid lock info printing. -- 1.7.1

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

flashrom