We define IO_APIC_ADDR in <arch/ioapic.h>, let's use it.

[coreboot.git] / src / mainboard / amd / mahogany / acpi_tables.c

diff --git a/src/mainboard/amd/mahogany/acpi_tables.c b/src/mainboard/amd/mahogany/acpi_tables.c
index 41bf454810f75040b999b785aa68a26572dc47b8..c348f44897051db915f0afb46b8778cc3a02c97d 100644 (file)
--- a/src/mainboard/amd/mahogany/acpi_tables.c
+++ b/src/mainboard/amd/mahogany/acpi_tables.c
@@ -20,12 +20,13 @@
 #include <console/console.h>
 #include <string.h>
 #include <arch/acpi.h>
+#include <arch/ioapic.h>
 #include <device/pci.h>
 #include <device/pci_ids.h>
 #include <cpu/x86/msr.h>
 #include <cpu/amd/mtrr.h>
 #include <cpu/amd/amdk8_sysconf.h>
-#include <../../../northbridge/amd/amdk8/amdk8_acpi.h>
+#include "northbridge/amd/amdk8/amdk8_acpi.h"
 #include <arch/cpu.h>
 #include <cpu/amd/model_fxx_powernow.h>
 
@@ -57,17 +58,15 @@ static void dump_mem(u32 start, u32 end)
 }
 #endif
 
-extern u8 AmlCode[];
+extern const unsigned char AmlCode[];
 
 #if CONFIG_ACPI_SSDTX_NUM >= 1
-extern u8 AmlCode_ssdt2[];
-extern u8 AmlCode_ssdt3[];
-extern u8 AmlCode_ssdt4[];
-extern u8 AmlCode_ssdt5[];
+extern const unsigned char AmlCode_ssdt2[];
+extern const unsigned char AmlCode_ssdt3[];
+extern const unsigned char AmlCode_ssdt4[];
+extern const unsigned char AmlCode_ssdt5[];
 #endif
 
-#define IO_APIC_ADDR   0xfec00000UL
-
 unsigned long acpi_fill_mcfg(unsigned long current)
 {
        /* Just a dummy */
@@ -99,30 +98,6 @@ unsigned long acpi_fill_madt(unsigned long current)
        return current;
 }
 
