Skip to contentSkip to conversation

OMAP4: Add L2 Cache support

PATCH New Santosh Shilimkar 3 participants 8 messages Dec 9, 2009 – Dec 14, 2009

Subsystems (3)
lore
Share & tools
lore
#0 lore raw

PATCH 1/4 OMAP4: Add L2 Cache support

This patch adds L2 Cache support for OMAP4. External L2 cache is used in OMPA4

---
 arch/arm/mach-omap2/board-4430sdp.c        |   30 ++++++++++++++++++++++++++++
 arch/arm/mm/Kconfig                        |    2 +-
 arch/arm/plat-omap/include/plat/omap44xx.h |    1 +
 3 files changed, 32 insertions(+), 1 deletions(-)
arch/arm/mach-omap2/board-4430sdp.c +30 -0
index 0c6be6b..ceb2490 100644
@@ -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,35 @@ 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 int __init omap_l2_cache_init(void)
+{
+	void __iomem *l2cache_base;
+
+	/* Static mapping, never released */
+	l2cache_base = ioremap(OMAP44XX_L2CACHE_BASE, SZ_4K);
+	BUG_ON(!l2cache_base);
+
+	/* Enable L2 Cache using secure api
+	 * Save/Restore relevant registers
+	 */
+	__asm__ __volatile__(
+		"stmfd r13!, {r0-r12, r14}\n"
+		"mov r0, #1\n"
+		"ldr r12, =0x102\n"
+		"dsb\n"
+		"smc\n"
+		"ldmfd r13!, {r0-r12, r14}");
+
+	/* 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
index dd4698c..b146ae2 100644
@@ -758,7 +758,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
index e52902a..9b7870c 100644
@@ -38,6 +38,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
#1 lore raw

PATCH 2/4 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
index 38153e5..2d0733a 100644
@@ -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
#2 lore raw

PATCH 3/4 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 regsiter because of trust-zone.

---
 arch/arm/Kconfig         |   13 +++++++++++++
 arch/arm/mm/cache-l2x0.c |   32 ++++++++++++++++++++++++++++++++
 2 files changed, 45 insertions(+), 0 deletions(-)
arch/arm/Kconfig +13 -0
index cf8a99f..388d1e3 100644
@@ -916,6 +916,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
+	default n
+	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
 endmenu
 
 source "arch/arm/common/Kconfig"
arch/arm/mm/cache-l2x0.c +32 -0
index 747f9a9..c3905a9 100644
@@ -88,8 +88,40 @@ static void l2x0_flush_range(unsigned long start, unsigned long end)
 	unsigned long addr;
 
 	start &= ~(CACHE_LINE_SIZE - 1);
+#ifdef CONFIG_PL310_ERRATA_588369
+	/*
+	 * Disable Write-Back and Cache Linefill (set bits [1:0] of the Debug
+	 * Control Register)
+	 */
+	__asm__ __volatile__(
+	"stmfd r13!, {r0-r12, r14}\n"
+	"mov r0, #3\n"
+	"ldr r12, =0x100\n"
+	"dsb\n"
+	"smc\n"
+	"ldmfd r13!, {r0-r12, r14}");
+
+	/* Clean by PA followed by Invalidate by PA */
+	for (addr = start; addr < end; addr += CACHE_LINE_SIZE) {
+		sync_writel(addr, L2X0_CLEAN_LINE_PA, 1);
+		sync_writel(addr, L2X0_INV_LINE_PA, 1);
+	}
+
+	/*
+	 * Enable Write-Back and Cache Linefill (set bits [1:0] of the Debug
+	 * Control Register)
+	 */
+	__asm__ __volatile__(
+	"stmfd r13!, {r0-r12, r14}\n"
+	"mov r0, #0\n"
+	"ldr r12, =0x100\n"
+	"dsb\n"
+	"smc\n"
+	"ldmfd r13!, {r0-r12, r14}");
+#else
 	for (addr = start; addr < end; addr += CACHE_LINE_SIZE)
 		sync_writel(addr, L2X0_CLEAN_INV_LINE_PA, 1);
+#endif
 	cache_sync();
 }
 
