From be36ed1cf1278bb6e827b4d2e071568fac1ec079 Mon Sep 17 00:00:00 2001 From: Brandon Kim Date: Wed, 11 Aug 2021 20:39:16 -0700 Subject: Revert "Revert "meta-quanta: gbs: enable fallback watchdog"" This reverts commit cf7bc62babb57ea27e7a00cd6271ca53579281fe. Reason for revert: Enable fallback watchdog since it is possible that host fails to boot before enabling the watchdog timer at all. It was thought that DC cycle may be needed for fallback watchdog but it is not required. Signed-off-by: Brandon Kim Change-Id: I8b0f2677f078a091b626536a7ca474afa6ce77d9 --- .../recipes-phosphor/watchdog/phosphor-watchdog/obmc/watchdog/host0 | 3 +++ .../watchdog/phosphor-watchdog/phosphor-watchdog@.service | 3 ++- 2 files changed, 5 insertions(+), 1 deletion(-) (limited to 'meta-quanta/meta-gbs') diff --git a/meta-quanta/meta-gbs/recipes-phosphor/watchdog/phosphor-watchdog/obmc/watchdog/host0 b/meta-quanta/meta-gbs/recipes-phosphor/watchdog/phosphor-watchdog/obmc/watchdog/host0 index c0f04ef03..27c438d90 100644 --- a/meta-quanta/meta-gbs/recipes-phosphor/watchdog/phosphor-watchdog/obmc/watchdog/host0 +++ b/meta-quanta/meta-gbs/recipes-phosphor/watchdog/phosphor-watchdog/obmc/watchdog/host0 @@ -3,3 +3,6 @@ SERVICE=xyz.openbmc_project.Watchdog UNIT_HARD_RESET=phosphor-host-watchdog-reset.service UNIT_POWER_OFF=phosphor-host-watchdog-poweroff.service UNIT_POWER_CYCLE=phosphor-host-watchdog-powercycle.service +FALLBACK_ACTION=xyz.openbmc_project.State.Watchdog.Action.PowerCycle +FALLBACK_INTERVAL=180000 +MIN_INTERVAL=60000 diff --git a/meta-quanta/meta-gbs/recipes-phosphor/watchdog/phosphor-watchdog/phosphor-watchdog@.service b/meta-quanta/meta-gbs/recipes-phosphor/watchdog/phosphor-watchdog/phosphor-watchdog@.service index df11b22e5..4577cd1c1 100644 --- a/meta-quanta/meta-gbs/recipes-phosphor/watchdog/phosphor-watchdog/phosphor-watchdog@.service +++ b/meta-quanta/meta-gbs/recipes-phosphor/watchdog/phosphor-watchdog/phosphor-watchdog@.service @@ -4,7 +4,8 @@ Description=Phosphor Watchdog [Service] EnvironmentFile={envfiledir}/obmc/watchdog/%I ExecStart=/usr/bin/env phosphor-watchdog --service=${{SERVICE}} --path=${{DEVPATH}} \ - --continue \ + --continue --fallback_always --min_interval=${{MIN_INTERVAL}} \ + --fallback_action=${{FALLBACK_ACTION}} --fallback_interval=${{FALLBACK_INTERVAL}} \ --action_target=xyz.openbmc_project.State.Watchdog.Action.HardReset=${{UNIT_HARD_RESET}} \ --action_target=xyz.openbmc_project.State.Watchdog.Action.PowerOff=${{UNIT_POWER_OFF}} \ --action_target=xyz.openbmc_project.State.Watchdog.Action.PowerCycle=${{UNIT_POWER_CYCLE}} -- cgit v1.2.3