<p>Hannah Williams has uploaded this change for <strong>review</strong>.</p><p><a href="https://review.coreboot.org/26238">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">mb/google/octopus: Disable BT before S5 entry<br><br>BUG=b:79606769<br>TEST= Test powerbtn press before OS entry, system should enter S5<br><br>Change-Id: Ibc14b4080a27de48d197e16d0eed162603482de2<br>Signed-off-by: Hannah Williams <hannah.williams@intel.com><br>---<br>M src/mainboard/google/octopus/smihandler.c<br>M src/mainboard/google/octopus/variants/baseboard/gpio.c<br>M src/mainboard/google/octopus/variants/baseboard/include/baseboard/variants.h<br>3 files changed, 15 insertions(+), 3 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;">git pull ssh://review.coreboot.org:29418/coreboot refs/changes/38/26238/1</pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/src/mainboard/google/octopus/smihandler.c b/src/mainboard/google/octopus/smihandler.c</span><br><span>index d430c4d..ecd41ae 100644</span><br><span>--- a/src/mainboard/google/octopus/smihandler.c</span><br><span>+++ b/src/mainboard/google/octopus/smihandler.c</span><br><span>@@ -34,7 +34,7 @@</span><br><span> const struct pad_config *pads;</span><br><span> size_t num;</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- pads = variant_sleep_gpio_table(&num);</span><br><span style="color: hsl(120, 100%, 40%);">+ pads = variant_sleep_gpio_table(&num, slp_typ);</span><br><span> gpio_configure_pads(pads, num);</span><br><span> </span><br><span> chromeec_smi_sleep(slp_typ, MAINBOARD_EC_S3_WAKE_EVENTS,</span><br><span>diff --git a/src/mainboard/google/octopus/variants/baseboard/gpio.c b/src/mainboard/google/octopus/variants/baseboard/gpio.c</span><br><span>index 2640696..10d43cf 100644</span><br><span>--- a/src/mainboard/google/octopus/variants/baseboard/gpio.c</span><br><span>+++ b/src/mainboard/google/octopus/variants/baseboard/gpio.c</span><br><span>@@ -13,6 +13,7 @@</span><br><span> * GNU General Public License for more details.</span><br><span> */</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+#include <arch/acpi.h></span><br><span> #include <baseboard/gpio.h></span><br><span> #include <baseboard/variants.h></span><br><span> #include <commonlib/helpers.h></span><br><span>@@ -300,9 +301,20 @@</span><br><span> static const struct pad_config sleep_gpio_table[] = {</span><br><span> };</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+/* GPIO settings before entering slp_s5. */</span><br><span style="color: hsl(120, 100%, 40%);">+static const struct pad_config sleep_s5_gpio_table[] = {</span><br><span style="color: hsl(120, 100%, 40%);">+ /* BT_DISABLE_L */</span><br><span style="color: hsl(120, 100%, 40%);">+ PAD_CFG_GPO_IOSSTATE_IOSTERM(GPIO_109, 0, DEEP, NONE, HIZCRx1, ENPU),</span><br><span style="color: hsl(120, 100%, 40%);">+};</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> const struct pad_config *__weak</span><br><span style="color: hsl(0, 100%, 40%);">-variant_sleep_gpio_table(size_t *num)</span><br><span style="color: hsl(120, 100%, 40%);">+variant_sleep_gpio_table(size_t *num, u8 slp_typ)</span><br><span> {</span><br><span style="color: hsl(120, 100%, 40%);">+ if (slp_typ == ACPI_S5) {</span><br><span style="color: hsl(120, 100%, 40%);">+ *num = ARRAY_SIZE(sleep_s5_gpio_table);</span><br><span style="color: hsl(120, 100%, 40%);">+ return sleep_s5_gpio_table;</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> *num = ARRAY_SIZE(sleep_gpio_table);</span><br><span> return sleep_gpio_table;</span><br><span> }</span><br><span>diff --git a/src/mainboard/google/octopus/variants/baseboard/include/baseboard/variants.h b/src/mainboard/google/octopus/variants/baseboard/include/baseboard/variants.h</span><br><span>index c278cde..f014f90 100644</span><br><span>--- a/src/mainboard/google/octopus/variants/baseboard/include/baseboard/variants.h</span><br><span>+++ b/src/mainboard/google/octopus/variants/baseboard/include/baseboard/variants.h</span><br><span>@@ -28,7 +28,7 @@</span><br><span> * entries for each table. */</span><br><span> const struct pad_config *variant_gpio_table(size_t *num);</span><br><span> const struct pad_config *variant_early_gpio_table(size_t *num);</span><br><span style="color: hsl(0, 100%, 40%);">-const struct pad_config *variant_sleep_gpio_table(size_t *num);</span><br><span style="color: hsl(120, 100%, 40%);">+const struct pad_config *variant_sleep_gpio_table(size_t *num, u8 slp_typ);</span><br><span> </span><br><span> /* Baseboard default swizzle. Can be reused if swizzle is same. */</span><br><span> extern const struct lpddr4_swizzle_cfg baseboard_lpddr4_swizzle;</span><br><span></span><br></pre><p>To view, visit <a href="https://review.coreboot.org/26238">change 26238</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/26238"/><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: Ibc14b4080a27de48d197e16d0eed162603482de2 </div>
<div style="display:none"> Gerrit-Change-Number: 26238 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: Hannah Williams <hannah.williams@intel.com> </div>