summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrew Geissler <openbmcbump-github@yahoo.com>2022-07-06 22:51:03 +0300
committerAndrew Geissler <andrew@geissonator.com>2022-07-14 21:40:33 +0300
commite0ba7fb831e558bdeae8e79e889e33a361eed538 (patch)
treec2beed8a7c22d587a1f9b74390b91cba2a48c748
parent4e8400d6d9de722679fa9f1f57024e40eb4444d0 (diff)
downloadopenbmc-e0ba7fb831e558bdeae8e79e889e33a361eed538.tar.xz
phosphor-state-manager: srcrev bump 1e91dc6357..b4cbfac10b
Corey-Hardesty (1): Host reboot configuration support Corey-Hardesty (1): Define new 'obmc-chassis-blackout@.target' "obmc-chassis-blackout@.target" was added to ensure the system can recognize when it has entered a blackout state. This target is to be called from chassis-state-manager when determining the initial state of the chassis and finds that it experienced a power blackout. Chassis-state-manager does this by checking the status of the pgood pin along with the last known power state of the system to determine if the target should be applied. If the last known power state was "powered on" and the pgood pin is false, the chassis experienced a blackout. To accommodate for any discrepencies across the systemd services and targets may be added such as resetting host-state-sensors or powering off leds to ensure the system stays in a predictable state. Change-Id: I0832cd6300e9a1742c9ec2a9c5f68890b4e11918 Signed-off-by: Andrew Geissler <openbmcbump-github@yahoo.com> Signed-off-by: Corey Hardesty <corey.hardesty@icloud.com>
-rw-r--r--meta-phosphor/recipes-phosphor/state/phosphor-state-manager-systemd-links.inc1
-rw-r--r--meta-phosphor/recipes-phosphor/state/phosphor-state-manager_git.bb5
2 files changed, 4 insertions, 2 deletions
diff --git a/meta-phosphor/recipes-phosphor/state/phosphor-state-manager-systemd-links.inc b/meta-phosphor/recipes-phosphor/state/phosphor-state-manager-systemd-links.inc
index 2a3f04429b..2a5bfda50f 100644
--- a/meta-phosphor/recipes-phosphor/state/phosphor-state-manager-systemd-links.inc
+++ b/meta-phosphor/recipes-phosphor/state/phosphor-state-manager-systemd-links.inc
@@ -19,6 +19,7 @@ DEFAULT_TARGETS = " \
obmc-host-force-warm-reboot@{}.target.requires/phosphor-reboot-host@{}.service \
obmc-host-warm-reboot@{}.target.requires/obmc-host-force-warm-reboot@{}.target \
obmc-chassis-poweroff@{}.target.wants/phosphor-clear-one-time@{}.service \
+ obmc-chassis-blackout@{}.target.wants/phosphor-reset-sensor-states@{}.service \
"
# TODO: There are some targets that are chassis oriented, but there is no
diff --git a/meta-phosphor/recipes-phosphor/state/phosphor-state-manager_git.bb b/meta-phosphor/recipes-phosphor/state/phosphor-state-manager_git.bb
index 0d70f88e1a..aad7c821e6 100644
--- a/meta-phosphor/recipes-phosphor/state/phosphor-state-manager_git.bb
+++ b/meta-phosphor/recipes-phosphor/state/phosphor-state-manager_git.bb
@@ -123,7 +123,8 @@ CHASSIS_SYNCH_TARGETS = "start-pre start on stop-pre stop off reset-on"
# - powered-off: Services to run once chassis power is off
# - reset: Services to check chassis power state and update chassis "on" target
# - hard-off: Services to force an immediate power off of the chassis
-CHASSIS_ACTION_TARGETS = "poweron poweroff powered-off powerreset hard-poweroff"
+# - blackout: Target to enter when chassis experiences blackout
+CHASSIS_ACTION_TARGETS = "poweron poweroff powered-off powerreset hard-poweroff blackout"
# Track all host synchronization point targets
# - start-pre: Services to run before we start host boot
@@ -198,6 +199,6 @@ SYSTEMD_LINK:${PN}-obmc-targets += "${@compose_list(d, 'QUIESCE_FMT', 'HOST_ERRO
SRC_URI += "git://github.com/openbmc/phosphor-state-manager;branch=master;protocol=https"
-SRCREV = "1e91dc63570d03c2c239acaa3db0965f210bd98f"
+SRCREV = "b4cbfac10b490cd2a8ca83bfd139fe07bf1fe5a7"
S = "${WORKDIR}/git"