From 4372a9eca5561ec21277b616b5223cf23ab526ca Mon Sep 17 00:00:00 2001 From: Bin Meng Date: Thu, 20 Nov 2014 16:10:49 +0800 Subject: [PATCH] x86: Call cpu_init_interrupts() from interrupt_init() Currently cpu_init_interrupts() is called from cpu_init_r() to setup the interrupt and exception of the cpu core, but at that time the i8259 has not been initialized to mask all the irqs and remap the master i8259 interrupt vector base, so the whole system is at risk of being interrupted, and if interrupted, wrong interrupt/exception message is shown. Signed-off-by: Bin Meng Acked-by: Simon Glass Tested-by: Simon Glass --- arch/x86/cpu/cpu.c | 2 -- arch/x86/lib/pcat_interrupts.c | 3 +++ 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/arch/x86/cpu/cpu.c b/arch/x86/cpu/cpu.c index b391b7ade4..ac253922ae 100644 --- a/arch/x86/cpu/cpu.c +++ b/arch/x86/cpu/cpu.c @@ -322,8 +322,6 @@ int x86_cpu_init_f(void) int x86_cpu_init_r(void) { - /* Initialize core interrupt and exception functionality of CPU */ - cpu_init_interrupts(); return 0; } int cpu_init_r(void) __attribute__((weak, alias("x86_cpu_init_r"))); diff --git a/arch/x86/lib/pcat_interrupts.c b/arch/x86/lib/pcat_interrupts.c index 2dc2fbd55b..f388db2276 100644 --- a/arch/x86/lib/pcat_interrupts.c +++ b/arch/x86/lib/pcat_interrupts.c @@ -65,6 +65,9 @@ int interrupt_init(void) /* Interrupt 9 should be level triggered (SCI). The OS might do this */ configure_irq_trigger(9, true); + /* Initialize core interrupt and exception functionality of CPU */ + cpu_init_interrupts(); + enable_interrupts(); return 0; -- 2.39.5