Integrate Broadcom Devices in amd-smi framework

CMakeLists.txt

@@ -104,6 +104,7 @@ include(GNUInstallDirs)
 option(BUILD_TESTS "Build test suite" OFF)
 option(ENABLE_ASAN_PACKAGING "" OFF)
 option(ENABLE_ESMI_LIB "Build ESMI Library" ON)
+option(ENABLE_BRCM_SMI "Build BRCM SMI Library" OFF)
 option(BUILD_EXAMPLES "Build examples" OFF)
 
 # If amdsmi is built as a static library, it should support being embedded in other programs. The setting below essentially enables the -fPIC flag.
@@ -291,6 +292,36 @@ set(CMN_INC_LIST
     "${ROCM_INC_DIR}/rocm_smi_npm.h")
 
 add_subdirectory("rocm_smi")
+
+# Conditionally include BRCM SMI sources before building the main library
+if(ENABLE_BRCM_SMI)
+    message(STATUS "BRCM SMI Library enabled")
+    add_compile_definitions(ENABLE_BRCM_SMI=1)
+
+    # Add BRCM SMI sources to the common source list
+    set(BRCM_SMI_SRC_DIR "${CMAKE_CURRENT_SOURCE_DIR}/brcm-smi/src")
+    list(APPEND CMN_SRC_LIST 
+        "${BRCM_SMI_SRC_DIR}/brcm_smi.cc"
+        "${BRCM_SMI_SRC_DIR}/brcm_smi_discovery.cc"
+        "${BRCM_SMI_SRC_DIR}/brcm_smi_device.cc"
+        "${BRCM_SMI_SRC_DIR}/brcm_smi_utils.cc"
+        "${BRCM_SMI_SRC_DIR}/brcm_smi_nic_device.cc"
+        "${BRCM_SMI_SRC_DIR}/brcm_smi_switch_device.cc"
+        "${BRCM_SMI_SRC_DIR}/brcm_smi_no_drm_nic.cc"
+        "${BRCM_SMI_SRC_DIR}/brcm_smi_no_drm_switch.cc"
+        "${BRCM_SMI_SRC_DIR}/brcm_smi_lspci_commands.cc"
+        "${BRCM_SMI_SRC_DIR}/brcm_smi_socket.cc"
+        "${BRCM_SMI_SRC_DIR}/brcm_smi_processor.cc"
+        "${BRCM_SMI_SRC_DIR}/brcm_smi_system.cc"
+    )
+    message(STATUS "BRCM SMI sources added to main library")
+
+    # Include BRCM SMI headers
+    include_directories("${CMAKE_CURRENT_SOURCE_DIR}/brcm-smi/include")
+
+    add_subdirectory("brcm-smi")
+endif()
+
 add_subdirectory("src")
 
 if(BUILD_TESTS)

amdsmi_cli/CMakeLists.txt

