Modify prior change to not claim an NMI unless originated
from iLO to apply only to iLO5 and later going forward.
This restores hpwdt traditional behavior of calling panic
if the NMI is NMI_IO_CHECK, NMI_SERR, or NMI_UNKNOWN for
legacy hardware.
Signed-off-by: Jerry Hoemann <jerry.hoemann@xxxxxxx>
---
drivers/watchdog/hpwdt.c | 10 +++++++---
1 file changed, 7 insertions(+), 3 deletions(-)
diff --git a/drivers/watchdog/hpwdt.c b/drivers/watchdog/hpwdt.c
index 1edbcb8f1537..9bfb668115f8 100644
--- a/drivers/watchdog/hpwdt.c
+++ b/drivers/watchdog/hpwdt.c
@@ -33,6 +33,7 @@
static unsigned int soft_margin = DEFAULT_MARGIN; /* in seconds */
static bool nowayout = WATCHDOG_NOWAYOUT;
static unsigned int allow_kdump = 1;
+static bool iLO5;
#ifdef CONFIG_HPWDT_NMI_DECODING /* { */
static bool pretimeout = 1;
#else
@@ -140,14 +141,14 @@ static int hpwdt_pretimeout(unsigned int ulReason, struct pt_regs *regs)
"3. OA Forward Progress Log\n"
"4. iLO Event Log";
- if ((ulReason == NMI_UNKNOWN) && !mynmi)
- return NMI_DONE;
-
pr_debug("nmi: ulReason=%d, mynmi=0x%0x\n", ulReason, mynmi);
if (!pretimeout)
return NMI_DONE;
+ if (iLO5 && (ulReason == NMI_UNKNOWN) && !mynmi)
+ return NMI_DONE;
+
if (allow_kdump)
hpwdt_stop(&hpwdt_dev);
@@ -280,6 +281,9 @@ static int hpwdt_probe(struct pci_dev *dev, const struct pci_device_id *ent)
", timer margin: %d seconds (nowayout=%d).\n",
HPWDT_VERSION, hpwdt_dev.timeout, nowayout);
+ if (dev->subsystem_vendor == PCI_VENDOR_ID_HP_3PAR)
+ iLO5 = 1;
+
return 0;
error_wd_register:
--
2.13.6
--
To unsubscribe from this list: send the line "unsubscribe linux-watchdog" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
