commit d48f8e345d2f3bad94798e5f604575e32cc03930
author Dhruvaraj Subhashchandran <dhruvaraj@in.ibm.com> Sat Jun 01 11:16:26 2024 -0500
committer Dhruvaraj Subhashchandran <dhruvaraj@in.ibm.com> Wed Jun 19 01:46:50 2024 -0500
tree 1c884231ed5c9ae8e1b1dbae24a14020028dde80
parent 888472dc7ad26c883bcfcaae2bf0b03a5fa7d0fc

Update the request dump methods

- Watchdog change
The dump request path of OpenPOWER dumps are updated
from /org/openpower/dump to /xyz/openbmc_project/dump/system

- Dump change
The dump type parameter is added instead of dump path.

Change-Id: Ic08e3c5fc99eaed116b97ceaf6c41f05a3503859
Signed-off-by: Dhruvaraj Subhashchandran <dhruvaraj@in.ibm.com>

dump/dump_utils.cpp

diff --git a/dump/dump_utils.cpp b/dump/dump_utils.cpp
index 1b2de79..18c1d3f 100644
--- a/dump/dump_utils.cpp
+++ b/dump/dump_utils.cpp
@@ -65,7 +65,8 @@
         "EID", eid, "CHIPTYPE", sbeTypeAttributes.at(sbeType).chipName,
         "FAILINGUNIT", failingUnit);
 
-    auto path = sbeTypeAttributes.at(sbeType).dumpPath.c_str();
+    constexpr auto path = "/xyz/openbmc_project/dump/system";
+    auto dumpRequestType = sbeTypeAttributes.at(sbeType).dumpType;
     constexpr auto interface = "xyz.openbmc_project.Dump.Create";
     constexpr auto function = "CreateDump";
 
@@ -78,6 +79,8 @@
 
         std::unordered_map<std::string, std::variant<std::string, uint64_t>>
             createParams = {
+                {"com.ibm.Dump.Create.CreateParameters.DumpType",
+                 dumpRequestType},
                 {"com.ibm.Dump.Create.CreateParameters.ErrorLogId",
                  uint64_t(eid)},
                 {"com.ibm.Dump.Create.CreateParameters.FailingUnitId",

dump/sbe_type.cpp

diff --git a/dump/sbe_type.cpp b/dump/sbe_type.cpp
index be09d81..f2898c1 100644
--- a/dump/sbe_type.cpp
+++ b/dump/sbe_type.cpp
@@ -5,13 +5,13 @@
 
 const std::map<SBETypes, SBEAttributes> sbeTypeAttributes = {
     {SBETypes::PROC,
-     {"proc", "/xyz/openbmc_project/dump/sbe",
+     {"proc", "com.ibm.Dump.Create.DumpType.SBE",
       "org.open_power.Processor.Error.SbeChipOpTimeout",
       "org.open_power.Processor.Error.SbeChipOpFailure",
       "org.open_power.Processor.Error.NoFffdc",
       "org.open_power.Processor.Error.SbeInternalFFDCData"}},
     {SBETypes::OCMB,
-     {"ocmb", "/xyz/openbmc_project/dump/msbe",
+     {"ocmb", "com.ibm.Dump.Create.DumpType.MemoryBufferSBE",
       "org.open_power.OCMB.Error.SbeChipOpTimeout",
       "org.open_power.OCMB.Error.SbeChipOpFailure",
       "org.open_power.OCMB.Error.NoFffdc",

dump/sbe_type.hpp

diff --git a/dump/sbe_type.hpp b/dump/sbe_type.hpp
index fd6a4ac..21b4ed4 100644
--- a/dump/sbe_type.hpp
+++ b/dump/sbe_type.hpp
@@ -15,7 +15,7 @@
 struct SBEAttributes
 {
     std::string chipName;
-    std::string dumpPath;
+    std::string dumpType;
     std::string chipOpTimeout;
     std::string chipOpFailure;
     std::string noFfdc;

watchdog/watchdog_handler.cpp

diff --git a/watchdog/watchdog_handler.cpp b/watchdog/watchdog_handler.cpp
index c94059f..ec58402 100644
--- a/watchdog/watchdog_handler.cpp
+++ b/watchdog/watchdog_handler.cpp
@@ -117,7 +117,7 @@
 
 void requestDump(const DumpParameters& dumpParameters)
 {
-    constexpr auto path = "/org/openpower/dump";
+    constexpr auto path = "/xyz/openbmc_project/dump/system";
     constexpr auto interface = "xyz.openbmc_project.Dump.Create";
     constexpr auto function = "CreateDump";