Commit 3bcc8a1a authored by Heiko Carstens's avatar Heiko Carstens Committed by Alexander Gordeev
Browse files

s390/sclp: Initialize sclp subsystem via arch_cpu_finalize_init() 



With the switch to GENERIC_CPU_DEVICES an early call to the sclp subsystem
was added to smp_prepare_cpus(). This will usually succeed since the sclp
subsystem is implicitly initialized early enough if an sclp based console
is present.

If no such console is present the initialization happens with an
arch_initcall(); in such cases calls to the sclp subsystem will fail.
For CPU detection this means that the fallback sigp loop will be used
permanently to detect CPUs instead of the preferred READ_CPU_INFO sclp
request.

Fix this by adding an explicit early sclp_init() call via
arch_cpu_finalize_init().

Reported-by: default avatarSheshu Ramanandan <sheshu.ramanandan@ibm.com>
Fixes: 4a39f12e ("s390/smp: Switch to GENERIC_CPU_DEVICES")
Reviewed-by: default avatarPeter Oberparleiter <oberpar@linux.ibm.com>
Signed-off-by: default avatarHeiko Carstens <hca@linux.ibm.com>
Signed-off-by: default avatarAlexander Gordeev <agordeev@linux.ibm.com>
parent 7cbae7ea

arch/s390/Kconfig

+1 −0
Original line number Diff line number Diff line
@@ -78,6 +78,7 @@ config S390 
	select ARCH_ENABLE_MEMORY_HOTPLUG if SPARSEMEM

	select ARCH_ENABLE_MEMORY_HOTREMOVE

	select ARCH_ENABLE_SPLIT_PMD_PTLOCK if PGTABLE_LEVELS > 2

	select ARCH_HAS_CPU_FINALIZE_INIT

	select ARCH_HAS_CURRENT_STACK_POINTER

	select ARCH_HAS_DEBUG_VIRTUAL

	select ARCH_HAS_DEBUG_VM_PGTABLE

arch/s390/include/asm/sclp.h

+1 −0
Original line number Diff line number Diff line
@@ -172,6 +172,7 @@ void sclp_early_printk(const char *s); 
void __sclp_early_printk(const char *s, unsigned int len);

void sclp_emergency_printk(const char *s);



int sclp_init(void);

int sclp_early_get_memsize(unsigned long *mem);

int sclp_early_get_hsa_size(unsigned long *hsa_size);

int _sclp_get_core_info(struct sclp_core_info *info);

arch/s390/kernel/setup.c

+5 −0
Original line number Diff line number Diff line
@@ -1025,3 +1025,8 @@ void __init setup_arch(char **cmdline_p) 
	/* Add system specific data to the random pool */

	setup_randomness();

}



void __init arch_cpu_finalize_init(void)

{

	sclp_init();

}

drivers/s390/char/sclp.c

+2 −10
Original line number Diff line number Diff line
@@ -245,7 +245,6 @@ static void sclp_request_timeout(bool force_restart); 
static void sclp_process_queue(void);

static void __sclp_make_read_req(void);

static int sclp_init_mask(int calculate);

static int sclp_init(void);



static void

__sclp_queue_read_req(void)
@@ -1251,8 +1250,7 @@ static struct platform_driver sclp_pdrv = { 


/* Initialize SCLP driver. Return zero if driver is operational, non-zero

 * otherwise. */

static int

sclp_init(void)

int sclp_init(void)

{

	unsigned long flags;

	int rc = 0;
@@ -1305,13 +1303,7 @@ sclp_init(void) 


static __init int sclp_initcall(void)

{

	int rc;



	rc = platform_driver_register(&sclp_pdrv);

	if (rc)

		return rc;



	return sclp_init();

	return platform_driver_register(&sclp_pdrv);

}



arch_initcall(sclp_initcall);