| Message ID | 164296788110.16921.15198014097333837407.tip-bot2@tip-bot2 |
|---|---|
| State | New |
| Headers | show |
| Series | [tip:,x86/urgent] x86/MCE/AMD: Allow thresholding interface updates after init | expand |
diff --git a/arch/x86/kernel/cpu/mce/amd.c b/arch/x86/kernel/cpu/mce/amd.c index a1e2f41..9f4b508 100644 --- a/arch/x86/kernel/cpu/mce/amd.c +++ b/arch/x86/kernel/cpu/mce/amd.c @@ -423,7 +423,7 @@ static void threshold_restart_bank(void *_tr) u32 hi, lo; /* sysfs write might race against an offline operation */ - if (this_cpu_read(threshold_banks)) + if (!this_cpu_read(threshold_banks) && !tr->set_lvt_off) return; rdmsr(tr->b->address, lo, hi);
The following commit has been merged into the x86/urgent branch of tip: Commit-ID: 1f52b0aba6fd37653416375cb8a1ca673acf8d5f Gitweb: https://git.kernel.org/tip/1f52b0aba6fd37653416375cb8a1ca673acf8d5f Author: Yazen Ghannam <yazen.ghannam@amd.com> AuthorDate: Mon, 17 Jan 2022 16:13:28 Committer: Borislav Petkov <bp@suse.de> CommitterDate: Sun, 23 Jan 2022 20:50:18 +01:00 x86/MCE/AMD: Allow thresholding interface updates after init Changes to the AMD Thresholding sysfs code prevents sysfs writes from updating the underlying registers once CPU init is completed, i.e. "threshold_banks" is set. Allow the registers to be updated if the thresholding interface is already initialized or if in the init path. Use the "set_lvt_off" value to indicate if running in the init path, since this value is only set during init. Fixes: a037f3ca0ea0 ("x86/mce/amd: Make threshold bank setting hotplug robust") Signed-off-by: Yazen Ghannam <yazen.ghannam@amd.com> Signed-off-by: Borislav Petkov <bp@suse.de> Cc: <stable@vger.kernel.org> Link: https://lore.kernel.org/r/20220117161328.19148-1-yazen.ghannam@amd.com --- arch/x86/kernel/cpu/mce/amd.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)