erebion/coreboot
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

slippy/falco/peppy: Fix EC wake events in S5

Browse source 
The SMI handler code was setting S3 wake events when going
into S5 and enabling a key press to wake the system.

BUG=chrome-os-partner:21025
BRANCH=falco,peppy
TEST=manual: power off and try to wake with key press

Change-Id: I6413ef1341e0149187df9f4f7e0c314d4c9e9c6e
Signed-off-by: Duncan Laurie <dlaurie@chromium.org>
Reviewed-on: https://gerrit.chromium.org/gerrit/65323
Reviewed-by: Aaron Durbin <adurbin@chromium.org>
This commit is contained in:
Duncan Laurie 2013-08-09 10:12:51 -07:00 • committed by ChromeBot
commit 9bfa727800
3 changed files with 16 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

9
src/mainboard/google/falco/smihandler.c
View file

@ -107,6 +107,9 @@ void mainboard_smi_sleep(u8 slp_typ)
set_gpio(GPIO_WLAN_DISABLE_L, 0);
/* Disable LTE */
set_gpio(GPIO_LTE_DISABLE_L, 0);
/* Enable wake events */
google_chromeec_set_wake_mask(MAINBOARD_EC_S3_WAKE_EVENTS);
break;
case 5:
if (smm_get_gnvs()->s5u0 == 0)
@ -120,6 +123,9 @@ void mainboard_smi_sleep(u8 slp_typ)
set_gpio(GPIO_WLAN_DISABLE_L, 0);
/* Disable LTE */
set_gpio(GPIO_LTE_DISABLE_L, 0);
/* Enable wake events */
google_chromeec_set_wake_mask(MAINBOARD_EC_S5_WAKE_EVENTS);
break;
}
@ -129,9 +135,6 @@ void mainboard_smi_sleep(u8 slp_typ)
/* Clear pending events that may trigger immediate wake */
while (google_chromeec_get_event() != 0);
/* Enable wake events */
google_chromeec_set_wake_mask(MAINBOARD_EC_S3_WAKE_EVENTS);
}
#define APMC_FINALIZE 0xcb

9
src/mainboard/google/peppy/smihandler.c
View file

@ -106,6 +106,9 @@ void mainboard_smi_sleep(u8 slp_typ)
set_gpio(GPIO_PP3300_CODEC_EN, 0);
set_gpio(GPIO_WLAN_DISABLE_L, 0);
/* Enable wake events */
google_chromeec_set_wake_mask(MAINBOARD_EC_S3_WAKE_EVENTS);
break;
case 5:
if (smm_get_gnvs()->s5u0 == 0)
@ -117,6 +120,9 @@ void mainboard_smi_sleep(u8 slp_typ)
set_gpio(GPIO_PP3300_CODEC_EN, 0);
set_gpio(GPIO_WLAN_DISABLE_L, 0);
/* Enable wake events */
google_chromeec_set_wake_mask(MAINBOARD_EC_S5_WAKE_EVENTS);
break;
}
@ -126,9 +132,6 @@ void mainboard_smi_sleep(u8 slp_typ)
/* Clear pending events that may trigger immediate wake */
while (google_chromeec_get_event() != 0);
/* Enable wake events */
google_chromeec_set_wake_mask(MAINBOARD_EC_S3_WAKE_EVENTS);
}
#define APMC_FINALIZE 0xcb

7
src/mainboard/google/slippy/smihandler.c
View file

@ -98,6 +98,8 @@ void mainboard_smi_sleep(u8 slp_typ)
if (smm_get_gnvs()->s3u1 == 0)
google_chromeec_set_usb_charge_mode(
1, USB_CHARGE_MODE_DISABLED);
/* Enable wake events */
google_chromeec_set_wake_mask(MAINBOARD_EC_S3_WAKE_EVENTS);
break;
case 5:
if (smm_get_gnvs()->s5u0 == 0)
@ -106,6 +108,8 @@ void mainboard_smi_sleep(u8 slp_typ)
if (smm_get_gnvs()->s5u1 == 0)
google_chromeec_set_usb_charge_mode(
1, USB_CHARGE_MODE_DISABLED);
/* Enable wake events */
google_chromeec_set_wake_mask(MAINBOARD_EC_S5_WAKE_EVENTS);
break;
}
@ -115,9 +119,6 @@ void mainboard_smi_sleep(u8 slp_typ)
/* Clear pending events that may trigger immediate wake */
while (google_chromeec_get_event() != 0);
/* Enable wake events */
google_chromeec_set_wake_mask(MAINBOARD_EC_S3_WAKE_EVENTS);
}
#define APMC_FINALIZE 0xcb