From b23b1ebcc9cf04657262f4ef247d457b3f0b1c11 Mon Sep 17 00:00:00 2001 From: Carl-Daniel Hailfinger Date: Thu, 2 Dec 2010 02:41:55 +0000 Subject: Handle erase failure in partial write Corresponding to flashrom svn r1238. Signed-off-by: Carl-Daniel Hailfinger Acked-by: Michael Karcher --- flashrom.c | 17 +++++++++++++---- 1 file changed, 13 insertions(+), 4 deletions(-) (limited to 'flashrom.c') diff --git a/flashrom.c b/flashrom.c index 7ad9f2dc..629cce29 100644 --- a/flashrom.c +++ b/flashrom.c @@ -1468,11 +1468,20 @@ int erase_and_write_flash(struct flashchip *flash, uint8_t *oldcontents, uint8_t /* If everything is OK, don't try another erase function. */ if (!ret) break; - /* FIXME: Reread the whole chip here so we know the current - * chip contents? curcontents might be up to date, but this - * code is only reached if something failed, and then we don't - * know exactly what failed, and how. + /* Write/erase failed, so try to find out what the current chip + * contents are. If no usable erase functions remain, we could + * abort the loop instead of continuing, the effect is the same. + * The only difference is whether the reason for other unusable + * functions is printed or not. If in doubt, verbosity wins. */ + if (flash->read(flash, curcontents, 0, size)) { + /* Now we are truly screwed. Read failed as well. */ + msg_cerr("Can't read anymore!\n"); + /* We have no idea about the flash chip contents, so + * retrying with another erase function is pointless. + */ + break; + } } /* Free the scratchpad. */ free(curcontents); -- cgit v1.2.3