sravan/system76-coreboot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

binaryPI: Hide use of acpi_slp_type

Browse Source 
Change-Id: I867932db4388eb078b69b6f42c82967777d45d79
Signed-off-by: Kyösti Mälkki <kyosti.malkki@gmail.com>
Reviewed-on: http://review.coreboot.org/10358
Tested-by: build bot (Jenkins)
Reviewed-by: Paul Menzel <paulepanter@users.sourceforge.net>
Reviewed-by: Aaron Durbin <adurbin@chromium.org>
This commit is contained in:
Kyösti Mälkki
2015-05-29 06:18:08 +03:00
parent 59d262ce6f
commit 315a7b8383
2 changed files with 2 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/cpu/amd/pi/00630F01/model_15_init.c
View File

@@ -34,9 +34,7 @@
#include <cpu/x86/mtrr.h> #include <cpu/x86/mtrr.h>
#include <cpu/amd/amdfam15.h> #include <cpu/amd/amdfam15.h>
#include <arch/acpi.h> #include <arch/acpi.h>
#if CONFIG_HAVE_ACPI_RESUME
#include <cpu/amd/pi/s3_resume.h> #include <cpu/amd/pi/s3_resume.h>
#endif
static void model_15_init(device_t dev) static void model_15_init(device_t dev)
{ {
@@ -71,10 +69,8 @@ static void model_15_init(device_t dev)
msr.lo |= SYSCFG_MSR_MtrrFixDramEn; msr.lo |= SYSCFG_MSR_MtrrFixDramEn;
wrmsr(SYSCFG_MSR, msr); wrmsr(SYSCFG_MSR, msr);
#if CONFIG_HAVE_ACPI_RESUME if (acpi_is_wakeup())
if (acpi_slp_type == 3)
restore_mtrr(); restore_mtrr();
#endif
x86_mtrr_check(); x86_mtrr_check();
x86_enable_cache(); x86_enable_cache();

5
src/mainboard/amd/lamar/mainboard.c
View File

@@ -158,11 +158,8 @@ static void mainboard_enable(device_t dev)
* The mainboard is the first place that we get control in ramstage. Check * The mainboard is the first place that we get control in ramstage. Check
* for S3 resume and call the approriate AGESA/CIMx resume functions. * for S3 resume and call the approriate AGESA/CIMx resume functions.
*/ */
#if CONFIG_HAVE_ACPI_RESUME if (acpi_is_wakeup_s3())
acpi_slp_type = acpi_get_sleep_type();
if (acpi_slp_type == 3)
agesawrapper_fchs3earlyrestore(); agesawrapper_fchs3earlyrestore();
#endif
/* Initialize the PIRQ data structures for consumption */ /* Initialize the PIRQ data structures for consumption */
pirq_setup(); pirq_setup();