commit b2cd93f5b82eed0eb5bce479457f6cf610ba8e16
author Matthew Barth <msbarth@us.ibm.com> Wed Jun 16 16:37:40 2021 -0500
committer Matthew Barth <msbarth@linux.ibm.com> Wed Jul 07 12:09:42 2021 +0000
tree 9b6bdcb34c2fa701aa99bf10956b0a781265fc61
parent a35a890b495b952f5f68855df115270670a8e7c7

control: Stop forcing power state changed

With the service files updated to start at BMC
standby(multi-user.target), JSON driven fan control no longer needs to
force a power state changed to set the fans to the poweron target. This
was originally done due to JSON driven fan control's service getting
started at poweron.

Essentially reverts 27958bf89252ed8c5c6497ec2b7296917b566b74

Dependent on https://gerrit.openbmc-project.xyz/c/openbmc/openbmc/+/44294

Change-Id: I33b38cf15815cfefbcc813a143fcd63c9f720b1d
Signed-off-by: Matthew Barth <msbarth@us.ibm.com>

control/json/manager.hpp

diff --git a/control/json/manager.hpp b/control/json/manager.hpp
index 43b963c..5e5b33c 100644
--- a/control/json/manager.hpp
+++ b/control/json/manager.hpp
@@ -431,17 +431,6 @@
      */
     void load();
 
-    // TODO - Set power state to on until fan control services updated
-    /**
-     * @brief Callback for power state changes
-     *
-     * @param[in] powerStateOn - Whether the power state is on or not
-     *
-     * Callback function bound to the PowerState object instance to handle each
-     * time the power state changes.
-     */
-    void powerStateChanged(bool powerStateOn);
-
   private:
     /* The sdbusplus bus object to use */
     sdbusplus::bus::bus& _bus;
@@ -489,6 +478,16 @@
     std::map<configKey, std::unique_ptr<Event>> _events;
 
     /**
+     * @brief Callback for power state changes
+     *
+     * @param[in] powerStateOn - Whether the power state is on or not
+     *
+     * Callback function bound to the PowerState object instance to handle each
+     * time the power state changes.
+     */
+    void powerStateChanged(bool powerStateOn);
+
+    /**
      * @brief Find the service name for a given path and interface from the
      * cached dataset
      *

control/main.cpp

diff --git a/control/main.cpp b/control/main.cpp
index 7d19f58..9eec2c5 100644
--- a/control/main.cpp
+++ b/control/main.cpp
@@ -84,9 +84,6 @@
                       std::placeholders::_1, std::placeholders::_2));
 
         phosphor::fan::util::SDBusPlus::getBus().request_name(CONTROL_BUSNAME);
-
-        // TODO - Set power state to on until fan control services updated
-        manager.powerStateChanged(true);
 #else
         Manager manager(phosphor::fan::util::SDBusPlus::getBus(), event, mode);