diff options
| author | Kyösti Mälkki <kyosti.malkki@gmail.com> | 2014-06-19 20:52:39 +0300 |
|---|---|---|
| committer | Patrick Georgi <patrick@georgi-clan.de> | 2014-06-21 08:04:58 +0200 |
| commit | 9107e53756e158cf2b5803862b731577407265d5 (patch) | |
| tree | 53b514b2ea75c97a41cd0d29988482cd4bc2bb8d /src/cpu/amd/agesa/family14 | |
| parent | c551caae56535b056be0440b08bd57e24459242c (diff) | |
| download | coreboot-9107e53756e158cf2b5803862b731577407265d5.tar.xz | |
cpu/amd/agesa: Use acpi_is_wakeup()
Change test to return true on S2 wakeup too. In S2 CPU would
have been powered down so MTRR recovery is required.
Change-Id: I6ad5fb7e32c59be7d84f28461c238c3975e1e04e
Signed-off-by: Kyösti Mälkki <kyosti.malkki@gmail.com>
Reviewed-on: http://review.coreboot.org/6078
Tested-by: build bot (Jenkins)
Reviewed-by: Edward O'Callaghan <eocallaghan@alterapraxis.com>
Reviewed-by: Patrick Georgi <patrick@georgi-clan.de>
Diffstat (limited to 'src/cpu/amd/agesa/family14')
| -rw-r--r-- | src/cpu/amd/agesa/family14/model_14_init.c | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/src/cpu/amd/agesa/family14/model_14_init.c b/src/cpu/amd/agesa/family14/model_14_init.c index 1a97f2c462..60a88c734e 100644 --- a/src/cpu/amd/agesa/family14/model_14_init.c +++ b/src/cpu/amd/agesa/family14/model_14_init.c @@ -32,9 +32,7 @@ #include <cpu/x86/mtrr.h> #include <cpu/amd/amdfam14.h> #include <arch/acpi.h> -#if CONFIG_HAVE_ACPI_RESUME #include <cpu/amd/agesa/s3_resume.h> -#endif #define MCI_STATUS 0x401 @@ -75,10 +73,8 @@ static void model_14_init(device_t dev) msr.lo |= SYSCFG_MSR_MtrrFixDramEn; wrmsr(SYSCFG_MSR, msr); -#if CONFIG_HAVE_ACPI_RESUME - if (acpi_slp_type == 3) + if (acpi_is_wakeup()) restore_mtrr(); -#endif x86_mtrr_check(); x86_enable_cache(); |