aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorWolfgang Denk <wd@denx.de>2011-12-23 01:29:12 +0000
committerWolfgang Denk <wd@denx.de>2011-12-23 20:08:10 +0100
commit7ddd4475a8f7cabfa86c7f61452cc49facbe172a (patch)
tree2c51850f9832ae3a2002d35df28fe111d50e4f3f
parent38081ff7a4c43cc77bac3f7e85b6592b50d136a8 (diff)
downloadu-boot-7ddd4475a8f7cabfa86c7f61452cc49facbe172a.zip
u-boot-7ddd4475a8f7cabfa86c7f61452cc49facbe172a.tar.gz
u-boot-7ddd4475a8f7cabfa86c7f61452cc49facbe172a.tar.bz2
post/lib_powerpc/multi.c: fix stack overflow error
The code and comment disagreed: the comment claimed that r6...r31 were copied, and consequently the arrays for "src" and "dst" were declared with 26 entries, but the actual code ("lmw r5,0(r3)" and "stmw r5,0(r4)") copied _27_ words (r5 through r31), which resulted in false "POST cpu Error at multi test" messages. Fix the comment and the array sizes. Signed-off-by: Wolfgang Denk <wd@denx.de> Cc: Anatolij Gustschin <agust@denx.de> Cc: Stefan Roese <sr@denx.de> Cc: Kumar Gala <galak@kernel.crashing.org> Cc: Kim Phillips <kim.phillips@freescale.com> Cc: Andy Fleming <afleming@gmail.com> Acked-by: Anatolij Gustschin <agust@denx.de> Tested-by: Anatolij Gustschin <agust@denx.de>
-rw-r--r--post/lib_powerpc/multi.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/post/lib_powerpc/multi.c b/post/lib_powerpc/multi.c
index f9fe719..e9814a6 100644
--- a/post/lib_powerpc/multi.c
+++ b/post/lib_powerpc/multi.c
@@ -27,9 +27,9 @@
* CPU test
* Load/store multiple word instructions: lmw, stmw
*
- * 26 consecutive words are loaded from a source memory buffer
- * into GPRs r6 through r31. After that, 26 consecutive words are stored
- * from the GPRs r6 through r31 into a target memory buffer. The contents
+ * 27 consecutive words are loaded from a source memory buffer
+ * into GPRs r5 through r31. After that, 27 consecutive words are stored
+ * from the GPRs r5 through r31 into a target memory buffer. The contents
* of the source and target buffers are then compared.
*/
@@ -44,7 +44,7 @@ int cpu_post_test_multi(void)
{
int ret = 0;
unsigned int i;
- ulong src[26], dst[26];
+ ulong src[27], dst[27];
int flag = disable_interrupts();
ulong code[] = {