commit 8292dc60eff82446ec6ee23cc049d6a7f6eb1ab8
author Vikram Bodireddy <vikram.bodireddy@linux.intel.com> Wed May 26 13:31:47 2021 +0530
committer Vikram Bodireddy <vikram.bodireddy@linux.intel.com> Thu May 27 23:51:55 2021 +0530
tree f01e0d2ec3cc04a1dd2ae2a0f2427910931d7fd8
parent 2dfaf507da581ed4c71d41c02976e4efafc1d634

Add version support for AFM

This change adds AFM version support under FirmwareInventory.

Tested: D-Bus version objects are created and also it's shown
        up under FirmwareInventory.

root@intel-obmc:/tmp# busctl tree xyz.openbmc_project.PFR.Manager
└─/xyz
  └─/xyz/openbmc_project
    ├─/xyz/openbmc_project/pfr
    └─/xyz/openbmc_project/software
      ├─/xyz/openbmc_project/software/afm_active
      ├─/xyz/openbmc_project/software/afm_recovery
      ├─/xyz/openbmc_project/software/bios_recovery
      ├─/xyz/openbmc_project/software/bmc_recovery
      └─/xyz/openbmc_project/software/cpld_recovery

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

Signed-off-by: Vikram Bodireddy <vikram.bodireddy@linux.intel.com>
Change-Id: I4233803354d686a736a2614e9f205b294d39f8d6

service/src/pfr_mgr.cpp

diff --git a/service/src/pfr_mgr.cpp b/service/src/pfr_mgr.cpp
index 479cf5f..5245075 100644
--- a/service/src/pfr_mgr.cpp
+++ b/service/src/pfr_mgr.cpp
@@ -61,7 +61,7 @@
 
     if ((imgType == ImageType::bmcActive) ||
         (imgType == ImageType::biosActive) ||
-        (imgType == ImageType::cpldActive))
+        (imgType == ImageType::cpldActive) || (imgType == ImageType::afmActive))
     {
         // Running images so set Activations to "Active"
         activation =
@@ -75,7 +75,8 @@
         // BIOS version is read from SMBIOS. Since it provides more
         // version information, Lets expose those as functional.
         // Down the line, Redundant inventory objects need to be addressed.
-        if (imgType == ImageType::cpldActive)
+        if ((imgType == ImageType::cpldActive) ||
+            (imgType == ImageType::afmActive))
         {
             associations.emplace("functional", "software_version", objPath);
         }