From cf0d5ef0adc93a714328de2180f8079401ad7792 Mon Sep 17 00:00:00 2001
From: Akshay Tondak <Akshay.Tondak@amd.com>
Date: Tue, 4 Mar 2025 11:31:15 -0800
Subject: [PATCH 1/3] CR-1228350 fix

Signed-off-by: Akshay Tondak <Akshay.Tondak@amd.com>
---
 src/runtime_src/core/common/smi.cpp | 30 ++++++++++++++---------------
 src/runtime_src/core/common/smi.h   |  1 +
 2 files changed, 16 insertions(+), 15 deletions(-)

diff --git a/src/runtime_src/core/common/smi.cpp b/src/runtime_src/core/common/smi.cpp
index fb5bf09a1..d44412349 100644
--- a/src/runtime_src/core/common/smi.cpp
+++ b/src/runtime_src/core/common/smi.cpp
@@ -49,6 +49,20 @@ smi_base()
   examine_report_desc = {
     {"host", "Host information", "common"}
   };
+
+  configure_options = {
+    {"device", "d", "The Bus:Device.Function (e.g., 0000:d8:00.0) device of interest", "common", "", "string"},
+    {"help", "h", "Help to use this sub-command", "common", "", "none"},
+    {"daemon", "", "Update the device daemon configuration", "hidden", "", "none"},
+    {"purge", "", "Remove the daemon configuration file", "hidden", "", "string"},
+    {"host", "", "IP or hostname for device peer", "hidden", "", "string"},
+    {"security", "", "Update the security level for the device", "hidden", "", "string"},
+    {"clk_throttle", "", "Enable/disable the device clock throttling", "hidden", "", "string"},
+    {"ct_threshold_power_override", "", "Update the power threshold in watts", "hidden", "", "string"},
+    {"ct_threshold_temp_override", "", "Update the temperature threshold in celsius", "hidden", "", "string"},
+    {"ct_reset", "", "Reset all throttling options", "hidden", "", "string"},
+    {"showx", "", "Display the device configuration settings", "hidden", "", "string"}
+  };
 }
 
 std::vector<basic_option> 
@@ -131,22 +145,8 @@ construct_configure_subcommand() const
   subcommand.put("type", "common");
   subcommand.put("description", "Device and host configuration");
 
-  std::vector<option> options = {
-    {"device", "d", "The Bus:Device.Function (e.g., 0000:d8:00.0) device of interest", "common", "", "string"},
-    {"help", "h", "Help to use this sub-command", "common", "", "none"},
-    {"daemon", "", "Update the device daemon configuration", "hidden", "", "none"},
-    {"purge", "", "Remove the daemon configuration file", "hidden", "", "string"},
-    {"host", "", "IP or hostname for device peer", "hidden", "", "string"},
-    {"security", "", "Update the security level for the device", "hidden", "", "string"},
-    {"clk_throttle", "", "Enable/disable the device clock throttling", "hidden", "", "string"},
-    {"ct_threshold_power_override", "", "Update the power threshold in watts", "hidden", "", "string"},
-    {"ct_threshold_temp_override", "", "Update the temperature threshold in celsius", "hidden", "", "string"},
-    {"ct_reset", "", "Reset all throttling options", "hidden", "", "string"},
-    {"showx", "", "Display the device configuration settings", "hidden", "", "string"}
-  };
-
   ptree options_ptree;
-  for (const auto& option : options) {
+  for (const auto& option : configure_options) {
     options_ptree.push_back(std::make_pair("", option.to_ptree()));
   }
 
diff --git a/src/runtime_src/core/common/smi.h b/src/runtime_src/core/common/smi.h
index e18f8909e..094652830 100644
--- a/src/runtime_src/core/common/smi.h
+++ b/src/runtime_src/core/common/smi.h
@@ -54,6 +54,7 @@ class smi_base {
 
   tuple_vector validate_test_desc;
   tuple_vector examine_report_desc;
+  std::vector<option> configure_options;
 
   std::vector<basic_option> 
   construct_option_description(const tuple_vector&) const;

From 264ee218f63aa0706d5c36104a3a2e5f986445ec Mon Sep 17 00:00:00 2001
From: Akshay Tondak <Akshay.Tondak@amd.com>
Date: Tue, 4 Mar 2025 11:53:29 -0800
Subject: [PATCH 2/3] Adding default as minimum list and moving options to
 edge/pcie shims

Signed-off-by: Akshay Tondak <Akshay.Tondak@amd.com>
---
 src/runtime_src/core/common/smi.cpp     | 11 +----------
 src/runtime_src/core/edge/user/smi.cpp  | 14 ++++++++++++++
 src/runtime_src/core/pcie/linux/smi.cpp | 14 ++++++++++++++
 3 files changed, 29 insertions(+), 10 deletions(-)

diff --git a/src/runtime_src/core/common/smi.cpp b/src/runtime_src/core/common/smi.cpp
index d44412349..e6b2c45c5 100644
--- a/src/runtime_src/core/common/smi.cpp
+++ b/src/runtime_src/core/common/smi.cpp
@@ -52,16 +52,7 @@ smi_base()
 
   configure_options = {
     {"device", "d", "The Bus:Device.Function (e.g., 0000:d8:00.0) device of interest", "common", "", "string"},
-    {"help", "h", "Help to use this sub-command", "common", "", "none"},
-    {"daemon", "", "Update the device daemon configuration", "hidden", "", "none"},
-    {"purge", "", "Remove the daemon configuration file", "hidden", "", "string"},
-    {"host", "", "IP or hostname for device peer", "hidden", "", "string"},
-    {"security", "", "Update the security level for the device", "hidden", "", "string"},
-    {"clk_throttle", "", "Enable/disable the device clock throttling", "hidden", "", "string"},
-    {"ct_threshold_power_override", "", "Update the power threshold in watts", "hidden", "", "string"},
-    {"ct_threshold_temp_override", "", "Update the temperature threshold in celsius", "hidden", "", "string"},
-    {"ct_reset", "", "Reset all throttling options", "hidden", "", "string"},
-    {"showx", "", "Display the device configuration settings", "hidden", "", "string"}
+    {"help", "h", "Help to use this sub-command", "common", "", "none"}
   };
 }
 
diff --git a/src/runtime_src/core/edge/user/smi.cpp b/src/runtime_src/core/edge/user/smi.cpp
index 80854ada3..c9396930a 100644
--- a/src/runtime_src/core/edge/user/smi.cpp
+++ b/src/runtime_src/core/edge/user/smi.cpp
@@ -37,6 +37,20 @@ smi_edge() : smi_base()
     {"qspi-status", "QSPI write protection status", "common"},
     {"thermal", "Thermal sensors present on the device", "common"}
   };
