Skip to content

Commit 0cc5359

Browse files
Rahul TanwarIngo Molnar
authored andcommitted
x86/cpu: Update init data for new Airmont CPU model
Update properties for newly added Airmont CPU variant. Signed-off-by: Rahul Tanwar <[email protected]> Signed-off-by: Tony Luck <[email protected]> Cc: Gayatri Kammela <[email protected]> Cc: Linus Torvalds <[email protected]> Cc: Peter Zijlstra <[email protected]> Cc: Thomas Gleixner <[email protected]> Link: https://lkml.kernel.org/r/[email protected] Signed-off-by: Ingo Molnar <[email protected]>
1 parent 855fa1f commit 0cc5359

File tree

3 files changed

+7
-0
lines changed

3 files changed

+7
-0
lines changed

arch/x86/kernel/cpu/common.c

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1059,6 +1059,7 @@ static const __initconst struct x86_cpu_id cpu_vuln_whitelist[] = {
10591059
VULNWL_INTEL(CORE_YONAH, NO_SSB),
10601060

10611061
VULNWL_INTEL(ATOM_AIRMONT_MID, NO_L1TF | MSBDS_ONLY | NO_SWAPGS),
1062+
VULNWL_INTEL(ATOM_AIRMONT_NP, NO_L1TF | NO_SWAPGS),
10621063

10631064
VULNWL_INTEL(ATOM_GOLDMONT, NO_MDS | NO_L1TF | NO_SWAPGS),
10641065
VULNWL_INTEL(ATOM_GOLDMONT_D, NO_MDS | NO_L1TF | NO_SWAPGS),

arch/x86/kernel/cpu/intel.c

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -268,6 +268,7 @@ static void early_init_intel(struct cpuinfo_x86 *c)
268268
case INTEL_FAM6_ATOM_SALTWELL_MID:
269269
case INTEL_FAM6_ATOM_SALTWELL_TABLET:
270270
case INTEL_FAM6_ATOM_SILVERMONT_MID:
271+
case INTEL_FAM6_ATOM_AIRMONT_NP:
271272
set_cpu_cap(c, X86_FEATURE_NONSTOP_TSC_S3);
272273
break;
273274
default:

arch/x86/kernel/tsc_msr.c

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -58,13 +58,18 @@ static const struct freq_desc freq_desc_ann = {
5858
1, { 83300, 100000, 133300, 100000, 0, 0, 0, 0 }
5959
};
6060

61+
static const struct freq_desc freq_desc_lgm = {
62+
1, { 78000, 78000, 78000, 78000, 78000, 78000, 78000, 78000 }
63+
};
64+
6165
static const struct x86_cpu_id tsc_msr_cpu_ids[] = {
6266
INTEL_CPU_FAM6(ATOM_SALTWELL_MID, freq_desc_pnw),
6367
INTEL_CPU_FAM6(ATOM_SALTWELL_TABLET, freq_desc_clv),
6468
INTEL_CPU_FAM6(ATOM_SILVERMONT, freq_desc_byt),
6569
INTEL_CPU_FAM6(ATOM_SILVERMONT_MID, freq_desc_tng),
6670
INTEL_CPU_FAM6(ATOM_AIRMONT, freq_desc_cht),
6771
INTEL_CPU_FAM6(ATOM_AIRMONT_MID, freq_desc_ann),
72+
INTEL_CPU_FAM6(ATOM_AIRMONT_NP, freq_desc_lgm),
6873
{}
6974
};
7075

0 commit comments

Comments
 (0)