<p>Daisuke Nojiri has uploaded this change for <strong>review</strong>.</p><p><a href="https://review.coreboot.org/28110">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">Nami: Disable powering off EC on cr50 update<br><br>Nami doesn't support wakeup from hibernation by CR50. This causes the<br>device to remain turned off after CR50 update.<br><br>This patch disables turning off EC on cr50 update. CR50 resets the<br>whole system. So, EC reset is not required.<br><br>Signed-off-by: Daisuke Nojiri <dnojiri@chromium.org><br><br>BUG=b:112604277<br>BRANCH=none<br>TEST=gsctool -a -u /media/removable/cr50.bin && reboot<br>Verify EC reboots. AP prints 'Waiting for CR50 reset to pick up update'<br>then reboots.<br><br>Change-Id: I60a7aa50a549e7a5a1a114245fbf7b9646d813bb<br>---<br>M src/mainboard/google/poppy/Kconfig<br>M src/security/tpm/tss/vendor/cr50/Kconfig<br>M src/vendorcode/google/chromeos/cr50_enable_update.c<br>3 files changed, 10 insertions(+), 1 deletion(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;">git pull ssh://review.coreboot.org:29418/coreboot refs/changes/10/28110/1</pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/src/mainboard/google/poppy/Kconfig b/src/mainboard/google/poppy/Kconfig</span><br><span>index fc090df..1645451 100644</span><br><span>--- a/src/mainboard/google/poppy/Kconfig</span><br><span>+++ b/src/mainboard/google/poppy/Kconfig</span><br><span>@@ -169,6 +169,7 @@</span><br><span>         select DRIVERS_SPI_ACPI</span><br><span>      select EXCLUDE_NATIVE_SD_INTERFACE</span><br><span>   select MAINBOARD_HAS_SPI_TPM_CR50</span><br><span style="color: hsl(120, 100%, 40%);">+     select DISABLE_POWER_OFF_EC_ON_CR50_UPDATE</span><br><span> </span><br><span> config VARIANT_SPECIFIC_OPTIONS_NAUTILUS</span><br><span>   def_bool n</span><br><span>diff --git a/src/security/tpm/tss/vendor/cr50/Kconfig b/src/security/tpm/tss/vendor/cr50/Kconfig</span><br><span>index 4d40c08..e98ec11 100644</span><br><span>--- a/src/security/tpm/tss/vendor/cr50/Kconfig</span><br><span>+++ b/src/security/tpm/tss/vendor/cr50/Kconfig</span><br><span>@@ -25,4 +25,11 @@</span><br><span>         help</span><br><span>           Power off machine while waiting for CR50 update to take effect.</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+config DISABLE_POWER_OFF_EC_ON_CR50_UPDATE</span><br><span style="color: hsl(120, 100%, 40%);">+     bool</span><br><span style="color: hsl(120, 100%, 40%);">+  default n</span><br><span style="color: hsl(120, 100%, 40%);">+     help</span><br><span style="color: hsl(120, 100%, 40%);">+    Disable powering off EC while waiting for CR50 update to take effect.</span><br><span style="color: hsl(120, 100%, 40%);">+         Turning off EC is not necessary if CR50 resets the whole system.</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> endif</span><br><span>diff --git a/src/vendorcode/google/chromeos/cr50_enable_update.c b/src/vendorcode/google/chromeos/cr50_enable_update.c</span><br><span>index 1d91112..d07a9a3 100644</span><br><span>--- a/src/vendorcode/google/chromeos/cr50_enable_update.c</span><br><span>+++ b/src/vendorcode/google/chromeos/cr50_enable_update.c</span><br><span>@@ -60,7 +60,8 @@</span><br><span>   printk(BIOS_INFO, "Waiting for CR50 reset to pick up update.\n");</span><br><span> </span><br><span>      if (IS_ENABLED(CONFIG_POWER_OFF_ON_CR50_UPDATE)) {</span><br><span style="color: hsl(0, 100%, 40%);">-              if (IS_ENABLED(CONFIG_EC_GOOGLE_CHROMEEC)) {</span><br><span style="color: hsl(120, 100%, 40%);">+          if (IS_ENABLED(CONFIG_EC_GOOGLE_CHROMEEC) &&</span><br><span style="color: hsl(120, 100%, 40%);">+              !IS_ENABLED(CONFIG_DISABLE_POWER_OFF_EC_ON_CR50_UPDATE)) {</span><br><span>                       printk(BIOS_INFO, "Hibernating EC. Clearing AP_OFF.\n");</span><br><span>                   google_chromeec_reboot(0,</span><br><span>                                           EC_REBOOT_HIBERNATE_CLEAR_AP_OFF,</span><br><span></span><br></pre><p>To view, visit <a href="https://review.coreboot.org/28110">change 28110</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/28110"/><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: I60a7aa50a549e7a5a1a114245fbf7b9646d813bb </div>
<div style="display:none"> Gerrit-Change-Number: 28110 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: Daisuke Nojiri <dnojiri@chromium.org> </div>