From 7b50da53f6ad2048241bef232bfc22a132a40283 Mon Sep 17 00:00:00 2001 From: Michael Holzheu Date: Wed, 13 Nov 2013 10:38:27 +0100 Subject: [PATCH] s390/sclp: Consolidate early sclp init calls to sclp_early_detect() The new function calls the old ones. The sclp_event_mask_early() is removed and replaced by one invocation of sclp_set_event_mask(0, 0). Reviewed-by: Heiko Carstens Signed-off-by: Michael Holzheu Signed-off-by: Martin Schwidefsky --- arch/s390/include/asm/sclp.h | 3 +-- arch/s390/kernel/early.c | 3 +-- drivers/s390/char/sclp_early.c | 27 +++++++++------------------ 3 files changed, 11 insertions(+), 22 deletions(-) diff --git a/arch/s390/include/asm/sclp.h b/arch/s390/include/asm/sclp.h index 593069201bb9..30ef748bc161 100644 --- a/arch/s390/include/asm/sclp.h +++ b/arch/s390/include/asm/sclp.h @@ -43,7 +43,6 @@ struct sclp_cpu_info { int sclp_get_cpu_info(struct sclp_cpu_info *info); int sclp_cpu_configure(u8 cpu); int sclp_cpu_deconfigure(u8 cpu); -void sclp_facilities_detect(void); unsigned long long sclp_get_rnmax(void); unsigned long long sclp_get_rzm(void); int sclp_sdias_blk_count(void); @@ -57,7 +56,7 @@ bool sclp_has_vt220(void); int sclp_pci_configure(u32 fid); int sclp_pci_deconfigure(u32 fid); int memcpy_hsa(void *dest, unsigned long src, size_t count, int mode); -void sclp_hsa_size_detect(void); unsigned long sclp_get_hsa_size(void); +void sclp_early_detect(void); #endif /* _ASM_S390_SCLP_H */ diff --git a/arch/s390/kernel/early.c b/arch/s390/kernel/early.c index c0462f45cf1b..fca20b5fe79e 100644 --- a/arch/s390/kernel/early.c +++ b/arch/s390/kernel/early.c @@ -483,8 +483,7 @@ void __init startup_init(void) detect_diag44(); detect_machine_facilities(); setup_topology(); - sclp_facilities_detect(); - sclp_hsa_size_detect(); + sclp_early_detect(); #ifdef CONFIG_DYNAMIC_FTRACE S390_lowcore.ftrace_func = (unsigned long)ftrace_caller; #endif diff --git a/drivers/s390/char/sclp_early.c b/drivers/s390/char/sclp_early.c index cbec45fdcc59..f7aa080e9b28 100644 --- a/drivers/s390/char/sclp_early.c +++ b/drivers/s390/char/sclp_early.c @@ -93,20 +93,7 @@ static void __init sclp_read_info_early(void) } } -static void __init sclp_event_mask_early(void) -{ - struct init_sccb *sccb = &early_event_mask_sccb; - int rc; - - do { - memset(sccb, 0, sizeof(*sccb)); - sccb->header.length = sizeof(*sccb); - sccb->mask_length = sizeof(sccb_mask_t); - rc = sclp_cmd_sync_early(SCLP_CMDW_WRITE_EVENT_MASK, sccb); - } while (rc == -EBUSY); -} - -void __init sclp_facilities_detect(void) +static void __init sclp_facilities_detect(void) { struct read_info_sccb *sccb; @@ -122,8 +109,6 @@ void __init sclp_facilities_detect(void) sclp_rnmax = sccb->rnmax ? sccb->rnmax : sccb->rnmax2; sclp_rzm = sccb->rnsize ? sccb->rnsize : sccb->rnsize2; sclp_rzm <<= 20; - - sclp_event_mask_early(); } bool __init sclp_has_linemode(void) @@ -246,7 +231,7 @@ unsigned long sclp_get_hsa_size(void) return sclp_hsa_size; } -void __init sclp_hsa_size_detect(void) +static void __init sclp_hsa_size_detect(void) { long size; @@ -268,6 +253,12 @@ void __init sclp_hsa_size_detect(void) if (size < 0) return; out: - sclp_set_event_mask(0, 0); sclp_hsa_size = size; } + +void __init sclp_early_detect(void) +{ + sclp_facilities_detect(); + sclp_hsa_size_detect(); + sclp_set_event_mask(0, 0); +} -- 2.34.1