diff options
| author | Alexander Egorenkov <egorenar@linux.ibm.com> | 2020-10-10 04:34:25 +0300 |
|---|---|---|
| committer | Heiko Carstens <hca@linux.ibm.com> | 2021-07-27 10:39:13 +0300 |
| commit | 0029b4d19491cd83cfb85de0fa9ac1e175409377 (patch) | |
| tree | 68604b1541e9aa5d142e994d6b70556b4acb3b7f /arch/s390 | |
| parent | 6040b3f45f394ef3a9fabd68282de92cc271328e (diff) | |
| download | linux-0029b4d19491cd83cfb85de0fa9ac1e175409377.tar.xz | |
s390/sclp: use only one sclp early buffer to send commands
A buffer that can be used for communication with SCLP is required
to lie below 2GB memory address. Therefore, both sclp_info_sccb
and sclp_early_sccb must fulfill this requirement if passed directly
to the sclp_early_cmd() function. Instead, use only sclp_early_sccb
for communication with SCLP. This allows the buffer sclp_info_sccb
to be placed anywhere in the memory address space and, therefore,
simplifies the process of making the decompressor relocatable later on,
one thing less to relocate. And make sure that the length of the new unified
early SCLP buffer is no less than the length of the removed sclp_info_sccb
buffer which might be larger than the length of the sclp_early_sccb buffer.
Signed-off-by: Alexander Egorenkov <egorenar@linux.ibm.com>
Acked-by: Heiko Carstens <hca@linux.ibm.com>
Reviewed-by: Vasily Gorbik <gor@linux.ibm.com>
Signed-off-by: Heiko Carstens <hca@linux.ibm.com>
Diffstat (limited to 'arch/s390')
| -rw-r--r-- | arch/s390/boot/head.S | 3 | ||||
| -rw-r--r-- | arch/s390/include/asm/sclp.h | 7 | ||||
| -rw-r--r-- | arch/s390/include/asm/setup.h | 3 |
3 files changed, 9 insertions, 4 deletions
diff --git a/arch/s390/boot/head.S b/arch/s390/boot/head.S index cafe454703b8..0cfa76fe6dfd 100644 --- a/arch/s390/boot/head.S +++ b/arch/s390/boot/head.S @@ -27,6 +27,7 @@ #include <asm/asm-offsets.h> #include <asm/page.h> #include <asm/ptrace.h> +#include <asm/sclp.h> #define ARCH_OFFSET 4 @@ -410,6 +411,6 @@ SYM_DATA_START(parmarea) SYM_DATA_END(parmarea) .org EARLY_SCCB_OFFSET - .fill 4096 + .fill EXT_SCCB_READ_SCP .org HEAD_END diff --git a/arch/s390/include/asm/sclp.h b/arch/s390/include/asm/sclp.h index 5763769a39b6..3adbb417f740 100644 --- a/arch/s390/include/asm/sclp.h +++ b/arch/s390/include/asm/sclp.h @@ -8,8 +8,6 @@ #define _ASM_S390_SCLP_H #include <linux/types.h> -#include <asm/chpid.h> -#include <asm/cpu.h> #define SCLP_CHP_INFO_MASK_SIZE 32 #define EARLY_SCCB_SIZE PAGE_SIZE @@ -19,6 +17,10 @@ /* 24 + 16 * SCLP_MAX_CORES */ #define EXT_SCCB_READ_CPU (3 * PAGE_SIZE) +#ifndef __ASSEMBLY__ +#include <asm/chpid.h> +#include <asm/cpu.h> + struct sclp_chp_info { u8 recognized[SCLP_CHP_INFO_MASK_SIZE]; u8 standby[SCLP_CHP_INFO_MASK_SIZE]; @@ -147,4 +149,5 @@ static inline int sclp_get_core_info(struct sclp_core_info *info, int early) return _sclp_get_core_info(info); } +#endif /* __ASSEMBLY__ */ #endif /* _ASM_S390_SCLP_H */ diff --git a/arch/s390/include/asm/setup.h b/arch/s390/include/asm/setup.h index 3a77aa96d092..cf285f57579f 100644 --- a/arch/s390/include/asm/setup.h +++ b/arch/s390/include/asm/setup.h @@ -7,6 +7,7 @@ #define _ASM_S390_SETUP_H #include <linux/bits.h> +#include <asm/sclp.h> #include <uapi/asm/setup.h> #include <linux/build_bug.h> @@ -14,7 +15,7 @@ #define EP_STRING "S390EP" #define PARMAREA 0x10400 #define EARLY_SCCB_OFFSET 0x11000 -#define HEAD_END 0x12000 +#define HEAD_END (EARLY_SCCB_OFFSET + EXT_SCCB_READ_SCP) /* * Machine features detected in early.c |