commit afd04f0283bfc4854c0100c56ccf8bc1c10c799a
author Charles Hsu <Charles.Hsu@quantatw.com> Thu Apr 22 13:52:41 2021 +0800
committer Charles Hsu <Charles.Hsu@quantatw.com> Wed Apr 28 09:17:20 2021 +0800
tree dbe5813a4a957c83d71549d819bf6d4d22847691
parent 92caa4c639903ef076e2f09e985291781edd927d

Add timing configurations into power-config-host0.json

The timings will be changed according to different hardware design, this change can be used flexibly.

TESTED: the existing functionality is not broken after adding the JSON parser implementation.

Signed-off-by: Charles Hsu <Charles.Hsu@quantatw.com>
Change-Id: I1aada7af79fdb9ed3110e94bee31697b25bb6613

power-control-x86/src/power_control.cpp

diff --git a/power-control-x86/src/power_control.cpp b/power-control-x86/src/power_control.cpp
index 61656f3..32f0a5b 100644
--- a/power-control-x86/src/power_control.cpp
+++ b/power-control-x86/src/power_control.cpp
@@ -69,15 +69,15 @@
 static gpiod::line resetButtonMask;
 static bool nmiButtonMasked = false;
 
-const static constexpr int powerPulseTimeMs = 200;
-const static constexpr int forceOffPulseTimeMs = 15000;
-const static constexpr int resetPulseTimeMs = 500;
-const static constexpr int powerCycleTimeMs = 5000;
-const static constexpr int sioPowerGoodWatchdogTimeMs = 1000;
-const static constexpr int psPowerOKWatchdogTimeMs = 8000;
-const static constexpr int gracefulPowerOffTimeS = 5 * 60;
-const static constexpr int warmResetCheckTimeMs = 500;
-const static constexpr int powerOffSaveTimeMs = 7000;
+static int powerPulseTimeMs = 200;
+static int forceOffPulseTimeMs = 15000;
+static int resetPulseTimeMs = 500;
+static int powerCycleTimeMs = 5000;
+static int sioPowerGoodWatchdogTimeMs = 1000;
+static int psPowerOKWatchdogTimeMs = 8000;
+static int gracefulPowerOffTimeS = 5 * 60;
+static int warmResetCheckTimeMs = 500;
+static int powerOffSaveTimeMs = 7000;
 
 const static std::filesystem::path powerControlDir = "/var/lib/power-control";
 const static constexpr std::string_view powerStateFile = "power-state";
@@ -2289,67 +2289,113 @@
             "Power config readings JSON parser failure");
         return -1;
     }
+    auto gpios = data["gpio_configs"];
+    auto timers = data["timing_configs"];
 
-    if (data.contains("IdButton"))
+    if (gpios.contains("IdButton"))
     {
-        idButtonName = data["IdButton"];
+        idButtonName = gpios["IdButton"];
     }
 
-    if (data.contains("NMIButton"))
+    if (gpios.contains("NMIButton"))
     {
-        nmiButtonName = data["NMIButton"];
+        nmiButtonName = gpios["NMIButton"];
     }
 
-    if (data.contains("NMIOut"))
+    if (gpios.contains("NMIOut"))
     {
-        nmiOutName = data["NMIOut"];
+        nmiOutName = gpios["NMIOut"];
     }
 
-    if (data.contains("PostComplete"))
+    if (gpios.contains("PostComplete"))
     {
-        postCompleteName = data["PostComplete"];
+        postCompleteName = gpios["PostComplete"];
     }
 
-    if (data.contains("PwrButton"))
+    if (gpios.contains("PwrButton"))
     {
-        powerButtonName = data["PwrButton"];
+        powerButtonName = gpios["PwrButton"];
     }
 
-    if (data.contains("PwrOK"))
+    if (gpios.contains("PwrOK"))
     {
-        powerOkName = data["PwrOK"];
+        powerOkName = gpios["PwrOK"];
     }
 
-    if (data.contains("PwrOut"))
+    if (gpios.contains("PwrOut"))
     {
-        powerOutName = data["PwrOut"];
+        powerOutName = gpios["PwrOut"];
     }
 
-    if (data.contains("RstButton"))
+    if (gpios.contains("RstButton"))
     {
-        resetButtonName = data["RstButton"];
+        resetButtonName = gpios["RstButton"];
     }
 
-    if (data.contains("RstOut"))
+    if (gpios.contains("RstOut"))
     {
-        resetOutName = data["RstOut"];
+        resetOutName = gpios["RstOut"];
     }
 
-    if (data.contains("SIOOnCtl"))
+    if (gpios.contains("SIOOnCtl"))
     {
-        sioOnControlName = data["SIOOnCtl"];
+        sioOnControlName = gpios["SIOOnCtl"];
     }
 
-    if (data.contains("SIOPwrGd"))
+    if (gpios.contains("SIOPwrGd"))
     {
-        sioPwrGoodName = data["SIOPwrGd"];
+        sioPwrGoodName = gpios["SIOPwrGd"];
     }
 
-    if (data.contains("SIOS5"))
+    if (gpios.contains("SIOS5"))
     {
-        sioS5Name = data["SIOS5"];
+        sioS5Name = gpios["SIOS5"];
     }
 
+    if (timers.contains("PowerPulseMs"))
+    {
+        powerPulseTimeMs = timers["PowerPulseMs"];
+    }
+
+    if (timers.contains("ForceOffPulseMs"))
+    {
+        forceOffPulseTimeMs = timers["ForceOffPulseMs"];
+    }
+
+    if (timers.contains("ResetPulseMs"))
+    {
+        resetPulseTimeMs = timers["ResetPulseMs"];
+    }
+
+    if (timers.contains("PowerCycleMs"))
+    {
+        powerCycleTimeMs = timers["PowerCycleMs"];
+    }
+
+    if (timers.contains("SioPowerGoodWatchdogMs"))
+    {
+        sioPowerGoodWatchdogTimeMs = timers["SioPowerGoodWatchdogMs"];
+    }
+
+    if (timers.contains("PsPowerOKWatchdogMs"))
+    {
+        psPowerOKWatchdogTimeMs = timers["PsPowerOKWatchdogMs"];
+    }
+
+    if (timers.contains("GracefulPowerOffS"))
+    {
+        gracefulPowerOffTimeS = timers["GracefulPowerOffS"];
+    }
+
+    if (timers.contains("WarmResetCheckMs"))
+    {
+        warmResetCheckTimeMs = timers["WarmResetCheckMs"];
+    }
+
+    if (timers.contains("PowerOffSaveMs"))
+    {
+        powerOffSaveTimeMs = timers["PowerOffSaveMs"];
+    }
     return 0;
 }