From 0a57e999b75d733669383bdc5d4c693b1d675a5d Mon Sep 17 00:00:00 2001 From: Alexandru Gagniuc Date: Sat, 19 Apr 2014 15:10:14 -0500 Subject: hp/pavilion_m6_1035dx: Do not re-init EC and lid SMI on S3 resume MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit It's not needed, and puts the EC back into APM mode. The EC does not shut down during S3 sleep, so we don't need to re-initialize it. Lid SMI will have been disabled in the switch to ACPI mode, don't re-enable it. Change-Id: I2c06df140f63427dac32ae095d29e68f64135358 Signed-off-by: Alexandru Gagniuc Reviewed-on: http://review.coreboot.org/5555 Tested-by: build bot (Jenkins) Reviewed-by: Kyösti Mälkki --- src/mainboard/hp/pavilion_m6_1035dx/mainboard.c | 19 ++++++++++++------- 1 file changed, 12 insertions(+), 7 deletions(-) (limited to 'src/mainboard') diff --git a/src/mainboard/hp/pavilion_m6_1035dx/mainboard.c b/src/mainboard/hp/pavilion_m6_1035dx/mainboard.c index 2e8436bc82..81260f16c2 100644 --- a/src/mainboard/hp/pavilion_m6_1035dx/mainboard.c +++ b/src/mainboard/hp/pavilion_m6_1035dx/mainboard.c @@ -32,19 +32,21 @@ #include -/************************************************* - * enable the dedicated function in parmer board. - *************************************************/ + +static void pavilion_cold_boot_init(void) +{ + /* Lid SMI is only used in non-ACPI mode; leave it off in S3 resume */ + hudson_configure_gevent_smi(EC_LID_GEVENT, SMI_MODE_SMI, SMI_LVL_LOW); + /* EC is not powered off during S3 sleep */ + pavilion_m6_1035dx_ec_init(); +} + static void mainboard_enable(device_t dev) { printk(BIOS_INFO, "Mainboard " CONFIG_MAINBOARD_PART_NUMBER " Enable.\n"); - pavilion_m6_1035dx_ec_init(); - hudson_configure_gevent_smi(EC_SMI_GEVENT, SMI_MODE_SMI, SMI_LVL_HIGH); - hudson_configure_gevent_smi(EC_LID_GEVENT, SMI_MODE_SMI, SMI_LVL_LOW); hudson_enable_smi_generation(); - /* * The mainboard is the first place that we get control in ramstage. Check * for S3 resume and call the approriate AGESA/CIMx resume functions. @@ -53,7 +55,10 @@ static void mainboard_enable(device_t dev) acpi_slp_type = acpi_get_sleep_type(); if (acpi_slp_type == 3) agesawrapper_fchs3earlyrestore(); + else #endif + pavilion_cold_boot_init(); + } struct chip_operations mainboard_ops = { -- cgit v1.2.3