commit f284f855158315a41afefc11ff0764d95eaf5da6
author Jason M. Bills <jason.m.bills@intel.com> Thu Sep 07 15:48:48 2023 -0700
committer Jason Bills <jason.m.bills@linux.intel.com> Mon Sep 11 14:38:26 2023 +0000
tree 8760e65eb86af6c9390e20e7269be19356d52008
parent af65268e15a3a491f4548243254a686f42518e2e

Rename CATERR to IERR

CATERR is ambiguous because it represents two types of errors: IERR and
MCERR. This changes the name to IERR to be more specific.

Change-Id: I9f2c3967885b0d8eea0ceef310febd4124ddb558
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 4e3b7a5..c14907b 100644
--- a/src/oemcommands.cpp
+++ b/src/oemcommands.cpp
@@ -939,28 +939,28 @@
     }
 }
 
-ipmi::RspType<bool,    // CATERR Reset Enabled
+ipmi::RspType<bool,    // IERR Reset Enabled
               bool,    // ERR2 Reset Enabled
               uint6_t, // reserved
               uint8_t, // reserved, returns 0x3F
-              uint6_t, // CPU1 CATERR Count
+              uint6_t, // CPU1 IERR Count
               uint2_t, // CPU1 Status
-              uint6_t, // CPU2 CATERR Count
+              uint6_t, // CPU2 IERR Count
               uint2_t, // CPU2 Status
-              uint6_t, // CPU3 CATERR Count
+              uint6_t, // CPU3 IERR Count
               uint2_t, // CPU3 Status
-              uint6_t, // CPU4 CATERR Count
+              uint6_t, // CPU4 IERR Count
               uint2_t, // CPU4 Status
               uint8_t  // Crashdump Count
               >
     ipmiOEMGetProcessorErrConfig()
 {
-    bool resetOnCATERR = false;
+    bool resetOnIERR = false;
     bool resetOnERR2 = false;
-    uint6_t cpu1CATERRCount = 0;
-    uint6_t cpu2CATERRCount = 0;
-    uint6_t cpu3CATERRCount = 0;
-    uint6_t cpu4CATERRCount = 0;
+    uint6_t cpu1IERRCount = 0;
+    uint6_t cpu2IERRCount = 0;
+    uint6_t cpu3IERRCount = 0;
+    uint6_t cpu4IERRCount = 0;
     uint8_t crashdumpCount = 0;
     uint2_t cpu1Status = cpuPresent("CPU_1")
                              ? types::enum_cast<uint8_t>(CPUStatus::enabled)
@@ -983,12 +983,12 @@
 
         ipmi::PropertyMap result = ipmi::getAllDbusProperties(
             *busp, service, processorErrConfigObjPath, processorErrConfigIntf);
-        resetOnCATERR = std::get<bool>(result.at("ResetOnCATERR"));
+        resetOnIERR = std::get<bool>(result.at("ResetOnIERR"));
         resetOnERR2 = std::get<bool>(result.at("ResetOnERR2"));
-        cpu1CATERRCount = std::get<uint8_t>(result.at("ErrorCountCPU1"));
-        cpu2CATERRCount = std::get<uint8_t>(result.at("ErrorCountCPU2"));
-        cpu3CATERRCount = std::get<uint8_t>(result.at("ErrorCountCPU3"));
-        cpu4CATERRCount = std::get<uint8_t>(result.at("ErrorCountCPU4"));
+        cpu1IERRCount = std::get<uint8_t>(result.at("ErrorCountCPU1"));
+        cpu2IERRCount = std::get<uint8_t>(result.at("ErrorCountCPU2"));
+        cpu3IERRCount = std::get<uint8_t>(result.at("ErrorCountCPU3"));
+        cpu4IERRCount = std::get<uint8_t>(result.at("ErrorCountCPU4"));
         crashdumpCount = std::get<uint8_t>(result.at("CrashdumpCount"));
     }
     catch (const std::exception& e)
@@ -999,14 +999,14 @@
         return ipmi::responseUnspecifiedError();
     }
 
-    return ipmi::responseSuccess(resetOnCATERR, resetOnERR2, 0, 0x3F,
-                                 cpu1CATERRCount, cpu1Status, cpu2CATERRCount,
-                                 cpu2Status, cpu3CATERRCount, cpu3Status,
-                                 cpu4CATERRCount, cpu4Status, crashdumpCount);
+    return ipmi::responseSuccess(resetOnIERR, resetOnERR2, 0, 0x3F,
+                                 cpu1IERRCount, cpu1Status, cpu2IERRCount,
+                                 cpu2Status, cpu3IERRCount, cpu3Status,
+                                 cpu4IERRCount, cpu4Status, crashdumpCount);
 }
 
 ipmi::RspType<> ipmiOEMSetProcessorErrConfig(
-    bool resetOnCATERR, bool resetOnERR2, uint6_t reserved1, uint8_t reserved2,
+    bool resetOnIERR, bool resetOnERR2, uint6_t reserved1, uint8_t reserved2,
     std::optional<bool> clearCPUErrorCount,
     std::optional<bool> clearCrashdumpCount, std::optional<uint6_t> reserved3)
 {
@@ -1026,8 +1026,8 @@
         auto service = ipmi::getService(*busp, processorErrConfigIntf,
                                         processorErrConfigObjPath);
         ipmi::setDbusProperty(*busp, service, processorErrConfigObjPath,
-                              processorErrConfigIntf, "ResetOnCATERR",
-                              resetOnCATERR);
+                              processorErrConfigIntf, "ResetOnIERR",
+                              resetOnIERR);
         ipmi::setDbusProperty(*busp, service, processorErrConfigObjPath,
                               processorErrConfigIntf, "ResetOnERR2",
                               resetOnERR2);