commit dd14c0f75d9af7783afb3e9e124ca5c015a8609b
author Vijay Khemka <vijaykhemka@fb.com> Wed Mar 18 14:48:13 2020 -0700
committer Vijay Khemka <vijaykhemka@fb.com> Thu Mar 19 12:41:41 2020 -0700
tree e145ca159a5548e6eaf8650121e666ecea7a2f0d
parent 2515e0931ae981645cda726fd278e60b8f271f7c

Add DCMI command

Added DCMI command support for get power reading, get power limit,
set power limit and apply power limit.

Tested: Verified by running ipmi raw command.
ipmitool raw 0x2c 0x2 0xdc 0x1 0x0 0x0
 dc 0d 00 0c 00 0e 00 0d 00 a8 96 72 5e 18 51 3b 1a 40

Change-Id: I59a61b795d4c2ffec5d10d3f27fcf5e8d1bef6fc
Signed-off-by: Vijay Khemka <vijaykhemka@fb.com>

src/oemcommands.cpp

diff --git a/src/oemcommands.cpp b/src/oemcommands.cpp
index f5e4e0e..cdb0a02 100644
--- a/src/oemcommands.cpp
+++ b/src/oemcommands.cpp
@@ -16,7 +16,7 @@
  */
 
 #include "xyz/openbmc_project/Common/error.hpp"
-#include <ipmid/api.h>
+#include <ipmid/api.hpp>
 
 #include <nlohmann/json.hpp>
 #include <array>
@@ -52,6 +52,8 @@
                                     uint8_t *);
 ipmi_ret_t plat_udbg_control_panel(uint8_t, uint8_t, uint8_t, uint8_t *,
                                    uint8_t *);
+int sendMeCmd(uint8_t, uint8_t, std::vector<uint8_t> &, std::vector<uint8_t> &);
+
 namespace variant_ns = sdbusplus::message::variant_ns;
 nlohmann::json oemData __attribute__((init_priority(101)));
 
@@ -1491,6 +1493,50 @@
     return IPMI_CC_OK;
 }
 
+/* Helper function for sending DCMI commands to ME and getting response back */
+ipmi::RspType<std::vector<uint8_t>> sendDCMICmd(uint8_t cmd,
+                                                std::vector<uint8_t> &cmdData)
+{
+    std::vector<uint8_t> respData;
+
+    /* Add group id as first byte to request for ME command */
+    cmdData.insert(cmdData.begin(), groupDCMI);
+
+    if (sendMeCmd(ipmi::netFnGroup, cmd, cmdData, respData))
+        return ipmi::responseUnspecifiedError();
+
+    /* Remove group id as first byte as it will be added by IPMID */
+    respData.erase(respData.begin());
+
+    return ipmi::responseSuccess(std::move(respData));
+}
+
+/* DCMI Command handellers. */
+
+ipmi::RspType<std::vector<uint8_t>>
+    ipmiOemDCMIGetPowerReading(std::vector<uint8_t> reqData)
+{
+    return sendDCMICmd(ipmi::dcmi::cmdGetPowerReading, reqData);
+}
+
+ipmi::RspType<std::vector<uint8_t>>
+    ipmiOemDCMIGetPowerLimit(std::vector<uint8_t> reqData)
+{
+    return sendDCMICmd(ipmi::dcmi::cmdGetPowerLimit, reqData);
+}
+
+ipmi::RspType<std::vector<uint8_t>>
+    ipmiOemDCMISetPowerLimit(std::vector<uint8_t> reqData)
+{
+    return sendDCMICmd(ipmi::dcmi::cmdSetPowerLimit, reqData);
+}
+
+ipmi::RspType<std::vector<uint8_t>>
+    ipmiOemDCMIApplyPowerLimit(std::vector<uint8_t> reqData)
+{
+    return sendDCMICmd(ipmi::dcmi::cmdActDeactivatePwrLimit, reqData);
+}
+
 static void registerOEMFunctions(void)
 {
     /* Get OEM data from json file */
@@ -1576,6 +1622,28 @@
     ipmiPrintAndRegister(NETFUN_FB_OEM_QC, CMD_OEM_Q_GET_DRIVE_INFO, NULL,
                          ipmiOemQGetDriveInfo,
                          PRIVILEGE_USER); // Get Drive Info
+
+    /* FB OEM DCMI Commands as per DCMI spec 1.5 Section 6 */
+    ipmi::registerGroupHandler(ipmi::prioOpenBmcBase, groupDCMI,
+                               ipmi::dcmi::cmdGetPowerReading,
+                               ipmi::Privilege::User,
+                               ipmiOemDCMIGetPowerReading); // Get Power Reading
+
+    ipmi::registerGroupHandler(ipmi::prioOpenBmcBase, groupDCMI,
+                               ipmi::dcmi::cmdGetPowerLimit,
+                               ipmi::Privilege::User,
+                               ipmiOemDCMIGetPowerLimit); // Get Power Limit
+
+    ipmi::registerGroupHandler(ipmi::prioOpenBmcBase, groupDCMI,
+                               ipmi::dcmi::cmdSetPowerLimit,
+                               ipmi::Privilege::Operator,
+                               ipmiOemDCMISetPowerLimit); // Set Power Limit
+
+    ipmi::registerGroupHandler(ipmi::prioOpenBmcBase, groupDCMI,
+                               ipmi::dcmi::cmdActDeactivatePwrLimit,
+                               ipmi::Privilege::Operator,
+                               ipmiOemDCMIApplyPowerLimit); // Apply Power Limit
+
     return;
 }