ARM: L2 : Add maintainace by line helper functions
Subsystems (3)
PATCH 1/5 ARM: L2 : Add maintainace by line helper functions
This patch adds the cache maintainance by line helper functions.
--- arch/arm/mm/cache-l2x0.c | 36 ++++++++++++++++++++++++++---------- 1 files changed, 26 insertions(+), 10 deletions(-)
arch/arm/mm/cache-l2x0.c +26 -10
@@ -42,6 +42,27 @@ static inline void cache_sync(void)cache_wait (base +L2X0_CACHE_SYNC ,1 ); } +static inline void l2x0_clean_line (unsigned long addr) +{ +void __iomem *base = l2x0_base; +cache_wait (base +L2X0_CLEAN_LINE_PA ,1 ); +writel (addr, base +L2X0_CLEAN_LINE_PA ); +} + +static inline void l2x0_inv_line (unsigned long addr) +{ +void __iomem *base = l2x0_base; +cache_wait (base +L2X0_INV_LINE_PA ,1 ); +writel (addr, base +L2X0_INV_LINE_PA ); +} + +static inline void l2x0_flush_line (unsigned long addr) +{ +void __iomem *base = l2x0_base; +cache_wait (base +L2X0_CLEAN_INV_LINE_PA ,1 ); +writel (addr, base +L2X0_CLEAN_INV_LINE_PA ); +} +static inline void l2x0_inv_all (void ) {unsigned long flags;
@@ -62,23 +83,20 @@ static void l2x0_inv_range(unsigned long start, unsigned long end)spin_lock_irqsave (&l2x0_lock, flags);if (start & (CACHE_LINE_SIZE -1 )) { start &= ~(CACHE_LINE_SIZE -1 ); -cache_wait (base +L2X0_CLEAN_INV_LINE_PA ,1 ); -writel (start, base +L2X0_CLEAN_INV_LINE_PA ); +l2x0_flush_line (start); start +=CACHE_LINE_SIZE ; }if (end & (CACHE_LINE_SIZE -1 )) { end &= ~(CACHE_LINE_SIZE -1 ); -cache_wait (base +L2X0_CLEAN_INV_LINE_PA ,1 ); -writel (end, base +L2X0_CLEAN_INV_LINE_PA ); +l2x0_flush_line (end); }while (start < end) {unsigned long blk_end = start +min (end - start,4096UL );while (start < blk_end) { -cache_wait (base +L2X0_INV_LINE_PA ,1 ); -writel (start, base +L2X0_INV_LINE_PA ); +l2x0_inv_line (start); start +=CACHE_LINE_SIZE ; }
@@ -103,8 +121,7 @@ static void l2x0_clean_range(unsigned long start, unsigned long end)unsigned long blk_end = start +min (end - start,4096UL );while (start < blk_end) { -cache_wait (base +L2X0_CLEAN_LINE_PA ,1 ); -writel (start, base +L2X0_CLEAN_LINE_PA ); +l2x0_clean_line (start); start +=CACHE_LINE_SIZE ; }
@@ -129,8 +146,7 @@ static void l2x0_flush_range(unsigned long start, unsigned long end)unsigned long blk_end = start +min (end - start,4096UL );while (start < blk_end) { -cache_wait (base +L2X0_CLEAN_INV_LINE_PA ,1 ); -writel (start, base +L2X0_CLEAN_INV_LINE_PA ); +l2x0_flush_line (start); start +=CACHE_LINE_SIZE ; }
Signature · 1 line
1.6.0.4
PATCH 2/5 OMAP4: Add L2 Cache support
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
--- arch/arm/mach-omap2/board-4430sdp.c | 53 ++++++++++++++++++++++++++++ arch/arm/mm/Kconfig | 2 +- arch/arm/plat-omap/include/plat/omap44xx.h | 1 + 3 files changed, 55 insertions(+), 1 deletions(-)
arch/arm/mach-omap2/board-4430sdp.c +53 -0
@@ -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,58 @@ 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 +void noinline omap_smc1(u32 fn, u32 arg) +{ + register u32 r12 asm("r12") = fn; + register u32 r0 asm("r0") = arg; + +/* This is common routine cache secure monitor API used to +* modify the PL310 secure registers. +* 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 the compiler generated code +* won't save it. +*/ + asmvolatile ( +"stmfd r13!, {r11,r12}\n" +"dsb\n" +"smc\n" +"ldmfd r13!, {r11,r12}\n" + :"+r" (r0),"+r" (r12) + : + :"r4" ,"r5" ,"r10" ,"lr" ,"cc" ); +} +EXPORT_SYMBOL (omap_smc1); + +static int __init omap_l2_cache_init (void ) +{ +void __iomem *l2cache_base; + +/* To avoid code running on other OMAPs in +* multi-omap builds +*/ +if (!cpu_is_omap44xx ()) +return -ENODEV ; + +/* Static mapping, never released */ + l2cache_base =ioremap (OMAP44XX_L2CACHE_BASE ,SZ_4K ); +BUG_ON (!l2cache_base); + +/* Enable PL310 L2 Cache controller */ +omap_smc1 (0x102 ,0x1 ); + +/* 32KB way size, 16-way associativity, +* parity disabled +*/ +l2x0_init (l2cache_base,0x0e050000 ,0xc0000fff ); + +return 0 ; +} +early_initcall (omap_l2_cache_init); +#endif static void __init gic_init_irq (void ) {
arch/arm/mm/Kconfig +1 -1
@@ -754,7 +754,7 @@ config CACHE_FEROCEON_L2_WRITETHROUGH config CACHE_L2X0 bool "Enable the L2x0 outer cache controller" depends on REALVIEW_EB_ARM11MP || MACH_REALVIEW_PB11MP || MACH_REALVIEW_PB1176 || \ - REALVIEW_EB_A9MP || ARCH_MX35 || ARCH_MX31 || MACH_REALVIEW_PBX || ARCH_NOMADIK + REALVIEW_EB_A9MP || ARCH_MX35 || ARCH_MX31 || MACH_REALVIEW_PBX || ARCH_NOMADIK || ARCH_OMAP4 default y select OUTER_CACHE help
arch/arm/plat-omap/include/plat/omap44xx.h +1 -0
@@ -40,6 +40,7 @@#define OMAP44XX_GIC_CPU_BASE 0x48240100#define OMAP44XX_SCU_BASE 0x48240000#define OMAP44XX_LOCAL_TWD_BASE 0x48240600 +#define OMAP44XX_L2CACHE_BASE 0x48242000#define OMAP44XX_WKUPGEN_BASE 0x48281000#define OMAP44XX_MAILBOX_BASE (L4_44XX_BASE + 0xF4000)
Signature · 1 line
1.6.0.4
PATCH 3/5 OMAP4: Clean the secondary_data from L2
The boot_secondary() needs to call outer_clean_range() because the L2 cache is already enabled in the kernel boot with early_initcall
--- arch/arm/mach-omap2/omap-smp.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-)
arch/arm/mach-omap2/omap-smp.c +2 -0
@@ -73,6 +73,8 @@ int __cpuinit boot_secondary(unsigned int cpu, struct task_struct *idle)* the AuxCoreBoot1 register is updated with cpu state * A barrier is added to ensure that write buffer is drained */ +flush_cache_all (); +outer_clean_range (__pa (&secondary_data),__pa (&secondary_data +1 ));omap_modify_auxcoreboot0 (0x200 ,0x0 );flush_cache_all ();smp_wmb ();
Signature · 1 line
1.6.0.4
PATCH 4/5 ARM: L2 : Errata 588369: Clean & Invalidate do not invalidate clean lines
This patch implements the work-around for the errata 588369. The secure API is used to alter L2 debug register because of trust-zone.
This version updated with comments from Russell and Catalin and generated against 2.6.33-rc4 mainline kernel. Detail comments can be found:
http://www.spinics.net/lists/linux-omap/msg23431.html
--- arch/arm/Kconfig | 13 +++++++++++++ arch/arm/mm/cache-l2x0.c | 35 +++++++++++++++++++++++++++++++++++ 2 files changed, 48 insertions(+), 0 deletions(-)
arch/arm/Kconfig +13 -0
@@ -920,6 +920,19 @@ config ARM_ERRATA_460075 ACTLR register. Note that setting specific bits in the ACTLR register may not be available in non-secure mode. +config PL310_ERRATA_588369 + bool "Clean & Invalidate maintenance operations do not invalidate clean lines" + depends on CACHE_L2X0 && ARCH_OMAP4 + help + The PL310 L2 cache controller implements three types of Clean & + Invalidate maintenance operations: by Physical Address + (offset 0x7F0), by Index/Way (0x7F8) and by Way (0x7FC). + They are architecturally defined to behave as the execution of a + clean operation followed immediately by an invalidate operation, + both performing to the same memory location. This functionality + is not correctly implemented in PL310 as clean lines are not + invalidated as a result of these operations. Note that this errata + uses Texas Instrument's secure monitor api. endmenu source "arch/arm/common/Kconfig"
arch/arm/mm/cache-l2x0.c +35 -0
@@ -56,12 +56,41 @@ static inline void l2x0_inv_line(unsigned long addr)writel (addr, base +L2X0_INV_LINE_PA ); } +#ifdef CONFIG_PL310_ERRATA_588369 +extern void omap_smc1 (u32 fn,u32 arg); +static void debug_writel (unsigned long val) +{ +/* +* Texas Instrument secure monitor api to modify the +* PL310 Debug Control Register. +*/ +omap_smc1 (0x100 , val); +} + +static inline void l2x0_flush_line (unsigned long addr) +{ +void __iomem *base = l2x0_base; + +/* Clean by PA followed by Invalidate by PA */ +cache_wait (base +L2X0_CLEAN_LINE_PA ,1 ); +writel (addr, base +L2X0_CLEAN_LINE_PA ); +cache_wait (base +L2X0_INV_LINE_PA ,1 ); +writel (addr, base +L2X0_INV_LINE_PA ); +} +#else + +/* Optimised out for non-errata case */ +static inline void debug_writel (unsigned long val) +{ +} +static inline void l2x0_flush_line (unsigned long addr) {void __iomem *base = l2x0_base;cache_wait (base +L2X0_CLEAN_INV_LINE_PA ,1 );writel (addr, base +L2X0_CLEAN_INV_LINE_PA ); } +#endif static inline void l2x0_inv_all (void ) {
@@ -83,13 +112,17 @@ static void l2x0_inv_range(unsigned long start, unsigned long end)spin_lock_irqsave (&l2x0_lock, flags);if (start & (CACHE_LINE_SIZE -1 )) { start &= ~(CACHE_LINE_SIZE -1 ); +debug_writel (0x03 );l2x0_flush_line (start); +debug_writel (0x00 ); start +=CACHE_LINE_SIZE ; }if (end & (CACHE_LINE_SIZE -1 )) { end &= ~(CACHE_LINE_SIZE -1 ); +debug_writel (0x03 );l2x0_flush_line (end); +debug_writel (0x00 ); }while (start < end) {
@@ -145,10 +178,12 @@ static void l2x0_flush_range(unsigned long start, unsigned long end)while (start < end) {unsigned long blk_end = start +min (end - start,4096UL ); +debug_writel (0x03 );while (start < blk_end) {l2x0_flush_line (start); start +=CACHE_LINE_SIZE ; } +debug_writel (0x00 );if (blk_end < end) {spin_unlock_irqrestore (&l2x0_lock, flags);
Signature · 1 line
1.6.0.4
PATCH 5/5 OMAP4: Enable L2 Cache
This patch enables L2 cache and associated Errata on the OMAP4430 SDP.
--- arch/arm/configs/omap_4430sdp_defconfig | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-)
arch/arm/configs/omap_4430sdp_defconfig +3 -0
@@ -242,10 +242,13 @@ CONFIG_CPU_CP15_MMU=y # CONFIG_CPU_DCACHE_DISABLE is not set # CONFIG_CPU_BPREDICT_DISABLE is not set CONFIG_HAS_TLS_REG=y +CONFIG_OUTER_CACHE=y +CONFIG_CACHE_L2X0=y CONFIG_ARM_L1_CACHE_SHIFT=5 # CONFIG_ARM_ERRATA_430973 is not set # CONFIG_ARM_ERRATA_458693 is not set # CONFIG_ARM_ERRATA_460075 is not set +CONFIG_PL310_ERRATA_588369=y CONFIG_ARM_GIC=y #
Signature · 1 line
1.6.0.4
PATCH 4/5 ARM: L2 : Errata 588369: Clean & Invalidate do not invalidate clean lines
In reply to Santosh Shilimkararch/arm/mm/cache-l2x0.c static inline void l2x0_inv_line(unsigned long addr) · line 62
Quoted 12 lines · Santosh Shilimkar
arch/arm/mm/cache-l2x0.c +4
-0@@ -56,12 +56,41 @@ static inline void l2x0_inv_line(unsigned long addr)writel (addr, base +L2X0_INV_LINE_PA ); } +#ifdef CONFIG_PL310_ERRATA_588369 +extern void omap_smc1 (u32 fn,u32 arg); +static void debug_writel (unsigned long val) +{
You could move the external declaration into this function, thereby making it entirely local to this function (and hiding it from the file scope.)
PATCH 4/5 ARM: L2 : Errata 588369: Clean & Invalidate do not invalidate clean lines
Quoted 18 lines
-----Original Message-----
From: Russell King - ARM Linux [mailto:linux at arm.linux.org.uk]
Sent: Thursday, February 04, 2010 8:13 PM
To: Shilimkar, Santosh
Cc: tony at atomide.com; Woodruff, Richard; catalin.marinas at arm.com; linux-arm- kernel at lists.infradead.org; linux-omap at vger.kernel.org
Subject: Re: [PATCH 4/5] ARM: L2 : Errata 588369: Clean & Invalidate do not invalidate clean linesQuoted 8 lines · Santosh Shilimkar
arch/arm/mm/cache-l2x0.c +0
-0@@ -56,12 +56,41 @@ static inline void l2x0_inv_line(unsigned long addr)writel (addr, base +L2X0_INV_LINE_PA ); }
Quoted 8 lines
arch/arm/mm/cache-l2x0.c static inline void l2x0_inv_line(unsigned long addr) · line 62
Quoted 4 lines
arch/arm/mm/cache-l2x0.c +4
-0+#ifdef CONFIG_PL310_ERRATA_588369 +extern void omap_smc1 (u32 fn,u32 arg); +static void debug_writel (unsigned long val) +{You could move the external declaration into this function, thereby making it entirely local to this function (and hiding it from the file scope.)
OK
PATCH 2/5 OMAP4: Add L2 Cache support
In reply to Santosh ShilimkarQuoted 2 lines · Santosh Shilimkar
This patch adds L2 Cache support for OMAP4. External L2 cache is used in OMPA4
OMAP4.
arch/arm/mach-omap2/board-4430sdp.c static struct omap_lcd_config sdp4430_lcd_config __initdata = { · line 52
Quoted 4 lines
arch/arm/mach-omap2/board-4430sdp.c +0
-0@@ -49,6 +50,58 @@ static struct omap_lcd_config sdp4430_lcd_config __initdata = {static struct omap_board_config_kernel sdp4430_config[]__initdata = { {OMAP_TAG_LCD , &sdp4430_lcd_config }, };
Blank line here.