From bc0cd0d9606c7d0c41d09a694b49bade159815b1 Mon Sep 17 00:00:00 2001 From: Jehan Bing Date: Mon, 8 Jun 2009 13:43:26 -0700 Subject: nandwrite: fix error handling Artem Bityutskiy wrote: > Yes, write and erase failure mean that the erasblock is bad. But I think > marking a block as bad straight away is just dangerous. Who knows may be > this is a small glitch in a bus, or a software bug, or some-one > corrupted driver's memory, or whatever. This is why UBI is doing > eraseblock torturing before marking it as bad. And it is very careful > about error codes - only EIO code is considered as a reason to mark an > eraseblock as bad. Fixed broken behavior in case of write failure. More specifically: - Only try to mark a block bad if the errors are EIO. Other errors will abort the tool. - Also abort the tool if the marking fails instead of ignoring it. Signed-off-by: Jehan Bing Signed-off-by: Artem Bityutskiy --- nandwrite.c | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/nandwrite.c b/nandwrite.c index d745ab0..1a9449b 100644 --- a/nandwrite.c +++ b/nandwrite.c @@ -586,6 +586,10 @@ int main(int argc, char * const argv[]) erase_info_t erase; perror ("pwrite"); + if (errno != EIO) { + goto closeall; + } + /* Must rewind to blockstart if we can */ rewind_blocks = (mtdoffset - blockstart) / meminfo.writesize; /* Not including the one we just attempted */ rewind_bytes = (rewind_blocks * meminfo.writesize) + readlen; @@ -602,7 +606,9 @@ int main(int argc, char * const argv[]) (long)erase.start, (long)erase.start+erase.length-1); if (ioctl(fd, MEMERASE, &erase) != 0) { perror("MEMERASE"); - goto closeall; + if (errno != EIO) { + goto closeall; + } } if (markbad) { @@ -610,7 +616,7 @@ int main(int argc, char * const argv[]) fprintf(stderr, "Marking block at %08lx bad\n", (long)bad_addr); if (ioctl(fd, MEMSETBADBLOCK, &bad_addr)) { perror("MEMSETBADBLOCK"); - /* But continue anyway */ + goto closeall; } } mtdoffset = blockstart + meminfo.erasesize; -- cgit v1.2.3