brain-hackers_pepepper-mirror/u-boot-brain
1
0
Fork 0
mirror of https://github.com/brain-hackers/u-boot-brain synced 2024-09-28 07:30:26 +09:00
Code Issues Projects Releases Wiki Activity

x86: Call lapic_setup() in interrupt_init()

Browse Source 
Let's configure LAPIC in a common place - interrupt_init().

Signed-off-by: Bin Meng <bmeng.cn@gmail.com>
Reviewed-by: Simon Glass <sjg@chromium.org>
This commit is contained in:
Bin Meng 2016-05-22 01:45:33 -07:00
parent aaaa55751a
commit e2126711af
3 changed files with 5 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
arch/x86/cpu/interrupts.c
View File

@ -15,14 +15,14 @@
#include <dm.h>
#include <asm/cache.h>
#include <asm/control_regs.h>
#include <asm/i8259.h>
#include <asm/interrupt.h>
#include <asm/io.h>
#include <asm/processor-flags.h>
#include <linux/compiler.h>
#include <asm/lapic.h>
#include <asm/msr.h>
#include <asm/processor-flags.h>
#include <asm/processor.h>
#include <asm/u-boot-x86.h>
#include <asm/i8259.h>
DECLARE_GLOBAL_DATA_PTR;
@ -266,6 +266,8 @@ int interrupt_init(void)
i8259_init();
#endif
lapic_setup();
/* Initialize core interrupt and exception functionality of CPU */
cpu_init_interrupts();

2
arch/x86/cpu/ivybridge/model_206ax.c
View File

@ -14,7 +14,6 @@
#include <malloc.h>
#include <asm/cpu.h>
#include <asm/cpu_x86.h>
#include <asm/lapic.h>
#include <asm/msr.h>
#include <asm/msr-index.h>
#include <asm/mtrr.h>
@ -418,7 +417,6 @@ static int model_206ax_init(struct udevice *dev)
/* Enable the local cpu apics */
enable_lapic_tpr();
lapic_setup();
/* Enable virtualization if enabled in CMOS */
enable_vmx();

2
arch/x86/cpu/mp_init.c
View File

@ -408,8 +408,6 @@ static int init_bsp(struct udevice **devp)
cpu_get_name(processor_name);
debug("CPU: %s\n", processor_name);
lapic_setup();
apic_id = lapicid();
ret = find_cpu_by_apic_id(apic_id, devp);
if (ret) {