[PATCH] OMAP2xxx: move SRAM to fix boot hang

[PATCH] OMAP2xxx: move SRAM to fix boot hang

[Paul Walmsley]

Commit 1c957036bbd912322793da676d05e169abf24782 breaks booting on
OMAP2; it causes the SRAM to be mapped on top of the L4 interconnect.
This causes the system to hang early in boot in omap_map_sram() during
the TLB flush. Fix by moving SRAM elsewhere in the memory map.

Reported by Jarkko Nikula <jarkko.nikula@nokia.com>.  This patch is a
collaboration with Tony Lindgren <tony@atomide.com> and
Kevin Hilman <khilman@deeprootsystems.com>.

Boot-tested on 2430SDP (by Paul) and N810 (by Jarkko).

Signed-off-by: Paul Walmsley <paul@pwsan.com>
Tested-by: Jarkko Nikula <jarkko.nikula@nokia.com>
Cc: Kevin Hilman <khilman@deeprootsystems.com>
Cc: Tony Lindgren <tony@atomide.com>
Cc: Måns Rullgård <mans@mansr.com>
---
 arch/arm/plat-omap/sram.c |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/arch/arm/plat-omap/sram.c b/arch/arm/plat-omap/sram.c
index 853048d..027b101 100644
--- a/arch/arm/plat-omap/sram.c
+++ b/arch/arm/plat-omap/sram.c
@@ -37,8 +37,8 @@
 #define OMAP1_SRAM_VA		VMALLOC_END
 #define OMAP2_SRAM_PA		0x40200000
 #define OMAP2_SRAM_PUB_PA	0x4020f800
-#define OMAP2_SRAM_VA		VMALLOC_END
-#define OMAP2_SRAM_PUB_VA	(VMALLOC_END + 0x800)
+#define OMAP2_SRAM_VA		0xe3000000
+#define OMAP2_SRAM_PUB_VA	(OMAP2_SRAM_VA + 0x800)
 #define OMAP3_SRAM_PA           0x40200000
 #define OMAP3_SRAM_VA           0xd7000000
 #define OMAP3_SRAM_PUB_PA       0x40208000


--
To unsubscribe from this list: send the line "unsubscribe linux-omap" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Re: [PATCH] OMAP2xxx: move SRAM to fix boot hang

[Tony Lindgren]

* Paul Walmsley <paul@pwsan.com> [081010 02:23]:
> Commit 1c957036bbd912322793da676d05e169abf24782 breaks booting on
> OMAP2; it causes the SRAM to be mapped on top of the L4 interconnect.
> This causes the system to hang early in boot in omap_map_sram() during
> the TLB flush. Fix by moving SRAM elsewhere in the memory map.
> 
> Reported by Jarkko Nikula <jarkko.nikula@nokia.com>.  This patch is a
> collaboration with Tony Lindgren <tony@atomide.com> and
> Kevin Hilman <khilman@deeprootsystems.com>.
> 
> Boot-tested on 2430SDP (by Paul) and N810 (by Jarkko).

Pushing.

Tony

> Signed-off-by: Paul Walmsley <paul@pwsan.com>
> Tested-by: Jarkko Nikula <jarkko.nikula@nokia.com>
> Cc: Kevin Hilman <khilman@deeprootsystems.com>
> Cc: Tony Lindgren <tony@atomide.com>
> Cc: Måns Rullgård <mans@mansr.com>
> ---
>  arch/arm/plat-omap/sram.c |    4 ++--
>  1 files changed, 2 insertions(+), 2 deletions(-)
> 
> diff --git a/arch/arm/plat-omap/sram.c b/arch/arm/plat-omap/sram.c
> index 853048d..027b101 100644
> --- a/arch/arm/plat-omap/sram.c
> +++ b/arch/arm/plat-omap/sram.c
> @@ -37,8 +37,8 @@
>  #define OMAP1_SRAM_VA		VMALLOC_END
>  #define OMAP2_SRAM_PA		0x40200000
>  #define OMAP2_SRAM_PUB_PA	0x4020f800
> -#define OMAP2_SRAM_VA		VMALLOC_END
> -#define OMAP2_SRAM_PUB_VA	(VMALLOC_END + 0x800)
> +#define OMAP2_SRAM_VA		0xe3000000
> +#define OMAP2_SRAM_PUB_VA	(OMAP2_SRAM_VA + 0x800)
>  #define OMAP3_SRAM_PA           0x40200000
>  #define OMAP3_SRAM_VA           0xd7000000
>  #define OMAP3_SRAM_PUB_PA       0x40208000
> 
> 
--
To unsubscribe from this list: send the line "unsubscribe linux-omap" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html