[coreboot-gerrit] Patch set updated for coreboot: intel/skylake: Do not halt in poweroff if in SMM
Furquan Shaikh (furquan@google.com)
gerrit at coreboot.org
Fri Aug 19 17:58:03 CEST 2016
Furquan Shaikh (furquan at google.com) just uploaded a new patch set to gerrit, which you can find at https://review.coreboot.org/16259
-gerrit
commit 23e01a6d917136451058f6770caa0830db585643
Author: Furquan Shaikh <furquan at google.com>
Date: Thu Aug 18 21:42:36 2016 -0700
intel/skylake: 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
Change-Id: I3addc1ea065346fbc5dbec9d1ad49bbd0ae05696
Signed-off-by: Furquan Shaikh <furquan at google.com>
---
src/soc/intel/skylake/pmutil.c | 10 +++++++++-
1 file changed, 9 insertions(+), 1 deletion(-)
diff --git a/src/soc/intel/skylake/pmutil.c b/src/soc/intel/skylake/pmutil.c
index 807579d..31de242 100644
--- a/src/soc/intel/skylake/pmutil.c
+++ b/src/soc/intel/skylake/pmutil.c
@@ -25,6 +25,7 @@
#include <device/pci_def.h>
#include <console/console.h>
#include <halt.h>
+#include <rules.h>
#include <stdlib.h>
#include <soc/gpio.h>
#include <soc/iomap.h>
@@ -435,5 +436,12 @@ uint16_t smbus_tco_regs(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();
}
More information about the coreboot-gerrit
mailing list