summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAaron Durbin <adurbin@chromium.org>2015-08-08 01:25:21 -0500
committerAaron Durbin <adurbin@chromium.org>2015-08-14 15:21:33 +0200
commit50ed38feba58ff59248015285bfdbe1c37cc4136 (patch)
tree13621315ebe0003deb9c645f2c6ad54134ce252b
parentaf030503e8037f8147196290ea681192ab6b7732 (diff)
downloadcoreboot-50ed38feba58ff59248015285bfdbe1c37cc4136.tar.xz
glados: make EC_SMI_L functional
Set the EC_SMI_GPI define to be GPP_E15 and route that GPIO for SMI generation. Also, the mainboard_smi_gpi_handler() was introduced on skylake in order to process any GPI that could generate an SMI. Switch to this handler so one can process the appropriate events. BUG=chrome-os-partner:43778 BRANCH=None TEST=Used 'lidclose' on EC command line during depthcharge to confirm EC_SMI_L generates SMI and shutdown happens. Original-Change-Id: Ia365b86161670a809e3fa99dde38fccc612d5e77 Original-Signed-off-by: Aaron Durbin <adurbin@chromium.org> Original-Reviewed-on: https://chromium-review.googlesource.com/291934 Original-Reviewed-by: Duncan Laurie <dlaurie@chromium.org> Change-Id: Ic16ea8e8d6ff564977ed2081d2353c82af71adea Signed-off-by: Aaron Durbin <adurbin@chromium.org> Reviewed-on: http://review.coreboot.org/11209 Tested-by: build bot (Jenkins) Reviewed-by: Patrick Georgi <pgeorgi@google.com>
-rw-r--r--src/mainboard/google/glados/ec.h4
-rw-r--r--src/mainboard/google/glados/gpio.h2
-rw-r--r--src/mainboard/google/glados/smihandler.c5
3 files changed, 5 insertions, 6 deletions
diff --git a/src/mainboard/google/glados/ec.h b/src/mainboard/google/glados/ec.h
index 9da9d9f0b2..f42e4c725a 100644
--- a/src/mainboard/google/glados/ec.h
+++ b/src/mainboard/google/glados/ec.h
@@ -22,11 +22,11 @@
#define MAINBOARD_EC_H
#include <ec/google/chromeec/ec_commands.h>
+#include <soc/gpio.h>
/* GPP_E16 is EC_SCI_L */
#define EC_SCI_GPI 16 /* TODO: Update this */
-/* GPP_E15 is EC_SMI_L */
-#define EC_SMI_GPI 15 /* TODO: Update this */
+#define EC_SMI_GPI GPP_E15
#define MAINBOARD_EC_SCI_EVENTS \
(EC_HOST_EVENT_MASK(EC_HOST_EVENT_LID_CLOSED) |\
diff --git a/src/mainboard/google/glados/gpio.h b/src/mainboard/google/glados/gpio.h
index dc58e9aeca..ebbee20233 100644
--- a/src/mainboard/google/glados/gpio.h
+++ b/src/mainboard/google/glados/gpio.h
@@ -134,7 +134,7 @@ static const struct pad_config gpio_table[] = {
/* USB2_OC3# */ PAD_CFG_NF(GPP_E12, NONE, DEEP, NF1),
/* DDPB_HPD0 */ PAD_CFG_NF(GPP_E13, NONE, DEEP, NF1),
/* DDPC_HPD1 */ PAD_CFG_NF(GPP_E14, NONE, DEEP, NF1),
-/* DDPD_HPD2 */ PAD_CFG_NF(GPP_E15, NONE, DEEP, NF1),
+/* DDPD_HPD2 */ PAD_CFG_GPI_ACPI_SMI(GPP_E15, NONE, DEEP, YES), /* EC_SMI_L */
/* DDPE_HPD3 */ PAD_CFG_NF(GPP_E16, NONE, DEEP, NF1),
/* EDP_HPD */ PAD_CFG_NF(GPP_E17, NONE, DEEP, NF1),
/* DDPB_CTRLCLK */ /* GPP_E18 */
diff --git a/src/mainboard/google/glados/smihandler.c b/src/mainboard/google/glados/smihandler.c
index 164bd8e465..f9f4707973 100644
--- a/src/mainboard/google/glados/smihandler.c
+++ b/src/mainboard/google/glados/smihandler.c
@@ -74,10 +74,9 @@ static u8 mainboard_smi_ec(void)
return cmd;
}
-/* gpi_sts is GPIO 47:32 */
-void mainboard_smi_gpi(u32 gpi_sts)
+void mainboard_smi_gpi_handler(const struct gpi_status *sts)
{
- if (gpi_sts & (1 << EC_SMI_GPI)) {
+ if (gpi_status_get(sts, EC_SMI_GPI)) {
/* Process all pending events */
while (mainboard_smi_ec() != 0)
;