commit 4cc61e0e99c9014d2e8d8b25ec52b71c3c4e405b
author Chris Cain <cjcain@us.ibm.com> Wed Jan 12 17:23:14 2022 -0600
committer Chris Cain <cjcain@us.ibm.com> Tue Feb 01 08:49:08 2022 -0600
tree e92fc68e5d484f88b36c67dc7bb5af9014af138c
parent d2bae6849d8e73ee6f0ec695c32d76a07ee2abcf

Correct code reading total power from dbus

Original OpenBMC design was to use the Scale property, but that changed
a few years ago. The value no longer needs to be scaled.

Tested on Everest HW

Signed-off-by: Chris Cain <cjcain@us.ibm.com>
Change-Id: I37b73e0c787a66a4a5b7e4bb2ff554b83d6a026f

dcmihandler.cpp

diff --git a/dcmihandler.cpp b/dcmihandler.cpp
index 2ab02f3..a7a3bf1 100644
--- a/dcmihandler.cpp
+++ b/dcmihandler.cpp
@@ -51,7 +51,6 @@
 
 constexpr auto SENSOR_VALUE_INTF = "xyz.openbmc_project.Sensor.Value";
 constexpr auto SENSOR_VALUE_PROP = "Value";
-constexpr auto SENSOR_SCALE_PROP = "Scale";
 
 using namespace phosphor::logging;
 
@@ -1012,20 +1011,15 @@
         auto service = ipmi::getService(bus, SENSOR_VALUE_INTF, objectPath);
 
         // Read the sensor value and scale properties
-        auto properties = ipmi::getAllDbusProperties(bus, service, objectPath,
-                                                     SENSOR_VALUE_INTF);
-        auto value = std::get<int64_t>(properties[SENSOR_VALUE_PROP]);
-        auto scale = std::get<int64_t>(properties[SENSOR_SCALE_PROP]);
-
-        // Power reading needs to be scaled with the Scale value using the
-        // formula Value * 10^Scale.
-        power = value * std::pow(10, scale);
+        auto value = ipmi::getDbusProperty(
+            bus, service, objectPath, SENSOR_VALUE_INTF, SENSOR_VALUE_PROP);
+        power = std::get<double>(value);
     }
     catch (const std::exception& e)
     {
-        log<level::INFO>("Failure to read power value from D-Bus object",
-                         entry("OBJECT_PATH=%s", objectPath.c_str()),
-                         entry("INTERFACE=%s", SENSOR_VALUE_INTF));
+        log<level::ERR>("Failure to read power value from D-Bus object",
+                        entry("OBJECT_PATH=%s", objectPath.c_str()),
+                        entry("INTERFACE=%s", SENSOR_VALUE_INTF));
     }
     return power;
 }