Update to internal

Signed-off-by: Ed Tanous <ed.tanous@intel.com>

5 files changed, 621 insertions, 1 deletions

diff --git a/meta-openbmc-mods/meta-common/recipes-phosphor/ipmi/phosphor-ipmi-host/0056-add-SetInProgress-to-get-set-boot-option-cmd.patch b/meta-openbmc-mods/meta-common/recipes-phosphor/ipmi/phosphor-ipmi-host/0056-add-SetInProgress-to-get-set-boot-option-cmd.patch
new file mode 100644
index 000000000..3a77887a0
--- /dev/null
+++ b/meta-openbmc-mods/meta-common/recipes-phosphor/ipmi/phosphor-ipmi-host/0056-add-SetInProgress-to-get-set-boot-option-cmd.patch
@@ -0,0 +1,102 @@
+From 949db3a985719335d3df77db368eb2b296756749 Mon Sep 17 00:00:00 2001
+From: "Jia, chunhui" <chunhui.jia@linux.intel.com>
+Date: Tue, 19 Mar 2019 16:09:06 +0800
+Subject: [PATCH] add SetInProgress to get/set boot option cmd
+
+It is required by BIOS. BIOS will check setinprogress first.
+If this flag is not supported, BIOS will bypass all boot
+option flow.
+
+Change-Id: Ibb0501ea5bc36c4f1f72339efef03724dd4e613f
+Signed-off-by: Jia, chunhui <chunhui.jia@linux.intel.com>
+---
+ chassishandler.cpp | 26 +++++++++++++++++++++++++-
+ chassishandler.hpp |  3 +++
+ 2 files changed, 28 insertions(+), 1 deletion(-)
+
+diff --git a/chassishandler.cpp b/chassishandler.cpp
+index 6d14d1b..553afa8 100644
+--- a/chassishandler.cpp
++++ b/chassishandler.cpp
+@@ -1351,6 +1351,10 @@ static ipmi_ret_t setBootMode(const Mode::Modes& mode)
+     return IPMI_CC_OK;
+ }
+ 
++static constexpr uint8_t setComplete = 0x0;
++static constexpr uint8_t setInProgress = 0x1;
++static uint8_t transferStatus = setComplete;
++
+ ipmi_ret_t ipmi_chassis_get_sys_boot_options(ipmi_netfn_t netfn, ipmi_cmd_t cmd,
+                                              ipmi_request_t request,
+                                              ipmi_response_t response,
+@@ -1365,11 +1369,21 @@ ipmi_ret_t ipmi_chassis_get_sys_boot_options(ipmi_netfn_t netfn, ipmi_cmd_t cmd,
+     get_sys_boot_options_t* reqptr = (get_sys_boot_options_t*)request;
+     IpmiValue bootOption = ipmiDefault;
+ 
++    if (reqptr->parameter ==
++        static_cast<uint8_t>(BootOptionParameter::SET_IN_PROGRESS))
++    {
++        *data_len =
++            static_cast<uint8_t>(BootOptionResponseSize::SET_IN_PROGRESS);
++        resp->version = SET_PARM_VERSION;
++        resp->parm = static_cast<uint8_t>(BootOptionParameter::SET_IN_PROGRESS);
++        resp->data[0] = transferStatus;
++        return IPMI_CC_OK;
++    }
++
+     std::memset(resp, 0, sizeof(*resp));
+     resp->version = SET_PARM_VERSION;
+     resp->parm = 5;
+     resp->data[0] = SET_PARM_BOOT_FLAGS_VALID_ONE_TIME;
+-
+     /*
+      * Parameter #5 means boot flags. Please refer to 28.13 of ipmi doc.
+      * This is the only parameter used by petitboot.
+@@ -1505,6 +1519,16 @@ ipmi_ret_t ipmi_chassis_set_sys_boot_options(ipmi_netfn_t netfn, ipmi_cmd_t cmd,
+     // This IPMI command does not have any resposne data
+     *data_len = 0;
+ 
++    if (reqptr->parameter ==
++        static_cast<uint8_t>(BootOptionParameter::SET_IN_PROGRESS))
++    {
++        if (transferStatus == setInProgress) {
++            return IPMI_CC_FAIL_SET_IN_PROGRESS;
++        }
++        transferStatus = reqptr->data[0];
++        return IPMI_CC_OK;
++    }
++
+     /*  000101
+      * Parameter #5 means boot flags. Please refer to 28.13 of ipmi doc.
+      * This is the only parameter used by petitboot.
+diff --git a/chassishandler.hpp b/chassishandler.hpp
+index 2c42b11..6a24507 100644
+--- a/chassishandler.hpp
++++ b/chassishandler.hpp
+@@ -28,6 +28,7 @@ enum ipmi_chassis_return_codes
+ {
+     IPMI_OK = 0x0,
+     IPMI_CC_PARM_NOT_SUPPORTED = 0x80,
++    IPMI_CC_FAIL_SET_IN_PROGRESS = 0x81,
+ };
+ 
+ // Generic completion codes,
+@@ -49,6 +50,7 @@ enum ipmi_chassis_control_cmds : uint8_t
+ };
+ enum class BootOptionParameter : size_t
+ {
++    SET_IN_PROGRESS = 0x0,
+     BOOT_INFO = 0x4,
+     BOOT_FLAGS = 0x5,
+     OPAL_NETWORK_SETTINGS = 0x61
+@@ -56,6 +58,7 @@ enum class BootOptionParameter : size_t
+ 
+ enum class BootOptionResponseSize : size_t
+ {
++    SET_IN_PROGRESS = 3,
+     BOOT_FLAGS = 5,
+     OPAL_NETWORK_SETTINGS = 50
+ };
+-- 
+2.16.2
+
diff --git a/meta-openbmc-mods/meta-common/recipes-phosphor/ipmi/phosphor-ipmi-host/0057-Add-timer-use-actions-support.patch b/meta-openbmc-mods/meta-common/recipes-phosphor/ipmi/phosphor-ipmi-host/0057-Add-timer-use-actions-support.patch
new file mode 100644
index 000000000..5813cceae
--- /dev/null
+++ b/meta-openbmc-mods/meta-common/recipes-phosphor/ipmi/phosphor-ipmi-host/0057-Add-timer-use-actions-support.patch
@@ -0,0 +1,195 @@
+From 6e37e02a4f200507627a82f6dba00a9c9d877cb2 Mon Sep 17 00:00:00 2001
+From: Yong Li <yong.b.li@linux.intel.com>
+Date: Mon, 18 Mar 2019 23:05:16 +0800
+Subject: [PATCH] Add timer use/actions support
+
+Based on IPMI spec, add timer use/actions support,
+and add input data checking
+
+Signed-off-by: Yong Li <yong.b.li@linux.intel.com>
+---
+ app/watchdog.cpp         | 62 +++++++++++++++++++++++++++++++++++++++++++-----
+ app/watchdog_service.cpp |  8 +++++++
+ app/watchdog_service.hpp |  8 +++++++
+ 3 files changed, 72 insertions(+), 6 deletions(-)
+
+diff --git a/app/watchdog.cpp b/app/watchdog.cpp
+index 1a5d19c..3b61055 100644
+--- a/app/watchdog.cpp
++++ b/app/watchdog.cpp
+@@ -89,6 +89,13 @@ static constexpr uint8_t wd_dont_stop = 0x1 << 6;
+ static constexpr uint8_t wd_timeout_action_mask = 0x3;
+ 
+ static constexpr uint8_t wdTimerUseMask = 0x7;
++static constexpr uint8_t wdTimerUseResTimer1 = 0x0;
++static constexpr uint8_t wdTimerUseResTimer2 = 0x6;
++static constexpr uint8_t wdTimerUseResTimer3 = 0x7;
++static constexpr uint8_t wdTimerUseRes = 0x38;
++
++static constexpr uint8_t wdTimerActionMask = 0xcc;
++static constexpr uint8_t wdTimerUseExpMask = 0xc1;
+ 
+ enum class IpmiAction : uint8_t
+ {
+@@ -186,6 +193,11 @@ static_assert(sizeof(wd_set_req) == 6, "wd_set_req has invalid size.");
+ static_assert(sizeof(wd_set_req) <= MAX_IPMI_BUFFER,
+               "wd_get_res can't fit in request buffer.");
+ 
++static uint8_t timerLogFlags = 0;
++static uint8_t timerActions = 0;
++
++static uint8_t timerUseExpirationFlags = 0;
++
+ ipmi_ret_t ipmi_app_watchdog_set(ipmi_netfn_t netfn, ipmi_cmd_t cmd,
+                                  ipmi_request_t request,
+                                  ipmi_response_t response,
+@@ -203,6 +215,24 @@ ipmi_ret_t ipmi_app_watchdog_set(ipmi_netfn_t netfn, ipmi_cmd_t cmd,
+     req.initial_countdown = le16toh(req.initial_countdown);
+     *data_len = 0;
+ 
++    if (((req.timer_use & wdTimerUseMask) == wdTimerUseResTimer1) ||
++        ((req.timer_use & wdTimerUseMask) == wdTimerUseResTimer2) ||
++        ((req.timer_use & wdTimerUseMask) == wdTimerUseResTimer3) ||
++        (req.timer_use & wdTimerUseRes) ||
++        (req.timer_action & wdTimerActionMask) ||
++        (req.expire_flags & wdTimerUseExpMask))
++    {
++        return IPMI_CC_INVALID_FIELD_REQUEST;
++    }
++
++    if (req.pretimeout > (req.initial_countdown / 10))
++    {
++        return IPMI_CC_INVALID_FIELD_REQUEST;
++    }
++
++    timerLogFlags = req.timer_use & 0x80;
++    timerActions = req.timer_action;
++
+     try
+     {
+         WatchdogService wd_service;
+@@ -221,6 +251,10 @@ ipmi_ret_t ipmi_app_watchdog_set(ipmi_netfn_t netfn, ipmi_cmd_t cmd,
+             static_cast<IpmiTimerUse>(req.timer_use & wdTimerUseMask);
+         wd_service.setTimerUse(ipmiTimerUseToWdTimerUse(ipmiTimerUse));
+ 
++        wd_service.setExpiredTimerUse(WatchdogService::TimerUse::Reserved);
++
++        timerUseExpirationFlags &= ~req.expire_flags;
++
+         // Set the new interval and the time remaining deci -> mill seconds
+         const uint64_t interval = req.initial_countdown * 100;
+         wd_service.setInterval(interval);
+@@ -339,7 +373,6 @@ static_assert(sizeof(wd_get_res) == 8, "wd_get_res has invalid size.");
+ static_assert(sizeof(wd_get_res) <= MAX_IPMI_BUFFER,
+               "wd_get_res can't fit in response buffer.");
+ 
+-static constexpr uint8_t wd_dont_log = 0x1 << 7;
+ static constexpr uint8_t wd_running = 0x1 << 6;
+ 
+ ipmi_ret_t ipmi_app_watchdog_get(ipmi_netfn_t netfn, ipmi_cmd_t cmd,
+@@ -358,20 +391,37 @@ ipmi_ret_t ipmi_app_watchdog_get(ipmi_netfn_t netfn, ipmi_cmd_t cmd,
+ 
+         // Build and return the response
+         wd_get_res res;
+-        res.timer_use = wd_dont_log;
+-        res.timer_action =
+-            static_cast<uint8_t>(wdActionToIpmiAction(wd_prop.expireAction));
++        res.timer_use |= timerLogFlags;
++        res.timer_action = timerActions;
+ 
+         // Interval and timeRemaining need converted from milli -> deci seconds
+         res.initial_countdown = htole16(wd_prop.interval / 100);
++
++        if (wd_prop.expiredTimerUse != WatchdogService::TimerUse::Reserved)
++        {
++            timerUseExpirationFlags |=
++                1 << static_cast<uint8_t>(
++                    wdTimerUseToIpmiTimerUse(wd_prop.expiredTimerUse));
++        }
++
+         if (wd_prop.enabled)
+         {
+             res.timer_use |= wd_running;
+             res.present_countdown = htole16(wd_prop.timeRemaining / 100);
++            res.expire_flags = 0;
+         }
+         else
+         {
+-            res.present_countdown = res.initial_countdown;
++            if (wd_prop.expiredTimerUse == WatchdogService::TimerUse::Reserved)
++            {
++                res.present_countdown = res.initial_countdown;
++                res.expire_flags = 0;
++            }
++            else
++            {
++                res.present_countdown = 0;
++                res.expire_flags = timerUseExpirationFlags;
++            }
+         }
+ 
+         res.timer_use |=
+@@ -379,7 +429,7 @@ ipmi_ret_t ipmi_app_watchdog_get(ipmi_netfn_t netfn, ipmi_cmd_t cmd,
+ 
+         // TODO: Do something about having pretimeout support
+         res.pretimeout = 0;
+-        res.expire_flags = 0;
++
+         memcpy(response, &res, sizeof(res));
+         *data_len = sizeof(res);
+         lastCallSuccessful = true;
+diff --git a/app/watchdog_service.cpp b/app/watchdog_service.cpp
+index e65ea63..8b1aa47 100644
+--- a/app/watchdog_service.cpp
++++ b/app/watchdog_service.cpp
+@@ -83,6 +83,9 @@ WatchdogService::Properties WatchdogService::getProperties()
+         wd_prop.timerUse = Watchdog::convertTimerUseFromString(
+             get<std::string>(properties.at("CurrentTimerUse")));
+ 
++        wd_prop.expiredTimerUse = Watchdog::convertTimerUseFromString(
++            get<std::string>(properties.at("ExpiredTimerUse")));
++
+         wd_prop.interval = get<uint64_t>(properties.at("Interval"));
+         wd_prop.timeRemaining = get<uint64_t>(properties.at("TimeRemaining"));
+         return wd_prop;
+@@ -187,6 +190,11 @@ void WatchdogService::setTimerUse(TimerUse timerUse)
+     setProperty("CurrentTimerUse", convertForMessage(timerUse));
+ }
+ 
++void WatchdogService::setExpiredTimerUse(TimerUse timerUse)
++{
++    setProperty("ExpiredTimerUse", convertForMessage(timerUse));
++}
++
+ void WatchdogService::setInterval(uint64_t interval)
+ {
+     setProperty("Interval", interval);
+diff --git a/app/watchdog_service.hpp b/app/watchdog_service.hpp
+index 75afc1e..d0cc1a8 100644
+--- a/app/watchdog_service.hpp
++++ b/app/watchdog_service.hpp
+@@ -36,6 +36,7 @@ class WatchdogService
+         bool enabled;
+         Action expireAction;
+         TimerUse timerUse;
++        TimerUse expiredTimerUse;
+         uint64_t interval;
+         uint64_t timeRemaining;
+     };
+@@ -79,6 +80,13 @@ class WatchdogService
+      */
+     void setTimerUse(TimerUse timerUse);
+ 
++    /** @brief Sets the value of the ExpiredTimerUse property on the host
++     * watchdog
++     *
++     *  @param[in] timerUse - The new timerUse value
++     */
++    void setExpiredTimerUse(TimerUse timerUse);
++
+     /** @brief Sets the value of the interval property on the host watchdog
+      *
+      *  @param[in] interval - The new interval value
+-- 
+2.7.4
+
diff --git a/meta-openbmc-mods/meta-common/recipes-phosphor/ipmi/phosphor-ipmi-host_%.bbappend b/meta-openbmc-mods/meta-common/recipes-phosphor/ipmi/phosphor-ipmi-host_%.bbappend
index 56f90ec24..2d47fdfff 100644
--- a/meta-openbmc-mods/meta-common/recipes-phosphor/ipmi/phosphor-ipmi-host_%.bbappend
+++ b/meta-openbmc-mods/meta-common/recipes-phosphor/ipmi/phosphor-ipmi-host_%.bbappend
@@ -1,5 +1,10 @@
 FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
 
+# TODO: This should be removed, once up-stream bump up
+# issue is resolved
+#SRC_URI = "git://github.com/openbmc/phosphor-host-ipmid"
+SRCREV = "55768e3548ef7476d4fdbe7be7a3ddb4d4896f14"
+
 SRC_URI += "file://phosphor-ipmi-host.service \
             file://0002-Modify-dbus-interface-for-power-control.patch \
             file://0003-Modify-dbus-interface-for-chassis-control.patch \
@@ -17,8 +22,9 @@ SRC_URI += "file://phosphor-ipmi-host.service \
             file://0050-enable-6-oem-commands.patch \
             file://0051-Fix-Set-LAN-Config-to-work-without-SetInProgress.patch \
             file://0053-Fix-keep-looping-issue-when-entering-OS.patch \
-            file://0054-Fix-User-commands-require-channel-layer-lib.patch \
             file://0055-Implement-set-front-panel-button-enables-command.patch \
+            file://0056-add-SetInProgress-to-get-set-boot-option-cmd.patch \
+            file://0057-Add-timer-use-actions-support.patch \
             "
 
 do_install_append(){
diff --git a/meta-openbmc-mods/meta-common/recipes-phosphor/ipmi/phosphor-ipmi-net/0009-Add-dbus-interface-for-sol-commands.patch b/meta-openbmc-mods/meta-common/recipes-phosphor/ipmi/phosphor-ipmi-net/0009-Add-dbus-interface-for-sol-commands.patch
new file mode 100644
index 000000000..771120120
--- /dev/null
+++ b/meta-openbmc-mods/meta-common/recipes-phosphor/ipmi/phosphor-ipmi-net/0009-Add-dbus-interface-for-sol-commands.patch
@@ -0,0 +1,311 @@
+From 6b9aaf0304aed06e4b5ac53e7c163089568d4171 Mon Sep 17 00:00:00 2001
+From: Cheng C Yang <cheng.c.yang@intel.com>
+Date: Sat, 23 Mar 2019 04:03:07 +0800
+Subject: [PATCH] Add dbus interface for sol commands
+
+Add dbus interface for sol config parameters so that after move set/get
+sol config parameter command from net-ipmid to host-ipmid, the command
+can send config parameters to net-ipmid sol service through the dbus
+interface.
+
+Tested by:
+busctl introspect xyz.openbmc_project.Settings /xyz/openbmc_project
+/network/host0/sol can show correct dbus properties of sol parameters.
+ipmitool -I lanplus -H x -U x -P x raw 0x0c 0x21 0x0e 0x00 0x01
+ipmitool -I lanplus -H x -U x -P x raw 0x0c 0x21 0x0e 0x01 0x00
+ipmitool -I lanplus -H x -U x -P x raw 0x0c 0x21 0x0e 0x02 0x83
+ipmitool -I lanplus -H x -U x -P x raw 0x0c 0x21 0x0e 0x03 0x5 0x03
+ipmitool -I lanplus -H x -U x -P x raw 0x0c 0x21 0x0e 0x04 0x5 0x03
+all these commands can change the dbus properties as the value in
+above commands.
+Before and after run these commands, ipmitool -I lanplus -H x -U x
+-P x sol activate can start sol session correctly.
+After reboot BMC, "Progress" property in dbus interface change back
+to 0 and other properties will not reset to default value.
+
+Signed-off-by: Cheng C Yang <cheng.c.yang@intel.com>
+---
+ command/payload_cmds.cpp |   1 +
+ command/sol_cmds.cpp     |  84 ---------------------------------
+ sol/sol_manager.cpp      | 119 +++++++++++++++++++++++++++++++++++++++++++++++
+ sol/sol_manager.hpp      |   1 +
+ sol_module.cpp           |   6 ---
+ 5 files changed, 121 insertions(+), 90 deletions(-)
+
+diff --git a/command/payload_cmds.cpp b/command/payload_cmds.cpp
+index 3b5b4f8..570cdff 100644
+--- a/command/payload_cmds.cpp
++++ b/command/payload_cmds.cpp
+@@ -34,6 +34,7 @@ std::vector<uint8_t> activatePayload(const std::vector<uint8_t>& inPayload,
+         return outPayload;
+     }
+ 
++    std::get<sol::Manager&>(singletonPool).updateSOLParameter();
+     if (!std::get<sol::Manager&>(singletonPool).enable)
+     {
+         response->completionCode = IPMI_CC_PAYLOAD_TYPE_DISABLED;
+diff --git a/command/sol_cmds.cpp b/command/sol_cmds.cpp
+index a8fa410..804b5ea 100644
+--- a/command/sol_cmds.cpp
++++ b/command/sol_cmds.cpp
+@@ -65,90 +65,6 @@ void activating(uint8_t payloadInstance, uint32_t sessionID)
+                                           outPayload);
+ }
+ 
+-std::vector<uint8_t> setConfParams(const std::vector<uint8_t>& inPayload,
+-                                   const message::Handler& handler)
+-{
+-    std::vector<uint8_t> outPayload(sizeof(SetConfParamsResponse));
+-    auto request =
+-        reinterpret_cast<const SetConfParamsRequest*>(inPayload.data());
+-    auto response = reinterpret_cast<SetConfParamsResponse*>(outPayload.data());
+-    response->completionCode = IPMI_CC_OK;
+-
+-    switch (static_cast<Parameter>(request->paramSelector))
+-    {
+-        case Parameter::PROGRESS:
+-        {
+-            uint8_t progress = request->value & progressMask;
+-            std::get<sol::Manager&>(singletonPool).progress = progress;
+-            break;
+-        }
+-        case Parameter::ENABLE:
+-        {
+-            bool enable = request->value & enableMask;
+-            std::get<sol::Manager&>(singletonPool).enable = enable;
+-            break;
+-        }
+-        case Parameter::AUTHENTICATION:
+-        {
+-            if (!request->auth.auth || !request->auth.encrypt)
+-            {
+-                response->completionCode = ipmiCCWriteReadParameter;
+-            }
+-            else if (request->auth.privilege <
+-                         static_cast<uint8_t>(session::Privilege::USER) ||
+-                     request->auth.privilege >
+-                         static_cast<uint8_t>(session::Privilege::OEM))
+-            {
+-                response->completionCode = IPMI_CC_INVALID_FIELD_REQUEST;
+-            }
+-            else
+-            {
+-                std::get<sol::Manager&>(singletonPool).solMinPrivilege =
+-                    static_cast<session::Privilege>(request->auth.privilege);
+-            }
+-            break;
+-        }
+-        case Parameter::ACCUMULATE:
+-        {
+-            using namespace std::chrono_literals;
+-
+-            if (request->acc.threshold == 0)
+-            {
+-                response->completionCode = IPMI_CC_INVALID_FIELD_REQUEST;
+-                break;
+-            }
+-
+-            std::get<sol::Manager&>(singletonPool).accumulateInterval =
+-                request->acc.interval * sol::accIntervalFactor * 1ms;
+-            std::get<sol::Manager&>(singletonPool).sendThreshold =
+-                request->acc.threshold;
+-            break;
+-        }
+-        case Parameter::RETRY:
+-        {
+-            using namespace std::chrono_literals;
+-
+-            std::get<sol::Manager&>(singletonPool).retryCount =
+-                request->retry.count;
+-            std::get<sol::Manager&>(singletonPool).retryInterval =
+-                request->retry.interval * sol::retryIntervalFactor * 1ms;
+-            break;
+-        }
+-        case Parameter::PORT:
+-        {
+-            response->completionCode = ipmiCCWriteReadParameter;
+-            break;
+-        }
+-        case Parameter::NVBITRATE:
+-        case Parameter::VBITRATE:
+-        case Parameter::CHANNEL:
+-        default:
+-            response->completionCode = ipmiCCParamNotSupported;
+-    }
+-
+-    return outPayload;
+-}
+-
+ std::vector<uint8_t> getConfParams(const std::vector<uint8_t>& inPayload,
+                                    const message::Handler& handler)
+ {
+diff --git a/sol/sol_manager.cpp b/sol/sol_manager.cpp
+index 2046fe4..de36723 100644
+--- a/sol/sol_manager.cpp
++++ b/sol/sol_manager.cpp
+@@ -12,7 +12,13 @@
+ #include <boost/asio/write.hpp>
+ #include <chrono>
+ #include <cmath>
++#include <phosphor-ipmi-host/utils.hpp>
+ #include <phosphor-logging/log.hpp>
++#include <sdbusplus/message/types.hpp>
++
++constexpr const char* solInterface = "xyz.openbmc_project.Ipmi.SOL";
++constexpr const char* solPath = "/xyz/openbmc_project/ipmi/sol";
++constexpr const char* PROP_INTF = "org.freedesktop.DBus.Properties";
+ 
+ namespace sol
+ {
+@@ -93,6 +99,119 @@ void Manager::stopHostConsole()
+     }
+ }
+ 
++std::string getService(sdbusplus::bus::bus& bus, const std::string& intf,
++                       const std::string& path)
++{
++    auto mapperCall =
++        bus.new_method_call("xyz.openbmc_project.ObjectMapper",
++                            "/xyz/openbmc_project/object_mapper",
++                            "xyz.openbmc_project.ObjectMapper", "GetObject");
++
++    mapperCall.append(path);
++    mapperCall.append(std::vector<std::string>({intf}));
++
++    std::map<std::string, std::vector<std::string>> mapperResponse;
++
++    try
++    {
++        auto mapperResponseMsg = bus.call(mapperCall);
++        mapperResponseMsg.read(mapperResponse);
++    }
++    catch (sdbusplus::exception_t&)
++    {
++        throw std::runtime_error("ERROR in mapper call");
++    }
++
++    if (mapperResponse.begin() == mapperResponse.end())
++    {
++        throw std::runtime_error("ERROR in reading the mapper response");
++    }
++
++    return mapperResponse.begin()->first;
++}
++
++ipmi::PropertyMap getAllDbusProperties(sdbusplus::bus::bus& bus,
++                                       const std::string& service,
++                                       const std::string& objPath,
++                                       const std::string& interface)
++{
++    ipmi::PropertyMap properties;
++
++    sdbusplus::message::message method = bus.new_method_call(
++        service.c_str(), objPath.c_str(), PROP_INTF, "GetAll");
++
++    method.append(interface);
++
++    try
++    {
++        sdbusplus::message::message reply = bus.call(method);
++        reply.read(properties);
++    }
++    catch (sdbusplus::exception_t&)
++    {
++        phosphor::logging::log<phosphor::logging::level::ERR>(
++            "Failed to get all properties",
++            phosphor::logging::entry("PATH=%s", objPath.c_str()),
++            phosphor::logging::entry("INTERFACE=%s", interface.c_str()));
++        throw std::runtime_error("ERROR in reading proerties");
++    }
++
++    return properties;
++}
++
++void Manager::updateSOLParameter()
++{
++    std::variant<uint8_t, bool> value;
++    sdbusplus::bus::bus dbus(ipmid_get_sd_bus_connection());
++    static std::string solService{};
++    ipmi::PropertyMap properties;
++    if (solService.empty())
++    {
++        try
++        {
++            solService = getService(dbus, solInterface, solPath);
++        }
++        catch (const std::runtime_error& e)
++        {
++            solService.clear();
++            phosphor::logging::log<phosphor::logging::level::ERR>(
++                "Error: get SOL service failed");
++            return;
++        }
++    }
++    try
++    {
++        properties =
++            getAllDbusProperties(dbus, solService, solPath, solInterface);
++    }
++    catch (const std::runtime_error&)
++    {
++        phosphor::logging::log<phosphor::logging::level::ERR>(
++            "Error setting sol parameter");
++        return;
++    }
++
++    progress = std::get<uint8_t>(properties["Progress"]);
++
++    enable = std::get<bool>(properties["Enable"]);
++
++    solMinPrivilege = static_cast<session::Privilege>(
++        std::get<uint8_t>(properties["Authentication"]));
++
++    accumulateInterval =
++        std::get<uint8_t>((properties["AccumulateIntervalMS"])) *
++        sol::accIntervalFactor * 1ms;
++
++    sendThreshold = std::get<uint8_t>(properties["Threshold"]);
++
++    retryCount = std::get<uint8_t>(properties["RetryCount"]);
++
++    retryInterval = std::get<uint8_t>(properties["RetryIntervalMS"]) *
++                    sol::retryIntervalFactor * 1ms;
++
++    return;
++}
++
+ void Manager::startPayloadInstance(uint8_t payloadInstance,
+                                    session::SessionID sessionID)
+ {
+diff --git a/sol/sol_manager.hpp b/sol/sol_manager.hpp
+index 5d96890..b7eb89e 100644
+--- a/sol/sol_manager.hpp
++++ b/sol/sol_manager.hpp
+@@ -248,6 +248,7 @@ class Manager
+      *  @return 0 on success and errno on failure.
+      */
+     int writeConsoleSocket(const std::vector<uint8_t>& input) const;
++    void updateSOLParameter(void);
+ 
+   private:
+     SOLPayloadMap payloadMap;
+diff --git a/sol_module.cpp b/sol_module.cpp
+index 8200e74..2b1fb46 100644
+--- a/sol_module.cpp
++++ b/sol_module.cpp
+@@ -42,12 +42,6 @@ void registerCommands()
+          &getPayloadInfo,
+          session::Privilege::USER,
+          false},
+-        // Set SOL Configuration Parameters
+-        {{(static_cast<uint32_t>(message::PayloadType::IPMI) << 16) |
+-          static_cast<uint16_t>(::command::NetFns::TRANSPORT) | 0x21},
+-         &setConfParams,
+-         session::Privilege::ADMIN,
+-         false},
+         // Get SOL Configuration Parameters
+         {{(static_cast<uint32_t>(message::PayloadType::IPMI) << 16) |
+           static_cast<uint16_t>(::command::NetFns::TRANSPORT) | 0x22},
+-- 
+2.16.2
+
diff --git a/meta-openbmc-mods/meta-common/recipes-phosphor/ipmi/phosphor-ipmi-net_%.bbappend b/meta-openbmc-mods/meta-common/recipes-phosphor/ipmi/phosphor-ipmi-net_%.bbappend
index 19fa4c06b..4b82cc21c 100644
--- a/meta-openbmc-mods/meta-common/recipes-phosphor/ipmi/phosphor-ipmi-net_%.bbappend
+++ b/meta-openbmc-mods/meta-common/recipes-phosphor/ipmi/phosphor-ipmi-net_%.bbappend
@@ -1,5 +1,10 @@
 inherit useradd
 
+# TODO: This should be removed, once up-stream bump up
+# issue is resolved
+#SRC_URI += "git://github.com/openbmc/phosphor-net-ipmid"
+SRCREV = "7e5d38d2fb51fc746624ff2f2b3701cea245a8fb"
+
 USERADD_PACKAGES = "${PN}"
 # add a group called ipmi
 GROUPADD_PARAM_${PN} = "ipmi "
@@ -9,5 +14,6 @@ FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
 SRC_URI += " file://0006-Modify-dbus-namespace-of-chassis-control-for-guid.patch \
              file://0007-Adding-support-for-GetSessionInfo-command.patch \
              file://0008-Sync-GetSession-Info-cmd-based-on-Upstream-review.patch \
+             file://0009-Add-dbus-interface-for-sol-commands.patch \
            "