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

Commit 9be1b56a authored by Ingo Molnar's avatar Ingo Molnar
Browse files

x86, apic: separate 32-bit setup functionality out of apic_32.c 



Impact: build fix, cleanup

A couple of arch setup callbacks were mistakenly in apic_32.c, breaking
the build.

Also simplify the code a bit.

Signed-off-by: default avatarIngo Molnar <mingo@elte.hu>
parent 2a05180f

arch/x86/kernel/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -63,7 +63,7 @@ obj-$(CONFIG_SMP) += setup_percpu.o 
obj-$(CONFIG_X86_64_SMP)	+= tsc_sync.o

obj-$(CONFIG_X86_TRAMPOLINE)	+= trampoline_$(BITS).o

obj-$(CONFIG_X86_MPPARSE)	+= mpparse.o

obj-$(CONFIG_X86_LOCAL_APIC)	+= apic/

obj-y				+= apic/

obj-$(CONFIG_X86_REBOOTFIXUPS)	+= reboot_fixups_32.o

obj-$(CONFIG_DYNAMIC_FTRACE)	+= ftrace.o

obj-$(CONFIG_FUNCTION_GRAPH_TRACER)	+= ftrace.o

arch/x86/kernel/apic/Makefile

+1 −2
Original line number Diff line number Diff line
@@ -2,10 +2,9 @@ 
# Makefile for local APIC drivers and for the IO-APIC code

#



obj-y				:= apic.o probe_$(BITS).o ipi.o nmi.o

obj-$(CONFIG_X86_LOCAL_APIC)	+= apic.o probe_$(BITS).o ipi.o nmi.o

obj-$(CONFIG_X86_IO_APIC)	+= io_apic.o

obj-$(CONFIG_SMP)		+= ipi.o

obj-$



ifeq ($(CONFIG_X86_64),y)

obj-y				+= apic_flat_64.o

arch/x86/kernel/apic/probe_32.c

+16 −144
Original line number Diff line number Diff line
@@ -47,7 +47,22 @@ 


int no_broadcast = DEFAULT_SEND_IPI;



#ifdef CONFIG_X86_LOCAL_APIC

static __init int no_ipi_broadcast(char *str)

{

	get_option(&str, &no_broadcast);

	pr_info("Using %s mode\n",

		no_broadcast ? "No IPI Broadcast" : "IPI Broadcast");

	return 1;

}

__setup("no_ipi_broadcast=", no_ipi_broadcast);



static int __init print_ipi_mode(void)

{

	pr_info("Using IPI %s mode\n",

		no_broadcast ? "No-Shortcut" : "Shortcut");

	return 0;

}

late_initcall(print_ipi_mode);



void default_setup_apic_routing(void)

{
@@ -279,146 +294,3 @@ int __init default_acpi_madt_oem_check(char *oem_id, char *oem_table_id) 
	}

	return 0;

}
 


#endif /* CONFIG_X86_LOCAL_APIC */



/**

 * pre_intr_init_hook - initialisation prior to setting up interrupt vectors

 *

 * Description:

 *	Perform any necessary interrupt initialisation prior to setting up

 *	the "ordinary" interrupt call gates.  For legacy reasons, the ISA

 *	interrupts should be initialised here if the machine emulates a PC

 *	in any way.

 **/

void __init pre_intr_init_hook(void)

{

	if (x86_quirks->arch_pre_intr_init) {

		if (x86_quirks->arch_pre_intr_init())

			return;

	}

	init_ISA_irqs();

}



/**

 * intr_init_hook - post gate setup interrupt initialisation

 *

 * Description:

 *	Fill in any interrupts that may have been left out by the general

 *	init_IRQ() routine.  interrupts having to do with the machine rather

 *	than the devices on the I/O bus (like APIC interrupts in intel MP

 *	systems) are started here.

 **/

void __init intr_init_hook(void)

{

	if (x86_quirks->arch_intr_init) {

		if (x86_quirks->arch_intr_init())

			return;

	}

}



/**

 * pre_setup_arch_hook - hook called prior to any setup_arch() execution

 *

 * Description:

 *	generally used to activate any machine specific identification

 *	routines that may be needed before setup_arch() runs.  On Voyager

 *	this is used to get the board revision and type.

 **/

void __init pre_setup_arch_hook(void)

{

}



/**

 * trap_init_hook - initialise system specific traps

 *

 * Description:

 *	Called as the final act of trap_init().  Used in VISWS to initialise

 *	the various board specific APIC traps.

 **/

void __init trap_init_hook(void)

{

	if (x86_quirks->arch_trap_init) {

		if (x86_quirks->arch_trap_init())

			return;

	}

}



static struct irqaction irq0  = {

	.handler = timer_interrupt,

	.flags = IRQF_DISABLED | IRQF_NOBALANCING | IRQF_IRQPOLL,

	.mask = CPU_MASK_NONE,

	.name = "timer"

};



/**

 * pre_time_init_hook - do any specific initialisations before.

 *

 **/

void __init pre_time_init_hook(void)

{

	if (x86_quirks->arch_pre_time_init)

		x86_quirks->arch_pre_time_init();

}



/**

 * time_init_hook - do any specific initialisations for the system timer.

 *

 * Description:

 *	Must plug the system timer interrupt source at HZ into the IRQ listed

 *	in irq_vectors.h:TIMER_IRQ

 **/

