soc/intel/xeon_sp: disable PM ACPI timer if chosen

Disable the PM ACPI timer during PMC init, when `USE_PM_ACPI_TIMER` is
disabled. This is done to bring SKL, CNL, DNV in line with the other
platforms, in order to transition handling of the PM timer from FSP to
coreboot in the follow-up changes.

Disabling is done in `finalize` since FSP makes use of the PMtimer.
Without PM Timer emulation disabling it too early would block.

Change-Id: If85c64ba578991a1b112ceac7dd10276b58b0900
Signed-off-by: Michael Niewöhner <foss@mniewoehner.de>
Reviewed-on: https://review.coreboot.org/c/coreboot/+/58389
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Reviewed-by: Lance Zhao
This commit is contained in:
Michael Niewöhner 2021-09-24 23:57:37 +02:00 committed by Patrick Georgi
parent f6f1258673
commit 6b93866f5e
3 changed files with 17 additions and 0 deletions

View File

@ -36,6 +36,7 @@ config CPU_SPECIFIC_OPTIONS
select FSP_M_XIP select FSP_M_XIP
select POSTCAR_STAGE select POSTCAR_STAGE
select PARALLEL_MP_AP_WORK select PARALLEL_MP_AP_WORK
select PM_ACPI_TIMER_OPTIONAL
select PMC_GLOBAL_RESET_ENABLE_LOCK select PMC_GLOBAL_RESET_ENABLE_LOCK
select INTEL_DESCRIPTOR_MODE_CAPABLE select INTEL_DESCRIPTOR_MODE_CAPABLE
select SOC_INTEL_COMMON_BLOCK select SOC_INTEL_COMMON_BLOCK

View File

@ -7,6 +7,7 @@
#include <device/pci.h> #include <device/pci.h>
#include <intelpch/lockdown.h> #include <intelpch/lockdown.h>
#include <soc/pci_devs.h> #include <soc/pci_devs.h>
#include <soc/pm.h>
#include <soc/util.h> #include <soc/util.h>
#include "chip.h" #include "chip.h"
@ -26,6 +27,19 @@ static void soc_finalize(void *unused)
{ {
printk(BIOS_DEBUG, "Finalizing chipset.\n"); printk(BIOS_DEBUG, "Finalizing chipset.\n");
/*
* Disable ACPI PM timer based on Kconfig
*
* Disabling ACPI PM timer is necessary for XTAL OSC shutdown.
* Disabling ACPI PM timer also switches off TCO.
*
* Note: In contrast to other platforms supporting PM timer emulation,
* disabling the PM timer must be done *after* FSP has run on Xeon-SP,
* because FSP makes use of the PM timer.
*/
if (!CONFIG(USE_PM_ACPI_TIMER))
setbits8(pmc_mmio_regs() + PCH_PWRM_ACPI_TMR_CTL, ACPI_TIM_DIS);
apm_control(APM_CNT_FINALIZE); apm_control(APM_CNT_FINALIZE);
lock_pam0123(); lock_pam0123();

View File

@ -36,6 +36,8 @@
/* Memory mapped IO registers in PMC */ /* Memory mapped IO registers in PMC */
#define PMSYNC_TPR_CFG 0xc8 #define PMSYNC_TPR_CFG 0xc8
#define PMSYNC_LOCK (1 << 15) #define PMSYNC_LOCK (1 << 15)
#define PCH_PWRM_ACPI_TMR_CTL 0xfc
#define ACPI_TIM_DIS (1 << 1)
#define GPIO_GPE_CFG 0x120 #define GPIO_GPE_CFG 0x120
#define GPE0_DWX_MASK 0xf #define GPE0_DWX_MASK 0xf
#define GPE0_DW_SHIFT(x) (4 * (x)) #define GPE0_DW_SHIFT(x) (4 * (x))