commit 6d6d1e8d1dfc1d9ebd5aea72566993ce96da2794
author George Liu <liuxiwei@inspur.com> Tue Feb 16 11:08:55 2021 +0800
committer Sampa Misra <sampmisr@in.ibm.com> Wed Feb 24 12:39:21 2021 +0000
tree 39758118b6fa4f897d6e16b55ad56aec154176ce
parent a2767e689d5bd3d2537034d32518ece88d55bdab

Fix BIOS to allow updating attributers via D-Bus

BIOS attribute is changed by pending attributes and the new value
should be shown in D-Bus.
Also BaseBIOSTable should be updated.

Tested:
busctl call xyz.openbmc_project.BIOSConfigManager /xyz/openbmc_project/bios_config/manager org.freedesktop.DBus.Properties Set ssv xyz.openbmc_project.BIOSConfig.Manager PendingAttributes a{s\(sv\)} 1 "pvm_stop_at_standby" "xyz.openbmc_project.BIOSConfig.Manager.AttributeType.Enumeration" s "Enabled"

busctl get-property xyz.openbmc_project.BIOSConfigManager /xyz/openbmc_project/bios_config/manager xyz.openbmc_project.BIOSConfig.Manager BaseBIOSTable --verbose
```
DICT_ENTRY "s(sbsssvva(sv))" {
                STRING "pvm_stop_at_standby";
                STRUCT "sbsssvva(sv)" {
                        STRING "xyz.openbmc_project.BIOSConfig.Manager.AttributeType.Enumeration";
                        BOOLEAN false;
                        STRING "pvm_stop_at_standby";
                        STRING "pvm_stop_at_standby";
                        STRING "";
                        VARIANT "s" {
                                STRING "Enabled";
                        };
                        VARIANT "s" {
                                STRING "Enabled";
                        };
                        ARRAY "(sv)" {
                                STRUCT "sv" {
                                        STRING "xyz.openbmc_project.BIOSConfig.Manager.BoundType.OneOf";
                                        VARIANT "s" {
                                                STRING "Disabled";
                                        };
                                };
                                STRUCT "sv" {
                                        STRING "xyz.openbmc_project.BIOSConfig.Manager.BoundType.OneOf";
                                        VARIANT "s" {
                                                STRING "Enabled";
                                        };
                                };
                        };
                };
        };
```

Signed-off-by: George Liu <liuxiwei@inspur.com>
Change-Id: I74ee9ff843fa9d588f94e4334d015cf55b52aea6

libpldmresponder/bios_enum_attribute.cpp

diff --git a/libpldmresponder/bios_enum_attribute.cpp b/libpldmresponder/bios_enum_attribute.cpp
index 0808898..7d7cacf 100644
--- a/libpldmresponder/bios_enum_attribute.cpp
+++ b/libpldmresponder/bios_enum_attribute.cpp
@@ -149,21 +149,13 @@
 
 uint8_t BIOSEnumAttribute::getAttrValueIndex(const PropertyValue& propValue)
 {
-    auto defaultValueIndex = getValueIndex(defaultValue, possibleValues);
-
     try
     {
-        auto iter = valMap.find(propValue);
-        if (iter == valMap.end())
-        {
-            return defaultValueIndex;
-        }
-        auto currentValue = iter->second;
-        return getValueIndex(currentValue, possibleValues);
+        return getValueIndex(std::get<std::string>(propValue), possibleValues);
     }
     catch (const std::exception& e)
     {
-        return defaultValueIndex;
+        return getValueIndex(defaultValue, possibleValues);
     }
 }
 
@@ -180,7 +172,6 @@
     auto currHdls = table::attribute_value::decodeEnumEntry(attrValueEntry);
 
     assert(currHdls.size() == 1);
-
     auto valueString = stringTable.findString(pvHdls[currHdls[0]]);
 
     auto it = std::find_if(valMap.begin(), valMap.end(),
@@ -271,14 +262,10 @@
     entry->attr_type = 0;
     entry->value[0] = 1; // number of current values, default 1
 
-    if (readOnly)
+    if (readOnly || !dBusMap.has_value())
     {
         entry->value[1] = getValueIndex(defaultValue, possibleValues);
     }
-    else if (!dBusMap.has_value())
-    {
-        entry->value[1] = getValueIndex(value, possibleValues);
-    }
     else
     {
         entry->value[1] = getAttrValueIndex(value);