patch-2.4.20 linux-2.4.20/arch/mips64/mm/tlbex-r4k.S
Next file: linux-2.4.20/arch/mips64/mm/umap.c
Previous file: linux-2.4.20/arch/mips64/mm/tlb-sb1.c
Back to the patch index
Back to the overall index
- Lines: 209
- Date:
Thu Nov 28 15:53:10 2002
- Orig file:
linux-2.4.19/arch/mips64/mm/tlbex-r4k.S
- Orig date:
Fri Aug 2 17:39:43 2002
diff -urN linux-2.4.19/arch/mips64/mm/tlbex-r4k.S linux-2.4.20/arch/mips64/mm/tlbex-r4k.S
@@ -5,6 +5,7 @@
*
* Copyright (C) 2000 Silicon Graphics, Inc.
* Written by Ulf Carlsson (ulfc@engr.sgi.com)
+ * Copyright (C) 2002 Maciej W. Rozycki
*/
#include <linux/config.h>
#include <linux/init.h>
@@ -20,10 +21,9 @@
/*
* After this macro runs we have a pointer to the pte of the address
- * that caused the fault in in PTR.
+ * that caused the fault in PTR.
*/
-
- .macro LOAD_PTE2, ptr, tmp
+ .macro LOAD_PTE2, ptr, tmp, kaddr
#ifdef CONFIG_SMP
dmfc0 \ptr, CP0_CONTEXT
dmfc0 \tmp, CP0_BADVADDR
@@ -32,8 +32,8 @@
dmfc0 \tmp, CP0_BADVADDR
dla \ptr, pgd_current
#endif
- bltz \tmp, kaddr
- ld \ptr, (\ptr)
+ bltz \tmp, \kaddr
+ ld \ptr, (\ptr)
dsrl \tmp, (PGDIR_SHIFT-3) # get pgd offset in bytes
andi \tmp, ((PTRS_PER_PGD - 1)<<3)
daddu \ptr, \tmp # add in pgd offset
@@ -48,6 +48,35 @@
daddu \ptr, \tmp
.endm
+
+ /*
+ * Ditto for the kernel table.
+ */
+ .macro LOAD_KPTE2, ptr, tmp, not_vmalloc
+ /*
+ * First, determine that the address is in/above vmalloc range.
+ */
+ dmfc0 \tmp, CP0_BADVADDR
+ dli \ptr, VMALLOC_START
+
+ /*
+ * Now find offset into kptbl.
+ */
+ dsubu \tmp, \tmp, \ptr
+ dla \ptr, kptbl
+ dsrl \tmp, (PAGE_SHIFT+1) # get vpn2
+ dsll \tmp, 4 # byte offset of pte
+ daddu \ptr, \ptr, \tmp
+
+ /*
+ * Determine that fault address is within vmalloc range.
+ */
+ dla \tmp, ekptbl
+ sltu \tmp, \ptr, \tmp
+ beqz \tmp, \not_vmalloc # not vmalloc
+ .endm
+
+
/*
* This places the even/odd pte pair in the page table at the pte
* entry pointed to by PTE into ENTRYLO0 and ENTRYLO1.
@@ -59,6 +88,7 @@
dmtc0 \pte1, CP0_ENTRYLO1 # load it
.endm
+
.text
.set noreorder
.set mips3
@@ -66,69 +96,93 @@
__INIT
.align 5
-FEXPORT(except_vec0)
+LEAF(except_vec0)
.set noat
PANIC("Unused vector called")
1: b 1b
nop
+END(except_vec0)
+
/*
- * TLB refill handler for the R10000.
+ * TLB refill handler for the R4000.
* Attention: We may only use 32 instructions / 128 bytes.
*/
+ .align 5
+LEAF(except_vec1_r4k)
+ .set noat
+ dla k0, handle_vec1_r4k
+ jr k0
+ nop
+END(except_vec1_r4k)
- .align 5
-LEAF(except_vec1_r10k)
- .set noat
- LOAD_PTE2 k1 k0
+ __FINIT
+
+ .align 5
+LEAF(handle_vec1_r4k)
+ .set noat
+ LOAD_PTE2 k1 k0 9f
ld k0, 0(k1) # get even pte
ld k1, 8(k1) # get odd pte
PTE_RELOAD k0 k1
- nop
- tlbwr
+ b 1f
+ tlbwr
+1: nop
eret
-kaddr:
- dla k0, handle_vmalloc_address # MAPPED kernel needs this
- jr k0
- nop
- END(except_vec1_r10k)
- __FINIT
+9: # handle the vmalloc range
+ LOAD_KPTE2 k1 k0 invalid_vmalloc_address
+ ld k0, 0(k1) # get even pte
+ ld k1, 8(k1) # get odd pte
+ PTE_RELOAD k0 k1
+ b 1f
+ tlbwr
+1: nop
+ eret
+END(handle_vec1_r4k)
- .align 5
-LEAF(handle_vmalloc_address)
- .set noat
- /*
- * First, determine that the address is in/above vmalloc range.
- */
- dmfc0 k0, CP0_BADVADDR
- dli k1, VMALLOC_START
+ __INIT
/*
- * Now find offset into kptbl.
+ * TLB refill handler for the R10000.
+ * Attention: We may only use 32 instructions / 128 bytes.
*/
- dsubu k0, k0, k1
- dla k1, kptbl
- dsrl k0, (PAGE_SHIFT+1) # get vpn2
- dsll k0, 4 # byte offset of pte
- daddu k1, k1, k0
+ .align 5
+LEAF(except_vec1_r10k)
+ .set noat
+ dla k0, handle_vec1_r10k
+ jr k0
+ nop
+END(except_vec1_r10k)
- /*
- * Determine that fault address is within vmalloc range.
- */
- dla k0, ekptbl
- sltu k0, k1, k0
- beqz k0, not_vmalloc
+ __FINIT
- /*
- * Load cp0 registers.
- */
+ .align 5
+LEAF(handle_vec1_r10k)
+ .set noat
+ LOAD_PTE2 k1 k0 9f
ld k0, 0(k1) # get even pte
ld k1, 8(k1) # get odd pte
+ PTE_RELOAD k0 k1
+ nop
+ tlbwr
+ eret
-not_vmalloc:
+9: # handle the vmalloc range
+ LOAD_KPTE2 k1 k0 invalid_vmalloc_address
+ ld k0, 0(k1) # get even pte
+ ld k1, 8(k1) # get odd pte
PTE_RELOAD k0 k1
nop
tlbwr
eret
- END(handle_vmalloc_address)
+END(handle_vec1_r10k)
+
+
+ .align 5
+LEAF(invalid_vmalloc_address)
+ .set noat
+ PANIC("Invalid kernel address")
+1: b 1b
+ nop
+END(invalid_vmalloc_address)
FUNET's LINUX-ADM group, linux-adm@nic.funet.fi
TCL-scripts by Sam Shen (who was at: slshen@lbl.gov)