From: Peng Fan <b51431@freescale.com>
To: u-boot@lists.denx.de
Subject: [U-Boot] [PATCH 1/3] ARM: relocate: fix hang when CONFIG_ARMV7_SECURE_BASE
Date: Mon, 19 Oct 2015 13:40:51 +0800 [thread overview]
Message-ID: <20151019054044.GA30120@shlinux2> (raw)
In-Reply-To: <1444169606-21121-1-git-send-email-Frank.Li@freescale.com>
On Tue, Oct 06, 2015 at 05:13:24PM -0500, Frank Li wrote:
>When added above configuration, iram fix up plus relocate offset may locate
>in invalidate space. Write back fix up value will cause data abort.
>
>Add address check, skip psci code.
>
>Signed-off-by: Frank Li <Frank.Li@freescale.com>
>---
> arch/arm/lib/relocate.S | 4 ++++
> 1 file changed, 4 insertions(+)
>
>diff --git a/arch/arm/lib/relocate.S b/arch/arm/lib/relocate.S
>index 475d503..6795a1b 100644
>--- a/arch/arm/lib/relocate.S
>+++ b/arch/arm/lib/relocate.S
>@@ -99,6 +99,10 @@ fixloop:
> cmp r1, #23 /* relative fixup? */
> bne fixnext
>
>+ ldr r1, =__image_copy_start
>+ cmp r0, r1
>+ blo fixnext
>+
Hi Tom, Albert,
This is a bug fix, please consider to apply this patch.
The secure code such as PSCI is not relocated, so there is no need to fix the code
which generate relocate entry in rel.dyn section. We should only need take
code from __image_copy_start to __image_copy_end into consideration.
Regards,
Peng.
> /* relative fix: increase location by offset */
> add r0, r0, r4
> ldr r1, [r0]
>--
>2.5.2
>
>_______________________________________________
>U-Boot mailing list
>U-Boot at lists.denx.de
>http://lists.denx.de/mailman/listinfo/u-boot
--
next prev parent reply other threads:[~2015-10-19 5:40 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-10-06 22:13 [U-Boot] [PATCH 1/3] ARM: relocate: fix hang when CONFIG_ARMV7_SECURE_BASE Frank Li
2015-10-06 22:13 ` [U-Boot] [PATCH 2/3] mx7: psci: add basic psci support Frank Li
2015-10-06 22:13 ` [U-Boot] [PATCH 3/3] imx: config: default enable nosec mode Frank Li
2015-10-19 5:40 ` Peng Fan [this message]
2015-10-19 6:48 ` [U-Boot] [PATCH 1/3] ARM: relocate: fix hang when CONFIG_ARMV7_SECURE_BASE Albert ARIBAUD
2015-10-19 7:19 ` Peng Fan
2015-10-19 8:23 ` Albert ARIBAUD
2015-10-19 8:41 ` Peng Fan
2015-10-19 11:48 ` Albert ARIBAUD
2015-10-19 12:47 ` Peng Fan
2015-10-19 14:13 ` Li Frank
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=20151019054044.GA30120@shlinux2 \
--to=b51431@freescale.com \
--cc=u-boot@lists.denx.de \
/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