[U-Boot] [PATCH 1/3] ARM: relocate: fix hang when CONFIG_ARMV7_SECURE_BASE

[Peng Fan]

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 at 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

--