diff mbox series

[SRU,J,1/2] watchdog/hpwdt: Enable HP_WATCHDOG for ARM64 systems.

Message ID 20230322223637.25584-2-michael.reed@canonical.com
State New
Headers show
Series Backport request for hpwdt from upstream 6.1 to Jammy | expand

Commit Message

Michael Reed March 22, 2023, 10:36 p.m. UTC 
From: Jerry Hoemann <jerry.hoemann@hpe.com>

Enable HP_WATCHDOG for ARM64 systems.
HPWDT_NMI_DECODING requires X86 as NMI handlers are X86 specific.

BugLink: https://bugs.launchpad.net/bugs/2008751

Signed-off-by: Jerry Hoemann <jerry.hoemann@hpe.com>
Reviewed-by: Guenter Roeck <linux@roeck-us.net>
Link: https://lore.kernel.org/r/20220820202821.1263837-3-jerry.hoemann@hpe.com
Signed-off-by: Guenter Roeck <linux@roeck-us.net>
Signed-off-by: Wim Van Sebroeck <wim@linux-watchdog.org>

Add arm64 option to CONFIG_HP_WATCHDOG

CONFIG_HP_WATCHDOG is used in module hpwdt.  A software monitoring watchdog
and NMI handling driver. This driver will detect lockups and provide
a stack trace. This is a driver that will only load on an HP ProLiant
system with a minimum of iLO2 support.  This option allow it to build
on arm64.

(backported from commit 891862d5ba11da739ac796221ff64e4ccf5a275f)
Signed-off-by: Michael Reed <Michael.Reed@canonical.com>
[Michael Reed - Added arm64 option to the config file for CONFIG_HP_WATCHDOG]
---
 debian.master/config/annotations | 2 +-
 drivers/watchdog/Kconfig         | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)
diff mbox series

Patch

diff --git a/debian.master/config/annotations b/debian.master/config/annotations
index e24b4d05ff1f..33c935c94c78 100644
--- a/debian.master/config/annotations
+++ b/debian.master/config/annotations
@@ -10465,7 +10465,7 @@  CONFIG_ITCO_WDT                                 policy<{'amd64': 'm'}>
 CONFIG_ITCO_VENDOR_SUPPORT                      policy<{'amd64': 'y'}>
 CONFIG_IT8712F_WDT                              policy<{'amd64': 'm'}>
 CONFIG_IT87_WDT                                 policy<{'amd64': 'm'}>
-CONFIG_HP_WATCHDOG                              policy<{'amd64': 'm'}>
+CONFIG_HP_WATCHDOG                              policy<{'amd64': 'm', 'arm64': 'm'}>
 CONFIG_HPWDT_NMI_DECODING                       policy<{'amd64': 'y'}>
 CONFIG_KEMPLD_WDT                               policy<{'amd64': 'm', 'arm64': 'm', 'armhf': 'm', 'ppc64el': 'm'}>
 CONFIG_SC1200_WDT                               policy<{'amd64': 'm'}>
diff --git a/drivers/watchdog/Kconfig b/drivers/watchdog/Kconfig
index 5db5c5221663..1525f9aefb8b 100644
--- a/drivers/watchdog/Kconfig
+++ b/drivers/watchdog/Kconfig
@@ -1274,7 +1274,7 @@  config IT87_WDT
 config HP_WATCHDOG
 	tristate "HP ProLiant iLO2+ Hardware Watchdog Timer"
 	select WATCHDOG_CORE
-	depends on X86 && PCI
+	depends on (ARM64 || X86) && PCI
 	help
 	  A software monitoring watchdog and NMI handling driver. This driver
 	  will detect lockups and provide a stack trace. This is a driver that
@@ -1284,7 +1284,7 @@  config HP_WATCHDOG
 
 config HPWDT_NMI_DECODING
 	bool "NMI support for the HP ProLiant iLO2+ Hardware Watchdog Timer"
-	depends on HP_WATCHDOG
+	depends on X86 && HP_WATCHDOG
 	default y
 	help
 	  Enables the NMI handler for the watchdog pretimeout NMI and the iLO