Skip to content

Commit a96d3a5

Browse files
committed
Merge tag 'x86_urgent_for_v5.17_rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
Pull x86 fixes from Borislav Petkov: - Add another Intel CPU model to the list of CPUs supporting the processor inventory unique number - Allow writing to MCE thresholding sysfs files again - a previous change had accidentally disabled it and no one noticed. Goes to show how much is this stuff used * tag 'x86_urgent_for_v5.17_rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip: x86/cpu: Add Xeon Icelake-D to list of CPUs that support PPIN x86/MCE/AMD: Allow thresholding interface updates after init
2 parents 8dd7168 + e464121 commit a96d3a5

File tree

2 files changed

+2
-1
lines changed

2 files changed

+2
-1
lines changed

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -423,7 +423,7 @@ static void threshold_restart_bank(void *_tr)
423423
u32 hi, lo;
424424

425425
/* sysfs write might race against an offline operation */
426-
if (this_cpu_read(threshold_banks))
426+
if (!this_cpu_read(threshold_banks) && !tr->set_lvt_off)
427427
return;
428428

429429
rdmsr(tr->b->address, lo, hi);

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -486,6 +486,7 @@ static void intel_ppin_init(struct cpuinfo_x86 *c)
486486
case INTEL_FAM6_BROADWELL_X:
487487
case INTEL_FAM6_SKYLAKE_X:
488488
case INTEL_FAM6_ICELAKE_X:
489+
case INTEL_FAM6_ICELAKE_D:
489490
case INTEL_FAM6_SAPPHIRERAPIDS_X:
490491
case INTEL_FAM6_XEON_PHI_KNL:
491492
case INTEL_FAM6_XEON_PHI_KNM:

0 commit comments

Comments
 (0)