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

Commit af51160e authored by Heiko Carstens's avatar Heiko Carstens Committed by Martin Schwidefsky
Browse files

s390/smp: initialize cpu_present_mask in setup_arch 



In order to be able to setup the cpu to node mappings early it is a
prerequisite to know which cpus are present. Therefore cpus must be
detected much earlier than before.

For sclp based cpu detection this requires yet another early sclp
call, since the system is not ready to use the regular interrupt and
memory allocations.

Reviewed-by: default avatarMichael Holzheu <holzheu@linux.vnet.ibm.com>
Signed-off-by: default avatarHeiko Carstens <heiko.carstens@de.ibm.com>
Signed-off-by: default avatarMartin Schwidefsky <schwidefsky@de.ibm.com>
parent ebb299a5

arch/s390/include/asm/sclp.h

+9 −1
Original line number Diff line number Diff line
@@ -101,7 +101,8 @@ struct zpci_report_error_header { 
	u8 data[0];	/* Subsequent Data passed verbatim to SCLP ET 24 */

} __packed;



int sclp_get_core_info(struct sclp_core_info *info);

int _sclp_get_core_info_early(struct sclp_core_info *info);

int _sclp_get_core_info(struct sclp_core_info *info);

int sclp_core_configure(u8 core);

int sclp_core_deconfigure(u8 core);

int sclp_sdias_blk_count(void);
@@ -119,4 +120,11 @@ void sclp_early_detect(void); 
void _sclp_print_early(const char *);

void sclp_ocf_cpc_name_copy(char *dst);



static inline int sclp_get_core_info(struct sclp_core_info *info, int early)

{

	if (early)

		return _sclp_get_core_info_early(info);

	return _sclp_get_core_info(info);

}



#endif /* _ASM_S390_SCLP_H */

arch/s390/include/asm/smp.h

+2 −0
Original line number Diff line number Diff line
@@ -36,6 +36,7 @@ extern void smp_yield_cpu(int cpu); 
extern void smp_cpu_set_polarization(int cpu, int val);

extern int smp_cpu_get_polarization(int cpu);

extern void smp_fill_possible_mask(void);

extern void smp_detect_cpus(void);



#else /* CONFIG_SMP */
@@ -56,6 +57,7 @@ static inline int smp_store_status(int cpu) { return 0; } 
static inline int smp_vcpu_scheduled(int cpu) { return 1; }

static inline void smp_yield_cpu(int cpu) { }

static inline void smp_fill_possible_mask(void) { }

static inline void smp_detect_cpus(void) { }



#endif /* CONFIG_SMP */

arch/s390/kernel/setup.c

+1 −0
Original line number Diff line number Diff line
@@ -923,6 +923,7 @@ void __init setup_arch(char **cmdline_p) 
	cpu_detect_mhz_feature();

        cpu_init();

	numa_setup();

	smp_detect_cpus();



	/*

	 * Create kernel page tables and switch to virtual addressing.

arch/s390/kernel/smp.c

+9 −13
Original line number Diff line number Diff line
@@ -19,6 +19,7 @@ 
#define pr_fmt(fmt) KMSG_COMPONENT ": " fmt



#include <linux/workqueue.h>

#include <linux/bootmem.h>

#include <linux/module.h>

#include <linux/init.h>

#include <linux/mm.h>
@@ -655,14 +656,12 @@ int smp_cpu_get_polarization(int cpu) 
	return pcpu_devices[cpu].polarization;

}



static struct sclp_core_info *smp_get_core_info(void)

static void __ref smp_get_core_info(struct sclp_core_info *info, int early)

{

	static int use_sigp_detection;

	struct sclp_core_info *info;

	int address;



	info = kzalloc(sizeof(*info), GFP_KERNEL);

	if (info && (use_sigp_detection || sclp_get_core_info(info))) {

	if (use_sigp_detection || sclp_get_core_info(info, early)) {

		use_sigp_detection = 1;

		for (address = 0;

		     address < (SCLP_MAX_CORES << smp_cpu_mt_shift);
@@ -676,7 +675,6 @@ static struct sclp_core_info *smp_get_core_info(void) 
		}

		info->combined = info->configured;

	}

	return info;

}



static int smp_add_present_cpu(int cpu);
@@ -717,17 +715,15 @@ static int __smp_rescan_cpus(struct sclp_core_info *info, int sysfs_add) 
	return nr;

}



static void __init smp_detect_cpus(void)

void __init smp_detect_cpus(void)

{

	unsigned int cpu, mtid, c_cpus, s_cpus;

	struct sclp_core_info *info;

	u16 address;



	/* Get CPU information */

	info = smp_get_core_info();

	if (!info)

		panic("smp_detect_cpus failed to allocate memory\n");



	info = memblock_virt_alloc(sizeof(*info), 8);

	smp_get_core_info(info, 1);

	/* Find boot CPU type */

	if (sclp.has_core_type) {

		address = stap();
@@ -763,7 +759,7 @@ static void __init smp_detect_cpus(void) 
	get_online_cpus();

	__smp_rescan_cpus(info, 0);

	put_online_cpus();

	kfree(info);

	memblock_free_early((unsigned long)info, sizeof(*info));

}



