commit fc5c80ee4111870abcd3bb2982d1b1a2ba07b4ec
author Jayaprakash Mutyala <mutyalax.jayaprakash@intel.com> Fri Oct 18 07:07:46 2024 +0000
committer Vernon Mauery <vernon.mauery@linux.intel.com> Tue Oct 22 19:57:58 2024 +0000
tree 40be420ac5e4f914c813cfcd03570f290a5d1efa
parent ab5c0e5763a6e25c7d44758b5522a5d4e0cb6728

Fix for Change in LED Controller service

Due to below upstream change, user unable to Set SM Signal for different
LED's. All the dbus calls also affected due to this change.
https://gerrit.openbmc.org/c/openbmc/phosphor-led-sysfs/+/57455

Currently all LED Controllers are grouped into single service.
So this fix provides to support for all the LED controllers based on
new service i.e. xyz.openbmc_project.LED.Controller

Tested:
Ipmitool commands are verified working as expected.
Command: ipmitool raw 0x30 0xb4 0x03 0x02 //Set Security mode
Response:             //Success
Command: ipmitool raw 0x30 0x15 0x0D 00 00 00 //Set SM Signal
Response:             //Success

Signed-off-by: Jayaprakash Mutyala <mutyalax.jayaprakash@intel.com>
Change-Id: I4ee6f0d3f6148aae69e04fde028ab8ec46187ad8

include/manufacturingcommands.hpp

diff --git a/include/manufacturingcommands.hpp b/include/manufacturingcommands.hpp
index 7c85219..a4c2924 100644
--- a/include/manufacturingcommands.hpp
+++ b/include/manufacturingcommands.hpp
@@ -37,8 +37,7 @@
 static constexpr const char* fanService = "xyz.openbmc_project.FanSensor";
 static constexpr const char* buttonService =
     "xyz.openbmc_project.Chassis.Buttons";
-static constexpr const char* ledServicePrefix =
-    "xyz.openbmc_project.LED.Controller.";
+static constexpr const char* ledService = "xyz.openbmc_project.LED.Controller";
 
 static constexpr const char* ledPathPrefix =
     "/xyz/openbmc_project/led/physical/";

src/manufacturingcommands.cpp

diff --git a/src/manufacturingcommands.cpp b/src/manufacturingcommands.cpp
index 865b3a1..fce6665 100644
--- a/src/manufacturingcommands.cpp
+++ b/src/manufacturingcommands.cpp
@@ -107,14 +107,13 @@
     }
 
     std::string ledName = ledProp->getName();
-    std::string ledService = ledServicePrefix + ledName;
     std::string ledPath = ledPathPrefix + ledName;
     ipmi::Value presentState;
 
     if (false == ledProp->getLock())
     {
-        if (mtm.getProperty(ledService.c_str(), ledPath.c_str(), ledIntf,
-                            "State", &presentState) != 0)
+        if (mtm.getProperty(ledService, ledPath.c_str(), ledIntf, "State",
+                            &presentState) != 0)
         {
             return IPMI_CC_UNSPECIFIED_ERROR;
         }
@@ -162,7 +161,6 @@
         else
         {
             std::string ledName = ledProp->getName();
-            std::string ledService = ledServicePrefix + ledName;
             std::string ledPath = ledPathPrefix + ledName;
             if (mtm.setProperty(ledService, ledPath, ledIntf, "State",
                                 ledProp->getPrevState()) != 0)