x86/tsc: Clean up legacy code for Intel MID
cover x86/tsc: Clean up legacy code for Intel MID
As Thomas noticed there is unusual initialization is going on on Intel MID platforms when TSC is being calibrated.
It appears that we have tsc_msr.c to support Intel MID in a more generic way.
So, this patch series removes legacy calibration code and does accompanying clean ups.
Has been tested on Intel Medfield and Intel Merrifield platforms.
Andy Shevchenko (6):
x86/cpu: Introduce INTEL_CPU_FAM*() helper macros x86/tsc: Convert to use x86_match_cpu() and INTEL_CPU_FAM6() x86/tsc: Add missed header to tsc_msr.c
x86/tsc: Use SPDX identifier and update Intel copyright x86/platform/intel-mid: Remove custom TSC calibration x86/platform/intel-mid: Remove per platform code
arch/x86/include/asm/intel-family.h | 13 +++ arch/x86/include/asm/intel-mid.h | 43 ------- arch/x86/kernel/tsc_msr.c | 96 ++++++++-------- arch/x86/platform/intel-mid/Makefile | 2 +- arch/x86/platform/intel-mid/intel-mid.c | 23 +--- .../platform/intel-mid/intel_mid_weak_decls.h | 18 --- arch/x86/platform/intel-mid/mfld.c | 70 ------------ arch/x86/platform/intel-mid/mrfld.c | 105 ------------------ 8 files changed, 66 insertions(+), 304 deletions(-) delete mode 100644 arch/x86/platform/intel-mid/intel_mid_weak_decls.h delete mode 100644 arch/x86/platform/intel-mid/mfld.c delete mode 100644 arch/x86/platform/intel-mid/mrfld.c
Signature · 1 line
2.18.0
PATCH 1/6 x86/cpu: Introduce INTEL_CPU_FAM*() helper macros
These macros are often used by drivers and we have already a lot of duplication as ICPU() macro across the drivers.
Provide a generic x86 macro for users.
Note, as Ingo Molnar pointed out this has a hidden issue when a driver needs to preserve const qualifier. Though, it would be addressed separately at some point.
[1]: https://lkml.org/lkml/2017/12/28/85
--- arch/x86/include/asm/intel-family.h | 13 +++++++++++++ 1 file changed, 13 insertions(+)
arch/x86/include/asm/intel-family.h +13 -0
@@ -76,4 +76,17 @@#define INTEL_FAM6_XEON_PHI_KNL 0x57/* Knights Landing */ #define INTEL_FAM6_XEON_PHI_KNM 0x85/* Knights Mill */ +/* Useful macros */ +#define INTEL_CPU_FAM_ANY (_family, _model, _driver_data) \ +{ \ + .vendor = X86_VENDOR_INTEL, \ + .family = _family, \ + .model = _model, \ + .feature = X86_FEATURE_ANY, \ + .driver_data = (kernel_ulong_t)&_driver_data \ +} + +#define INTEL_CPU_FAM6 (_model, _driver_data) \ + INTEL_CPU_FAM_ANY(6, INTEL_FAM6_##_model, _driver_data) +#endif /* _ASM_X86_INTEL_FAMILY_H */
Signature · 1 line
2.18.0
tip-bot for Andy Shevchenko
merge bot[tip:x86/timers] x86/cpu: Introduce INTEL_CPU_FAM*() helper macros
x86/cpu: Introduce INTEL_CPU_FAM*() helper macros
Commit-ID: e2ce67b2b34b6e9d77da2f375dba5b525508f7df Gitweb: https://git.kernel.org/tip/e2ce67b2b34b6e9d77da2f375dba5b525508f7df Author: Andy Shevchenko <[email protected]> AuthorDate: Fri, 29 Jun 2018 22:31:08 +0300 Committer: Thomas Gleixner <[email protected]> CommitDate: Tue, 3 Jul 2018 13:08:20 +0200
x86/cpu: Introduce INTEL_CPU_FAM*() helper macros
These macros are often used by drivers and there exists already a lot of duplication as ICPU() macro across the drivers.
Provide a generic x86 macro for users.
Note, as Ingo Molnar pointed out this has a hidden issue when a driver needs to preserve const qualifier. Though, it would be addressed separately at some point.
--- arch/x86/include/asm/intel-family.h | 13 +++++++++++++ 1 file changed, 13 insertions(+)
arch/x86/include/asm/intel-family.h +13 -0
@@ -76,4 +76,17 @@#define INTEL_FAM6_XEON_PHI_KNL 0x57/* Knights Landing */ #define INTEL_FAM6_XEON_PHI_KNM 0x85/* Knights Mill */ +/* Useful macros */ +#define INTEL_CPU_FAM_ANY (_family, _model, _driver_data) \ +{ \ + .vendor = X86_VENDOR_INTEL, \ + .family = _family, \ + .model = _model, \ + .feature = X86_FEATURE_ANY, \ + .driver_data = (kernel_ulong_t)&_driver_data \ +} + +#define INTEL_CPU_FAM6 (_model, _driver_data) \ + INTEL_CPU_FAM_ANY(6, INTEL_FAM6_##_model, _driver_data) +#endif /* _ASM_X86_INTEL_FAMILY_H */
PATCH 2/6 x86/tsc: Convert to use x86_match_cpu() and INTEL_CPU_FAM6()
In reply to Andy ShevchenkoMove the code to use recently introduced INTEL_CPU_FAM6() macro and drop custom version of x86_match_cpu() function.
No functional change intended.
--- arch/x86/kernel/tsc_msr.c | 83 ++++++++++++++++++++------------------- 1 file changed, 42 insertions(+), 41 deletions(-)
arch/x86/kernel/tsc_msr.c +42 -41
@@ -8,9 +8,11 @@*/ #include <linux/kernel.h> -#include <asm/processor.h> -#include <asm/setup.h> +#include <asm/apic.h> +#include <asm/cpu_device_id.h> +#include <asm/intel-family.h> +#include <asm/msr.h> #include <asm/param.h> #define MAX_NUM_FREQS 9
@@ -23,44 +25,43 @@* field msr_plat does. */ struct freq_desc { -u8 x86_family;/* CPU family */ -u8 x86_model;/* model */ u8 msr_plat;/* 1: use MSR_PLATFORM_INFO, 0: MSR_IA32_PERF_STATUS */ u32 freqs[MAX_NUM_FREQS ]; }; -static struct freq_desc freq_desc_tables[] = { -/* PNW */ - {6 ,0x27 ,0 , {0 ,0 ,0 ,0 ,0 ,99840 ,0 ,83200 } }, -/* CLV+ */ - {6 ,0x35 ,0 , {0 ,133200 ,0 ,0 ,0 ,99840 ,0 ,83200 } }, -/* TNG - Intel Atom processor Z3400 series */ - {6 ,0x4a ,1 , {0 ,100000 ,133300 ,0 ,0 ,0 ,0 ,0 } }, -/* VLV2 - Intel Atom processor E3000, Z3600, Z3700 series */ - {6 ,0x37 ,1 , {83300 ,100000 ,133300 ,116700 ,80000 ,0 ,0 ,0 } }, -/* ANN - Intel Atom processor Z3500 series */ - {6 ,0x5a ,1 , {83300 ,100000 ,133300 ,100000 ,0 ,0 ,0 ,0 } }, -/* AMT - Intel Atom processor X7-Z8000 and X5-Z8000 series */ - {6 ,0x4c ,1 , {83300 ,100000 ,133300 ,116700 , -80000 ,93300 ,90000 ,88900 ,87500 } }, +static const struct freq_desc freq_desc_pnw = { +0 , {0 ,0 ,0 ,0 ,0 ,99840 ,0 ,83200 } }; -static int match_cpu (u8 family,u8 model) -{ -int i; +static const struct freq_desc freq_desc_clv = { +0 , {0 ,133200 ,0 ,0 ,0 ,99840 ,0 ,83200 } +}; -for (i =0 ; i <ARRAY_SIZE (freq_desc_tables); i++) { -if ((family == freq_desc_tables[i].x86_family) && - (model == freq_desc_tables[i].x86_model)) -return i; - } +static const struct freq_desc freq_desc_byt = { +1 , {83300 ,100000 ,133300 ,116700 ,80000 ,0 ,0 ,0 } +}; -return -1 ; -} +static const struct freq_desc freq_desc_cht = { +1 , {83300 ,100000 ,133300 ,116700 ,80000 ,93300 ,90000 ,88900 ,87500 } +}; -/* Map CPU reference clock freq ID(0-7) to CPU reference clock freq(KHz) */ -#define id_to_freq (cpu_index, freq_id) \ - (freq_desc_tables[cpu_index].freqs[freq_id]) +static const struct freq_desc freq_desc_tng = { +1 , {0 ,100000 ,133300 ,0 ,0 ,0 ,0 ,0 } +}; + +static const struct freq_desc freq_desc_ann = { +1 , {83300 ,100000 ,133300 ,100000 ,0 ,0 ,0 ,0 } +}; + +static const struct x86_cpu_id tsc_msr_cpu_ids[] = { +INTEL_CPU_FAM6 (ATOM_PENWELL , freq_desc_pnw), +INTEL_CPU_FAM6 (ATOM_CLOVERVIEW , freq_desc_clv), +INTEL_CPU_FAM6 (ATOM_SILVERMONT1 , freq_desc_byt), +INTEL_CPU_FAM6 (ATOM_AIRMONT , freq_desc_cht), +INTEL_CPU_FAM6 (ATOM_MERRIFIELD , freq_desc_tng), +INTEL_CPU_FAM6 (ATOM_MOOREFIELD , freq_desc_ann), + {} +};/* * MSR-based CPU/TSC frequency discovery for certain CPUs.
@@ -70,18 +71,17 @@ static int match_cpu(u8 family, u8 model)*/ unsigned long cpu_khz_from_msr (void ) { -u32 lo, hi, ratio, freq_id, freq; +u32 lo, hi, ratio, freq; +const struct freq_desc *freq_desc; +const struct x86_cpu_id *id;unsigned long res; -int cpu_index; -if (boot_cpu_data.x86_vendor !=X86_VENDOR_INTEL ) + id =x86_match_cpu (tsc_msr_cpu_ids); +if (!id)return 0 ; - cpu_index =match_cpu (boot_cpu_data.x86, boot_cpu_data.x86_model); -if (cpu_index <0 ) -return 0 ; - -if (freq_desc_tables[cpu_index].msr_plat) { + freq_desc = (struct freq_desc *)id->driver_data; +if (freq_desc->msr_plat) {rdmsr (MSR_PLATFORM_INFO , lo, hi); ratio = (lo >>8 ) &0xff ; }else {
@@ -91,8 +91,9 @@ unsigned long cpu_khz_from_msr(void)/* Get FSB FREQ ID */ rdmsr (MSR_FSB_FREQ , lo, hi); - freq_id = lo &0x7 ; - freq =id_to_freq (cpu_index, freq_id); + +/* Map CPU reference clock freq ID(0-7) to CPU reference clock freq(KHz) */ + freq = freq_desc->freqs[lo &0x7 ];/* TSC frequency = maximum resolved freq * maximum resolved bus ratio */ res = freq * ratio;
Signature · 1 line
2.18.0
tip-bot for Andy Shevchenko
merge bot[tip:x86/timers] x86/tsc: Convert to use x86_match_cpu() and INTEL_CPU_FAM6()
x86/tsc: Convert to use x86_match_cpu() and INTEL_CPU_FAM6()
Commit-ID: 397d3ad18dc431456baf8bce96606fa1d18b30b0 Gitweb: https://git.kernel.org/tip/397d3ad18dc431456baf8bce96606fa1d18b30b0 Author: Andy Shevchenko <[email protected]> AuthorDate: Fri, 29 Jun 2018 22:31:09 +0300 Committer: Thomas Gleixner <[email protected]> CommitDate: Tue, 3 Jul 2018 13:08:20 +0200
x86/tsc: Convert to use x86_match_cpu() and INTEL_CPU_FAM6()
Move the code to use recently introduced INTEL_CPU_FAM6() macro and drop custom version of x86_match_cpu() function.
No functional change intended.
--- arch/x86/kernel/tsc_msr.c | 83 ++++++++++++++++++++++++----------------------- 1 file changed, 42 insertions(+), 41 deletions(-)
arch/x86/kernel/tsc_msr.c +42 -41
@@ -8,9 +8,11 @@*/ #include <linux/kernel.h> -#include <asm/processor.h> -#include <asm/setup.h> +#include <asm/apic.h> +#include <asm/cpu_device_id.h> +#include <asm/intel-family.h> +#include <asm/msr.h> #include <asm/param.h> #include <asm/tsc.h>
@@ -24,44 +26,43 @@* field msr_plat does. */ struct freq_desc { -u8 x86_family;/* CPU family */ -u8 x86_model;/* model */ u8 msr_plat;/* 1: use MSR_PLATFORM_INFO, 0: MSR_IA32_PERF_STATUS */ u32 freqs[MAX_NUM_FREQS ]; }; -static struct freq_desc freq_desc_tables[] = { -/* PNW */ - {6 ,0x27 ,0 , {0 ,0 ,0 ,0 ,0 ,99840 ,0 ,83200 } }, -/* CLV+ */ - {6 ,0x35 ,0 , {0 ,133200 ,0 ,0 ,0 ,99840 ,0 ,83200 } }, -/* TNG - Intel Atom processor Z3400 series */ - {6 ,0x4a ,1 , {0 ,100000 ,133300 ,0 ,0 ,0 ,0 ,0 } }, -/* VLV2 - Intel Atom processor E3000, Z3600, Z3700 series */ - {6 ,0x37 ,1 , {83300 ,100000 ,133300 ,116700 ,80000 ,0 ,0 ,0 } }, -/* ANN - Intel Atom processor Z3500 series */ - {6 ,0x5a ,1 , {83300 ,100000 ,133300 ,100000 ,0 ,0 ,0 ,0 } }, -/* AMT - Intel Atom processor X7-Z8000 and X5-Z8000 series */ - {6 ,0x4c ,1 , {83300 ,100000 ,133300 ,116700 , -80000 ,93300 ,90000 ,88900 ,87500 } }, +static const struct freq_desc freq_desc_pnw = { +0 , {0 ,0 ,0 ,0 ,0 ,99840 ,0 ,83200 } }; -static int match_cpu (u8 family,u8 model) -{ -int i; +static const struct freq_desc freq_desc_clv = { +0 , {0 ,133200 ,0 ,0 ,0 ,99840 ,0 ,83200 } +}; -for (i =0 ; i <ARRAY_SIZE (freq_desc_tables); i++) { -if ((family == freq_desc_tables[i].x86_family) && - (model == freq_desc_tables[i].x86_model)) -return i; - } +static const struct freq_desc freq_desc_byt = { +1 , {83300 ,100000 ,133300 ,116700 ,80000 ,0 ,0 ,0 } +}; -return -1 ; -} +static const struct freq_desc freq_desc_cht = { +1 , {83300 ,100000 ,133300 ,116700 ,80000 ,93300 ,90000 ,88900 ,87500 } +}; -/* Map CPU reference clock freq ID(0-7) to CPU reference clock freq(KHz) */ -#define id_to_freq (cpu_index, freq_id) \ - (freq_desc_tables[cpu_index].freqs[freq_id]) +static const struct freq_desc freq_desc_tng = { +1 , {0 ,100000 ,133300 ,0 ,0 ,0 ,0 ,0 } +}; + +static const struct freq_desc freq_desc_ann = { +1 , {83300 ,100000 ,133300 ,100000 ,0 ,0 ,0 ,0 } +}; + +static const struct x86_cpu_id tsc_msr_cpu_ids[] = { +INTEL_CPU_FAM6 (ATOM_PENWELL , freq_desc_pnw), +INTEL_CPU_FAM6 (ATOM_CLOVERVIEW , freq_desc_clv), +INTEL_CPU_FAM6 (ATOM_SILVERMONT1 , freq_desc_byt), +INTEL_CPU_FAM6 (ATOM_AIRMONT , freq_desc_cht), +INTEL_CPU_FAM6 (ATOM_MERRIFIELD , freq_desc_tng), +INTEL_CPU_FAM6 (ATOM_MOOREFIELD , freq_desc_ann), + {} +};/* * MSR-based CPU/TSC frequency discovery for certain CPUs.
@@ -71,18 +72,17 @@ static int match_cpu(u8 family, u8 model)*/ unsigned long cpu_khz_from_msr (void ) { -u32 lo, hi, ratio, freq_id, freq; +u32 lo, hi, ratio, freq; +const struct freq_desc *freq_desc; +const struct x86_cpu_id *id;unsigned long res; -int cpu_index; -if (boot_cpu_data.x86_vendor !=X86_VENDOR_INTEL ) + id =x86_match_cpu (tsc_msr_cpu_ids); +if (!id)return 0 ; - cpu_index =match_cpu (boot_cpu_data.x86, boot_cpu_data.x86_model); -if (cpu_index <0 ) -return 0 ; - -if (freq_desc_tables[cpu_index].msr_plat) { + freq_desc = (struct freq_desc *)id->driver_data; +if (freq_desc->msr_plat) {rdmsr (MSR_PLATFORM_INFO , lo, hi); ratio = (lo >>8 ) &0xff ; }else {
@@ -92,8 +92,9 @@ unsigned long cpu_khz_from_msr(void)/* Get FSB FREQ ID */ rdmsr (MSR_FSB_FREQ , lo, hi); - freq_id = lo &0x7 ; - freq =id_to_freq (cpu_index, freq_id); + +/* Map CPU reference clock freq ID(0-7) to CPU reference clock freq(KHz) */ + freq = freq_desc->freqs[lo &0x7 ];/* TSC frequency = maximum resolved freq * maximum resolved bus ratio */ res = freq * ratio;
PATCH 3/6 x86/tsc: Add missed header to tsc_msr.c
In reply to Andy ShevchenkoAdd a missed header otherwise compiler warns about missed prototype:
CC arch/x86/kernel/tsc_msr.oarch/x86/kernel/tsc_msr.c:73:15: warning: no previous prototype for ‘cpu_khz_from_msr’ [-Wmissing-prototypes]
unsigned long cpu_khz_from_msr(void)
^~~~~~~~~~~~~~~~
--- arch/x86/kernel/tsc_msr.c | 1 + 1 file changed, 1 insertion(+)
arch/x86/kernel/tsc_msr.c +1 -0
@@ -14,6 +14,7 @@#include <asm/intel-family.h> #include <asm/msr.h> #include <asm/param.h> +#include <asm/tsc.h> #define MAX_NUM_FREQS 9
Signature · 1 line
2.18.0
tip-bot for Andy Shevchenko
merge bot[tip:x86/timers] x86/tsc: Add missing header to tsc_msr.c
x86/tsc: Add missing header to tsc_msr.c
Commit-ID: dbd0fbc76c77daac08ddd245afdcbade0d506e19 Gitweb: https://git.kernel.org/tip/dbd0fbc76c77daac08ddd245afdcbade0d506e19 Author: Andy Shevchenko <[email protected]> AuthorDate: Fri, 29 Jun 2018 22:31:10 +0300 Committer: Thomas Gleixner <[email protected]> CommitDate: Tue, 3 Jul 2018 13:08:19 +0200
x86/tsc: Add missing header to tsc_msr.c
Add a missing header otherwise compiler warns about missed prototype:
CC arch/x86/kernel/tsc_msr.oarch/x86/kernel/tsc_msr.c:73:15: warning: no previous prototype for ‘cpu_khz_from_msr’ [-Wmissing-prototypes]
unsigned long cpu_khz_from_msr(void)
^~~~~~~~~~~~~~~~
--- arch/x86/kernel/tsc_msr.c | 1 + 1 file changed, 1 insertion(+)
arch/x86/kernel/tsc_msr.c +1 -0
@@ -12,6 +12,7 @@#include <asm/setup.h> #include <asm/apic.h> #include <asm/param.h> +#include <asm/tsc.h> #define MAX_NUM_FREQS 9
PATCH 4/6 x86/tsc: Use SPDX identifier and update Intel copyright
In reply to Andy ShevchenkoUse SPDX identifier and update year in Intel copyright line.
While here, remove file name from the file itself.
--- arch/x86/kernel/tsc_msr.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-)
arch/x86/kernel/tsc_msr.c +3 -4
@@ -1,10 +1,9 @@ +// SPDX-License-Identifier: GPL-2.0 /* -* tsc_msr.c - TSC frequency enumeration via MSR +* TSC frequency enumeration via MSR * -* Copyright (C) 2013 Intel Corporation +* Copyright (C) 2013, 2018 Intel Corporation * Author: Bin Gao <[email protected]> -* -* This file is released under the GPLv2. */ #include <linux/kernel.h>
Signature · 1 line
2.18.0
tip-bot for Andy Shevchenko
merge bot[tip:x86/timers] x86/tsc: Use SPDX identifier and update Intel copyright
x86/tsc: Use SPDX identifier and update Intel copyright
Commit-ID: 5067b087cf5b2fa4de00443cdc6a66acb28a4953 Gitweb: https://git.kernel.org/tip/5067b087cf5b2fa4de00443cdc6a66acb28a4953 Author: Andy Shevchenko <[email protected]> AuthorDate: Fri, 29 Jun 2018 22:31:11 +0300 Committer: Thomas Gleixner <[email protected]> CommitDate: Tue, 3 Jul 2018 13:08:20 +0200
x86/tsc: Use SPDX identifier and update Intel copyright
Use SPDX identifier and update year in Intel copyright line.
While here, remove file name from the file itself.
--- arch/x86/kernel/tsc_msr.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-)
arch/x86/kernel/tsc_msr.c +3 -4
@@ -1,10 +1,9 @@ +// SPDX-License-Identifier: GPL-2.0 /* -* tsc_msr.c - TSC frequency enumeration via MSR +* TSC frequency enumeration via MSR * -* Copyright (C) 2013 Intel Corporation +* Copyright (C) 2013, 2018 Intel Corporation * Author: Bin Gao <[email protected]> -* -* This file is released under the GPLv2. */ #include <linux/kernel.h>
PATCH 5/6 x86/platform/intel-mid: Remove custom TSC calibration
In reply to Andy ShevchenkoSince the commit
7da7c1561366 ("x86, tsc: Add static (MSR) TSC calibration on Intel Atom SoCs")
introduced a common way for all Intel MID chips to get their TSC frequency via MSRs, there is no need to keep a duplication in each of Intel MID platform code.
Thus, remove the custom calibration code for good.
Note, there is slight difference in how we get frequency for (reserved?) values in MSRs, i.e. legacy code enforces some defaults while new code just uses 0 in that cases.
--- arch/x86/include/asm/intel-mid.h | 14 ----- arch/x86/kernel/tsc_msr.c | 5 ++ arch/x86/platform/intel-mid/intel-mid.c | 6 -- arch/x86/platform/intel-mid/mfld.c | 36 ------------ arch/x86/platform/intel-mid/mrfld.c | 74 ------------------------- 5 files changed, 5 insertions(+), 130 deletions(-)
arch/x86/include/asm/intel-mid.h +0 -14
@@ -136,20 +136,6 @@ enum intel_mid_timer_options {extern enum intel_mid_timer_options intel_mid_timer_options; -/* -* Penwell uses spread spectrum clock, so the freq number is not exactly -* the same as reported by MSR based on SDM. -*/ -#define FSB_FREQ_83SKU 83200 -#define FSB_FREQ_100SKU 99840 -#define FSB_FREQ_133SKU 133000 - -#define FSB_FREQ_167SKU 167000 -#define FSB_FREQ_200SKU 200000 -#define FSB_FREQ_267SKU 267000 -#define FSB_FREQ_333SKU 333000 -#define FSB_FREQ_400SKU 400000 -/* Bus Select SoC Fuse value */ #define BSEL_SOC_FUSE_MASK 0x7/* FSB 133MHz */
arch/x86/kernel/tsc_msr.c +5 -0
@@ -29,6 +29,11 @@ struct freq_desc {u32 freqs[MAX_NUM_FREQS ]; }; +/* +* Penwell and Clovertrail use spread spectrum clock, +* so the freq number is not exactly the same as reported +* by MSR based on SDM. +*/ static const struct freq_desc freq_desc_pnw = {0 , {0 ,0 ,0 ,0 ,0 ,99840 ,0 ,83200 } };
arch/x86/platform/intel-mid/intel-mid.c +0 -6
@@ -82,11 +82,6 @@ static void intel_mid_reboot(void)intel_scu_ipc_simple_command (IPCMSG_COLD_RESET ,0 ); } -static unsigned long __init intel_mid_calibrate_tsc (void ) -{ -return 0 ; -} -static void __init intel_mid_setup_bp_timer (void ) {apbt_time_init ();
@@ -191,7 +186,6 @@ void __init x86_intel_mid_early_setup(void) x86_cpuinit.setup_percpu_clockev = apbt_setup_secondary_clock; - x86_platform.calibrate_tsc = intel_mid_calibrate_tsc; x86_platform.get_nmi_reason = intel_mid_get_nmi_reason; x86_init.pci.arch_init = intel_mid_pci_init;
arch/x86/platform/intel-mid/mfld.c +0 -36
@@ -11,48 +11,12 @@#include <linux/init.h> -#include <asm/apic.h> #include <asm/intel-mid.h> -#include <asm/intel_mid_vrtc.h> #include "intel_mid_weak_decls.h" -static unsigned long __init mfld_calibrate_tsc (void ) -{ -unsigned long fast_calibrate; -u32 lo, hi, ratio, fsb; - -rdmsr (MSR_IA32_PERF_STATUS , lo, hi); -pr_debug ("IA32 perf status is 0x%x, 0x%0x\n" , lo, hi); - ratio = (hi >>8 ) &0x1f ; -pr_debug ("ratio is %d\n" , ratio); -if (!ratio) { -pr_err ("read a zero ratio, should be incorrect!\n" ); -pr_err ("force tsc ratio to 16 ...\n" ); - ratio =16 ; - } -rdmsr (MSR_FSB_FREQ , lo, hi); -if ((lo &0x7 ) ==0x7 ) - fsb =FSB_FREQ_83SKU ; -else - fsb =FSB_FREQ_100SKU ; - fast_calibrate = ratio * fsb; -pr_debug ("read penwell tsc %lu khz\n" , fast_calibrate); - lapic_timer_frequency = fsb *1000 /HZ ; - -/* -* TSC on Intel Atom SoCs is reliable and of known frequency. -* See tsc_msr.c for details. -*/ -setup_force_cpu_cap (X86_FEATURE_TSC_KNOWN_FREQ ); -setup_force_cpu_cap (X86_FEATURE_TSC_RELIABLE ); - -return fast_calibrate; -} -static void __init penwell_arch_setup (void ) { - x86_platform.calibrate_tsc = mfld_calibrate_tsc; }static struct intel_mid_ops penwell_ops = {
arch/x86/platform/intel-mid/mrfld.c +0 -74
86 lines not on this page · raw message
Signature · 1 line
2.18.0
tip-bot for Andy Shevchenko
merge bot[tip:x86/timers] x86/platform/intel-mid: Remove custom TSC calibration
x86/platform/intel-mid: Remove custom TSC calibration
Commit-ID: d99e5da91b36db5c35ddaf3653b280ee060971da Gitweb: https://git.kernel.org/tip/d99e5da91b36db5c35ddaf3653b280ee060971da Author: Andy Shevchenko <[email protected]> AuthorDate: Fri, 29 Jun 2018 22:31:12 +0300 Committer: Thomas Gleixner <[email protected]> CommitDate: Tue, 3 Jul 2018 13:08:21 +0200
x86/platform/intel-mid: Remove custom TSC calibration
Since the commit
7da7c1561366 ("x86, tsc: Add static (MSR) TSC calibration on Intel Atom SoCs")
introduced a common way for all Intel MID chips to get their TSC frequency via MSRs, there is no need to keep a duplication in each of Intel MID platform code.
Thus, remove the custom calibration code for good.
Note, there is slight difference in how to get frequency for (reserved?) values in MSRs, i.e. legacy code enforces some defaults while new code just uses 0 in that cases.
--- arch/x86/include/asm/intel-mid.h | 14 ------- arch/x86/kernel/tsc_msr.c | 5 +++ arch/x86/platform/intel-mid/intel-mid.c | 6 --- arch/x86/platform/intel-mid/mfld.c | 36 ---------------- arch/x86/platform/intel-mid/mrfld.c | 74 --------------------------------- 5 files changed, 5 insertions(+), 130 deletions(-)
arch/x86/include/asm/intel-mid.h +0 -14
@@ -136,20 +136,6 @@ enum intel_mid_timer_options {extern enum intel_mid_timer_options intel_mid_timer_options; -/* -* Penwell uses spread spectrum clock, so the freq number is not exactly -* the same as reported by MSR based on SDM. -*/ -#define FSB_FREQ_83SKU 83200 -#define FSB_FREQ_100SKU 99840 -#define FSB_FREQ_133SKU 133000 - -#define FSB_FREQ_167SKU 167000 -#define FSB_FREQ_200SKU 200000 -#define FSB_FREQ_267SKU 267000 -#define FSB_FREQ_333SKU 333000 -#define FSB_FREQ_400SKU 400000 -/* Bus Select SoC Fuse value */ #define BSEL_SOC_FUSE_MASK 0x7/* FSB 133MHz */
arch/x86/kernel/tsc_msr.c +5 -0
@@ -29,6 +29,11 @@ struct freq_desc {u32 freqs[MAX_NUM_FREQS ]; }; +/* +* Penwell and Clovertrail use spread spectrum clock, +* so the freq number is not exactly the same as reported +* by MSR based on SDM. +*/ static const struct freq_desc freq_desc_pnw = {0 , {0 ,0 ,0 ,0 ,0 ,99840 ,0 ,83200 } };
arch/x86/platform/intel-mid/intel-mid.c +0 -6
@@ -82,11 +82,6 @@ static void intel_mid_reboot(void)intel_scu_ipc_simple_command (IPCMSG_COLD_RESET ,0 ); } -static unsigned long __init intel_mid_calibrate_tsc (void ) -{ -return 0 ; -} -static void __init intel_mid_setup_bp_timer (void ) {apbt_time_init ();
@@ -191,7 +186,6 @@ void __init x86_intel_mid_early_setup(void) x86_cpuinit.setup_percpu_clockev = apbt_setup_secondary_clock; - x86_platform.calibrate_tsc = intel_mid_calibrate_tsc; x86_platform.get_nmi_reason = intel_mid_get_nmi_reason; x86_init.pci.arch_init = intel_mid_pci_init;
arch/x86/platform/intel-mid/mfld.c +0 -36
@@ -11,48 +11,12 @@#include <linux/init.h> -#include <asm/apic.h> #include <asm/intel-mid.h> -#include <asm/intel_mid_vrtc.h> #include "intel_mid_weak_decls.h" -static unsigned long __init mfld_calibrate_tsc (void ) -{ -unsigned long fast_calibrate; -u32 lo, hi, ratio, fsb; - -rdmsr (MSR_IA32_PERF_STATUS , lo, hi); -pr_debug ("IA32 perf status is 0x%x, 0x%0x\n" , lo, hi); - ratio = (hi >>8 ) &0x1f ; -pr_debug ("ratio is %d\n" , ratio); -if (!ratio) { -pr_err ("read a zero ratio, should be incorrect!\n" ); -pr_err ("force tsc ratio to 16 ...\n" ); - ratio =16 ; - } -rdmsr (MSR_FSB_FREQ , lo, hi); -if ((lo &0x7 ) ==0x7 ) - fsb =FSB_FREQ_83SKU ; -else - fsb =FSB_FREQ_100SKU ; - fast_calibrate = ratio * fsb; -pr_debug ("read penwell tsc %lu khz\n" , fast_calibrate); - lapic_timer_frequency = fsb *1000 /HZ ; - -/* -* TSC on Intel Atom SoCs is reliable and of known frequency. -* See tsc_msr.c for details. -*/ -setup_force_cpu_cap (X86_FEATURE_TSC_KNOWN_FREQ ); -setup_force_cpu_cap (X86_FEATURE_TSC_RELIABLE ); - -return fast_calibrate; -} -static void __init penwell_arch_setup (void ) { - x86_platform.calibrate_tsc = mfld_calibrate_tsc; }static struct intel_mid_ops penwell_ops = {
arch/x86/platform/intel-mid/mrfld.c +0 -74
86 lines not on this page · raw message
PATCH 6/6 x86/platform/intel-mid: Remove per platform code
In reply to Andy ShevchenkoAfter custom TSC calibration gone, there is no more reason to have custom platform code for each of Intel MID.
Thus, remove it for good.
--- arch/x86/include/asm/intel-mid.h | 29 ---------------- arch/x86/platform/intel-mid/Makefile | 2 +- arch/x86/platform/intel-mid/intel-mid.c | 17 +--------- .../platform/intel-mid/intel_mid_weak_decls.h | 18 ---------- arch/x86/platform/intel-mid/mfld.c | 34 ------------------- arch/x86/platform/intel-mid/mrfld.c | 31 ----------------- 6 files changed, 2 insertions(+), 129 deletions(-) delete mode 100644 arch/x86/platform/intel-mid/intel_mid_weak_decls.h delete mode 100644 arch/x86/platform/intel-mid/mfld.c delete mode 100644 arch/x86/platform/intel-mid/mrfld.c
arch/x86/include/asm/intel-mid.h +0 -29
@@ -80,35 +80,6 @@ enum intel_mid_cpu_type {extern enum intel_mid_cpu_type __intel_mid_cpu_chip; -/** -* struct intel_mid_ops - Interface between intel-mid & sub archs -* @arch_setup: arch_setup function to re-initialize platform -* structures (x86_init, x86_platform_init) -* -* This structure can be extended if any new interface is required -* between intel-mid & its sub arch files. -*/ -struct intel_mid_ops { -void (*arch_setup)(void ); -}; - -/* Helper API's for INTEL_MID_OPS_INIT */ -#define DECLARE_INTEL_MID_OPS_INIT (cpuname, cpuid) \ - [cpuid] = get_##cpuname##_ops - -/* Maximum number of CPU ops */ -#define MAX_CPU_OPS (a) (sizeof(a)/sizeof(void *)) - -/* -* For every new cpu addition, a weak get_<cpuname>_ops() function needs be -* declared in arch/x86/platform/intel_mid/intel_mid_weak_decls.h. -*/ -#define INTEL_MID_OPS_INIT { \ - DECLARE_INTEL_MID_OPS_INIT(penwell, INTEL_MID_CPU_CHIP_PENWELL), \ - DECLARE_INTEL_MID_OPS_INIT(cloverview, INTEL_MID_CPU_CHIP_CLOVERVIEW), \ - DECLARE_INTEL_MID_OPS_INIT(tangier, INTEL_MID_CPU_CHIP_TANGIER) \ -}; -#ifdef CONFIG_X86_INTEL_MID static inline enum intel_mid_cpu_type intel_mid_identify_cpu (void )
arch/x86/platform/intel-mid/Makefile +1 -1
@@ -1,4 +1,4 @@ -obj-$(CONFIG_X86_INTEL_MID) += intel-mid.o intel_mid_vrtc.o mfld.o mrfld.o pwr.o +obj-$(CONFIG_X86_INTEL_MID) += intel-mid.o intel_mid_vrtc.o pwr.o # SFI specific code ifdef CONFIG_X86_INTEL_MID
arch/x86/platform/intel-mid/intel-mid.c +1 -16
@@ -36,8 +36,6 @@#include <asm/apb_timer.h> #include <asm/reboot.h> -#include "intel_mid_weak_decls.h" -/* * the clockevent devices on Moorestown/Medfield can be APBT or LAPIC clock, * cmdline option x86_intel_mid_timer can be used to override the configuration
@@ -61,10 +59,6 @@enum intel_mid_timer_options intel_mid_timer_options; -/* intel_mid_ops to store sub arch ops */ -static struct intel_mid_ops *intel_mid_ops; -/* getter function for sub arch ops*/ -static void *(*get_intel_mid_ops[])(void ) =INTEL_MID_OPS_INIT ;enum intel_mid_cpu_type __intel_mid_cpu_chip;EXPORT_SYMBOL_GPL (__intel_mid_cpu_chip);
@@ -128,6 +122,7 @@ static void intel_mid_arch_setup(void)case 0x3C :case 0x4A : __intel_mid_cpu_chip =INTEL_MID_CPU_CHIP_TANGIER ; + x86_platform.legacy.rtc =1 ;break ;case 0x27 :default :
@@ -135,17 +130,7 @@ static void intel_mid_arch_setup(void)break ; } -if (__intel_mid_cpu_chip <MAX_CPU_OPS (get_intel_mid_ops)) - intel_mid_ops = get_intel_mid_ops[__intel_mid_cpu_chip](); -else { - intel_mid_ops = get_intel_mid_ops[INTEL_MID_CPU_CHIP_PENWELL ](); -pr_info ("ARCH: Unknown SoC, assuming Penwell!\n" ); - } - out: -if (intel_mid_ops->arch_setup) - intel_mid_ops->arch_setup (); -/* * Intel MID platforms are using explicitly defined regulators. *
arch/x86/platform/intel-mid/intel_mid_weak_decls.h deleted +0 -18
@@ -1,18 +0,0 @@ -/* -* intel_mid_weak_decls.h: Weak declarations of intel-mid.c -* -* (C) Copyright 2013 Intel Corporation -* -* 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. -*/ - - -/* For every CPU addition a new get_<cpuname>_ops interface needs -* to be added. -*/ -extern void *get_penwell_ops (void ); -extern void *get_cloverview_ops (void ); -extern void *get_tangier_ops (void );
arch/x86/platform/intel-mid/mfld.c deleted +0 -34
@@ -1,34 +0,0 @@ -/* -* mfld.c: Intel Medfield platform setup code -* -* (C) Copyright 2013 Intel Corporation -* -* 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. -*/ - -#include <linux/init.h> - -#include <asm/intel-mid.h> - -#include "intel_mid_weak_decls.h" - -static void __init penwell_arch_setup (void ) -{ -} - -static struct intel_mid_ops penwell_ops = { - .arch_setup = penwell_arch_setup, -}; - -void *get_penwell_ops (void ) -{ -return &penwell_ops; -} - -void *get_cloverview_ops (void ) -{ -return &penwell_ops; -}
arch/x86/platform/intel-mid/mrfld.c deleted +0 -31
@@ -1,31 +0,0 @@ -/* -* Intel Merrifield platform specific setup code -* -* (C) Copyright 2013 Intel Corporation -* -* 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. -*/ - -#include <linux/init.h> - -#include <asm/intel-mid.h> - -#include "intel_mid_weak_decls.h" - -static void __init tangier_arch_setup (void ) -{ - x86_platform.legacy.rtc =1 ; -} - -/* tangier arch ops */ -static struct intel_mid_ops tangier_ops = { - .arch_setup = tangier_arch_setup, -}; - -void *get_tangier_ops (void ) -{ -return &tangier_ops; -}
Signature · 1 line
2.18.0
tip-bot for Andy Shevchenko
merge bot[tip:x86/timers] x86/platform/intel-mid: Remove per platform code
x86/platform/intel-mid: Remove per platform code
Commit-ID: 41afb1dfad4d6af0c716746f6a15f3230482955c Gitweb: https://git.kernel.org/tip/41afb1dfad4d6af0c716746f6a15f3230482955c Author: Andy Shevchenko <[email protected]> AuthorDate: Fri, 29 Jun 2018 22:31:13 +0300 Committer: Thomas Gleixner <[email protected]> CommitDate: Tue, 3 Jul 2018 13:08:21 +0200
x86/platform/intel-mid: Remove per platform code
After custom TSC calibration gone, there is no more reason to have custom platform code for each of Intel MID.
Thus, remove it for good.
--- arch/x86/include/asm/intel-mid.h | 29 ------------------ arch/x86/platform/intel-mid/Makefile | 2 +- arch/x86/platform/intel-mid/intel-mid.c | 17 +---------- arch/x86/platform/intel-mid/intel_mid_weak_decls.h | 18 ------------ arch/x86/platform/intel-mid/mfld.c | 34 ---------------------- arch/x86/platform/intel-mid/mrfld.c | 31 -------------------- 6 files changed, 2 insertions(+), 129 deletions(-)
arch/x86/include/asm/intel-mid.h +0 -29
@@ -80,35 +80,6 @@ enum intel_mid_cpu_type {extern enum intel_mid_cpu_type __intel_mid_cpu_chip; -/** -* struct intel_mid_ops - Interface between intel-mid & sub archs -* @arch_setup: arch_setup function to re-initialize platform -* structures (x86_init, x86_platform_init) -* -* This structure can be extended if any new interface is required -* between intel-mid & its sub arch files. -*/ -struct intel_mid_ops { -void (*arch_setup)(void ); -}; - -/* Helper API's for INTEL_MID_OPS_INIT */ -#define DECLARE_INTEL_MID_OPS_INIT (cpuname, cpuid) \ - [cpuid] = get_##cpuname##_ops - -/* Maximum number of CPU ops */ -#define MAX_CPU_OPS (a) (sizeof(a)/sizeof(void *)) - -/* -* For every new cpu addition, a weak get_<cpuname>_ops() function needs be -* declared in arch/x86/platform/intel_mid/intel_mid_weak_decls.h. -*/ -#define INTEL_MID_OPS_INIT { \ - DECLARE_INTEL_MID_OPS_INIT(penwell, INTEL_MID_CPU_CHIP_PENWELL), \ - DECLARE_INTEL_MID_OPS_INIT(cloverview, INTEL_MID_CPU_CHIP_CLOVERVIEW), \ - DECLARE_INTEL_MID_OPS_INIT(tangier, INTEL_MID_CPU_CHIP_TANGIER) \ -}; -#ifdef CONFIG_X86_INTEL_MID static inline enum intel_mid_cpu_type intel_mid_identify_cpu (void )
arch/x86/platform/intel-mid/Makefile +1 -1
@@ -1,4 +1,4 @@ -obj-$(CONFIG_X86_INTEL_MID) += intel-mid.o intel_mid_vrtc.o mfld.o mrfld.o pwr.o +obj-$(CONFIG_X86_INTEL_MID) += intel-mid.o intel_mid_vrtc.o pwr.o # SFI specific code ifdef CONFIG_X86_INTEL_MID
arch/x86/platform/intel-mid/intel-mid.c +1 -16
@@ -36,8 +36,6 @@#include <asm/apb_timer.h> #include <asm/reboot.h> -#include "intel_mid_weak_decls.h" -/* * the clockevent devices on Moorestown/Medfield can be APBT or LAPIC clock, * cmdline option x86_intel_mid_timer can be used to override the configuration
@@ -61,10 +59,6 @@enum intel_mid_timer_options intel_mid_timer_options; -/* intel_mid_ops to store sub arch ops */ -static struct intel_mid_ops *intel_mid_ops; -/* getter function for sub arch ops*/ -static void *(*get_intel_mid_ops[])(void ) =INTEL_MID_OPS_INIT ;enum intel_mid_cpu_type __intel_mid_cpu_chip;EXPORT_SYMBOL_GPL (__intel_mid_cpu_chip);
@@ -128,6 +122,7 @@ static void intel_mid_arch_setup(void)case 0x3C :case 0x4A : __intel_mid_cpu_chip =INTEL_MID_CPU_CHIP_TANGIER ; + x86_platform.legacy.rtc =1 ;break ;case 0x27 :default :
@@ -135,17 +130,7 @@ static void intel_mid_arch_setup(void)break ; } -if (__intel_mid_cpu_chip <MAX_CPU_OPS (get_intel_mid_ops)) - intel_mid_ops = get_intel_mid_ops[__intel_mid_cpu_chip](); -else { - intel_mid_ops = get_intel_mid_ops[INTEL_MID_CPU_CHIP_PENWELL ](); -pr_info ("ARCH: Unknown SoC, assuming Penwell!\n" ); - } - out: -if (intel_mid_ops->arch_setup) - intel_mid_ops->arch_setup (); -/* * Intel MID platforms are using explicitly defined regulators. *
arch/x86/platform/intel-mid/intel_mid_weak_decls.h deleted +0 -18
@@ -1,18 +0,0 @@ -/* -* intel_mid_weak_decls.h: Weak declarations of intel-mid.c -* -* (C) Copyright 2013 Intel Corporation -* -* 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. -*/ - - -/* For every CPU addition a new get_<cpuname>_ops interface needs -* to be added. -*/ -extern void *get_penwell_ops (void ); -extern void *get_cloverview_ops (void ); -extern void *get_tangier_ops (void );
arch/x86/platform/intel-mid/mfld.c deleted +0 -34
@@ -1,34 +0,0 @@ -/* -* mfld.c: Intel Medfield platform setup code -* -* (C) Copyright 2013 Intel Corporation -* -* 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. -*/ - -#include <linux/init.h> - -#include <asm/intel-mid.h> - -#include "intel_mid_weak_decls.h" - -static void __init penwell_arch_setup (void ) -{ -} - -static struct intel_mid_ops penwell_ops = { - .arch_setup = penwell_arch_setup, -}; - -void *get_penwell_ops (void ) -{ -return &penwell_ops; -} - -void *get_cloverview_ops (void ) -{ -return &penwell_ops; -}
arch/x86/platform/intel-mid/mrfld.c deleted +0 -31
@@ -1,31 +0,0 @@ -/* -* Intel Merrifield platform specific setup code -* -* (C) Copyright 2013 Intel Corporation -* -* 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. -*/ - -#include <linux/init.h> - -#include <asm/intel-mid.h> - -#include "intel_mid_weak_decls.h" - -static void __init tangier_arch_setup (void ) -{ - x86_platform.legacy.rtc =1 ; -} - -/* tangier arch ops */ -static struct intel_mid_ops tangier_ops = { - .arch_setup = tangier_arch_setup, -}; - -void *get_tangier_ops (void ) -{ -return &tangier_ops; -}
Quoted 9 lines · Andy Shevchenko
As Thomas noticed there is unusual initialization is going on on Intel MID platforms when TSC is being calibrated.
It appears that we have
tsc_msr.cto support Intel MID in a more generic way.So, this patch series removes legacy calibration code and does accompanying clean ups.
Has been tested on Intel Medfield and Intel Merrifield platforms.
Nice series from a quick glance! I'll have a deeper look on monday.
One thing on top. From your earlier reply:
Quoted 2 lines
This sounds like a stub against very old calibration code since Intel MID has no PIT, HPET, PMTIMER to calibrate from.
As we already know that the legacy calibration cannot work on those machines, we really should splt out the msr/cpuid based calibration method into a separate function, which is set for the intel MID stuff and called from native_calibrate_tsc/cpu.
Hmm?
Thanks,
tglx
Quoted 19 lines · Thomas Gleixner
Quoted 9 lines · Andy Shevchenko
As Thomas noticed there is unusual initialization is going on on Intel MID platforms when TSC is being calibrated.
It appears that we have
tsc_msr.cto support Intel MID in a more generic way.So, this patch series removes legacy calibration code and does accompanying clean ups.
Has been tested on Intel Medfield and Intel Merrifield platforms.
Nice series from a quick glance! I'll have a deeper look on monday.
One thing on top. From your earlier reply:
Quoted 2 lines
This sounds like a stub against very old calibration code since Intel MID has no PIT, HPET, PMTIMER to calibrate from.
Quoted 6 lines
As we already know that the legacy calibration cannot work on those machines, we really should splt out the msr/cpuid based calibration method into a separate function, which is set for the intel MID stuff and called from native_calibrate_tsc/cpu.
Hmm?
But that's what has been done back in 2013! By some reason, I dunno why, the same author didn't clean up it.
Signature · 2 lines
With Best Regards, Andy Shevchenko