summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKyösti Mälkki <kyosti.malkki@gmail.com>2019-11-01 10:25:50 +0200
committerKyösti Mälkki <kyosti.malkki@gmail.com>2019-11-03 06:15:59 +0000
commit5b15e0103536101a4e0ebd398df9a0edbb3a9648 (patch)
tree1639cc13446e95b39785cfdcd2038b4ae2b7ab7b
parent0d6ddf8da7632e775dde92c9114ac6ace5ca5f14 (diff)
downloadcoreboot-5b15e0103536101a4e0ebd398df9a0edbb3a9648.tar.xz
intel/broadwell: Switch to TSC_MONOTONIC_TIMER
Change-Id: I01b73e20c8af1b00175dc6d9ee56e6b33ac5768d Signed-off-by: Kyösti Mälkki <kyosti.malkki@gmail.com> Reviewed-on: https://review.coreboot.org/c/coreboot/+/36537 Reviewed-by: Matt DeVillier <matt.devillier@gmail.com> Reviewed-by: Arthur Heymans <arthur@aheymans.xyz> Reviewed-by: Angel Pons <th3fanbus@gmail.com> Reviewed-by: Aaron Durbin <adurbin@chromium.org> Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
-rw-r--r--src/soc/intel/broadwell/Kconfig1
-rw-r--r--src/soc/intel/broadwell/Makefile.inc5
-rw-r--r--src/soc/intel/broadwell/monotonic_timer.c59
3 files changed, 1 insertions, 64 deletions
diff --git a/src/soc/intel/broadwell/Kconfig b/src/soc/intel/broadwell/Kconfig
index fadbb417ae..0bbb668c98 100644
--- a/src/soc/intel/broadwell/Kconfig
+++ b/src/soc/intel/broadwell/Kconfig
@@ -29,6 +29,7 @@ config CPU_SPECIFIC_OPTIONS
select SSE2
select TSC_SYNC_MFENCE
select UDELAY_TSC
+ select TSC_MONOTONIC_TIMER
select SOC_INTEL_COMMON
select INTEL_DESCRIPTOR_MODE_CAPABLE
select SOC_INTEL_COMMON_ACPI_WAKE_SOURCE
diff --git a/src/soc/intel/broadwell/Makefile.inc b/src/soc/intel/broadwell/Makefile.inc
index 91a3da02c6..055a0049af 100644
--- a/src/soc/intel/broadwell/Makefile.inc
+++ b/src/soc/intel/broadwell/Makefile.inc
@@ -39,11 +39,6 @@ ramstage-y += memmap.c
romstage-y += memmap.c
postcar-y += memmap.c
ramstage-y += minihd.c
-bootblock-y += monotonic_timer.c
-romstage-y += monotonic_timer.c
-postcar-y += monotonic_timer.c
-ramstage-y += monotonic_timer.c
-smm-y += monotonic_timer.c
ramstage-y += pch.c
romstage-y += pch.c
ramstage-y += pcie.c
diff --git a/src/soc/intel/broadwell/monotonic_timer.c b/src/soc/intel/broadwell/monotonic_timer.c
deleted file mode 100644
index 84eade8a30..0000000000
--- a/src/soc/intel/broadwell/monotonic_timer.c
+++ /dev/null
@@ -1,59 +0,0 @@
-/*
- * This file is part of the coreboot project.
- *
- * Copyright (C) 2014 Google Inc.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; version 2 of the License.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- */
-
-#include <stdint.h>
-#include <cpu/x86/msr.h>
-#include <timer.h>
-#include <soc/msr.h>
-
-static struct monotonic_counter {
- int initialized;
- struct mono_time time;
- uint32_t last_value;
-} mono_counter;
-
-static inline uint32_t read_counter_msr(void)
-{
- /* Even though the MSR is 64-bit it is assumed that the hardware
- * is polled frequently enough to only use the lower 32-bits. */
- msr_t counter_msr;
-
- counter_msr = rdmsr(MSR_COUNTER_24_MHZ);
-
- return counter_msr.lo;
-}
-
-void timer_monotonic_get(struct mono_time *mt)
-{
- uint32_t current_tick;
- uint32_t usecs_elapsed;
-
- if (!mono_counter.initialized) {
- mono_counter.last_value = read_counter_msr();
- mono_counter.initialized = 1;
- }
-
- current_tick = read_counter_msr();
- usecs_elapsed = (current_tick - mono_counter.last_value) / 24;
-
- /* Update current time and tick values only if a full tick occurred. */
- if (usecs_elapsed) {
- mono_time_add_usecs(&mono_counter.time, usecs_elapsed);
- mono_counter.last_value = current_tick;
- }
-
- /* Save result. */
- *mt = mono_counter.time;
-}