cfam-reset: ensure reset run on all boots
The corresponding change in openpower-proc-control has more details:
https://gerrit.openbmc-project.xyz/c/openbmc/openpower-proc-control/+/31265
The summary is that the cfam-reset is being removed from the power
control application and into its own service. This ensure it is run when
it is needed (i.e. warm reboots) and that future systems which may use
different power control or have different cfam reset requirements can
easily configure the function.
Tested:
- Verified chassison behaved as expected on witherspoon
- Verified normal power on/off works as expected on witherspoon
- Verified warm reboot works as expected on witherspoon
- Verified bmc reset with host up still works as expected
Signed-off-by: Andrew Geissler <geissonator@yahoo.com>
Change-Id: I8f10c5160f33430b074aa9a302440d4c7196d6c4
diff --git a/recipes-phosphor/host/op-proc-control-systemd-links.bb b/recipes-phosphor/host/op-proc-control-systemd-links.bb
index 46fdbbc..9cb75f3 100644
--- a/recipes-phosphor/host/op-proc-control-systemd-links.bb
+++ b/recipes-phosphor/host/op-proc-control-systemd-links.bb
@@ -16,12 +16,17 @@
mkdir -p $D$systemd_system_unitdir/obmc-host-force-warm-reboot@0.target.requires
mkdir -p $D$systemd_system_unitdir/obmc-host-startmin@0.target.requires
mkdir -p $D$systemd_system_unitdir/obmc-host-diagnostic-mode@0.target.requires
+ mkdir -p $D$systemd_system_unitdir/obmc-chassis-poweron@0.target.requires
LINK="$D$systemd_system_unitdir/obmc-host-stop@0.target.wants/op-stop-instructions@0.service"
TARGET="../op-stop-instructions@.service"
ln -s $TARGET $LINK
- LINK="$D$systemd_system_unitdir/obmc-host-force-warm-reboot@0.target.requires/op-cfam-reset.service"
+ LINK="$D$systemd_system_unitdir/obmc-host-startmin@0.target.requires/op-cfam-reset.service"
+ TARGET="../op-cfam-reset.service"
+ ln -s $TARGET $LINK
+
+ LINK="$D$systemd_system_unitdir/obmc-chassis-poweron@0.target.requires/op-cfam-reset.service"
TARGET="../op-cfam-reset.service"
ln -s $TARGET $LINK
@@ -45,7 +50,9 @@
pkg_prerm_${PN}() {
LINK="$D$systemd_system_unitdir/obmc-host-stop@0.target.wants/op-stop-instructions@0.service"
rm $LINK
- LINK="$D$systemd_system_unitdir/obmc-host-force-warm-reboot@0.target.requires/op-cfam-reset.service"
+ LINK="$D$systemd_system_unitdir/obmc-host-startmin@0.target.requires/op-cfam-reset.service"
+ rm $LINK
+ LINK="$D$systemd_system_unitdir/obmc-chassis-poweron@0.target.requires/op-cfam-reset.service"
rm $LINK
# Only uninstall cfam override if p9 system
if [ "${@bb.utils.contains("MACHINE_FEATURES", "p9-cfam-override", "True", "False", d)}" = True ]; then
diff --git a/recipes-phosphor/host/op-proc-control_git.bb b/recipes-phosphor/host/op-proc-control_git.bb
index 91fb65d..6451d7c 100644
--- a/recipes-phosphor/host/op-proc-control_git.bb
+++ b/recipes-phosphor/host/op-proc-control_git.bb
@@ -11,7 +11,7 @@
inherit systemd
SRC_URI += "git://github.com/openbmc/openpower-proc-control"
-SRCREV = "a21ed1217c686cd6a4e2d63ff99cd0c6a11c0427"
+SRCREV = "67aebf98094264cf3bdd189b70ec91db4e3ee804"
DEPENDS += " \
autoconf-archive-native \