Merge tag 'wht-0.47' of ssh://git-amr-1.devtools.intel.com:29418/openbmc-openbmc into update

10 files changed, 63 insertions, 12 deletions

diff --git a/meta-openpower/recipes-bsp/ecmd/files/croserver.service b/meta-openpower/recipes-bsp/ecmd/files/croserver.service
index 38d1fd2ff..79809e15d 100644
--- a/meta-openpower/recipes-bsp/ecmd/files/croserver.service
+++ b/meta-openpower/recipes-bsp/ecmd/files/croserver.service
@@ -9,4 +9,4 @@ ExecStart=/usr/bin/croserver
 Restart=on-failure
 ProtectHome=yes
 ProtectSystem=full
-RestrictAddressFamilies=AF_UNIX
+RestrictAddressFamilies=AF_INET AF_INET6
diff --git a/meta-openpower/recipes-phosphor/flash/openpower-software-manager_git.bb b/meta-openpower/recipes-phosphor/flash/openpower-software-manager_git.bb
index 4be44e57f..9c71a1e7c 100644
--- a/meta-openpower/recipes-phosphor/flash/openpower-software-manager_git.bb
+++ b/meta-openpower/recipes-phosphor/flash/openpower-software-manager_git.bb
@@ -44,7 +44,7 @@ S = "${WORKDIR}/git"
 
 SRC_URI += "git://github.com/openbmc/openpower-pnor-code-mgmt"
 
-SRCREV = "647d6134d448178e6b32892322596a5cc3d78b2d"
+SRCREV = "7f1967d56b89ffae5ea8e3313c000beb79cb63cd"
 
 DBUS_SERVICE_${PN} += "org.open_power.Software.Host.Updater.service"
 
diff --git a/meta-openpower/recipes-phosphor/host/op-host-control/cfam_override@.service b/meta-openpower/recipes-phosphor/host/op-host-control/cfam_override@.service
index e6bc9389c..8b773ec38 100644
--- a/meta-openpower/recipes-phosphor/host/op-host-control/cfam_override@.service
+++ b/meta-openpower/recipes-phosphor/host/op-host-control/cfam_override@.service
@@ -7,6 +7,7 @@ After=obmc-power-on@%i.target
 Wants=fsi-scan@%i.service
 After=fsi-scan@%i.service
 Conflicts=obmc-chassis-poweroff@%i.target
+Conflicts=obmc-host-stop@%i.target
 ConditionPathExists=!/run/openbmc/chassis@%i-on
 ConditionPathExists=/var/lib/obmc/cfam_overrides
 
@@ -18,3 +19,4 @@ RemainAfterExit=yes
 
 [Install]
 WantedBy=obmc-chassis-poweron@%i.target
+WantedBy=obmc-host-startmin@%i.target
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 000000000..b8105fc8d
--- /dev/null
+++ b/meta-openpower/recipes-phosphor/host/op-proc-control-systemd-links.bb
@@ -0,0 +1,45 @@
+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
+
+	# Only install cfam override if p9 system
+	if [ "${@bb.utils.contains("MACHINE_FEATURES", "p9-cfam-override", "True", "False", d)}" = True ]; then
+		mkdir -p $D$systemd_system_unitdir/obmc-host-startmin@0.target.requires
+		LINK="$D$systemd_system_unitdir/obmc-host-startmin@0.target.requires/cfam_override@0.service"
+		TARGET="../cfam_override@.service"
+		ln -s $TARGET $LINK
+	fi
+}
+
+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
+	# Only uninstall cfam override if p9 system
+	if [ "${@bb.utils.contains("MACHINE_FEATURES", "p9-cfam-override", "True", "False", d)}" = True ]; then
+		LINK="$D$systemd_system_unitdir/obmc-host-startmin@0.target.requires/cfam_override@0.service"
+		rm $LINK
+	fi
+}
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 d765b504d..9f17aa243 100644
--- a/meta-openpower/recipes-phosphor/host/op-proc-control_git.bb
+++ b/meta-openpower/recipes-phosphor/host/op-proc-control_git.bb
@@ -7,17 +7,16 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=e3fc50a88d0a364313df4b21ef20c29e"
 
 S = "${WORKDIR}/git"
 
-inherit autotools obmc-phosphor-utils pkgconfig pythonnative
+inherit autotools obmc-phosphor-utils pkgconfig
 inherit systemd
 
 SRC_URI += "git://github.com/openbmc/openpower-proc-control"
