commit 56b0e66dbabcb2910506ecaa6f33df1a7d58ff69
author ankita prasad <ankita.prasad@intel.com> Wed Aug 09 12:46:54 2023 +0000
committer ankita prasad <ankita.prasad@intel.com> Tue Aug 22 15:24:43 2023 +0000
tree 0c86096b57b1f40fa6962696159334df1d092a8e
parent be13259dd6f1dc2fac52792be091c97d7223596f

Update the PFR CPLD Version format

1. Removing the support of Main CPLD GPIO Lines as it was unused.
   The new format is  <RoTRev.RoTSVN>-<RoT HASH>
2. Updating the URI for cpld_active. The updated URI is -
   /redfish/v1/UpdateService/FirmwareInventory/rot_fw_active

Tested: Flashed the changes on the BMC.

Journal logs from BMC -
journalctl | grep pfr-manager
root@bmc-maca4bf018ceb52:~# journalctl | grep pfr-manager
Aug 10 12:08:23 bmc-maca4bf018ceb52 pfr-manager[535]: VERSION INFO - rot_fw_active - 3.0-0bbd19caa386faaa5802f21bc90ca557090413a788f9d098d5b346f08055c205
Aug 10 12:08:23 bmc-maca4bf018ceb52 pfr-manager[535]: VERSION INFO - bmc_recovery - 0.31-0-g1b1e1c
Aug 10 12:08:23 bmc-maca4bf018ceb52 pfr-manager[535]: VERSION INFO - rot_fw_recovery - 3.0
Aug 10 12:08:23 bmc-maca4bf018ceb52 pfr-manager[535]: Intel PFR service started successfully

Redfish Logs with the updated URi -

{
    "@odata.id": "/redfish/v1/UpdateService/FirmwareInventory/rot_fw_active",
    "@odata.type": "#SoftwareInventory.v1_1_0.SoftwareInventory",
    "Description": "Other image",
    "Id": "rot_fw_active",
    "Name": "Software Inventory",
    "Status": {
        "Health": "OK",
        "HealthRollup": "OK",
        "State": "Enabled"
    },
    "Updateable": false,
    "Version": "3.0-0bbd19caa386faaa5802f21bc90ca557090413a788f9d098d5b346f08055c205"
}

Change-Id: Iffde0324700b38ce01cd7fc3081c32000fbfc33a
Signed-off-by: Ankita Prasad <ankita.prasad@intel.com>

service/src/mainapp.cpp

diff --git a/service/src/mainapp.cpp b/service/src/mainapp.cpp
index ee21db1..fc3f75a 100644
--- a/service/src/mainapp.cpp
+++ b/service/src/mainapp.cpp
@@ -49,7 +49,7 @@
                         versionPurposeBMC),
         std::make_tuple("bios_recovery", ImageType::biosRecovery,
                         versionPurposeHost),
-        std::make_tuple("cpld_recovery", ImageType::cpldRecovery,
+        std::make_tuple("rot_fw_recovery", ImageType::cpldRecovery,
                         versionPurposeOther),
         std::make_tuple("afm_active", ImageType::afmActive,
                         versionPurposeOther),
@@ -570,19 +570,19 @@
 static void updateCPLDversion(std::shared_ptr<sdbusplus::asio::connection> conn)
 {
     std::string cpldVersion = pfr::readCPLDVersion();
-    lg2::info("VERSION INFO - cpld_active - {VER}", "VER", cpldVersion);
+    lg2::info("VERSION INFO - rot_fw_active - {VER}", "VER", cpldVersion);
     conn->async_method_call(
         [](const boost::system::error_code ec) {
         if (ec)
         {
             phosphor::logging::log<phosphor::logging::level::ERR>(
-                "Unable to update cpld_active version",
+                "Unable to update rot_fw_active version",
                 phosphor::logging::entry("MSG=%s", ec.message().c_str()));
             return;
         }
         },
         "xyz.openbmc_project.Settings",
-        "/xyz/openbmc_project/software/cpld_active",
+        "/xyz/openbmc_project/software/rot_fw_active",
         "org.freedesktop.DBus.Properties", "Set",
         "xyz.openbmc_project.Software.Version", "Version",
         std::variant<std::string>(cpldVersion));
@@ -665,7 +665,7 @@
 
             // Update the D-Bus properties.
             updateDbusPropertiesCache();
-            // Update CPLD Version to cpld_active object in settings.
+            // Update CPLD Version to rot_fw_active object in settings.
             updateCPLDversion(conn);
         }
         retrCount--;
@@ -686,7 +686,7 @@
 
     pfr::checkPFRandAddObjects(server, conn);
 
-    // Update CPLD Version to cpld_active object in settings.
+    // Update CPLD Version to rot_fw_active object in settings.
     pfr::updateCPLDversion(conn);
 
     server.add_manager("/xyz/openbmc_project/pfr");