V3s_Allwinner
/
uboot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 2 Wiki Activity

cfi_flash: do not reset flash when probe fails 

The CFI flash driver starts at flash_init() which calls down into
flash_get_size().  This starts by calling flash_detect_cfi().  If said
function fails, flash_get_size() finishes by attempting to reset the
flash.  Unfortunately, it does this with an info->portwidth set to 0x10
which filters down into flash_make_cmd() and that happily smashes the
stack by sticking info->portwidth bytes into a cfiword_t variable that
lives on the stack.  On a 64bit system you probably won't notice, but
killing the last 8 bytes on a 32bit system usually leads to a corrupt
return address.  Which is what happens on a Blackfin system.

Signed-off-by: Mike Frysinger <vapier@gentoo.org>
Signed-off-by: Stefan Roese <sr@denx.de>
This commit is contained in:
Mike Frysinger 2008-10-02 01:55:38 -04:00 committed by Stefan Roese
parent 8fd4166c46
commit 2215987e10
1 changed files with 2 additions and 1 deletions
drivers/mtd
cfi_flash.c

3
drivers/mtd/cfi_flash.c
View File

@ -1932,9 +1932,10 @@ ulong flash_get_size (ulong base, int banknum)
/* XXX - Need to test on x8/x16 in parallel. */ /* XXX - Need to test on x8/x16 in parallel. */
info->portwidth >>= 1; info->portwidth >>= 1;
} }
flash_write_cmd (info, 0, 0, info->cmd_reset);
} }
flash_write_cmd (info, 0, 0, info->cmd_reset);
return (info->size); return (info->size);
} }