openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

ARM: entry: prefetch abort: tail-call the main prefetch abort handler 

Tail-call the main C prefetch abort handler code from the per-CPU
helper code.  Also note that the helper function becomes ABI
compliant in terms of the registers preserved.

Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
This commit is contained in:
Russell King 2011-06-26 12:37:35 +01:00
parent d9600c99c5
commit 8dfe7ac96f
4 changed files with 19 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
arch/arm/kernel/entry-armv.S
View File

@ -45,7 +45,7 @@
.endm .endm
.macro pabt_helper .macro pabt_helper
@ PABORT handler takes fault address in r4 @ PABORT handler takes pt_regs in r2, fault address in r4 and psr in r5
#ifdef MULTI_PABORT #ifdef MULTI_PABORT
ldr ip, .LCprocfns ldr ip, .LCprocfns
mov lr, pc mov lr, pc
@ -306,9 +306,8 @@ ENDPROC(__und_svc)
.align 5 .align 5
__pabt_svc: __pabt_svc:
svc_entry svc_entry
pabt_helper
mov r2, sp @ regs mov r2, sp @ regs
bl do_PrefetchAbort @ call abort handler pabt_helper
@ @
@ IRQs off again before pulling preserved data off the stack @ IRQs off again before pulling preserved data off the stack
@ -653,9 +652,8 @@ ENDPROC(__und_usr_unknown)
.align 5 .align 5
__pabt_usr: __pabt_usr:
usr_entry usr_entry
pabt_helper
mov r2, sp @ regs mov r2, sp @ regs
bl do_PrefetchAbort @ call abort handler pabt_helper
UNWIND(.fnend ) UNWIND(.fnend )
/* fall through */ /* fall through */
/* /*

9
arch/arm/mm/pabort-legacy.S
View File

@ -4,10 +4,11 @@
/* /*
* Function: legacy_pabort * Function: legacy_pabort
* *
* Params : r4 = address of aborted instruction * Params : r2 = pt_regs
* : r4 = address of aborted instruction
* : r5 = psr for parent context
* *
* Returns : r0 = address of abort * Returns : r4 - r11, r13 preserved
* : r1 = Simulated IFSR with section translation fault status
* *
* Purpose : obtain information about current prefetch abort. * Purpose : obtain information about current prefetch abort.
*/ */
@ -16,5 +17,5 @@
ENTRY(legacy_pabort) ENTRY(legacy_pabort)
mov r0, r4 mov r0, r4
mov r1, #5 mov r1, #5
mov pc, lr b do_PrefetchAbort
ENDPROC(legacy_pabort) ENDPROC(legacy_pabort)

9
arch/arm/mm/pabort-v6.S
View File

@ -4,10 +4,11 @@
/* /*
* Function: v6_pabort * Function: v6_pabort
* *
* Params : r4 = address of aborted instruction * Params : r2 = pt_regs
* : r4 = address of aborted instruction
* : r5 = psr for parent context
* *
* Returns : r0 = address of abort * Returns : r4 - r11, r13 preserved
* : r1 = IFSR
* *
* Purpose : obtain information about current prefetch abort. * Purpose : obtain information about current prefetch abort.
*/ */
@ -16,5 +17,5 @@
ENTRY(v6_pabort) ENTRY(v6_pabort)
mov r0, r4 mov r0, r4
mrc p15, 0, r1, c5, c0, 1 @ get IFSR mrc p15, 0, r1, c5, c0, 1 @ get IFSR
mov pc, lr b do_PrefetchAbort
ENDPROC(v6_pabort) ENDPROC(v6_pabort)

11
arch/arm/mm/pabort-v7.S
View File

@ -2,12 +2,13 @@
#include <asm/assembler.h> #include <asm/assembler.h>
/* /*
* Function: v6_pabort * Function: v7_pabort
* *
* Params : r4 = address of aborted instruction * Params : r2 = pt_regs
* : r4 = address of aborted instruction
* : r5 = psr for parent context
* *
* Returns : r0 = address of abort * Returns : r4 - r11, r13 preserved
* : r1 = IFSR
* *
* Purpose : obtain information about current prefetch abort. * Purpose : obtain information about current prefetch abort.
*/ */
@ -16,5 +17,5 @@
ENTRY(v7_pabort) ENTRY(v7_pabort)
mrc p15, 0, r0, c6, c0, 2 @ get IFAR mrc p15, 0, r0, c6, c0, 2 @ get IFAR
mrc p15, 0, r1, c5, c0, 1 @ get IFSR mrc p15, 0, r1, c5, c0, 1 @ get IFSR
mov pc, lr b do_PrefetchAbort
ENDPROC(v7_pabort) ENDPROC(v7_pabort)