openwrt/flashrom
1
0
Fork 0
mirror of https://review.coreboot.org/flashrom.git synced 2025-04-28 15:33:42 +02:00
Code Issues Releases Wiki Activity

Disable writes on default for known bad programmers

Browse Source 
If a programmer has untested or non-working write/erase code, but
probing/reading works, it makes sense to protect the user against
write/erase accidents. This feature will be used by the Nvidia MCP SPI
code, and it also might make sense for the gfxnvidia driver which has
non-working write/erase.

Corresponding to flashrom svn r1069.

Signed-off-by: Carl-Daniel Hailfinger <c-d.hailfinger.devel.2006@gmx.net>
Acked-by: Michael Karcher <flashrom@mkarcher.dialup.fu-berlin.de>
This commit is contained in:
Carl-Daniel Hailfinger 2010-07-03 12:14:25 +00:00
parent ad3cc55e13
commit d1be52d545
2 changed files with 21 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
flash.h
View File

@ -569,6 +569,7 @@ struct decode_sizes {
uint32_t spi; uint32_t spi;
}; };
extern struct decode_sizes max_rom_decode; extern struct decode_sizes max_rom_decode;
extern int programmer_may_write;
extern char *programmer_param; extern char *programmer_param;
extern unsigned long flashbase; extern unsigned long flashbase;
extern int verbose; extern int verbose;

20
flashrom.c
View File

@ -103,6 +103,9 @@ struct decode_sizes max_rom_decode;
/* If nonzero, used as the start address of bottom-aligned flash. */ /* If nonzero, used as the start address of bottom-aligned flash. */
unsigned long flashbase; unsigned long flashbase;
/* Is writing allowed with this programmer? */
int programmer_may_write;
const struct programmer_entry programmer_table[] = { const struct programmer_entry programmer_table[] = {
#if CONFIG_INTERNAL == 1 #if CONFIG_INTERNAL == 1
{ {
@ -447,6 +450,8 @@ int programmer_init(char *param)
flashbase = 0; flashbase = 0;
/* Registering shutdown functions is now allowed. */ /* Registering shutdown functions is now allowed. */
may_register_shutdown = 1; may_register_shutdown = 1;
/* Default to allowing writes. Broken programmers set this to 0. */
programmer_may_write = 1;
programmer_param = param; programmer_param = param;
msg_pdbg("Initializing %s programmer\n", msg_pdbg("Initializing %s programmer\n",
@ -1383,6 +1388,21 @@ int doit(struct flashchip *flash, int force, char *filename, int read_it, int wr
size = flash->total_size * 1024; size = flash->total_size * 1024;
buf = (uint8_t *) calloc(size, sizeof(char)); 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();
return 1;
} else {
msg_cerr("Continuing anyway.\n");
}
}
if (erase_it) { if (erase_it) {
if (flash->tested & TEST_BAD_ERASE) { if (flash->tested & TEST_BAD_ERASE) {
msg_cerr("Erase is not working on this chip. "); msg_cerr("Erase is not working on this chip. ");