From: Tony Lindgren <tony@atomide.com>
To: Nicolas Pitre <nicolas.pitre@linaro.org>
Cc: Shawn Guo <shawn.guo@freescale.com>,
linux-arm-kernel@lists.infradead.org, patches@linaro.org,
Aaro Koskinen <aaro.koskinen@nokia.com>,
linux-omap@vger.kernel.org
Subject: [PATCH] ARM: Fix bad SP address after relocating kernel
Date: Tue, 26 Apr 2011 05:37:46 -0700 [thread overview]
Message-ID: <20110426123746.GC3755@atomide.com> (raw)
In-Reply-To: <20110426085700.GJ16892@atomide.com>
Otherwise cache_clean_flush can overwrite some of the relocated
area depending on where the kernel image gets loaded. This fixes
booting on n900 after commit 6d7d0ae51574943bf571d269da3243257a2d15db
(ARM: 6750/1: improvements to compressed/head.S).
Thanks to Aaro Koskinen <aaro.koskinen@nokia.com> for debugging
the address of the relocated area that gets corrupted, and to
Nicolas Pitre <nicolas.pitre@linaro.org> for the other uncompress
related fixes.
Signed-off-by: Tony Lindgren <tony@atomide.com>
---
I think this is the right fix.. And we don't want to mess with the
ZBOOT_ROM sp address, right?
--- a/arch/arm/boot/compressed/head.S
+++ b/arch/arm/boot/compressed/head.S
@@ -253,6 +253,15 @@ restart: adr r0, LC0
/* Preserve offset to relocated code. */
sub r6, r9, r6
+#ifndef CONFIG_ZBOOT_ROM
+ /*
+ * Fix sp to use the relocated address in case old sp is
+ * within the relocated area. Otherwise cache_clean_flush
+ * will trash some of the relocated area.
+ */
+ add sp, r6
+#endif
+
bl cache_clean_flush
adr r0, BSYM(restart)
next prev parent reply other threads:[~2011-04-26 12:37 UTC|newest]
Thread overview: 18+ messages / expand[flat|nested] mbox.gz Atom feed top
[not found] <1303272904-31392-1-git-send-email-nicolas.pitre@linaro.org>
[not found] ` <20110420072156.GA28679@atomide.com>
[not found] ` <alpine.LFD.2.00.1104200850030.24613@xanadu.home>
[not found] ` <20110420165514.GE10402@atomide.com>
[not found] ` <alpine.LFD.2.00.1104201318040.24613@xanadu.home>
[not found] ` <20110421055945.GB13688@atomide.com>
2011-04-21 10:49 ` [PATCH] ARM: Fix relocation if image end past uncompressed kernel end Tony Lindgren
2011-04-21 13:22 ` Nicolas Pitre
2011-04-21 21:26 ` Nicolas Pitre
2011-04-22 3:23 ` Nicolas Pitre
2011-04-22 5:19 ` Shawn Guo
2011-04-22 5:36 ` Shawn Guo
2011-04-22 6:28 ` Tony Lindgren
2011-04-22 14:12 ` Nicolas Pitre
2011-04-26 8:57 ` Tony Lindgren
2011-04-26 12:37 ` Tony Lindgren [this message]
2011-04-26 21:31 ` [PATCH] ARM: Fix bad SP address after relocating kernel Nicolas Pitre
2011-04-27 7:48 ` Tony Lindgren
2011-04-22 6:09 ` [PATCH] ARM: Fix relocation if image end past uncompressed kernel end Tony Lindgren
2011-04-27 12:47 ` Tony Lindgren
2011-04-27 12:56 ` Tony Lindgren
2011-04-27 22:16 ` Nicolas Pitre
2011-04-28 6:38 ` Tony Lindgren
2011-04-28 8:12 ` Tony Lindgren
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20110426123746.GC3755@atomide.com \
--to=tony@atomide.com \
--cc=aaro.koskinen@nokia.com \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-omap@vger.kernel.org \
--cc=nicolas.pitre@linaro.org \
--cc=patches@linaro.org \
--cc=shawn.guo@freescale.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox