Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 0cc5359d authored by Rahul Tanwar's avatar Rahul Tanwar Committed by Ingo Molnar
Browse files

x86/cpu: Update init data for new Airmont CPU model 



Update properties for newly added Airmont CPU variant.

Signed-off-by: default avatarRahul Tanwar <rahul.tanwar@linux.intel.com>
Signed-off-by: default avatarTony Luck <tony.luck@intel.com>
Cc: Gayatri Kammela <gayatri.kammela@intel.com>
Cc: Linus Torvalds <torvalds@linux-foundation.org>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Thomas Gleixner <tglx@linutronix.de>
Link: https://lkml.kernel.org/r/20190905193020.14707-5-tony.luck@intel.com


Signed-off-by: default avatarIngo Molnar <mingo@kernel.org>
parent 855fa1f3

arch/x86/kernel/cpu/common.c

+1 −0
Original line number Diff line number Diff line
@@ -1059,6 +1059,7 @@ static const __initconst struct x86_cpu_id cpu_vuln_whitelist[] = { 
	VULNWL_INTEL(CORE_YONAH,		NO_SSB),



	VULNWL_INTEL(ATOM_AIRMONT_MID,		NO_L1TF | MSBDS_ONLY | NO_SWAPGS),

	VULNWL_INTEL(ATOM_AIRMONT_NP,		NO_L1TF | NO_SWAPGS),



	VULNWL_INTEL(ATOM_GOLDMONT,		NO_MDS | NO_L1TF | NO_SWAPGS),

	VULNWL_INTEL(ATOM_GOLDMONT_D,		NO_MDS | NO_L1TF | NO_SWAPGS),

arch/x86/kernel/cpu/intel.c

+1 −0
Original line number Diff line number Diff line
@@ -268,6 +268,7 @@ static void early_init_intel(struct cpuinfo_x86 *c) 
		case INTEL_FAM6_ATOM_SALTWELL_MID:

		case INTEL_FAM6_ATOM_SALTWELL_TABLET:

		case INTEL_FAM6_ATOM_SILVERMONT_MID:

		case INTEL_FAM6_ATOM_AIRMONT_NP:

			set_cpu_cap(c, X86_FEATURE_NONSTOP_TSC_S3);

			break;

		default:

arch/x86/kernel/tsc_msr.c

+5 −0
Original line number Diff line number Diff line
@@ -58,6 +58,10 @@ static const struct freq_desc freq_desc_ann = { 
	1, { 83300, 100000, 133300, 100000, 0, 0, 0, 0 }

};



static const struct freq_desc freq_desc_lgm = {

	1, { 78000, 78000, 78000, 78000, 78000, 78000, 78000, 78000 }

};



static const struct x86_cpu_id tsc_msr_cpu_ids[] = {

	INTEL_CPU_FAM6(ATOM_SALTWELL_MID,	freq_desc_pnw),

	INTEL_CPU_FAM6(ATOM_SALTWELL_TABLET,	freq_desc_clv),
@@ -65,6 +69,7 @@ static const struct x86_cpu_id tsc_msr_cpu_ids[] = { 
	INTEL_CPU_FAM6(ATOM_SILVERMONT_MID,	freq_desc_tng),

	INTEL_CPU_FAM6(ATOM_AIRMONT,		freq_desc_cht),

	INTEL_CPU_FAM6(ATOM_AIRMONT_MID,	freq_desc_ann),

	INTEL_CPU_FAM6(ATOM_AIRMONT_NP,		freq_desc_lgm),

	{}

};