warm-reboot: stop instr and cfam reset
Install the new stop instructions and cfam reset services required for a
warm reboot into the appropriate target
Includes following in bump:
Andrew Geissler (4):
warm-reboot: ensure sbe start bit is 0
warm reboot: stop instructions support
warm-reboot: add cfam-reset capabilities
warm-reboot: cfam-reset service
(From meta-openpower rev: 84962a9850f8f7b61698134ecf2d016a9b1e33de)
Signed-off-by: Andrew Geissler <geissonator@yahoo.com>
Change-Id: Ia8fe30f160e0078bbdca2bcef322c9e23ea0e9e0
Signed-off-by: Andrew Geissler <geissonator@yahoo.com>
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
new file mode 100644
index 0000000..cd4f63b
--- /dev/null
+++ b/meta-openpower/recipes-phosphor/host/op-proc-control-systemd-links.bb
@@ -0,0 +1,32 @@
+SUMMARY = "OpenPOWER processor control services installation"
+PR = "r1"
+
+LICENSE = "Apache-2.0"
+LIC_FILES_CHKSUM = "file://${COREBASE}/meta/files/common-licenses/Apache-2.0;md5=89aea4e17d99a7cacdbeed46a0096b10"
+
+inherit allarch
+
+RDEPENDS_${PN} += "op-proc-control"
+RDEPENDS_${PN} += "phosphor-state-manager-obmc-targets"
+
+ALLOW_EMPTY_${PN} = "1"
+
+pkg_postinst_${PN}() {
+ mkdir -p $D$systemd_system_unitdir/obmc-host-stop@0.target.requires
+ mkdir -p $D$systemd_system_unitdir/obmc-host-force-warm-reboot@0.target.requires
+
+ LINK="$D$systemd_system_unitdir/obmc-host-stop@0.target.requires/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"
+ TARGET="../op-cfam-reset.service"
+ ln -s $TARGET $LINK
+}
+
+pkg_prerm_${PN}() {
+ LINK="$D$systemd_system_unitdir/obmc-host-stop@0.target.requires/op-stop-instructions@0.service"
+ rm $LINK
+ LINK="$D$systemd_system_unitdir/obmc-host-force-warm-reboot@0.target.requires/op-cfam-reset.service"
+ rm $LINK
+}
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 1e6aa03..7d38be4 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 systemd
SRC_URI += "git://github.com/openbmc/openpower-proc-control"
-SRCREV = "a5311abddaa057a50b492c839b310f968a7e270f"
+SRCREV = "a007668ac9a4c0cf0ca4bd50f86159822341c3cc"
DEPENDS += " \
autoconf-archive-native \
@@ -31,4 +31,6 @@
SYSTEMD_SERVICE_${PN} += " \
xyz.openbmc_project.Control.Host.NMI.service \
+ op-stop-instructions@.service \
+ op-cfam-reset.service \
"
diff --git a/meta-openpower/recipes-phosphor/host/p9-host-start.bb b/meta-openpower/recipes-phosphor/host/p9-host-start.bb
index 3743598..6905f34 100644
--- a/meta-openpower/recipes-phosphor/host/p9-host-start.bb
+++ b/meta-openpower/recipes-phosphor/host/p9-host-start.bb
@@ -11,7 +11,9 @@
PROVIDES += 'virtual/obmc-host-ctl'
RPROVIDES_${PN} += 'virtual-obmc-host-ctl'
-RDEPENDS_${PN} += "p9-vcs-workaround op-proc-control"
+RDEPENDS_${PN} += "p9-vcs-workaround \
+ op-proc-control \
+ op-proc-control-systemd-links"
S = "${WORKDIR}"