+
+  configure_options = {
+    {"device", "d", "The Bus:Device.Function (e.g., 0000:d8:00.0) device of interest", "common", "", "string"},
+    {"help", "h", "Help to use this sub-command", "common", "", "none"},
+    {"daemon", "", "Update the device daemon configuration", "hidden", "", "none"},
+    {"purge", "", "Remove the daemon configuration file", "hidden", "", "string"},
+    {"host", "", "IP or hostname for device peer", "hidden", "", "string"},
+    {"security", "", "Update the security level for the device", "hidden", "", "string"},
+    {"clk_throttle", "", "Enable/disable the device clock throttling", "hidden", "", "string"},
+    {"ct_threshold_power_override", "", "Update the power threshold in watts", "hidden", "", "string"},
+    {"ct_threshold_temp_override", "", "Update the temperature threshold in celsius", "hidden", "", "string"},
+    {"ct_reset", "", "Reset all throttling options", "hidden", "", "string"},
+    {"showx", "", "Display the device configuration settings", "hidden", "", "string"}
+  };
 }
 
 // Create an instance of the derived class
diff --git a/src/runtime_src/core/pcie/linux/smi.cpp b/src/runtime_src/core/pcie/linux/smi.cpp
index aacfa45c6..ea1375b5e 100644
--- a/src/runtime_src/core/pcie/linux/smi.cpp
+++ b/src/runtime_src/core/pcie/linux/smi.cpp
@@ -39,6 +39,20 @@ smi_pcie() : smi_base()
     {"qspi-status", "QSPI write protection status", "common"},
     {"thermal", "Thermal sensors present on the device", "common"}
   };
+
+  configure_options = {
+    {"device", "d", "The Bus:Device.Function (e.g., 0000:d8:00.0) device of interest", "common", "", "string"},
+    {"help", "h", "Help to use this sub-command", "common", "", "none"},
+    {"daemon", "", "Update the device daemon configuration", "hidden", "", "none"},
+    {"purge", "", "Remove the daemon configuration file", "hidden", "", "string"},
+    {"host", "", "IP or hostname for device peer", "hidden", "", "string"},
+    {"security", "", "Update the security level for the device", "hidden", "", "string"},
+    {"clk_throttle", "", "Enable/disable the device clock throttling", "hidden", "", "string"},
+    {"ct_threshold_power_override", "", "Update the power threshold in watts", "hidden", "", "string"},
+    {"ct_threshold_temp_override", "", "Update the temperature threshold in celsius", "hidden", "", "string"},
+    {"ct_reset", "", "Reset all throttling options", "hidden", "", "string"},
+    {"showx", "", "Display the device configuration settings", "hidden", "", "string"}
+  };
 }
 
 // Create an instance of the derived class

From aeb1b6006bfe1aaef5c28d7ce9a6261ecb3cb430 Mon Sep 17 00:00:00 2001
From: Akshay Tondak <Akshay.Tondak@amd.com>
Date: Tue, 4 Mar 2025 13:39:33 -0800
Subject: [PATCH 3/3] Using initialization list for cleaner code

Signed-off-by: Akshay Tondak <Akshay.Tondak@amd.com>
---
 src/runtime_src/core/common/smi.cpp | 15 ++++++---------
 1 file changed, 6 insertions(+), 9 deletions(-)

diff --git a/src/runtime_src/core/common/smi.cpp b/src/runtime_src/core/common/smi.cpp
index e6b2c45c5..9974c14eb 100644
--- a/src/runtime_src/core/common/smi.cpp
+++ b/src/runtime_src/core/common/smi.cpp
@@ -43,18 +43,15 @@ to_ptree() const
 }
 
 smi_base::
-smi_base()
-{
-
-  examine_report_desc = {
+smi_base() : 
+  examine_report_desc {
     {"host", "Host information", "common"}
-  };
-
-  configure_options = {
+  },
+  configure_options {
     {"device", "d", "The Bus:Device.Function (e.g., 0000:d8:00.0) device of interest", "common", "", "string"},
     {"help", "h", "Help to use this sub-command", "common", "", "none"}
-  };
-}
+  }
+{}
 
 std::vector<basic_option> 
 smi_base::