<p>Patrick Georgi has uploaded this change for <strong>review</strong>.</p><p><a href="https://review.coreboot.org/22179">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">soc/intel/apollolake: avoid double accounting for power state<br><br>intel/common's pmclib already keeps track of the power state (since<br>commit f073872e22728fe8ade85022740af95cc129e9a5 and doing it twice can<br>mess up the data that ends up in cbmem (and from there, everything else),<br>so don't.<br><br>BUG=b:67976359<br>BRANCH=none<br>TEST=builds<br><br>Change-Id: I69c804a2a3bee43add940d8c827b7250f2fe9024<br>Signed-off-by: Patrick Georgi <pgeorgi@google.com><br>---<br>M src/soc/intel/apollolake/romstage.c<br>1 file changed, 2 insertions(+), 20 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;">git pull ssh://review.coreboot.org:29418/coreboot refs/changes/79/22179/1</pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;">diff --git a/src/soc/intel/apollolake/romstage.c b/src/soc/intel/apollolake/romstage.c<br>index cc02ff5..f315e61 100644<br>--- a/src/soc/intel/apollolake/romstage.c<br>+++ b/src/soc/intel/apollolake/romstage.c<br>@@ -53,8 +53,6 @@<br> #include <compiler.h><br> #include "chip.h"<br> <br>-static struct chipset_power_state power_state CAR_GLOBAL;<br>-<br> static const uint8_t hob_variable_guid[16] = {<br>     0x7d, 0x14, 0x34, 0xa0, 0x0c, 0x69, 0x54, 0x41,<br>       0x8d, 0xe6, 0xc0, 0x44, 0x64, 0x1d, 0xe9, 0x42,<br>@@ -110,22 +108,6 @@<br>         reg |= TCO_TMR_HLT;<br>   outl(reg, ACPI_BASE_ADDRESS + TCO1_CNT);<br> }<br>-<br>-static void migrate_power_state(int is_recovery)<br>-{<br>-       struct chipset_power_state *ps_cbmem;<br>-        struct chipset_power_state *ps_car;<br>-<br>-       ps_car = car_get_var_ptr(&power_state);<br>-  ps_cbmem = cbmem_add(CBMEM_ID_POWER_STATE, sizeof(*ps_cbmem));<br>-<br>-    if (ps_cbmem == NULL) {<br>-              printk(BIOS_DEBUG, "Unable to add power state to cbmem!\n");<br>-               return;<br>-      }<br>-    memcpy(ps_cbmem, ps_car, sizeof(*ps_cbmem));<br>-}<br>-ROMSTAGE_CBMEM_INIT_HOOK(migrate_power_state);<br> <br> /*<br>  * Punit Initialization code. This all isn't documented, but<br>@@ -211,7 +193,7 @@<br>     struct postcar_frame pcf;<br>     uintptr_t top_of_ram;<br>         bool s3wake;<br>- struct chipset_power_state *ps = car_get_var_ptr(&power_state);<br>+  struct chipset_power_state *ps = pmc_get_power_state();<br>       void *smm_base;<br>       size_t smm_size, var_size;<br>    const void *new_var_data;<br>@@ -312,7 +294,7 @@<br>        if (mupd->FspmArchUpd.BootMode != FSP_BOOT_WITH_FULL_CONFIGURATION)<br>                return;<br> <br>-   ps = car_get_var_ptr(&power_state);<br>+      ps = pmc_get_power_state();<br> <br>        if (ps->gen_pmcon1 & WARM_RESET_STS) {<br>                 printk(BIOS_INFO, "Full retrain unsupported on warm reboot.\n");<br></pre><p>To view, visit <a href="https://review.coreboot.org/22179">change 22179</a>. To unsubscribe, 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/22179"/><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: I69c804a2a3bee43add940d8c827b7250f2fe9024 </div>
<div style="display:none"> Gerrit-Change-Number: 22179 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: Patrick Georgi <pgeorgi@google.com> </div>