UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

s390/sclp_early: Pass sccb pointer to every *_detect() function 

Add a sccb pointer parameter to *_detect() functions instead of accessing
the global sccb_early variable directly.

Signed-off-by: Hendrik Brueckner <brueckner@linux.vnet.ibm.com>
Reviewed-by: Michael Holzheu <holzheu@linux.vnet.ibm.com>
Reviewed-by: Heiko Carstens <heiko.carstens@de.ibm.com>
Signed-off-by: Martin Schwidefsky <schwidefsky@de.ibm.com>
This commit is contained in:
Hendrik Brueckner 2013-12-05 19:13:36 +01:00 committed by Martin Schwidefsky
parent 56e57a84a7
commit 5d5de1a068
1 changed files with 16 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
drivers/s390/char/sclp_early.c
View File

@ -87,10 +87,8 @@ static int __init sclp_read_info_early(struct read_info_sccb *sccb)
return -EIO; return -EIO;
} }
static void __init sclp_facilities_detect(void) static void __init sclp_facilities_detect(struct read_info_sccb *sccb)
{ {
struct read_info_sccb *sccb = (void *) &sccb_early;
if (sclp_read_info_early(sccb)) if (sclp_read_info_early(sccb))
return; return;
@ -181,11 +179,10 @@ static void __init sccb_init_eq_size(struct sdias_sccb *sccb)
sccb->evbuf.dbs = 1; sccb->evbuf.dbs = 1;
} }
static int __init sclp_set_event_mask(unsigned long receive_mask, static int __init sclp_set_event_mask(struct init_sccb *sccb,
unsigned long receive_mask,
unsigned long send_mask) unsigned long send_mask)
{ {
struct init_sccb *sccb = (void *) &sccb_early;
memset(sccb, 0, sizeof(*sccb)); memset(sccb, 0, sizeof(*sccb));
sccb->header.length = sizeof(*sccb); sccb->header.length = sizeof(*sccb);
sccb->mask_length = sizeof(sccb_mask_t); sccb->mask_length = sizeof(sccb_mask_t);
@ -194,10 +191,8 @@ static int __init sclp_set_event_mask(unsigned long receive_mask,
return sclp_cmd_early(SCLP_CMDW_WRITE_EVENT_MASK, sccb); return sclp_cmd_early(SCLP_CMDW_WRITE_EVENT_MASK, sccb);
} }
static long __init sclp_hsa_size_init(void) static long __init sclp_hsa_size_init(struct sdias_sccb *sccb)
{ {
struct sdias_sccb *sccb = (void *) &sccb_early;
sccb_init_eq_size(sccb); sccb_init_eq_size(sccb);
if (sclp_cmd_early(SCLP_CMDW_WRITE_EVENT_DATA, sccb)) if (sclp_cmd_early(SCLP_CMDW_WRITE_EVENT_DATA, sccb))
return -EIO; return -EIO;
@ -206,10 +201,8 @@ static long __init sclp_hsa_size_init(void)
return 0; return 0;
} }
static long __init sclp_hsa_copy_wait(void) static long __init sclp_hsa_copy_wait(struct sccb_header *sccb)
{ {
struct sccb_header *sccb = (void *) &sccb_early;
memset(sccb, 0, PAGE_SIZE); memset(sccb, 0, PAGE_SIZE);
sccb->length = PAGE_SIZE; sccb->length = PAGE_SIZE;
if (sclp_cmd_early(SCLP_CMDW_READ_EVENT_DATA, sccb)) if (sclp_cmd_early(SCLP_CMDW_READ_EVENT_DATA, sccb))
@ -222,25 +215,25 @@ unsigned long sclp_get_hsa_size(void)
return sclp_hsa_size; return sclp_hsa_size;
} }
static void __init sclp_hsa_size_detect(void) static void __init sclp_hsa_size_detect(void *sccb)
{ {
long size; long size;
/* First try synchronous interface (LPAR) */ /* First try synchronous interface (LPAR) */
if (sclp_set_event_mask(0, 0x40000010)) if (sclp_set_event_mask(sccb, 0, 0x40000010))
return; return;
size = sclp_hsa_size_init(); size = sclp_hsa_size_init(sccb);
if (size < 0) if (size < 0)
return; return;
if (size != 0) if (size != 0)
goto out; goto out;
/* Then try asynchronous interface (z/VM) */ /* Then try asynchronous interface (z/VM) */
if (sclp_set_event_mask(0x00000010, 0x40000010)) if (sclp_set_event_mask(sccb, 0x00000010, 0x40000010))
return; return;
size = sclp_hsa_size_init(); size = sclp_hsa_size_init(sccb);
if (size < 0) if (size < 0)
return; return;
size = sclp_hsa_copy_wait(); size = sclp_hsa_copy_wait(sccb);
if (size < 0) if (size < 0)
return; return;
out: out:
@ -249,7 +242,9 @@ out:
void __init sclp_early_detect(void) void __init sclp_early_detect(void)
{ {
sclp_facilities_detect(); void *sccb = &sccb_early;
sclp_hsa_size_detect();
sclp_set_event_mask(0, 0); sclp_facilities_detect(sccb);
sclp_hsa_size_detect(sccb);
sclp_set_event_mask(sccb, 0, 0);
} }