diff mbox

[U-Boot,1/2] mx31: Fix boot hang by avoiding vector relocation

Message ID 1424693349-12252-1-git-send-email-fabio.estevam@freescale.com
State Awaiting Upstream
Delegated to: Stefano Babic
Headers show

Commit Message

Fabio Estevam Feb. 23, 2015, 12:09 p.m. UTC
Since commit 3ff46cc42b9d73d0 ("arm: relocate the exception vectors") mx31
does not boot anymore.

Add a specific relocate_vectors macro that skips the vector relocation, as the
i.MX31 SoC does not provide RAM at the high vectors address (0xFFFF0000), and
(0x00000000) maps to ROM.

This allows mx31 to boot again.

Cc: Anatolij Gustschin <agust@denx.de>
Cc: Magnus Lilja <lilja.magnus@gmail.com>
Signed-off-by: Fabio Estevam <fabio.estevam@freescale.com>
---
Anatolij/Maguns,

I don't have access to a mx31 board.

Could you please test this patch?

Thanks

 arch/arm/cpu/arm1136/mx31/Makefile   |  4 ++++
 arch/arm/cpu/arm1136/mx31/relocate.S | 23 +++++++++++++++++++++++
 2 files changed, 27 insertions(+)
 create mode 100644 arch/arm/cpu/arm1136/mx31/relocate.S

Comments

Anatolij Gustschin Feb. 23, 2015, 1:03 p.m. UTC | #1
Hi Fabio,

On Mon, 23 Feb 2015 09:09:08 -0300
Fabio Estevam <fabio.estevam@freescale.com> wrote:

> Since commit 3ff46cc42b9d73d0 ("arm: relocate the exception vectors") mx31
> does not boot anymore.
> 
> Add a specific relocate_vectors macro that skips the vector relocation, as the
> i.MX31 SoC does not provide RAM at the high vectors address (0xFFFF0000), and
> (0x00000000) maps to ROM.
> 
> This allows mx31 to boot again.
> 
> Cc: Anatolij Gustschin <agust@denx.de>
> Cc: Magnus Lilja <lilja.magnus@gmail.com>
> Signed-off-by: Fabio Estevam <fabio.estevam@freescale.com>
> ---
> Anatolij/Maguns,
> 
> I don't have access to a mx31 board.
> 
> Could you please test this patch?

Thanks for the patch! I'll get access to the imx31_phycore board at the
beginning of the next week and will test it. Unfortunately I can't test
it earlier.

Thanks,

Anatolij
Magnus Lilja Feb. 24, 2015, 5:40 p.m. UTC | #2
Hi

On 23 February 2015 at 14:03, Anatolij Gustschin <agust@denx.de> wrote:
> Hi Fabio,
>
> On Mon, 23 Feb 2015 09:09:08 -0300
> Fabio Estevam <fabio.estevam@freescale.com> wrote:
>
>> Since commit 3ff46cc42b9d73d0 ("arm: relocate the exception vectors") mx31
>> does not boot anymore.
>>
>> Add a specific relocate_vectors macro that skips the vector relocation, as the
>> i.MX31 SoC does not provide RAM at the high vectors address (0xFFFF0000), and
>> (0x00000000) maps to ROM.
>>
>> This allows mx31 to boot again.
>>
>> Cc: Anatolij Gustschin <agust@denx.de>
>> Cc: Magnus Lilja <lilja.magnus@gmail.com>
>> Signed-off-by: Fabio Estevam <fabio.estevam@freescale.com>
>> ---
>> Anatolij/Maguns,
>>
>> I don't have access to a mx31 board.
>>
>> Could you please test this patch?
>
> Thanks for the patch! I'll get access to the imx31_phycore board at the
> beginning of the next week and will test it. Unfortunately I can't test
> it earlier.

I might get around to test it before that but I can't promise that.

Regards, Magnus
Stefano Babic March 2, 2015, 9:45 a.m. UTC | #3
Hi Fabio, Magnus, Anatolji, Sebastian,

On 23/02/2015 13:09, Fabio Estevam wrote:
> Since commit 3ff46cc42b9d73d0 ("arm: relocate the exception vectors") mx31
> does not boot anymore.
> 
> Add a specific relocate_vectors macro that skips the vector relocation, as the
> i.MX31 SoC does not provide RAM at the high vectors address (0xFFFF0000), and
> (0x00000000) maps to ROM.
> 
> This allows mx31 to boot again.
> 
> Cc: Anatolij Gustschin <agust@denx.de>
> Cc: Magnus Lilja <lilja.magnus@gmail.com>
> Signed-off-by: Fabio Estevam <fabio.estevam@freescale.com>
> ---

As boards are currently broken, I think can help if patches are merged
even if they are not fully tested. I could at least test on a mx35, and
board boots again.

Applied to u-boot-imx, thanks !

Best regards,
Stefano Babic
diff mbox

Patch

diff --git a/arch/arm/cpu/arm1136/mx31/Makefile b/arch/arm/cpu/arm1136/mx31/Makefile
index 9670ed9..dcbd570 100644
--- a/arch/arm/cpu/arm1136/mx31/Makefile
+++ b/arch/arm/cpu/arm1136/mx31/Makefile
@@ -8,3 +8,7 @@ 
 obj-y	+= generic.o
 obj-y	+= timer.o
 obj-y	+= devices.o
+
+ifndef CONFIG_SPL_BUILD
+obj-y  += relocate.o
+endif
diff --git a/arch/arm/cpu/arm1136/mx31/relocate.S b/arch/arm/cpu/arm1136/mx31/relocate.S
new file mode 100644
index 0000000..1c556df
--- /dev/null
+++ b/arch/arm/cpu/arm1136/mx31/relocate.S
@@ -0,0 +1,23 @@ 
+/*
+ *  relocate - i.MX31-specific vector relocation
+ *
+ *  Copyright (c) 2013  Albert ARIBAUD <albert.u.boot@aribaud.net>
+ *
+ * SPDX-License-Identifier:	GPL-2.0+
+ */
+
+#include <linux/linkage.h>
+
+/*
+ * The i.MX31 SoC is very specific with respect to exceptions: it
+ * does not provide RAM at the high vectors address (0xFFFF0000),
+ * thus only the low address (0x00000000) is useable; but that is
+ * in ROM, so let's avoid relocating the vectors.
+ */
+	.section	.text.relocate_vectors,"ax",%progbits
+
+ENTRY(relocate_vectors)
+
+	bx	lr
+
+ENDPROC(relocate_vectors)