@@ -14,6 +14,7 @@ add_custom_command(
     OUTPUT ${PY_PACKAGE_DIR}/__init__.py
            ${PY_PACKAGE_DIR}/amdsmi_cli.py
            ${PY_PACKAGE_DIR}/amdsmi_commands.py
+           ${PY_PACKAGE_DIR}/brcmsmi_commands.py
            ${PY_PACKAGE_DIR}/amdsmi_helpers.py
            ${PY_PACKAGE_DIR}/amdsmi_init.py
            ${PY_PACKAGE_DIR}/amdsmi_logger.py
@@ -27,6 +28,7 @@ add_custom_command(
     COMMAND ${CMAKE_COMMAND} -E copy_if_different ${CMAKE_CURRENT_SOURCE_DIR}/__init__.py ${PY_PACKAGE_DIR}/
     COMMAND ${CMAKE_COMMAND} -E copy_if_different ${CMAKE_CURRENT_SOURCE_DIR}/amdsmi_cli.py ${PY_PACKAGE_DIR}/
     COMMAND ${CMAKE_COMMAND} -E copy_if_different ${CMAKE_CURRENT_SOURCE_DIR}/amdsmi_commands.py ${PY_PACKAGE_DIR}/
+    COMMAND ${CMAKE_COMMAND} -E copy_if_different ${CMAKE_CURRENT_SOURCE_DIR}/brcmsmi_commands.py ${PY_PACKAGE_DIR}/
     COMMAND ${CMAKE_COMMAND} -E copy_if_different ${CMAKE_CURRENT_SOURCE_DIR}/amdsmi_helpers.py ${PY_PACKAGE_DIR}/
     COMMAND ${CMAKE_COMMAND} -E copy_if_different ${CMAKE_CURRENT_SOURCE_DIR}/amdsmi_init.py ${PY_PACKAGE_DIR}/
     COMMAND ${CMAKE_COMMAND} -E copy_if_different ${CMAKE_CURRENT_SOURCE_DIR}/amdsmi_logger.py ${PY_PACKAGE_DIR}/
@@ -44,6 +46,7 @@ add_custom_target(
             ${PY_PACKAGE_DIR}/_version.py
             ${PY_PACKAGE_DIR}/amdsmi_cli.py
             ${PY_PACKAGE_DIR}/amdsmi_commands.py
+            ${PY_PACKAGE_DIR}/brcmsmi_commands.py
             ${PY_PACKAGE_DIR}/amdsmi_helpers.py
             ${PY_PACKAGE_DIR}/amdsmi_init.py
             ${PY_PACKAGE_DIR}/amdsmi_logger.py

amdsmi_cli/amdsmi_cli.py

@@ -159,6 +159,7 @@ def configure_logging_and_execute(args, amd_smi_commands):
                                     amd_smi_commands.xgmi,
                                     amd_smi_commands.partition,
                                     amd_smi_commands.ras,
+                                    amd_smi_commands.dump,
                                     amd_smi_commands.node,
                                     amd_smi_commands.default,
                                     sys_argv=sys.argv,

amdsmi_cli/amdsmi_cli_exceptions.py

@@ -71,8 +71,13 @@
 }
 
 def _get_error_message(error_code):
-    if abs(error_code) in AMDSMI_ERROR_MESSAGES:
-        return AMDSMI_ERROR_MESSAGES[abs(error_code)]
+    # Handle non-numeric error codes gracefully
+    try:
+        error_code_num = int(error_code)
+        if abs(error_code_num) in AMDSMI_ERROR_MESSAGES:
+            return AMDSMI_ERROR_MESSAGES[abs(error_code_num)]
+    except (ValueError, TypeError):
+        pass
     return "Generic error"
 
 
@@ -297,11 +302,25 @@ def __init__(self, command, outputformat: str):
 class AmdSmiLibraryErrorException(AmdSmiException):
     def __init__(self, outputformat: str, error_code):
         super().__init__()
-        self.value = -1000 - abs(error_code)
-        self.smilibcode = error_code
+
+        # Handle non-numeric error codes gracefully
+        try:
+            error_code_num = int(error_code)
+            self.value = -1000 - abs(error_code_num)
+            self.smilibcode = error_code_num
+
+            # Get error message safely
+            if abs(error_code_num) in AMDSMI_ERROR_MESSAGES:
+                error_msg = AMDSMI_ERROR_MESSAGES[abs(error_code_num)]
+            else:
+                error_msg = "Unknown error"
+        except (ValueError, TypeError):
+            self.value = -1000
+            self.smilibcode = error_code
+            error_msg = "Invalid error code"
+
         self.output_format = outputformat
-
-        common_message = f"AMDSMI has returned error '{self.value}' - '{AMDSMI_ERROR_MESSAGES[abs(self.smilibcode)]}'"
+        common_message = f"AMDSMI has returned error '{self.value}' - '{error_msg}'"
 
         self.json_message["error"] = common_message
         self.json_message["code"] = self.value