Define and consistently use BUILD_APIC_ADDR and BUILD_IOAPIC_ADDR.

diff --git a/src/acpi.c b/src/acpi.c
index c85ddf5a2ef07bc3f26fe5b643451b97b6fa6526..a688d34cb4d94266238feb50d1be3c65419d36ff 100644 (file)
--- a/src/acpi.c
+++ b/src/acpi.c
@@ -395,7 +395,7 @@ void acpi_bios_init(void)
         struct madt_io_apic *io_apic;
 
         memset(madt, 0, madt_size);
-        madt->local_apic_address = cpu_to_le32(0xfee00000);
+        madt->local_apic_address = cpu_to_le32(BUILD_APIC_ADDR);
         madt->flags = cpu_to_le32(1);
         apic = (void *)(madt + 1);
         for(i=0;i<smp_cpus;i++) {
@@ -410,7 +410,7 @@ void acpi_bios_init(void)
         io_apic->type = APIC_IO;
         io_apic->length = sizeof(*io_apic);
         io_apic->io_apic_id = smp_cpus;
-        io_apic->address = cpu_to_le32(0xfec00000);
+        io_apic->address = cpu_to_le32(BUILD_IOAPIC_ADDR);
         io_apic->interrupt = cpu_to_le32(0);
 
         acpi_build_table_header((struct acpi_table_header *)madt,

diff --git a/src/config.h b/src/config.h
index 968b1f385e9047c1a26b149e2ed40af68af0f432..7e384ad12aedafb0a30b2a105fd45cdb5e4c3f99 100644 (file)
--- a/src/config.h
+++ b/src/config.h
@@ -93,6 +93,9 @@
 // 64 KB used to copy the BIOS to shadow RAM
 #define BUILD_BIOS_TMP_ADDR     0x30000
 
+#define BUILD_APIC_ADDR         0xfee00000
+#define BUILD_IOAPIC_ADDR       0xfec00000
+
 #define BUILD_SMM_INIT_ADDR     0x38000
 #define BUILD_SMM_ADDR          0xa8000
 #define BUILD_SMM_SIZE          0x8000

diff --git a/src/mptable.c b/src/mptable.c
index 49a88e44c10cb11504df088f046e167ba9a8da98..1dd45ece240976c4ed71d36f8e853d9626dbe6d9 100644 (file)
--- a/src/mptable.c
+++ b/src/mptable.c
@@ -75,7 +75,7 @@ mptable_init(void)
     putle32(&q, 0); /* OEM table ptr */
     putle16(&q, 0); /* OEM table size */
     putle16(&q, smp_cpus + 18); /* entry count */
-    putle32(&q, 0xfee00000); /* local APIC addr */
+    putle32(&q, BUILD_APIC_ADDR); /* local APIC addr */
     putle16(&q, 0); /* ext table length */
     putb(&q, 0); /* ext table checksum */
     putb(&q, 0); /* reserved */
@@ -112,7 +112,7 @@ mptable_init(void)
     putb(&q, ioapic_id); /* apic ID */
     putb(&q, 0x11); /* I/O APIC version number */
     putb(&q, 1); /* enable */
-    putle32(&q, 0xfec00000); /* I/O APIC addr */
+    putle32(&q, BUILD_IOAPIC_ADDR); /* I/O APIC addr */
 
     /* irqs */
     for(i = 0; i < 16; i++) {

diff --git a/src/smpdetect.c b/src/smpdetect.c
index 3de37a789749695f9f8a3e031a2c7fdf94a31a68..7f0c7aaaec15084d30586d423e932a3ea0858a92 100644 (file)
--- a/src/smpdetect.c
+++ b/src/smpdetect.c
@@ -10,11 +10,8 @@
 
 #define CPUID_APIC (1 << 9)
 
-#define APIC_BASE    ((u8 *)0xfee00000)
-#define APIC_ICR_LOW 0x300
-#define APIC_SVR     0x0F0
-#define APIC_ID      0x020
-#define APIC_LVT3    0x370
+#define APIC_ICR_LOW ((u8*)BUILD_APIC_ADDR + 0x300)
+#define APIC_SVR     ((u8*)BUILD_APIC_ADDR + 0x0F0)
 
 #define APIC_ENABLED 0x0100
 
@@ -90,19 +87,19 @@ smp_probe(void)
     *(u64*)BUILD_AP_BOOT_ADDR = new;
 
     // enable local APIC
-    u32 val = readl(APIC_BASE + APIC_SVR);
-    writel(APIC_BASE + APIC_SVR, val | APIC_ENABLED);
+    u32 val = readl(APIC_SVR);
+    writel(APIC_SVR, val | APIC_ENABLED);
 
     // broadcast SIPI
-    writel(APIC_BASE + APIC_ICR_LOW, 0x000C4500);
+    writel(APIC_ICR_LOW, 0x000C4500);
     u32 sipi_vector = BUILD_AP_BOOT_ADDR >> 12;
-    writel(APIC_BASE + APIC_ICR_LOW, 0x000C4600 | sipi_vector);
+    writel(APIC_ICR_LOW, 0x000C4600 | sipi_vector);
 
     // Wait for other CPUs to process the SIPI.
     mdelay(10);
 
     // Restore memory.
-    writel(APIC_BASE + APIC_SVR, val);
+    writel(APIC_SVR, val);
     *(u64*)BUILD_AP_BOOT_ADDR = old;
 
     u32 count = readl(&smp_cpus);