commit 9e666cdaab413193d2e723f3060fe4c14db3e513
author Chau Ly <chaul@amperecomputing.com> Mon Mar 06 08:46:14 2023 +0000
committer Vernon Mauery <vernon.mauery@linux.intel.com> Thu Apr 06 21:47:54 2023 +0000
tree e47bda4943509c6e881c6bce2a9dbe7b8938fde8
parent 958806d4c7b33394209434f9d87abaa259c9d327

chassishandler: Read chassis intrusion status

This patch supports reading chassis intrusion status from "Status"
property under xyz.openbmc_project.Chassis.Intrusion on Dbus and
shows it to "Chassis Intrusion" field of ipmi command "chassis status".
This is corresponding to patch:
https://gerrit.openbmc.org/c/openbmc/dbus-sensors/+/61433 which modifies
dbus-sensors intrusionsensor object path.

Tested:
$ ipmitool chassis status | grep -i "Chassis Intrusion"
Chassis Intrusion: active means "HardwareIntrusion"
Chassis Intrusion: inactive means "Normal"

Signed-off-by: Chau Ly <chaul@amperecomputing.com>
Change-Id: Ieef0d8d7a70bbb7472125cdf04d3687926b333c5

chassishandler.cpp

diff --git a/chassishandler.cpp b/chassishandler.cpp
index c2ed807..85b0399 100644
--- a/chassishandler.cpp
+++ b/chassishandler.cpp
@@ -1095,6 +1095,36 @@
     return true;
 }
 
+static std::optional<bool> getChassisIntrusionStatus(ipmi::Context::ptr& ctx)
+{
+    constexpr const char* chassisIntrusionPath =
+        "/xyz/openbmc_project/Chassis/Intrusion";
+    constexpr const char* chassisIntrusionInf =
+        "xyz.openbmc_project.Chassis.Intrusion";
+
+    std::string service;
+    boost::system::error_code ec = ipmi::getService(
+        ctx, chassisIntrusionInf, chassisIntrusionPath, service);
+    if (!ec)
+    {
+        std::string chassisIntrusionStr;
+        ec = ipmi::getDbusProperty<std::string>(
+            ctx, service, chassisIntrusionPath, chassisIntrusionInf, "Status",
+            chassisIntrusionStr);
+        if (!ec)
+        {
+            bool ret =
+                (chassisIntrusionStr == "HardwareIntrusion") ? true : false;
+            return std::make_optional(ret);
+        }
+    }
+    log<level::ERR>("Fail to get Chassis Intrusion Status property",
+                    entry("PATH=%s", chassisIntrusionPath),
+                    entry("INTERFACE=%s", chassisIntrusionInf),
+                    entry("ERROR=%s", ec.message().c_str()));
+    return std::nullopt;
+}
+
 //----------------------------------------------------------------------
 // Get Chassis Status commands
 //----------------------------------------------------------------------
@@ -1130,7 +1160,7 @@
               bool, // Diagnostic Interrupt button disable allowed
               bool  // Standby (sleep) button disable allowed
               >
-    ipmiGetChassisStatus()
+    ipmiGetChassisStatus(ipmi::Context::ptr& ctx)
 {
     using namespace chassis::internal;
     std::optional<uint2_t> restorePolicy =
@@ -1168,6 +1198,13 @@
 
     bool powerDownAcFailed = power_policy::getACFailStatus();
 
+    bool chassisIntrusionActive = false;
+    std::optional<bool> chassisIntrusionStatus = getChassisIntrusionStatus(ctx);
+    if (chassisIntrusionStatus)
+    {
+        chassisIntrusionActive = chassisIntrusionStatus.value();
+    }
+
     // This response has a lot of hard-coded, unsupported fields
     // They are set to false or 0
     constexpr bool powerOverload = false;
@@ -1178,7 +1215,6 @@
     constexpr bool powerDownInterlock = false;
     constexpr bool powerDownPowerFault = false;
     constexpr bool powerStatusIPMI = false;
-    constexpr bool chassisIntrusionActive = false;
     constexpr bool frontPanelLockoutActive = false;
     constexpr bool driveFault = false;
     constexpr bool coolingFanFault = false;