From: Jerry Hoemann Date: Thu, 3 May 2018 21:00:55 +0000 (-0600) Subject: watchdog: hpwdt: Claim NMIs generated by iLO5 X-Git-Tag: v5.15~8630^2~9 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=62290a5c194b30a096cbcc6bb8680a5a1e627714;p=platform%2Fkernel%2Flinux-starfive.git watchdog: hpwdt: Claim NMIs generated by iLO5 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 Fixes: a042229a18ac ("watchdog: hpwdt: Update nmi_panic message.") Reviewed-by: Guenter Roeck Signed-off-by: Guenter Roeck Signed-off-by: Wim Van Sebroeck --- diff --git a/drivers/watchdog/hpwdt.c b/drivers/watchdog/hpwdt.c index a43ab2c..9dc62a4 100644 --- a/drivers/watchdog/hpwdt.c +++ b/drivers/watchdog/hpwdt.c @@ -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)