Skip to contentSkip to conversation

metag: smp / cache changes

PATCH New James Hogan 1 participant 4 messages Mar 15, 2013

lore
Share & tools
lore
#0 lore raw

cover metag: smp / cache changes

Here are a few Meta SMP and cache changes I have for v3.10. The first one removes the need to have an SMP specific bootloader to configure the cache partitions and coherency for the hardware threads that will run SMP, and the other two are very minor fixes.

James Hogan (3):
metag: smp: copy cache partition and enable GCOn
metag: cachepart: take into account small cache bits
metag: cachepart: fix get_global_dcache_size() typo

 arch/metag/include/asm/metag_mem.h |   3 +
 arch/metag/kernel/cachepart.c      |  16 ++++--
 arch/metag/kernel/head.S           |   8 +++
 arch/metag/kernel/smp.c            | 115 +++++++++++++++++++++++++++++++++++++
 4 files changed, 137 insertions(+), 5 deletions(-)
Signature · 1 line
1.8.1.2
#1 lore raw

PATCH 1/3 metag: smp: copy cache partition and enable GCOn

When starting an SMP hardware thread, copy the cache partition configuration so that the threads share the same cache partitions. Also enable the GCOn bit if running in the local half of the virtual address space to enable coherency of shared local cache partitions. An atomic unlock system event is executed by the new cpu before any memory is read to ensure that any writes made by the boot cpu prior to full coherency taking effect are visible to the new cpu.

This is to allow SMP to work even when the bootloader hasn't configured the caches for coherency. A log message is printed to describe the cache partition changes so that the user is aware of potential unintentional cache wastage if they've configured the cache partitions in the wrong way.

---
 arch/metag/include/asm/metag_mem.h |   3 +
 arch/metag/kernel/head.S           |   8 +++
 arch/metag/kernel/smp.c            | 115 +++++++++++++++++++++++++++++++++++++
 3 files changed, 126 insertions(+)
arch/metag/include/asm/metag_mem.h +3 -0
index 3f7b54d..aa5a076 100644
@@ -700,6 +700,9 @@
 #define     SYSC_xCPARTG_AND_S    8
 #define     SYSC_xCPARTL_OR_BITS  0x000F0000 /* Ors into top 4 bits */
 #define     SYSC_xCPARTL_OR_S     16
+#ifdef METAC_2_1
+#define     SYSC_DCPART_GCON_BIT  0x00100000 /* Coherent shared local */
+#endif /* METAC_2_1 */
 #define     SYSC_xCPARTG_OR_BITS  0x0F000000 /* Ors into top 4 bits */
 #define     SYSC_xCPARTG_OR_S     24
 #define     SYSC_CWRMODE_BIT      0x80000000 /* Write cache mode bit */
arch/metag/kernel/head.S +8 -0
index 969dffa..713f71d 100644
@@ -1,6 +1,7 @@
 	! Copyright 2005,2006,2007,2009 Imagination Technologies
 
 #include <linux/init.h>
+#include <asm/metag_mem.h>
 #include <generated/asm-offsets.h>
 #undef __exit
 
@@ -48,6 +49,13 @@ __exit:
 	.global _secondary_startup
 	.type _secondary_startup,function
 _secondary_startup:
+#if CONFIG_PAGE_OFFSET < LINGLOBAL_BASE
+	! In case GCOn has just been turned on we need to fence any writes that
+	! the boot thread might have performed prior to coherency taking effect.
+	MOVT	D0Re0,#HI(LINSYSEVENT_WR_ATOMIC_UNLOCK)
+	MOV	D1Re0,#0
+	SETD	[D0Re0], D1Re0
+#endif
 	MOVT	A0StP,#HI(_secondary_data_stack)
 	ADD	A0StP,A0StP,#LO(_secondary_data_stack)
 	GETD	A0StP,[A0StP]
arch/metag/kernel/smp.c +115 -0

139 lines not on this page · raw message

Signature · 1 line
1.8.1.2
#2 lore raw

PATCH 2/3 metag: cachepart: take into account small cache bits

In reply to James Hogan

The CORE_CONFIG2 register has bits to indicate that the data or code cache is small, i.e. that the size described in the field should be divided by 64. Take this into account in get_icache_size() and get_dcache_size().

---
 arch/metag/kernel/cachepart.c | 14 ++++++++++----
 1 file changed, 10 insertions(+), 4 deletions(-)
arch/metag/kernel/cachepart.c +10 -4
index 3a589dfb..c737edb 100644
@@ -24,15 +24,21 @@
 unsigned int get_dcache_size(void)
 {
 	unsigned int config2 = metag_in32(METAC_CORE_CONFIG2);
-	return 0x1000 << ((config2 & METAC_CORECFG2_DCSZ_BITS)
-				>> METAC_CORECFG2_DCSZ_S);
+	unsigned int sz = 0x1000 << ((config2 & METAC_CORECFG2_DCSZ_BITS)
+				     >> METAC_CORECFG2_DCSZ_S);
+	if (config2 & METAC_CORECFG2_DCSMALL_BIT)
+		sz >>= 6;
+	return sz;
 }
 
 unsigned int get_icache_size(void)
 {
 	unsigned int config2 = metag_in32(METAC_CORE_CONFIG2);
-	return 0x1000 << ((config2 & METAC_CORE_C2ICSZ_BITS)
-				>> METAC_CORE_C2ICSZ_S);
+	unsigned int sz = 0x1000 << ((config2 & METAC_CORE_C2ICSZ_BITS)
+				     >> METAC_CORE_C2ICSZ_S);
+	if (config2 & METAC_CORECFG2_ICSMALL_BIT)
+		sz >>= 6;
+	return sz;
 }
 
 unsigned int get_global_dcache_size(void)
Signature · 1 line
1.8.1.2
#3 lore raw

PATCH 3/3 metag: cachepart: fix get_global_dcache_size() typo

In reply to James Hogan

Compilation is broken when the kernel is destined to live in the global part of the virtual address space:

arch/metag/kernel/cachepart.c In function 'get_thread_cache_size':
arch/metag/kernel/cachepart.c +71 : error: implicit declaration of function 'get_global_dache_size'

Fix the typo.

---
 arch/metag/kernel/cachepart.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
arch/metag/kernel/cachepart.c +1 -1
index c737edb..954548b 100644
@@ -67,7 +67,7 @@ static unsigned int get_thread_cache_size(unsigned int cache, int thread_id)
 		return 0;
 #if PAGE_OFFSET >= LINGLOBAL_BASE
 	/* Checking for global cache */
-	cache_size = (cache == DCACHE ? get_global_dache_size() :
+	cache_size = (cache == DCACHE ? get_global_dcache_size() :
 		get_global_icache_size());
 	offset = 8;
 #else
Signature · 1 line
1.8.1.2