diff options
| author | Charles Boyer <Charles.Boyer@fii-usa.com> | 2021-08-24 19:25:03 +0300 |
|---|---|---|
| committer | Charles Boyer <Charles.Boyer@fii-usa.com> | 2021-11-09 01:10:53 +0300 |
| commit | 1c51ca54c8206feaeaea61c1e4831b4a68ddb0e5 (patch) | |
| tree | 8f986e6717079f8bc3a5f3f49babf2c41ebe31a1 /meta-fii/meta-kudo/recipes-phosphor | |
| parent | c6001349529450007d0430377fca88ca11d3a71e (diff) | |
| download | openbmc-1c51ca54c8206feaeaea61c1e4831b4a68ddb0e5.tar.xz | |
meta-fii/meta-kudo: Fix power control states and timing
Summary of changes:
1. Adjust start time of xyz.openbmc_project.State.Chassis.service
to fix initial chassis state
2. Add shutdown ack service
3. Remove reset ack service
4. Remove heartbeat mode
5. Remove sysreset pin control from power_control.exe
6. Remove all phosphor-fan services that caused power off during
a system reset
7. Adjustments to ampere_power_util.sh (See below)
ampere_power_util.sh:
1. Use GPIO instead of dbus for host state
2. Wait 3 seconds before checking power status for power on
3. Wait 6 seconds before checking power status for power off
4. Have force_off act GPIO while power_off sets Chassis state
5. Graceful shutdown acts GPIO
6. Check host status before issuing system reset
7. Set Watchdog Expire Action to None before power off and reset
Signed-off-by: Charles Boyer <Charles.Boyer@fii-usa.com>
Change-Id: Ie2720ee60d489c4160165c6827a78a400ae4d30b
Diffstat (limited to 'meta-fii/meta-kudo/recipes-phosphor')
3 files changed, 29 insertions, 6 deletions
diff --git a/meta-fii/meta-kudo/recipes-phosphor/skeleton/obmc-libobmc-intf/gpio_defs.json b/meta-fii/meta-kudo/recipes-phosphor/skeleton/obmc-libobmc-intf/gpio_defs.json index 2dccd42e89..47cb2cc60f 100644 --- a/meta-fii/meta-kudo/recipes-phosphor/skeleton/obmc-libobmc-intf/gpio_defs.json +++ b/meta-fii/meta-kudo/recipes-phosphor/skeleton/obmc-libobmc-intf/gpio_defs.json @@ -6,7 +6,6 @@ "power_up_outs": [ ], "reset_outs": [ - {"name": "BMC_S0_SYSRESET_N", "polarity": false} ] } }, @@ -16,11 +15,6 @@ "name": "PGOOD", "num": 200, "direction": "in" - }, - { - "name": "BMC_S0_SYSRESET_N", - "num": 65, - "direction": "out" } ] } diff --git a/meta-fii/meta-kudo/recipes-phosphor/state/phosphor-state-manager/xyz.openbmc_project.State.Chassis.service b/meta-fii/meta-kudo/recipes-phosphor/state/phosphor-state-manager/xyz.openbmc_project.State.Chassis.service new file mode 100644 index 0000000000..d8df56164a --- /dev/null +++ b/meta-fii/meta-kudo/recipes-phosphor/state/phosphor-state-manager/xyz.openbmc_project.State.Chassis.service @@ -0,0 +1,18 @@ +[Unit] +Description=Phosphor Chassis State Manager +Before=mapper-wait@-xyz-openbmc_project-state-chassis.service +Wants=obmc-mapper.target +After=obmc-mapper.target +After=org.openbmc.control.Power@0.service +After=host-powerctrl.service + +[Service] +ExecStartPre=/bin/sleep 5 +ExecStart=/usr/bin/phosphor-chassis-state-manager +Restart=always +Type=dbus +BusName=xyz.openbmc_project.State.Chassis + +[Install] +WantedBy=multi-user.target + diff --git a/meta-fii/meta-kudo/recipes-phosphor/state/phosphor-state-manager_%.bbappend b/meta-fii/meta-kudo/recipes-phosphor/state/phosphor-state-manager_%.bbappend new file mode 100644 index 0000000000..57e3aa6c8a --- /dev/null +++ b/meta-fii/meta-kudo/recipes-phosphor/state/phosphor-state-manager_%.bbappend @@ -0,0 +1,11 @@ +FILESEXTRAPATHS:prepend:kudo := "${THISDIR}/${PN}:" + +SRC_URI:append:kudo = " \ + file://xyz.openbmc_project.State.Chassis.service \ + " + +do_install:append:kudo() { + install -d ${D}${systemd_system_unitdir} + install -m 0644 ${WORKDIR}/xyz.openbmc_project.State.Chassis.service ${D}${systemd_system_unitdir}/xyz.openbmc_project.State.Chassis.service +} + |