Commit 69c18c15 authored by Glauber Costa's avatar Glauber Costa Committed by Ingo Molnar
Browse files

x86: merge __cpu_disable and cpu_die 



They are now equal, and are moved to a common file

Signed-off-by: default avatarGlauber Costa <gcosta@redhat.com>
Signed-off-by: default avatarIngo Molnar <mingo@elte.hu>
parent e9a6cb96

arch/x86/kernel/smpboot.c

+85 −0
Original line number Diff line number Diff line
@@ -2,6 +2,13 @@ 
#include <linux/smp.h>

#include <linux/module.h>

#include <linux/sched.h>

#include <linux/percpu.h>



#include <asm/nmi.h>

#include <asm/irq.h>

#include <asm/smp.h>

#include <asm/cpu.h>

#include <asm/numa.h>



/* Number of siblings per CPU package */

int smp_num_siblings = 1;
@@ -181,5 +188,83 @@ __init void prefill_possible_map(void) 
	for (i = 0; i < possible; i++)

		cpu_set(i, cpu_possible_map);

}



static void __ref remove_cpu_from_maps(int cpu)

{

	cpu_clear(cpu, cpu_online_map);

#ifdef CONFIG_X86_64

	cpu_clear(cpu, cpu_callout_map);

	cpu_clear(cpu, cpu_callin_map);

	/* was set by cpu_init() */

	clear_bit(cpu, (unsigned long *)&cpu_initialized);

	clear_node_cpumask(cpu);

#endif

}



int __cpu_disable(void)

{

	int cpu = smp_processor_id();



	/*

	 * Perhaps use cpufreq to drop frequency, but that could go

	 * into generic code.

	 *

	 * We won't take down the boot processor on i386 due to some

	 * interrupts only being able to be serviced by the BSP.

	 * Especially so if we're not using an IOAPIC	-zwane

	 */

	if (cpu == 0)

		return -EBUSY;



	if (nmi_watchdog == NMI_LOCAL_APIC)

		stop_apic_nmi_watchdog(NULL);

	clear_local_APIC();



	/*

	 * HACK:

	 * Allow any queued timer interrupts to get serviced

	 * This is only a temporary solution until we cleanup

	 * fixup_irqs as we do for IA64.

	 */

	local_irq_enable();

	mdelay(1);



	local_irq_disable();

	remove_siblinginfo(cpu);



	/* It's now safe to remove this processor from the online map */

	remove_cpu_from_maps(cpu);

	fixup_irqs(cpu_online_map);

	return 0;

}



void __cpu_die(unsigned int cpu)

{

	/* We don't do anything here: idle task is faking death itself. */

	unsigned int i;



	for (i = 0; i < 10; i++) {

		/* They ack this in play_dead by setting CPU_DEAD */

		if (per_cpu(cpu_state, cpu) == CPU_DEAD) {

			printk(KERN_INFO "CPU %d is now offline\n", cpu);

			if (1 == num_online_cpus())

				alternatives_smp_switch(0);

			return;

		}

		msleep(100);

	}

	printk(KERN_ERR "CPU %u didn't die...\n", cpu);

}

#else /* ... !CONFIG_HOTPLUG_CPU */

int __cpu_disable(void)

{

	return -ENOSYS;

}



void __cpu_die(unsigned int cpu)

{

	/* We said "no" in __cpu_disable */

	BUG();

}

#endif

arch/x86/kernel/smpboot_32.c

+0 −67
Original line number Diff line number Diff line
@@ -1040,73 +1040,6 @@ void __init native_smp_prepare_boot_cpu(void) 
	__get_cpu_var(cpu_state) = CPU_ONLINE;

}



#ifdef CONFIG_HOTPLUG_CPU

static void __ref remove_cpu_from_maps(int cpu)

{

	cpu_clear(cpu, cpu_online_map);

}



int __cpu_disable(void)

{

	cpumask_t map = cpu_online_map;

	int cpu = smp_processor_id();



	/*

	 * Perhaps use cpufreq to drop frequency, but that could go

	 * into generic code.

 	 *

	 * We won't take down the boot processor on i386 due to some

	 * interrupts only being able to be serviced by the BSP.

	 * Especially so if we're not using an IOAPIC	-zwane

	 */

	if (cpu == 0)

		return -EBUSY;

	if (nmi_watchdog == NMI_LOCAL_APIC)

		stop_apic_nmi_watchdog(NULL);

	clear_local_APIC();

	/* Allow any queued timer interrupts to get serviced */

	local_irq_enable();

	mdelay(1);

	local_irq_disable();



	remove_siblinginfo(cpu);



	remove_cpu_from_maps(cpu);

	fixup_irqs(map);



	return 0;

}



