summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBin Meng <bmeng.cn@gmail.com>2016-05-22 01:45:35 -0700
committerBin Meng <bmeng.cn@gmail.com>2016-05-23 15:27:42 +0800
commitb813ea9a14eaa9a6c071a9ab48a18d9a17dcef08 (patch)
treea7c79b750494abd26a81646aaa4d91ff62d0cf70
parent911d6f693292dbf9b54de43f18ac95427e9accd8 (diff)
downloadu-boot-b813ea9a14eaa9a6c071a9ab48a18d9a17dcef08.tar.gz
x86: broadwell: Correct I/O APIC ID
Currently ID 2 is assgined to broadwell I/O APIC, however per chromebook_samus.dts 2 is the core#2 LAPIC ID. Now we change I/O APIC ID to 4 to avoid conflict. Signed-off-by: Bin Meng <bmeng.cn@gmail.com> Reviewed-by: Simon Glass <sjg@chromium.org>
-rw-r--r--arch/x86/cpu/broadwell/pch.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/arch/x86/cpu/broadwell/pch.c b/arch/x86/cpu/broadwell/pch.c
index f0798a7f9e..317f57d3f9 100644
--- a/arch/x86/cpu/broadwell/pch.c
+++ b/arch/x86/cpu/broadwell/pch.c
@@ -109,7 +109,8 @@ static void pch_enable_ioapic(void)
{
u32 reg32;
- io_apic_set_id(0x02);
+ /* Make sure this is a unique ID within system */
+ io_apic_set_id(0x04);
/* affirm full set of redirection table entries ("write once") */
reg32 = io_apic_read(0x01);