From ac1598c101faa55562051932fb9134f8a002a777 Mon Sep 17 00:00:00 2001 From: Andrey Konovalov Date: Mon, 23 Jan 2012 21:00:43 +0400 Subject: arm: omap4: Fix omap_barriers_init for generic ioremap changes From: Tony Lindgren Date: Thu, 12 Jan 2012 10:42:57 -0800 Cc: Santosh Shilimkar Commit 73829af71fdb8655e7ba4b5a2a6612ad34a75a11 (Merge branch 'vmalloc' of git://git.linaro.org/people/nico/linux into devel-stable) merged generic ioremap changes. Commit 137d105d50f6e6c373c1aa759f59045e6239cf66 (ARM: OMAP4: Fix errata i688 with MPU interconnect barriers) added a workaround for omap4. In order for the errata to work, we now need the following patch or else we'll get: kernel BUG at mm/vmalloc.c:1134! Signed-off-by: Tony Lindgren Signed-off-by: Andrey Konovalov --- arch/arm/mach-omap2/common.h | 1 + arch/arm/mach-omap2/io.c | 5 +++++ arch/arm/mach-omap2/omap4-common.c | 8 ++++++-- 3 files changed, 12 insertions(+), 2 deletions(-) (limited to 'arch/arm') diff --git a/arch/arm/mach-omap2/common.h b/arch/arm/mach-omap2/common.h index febffde2ff1..8d130931115 100644 --- a/arch/arm/mach-omap2/common.h +++ b/arch/arm/mach-omap2/common.h @@ -132,6 +132,7 @@ void omap3_map_io(void); void am33xx_map_io(void); void omap4_map_io(void); void ti81xx_map_io(void); +int omap_barriers_init(void); /** * omap_test_timeout - busy-loop, testing a condition diff --git a/arch/arm/mach-omap2/io.c b/arch/arm/mach-omap2/io.c index eb50c29fb64..da8b65d7143 100644 --- a/arch/arm/mach-omap2/io.c +++ b/arch/arm/mach-omap2/io.c @@ -306,7 +306,12 @@ void __init omapam33xx_map_common_io(void) #ifdef CONFIG_ARCH_OMAP4 void __init omap44xx_map_common_io(void) { + int res; + iotable_init(omap44xx_io_desc, ARRAY_SIZE(omap44xx_io_desc)); + res = omap_barriers_init(); + if (res) + pr_err("Barriers broken\n"); } #endif diff --git a/arch/arm/mach-omap2/omap4-common.c b/arch/arm/mach-omap2/omap4-common.c index 40a8fbc07e4..55418ac90ee 100644 --- a/arch/arm/mach-omap2/omap4-common.c +++ b/arch/arm/mach-omap2/omap4-common.c @@ -52,7 +52,7 @@ void omap_bus_sync(void) } } -static int __init omap_barriers_init(void) +int __init omap_barriers_init(void) { struct map_desc dram_io_desc[1]; phys_addr_t paddr; @@ -77,7 +77,11 @@ static int __init omap_barriers_init(void) return 0; } -core_initcall(omap_barriers_init); +#else +int __init omap_barriers_init(void) +{ + return 0; +} #endif void __init gic_init_irq(void) -- cgit v1.2.3