void __cpu_die(unsigned int cpu)

{

	/* We don't do anything here: idle task is faking death itself. */

	unsigned int i;



	for (i = 0; i < 10; i++) {

		/* They ack this in play_dead by setting CPU_DEAD */

		if (per_cpu(cpu_state, cpu) == CPU_DEAD) {

			printk ("CPU %d is now offline\n", cpu);

			if (1 == num_online_cpus())

				alternatives_smp_switch(0);

			return;

		}

		msleep(100);

	}

 	printk(KERN_ERR "CPU %u didn't die...\n", cpu);

}

#else /* ... !CONFIG_HOTPLUG_CPU */

int __cpu_disable(void)

{

	return -ENOSYS;

}



void __cpu_die(unsigned int cpu)

{

	/* We said "no" in __cpu_disable */

	BUG();

}

#endif /* CONFIG_HOTPLUG_CPU */



int __cpuinit native_cpu_up(unsigned int cpu)

{

	unsigned long flags;

arch/x86/kernel/smpboot_64.c

+0 −79
Original line number Diff line number Diff line
@@ -836,82 +836,3 @@ void __init native_smp_cpus_done(unsigned int max_cpus) 
	setup_ioapic_dest();

	check_nmi_watchdog();

}
 


#ifdef CONFIG_HOTPLUG_CPU

static void __ref remove_cpu_from_maps(int cpu)

{

	cpu_clear(cpu, cpu_online_map);

	cpu_clear(cpu, cpu_callout_map);

	cpu_clear(cpu, cpu_callin_map);

	clear_bit(cpu, (unsigned long *)&cpu_initialized); /* was set by cpu_init() */

	clear_node_cpumask(cpu);

}



int __cpu_disable(void)

{

	int cpu = smp_processor_id();



	/*

	 * Perhaps use cpufreq to drop frequency, but that could go

	 * into generic code.

 	 *

	 * We won't take down the boot processor on i386 due to some

	 * interrupts only being able to be serviced by the BSP.

	 * Especially so if we're not using an IOAPIC	-zwane

	 */

	if (cpu == 0)

		return -EBUSY;



	if (nmi_watchdog == NMI_LOCAL_APIC)

		stop_apic_nmi_watchdog(NULL);

	clear_local_APIC();



	/*

	 * HACK:

	 * Allow any queued timer interrupts to get serviced

	 * This is only a temporary solution until we cleanup

	 * fixup_irqs as we do for IA64.

	 */

	local_irq_enable();

	mdelay(1);



	local_irq_disable();

	remove_siblinginfo(cpu);



	/* It's now safe to remove this processor from the online map */

	remove_cpu_from_maps(cpu);

	fixup_irqs(cpu_online_map);

	return 0;

}



void __cpu_die(unsigned int cpu)

{

	/* We don't do anything here: idle task is faking death itself. */

	unsigned int i;



	for (i = 0; i < 10; i++) {

		/* They ack this in play_dead by setting CPU_DEAD */

		if (per_cpu(cpu_state, cpu) == CPU_DEAD) {

			printk ("CPU %d is now offline\n", cpu);

			if (1 == num_online_cpus())

				alternatives_smp_switch(0);

			return;

		}

		msleep(100);

	}

 	printk(KERN_ERR "CPU %u didn't die...\n", cpu);

}



#else /* ... !CONFIG_HOTPLUG_CPU */



int __cpu_disable(void)

{

	return -ENOSYS;

}



void __cpu_die(unsigned int cpu)

{

	/* We said "no" in __cpu_disable */

	BUG();

}

#endif /* CONFIG_HOTPLUG_CPU */

include/asm-x86/smp.h

+3 −0
Original line number Diff line number Diff line
@@ -70,6 +70,9 @@ void native_smp_prepare_cpus(unsigned int max_cpus); 
void native_smp_cpus_done(unsigned int max_cpus);

int native_cpu_up(unsigned int cpunum);



extern int __cpu_disable(void);

extern void __cpu_die(unsigned int cpu);



extern unsigned disabled_cpus;

extern void prefill_possible_map(void);

#endif

include/asm-x86/smp_32.h

+0 −3
Original line number Diff line number Diff line
@@ -34,9 +34,6 @@ DECLARE_PER_CPU(u16, x86_cpu_to_apicid); 
#define startup_ipi_hook(phys_apicid, start_eip, start_esp) do { } while (0)

#endif



extern int __cpu_disable(void);

extern void __cpu_die(unsigned int cpu);



/*

 * This function is needed by all SMP systems. It must _always_ be valid

 * from the initial startup. We map APIC_BASE very early in page_setup(),