Skip to contentSkip to conversation

powerpc/mm: e300c2/c3/c4 TLB errata workaround

RFC PATCH Superseded Kumar Gala 2 participants 4 messages Mar 16, 2009 PowerPC

lore
Share & tools
lore

Kumar Gala

author
#0 lore raw

RFC PATCH v4 1/1 powerpc/mm: e300c2/c3/c4 TLB errata workaround

Complete workaround for DTLB errata in e300c2/c3/c4 processors.

Due to the bug, the hardware-implemented LRU algorythm always goes to way 1 of the TLB. This fix implements the proposed software workaround in form of a LRW table for chosing the TLB-way.

Based on patch from David Jander <[email protected]>

---
 arch/powerpc/include/asm/mmu.h |    6 ++++++
 arch/powerpc/kernel/cputable.c |    9 ++++++---
 arch/powerpc/kernel/head_32.S  |   32 ++++++++++++++++++++++++++++----
 3 files changed, 40 insertions(+), 7 deletions(-)
arch/powerpc/include/asm/mmu.h +6 -0
index 10476a8..cbf1543 100644
@@ -46,6 +46,12 @@
  */
 #define MMU_FTR_LOCK_BCAST_INVAL	ASM_CONST(0x00100000)
 
+/* This indicates that the processor doesn't handle way selection
+ * properly and needs SW to track and update the LRU state.  This
+ * is specific to an errata on e300c2/c3/c4 class parts
+ */
+#define MMU_FTR_NEED_DTLB_SW_LRU	ASM_CONST(0x00200000)
+
 #ifndef __ASSEMBLY__
 #include <asm/cputable.h>
 
