Commit 8fa91bfa authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'ras-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip 

Pull RAS fix from Borislav Petkov:
 "One urgent fix for the thermal throttling machinery: the recent change
  reworking the thermal notifications forgot to mask out read-only and
  reserved bits in the thermal status MSRs, leading to exceptions while
  writing those MSRs.

  The fix takes care of masking out those bits first"

* 'ras-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  x86/mce/therm_throt: Mask out read-only and reserved MSR bits
parents 738d5fab 5a43b87b

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

+12 −5
Original line number Diff line number Diff line
@@ -195,17 +195,24 @@ static const struct attribute_group thermal_attr_group = { 
#define THERM_THROT_POLL_INTERVAL	HZ

#define THERM_STATUS_PROCHOT_LOG	BIT(1)



#define THERM_STATUS_CLEAR_CORE_MASK (BIT(1) | BIT(3) | BIT(5) | BIT(7) | BIT(9) | BIT(11) | BIT(13) | BIT(15))

#define THERM_STATUS_CLEAR_PKG_MASK  (BIT(1) | BIT(3) | BIT(5) | BIT(7) | BIT(9) | BIT(11))



static void clear_therm_status_log(int level)

{

	int msr;

	u64 msr_val;

	u64 mask, msr_val;



	if (level == CORE_LEVEL)

	if (level == CORE_LEVEL) {

		msr  = MSR_IA32_THERM_STATUS;

	else

		mask = THERM_STATUS_CLEAR_CORE_MASK;

	} else {

		msr  = MSR_IA32_PACKAGE_THERM_STATUS;

		mask = THERM_STATUS_CLEAR_PKG_MASK;

	}



	rdmsrl(msr, msr_val);

	msr_val &= mask;

	wrmsrl(msr, msr_val & ~THERM_STATUS_PROCHOT_LOG);

}