commit 5cf320c39ff4ca7b75e636a56a8f559506f2ca7a
author Alex Schendel <alex.schendel@intel.com> Thu Dec 09 12:11:04 2021 -0800
committer Alex Schendel <alex.schendel@intel.com> Thu Feb 10 18:19:00 2022 +0000
tree b7d6363da818d40f0092b9bec24d731036ae816e
parent f89de47109809797c5913e4b6c66485146ab30a1

Add FW Version in journalctl log

Adds version logging for AFM and CPLD active and recovery versions as well
as BMC and BIOS recovery versions on every AC cycle and BMC reboot.
Log format: VERSION INFO - <ITEM>_<RECOVERY/ACTIVE> - <version info>
Where <ITEM> is "afm" "bmc", "bios", or "cpld"
and <RECOVERY/ACTIVE> will specify "recovery" or "active" depending on
if the version is the recovery version or the active version,
respectively.
If any version is empty, e.g. "0.0", then it is not printed.
User can retrieve FW versions by running:
journalctl | grep "VERSION INFO"

Tested:
AC Cycle:
VERSION INFO - cpld_active - xx.x-x.x-xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
xxxxxxxxxxxxxxxxxxxxxx
VERSION INFO - bmc_recovery - x.xx-xx-xxxxxxx
VERSION INFO - bios_recovery - x.x
VERSION INFO - cpld_recovery - x.x
VERSION INFO - afm_active - x.x
VERSION INFO - afm_recovery - x.x

BMC reboot:
VERSION INFO - cpld_active - xx.x-x.x-xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
xxxxxxxxxxxxxxxxxxxxxx
VERSION INFO - bmc_recovery - x.xx-xx-xxxxxxx
VERSION INFO - bios_recovery - xxx.xxx
VERSION INFO - cpld_recovery - x.x
VERSION INFO - afm_active - x.x
VERSION INFO - afm_recovery - x.x

Change-Id: I955bc67a9cdc6d53a422d70ee999781cb6e22b08
Signed-off-by: Alex Schendel <alex.schendel@intel.com>

service/inc/pfr_mgr.hpp

diff --git a/service/inc/pfr_mgr.hpp b/service/inc/pfr_mgr.hpp
index c8211d4..c0d6fd5 100644
--- a/service/inc/pfr_mgr.hpp
+++ b/service/inc/pfr_mgr.hpp
@@ -19,6 +19,7 @@
 #include "pfr.hpp"
 
 #include <boost/asio.hpp>
+#include <phosphor-logging/lg2.hpp>
 #include <phosphor-logging/log.hpp>
 #include <sdbusplus/asio/object_server.hpp>
 

service/src/mainapp.cpp

diff --git a/service/src/mainapp.cpp b/service/src/mainapp.cpp
index 5560d5f..0a986f5 100644
--- a/service/src/mainapp.cpp
+++ b/service/src/mainapp.cpp
@@ -556,6 +556,7 @@
 static void updateCPLDversion(std::shared_ptr<sdbusplus::asio::connection> conn)
 {
     std::string cpldVersion = pfr::readCPLDVersion();
+    lg2::info("VERSION INFO - cpld_active - {VER}", "VER", cpldVersion);
     conn->async_method_call(
         [](const boost::system::error_code ec) {
             if (ec)

service/src/pfr_mgr.cpp

diff --git a/service/src/pfr_mgr.cpp b/service/src/pfr_mgr.cpp
index e2fdbfd..2fc73fd 100644
--- a/service/src/pfr_mgr.cpp
+++ b/service/src/pfr_mgr.cpp
@@ -19,6 +19,10 @@
 namespace pfr
 {
 
+inline void printVersion(const std::string& path, const std::string& version)
+{
+    lg2::info("VERSION INFO - {TYPE} - {VER}", "TYPE", path, "VER", version);
+}
 static constexpr uint8_t activeImage = 0;
 static constexpr uint8_t recoveryImage = 1;
 
@@ -34,6 +38,11 @@
 {
     version = getFirmwareVersion(imgType);
 
+    if (!(version == "0.0" || version.empty()))
+    {
+        printVersion(path, version);
+    }
+
     std::string objPath = "/xyz/openbmc_project/software/" + path;
     versionIface =
         server.add_interface(objPath, "xyz.openbmc_project.Software.Version");
@@ -112,6 +121,7 @@
     if (versionIface && versionIface->is_initialized())
     {
         std::string ver = getFirmwareVersion(imgType);
+        printVersion(path, ver);
         internalSet = true;
         versionIface->set_property(versionStr, ver);
         internalSet = false;