From 3b637531c91d0cb290dcff26584274f41c06ec85 Mon Sep 17 00:00:00 2001 From: Andrey Petrov Date: Wed, 30 Nov 2016 17:39:16 -0800 Subject: soc/intel/apollolake: Enable ACPI PM timer emulation on all CPUs Currently we enable ACPI PM timer emulation only on BSP. So the timer doesn't work on other cores and that breaks OSes that use it. Also, microcode uses this information to figure out ACPI IO base, and that is used for other features. This patch enables ACPI timer emulation on all the logical CPUs. BUG=chrome-os-partner:60011 TEST=iotools rdmsr x 0x121, x={0..3}, make sure it is set Change-Id: I0d6cb8761c1c25d3a2fcf59a49c1eda9e4ccc70c Signed-off-by: Andrey Petrov Reviewed-on: https://review.coreboot.org/17663 Reviewed-by: Aaron Durbin Tested-by: build bot (Jenkins) Reviewed-by: Paul Menzel --- src/soc/intel/apollolake/bootblock/bootblock.c | 18 +----------------- 1 file changed, 1 insertion(+), 17 deletions(-) (limited to 'src/soc/intel/apollolake/bootblock') diff --git a/src/soc/intel/apollolake/bootblock/bootblock.c b/src/soc/intel/apollolake/bootblock/bootblock.c index 28a912818f..be10a22736 100644 --- a/src/soc/intel/apollolake/bootblock/bootblock.c +++ b/src/soc/intel/apollolake/bootblock/bootblock.c @@ -41,22 +41,6 @@ static void tpm_enable(void) gpio_configure_pads(tpm_spi_configs, ARRAY_SIZE(tpm_spi_configs)); } -static void enable_pm_timer(void) -{ - /* ACPI PM timer emulation */ - msr_t msr; - /* - * The derived frequency is calculated as follows: - * (CTC_FREQ * msr[63:32]) >> 32 = target frequency. - * Back solve the multiplier so the 3.579545MHz ACPI timer - * frequency is used. - */ - msr.hi = (3579545ULL << 32) / CTC_FREQ; - /* Set PM1 timer IO port and enable*/ - msr.lo = EMULATE_PM_TMR_EN | (ACPI_PMIO_BASE + R_ACPI_PM1_TMR); - wrmsr(MSR_EMULATE_PM_TMR, msr); -} - static void enable_cmos_upper_bank(void) { uint32_t reg = iosf_read(IOSF_RTC_PORT_ID, RTC_CONFIG); @@ -177,7 +161,7 @@ void bootblock_soc_early_init(void) if (IS_ENABLED(CONFIG_TPM_ON_FAST_SPI)) tpm_enable(); - enable_pm_timer(); + enable_pm_timer_emulation(); enable_spibar(); -- cgit v1.2.3