Merge git://git.denx.de/u-boot-dm

[oweals/u-boot.git] / arch / x86 / cpu / ioapic.c

diff --git a/arch/x86/cpu/ioapic.c b/arch/x86/cpu/ioapic.c
index 112a9c63b449233ce67ad3358704c4092d38514d..d15e86c1c5dc77b927f7de92133828dc2e849b48 100644 (file)
--- a/arch/x86/cpu/ioapic.c
+++ b/arch/x86/cpu/ioapic.c
@@ -7,6 +7,7 @@
 #include <common.h>
 #include <asm/io.h>
 #include <asm/ioapic.h>
+#include <asm/lapic.h>
 
 u32 io_apic_read(u32 reg)
 {
@@ -19,3 +20,18 @@ void io_apic_write(u32 reg, u32 val)
        writel(reg, IO_APIC_INDEX);
        writel(val, IO_APIC_DATA);
 }
+
+void io_apic_set_id(int ioapic_id)
+{
+       int bsp_lapicid = lapicid();
+
+       debug("IOAPIC: Initialising IOAPIC at %08x\n", IO_APIC_ADDR);
+       debug("IOAPIC: Bootstrap Processor Local APIC = %#02x\n", bsp_lapicid);
+
+       if (ioapic_id) {
+               debug("IOAPIC: ID = 0x%02x\n", ioapic_id);
+               /* Set IOAPIC ID if it has been specified */
+               io_apic_write(0x00, (io_apic_read(0x00) & 0xf0ffffff) |
+                             (ioapic_id << 24));
+       }
+}