arch/powerpc/kernel/cputable.c +6 -3
index ccea243..cd1b687 100644
@@ -1090,7 +1090,8 @@ static struct cpu_spec __initdata cpu_specs[] = {
 		.cpu_name		= "e300c2",
 		.cpu_features		= CPU_FTRS_E300C2,
 		.cpu_user_features	= PPC_FEATURE_32 | PPC_FEATURE_HAS_MMU,
-		.mmu_features		= MMU_FTR_USE_HIGH_BATS,
+		.mmu_features		= MMU_FTR_USE_HIGH_BATS |
+			MMU_FTR_NEED_DTLB_SW_LRU,
 		.icache_bsize		= 32,
 		.dcache_bsize		= 32,
 		.cpu_setup		= __setup_cpu_603,
@@ -1103,7 +1104,8 @@ static struct cpu_spec __initdata cpu_specs[] = {
 		.cpu_name		= "e300c3",
 		.cpu_features		= CPU_FTRS_E300,
 		.cpu_user_features	= COMMON_USER,
-		.mmu_features		= MMU_FTR_USE_HIGH_BATS,
+		.mmu_features		= MMU_FTR_USE_HIGH_BATS |
+			MMU_FTR_NEED_DTLB_SW_LRU,
 		.icache_bsize		= 32,
 		.dcache_bsize		= 32,
 		.cpu_setup		= __setup_cpu_603,
@@ -1118,7 +1120,8 @@ static struct cpu_spec __initdata cpu_specs[] = {
 		.cpu_name		= "e300c4",
 		.cpu_features		= CPU_FTRS_E300,
 		.cpu_user_features	= COMMON_USER,
-		.mmu_features		= MMU_FTR_USE_HIGH_BATS,
+		.mmu_features		= MMU_FTR_USE_HIGH_BATS |
+			MMU_FTR_NEED_DTLB_SW_LRU,
 		.icache_bsize		= 32,
 		.dcache_bsize		= 32,
 		.cpu_setup		= __setup_cpu_603,
arch/powerpc/kernel/head_32.S +28 -4
index b6c5955..d59771d 100644
@@ -587,9 +587,19 @@ DataLoadTLBMiss:
 	ori	r1,r1,0xe04		/* clear out reserved bits */
 	andc	r1,r0,r1		/* PP = user? (rw&dirty? 2: 3): 0 */
 	mtspr	SPRN_RPA,r1
+	mfspr	r2,SPRN_SRR1		/* Need to restore CR0 */
+	mtcrf	0x80,r2
+BEGIN_MMU_FTR_SECTION
+	li	r0,1
+	lwz	r1,sw_way_lru@l(0)
+	rlwinm	r3,r3,19,25,29		/* Get Address bits 19:15 */
+	slw	r0,r0,r3
+	xor	r1,r0,r1
+	srw	r0,r1,r3
+	stw	r1,sw_way_lru@l(0)
+	rlwimi	r2,r0,31-14,14,14
+END_MMU_FTR_SECTION_IFSET(MMU_FTR_NEED_DTLB_SW_LRU)
 	tlbld	r3
-	mfspr	r3,SPRN_SRR1		/* Need to restore CR0 */
-	mtcrf	0x80,r3
 	rfi
 DataAddressInvalid:
 	mfspr	r3,SPRN_SRR1
@@ -652,11 +662,25 @@ DataStoreTLBMiss:
 	li	r1,0xe05		/* clear out reserved bits & PP lsb */
 	andc	r1,r0,r1		/* PP = user? 2: 0 */
 	mtspr	SPRN_RPA,r1
+	mfspr	r2,SPRN_SRR1		/* Need to restore CR0 */
+	mtcrf	0x80,r2
+BEGIN_MMU_FTR_SECTION
+	li	r0,1
+	lwz	r1,sw_way_lru@l(0)
+	rlwinm	r3,r3,19,25,29		/* Get Address bits 19:15 */
+	slw	r0,r0,r3
+	xor	r1,r0,r1
+	srw	r0,r1,r3
+	stw	r1,sw_way_lru@l(0)
+	rlwimi	r2,r0,31-14,14,14
+END_MMU_FTR_SECTION_IFSET(MMU_FTR_NEED_DTLB_SW_LRU)
 	tlbld	r3
-	mfspr	r3,SPRN_SRR1		/* Need to restore CR0 */
-	mtcrf	0x80,r3
 	rfi
 
+	.balign	L1_CACHE_BYTES
+sw_way_lru:
+	.long 0
+
 #ifndef CONFIG_ALTIVEC
 #define altivec_assist_exception	unknown_exception
 #endif
Signature · 1 line
1.5.6.6
#1 lore raw

Ok, I was analysing your code (which seems much more compact than mine):

arch/powerpc/kernel/head_32.S DataLoadTLBMiss: · line 595

Quoted 13 lines · On Monday 16 March 2009 14:02:18 Kumar Gala wrote:

[...]

arch/powerpc/kernel/head_32.S +6 -0
@@ -587,9 +587,19 @@ DataLoadTLBMiss:
 	ori	r1,r1,0xe04		/* clear out reserved bits */
 	andc	r1,r0,r1		/* PP = user? (rw&dirty? 2: 3): 0 */
 	mtspr	SPRN_RPA,r1
+	mfspr	r2,SPRN_SRR1		/* Need to restore CR0 */
+	mtcrf	0x80,r2
+BEGIN_MMU_FTR_SECTION
+	li	r0,1
+	lwz	r1,sw_way_lru@l(0)
+	rlwinm	r3,r3,19,25,29		/* Get Address bits 19:15 */

This should be 'rlwinm r3,r3,17,27,31' now, since you address bits, not ints.
Note that you are trashing r3 (SPRN_DMISS) here!

arch/powerpc/kernel/head_32.S DataLoadTLBMiss: · line 602

Quoted 7 lines
arch/powerpc/kernel/head_32.S +6 -0
+	slw	r0,r0,r3
+	xor	r1,r0,r1
+	srw	r0,r1,r3
+	stw	r1,sw_way_lru@l(0)
+	rlwimi	r2,r0,31-14,14,14
+END_MMU_FTR_SECTION_IFSET(MMU_FTR_NEED_DTLB_SW_LRU)
 	tlbld	r3

And now you load r3 into the tlb, is this right? It doesn't seem right to me....

Quoted 12 lines
arch/powerpc/kernel/head_32.S +3 -2
-	mfspr	r3,SPRN_SRR1		/* Need to restore CR0 */
-	mtcrf	0x80,r3
 	rfi
 DataAddressInvalid:
 	mfspr	r3,SPRN_SRR1
@@ -652,11 +662,25 @@ DataStoreTLBMiss:
 	li	r1,0xe05		/* clear out reserved bits & PP lsb */
 	andc	r1,r0,r1		/* PP = user? 2: 0 */
 	mtspr	SPRN_RPA,r1
+	mfspr	r2,SPRN_SRR1		/* Need to restore CR0 */
+	mtcrf	0x80,r2
+BEGIN_MMU_FTR_SECTION

arch/powerpc/kernel/head_32.S DataStoreTLBMiss: · line 677

Quoted 10 lines
arch/powerpc/kernel/head_32.S +9 -0
+	li	r0,1
+	lwz	r1,sw_way_lru@l(0)
+	rlwinm	r3,r3,19,25,29		/* Get Address bits 19:15 */
+	slw	r0,r0,r3
+	xor	r1,r0,r1
+	srw	r0,r1,r3
+	stw	r1,sw_way_lru@l(0)
+	rlwimi	r2,r0,31-14,14,14
+END_MMU_FTR_SECTION_IFSET(MMU_FTR_NEED_DTLB_SW_LRU)
 	tlbld	r3

Same thing here, r3 is trashed.

arch/powerpc/kernel/head_32.S DataStoreTLBMiss: · line 683

Quoted 8 lines
arch/powerpc/kernel/head_32.S +4 -2
-	mfspr	r3,SPRN_SRR1		/* Need to restore CR0 */
-	mtcrf	0x80,r3
 	rfi
 
+	.balign	L1_CACHE_BYTES
+sw_way_lru:
+	.long 0
+

Ok, I'll try to do it like this, but with lru stored in SPRG6

Best regards,

Signature · 2 lines
David Jander
Protonic Holland.
author
#2 lore raw
Quoted 4 lines · David Jander

Ok, I was analysing your code (which seems much more compact than mine):

On Monday 16 March 2009 14:02:18 Kumar Gala wrote:

Quoted 15 lines

arch/powerpc/kernel/head_32.S DataLoadTLBMiss: · line 595

Quoted 13 lines

[...]

arch/powerpc/kernel/head_32.S +6 -0
@@ -587,9 +587,19 @@ DataLoadTLBMiss:
 	ori	r1,r1,0xe04		/* clear out reserved bits */
 	andc	r1,r0,r1		/* PP = user? (rw&dirty? 2: 3): 0 */
 	mtspr	SPRN_RPA,r1
+	mfspr	r2,SPRN_SRR1		/* Need to restore CR0 */
+	mtcrf	0x80,r2
+BEGIN_MMU_FTR_SECTION
+	li	r0,1
+	lwz	r1,sw_way_lru@l(0)
+	rlwinm	r3,r3,19,25,29		/* Get Address bits 19:15 */

This should be 'rlwinm r3,r3,17,27,31' now, since you address bits, not ints.

was just copying/pasting what you had :)

Quoted 1 line

Note that you are trashing r3 (SPRN_DMISS) here!

good catch..

Quoted 10 lines

arch/powerpc/kernel/head_32.S DataLoadTLBMiss: · line 602

Quoted 7 lines
arch/powerpc/kernel/head_32.S +6 -0
+	slw	r0,r0,r3
+	xor	r1,r0,r1
+	srw	r0,r1,r3
+	stw	r1,sw_way_lru@l(0)
+	rlwimi	r2,r0,31-14,14,14
+END_MMU_FTR_SECTION_IFSET(MMU_FTR_NEED_DTLB_SW_LRU)
 	tlbld	r3

And now you load r3 into the tlb, is this right? It doesn't seem right to me....

correct.. I wasn't thinking about the fact that tlbld was using r3.

- k

author
#3 lore raw
Quoted 27 lines · Kumar Gala
Quoted 4 lines · David Jander

Ok, I was analysing your code (which seems much more compact than mine):

On Monday 16 March 2009 14:02:18 Kumar Gala wrote:

Quoted 15 lines

arch/powerpc/kernel/head_32.S DataLoadTLBMiss: · line 595

Quoted 13 lines

[...]

arch/powerpc/kernel/head_32.S +6 -0
@@ -587,9 +587,19 @@ DataLoadTLBMiss:
 	ori	r1,r1,0xe04		/* clear out reserved bits */
 	andc	r1,r0,r1		/* PP = user? (rw&dirty? 2: 3): 0 */
 	mtspr	SPRN_RPA,r1
+	mfspr	r2,SPRN_SRR1		/* Need to restore CR0 */
+	mtcrf	0x80,r2
+BEGIN_MMU_FTR_SECTION
+	li	r0,1
+	lwz	r1,sw_way_lru@l(0)
+	rlwinm	r3,r3,19,25,29		/* Get Address bits 19:15 */

This should be 'rlwinm r3,r3,17,27,31' now, since you address bits, not ints.

was just copying/pasting what you had :)

Quoted 1 line

Note that you are trashing r3 (SPRN_DMISS) here!

Quoted 7 lines

good catch..

Quoted 5 lines

arch/powerpc/kernel/head_32.S DataLoadTLBMiss: · line 600

Quoted 5 lines
arch/powerpc/kernel/head_32.S +5 -0
+	slw	r0,r0,r3
+	xor	r1,r0,r1
+	srw	r0,r1,r3
+	stw	r1,sw_way_lru@l(0)
+	rlwimi	r2,r0,31-14,14,14

I'm also missing a:

	mtspr	SPRN_SRR1,r2

- k