diff options
author | Heiko Carstens <heiko.carstens@de.ibm.com> | 2012-06-05 03:59:52 -0400 |
---|---|---|
committer | Martin Schwidefsky <schwidefsky@de.ibm.com> | 2012-06-14 03:09:02 -0400 |
commit | fbe765680d1fe9d08187ea4dad5041a7955a2c3a (patch) | |
tree | cfa5ba11106bb5535552cf6b29ff6aa81f32c606 /arch/s390/kernel/entry.S | |
parent | 72f6e3a8bc956fddf6e004ae9b804977d1458e77 (diff) |
s390/smp: make absolute lowcore / cpu restart parameter accesses more robust
Setting the cpu restart parameters is done in three different fashions:
- directly setting the four parameters individually
- copying the four parameters with memcpy (using 4 * sizeof(long))
- copying the four parameters using a private structure
In addition code in entry*.S relies on a certain order of the restart
members of struct _lowcore.
Make all of this more robust to future changes by adding a
mem_absolute_assign(dest, val) define, which assigns val to dest
using absolute addressing mode. Also the load multiple instructions
in entry*.S have been split into separate load instruction so the
order of the struct _lowcore members doesn't matter anymore.
In addition move the prototypes of memcpy_real/absolute from uaccess.h
to processor.h. These memcpy* variants are not related to uaccess at all.
string.h doesn't seem to match as well, so lets use processor.h.
Also replace the eight byte array in struct _lowcore which represents a
misaliged u64 with a u64. The compiler will always create code that
handles the misaligned u64 correctly.
Signed-off-by: Heiko Carstens <heiko.carstens@de.ibm.com>
Signed-off-by: Martin Schwidefsky <schwidefsky@de.ibm.com>
Diffstat (limited to 'arch/s390/kernel/entry.S')
-rw-r--r-- | arch/s390/kernel/entry.S | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/arch/s390/kernel/entry.S b/arch/s390/kernel/entry.S index 3787f9e6907a..4ea53cd7c8c3 100644 --- a/arch/s390/kernel/entry.S +++ b/arch/s390/kernel/entry.S | |||
@@ -724,7 +724,9 @@ ENTRY(restart_int_handler) | |||
724 | mvc __PT_PSW(8,%r15),__LC_RST_OLD_PSW # store restart old psw | 724 | mvc __PT_PSW(8,%r15),__LC_RST_OLD_PSW # store restart old psw |
725 | ahi %r15,-STACK_FRAME_OVERHEAD # create stack frame on stack | 725 | ahi %r15,-STACK_FRAME_OVERHEAD # create stack frame on stack |
726 | xc 0(STACK_FRAME_OVERHEAD,%r15),0(%r15) | 726 | xc 0(STACK_FRAME_OVERHEAD,%r15),0(%r15) |
727 | lm %r1,%r3,__LC_RESTART_FN # load fn, parm & source cpu | 727 | l %r1,__LC_RESTART_FN # load fn, parm & source cpu |
728 | l %r2,__LC_RESTART_DATA | ||
729 | l %r3,__LC_RESTART_SOURCE | ||
728 | ltr %r3,%r3 # test source cpu address | 730 | ltr %r3,%r3 # test source cpu address |
729 | jm 1f # negative -> skip source stop | 731 | jm 1f # negative -> skip source stop |
730 | 0: sigp %r4,%r3,SIGP_SENSE # sigp sense to source cpu | 732 | 0: sigp %r4,%r3,SIGP_SENSE # sigp sense to source cpu |