From 344ed02a74f0a3a5e4db087e989de36eaaa5218c Mon Sep 17 00:00:00 2001 From: Furquan Shaikh Date: Tue, 26 Jun 2018 17:53:59 -0700 Subject: 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 Reviewed-on: https://review.coreboot.org/27249 Tested-by: build bot (Jenkins) Reviewed-by: Aaron Durbin --- src/soc/intel/apollolake/pmc.c | 1 - 1 file changed, 1 deletion(-) (limited to 'src/soc/intel') diff --git a/src/soc/intel/apollolake/pmc.c b/src/soc/intel/apollolake/pmc.c index 58cb71a43f..15ef2430ab 100644 --- a/src/soc/intel/apollolake/pmc.c +++ b/src/soc/intel/apollolake/pmc.c @@ -97,7 +97,6 @@ void pmc_soc_init(struct device *dev) /* Set up GPE configuration */ pmc_gpe_init(); - pmc_fixup_power_state(); pmc_set_acpi_mode(); if (cfg != NULL) -- cgit v1.2.3