Re: [PATCH 1/3 v2] OMAP4: Add L2 Cache support

[Tony Lindgren <tony@atomide.com>]

Hi,

Sorry, replied to the older version. Same comment here again.

* Santosh Shilimkar <santosh.shilimkar@ti.com> [100129 05:28]:
> This patch adds L2 Cache support for OMAP4. External L2 cache
> is used in OMPA4
> 
> v2 version incorporates Catalin's commnet on the register
> save/restore list
> 
> Signed-off-by: Santosh Shilimkar <santosh.shilimkar@ti.com>
> CC: Catalin Marinas <catalin.marinas@arm.com>
> ---
>  arch/arm/mach-omap2/board-4430sdp.c        |   45 ++++++++++++++++++++++++++++
>  arch/arm/mm/Kconfig                        |    2 +-
>  arch/arm/plat-omap/include/plat/omap44xx.h |    1 +
>  3 files changed, 47 insertions(+), 1 deletions(-)
> 
> diff --git a/arch/arm/mach-omap2/board-4430sdp.c b/arch/arm/mach-omap2/board-4430sdp.c
> index 0c6be6b..a828c77 100644
> --- a/arch/arm/mach-omap2/board-4430sdp.c
> +++ b/arch/arm/mach-omap2/board-4430sdp.c
> @@ -28,6 +28,7 @@
>  #include <plat/control.h>
>  #include <plat/timer-gp.h>
>  #include <asm/hardware/gic.h>
> +#include <asm/hardware/cache-l2x0.h>
>  
>  static struct platform_device sdp4430_lcd_device = {
>  	.name		= "sdp4430_lcd",
> @@ -49,6 +50,50 @@ static struct omap_lcd_config sdp4430_lcd_config __initdata = {
>  static struct omap_board_config_kernel sdp4430_config[] __initdata = {
>  	{ OMAP_TAG_LCD,		&sdp4430_lcd_config },
>  };
> +#ifdef CONFIG_CACHE_L2X0
> +static noinline void omap_l2x_control(unsigned long val)
> +{
> +	register unsigned long r0 asm("r0") = val;
> +
> +	/* This API modifies Pl310 Control Register.
> +	 * r0 contains the value to be modified and "r12" contains
> +	 * the monitor API number. It uses few CPU registers
> +	 * internally and hence they need be backed up including
> +	 * link register "lr".
> +	 * Explicitly save r11 and r12 since  the compiler generated
> +	 * code won't save it.
> +	 */
> +	__asm__ __volatile__(
> +		__asmeq("%0", "r0")
> +		"stmfd r13!, {r11,r12}\n"
> +		"ldr r12, =0x102\n"
> +		"dsb\n"
> +		"smc\n"
> +		"ldmfd r13!, {r11,r12}\n"
> +		: : "r" (r0)
> +		: "r4", "r5", "r10", "lr");
> +}
> +
> +static int __init omap_l2_cache_init(void)
> +{
> +	void __iomem *l2cache_base;

	if (!cpu_is_omap44xx())
		return -ENODEV;


> +
> +	/* Static mapping, never released */
> +	l2cache_base = ioremap(OMAP44XX_L2CACHE_BASE, SZ_4K);
> +	BUG_ON(!l2cache_base);
> +
> +	/* Enable L2 Cache controller */
> +	omap_l2x_control(0x1);
> +
> +	/* 32KB way size, 16-way associativity,
> +	* parity disabled
> +	*/
> +	l2x0_init(l2cache_base, 0x0e050000, 0xc0000fff);
> +
> +	return 0;
> +}
> +early_initcall(omap_l2_cache_init);
> +#endif

Because it's an initcall.

Tony