From 191e1ff92ac841b674bd294c312dc93dd22391f8 Mon Sep 17 00:00:00 2001 From: Andrew Geissler Date: Thu, 20 Jul 2017 10:28:34 -0500 Subject: Implement new hard power off target This target will allow the user to do an immediate power off of the system without waiting for the host. It can also be used to cause an immedate power off if the host is hung during the normal power off process. The chassis poweroff target will now require the host off target to ensure everything is properly stopped when the chassis is powered off. Change-Id: I8430d895ae5498d2e451aaf07480b0cf9550e8f2 Signed-off-by: Andrew Geissler --- .../recipes-phosphor/chassis/obmc-op-control-power.bb | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) (limited to 'meta-phosphor/common/recipes-phosphor/chassis') diff --git a/meta-phosphor/common/recipes-phosphor/chassis/obmc-op-control-power.bb b/meta-phosphor/common/recipes-phosphor/chassis/obmc-op-control-power.bb index f85859ccb..4388e7a7b 100644 --- a/meta-phosphor/common/recipes-phosphor/chassis/obmc-op-control-power.bb +++ b/meta-phosphor/common/recipes-phosphor/chassis/obmc-op-control-power.bb @@ -66,11 +66,19 @@ START_INSTFMT_CTRL = "obmc-chassis-poweron@{0}.target" START_FMT_CTRL = "../${START_TMPL_CTRL}:${START_TGTFMT_CTRL}.requires/${START_INSTFMT_CTRL}" SYSTEMD_LINK_${PN} += "${@compose_list_zip(d, 'START_FMT_CTRL', 'OBMC_POWER_INSTANCES', 'OBMC_CHASSIS_INSTANCES')}" -STOP_TMPL_CTRL = "obmc-chassis-poweroff@.target" -STOP_TGTFMT_CTRL = "obmc-host-stop@{1}.target" -STOP_INSTFMT_CTRL = "obmc-chassis-poweroff@{0}.target" +# Chassis off requires host off +STOP_TMPL_CTRL = "obmc-host-stop@.target" +STOP_TGTFMT_CTRL = "obmc-chassis-poweroff@{0}.target" +STOP_INSTFMT_CTRL = "obmc-host-stop@{1}.target" STOP_FMT_CTRL = "../${STOP_TMPL_CTRL}:${STOP_TGTFMT_CTRL}.requires/${STOP_INSTFMT_CTRL}" -SYSTEMD_LINK_${PN} += "${@compose_list_zip(d, 'STOP_FMT_CTRL', 'OBMC_POWER_INSTANCES', 'OBMC_CHASSIS_INSTANCES')}" +SYSTEMD_LINK_${PN} += "${@compose_list_zip(d, 'STOP_FMT_CTRL', 'OBMC_CHASSIS_INSTANCES', 'OBMC_HOST_INSTANCES')}" + +# Hard power off requires chassis off +HARD_OFF_TMPL_CTRL = "obmc-chassis-poweroff@.target" +HARD_OFF_TGTFMT_CTRL = "obmc-chassis-hard-poweroff@{0}.target" +HARD_OFF_INSTFMT_CTRL = "obmc-chassis-poweroff@{0}.target" +HARD_OFF_FMT_CTRL = "../${HARD_OFF_TMPL_CTRL}:${HARD_OFF_TGTFMT_CTRL}.requires/${HARD_OFF_INSTFMT_CTRL}" +SYSTEMD_LINK_${PN} += "${@compose_list_zip(d, 'HARD_OFF_FMT_CTRL', 'OBMC_CHASSIS_INSTANCES')}" # Force the standby target to run the chassis reset check target RESET_TMPL_CTRL = "obmc-chassis-powerreset@.target" -- cgit v1.2.1