commit 08eb9e5a3dd2ab361e3a338c57cf2e68f542758a
author Jason M. Bills <jason.m.bills@intel.com> Mon Jul 08 13:09:54 2024 -0700
committer Jason M. Bills <jason.m.bills@intel.com> Thu Aug 29 10:09:18 2024 -0700
tree 56934c7fec7b93d620fa1ecd3d95194012308674
parent 1bcced0820999e7e050257b9f78cf36b23eb762b

Change name to ResetOnMCERR

The BMC will now be in control of the reset on MCERR, so change the name
to align with the IERR and ERR2 options.

Change-Id: I0d2449ce4c29c3b6915d64cf68cbf02e06df921d
Signed-off-by: Jason M. Bills <jason.m.bills@intel.com>

src/oemcommands.cpp

diff --git a/src/oemcommands.cpp b/src/oemcommands.cpp
index 11b00c8..ac97fdb 100644
--- a/src/oemcommands.cpp
+++ b/src/oemcommands.cpp
@@ -954,7 +954,7 @@
 {
     bool resetOnIERR = false;
     bool resetOnERR2 = false;
-    bool allowResetOnMCERR = false;
+    bool resetOnMCERR = false;
     uint6_t cpu1IERRCount = 0;
     uint6_t cpu2IERRCount = 0;
     uint6_t cpu3IERRCount = 0;
@@ -983,7 +983,7 @@
             *busp, service, processorErrConfigObjPath, processorErrConfigIntf);
         resetOnIERR = std::get<bool>(result.at("ResetOnIERR"));
         resetOnERR2 = std::get<bool>(result.at("ResetOnERR2"));
-        allowResetOnMCERR = std::get<bool>(result.at("AllowResetOnMCERR"));
+        resetOnMCERR = std::get<bool>(result.at("ResetOnMCERR"));
         cpu1IERRCount = std::get<uint8_t>(result.at("ErrorCountCPU1"));
         cpu2IERRCount = std::get<uint8_t>(result.at("ErrorCountCPU2"));
         cpu3IERRCount = std::get<uint8_t>(result.at("ErrorCountCPU3"));
@@ -999,15 +999,14 @@
     }
 
     return ipmi::responseSuccess(
-        resetOnIERR, resetOnERR2, allowResetOnMCERR, 0, 0x3F, cpu1IERRCount,
+        resetOnIERR, resetOnERR2, resetOnMCERR, 0, 0x3F, cpu1IERRCount,
         cpu1Status, cpu2IERRCount, cpu2Status, cpu3IERRCount, cpu3Status,
         cpu4IERRCount, cpu4Status, crashdumpCount);
 }
 
 ipmi::RspType<> ipmiOEMSetProcessorErrConfig(
-    bool resetOnIERR, bool resetOnERR2, bool allowResetOnMCERR,
-    uint5_t reserved1, uint8_t reserved2,
-    std::optional<bool> clearCPUErrorCount,
+    bool resetOnIERR, bool resetOnERR2, bool resetOnMCERR, uint5_t reserved1,
+    uint8_t reserved2, std::optional<bool> clearCPUErrorCount,
     std::optional<bool> clearCrashdumpCount, std::optional<uint6_t> reserved3)
 {
     if (reserved1 || reserved2)
@@ -1032,8 +1031,8 @@
                               processorErrConfigIntf, "ResetOnERR2",
                               resetOnERR2);
         ipmi::setDbusProperty(*busp, service, processorErrConfigObjPath,
-                              processorErrConfigIntf, "AllowResetOnMCERR",
-                              allowResetOnMCERR);
+                              processorErrConfigIntf, "ResetOnMCERR",
+                              resetOnMCERR);
         if (clearCPUErrorCount.value_or(false))
         {
             ipmi::setDbusProperty(*busp, service, processorErrConfigObjPath,