mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-09-03 17:40:04 +00:00
powerpc/40x: Refactor exception entry macros by using head_32.h
Refactor exception entry macros by using the ones defined in head_32.h Signed-off-by: Christophe Leroy <christophe.leroy@c-s.fr> Signed-off-by: Michael Ellerman <mpe@ellerman.id.au>
This commit is contained in:
parent
7271fc9604
commit
90f204b9a1
2 changed files with 6 additions and 86 deletions
|
@ -59,8 +59,12 @@
|
||||||
stw r1,GPR1(r11)
|
stw r1,GPR1(r11)
|
||||||
stw r1,0(r11)
|
stw r1,0(r11)
|
||||||
tovirt(r1,r11) /* set new kernel sp */
|
tovirt(r1,r11) /* set new kernel sp */
|
||||||
|
#ifdef CONFIG_40x
|
||||||
|
rlwinm r9,r9,0,14,12 /* clear MSR_WE (necessary?) */
|
||||||
|
#else
|
||||||
li r10,MSR_KERNEL & ~(MSR_IR|MSR_DR) /* can take exceptions */
|
li r10,MSR_KERNEL & ~(MSR_IR|MSR_DR) /* can take exceptions */
|
||||||
MTMSRD(r10) /* (except for mach check in rtas) */
|
MTMSRD(r10) /* (except for mach check in rtas) */
|
||||||
|
#endif
|
||||||
stw r0,GPR0(r11)
|
stw r0,GPR0(r11)
|
||||||
lis r10,STACK_FRAME_REGS_MARKER@ha /* exception frame marker */
|
lis r10,STACK_FRAME_REGS_MARKER@ha /* exception frame marker */
|
||||||
addi r10,r10,STACK_FRAME_REGS_MARKER@l
|
addi r10,r10,STACK_FRAME_REGS_MARKER@l
|
||||||
|
|
|
@ -44,6 +44,8 @@
|
||||||
#include <asm/export.h>
|
#include <asm/export.h>
|
||||||
#include <asm/asm-405.h>
|
#include <asm/asm-405.h>
|
||||||
|
|
||||||
|
#include "head_32.h"
|
||||||
|
|
||||||
/* As with the other PowerPC ports, it is expected that when code
|
/* As with the other PowerPC ports, it is expected that when code
|
||||||
* execution begins here, the following registers contain valid, yet
|
* execution begins here, the following registers contain valid, yet
|
||||||
* optional, information:
|
* optional, information:
|
||||||
|
@ -98,52 +100,6 @@ _ENTRY(crit_srr1)
|
||||||
_ENTRY(saved_ksp_limit)
|
_ENTRY(saved_ksp_limit)
|
||||||
.space 4
|
.space 4
|
||||||
|
|
||||||
/*
|
|
||||||
* Exception vector entry code. This code runs with address translation
|
|
||||||
* turned off (i.e. using physical addresses). We assume SPRG_THREAD has
|
|
||||||
* the physical address of the current task thread_struct.
|
|
||||||
*/
|
|
||||||
#define EXCEPTION_PROLOG \
|
|
||||||
mtspr SPRN_SPRG_SCRATCH0,r10; /* save two registers to work with */\
|
|
||||||
mtspr SPRN_SPRG_SCRATCH1,r11; \
|
|
||||||
mfcr r10; /* save CR in r10 for now */\
|
|
||||||
EXCEPTION_PROLOG_1; \
|
|
||||||
EXCEPTION_PROLOG_2
|
|
||||||
|
|
||||||
#define EXCEPTION_PROLOG_1 \
|
|
||||||
mfspr r11,SPRN_SRR1; /* check whether user or kernel */\
|
|
||||||
andi. r11,r11,MSR_PR; \
|
|
||||||
tophys(r11,r1); \
|
|
||||||
beq 1f; \
|
|
||||||
mfspr r11,SPRN_SPRG_THREAD; /* if from user, start at top of */\
|
|
||||||
lwz r11,TASK_STACK-THREAD(r11); /* this thread's kernel stack */\
|
|
||||||
addi r11,r11,THREAD_SIZE; \
|
|
||||||
tophys(r11,r11); \
|
|
||||||
1: subi r11,r11,INT_FRAME_SIZE /* Allocate an exception frame */
|
|
||||||
|
|
||||||
#define EXCEPTION_PROLOG_2 \
|
|
||||||
stw r10,_CCR(r11); /* save various registers */\
|
|
||||||
stw r12,GPR12(r11); \
|
|
||||||
stw r9,GPR9(r11); \
|
|
||||||
mfspr r10,SPRN_SPRG_SCRATCH0; \
|
|
||||||
stw r10,GPR10(r11); \
|
|
||||||
mfspr r12,SPRN_SPRG_SCRATCH1; \
|
|
||||||
stw r12,GPR11(r11); \
|
|
||||||
mflr r10; \
|
|
||||||
stw r10,_LINK(r11); \
|
|
||||||
mfspr r12,SPRN_SRR0; \
|
|
||||||
stw r1,GPR1(r11); \
|
|
||||||
mfspr r9,SPRN_SRR1; \
|
|
||||||
stw r1,0(r11); \
|
|
||||||
tovirt(r1,r11); /* set new kernel sp */ \
|
|
||||||
rlwinm r9,r9,0,14,12; /* clear MSR_WE (necessary?) */\
|
|
||||||
stw r0,GPR0(r11); \
|
|
||||||
lis r10, STACK_FRAME_REGS_MARKER@ha; /* exception frame marker */\
|
|
||||||
addi r10, r10, STACK_FRAME_REGS_MARKER@l; \
|
|
||||||
stw r10, 8(r11); \
|
|
||||||
SAVE_4GPRS(3, r11); \
|
|
||||||
SAVE_2GPRS(7, r11)
|
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* Exception prolog for critical exceptions. This is a little different
|
* Exception prolog for critical exceptions. This is a little different
|
||||||
* from the normal exception prolog above since a critical exception
|
* from the normal exception prolog above since a critical exception
|
||||||
|
@ -205,16 +161,6 @@ _ENTRY(saved_ksp_limit)
|
||||||
/*
|
/*
|
||||||
* Exception vectors.
|
* Exception vectors.
|
||||||
*/
|
*/
|
||||||
#define START_EXCEPTION(n, label) \
|
|
||||||
. = n; \
|
|
||||||
label:
|
|
||||||
|
|
||||||
#define EXCEPTION(n, label, hdlr, xfer) \
|
|
||||||
START_EXCEPTION(n, label); \
|
|
||||||
EXCEPTION_PROLOG; \
|
|
||||||
addi r3,r1,STACK_FRAME_OVERHEAD; \
|
|
||||||
xfer(n, hdlr)
|
|
||||||
|
|
||||||
#define CRITICAL_EXCEPTION(n, label, hdlr) \
|
#define CRITICAL_EXCEPTION(n, label, hdlr) \
|
||||||
START_EXCEPTION(n, label); \
|
START_EXCEPTION(n, label); \
|
||||||
CRITICAL_EXCEPTION_PROLOG; \
|
CRITICAL_EXCEPTION_PROLOG; \
|
||||||
|
@ -223,36 +169,6 @@ label:
|
||||||
NOCOPY, crit_transfer_to_handler, \
|
NOCOPY, crit_transfer_to_handler, \
|
||||||
ret_from_crit_exc)
|
ret_from_crit_exc)
|
||||||
|
|
||||||
#define EXC_XFER_TEMPLATE(hdlr, trap, msr, copyee, tfer, ret) \
|
|
||||||
li r10,trap; \
|
|
||||||
stw r10,_TRAP(r11); \
|
|
||||||
lis r10,msr@h; \
|
|
||||||
ori r10,r10,msr@l; \
|
|
||||||
copyee(r10, r9); \
|
|
||||||
bl tfer; \
|
|
||||||
.long hdlr; \
|
|
||||||
.long ret
|
|
||||||
|
|
||||||
#define COPY_EE(d, s) rlwimi d,s,0,16,16
|
|
||||||
#define NOCOPY(d, s)
|
|
||||||
|
|
||||||
#define EXC_XFER_STD(n, hdlr) \
|
|
||||||
EXC_XFER_TEMPLATE(hdlr, n, MSR_KERNEL, NOCOPY, transfer_to_handler_full, \
|
|
||||||
ret_from_except_full)
|
|
||||||
|
|
||||||
#define EXC_XFER_LITE(n, hdlr) \
|
|
||||||
EXC_XFER_TEMPLATE(hdlr, n+1, MSR_KERNEL, NOCOPY, transfer_to_handler, \
|
|
||||||
ret_from_except)
|
|
||||||
|
|
||||||
#define EXC_XFER_EE(n, hdlr) \
|
|
||||||
EXC_XFER_TEMPLATE(hdlr, n, MSR_KERNEL, COPY_EE, transfer_to_handler_full, \
|
|
||||||
ret_from_except_full)
|
|
||||||
|
|
||||||
#define EXC_XFER_EE_LITE(n, hdlr) \
|
|
||||||
EXC_XFER_TEMPLATE(hdlr, n+1, MSR_KERNEL, COPY_EE, transfer_to_handler, \
|
|
||||||
ret_from_except)
|
|
||||||
|
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* 0x0100 - Critical Interrupt Exception
|
* 0x0100 - Critical Interrupt Exception
|
||||||
*/
|
*/
|
||||||
|
|
Loading…
Reference in a new issue