summaryrefslogtreecommitdiff
path: root/drivers
diff options
context:
space:
mode:
authorMike Frysinger <vapier@gentoo.org>2008-10-02 01:55:38 -0400
committerStefan Roese <sr@denx.de>2008-10-02 10:30:32 +0200
commit2215987e100d2a841ae6d48a7cc9bb83fcf22737 (patch)
tree37ea6fa0da6ddb6d1d8e11a2ea2abea5b30de3eb /drivers
parent8fd4166c467a46773f80208bda1ec3b4757747bc (diff)
downloadu-boot-imx-2215987e100d2a841ae6d48a7cc9bb83fcf22737.zip
u-boot-imx-2215987e100d2a841ae6d48a7cc9bb83fcf22737.tar.gz
u-boot-imx-2215987e100d2a841ae6d48a7cc9bb83fcf22737.tar.bz2
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>
Diffstat (limited to 'drivers')
-rw-r--r--drivers/mtd/cfi_flash.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/mtd/cfi_flash.c b/drivers/mtd/cfi_flash.c
index 0d1ee8a..72d063a 100644
--- a/drivers/mtd/cfi_flash.c
+++ b/drivers/mtd/cfi_flash.c
@@ -1932,9 +1932,10 @@ ulong flash_get_size (ulong base, int banknum)
/* XXX - Need to test on x8/x16 in parallel. */
info->portwidth >>= 1;
}
+
+ flash_write_cmd (info, 0, 0, info->cmd_reset);
}
- flash_write_cmd (info, 0, 0, info->cmd_reset);
return (info->size);
}