diff options
| author | Andrew Geissler <geissonator@yahoo.com> | 2020-09-22 21:33:56 +0300 |
|---|---|---|
| committer | Andrew Geissler <geissonator@yahoo.com> | 2020-09-30 01:00:23 +0300 |
| commit | db3d7a73284c38a1c0fe3cdc5de025531bb864f2 (patch) | |
| tree | 205c4173a4b9bd9b202812f86a090066e97b6129 /meta-openpower/recipes-phosphor/fsi | |
| parent | 88dc6508962cd7d13649a1ac3f774b18d13cdfae (diff) | |
| download | openbmc-db3d7a73284c38a1c0fe3cdc5de025531bb864f2.tar.xz | |
fsi-scan: ensure run on all boots
This service needs to be run in both the obmc-chassis-poweron target and
obmc-host-startmin target. 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.
Similar to the CFAM reset, the FSI scan service should also not be run
on memory preserving reboots.
(From meta-openpower rev: b81b81a2dc37288396bdea38caff429d876f5740)
Signed-off-by: Andrew Geissler <geissonator@yahoo.com>
Change-Id: I9447a374afa405197ca5ae9373f758c653ca8dc0
Signed-off-by: Andrew Geissler <geissonator@yahoo.com>
Diffstat (limited to 'meta-openpower/recipes-phosphor/fsi')
| -rw-r--r-- | meta-openpower/recipes-phosphor/fsi/op-fsi.bb | 9 | ||||
| -rw-r--r-- | meta-openpower/recipes-phosphor/fsi/op-fsi/fsi-scan@.service | 4 |
2 files changed, 10 insertions, 3 deletions
diff --git a/meta-openpower/recipes-phosphor/fsi/op-fsi.bb b/meta-openpower/recipes-phosphor/fsi/op-fsi.bb index 86cf5c1dc..bedf65011 100644 --- a/meta-openpower/recipes-phosphor/fsi/op-fsi.bb +++ b/meta-openpower/recipes-phosphor/fsi/op-fsi.bb @@ -8,12 +8,15 @@ inherit obmc-phosphor-systemd RDEPENDS_${PN} += "op-proc-control" -TGTFMT = "obmc-chassis-poweron@{0}.target" +TGTFMT_CHASSIS = "obmc-chassis-poweron@{0}.target" +TGTFMT_HOST = "obmc-host-startmin@{0}.target" TMPL_SCAN = "fsi-scan@.service" INSTFMT_SCAN = "fsi-scan@{0}.service" -FMT_SCAN = "../${TMPL_SCAN}:${TGTFMT}.wants/${INSTFMT_SCAN}" +FMT_SCAN_CHASSIS = "../${TMPL_SCAN}:${TGTFMT_CHASSIS}.wants/${INSTFMT_SCAN}" +FMT_SCAN_HOST = "../${TMPL_SCAN}:${TGTFMT_HOST}.wants/${INSTFMT_SCAN}" SYSTEMD_SERVICE_${PN} += "${TMPL_SCAN} fsi-enable.service fsi-disable.service" -SYSTEMD_LINK_${PN} += "${@compose_list(d, 'FMT_SCAN', 'OBMC_CHASSIS_INSTANCES')}" +SYSTEMD_LINK_${PN} += "${@compose_list(d, 'FMT_SCAN_CHASSIS', 'OBMC_CHASSIS_INSTANCES')}" +SYSTEMD_LINK_${PN} += "${@compose_list(d, 'FMT_SCAN_HOST', 'OBMC_HOST_INSTANCES')}" diff --git a/meta-openpower/recipes-phosphor/fsi/op-fsi/fsi-scan@.service b/meta-openpower/recipes-phosphor/fsi/op-fsi/fsi-scan@.service index dd837efe7..c37863e80 100644 --- a/meta-openpower/recipes-phosphor/fsi/op-fsi/fsi-scan@.service +++ b/meta-openpower/recipes-phosphor/fsi/op-fsi/fsi-scan@.service @@ -4,7 +4,10 @@ Wants=obmc-power-on@%i.target After=obmc-power-on@%i.target Wants=obmc-host-start-pre@%i.target Before=obmc-host-start-pre@%i.target +After=op-cfam-reset.service Conflicts=obmc-chassis-poweroff@%i.target +Conflicts=obmc-host-stop@%i.target +ConditionPathExists=!/run/openbmc/mpreboot@%i [Service] ExecStart=/usr/bin/env openpower-proc-control scanFSI @@ -15,3 +18,4 @@ RemainAfterExit=yes [Install] WantedBy=obmc-chassis-poweron@%i.target +WantedBy=obmc-host-startmin@%i.target |