From 9107e53756e158cf2b5803862b731577407265d5 Mon Sep 17 00:00:00 2001 From: Kyösti Mälkki Date: Thu, 19 Jun 2014 20:52:39 +0300 Subject: cpu/amd/agesa: Use acpi_is_wakeup() MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 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 Reviewed-on: http://review.coreboot.org/6078 Tested-by: build bot (Jenkins) Reviewed-by: Edward O'Callaghan Reviewed-by: Patrick Georgi --- src/cpu/amd/agesa/family15tn/model_15_init.c | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) (limited to 'src/cpu/amd/agesa/family15tn/model_15_init.c') diff --git a/src/cpu/amd/agesa/family15tn/model_15_init.c b/src/cpu/amd/agesa/family15tn/model_15_init.c index 467a3012df..64c78af04e 100644 --- a/src/cpu/amd/agesa/family15tn/model_15_init.c +++ b/src/cpu/amd/agesa/family15tn/model_15_init.c @@ -33,9 +33,7 @@ #include #include #include -#if CONFIG_HAVE_ACPI_RESUME #include -#endif static void model_15_init(device_t dev) { @@ -73,10 +71,8 @@ static void model_15_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(); -- cgit v1.2.3