korg/linux
0
0
Fork 0
mirror of https://mirrors.bfsu.edu.cn/git/linux.git synced 2025-01-18 11:54:37 +08:00
Code Issues Packages Projects Releases Wiki Activity

ARM: OMAP4: Move the barrier memboclk_steal() as part of reserve callback

Browse Source 
arm_memblock_steal() is not suppose to be used outside ->reserve callback.
OMAP barrier errata code was using it outside reserve callback and hence
it was broken.

Move the allocation as part of ->reserve callback to fix the it.

Signed-off-by: Santosh Shilimkar <santosh.shilimkar@ti.com>
Signed-off-by: Tony Lindgren <tony@atomide.com>
This commit is contained in:
Santosh Shilimkar 2012-02-02 19:33:55 +05:30 committed by Tony Lindgren
parent 1e056dddab
commit 2ec1fc4e16
6 changed files with 27 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
arch/arm/mach-omap2/Kconfig
View File

@ -365,8 +365,8 @@ config OMAP3_SDRC_AC_TIMING
going on could result in system crashes; going on could result in system crashes;
config OMAP4_ERRATA_I688 config OMAP4_ERRATA_I688
bool "OMAP4 errata: Async Bridge Corruption (BROKEN)" bool "OMAP4 errata: Async Bridge Corruption"
depends on ARCH_OMAP4 && BROKEN depends on ARCH_OMAP4
select ARCH_HAS_BARRIERS select ARCH_HAS_BARRIERS
help help
If a data is stalled inside asynchronous bridge because of back If a data is stalled inside asynchronous bridge because of back

1
arch/arm/mach-omap2/common.h
View File

@ -132,6 +132,7 @@ void omap3_map_io(void);
void am33xx_map_io(void); void am33xx_map_io(void);
void omap4_map_io(void); void omap4_map_io(void);
void ti81xx_map_io(void); void ti81xx_map_io(void);
void omap_barriers_init(void);
/** /**
* omap_test_timeout - busy-loop, testing a condition * omap_test_timeout - busy-loop, testing a condition

1
arch/arm/mach-omap2/io.c
View File

@ -307,6 +307,7 @@ void __init omapam33xx_map_common_io(void)
void __init omap44xx_map_common_io(void) void __init omap44xx_map_common_io(void)
{ {
iotable_init(omap44xx_io_desc, ARRAY_SIZE(omap44xx_io_desc)); iotable_init(omap44xx_io_desc, ARRAY_SIZE(omap44xx_io_desc));
omap_barriers_init();
} }
#endif #endif

25
arch/arm/mach-omap2/omap4-common.c
View File

@ -24,6 +24,7 @@
#include <plat/irqs.h> #include <plat/irqs.h>
#include <plat/sram.h> #include <plat/sram.h>
#include <plat/omap-secure.h>
#include <mach/hardware.h> #include <mach/hardware.h>
#include <mach/omap-wakeupgen.h> #include <mach/omap-wakeupgen.h>
@ -43,6 +44,9 @@ static void __iomem *sar_ram_base;
void __iomem *dram_sync, *sram_sync; void __iomem *dram_sync, *sram_sync;
static phys_addr_t paddr;
static u32 size;
void omap_bus_sync(void) void omap_bus_sync(void)
{ {
if (dram_sync && sram_sync) { if (dram_sync && sram_sync) {
@ -52,18 +56,20 @@ void omap_bus_sync(void)
} }
} }
static int __init omap_barriers_init(void) /* Steal one page physical memory for barrier implementation */
int __init omap_barrier_reserve_memblock(void)
{ {
struct map_desc dram_io_desc[1];
phys_addr_t paddr;
u32 size;
if (!cpu_is_omap44xx())
return -ENODEV;
size = ALIGN(PAGE_SIZE, SZ_1M); size = ALIGN(PAGE_SIZE, SZ_1M);
paddr = arm_memblock_steal(size, SZ_1M); paddr = arm_memblock_steal(size, SZ_1M);
return 0;
}
void __init omap_barriers_init(void)
{
struct map_desc dram_io_desc[1];
dram_io_desc[0].virtual = OMAP4_DRAM_BARRIER_VA; dram_io_desc[0].virtual = OMAP4_DRAM_BARRIER_VA;
dram_io_desc[0].pfn = __phys_to_pfn(paddr); dram_io_desc[0].pfn = __phys_to_pfn(paddr);
dram_io_desc[0].length = size; dram_io_desc[0].length = size;
@ -75,9 +81,10 @@ static int __init omap_barriers_init(void)
pr_info("OMAP4: Map 0x%08llx to 0x%08lx for dram barrier\n", pr_info("OMAP4: Map 0x%08llx to 0x%08lx for dram barrier\n",
(long long) paddr, dram_io_desc[0].virtual); (long long) paddr, dram_io_desc[0].virtual);
return 0;
} }
core_initcall(omap_barriers_init); #else
void __init omap_barriers_init(void)
{}
#endif #endif
void __init gic_init_irq(void) void __init gic_init_irq(void)

1
arch/arm/plat-omap/common.c
View File

@ -69,6 +69,7 @@ void __init omap_reserve(void)
omap_vram_reserve_sdram_memblock(); omap_vram_reserve_sdram_memblock();
omap_dsp_reserve_sdram_memblock(); omap_dsp_reserve_sdram_memblock();
omap_secure_ram_reserve_memblock(); omap_secure_ram_reserve_memblock();
omap_barrier_reserve_memblock();
} }
void __init omap_init_consistent_dma_size(void) void __init omap_init_consistent_dma_size(void)

6
arch/arm/plat-omap/include/plat/omap-secure.h
View File

@ -10,4 +10,10 @@ static inline void omap_secure_ram_reserve_memblock(void)
{ } { }
#endif #endif
#ifdef CONFIG_OMAP4_ERRATA_I688
extern int omap_barrier_reserve_memblock(void);
#else
static inline void omap_barrier_reserve_memblock(void)
{ }
#endif
#endif /* __OMAP_SECURE_H__ */ #endif /* __OMAP_SECURE_H__ */