On Sun, Feb 25, 2018 at 02:32:55PM -0700, Jerry Hoemann wrote: > 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.hoem...@hpe.com> > --- > drivers/watchdog/hpwdt.c | 6 +++++- > 1 file changed, 5 insertions(+), 1 deletion(-) > > diff --git a/drivers/watchdog/hpwdt.c b/drivers/watchdog/hpwdt.c > index 1a18326bc99d..e60c689ebdb2 100644 > --- a/drivers/watchdog/hpwdt.c > +++ b/drivers/watchdog/hpwdt.c > @@ -32,6 +32,7 @@ > #define HPWDT_MAX_TIMER TICKS_TO_SECS(65535) > #define DEFAULT_MARGIN 30 > > +static bool iLO5;
Another nitpick: CamelCase is still not preferred for variable names. Guenter > static unsigned int soft_margin = DEFAULT_MARGIN; /* in seconds */ > static unsigned int reload; /* the computed soft_margin */ > static bool nowayout = WATCHDOG_NOWAYOUT; > @@ -121,7 +122,7 @@ 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) > + if (iLO5 && ulReason == NMI_UNKNOWN && mynmi) > return NMI_DONE; > > if (allow_kdump) > @@ -279,6 +280,9 @@ static int hpwdt_init_one(struct pci_dev *dev, > ", 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:
