From f021ee9f72d43f6033e033ce244e542fb74c62db Mon Sep 17 00:00:00 2001 From: Andrew Geissler Date: Wed, 26 Aug 2020 18:18:24 -0500 Subject: kernel: enable KERNEL_DANGLING_FEATURES_WARN_ONLY Uptream yocto recently added some new code which enforces kernel feature validation. The commit which did this is: https://git.yoctoproject.org/cgit/cgit.cgi/poky/commit/?id=095175595d9f28d5a0eb7ea520c9af0100bb8dfd This caused OpenBMC builds to start failing with the following: | ERROR: Feature 'phosphor-wdt-on-panic' not found, this will cause configuration failures. | ERROR: Check the SRC_URI for meta-data repositories or directories that may be missing | ERROR: Set KERNEL_DANGLING_FEATURES_WARN_ONLY to ignore this issue OpenBMC does not utilize this aspect of the kernel-yocto.bbclass so make it a warning only. Tested: Verified that the resultant build still had the expected CONFIG options set in the linux-aspeed defconfig. Resolves openbmc/openbmc#3690 (From meta-phosphor rev: d9a065db400bea4b026e240532dd369e588c967d) Signed-off-by: Andrew Geissler Change-Id: I7590e6304307599cbc77ef26ca9708a70d47d8a0 Signed-off-by: Andrew Geissler --- .../aspeed-layer/recipes-kernel/linux/linux-aspeed_%.bbappend | 7 +++++++ 1 file changed, 7 insertions(+) (limited to 'meta-phosphor/aspeed-layer/recipes-kernel/linux/linux-aspeed_%.bbappend') diff --git a/meta-phosphor/aspeed-layer/recipes-kernel/linux/linux-aspeed_%.bbappend b/meta-phosphor/aspeed-layer/recipes-kernel/linux/linux-aspeed_%.bbappend index ea70a4fe8..6acd6a6e1 100644 --- a/meta-phosphor/aspeed-layer/recipes-kernel/linux/linux-aspeed_%.bbappend +++ b/meta-phosphor/aspeed-layer/recipes-kernel/linux/linux-aspeed_%.bbappend @@ -9,3 +9,10 @@ SRC_URI += "file://phosphor-wdt-on-panic.cfg" KERNEL_FEATURES_append = " phosphor-vlan" KERNEL_FEATURES_remove_qemuall = " phosphor-vlan" + +python () { + # OpenBMC loads in kernel features via other mechanisms so this check + # in the kernel-yocto.bbclass is not required + d.setVar("KERNEL_DANGLING_FEATURES_WARN_ONLY","1") +} + -- cgit v1.2.3 From cfef6753e7e72f5e7d43f492d1c3fe2f800b945e Mon Sep 17 00:00:00 2001 From: Andrew Geissler Date: Tue, 1 Sep 2020 14:17:19 -0500 Subject: simplify setting of KERNEL_DANGLING_FEATURES_WARN_ONLY Setting this within python is not required (From meta-phosphor rev: b737ffb23aff232b2ce212ad54171afe7b216a71) Change-Id: I3d799b5cd9e66c9bc1a4d145274bfa3c06bdf575 Signed-off-by: Andrew Geissler --- .../aspeed-layer/recipes-kernel/linux/linux-aspeed_%.bbappend | 9 +++------ .../recipes-kernel/linux/linux-nuvoton_%.bbappend | 10 +++------- 2 files changed, 6 insertions(+), 13 deletions(-) (limited to 'meta-phosphor/aspeed-layer/recipes-kernel/linux/linux-aspeed_%.bbappend') diff --git a/meta-phosphor/aspeed-layer/recipes-kernel/linux/linux-aspeed_%.bbappend b/meta-phosphor/aspeed-layer/recipes-kernel/linux/linux-aspeed_%.bbappend index 6acd6a6e1..8dd381e31 100644 --- a/meta-phosphor/aspeed-layer/recipes-kernel/linux/linux-aspeed_%.bbappend +++ b/meta-phosphor/aspeed-layer/recipes-kernel/linux/linux-aspeed_%.bbappend @@ -10,9 +10,6 @@ SRC_URI += "file://phosphor-wdt-on-panic.cfg" KERNEL_FEATURES_append = " phosphor-vlan" KERNEL_FEATURES_remove_qemuall = " phosphor-vlan" -python () { - # OpenBMC loads in kernel features via other mechanisms so this check - # in the kernel-yocto.bbclass is not required - d.setVar("KERNEL_DANGLING_FEATURES_WARN_ONLY","1") -} - +# OpenBMC loads in kernel features via other mechanisms so this check +# in the kernel-yocto.bbclass is not required +KERNEL_DANGLING_FEATURES_WARN_ONLY="1" diff --git a/meta-phosphor/nuvoton-layer/recipes-kernel/linux/linux-nuvoton_%.bbappend b/meta-phosphor/nuvoton-layer/recipes-kernel/linux/linux-nuvoton_%.bbappend index 88b386018..3d0bbb7f3 100644 --- a/meta-phosphor/nuvoton-layer/recipes-kernel/linux/linux-nuvoton_%.bbappend +++ b/meta-phosphor/nuvoton-layer/recipes-kernel/linux/linux-nuvoton_%.bbappend @@ -3,10 +3,6 @@ FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" SRC_URI += "file://phosphor-gpio-keys.scc" SRC_URI += "file://phosphor-gpio-keys.cfg" - -python () { - # OpenBMC loads in kernel features via other mechanisms so this check - # in the kernel-yocto.bbclass is not required - d.setVar("KERNEL_DANGLING_FEATURES_WARN_ONLY","1") -} - +# OpenBMC loads in kernel features via other mechanisms so this check +# in the kernel-yocto.bbclass is not required +KERNEL_DANGLING_FEATURES_WARN_ONLY="1" -- cgit v1.2.3 From 657291878ae43f327a423ab2b3fb6235cd1f81d3 Mon Sep 17 00:00:00 2001 From: Andrew Geissler Date: Fri, 16 Oct 2020 12:45:39 -0500 Subject: wdt-on-panic: remove overrides from meta-phosphor If these are needed, they really should be done within the meta-aspeed layer. This was originally done to allow the BMC hardware watchdogs to control the reboot of the BMC in error scenarios vs. the kernel auto rebooting itself. This is causing issues on AST2600 hardware because the watchdogs are not setup correctly. Kernel panics result in the BMC becoming unusable and not rebooting, requiring a manual power cycle. The goal with letting the hardware watchdogs control the reboot was that fancy things like flash side switches could be performed for recovery scenarios. However the end to end software stack for this was never fully implemented so if a flash side switch did occur, there would be no notice to the user of the system, and in most cases the BMC was still inoperable because the network settings were missing. For now, we should just go back to the defaults built into the meta-aspeed layer which is to panic on oops and have the kernel immediately reboot the BMC when a panic occurs. Once we iron out the watchdog usage, we can look into changing these back in the meta-aspeed layer if needed. (From meta-phosphor rev: 7777a8eda2b4909f34605476813e1e364b0d5728) Change-Id: I18a15a7769b27d6dd577bcc4e35cc9f60c4d3240 Signed-off-by: Andrew Geissler --- .../recipes-kernel/linux/linux-aspeed/phosphor-wdt-on-panic.cfg | 2 -- .../recipes-kernel/linux/linux-aspeed/phosphor-wdt-on-panic.scc | 2 -- meta-phosphor/aspeed-layer/recipes-kernel/linux/linux-aspeed_%.bbappend | 2 -- 3 files changed, 6 deletions(-) delete mode 100644 meta-phosphor/aspeed-layer/recipes-kernel/linux/linux-aspeed/phosphor-wdt-on-panic.cfg delete mode 100644 meta-phosphor/aspeed-layer/recipes-kernel/linux/linux-aspeed/phosphor-wdt-on-panic.scc (limited to 'meta-phosphor/aspeed-layer/recipes-kernel/linux/linux-aspeed_%.bbappend') diff --git a/meta-phosphor/aspeed-layer/recipes-kernel/linux/linux-aspeed/phosphor-wdt-on-panic.cfg b/meta-phosphor/aspeed-layer/recipes-kernel/linux/linux-aspeed/phosphor-wdt-on-panic.cfg deleted file mode 100644 index 329b4df4b..000000000 --- a/meta-phosphor/aspeed-layer/recipes-kernel/linux/linux-aspeed/phosphor-wdt-on-panic.cfg +++ /dev/null @@ -1,2 +0,0 @@ -CONFIG_PANIC_ON_OOPS=y -CONFIG_PANIC_TIMEOUT=0 diff --git a/meta-phosphor/aspeed-layer/recipes-kernel/linux/linux-aspeed/phosphor-wdt-on-panic.scc b/meta-phosphor/aspeed-layer/recipes-kernel/linux/linux-aspeed/phosphor-wdt-on-panic.scc deleted file mode 100644 index 7fc650799..000000000 --- a/meta-phosphor/aspeed-layer/recipes-kernel/linux/linux-aspeed/phosphor-wdt-on-panic.scc +++ /dev/null @@ -1,2 +0,0 @@ -define KFEATURE_DESCRIPTION "Require watchdog to reset SoC on panic" -kconf non-hardware phosphor-wdt-on-panic.cfg diff --git a/meta-phosphor/aspeed-layer/recipes-kernel/linux/linux-aspeed_%.bbappend b/meta-phosphor/aspeed-layer/recipes-kernel/linux/linux-aspeed_%.bbappend index 8dd381e31..7401a1895 100644 --- a/meta-phosphor/aspeed-layer/recipes-kernel/linux/linux-aspeed_%.bbappend +++ b/meta-phosphor/aspeed-layer/recipes-kernel/linux/linux-aspeed_%.bbappend @@ -4,8 +4,6 @@ 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" KERNEL_FEATURES_append = " phosphor-vlan" KERNEL_FEATURES_remove_qemuall = " phosphor-vlan" -- cgit v1.2.3