summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTobias Diedrich <ranma+coreboot@tdiedrich.de>2010-11-24 20:03:09 +0000
committerTobias Diedrich <ranma@tdiedrich.de>2010-11-24 20:03:09 +0000
commit48ae6086da64eb260c6eed676c593cdcd0957fbf (patch)
treef70d55ae2a05576cd988c9ee07c770b49dae1617
parentba9f0b30fb3d2081e30c8957194f3a0a202bc2ef (diff)
downloadcoreboot-48ae6086da64eb260c6eed676c593cdcd0957fbf.tar.xz
S3 support for ASUS M2V
This adds the board-specific parts for S3 support on the M2V board. Signed-off-by: Tobias Diedrich <ranma+coreboot@tdiedrich.de> Acked-by: Stefan Reinauer <stepan@coreboot.org> git-svn-id: svn://svn.coreboot.org/coreboot/trunk@6122 2b7e53f0-3cfb-0310-b3e9-8179ed1497e1
-rw-r--r--src/mainboard/asus/m2v/Kconfig1
-rw-r--r--src/mainboard/asus/m2v/dsdt.asl31
-rw-r--r--src/mainboard/asus/m2v/romstage.c10
3 files changed, 38 insertions, 4 deletions
diff --git a/src/mainboard/asus/m2v/Kconfig b/src/mainboard/asus/m2v/Kconfig
index aced403f2d..78e897b82c 100644
--- a/src/mainboard/asus/m2v/Kconfig
+++ b/src/mainboard/asus/m2v/Kconfig
@@ -17,6 +17,7 @@ config BOARD_SPECIFIC_OPTIONS # dummy
select BOARD_ROMSIZE_KB_512
select RAMINIT_SYSINFO
select TINY_BOOTBLOCK
+ select HAVE_ACPI_RESUME
select HAVE_PIRQ_TABLE
select PIRQ_ROUTE
select HAVE_ACPI_TABLES
diff --git a/src/mainboard/asus/m2v/dsdt.asl b/src/mainboard/asus/m2v/dsdt.asl
index 959e5a7990..40bde8f38e 100644
--- a/src/mainboard/asus/m2v/dsdt.asl
+++ b/src/mainboard/asus/m2v/dsdt.asl
@@ -59,10 +59,10 @@ DefinitionBlock ("DSDT.aml", "DSDT", 2, "CORE ", "COREBOOT", 1)
/* _PR CPU0 is dynamically supplied by SSDT */
- /* For now only define 2 power states:
+ /* We define 3 power states:
* - S0 which is fully on
+ * - S3 which is suspend to ram
* - S5 which is soft off
- * Any others would involve declaring the wake up methods.
*
* Package contents:
* ofs len desc
@@ -73,6 +73,7 @@ DefinitionBlock ("DSDT.aml", "DSDT", 2, "CORE ", "COREBOOT", 1)
* 2 2 Reserved
*/
Name (\_S0, Package () { 0x00, 0x00, 0x00, 0x00 })
+ Name (\_S3, Package () { 0x01, 0x01, 0x00, 0x00 })
Name (\_S5, Package () { 0x02, 0x02, 0x00, 0x00 })
/* Root of the bus hierarchy */
@@ -341,6 +342,7 @@ DefinitionBlock ("DSDT.aml", "DSDT", 2, "CORE ", "COREBOOT", 1)
Device (SBRG) { /* southbridge */
Name (_ADR, 0x00110000)
+ OperationRegion (PCIC, PCI_Config, 0x0, 0x100)
/* PS/2 keyboard (seems to be important for WinXP install) */
Device (KBD)
@@ -459,9 +461,9 @@ DefinitionBlock ("DSDT.aml", "DSDT", 2, "CORE ", "COREBOOT", 1)
}
}
- OperationRegion (PCI0.SBRG.SBR1, PCI_Config, 0x55, 0x03)
- Field (PCI0.SBRG.SBR1, ByteAcc, NoLock, Preserve)
+ Field (PCI0.SBRG.PCIC, ByteAcc, NoLock, Preserve)
{
+ Offset (0x55),
/*
* Offset 0x55:
* 3-0: reserved
@@ -538,4 +540,25 @@ PCI_INTX_DEV(INTB, PINB, 2)
PCI_INTX_DEV(INTC, PINC, 3)
PCI_INTX_DEV(INTD, PIND, 4)
}
+
+ Field (_SB.PCI0.SBRG.PCIC, ByteAcc, NoLock, Preserve)
+ {
+ Offset (0x94),
+ /* two LSB bits are blink rate */
+ LEDR, 2,
+ }
+
+ Method (_PTS, 1, NotSerialized)
+ {
+ /* blink power led while suspended */
+ Store (0x1, LEDR)
+ }
+
+ Method (_WAK, 1, NotSerialized)
+ {
+ /* stop power led blinking */
+ Store (0x0, LEDR)
+ /* wake OK */
+ Return(Package(0x02){0x00, 0x00})
+ }
}
diff --git a/src/mainboard/asus/m2v/romstage.c b/src/mainboard/asus/m2v/romstage.c
index 4c86f55657..3176c39866 100644
--- a/src/mainboard/asus/m2v/romstage.c
+++ b/src/mainboard/asus/m2v/romstage.c
@@ -73,6 +73,15 @@ static inline int spd_read_byte(unsigned device, unsigned address)
#include "cpu/amd/dualcore/dualcore.c"
#include "cpu/amd/car/post_cache_as_ram.c"
#include "cpu/amd/model_fxx/init_cpus.c"
+
+// Now, this needs to be included because it relies on the symbol
+// __PRE_RAM__ being set during CAR stage (in order to compile the
+// BSS free versions of the functions). Either rewrite the code
+// to be always BSS free, or invent a flag that's better suited than
+// __PRE_RAM__ to determine whether we're in ram init stage (stage 1)
+//
+#include "lib/cbmem.c"
+
#include "cpu/amd/model_fxx/fidvid.c"
#include "northbridge/amd/amdk8/resourcemap.c"
@@ -242,6 +251,7 @@ void cache_as_ram_main(unsigned long bist, unsigned long cpu_init_detectedx)
enable_rom_decode();
m2v_bus_init();
m2v_it8712f_gpio_init();
+ it8712f_enable_3vsbsw();
printk(BIOS_INFO, "now booting... \n");