Commit 4f432e8b authored by Borislav Petkov's avatar Borislav Petkov
Browse files

x86/mce: Get rid of mcheck_intel_therm_init() 



Move the APIC_LVTTHMR read which needs to happen on the BSP, to
intel_init_thermal(). One less boot dependency.

No functional changes.

Signed-off-by: default avatarBorislav Petkov <bp@suse.de>
Tested-by: default avatarSrinivas Pandruvada <srinivas.pandruvada@linux.intel.com>
Link: https://lkml.kernel.org/r/20210201142704.12495-2-bp@alien8.de
parent 7bb39313

arch/x86/include/asm/mce.h

+0 −6
Original line number Diff line number Diff line
@@ -304,12 +304,6 @@ extern int (*platform_thermal_package_notify)(__u64 msr_val); 
 * callback has rate control */

extern bool (*platform_thermal_package_rate_control)(void);



#ifdef CONFIG_X86_THERMAL_VECTOR

extern void mcheck_intel_therm_init(void);

#else

static inline void mcheck_intel_therm_init(void) { }

#endif



/*

 * Used by APEI to report memory error via /dev/mcelog

 */

arch/x86/kernel/cpu/mce/core.c

+0 −1
Original line number Diff line number Diff line
@@ -2189,7 +2189,6 @@ __setup("mce", mcheck_enable); 


int __init mcheck_init(void)

{

	mcheck_intel_therm_init();

	mce_register_decode_chain(&early_nb);

	mce_register_decode_chain(&mce_uc_nb);

	mce_register_decode_chain(&mce_default_nb);

arch/x86/kernel/cpu/mce/therm_throt.c

+4 −11
Original line number Diff line number Diff line
@@ -633,17 +633,6 @@ static int intel_thermal_supported(struct cpuinfo_x86 *c) 
	return 1;

}



void __init mcheck_intel_therm_init(void)

{

	/*

	 * This function is only called on boot CPU. Save the init thermal

	 * LVT value on BSP and use that value to restore APs' thermal LVT

	 * entry BIOS programmed later

	 */

	if (intel_thermal_supported(&boot_cpu_data))

		lvtthmr_init = apic_read(APIC_LVTTHMR);

}



void intel_init_thermal(struct cpuinfo_x86 *c)

{

	unsigned int cpu = smp_processor_id();
@@ -653,6 +642,10 @@ void intel_init_thermal(struct cpuinfo_x86 *c) 
	if (!intel_thermal_supported(c))

		return;



	/* On the BSP? */

	if (c == &boot_cpu_data)

		lvtthmr_init = apic_read(APIC_LVTTHMR);



	/*

	 * First check if its enabled already, in which case there might

	 * be some SMM goo which handles it, so we can't even put a handler