diff options
author | Jason M. Bills <jason.m.bills@linux.intel.com> | 2020-03-16 22:50:26 +0300 |
---|---|---|
committer | Jason M. Bills <jason.m.bills@linux.intel.com> | 2020-03-19 03:19:39 +0300 |
commit | 7c37c8ecd10d232c43ad9831257838cd6d75f683 (patch) | |
tree | d920f2bac79949e9cb8c3807bcd23cff7f497b9c /meta-openbmc-mods/meta-common/recipes-phosphor/watchdog/phosphor-watchdog | |
parent | cde54c4d6f7a200f7df9c301d60c3a9f668fc1db (diff) | |
download | openbmc-7c37c8ecd10d232c43ad9831257838cd6d75f683.tar.xz |
Update to internal 0.44
Signed-off-by: Jason M. Bills <jason.m.bills@linux.intel.com>
Diffstat (limited to 'meta-openbmc-mods/meta-common/recipes-phosphor/watchdog/phosphor-watchdog')
2 files changed, 34 insertions, 14 deletions
diff --git a/meta-openbmc-mods/meta-common/recipes-phosphor/watchdog/phosphor-watchdog/0001-Customize-phosphor-watchdog-for-Intel-platforms.patch b/meta-openbmc-mods/meta-common/recipes-phosphor/watchdog/phosphor-watchdog/0001-Customize-phosphor-watchdog-for-Intel-platforms.patch index 736431e9e..360ba35f0 100644 --- a/meta-openbmc-mods/meta-common/recipes-phosphor/watchdog/phosphor-watchdog/0001-Customize-phosphor-watchdog-for-Intel-platforms.patch +++ b/meta-openbmc-mods/meta-common/recipes-phosphor/watchdog/phosphor-watchdog/0001-Customize-phosphor-watchdog-for-Intel-platforms.patch @@ -1,4 +1,4 @@ -From a65701eabcf205203d6363d54730a6a497c0e6fc Mon Sep 17 00:00:00 2001 +From 82f31d1e6096acd4f223f0b0fe0d814c27450022 Mon Sep 17 00:00:00 2001 From: James Feist <james.feist@linux.intel.com> Date: Mon, 17 Jun 2019 12:00:58 -0700 Subject: [PATCH] Customize phosphor-watchdog for Intel platforms @@ -16,12 +16,12 @@ Signed-off-by: Ren Yu <yux.ren@intel.com> Signed-off-by: Yong Li <yong.b.li@linux.intel.com> Signed-off-by: Jason M. Bills <jason.m.bills@linux.intel.com> --- - watchdog.cpp | 193 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++--- + watchdog.cpp | 213 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++--- watchdog.hpp | 23 ++++++- - 2 files changed, 206 insertions(+), 10 deletions(-) + 2 files changed, 226 insertions(+), 10 deletions(-) diff --git a/watchdog.cpp b/watchdog.cpp -index 9090760..68b4246 100644 +index 9090760..079d88e 100644 --- a/watchdog.cpp +++ b/watchdog.cpp @@ -1,11 +1,14 @@ @@ -39,7 +39,7 @@ index 9090760..68b4246 100644 namespace phosphor { -@@ -18,10 +21,69 @@ using namespace phosphor::logging; +@@ -18,10 +21,77 @@ using namespace phosphor::logging; using sdbusplus::exception::SdBusError; using sdbusplus::xyz::openbmc_project::Common::Error::InternalFailure; @@ -94,6 +94,14 @@ index 9090760..68b4246 100644 +static constexpr const char* request = "RequestedPowerTransition"; +} // namespace chassis + ++namespace host ++{ ++static constexpr const char* busName = "xyz.openbmc_project.State.Host"; ++static constexpr const char* path = "/xyz/openbmc_project/state/host0"; ++static constexpr const char* interface = "xyz.openbmc_project.State.Host"; ++static constexpr const char* request = "RequestedHostTransition"; ++} // namespace host ++ +void Watchdog::powerStateChangedHandler( + const std::map<std::string, std::variant<std::string>>& props) +{ @@ -113,7 +121,7 @@ index 9090760..68b4246 100644 void Watchdog::resetTimeRemaining(bool enableWatchdog) { -@@ -102,13 +164,102 @@ uint64_t Watchdog::interval(uint64_t value) +@@ -102,13 +172,102 @@ uint64_t Watchdog::interval(uint64_t value) // Optional callback function on timer expiration void Watchdog::timeOutHandler() { @@ -217,7 +225,7 @@ index 9090760..68b4246 100644 auto target = actionTargetMap.find(action); if (target == actionTargetMap.end()) -@@ -128,10 +279,11 @@ void Watchdog::timeOutHandler() +@@ -128,10 +287,23 @@ void Watchdog::timeOutHandler() try { @@ -225,15 +233,27 @@ index 9090760..68b4246 100644 - SYSTEMD_INTERFACE, "StartUnit"); - method.append(target->second); - method.append("replace"); -+ auto method = -+ bus.new_method_call(chassis::busName, chassis::path, -+ "org.freedesktop.DBus.Properties", "Set"); -+ method.append(chassis::interface, chassis::request, -+ std::variant<std::string>(target->second)); ++ sdbusplus::message::message method; ++ if (action == Watchdog::Action::HardReset) ++ { ++ method = bus.new_method_call(host::busName, host::path, ++ "org.freedesktop.DBus.Properties", ++ "Set"); ++ method.append(host::interface, host::request, ++ std::variant<std::string>(target->second)); ++ } ++ else ++ { ++ method = bus.new_method_call(chassis::busName, chassis::path, ++ "org.freedesktop.DBus.Properties", ++ "Set"); ++ method.append(chassis::interface, chassis::request, ++ std::variant<std::string>(target->second)); ++ } bus.call_noreply(method); } -@@ -142,6 +294,29 @@ void Watchdog::timeOutHandler() +@@ -142,6 +314,29 @@ void Watchdog::timeOutHandler() entry("ERROR=%s", e.what())); commit<InternalFailure>(); } diff --git a/meta-openbmc-mods/meta-common/recipes-phosphor/watchdog/phosphor-watchdog/phosphor-watchdog.service b/meta-openbmc-mods/meta-common/recipes-phosphor/watchdog/phosphor-watchdog/phosphor-watchdog.service index 5ef1a4179..007e39d8a 100644 --- a/meta-openbmc-mods/meta-common/recipes-phosphor/watchdog/phosphor-watchdog/phosphor-watchdog.service +++ b/meta-openbmc-mods/meta-common/recipes-phosphor/watchdog/phosphor-watchdog/phosphor-watchdog.service @@ -4,7 +4,7 @@ Description=Phosphor Watchdog [Service] ExecStart=/usr/bin/env phosphor-watchdog --continue --service=xyz.openbmc_project.Watchdog \ --path=/xyz/openbmc_project/watchdog/host0 \ - --action_target=xyz.openbmc_project.State.Watchdog.Action.HardReset=xyz.openbmc_project.State.Chassis.Transition.Reset \ + --action_target=xyz.openbmc_project.State.Watchdog.Action.HardReset=xyz.openbmc_project.State.Host.Transition.ForceWarmReboot \ --action_target=xyz.openbmc_project.State.Watchdog.Action.PowerOff=xyz.openbmc_project.State.Chassis.Transition.Off \ --action_target=xyz.openbmc_project.State.Watchdog.Action.PowerCycle=xyz.openbmc_project.State.Chassis.Transition.PowerCycle |