Convert memory detection into C code.
Subsystems (2)
From: Heiko Carstens <[email protected]>
[S390] Convert memory detection into C code.
Hopefully this will make it more maintainable and less error prone. Code makes use of search_exception_tables(). Since it calls this function before the kernel exeception table is sorted, there is an early call to sort_main_extable().
This way it's easy to use the already present infrastructure of fixup sections. Also this would allows to easily convert the rest of head[31|64].S into C code.
---
arch/s390/defconfig | 1 arch/s390/kernel/Makefile | 2 arch/s390/kernel/base.S | 150 ++++++++++++++++++++ arch/s390/kernel/early.c | 307 +++++++++++++++++++++++++++++++++++++++++ arch/s390/kernel/head31.S | 164 --------------------- arch/s390/kernel/head64.S | 175 ----------------------- arch/s390/kernel/ipl.c | 15 -- arch/s390/kernel/reset.S | 90 ------------ arch/s390/kernel/setup.c | 134 ----------------- drivers/s390/Kconfig | 8 - drivers/s390/char/Makefile | 4 drivers/s390/char/sclp.c | 12 - drivers/s390/char/sclp.h | 18 -- drivers/s390/char/sclp_cpi.c | 2 drivers/s390/char/sclp_info.c | 57 +++++++ drivers/s390/char/sclp_rw.c | 2 drivers/s390/char/sclp_vt220.c | 2 drivers/s390/cio/cio.c | 10 - include/asm-s390/processor.h | 12 + include/asm-s390/reset.h | 3 include/asm-s390/sclp.h | 39 +++++ 21 files changed, 598 insertions(+), 609 deletions(-)
arch/s390/defconfig +0 -1
@@ -433,7 +433,6 @@ CONFIG_TN3270_CONSOLE=y CONFIG_TN3215=y CONFIG_TN3215_CONSOLE=y CONFIG_CCW_CONSOLE=y -CONFIG_SCLP=y CONFIG_SCLP_TTY=y CONFIG_SCLP_CONSOLE=y CONFIG_SCLP_VT220_TTY=y
arch/s390/kernel/base.S +150 -0
150 lines not on this page · raw message
arch/s390/kernel/early.c +307 -0
307 lines not on this page · raw message
arch/s390/kernel/head31.S +3 -161
188 lines not on this page · raw message
arch/s390/kernel/head64.S +0 -175
187 lines not on this page · raw message
arch/s390/kernel/ipl.c +6 -9
@@ -20,14 +20,13 @@#include <asm/cio.h> #include <asm/ebcdic.h> #include <asm/reset.h> +#include <asm/sclp.h> #define IPL_PARM_BLOCK_VERSION 0 -#define LOADPARM_LEN 8 -extern char s390_readinfo_sccb[]; -#define SCCB_VALID (*((__u16*)&s390_readinfo_sccb[6]) == 0x0010) -#define SCCB_LOADPARM (&s390_readinfo_sccb[24]) -#define SCCB_FLAG (s390_readinfo_sccb[91]) +#define SCCB_VALID (s390_readinfo_sccb.header.response_code == 0x10) +#define SCCB_LOADPARM (&s390_readinfo_sccb.loadparm) +#define SCCB_FLAG (s390_readinfo_sccb.flags)enum ipl_type {IPL_TYPE_NONE =1 ,
@@ -1080,8 +1079,6 @@ static void do_reset_calls(void) reset->fn (); } -extern void reset_mcck_handler (void ); -extern void reset_pgm_handler (void );extern __u32 dump_prefix_page;void s390_reset_system (void )
@@ -1105,12 +1102,12 @@ void s390_reset_system(void)/* Set new machine check handler */ S390_lowcore.mcck_new_psw.mask = psw_kernel_bits & ~PSW_MASK_MCHECK ; S390_lowcore.mcck_new_psw.addr = -PSW_ADDR_AMODE | (unsigned long ) &reset_mcck_handler; +PSW_ADDR_AMODE | (unsigned long ) s390_base_mcck_handler;/* Set new program check handler */ S390_lowcore.program_new_psw.mask = psw_kernel_bits & ~PSW_MASK_MCHECK ; S390_lowcore.program_new_psw.addr = -PSW_ADDR_AMODE | (unsigned long ) &reset_pgm_handler; +PSW_ADDR_AMODE | (unsigned long ) s390_base_pgm_handler;do_reset_calls (); }
arch/s390/kernel/Makefile +1 -1
@@ -4,7 +4,7 @@ EXTRA_AFLAGS := -traditional -obj-y := bitmap.o traps.o time.o process.o reset.o \ +obj-y := bitmap.o traps.o time.o process.o base.o early.o \ setup.o sys_s390.o ptrace.o signal.o cpcmd.o ebcdic.o \ semaphore.o s390_ext.o debug.o irq.o ipl.o
arch/s390/kernel/reset.S +0 -90
90 lines not on this page · raw message
arch/s390/kernel/setup.c +0 -134
140 lines not on this page · raw message
drivers/s390/char/Makefile +2 -2
@@ -2,7 +2,8 @@ # S/390 character devices # -obj-y += ctrlchar.o keyboard.o defkeymap.o +obj-y += ctrlchar.o keyboard.o defkeymap.o sclp.o sclp_rw.o sclp_quiesce.o \ + sclp_info.o obj-$(CONFIG_TN3270) += raw3270.o obj-$(CONFIG_TN3270_CONSOLE) += con3270.o
@@ -11,7 +12,6 @@ obj-$(CONFIG_TN3270_FS) += fs3270.o obj-$(CONFIG_TN3215) += con3215.o -obj-$(CONFIG_SCLP) += sclp.o sclp_rw.o sclp_quiesce.o obj-$(CONFIG_SCLP_TTY) += sclp_tty.o obj-$(CONFIG_SCLP_CONSOLE) += sclp_con.o obj-$(CONFIG_SCLP_VT220_TTY) += sclp_vt220.o
drivers/s390/char/sclp.c +6 -6
@@ -96,8 +96,8 @@ static int sclp_init_mask(int calculate)static int sclp_init (void );/* Perform service call. Return 0 on success, non-zero otherwise. */ -static int -service_call (sclp_cmdw_t command,void *sccb) +int +sclp_service_call (sclp_cmdw_t command,void *sccb) {int cc;
@@ -173,7 +173,7 @@ __sclp_start_request(struct sclp_req *reif (sclp_running_state != sclp_running_state_idle)return 0 ;del_timer (&sclp_request_timer); - rc =service_call (req->command, req->sccb); + rc =sclp_service_call (req->command, req->sccb); req->start_count++;if (rc ==0 ) {
@@ -325,7 +325,7 @@ __sclp_make_read_req(void) sccb = (struct sccb_header *) sclp_read_sccb;clear_page (sccb);memset (&sclp_read_req,0 ,sizeof (struct sclp_req )); - sclp_read_req.command =SCLP_CMDW_READDATA ; + sclp_read_req.command =SCLP_CMDW_READ_EVENT_DATA ; sclp_read_req.status =SCLP_REQ_QUEUED ; sclp_read_req.start_count =0 ; sclp_read_req.callback = sclp_read_cb;
@@ -628,7 +628,7 @@ __sclp_make_init_req(u32 receive_mask, u sccb = (struct init_sccb *) sclp_init_sccb;clear_page (sccb);memset (&sclp_init_req,0 ,sizeof (struct sclp_req )); - sclp_init_req.command =SCLP_CMDW_WRITEMASK ; + sclp_init_req.command =SCLP_CMDW_WRITE_EVENT_MASK ; sclp_init_req.status =SCLP_REQ_FILLED ; sclp_init_req.start_count =0 ; sclp_init_req.callback =NULL ;
@@ -831,7 +831,7 @@ sclp_check_interface(void)for (retry =0 ; retry <=SCLP_INIT_RETRY ; retry++) {__sclp_make_init_req (0 ,0 ); sccb = (struct init_sccb *) sclp_init_req.sccb; - rc =service_call (sclp_init_req.command, sccb); + rc =sclp_service_call (sclp_init_req.command, sccb);if (rc == -EIO )break ; sclp_init_req.status =SCLP_REQ_RUNNING ;
drivers/s390/char/sclp_cpi.c +1 -1
@@ -169,7 +169,7 @@ cpi_prepare_req(void) }/* prepare request data structure presented to SCLP driver */ - req->command =SCLP_CMDW_WRITEDATA ; + req->command =SCLP_CMDW_WRITE_EVENT_DATA ; req->sccb = sccb; req->status =SCLP_REQ_FILLED ; req->callback = cpi_callback;
drivers/s390/char/sclp.h +7 -11
@@ -12,7 +12,7 @@#include <linux/types.h> #include <linux/list.h> - +#include <asm/sclp.h> #include <asm/ebcdic.h> /* maximum number of pages concerning our own memory management */
@@ -49,9 +49,11 @@typedef unsigned int sclp_cmdw_t ; -#define SCLP_CMDW_READDATA 0x00770005 -#define SCLP_CMDW_WRITEDATA 0x00760005 -#define SCLP_CMDW_WRITEMASK 0x00780005 +#define SCLP_CMDW_READ_EVENT_DATA 0x00770005 +#define SCLP_CMDW_WRITE_EVENT_DATA 0x00760005 +#define SCLP_CMDW_WRITE_EVENT_MASK 0x00780005 +#define SCLP_CMDW_READ_SCP_INFO 0x00020001 +#define SCLP_CMDW_READ_SCP_INFO_FORCED 0x00120001#define GDS_ID_MDSMU 0x1310#define GDS_ID_MDSRouteInfo 0x1311
@@ -66,13 +68,6 @@ typedef unsigned int sclp_cmdw_t;typedef u32 sccb_mask_t ;/* ATTENTION: assumes 32bit mask !!! */ -struct sccb_header { -u16 length; -u8 function_code; -u8 control_mask[3 ]; -u16 response_code; -} __attribute__((packed)); -struct gds_subvector {u8 length;u8 key;
@@ -131,6 +126,7 @@ void sclp_unregister(struct sclp_registeint sclp_remove_processed (struct sccb_header *sccb);int sclp_deactivate (void );int sclp_reactivate (void ); +int sclp_service_call (sclp_cmdw_t command,void *sccb);/* useful inlines */
drivers/s390/char/sclp_info.c +57 -0
57 lines not on this page · raw message
drivers/s390/char/sclp_rw.c +1 -1
@@ -460,7 +460,7 @@ sclp_emit_buffer(struct sclp_buffer *buf sccb->msg_buf.header.type = EvTyp_PMsgCmd; else return -ENOSYS; - buffer->request.command =SCLP_CMDW_WRITEDATA ; + buffer->request.command =SCLP_CMDW_WRITE_EVENT_DATA ; buffer->request.status =SCLP_REQ_FILLED ; buffer->request.callback = sclp_writedata_callback; buffer->request.callback_data = buffer;
drivers/s390/char/sclp_vt220.c +1 -1
@@ -207,7 +207,7 @@ __sclp_vt220_emit(struct sclp_vt220_requ request->sclp_req.status =SCLP_REQ_FAILED ;return -EIO ; } - request->sclp_req.command =SCLP_CMDW_WRITEDATA ; + request->sclp_req.command =SCLP_CMDW_WRITE_EVENT_DATA ; request->sclp_req.status =SCLP_REQ_FILLED ; request->sclp_req.callback = sclp_vt220_callback; request->sclp_req.callback_data = (void *) request;
drivers/s390/cio/cio.c +5 -5
@@ -895,11 +895,11 @@ static int stsch_reset(struct subchannelint rc; pgm_check_occured =0 ; - s390_reset_pgm_handler = cio_reset_pgm_check_handler; + s390_base_pgm_handler_fn = cio_reset_pgm_check_handler; rc =stsch (schid, addr); - s390_reset_pgm_handler =NULL ; + s390_base_pgm_handler_fn =NULL ; -/* The program check handler could have changed pgm_check_occured */ +/* The program check handler could have changed pgm_check_occured. */ barrier ();if (pgm_check_occured)
@@ -957,7 +957,7 @@ static void css_reset(void)/* Reset subchannels. */ for_each_subchannel (__shutdown_subchannel_easy,NULL );/* Reset channel paths. */ - s390_reset_mcck_handler = s390_reset_chpids_mcck_handler; + s390_base_mcck_handler_fn = s390_reset_chpids_mcck_handler;/* Enable channel report machine checks. */ __ctl_set_bit (14 ,28 );/* Temporarily reenable machine checks. */
@@ -982,7 +982,7 @@ static void css_reset(void)local_mcck_disable ();/* Disable channel report machine checks. */ __ctl_clear_bit (14 ,28 ); - s390_reset_mcck_handler =NULL ; + s390_base_mcck_handler_fn =NULL ; }static struct reset_call css_reset_call = {
drivers/s390/Kconfig +0 -8
@@ -103,14 +103,8 @@ config CCW_CONSOLE depends on TN3215_CONSOLE || TN3270_CONSOLE default y -config SCLP - bool "Support for SCLP" - help - Include support for the SCLP interface to the service element. - config SCLP_TTY bool "Support for SCLP line mode terminal" - depends on SCLP help Include support for IBM SCLP line-mode terminals.
@@ -123,7 +117,6 @@ config SCLP_CONSOLE config SCLP_VT220_TTY bool "Support for SCLP VT220-compatible terminal" - depends on SCLP help Include support for an IBM SCLP VT220-compatible terminal.
@@ -136,7 +129,6 @@ config SCLP_VT220_CONSOLE config SCLP_CPI tristate "Control-Program Identification" - depends on SCLP help This option enables the hardware console interface for system identification. This is commonly used for workload management and
include/asm-s390/processor.h +12 -0
@@ -327,6 +327,18 @@ static inline void disabled_wait(unsigne }/* +* Basic Machine Check/Program Check Handler. +*/ + +extern void s390_base_mcck_handler (void ); +extern void s390_base_pgm_handler (void ); +extern void s390_base_ext_handler (void ); + +extern void (*s390_base_mcck_handler_fn)(void ); +extern void (*s390_base_pgm_handler_fn)(void ); +extern void (*s390_base_ext_handler_fn)(void ); + +/* * CPU idle notifier chain. */ #define CPU_IDLE 0
include/asm-s390/reset.h +0 -3
@@ -18,7 +18,4 @@ struct reset_call {extern void register_reset_call (struct reset_call *reset);extern void unregister_reset_call (struct reset_call *reset);extern void s390_reset_system (void ); -extern void (*s390_reset_mcck_handler)(void ); -extern void (*s390_reset_pgm_handler)(void ); -#endif /* _ASM_S390_RESET_H */
include/asm-s390/sclp.h +39 -0
@@ -0,0 +1,39 @@ +/* +* include/asm-s390/sclp.h +* +* Copyright IBM Corp. 2007 +* Author(s): Heiko Carstens <[email protected]> +*/ + +#ifndef _ASM_S390_SCLP_H +#define _ASM_S390_SCLP_H + +#include <linux/types.h> + +struct sccb_header { +u16 length; +u8 function_code; +u8 control_mask[3 ]; +u16 response_code; +} __attribute__((packed)); + +#define LOADPARM_LEN 8 + +struct sclp_readinfo_sccb { +struct sccb_header header;/* 0-7 */ +u16 rnmax;/* 8-9 */ +u8 rnsize;/* 10 */ +u8 _reserved0[24 -11 ];/* 11-23 */ +u8 loadparm[LOADPARM_LEN ];/* 24-31 */ +u8 _reserved1[91 -32 ];/* 32-90 */ +u8 flags;/* 91 */ +u8 _reserved2[100 -92 ];/* 92-99 */ +u32 rnsize2;/* 100-103 */ +u64 rnmax2;/* 104-111 */ +u8 _reserved3[4096 -112 ];/* 112-4095 */ +} __attribute__((packed,aligned (4096 ))); + +extern struct sclp_readinfo_sccb s390_readinfo_sccb; +extern void sclp_readinfo_early (void ); + +#endif /* _ASM_S390_SCLP_H */