summaryrefslogtreecommitdiffstats
path: root/meta-openbmc-machines/meta-openpower/common/recipes-phosphor
diff options
context:
space:
mode:
authorAndrew Geissler <andrewg@us.ibm.com>2017-09-25 14:28:14 -0500
committerAndrew Geissler <geissonator@yahoo.com>2017-10-04 19:48:08 +0000
commita5456ec5237f8f91a7785751fa3465d0a55f0743 (patch)
tree62ab9c33a0c8324ba637953197442a9db1dfbae7 /meta-openbmc-machines/meta-openpower/common/recipes-phosphor
parent79f587e30a5fa67fe2e94125d279ef487580a1c1 (diff)
downloadtalos-openbmc-a5456ec5237f8f91a7785751fa3465d0a55f0743.tar.gz
talos-openbmc-a5456ec5237f8f91a7785751fa3465d0a55f0743.zip
Ensure occ active is asserted after fsi scan
During a normal boot, the FSI scan service runs before the occ active assert. However, when the BMC is rebooted and the host is running, need to ensure the occ active assertion does not happen until FSI has been scanned. The OCC active assert causes the openpower-occ-control application to bind to the OCC device. This can not happen until the FSI bus has been scanned. Resolves openbmc/openbmc#2360 Change-Id: I3c5e802f051f72a7ae6c79e414ded16ccac4fa02 Signed-off-by: Andrew Geissler <andrewg@us.ibm.com>
Diffstat (limited to 'meta-openbmc-machines/meta-openpower/common/recipes-phosphor')
-rw-r--r--meta-openbmc-machines/meta-openpower/common/recipes-phosphor/occ/openpower-occ-control/op-occ-enable@.service6
1 files changed, 6 insertions, 0 deletions
diff --git a/meta-openbmc-machines/meta-openpower/common/recipes-phosphor/occ/openpower-occ-control/op-occ-enable@.service b/meta-openbmc-machines/meta-openpower/common/recipes-phosphor/occ/openpower-occ-control/op-occ-enable@.service
index 79373828d..c4c963894 100644
--- a/meta-openbmc-machines/meta-openpower/common/recipes-phosphor/occ/openpower-occ-control/op-occ-enable@.service
+++ b/meta-openbmc-machines/meta-openpower/common/recipes-phosphor/occ/openpower-occ-control/op-occ-enable@.service
@@ -4,6 +4,12 @@ Conflicts=obmc-host-stop@%i.target
Conflicts=op-occ-disable@%i.service
Wants=org.open_power.OCC.Control.service
After=org.open_power.OCC.Control.service
+Wants=fsi-scan@%i.service
+After=fsi-scan@%i.service
+# TODO - openbmc/openbmc#2278 - Remove fsi-hub-scan
+# These are not needed once we remove fsi-hub-scan service
+Wants=fsi-hub-scan@%i.service
+After=fsi-hub-scan@%i.service
ConditionPathExists=/run/openbmc/host@%i-on
[Service]
OpenPOWER on IntegriCloud