summaryrefslogtreecommitdiff
path: root/src/soc/intel/common/block/cpu
diff options
context:
space:
mode:
authorMichael Niewöhner <foss@mniewoehner.de>2021-09-24 23:42:14 +0200
committerMichael Niewöhner <foss@mniewoehner.de>2021-10-17 13:59:26 +0000
commit413810e55ff307d998ace4e16145ab71e939e85a (patch)
tree61f46c3ceedc2021de0ae349c0f619235a355eb9 /src/soc/intel/common/block/cpu
parent0e905801f8ff6c10b20625e31d851920b3f4c4f2 (diff)
soc/intel/*: only enable PM Timer emulation if the PM Timer is disabled
uCode PM Timer emulation is only needed when the hardware PM ACPI timer is disabled. Also, since it redirects any register accesses to uCode, it overrides the hardware PM Timer. Thus, only enable emulation when required. Change-Id: I60a775bd6eb4206750f606ce8a8777d2e2dfb579 Signed-off-by: Michael Niewöhner <foss@mniewoehner.de> Reviewed-on: https://review.coreboot.org/c/coreboot/+/57930 Tested-by: build bot (Jenkins) <no-reply@coreboot.org> Reviewed-by: Nico Huber <nico.h@gmx.de>
Diffstat (limited to 'src/soc/intel/common/block/cpu')
-rw-r--r--src/soc/intel/common/block/cpu/pm_timer_emulation.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/soc/intel/common/block/cpu/pm_timer_emulation.c b/src/soc/intel/common/block/cpu/pm_timer_emulation.c
index 0436e04634..3c61998515 100644
--- a/src/soc/intel/common/block/cpu/pm_timer_emulation.c
+++ b/src/soc/intel/common/block/cpu/pm_timer_emulation.c
@@ -11,7 +11,7 @@ void enable_pm_timer_emulation(void)
{
msr_t msr;
- if (!CONFIG_CPU_XTAL_HZ)
+ if (CONFIG(USE_PM_ACPI_TIMER) || !CONFIG_CPU_XTAL_HZ)
return;
/*