Signature · 1 line
1.6.0.4
#3 lore raw

PATCH 4/4 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
index 49df3ad..2a8d555 100644
@@ -243,10 +243,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
maintainer
#4 lore raw

PATCH 3/4 ARM: L2 : Errata 588369: Clean & Invalidate do not invalidate clean lines

In reply to Santosh Shilimkar

Hi,

Quoted 2 lines · Santosh Shilimkar

This patch implements the work-around for the errata 588369. The secure API is used to alter L2 debug regsiter because of trust-zone.

This one should be queued via Russell's patch system. It should be also acked by Catalin.

Regards,

Tony

Quoted 78 lines
---
 arch/arm/Kconfig         |   13 +++++++++++++
 arch/arm/mm/cache-l2x0.c |   32 ++++++++++++++++++++++++++++++++
 2 files changed, 45 insertions(+), 0 deletions(-)
arch/arm/Kconfig +13 -0
index cf8a99f..388d1e3 100644
@@ -916,6 +916,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
+	default n
+	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
 endmenu
 
 source "arch/arm/common/Kconfig"
arch/arm/mm/cache-l2x0.c +32 -0
index 747f9a9..c3905a9 100644
@@ -88,8 +88,40 @@ static void l2x0_flush_range(unsigned long start, unsigned long end)
 	unsigned long addr;
 
 	start &= ~(CACHE_LINE_SIZE - 1);
+#ifdef CONFIG_PL310_ERRATA_588369
+	/*
+	 * Disable Write-Back and Cache Linefill (set bits [1:0] of the Debug
+	 * Control Register)
+	 */
+	__asm__ __volatile__(
+	"stmfd r13!, {r0-r12, r14}\n"
+	"mov r0, #3\n"
+	"ldr r12, =0x100\n"
+	"dsb\n"
+	"smc\n"
+	"ldmfd r13!, {r0-r12, r14}");
+
+	/* Clean by PA followed by Invalidate by PA */
+	for (addr = start; addr < end; addr += CACHE_LINE_SIZE) {
+		sync_writel(addr, L2X0_CLEAN_LINE_PA, 1);
+		sync_writel(addr, L2X0_INV_LINE_PA, 1);
+	}
+
+	/*
+	 * Enable Write-Back and Cache Linefill (set bits [1:0] of the Debug
+	 * Control Register)
+	 */
+	__asm__ __volatile__(
+	"stmfd r13!, {r0-r12, r14}\n"
+	"mov r0, #0\n"
+	"ldr r12, =0x100\n"
+	"dsb\n"
+	"smc\n"
+	"ldmfd r13!, {r0-r12, r14}");
+#else
 	for (addr = start; addr < end; addr += CACHE_LINE_SIZE)
 		sync_writel(addr, L2X0_CLEAN_INV_LINE_PA, 1);
+#endif
 	cache_sync();
 }
 
Signature · 1 line
1.6.0.4
#5 lore raw

PATCH 3/4 ARM: L2 : Errata 588369: Clean & Invalidate do notinvalidate clean lines

In reply to Santosh Shilimkar
Quoted 2 lines · Santosh Shilimkar

This patch implements the work-around for the errata 588369. The secure API is used to alter L2 debug regsiter because of trust-zone.

[...]

Quoted 4 lines
arch/arm/Kconfig +4 -0
+config PL310_ERRATA_588369
+       bool "Clean & Invalidate maintenance operations do not invalidate clean lines"
+       depends on CACHE_L2X0
+       default n

arch/arm/Kconfig config ARM_ERRATA_460075 · line 932

Quoted 10 lines
arch/arm/Kconfig +9 -0
+       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
 endmenu

Could you actually add a comment and a dependence on OMAP4 since this requires the secure monitor that only TI has.

arch/arm/mm/cache-l2x0.c static void l2x0_flush_range(unsigned long start, unsigned long end) · line 102

Quoted 13 lines
arch/arm/mm/cache-l2x0.c +12 -0
+#ifdef CONFIG_PL310_ERRATA_588369
+       /*
+        * Disable Write-Back and Cache Linefill (set bits [1:0] of the Debug
+        * Control Register)
+        */
+       __asm__ __volatile__(
+       "stmfd r13!, {r0-r12, r14}\n"
+       "mov r0, #3\n"
+       "ldr r12, =0x100\n"
+       "dsb\n"
+       "smc\n"
+       "ldmfd r13!, {r0-r12, r14}");