/*
@@ -900,7 +896,6 @@ void __init smp_prepare_cpus(unsigned int max_cpus) 
	/* request the 0x1202 external call external interrupt */

	if (register_external_irq(EXT_IRQ_EXTERNAL_CALL, do_ext_call_interrupt))

		panic("Couldn't request external interrupt 0x1202");

	smp_detect_cpus();

}



void __init smp_prepare_boot_cpu(void)
@@ -1111,9 +1106,10 @@ int __ref smp_rescan_cpus(void) 
	struct sclp_core_info *info;

	int nr;



	info = smp_get_core_info();

	info = kzalloc(sizeof(*info), GFP_KERNEL);

	if (!info)

		return -ENOMEM;

	smp_get_core_info(info, 0);

	get_online_cpus();

	mutex_lock(&smp_cpu_state_mutex);

	nr = __smp_rescan_cpus(info, 1);

drivers/s390/char/sclp.h

+23 −0
Original line number Diff line number Diff line
@@ -59,6 +59,7 @@ 


typedef unsigned int sclp_cmdw_t;



#define SCLP_CMDW_READ_CPU_INFO		0x00010001

#define SCLP_CMDW_READ_EVENT_DATA	0x00770005

#define SCLP_CMDW_WRITE_EVENT_DATA	0x00760005

#define SCLP_CMDW_WRITE_EVENT_MASK	0x00780005
@@ -102,6 +103,28 @@ struct init_sccb { 
	sccb_mask_t sclp_send_mask;

} __attribute__((packed));



struct read_cpu_info_sccb {

	struct	sccb_header header;

	u16	nr_configured;

	u16	offset_configured;

	u16	nr_standby;

	u16	offset_standby;

	u8	reserved[4096 - 16];

} __attribute__((packed, aligned(PAGE_SIZE)));



static inline void sclp_fill_core_info(struct sclp_core_info *info,

				       struct read_cpu_info_sccb *sccb)

{

	char *page = (char *) sccb;



	memset(info, 0, sizeof(*info));

	info->configured = sccb->nr_configured;

	info->standby = sccb->nr_standby;

	info->combined = sccb->nr_configured + sccb->nr_standby;

	memcpy(&info->core, page + sccb->offset_configured,

	       info->combined * sizeof(struct sclp_core_entry));

}



#define SCLP_HAS_CHP_INFO	(sclp.facilities & 0x8000000000000000ULL)

#define SCLP_HAS_CHP_RECONFIG	(sclp.facilities & 0x2000000000000000ULL)

#define SCLP_HAS_CPU_INFO	(sclp.facilities & 0x0800000000000000ULL)