Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 7b50da53 authored by Michael Holzheu's avatar Michael Holzheu Committed by Martin Schwidefsky
Browse files

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: default avatarHeiko Carstens <heiko.carstens@de.ibm.com>
Signed-off-by: default avatarMichael Holzheu <holzheu@linux.vnet.ibm.com>
Signed-off-by: default avatarMartin Schwidefsky <schwidefsky@de.ibm.com>
parent acf6a004

arch/s390/include/asm/sclp.h

+1 −2
Original line number Original line Diff line number Diff line
@@ -43,7 +43,6 @@ struct sclp_cpu_info { 
int sclp_get_cpu_info(struct sclp_cpu_info *info);

int sclp_get_cpu_info(struct sclp_cpu_info *info);

int sclp_cpu_configure(u8 cpu);

int sclp_cpu_configure(u8 cpu);

int sclp_cpu_deconfigure(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_rnmax(void);

unsigned long long sclp_get_rzm(void);

unsigned long long sclp_get_rzm(void);

int sclp_sdias_blk_count(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_configure(u32 fid);

int sclp_pci_deconfigure(u32 fid);

int sclp_pci_deconfigure(u32 fid);

int memcpy_hsa(void *dest, unsigned long src, size_t count, int mode);

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);

unsigned long sclp_get_hsa_size(void);

void sclp_early_detect(void);





#endif /* _ASM_S390_SCLP_H */
 
#endif /* _ASM_S390_SCLP_H */

arch/s390/kernel/early.c

+1 −2
Original line number Original line Diff line number Diff line
@@ -483,8 +483,7 @@ void __init startup_init(void) 
	detect_diag44();

	detect_diag44();

	detect_machine_facilities();

	detect_machine_facilities();

	setup_topology();

	setup_topology();

	sclp_facilities_detect();

	sclp_early_detect();

	sclp_hsa_size_detect();

#ifdef CONFIG_DYNAMIC_FTRACE

#ifdef CONFIG_DYNAMIC_FTRACE

	S390_lowcore.ftrace_func = (unsigned long)ftrace_caller;

	S390_lowcore.ftrace_func = (unsigned long)ftrace_caller;

#endif

#endif

drivers/s390/char/sclp_early.c

+9 −18
Original line number Original line Diff line number Diff line
@@ -93,20 +93,7 @@ static void __init sclp_read_info_early(void) 
	}

	}

}

}





static void __init sclp_event_mask_early(void)

static void __init sclp_facilities_detect(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)

{

{

	struct read_info_sccb *sccb;

	struct read_info_sccb *sccb;
@@ -122,8 +109,6 @@ void __init sclp_facilities_detect(void) 
	sclp_rnmax = sccb->rnmax ? sccb->rnmax : sccb->rnmax2;

	sclp_rnmax = sccb->rnmax ? sccb->rnmax : sccb->rnmax2;

	sclp_rzm = sccb->rnsize ? sccb->rnsize : sccb->rnsize2;

	sclp_rzm = sccb->rnsize ? sccb->rnsize : sccb->rnsize2;

	sclp_rzm <<= 20;

	sclp_rzm <<= 20;



	sclp_event_mask_early();

}

}





bool __init sclp_has_linemode(void)

bool __init sclp_has_linemode(void)
@@ -246,7 +231,7 @@ unsigned long sclp_get_hsa_size(void) 
	return sclp_hsa_size;

	return sclp_hsa_size;

}

}





void __init sclp_hsa_size_detect(void)

static void __init sclp_hsa_size_detect(void)

{

{

	long size;

	long size;
@@ -268,6 +253,12 @@ void __init sclp_hsa_size_detect(void) 
	if (size < 0)

	if (size < 0)

		return;

		return;

out:

out:

	sclp_set_event_mask(0, 0);

	sclp_hsa_size = size;

	sclp_hsa_size = size;

}

}



void __init sclp_early_detect(void)

{

	sclp_facilities_detect();

	sclp_hsa_size_detect();

	sclp_set_event_mask(0, 0);

}