GNUBoot
/
coreboot-kgpe-d16
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

soc/intel: Drop pmc_get_mainboard_power_failure_state_choice() 

It's not needed anymore.

Change-Id: I273acb2bf1675dc947927e3e6d2ebb78aa94518a
Signed-off-by: Nico Huber <nico.h@gmx.de>
Reviewed-on: https://review.coreboot.org/c/29681
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Reviewed-by: HAOUAS Elyes <ehaouas@noos.fr>
This commit is contained in:
Nico Huber 2018-11-17 23:43:24 +01:00
parent 9faae2b939
commit a70ed00bc2
5 changed files with 6 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/soc/intel/cannonlake/pmc.c
View File

@ -57,8 +57,7 @@ static void pmc_set_afterg3(struct device *dev, int s5pwr)
*/ */
void pmc_soc_restore_power_failure(void) void pmc_soc_restore_power_failure(void)
{ {
pmc_set_afterg3(PCH_DEV_PMC, pmc_set_afterg3(PCH_DEV_PMC, CONFIG_MAINBOARD_POWER_FAILURE_STATE);
pmc_get_mainboard_power_failure_state_choice());
} }
static void config_deep_sX(uint32_t offset, uint32_t mask, int sx, int enable) static void config_deep_sX(uint32_t offset, uint32_t mask, int sx, int enable)
@ -106,8 +105,7 @@ static void pch_power_options(struct device *dev)
{ {
const char *state; const char *state;
/* Get the chip configuration */ const int pwr_on = CONFIG_MAINBOARD_POWER_FAILURE_STATE;
int pwr_on = pmc_get_mainboard_power_failure_state_choice();
/* /*
* Which state do we want to goto after g3 (power restored)? * Which state do we want to goto after g3 (power restored)?

6
src/soc/intel/common/block/include/intelblocks/pmclib.h
View File

@ -221,10 +221,4 @@ enum {
MAINBOARD_POWER_STATE_PREVIOUS, MAINBOARD_POWER_STATE_PREVIOUS,
}; };
/*
* Determines what state to go to when power is reapplied
* after a power failure (G3 State)
*/
int pmc_get_mainboard_power_failure_state_choice(void);
#endif /* SOC_INTEL_COMMON_BLOCK_PMCLIB_H */ #endif /* SOC_INTEL_COMMON_BLOCK_PMCLIB_H */

9
src/soc/intel/common/block/pmc/pmclib.c
View File

@ -580,12 +580,3 @@ void pmc_gpe_init(void)
/* Set the routes in the GPIO communities as well. */ /* Set the routes in the GPIO communities as well. */
gpio_route_gpe(dw0, dw1, dw2); gpio_route_gpe(dw0, dw1, dw2);
} }
/*
* Determines what state to go to when power is reapplied
* after a power failure (G3 State)
*/
int pmc_get_mainboard_power_failure_state_choice(void)
{
return CONFIG_MAINBOARD_POWER_FAILURE_STATE;
}

6
src/soc/intel/icelake/pmc.c
View File

@ -55,8 +55,7 @@ static void pmc_set_afterg3(struct device *dev, int s5pwr)
*/ */
void pmc_soc_restore_power_failure(void) void pmc_soc_restore_power_failure(void)
{ {
pmc_set_afterg3(PCH_DEV_PMC, pmc_set_afterg3(PCH_DEV_PMC, CONFIG_MAINBOARD_POWER_FAILURE_STATE);
pmc_get_mainboard_power_failure_state_choice());
} }
static void config_deep_sX(uint32_t offset, uint32_t mask, int sx, int enable) static void config_deep_sX(uint32_t offset, uint32_t mask, int sx, int enable)
@ -104,8 +103,7 @@ static void pch_power_options(struct device *dev)
{ {
const char *state; const char *state;
/* Get the chip configuration */ const int pwr_on = CONFIG_MAINBOARD_POWER_FAILURE_STATE;
int pwr_on = pmc_get_mainboard_power_failure_state_choice();
/* /*
* Which state do we want to goto after g3 (power restored)? * Which state do we want to goto after g3 (power restored)?

6
src/soc/intel/skylake/pmc.c
View File

@ -108,8 +108,7 @@ static void pch_power_options(struct device *dev)
{ {
const char *state; const char *state;
/* Get the chip configuration */ const int pwr_on = CONFIG_MAINBOARD_POWER_FAILURE_STATE;
int pwr_on = pmc_get_mainboard_power_failure_state_choice();
/* /*
* Which state do we want to goto after g3 (power restored)? * Which state do we want to goto after g3 (power restored)?
@ -206,8 +205,7 @@ void pmc_soc_init(struct device *dev)
*/ */
void pmc_soc_restore_power_failure(void) void pmc_soc_restore_power_failure(void)
{ {
pmc_set_afterg3(PCH_DEV_PMC, pmc_set_afterg3(PCH_DEV_PMC, CONFIG_MAINBOARD_POWER_FAILURE_STATE);
pmc_get_mainboard_power_failure_state_choice());
} }
static void pm1_enable_pwrbtn_smi(void *unused) static void pm1_enable_pwrbtn_smi(void *unused)