commit 1f0193ff4fbddf4908cfa2c967c493100b37c0b7
author Anwaar Hadi <anwaar.hadi@ibm.com> Tue May 13 21:05:12 2025 +0000
committer Shawn McCarney <shawnmm@us.ibm.com> Thu May 15 14:47:01 2025 +0000
tree fd7b41828b76ca19570e65dcf7c36eee3e6f5c1d
parent 298c0e79b83fbd5d152dc4a73ce39352cc5f68e5

Move power-supply and power-sequencer to lg2

Update the logging API for files in power-supply and
power-sequencer from the older phosphor::logging::log style of
journal traces to the newer lg2::log style.

Tested:
* Verified commit passed CI unit tests.
* Verified commit built using bitbake.

Change-Id: I4436b5a422ff4cb64bedcd357f632b99837627d4
Signed-off-by: Anwaar Hadi <anwaar.hadi@ibm.com>

power-sequencer/ucd90160.cpp

diff --git a/power-sequencer/ucd90160.cpp b/power-sequencer/ucd90160.cpp
index 1b2be11..e8868e8 100644
--- a/power-sequencer/ucd90160.cpp
+++ b/power-sequencer/ucd90160.cpp
@@ -21,7 +21,7 @@
 #include <elog-errors.hpp>
 #include <org/open_power/Witherspoon/Fault/error.hpp>
 #include <phosphor-logging/elog.hpp>
-#include <phosphor-logging/log.hpp>
+#include <phosphor-logging/lg2.hpp>
 #include <xyz/openbmc_project/Common/Device/error.hpp>
 
 #include <map>
@@ -137,9 +137,9 @@
         // warnings so they won't cause errors
         if (vout)
         {
-            log<level::INFO>("A voltage rail has bits on in STATUS_VOUT",
-                             entry("STATUS_VOUT=0x%X", vout),
-                             entry("PAGE=%d", page));
+            lg2::info("A voltage rail has bits on in STATUS_VOUT,"
+                      "STATUS_VOUT={STATUS_VOUT}. PAGE={PAGE}",
+                      "STATUS_VOUT", lg2::hex, vout, "PAGE", page);
         }
 
         // Log errors if any non-warning bits on
@@ -158,7 +158,7 @@
             }
             catch (const device_error::ReadFailure& e)
             {
-                log<level::ERR>("ReadFailure when collecting metadata");
+                lg2::error("ReadFailure when collecting metadata");
                 commit<device_error::ReadFailure>();
             }
 
@@ -225,7 +225,7 @@
         {
             if (!accessError)
             {
-                log<level::ERR>(e.what());
+                lg2::error("Access Error Exception: {ERROR}", "ERROR", e);
                 accessError = true;
             }
             continue;
@@ -256,7 +256,7 @@
             }
             catch (const device_error::ReadFailure& e)
             {
-                log<level::ERR>("ReadFailure when collecting metadata");
+                lg2::error("ReadFailure when collecting metadata");
                 commit<device_error::ReadFailure>();
             }
 
@@ -287,7 +287,7 @@
     }
     catch (const device_error::ReadFailure& e)
     {
-        log<level::ERR>("ReadFailure when collecting metadata");
+        lg2::error("ReadFailure when collecting metadata");
         commit<device_error::ReadFailure>();
     }
 
@@ -319,8 +319,8 @@
 
     if (gpioDevicePath.empty())
     {
-        log<level::ERR>("Could not find GPIO device path",
-                        entry("BASE_PATH=%s", path.c_str()));
+        lg2::error("Could not find GPIO device path, BASE_PATH={BASE_PATH}",
+                   "BASE_PATH", path);
     }
 
     return gpioDevicePath;
@@ -359,9 +359,9 @@
 
     if (device.empty())
     {
-        log<level::ERR>(
-            "Missing GPIO device - cannot do GPIO analysis of fault",
-            entry("ANALYSIS_TYPE=%d\n", type));
+        lg2::error(
+            "Missing GPIO device - cannot do GPIO analysis of fault, ANALYSIS_TYPE={ANALYSIS_TYPE}",
+            "ANALYSIS_TYPE", type);
         return errorFound;
     }
 
@@ -387,9 +387,9 @@
             if (!gpioAccessError)
             {
                 // GPIO only throws InternalErrors - not worth committing.
-                log<level::ERR>(
-                    "GPIO read failed while analyzing a power fault",
-                    entry("CHIP_PATH=%s", path.c_str()));
+                lg2::error(
+                    "GPIO read failed while analyzing a power fault, CHIP_PATH={CHIP_PATH}",
+                    "CHIP_PATH", path);
 
                 gpioAccessError = true;
             }
@@ -450,7 +450,7 @@
     }
     catch (const device_error::ReadFailure& e)
     {
-        log<level::ERR>("ReadFailure when collecting metadata");
+        lg2::error("ReadFailure when collecting metadata");
         commit<device_error::ReadFailure>();
     }
 
@@ -472,7 +472,7 @@
     }
     catch (const device_error::ReadFailure& e)
     {
-        log<level::ERR>("ReadFailure when collecting metadata");
+        lg2::error("ReadFailure when collecting metadata");
         commit<device_error::ReadFailure>();
     }
 
@@ -494,7 +494,7 @@
     }
     catch (const device_error::ReadFailure& e)
     {
-        log<level::ERR>("ReadFailure when collecting metadata");
+        lg2::error("ReadFailure when collecting metadata");
         commit<device_error::ReadFailure>();
     }