Commit e0da3364 authored by Yinghai Lu's avatar Yinghai Lu Committed by Ingo Molnar
Browse files

x86: introduce max_physical_apicid for bigsmp switching 



a multi-socket test-system with 3 or 4 ioapics, when 4 dualcore cpus or
2 quadcore cpus installed, needs to switch to bigsmp or physflat.

CPU apic id is [4,11] instead of [0,7], and we need to check max apic
id instead of cpu numbers.

also add check for 32 bit when acpi is not compiled in or acpi=off.

Signed-off-by: default avatarYinghai Lu <yhlu.kernel@gmail.com>
Signed-off-by: default avatarIngo Molnar <mingo@elte.hu>
parent c3ff0167

arch/x86/kernel/apic_32.c

+4 −1
Original line number Diff line number Diff line
@@ -1518,6 +1518,9 @@ void __cpuinit generic_processor_info(int apicid, int version) 
		 */

		cpu = 0;



	if (apicid > max_physical_apicid)

		max_physical_apicid = apicid;



	/*

	 * Would be preferable to switch to bigsmp when CONFIG_HOTPLUG_CPU=y

	 * but we need to work other dependencies like SMP_SUSPEND etc
@@ -1525,7 +1528,7 @@ void __cpuinit generic_processor_info(int apicid, int version) 
	 * if (CPU_HOTPLUG_ENABLED || num_processors > 8)

	 *       - Ashok Raj <ashok.raj@intel.com>

	 */

	if (num_processors > 8) {

	if (max_physical_apicid >= 8) {

		switch (boot_cpu_data.x86_vendor) {

		case X86_VENDOR_INTEL:

			if (!APIC_XAPIC(version)) {

arch/x86/kernel/apic_64.c

+3 −0
Original line number Diff line number Diff line
@@ -1093,6 +1093,9 @@ void __cpuinit generic_processor_info(int apicid, int version) 
		 */

		cpu = 0;

	}

	if (apicid > max_physical_apicid)

		max_physical_apicid = apicid;



	/* are we being called early in kernel startup? */

	if (x86_cpu_to_apicid_early_ptr) {

		u16 *cpu_to_apicid = x86_cpu_to_apicid_early_ptr;

arch/x86/kernel/genapic_64.c

+1 −1
Original line number Diff line number Diff line
@@ -51,7 +51,7 @@ void __init setup_apic_routing(void) 
	else

#endif



	if (num_possible_cpus() <= 8)

	if (max_physical_apicid < 8)

		genapic = &apic_flat;

	else

		genapic = &apic_physflat;

arch/x86/kernel/mpparse.c

+5 −0
Original line number Diff line number Diff line
@@ -473,6 +473,11 @@ static int __init smp_read_mpc(struct mp_config_table *mpc, unsigned early) 
		++mpc_record;

#endif

	}



#ifdef CONFIG_X86_GENERICARCH

       generic_bigsmp_probe();

#endif



	setup_apic_routing();

	if (!num_processors)

		printk(KERN_ERR "MPTABLE: no processors registered!\n");

arch/x86/kernel/setup.c

+1 −0
Original line number Diff line number Diff line
@@ -17,6 +17,7 @@ unsigned int num_processors; 
unsigned disabled_cpus __cpuinitdata;

/* Processor that is doing the boot up */

unsigned int boot_cpu_physical_apicid = -1U;

unsigned int max_physical_apicid;

EXPORT_SYMBOL(boot_cpu_physical_apicid);



DEFINE_PER_CPU(u16, x86_cpu_to_apicid) = BAD_APICID;

CRA Git | Maintained and supported by SUSTech CRA and CCSE