From 131ab813d73cf45f8710783c7ce710dfd5f73cc5 Mon Sep 17 00:00:00 2001 From: Aamir Bohra Date: Fri, 2 Jun 2017 19:07:56 +0530 Subject: [PATCH] UPSTREAM: soc/intel/apollolake: Add config for cpu base clock frequency Add config for cpu base clock frequency(Mhz), use and clean up code. BUG=none BRANCH=none TEST=none Change-Id: I6399d457dafe042ae572b125e382d95792bf0979 Signed-off-by: Patrick Georgi Original-Commit-Id: 22b2c793e3587fb98d42f88e5e623621e055ff3a Original-Change-Id: I724c48c11796aa942295d4f19cc629d4c13647e1 Original-Signed-off-by: Aamir Bohra Original-Reviewed-on: https://review.coreboot.org/20017 Original-Tested-by: build bot (Jenkins) Original-Reviewed-by: Aaron Durbin Reviewed-on: https://chromium-review.googlesource.com/524601 --- src/soc/intel/apollolake/Kconfig | 4 ++++ src/soc/intel/apollolake/include/soc/cpu.h | 2 -- src/soc/intel/apollolake/tsc_freq.c | 2 +- 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/src/soc/intel/apollolake/Kconfig b/src/soc/intel/apollolake/Kconfig index 56f0d203b2..fe72c078f7 100644 --- a/src/soc/intel/apollolake/Kconfig +++ b/src/soc/intel/apollolake/Kconfig @@ -322,4 +322,8 @@ config IFD_CHIPSET string default "aplk" +config CPU_BCLK_MHZ + int + default 100 + endif diff --git a/src/soc/intel/apollolake/include/soc/cpu.h b/src/soc/intel/apollolake/include/soc/cpu.h index 3391597396..0900eef640 100644 --- a/src/soc/intel/apollolake/include/soc/cpu.h +++ b/src/soc/intel/apollolake/include/soc/cpu.h @@ -32,8 +32,6 @@ void enable_untrusted_mode(void); #define CPUID_APOLLOLAKE_A0 0x506c8 #define CPUID_APOLLOLAKE_B0 0x506c9 -#define BASE_CLOCK_MHZ 100 - /* Common Timer Copy (CTC) frequency - 19.2MHz. */ #define CTC_FREQ 19200000 diff --git a/src/soc/intel/apollolake/tsc_freq.c b/src/soc/intel/apollolake/tsc_freq.c index f91a047d08..885311c555 100644 --- a/src/soc/intel/apollolake/tsc_freq.c +++ b/src/soc/intel/apollolake/tsc_freq.c @@ -26,7 +26,7 @@ unsigned long tsc_freq_mhz(void) { msr_t msr = rdmsr(MSR_PLATFORM_INFO); - return (BASE_CLOCK_MHZ * ((msr.lo >> 8) & 0xff)); + return (CONFIG_CPU_BCLK_MHZ * ((msr.lo >> 8) & 0xff)); } void set_max_freq(void)