convert some assembler to C.
Subsystems (2)
From: Heiko Carstens <[email protected]>
[S390] convert some assembler to C.
Convert GET_IPL_DEVICE assembler macro to C function.
Signed-off-by Heiko Carstens <[email protected]>
Signed-off-by Martin Schwidefsky <[email protected]>
---
arch/s390/kernel/head.S | 59 --------------------------------------------- arch/s390/kernel/head31.S | 43 ++++++++++++++++++++++---------- arch/s390/kernel/head64.S | 39 +++++++++++++++++++---------- arch/s390/kernel/ipl.c | 4 +-- drivers/s390/cio/cio.c | 38 +++++++++++++++++++++++++++- include/asm-s390/lowcore.h | 1 include/asm-s390/setup.h | 8 +++--- 7 files changed, 99 insertions(+), 93 deletions(-)
arch/s390/kernel/head31.S +30 -13
@@ -37,13 +37,23 @@ startup:basr %r13,0 # get base startup_continue: basr %r13,0 # get base -.LPG1: GET_IPL_DEVICE - mvi __LC_AR_MODE_ID,0 # set ESA flag (mode 0) +.LPG1: mvi __LC_AR_MODE_ID,0 # set ESA flag (mode 0) lctl %c0,%c15,.Lctl-.LPG1(%r13) # load control registers l %r12,.Lparmaddr-.LPG1(%r13) # pointer to parameter area # move IPL device to lowcore mvc __LC_IPLDEV(4),IPL_DEVICE-PARMAREA(%r12) +# +# Setup stack +# + l %r15,.Linittu-.LPG1(%r13) + mvc __LC_CURRENT(4),__TI_task(%r15) + ahi %r15,1<<(PAGE_SHIFT+THREAD_ORDER) # init_task_union+THREAD_SIZE + st %r15,__LC_KERNEL_STACK # set end of kernel stack + ahi %r15,-96 + xc __SF_BACKCHAIN(4,%r15),__SF_BACKCHAIN(%r15) # clear backchain + l %r14,.Lipl_save_parameters-.LPG1(%r13) + basr %r14,%r14 # # clear bss memory #
@@ -115,6 +125,10 @@ startup_continue: b .Lfchunk-.LPG1(%r13) .align 4 +.Lipl_save_parameters: + .long ipl_save_parameters +.Linittu: + .long init_thread_union .Lpmask: .byte 0 .align 8
@@ -274,6 +288,20 @@ startup_continue: .Lbss_end: .long _end .Lparmaddr: .long PARMAREA .Lsccbaddr: .long .Lsccb + + .globl ipl_schib +ipl_schib: + .rept 13 + .long 0 + .endr + + .globl ipl_flags +ipl_flags: + .long 0 + .globl ipl_devno +ipl_devno: + .word 0 + .org 0x12000 .globl s390_readinfo_sccb s390_readinfo_sccb:
@@ -305,16 +333,6 @@ s390_readinfo_sccb: .globl _stext _stext: basr %r13,0 # get base .LPG3: -# -# Setup stack -# - l %r15,.Linittu-.LPG3(%r13) - mvc __LC_CURRENT(4),__TI_task(%r15) - ahi %r15,1<<(PAGE_SHIFT+THREAD_ORDER) # init_task_union+THREAD_SIZE - st %r15,__LC_KERNEL_STACK # set end of kernel stack - ahi %r15,-96 - xc __SF_BACKCHAIN(4,%r15),__SF_BACKCHAIN(%r15) # clear backchain - # check control registers stctl %c0,%c15,0(%r15) oi 2(%r15),0x40 # enable sigp emergency signal
@@ -333,6 +351,5 @@ _stext: basr %r13,0 # get base # .align 8 .Ldw: .long 0x000a0000,0x00000000 -.Linittu:.long init_thread_union .Lstart:.long start_kernel .Laregs:.long 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
arch/s390/kernel/head64.S +25 -14
@@ -39,7 +39,6 @@ startup_continue: basr %r13,0 # get base .LPG1: sll %r13,1 # remove high order bit srl %r13,1 - GET_IPL_DEVICE lhi %r1,1 # mode 1 = esame mvi __LC_AR_MODE_ID,1 # set esame flag slr %r0,%r0 # set cpuid to zero
@@ -49,7 +48,18 @@ startup_continue: lg %r12,.Lparmaddr-.LPG1(%r13)# pointer to parameter area # move IPL device to lowcore mvc __LC_IPLDEV(4),IPL_DEVICE+4-PARMAREA(%r12) +# +# Setup stack +# + larl %r15,init_thread_union + lg %r14,__TI_task(%r15) # cache current in lowcore + stg %r14,__LC_CURRENT + aghi %r15,1<<(PAGE_SHIFT+THREAD_ORDER) # init_task_union + THREAD_SIZE + stg %r15,__LC_KERNEL_STACK # set end of kernel stack + aghi %r15,-160 + xc __SF_BACKCHAIN(4,%r15),__SF_BACKCHAIN(%r15) # clear backchain + brasl %r14,ipl_save_parameters # # clear bss memory #
@@ -269,6 +279,19 @@ startup_continue: .Lparmaddr: .quad PARMAREA + .globl ipl_schib +ipl_schib: + .rept 13 + .long 0 + .endr + + .globl ipl_flags +ipl_flags: + .long 0 + .globl ipl_devno +ipl_devno: + .word 0 + .org 0x12000 .globl s390_readinfo_sccb s390_readinfo_sccb:
@@ -300,24 +323,12 @@ s390_readinfo_sccb: .globl _stext _stext: basr %r13,0 # get base .LPG3: -# -# Setup stack -# - larl %r15,init_thread_union - lg %r14,__TI_task(%r15) # cache current in lowcore - stg %r14,__LC_CURRENT - aghi %r15,1<<(PAGE_SHIFT+THREAD_ORDER) # init_task_union + THREAD_SIZE - stg %r15,__LC_KERNEL_STACK # set end of kernel stack - aghi %r15,-160 - xc __SF_BACKCHAIN(4,%r15),__SF_BACKCHAIN(%r15) # clear backchain - # check control registers stctg %c0,%c15,0(%r15) oi 6(%r15),0x40 # enable sigp emergency signal oi 4(%r15),0x10 # switch on low address proctection lctlg %c0,%c15,0(%r15) -# lam 0,15,.Laregs-.LPG3(%r13) # load access regs needed by uaccess brasl %r14,start_kernel # go to C code #
@@ -325,7 +336,7 @@ _stext: basr %r13,0 # basr %r13,0 lpswe .Ldw-.(%r13) # load disabled wait psw -# + .align 8 .Ldw: .quad 0x0002000180000000,0x0000000000000000 .Laregs: .long 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
arch/s390/kernel/head.S +0 -59
65 lines not on this page · raw message
arch/s390/kernel/ipl.c +2 -2
@@ -189,9 +189,9 @@ static enum ipl_type ipl_get_type(void) {struct ipl_parameter_block *ipl =IPL_PARMBLOCK_START ; -if (!IPL_DEVNO_VALID ) +if (!(ipl_flags &IPL_DEVNO_VALID ))return IPL_TYPE_UNKNOWN ; -if (!IPL_PARMBLOCK_VALID ) +if (!(ipl_flags &IPL_PARMBLOCK_VALID ))return IPL_TYPE_CCW ;if (ipl->hdr.version >IPL_MAX_SUPPORTED_VERSION )return IPL_TYPE_UNKNOWN ;
drivers/s390/cio/cio.c +36 -2
@@ -16,11 +16,10 @@#include <linux/device.h> #include <linux/kernel_stat.h> #include <linux/interrupt.h> -#include <asm/cio.h> #include <asm/delay.h> #include <asm/irq.h> - +#include <asm/setup.h> #include "airq.h" #include "cio.h" #include "css.h"
@@ -909,3 +908,38 @@ void reipl_ccw_dev(struct ccw_dev_id *decio_reset_channel_paths ();do_reipl_asm (*((__u32 *)&schid)); } + +extern struct schib ipl_schib; + +/* +* ipl_save_parameters gets called very early. It is not allowed to access +* anything in the bss section at all. The bss section is not cleared yet, +* but may contain some ipl parameters written by the firmware. +* These parameters (if present) are copied to 0x2000. +* To avoid corruption of the ipl parameters, all variables used by this +* function must reside on the stack or in the data section. +*/ +void ipl_save_parameters (void ) +{ +struct subchannel_id schid; +unsigned int *ipl_ptr; +void *src, *dst; + + schid = *(struct subchannel_id *)__LC_SUBCHANNEL_ID; +if (!schid.one) +return ; +if (stsch (schid, &ipl_schib)) +return ; +if (!ipl_schib.pmcw.dnv) +return ; + ipl_devno = ipl_schib.pmcw.dev; + ipl_flags |=IPL_DEVNO_VALID ; +if (!ipl_schib.pmcw.qf) +return ; + ipl_flags |=IPL_PARMBLOCK_VALID ; + ipl_ptr = (unsigned int *)__LC_IPL_PARMBLOCK_PTR; + src = (void *)(unsigned long )*ipl_ptr; + dst = (void *)IPL_PARMBLOCK_ORIGIN ; +memmove (dst, src,PAGE_SIZE ); + *ipl_ptr =IPL_PARMBLOCK_ORIGIN ; +}
include/asm-s390/lowcore.h +1 -0
@@ -35,6 +35,7 @@#define __LC_IO_NEW_PSW 0x01f0#endif /* !__s390x__ */ +#define __LC_IPL_PARMBLOCK_PTR 0x014#define __LC_EXT_PARAMS 0x080#define __LC_CPU_ADDRESS 0x084#define __LC_EXT_INT_CODE 0x086
include/asm-s390/setup.h +5 -3
@@ -125,13 +125,15 @@ struct ipl_parameter_block {/* * IPL validity flags and parameters as detected in head.S */ -extern u32 ipl_parameter_flags; +extern u32 ipl_flags;extern u16 ipl_devno;void do_reipl (void ); -#define IPL_DEVNO_VALID (ipl_parameter_flags & 1) -#define IPL_PARMBLOCK_VALID (ipl_parameter_flags & 2) +enum { +IPL_DEVNO_VALID =1 , +IPL_PARMBLOCK_VALID =2 , +};#define IPL_PARMBLOCK_START ((struct ipl_parameter_block *) \ IPL_PARMBLOCK_ORIGIN)
Signature · 1 line
VGER BF report: U 0.5