cfam-reset: ensure run on all boots
Currently the cfam-reset is run within the power_control application and
it is also run as a standalone service for warm reboots. Going forward
the direction is to move the cfam reset out of the power domain. The
op-cfam-reset service will be run in all scenarios where it is required
and the power application will no longer perform it.
For a period of time there will be overlap where both this service and
the power application will be doing the cfam reset. This does not hurt
anything and will make the transition easier due to no requisites.
This service will be run in both the obmc-chassis-poweron and
obmc-host-startmin targets. This is so support is there for FSI
operations with just a "obmcutil chassison" as well as supporting the
warm reboot path where a chassison is not executed. The service will
only run once during a normal boot due to the way the service is
configured.
Signed-off-by: Andrew Geissler <geissonator@yahoo.com>
Change-Id: Ic24b10c4f6d15bff0c85caa944517175089500d9
diff --git a/op-cfam-reset.service.in b/op-cfam-reset.service.in
index 5b409bf..f560bf6 100644
--- a/op-cfam-reset.service.in
+++ b/op-cfam-reset.service.in
@@ -1,10 +1,13 @@
[Unit]
Description=CFAM reset
-Wants=obmc-host-stopped@0.target
-After=obmc-host-stopped@0.target
-After=op-occ-disable@0.service
-Before=obmc-host-startmin@0.target
-Conflicts=obmc-host-startmin@0.target
+Wants=obmc-power-on@0.target
+After=obmc-power-on@0.target
+Wants=obmc-host-start-pre@0.target
+Before=obmc-host-start-pre@0.target
+Before=fsi-scan@0.service
+Before=cfam_override@0.service
+Conflicts=obmc-host-stop@0.target
+Conflicts=obmc-chassis-poweroff@0.target
ConditionPathExists=!/run/openbmc/mpreboot@0
[Service]
@@ -13,4 +16,4 @@
ExecStart=/usr/bin/openpower-proc-control cfamReset
[Install]
-# Will be installed in appropriate warm reboot targets via bb files
+# Will be installed in appropriate targets via bb files