projects
/
coreboot.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
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 1944b18de6b995481dbe6cc97bf71e28bd5e84c4..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>
/*
* 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
* 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 <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 <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 const 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_GENERATE_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
* mainboard/via/... have no mptable.c (so that I can not set
- *
CONFIG_GENERATE_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
* 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,
/* 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 *)
/* IRQ0 -> APIC IRQ2. */
current += acpi_create_madt_irqoverride((acpi_madt_irqoverride_t *)
@@
-117,10
+118,6
@@
unsigned long acpi_fill_srat(unsigned long current)
return 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;
unsigned long write_acpi_tables(unsigned long start)
{
unsigned long current;
@@
-130,11
+127,11
@@
unsigned long write_acpi_tables(unsigned long start)
acpi_fadt_t *fadt;
acpi_facs_t *facs;
acpi_header_t *dsdt;
acpi_fadt_t *fadt;
acpi_facs_t *facs;
acpi_header_t *dsdt;
-
+
/* Align ACPI tables to 16byte */
start = ( start + 0x0f ) & -0x10;
current = start;
/* Align ACPI tables to 16byte */
start = ( start + 0x0f ) & -0x10;
current = start;
-
+
printk(BIOS_INFO, "ACPI: Writing ACPI tables at %lx...\n", start);
/* We need at least an RSDP and an RSDT Table */
printk(BIOS_INFO, "ACPI: Writing ACPI tables at %lx...\n", start);
/* We need at least an RSDP and an RSDT Table */
@@
-145,10
+142,10
@@
unsigned long write_acpi_tables(unsigned long start)
/* clear all table memory */
memset((void *)start, 0, current - start);
/* clear all table memory */
memset((void *)start, 0, current - start);
-
+
acpi_write_rsdp(rsdp, rsdt, NULL);
acpi_write_rsdt(rsdt);
acpi_write_rsdp(rsdp, rsdt, NULL);
acpi_write_rsdt(rsdt);
-
+
/*
* We explicitly add these tables later on:
*/
/*
* We explicitly add these tables later on:
*/