hollalinux
/
linux-sg2042
mirror of https://github.com/sophgo/linux-riscv.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

s390/sclp_early: Replace early_read_info_sccb with sccb_early 

Replace early_read_info_sccb and use sccb_early instead.
Also saves some memory.

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:03:50 +01:00 committed by Martin Schwidefsky
parent 333cce91f3
commit 56e57a84a7
1 changed files with 4 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -35,8 +35,7 @@ struct read_info_sccb {
u8 _reserved5[4096 - 112]; /* 112-4095 */ u8 _reserved5[4096 - 112]; /* 112-4095 */
} __packed __aligned(PAGE_SIZE); } __packed __aligned(PAGE_SIZE);
static __initdata struct read_info_sccb early_read_info_sccb; static char sccb_early[PAGE_SIZE] __aligned(PAGE_SIZE) __initdata;
static __initdata char sccb_early[PAGE_SIZE] __aligned(PAGE_SIZE);
static unsigned long sclp_hsa_size; static unsigned long sclp_hsa_size;
static struct sclp_ipl_info sclp_ipl_info; static struct sclp_ipl_info sclp_ipl_info;
@ -63,14 +62,12 @@ out:
return rc; return rc;
} }
static int __init sclp_read_info_early(void) static int __init sclp_read_info_early(struct read_info_sccb *sccb)
{ {
int rc, i; int rc, i;
struct read_info_sccb *sccb;
sclp_cmdw_t commands[] = {SCLP_CMDW_READ_SCP_INFO_FORCED, sclp_cmdw_t commands[] = {SCLP_CMDW_READ_SCP_INFO_FORCED,
SCLP_CMDW_READ_SCP_INFO}; SCLP_CMDW_READ_SCP_INFO};
sccb = &early_read_info_sccb;
for (i = 0; i < ARRAY_SIZE(commands); i++) { for (i = 0; i < ARRAY_SIZE(commands); i++) {
do { do {
memset(sccb, 0, sizeof(*sccb)); memset(sccb, 0, sizeof(*sccb));
@ -92,12 +89,11 @@ static int __init sclp_read_info_early(void)
static void __init sclp_facilities_detect(void) static void __init sclp_facilities_detect(void)
{ {
struct read_info_sccb *sccb; struct read_info_sccb *sccb = (void *) &sccb_early;
if (sclp_read_info_early()) if (sclp_read_info_early(sccb))
return; return;
sccb = &early_read_info_sccb;
sclp_facilities = sccb->facilities; sclp_facilities = sccb->facilities;
sclp_fac84 = sccb->fac84; sclp_fac84 = sccb->fac84;
if (sccb->fac85 & 0x02) if (sccb->fac85 & 0x02)