void __init time_init_hook(void)

{

	if (x86_quirks->arch_time_init) {

		/*

		 * A nonzero return code does not mean failure, it means

		 * that the architecture quirk does not want any

		 * generic (timer) setup to be performed after this:

		 */

		if (x86_quirks->arch_time_init())

			return;

	}



	irq0.mask = cpumask_of_cpu(0);

	setup_irq(0, &irq0);

}



#ifdef CONFIG_MCA

/**

 * mca_nmi_hook - hook into MCA specific NMI chain

 *

 * Description:

 *	The MCA (Microchannel Architecture) has an NMI chain for NMI sources

 *	along the MCA bus.  Use this to hook into that chain if you will need

 *	it.

 **/

void mca_nmi_hook(void)

{

	/*

	 * If I recall correctly, there's a whole bunch of other things that

	 * we can do to check for NMI problems, but that's all I know about

	 * at the moment.

	 */

	pr_warning("NMI generated from unknown source!\n");

}

#endif



static __init int no_ipi_broadcast(char *str)

{

	get_option(&str, &no_broadcast);

	pr_info("Using %s mode\n",

		no_broadcast ? "No IPI Broadcast" : "IPI Broadcast");

	return 1;

}

__setup("no_ipi_broadcast=", no_ipi_broadcast);



static int __init print_ipi_mode(void)

{

	pr_info("Using IPI %s mode\n",

		no_broadcast ? "No-Shortcut" : "Shortcut");

	return 0;

}



late_initcall(print_ipi_mode);

arch/x86/kernel/setup.c

+124 −0
Original line number Diff line number Diff line
@@ -985,4 +985,128 @@ void __init setup_arch(char **cmdline_p) 
#endif

}



#ifdef CONFIG_X86_32



/**

 * pre_intr_init_hook - initialisation prior to setting up interrupt vectors

 *

 * Description:

 *	Perform any necessary interrupt initialisation prior to setting up

 *	the "ordinary" interrupt call gates.  For legacy reasons, the ISA

 *	interrupts should be initialised here if the machine emulates a PC

 *	in any way.

 **/

void __init pre_intr_init_hook(void)

{

	if (x86_quirks->arch_pre_intr_init) {

		if (x86_quirks->arch_pre_intr_init())

			return;

	}

	init_ISA_irqs();

}



/**

 * intr_init_hook - post gate setup interrupt initialisation

 *

 * Description:

 *	Fill in any interrupts that may have been left out by the general

 *	init_IRQ() routine.  interrupts having to do with the machine rather

 *	than the devices on the I/O bus (like APIC interrupts in intel MP

 *	systems) are started here.

 **/

void __init intr_init_hook(void)

{

	if (x86_quirks->arch_intr_init) {

		if (x86_quirks->arch_intr_init())

			return;

	}

}



/**

 * pre_setup_arch_hook - hook called prior to any setup_arch() execution

 *

 * Description:

 *	generally used to activate any machine specific identification

 *	routines that may be needed before setup_arch() runs.  On Voyager

 *	this is used to get the board revision and type.

 **/

void __init pre_setup_arch_hook(void)

{

}



/**

 * trap_init_hook - initialise system specific traps

 *

 * Description:

 *	Called as the final act of trap_init().  Used in VISWS to initialise

 *	the various board specific APIC traps.

 **/

void __init trap_init_hook(void)

{

	if (x86_quirks->arch_trap_init) {

		if (x86_quirks->arch_trap_init())

			return;

	}

}



static struct irqaction irq0  = {

	.handler = timer_interrupt,

	.flags = IRQF_DISABLED | IRQF_NOBALANCING | IRQF_IRQPOLL,

	.mask = CPU_MASK_NONE,

	.name = "timer"

};



/**

 * pre_time_init_hook - do any specific initialisations before.

 *

 **/

void __init pre_time_init_hook(void)

{

	if (x86_quirks->arch_pre_time_init)

		x86_quirks->arch_pre_time_init();

}



/**

 * time_init_hook - do any specific initialisations for the system timer.

 *

 * Description:

 *	Must plug the system timer interrupt source at HZ into the IRQ listed

 *	in irq_vectors.h:TIMER_IRQ

 **/

void __init time_init_hook(void)

{

	if (x86_quirks->arch_time_init) {

		/*

		 * A nonzero return code does not mean failure, it means

		 * that the architecture quirk does not want any

		 * generic (timer) setup to be performed after this:

		 */

		if (x86_quirks->arch_time_init())

			return;

	}



	irq0.mask = cpumask_of_cpu(0);

	setup_irq(0, &irq0);

}



#ifdef CONFIG_MCA

/**

 * mca_nmi_hook - hook into MCA specific NMI chain

 *

 * Description:

 *	The MCA (Microchannel Architecture) has an NMI chain for NMI sources

 *	along the MCA bus.  Use this to hook into that chain if you will need

 *	it.

 **/

void mca_nmi_hook(void)

{

	/*

	 * If I recall correctly, there's a whole bunch of other things that

	 * we can do to check for NMI problems, but that's all I know about

	 * at the moment.

	 */

	pr_warning("NMI generated from unknown source!\n");

}

#endif /* CONFIG_MCA */



#endif /* CONFIG_X86_32 */