diff options
| author | Andrew Geissler <geissonator@yahoo.com> | 2020-04-14 23:08:43 +0300 |
|---|---|---|
| committer | Andrew Geissler <geissonator@yahoo.com> | 2020-04-21 19:46:11 +0300 |
| commit | f95063e21a8db116ccb1eb13dc5afcd82383dd04 (patch) | |
| tree | e5588a029557056f54ebf61196ef1bdeff09a02b | |
| parent | 8bf3d5b6610c5b0b0519b177464abae440a94a29 (diff) | |
| download | openbmc-f95063e21a8db116ccb1eb13dc5afcd82383dd04.tar.xz | |
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
(From meta-openpower rev: fd9969e4221c321d2807c86b16e6fbafac8e3d8b)
Signed-off-by: Andrew Geissler <geissonator@yahoo.com>
Change-Id: If6dc939015dc1647773d20e3909ae2d718512a73
Signed-off-by: Andrew Geissler <geissonator@yahoo.com>
| -rw-r--r-- | meta-openpower/recipes-phosphor/host/op-proc-control-systemd-links.bb | 11 | ||||
| -rw-r--r-- | meta-openpower/recipes-phosphor/host/op-proc-control_git.bb | 2 |
2 files changed, 10 insertions, 3 deletions
diff --git a/meta-openpower/recipes-phosphor/host/op-proc-control-systemd-links.bb b/meta-openpower/recipes-phosphor/host/op-proc-control-systemd-links.bb index 46fdbbcb9..9cb75f33e 100644 --- a/meta-openpower/recipes-phosphor/host/op-proc-control-systemd-links.bb +++ b/meta-openpower/recipes-phosphor/host/op-proc-control-systemd-links.bb @@ -16,12 +16,17 @@ pkg_postinst_${PN}() { 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_postinst_${PN}() { 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/meta-openpower/recipes-phosphor/host/op-proc-control_git.bb b/meta-openpower/recipes-phosphor/host/op-proc-control_git.bb index 91fb65d53..6451d7c20 100644 --- a/meta-openpower/recipes-phosphor/host/op-proc-control_git.bb +++ b/meta-openpower/recipes-phosphor/host/op-proc-control_git.bb @@ -11,7 +11,7 @@ inherit autotools obmc-phosphor-utils pkgconfig inherit systemd SRC_URI += "git://github.com/openbmc/openpower-proc-control" -SRCREV = "a21ed1217c686cd6a4e2d63ff99cd0c6a11c0427" +SRCREV = "67aebf98094264cf3bdd189b70ec91db4e3ee804" DEPENDS += " \ autoconf-archive-native \ |