commit 0dc7d4cf3152c5c3605bbc5c463ec30f0fea78eb
author Vijay Khemka <vijaykhemka@fb.com> Tue Oct 22 12:30:17 2019 -0700
committer Vijay Khemka <vijaykhemka@fb.com> Wed Oct 23 14:53:23 2019 -0700
tree d6608a4ef13988937cdf3927af5f611304d01df3
parent f61ca6fdcc52beba485e014b5fad38a9e9a555ad

Fix GPIO initialization

For non button mask case, gpio lines POWER_OUT and RESET_OUT
were not initilized to initial value and also lines were not
 released after timeout. Added this fix here.

Tested: Verified power on and power off with ButtonMasked false.

Signed-off-by: Vijay Khemka <vijaykhemka@fb.com>
Change-Id: I21584e23eeee7c499188d70c136f94e87b6c482a

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 dce3440..2cdda2c 100644
--- a/power-control-x86/src/power_control.cpp
+++ b/power-control-x86/src/power_control.cpp
@@ -59,6 +59,8 @@
 
 static bool nmiEnabled = true;
 static constexpr const char* nmiOutName = "NMI_OUT";
+static constexpr const char* powerOutName = "POWER_OUT";
+static constexpr const char* resetOutName = "RESET_OUT";
 
 // Timers
 // Time holding GPIOs asserted
@@ -908,12 +910,12 @@
                               const int durationMs)
 {
     // If the requested GPIO is masked, use the mask line to set the output
-    if (powerButtonMask && name == "POWER_OUT")
+    if (powerButtonMask && name == power_control::powerOutName)
     {
         return setMaskedGPIOOutputForMs(powerButtonMask, name, value,
                                         durationMs);
     }
-    if (resetButtonMask && name == "RESET_OUT")
+    if (resetButtonMask && name == power_control::resetOutName)
     {
         return setMaskedGPIOOutputForMs(resetButtonMask, name, value,
                                         durationMs);
@@ -927,7 +929,9 @@
     }
     gpioAssertTimer.expires_after(std::chrono::milliseconds(durationMs));
     gpioAssertTimer.async_wait(
-        [gpioLine, name](const boost::system::error_code ec) {
+        [gpioLine, value, name](const boost::system::error_code ec) {
+            // Set the GPIO line back to the opposite value
+            gpioLine.set_value(!value);
             std::cerr << name << " released\n";
             if (ec)
             {
@@ -945,17 +949,18 @@
 
 static void powerOn()
 {
-    setGPIOOutputForMs("POWER_OUT", 0, powerPulseTimeMs);
+    setGPIOOutputForMs(power_control::powerOutName, 0, powerPulseTimeMs);
 }
 
 static void gracefulPowerOff()
 {
-    setGPIOOutputForMs("POWER_OUT", 0, powerPulseTimeMs);
+    setGPIOOutputForMs(power_control::powerOutName, 0, powerPulseTimeMs);
 }
 
 static void forcePowerOff()
 {
-    if (setGPIOOutputForMs("POWER_OUT", 0, forceOffPulseTimeMs) < 0)
+    if (setGPIOOutputForMs(power_control::powerOutName, 0,
+                           forceOffPulseTimeMs) < 0)
     {
         return;
     }
@@ -991,7 +996,7 @@
 
 static void reset()
 {
-    setGPIOOutputForMs("RESET_OUT", 0, resetPulseTimeMs);
+    setGPIOOutputForMs(power_control::resetOutName, 0, resetPulseTimeMs);
 }
 
 static void gracefulPowerOffTimerStart()
@@ -1863,6 +1868,21 @@
         return -1;
     }
 
+    // Initialize POWER_OUT and RESET_OUT GPIO.
+    gpiod::line line;
+    if (!power_control::setGPIOOutput(power_control::powerOutName, 1, line))
+    {
+        return -1;
+    }
+
+    if (!power_control::setGPIOOutput(power_control::resetOutName, 1, line))
+    {
+        return -1;
+    }
+
+    // Release line
+    line.reset();
+
     // Initialize the power state
     power_control::powerState = power_control::PowerState::off;
     // Check power good
@@ -2002,7 +2022,8 @@
                     return 1;
                 }
                 if (!power_control::setGPIOOutput(
-                        "POWER_OUT", 1, power_control::powerButtonMask))
+                        power_control::powerOutName, 1,
+                        power_control::powerButtonMask))
                 {
                     throw std::runtime_error("Failed to request GPIO");
                     return 0;
@@ -2044,7 +2065,8 @@
                     return 1;
                 }
                 if (!power_control::setGPIOOutput(
-                        "RESET_OUT", 1, power_control::resetButtonMask))
+                        power_control::resetOutName, 1,
+                        power_control::resetButtonMask))
                 {
                     throw std::runtime_error("Failed to request GPIO");
                     return 0;