Could you actually add a function that gets called with a parameter rather than having to similar inline asm blocks? You also don't need to save/restore the registers if you declare them properly or use local variables for that, the compiler does the work for you.

Is a DSB needed before SMC (I'm not sure)?

Signature · 1 line
Catalin
#6 lore raw

PATCH 3/4 ARM: L2 : Errata 588369: Clean & Invalidate do notinvalidate clean lines

Thanks for comments Catalin !!

Quoted 27 lines

-----Original Message-----
From: Catalin Marinas [mailto:catalin.marinas at arm.com]
Sent: Monday, December 14, 2009 4:07 PM
To: Shilimkar, Santosh
Cc: tony at atomide.com; linux-omap at vger.kernel.org; linux at arm.linux.org.uk; linux-arm- kernel at lists.infradead.org
Subject: Re: [PATCH 3/4] ARM: L2 : Errata 588369: Clean & Invalidate do notinvalidate clean lines

Quoted 2 lines · Santosh Shilimkar

This patch implements the work-around for the errata 588369. The secure API is used to alter L2 debug regsiter because of trust-zone.

[...]

Quoted 4 lines
arch/arm/Kconfig +4 -0
+config PL310_ERRATA_588369
+       bool "Clean & Invalidate maintenance operations do not invalidate clean lines"
+       depends on CACHE_L2X0
+       default n

arch/arm/Kconfig config ARM_ERRATA_460075 · line 932

Quoted 10 lines
arch/arm/Kconfig +9 -0
+       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
 endmenu
Quoted 2 lines

Could you actually add a comment and a dependence on OMAP4 since this requires the secure monitor that only TI has.

OK

Quoted 13 lines

arch/arm/mm/cache-l2x0.c static void l2x0_flush_range(unsigned long start, unsigned long end) · line 102

Quoted 12 lines
arch/arm/mm/cache-l2x0.c +12 -0
+#ifdef CONFIG_PL310_ERRATA_588369
+       /*
+        * Disable Write-Back and Cache Linefill (set bits [1:0] of the Debug
+        * Control Register)
+        */
+       __asm__ __volatile__(
+       "stmfd r13!, {r0-r12, r14}\n"
+       "mov r0, #3\n"
+       "ldr r12, =0x100\n"
+       "dsb\n"
+       "smc\n"
+       "ldmfd r13!, {r0-r12, r14}");
Quoted 4 lines

Could you actually add a function that gets called with a parameter rather than having to similar inline asm blocks? You also don't need to save/restore the registers if you declare them properly or use local variables for that, the compiler does the work for you.

A function call would be better as you suggested. We will look into this.

Quoted 1 line

Is a DSB needed before SMC (I'm not sure)?

That was a recommendation though not having it, I didn't observer any problems.

Quoted 2 lines

--
Catalin

#7 lore raw

PATCH 3/4 ARM: L2 : Errata 588369: Clean & Invalidate donotinvalidate clean lines

Quoted 13 lines · Santosh
Quoted 13 lines · Santosh Shilimkar
Quoted 12 lines
arch/arm/mm/cache-l2x0.c +12 -0
+#ifdef CONFIG_PL310_ERRATA_588369
+       /*
+        * Disable Write-Back and Cache Linefill (set bits [1:0] of the Debug
+        * Control Register)
+        */
+       __asm__ __volatile__(
+       "stmfd r13!, {r0-r12, r14}\n"
+       "mov r0, #3\n"
+       "ldr r12, =0x100\n"
+       "dsb\n"
+       "smc\n"
+       "ldmfd r13!, {r0-r12, r14}");

[...]

Quoted 3 lines
Quoted 1 line

Is a DSB needed before SMC (I'm not sure)?

That was a recommendation though not having it, I didn't observer any problems.

Maybe it's needed, I'm not sure, but if you found it recommended in some errata description, then you probably need it.

Signature · 1 line
Catalin