Align: Make sure 1 is treated as unsigned long instead of int

[coreboot.git] / src / mainboard / via / epia-n / acpi_tables.c

diff --git a/src/mainboard/via/epia-n/acpi_tables.c b/src/mainboard/via/epia-n/acpi_tables.c
index 57e648f3ebec390938210a5bc1614ac4d42400c3..b4966bb1db0dfd3801211d42bbda06896184b1d0 100644 (file)
--- a/src/mainboard/via/epia-n/acpi_tables.c
+++ b/src/mainboard/via/epia-n/acpi_tables.c
@@ -1,7 +1,7 @@
 /*
  * coreboot ACPI Table support
  * written by Stefan Reinauer <stepan@openbios.org>
- * ACPI FADT, FACS, and DSDT table support added by 
+ * ACPI FADT, FACS, and DSDT table support added by
  * Nick Barker <nick.barker9@btinternet.com>, and those portions
  * (C) Copyright 2004 Nick Barker
  * (C) Copyright 2005 Stefan Reinauer
@@ -30,18 +30,19 @@
 #include <console/console.h>
 #include <string.h>
 #include <arch/acpi.h>
+#include <arch/ioapic.h>
 #include <device/device.h>
 #include <device/pci.h>
 #include <device/pci_ids.h>
-#include "../../../southbridge/via/vt8237r/vt8237r.h"
+#include "southbridge/via/vt8237r/vt8237r.h"
 
-extern unsigned char AmlCode[];
+extern const unsigned char AmlCode[];
 
 /*
- * These four macros are copied from <arch/smp/mpspec.h>, I have to do this
- * since the "default CONFIG_HAVE_MP_TABLE = 0" in Options.lb, and also since
+ * These 8 macros are copied from <arch/smp/mpspec.h>, I have to do this
+ * since the "CONFIG_GENERATE_MP_TABLE = 0", and also since
  * mainboard/via/... have no mptable.c (so that I can not set
- * CONFIG_HAVE_MP_TABLE = 1) as many other mainboards.
+ * "CONFIG_GENERATE_MP_TABLE = 1" as many other mainboards.
  * So I have to copy these four to here. acpi_fill_madt() needs this.
  */
 #define MP_IRQ_POLARITY_DEFAULT        0x0
@@ -94,7 +95,7 @@ unsigned long acpi_fill_madt(unsigned long current)
 
        /* Write SB IOAPIC. */
        current += acpi_create_madt_ioapic((acpi_madt_ioapic_t *) current,
-                                  VT8237R_APIC_ID, VT8237R_APIC_BASE, gsi_base);
+                                  VT8237R_APIC_ID, IO_APIC_ADDR, gsi_base);
 
        /* IRQ0 -> APIC IRQ2. */
        current += acpi_create_madt_irqoverride((acpi_madt_irqoverride_t *)
@@ -117,26 +118,21 @@ unsigned long acpi_fill_srat(unsigned long current)
        return current;
 }
 
-#define ALIGN(x,a)              __ALIGN_MASK(x,(typeof(x))(a)-1)
-#define __ALIGN_MASK(x,mask)    (((x)+(mask))&~(mask))
-#define ALIGN_CURRENT current = ((current + 0x0f) & -0x10)
-
 unsigned long write_acpi_tables(unsigned long start)
 {
        unsigned long current;
        acpi_rsdp_t *rsdp;
        acpi_rsdt_t *rsdt;
-       acpi_xsdt_t *xsdt;
        acpi_madt_t *madt;
        acpi_fadt_t *fadt;
        acpi_facs_t *facs;
        acpi_header_t *dsdt;
-       
+
        /* Align ACPI tables to 16byte */
        start   = ( start + 0x0f ) & -0x10;
        current = start;
-       
-       printk_info("ACPI: Writing ACPI tables at %lx...\n", start);
+
+       printk(BIOS_INFO, "ACPI: Writing ACPI tables at %lx...\n", start);
 
        /* We need at least an RSDP and an RSDT Table */
        rsdp = (acpi_rsdp_t *) current;
@@ -146,27 +142,30 @@ unsigned long write_acpi_tables(unsigned long start)
 
        /* clear all table memory */
        memset((void *)start, 0, current - start);
-       
+
        acpi_write_rsdp(rsdp, rsdt, NULL);
        acpi_write_rsdt(rsdt);
-       
+
        /*
         * We explicitly add these tables later on:
         */
-       printk_debug("ACPI:     * FACS\n");
+       printk(BIOS_DEBUG, "ACPI:     * FACS\n");
        current = ALIGN(current, 64);
        facs = (acpi_facs_t *) current;
        current += sizeof(acpi_facs_t);
        acpi_create_facs(facs);
 
-       printk_debug("ACPI:     * DSDT\n");
+       printk(BIOS_DEBUG, "ACPI:     * DSDT\n");
        dsdt = (acpi_header_t *)current;
-       current += ((acpi_header_t *)AmlCode)->length;
-       memcpy((void *)dsdt,(void *)AmlCode, ((acpi_header_t *)AmlCode)->length);
+       memcpy(dsdt, &AmlCode, sizeof(acpi_header_t));
+       current += dsdt->length;
+       memcpy(dsdt, &AmlCode, dsdt->length);
+#if 0
        dsdt->checksum = 0; // don't trust intel iasl compiler to get this right
        dsdt->checksum = acpi_checksum(dsdt,dsdt->length);
-       printk_debug("ACPI:     * DSDT @ %08x Length %x\n",dsdt,dsdt->length);
-       printk_debug("ACPI:     * FADT\n");
+#endif
+       printk(BIOS_DEBUG, "ACPI:     * DSDT @ %p Length %x\n",dsdt,dsdt->length);
+       printk(BIOS_DEBUG, "ACPI:     * FADT\n");
 
        fadt = (acpi_fadt_t *) current;
        current += sizeof(acpi_fadt_t);
@@ -175,13 +174,13 @@ unsigned long write_acpi_tables(unsigned long start)
        acpi_add_table(rsdp,fadt);
 
        /* If we want IOAPIC Support Linux wants it in MADT. */
-       printk_debug("ACPI:    * MADT\n");
+       printk(BIOS_DEBUG, "ACPI:    * MADT\n");
        madt = (acpi_madt_t *) current;
        acpi_create_madt(madt);
        current += madt->header.length;
        acpi_add_table(rsdp, madt);
 
-       printk_info("ACPI: done.\n");
+       printk(BIOS_INFO, "ACPI: done.\n");
        return current;
 }