lkml.org 
[lkml]   [2023]   [Nov]   [8]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
Patch in this message
/
From
Subject[PATCH 2/2] watchdog/hpwdt: Remove checks on ilo5
Date
This test doesn't really do much.

ProLiant of vintage to have iLO 5, no longer send watchdog NMI as IO CHECK.
They are presented to hpwdt_pretimeout as UNKNOWN which is convered
by the preceding if statement.

Test could have been useful in the ERROR cases to validate FW set nmistat
register correctly but as the default value of "pretimeout" is true, this
test was almost always skipped during platform validation.

Without this if statment, we can remove all references to variable ilo5.

Signed-off-by: Jerry Hoemann <jerry.hoemann@hpe.com>
---
drivers/watchdog/hpwdt.c | 7 -------
1 file changed, 7 deletions(-)

diff --git a/drivers/watchdog/hpwdt.c b/drivers/watchdog/hpwdt.c
index 79ed1626d8ea..138dc8d8ca3d 100644
--- a/drivers/watchdog/hpwdt.c
+++ b/drivers/watchdog/hpwdt.c
@@ -33,7 +33,6 @@
#define DEFAULT_MARGIN 30
#define PRETIMEOUT_SEC 9

-static bool ilo5;
static unsigned int soft_margin = DEFAULT_MARGIN; /* in seconds */
static bool nowayout = WATCHDOG_NOWAYOUT;
static bool pretimeout = IS_ENABLED(CONFIG_HPWDT_NMI_DECODING);
@@ -181,9 +180,6 @@ static int hpwdt_pretimeout(unsigned int ulReason, struct pt_regs *regs)
if (ulReason == NMI_UNKNOWN && !mynmi)
return NMI_DONE;

- if (ilo5 && !pretimeout && !mynmi)
- return NMI_DONE;
-
if (kdumptimeout < 0)
hpwdt_stop();
else if (kdumptimeout == 0)
@@ -363,9 +359,6 @@ static int hpwdt_init_one(struct pci_dev *dev,
pretimeout ? "on" : "off");
dev_info(&dev->dev, "kdumptimeout: %d.\n", kdumptimeout);

- if (dev->subsystem_vendor == PCI_VENDOR_ID_HP_3PAR)
- ilo5 = true;
-
return 0;

error_wd_register:
--
2.41.0
\
 
 \ /
  Last update: 2023-11-20 13:53    [W:0.068 / U:0.320 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site