s390x: Move common sclp data and functions to sclp.c
PATCH v5 6/11 s390x: Move common sclp data and functions to sclp.c
sclp.c will provide the common functionality in the future and the base memory detection as it is quite small.
Signed-off-by Janosch Frank <[email protected]>
Reviewed-by David Hildenbrand <[email protected]>
Reviewed-by Thomas Huth <[email protected]>
--- lib/s390x/sclp-console.c | 20 -------------------- lib/s390x/sclp.c | 20 ++++++++++++++++++++ lib/s390x/sclp.h | 2 +- 3 files changed, 21 insertions(+), 21 deletions(-)
lib/s390x/sclp-console.c +0 -20
@@ -13,26 +13,6 @@#include <asm/page.h> #include "sclp.h" -char _sccb[PAGE_SIZE] __attribute__((__aligned__(4096))); - -/* Perform service call. Return 0 on success, non-zero otherwise. */ -int sclp_service_call (unsigned int command,void *sccb) -{ -int cc; - - asmvolatile ( -" .insn rre,0xb2200000,%1,%2\n" /* servc %1,%2 */ -" ipm %0\n" -" srl %0,28" - :"=&d" (cc) :"d" (command),"a" (__pa (sccb)) - :"cc" ,"memory" ); -if (cc ==3 ) -return -1 ; -if (cc ==2 ) -return -1 ; -return 0 ; -} -static void sclp_set_write_mask (void ) {WriteEventMask *sccb = (void *)_sccb;
lib/s390x/sclp.c +20 -0
@@ -23,6 +23,8 @@ static uint64_t storage_increment_size;static uint64_t max_ram_size;static uint64_t ram_size; +char _sccb[PAGE_SIZE] __attribute__((__aligned__(4096))); +static void mem_init (phys_addr_t mem_end) {phys_addr_t freemem_start = (phys_addr_t)&stacktop;
@@ -50,6 +52,24 @@ static void sclp_read_scp_info(ReadInfo *ri, int length)report_abort ("READ_SCP_INFO failed" ); } +/* Perform service call. Return 0 on success, non-zero otherwise. */ +int sclp_service_call (unsigned int command,void *sccb) +{ +int cc; + + asmvolatile ( +" .insn rre,0xb2200000,%1,%2\n" /* servc %1,%2 */ +" ipm %0\n" +" srl %0,28" + :"=&d" (cc) :"d" (command),"a" (__pa (sccb)) + :"cc" ,"memory" ); +if (cc ==3 ) +return -1 ; +if (cc ==2 ) +return -1 ; +return 0 ; +} +void sclp_memory_setup (void ) {ReadInfo *ri = (void *)_sccb;
lib/s390x/sclp.h +1 -1
@@ -212,9 +212,9 @@ typedef struct ReadEventData {uint32_t mask; } __attribute__((packed)) ReadEventData; +extern char _sccb[];void sclp_console_setup (void );void sclp_print (const char *str); -extern char _sccb[];int sclp_service_call (unsigned int command,void *sccb);void sclp_memory_setup (void );
Signature · 1 line
2.14.3