]> asedeno.scripts.mit.edu Git - linux.git/commitdiff
watchdog: hpwdt: Update nmi_panic message.
authorJerry Hoemann <jerry.hoemann@hpe.com>
Mon, 26 Feb 2018 03:22:21 +0000 (20:22 -0700)
committerWim Van Sebroeck <wim@linux-watchdog.org>
Sat, 3 Mar 2018 16:04:17 +0000 (17:04 +0100)
Include the nmistat in the nmi_panic message to give support
an indication why the NMI was called (e.g. a timeout or generate
nmi button.)

Signed-off-by: Jerry Hoemann <jerry.hoemann@hpe.com>
Signed-off-by: Guenter Roeck <linux@roeck-us.net>
Signed-off-by: Wim Van Sebroeck <wim@iguana.be>
drivers/watchdog/hpwdt.c

index 1d20bc6d2c4472f9116fab9808f0cc32dbd3300a..44c3038cc531101681ed20c2eb735bb8568a1e53 100644 (file)
@@ -113,19 +113,23 @@ static int hpwdt_my_nmi(void)
  */
 static int hpwdt_pretimeout(unsigned int ulReason, struct pt_regs *regs)
 {
-       if ((ulReason == NMI_UNKNOWN) && !hpwdt_my_nmi())
+       unsigned int mynmi = hpwdt_my_nmi();
+       static char panic_msg[] =
+               "00: An NMI occurred. Depending on your system the reason "
+               "for the NMI is logged in any one of the following resources:\n"
+               "1. Integrated Management Log (IML)\n"
+               "2. OA Syslog\n"
+               "3. OA Forward Progress Log\n"
+               "4. iLO Event Log";
+
+       if ((ulReason == NMI_UNKNOWN) && mynmi)
                return NMI_DONE;
 
        if (allow_kdump)
                hpwdt_stop();
 
-       nmi_panic(regs, "An NMI occurred. Depending on your system the reason "
-               "for the NMI is logged in any one of the following "
-               "resources:\n"
-               "1. Integrated Management Log (IML)\n"
-               "2. OA Syslog\n"
-               "3. OA Forward Progress Log\n"
-               "4. iLO Event Log");
+       hex_byte_pack(panic_msg, mynmi);
+       nmi_panic(regs, panic_msg);
 
        return NMI_HANDLED;
 }