[coreboot-gerrit] New patch to review for coreboot: intel/apollolake: Do not halt in poweroff if in SMM

[Furquan Shaikh]

Furquan Shaikh ([e-mail]) just uploaded a new patch set to gerrit, which you can find at https://review.coreboot.org/16257

-gerrit

commit 0448bb1ef23c317604abe5b67c504c53d99da3f5
Author: Furquan Shaikh 
Date:   Thu Aug 18 21:31:50 2016 -0700

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.

Change-Id: If116c8f4e867543abdc2ff235457c167b5073767
    Signed-off-by: Furquan Shaikh 
---
 src/soc/intel/apollolake/pmutil.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/soc/intel/apollolake/pmutil.c b/src/soc/intel/apollolake/pmutil.c
index dabc268..0d1a3f6 100644
--- a/src/soc/intel/apollolake/pmutil.c
+++ b/src/soc/intel/apollolake/pmutil.c
@@ -443,5 +443,6 @@ void vboot_platform_prepare_reboot(void)
 void poweroff(void)
 {
    enable_pm1_control(SLP_EN | (SLP_TYP_S5 << SLP_TYP_SHIFT));
-	halt();
+	if (!ENV_SMM)
+		halt();
 }