-SRCREV = "a5311abddaa057a50b492c839b310f968a7e270f"
+SRCREV = "7847960506ca4357e267fe05866b38aad236708f"
 
 DEPENDS += " \
         autoconf-archive-native \
         phosphor-logging \
         phosphor-dbus-interfaces \
-        openpower-dbus-interfaces \
         libgpiod \
         "
 
@@ -32,4 +31,6 @@ SYSTEMD_SERVICE_${PN} = "${TEMPLATE} ${INSTANCES}"
 
 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 374359838..6905f34aa 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 @@ FILESEXTRAPATHS_prepend := "${THISDIR}/op-host-control:"
 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}"
 
diff --git a/meta-openpower/recipes-phosphor/logging/phosphor-logging_%.bbappend b/meta-openpower/recipes-phosphor/logging/phosphor-logging_%.bbappend
index e5de414f7..c128cfe15 100644
--- a/meta-openpower/recipes-phosphor/logging/phosphor-logging_%.bbappend
+++ b/meta-openpower/recipes-phosphor/logging/phosphor-logging_%.bbappend
@@ -1,5 +1,4 @@
 DEPENDS_append_df-openpower = " \
         openpower-debug-collector-native \
-        openpower-dbus-interfaces-native \
         openpower-occ-control-native \
         "
diff --git a/meta-openpower/recipes-phosphor/occ/openpower-occ-control.inc b/meta-openpower/recipes-phosphor/occ/openpower-occ-control.inc
index f74026379..0445bd027 100644
--- a/meta-openpower/recipes-phosphor/occ/openpower-occ-control.inc
+++ b/meta-openpower/recipes-phosphor/occ/openpower-occ-control.inc
@@ -2,4 +2,4 @@ HOMEPAGE = "https://github.com/openbmc/openpower-occ-control"
 LICENSE = "Apache-2.0"
 LIC_FILES_CHKSUM = "file://LICENSE;md5=e3fc50a88d0a364313df4b21ef20c29e"
 SRC_URI += "git://github.com/openbmc/openpower-occ-control"
-SRCREV = "5ebf803cf6b2bee06b76c6638daecdcd50a3a70e"
+SRCREV = "65f8cd379d2aa0078352714f9a6bb513cc5e7b17"
diff --git a/meta-openpower/recipes-phosphor/occ/openpower-occ-control_git.bb b/meta-openpower/recipes-phosphor/occ/openpower-occ-control_git.bb
index 33ebb4676..aaab247f7 100644
--- a/meta-openpower/recipes-phosphor/occ/openpower-occ-control_git.bb
+++ b/meta-openpower/recipes-phosphor/occ/openpower-occ-control_git.bb
@@ -7,7 +7,7 @@ PV = "1.0+git${SRCPV}"
 inherit autotools \
         pkgconfig \
         obmc-phosphor-dbus-service \
-        pythonnative \
+        python3native \
         phosphor-dbus-yaml
 
 require ${PN}.inc
@@ -28,11 +28,13 @@ DEPENDS += " \
         sdbusplus \
         sdbusplus-native \
         phosphor-logging \
-        openpower-dbus-interfaces \
         phosphor-dbus-interfaces \
-        openpower-dbus-interfaces-native \
         autoconf-archive-native \
         systemd \
+        ${PYTHON_PN}-native \
+        ${PYTHON_PN}-pyyaml-native \
+        ${PYTHON_PN}-setuptools-native \
+        ${PYTHON_PN}-mako-native \
         "
 
 RDEPENDS_${PN} += "phosphor-state-manager-obmc-targets"
diff --git a/meta-openpower/recipes-phosphor/vpd/openpower-fru-vpd.inc b/meta-openpower/recipes-phosphor/vpd/openpower-fru-vpd.inc
index 80fb65fbc..a65c9162e 100644
--- a/meta-openpower/recipes-phosphor/vpd/openpower-fru-vpd.inc
+++ b/meta-openpower/recipes-phosphor/vpd/openpower-fru-vpd.inc
@@ -2,4 +2,4 @@ HOMEPAGE = "https://github.com/openbmc/openpower-vpd-parser"
 LICENSE = "Apache-2.0"
 LIC_FILES_CHKSUM = "file://LICENSE;md5=e3fc50a88d0a364313df4b21ef20c29e"
 SRC_URI += "git://github.com/openbmc/openpower-vpd-parser"
-SRCREV = "18197ae979ea3fea5f5f34216987f497e02ce96e"
+SRCREV = "675ee7e4459c8c3fc5c2733289dc35406bb6d400"