1 files changed, 173 insertions, 0 deletions
diff --git a/meta-openbmc-mods/meta-common/recipes-phosphor/configuration/entity-manager/0002-Entity-manager-Add-support-to-update-assetTag.patch b/meta-openbmc-mods/meta-common/recipes-phosphor/configuration/entity-manager/0002-Entity-manager-Add-support-to-update-assetTag.patch
new file mode 100644
index 000000000..8682e2cad
--- /dev/null
+++ b/meta-openbmc-mods/meta-common/recipes-phosphor/configuration/entity-manager/0002-Entity-manager-Add-support-to-update-assetTag.patch
@@ -0,0 +1,173 @@
+From ff5dbca96d12b1c2aaaec0bb891125990af3f218 Mon Sep 17 00:00:00 2001
+From: mansijos <mansi.joshi@intel.com>
+Date: Tue, 6 Apr 2021 02:12:56 +0530
+Subject: [PATCH] Entity-manager: Add support to update assetTag
+
+Asset tag is an updateable property from User level interface like
+Redfish. User-level interface will update Asset tag in entity-manager,
+which will further update the needed FRU interface property exposed.
+
+Tested:
+Successfully updated in assetTag interface as well as in fru interface
+while using set-property and using redfish as well.
+The new value is preserved after BMC resets.
+
+Change-Id: If7fbfd8325488280f500ab0e2c8b38475813cc3f
+Signed-off-by: mansijos <mansi.joshi@intel.com>
+---
+ src/EntityManager.cpp | 92 +++++++++++++++++++++++++++++++++++++++++--
+ 1 file changed, 88 insertions(+), 4 deletions(-)
+
+diff --git a/src/EntityManager.cpp b/src/EntityManager.cpp
+index 932b6f9..67b8f95 100644
+--- a/src/EntityManager.cpp
++++ b/src/EntityManager.cpp
+@@ -47,9 +47,17 @@ constexpr const char* lastConfiguration = "/tmp/configuration/last.json";
+ constexpr const char* currentConfiguration = "/var/configuration/system.json";
+ constexpr const char* globalSchema = "global.json";
+ constexpr const int32_t MAX_MAPPER_DEPTH = 0;
++constexpr const char* foundObject = "FoundProbe";
+ 
+ constexpr const bool DEBUG = false;
+ 
++using foundProbeData = std::map<std::string, std::string>;
++static foundProbeData foundData;
++static std::map<std::string, foundProbeData> mapFoundData;
++
++constexpr const char* fruConn = "xyz.openbmc_project.FruDevice";
++constexpr const char* fruIntf = "xyz.openbmc_project.FruDevice";
++
+ struct cmp_str
+ {
+     bool operator()(const char* a, const char* b) const
+@@ -575,6 +583,43 @@ void addArrayToDbus(const std::string& name, const nlohmann::json& array,
+     }
+ }
+ 
++template <typename PropertyType>
++bool persistAssetTag(const PropertyType& newVal,
++                     const std::string& jsonPointerString)
++{
++    std::size_t found = jsonPointerString.find_last_of("/\\");
++    std::string jsonPointerPath = jsonPointerString.substr(0, found);
++
++    auto it = mapFoundData.find(jsonPointerPath);
++    if (it == mapFoundData.end())
++    {
++        std::cerr << "Error in finding jsonPointerPath in mapFoundData"
++                  << "\n";
++        return false;
++    }
++
++    foundProbeData& tmpMap = it->second;
++    auto foundPath = tmpMap.find("foundPath");
++    if (foundPath == tmpMap.end())
++    {
++        std::cerr << "No prob object data is avaliable in foundProbeData"
++                  << "\n";
++        return false;
++    }
++
++    SYSTEM_BUS->async_method_call(
++        [](const boost::system::error_code& ec) {
++            if (ec)
++            {
++                std::cerr << "Error setting AssetTag in FRU interface " << ec
++                          << "\n";
++            }
++        },
++        fruConn, foundPath->second, "org.freedesktop.DBus.Properties", "Set",
++        fruIntf, "PRODUCT_ASSET_TAG", std::variant<PropertyType>(newVal));
++    return true;
++}
++
+ template <typename PropertyType>
+ void addProperty(const std::string& propertyName, const PropertyType& value,
+                  sdbusplus::asio::dbus_interface* iface,
+@@ -589,9 +634,18 @@ void addProperty(const std::string& propertyName, const PropertyType& value,
+     }
+     iface->register_property(
+         propertyName, value,
+-        [&systemConfiguration,
++        [propertyName, &systemConfiguration,
+          jsonPointerString{std::string(jsonPointerString)}](
+             const PropertyType& newVal, PropertyType& val) {
++            if (propertyName == "AssetTag")
++            {
++                if (!persistAssetTag(newVal, jsonPointerString))
++                {
++                    std::cerr << "error setting AssetTag in FRU interface\n";
++                    return -1;
++                }
++            }
++
+             val = newVal;
+             if (!setJsonFromPointer(jsonPointerString, val,
+                                     systemConfiguration))
+@@ -989,6 +1043,9 @@ void postToDbus(const nlohmann::json& newConfiguration,
+         populateInterfaceFromJson(systemConfiguration, jsonPointerPath,
+                                   boardIface, boardValues, objServer);
+         jsonPointerPath += "/";
++
++        std::string foundPath;
++
+         // iterate through board properties
+         for (auto& boardField : boardValues.items())
+         {
+@@ -998,9 +1055,28 @@ void postToDbus(const nlohmann::json& newConfiguration,
+                     createInterface(objServer, boardName, boardField.key(),
+                                     boardKeyOrig);
+ 
+-                populateInterfaceFromJson(systemConfiguration,
+-                                          jsonPointerPath + boardField.key(),
+-                                          iface, boardField.value(), objServer);
++                if (boardField.key() == "FoundProbe")
++                {
++                    foundPath = boardField.value()["Path"];
++                }
++                if (boardField.key() ==
++                    "xyz.openbmc_project.Inventory.Decorator.AssetTag")
++                {
++                    foundData["foundPath"] = foundPath;
++                    mapFoundData[jsonPointerPath + boardField.key()] =
++                        foundData;
++
++                    populateInterfaceFromJson(
++                        systemConfiguration, jsonPointerPath + boardField.key(),
++                        iface, boardField.value(), objServer,
++                        sdbusplus::asio::PropertyPermission::readWrite);
++                }
++                else
++                {
++                    populateInterfaceFromJson(
++                        systemConfiguration, jsonPointerPath + boardField.key(),
++                        iface, boardField.value(), objServer);
++                }
+             }
+         }
+ 
+@@ -1349,6 +1425,10 @@ void PerformScan::run()
+                                 continue;
+                             }
+ 
++                            nlohmann::json recordVal = *recordPtr;
++                            // Save the dbus path info of the device
++                            recordVal[foundObject]["Path"] = std::get<1>(*itr);
++
+                             int index = std::stoi(
+                                 nameIt->get<std::string>().substr(indexIdx),
+                                 nullptr, 0);
+@@ -1421,6 +1501,10 @@ void PerformScan::run()
+                         }
+                     }
+ 
++                    // Save the dbus path info of the device
++                    record[foundObject]["Path"] =
++                        std::get<1>(foundDeviceAndPath);
++
+                     if (replaceStr)
+                     {
+                         std::cerr << "Duplicates found, replacing "
+-- 
+2.17.1
+