<p>Nico Huber has uploaded this change for <strong>review</strong>.</p><p><a href="https://review.coreboot.org/29681">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">soc/intel: Drop pmc_get_mainboard_power_failure_state_choice()<br><br>It's not needed anymore.<br><br>Change-Id: I273acb2bf1675dc947927e3e6d2ebb78aa94518a<br>Signed-off-by: Nico Huber <nico.h@gmx.de><br>---<br>M src/soc/intel/cannonlake/pmc.c<br>M src/soc/intel/common/block/include/intelblocks/pmclib.h<br>M src/soc/intel/common/block/pmc/pmclib.c<br>M src/soc/intel/icelake/pmc.c<br>M src/soc/intel/skylake/pmc.c<br>5 files changed, 6 insertions(+), 27 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;">git pull ssh://review.coreboot.org:29418/coreboot refs/changes/81/29681/1</pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/src/soc/intel/cannonlake/pmc.c b/src/soc/intel/cannonlake/pmc.c</span><br><span>index ecd47e0..aebcfc9 100644</span><br><span>--- a/src/soc/intel/cannonlake/pmc.c</span><br><span>+++ b/src/soc/intel/cannonlake/pmc.c</span><br><span>@@ -57,8 +57,7 @@</span><br><span> */</span><br><span> void pmc_soc_restore_power_failure(void)</span><br><span> {</span><br><span style="color: hsl(0, 100%, 40%);">- pmc_set_afterg3(PCH_DEV_PMC,</span><br><span style="color: hsl(0, 100%, 40%);">- pmc_get_mainboard_power_failure_state_choice());</span><br><span style="color: hsl(120, 100%, 40%);">+ pmc_set_afterg3(PCH_DEV_PMC, CONFIG_MAINBOARD_POWER_FAILURE_STATE);</span><br><span> }</span><br><span> </span><br><span> static void config_deep_sX(uint32_t offset, uint32_t mask, int sx, int enable)</span><br><span>@@ -106,8 +105,7 @@</span><br><span> {</span><br><span> const char *state;</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- /* Get the chip configuration */</span><br><span style="color: hsl(0, 100%, 40%);">- int pwr_on = pmc_get_mainboard_power_failure_state_choice();</span><br><span style="color: hsl(120, 100%, 40%);">+ const int pwr_on = CONFIG_MAINBOARD_POWER_FAILURE_STATE;</span><br><span> </span><br><span> /*</span><br><span> * Which state do we want to goto after g3 (power restored)?</span><br><span>diff --git a/src/soc/intel/common/block/include/intelblocks/pmclib.h b/src/soc/intel/common/block/include/intelblocks/pmclib.h</span><br><span>index 4569525..e1c29be 100644</span><br><span>--- a/src/soc/intel/common/block/include/intelblocks/pmclib.h</span><br><span>+++ b/src/soc/intel/common/block/include/intelblocks/pmclib.h</span><br><span>@@ -221,10 +221,4 @@</span><br><span> MAINBOARD_POWER_STATE_PREVIOUS,</span><br><span> };</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-/*</span><br><span style="color: hsl(0, 100%, 40%);">- * Determines what state to go to when power is reapplied</span><br><span style="color: hsl(0, 100%, 40%);">- * after a power failure (G3 State)</span><br><span style="color: hsl(0, 100%, 40%);">- */</span><br><span style="color: hsl(0, 100%, 40%);">-int pmc_get_mainboard_power_failure_state_choice(void);</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span> #endif /* SOC_INTEL_COMMON_BLOCK_PMCLIB_H */</span><br><span>diff --git a/src/soc/intel/common/block/pmc/pmclib.c b/src/soc/intel/common/block/pmc/pmclib.c</span><br><span>index dcc7cc9..4a1da9e 100644</span><br><span>--- a/src/soc/intel/common/block/pmc/pmclib.c</span><br><span>+++ b/src/soc/intel/common/block/pmc/pmclib.c</span><br><span>@@ -580,12 +580,3 @@</span><br><span> /* Set the routes in the GPIO communities as well. */</span><br><span> gpio_route_gpe(dw0, dw1, dw2);</span><br><span> }</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">-/*</span><br><span style="color: hsl(0, 100%, 40%);">- * Determines what state to go to when power is reapplied</span><br><span style="color: hsl(0, 100%, 40%);">- * after a power failure (G3 State)</span><br><span style="color: hsl(0, 100%, 40%);">- */</span><br><span style="color: hsl(0, 100%, 40%);">-int pmc_get_mainboard_power_failure_state_choice(void)</span><br><span style="color: hsl(0, 100%, 40%);">-{</span><br><span style="color: hsl(0, 100%, 40%);">- return CONFIG_MAINBOARD_POWER_FAILURE_STATE;</span><br><span style="color: hsl(0, 100%, 40%);">-}</span><br><span>diff --git a/src/soc/intel/icelake/pmc.c b/src/soc/intel/icelake/pmc.c</span><br><span>index 2453210..754aa50 100644</span><br><span>--- a/src/soc/intel/icelake/pmc.c</span><br><span>+++ b/src/soc/intel/icelake/pmc.c</span><br><span>@@ -55,8 +55,7 @@</span><br><span> */</span><br><span> void pmc_soc_restore_power_failure(void)</span><br><span> {</span><br><span style="color: hsl(0, 100%, 40%);">- pmc_set_afterg3(PCH_DEV_PMC,</span><br><span style="color: hsl(0, 100%, 40%);">- pmc_get_mainboard_power_failure_state_choice());</span><br><span style="color: hsl(120, 100%, 40%);">+ pmc_set_afterg3(PCH_DEV_PMC, CONFIG_MAINBOARD_POWER_FAILURE_STATE);</span><br><span> }</span><br><span> </span><br><span> static void config_deep_sX(uint32_t offset, uint32_t mask, int sx, int enable)</span><br><span>@@ -104,8 +103,7 @@</span><br><span> {</span><br><span> const char *state;</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- /* Get the chip configuration */</span><br><span style="color: hsl(0, 100%, 40%);">- int pwr_on = pmc_get_mainboard_power_failure_state_choice();</span><br><span style="color: hsl(120, 100%, 40%);">+ const int pwr_on = CONFIG_MAINBOARD_POWER_FAILURE_STATE;</span><br><span> </span><br><span> /*</span><br><span> * Which state do we want to goto after g3 (power restored)?</span><br><span>diff --git a/src/soc/intel/skylake/pmc.c b/src/soc/intel/skylake/pmc.c</span><br><span>index 6b673be..5b82392 100644</span><br><span>--- a/src/soc/intel/skylake/pmc.c</span><br><span>+++ b/src/soc/intel/skylake/pmc.c</span><br><span>@@ -108,8 +108,7 @@</span><br><span> {</span><br><span> const char *state;</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- /* Get the chip configuration */</span><br><span style="color: hsl(0, 100%, 40%);">- int pwr_on = pmc_get_mainboard_power_failure_state_choice();</span><br><span style="color: hsl(120, 100%, 40%);">+ const int pwr_on = CONFIG_MAINBOARD_POWER_FAILURE_STATE;</span><br><span> </span><br><span> /*</span><br><span> * Which state do we want to goto after g3 (power restored)?</span><br><span>@@ -206,8 +205,7 @@</span><br><span> */</span><br><span> void pmc_soc_restore_power_failure(void)</span><br><span> {</span><br><span style="color: hsl(0, 100%, 40%);">- pmc_set_afterg3(PCH_DEV_PMC,</span><br><span style="color: hsl(0, 100%, 40%);">- pmc_get_mainboard_power_failure_state_choice());</span><br><span style="color: hsl(120, 100%, 40%);">+ pmc_set_afterg3(PCH_DEV_PMC, CONFIG_MAINBOARD_POWER_FAILURE_STATE);</span><br><span> }</span><br><span> </span><br><span> static void pm1_enable_pwrbtn_smi(void *unused)</span><br><span></span><br></pre><p>To view, visit <a href="https://review.coreboot.org/29681">change 29681</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/29681"/><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: I273acb2bf1675dc947927e3e6d2ebb78aa94518a </div>
<div style="display:none"> Gerrit-Change-Number: 29681 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: Nico Huber <nico.h@gmx.de> </div>