From ce5655be5f5f2d49a90ffc7ec4fcc82b697ec2d9 Mon Sep 17 00:00:00 2001 From: Nikita Kosenkov Date: Tue, 14 Jun 2022 15:15:24 +0300 Subject: Revert "x86-power-control: added check BMC restart cause for AlwaysOn policy" This reverts commit c29cccddde306c9d7d06eec7bf2f14058820e061, reversing changes made to 77997ff4ed369387c85847dc2420af321af2ac24. --- .../0002-Add-system-reset-status-support.patch | 210 --------------------- .../recipes-bsp/u-boot/u-boot-aspeed_%.bbappend | 1 - ...ontrol-added-check-BMC-restart-cause-for-.patch | 118 ------------ .../chassis/x86-power-control_%.bbappend | 1 - 4 files changed, 330 deletions(-) delete mode 100644 meta-ibs/meta-ast2500/recipes-bsp/u-boot/files/0002-Add-system-reset-status-support.patch delete mode 100644 meta-ibs/meta-cp2-5422/recipes-x86/chassis/x86-power-control/0001-x86-power-control-added-check-BMC-restart-cause-for-.patch (limited to 'meta-ibs') diff --git a/meta-ibs/meta-ast2500/recipes-bsp/u-boot/files/0002-Add-system-reset-status-support.patch b/meta-ibs/meta-ast2500/recipes-bsp/u-boot/files/0002-Add-system-reset-status-support.patch deleted file mode 100644 index d1cc9d9a67..0000000000 --- a/meta-ibs/meta-ast2500/recipes-bsp/u-boot/files/0002-Add-system-reset-status-support.patch +++ /dev/null @@ -1,210 +0,0 @@ -From 1c5b450a068583f2407767451ef636d0661071da Mon Sep 17 00:00:00 2001 -From: Alexander Filippov -Date: Tue, 7 Apr 2020 16:45:41 +0300 -Subject: [PATCH] Add system reset status support - -This is backport of patch file from intel-bmc/openbmc repository. - https://github.com/Intel-BMC/openbmc/blob/intel/meta-openbmc-mods/meta-common/recipes-bsp/u-boot/files/0020-Add-system-reset-status-support.patch - -Will display the reset reasons in u-boot, -and save the reset reasons into kernel command line, -for applications to query. - -Signed-off-by: Alexander Filippov ---- - arch/arm/include/asm/arch-aspeed/ast_scu.h | 2 +- - arch/arm/include/asm/arch-aspeed/platform.h | 2 + - arch/arm/mach-aspeed/Makefile | 1 + - arch/arm/mach-aspeed/ast-late-init.c | 114 ++++++++++++++++++++ - arch/arm/mach-aspeed/ast-scu.c | 6 +- - 5 files changed, 123 insertions(+), 2 deletions(-) - create mode 100644 arch/arm/mach-aspeed/ast-late-init.c - -diff --git a/arch/arm/include/asm/arch-aspeed/ast_scu.h b/arch/arm/include/asm/arch-aspeed/ast_scu.h -index dcbc6730d4..b428f386d6 100644 ---- a/arch/arm/include/asm/arch-aspeed/ast_scu.h -+++ b/arch/arm/include/asm/arch-aspeed/ast_scu.h -@@ -29,7 +29,7 @@ - #define __AST_SCU_H - - extern void ast_scu_show_system_info (void); --extern void ast_scu_sys_rest_info(void); -+extern u32 ast_scu_sys_rest_info(void); - extern void ast_scu_security_info(void); - extern u32 ast_scu_revision_id(void); - extern u32 ast_scu_get_vga_memsize(void); -diff --git a/arch/arm/include/asm/arch-aspeed/platform.h b/arch/arm/include/asm/arch-aspeed/platform.h -index 1c02914fcb..b9207c492f 100644 ---- a/arch/arm/include/asm/arch-aspeed/platform.h -+++ b/arch/arm/include/asm/arch-aspeed/platform.h -@@ -31,4 +31,6 @@ - #err "No define for platform.h" - #endif - -+#define CONFIG_BOARD_LATE_INIT 1 /* Call board_late_init */ -+ - #endif -diff --git a/arch/arm/mach-aspeed/Makefile b/arch/arm/mach-aspeed/Makefile -index 7d8930beb9..4af2a7c96a 100644 ---- a/arch/arm/mach-aspeed/Makefile -+++ b/arch/arm/mach-aspeed/Makefile -@@ -15,3 +15,4 @@ obj-y += timer.o reset.o cpuinfo.o ast-scu.o ast-ahbc.o ast-sdmc.o - obj-$(CONFIG_AST_SPI_NOR) += flash.o - obj-$(CONFIG_ARCH_AST2500) += platform_g5.o - obj-$(CONFIG_ARCH_AST2400) += platform_g4.o -+obj-$(CONFIG_BOARD_LATE_INIT) += ast-late-init.o -diff --git a/arch/arm/mach-aspeed/ast-late-init.c b/arch/arm/mach-aspeed/ast-late-init.c -new file mode 100644 -index 0000000000..5646c0e882 ---- /dev/null -+++ b/arch/arm/mach-aspeed/ast-late-init.c -@@ -0,0 +1,114 @@ -+/* -+ * SPDX-License-Identifier: Apache-2.0 -+ * Copyright (C) 2020 YADRO. -+ */ -+ -+#include -+ -+#include -+#include -+#include -+ -+static void update_bootargs_cmd(const char *key, const char *value) -+{ -+ int buf_len; -+ char *buf; -+ char *cmdline; -+ char *end = NULL; -+ -+ if (!key || (key[0] == '\0')) -+ { -+ printf("%s: Empty key not allowed\n", __func__); -+ return; -+ } -+ -+ cmdline = getenv("bootargs"); -+ -+ /* Allocate space for maximum possible new command line */ -+ buf_len = (cmdline ? strlen(cmdline) : 0) -+ + 1 /* spacebar as delimiter */ -+ + strlen(key) -+ + (value ? 1 /* equal sign */ + strlen(value) : 0) -+ + 1 /* terminating null */; -+ -+ buf = calloc(buf_len, sizeof(char)); -+ if (!buf) -+ { -+ printf("%s: out of memory\n", __func__); -+ return; -+ } -+ -+ if (cmdline) -+ { -+ char *start = strstr(cmdline, key); -+ -+ /* Check for full word match. Match should be start of cmdline -+ * or there should be space before match */ -+ if (start && ((start == cmdline) || (*(start - 1) == ' '))) -+ { -+ strncat(buf, cmdline, (start - cmdline)); -+ -+ /* Find the end of the keyword[=value] pair, -+ * including a single training space character, if any. -+ * Skip the found substring, mark the tail of cmdline. -+ */ -+ end = strchr(start, ' '); -+ if (end) -+ { -+ end++; -+ } -+ } -+ else -+ { -+ strcat(buf, cmdline); -+ strcat(buf, " "); -+ } -+ } -+ -+ strcat(buf, key); -+ if (value) -+ { -+ strcat(buf, "="); -+ strcat(buf, value); -+ } -+ -+ if (end) -+ { -+ strcat(buf, " "); -+ strcat(buf, end); -+ } -+ -+ setenv("bootargs", buf); -+ free(buf); -+} -+ -+static void set_reset_reason(void) -+{ -+ u32 reset_reason = ast_scu_sys_rest_info(); -+ -+ if (reset_reason & SCU_SYS_EXT_RESET_FLAG) -+ { -+ update_bootargs_cmd("resetreason", "external"); -+ } -+ else if (reset_reason & SCU_SYS_WDT_RESET_FLAG) -+ { -+ update_bootargs_cmd("resetreason", "watchdog"); -+ } -+ else if (reset_reason & SCU_SYS_PWR_RESET_FLAG) -+ { -+ update_bootargs_cmd("resetreason", "power"); -+ } -+ else -+ { -+ char value[32]; -+ snprintf(value, sizeof(value) - 1, "0x%x", reset_reason); -+ update_bootargs_cmd("resetreason", value); -+ } -+} -+ -+int board_late_init(void) -+{ -+ set_reset_reason(); -+ -+ return 0; -+} -diff --git a/arch/arm/mach-aspeed/ast-scu.c b/arch/arm/mach-aspeed/ast-scu.c -index 12de9b8036..5afd3793e3 100644 ---- a/arch/arm/mach-aspeed/ast-scu.c -+++ b/arch/arm/mach-aspeed/ast-scu.c -@@ -482,22 +482,26 @@ void ast_scu_security_info(void) - } - } - --void ast_scu_sys_rest_info(void) -+u32 ast_scu_sys_rest_info(void) - { - u32 rest = ast_scu_read(AST_SCU_SYS_CTRL); - - if (rest & SCU_SYS_EXT_RESET_FLAG) { - printf("RST : External\n"); - ast_scu_write(SCU_SYS_EXT_RESET_FLAG, AST_SCU_SYS_CTRL); -+ rest = SCU_SYS_EXT_RESET_FLAG; - } else if (rest & SCU_SYS_WDT_RESET_FLAG) { - printf("RST : Watchdog\n"); - ast_scu_write(SCU_SYS_WDT_RESET_FLAG, AST_SCU_SYS_CTRL); -+ rest = SCU_SYS_WDT_RESET_FLAG; - } else if (rest & SCU_SYS_PWR_RESET_FLAG) { - printf("RST : Power On\n"); - ast_scu_write(SCU_SYS_PWR_RESET_FLAG, AST_SCU_SYS_CTRL); -+ rest = SCU_SYS_PWR_RESET_FLAG; - } else { - printf("RST : CLK en\n"); - } -+ return rest; - } - - u32 ast_scu_get_vga_memsize(void) --- -2.25.4 - diff --git a/meta-ibs/meta-ast2500/recipes-bsp/u-boot/u-boot-aspeed_%.bbappend b/meta-ibs/meta-ast2500/recipes-bsp/u-boot/u-boot-aspeed_%.bbappend index 65f41c15a6..b053ea2c55 100644 --- a/meta-ibs/meta-ast2500/recipes-bsp/u-boot/u-boot-aspeed_%.bbappend +++ b/meta-ibs/meta-ast2500/recipes-bsp/u-boot/u-boot-aspeed_%.bbappend @@ -3,5 +3,4 @@ FILESEXTRAPATHS:prepend := "${THISDIR}/files:" SRC_URI:append = " \ file://mii_enable.cfg \ file://0001-drivers-ftgmac100-use-hardware-MAC-by-default.patch \ - file://0002-Add-system-reset-status-support.patch \ " diff --git a/meta-ibs/meta-cp2-5422/recipes-x86/chassis/x86-power-control/0001-x86-power-control-added-check-BMC-restart-cause-for-.patch b/meta-ibs/meta-cp2-5422/recipes-x86/chassis/x86-power-control/0001-x86-power-control-added-check-BMC-restart-cause-for-.patch deleted file mode 100644 index 92a0da1675..0000000000 --- a/meta-ibs/meta-cp2-5422/recipes-x86/chassis/x86-power-control/0001-x86-power-control-added-check-BMC-restart-cause-for-.patch +++ /dev/null @@ -1,118 +0,0 @@ -From f49794106c6993b0a53b3b6634b44ae3d2f5cd82 Mon Sep 17 00:00:00 2001 -From: Nikita Kosenkov -Date: Thu, 9 Jun 2022 14:26:30 +0300 -Subject: [PATCH] x86-power-control: added check BMC restart cause for AlwaysOn - policy - ---- - src/power_control.cpp | 80 +++++++++++++++++++++++++++++++++++++++++-- - 1 file changed, 78 insertions(+), 2 deletions(-) - -diff --git a/src/power_control.cpp b/src/power_control.cpp -index 05aa45c..380ba7e 100644 ---- a/src/power_control.cpp -+++ b/src/power_control.cpp -@@ -31,6 +31,7 @@ - #include - #include - #include -+#include - - namespace power_control - { -@@ -857,6 +858,74 @@ void PersistentState::saveState() - appStateStream << stateData.dump(indentationSize); - } - -+enum class BMCRestartCause -+{ -+ power = 1, // After cold BMC boot -+ watchdog, // After warm BMC reboot -+ unknown // Unknown reboot cause -+}; -+ -+BMCRestartCause getBmcRestartCause() -+{ -+ // U-boot write restart cause to bootargs -+ std::string cmdlineFilePath{"/proc/cmdline"}; -+ std::ifstream cmdlineFile{cmdlineFilePath}; -+ if(!cmdlineFile.is_open()) -+ { -+ lg2::error("BMCRestartCause: cannot open {FILE}", "FILE", -+ cmdlineFilePath); -+ -+ return BMCRestartCause::unknown; -+ } -+ -+ // Read cmd line from file -+ std::stringstream cmdlineBuffer; -+ cmdlineBuffer << cmdlineFile.rdbuf(); -+ cmdlineFile.close(); -+ -+ std::string cmdline{cmdlineBuffer.str()}; -+ if(cmdline.size() == 0) -+ { -+ lg2::error("BMCRestartCause: file {FILE} is empty", "FILE", -+ cmdlineFilePath); -+ -+ return BMCRestartCause::unknown; -+ } -+ -+ // Parse cmdline with regex -+ std::smatch regexResult; -+ std::regex regexExpr("resetreason=((?:power|watchdog))"); -+ if (!std::regex_search(cmdline, regexResult, regexExpr)) -+ { -+ lg2::error("BMCRestartCause: error parse file {FILE}", "FILE", -+ cmdlineFilePath); -+ -+ return BMCRestartCause::unknown; -+ } -+ -+ // Initialize restart cause -+ BMCRestartCause bmcRestartCause = BMCRestartCause::unknown; -+ -+ if(regexResult.ready()) -+ { -+ // The second element is needed -+ // as it contains the result of the second capturing group -+ if(regexResult.str(1) == "power") -+ { -+ bmcRestartCause = BMCRestartCause::power; -+ } -+ else if (regexResult.str(1) == "watchdog") -+ { -+ bmcRestartCause = BMCRestartCause::watchdog; -+ } -+ -+ lg2::info("BmcRestartCause: current BMC restart cause={CAUSE}", "CAUSE", -+ regexResult.str(1)); -+ } -+ -+ return bmcRestartCause; -+} -+ - static constexpr char const* setingsService = "xyz.openbmc_project.Settings"; - static constexpr char const* powerRestorePolicyObject = - "/xyz/openbmc_project/control/host0/power_restore_policy"; -@@ -1083,8 +1152,15 @@ void PowerRestoreController::invoke() - if (powerRestorePolicy == - "xyz.openbmc_project.Control.Power.RestorePolicy.Policy.AlwaysOn") - { -- sendPowerControlEvent(Event::powerOnRequest); -- setRestartCauseProperty(getRestartCause(RestartCause::powerPolicyOn)); -+ // We check the reason for the BMC restart and -+ // if the BMC is after a cold boot, -+ // then start the "AlwaysOn" policy -+ if (getBmcRestartCause() == BMCRestartCause::power) -+ { -+ sendPowerControlEvent(Event::powerOnRequest); -+ setRestartCauseProperty( -+ getRestartCause(RestartCause::powerPolicyOn)); -+ } - } - else if (powerRestorePolicy == - "xyz.openbmc_project.Control.Power.RestorePolicy.Policy.Restore") --- -2.35.1 - diff --git a/meta-ibs/meta-cp2-5422/recipes-x86/chassis/x86-power-control_%.bbappend b/meta-ibs/meta-cp2-5422/recipes-x86/chassis/x86-power-control_%.bbappend index cbda0f130a..d8a4104b65 100644 --- a/meta-ibs/meta-cp2-5422/recipes-x86/chassis/x86-power-control_%.bbappend +++ b/meta-ibs/meta-cp2-5422/recipes-x86/chassis/x86-power-control_%.bbappend @@ -1,7 +1,6 @@ FILESEXTRAPATHS:prepend := "${THISDIR}/${PN}:" SRC_URI:append = " \ file://power-config-host0.json \ - file://0001-x86-power-control-added-check-BMC-restart-cause-for-.patch \ " RDEPENDS:${PN}:append = " bash" -- cgit v1.2.3