1 files changed, 49 insertions, 12 deletions

diff --git a/arch/s390/kernel/base.S b/arch/s390/kernel/base.S
index 15e46ca9433..255435663bf 100644
--- a/arch/s390/kernel/base.S
+++ b/arch/s390/kernel/base.S
@@ -6,13 +6,13 @@
  *               Michael Holzheu <holzheu@de.ibm.com>
  */
 
+#include <linux/linkage.h>
 #include <asm/asm-offsets.h>
 #include <asm/ptrace.h>
 
 #ifdef CONFIG_64BIT
 
-        .globl  s390_base_mcck_handler
-s390_base_mcck_handler:
+ENTRY(s390_base_mcck_handler)
         basr    %r13,0
 0:      lg      %r15,__LC_PANIC_STACK   # load panic stack
         aghi    %r15,-STACK_FRAME_OVERHEAD
@@ -26,13 +26,13 @@ s390_base_mcck_handler:
         lpswe   __LC_MCK_OLD_PSW
 
         .section .bss
+        .align 8
         .globl  s390_base_mcck_handler_fn
 s390_base_mcck_handler_fn:
         .quad   0
         .previous
 
-        .globl  s390_base_ext_handler
-s390_base_ext_handler:
+ENTRY(s390_base_ext_handler)
         stmg    %r0,%r15,__LC_SAVE_AREA
         basr    %r13,0
 0:      aghi    %r15,-STACK_FRAME_OVERHEAD
@@ -46,13 +46,13 @@ s390_base_ext_handler:
         lpswe   __LC_EXT_OLD_PSW
 
         .section .bss
+        .align 8
         .globl s390_base_ext_handler_fn
 s390_base_ext_handler_fn:
         .quad   0
         .previous
 
-        .globl  s390_base_pgm_handler
-s390_base_pgm_handler:
+ENTRY(s390_base_pgm_handler)
         stmg    %r0,%r15,__LC_SAVE_AREA
         basr    %r13,0
 0:      aghi    %r15,-STACK_FRAME_OVERHEAD
@@ -70,15 +70,51 @@ disabled_wait_psw:
         .quad   0x0002000180000000,0x0000000000000000 + s390_base_pgm_handler
 
         .section .bss
+        .align 8
         .globl s390_base_pgm_handler_fn
 s390_base_pgm_handler_fn:
         .quad   0
         .previous
 
+#
+# Calls diag 308 subcode 1 and continues execution
+#
+# The following conditions must be ensured before calling this function:
+# * Prefix register = 0
+# * Lowcore protection is disabled
+#
+ENTRY(diag308_reset)
+        larl    %r4,.Lctlregs           # Save control registers
+        stctg   %c0,%c15,0(%r4)
+        larl    %r4,.Lrestart_psw       # Setup restart PSW at absolute 0
+        lghi    %r3,0
+        lg      %r4,0(%r4)              # Save PSW
+        sturg   %r4,%r3                 # Use sturg, because of large pages
+        lghi    %r1,1
+        diag    %r1,%r1,0x308
+.Lrestart_part2:
+        lhi     %r0,0                   # Load r0 with zero
+        lhi     %r1,2                   # Use mode 2 = ESAME (dump)
+        sigp    %r1,%r0,0x12            # Switch to ESAME mode
+        sam64                           # Switch to 64 bit addressing mode
+        larl    %r4,.Lctlregs           # Restore control registers
+        lctlg   %c0,%c15,0(%r4)
+        br      %r14
+.align 16
+.Lrestart_psw:
+        .long   0x00080000,0x80000000 + .Lrestart_part2
+
+        .section .bss
+.align 8
+.Lctlregs:
+        .rept   16
+        .quad   0
+        .endr
+        .previous
+
 #else /* CONFIG_64BIT */
 
-        .globl  s390_base_mcck_handler
-s390_base_mcck_handler:
+ENTRY(s390_base_mcck_handler)
         basr    %r13,0
 0:      l       %r15,__LC_PANIC_STACK   # load panic stack
         ahi     %r15,-STACK_FRAME_OVERHEAD
@@ -93,13 +129,13 @@ s390_base_mcck_handler:
 2:      .long   s390_base_mcck_handler_fn
 
         .section .bss
+        .align 4
         .globl  s390_base_mcck_handler_fn
 s390_base_mcck_handler_fn:
         .long   0
         .previous
 
-        .globl  s390_base_ext_handler
-s390_base_ext_handler:
+ENTRY(s390_base_ext_handler)
         stm     %r0,%r15,__LC_SAVE_AREA
         basr    %r13,0
 0:      ahi     %r15,-STACK_FRAME_OVERHEAD
@@ -115,13 +151,13 @@ s390_base_ext_handler:
 2:      .long   s390_base_ext_handler_fn
 
         .section .bss
+        .align 4
         .globl  s390_base_ext_handler_fn
 s390_base_ext_handler_fn:
         .long   0
         .previous
 
-        .globl  s390_base_pgm_handler
-s390_base_pgm_handler:
+ENTRY(s390_base_pgm_handler)
         stm     %r0,%r15,__LC_SAVE_AREA
         basr    %r13,0
 0:      ahi     %r15,-STACK_FRAME_OVERHEAD
@@ -142,6 +178,7 @@ disabled_wait_psw:
         .long   0x000a0000,0x00000000 + s390_base_pgm_handler
 
         .section .bss
+        .align 4
         .globl  s390_base_pgm_handler_fn
 s390_base_pgm_handler_fn:
         .long   0