Nag

.shellcheck-ignore

@@ -34,3 +34,5 @@ tools/dreport.d/plugins.d/traceevents
 tools/dreport.d/plugins.d/top
 tools/dreport.d/plugins.d/uptime
 tools/dreport.d/ibm.d/plugins.d/badpel
+tools/dreport.d/openpower.d/plugins.d/hostboot
+tools/dreport.d/ibm.d/plugins.d/faultlog

dump_manager_bmc.cpp

@@ -36,11 +36,16 @@ constexpr auto BMC_DUMP = "BMC_DUMP";
 sdbusplus::message::object_path
     Manager::createDump(phosphor::dump::DumpCreateParams params)
 {
-    if (params.size() > CREATE_DUMP_MAX_PARAMS)
+    if (params.size() > CREATE_BMC_DUMP_MAX_PARAMS)
     {
         lg2::warning("BMC dump accepts not more than 2 additional parameters");
     }
 
+    if (Manager::fUserDumpInProgress == true)
+    {
+        elog<sdbusplus::xyz::openbmc_project::Common::Error::Unavailable>();
+    }
+
     // Get the originator id and type from params
     std::string originatorId;
     originatorTypes originatorType;
@@ -62,18 +67,48 @@ sdbusplus::message::object_path
     {
         dumpType = getErrorDumpType(params);
     }
-    std::string path = extractParameter<std::string>(
+
+#ifdef FAULT_DATA_DUMP
+    constexpr auto BMC_DUMP_TYPE =
+        "xyz.openbmc_project.Dump.Internal.Create.Type";
+    constexpr auto FAULT_DATA_DUMP_TYPE =
+        "xyz.openbmc_project.Dump.Internal.Create.Type.FaultData";
+    using InvalidArgument =
+        sdbusplus::xyz::openbmc_project::Common::Error::InvalidArgument;
+    using Argument = xyz::openbmc_project::Common::InvalidArgument;
+    auto iter = params.find(BMC_DUMP_TYPE);
+    if (iter != params.end())
+    {
+        if (!std::holds_alternative<std::string>(iter->second))
+        {
+            lg2::error("An invalid dump type passed");
+            elog<InvalidArgument>(Argument::ARGUMENT_NAME("BMC_DUMP_TYPE"),
+                                  Argument::ARGUMENT_VALUE("INVALID INPUT"));
+        }
+
+        auto strDumpType = std::get<std::string>(iter->second);
+        // Only Fault data dump is supported
+        if (strDumpType != FAULT_DATA_DUMP_TYPE)
+        {
+            lg2::error("An invalid dump type passed {DUMPTYPE}","DUMPTYPE",strDumpType);
+            elog<InvalidArgument>(
+                Argument::ARGUMENT_NAME("BMC_DUMP_TYPE"),
+                Argument::ARGUMENT_VALUE(strDumpType.c_str()));
+        }
+        dumpType = DumpTypes::FAULTDATA;
+    }
+#endif
+
+  std::string path = extractParameter<std::string>(
         convertCreateParametersToString(CreateParameters::FilePath), params);
 
     if ((Manager::fUserDumpInProgress == true) && (dumpType == DumpTypes::USER))
     {
         lg2::info("Another user initiated dump in progress");
         elog<sdbusplus::xyz::openbmc_project::Common::Error::Unavailable>();
     }
-
-    lg2::info("Initiating new BMC dump with type: {TYPE} path: {PATH}", "TYPE",
+  lg2::info("Initiating new BMC dump with type: {TYPE} path: {PATH}", "TYPE",
               dumpTypeToString(dumpType).value(), "PATH", path);
-
     auto id = captureDump(dumpType, path);
 
     // Entry Object path.
@@ -118,6 +153,7 @@ uint32_t Manager::captureDump(DumpTypes type, const std::string& path)
     {
         std::filesystem::path dumpPath(dumpDir);
         auto id = std::to_string(lastEntryId + 1);
+
         dumpPath /= id;
 
         auto strType = dumpTypeToString(type).value();

dump_manager_bmc.hpp

@@ -1,4 +1,5 @@
 #pragma once
+#include "config.h"
 
 #include "dump_entry.hpp"
 #include "dump_manager.hpp"
@@ -11,6 +12,12 @@
 #include <filesystem>
 #include <map>
 
+#ifdef FAULT_DATA_DUMP
+#define CREATE_BMC_DUMP_MAX_PARAMS 3
+#else
+#define CREATE_BMC_DUMP_MAX_PARAMS 2
+#endif
+
 namespace phosphor
 {
 namespace dump

example_dump_types.yaml

@@ -10,3 +10,6 @@
 - xyz.openbmc_project.Dump.Create.DumpType.ErrorLog:
       - elog
       - BMC_DUMP
+- xyz.openbmc_project.Dump.Internal.Create.Type.FaultData:
+      - faultdata
+      - BMC_DUMP

meson.build

@@ -115,6 +115,14 @@ conf_data.set_quoted('FAULTLOG_DUMP_PATH', get_option('FAULTLOG_DUMP_PATH'),
 conf_data.set('BMC_DUMP_ROTATE_CONFIG', get_option('dump_rotate_config').allowed(),
                description : 'Turn on rotate config for bmc dump'
              )
+conf_data.set('LOG_PEL_ON_DUMP_DELETE', get_option('log_pel_on_dump_delete').enabled(),
+               description : 'Turn on to log PEL while deleting the dump'
+             )
+
+conf_data.set('FAULT_DATA_DUMP', get_option('fault_data_dump').enabled(),
+               description : 'Turn on to enable fault data dump'
+             )
+
 conf_data.set_quoted('BMC_DUMP_FILENAME_REGEX', get_option('BMC_DUMP_FILENAME_REGEX'),
                       description: 'BMC Dump filename format'
             )

meson.options

@@ -105,6 +105,15 @@ option('TIMESTAMP_FORMAT', type : 'integer',
         description : 'Timestamp format in filename: 0-epoch 1-human readable'
       )
 
+option('log_pel_on_dump_delete', type: 'feature',
+        value : 'disabled',
+        description : 'Log PEL on deleting the dump'
+      )
+option('fault_data_dump', type: 'feature',
+        value : 'disabled',
+        description : 'Dump to store system fault data'
+      )
+
 # Fault log options
 
 option('FAULTLOG_DUMP_PATH', type : 'string',

tools/dreport.d/ibm.d/plugins.d/faultlog

@@ -0,0 +1,13 @@
+#!/bin/bash
+#
+# config: 6 10
+# @brief: Collect faultlog command output.
+#
+
+. $DREPORT_INCLUDE/functions
+
+desc="faultlog"
+file_name="faultlog.json"
+command="faultlog -f"
+
+add_cmd_output "$command" "$file_name" "$desc"

tools/dreport.d/sample.conf

@@ -10,3 +10,4 @@
 3: elog
 4: checkstop
 5: ramoops
+6: faultdata