<p>Shelley Chen has uploaded this change for <strong>review</strong>.</p><p><a href="https://review.coreboot.org/26724">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">mb/google/poppy/variants/nami: Fix Elan touchscreen power off sequence<br><br>Power off does not seem to use the ACPI _OFF function, but rather the<br>smihandler. Creating variant_smi_sleep function for nami to handle<br>the power off sequence during reboot/power off.<br><br>BUG=b:78311818<br>BRANCH=None<br>TEST=Run "poweroff" command from AP console with SMI_DEBUG enabled<br> Make sure delays are consistent with spec<br><br>Change-Id: Ifeea545fe268be249793b3e508c51f5e4c1a3460<br>Signed-off-by: Shelley Chen <shchen@google.com><br>---<br>M src/mainboard/google/poppy/smihandler.c<br>M src/mainboard/google/poppy/variants/baseboard/include/baseboard/variants.h<br>M src/mainboard/google/poppy/variants/nami/Makefile.inc<br>A src/mainboard/google/poppy/variants/nami/smihandler.c<br>4 files changed, 46 insertions(+), 0 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;">git pull ssh://review.coreboot.org:29418/coreboot refs/changes/24/26724/1</pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/src/mainboard/google/poppy/smihandler.c b/src/mainboard/google/poppy/smihandler.c</span><br><span>index e880581..c8ff749 100644</span><br><span>--- a/src/mainboard/google/poppy/smihandler.c</span><br><span>+++ b/src/mainboard/google/poppy/smihandler.c</span><br><span>@@ -21,6 +21,7 @@</span><br><span> #include <soc/gpio.h></span><br><span> #include <soc/smm.h></span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+#include <baseboard/variants.h></span><br><span> #include <variant/gpio.h></span><br><span> #include <variant/ec.h></span><br><span> </span><br><span>@@ -29,8 +30,11 @@</span><br><span> chromeec_smi_process_events();</span><br><span> }</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+void __weak variant_smi_sleep(u8 slp_typ) {}</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> void mainboard_smi_sleep(u8 slp_typ)</span><br><span> {</span><br><span style="color: hsl(120, 100%, 40%);">+ variant_smi_sleep(slp_typ);</span><br><span> chromeec_smi_sleep(slp_typ, MAINBOARD_EC_S3_WAKE_EVENTS,</span><br><span> MAINBOARD_EC_S5_WAKE_EVENTS);</span><br><span> }</span><br><span>diff --git a/src/mainboard/google/poppy/variants/baseboard/include/baseboard/variants.h b/src/mainboard/google/poppy/variants/baseboard/include/baseboard/variants.h</span><br><span>index 97cb0fe..7e850b6 100644</span><br><span>--- a/src/mainboard/google/poppy/variants/baseboard/include/baseboard/variants.h</span><br><span>+++ b/src/mainboard/google/poppy/variants/baseboard/include/baseboard/variants.h</span><br><span>@@ -54,6 +54,7 @@</span><br><span> int variant_memory_sku(void);</span><br><span> void variant_devtree_update(void);</span><br><span> uint32_t variant_board_sku(void);</span><br><span style="color: hsl(120, 100%, 40%);">+void variant_smi_sleep(u8 slp_typ);</span><br><span> </span><br><span> struct nhlt;</span><br><span> void variant_nhlt_init(struct nhlt *nhlt);</span><br><span>diff --git a/src/mainboard/google/poppy/variants/nami/Makefile.inc b/src/mainboard/google/poppy/variants/nami/Makefile.inc</span><br><span>index 618011c..8fc0264 100644</span><br><span>--- a/src/mainboard/google/poppy/variants/nami/Makefile.inc</span><br><span>+++ b/src/mainboard/google/poppy/variants/nami/Makefile.inc</span><br><span>@@ -35,6 +35,8 @@</span><br><span> ramstage-y += nhlt.c</span><br><span> ramstage-y += mainboard.c</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+smm-$(CONFIG_HAVE_SMI_HANDLER) += smihandler.c</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> # Add OEM ID table</span><br><span> cbfs-files-y += oem.bin</span><br><span> oem.bin-file := $(call strip_quotes,$(CONFIG_OEM_BIN_FILE))</span><br><span>diff --git a/src/mainboard/google/poppy/variants/nami/smihandler.c b/src/mainboard/google/poppy/variants/nami/smihandler.c</span><br><span>new file mode 100644</span><br><span>index 0000000..85a7282</span><br><span>--- /dev/null</span><br><span>+++ b/src/mainboard/google/poppy/variants/nami/smihandler.c</span><br><span>@@ -0,0 +1,39 @@</span><br><span style="color: hsl(120, 100%, 40%);">+/*</span><br><span style="color: hsl(120, 100%, 40%);">+ * This file is part of the coreboot project.</span><br><span style="color: hsl(120, 100%, 40%);">+ *</span><br><span style="color: hsl(120, 100%, 40%);">+ * Copyright (C) 2018 Google Inc.</span><br><span style="color: hsl(120, 100%, 40%);">+ *</span><br><span style="color: hsl(120, 100%, 40%);">+ * This program is free software; you can redistribute it and/or modify</span><br><span style="color: hsl(120, 100%, 40%);">+ * it under the terms of the GNU General Public License as published by</span><br><span style="color: hsl(120, 100%, 40%);">+ * the Free Software Foundation; version 2 of the License.</span><br><span style="color: hsl(120, 100%, 40%);">+ *</span><br><span style="color: hsl(120, 100%, 40%);">+ * This program is distributed in the hope that it will be useful,</span><br><span style="color: hsl(120, 100%, 40%);">+ * but WITHOUT ANY WARRANTY; without even the implied warranty of</span><br><span style="color: hsl(120, 100%, 40%);">+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the</span><br><span style="color: hsl(120, 100%, 40%);">+ * GNU General Public License for more details.</span><br><span style="color: hsl(120, 100%, 40%);">+ */</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+#include <baseboard/variants.h></span><br><span style="color: hsl(120, 100%, 40%);">+#include <console/console.h></span><br><span style="color: hsl(120, 100%, 40%);">+#include <delay.h></span><br><span style="color: hsl(120, 100%, 40%);">+#include <device/device.h></span><br><span style="color: hsl(120, 100%, 40%);">+#include "chip.h"</span><br><span style="color: hsl(120, 100%, 40%);">+#include "gpio.h"</span><br><span style="color: hsl(120, 100%, 40%);">+#include <drivers/i2c/generic/chip.h></span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+void variant_smi_sleep(u8 slp_typ)</span><br><span style="color: hsl(120, 100%, 40%);">+{</span><br><span style="color: hsl(120, 100%, 40%);">+ const struct device *dev_i2c0 = dev_find_slot(0, PCH_DEVFN_I2C0);</span><br><span style="color: hsl(120, 100%, 40%);">+ const struct drivers_i2c_generic_config *conf =</span><br><span style="color: hsl(120, 100%, 40%);">+ dev_i2c0->link_list[0].children->chip_info;</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ /* TOUCHSCREEN_DIS# */</span><br><span style="color: hsl(120, 100%, 40%);">+ gpio_set(GPP_C3, 0);</span><br><span style="color: hsl(120, 100%, 40%);">+ mdelay(conf->stop_off_delay_ms);</span><br><span style="color: hsl(120, 100%, 40%);">+ /* TOUCHSCREEN_RST# */</span><br><span style="color: hsl(120, 100%, 40%);">+ gpio_set(GPP_B3, 0);</span><br><span style="color: hsl(120, 100%, 40%);">+ mdelay(conf->reset_off_delay_ms);</span><br><span style="color: hsl(120, 100%, 40%);">+ /* EN_PP3300_DX_TOUCHSCREEN */</span><br><span style="color: hsl(120, 100%, 40%);">+ gpio_set(GPP_B4, 0);</span><br><span style="color: hsl(120, 100%, 40%);">+ mdelay(conf->enable_off_delay_ms);</span><br><span style="color: hsl(120, 100%, 40%);">+}</span><br><span></span><br></pre><p>To view, visit <a href="https://review.coreboot.org/26724">change 26724</a>. To unsubscribe, or for help writing mail filters, visit <a href="https://review.coreboot.org/settings">settings</a>.</p><div itemscope itemtype="http://schema.org/EmailMessage"><div itemscope itemprop="action" itemtype="http://schema.org/ViewAction"><link itemprop="url" href="https://review.coreboot.org/26724"/><meta itemprop="name" content="View Change"/></div></div>
<div style="display:none"> Gerrit-Project: coreboot </div>
<div style="display:none"> Gerrit-Branch: master </div>
<div style="display:none"> Gerrit-MessageType: newchange </div>
<div style="display:none"> Gerrit-Change-Id: Ifeea545fe268be249793b3e508c51f5e4c1a3460 </div>
<div style="display:none"> Gerrit-Change-Number: 26724 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: Shelley Chen <shchen@google.com> </div>