Commit 3e89c7ea authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'ras_updates_for_v5.12' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip 

Pull RAS updates from Borislav Petkov:

 - move therm_throt.c to the thermal framework, where it belongs.

 - identify CPUs which miss to enter the broadcast handler, as an
   additional debugging aid.

* tag 'ras_updates_for_v5.12' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  thermal: Move therm_throt there from x86/mce
  x86/mce: Get rid of mcheck_intel_therm_init()
  x86/mce: Make mce_timed_out() identify holdout CPUs
parents 85184966 9223d0dc

arch/x86/Kconfig

+0 −4
Original line number Diff line number Diff line
@@ -1158,10 +1158,6 @@ config X86_MCE_INJECT 
	  If you don't know what a machine check is and you don't do kernel

	  QA it is safe to say n.



config X86_THERMAL_VECTOR

	def_bool y

	depends on X86_MCE_INTEL



source "arch/x86/events/Kconfig"



config X86_LEGACY_VM86

arch/x86/include/asm/mce.h

+0 −22
Original line number Diff line number Diff line
@@ -288,28 +288,6 @@ extern void (*mce_threshold_vector)(void); 
/* Deferred error interrupt handler */

extern void (*deferred_error_int_vector)(void);



/*

 * Thermal handler

 */



void intel_init_thermal(struct cpuinfo_x86 *c);



/* Interrupt Handler for core thermal thresholds */

extern int (*platform_thermal_notify)(__u64 msr_val);



/* Interrupt Handler for package thermal thresholds */

extern int (*platform_thermal_package_notify)(__u64 msr_val);



/* Callback support of rate control, return true, if

 * 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/include/asm/thermal.h

0 → 100644
+13 −0
Original line number Diff line number Diff line 
/* SPDX-License-Identifier: GPL-2.0 */

#ifndef _ASM_X86_THERMAL_H

#define _ASM_X86_THERMAL_H



#ifdef CONFIG_X86_THERMAL_VECTOR

void intel_init_thermal(struct cpuinfo_x86 *c);

bool x86_thermal_enabled(void);

void intel_thermal_interrupt(void);

#else

static inline void intel_init_thermal(struct cpuinfo_x86 *c) { }

#endif



#endif /* _ASM_X86_THERMAL_H */

arch/x86/kernel/cpu/intel.c

+3 −0
Original line number Diff line number Diff line
@@ -24,6 +24,7 @@ 
#include <asm/traps.h>

#include <asm/resctrl.h>

#include <asm/numa.h>

#include <asm/thermal.h>



#ifdef CONFIG_X86_64

#include <linux/topology.h>
@@ -719,6 +720,8 @@ static void init_intel(struct cpuinfo_x86 *c) 
		tsx_disable();



	split_lock_init();



	intel_init_thermal(c);

}



#ifdef CONFIG_X86_32

arch/x86/kernel/cpu/mce/Makefile

+0 −2
Original line number Diff line number Diff line
@@ -9,8 +9,6 @@ obj-$(CONFIG_X86_MCE_THRESHOLD) += threshold.o 
mce-inject-y			:= inject.o

obj-$(CONFIG_X86_MCE_INJECT)	+= mce-inject.o



obj-$(CONFIG_X86_THERMAL_VECTOR) += therm_throt.o



obj-$(CONFIG_ACPI_APEI)		+= apei.o



obj-$(CONFIG_X86_MCELOG_LEGACY)	+= dev-mcelog.o