AcoSail/kernel_optimize_test
8
0
Fork 0
forked from luck/tmp_suning_uos_patched
Code Pull Requests Activity

omap4: l2x0: Override the default l2x0_disable

Browse Source 
The machine_kexec() calls outer_disable which can crash on OMAP4
becasue of trustzone restrictions.

This patch overrides the default l2x0_disable with a OMAP4
specific implementation taking care of trustzone

Signed-off-by: Santosh Shilimkar <santosh.shilimkar@ti.com>
Reviewed-by: Tony Lindgren <tony@atomide.com>
Acked-by: Linus Walleij <linus.walleij@stericsson.com>
This commit is contained in:
Santosh Shilimkar 2010-07-31 21:40:10 +05:30
parent 2fd8658931
commit 4e803c40b3
1 changed files with 13 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -44,6 +44,13 @@ void __init gic_init_irq(void)
} }
#ifdef CONFIG_CACHE_L2X0 #ifdef CONFIG_CACHE_L2X0
static void omap4_l2x0_disable(void)
{
/* Disable PL310 L2 Cache controller */
omap_smc1(0x102, 0x0);
}
static int __init omap_l2_cache_init(void) static int __init omap_l2_cache_init(void)
{ {
/* /*
@ -66,6 +73,12 @@ static int __init omap_l2_cache_init(void)
*/ */
l2x0_init(l2cache_base, 0x0e050000, 0xc0000fff); l2x0_init(l2cache_base, 0x0e050000, 0xc0000fff);
/*
* Override default outer_cache.disable with a OMAP4
* specific one
*/
outer_cache.disable = omap4_l2x0_disable;
return 0; return 0;
} }
early_initcall(omap_l2_cache_init); early_initcall(omap_l2_cache_init);