Merge amd-dev into amd-master 20240710

Signed-off-by: Maisam Arif <[email protected]> Change-Id: I4ffe6789a1fa70759d5161bcf77f44a76e321571
ROCm · Jul 11, 2024 · 4732919 · 4732919
2 parents 4f160a5 + 5489383
commit 4732919
Show file tree

Hide file tree

Showing 7 changed files with 20 additions and 21 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -28,7 +28,7 @@ find_program(GIT NAMES git)
 
 ## Setup the package version based on git tags.
 set(PKG_VERSION_GIT_TAG_PREFIX "amdsmi_pkg_ver")
-get_package_version_number("24.6.1" ${PKG_VERSION_GIT_TAG_PREFIX} GIT)
+get_package_version_number("24.6.2" ${PKG_VERSION_GIT_TAG_PREFIX} GIT)
 message("Package version: ${PKG_VERSION_STR}")
 set(${AMD_SMI_LIBS_TARGET}_VERSION_MAJOR "${CPACK_PACKAGE_VERSION_MAJOR}")
 set(${AMD_SMI_LIBS_TARGET}_VERSION_MINOR "${CPACK_PACKAGE_VERSION_MINOR}")

diff --git a/amdsmi_cli/README.md b/amdsmi_cli/README.md
@@ -79,7 +79,7 @@ AMD-SMI reports the version and current platform detected when running the comma
 ~$ amd-smi
 usage: amd-smi [-h]  ...
 
-AMD System Management Interface | Version: 24.6.1.0 | ROCm version: 6.2.0 | Platform: Linux Baremetal
+AMD System Management Interface | Version: 24.6.2.0 | ROCm version: 6.2.0 | Platform: Linux Baremetal
 
 options:
   -h, --help          show this help message and exit

diff --git a/docs/doxygen/Doxyfile b/docs/doxygen/Doxyfile
@@ -48,7 +48,7 @@ PROJECT_NAME           = AMD SMI
 # could be handy for archiving the generated documentation or if some version
 # control system is used.
 
-PROJECT_NUMBER         = "24.6.1.0"
+PROJECT_NUMBER         = "24.6.2.0"
 
 # Using the PROJECT_BRIEF tag one can provide an optional one line description
 # for a project that appears at the top of each page and should give viewer a

diff --git a/docs/how-to/using-AMD-SMI-CLI-tool.md b/docs/how-to/using-AMD-SMI-CLI-tool.md
@@ -6,7 +6,7 @@ AMD-SMI reports the version and current platform detected when running the comma
 ~$ amd-smi
 usage: amd-smi [-h]  ...
 
-AMD System Management Interface | Version: 24.6.1.0 | ROCm version: 6.2.0 | Platform: Linux Baremetal
+AMD System Management Interface | Version: 24.6.2.0 | ROCm version: 6.2.0 | Platform: Linux Baremetal
 
 options:
   -h, --help          show this help message and exit

diff --git a/include/amd_smi/amdsmi.h b/include/amd_smi/amdsmi.h
@@ -154,7 +154,7 @@ typedef enum {
 #define AMDSMI_LIB_VERSION_MAJOR 6
 
 //! Minor version should be updated for each API change, but without changing headers
-#define AMDSMI_LIB_VERSION_MINOR 1
+#define AMDSMI_LIB_VERSION_MINOR 2
 
 //! Release version should be set to 0 as default and can be updated by the PMs for each CSP point release
 #define AMDSMI_LIB_VERSION_RELEASE 0

diff --git a/py-interface/amdsmi_wrapper.py b/py-interface/amdsmi_wrapper.py
@@ -2613,7 +2613,6 @@ class struct_amdsmi_hsmp_metrics_table_t(Structure):
     'amdsmi_get_cpu_fclk_mclk', 'amdsmi_get_cpu_hsmp_proto_ver',
     'amdsmi_get_cpu_model', 'amdsmi_get_cpu_prochot_status',
     'amdsmi_get_cpu_pwr_svi_telemetry_all_rails',
-    'amdsmi_get_threads_per_core',
     'amdsmi_get_cpu_smu_fw_version',
     'amdsmi_get_cpu_socket_c0_residency',
     'amdsmi_get_cpu_socket_current_active_freq_limit',
@@ -2672,9 +2671,10 @@ class struct_amdsmi_hsmp_metrics_table_t(Structure):
     'amdsmi_get_processor_info', 'amdsmi_get_processor_type',
     'amdsmi_get_soc_pstate', 'amdsmi_get_socket_handles',
     'amdsmi_get_socket_info', 'amdsmi_get_temp_metric',
-    'amdsmi_get_utilization_count', 'amdsmi_get_xgmi_info',
-    'amdsmi_get_xgmi_plpd', 'amdsmi_gpu_block_t',
-    'amdsmi_gpu_cache_info_t', 'amdsmi_gpu_control_counter',
+    'amdsmi_get_threads_per_core', 'amdsmi_get_utilization_count',
+    'amdsmi_get_xgmi_info', 'amdsmi_get_xgmi_plpd',
+    'amdsmi_gpu_block_t', 'amdsmi_gpu_cache_info_t',
+    'amdsmi_gpu_control_counter',
     'amdsmi_gpu_counter_group_supported', 'amdsmi_gpu_create_counter',
     'amdsmi_gpu_destroy_counter', 'amdsmi_gpu_metrics_t',
     'amdsmi_gpu_read_counter', 'amdsmi_gpu_xgmi_error_status',

diff --git a/tests/amd_smi_test/amdsmitst.exclude b/tests/amd_smi_test/amdsmitst.exclude
@@ -56,18 +56,6 @@ FILTER[sienna_cichlid]=\
 $BLACKLIST_ALL_ASICS\
 "amdsmitstReadWrite.TestPerfLevelReadWrite"
 
-# SWDEV-391407
-# aqua_vanjaram and later systems show 'ip discovery' in
-# /sys/class/kfd/kfd/topology/nodes/*/name
-#
-# For those systems gfx_target_version must be used. It can be found in
-# /sys/class/kfd/kfd/topology/nodes/*/properties
-FILTER[90400]=\
-$BLACKLIST_ALL_ASICS\
-# "amdsmitstReadOnly.TestVoltCurvRead"
-FILTER[90401]=${FILTER[90400]}
-FILTER[90402]=${FILTER[90400]}
-
 # SWDEV-321166
 FILTER[virtualization]=\
 $BLACKLIST_ALL_ASICS\
@@ -77,3 +65,14 @@ $BLACKLIST_ALL_ASICS\
 "amdsmitstReadWrite.TestOverdriveReadWrite:"\
 "amdsmitstReadWrite.TestPowerReadWrite:"\
 "amdsmitstReadWrite.TestPowerCapReadWrite"
+
+# aqua_vanjaram and later systems show 'ip discovery' in
+# /sys/class/kfd/kfd/topology/nodes/*/name
+#
+# For those systems gfx_target_version must be used. It can be found in
+# /sys/class/kfd/kfd/topology/nodes/*/properties
+# 
+# ex.
+# FILTER[90400]=\
+# $BLACKLIST_ALL_ASICS\
+# "amdsmitstReadOnly.TestVoltCurvRead"