ppc: Loose GOT access in IRQ
Using the GOT in IRQ handlers requires r14 to be -ffixed-r14. Avoid this by relocatate transfer_to_handler too. This will allow to free up r14 later on. Signed-off-by: Joakim Tjernlund <Joakim.Tjernlund@transmode.se>
This commit is contained in:
parent
2903ad33a7
commit
fc4e188789
|
@ -132,28 +132,15 @@ Alignment:
|
||||||
mfspr r5,DSISR
|
mfspr r5,DSISR
|
||||||
stw r5,_DSISR(r21)
|
stw r5,_DSISR(r21)
|
||||||
addi r3,r1,STACK_FRAME_OVERHEAD
|
addi r3,r1,STACK_FRAME_OVERHEAD
|
||||||
li r20,MSR_KERNEL
|
EXC_XFER_TEMPLATE(Alignment, AlignmentException, MSR_KERNEL, COPY_EE)
|
||||||
rlwimi r20,r23,0,16,16 /* copy EE bit from saved MSR */
|
|
||||||
lwz r6,GOT(transfer_to_handler)
|
|
||||||
mtlr r6
|
|
||||||
blrl
|
|
||||||
.L_Alignment:
|
|
||||||
.long AlignmentException - _start + EXC_OFF_SYS_RESET
|
|
||||||
.long int_return - _start + EXC_OFF_SYS_RESET
|
|
||||||
|
|
||||||
/* Program check exception */
|
/* Program check exception */
|
||||||
. = 0x700
|
. = 0x700
|
||||||
ProgramCheck:
|
ProgramCheck:
|
||||||
EXCEPTION_PROLOG(SRR0, SRR1)
|
EXCEPTION_PROLOG(SRR0, SRR1)
|
||||||
addi r3,r1,STACK_FRAME_OVERHEAD
|
addi r3,r1,STACK_FRAME_OVERHEAD
|
||||||
li r20,MSR_KERNEL
|
EXC_XFER_TEMPLATE(ProgramCheck, ProgramCheckException,
|
||||||
rlwimi r20,r23,0,16,16 /* copy EE bit from saved MSR */
|
MSR_KERNEL, COPY_EE)
|
||||||
lwz r6,GOT(transfer_to_handler)
|
|
||||||
mtlr r6
|
|
||||||
blrl
|
|
||||||
.L_ProgramCheck:
|
|
||||||
.long ProgramCheckException - _start + EXC_OFF_SYS_RESET
|
|
||||||
.long int_return - _start + EXC_OFF_SYS_RESET
|
|
||||||
|
|
||||||
/* No FPU on MPC8xx. This exception is not supposed to happen.
|
/* No FPU on MPC8xx. This exception is not supposed to happen.
|
||||||
*/
|
*/
|
||||||
|
@ -837,23 +824,6 @@ trap_init:
|
||||||
mtlr r4 /* restore link register */
|
mtlr r4 /* restore link register */
|
||||||
blr
|
blr
|
||||||
|
|
||||||
/*
|
|
||||||
* Function: relocate entries for one exception vector
|
|
||||||
*/
|
|
||||||
trap_reloc:
|
|
||||||
lwz r0, 0(r7) /* hdlr ... */
|
|
||||||
add r0, r0, r3 /* ... += dest_addr */
|
|
||||||
stw r0, 0(r7)
|
|
||||||
|
|
||||||
lwz r0, 4(r7) /* int_return ... */
|
|
||||||
add r0, r0, r3 /* ... += dest_addr */
|
|
||||||
stw r0, 4(r7)
|
|
||||||
|
|
||||||
sync
|
|
||||||
isync
|
|
||||||
|
|
||||||
blr
|
|
||||||
|
|
||||||
#ifdef CONFIG_SYS_INIT_RAM_LOCK
|
#ifdef CONFIG_SYS_INIT_RAM_LOCK
|
||||||
lock_ram_in_cache:
|
lock_ram_in_cache:
|
||||||
/* Allocate Initial RAM in data cache.
|
/* Allocate Initial RAM in data cache.
|
||||||
|
|
|
@ -127,30 +127,15 @@ Alignment:
|
||||||
mfspr r5,DSISR
|
mfspr r5,DSISR
|
||||||
stw r5,_DSISR(r21)
|
stw r5,_DSISR(r21)
|
||||||
addi r3,r1,STACK_FRAME_OVERHEAD
|
addi r3,r1,STACK_FRAME_OVERHEAD
|
||||||
li r20,MSR_KERNEL
|
EXC_XFER_TEMPLATE(Alignment, AlignmentException, MSR_KERNEL, COPY_EE)
|
||||||
rlwimi r20,r23,0,16,16 /* copy EE bit from saved MSR */
|
|
||||||
rlwimi r20,r23,0,25,25 /* copy IP bit from saved MSR */
|
|
||||||
lwz r6,GOT(transfer_to_handler)
|
|
||||||
mtlr r6
|
|
||||||
blrl
|
|
||||||
.L_Alignment:
|
|
||||||
.long AlignmentException - _start + EXC_OFF_SYS_RESET
|
|
||||||
.long int_return - _start + EXC_OFF_SYS_RESET
|
|
||||||
|
|
||||||
/* Program check exception */
|
/* Program check exception */
|
||||||
. = 0x700
|
. = 0x700
|
||||||
ProgramCheck:
|
ProgramCheck:
|
||||||
EXCEPTION_PROLOG(SRR0, SRR1)
|
EXCEPTION_PROLOG(SRR0, SRR1)
|
||||||
addi r3,r1,STACK_FRAME_OVERHEAD
|
addi r3,r1,STACK_FRAME_OVERHEAD
|
||||||
li r20,MSR_KERNEL
|
EXC_XFER_TEMPLATE(ProgramCheck, ProgramCheckException,
|
||||||
rlwimi r20,r23,0,16,16 /* copy EE bit from saved MSR */
|
MSR_KERNEL, COPY_EE)
|
||||||
rlwimi r20,r23,0,25,25 /* copy IP bit from saved MSR */
|
|
||||||
lwz r6,GOT(transfer_to_handler)
|
|
||||||
mtlr r6
|
|
||||||
blrl
|
|
||||||
.L_ProgramCheck:
|
|
||||||
.long ProgramCheckException - _start + EXC_OFF_SYS_RESET
|
|
||||||
.long int_return - _start + EXC_OFF_SYS_RESET
|
|
||||||
|
|
||||||
/* Floating Point Unit unavailable exception */
|
/* Floating Point Unit unavailable exception */
|
||||||
STD_EXCEPTION(0x800, FPUnavailable, UnknownException)
|
STD_EXCEPTION(0x800, FPUnavailable, UnknownException)
|
||||||
|
@ -723,17 +708,3 @@ trap_init:
|
||||||
|
|
||||||
mtlr r4 /* restore link register */
|
mtlr r4 /* restore link register */
|
||||||
blr
|
blr
|
||||||
|
|
||||||
/*
|
|
||||||
* Function: relocate entries for one exception vector
|
|
||||||
*/
|
|
||||||
trap_reloc:
|
|
||||||
lwz r0, 0(r7) /* hdlr ... */
|
|
||||||
add r0, r0, r3 /* ... += dest_addr */
|
|
||||||
stw r0, 0(r7)
|
|
||||||
|
|
||||||
lwz r0, 4(r7) /* int_return ... */
|
|
||||||
add r0, r0, r3 /* ... += dest_addr */
|
|
||||||
stw r0, 4(r7)
|
|
||||||
|
|
||||||
blr
|
|
||||||
|
|
|
@ -217,28 +217,15 @@ Alignment:
|
||||||
mfspr r5,DSISR
|
mfspr r5,DSISR
|
||||||
stw r5,_DSISR(r21)
|
stw r5,_DSISR(r21)
|
||||||
addi r3,r1,STACK_FRAME_OVERHEAD
|
addi r3,r1,STACK_FRAME_OVERHEAD
|
||||||
li r20,MSR_KERNEL
|
EXC_XFER_TEMPLATE(Alignment, AlignmentException, MSR_KERNEL, COPY_EE)
|
||||||
rlwimi r20,r23,0,16,16 /* copy EE bit from saved MSR */
|
|
||||||
lwz r6,GOT(transfer_to_handler)
|
|
||||||
mtlr r6
|
|
||||||
blrl
|
|
||||||
.L_Alignment:
|
|
||||||
.long AlignmentException - _start + EXC_OFF_SYS_RESET
|
|
||||||
.long int_return - _start + EXC_OFF_SYS_RESET
|
|
||||||
|
|
||||||
/* Program check exception */
|
/* Program check exception */
|
||||||
. = 0x700
|
. = 0x700
|
||||||
ProgramCheck:
|
ProgramCheck:
|
||||||
EXCEPTION_PROLOG(SRR0, SRR1)
|
EXCEPTION_PROLOG(SRR0, SRR1)
|
||||||
addi r3,r1,STACK_FRAME_OVERHEAD
|
addi r3,r1,STACK_FRAME_OVERHEAD
|
||||||
li r20,MSR_KERNEL
|
EXC_XFER_TEMPLATE(ProgramCheck, ProgramCheckException,
|
||||||
rlwimi r20,r23,0,16,16 /* copy EE bit from saved MSR */
|
MSR_KERNEL, COPY_EE)
|
||||||
lwz r6,GOT(transfer_to_handler)
|
|
||||||
mtlr r6
|
|
||||||
blrl
|
|
||||||
.L_ProgramCheck:
|
|
||||||
.long ProgramCheckException - _start + EXC_OFF_SYS_RESET
|
|
||||||
.long int_return - _start + EXC_OFF_SYS_RESET
|
|
||||||
|
|
||||||
/* FPU on MPC5xx available. We will use it later.
|
/* FPU on MPC5xx available. We will use it later.
|
||||||
*/
|
*/
|
||||||
|
@ -563,24 +550,6 @@ trap_init:
|
||||||
mtlr r4 /* restore link register */
|
mtlr r4 /* restore link register */
|
||||||
blr
|
blr
|
||||||
|
|
||||||
/*
|
|
||||||
* Function: relocate entries for one exception vector
|
|
||||||
*/
|
|
||||||
trap_reloc:
|
|
||||||
lwz r0, 0(r7) /* hdlr ... */
|
|
||||||
add r0, r0, r3 /* ... += dest_addr */
|
|
||||||
stw r0, 0(r7)
|
|
||||||
|
|
||||||
lwz r0, 4(r7) /* int_return ... */
|
|
||||||
add r0, r0, r3 /* ... += dest_addr */
|
|
||||||
stw r0, 4(r7)
|
|
||||||
|
|
||||||
sync
|
|
||||||
isync
|
|
||||||
|
|
||||||
blr
|
|
||||||
|
|
||||||
|
|
||||||
#if defined(CONFIG_PATI)
|
#if defined(CONFIG_PATI)
|
||||||
/* Program the PLL */
|
/* Program the PLL */
|
||||||
pll_prog_code_start:
|
pll_prog_code_start:
|
||||||
|
|
|
@ -215,30 +215,15 @@ Alignment:
|
||||||
mfspr r5,DSISR
|
mfspr r5,DSISR
|
||||||
stw r5,_DSISR(r21)
|
stw r5,_DSISR(r21)
|
||||||
addi r3,r1,STACK_FRAME_OVERHEAD
|
addi r3,r1,STACK_FRAME_OVERHEAD
|
||||||
li r20,MSR_KERNEL
|
EXC_XFER_TEMPLATE(Alignment, AlignmentException, MSR_KERNEL, COPY_EE)
|
||||||
rlwimi r20,r23,0,16,16 /* copy EE bit from saved MSR */
|
|
||||||
rlwimi r20,r23,0,25,25 /* copy IP bit from saved MSR */
|
|
||||||
lwz r6,GOT(transfer_to_handler)
|
|
||||||
mtlr r6
|
|
||||||
blrl
|
|
||||||
.L_Alignment:
|
|
||||||
.long AlignmentException - _start + EXC_OFF_SYS_RESET
|
|
||||||
.long int_return - _start + EXC_OFF_SYS_RESET
|
|
||||||
|
|
||||||
/* Program check exception */
|
/* Program check exception */
|
||||||
. = 0x700
|
. = 0x700
|
||||||
ProgramCheck:
|
ProgramCheck:
|
||||||
EXCEPTION_PROLOG(SRR0, SRR1)
|
EXCEPTION_PROLOG(SRR0, SRR1)
|
||||||
addi r3,r1,STACK_FRAME_OVERHEAD
|
addi r3,r1,STACK_FRAME_OVERHEAD
|
||||||
li r20,MSR_KERNEL
|
EXC_XFER_TEMPLATE(ProgramCheck, ProgramCheckException,
|
||||||
rlwimi r20,r23,0,16,16 /* copy EE bit from saved MSR */
|
MSR_KERNEL, COPY_EE)
|
||||||
rlwimi r20,r23,0,25,25 /* copy IP bit from saved MSR */
|
|
||||||
lwz r6,GOT(transfer_to_handler)
|
|
||||||
mtlr r6
|
|
||||||
blrl
|
|
||||||
.L_ProgramCheck:
|
|
||||||
.long ProgramCheckException - _start + EXC_OFF_SYS_RESET
|
|
||||||
.long int_return - _start + EXC_OFF_SYS_RESET
|
|
||||||
|
|
||||||
STD_EXCEPTION(0x800, FPUnavailable, UnknownException)
|
STD_EXCEPTION(0x800, FPUnavailable, UnknownException)
|
||||||
|
|
||||||
|
@ -797,17 +782,3 @@ trap_init:
|
||||||
|
|
||||||
mtlr r4 /* restore link register */
|
mtlr r4 /* restore link register */
|
||||||
blr
|
blr
|
||||||
|
|
||||||
/*
|
|
||||||
* Function: relocate entries for one exception vector
|
|
||||||
*/
|
|
||||||
trap_reloc:
|
|
||||||
lwz r0, 0(r7) /* hdlr ... */
|
|
||||||
add r0, r0, r3 /* ... += dest_addr */
|
|
||||||
stw r0, 0(r7)
|
|
||||||
|
|
||||||
lwz r0, 4(r7) /* int_return ... */
|
|
||||||
add r0, r0, r3 /* ... += dest_addr */
|
|
||||||
stw r0, 4(r7)
|
|
||||||
|
|
||||||
blr
|
|
||||||
|
|
|
@ -176,30 +176,15 @@ Alignment:
|
||||||
mfspr r5,DSISR
|
mfspr r5,DSISR
|
||||||
stw r5,_DSISR(r21)
|
stw r5,_DSISR(r21)
|
||||||
addi r3,r1,STACK_FRAME_OVERHEAD
|
addi r3,r1,STACK_FRAME_OVERHEAD
|
||||||
li r20,MSR_KERNEL
|
EXC_XFER_TEMPLATE(Alignment, AlignmentException, MSR_KERNEL, COPY_EE)
|
||||||
rlwimi r20,r23,0,16,16 /* copy EE bit from saved MSR */
|
|
||||||
rlwimi r20,r23,0,25,25 /* copy IP bit from saved MSR */
|
|
||||||
lwz r6,GOT(transfer_to_handler)
|
|
||||||
mtlr r6
|
|
||||||
blrl
|
|
||||||
.L_Alignment:
|
|
||||||
.long AlignmentException - _start + EXC_OFF_SYS_RESET
|
|
||||||
.long int_return - _start + EXC_OFF_SYS_RESET
|
|
||||||
|
|
||||||
/* Program check exception */
|
/* Program check exception */
|
||||||
. = 0x700
|
. = 0x700
|
||||||
ProgramCheck:
|
ProgramCheck:
|
||||||
EXCEPTION_PROLOG(SRR0, SRR1)
|
EXCEPTION_PROLOG(SRR0, SRR1)
|
||||||
addi r3,r1,STACK_FRAME_OVERHEAD
|
addi r3,r1,STACK_FRAME_OVERHEAD
|
||||||
li r20,MSR_KERNEL
|
EXC_XFER_TEMPLATE(ProgramCheck, ProgramCheckException,
|
||||||
rlwimi r20,r23,0,16,16 /* copy EE bit from saved MSR */
|
MSR_KERNEL, COPY_EE)
|
||||||
rlwimi r20,r23,0,25,25 /* copy IP bit from saved MSR */
|
|
||||||
lwz r6,GOT(transfer_to_handler)
|
|
||||||
mtlr r6
|
|
||||||
blrl
|
|
||||||
.L_ProgramCheck:
|
|
||||||
.long ProgramCheckException - _start + EXC_OFF_SYS_RESET
|
|
||||||
.long int_return - _start + EXC_OFF_SYS_RESET
|
|
||||||
|
|
||||||
STD_EXCEPTION(0x800, FPUnavailable, UnknownException)
|
STD_EXCEPTION(0x800, FPUnavailable, UnknownException)
|
||||||
|
|
||||||
|
@ -762,17 +747,3 @@ trap_init:
|
||||||
|
|
||||||
mtlr r4 /* restore link register */
|
mtlr r4 /* restore link register */
|
||||||
blr
|
blr
|
||||||
|
|
||||||
/*
|
|
||||||
* Function: relocate entries for one exception vector
|
|
||||||
*/
|
|
||||||
trap_reloc:
|
|
||||||
lwz r0, 0(r7) /* hdlr ... */
|
|
||||||
add r0, r0, r3 /* ... += dest_addr */
|
|
||||||
stw r0, 0(r7)
|
|
||||||
|
|
||||||
lwz r0, 4(r7) /* int_return ... */
|
|
||||||
add r0, r0, r3 /* ... += dest_addr */
|
|
||||||
stw r0, 4(r7)
|
|
||||||
|
|
||||||
blr
|
|
||||||
|
|
|
@ -227,28 +227,15 @@ Alignment:
|
||||||
mfspr r5,DSISR
|
mfspr r5,DSISR
|
||||||
stw r5,_DSISR(r21)
|
stw r5,_DSISR(r21)
|
||||||
addi r3,r1,STACK_FRAME_OVERHEAD
|
addi r3,r1,STACK_FRAME_OVERHEAD
|
||||||
li r20,MSR_KERNEL
|
EXC_XFER_TEMPLATE(Alignment, AlignmentException, MSR_KERNEL, COPY_EE)
|
||||||
rlwimi r20,r23,0,16,16 /* copy EE bit from saved MSR */
|
|
||||||
lwz r6,GOT(transfer_to_handler)
|
|
||||||
mtlr r6
|
|
||||||
blrl
|
|
||||||
.L_Alignment:
|
|
||||||
.long AlignmentException - _start + EXC_OFF_SYS_RESET
|
|
||||||
.long int_return - _start + EXC_OFF_SYS_RESET
|
|
||||||
|
|
||||||
/* Program check exception */
|
/* Program check exception */
|
||||||
. = EXC_OFF_PROGRAM
|
. = EXC_OFF_PROGRAM
|
||||||
ProgramCheck:
|
ProgramCheck:
|
||||||
EXCEPTION_PROLOG(SRR0, SRR1)
|
EXCEPTION_PROLOG(SRR0, SRR1)
|
||||||
addi r3,r1,STACK_FRAME_OVERHEAD
|
addi r3,r1,STACK_FRAME_OVERHEAD
|
||||||
li r20,MSR_KERNEL
|
EXC_XFER_TEMPLATE(ProgramCheck, ProgramCheckException,
|
||||||
rlwimi r20,r23,0,16,16 /* copy EE bit from saved MSR */
|
MSR_KERNEL, COPY_EE)
|
||||||
lwz r6,GOT(transfer_to_handler)
|
|
||||||
mtlr r6
|
|
||||||
blrl
|
|
||||||
.L_ProgramCheck:
|
|
||||||
.long ProgramCheckException - _start + EXC_OFF_SYS_RESET
|
|
||||||
.long int_return - _start + EXC_OFF_SYS_RESET
|
|
||||||
|
|
||||||
/* No FPU on MPC8xx. This exception is not supposed to happen.
|
/* No FPU on MPC8xx. This exception is not supposed to happen.
|
||||||
*/
|
*/
|
||||||
|
@ -695,20 +682,6 @@ trap_init:
|
||||||
mtlr r4 /* restore link register */
|
mtlr r4 /* restore link register */
|
||||||
blr
|
blr
|
||||||
|
|
||||||
/*
|
|
||||||
* Function: relocate entries for one exception vector
|
|
||||||
*/
|
|
||||||
trap_reloc:
|
|
||||||
lwz r0, 0(r7) /* hdlr ... */
|
|
||||||
add r0, r0, r3 /* ... += dest_addr */
|
|
||||||
stw r0, 0(r7)
|
|
||||||
|
|
||||||
lwz r0, 4(r7) /* int_return ... */
|
|
||||||
add r0, r0, r3 /* ... += dest_addr */
|
|
||||||
stw r0, 4(r7)
|
|
||||||
|
|
||||||
blr
|
|
||||||
|
|
||||||
/* Setup the BAT registers.
|
/* Setup the BAT registers.
|
||||||
*/
|
*/
|
||||||
setup_bats:
|
setup_bats:
|
||||||
|
|
|
@ -286,30 +286,15 @@ Alignment:
|
||||||
mfspr r5,DSISR
|
mfspr r5,DSISR
|
||||||
stw r5,_DSISR(r21)
|
stw r5,_DSISR(r21)
|
||||||
addi r3,r1,STACK_FRAME_OVERHEAD
|
addi r3,r1,STACK_FRAME_OVERHEAD
|
||||||
li r20,MSR_KERNEL
|
EXC_XFER_TEMPLATE(Alignment, AlignmentException, MSR_KERNEL, COPY_EE)
|
||||||
rlwimi r20,r23,0,16,16 /* copy EE bit from saved MSR */
|
|
||||||
rlwimi r20,r23,0,25,25 /* copy IP bit from saved MSR */
|
|
||||||
lwz r6,GOT(transfer_to_handler)
|
|
||||||
mtlr r6
|
|
||||||
blrl
|
|
||||||
.L_Alignment:
|
|
||||||
.long AlignmentException - _start + EXC_OFF_SYS_RESET
|
|
||||||
.long int_return - _start + EXC_OFF_SYS_RESET
|
|
||||||
|
|
||||||
/* Program check exception */
|
/* Program check exception */
|
||||||
. = 0x700
|
. = 0x700
|
||||||
ProgramCheck:
|
ProgramCheck:
|
||||||
EXCEPTION_PROLOG(SRR0, SRR1)
|
EXCEPTION_PROLOG(SRR0, SRR1)
|
||||||
addi r3,r1,STACK_FRAME_OVERHEAD
|
addi r3,r1,STACK_FRAME_OVERHEAD
|
||||||
li r20,MSR_KERNEL
|
EXC_XFER_TEMPLATE(ProgramCheck, ProgramCheckException,
|
||||||
rlwimi r20,r23,0,16,16 /* copy EE bit from saved MSR */
|
MSR_KERNEL, COPY_EE)
|
||||||
rlwimi r20,r23,0,25,25 /* copy IP bit from saved MSR */
|
|
||||||
lwz r6,GOT(transfer_to_handler)
|
|
||||||
mtlr r6
|
|
||||||
blrl
|
|
||||||
.L_ProgramCheck:
|
|
||||||
.long ProgramCheckException - _start + EXC_OFF_SYS_RESET
|
|
||||||
.long int_return - _start + EXC_OFF_SYS_RESET
|
|
||||||
|
|
||||||
STD_EXCEPTION(0x800, FPUnavailable, UnknownException)
|
STD_EXCEPTION(0x800, FPUnavailable, UnknownException)
|
||||||
|
|
||||||
|
@ -1033,17 +1018,3 @@ trap_init:
|
||||||
|
|
||||||
mtlr r4 /* restore link register */
|
mtlr r4 /* restore link register */
|
||||||
blr
|
blr
|
||||||
|
|
||||||
/*
|
|
||||||
* Function: relocate entries for one exception vector
|
|
||||||
*/
|
|
||||||
trap_reloc:
|
|
||||||
lwz r0, 0(r7) /* hdlr ... */
|
|
||||||
add r0, r0, r3 /* ... += dest_addr */
|
|
||||||
stw r0, 0(r7)
|
|
||||||
|
|
||||||
lwz r0, 4(r7) /* int_return ... */
|
|
||||||
add r0, r0, r3 /* ... += dest_addr */
|
|
||||||
stw r0, 4(r7)
|
|
||||||
|
|
||||||
blr
|
|
||||||
|
|
|
@ -338,30 +338,15 @@ Alignment:
|
||||||
mfspr r5,DSISR
|
mfspr r5,DSISR
|
||||||
stw r5,_DSISR(r21)
|
stw r5,_DSISR(r21)
|
||||||
addi r3,r1,STACK_FRAME_OVERHEAD
|
addi r3,r1,STACK_FRAME_OVERHEAD
|
||||||
li r20,MSR_KERNEL
|
EXC_XFER_TEMPLATE(Alignment, AlignmentException, MSR_KERNEL, COPY_EE)
|
||||||
rlwimi r20,r23,0,16,16 /* copy EE bit from saved MSR */
|
|
||||||
rlwimi r20,r23,0,25,25 /* copy IP bit from saved MSR */
|
|
||||||
lwz r6,GOT(transfer_to_handler)
|
|
||||||
mtlr r6
|
|
||||||
blrl
|
|
||||||
.L_Alignment:
|
|
||||||
.long AlignmentException - _start + EXC_OFF_SYS_RESET
|
|
||||||
.long int_return - _start + EXC_OFF_SYS_RESET
|
|
||||||
|
|
||||||
/* Program check exception */
|
/* Program check exception */
|
||||||
. = 0x700
|
. = 0x700
|
||||||
ProgramCheck:
|
ProgramCheck:
|
||||||
EXCEPTION_PROLOG(SRR0, SRR1)
|
EXCEPTION_PROLOG(SRR0, SRR1)
|
||||||
addi r3,r1,STACK_FRAME_OVERHEAD
|
addi r3,r1,STACK_FRAME_OVERHEAD
|
||||||
li r20,MSR_KERNEL
|
EXC_XFER_TEMPLATE(ProgramCheck, ProgramCheckException,
|
||||||
rlwimi r20,r23,0,16,16 /* copy EE bit from saved MSR */
|
MSR_KERNEL, COPY_EE)
|
||||||
rlwimi r20,r23,0,25,25 /* copy IP bit from saved MSR */
|
|
||||||
lwz r6,GOT(transfer_to_handler)
|
|
||||||
mtlr r6
|
|
||||||
blrl
|
|
||||||
.L_ProgramCheck:
|
|
||||||
.long ProgramCheckException - _start + EXC_OFF_SYS_RESET
|
|
||||||
.long int_return - _start + EXC_OFF_SYS_RESET
|
|
||||||
|
|
||||||
STD_EXCEPTION(0x800, FPUnavailable, UnknownException)
|
STD_EXCEPTION(0x800, FPUnavailable, UnknownException)
|
||||||
|
|
||||||
|
@ -1086,19 +1071,6 @@ trap_init:
|
||||||
mtlr r4 /* restore link register */
|
mtlr r4 /* restore link register */
|
||||||
blr
|
blr
|
||||||
|
|
||||||
/*
|
|
||||||
* Function: relocate entries for one exception vector
|
|
||||||
*/
|
|
||||||
trap_reloc:
|
|
||||||
lwz r0, 0(r7) /* hdlr ... */
|
|
||||||
add r0, r0, r3 /* ... += dest_addr */
|
|
||||||
stw r0, 0(r7)
|
|
||||||
|
|
||||||
lwz r0, 4(r7) /* int_return ... */
|
|
||||||
add r0, r0, r3 /* ... += dest_addr */
|
|
||||||
stw r0, 4(r7)
|
|
||||||
|
|
||||||
blr
|
|
||||||
#endif /* !CONFIG_NAND_SPL */
|
#endif /* !CONFIG_NAND_SPL */
|
||||||
|
|
||||||
#ifdef CONFIG_SYS_INIT_RAM_LOCK
|
#ifdef CONFIG_SYS_INIT_RAM_LOCK
|
||||||
|
|
|
@ -415,28 +415,15 @@ Alignment:
|
||||||
mfspr r5,DSISR
|
mfspr r5,DSISR
|
||||||
stw r5,_DSISR(r21)
|
stw r5,_DSISR(r21)
|
||||||
addi r3,r1,STACK_FRAME_OVERHEAD
|
addi r3,r1,STACK_FRAME_OVERHEAD
|
||||||
li r20,MSR_KERNEL
|
EXC_XFER_TEMPLATE(Alignment, AlignmentException, MSR_KERNEL, COPY_EE)
|
||||||
rlwimi r20,r23,0,16,16 /* copy EE bit from saved MSR */
|
|
||||||
lwz r6,GOT(transfer_to_handler)
|
|
||||||
mtlr r6
|
|
||||||
blrl
|
|
||||||
.L_Alignment:
|
|
||||||
.long AlignmentException - _start + _START_OFFSET
|
|
||||||
.long int_return - _start + _START_OFFSET
|
|
||||||
|
|
||||||
/* Program check exception */
|
/* Program check exception */
|
||||||
. = 0x0700
|
. = 0x0700
|
||||||
ProgramCheck:
|
ProgramCheck:
|
||||||
EXCEPTION_PROLOG(SRR0, SRR1)
|
EXCEPTION_PROLOG(SRR0, SRR1)
|
||||||
addi r3,r1,STACK_FRAME_OVERHEAD
|
addi r3,r1,STACK_FRAME_OVERHEAD
|
||||||
li r20,MSR_KERNEL
|
EXC_XFER_TEMPLATE(ProgramCheck, ProgramCheckException,
|
||||||
rlwimi r20,r23,0,16,16 /* copy EE bit from saved MSR */
|
MSR_KERNEL, COPY_EE)
|
||||||
lwz r6,GOT(transfer_to_handler)
|
|
||||||
mtlr r6
|
|
||||||
blrl
|
|
||||||
.L_ProgramCheck:
|
|
||||||
.long ProgramCheckException - _start + _START_OFFSET
|
|
||||||
.long int_return - _start + _START_OFFSET
|
|
||||||
|
|
||||||
/* No FPU on MPC85xx. This exception is not supposed to happen.
|
/* No FPU on MPC85xx. This exception is not supposed to happen.
|
||||||
*/
|
*/
|
||||||
|
@ -1089,20 +1076,6 @@ trap_init:
|
||||||
mtlr r4 /* restore link register */
|
mtlr r4 /* restore link register */
|
||||||
blr
|
blr
|
||||||
|
|
||||||
/*
|
|
||||||
* Function: relocate entries for one exception vector
|
|
||||||
*/
|
|
||||||
trap_reloc:
|
|
||||||
lwz r0,0(r7) /* hdlr ... */
|
|
||||||
add r0,r0,r3 /* ... += dest_addr */
|
|
||||||
stw r0,0(r7)
|
|
||||||
|
|
||||||
lwz r0,4(r7) /* int_return ... */
|
|
||||||
add r0,r0,r3 /* ... += dest_addr */
|
|
||||||
stw r0,4(r7)
|
|
||||||
|
|
||||||
blr
|
|
||||||
|
|
||||||
.globl unlock_ram_in_cache
|
.globl unlock_ram_in_cache
|
||||||
unlock_ram_in_cache:
|
unlock_ram_in_cache:
|
||||||
/* invalidate the INIT_RAM section */
|
/* invalidate the INIT_RAM section */
|
||||||
|
|
|
@ -121,28 +121,15 @@ Alignment:
|
||||||
mfspr r5,DSISR
|
mfspr r5,DSISR
|
||||||
stw r5,_DSISR(r21)
|
stw r5,_DSISR(r21)
|
||||||
addi r3,r1,STACK_FRAME_OVERHEAD
|
addi r3,r1,STACK_FRAME_OVERHEAD
|
||||||
li r20,MSR_KERNEL
|
EXC_XFER_TEMPLATE(Alignment, AlignmentException, MSR_KERNEL, COPY_EE)
|
||||||
rlwimi r20,r23,0,16,16 /* copy EE bit from saved MSR */
|
|
||||||
lwz r6,GOT(transfer_to_handler)
|
|
||||||
mtlr r6
|
|
||||||
blrl
|
|
||||||
.L_Alignment:
|
|
||||||
.long AlignmentException - _start + EXC_OFF_SYS_RESET
|
|
||||||
.long int_return - _start + EXC_OFF_SYS_RESET
|
|
||||||
|
|
||||||
/* Program check exception */
|
/* Program check exception */
|
||||||
. = 0x700
|
. = 0x700
|
||||||
ProgramCheck:
|
ProgramCheck:
|
||||||
EXCEPTION_PROLOG(SRR0, SRR1)
|
EXCEPTION_PROLOG(SRR0, SRR1)
|
||||||
addi r3,r1,STACK_FRAME_OVERHEAD
|
addi r3,r1,STACK_FRAME_OVERHEAD
|
||||||
li r20,MSR_KERNEL
|
EXC_XFER_TEMPLATE(ProgramCheck, ProgramCheckException,
|
||||||
rlwimi r20,r23,0,16,16 /* copy EE bit from saved MSR */
|
MSR_KERNEL, COPY_EE)
|
||||||
lwz r6,GOT(transfer_to_handler)
|
|
||||||
mtlr r6
|
|
||||||
blrl
|
|
||||||
.L_ProgramCheck:
|
|
||||||
.long ProgramCheckException - _start + EXC_OFF_SYS_RESET
|
|
||||||
.long int_return - _start + EXC_OFF_SYS_RESET
|
|
||||||
|
|
||||||
STD_EXCEPTION(0x800, FPUnavailable, UnknownException)
|
STD_EXCEPTION(0x800, FPUnavailable, UnknownException)
|
||||||
|
|
||||||
|
@ -848,23 +835,6 @@ trap_init:
|
||||||
mtlr r4 /* restore link register */
|
mtlr r4 /* restore link register */
|
||||||
blr
|
blr
|
||||||
|
|
||||||
/*
|
|
||||||
* Function: relocate entries for one exception vector
|
|
||||||
*/
|
|
||||||
trap_reloc:
|
|
||||||
lwz r0, 0(r7) /* hdlr ... */
|
|
||||||
add r0, r0, r3 /* ... += dest_addr */
|
|
||||||
stw r0, 0(r7)
|
|
||||||
|
|
||||||
lwz r0, 4(r7) /* int_return ... */
|
|
||||||
add r0, r0, r3 /* ... += dest_addr */
|
|
||||||
stw r0, 4(r7)
|
|
||||||
|
|
||||||
sync
|
|
||||||
isync
|
|
||||||
|
|
||||||
blr
|
|
||||||
|
|
||||||
.globl enable_ext_addr
|
.globl enable_ext_addr
|
||||||
enable_ext_addr:
|
enable_ext_addr:
|
||||||
mfspr r0, HID0
|
mfspr r0, HID0
|
||||||
|
|
|
@ -231,28 +231,15 @@ Alignment:
|
||||||
mfspr r5,DSISR
|
mfspr r5,DSISR
|
||||||
stw r5,_DSISR(r21)
|
stw r5,_DSISR(r21)
|
||||||
addi r3,r1,STACK_FRAME_OVERHEAD
|
addi r3,r1,STACK_FRAME_OVERHEAD
|
||||||
li r20,MSR_KERNEL
|
EXC_XFER_TEMPLATE(Alignment, AlignmentException, MSR_KERNEL, COPY_EE)
|
||||||
rlwimi r20,r23,0,16,16 /* copy EE bit from saved MSR */
|
|
||||||
lwz r6,GOT(transfer_to_handler)
|
|
||||||
mtlr r6
|
|
||||||
blrl
|
|
||||||
.L_Alignment:
|
|
||||||
.long AlignmentException - _start + EXC_OFF_SYS_RESET
|
|
||||||
.long int_return - _start + EXC_OFF_SYS_RESET
|
|
||||||
|
|
||||||
/* Program check exception */
|
/* Program check exception */
|
||||||
. = 0x700
|
. = 0x700
|
||||||
ProgramCheck:
|
ProgramCheck:
|
||||||
EXCEPTION_PROLOG(SRR0, SRR1)
|
EXCEPTION_PROLOG(SRR0, SRR1)
|
||||||
addi r3,r1,STACK_FRAME_OVERHEAD
|
addi r3,r1,STACK_FRAME_OVERHEAD
|
||||||
li r20,MSR_KERNEL
|
EXC_XFER_TEMPLATE(ProgramCheck, ProgramCheckException,
|
||||||
rlwimi r20,r23,0,16,16 /* copy EE bit from saved MSR */
|
MSR_KERNEL, COPY_EE)
|
||||||
lwz r6,GOT(transfer_to_handler)
|
|
||||||
mtlr r6
|
|
||||||
blrl
|
|
||||||
.L_ProgramCheck:
|
|
||||||
.long ProgramCheckException - _start + EXC_OFF_SYS_RESET
|
|
||||||
.long int_return - _start + EXC_OFF_SYS_RESET
|
|
||||||
|
|
||||||
/* No FPU on MPC8xx. This exception is not supposed to happen.
|
/* No FPU on MPC8xx. This exception is not supposed to happen.
|
||||||
*/
|
*/
|
||||||
|
@ -694,20 +681,3 @@ trap_init:
|
||||||
|
|
||||||
mtlr r4 /* restore link register */
|
mtlr r4 /* restore link register */
|
||||||
blr
|
blr
|
||||||
|
|
||||||
/*
|
|
||||||
* Function: relocate entries for one exception vector
|
|
||||||
*/
|
|
||||||
trap_reloc:
|
|
||||||
lwz r0, 0(r7) /* hdlr ... */
|
|
||||||
add r0, r0, r3 /* ... += dest_addr */
|
|
||||||
stw r0, 0(r7)
|
|
||||||
|
|
||||||
lwz r0, 4(r7) /* int_return ... */
|
|
||||||
add r0, r0, r3 /* ... += dest_addr */
|
|
||||||
stw r0, 4(r7)
|
|
||||||
|
|
||||||
sync
|
|
||||||
isync
|
|
||||||
|
|
||||||
blr
|
|
||||||
|
|
|
@ -574,28 +574,15 @@ Alignment:
|
||||||
mfspr r5,DSISR
|
mfspr r5,DSISR
|
||||||
stw r5,_DSISR(r21)
|
stw r5,_DSISR(r21)
|
||||||
addi r3,r1,STACK_FRAME_OVERHEAD
|
addi r3,r1,STACK_FRAME_OVERHEAD
|
||||||
li r20,MSR_KERNEL
|
EXC_XFER_TEMPLATE(Alignment, AlignmentException, MSR_KERNEL, COPY_EE)
|
||||||
rlwimi r20,r23,0,16,16 /* copy EE bit from saved MSR */
|
|
||||||
lwz r6,GOT(transfer_to_handler)
|
|
||||||
mtlr r6
|
|
||||||
blrl
|
|
||||||
.L_Alignment:
|
|
||||||
.long AlignmentException - _start + _START_OFFSET
|
|
||||||
.long int_return - _start + _START_OFFSET
|
|
||||||
|
|
||||||
/* Program check exception */
|
/* Program check exception */
|
||||||
. = 0x700
|
. = 0x700
|
||||||
ProgramCheck:
|
ProgramCheck:
|
||||||
EXCEPTION_PROLOG(SRR0, SRR1)
|
EXCEPTION_PROLOG(SRR0, SRR1)
|
||||||
addi r3,r1,STACK_FRAME_OVERHEAD
|
addi r3,r1,STACK_FRAME_OVERHEAD
|
||||||
li r20,MSR_KERNEL
|
EXC_XFER_TEMPLATE(ProgramCheck, ProgramCheckException,
|
||||||
rlwimi r20,r23,0,16,16 /* copy EE bit from saved MSR */
|
MSR_KERNEL, COPY_EE)
|
||||||
lwz r6,GOT(transfer_to_handler)
|
|
||||||
mtlr r6
|
|
||||||
blrl
|
|
||||||
.L_ProgramCheck:
|
|
||||||
.long ProgramCheckException - _start + _START_OFFSET
|
|
||||||
.long int_return - _start + _START_OFFSET
|
|
||||||
|
|
||||||
#ifdef CONFIG_440
|
#ifdef CONFIG_440
|
||||||
STD_EXCEPTION(0x800, FPUnavailable, UnknownException)
|
STD_EXCEPTION(0x800, FPUnavailable, UnknownException)
|
||||||
|
@ -1742,20 +1729,6 @@ __440_msr_continue:
|
||||||
mtlr r4 /* restore link register */
|
mtlr r4 /* restore link register */
|
||||||
blr
|
blr
|
||||||
|
|
||||||
/*
|
|
||||||
* Function: relocate entries for one exception vector
|
|
||||||
*/
|
|
||||||
trap_reloc:
|
|
||||||
lwz r0, 0(r7) /* hdlr ... */
|
|
||||||
add r0, r0, r3 /* ... += dest_addr */
|
|
||||||
stw r0, 0(r7)
|
|
||||||
|
|
||||||
lwz r0, 4(r7) /* int_return ... */
|
|
||||||
add r0, r0, r3 /* ... += dest_addr */
|
|
||||||
stw r0, 4(r7)
|
|
||||||
|
|
||||||
blr
|
|
||||||
|
|
||||||
#if defined(CONFIG_440)
|
#if defined(CONFIG_440)
|
||||||
/*----------------------------------------------------------------------------+
|
/*----------------------------------------------------------------------------+
|
||||||
| dcbz_area.
|
| dcbz_area.
|
||||||
|
|
|
@ -257,46 +257,43 @@
|
||||||
* OFFSET values only; they must be relocated first before they can
|
* OFFSET values only; they must be relocated first before they can
|
||||||
* be used!
|
* be used!
|
||||||
*/
|
*/
|
||||||
#define STD_EXCEPTION(n, label, hdlr) \
|
#define COPY_EE(d, s) rlwimi d,s,0,16,16
|
||||||
. = n; \
|
#define NOCOPY(d, s)
|
||||||
label: \
|
#define EXC_XFER_TEMPLATE(label, hdlr, msr, copyee) \
|
||||||
EXCEPTION_PROLOG(SRR0, SRR1); \
|
bl 1f; \
|
||||||
lwz r3,GOT(transfer_to_handler); \
|
1: mflr r20; \
|
||||||
mtlr r3; \
|
lwz r20,(.L_ ## label)-1b+8(r20); \
|
||||||
addi r3,r1,STACK_FRAME_OVERHEAD; \
|
mtlr r20; \
|
||||||
li r20,MSR_KERNEL; \
|
li r20,msr; \
|
||||||
|
copyee(r20,r23); \
|
||||||
rlwimi r20,r23,0,25,25; \
|
rlwimi r20,r23,0,25,25; \
|
||||||
blrl; \
|
blrl; \
|
||||||
.L_ ## label : \
|
.L_ ## label : \
|
||||||
.long hdlr - _start + _START_OFFSET; \
|
.long hdlr - _start + _START_OFFSET; \
|
||||||
.long int_return - _start + _START_OFFSET
|
.long int_return - _start + _START_OFFSET; \
|
||||||
|
.long transfer_to_handler - _start + _START_OFFSET
|
||||||
|
|
||||||
|
#define STD_EXCEPTION(n, label, hdlr) \
|
||||||
|
. = n; \
|
||||||
|
label: \
|
||||||
|
EXCEPTION_PROLOG(SRR0, SRR1); \
|
||||||
|
addi r3,r1,STACK_FRAME_OVERHEAD; \
|
||||||
|
EXC_XFER_TEMPLATE(label, hdlr, MSR_KERNEL, NOCOPY) \
|
||||||
|
|
||||||
#define CRIT_EXCEPTION(n, label, hdlr) \
|
#define CRIT_EXCEPTION(n, label, hdlr) \
|
||||||
. = n; \
|
. = n; \
|
||||||
label: \
|
label: \
|
||||||
EXCEPTION_PROLOG(CSRR0, CSRR1); \
|
EXCEPTION_PROLOG(CSRR0, CSRR1); \
|
||||||
lwz r3,GOT(transfer_to_handler); \
|
|
||||||
mtlr r3; \
|
|
||||||
addi r3,r1,STACK_FRAME_OVERHEAD; \
|
addi r3,r1,STACK_FRAME_OVERHEAD; \
|
||||||
li r20,(MSR_KERNEL & ~(MSR_ME|MSR_DE|MSR_CE)); \
|
EXC_XFER_TEMPLATE(label, hdlr, \
|
||||||
rlwimi r20,r23,0,25,25; \
|
MSR_KERNEL & ~(MSR_ME|MSR_DE|MSR_CE), NOCOPY) \
|
||||||
blrl; \
|
|
||||||
.L_ ## label : \
|
|
||||||
.long hdlr - _start + _START_OFFSET; \
|
|
||||||
.long crit_return - _start + _START_OFFSET
|
|
||||||
|
|
||||||
#define MCK_EXCEPTION(n, label, hdlr) \
|
#define MCK_EXCEPTION(n, label, hdlr) \
|
||||||
. = n; \
|
. = n; \
|
||||||
label: \
|
label: \
|
||||||
EXCEPTION_PROLOG(MCSRR0, MCSRR1); \
|
EXCEPTION_PROLOG(MCSRR0, MCSRR1); \
|
||||||
lwz r3,GOT(transfer_to_handler); \
|
|
||||||
mtlr r3; \
|
|
||||||
addi r3,r1,STACK_FRAME_OVERHEAD; \
|
addi r3,r1,STACK_FRAME_OVERHEAD; \
|
||||||
li r20,(MSR_KERNEL & ~(MSR_ME|MSR_DE|MSR_CE)); \
|
EXC_XFER_TEMPLATE(label, hdlr, \
|
||||||
rlwimi r20,r23,0,25,25; \
|
MSR_KERNEL & ~(MSR_ME|MSR_DE|MSR_CE), NOCOPY) \
|
||||||
blrl; \
|
|
||||||
.L_ ## label : \
|
|
||||||
.long hdlr - _start + _START_OFFSET; \
|
|
||||||
.long mck_return - _start + _START_OFFSET
|
|
||||||
|
|
||||||
#endif /* __PPC_ASM_TMPL__ */
|
#endif /* __PPC_ASM_TMPL__ */
|
||||||
|
|
|
@ -28,6 +28,7 @@ LIB = $(obj)lib$(ARCH).a
|
||||||
SOBJS-y += ppccache.o
|
SOBJS-y += ppccache.o
|
||||||
SOBJS-y += ppcstring.o
|
SOBJS-y += ppcstring.o
|
||||||
SOBJS-y += ticks.o
|
SOBJS-y += ticks.o
|
||||||
|
SOBJS-y += reloc.o
|
||||||
|
|
||||||
COBJS-y += bat_rw.o
|
COBJS-y += bat_rw.o
|
||||||
COBJS-y += board.o
|
COBJS-y += board.o
|
||||||
|
|
|
@ -0,0 +1,49 @@
|
||||||
|
/*
|
||||||
|
* Copyright (C) 2009 Wolfgang Denk <wd@denx.de>
|
||||||
|
*
|
||||||
|
* See file CREDITS for list of people who contributed to this
|
||||||
|
* project.
|
||||||
|
*
|
||||||
|
* This program is free software; you can redistribute it and/or
|
||||||
|
* modify it under the terms of the GNU General Public License as
|
||||||
|
* published by the Free Software Foundation; either version 2 of
|
||||||
|
* the License, or (at your option) any later version.
|
||||||
|
*
|
||||||
|
* This program is distributed in the hope that it will be useful,
|
||||||
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||||
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||||
|
* GNU General Public License for more details.
|
||||||
|
*
|
||||||
|
* You should have received a copy of the GNU General Public License
|
||||||
|
* along with this program; if not, write to the Free Software
|
||||||
|
* Foundation, Inc., 59 Temple Place, Suite 330, Boston,
|
||||||
|
* MA 02111-1307 USA
|
||||||
|
*/
|
||||||
|
|
||||||
|
#include <ppc_asm.tmpl>
|
||||||
|
|
||||||
|
.file "reloc.S"
|
||||||
|
|
||||||
|
.text
|
||||||
|
#ifndef CONFIG_NAND_SPL
|
||||||
|
/*
|
||||||
|
* Function: relocate entries for one exception vector
|
||||||
|
*/
|
||||||
|
.globl trap_reloc
|
||||||
|
.type trap_reloc, @function
|
||||||
|
trap_reloc:
|
||||||
|
lwz r0, 0(r7) /* hdlr ... */
|
||||||
|
add r0, r0, r3 /* ... += dest_addr */
|
||||||
|
stw r0, 0(r7)
|
||||||
|
|
||||||
|
lwz r0, 4(r7) /* int_return ... */
|
||||||
|
add r0, r0, r3 /* ... += dest_addr */
|
||||||
|
stw r0, 4(r7)
|
||||||
|
|
||||||
|
lwz r0, 8(r7) /* transfer_to_handler ...*/
|
||||||
|
add r0, r0, r3 /* ... += dest_addr */
|
||||||
|
stw r0, 8(r7)
|
||||||
|
|
||||||
|
blr
|
||||||
|
.size trap_reloc, .-trap_reloc
|
||||||
|
#endif
|
Loading…
Reference in New Issue