1
0
Fork 0

powerpc/64s/exception: shuffle windup code around

Restore all SPRs and CR up-front, these are longer latency
instructions. Move register restore around to maximise pairs of
adjacent loads (e.g., restore r0 next to r1).

Signed-off-by: Nicholas Piggin <npiggin@gmail.com>
Signed-off-by: Michael Ellerman <mpe@ellerman.id.au>
alistair/sunxi64-5.4-dsi
Nicholas Piggin 2019-06-28 15:33:26 +10:00 committed by Michael Ellerman
parent 67d4160a61
commit b113c08341
1 changed files with 16 additions and 24 deletions

View File

@ -917,13 +917,11 @@ EXC_COMMON_BEGIN(system_reset_common)
mtxer r9
ld r9,_LINK(r1)
mtlr r9
REST_GPR(0, r1)
ld r9,_CCR(r1)
mtcr r9
REST_8GPRS(2, r1)
REST_GPR(10, r1)
ld r11,_CCR(r1)
mtcr r11
REST_GPR(11, r1)
REST_2GPRS(12, r1)
REST_4GPRS(10, r1)
REST_GPR(0, r1)
/* restore original r1. */
ld r1,GPR1(r1)
RFI_TO_USER_OR_KERNEL
@ -1095,13 +1093,11 @@ EXC_COMMON_BEGIN(machine_check_common)
mtxer r9; \
ld r9,_LINK(r1); \
mtlr r9; \
REST_GPR(0, r1); \
ld r9,_CCR(r1); \
mtcr r9; \
REST_8GPRS(2, r1); \
REST_GPR(10, r1); \
ld r11,_CCR(r1); \
mtcr r11; \
REST_GPR(11, r1); \
REST_2GPRS(12, r1); \
REST_4GPRS(10, r1); \
REST_GPR(0, r1); \
/* restore original r1. */ \
ld r1,GPR1(r1)
@ -1795,13 +1791,11 @@ TRAMP_REAL_BEGIN(hmi_exception_early)
mtxer r9
ld r9,_LINK(r1)
mtlr r9
REST_GPR(0, r1)
ld r9,_CCR(r1)
mtcr r9
REST_8GPRS(2, r1)
REST_GPR(10, r1)
ld r11,_CCR(r1)
REST_2GPRS(12, r1)
mtcr r11
REST_GPR(11, r1)
REST_4GPRS(10, r1)
REST_GPR(0, r1)
ld r1,GPR1(r1)
HRFI_TO_USER_OR_KERNEL
@ -1816,13 +1810,11 @@ TRAMP_REAL_BEGIN(hmi_exception_early)
mtxer r9
ld r9,_LINK(r1)
mtlr r9
REST_GPR(0, r1)
ld r9,_CCR(r1)
mtcr r9
REST_8GPRS(2, r1)
REST_GPR(10, r1)
ld r11,_CCR(r1)
REST_2GPRS(12, r1)
mtcr r11
REST_GPR(11, r1)
REST_4GPRS(10, r1)
REST_GPR(0, r1)
ld r1,GPR1(r1)
/*