-extern void get_bus_conf(void);
-
-static void update_ssdtx(void *ssdtx, int i)
-{
-       uint8_t *PCI;
-       uint8_t *HCIN;
-       uint8_t *UID;
-
-       PCI = ssdtx + 0x32;
-       HCIN = ssdtx + 0x39;
-       UID = ssdtx + 0x40;
-
-       if (i < 7) {
-               *PCI = (uint8_t) ('4' + i - 1);
-       } else {
-               *PCI = (uint8_t) ('A' + i - 1 - 6);
-       }
-       *HCIN = (uint8_t) i;
-       *UID = (uint8_t) (i + 3);
-
-       /* FIXME: need to update the GSI id in the ssdtx too */
-
-}
-
 unsigned long acpi_fill_ssdt_generator(unsigned long current, const char *oem_table_id) {
        k8acpi_write_vars();
        amd_model_fxx_generate_powernow(pm_base + 8, 6, 1);
@@ -140,10 +115,15 @@ unsigned long write_acpi_tables(unsigned long start)
        acpi_facs_t *facs;
        acpi_header_t *dsdt;
        acpi_header_t *ssdt;
+#if CONFIG_ACPI_SSDTX_NUM >= 1
+       acpi_header_t *ssdtx;
+       void *p;
+       int i;
+#endif
 
-       get_bus_conf();         /* it will get sblk, pci1234, hcdn, and sbdn */
+       get_bus_conf(); /* it will get sblk, pci1234, hcdn, and sbdn */
 
-       /* Align ACPI tables to 16byte */
+       /* Align ACPI tables to 16 bytes */
        start = (start + 0x0f) & -0x10;
        current = start;
 
@@ -177,22 +157,6 @@ unsigned long write_acpi_tables(unsigned long start)
        current += madt->header.length;
        acpi_add_table(rsdp, madt);
 
-#if 0
-       /* SRAT */
-       printk(BIOS_DEBUG, "ACPI:    * SRAT\n");
-       srat = (acpi_srat_t *) current;
-       acpi_create_srat(srat);
-       current += srat->header.length;
-       acpi_add_table(rsdp, srat);
-
-       /* SLIT */
-       printk(BIOS_DEBUG, "ACPI:    * SLIT\n");
-       slit = (acpi_slit_t *) current;
-       acpi_create_slit(slit);
-       current += slit->header.length;
-       acpi_add_table(rsdp, slit);
-#endif
-
        /* SSDT */
        printk(BIOS_DEBUG, "ACPI:    * SSDT\n");
        ssdt = (acpi_header_t *)current;
@@ -208,36 +172,36 @@ unsigned long write_acpi_tables(unsigned long start)
        for (i = 1; i < sysconf.hc_possible_num; i++) { /* 0: is hc sblink */
                if ((sysconf.pci1234[i] & 1) != 1)
                        continue;
-               uint8_t c;
+               u8 c;
                if (i < 7) {
-                       c = (uint8_t) ('4' + i - 1);
+                       c = (u8) ('4' + i - 1);
                } else {
-                       c = (uint8_t) ('A' + i - 1 - 6);
+                       c = (u8) ('A' + i - 1 - 6);
                }
                printk(BIOS_DEBUG, "ACPI:    * SSDT for PCI%c Aka hcid = %d\n", c, sysconf.hcid[i]);    /* pci0 and pci1 are in dsdt */
                current = (current + 0x07) & -0x08;
                ssdtx = (acpi_header_t *) current;
                switch (sysconf.hcid[i]) {
                case 1: /* 8132 */
-                       p = AmlCode_ssdt2;
+                       p = &AmlCode_ssdt2;
                        break;
                case 2: /* 8151 */
-                       p = AmlCode_ssdt3;
+                       p = &AmlCode_ssdt3;
                        break;
                case 3: /* 8131 */
-                       p = AmlCode_ssdt4;
+                       p = &AmlCode_ssdt4;
                        break;
                default:
                        /* HTX no io apic */
-                       p = AmlCode_ssdt5;
+                       p = &AmlCode_ssdt5;
                        break;
                }
-               current += ((acpi_header_t *) p)->length;
-               memcpy((void *)ssdtx, (void *)p, ((acpi_header_t *) p)->length);
+               memcpy(ssdtx, p, sizeof(acpi_header_t));
+               current += ssdtx->length;
+               memcpy(ssdtx, p, ssdtx->length);
                update_ssdtx((void *)ssdtx, i);
                ssdtx->checksum = 0;
-               ssdtx->checksum =
-                   acpi_checksum((u8 *)ssdtx, ssdtx->length);
+               ssdtx->checksum = acpi_checksum((u8 *)ssdtx, ssdtx->length);
                acpi_add_table(rsdp, ssdtx);
        }
 #endif
@@ -250,10 +214,10 @@ unsigned long write_acpi_tables(unsigned long start)
 
        /* DSDT */
        printk(BIOS_DEBUG, "ACPI:    * DSDT\n");
-       dsdt = (acpi_header_t *) current;
-       memcpy((void *)dsdt, (void *)AmlCode,
-              ((acpi_header_t *) AmlCode)->length);
+       dsdt = (acpi_header_t *)current;
+       memcpy(dsdt, &AmlCode, sizeof(acpi_header_t));
        current += dsdt->length;
+       memcpy(dsdt, &AmlCode, dsdt->length);
        printk(BIOS_DEBUG, "ACPI:    * DSDT @ %p Length %x\n", dsdt, dsdt->length);
        /* FADT */
        printk(BIOS_DEBUG, "ACPI:    * FADT\n");
@@ -273,12 +237,6 @@ unsigned long write_acpi_tables(unsigned long start)
        printk(BIOS_DEBUG, "madt\n");
        dump_mem(madt, ((void *)madt) + madt->header.length);
 
-       printk(BIOS_DEBUG, "srat\n");
-       dump_mem(srat, ((void *)srat) + srat->header.length);
-
-       printk(BIOS_DEBUG, "slit\n");
-       dump_mem(slit, ((void *)slit) + slit->header.length);
-
        printk(BIOS_DEBUG, "ssdt\n");
        dump_mem(ssdt, ((void *)ssdt) + ssdt->length);