kpriv/linux-hardened
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

x86: Move irq_init to x86_init_ops

Browse source 
irq_init is overridden by x86_quirks and by paravirts. Unify the whole
mess and make it an unconditional x86_init_ops function which defaults
to the standard function and can be overridden by the early platform
code.

Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
This commit is contained in:
Thomas Gleixner 2009-08-20 09:59:09 +02:00
parent d9112f4302
commit 66bcaf0bde
12 changed files with 11 additions and 42 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
arch/x86/include/asm/irq.h
View file

@ -37,7 +37,6 @@ extern void fixup_irqs(void);
#endif
extern void (*generic_interrupt_extension)(void);
extern void init_IRQ(void);
extern void native_init_IRQ(void);
extern bool handle_irq(unsigned irq, struct pt_regs *regs);

2
arch/x86/include/asm/paravirt_types.h
View file

@ -201,8 +201,6 @@ struct pv_cpu_ops {
};
struct pv_irq_ops {
void (*init_IRQ)(void);
/*
* Get/set interrupt state. save_fl and restore_fl are only
* expected to use X86_EFLAGS_IF; all other bits

3
arch/x86/include/asm/setup.h
View file

@ -16,12 +16,9 @@
struct x86_quirks {
int (*arch_pre_time_init)(void);
int (*arch_time_init)(void);
int (*arch_intr_init)(void);
int (*arch_trap_init)(void);
};
extern void x86_quirk_intr_init(void);
extern void x86_quirk_trap_init(void);
extern void x86_quirk_pre_time_init(void);

2
arch/x86/include/asm/x86_init.h
View file

@ -47,9 +47,11 @@ struct x86_init_resources {
* struct x86_init_irqs - platform specific interrupt setup
* @pre_vector_init: init code to run before interrupt vectors
* are set up.
* @intr_init: interrupt init code
*/
struct x86_init_irqs {
void (*pre_vector_init)(void);
void (*intr_init)(void);
};
/**

1
arch/x86/kernel/apic/numaq_32.c
View file

@ -265,7 +265,6 @@ static void __init smp_read_mpc_oem(struct mpc_table *mpc)
static struct x86_quirks numaq_x86_quirks __initdata = {
.arch_pre_time_init = numaq_pre_time_init,
.arch_time_init = NULL,
.arch_intr_init = NULL,
.arch_trap_init = NULL,
};

12
arch/x86/kernel/irqinit.c
View file

@ -140,8 +140,10 @@ void __init init_ISA_irqs(void)
}
}
/* Overridden in paravirt.c */
void init_IRQ(void) __attribute__((weak, alias("native_init_IRQ")));
void init_IRQ(void)
{
x86_init.irqs.intr_init();
}
static void __init smp_intr_init(void)
{
@ -237,12 +239,6 @@ void __init native_init_IRQ(void)
setup_irq(2, &irq2);
#ifdef CONFIG_X86_32
/*
* Call quirks after call gates are initialised (usually add in
* the architecture specific gates):
*/
x86_quirk_intr_init();
/*
* External FPU? Set up irq13 if so, for
* original braindamaged IBM FERR coupling.

6
arch/x86/kernel/paravirt.c
View file

@ -183,11 +183,6 @@ unsigned paravirt_patch_insns(void *insnbuf, unsigned len,
return insn_len;
}
void init_IRQ(void)
{
pv_irq_ops.init_IRQ();
}
static void native_flush_tlb(void)
{
__native_flush_tlb();
@ -328,7 +323,6 @@ struct pv_time_ops pv_time_ops = {
};
struct pv_irq_ops pv_irq_ops = {
.init_IRQ = native_init_IRQ,
.save_fl = __PV_IS_CALLEE_SAVE(native_save_fl),
.restore_fl = __PV_IS_CALLEE_SAVE(native_restore_fl),
.irq_disable = __PV_IS_CALLEE_SAVE(native_irq_disable),

17
arch/x86/kernel/setup.c
View file

@ -1020,23 +1020,6 @@ void __init setup_arch(char **cmdline_p)
#ifdef CONFIG_X86_32
/**
* x86_quirk_intr_init - 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 x86_quirk_intr_init(void)
{
if (x86_quirks->arch_intr_init) {
if (x86_quirks->arch_intr_init())
return;
}
}
/**
* x86_quirk_trap_init - initialise system specific traps
*

1
arch/x86/kernel/visws_quirks.c
View file

@ -228,7 +228,6 @@ static int visws_trap_init(void);
static struct x86_quirks visws_x86_quirks __initdata = {
.arch_time_init = visws_time_init,
.arch_intr_init = NULL,
.arch_trap_init = visws_trap_init,
};

1
arch/x86/kernel/x86_init.c
View file

@ -39,5 +39,6 @@ struct __initdata x86_init_ops x86_init = {
.irqs = {
.pre_vector_init = init_ISA_irqs,
.intr_init = native_init_IRQ,
},
};

2
arch/x86/lguest/boot.c
View file

@ -1262,7 +1262,6 @@ __init void lguest_init(void)
*/
/* Interrupt-related operations */
pv_irq_ops.init_IRQ = lguest_init_IRQ;
pv_irq_ops.save_fl = PV_CALLEE_SAVE(save_fl);
pv_irq_ops.restore_fl = __PV_IS_CALLEE_SAVE(lg_restore_fl);
pv_irq_ops.irq_disable = PV_CALLEE_SAVE(irq_disable);
@ -1325,6 +1324,7 @@ __init void lguest_init(void)
pv_time_ops.get_tsc_khz = lguest_tsc_khz;
x86_init.resources.memory_setup = lguest_memory_setup;
x86_init.irqs.intr_init = lguest_init_IRQ;
/*
* Now is a good time to look at the implementations of these functions

5
arch/x86/xen/irq.c
View file

@ -1,5 +1,7 @@
#include <linux/hardirq.h>
#include <asm/x86_init.h>
#include <xen/interface/xen.h>
#include <xen/interface/sched.h>
#include <xen/interface/vcpu.h>
@ -112,8 +114,6 @@ static void xen_halt(void)
}
static const struct pv_irq_ops xen_irq_ops __initdata = {
.init_IRQ = xen_init_IRQ,
.save_fl = PV_CALLEE_SAVE(xen_save_fl),
.restore_fl = PV_CALLEE_SAVE(xen_restore_fl),
.irq_disable = PV_CALLEE_SAVE(xen_irq_disable),
@ -129,4 +129,5 @@ static const struct pv_irq_ops xen_irq_ops __initdata = {
void __init xen_init_irq_ops()
{
pv_irq_ops = xen_irq_ops;
x86_init.irqs.intr_init = xen_init_IRQ;
}