Enable hpwdt for the rl300, an ARM64 based platform.
Patch 1: watchdog/hpwdt.c: Include nmi.h only if CONFIG_HPWDT_NMI_DECODING
ARM64 does not support NMI and does not have <asm/nmi.h>. Include
nmi.h only if CONFIG_HPWDT_NMI_DECODING is defined.
Patch 2: watchdog/Kconfig: Allow hpwdt.c to be built for ARM64.
Allow hpwdt.c to be built for (ARM64 || X86) as this part of hwpdt doesn't
use NMI.
Make HPWDT_NMI_DECODING dependent upon X86 as NMI handlers are specific
to X86 platforms.
== Changes for v2 ==
Update patch documentation.
Jerry Hoemann (2):
watchdog/hpwdt: Include nmi.h only if CONFIG_HPWDT_NMI_DECODING
watchdog: Enable HP_WATCHDOG for ARM64 systems.
drivers/watchdog/Kconfig | 4 ++--
drivers/watchdog/hpwdt.c | 2 ++
2 files changed, 4 insertions(+), 2 deletions(-)
--
2.37.1
Fixes: d48b0e173715 ("x86, nmi, drivers: Fix nmi splitup build bug")
Arm64 does not support NMI and has no <asm/nmi.h>.
Include <asm/nmi.h> only if CONFIG_HPWDT_NMI_DECODING is defined to
avoid build failure on non-existent header file on Arm64.
Signed-off-by: Jerry Hoemann <[email protected]>
---
drivers/watchdog/hpwdt.c | 2 ++
1 file changed, 2 insertions(+)
diff --git a/drivers/watchdog/hpwdt.c b/drivers/watchdog/hpwdt.c
index a5006a58e0db..f79f932bca14 100644
--- a/drivers/watchdog/hpwdt.c
+++ b/drivers/watchdog/hpwdt.c
@@ -20,7 +20,9 @@
#include <linux/pci_ids.h>
#include <linux/types.h>
#include <linux/watchdog.h>
+#ifdef CONFIG_HPWDT_NMI_DECODING
#include <asm/nmi.h>
+#endif
#include <linux/crash_dump.h>
#define HPWDT_VERSION "2.0.4"
--
2.37.1
Enable HP_WATCHDOG for ARM64 systems.
HPWDT_NMI_DECODING requires X86 as NMI handlers are X86 specific.
Signed-off-by: Jerry Hoemann <[email protected]>
---
drivers/watchdog/Kconfig | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/drivers/watchdog/Kconfig b/drivers/watchdog/Kconfig
index 9295492d24f7..cd643e50681e 100644
--- a/drivers/watchdog/Kconfig
+++ b/drivers/watchdog/Kconfig
@@ -1315,7 +1315,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
@@ -1325,7 +1325,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
--
2.37.1
On Sat, Aug 20, 2022 at 02:28:19PM -0600, Jerry Hoemann wrote:
> Enable hpwdt for the rl300, an ARM64 based platform.
>
Guenter,
Did you have any questions/comments on version 2 of the patch series?
Thanks
Jerry
>
> Patch 1: watchdog/hpwdt.c: Include nmi.h only if CONFIG_HPWDT_NMI_DECODING
>
> ARM64 does not support NMI and does not have <asm/nmi.h>. Include
> nmi.h only if CONFIG_HPWDT_NMI_DECODING is defined.
>
> Patch 2: watchdog/Kconfig: Allow hpwdt.c to be built for ARM64.
>
> Allow hpwdt.c to be built for (ARM64 || X86) as this part of hwpdt doesn't
> use NMI.
>
> Make HPWDT_NMI_DECODING dependent upon X86 as NMI handlers are specific
> to X86 platforms.
>
>
> == Changes for v2 ==
> Update patch documentation.
>
>
>
>
> Jerry Hoemann (2):
> watchdog/hpwdt: Include nmi.h only if CONFIG_HPWDT_NMI_DECODING
> watchdog: Enable HP_WATCHDOG for ARM64 systems.
>
> drivers/watchdog/Kconfig | 4 ++--
> drivers/watchdog/hpwdt.c | 2 ++
> 2 files changed, 4 insertions(+), 2 deletions(-)
>
> --
> 2.37.1
--
-----------------------------------------------------------------------------
Jerry Hoemann Software Engineer Hewlett Packard Enterprise
-----------------------------------------------------------------------------
On 8/20/22 13:28, Jerry Hoemann wrote:
> Enable HP_WATCHDOG for ARM64 systems.
> HPWDT_NMI_DECODING requires X86 as NMI handlers are X86 specific.
>
> Signed-off-by: Jerry Hoemann <[email protected]>
Reviewed-by: Guenter Roeck <[email protected]>
> ---
> drivers/watchdog/Kconfig | 4 ++--
> 1 file changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/drivers/watchdog/Kconfig b/drivers/watchdog/Kconfig
> index 9295492d24f7..cd643e50681e 100644
> --- a/drivers/watchdog/Kconfig
> +++ b/drivers/watchdog/Kconfig
> @@ -1315,7 +1315,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
> @@ -1325,7 +1325,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
On 8/20/22 13:28, Jerry Hoemann wrote:
> Fixes: d48b0e173715 ("x86, nmi, drivers: Fix nmi splitup build bug")
>
> Arm64 does not support NMI and has no <asm/nmi.h>.
>
> Include <asm/nmi.h> only if CONFIG_HPWDT_NMI_DECODING is defined to
> avoid build failure on non-existent header file on Arm64.
>
> Signed-off-by: Jerry Hoemann <[email protected]>
Reviewed-by: Guenter Roeck <[email protected]>
> ---
> drivers/watchdog/hpwdt.c | 2 ++
> 1 file changed, 2 insertions(+)
>
> diff --git a/drivers/watchdog/hpwdt.c b/drivers/watchdog/hpwdt.c
> index a5006a58e0db..f79f932bca14 100644
> --- a/drivers/watchdog/hpwdt.c
> +++ b/drivers/watchdog/hpwdt.c
> @@ -20,7 +20,9 @@
> #include <linux/pci_ids.h>
> #include <linux/types.h>
> #include <linux/watchdog.h>
> +#ifdef CONFIG_HPWDT_NMI_DECODING
> #include <asm/nmi.h>
> +#endif
> #include <linux/crash_dump.h>
>
> #define HPWDT_VERSION "2.0.4"