Update TimerMap names to match the config file
The TimerMap names are compared against the config file entries
to update the values; however, the names don't match between the
TimerMap and the config file, so no timing values from the config
file are used.
This updates the TimerMap to match the names in the config file
so the config file timing values can be used.
Tested:
Changed the PowerCycleMs value to 15000 and confirmed that the
system stayed off for 15 seconds on a power cycle.
Change-Id: Ia273471fca36303a33572eeedff9079a18ad3569
Signed-off-by: Jason M. Bills <jason.m.bills@linux.intel.com>
diff --git a/power-control-x86/src/power_control.cpp b/power-control-x86/src/power_control.cpp
index bdb4ea7..54cac61 100644
--- a/power-control-x86/src/power_control.cpp
+++ b/power-control-x86/src/power_control.cpp
@@ -127,16 +127,16 @@
// This map contains all timer values that are to be read from json config
boost::container::flat_map<std::string, int> TimerMap = {
- {"powerPulseTimeMs", 200},
- {"forceOffPulseTimeMs", 15000},
- {"resetPulseTimeMs", 500},
- {"powerCycleTimeMs", 5000},
- {"sioPowerGoodWatchdogTimeMs", 1000},
- {"psPowerOKWatchdogTimeMs", 8000},
- {"gracefulPowerOffTimeS", (5 * 60)},
- {"warmResetCheckTimeMs", 500},
- {"powerOffSaveTimeMs", 7000},
- {"slotPowerCycleTimeMs", 200}};
+ {"PowerPulseMs", 200},
+ {"ForceOffPulseMs", 15000},
+ {"ResetPulseMs", 500},
+ {"PowerCycleMs", 5000},
+ {"SioPowerGoodWatchdogMs", 1000},
+ {"PsPowerOKWatchdogMs", 8000},
+ {"GracefulPowerOffS", (5 * 60)},
+ {"WarmResetCheckMs", 500},
+ {"PowerOffSaveMs", 7000},
+ {"SlotPowerCycleMs", 200}};
const static std::filesystem::path powerControlDir = "/var/lib/power-control";
const static constexpr std::string_view powerStateFile = "power-state";
@@ -543,7 +543,7 @@
static void savePowerState(const PowerState state)
{
powerStateSaveTimer.expires_after(
- std::chrono::milliseconds(TimerMap["powerOffSaveTimeMs"]));
+ std::chrono::milliseconds(TimerMap["PowerOffSaveMs"]));
powerStateSaveTimer.async_wait([state](const boost::system::error_code ec) {
if (ec)
{
@@ -702,7 +702,7 @@
"MESSAGE=PowerControl: system power good failed to assert (VR failure)",
"PRIORITY=%i", LOG_INFO, "REDFISH_MESSAGE_ID=%s",
"OpenBMC.0.1.SystemPowerGoodFailed", "REDFISH_MESSAGE_ARGS=%d",
- TimerMap["sioPowerGoodWatchdogTimeMs"], NULL);
+ TimerMap["SioPowerGoodWatchdogMs"], NULL);
}
static void psPowerOKFailedLog()
@@ -711,7 +711,7 @@
"MESSAGE=PowerControl: power supply power good failed to assert",
"PRIORITY=%i", LOG_INFO, "REDFISH_MESSAGE_ID=%s",
"OpenBMC.0.1.PowerSupplyPowerGoodFailed", "REDFISH_MESSAGE_ARGS=%d",
- TimerMap["psPowerOKWatchdogTimeMs"], NULL);
+ TimerMap["PsPowerOKWatchdogMs"], NULL);
}
static void powerRestorePolicyLog()
@@ -1244,7 +1244,7 @@
static void powerOn()
{
- setGPIOOutputForMs(powerOutConfig, 0, TimerMap["powerPulseTimeMs"]);
+ setGPIOOutputForMs(powerOutConfig, 0, TimerMap["PowerPulseMs"]);
}
#ifdef CHASSIS_SYSTEM_RESET
static int slotPowerOn()
@@ -1305,7 +1305,7 @@
"Slot Power Cycle started\n");
slotPowerOff();
slotPowerCycleTimer.expires_after(
- std::chrono::milliseconds(TimerMap["slotPowerCycleTimeMs"]));
+ std::chrono::milliseconds(TimerMap["SlotPowerCycleMs"]));
slotPowerCycleTimer.async_wait([](const boost::system::error_code ec) {
if (ec)
{
@@ -1330,13 +1330,12 @@
#endif
static void gracefulPowerOff()
{
- setGPIOOutputForMs(powerOutConfig, 0, TimerMap["powerPulseTimeMs"]);
+ setGPIOOutputForMs(powerOutConfig, 0, TimerMap["PowerPulseMs"]);
}
static void forcePowerOff()
{
- if (setGPIOOutputForMs(powerOutConfig, 0, TimerMap["forceOffPulseTimeMs"]) <
- 0)
+ if (setGPIOOutputForMs(powerOutConfig, 0, TimerMap["ForceOffPulseMs"]) < 0)
{
return;
}
@@ -1377,7 +1376,7 @@
static void reset()
{
- setGPIOOutputForMs(resetOutConfig, 0, TimerMap["resetPulseTimeMs"]);
+ setGPIOOutputForMs(resetOutConfig, 0, TimerMap["ResetPulseMs"]);
}
static void gracefulPowerOffTimerStart()
@@ -1385,7 +1384,7 @@
phosphor::logging::log<phosphor::logging::level::INFO>(
"Graceful power-off timer started");
gracefulPowerOffTimer.expires_after(
- std::chrono::seconds(TimerMap["gracefulPowerOffTimeS"]));
+ std::chrono::seconds(TimerMap["GracefulPowerOffS"]));
gracefulPowerOffTimer.async_wait([](const boost::system::error_code ec) {
if (ec)
{
@@ -1413,7 +1412,7 @@
phosphor::logging::log<phosphor::logging::level::INFO>(
"Power-cycle timer started");
powerCycleTimer.expires_after(
- std::chrono::milliseconds(TimerMap["powerCycleTimeMs"]));
+ std::chrono::milliseconds(TimerMap["PowerCycleMs"]));
powerCycleTimer.async_wait([](const boost::system::error_code ec) {
if (ec)
{
@@ -1441,7 +1440,7 @@
phosphor::logging::log<phosphor::logging::level::INFO>(
"power supply power OK watchdog timer started");
psPowerOKWatchdogTimer.expires_after(
- std::chrono::milliseconds(TimerMap["psPowerOKWatchdogTimeMs"]));
+ std::chrono::milliseconds(TimerMap["PsPowerOKWatchdogMs"]));
psPowerOKWatchdogTimer.async_wait([](const boost::system::error_code ec) {
if (ec)
{
@@ -1470,7 +1469,7 @@
phosphor::logging::log<phosphor::logging::level::INFO>(
"Warm reset check timer started");
warmResetCheckTimer.expires_after(
- std::chrono::milliseconds(TimerMap["warmResetCheckTimeMs"]));
+ std::chrono::milliseconds(TimerMap["WarmResetCheckMs"]));
warmResetCheckTimer.async_wait([](const boost::system::error_code ec) {
if (ec)
{
@@ -1659,7 +1658,7 @@
phosphor::logging::log<phosphor::logging::level::INFO>(
"SIO power good watchdog timer started");
sioPowerGoodWatchdogTimer.expires_after(
- std::chrono::milliseconds(TimerMap["sioPowerGoodWatchdogTimeMs"]));
+ std::chrono::milliseconds(TimerMap["SioPowerGoodWatchdogMs"]));
sioPowerGoodWatchdogTimer.async_wait(
[](const boost::system::error_code ec) {
if (ec)