Merging upstream version 2.5.

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>

1 files changed, 34 insertions, 1 deletions

diff --git a/plugins/solidigm/solidigm-nvme.c b/plugins/solidigm/solidigm-nvme.c
index 0e42bd6..b0db1ea 100644
--- a/plugins/solidigm/solidigm-nvme.c
+++ b/plugins/solidigm/solidigm-nvme.c
@@ -1,6 +1,6 @@
 // SPDX-License-Identifier: GPL-2.0-or-later
 /*
- * Copyright (c) 2022 Solidigm.
+ * Copyright (c) 2022-2023 Solidigm.
  *
  * Author: leonardo.da.cunha@solidigm.com
  */
@@ -10,19 +10,34 @@
 #define CREATE_CMD
 #include "solidigm-nvme.h"
 
+#include "solidigm-id-ctrl.h"
 #include "solidigm-smart.h"
+#include "solidigm-internal-logs.h"
 #include "solidigm-garbage-collection.h"
 #include "solidigm-latency-tracking.h"
 #include "solidigm-telemetry.h"
+#include "solidigm-log-page-dir.h"
+#include "solidigm-market-log.h"
 
 #include "plugins/ocp/ocp-clear-fw-update-history.h"
 #include "plugins/ocp/ocp-smart-extended-log.h"
+#include "plugins/ocp/ocp-fw-activation-history.h"
+
+static int id_ctrl(int argc, char **argv, struct command *cmd, struct plugin *plugin)
+{
+	return __id_ctrl(argc, argv, cmd, plugin, sldgm_id_ctrl);
+}
 
 static int get_additional_smart_log(int argc, char **argv, struct command *cmd, struct plugin *plugin)
 {
 	return solidigm_get_additional_smart_log(argc, argv, cmd, plugin);
 }
 
+static int get_internal_log(int argc, char **argv, struct command *cmd, struct plugin *plugin)
+{
+	return solidigm_get_internal_log(argc, argv, cmd, plugin);
+}
+
 static int get_garbage_collection_log(int argc, char **argv, struct command *cmd, struct plugin *plugin)
 {
 	return solidigm_get_garbage_collection_log(argc, argv, cmd, plugin);
@@ -49,3 +64,21 @@ static int smart_cloud(int argc, char **argv, struct command *cmd,
 {
 	return ocp_smart_add_log(argc, argv, cmd, plugin);
 }
+
+static int fw_activation_history(int argc, char **argv, struct command *cmd,
+				 struct plugin *plugin)
+{
+	return ocp_fw_activation_history_log(argc, argv, cmd, plugin);
+}
+
+static int get_log_page_directory_log(int argc, char **argv, struct command *cmd,
+				      struct plugin *plugin)
+{
+	return solidigm_get_log_page_directory_log(argc, argv, cmd, plugin);
+}
+
+static int get_market_log(int argc, char **argv, struct command *cmd,
+				      struct plugin *plugin)
+{
+	return sldgm_get_market_log(argc, argv, cmd, plugin);
+}