commit 1b751dc2720fc4e6ec1874560bff18b1d07818f1
author Vernon Mauery <vernon.mauery@linux.intel.com> Wed Jun 16 11:21:05 2021 -0700
committer Vernon Mauery <vernon.mauery@linux.intel.com> Tue Jul 13 23:27:45 2021 +0000
tree ba63addae11cb7fda8ba492b09c8d0f70a5f01af
parent 5dd161f88afc0aa8cd40113648fbc7120a8c0945

Add channel support to Get System Restart Cause

Channel was previously unsupported. This adds the channel support that
is available from the ipmi::Context. It also reworks the D-Bus calls
made in that command to use the yielding variants now that the
ipmi::Context is present.

Tested: before: ipmitool -I lanplus ... raw 0 7
                 00 00
         after: ipmitool -I lanplus ... raw 0 7
                 00 03

Change-Id: I94727c945f4fcf7fb5420960acb828e979a8e3bc
Signed-off-by: Vernon Mauery <vernon.mauery@linux.intel.com>

src/chassiscommands.cpp

diff --git a/src/chassiscommands.cpp b/src/chassiscommands.cpp
index 2206d77..2363877 100644
--- a/src/chassiscommands.cpp
+++ b/src/chassiscommands.cpp
@@ -367,27 +367,27 @@
     return 0;
 }
 
-static bool getRestartCause(std::string& restartCause)
+static bool getRestartCause(ipmi::Context::ptr& ctx, std::string& restartCause)
 {
     constexpr const char* restartCausePath =
         "/xyz/openbmc_project/control/host0/restart_cause";
     constexpr const char* restartCauseIntf =
         "xyz.openbmc_project.Control.Host.RestartCause";
-    std::shared_ptr<sdbusplus::asio::connection> busp = getSdBus();
 
-    try
+    std::string service;
+    boost::system::error_code ec =
+        ipmi::getService(ctx, restartCauseIntf, restartCausePath, service);
+
+    if (!ec)
     {
-        auto service =
-            ipmi::getService(*busp, restartCauseIntf, restartCausePath);
-
-        ipmi::Value result = ipmi::getDbusProperty(
-            *busp, service, restartCausePath, restartCauseIntf, "RestartCause");
-        restartCause = std::get<std::string>(result);
+        ec = ipmi::getDbusProperty(ctx, service, restartCausePath,
+                                   restartCauseIntf, "RestartCause",
+                                   restartCause);
     }
-    catch (const std::exception& e)
+    if (ec)
     {
         log<level::ERR>("Failed to fetch RestartCause property",
-                        entry("ERROR=%s", e.what()),
+                        entry("ERROR=%s", ec.message().c_str()),
                         entry("PATH=%s", restartCausePath),
                         entry("INTERFACE=%s", restartCauseIntf));
         return false;
@@ -395,10 +395,11 @@
     return true;
 }
 
-static bool checkIPMIRestartCause(bool& ipmiRestartCause)
+static bool checkIPMIRestartCause(ipmi::Context::ptr& ctx,
+                                  bool& ipmiRestartCause)
 {
     std::string restartCause;
-    if (!getRestartCause(restartCause))
+    if (!getRestartCause(ctx, restartCause))
     {
         return false;
     }
@@ -443,7 +444,7 @@
               bool, // Diagnostic Interrupt button disable allowed
               bool  // Standby (sleep) button disable allowed
               >
-    ipmiGetChassisStatus()
+    ipmiGetChassisStatus(ipmi::Context::ptr ctx)
 {
     std::optional<uint2_t> restorePolicy =
         power_policy::getPowerRestorePolicy();
@@ -492,7 +493,7 @@
     bool powerDownAcFailed = power_policy::getACFailStatus();
 
     bool powerStatusIPMI = false;
-    if (!checkIPMIRestartCause(powerStatusIPMI))
+    if (!checkIPMIRestartCause(ctx, powerStatusIPMI))
     {
         return ipmi::responseUnspecifiedError();
     }
@@ -594,17 +595,19 @@
 
 ipmi::RspType<uint4_t, // Restart Cause
               uint4_t, // reserved
-              uint8_t  // channel number (not supported)
+              uint8_t  // channel number
               >
-    ipmiGetSystemRestartCause()
+    ipmiGetSystemRestartCause(ipmi::Context::ptr ctx)
 {
     std::string restartCauseStr;
-    if (!getRestartCause(restartCauseStr))
+    if (!getRestartCause(ctx, restartCauseStr))
     {
         return ipmi::responseUnspecifiedError();
     }
-
-    return ipmi::responseSuccess(getRestartCauseValue(restartCauseStr), 0, 0);
+    constexpr uint4_t reserved = 0;
+    auto channel = static_cast<uint8_t>(ctx->channel);
+    return ipmi::responseSuccess(getRestartCauseValue(restartCauseStr),
+                                 reserved, channel);
 }
 
 ipmi::RspType<> ipmiSetFrontPanelButtonEnables(bool disablePowerButton,