summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNikita Kosenkov <NKosenkov@IBS.RU>2022-09-30 14:46:15 +0300
committerNikita Kosenkov <NKosenkov@IBS.RU>2022-09-30 14:48:42 +0300
commit2285dd2211ad21bb7533ee655ecb260df543d38c (patch)
treea538f47cb7d2aff7af4a1575add4756688574358
parentff240127199bc546f38c640ed2bb5c5d4b3ddac6 (diff)
downloadopenbmc-2285dd2211ad21bb7533ee655ecb260df543d38c.tar.xz
SILABMC-307: x86-PC: Added transition states for immediate reset
-rw-r--r--meta-ibs/meta-cp2-5422/recipes-phosphor/sel-logger/phosphor-sel-logger_%.bbappend4
-rw-r--r--meta-ibs/meta-cp2-5422/recipes-x86/chassis/x86-power-control/0003-Added-transition-states-for-immediate-reset.patch26
-rw-r--r--meta-ibs/meta-cp2-5422/recipes-x86/chassis/x86-power-control_%.bbappend1
3 files changed, 31 insertions, 0 deletions
diff --git a/meta-ibs/meta-cp2-5422/recipes-phosphor/sel-logger/phosphor-sel-logger_%.bbappend b/meta-ibs/meta-cp2-5422/recipes-phosphor/sel-logger/phosphor-sel-logger_%.bbappend
index ca35bcb6a1..e943b7ec55 100644
--- a/meta-ibs/meta-cp2-5422/recipes-phosphor/sel-logger/phosphor-sel-logger_%.bbappend
+++ b/meta-ibs/meta-cp2-5422/recipes-phosphor/sel-logger/phosphor-sel-logger_%.bbappend
@@ -1 +1,5 @@
PACKAGECONFIG:append = " log-threshold log-pulse"
+
+EXTRA_OEMESON += "\
+ -Dlog-pulse=disabled \
+ " \ No newline at end of file
diff --git a/meta-ibs/meta-cp2-5422/recipes-x86/chassis/x86-power-control/0003-Added-transition-states-for-immediate-reset.patch b/meta-ibs/meta-cp2-5422/recipes-x86/chassis/x86-power-control/0003-Added-transition-states-for-immediate-reset.patch
new file mode 100644
index 0000000000..d6b0b8caec
--- /dev/null
+++ b/meta-ibs/meta-cp2-5422/recipes-x86/chassis/x86-power-control/0003-Added-transition-states-for-immediate-reset.patch
@@ -0,0 +1,26 @@
+From 538856c53e064ae9099cfa64719f2b0a617a9767 Mon Sep 17 00:00:00 2001
+From: Nikita Kosenkov <NKosenkov@IBS.RU>
+Date: Fri, 30 Sep 2022 10:18:10 +0300
+Subject: [PATCH] Added transition states for immediate reset
+
+---
+ src/power_control.cpp | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/src/power_control.cpp b/src/power_control.cpp
+index 690622a..6dc9075 100644
+--- a/src/power_control.cpp
++++ b/src/power_control.cpp
+@@ -1827,7 +1827,9 @@ static void powerStateOn(const Event event)
+ gracefulPowerOff();
+ break;
+ case Event::resetRequest:
++ setPowerState(PowerState::transitionToCycleOff);
+ reset();
++ setPowerState(PowerState::on);
+ break;
+ default:
+ lg2::info("No action taken.");
+--
+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 d0be09cd0e..eb6ce8e076 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
@@ -4,6 +4,7 @@ SRC_URI:append = " \
file://power-config-host0.json \
file://0001-support-host-boot-progress.patch \
file://0002-x86-power-control-added-check-BMC-restart-cause.patch \
+ file://0003-Added-transition-states-for-immediate-reset.patch \
"
RDEPENDS:${PN}:append = " bash"