From 494a6b6dcc7fff2b054daf5384d2b258f83d44f0 Mon Sep 17 00:00:00 2001 From: Furquan Shaikh Date: Thu, 18 Aug 2016 21:31:50 -0700 Subject: [PATCH] UPSTREAM: intel/apollolake: Do not halt in poweroff if in SMM Calling halt in poweroff when in SMM prevents SLP_SMI to be triggered preventing the system from entering sleep state. Fix this by calling halt only if ENV_SMM is not true. BUG=chrome-os-partner:56395 BRANCH=None TEST=Verified lidclose behavior on reef. Signed-off-by: Furquan Shaikh Reviewed-on: https://review.coreboot.org/16257 Reviewed-by: Aaron Durbin Change-Id: If116c8f4e867543abdc2ff235457c167b5073767 Reviewed-on: https://chromium-review.googlesource.com/373731 Commit-Ready: Furquan Shaikh Tested-by: Furquan Shaikh Reviewed-by: Aaron Durbin --- src/soc/intel/apollolake/pmutil.c | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/src/soc/intel/apollolake/pmutil.c b/src/soc/intel/apollolake/pmutil.c index dabc2683bc..aaa4018683 100644 --- a/src/soc/intel/apollolake/pmutil.c +++ b/src/soc/intel/apollolake/pmutil.c @@ -443,5 +443,12 @@ void vboot_platform_prepare_reboot(void) void poweroff(void) { enable_pm1_control(SLP_EN | (SLP_TYP_S5 << SLP_TYP_SHIFT)); - halt(); + + /* + * Setting SLP_TYP_S5 in PM1 triggers SLP_SMI, which is handled by SMM + * to transition to S5 state. If halt is called in SMM, then it prevents + * the SMI handler from being triggered and system never enters S5. + */ + if (!ENV_SMM) + halt(); }