On 19/03/2024 4:51 pm, Jan Beulich wrote: > On 19.03.2024 15:48, Andrew Cooper wrote: >> The MSRs used by setup_k7_watchdog() are architectural in 64bit. The Unit >> Select (0x76, cycles not in halt state) isn't, but it hasn't changed in 23 >> years, making this a trend likely to continue. >> >> Drop the family check. If the Unit Select does happen to change meaning in >> the future, check_nmi_watchdog() will still notice the watchdog not operating >> as expected. >> >> Signed-off-by: Andrew Cooper <andrew.coop...@citrix.com> > Reviewed-by: Jan Beulich <jbeul...@suse.com>
Thanks. > >> --- a/xen/arch/x86/nmi.c >> +++ b/xen/arch/x86/nmi.c >> @@ -387,15 +387,12 @@ void setup_apic_nmi_watchdog(void) >> if ( nmi_watchdog == NMI_NONE ) >> return; >> >> - switch (boot_cpu_data.x86_vendor) { >> + switch ( boot_cpu_data.x86_vendor ) >> + { >> case X86_VENDOR_AMD: >> - switch (boot_cpu_data.x86) { >> - case 6: > Just to mention it - this case label has been dead code anyway for about 10 > years. Yeah... I noticed that after writing the commit message, although it's not very easy to slip in. Also it's 25 years since the K7 was released (June 1999), because I apparently can't count. ~Andrew