diff options
4 files changed, 17 insertions, 6 deletions
diff --git a/meta-facebook/meta-harma/recipes-phosphor/gpio/phosphor-gpio-monitor/assert-power-good b/meta-facebook/meta-harma/recipes-phosphor/gpio/phosphor-gpio-monitor/assert-power-good index a8cbda483c..4bec537265 100644 --- a/meta-facebook/meta-harma/recipes-phosphor/gpio/phosphor-gpio-monitor/assert-power-good +++ b/meta-facebook/meta-harma/recipes-phosphor/gpio/phosphor-gpio-monitor/assert-power-good @@ -3,8 +3,5 @@ # Set Host Power Status Off busctl set-property xyz.openbmc_project.State.Host0 /xyz/openbmc_project/state/host0 xyz.openbmc_project.State.Host CurrentHostState s xyz.openbmc_project.State.Host.HostState.Off -# Set Chassis Power Status Off -busctl set-property xyz.openbmc_project.State.Chassis0 /xyz/openbmc_project/state/chassis0 xyz.openbmc_project.State.Chassis CurrentPowerState s xyz.openbmc_project.State.Chassis.PowerState.Off - systemctl start obmc-led-group-stop@power_on.service exit 0 diff --git a/meta-facebook/meta-harma/recipes-phosphor/gpio/phosphor-gpio-monitor/deassert-power-good b/meta-facebook/meta-harma/recipes-phosphor/gpio/phosphor-gpio-monitor/deassert-power-good index 36ede163b2..cc2258f373 100644 --- a/meta-facebook/meta-harma/recipes-phosphor/gpio/phosphor-gpio-monitor/deassert-power-good +++ b/meta-facebook/meta-harma/recipes-phosphor/gpio/phosphor-gpio-monitor/deassert-power-good @@ -3,9 +3,6 @@ # Set Host Power Status Running busctl set-property xyz.openbmc_project.State.Host0 /xyz/openbmc_project/state/host0 xyz.openbmc_project.State.Host CurrentHostState s xyz.openbmc_project.State.Host.HostState.Running -# Set Chassis Power Status On -busctl set-property xyz.openbmc_project.State.Chassis0 /xyz/openbmc_project/state/chassis0 xyz.openbmc_project.State.Chassis CurrentPowerState s xyz.openbmc_project.State.Chassis.PowerState.On - systemctl start obmc-led-group-start@power_on.service # The hardware disables the multiplexer in standby diff --git a/meta-facebook/meta-harma/recipes-phosphor/state/phosphor-state-manager_%.bbappend b/meta-facebook/meta-harma/recipes-phosphor/state/phosphor-state-manager_%.bbappend index aead043cb1..72f7faa2a5 100644 --- a/meta-facebook/meta-harma/recipes-phosphor/state/phosphor-state-manager_%.bbappend +++ b/meta-facebook/meta-harma/recipes-phosphor/state/phosphor-state-manager_%.bbappend @@ -69,6 +69,17 @@ HOST_DEFAULT_TARGETS:remove = " \ obmc-host-reboot@{}.target.requires/obmc-host-shutdown@{}.service \ " +#We need to ensure that the chassis power is always on. +CHASSIS_DEFAULT_TARGETS:remove = " \ + obmc-host-shutdown@{}.target.requires/obmc-chassis-poweroff@{}.target \ + " + +HARD_OFF_TMPL_CTRL="" +HARD_OFF_TGTFMT_CTRL="" +HARD_OFF_FMT_CTRL="" +HARD_OFF_INSTFMT_CTRL="" + + SRC_URI:append = " \ file://chassis-powercycle \ file://chassis-powercycle@.service \ diff --git a/meta-facebook/recipes-phosphor/fans/phosphor-fan_%.bbappend b/meta-facebook/recipes-phosphor/fans/phosphor-fan_%.bbappend index ace7331fed..9b4364b92f 100644 --- a/meta-facebook/recipes-phosphor/fans/phosphor-fan_%.bbappend +++ b/meta-facebook/recipes-phosphor/fans/phosphor-fan_%.bbappend @@ -38,6 +38,7 @@ pkg_postinst:${PN}-sensor-monitor() { mkdir -p $D$systemd_system_unitdir/obmc-chassis-poweroff@0.target.requires mkdir -p $D/var/lib/phosphor-fan-presence +# It should be create by PSM, should we remove it? LINK="$D$systemd_system_unitdir/obmc-chassis-hard-poweroff@0.target.requires/obmc-chassis-poweroff@.target" TARGET="../obmc-chassis-poweroff@0.target" ln -s $TARGET $LINK @@ -47,5 +48,10 @@ pkg_postinst:${PN}-sensor-monitor() { ln -s $TARGET $LINK } +pkg_postinst:${PN}-sensor-monitor:harma() { + rm -f $D$systemd_system_unitdir/obmc-chassis-hard-poweroff@0.target.requires/obmc-chassis-poweroff@.target +} + + FILES:${PN}-sensor-monitor += "${libexecdir}/phosphor-fan-sensor-monitor/host-poweroff" FILES:${PN}-sensor-monitor += "${systemd_system_unitdir}" |