]> git.baikalelectronics.ru Git - kernel.git/commit
x86/nmi_watchdog: Fix old-style NMI watchdog regression on old Intel CPUs
authorCodyYao-oc <CodyYao-oc@zhaoxin.com>
Mon, 7 Jun 2021 02:53:35 +0000 (10:53 +0800)
committerPeter Zijlstra <peterz@infradead.org>
Thu, 10 Jun 2021 08:04:40 +0000 (10:04 +0200)
commit67118db49a7e71d65af271dfbeee4cb1f262baff
tree2b05d96e731a709a051f92cbf2c3de834d5ff1e1
parentafeca46bea5317443188da80e63d9174af784892
x86/nmi_watchdog: Fix old-style NMI watchdog regression on old Intel CPUs

The following commit:

   0ebb87d96a8a ("x86/perf: Add hardware performance events support for Zhaoxin CPU.")

Got the old-style NMI watchdog logic wrong and broke it for basically every
Intel CPU where it was active. Which is only truly old CPUs, so few people noticed.

On CPUs with perf events support we turn off the old-style NMI watchdog, so it
was pretty pointless to add the logic for X86_VENDOR_ZHAOXIN to begin with ... :-/

Anyway, the fix is to restore the old logic and add a 'break'.

[ mingo: Wrote a new changelog. ]

Fixes: 0ebb87d96a8a ("x86/perf: Add hardware performance events support for Zhaoxin CPU.")
Signed-off-by: CodyYao-oc <CodyYao-oc@zhaoxin.com>
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Signed-off-by: Peter Zijlstra (Intel) <peterz@infradead.org>
Link: https://lore.kernel.org/r/20210607025335.9643-1-CodyYao-oc@zhaoxin.com
arch/x86/kernel/cpu/perfctr-watchdog.c