]> asedeno.scripts.mit.edu Git - linux.git/commitdiff
watchdog: hpwdt: Claim NMIs generated by iLO5
authorJerry Hoemann <jerry.hoemann@hpe.com>
Thu, 3 May 2018 21:00:55 +0000 (15:00 -0600)
committerWim Van Sebroeck <wim@linux-watchdog.org>
Mon, 21 May 2018 19:24:42 +0000 (21:24 +0200)
On iLO5 going forward we want to return and not claim the NMI, if
the NMI was NOT gnerated by the iLO as a result of the watchdog
timing out or an explicit generate NMI.

The sense of the test in is inverted and prevents hpwdt_pretimeout
from claiming NMIs when it should.

Signed-off-by: Jerry Hoemann <jerry.hoemann@hpe.com>
Fixes: a042229a18ac ("watchdog: hpwdt: Update nmi_panic message.")
Reviewed-by: Guenter Roeck <linux@roeck-us.net>
Signed-off-by: Guenter Roeck <linux@roeck-us.net>
Signed-off-by: Wim Van Sebroeck <wim@iguana.be>
drivers/watchdog/hpwdt.c

index a43ab2cecca2748d23e3d064ca55390ddffe386f..9dc62a4614512fb8faeb2e937bc085d2bec16f3c 100644 (file)
@@ -159,7 +159,7 @@ static int hpwdt_pretimeout(unsigned int ulReason, struct pt_regs *regs)
                "3. OA Forward Progress Log\n"
                "4. iLO Event Log";
 
-       if (ilo5 && ulReason == NMI_UNKNOWN && mynmi)
+       if (ilo5 && ulReason == NMI_UNKNOWN && !mynmi)
                return NMI_DONE;
 
        if (ilo5 && !pretimeout)