Fix - BIOS version on Redfish
Even though SMBIOS populating bios_active version, Set BIOS ID IPMI
command is failing to set the bios_active version. This change support
to populate bios_acvite version on BMC.
Tested:
Verified using Redfish and EWS. BIOS version populated as expected.
Signed-off-by: Jayaprakash Mutyala <mutyalax.jayaprakash@intel.com>
Change-Id: If9df1297e7289847ca0e57cbadf128112eeced92
diff --git a/include/system.hpp b/include/system.hpp
index 091f4cb..80822e2 100644
--- a/include/system.hpp
+++ b/include/system.hpp
@@ -45,6 +45,7 @@
sdbusplus::server::object_t<
sdbusplus::xyz::openbmc_project::Common::server::UUID>(
bus, objPath.c_str()),
+ bus(bus),
sdbusplus::server::object_t<sdbusplus::xyz::openbmc_project::Inventory::
Decorator::server::Revision>(
bus, objPath.c_str()),
@@ -58,6 +59,7 @@
std::string uuid(std::string value) override;
std::string version(std::string value) override;
+ sdbusplus::bus_t& bus;
private:
/** @brief Path of the group instance */
diff --git a/src/system.cpp b/src/system.cpp
index 532d979..e4ea038 100644
--- a/src/system.cpp
+++ b/src/system.cpp
@@ -22,6 +22,13 @@
#include <iomanip>
#include <iostream>
#include <sstream>
+
+static constexpr const char* biosActiveObjPath =
+ "/xyz/openbmc_project/software/bios_active";
+static constexpr const char* biosVersionIntf =
+ "xyz.openbmc_project.Software.Version";
+static constexpr const char* biosVersionProp = "Version";
+
namespace phosphor
{
namespace smbios
@@ -62,6 +69,57 @@
"00000000-0000-0000-0000-000000000000");
}
+static std::string getService(sdbusplus::bus::bus& bus,
+ const std::string& objectPath,
+ const std::string& interface)
+{
+ auto method =
+ bus.new_method_call("xyz.openbmc_project.ObjectMapper",
+ "/xyz/openbmc_project/object_mapper",
+ "xyz.openbmc_project.ObjectMapper", "GetObject");
+
+ method.append(objectPath);
+ method.append(std::vector<std::string>({interface}));
+
+ std::vector<std::pair<std::string, std::vector<std::string>>> response;
+
+ try
+ {
+ auto reply = bus.call(method);
+ reply.read(response);
+ }
+ catch (const sdbusplus::exception_t& e)
+ {
+ lg2::error("Error in mapper method call - {ERROR}, SERVICE - "
+ "{SERVICE}, PATH - {PATH}",
+ "ERROR", e.what(), "SERVICE", objectPath.c_str(), "PATH",
+ interface.c_str());
+
+ return std::string{};
+ }
+
+ return response[0].first;
+}
+
+static void setProperty(sdbusplus::bus::bus& bus, const std::string& objectPath,
+ const std::string& interface,
+ const std::string& propertyName,
+ const std::string& value)
+{
+ auto service = getService(bus, objectPath, interface);
+ if (service.empty())
+ {
+ return;
+ }
+
+ auto method = bus.new_method_call(service.c_str(), objectPath.c_str(),
+ "org.freedesktop.DBus.Properties", "Set");
+ method.append(interface.c_str(), propertyName.c_str(),
+ std::variant<std::string>{value});
+
+ bus.call_noreply(method);
+}
+
std::string System::version(std::string value)
{
std::string result = "No BIOS Version";
@@ -91,8 +149,12 @@
server::Revision::version(result);
}
result = tempS;
+
+ setProperty(bus, biosActiveObjPath, biosVersionIntf, biosVersionProp,
+ result);
}
lg2::info("VERSION INFO - BIOS - {VER}", "VER", result);
+
return sdbusplus::xyz::openbmc_project::Inventory::Decorator::server::
Revision::version(result);
}