Merge amd-staging into amd-mainline 20250819 (#634)

Signed-off-by: Maisam Arif <Maisam.Arif@amd.com>
Signed-off-by: Zoy Bai <Zoy.Bai@amd.com>

Author: amd-zoybai

CHANGELOG.md

@@ -19,6 +19,19 @@ Full documentation for amd_smi_lib is available at [https://rocm.docs.amd.com/pr
 
 ### Resolved Issues
 
+- Fixed `amd-smi monitor` errors on guest systems
+```shell
+$ amd-smi monitor
+AttributeError: 'Namespace' object has no attribute 'violation'
+```
+
+Now properly shows:
+```shell
+$ amd-smi monitor
+GPU  XCP  POWER   GPU_T   MEM_T   GFX_CLK   GFX%   MEM%   ENC%   DEC%      VRAM_USAGE
+  0    0   12 W   40 °C   44 °C     9 MHz    8 %    1 %    N/A    0 %    0.2/ 25.4 GB
+```
+
 ### Upcoming Changes
 
 - N/A
@@ -179,6 +192,11 @@ $ amd-smi
 - **Updated `amdsmi_bdf_t` in `amdsmi.h`**.  
   - The `amdsmi_bdf_t` union was changed to have an identical unnamed struct for backwards compatiblity
 
+- **Updated `amdsmi_get_temp_metric` and `amdsmi_temperature_type_t` with new values**.  
+  - New values have added to `amdsmi_temperature_type_t` representing various baseboard and gpuboard temperature measures.
+  - `amdsmi_get_temp_metric` API has also been updated to be able to take in and return the respective values for the new
+  temperature types.
+
 ### Removed
 
 - **Removed unnecessary API, `amdsmi_free_name_value_pairs(),` from amdsmi.h**
@@ -358,7 +376,9 @@ $ amd-smi
 
 ### Upcoming changes
 
-- N/A
+- **`amd-smi metric` will also display gpuboard and baseboard temperatures**.  
+  - This change is meant to follow the API change to amdsmi_get_temp_metric. If these measures are not available due
+  to hardware incompatibility, then they will simply not be displayed in the results when using the metric command.
 
 ### Known issues
 
@@ -625,7 +645,11 @@ $ amd-smi
 
 ### Known issues
 
-- N/A
+- `amd-smi monitor` does not work on guest systems
+```shell
+$ amd-smi monitor
+AttributeError: 'Namespace' object has no attribute 'violation'
+```
 
 ## amd_smi_lib for ROCm 6.4.0
 

CMakeLists.txt

@@ -97,6 +97,10 @@ option(ENABLE_ASAN_PACKAGING "" OFF)
 option(ENABLE_ESMI_LIB "Build ESMI Library" ON)
 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.
+set(CMAKE_POSITION_INDEPENDENT_CODE ON CACHE BOOL "Enable position independent code for all targets")
+mark_as_advanced(CMAKE_POSITION_INDEPENDENT_CODE)
+
 include(CMakeDependentOption)
 # these options don't work without BUILD_SHARED_LIBS
 cmake_dependent_option(BUILD_WRAPPER "Rebuild AMDSMI-wrapper" OFF "BUILD_SHARED_LIBS" OFF)

amdsmi_cli/amdsmi_commands.py

@@ -760,7 +760,7 @@ def get_accelerator_partition_profile_config(self):
                     return accelerator_partition_profiles
                 break
             except Exception as e:
-                logging.debug(f"AMDSMIHelpers.get_accelerator_partition_profile_config - Unexpected error occured --> Unable to get accelerator partition profile config for device {dev}: {str(e)}")
+                logging.debug(f"AMDSMIHelpers.get_accelerator_partition_profile_config - Unexpected error occurred --> Unable to get accelerator partition profile config for device {dev}: {str(e)}")
                 break
         return accelerator_partition_profiles
 
@@ -822,6 +822,13 @@ def get_power_caps(self):
             except amdsmi_interface.AmdSmiLibraryException as e:
                 logging.debug(f"AMDSMIHelpers.get_power_caps - Unable to get power cap info for device {dev}: {str(e)}")
                 continue
+        
+        # If we never found a real min or max, set them to N/A
+        if power_cap_min == amdsmi_interface.MaxUIntegerTypes.UINT64_T:
+            power_cap_min = "N/A"
+        if power_cap_max == 0:
+            power_cap_max = "N/A"
+
         return (power_cap_min, power_cap_max)
 
 
@@ -1177,7 +1184,7 @@ def display_cper_files_generated(self, entries, device_handle, folder):
         if not getattr(self, "_cper_display_initialized", False):
             # Warning if no folder was specified elsewhere
             if not getattr(self, "_cper_warning_printed", False):
-               print(f"WARNING:No cper files will be dumped unless --folder=<folder_name> is specified.")
+               print(f"WARNING:No cper files will be dumped unless --folder=<folder_name> is specified and cper entries exist.")
                self._cper_warning_printed = True
 
             self._print_header(folder)
@@ -1441,11 +1448,13 @@ def ras_cper(self, args, device_handle, logger, gpu_idx):
         logger.set_cper_exit_message(False)
         self.stop = False
 
+        num_entries = 0
         while True:
             try:
                 entries, new_cursor, cper_data, status_code = amdsmi_interface.amdsmi_get_gpu_cper_entries(
                     device_handle, severity_mask, buffer_size, args.cursor[gpu_idx])
                 logging.debug(f"cper_entries | entries: {entries}")
+                num_entries = num_entries + len(entries)
             except amdsmi_exception.AmdSmiLibraryException as e:
                 if e.get_error_code() == amdsmi_interface.amdsmi_wrapper.AMDSMI_STATUS_NO_PERM:
                     raise PermissionError('Error opening CPER file. This command requires elevation') from e
@@ -1462,7 +1471,11 @@ def ras_cper(self, args, device_handle, logger, gpu_idx):
                 break
             if args.folder:
                 self.dump_cper_entries(args.folder, entries, cper_data, device_handle, args.file_limit)
-                break
+            else:
+                self.display_cper_files_generated(entries, device_handle, args.folder)
+        if num_entries == 0 and not args.follow:
+            if args.folder:
+                self.dump_cper_entries(args.folder, entries, cper_data, device_handle, args.file_limit)
             else:
                 self.display_cper_files_generated(entries, device_handle, args.folder)
 

amdsmi_cli/amdsmi_helpers.py

@@ -25,9 +25,7 @@
 import time
 from typing import Dict
 from enum import Enum
-import inspect
 from amdsmi_helpers import AMDSMIHelpers
-import amdsmi_cli_exceptions
 
 class AMDSMILogger():
     def __init__(self, format='human_readable', destination='stdout', helpers=None) -> None:
@@ -92,10 +90,10 @@ def clear_multiple_devices_output(self):
         self.multiple_device_output.clear()
 
 
-    def cper_exit_message(self):
-        """ Store the cper exit message
+    def get_cper_exit_message(self):
+        """ Get the cper exit message
             params:
-                message (str) - message to store
+                None
             return:
                 cper_exit_message (bool) - True if cper exit message is set
         """
@@ -239,9 +237,10 @@ def _convert_json_to_tabular(self, json_object: Dict[str, any], dynamic=False):
                             string_process_value = str(process_value)
                             if process_key == "name":
                                 # Truncate name if too long
-                                process_name = string_process_value.split('/')[-1][:17]
-                                if process_name == "":
+                                if string_process_value == "" or string_process_value == "N/A":
                                     process_name = "N/A"
+                                else:
+                                    process_name = string_process_value.split('/')[-1][:17]
                                 table_values += process_name.rjust(17)
                             elif process_key == "pid":
                                 table_values += string_process_value.rjust(9)
@@ -459,7 +458,7 @@ def _store_core_output_amdsmi(self, core_id, argument, data):
             else:
                 self.output[argument] = data
         else:
-            raise amdsmi_cli_exceptions(self, "Invalid output format given, only json, csv, and human_readable supported")
+            raise ValueError("Invalid output format: expected json, csv, or human_readable")
 
 
     def _store_cpu_output_amdsmi(self, cpu_id, argument, data):
@@ -481,7 +480,7 @@ def _store_cpu_output_amdsmi(self, cpu_id, argument, data):
             else:
                 self.output[argument] = data
         else:
-            raise amdsmi_cli_exceptions(self, "Invalid output format given, only json, csv, and human_readable supported")
+            raise ValueError("Invalid output format: expected json, csv, or human_readable")
 
 
     def _store_output_amdsmi(self, gpu_id, argument, data):
@@ -503,7 +502,7 @@ def _store_output_amdsmi(self, gpu_id, argument, data):
             else:
                 self.output[argument] = data
         else:
-            raise amdsmi_cli_exceptions(self, "Invalid output format given, only json, csv, and human_readable supported")
+            raise ValueError("Invalid output format: expected json, csv, or human_readable")
 
 
     def store_multiple_device_output(self):
@@ -1024,11 +1023,24 @@ def print_default_output(self, output: Dict):
                     amdgpu_version = "N/A".ljust(8)
             else:
                 amdgpu_version = str(driver_version['driver_version'])[:8].ljust(8)
+        fw_pldm_version = str(output['version_info']['fw pldm version'])
+        vbios_version = str(output['version_info']['vbios version'])
 
         # print GPU info
         print(default_line_1)
         print("| AMD-SMI {0:20s} amdgpu version: {1:8s} ROCm version: {2:8s} |".format(amd_smi_version.ljust(20), amdgpu_version, rocm_version))
-        print("| Platform: {0:20.20s} {1:46s}|".format(str(self.helpers.os_info()), ""))
+
+        # adjust format depending on whether vbios or fw pldm version is present
+        if vbios_version != "N/A" and fw_pldm_version != "N/A":
+            print("| VBIOS version: {0:22s}  {1:12s}  FW PLDM: {2:15s}|".format(vbios_version, "", fw_pldm_version))
+        elif vbios_version != "N/A" and fw_pldm_version == "N/A":
+            print("| VBIOS version: {0:22s}  {1:37s} |".format(vbios_version, ""))
+        elif fw_pldm_version != "N/A" and vbios_version == "N/A":
+            print("| FW PLDM: {0:15s}  {1:50s} |".format(fw_pldm_version, ""))
+        else:
+            pass  # Both VBIOS and FW PLDM versions are "N/A" so skip this line
+
+        print("| Platform: {0:25.25s} {1:41s}|".format(str(self.helpers.os_info()), ""))
         print(default_line_2)
         print("| BDF                        GPU-Name | Mem-Uti   Temp   UEC       Power-Usage |")
         print("| GPU  HIP-ID  OAM-ID  Partition-Mode | GFX-Uti    Fan               Mem-Usage |")