mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-08-26 10:49:33 +00:00
[PATCH] s390: diag 0x308 reipl
Add code to support the re-IPL method using diagnose 0x308. Signed-off-by: Martin Schwidefsky <schwidefsky@de.ibm.com> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
This commit is contained in:
parent
b7ae9dd80a
commit
c782268be8
4 changed files with 46 additions and 1 deletions
|
@ -6,7 +6,7 @@ EXTRA_AFLAGS := -traditional
|
|||
|
||||
obj-y := bitmap.o traps.o time.o process.o \
|
||||
setup.o sys_s390.o ptrace.o signal.o cpcmd.o ebcdic.o \
|
||||
semaphore.o s390_ext.o debug.o profile.o irq.o
|
||||
semaphore.o s390_ext.o debug.o profile.o irq.o reipl_diag.o
|
||||
|
||||
extra-$(CONFIG_ARCH_S390_31) += head.o
|
||||
extra-$(CONFIG_ARCH_S390X) += head64.o
|
||||
|
|
39
arch/s390/kernel/reipl_diag.c
Normal file
39
arch/s390/kernel/reipl_diag.c
Normal file
|
@ -0,0 +1,39 @@
|
|||
/*
|
||||
* This file contains the implementation of the
|
||||
* Linux re-IPL support
|
||||
*
|
||||
* (C) Copyright IBM Corp. 2005
|
||||
*
|
||||
* Author(s): Volker Sameske (sameske@de.ibm.com)
|
||||
*
|
||||
*/
|
||||
|
||||
#include <linux/kernel.h>
|
||||
|
||||
static unsigned int reipl_diag_rc1;
|
||||
static unsigned int reipl_diag_rc2;
|
||||
|
||||
/*
|
||||
* re-IPL the system using the last used IPL parameters
|
||||
*/
|
||||
void reipl_diag(void)
|
||||
{
|
||||
asm volatile (
|
||||
" la %%r4,0\n"
|
||||
" la %%r5,0\n"
|
||||
" diag %%r4,%2,0x308\n"
|
||||
"0:\n"
|
||||
" st %%r4,%0\n"
|
||||
" st %%r5,%1\n"
|
||||
".section __ex_table,\"a\"\n"
|
||||
#ifdef __s390x__
|
||||
" .align 8\n"
|
||||
" .quad 0b, 0b\n"
|
||||
#else
|
||||
" .align 4\n"
|
||||
" .long 0b, 0b\n"
|
||||
#endif
|
||||
".previous\n"
|
||||
: "=m" (reipl_diag_rc1), "=m" (reipl_diag_rc2)
|
||||
: "d" (3) : "cc", "4", "5" );
|
||||
}
|
|
@ -261,8 +261,11 @@ void (*_machine_power_off)(void) = machine_power_off_smp;
|
|||
* Reboot, halt and power_off routines for non SMP.
|
||||
*/
|
||||
extern void reipl(unsigned long devno);
|
||||
extern void reipl_diag(void);
|
||||
static void do_machine_restart_nonsmp(char * __unused)
|
||||
{
|
||||
reipl_diag();
|
||||
|
||||
if (MACHINE_IS_VM)
|
||||
cpcmd ("IPL", NULL, 0);
|
||||
else
|
||||
|
|
|
@ -65,6 +65,7 @@ extern char vmhalt_cmd[];
|
|||
extern char vmpoff_cmd[];
|
||||
|
||||
extern void reipl(unsigned long devno);
|
||||
extern void reipl_diag(void);
|
||||
|
||||
static void smp_ext_bitcall(int, ec_bit_sig);
|
||||
static void smp_ext_bitcall_others(ec_bit_sig);
|
||||
|
@ -283,6 +284,8 @@ static void do_machine_restart(void * __unused)
|
|||
* interrupted by an external interrupt and s390irq
|
||||
* locks are always held disabled).
|
||||
*/
|
||||
reipl_diag();
|
||||
|
||||
if (MACHINE_IS_VM)
|
||||
cpcmd ("IPL", NULL, 0, NULL);
|
||||
else
|
||||
|
|
Loading…
Reference in a new issue