1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
212
213
214
215
216
217
218
219
220
221
222
223
224
225
226
227
228
229
230
231
232
233
234
|
From c0f01261572cb527cf9dc62fa732b28c658ff013 Mon Sep 17 00:00:00 2001
From: Kuiying Wang <kuiying.wang@intel.com>
Date: Tue, 7 Aug 2018 16:43:00 +0800
Subject: [PATCH] Capture host restart cause
Capture host restart cause on power/reset button pressed,
and power restore policy settings.
Save the restart cause into file system.
And restort it when BMC boot up.
Signed-off-by: Kuiying Wang <kuiying.wang@intel.com>
Signed-off-by: Yong Li <yong.b.li@linux.intel.com>
---
configure.ac | 4 ++--
discover_system_state.cpp | 14 ++++++++++++
host_state_manager.cpp | 16 ++++++++++++++
host_state_manager.hpp | 56 ++++++++++++++++++++++++++++++++++++++++++++---
4 files changed, 85 insertions(+), 5 deletions(-)
diff --git a/configure.ac b/configure.ac
index e985a95..b9e64c8 100644
--- a/configure.ac
+++ b/configure.ac
@@ -56,9 +56,9 @@ AC_ARG_VAR(HOST_RUNNING_FILE, [File to create if host is running])
AS_IF([test "x$HOST_RUNNING_FILE" == "x"], [HOST_RUNNING_FILE="/run/openbmc/host@%u-on"])
AC_DEFINE_UNQUOTED([HOST_RUNNING_FILE], ["$HOST_RUNNING_FILE"], [File to create if host is running])
-AC_ARG_VAR(HOST_STATE_PERSIST_PATH, [Path of file for storing requested host state.])
+AC_ARG_VAR(HOST_STATE_PERSIST_PATH, [Path of file for storing host state.])
AS_IF([test "x$HOST_STATE_PERSIST_PATH" == "x"], \
- [HOST_STATE_PERSIST_PATH="/var/lib/phosphor-state-manager/requestedHostTransition"])
+ [HOST_STATE_PERSIST_PATH="/var/lib/phosphor-state-manager/hostState"])
AC_DEFINE_UNQUOTED([HOST_STATE_PERSIST_PATH], ["$HOST_STATE_PERSIST_PATH"], \
[Path of file for storing requested host state.])
diff --git a/discover_system_state.cpp b/discover_system_state.cpp
index 3a38152..0b5798a 100644
--- a/discover_system_state.cpp
+++ b/discover_system_state.cpp
@@ -12,6 +12,7 @@
#include "settings.hpp"
#include "xyz/openbmc_project/Common/error.hpp"
#include "xyz/openbmc_project/Control/Power/RestorePolicy/server.hpp"
+#include <xyz/openbmc_project/State/Host/server.hpp>
namespace phosphor
{
@@ -181,6 +182,10 @@ int main(int argc, char** argv)
log<level::INFO>("power_policy=ALWAYS_POWER_ON, powering host on");
setProperty(bus, hostPath, HOST_BUSNAME, "RequestedHostTransition",
convertForMessage(server::Host::Transition::On));
+
+ setProperty(
+ bus, hostPath, HOST_BUSNAME, "HostRestartCause",
+ convertForMessage(server::Host::RestartCause::PowerPolicyAlwaysOn));
}
else if (RestorePolicy::Policy::Restore ==
RestorePolicy::convertPolicyFromString(powerPolicy))
@@ -192,6 +197,15 @@ int main(int argc, char** argv)
getProperty(bus, hostPath, HOST_BUSNAME, "RequestedHostTransition");
setProperty(bus, hostPath, HOST_BUSNAME, "RequestedHostTransition",
hostReqState);
+
+ if (server::Host::convertTransitionFromString(hostReqState) ==
+ server::Host::Transition::On)
+ {
+ setProperty(
+ bus, hostPath, HOST_BUSNAME, "HostRestartCause",
+ convertForMessage(
+ server::Host::RestartCause::PowerPolicyPreviousState));
+ }
}
return 0;
diff --git a/host_state_manager.cpp b/host_state_manager.cpp
index 7d661dd..03d210d 100644
--- a/host_state_manager.cpp
+++ b/host_state_manager.cpp
@@ -308,6 +308,15 @@ bool Host::deserialize(const fs::path& path)
}
}
+void Host::restoreHostRestartCause()
+{
+ if (!deserialize(HOST_STATE_PERSIST_PATH))
+ {
+ // set to default value
+ server::Host::hostRestartCause(server::Host::RestartCause::Unknown);
+ }
+}
+
Host::Transition Host::requestedHostTransition(Transition value)
{
log<level::INFO>("Host State transaction request",
@@ -353,6 +362,13 @@ Host::HostState Host::currentHostState(HostState value)
return server::Host::currentHostState(value);
}
+Host::RestartCause Host::hostRestartCause(RestartCause value)
+{
+ auto retVal = server::Host::hostRestartCause(value);
+ serialize();
+ return retVal;
+}
+
} // namespace manager
} // namespace state
} // namespace phosphor
diff --git a/host_state_manager.hpp b/host_state_manager.hpp
index 2b00777..e74fab7 100644
--- a/host_state_manager.hpp
+++ b/host_state_manager.hpp
@@ -32,6 +32,15 @@ using namespace phosphor::logging;
namespace sdbusRule = sdbusplus::bus::match::rules;
namespace fs = std::experimental::filesystem;
+const static constexpr char* powerButtonPath =
+ "/xyz/openbmc_project/Chassis/Buttons/Power0";
+const static constexpr char* powerButtonIntf =
+ "xyz.openbmc_project.Chassis.Buttons.Power";
+const static constexpr char* resetButtonPath =
+ "/xyz/openbmc_project/Chassis/Buttons/Reset0";
+const static constexpr char* resetButtonIntf =
+ "xyz.openbmc_project.Chassis.Buttons.Reset";
+
/** @class Host
* @brief OpenBMC host state management implementation.
* @details A concrete implementation for xyz.openbmc_project.State.Host
@@ -59,7 +68,31 @@ class Host : public HostInherit
sdbusRule::interface("org.freedesktop.systemd1.Manager"),
std::bind(std::mem_fn(&Host::sysStateChange), this,
std::placeholders::_1)),
- settings(bus)
+ settings(bus),
+ powerButtonPressedSignal(
+ bus,
+ sdbusRule::type::signal() + sdbusRule::member("Pressed") +
+ sdbusRule::path(powerButtonPath) +
+ sdbusRule::interface(powerButtonIntf),
+ [this](sdbusplus::message::message &msg) {
+ phosphor::logging::log<phosphor::logging::level::INFO>(
+ "powerButtonPressedSignal callback function is called...");
+ this->hostRestartCause(this->RestartCause::PowerButton);
+ return;
+ }
+ ),
+ resetButtonPressedSignal(
+ bus,
+ sdbusRule::type::signal() + sdbusRule::member("Pressed") +
+ sdbusRule::path(resetButtonPath) +
+ sdbusRule::interface(resetButtonIntf),
+ [this](sdbusplus::message::message &msg) {
+ phosphor::logging::log<phosphor::logging::level::INFO>(
+ "resetButtonPressedSignal callback function is called...");
+ this->hostRestartCause(this->RestartCause::ResetButton);
+ return;
+ }
+ )
{
// Enable systemd signals
subscribeToSystemdSignals();
@@ -69,6 +102,8 @@ class Host : public HostInherit
attemptsLeft(BOOT_COUNT_MAX_ALLOWED);
+ restoreHostRestartCause(); // restore host restart cause from persisted file
+
// We deferred this until we could get our property correct
this->emit_object_added();
}
@@ -85,6 +120,9 @@ class Host : public HostInherit
/** @brief Set value of CurrentHostState */
HostState currentHostState(HostState value) override;
+ /** @brief Set value of HostRestartCause */
+ RestartCause hostRestartCause(RestartCause value) override;
+
/**
* @brief Set host reboot count to default
*
@@ -192,7 +230,10 @@ class Host : public HostInherit
server::Progress::bootProgress()),
convertForMessage(
sdbusplus::xyz::openbmc_project::State::OperatingSystem::
- server::Status::operatingSystemState()));
+ server::Status::operatingSystemState()),
+ convertForMessage(sdbusplus::xyz::openbmc_project::State::
+ server::Host::hostRestartCause())
+ );
}
/** @brief Function required by Cereal to perform deserialization.
@@ -208,7 +249,8 @@ class Host : public HostInherit
std::string reqTranState;
std::string bootProgress;
std::string osState;
- archive(reqTranState, bootProgress, osState);
+ std::string restartCause;
+ archive(reqTranState, bootProgress, osState, restartCause);
auto reqTran = Host::convertTransitionFromString(reqTranState);
// When restoring, set the requested state with persistent value
// but don't call the override which would execute it
@@ -219,6 +261,8 @@ class Host : public HostInherit
sdbusplus::xyz::openbmc_project::State::OperatingSystem::server::
Status::operatingSystemState(
Host::convertOSStatusFromString(osState));
+ sdbusplus::xyz::openbmc_project::State::server::Host::
+ hostRestartCause(Host::convertRestartCauseFromString(restartCause));
}
/** @brief Serialize and persist requested host state
@@ -239,6 +283,9 @@ class Host : public HostInherit
*/
bool deserialize(const fs::path& path);
+ /** @brief Used to restore HostRestartCause value from persisted file */
+ void restoreHostRestartCause();
+
/** @brief Persistent sdbusplus DBus bus connection. */
sdbusplus::bus::bus& bus;
@@ -247,6 +294,9 @@ class Host : public HostInherit
// Settings objects of interest
settings::Objects settings;
+
+ sdbusplus::bus::match_t powerButtonPressedSignal;
+ sdbusplus::bus::match_t resetButtonPressedSignal;
};
} // namespace manager
--
2.7.4
|
