gm45: Move S3 detection to enable stage.
Also move it to NB to be in line with other. Change-Id: Ibd961d60dcd686899f34f6a494c14ff9d65e618b Signed-off-by: Vladimir Serbinenko <phcoder@gmail.com> Reviewed-on: http://review.coreboot.org/6625 Tested-by: build bot (Jenkins) Reviewed-by: Patrick Georgi <patrick@georgi-clan.de>
This commit is contained in:
parent
b1f34ab8d5
commit
06667a5247
|
@ -32,6 +32,7 @@
|
|||
#include <cbmem.h>
|
||||
#include "chip.h"
|
||||
#include "gm45.h"
|
||||
#include "arch/acpi.h"
|
||||
|
||||
/* Reserve everything between A segment and 1MB:
|
||||
*
|
||||
|
@ -228,6 +229,23 @@ static void enable_dev(device_t dev)
|
|||
} else if (dev->path.type == DEVICE_PATH_CPU_CLUSTER) {
|
||||
dev->ops = &cpu_bus_ops;
|
||||
}
|
||||
|
||||
#if CONFIG_HAVE_ACPI_RESUME
|
||||
switch (pci_read_config32(dev_find_slot(0, PCI_DEVFN(0, 0)), /*D0F0_SKPD*/0xdc)) {
|
||||
case SKPAD_NORMAL_BOOT_MAGIC:
|
||||
printk(BIOS_DEBUG, "Normal boot.\n");
|
||||
acpi_slp_type=0;
|
||||
break;
|
||||
case SKPAD_ACPI_S3_MAGIC:
|
||||
printk(BIOS_DEBUG, "S3 Resume.\n");
|
||||
acpi_slp_type=3;
|
||||
break;
|
||||
default:
|
||||
printk(BIOS_DEBUG, "Unknown boot method, assuming normal.\n");
|
||||
acpi_slp_type=0;
|
||||
break;
|
||||
}
|
||||
#endif
|
||||
}
|
||||
|
||||
static void gm45_init(void *const chip_info)
|
||||
|
|
|
@ -234,23 +234,6 @@ static void i82801ix_init(void *chip_info)
|
|||
outw(0x0008, DEFAULT_TCOBASE + 0x12); /* Set higher timer value. */
|
||||
#endif
|
||||
outw(0x0000, DEFAULT_TCOBASE + 0x00); /* Update timer. */
|
||||
|
||||
#if CONFIG_HAVE_ACPI_RESUME
|
||||
switch (pci_read_config32(dev_find_slot(0, PCI_DEVFN(0, 0)), /*D0F0_SKPD*/0xdc)) {
|
||||
case SKPAD_NORMAL_BOOT_MAGIC:
|
||||
printk(BIOS_DEBUG, "Normal boot.\n");
|
||||
acpi_slp_type=0;
|
||||
break;
|
||||
case SKPAD_ACPI_S3_MAGIC:
|
||||
printk(BIOS_DEBUG, "S3 Resume.\n");
|
||||
acpi_slp_type=3;
|
||||
break;
|
||||
default:
|
||||
printk(BIOS_DEBUG, "Unknown boot method, assuming normal.\n");
|
||||
acpi_slp_type=0;
|
||||
break;
|
||||
}
|
||||
#endif
|
||||
}
|
||||
|
||||
struct chip_operations southbridge_intel_i82801ix_ops = {
|
||||
|
|
Loading…
Reference in New Issue