From 8de079015e5ea8dc3883c466afd0d4e0de3c8ac1 Mon Sep 17 00:00:00 2001 From: Andrew Jeffery Date: Sat, 21 Apr 2018 16:37:44 +0930 Subject: kernel: Add phosphor-wdt-on-panic KERNEL_FEATURE phosphor-wdt-on-panic configures the kernel with an infinite panic timeout, with the expectation that the hardware watchdog will bite and reset the BMC. On Witherspoon systems this allows the SoC to boot from the alternate BMC firmware flash device. Change-Id: I45f5c5175484a2c386f5104194f16d8d6fa0aec9 Signed-off-by: Andrew Jeffery --- meta-phosphor/common/recipes-kernel/linux/linux-obmc.inc | 2 ++ .../common/recipes-kernel/linux/linux-obmc/phosphor-wdt-on-panic.cfg | 2 ++ .../common/recipes-kernel/linux/linux-obmc/phosphor-wdt-on-panic.scc | 2 ++ 3 files changed, 6 insertions(+) create mode 100644 meta-phosphor/common/recipes-kernel/linux/linux-obmc/phosphor-wdt-on-panic.cfg create mode 100644 meta-phosphor/common/recipes-kernel/linux/linux-obmc/phosphor-wdt-on-panic.scc diff --git a/meta-phosphor/common/recipes-kernel/linux/linux-obmc.inc b/meta-phosphor/common/recipes-kernel/linux/linux-obmc.inc index 271f32508..274db26a4 100644 --- a/meta-phosphor/common/recipes-kernel/linux/linux-obmc.inc +++ b/meta-phosphor/common/recipes-kernel/linux/linux-obmc.inc @@ -12,6 +12,8 @@ SRC_URI += "file://phosphor-gpio-keys.scc" SRC_URI += "file://phosphor-gpio-keys.cfg" SRC_URI += "file://phosphor-vlan.scc" SRC_URI += "file://phosphor-vlan.cfg" +SRC_URI += "file://phosphor-wdt-on-panic.scc" +SRC_URI += "file://phosphor-wdt-on-panic.cfg" SRC_URI_append_df-obmc-ubi-fs = " file://0001-ARM-dts-Aspeed-Witherspoon-Update-BMC-partitioning.patch" diff --git a/meta-phosphor/common/recipes-kernel/linux/linux-obmc/phosphor-wdt-on-panic.cfg b/meta-phosphor/common/recipes-kernel/linux/linux-obmc/phosphor-wdt-on-panic.cfg new file mode 100644 index 000000000..329b4df4b --- /dev/null +++ b/meta-phosphor/common/recipes-kernel/linux/linux-obmc/phosphor-wdt-on-panic.cfg @@ -0,0 +1,2 @@ +CONFIG_PANIC_ON_OOPS=y +CONFIG_PANIC_TIMEOUT=0 diff --git a/meta-phosphor/common/recipes-kernel/linux/linux-obmc/phosphor-wdt-on-panic.scc b/meta-phosphor/common/recipes-kernel/linux/linux-obmc/phosphor-wdt-on-panic.scc new file mode 100644 index 000000000..7fc650799 --- /dev/null +++ b/meta-phosphor/common/recipes-kernel/linux/linux-obmc/phosphor-wdt-on-panic.scc @@ -0,0 +1,2 @@ +define KFEATURE_DESCRIPTION "Require watchdog to reset SoC on panic" +kconf non-hardware phosphor-wdt-on-panic.cfg -- cgit v1.2.3