From db3d7a73284c38a1c0fe3cdc5de025531bb864f2 Mon Sep 17 00:00:00 2001 From: Andrew Geissler Date: Tue, 22 Sep 2020 13:33:56 -0500 Subject: 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 Change-Id: I9447a374afa405197ca5ae9373f758c653ca8dc0 Signed-off-by: Andrew Geissler --- meta-openpower/recipes-phosphor/fsi/op-fsi.bb | 9 ++++++--- meta-openpower/recipes-phosphor/fsi/op-fsi/fsi-scan@.service | 4 ++++ 2 files changed, 10 insertions(+), 3 deletions(-) (limited to 'meta-openpower') diff --git a/meta-openpower/recipes-phosphor/fsi/op-fsi.bb b/meta-openpower/recipes-phosphor/fsi/op-fsi.bb index 86cf5c1dc5..bedf65011e 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 dd837efe74..c37863e806 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 -- cgit v1.2.3