coreboot June 2009

coreboot@coreboot.org

84 participants
500 discussions

[PATCH] flashrom: Autoverify all writes, unless --noverify is used
by Uwe Hermann 24 Jun '09

24 Jun '09

See patch. Tested on one board, other tests are welcome. Uwe. -- http://www.hermann-uwe.de | http://www.holsham-traders.de http://www.crazy-hacks.org | http://www.unmaintained-free-software.org

4 4

[flashrom] r631 - trunk
by svn＠coreboot.org 24 Jun '09

24 Jun '09

Author: uwe Date: 2009-06-24 19:31:08 +0200 (Wed, 24 Jun 2009) New Revision: 631 Modified: trunk/flashrom.8 trunk/flashrom.c Log: Always verify write operations automatically. Should this be undesireable because of speed reasons, --noverify can be used to suppress an auto-verify. Signed-off-by: Uwe Hermann <uwe(a)hermann-uwe.de> Acked-by: Carl-Daniel Hailfinger <c-d.hailfinger.devel.2006(a)gmx.net> Acked-by: Harald Gutmann <harald.gutmann(a)gmx.net> Modified: trunk/flashrom.8 =================================================================== --- trunk/flashrom.8 2009-06-24 08:28:39 UTC (rev 630) +++ trunk/flashrom.8 2009-06-24 17:31:08 UTC (rev 631) @@ -2,9 +2,8 @@ .SH NAME flashrom \- detect, read, write, verify and erase flash chips .SH SYNOPSIS -.B flashrom \fR[\fB\-VfLzhR\fR] [\fB\-E\fR|\fB\-r\fR file|\fB\-w\fR file|\fB\-v\fR file] - [\fB\-c\fR chipname] [\fB\-m\fR [vendor:]part] - [\fB\-l\fR file] [\fB\-i\fR image] [\fB\-p\fR programmer] +.B flashrom \fR[\fB\-VfLzhRn\fR] [\fB\-E\fR|\fB\-r\fR file|\fB\-w\fR file|\fB\-v\fR file] [\fB\-c\fR chipname] + [\fB\-m\fR [vendor:]part] [\fB\-l\fR file] [\fB\-i\fR image] [\fB\-p\fR programmer] .SH DESCRIPTION .B flashrom is a utility for detecting, reading, writing, verifying and erasing flash @@ -38,6 +37,21 @@ .B <file> is specified). .TP +.B "\-n, \-\-noverify" +Do +.B not +verify the flash ROM contents after writing them to the chip. Using this +option is +.B not +recommended, you should only use it if you know what you are doing and you +feel that the time for verification takes too long. +.sp +Typical usage is: +.B "flashrom -wn file" +.sp +This option is only useful in combination with +.BR \-\-write . +.TP .B "\-v, \-\-verify <file>" Verify the flash ROM contents against the given .BR <file> . Modified: trunk/flashrom.c =================================================================== --- trunk/flashrom.c 2009-06-24 08:28:39 UTC (rev 630) +++ trunk/flashrom.c 2009-06-24 17:31:08 UTC (rev 631) @@ -480,6 +480,7 @@ (" -r | --read: read flash and save into file\n" " -w | --write: write file into flash\n" " -v | --verify: verify flash against file\n" + " -n | --noverify: don't verify flash against file\n" " -E | --erase: erase flash device\n" " -V | --verbose: more verbose output\n" " -c | --chip <chipname>: probe only for specified flash chip\n" @@ -515,7 +516,7 @@ int option_index = 0; int force = 0; int read_it = 0, write_it = 0, erase_it = 0, verify_it = 0; - int list_supported = 0, list_supported_wiki = 0; + int dont_verify_it = 0, list_supported = 0, list_supported_wiki = 0; int operation_specified = 0; int ret = 0, i; @@ -524,6 +525,7 @@ {"write", 0, 0, 'w'}, {"erase", 0, 0, 'E'}, {"verify", 0, 0, 'v'}, + {"noverify", 0, 0, 'n'}, {"chip", 1, 0, 'c'}, {"mainboard", 1, 0, 'm'}, {"verbose", 0, 0, 'V'}, @@ -553,7 +555,7 @@ } setbuf(stdout, NULL); - while ((opt = getopt_long(argc, argv, "rRwvVEfc:m:l:i:p:Lzh", + while ((opt = getopt_long(argc, argv, "rRwvnVEfc:m:l:i:p:Lzh", long_options, &option_index)) != EOF) { switch (opt) { case 'r': @@ -580,6 +582,9 @@ } verify_it = 1; break; + case 'n': + dont_verify_it = 1; + break; case 'c': chip_to_probe = strdup(optarg); break; @@ -779,6 +784,10 @@ exit(1); } + /* Always verify write operations unless -n is used. */ + if (write_it && !dont_verify_it) + verify_it = 1; + size = flash->total_size * 1024; buf = (uint8_t *) calloc(size, sizeof(char));

1 0

Re: [coreboot] coreboot for C3/CN400 (Luke)
by Harald Gutmann 24 Jun '09

24 Jun '09

Hello Jon, I'm really interested in your work on CN400 as i own an EPIA-SP, but right now I don't have the possibilities to test something on that board. Can you please be so kindly and attach the patch you posted as a file, because this would make life more easyier for testing/reviewing your patch. Hopefully I can get my hardware setup from my EPIA board working in the next days, and do some tests of your patch. (And maybe help to get it working fine.) Kind regards, Harald

2 1

Flash ROM and payload (All in the Flash ROM chip) ?
by Rick Ant 24 Jun '09

24 Jun '09

I try to install Flash ROM, but need zlib-devel and pciutils-devel, I'm using Suse 10.1, Can I install Coreboot + payload Linux without any Compact flash? All in the Flash ROM chip ? Anyone knows where to download those files ? Thanks

2 1

Re: [coreboot] coreboot for C3/CN400 (Luke)
by Carl-Daniel Hailfinger 24 Jun '09

24 Jun '09

On 24.06.2009 12:17, Harrison, Jon (SELEX GALILEO, UK) wrote: > I've made a bit of progress, now getting beyond the basic RAM init. > RAM init is one of the big obstacles in finishing a port. If RAM works reliably for you, please send your code to the list. Regards, Carl-Daniel -- http://www.hailfinger.org/

2 3

Re: [coreboot] coreboot for C3/CN400 (Luke)
by Harrison, Jon (SELEX GALILEO, UK) 24 Jun '09

24 Jun '09

Hi Guys, I've made a bit of progress, now getting beyond the basic RAM init. Uncompresses and starts to run the coreboot core. Not worth posting a patch unless anyone really wants to see it. Let me know. Jon -----Original Message----- From: Peter Stuge [mailto:peter@stuge.se] Sent: 23 June 2009 12:52 To: Harrison, Jon (SELEX GALILEO, UK) Subject: Re: [coreboot] coreboot for VX800+Nano *** WARNING *** This message has originated outside your organisation, either from an external partner or the Global Internet. Keep this in mind if you answer this message. Harrison, Jon (SELEX GALILEO, UK) wrote: > Thx, Peter. I understand that there are not very many resources available for Luke, it might simply be too old. Hope something can come out of it though. //Peter SELEX Sensors and Airborne Systems Limited Registered Office: Sigma House, Christopher Martin Road, Basildon, Essex SS14 3EL A company registered in England & Wales. Company no. 02426132 ******************************************************************** This email and any attachments are confidential to the intended recipient and may also be privileged. If you are not the intended recipient please delete it from your system and notify the sender. You should not copy it or use it for any purpose nor disclose or distribute its contents to any other person. ********************************************************************

1 0

[PATCH] flashrom: Check result of all SPI erase functions
by Carl-Daniel Hailfinger 24 Jun '09

24 Jun '09

Check result of all SPI erase functions. Since block erase functions do not know the block length (it's not specified in any standard), block erase functions now get an additional parameter blocklen. This enables flashrom to verify the erase result for block erase functions at correct boundaries. Unchecked erase is bad and can lead to problems nobody can understand. Signed-off-by: Carl-Daniel Hailfinger <c-d.hailfinger.devel.2006(a)gmx.net> Index: flashrom-spi_verify_erase/flash.h =================================================================== --- flashrom-spi_verify_erase/flash.h (Revision 618) +++ flashrom-spi_verify_erase/flash.h (Arbeitskopie) @@ -424,8 +424,11 @@ int spi_chip_erase_c7(struct flashchip *flash); int spi_chip_erase_60_c7(struct flashchip *flash); int spi_chip_erase_d8(struct flashchip *flash); -int spi_block_erase_52(const struct flashchip *flash, unsigned long addr); -int spi_block_erase_d8(const struct flashchip *flash, unsigned long addr); +int spi_block_erase_20(struct flashchip *flash, unsigned int addr, unsigned int blocklen); +int spi_block_erase_52(struct flashchip *flash, unsigned int addr, unsigned int blocklen); +int spi_block_erase_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_read(struct flashchip *flash, uint8_t *buf, int start, int len); Index: flashrom-spi_verify_erase/spi.c =================================================================== --- flashrom-spi_verify_erase/spi.c (Revision 618) +++ flashrom-spi_verify_erase/spi.c (Arbeitskopie) @@ -1,7 +1,7 @@ /* * This file is part of the flashrom project. * - * Copyright (C) 2007, 2008 Carl-Daniel Hailfinger + * Copyright (C) 2007, 2008, 2009 Carl-Daniel Hailfinger * Copyright (C) 2008 coresystems GmbH * * This program is free software; you can redistribute it and/or modify @@ -430,6 +430,10 @@ /* 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)) { + fprintf(stderr, "ERASE FAILED!\n"); + return -1; + } return 0; } @@ -458,6 +462,10 @@ /* 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)) { + fprintf(stderr, "ERASE FAILED!\n"); + return -1; + } return 0; } @@ -472,9 +480,9 @@ return result; } -int spi_block_erase_52(const struct flashchip *flash, unsigned long addr) +int spi_block_erase_52(struct flashchip *flash, unsigned int addr, unsigned int blocklen) { - unsigned char cmd[JEDEC_BE_52_OUTSIZE] = {JEDEC_BE_52}; + unsigned char cmd[JEDEC_BE_52_OUTSIZE] = {JEDEC_BE_52, }; int result; cmd[1] = (addr & 0x00ff0000) >> 16; @@ -490,6 +498,10 @@ */ while (spi_read_status_register() & JEDEC_RDSR_BIT_WIP) programmer_delay(100 * 1000); + if (check_erased_range(flash, addr, blocklen)) { + fprintf(stderr, "ERASE FAILED!\n"); + return -1; + } return 0; } @@ -498,9 +510,9 @@ * 32k for SST * 4-32k non-uniform for EON */ -int spi_block_erase_d8(const struct flashchip *flash, unsigned long addr) +int spi_block_erase_d8(struct flashchip *flash, unsigned int addr, unsigned int blocklen) { - unsigned char cmd[JEDEC_BE_D8_OUTSIZE] = { JEDEC_BE_D8 }; + unsigned char cmd[JEDEC_BE_D8_OUTSIZE] = { JEDEC_BE_D8, }; int result; cmd[1] = (addr & 0x00ff0000) >> 16; @@ -516,6 +528,10 @@ */ while (spi_read_status_register() & JEDEC_RDSR_BIT_WIP) programmer_delay(100 * 1000); + if (check_erased_range(flash, addr, blocklen)) { + fprintf(stderr, "ERASE FAILED!\n"); + return -1; + } return 0; } @@ -530,7 +546,7 @@ printf("Erasing chip: \n"); for (i = 0; i < total_size / erase_size; i++) { - rc = spi_block_erase_d8(flash, i * erase_size); + rc = spi_block_erase_d8(flash, i * erase_size, erase_size); if (rc) { printf("Error erasing block at 0x%x\n", i); break; @@ -543,9 +559,9 @@ } /* Sector size is usually 4k, though Macronix eliteflash has 64k */ -int spi_sector_erase(const struct flashchip *flash, unsigned long addr) +int spi_block_erase_20(struct flashchip *flash, unsigned int addr, unsigned int blocklen) { - unsigned char cmd[JEDEC_SE_OUTSIZE] = { JEDEC_SE }; + unsigned char cmd[JEDEC_SE_OUTSIZE] = { JEDEC_SE, }; int result; cmd[1] = (addr & 0x00ff0000) >> 16; @@ -562,9 +578,31 @@ */ while (spi_read_status_register() & JEDEC_RDSR_BIT_WIP) programmer_delay(10 * 1000); + if (check_erased_range(flash, addr, blocklen)) { + fprintf(stderr, "ERASE FAILED!\n"); + return -1; + } return 0; } +int spi_block_erase_60(struct flashchip *flash, unsigned int addr, unsigned int blocklen) +{ + if ((addr != 0) || (blocklen != flash->total_size * 1024)) { + fprintf(stderr, "%s called with incorrect arguments\n", __func__); + return -1; + } + return spi_chip_erase_60(flash); +} + +int spi_block_erase_c7(struct flashchip *flash, unsigned int addr, unsigned int blocklen) +{ + if ((addr != 0) || (blocklen != flash->total_size * 1024)) { + fprintf(stderr, "%s called with incorrect arguments\n", __func__); + return -1; + } + return spi_chip_erase_c7(flash); +} + int spi_write_status_enable(void) { const unsigned char cmd[JEDEC_EWSR_OUTSIZE] = { JEDEC_EWSR }; @@ -810,7 +848,10 @@ default: break; } - flash->erase(flash); + if (flash->erase(flash)) { + fprintf(stderr, "ERASE FAILED!\n"); + return -1; + } result = spi_write_enable(); if (result) return result; Index: flashrom-spi_verify_erase/ichspi.c =================================================================== --- flashrom-spi_verify_erase/ichspi.c (Revision 618) +++ flashrom-spi_verify_erase/ichspi.c (Arbeitskopie) @@ -661,7 +661,7 @@ * For this, we need to add a block erase function to * struct flashchip. */ - rc = spi_block_erase_d8(flash, i * erase_size); + rc = spi_block_erase_d8(flash, i * erase_size, erase_size); if (rc) { printf("Error erasing block at 0x%x\n", i); break; -- http://www.hailfinger.org/ Index: flashrom-spi_verify_erase/flash.h =================================================================== --- flashrom-spi_verify_erase/flash.h (Revision 618) +++ flashrom-spi_verify_erase/flash.h (Arbeitskopie) @@ -424,8 +424,11 @@ int spi_chip_erase_c7(struct flashchip *flash); int spi_chip_erase_60_c7(struct flashchip *flash); int spi_chip_erase_d8(struct flashchip *flash); -int spi_block_erase_52(const struct flashchip *flash, unsigned long addr); -int spi_block_erase_d8(const struct flashchip *flash, unsigned long addr); +int spi_block_erase_20(struct flashchip *flash, unsigned int addr, unsigned int blocklen); +int spi_block_erase_52(struct flashchip *flash, unsigned int addr, unsigned int blocklen); +int spi_block_erase_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_read(struct flashchip *flash, uint8_t *buf, int start, int len); Index: flashrom-spi_verify_erase/spi.c =================================================================== --- flashrom-spi_verify_erase/spi.c (Revision 618) +++ flashrom-spi_verify_erase/spi.c (Arbeitskopie) @@ -1,7 +1,7 @@ /* * This file is part of the flashrom project. * - * Copyright (C) 2007, 2008 Carl-Daniel Hailfinger + * Copyright (C) 2007, 2008, 2009 Carl-Daniel Hailfinger * Copyright (C) 2008 coresystems GmbH * * This program is free software; you can redistribute it and/or modify @@ -430,6 +430,10 @@ /* 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)) { + fprintf(stderr, "ERASE FAILED!\n"); + return -1; + } return 0; } @@ -458,6 +462,10 @@ /* 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)) { + fprintf(stderr, "ERASE FAILED!\n"); + return -1; + } return 0; } @@ -472,9 +480,9 @@ return result; } -int spi_block_erase_52(const struct flashchip *flash, unsigned long addr) +int spi_block_erase_52(struct flashchip *flash, unsigned int addr, unsigned int blocklen) { - unsigned char cmd[JEDEC_BE_52_OUTSIZE] = {JEDEC_BE_52}; + unsigned char cmd[JEDEC_BE_52_OUTSIZE] = {JEDEC_BE_52, }; int result; cmd[1] = (addr & 0x00ff0000) >> 16; @@ -490,6 +498,10 @@ */ while (spi_read_status_register() & JEDEC_RDSR_BIT_WIP) programmer_delay(100 * 1000); + if (check_erased_range(flash, addr, blocklen)) { + fprintf(stderr, "ERASE FAILED!\n"); + return -1; + } return 0; } @@ -498,9 +510,9 @@ * 32k for SST * 4-32k non-uniform for EON */ -int spi_block_erase_d8(const struct flashchip *flash, unsigned long addr) +int spi_block_erase_d8(struct flashchip *flash, unsigned int addr, unsigned int blocklen) { - unsigned char cmd[JEDEC_BE_D8_OUTSIZE] = { JEDEC_BE_D8 }; + unsigned char cmd[JEDEC_BE_D8_OUTSIZE] = { JEDEC_BE_D8, }; int result; cmd[1] = (addr & 0x00ff0000) >> 16; @@ -516,6 +528,10 @@ */ while (spi_read_status_register() & JEDEC_RDSR_BIT_WIP) programmer_delay(100 * 1000); + if (check_erased_range(flash, addr, blocklen)) { + fprintf(stderr, "ERASE FAILED!\n"); + return -1; + } return 0; } @@ -530,7 +546,7 @@ printf("Erasing chip: \n"); for (i = 0; i < total_size / erase_size; i++) { - rc = spi_block_erase_d8(flash, i * erase_size); + rc = spi_block_erase_d8(flash, i * erase_size, erase_size); if (rc) { printf("Error erasing block at 0x%x\n", i); break; @@ -543,9 +559,9 @@ } /* Sector size is usually 4k, though Macronix eliteflash has 64k */ -int spi_sector_erase(const struct flashchip *flash, unsigned long addr) +int spi_block_erase_20(struct flashchip *flash, unsigned int addr, unsigned int blocklen) { - unsigned char cmd[JEDEC_SE_OUTSIZE] = { JEDEC_SE }; + unsigned char cmd[JEDEC_SE_OUTSIZE] = { JEDEC_SE, }; int result; cmd[1] = (addr & 0x00ff0000) >> 16; @@ -562,9 +578,31 @@ */ while (spi_read_status_register() & JEDEC_RDSR_BIT_WIP) programmer_delay(10 * 1000); + if (check_erased_range(flash, addr, blocklen)) { + fprintf(stderr, "ERASE FAILED!\n"); + return -1; + } return 0; } +int spi_block_erase_60(struct flashchip *flash, unsigned int addr, unsigned int blocklen) +{ + if ((addr != 0) || (blocklen != flash->total_size * 1024)) { + fprintf(stderr, "%s called with incorrect arguments\n", __func__); + return -1; + } + return spi_chip_erase_60(flash); +} + +int spi_block_erase_c7(struct flashchip *flash, unsigned int addr, unsigned int blocklen) +{ + if ((addr != 0) || (blocklen != flash->total_size * 1024)) { + fprintf(stderr, "%s called with incorrect arguments\n", __func__); + return -1; + } + return spi_chip_erase_c7(flash); +} + int spi_write_status_enable(void) { const unsigned char cmd[JEDEC_EWSR_OUTSIZE] = { JEDEC_EWSR }; @@ -810,7 +848,10 @@ default: break; } - flash->erase(flash); + if (flash->erase(flash)) { + fprintf(stderr, "ERASE FAILED!\n"); + return -1; + } result = spi_write_enable(); if (result) return result; Index: flashrom-spi_verify_erase/ichspi.c =================================================================== --- flashrom-spi_verify_erase/ichspi.c (Revision 618) +++ flashrom-spi_verify_erase/ichspi.c (Arbeitskopie) @@ -661,7 +661,7 @@ * For this, we need to add a block erase function to * struct flashchip. */ - rc = spi_block_erase_d8(flash, i * erase_size); + rc = spi_block_erase_d8(flash, i * erase_size, erase_size); if (rc) { printf("Error erasing block at 0x%x\n", i); break;

2 3

[flashrom] r630 - trunk
by svn＠coreboot.org 24 Jun '09

24 Jun '09

Author: hailfinger Date: 2009-06-24 10:28:39 +0200 (Wed, 24 Jun 2009) New Revision: 630 Modified: trunk/flash.h trunk/ichspi.c trunk/spi.c Log: Check result of all SPI erase functions. Since block erase functions do not know the block length (it's not specified in any standard), block erase functions now get an additional parameter blocklen. This enables flashrom to verify the erase result for block erase functions at correct boundaries. Tested by Uwe on SB600. Signed-off-by: Carl-Daniel Hailfinger <c-d.hailfinger.devel.2006(a)gmx.net> Acked-by: Uwe Hermann <uwe(a)hermann-uwe.de> Modified: trunk/flash.h =================================================================== --- trunk/flash.h 2009-06-24 08:20:45 UTC (rev 629) +++ trunk/flash.h 2009-06-24 08:28:39 UTC (rev 630) @@ -425,8 +425,11 @@ int spi_chip_erase_c7(struct flashchip *flash); int spi_chip_erase_60_c7(struct flashchip *flash); int spi_chip_erase_d8(struct flashchip *flash); -int spi_block_erase_52(const struct flashchip *flash, unsigned long addr); -int spi_block_erase_d8(const struct flashchip *flash, unsigned long addr); +int spi_block_erase_20(struct flashchip *flash, unsigned int addr, unsigned int blocklen); +int spi_block_erase_52(struct flashchip *flash, unsigned int addr, unsigned int blocklen); +int spi_block_erase_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_read(struct flashchip *flash, uint8_t *buf, int start, int len); Modified: trunk/ichspi.c =================================================================== --- trunk/ichspi.c 2009-06-24 08:20:45 UTC (rev 629) +++ trunk/ichspi.c 2009-06-24 08:28:39 UTC (rev 630) @@ -661,7 +661,7 @@ * For this, we need to add a block erase function to * struct flashchip. */ - rc = spi_block_erase_d8(flash, i * erase_size); + rc = spi_block_erase_d8(flash, i * erase_size, erase_size); if (rc) { printf("Error erasing block at 0x%x\n", i); break; Modified: trunk/spi.c =================================================================== --- trunk/spi.c 2009-06-24 08:20:45 UTC (rev 629) +++ trunk/spi.c 2009-06-24 08:28:39 UTC (rev 630) @@ -1,7 +1,7 @@ /* * This file is part of the flashrom project. * - * Copyright (C) 2007, 2008 Carl-Daniel Hailfinger + * Copyright (C) 2007, 2008, 2009 Carl-Daniel Hailfinger * Copyright (C) 2008 coresystems GmbH * * This program is free software; you can redistribute it and/or modify @@ -430,6 +430,10 @@ /* 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)) { + fprintf(stderr, "ERASE FAILED!\n"); + return -1; + } return 0; } @@ -458,6 +462,10 @@ /* 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)) { + fprintf(stderr, "ERASE FAILED!\n"); + return -1; + } return 0; } @@ -472,9 +480,9 @@ return result; } -int spi_block_erase_52(const struct flashchip *flash, unsigned long addr) +int spi_block_erase_52(struct flashchip *flash, unsigned int addr, unsigned int blocklen) { - unsigned char cmd[JEDEC_BE_52_OUTSIZE] = {JEDEC_BE_52}; + unsigned char cmd[JEDEC_BE_52_OUTSIZE] = {JEDEC_BE_52, }; int result; cmd[1] = (addr & 0x00ff0000) >> 16; @@ -490,6 +498,10 @@ */ while (spi_read_status_register() & JEDEC_RDSR_BIT_WIP) programmer_delay(100 * 1000); + if (check_erased_range(flash, addr, blocklen)) { + fprintf(stderr, "ERASE FAILED!\n"); + return -1; + } return 0; } @@ -498,9 +510,9 @@ * 32k for SST * 4-32k non-uniform for EON */ -int spi_block_erase_d8(const struct flashchip *flash, unsigned long addr) +int spi_block_erase_d8(struct flashchip *flash, unsigned int addr, unsigned int blocklen) { - unsigned char cmd[JEDEC_BE_D8_OUTSIZE] = { JEDEC_BE_D8 }; + unsigned char cmd[JEDEC_BE_D8_OUTSIZE] = { JEDEC_BE_D8, }; int result; cmd[1] = (addr & 0x00ff0000) >> 16; @@ -516,6 +528,10 @@ */ while (spi_read_status_register() & JEDEC_RDSR_BIT_WIP) programmer_delay(100 * 1000); + if (check_erased_range(flash, addr, blocklen)) { + fprintf(stderr, "ERASE FAILED!\n"); + return -1; + } return 0; } @@ -530,7 +546,7 @@ printf("Erasing chip: \n"); for (i = 0; i < total_size / erase_size; i++) { - rc = spi_block_erase_d8(flash, i * erase_size); + rc = spi_block_erase_d8(flash, i * erase_size, erase_size); if (rc) { printf("Error erasing block at 0x%x\n", i); break; @@ -543,9 +559,9 @@ } /* Sector size is usually 4k, though Macronix eliteflash has 64k */ -int spi_sector_erase(const struct flashchip *flash, unsigned long addr) +int spi_block_erase_20(struct flashchip *flash, unsigned int addr, unsigned int blocklen) { - unsigned char cmd[JEDEC_SE_OUTSIZE] = { JEDEC_SE }; + unsigned char cmd[JEDEC_SE_OUTSIZE] = { JEDEC_SE, }; int result; cmd[1] = (addr & 0x00ff0000) >> 16; @@ -562,9 +578,31 @@ */ while (spi_read_status_register() & JEDEC_RDSR_BIT_WIP) programmer_delay(10 * 1000); + if (check_erased_range(flash, addr, blocklen)) { + fprintf(stderr, "ERASE FAILED!\n"); + return -1; + } return 0; } +int spi_block_erase_60(struct flashchip *flash, unsigned int addr, unsigned int blocklen) +{ + if ((addr != 0) || (blocklen != flash->total_size * 1024)) { + fprintf(stderr, "%s called with incorrect arguments\n", __func__); + return -1; + } + return spi_chip_erase_60(flash); +} + +int spi_block_erase_c7(struct flashchip *flash, unsigned int addr, unsigned int blocklen) +{ + if ((addr != 0) || (blocklen != flash->total_size * 1024)) { + fprintf(stderr, "%s called with incorrect arguments\n", __func__); + return -1; + } + return spi_chip_erase_c7(flash); +} + int spi_write_status_enable(void) { const unsigned char cmd[JEDEC_EWSR_OUTSIZE] = { JEDEC_EWSR }; @@ -810,7 +848,10 @@ default: break; } - flash->erase(flash); + if (flash->erase(flash)) { + fprintf(stderr, "ERASE FAILED!\n"); + return -1; + } result = spi_write_enable(); if (result) return result;

1 0

[PATCH] flashrom: Use improved abstraction for verify_range, check SPI erase
by Carl-Daniel Hailfinger 24 Jun '09

24 Jun '09

Use improved abstraction for verify_range(). The new abstraction can handle out-of-band chip communication protocols as well. Check SPI chip erase results with check_erased_range(). Signed-off-by: Carl-Daniel Hailfinger <c-d.hailfinger.devel.2006(a)gmx.net> Index: flashrom-check_erased_range_use_flash_read/spi.c =================================================================== --- flashrom-check_erased_range_use_flash_read/spi.c (Revision 602) +++ flashrom-check_erased_range_use_flash_read/spi.c (Arbeitskopie) @@ -430,6 +430,10 @@ /* 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)) { + fprintf(stderr, "ERASE FAILED!\n"); + return -1; + } return 0; } @@ -458,6 +462,10 @@ /* 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)) { + fprintf(stderr, "ERASE FAILED!\n"); + return -1; + } return 0; } Index: flashrom-check_erased_range_use_flash_read/flashrom.c =================================================================== --- flashrom-check_erased_range_use_flash_read/flashrom.c (Revision 602) +++ flashrom-check_erased_range_use_flash_read/flashrom.c (Arbeitskopie) @@ -262,7 +262,6 @@ int verify_range(struct flashchip *flash, uint8_t *cmpbuf, int start, int len, char *message) { int i, j, starthere, lenhere, ret = 0; - chipaddr bios = flash->virtual_memory; int page_size = flash->page_size; uint8_t *readbuf = malloc(page_size); @@ -298,7 +297,7 @@ starthere = max(start, i * page_size); /* Length of bytes in the range in this page. */ lenhere = min(start + len, (i + 1) * page_size) - starthere; - chip_readn(readbuf, bios + starthere, lenhere); + flash->read(flash, readbuf, starthere, lenhere); for (j = 0; j < lenhere; j++) { if (cmpbuf[starthere - start + j] != readbuf[j]) { fprintf(stderr, "%s FAILED at 0x%08x! " -- http://www.hailfinger.org/ Index: flashrom-check_erased_range_use_flash_read/spi.c =================================================================== --- flashrom-check_erased_range_use_flash_read/spi.c (Revision 602) +++ flashrom-check_erased_range_use_flash_read/spi.c (Arbeitskopie) @@ -430,6 +430,10 @@ /* 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)) { + fprintf(stderr, "ERASE FAILED!\n"); + return -1; + } return 0; } @@ -458,6 +462,10 @@ /* 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)) { + fprintf(stderr, "ERASE FAILED!\n"); + return -1; + } return 0; } Index: flashrom-check_erased_range_use_flash_read/flashrom.c =================================================================== --- flashrom-check_erased_range_use_flash_read/flashrom.c (Revision 602) +++ flashrom-check_erased_range_use_flash_read/flashrom.c (Arbeitskopie) @@ -262,7 +262,6 @@ int verify_range(struct flashchip *flash, uint8_t *cmpbuf, int start, int len, char *message) { int i, j, starthere, lenhere, ret = 0; - chipaddr bios = flash->virtual_memory; int page_size = flash->page_size; uint8_t *readbuf = malloc(page_size); @@ -298,7 +297,7 @@ starthere = max(start, i * page_size); /* Length of bytes in the range in this page. */ lenhere = min(start + len, (i + 1) * page_size) - starthere; - chip_readn(readbuf, bios + starthere, lenhere); + flash->read(flash, readbuf, starthere, lenhere); for (j = 0; j < lenhere; j++) { if (cmpbuf[starthere - start + j] != readbuf[j]) { fprintf(stderr, "%s FAILED at 0x%08x! "

2 3

[flashrom] r629 - trunk
by svn＠coreboot.org 24 Jun '09

24 Jun '09

Author: hailfinger Date: 2009-06-24 10:20:45 +0200 (Wed, 24 Jun 2009) New Revision: 629 Modified: trunk/flashrom.c Log: Use correct abstraction for verify_range(). The new abstraction can handle out-of-band chip communication protocols as well. The old abstraction caused spurious false positives for erase on SPI and spurious false negatives for verify on SPI. Make verify_flash() use verify_range(). Tested by Uwe on SB600. Signed-off-by: Carl-Daniel Hailfinger <c-d.hailfinger.devel.2006(a)gmx.net> Acked-by: Uwe Hermann <uwe(a)hermann-uwe.de> Modified: trunk/flashrom.c =================================================================== --- trunk/flashrom.c 2009-06-24 08:18:38 UTC (rev 628) +++ trunk/flashrom.c 2009-06-24 08:20:45 UTC (rev 629) @@ -276,13 +276,16 @@ int verify_range(struct flashchip *flash, uint8_t *cmpbuf, int start, int len, char *message) { int i, j, starthere, lenhere, ret = 0; - chipaddr bios = flash->virtual_memory; int page_size = flash->page_size; uint8_t *readbuf = malloc(page_size); if (!len) goto out_free; + if (!flash->read) { + fprintf(stderr, "ERROR: flashrom has no read function for this flash chip.\n"); + return 1; + } if (!readbuf) { fprintf(stderr, "Could not allocate memory!\n"); exit(1); @@ -312,7 +315,7 @@ starthere = max(start, i * page_size); /* Length of bytes in the range in this page. */ lenhere = min(start + len, (i + 1) * page_size) - starthere; - chip_readn(readbuf, bios + starthere, lenhere); + flash->read(flash, readbuf, starthere, lenhere); for (j = 0; j < lenhere; j++) { if (cmpbuf[starthere - start + j] != readbuf[j]) { fprintf(stderr, "%s FAILED at 0x%08x! " @@ -384,44 +387,17 @@ int verify_flash(struct flashchip *flash, uint8_t *buf) { - int idx; + int ret; int total_size = flash->total_size * 1024; - uint8_t *buf2 = (uint8_t *) calloc(total_size, sizeof(char)); - if (!flash->read) { - printf("FAILED!\n"); - fprintf(stderr, "ERROR: flashrom has no read function for this flash chip.\n"); - return 1; - } else - flash->read(flash, buf2, 0, total_size); printf("Verifying flash... "); - if (verbose) - printf("address: 0x00000000\b\b\b\b\b\b\b\b\b\b"); + ret = verify_range(flash, buf, 0, total_size, NULL); - for (idx = 0; idx < total_size; idx++) { - if (verbose && ((idx & 0xfff) == 0xfff)) - printf("0x%08x", idx); + if (!ret) + printf("VERIFIED. \n"); - if (*(buf2 + idx) != *(buf + idx)) { - if (verbose) - printf("0x%08x FAILED!", idx); - else - printf("FAILED at 0x%08x!", idx); - printf(" Expected=0x%02x, Read=0x%02x\n", - *(buf + idx), *(buf2 + idx)); - return 1; - } - - if (verbose && ((idx & 0xfff) == 0xfff)) - printf("\b\b\b\b\b\b\b\b\b\b"); - } - if (verbose) - printf("\b\b\b\b\b\b\b\b\b\b "); - - printf("VERIFIED. \n"); - - return 0; + return ret; } int read_flash(struct flashchip *flash, char *filename)

1 0

← Newer
1
...
12
13
14
15
16
17
18
...
50
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

coreboot June 2009