diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/arch/i386/include/arch/acpi.h | 2 | ||||
| -rw-r--r-- | src/include/stdlib.h | 3 | ||||
| -rw-r--r-- | src/mainboard/asus/m2v-mx_se/acpi_tables.c | 27 | ||||
| -rw-r--r-- | src/mainboard/asus/m2v-mx_se/cache_as_ram_auto.c | 1 | ||||
| -rw-r--r-- | src/mainboard/asus/m2v-mx_se/dsdt.asl | 41 | ||||
| -rw-r--r-- | src/mainboard/asus/m2v-mx_se/fadt.c | 6 |
6 files changed, 73 insertions, 7 deletions
diff --git a/src/arch/i386/include/arch/acpi.h b/src/arch/i386/include/arch/acpi.h index 0e628b4cb3..a71fb319f5 100644 --- a/src/arch/i386/include/arch/acpi.h +++ b/src/arch/i386/include/arch/acpi.h @@ -285,7 +285,7 @@ typedef struct acpi_facs { u32 x_firmware_waking_vector_l; u32 x_firmware_waking_vector_h; u8 version; - u8 resv[33]; + u8 resv[31]; } __attribute__ ((packed)) acpi_facs_t; /* These are implemented by the target port */ diff --git a/src/include/stdlib.h b/src/include/stdlib.h index e2b37e6fe9..c3052bd209 100644 --- a/src/include/stdlib.h +++ b/src/include/stdlib.h @@ -5,6 +5,9 @@ #define ARRAY_SIZE(a) (sizeof(a) / sizeof((a)[0])) +#define ALIGN(x,a) __ALIGN_MASK(x,(typeof(x))(a)-1) +#define __ALIGN_MASK(x,mask) (((x)+(mask))&~(mask)) + #define MIN(a,b) ((a) < (b) ? (a) : (b)) #define MAX(a,b) ((a) > (b) ? (a) : (b)) diff --git a/src/mainboard/asus/m2v-mx_se/acpi_tables.c b/src/mainboard/asus/m2v-mx_se/acpi_tables.c index 86fee0c99a..4fb27dbbfb 100644 --- a/src/mainboard/asus/m2v-mx_se/acpi_tables.c +++ b/src/mainboard/asus/m2v-mx_se/acpi_tables.c @@ -6,7 +6,7 @@ * * Copyright (C) 2004 Stefan Reinauer <stepan@openbios.org> * Copyright (C) 2005 Nick Barker <nick.barker9@btinternet.com> - * Copyright (C) 2007 Rudolf Marek <r.marek@assembler.cz> + * Copyright (C) 2007, 2008 Rudolf Marek <r.marek@assembler.cz> * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License v2 as published by @@ -32,6 +32,7 @@ #include <../../../southbridge/via/k8t890/k8t890.h> extern unsigned char AmlCode[]; +extern unsigned char AmlCode_ssdt[]; unsigned long acpi_fill_mcfg(unsigned long current) { @@ -91,6 +92,8 @@ unsigned long write_acpi_tables(unsigned long start) acpi_madt_t *madt; acpi_fadt_t *fadt; acpi_facs_t *facs; + acpi_slit_t *slit; + acpi_header_t *ssdt; acpi_header_t *dsdt; /* Align ACPI tables to 16 byte. */ @@ -113,6 +116,10 @@ unsigned long write_acpi_tables(unsigned long start) /* We explicitly add these tables later on: */ printk_debug("ACPI: * FACS\n"); + + /* we should align FACS to 64B as per ACPI specs */ + + current = ALIGN(current, 64); facs = (acpi_facs_t *) current; current += sizeof(acpi_facs_t); acpi_create_facs(facs); @@ -158,6 +165,24 @@ unsigned long write_acpi_tables(unsigned long start) current += srat->header.length; acpi_add_table(rsdt, srat); + /* SLIT */ + printk_debug("ACPI: * SLIT\n"); + slit = (acpi_slit_t *) current; + acpi_create_slit(slit); + current+=slit->header.length; + acpi_add_table(rsdt,slit); + + /* SSDT */ + printk_debug("ACPI: * SSDT\n"); + ssdt = (acpi_header_t *)current; + current += ((acpi_header_t *)AmlCode_ssdt)->length; + memcpy((void *)ssdt, (void *)AmlCode_ssdt, ((acpi_header_t *)AmlCode_ssdt)->length); + update_ssdt((void*)ssdt); + /* recalculate checksum */ + ssdt->checksum = 0; + ssdt->checksum = acpi_checksum((unsigned char *)ssdt,ssdt->length); + acpi_add_table(rsdt,ssdt); + printk_info("ACPI: done.\n"); return current; } diff --git a/src/mainboard/asus/m2v-mx_se/cache_as_ram_auto.c b/src/mainboard/asus/m2v-mx_se/cache_as_ram_auto.c index ccdf1fd0b8..35ca449011 100644 --- a/src/mainboard/asus/m2v-mx_se/cache_as_ram_auto.c +++ b/src/mainboard/asus/m2v-mx_se/cache_as_ram_auto.c @@ -299,7 +299,6 @@ void real_main(unsigned long bist, unsigned long cpu_init_detectedx) enable_fid_change(); print_debug("after enable_fid_change\r\n"); - /* FIXME does not work yet */ init_fidvid_bsp(bsp_apicid); /* Stop the APs so we can start them later in init. */ diff --git a/src/mainboard/asus/m2v-mx_se/dsdt.asl b/src/mainboard/asus/m2v-mx_se/dsdt.asl index ac32980531..61d34f2714 100644 --- a/src/mainboard/asus/m2v-mx_se/dsdt.asl +++ b/src/mainboard/asus/m2v-mx_se/dsdt.asl @@ -22,6 +22,9 @@ DefinitionBlock ("DSDT.aml", "DSDT", 1, "LXBIOS", "LXB-DSDT", 1) { + Include ("amdk8_util.asl") + + /* Define the main processor.*/ Scope (\_PR) { @@ -47,9 +50,45 @@ DefinitionBlock ("DSDT.aml", "DSDT", 1, "LXBIOS", "LXB-DSDT", 1) Name (_ADR, 0x00) Name (_UID, 0x00) Name (_BBN, 0x00) + + External (BUSN) + External (MMIO) + External (PCIO) + External (SBLK) + External (TOM1) + External (HCLK) + External (SBDN) + External (HCDN) + + Method (_CRS, 0, NotSerialized) + { + Name (BUF0, ResourceTemplate () + { + IO (Decode16, + 0x0CF8, // Address Range Minimum + 0x0CF8, // Address Range Maximum + 0x01, // Address Alignment + 0x08, // Address Length + ) + WordIO (ResourceProducer, MinFixed, MaxFixed, PosDecode, EntireRange, + 0x0000, // Address Space Granularity + 0x0000, // Address Range Minimum + 0x0CF7, // Address Range Maximum + 0x0000, // Address Translation Offset + 0x0CF8, // Address Length + ,, , TypeStatic) + }) + /* Methods bellow use SSDT to get actual MMIO regs + The IO ports are from 0xd00, optionally an VGA, + otherwise the info from MMIO is used. + */ + Concatenate (\_SB.GMEM (0x00, \_SB.PCI0.SBLK), BUF0, Local1) + Concatenate (\_SB.GIOR (0x00, \_SB.PCI0.SBLK), Local1, Local2) + Concatenate (\_SB.GWBN (0x00, \_SB.PCI0.SBLK), Local2, Local3) + Return (Local3) + } /* PCI Routing Table */ - /* aaa */ Name (_PRT, Package () { Package (0x04) { 0x000F0000, 0x01, 0x00, 0x15 }, /* 0xf SATA IRQ 21 */ Package (0x04) { 0x000F0001, 0x00, 0x00, 0x14 }, /* 0xf Native IDE IRQ 20 */ diff --git a/src/mainboard/asus/m2v-mx_se/fadt.c b/src/mainboard/asus/m2v-mx_se/fadt.c index f77601a022..61e98bbf02 100644 --- a/src/mainboard/asus/m2v-mx_se/fadt.c +++ b/src/mainboard/asus/m2v-mx_se/fadt.c @@ -75,10 +75,10 @@ void acpi_create_fadt(acpi_fadt_t *fadt, acpi_facs_t *facs, void *dsdt) fadt->day_alrm = 0x7d; fadt->mon_alrm = 0x7e; fadt->century = 0x32; - /* fixme 5 - 10 */ - fadt->iapc_boot_arch = 0x1; + /* We have legacy devices, 8042, VGA is ok to probe, MSI are not supported */ + fadt->iapc_boot_arch = 0xb; /* fixme */ - fadt->flags = 0x4a5; + fadt->flags = 0xa5; fadt->reset_reg.space_id = 0; fadt->reset_reg.bit_width = 0; |