Commit 37737a2a authored by Christophe Leroy's avatar Christophe Leroy Committed by Michael Ellerman

powerpc/32: move LOAD_MSR_KERNEL() into head_32.h and use it

As preparation for using head_32.h for head_40x.S, move
LOAD_MSR_KERNEL() there and use it to load r10 with MSR_KERNEL value.

In the mean time, this patch modifies it so that it takes into account
the size of the passed value to determine if 'li' can be used or if
'lis/ori' is needed instead of using the size of MSR_KERNEL. This is
done by using gas macro.
Signed-off-by: default avatarChristophe Leroy <christophe.leroy@c-s.fr>
Signed-off-by: default avatarMichael Ellerman <mpe@ellerman.id.au>
parent 8a23fdec
...@@ -38,14 +38,7 @@ ...@@ -38,14 +38,7 @@
#include <asm/barrier.h> #include <asm/barrier.h>
#include <asm/kup.h> #include <asm/kup.h>
/* #include "head_32.h"
* MSR_KERNEL is > 0x10000 on 4xx/Book-E since it include MSR_CE.
*/
#if MSR_KERNEL >= 0x10000
#define LOAD_MSR_KERNEL(r, x) lis r,(x)@h; ori r,r,(x)@l
#else
#define LOAD_MSR_KERNEL(r, x) li r,(x)
#endif
/* /*
* Align to 4k in order to ensure that all functions modyfing srr0/srr1 * Align to 4k in order to ensure that all functions modyfing srr0/srr1
......
...@@ -4,6 +4,19 @@ ...@@ -4,6 +4,19 @@
#include <asm/ptrace.h> /* for STACK_FRAME_REGS_MARKER */ #include <asm/ptrace.h> /* for STACK_FRAME_REGS_MARKER */
/*
* MSR_KERNEL is > 0x8000 on 4xx/Book-E since it include MSR_CE.
*/
.macro __LOAD_MSR_KERNEL r, x
.if \x >= 0x8000
lis \r, (\x)@h
ori \r, \r, (\x)@l
.else
li \r, (\x)
.endif
.endm
#define LOAD_MSR_KERNEL(r, x) __LOAD_MSR_KERNEL r, x
/* /*
* Exception entry code. This code runs with address translation * Exception entry code. This code runs with address translation
* turned off, i.e. using physical addresses. * turned off, i.e. using physical addresses.
...@@ -89,7 +102,7 @@ ...@@ -89,7 +102,7 @@
#define EXC_XFER_TEMPLATE(n, hdlr, trap, copyee, tfer, ret) \ #define EXC_XFER_TEMPLATE(n, hdlr, trap, copyee, tfer, ret) \
li r10,trap; \ li r10,trap; \
stw r10,_TRAP(r11); \ stw r10,_TRAP(r11); \
li r10,MSR_KERNEL; \ LOAD_MSR_KERNEL(r10, MSR_KERNEL); \
copyee(r10, r9); \ copyee(r10, r9); \
bl tfer; \ bl tfer; \
i##n: \ i##n: \
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment