Home » Mailing list archives » git-commits-head » 2010 » April » 1

microblaze: Use MICROBLAZE_TLB_SIZE in asm code

Previous thread: microblaze: Fix TLB macros by Linux Kernel Mailing List on Thursday, April 1, 2010 - 10:59 am. (1 message)

Next thread: microblaze: Add .type and .size to ASM functions by Linux Kernel Mailing List on Thursday, April 1, 2010 - 10:59 am. (1 message)
[view original message]
From: Linux Kernel Mailing List
Subject: microblaze: Use MICROBLAZE_TLB_SIZE in asm code
Date: Thursday, April 1, 2010 - 10:59 am

Gitweb:     http://git.kernel.org/linus/0691c97d74cbdfd49333ef01939ecaef158ebe1b
Commit:     0691c97d74cbdfd49333ef01939ecaef158ebe1b
Parent:     9373dd6ab140f1e6f2e62a9f0bf473987a0b62dc
Author:     Michal Simek <monstr@monstr.eu>
AuthorDate: Wed Mar 24 10:09:17 2010 +0100
Committer:  Michal Simek <monstr@monstr.eu>
CommitDate: Thu Apr 1 08:38:24 2010 +0200

    microblaze: Use MICROBLAZE_TLB_SIZE in asm code
    
    TLB size was hardcoded in asm code. This patch brings ability
    to change TLB size only in one place. (mmu.h).
    
    Signed-off-by: Michal Simek <monstr@monstr.eu>
---
 arch/microblaze/kernel/head.S |    2 +-
 arch/microblaze/kernel/misc.S |    4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/arch/microblaze/kernel/head.S b/arch/microblaze/kernel/head.S
index e397d5d..ba2c033 100644
--- a/arch/microblaze/kernel/head.S
+++ b/arch/microblaze/kernel/head.S
@@ -134,7 +134,7 @@ _copy_bram:
 	 * virtual to physical.
 	 */
 	nop
-	addik	r3, r0, 63		/* Invalidate all TLB entries */
+	addik	r3, r0, MICROBLAZE_TLB_SIZE -1	/* Invalidate all TLB entries */
 _invalidate:
 	mts	rtlbx, r3
 	mts	rtlbhi, r0			/* flush: ensure V is clear   */
diff --git a/arch/microblaze/kernel/misc.S b/arch/microblaze/kernel/misc.S
index 18681ee..7cf8649 100644
--- a/arch/microblaze/kernel/misc.S
+++ b/arch/microblaze/kernel/misc.S
@@ -29,7 +29,7 @@
 .type  _tlbia, @function
 .align 4;
 _tlbia:
-	addik	r12, r0, 63 /* flush all entries (63 - 3) */
+	addik	r12, r0, MICROBLAZE_TLB_SIZE - 1 /* flush all entries (63 - 3) */
 	/* isync */
 _tlbia_1:
 	mts	rtlbx, r12
@@ -75,7 +75,7 @@ early_console_reg_tlb_alloc:
 	 * Load a TLB entry for the UART, so that microblaze_progress() can use
 	 * the UARTs nice and early.  We use a 4k real==virtual mapping.
 	 */
-	ori	r4, r0, 63
+	ori	r4, r0, MICROBLAZE_TLB_SIZE - 1
 	mts	rtlbx, r4 /* TLB slot 2 */
 
 	or	r4,r5,r0
--


[ message continues ]
Previous thread: microblaze: Fix TLB macros by Linux Kernel Mailing List on Thursday, April 1, 2010 - 10:59 am. (1 message)

Next thread: microblaze: Add .type and .size to ASM functions by Linux Kernel Mailing List on Thursday, April 1, 2010 - 10:59 am. (1 message)