[xen staging-4.17] x86/boot: Support the watchdog on newer AMD systems

[patchbot@xxxxxxx]

commit 2777b499f1f6d5cea68f9479f82d055542b822ad
Author:     Andrew Cooper <andrew.cooper3@xxxxxxxxxx>
AuthorDate: Tue Apr 2 16:20:30 2024 +0200
Commit:     Jan Beulich <jbeulich@xxxxxxxx>
CommitDate: Tue Apr 2 16:20:30 2024 +0200

    x86/boot: Support the watchdog on newer AMD systems
    
    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 25
    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.cooper3@xxxxxxxxxx>
    Reviewed-by: Jan Beulich <jbeulich@xxxxxxxx>
    master commit: 131892e0dcc1265b621c2b7d844cb9e7c3a4404f
    master date: 2024-03-19 18:29:37 +0000
---
 xen/arch/x86/nmi.c | 11 ++++-------
 1 file changed, 4 insertions(+), 7 deletions(-)

diff --git a/xen/arch/x86/nmi.c b/xen/arch/x86/nmi.c
index dd31034ac8..c7c51614a6 100644
--- a/xen/arch/x86/nmi.c
+++ b/xen/arch/x86/nmi.c
@@ -386,15 +386,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:
-        case 0xf ... 0x19:
-            setup_k7_watchdog();
-            break;
-        }
+        setup_k7_watchdog();
         break;
+
     case X86_VENDOR_INTEL:
         switch (boot_cpu_data.x86) {
         case 6:
--
generated by git-patchbot for /home/xen/git/xen.git#staging-4.17