Furquan Shaikh has uploaded this change for review. ( https://review.coreboot.org/27249
Change subject: soc/intel/apollolake: Remove call to pmc_fixup_power_state ......................................................................
soc/intel/apollolake: Remove call to pmc_fixup_power_state
On APL, call to pmc_fixup_power_state was added because GPE0_EN registers did not have the right bits set on resume from S3 -- this was a result of GPE_CFG registers getting reset to their default state on resume. GPE_CFG registers are programmed as part of pmc_gpe_init which was previously done only in ramstage.
However, with change a673d1c (soc/intel/apollolake: Initialize GPEs in bootblock), call to pmc_gpe_init was added to bootblock which means that GPE_CFG registers will have the right state by the time control reaches romstage where pmc_fill_power_state is called. Thus, call to pmc_fixup_power_state is totally redundant and in fact leads to side-effects because of the call to pmc_disable_all_gpe at the end of pmc_fill_power_state.
BUG=b:110836465 TEST=Verified on yorp that wake source is correctly identified on resume from S3.
Change-Id: Ia63ddbe381ce8a59736c231d745fd71d008d5d92 Signed-off-by: Furquan Shaikh furquan@google.com --- M src/soc/intel/apollolake/pmc.c 1 file changed, 0 insertions(+), 1 deletion(-)
git pull ssh://review.coreboot.org:29418/coreboot refs/changes/49/27249/1
diff --git a/src/soc/intel/apollolake/pmc.c b/src/soc/intel/apollolake/pmc.c index 58cb71a..15ef243 100644 --- a/src/soc/intel/apollolake/pmc.c +++ b/src/soc/intel/apollolake/pmc.c @@ -97,7 +97,6 @@
/* Set up GPE configuration */ pmc_gpe_init(); - pmc_fixup_power_state(); pmc_set_acpi_mode();
if (cfg != NULL)