From: Bin Meng <bmeng.cn@gmail.com>
Date: Sun, 22 May 2016 08:45:35 +0000 (-0700)
Subject: x86: broadwell: Correct I/O APIC ID
X-Git-Tag: v2016.07-rc1~177^2~4
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=b813ea9a14eaa9a6c071a9ab48a18d9a17dcef08;p=oweals%2Fu-boot.git

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>
---

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);