aboutsummaryrefslogtreecommitdiff
path: root/arch
diff options
context:
space:
mode:
authorAndrey Konovalov <andrey.konovalov@linaro.org>2012-01-23 21:00:43 +0400
committerAndrey Konovalov <andrey.konovalov@linaro.org>2012-01-23 21:02:17 +0400
commitc2a5a3cfab76c6b1768c5f4d5ad73404c81d3767 (patch)
tree08eff1e7126b5ef7c38ef48c4c2baef916330604 /arch
parent34e7c4f3f9e5403ef4f135394aa7e4357588fd89 (diff)
downloadvexpress-lsk-c2a5a3cfab76c6b1768c5f4d5ad73404c81d3767.tar.gz
arm: omap4: Fix omap_barriers_init for generic ioremap changes
From: Tony Lindgren <tony@atomide.com> Date: Thu, 12 Jan 2012 10:42:57 -0800 Cc: Santosh Shilimkar <santosh.shilimkar@ti.com> 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 <tony@atomide.com> Signed-off-by: Andrey Konovalov <andrey.konovalov@linaro.org>
Diffstat (limited to 'arch')
-rw-r--r--arch/arm/mach-omap2/common.h1
-rw-r--r--arch/arm/mach-omap2/io.c5
-rw-r--r--arch/arm/mach-omap2/omap4-common.c8
3 files changed, 12 insertions, 2 deletions
diff --git a/arch/arm/mach-omap2/common.h b/arch/arm/mach-omap2/common.h
index 012bac7d56a..4e6cb2453ad 100644
--- a/arch/arm/mach-omap2/common.h
+++ b/arch/arm/mach-omap2/common.h
@@ -118,6 +118,7 @@ void omap242x_map_io(void);
void omap243x_map_io(void);
void omap3_map_io(void);
void omap4_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 65843390e7f..bd0e9a84b3b 100644
--- a/arch/arm/mach-omap2/io.c
+++ b/arch/arm/mach-omap2/io.c
@@ -282,7 +282,12 @@ void __init omapti816x_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 da202aa71c6..e8ef81adabb 100644
--- a/arch/arm/mach-omap2/omap4-common.c
+++ b/arch/arm/mach-omap2/omap4-common.c
@@ -47,7 +47,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)