Merge amd-staging into amd-mainline 20251117 (#838)

marifamd · web-flow · commit b5522cc8141a · 2025-11-17T17:25:48.000-06:00
Signed-off-by: Maisam Arif &lt;Maisam.Arif@amd.com&gt;
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -67,16 +67,29 @@ Full documentation for amd_smi_lib is available at [https://rocm.docs.amd.com/pr
 
 ### Changed
 
-- **`amd-smi set --power-cap` now requires specification of the power cap type**.  
-  - Command now takes the form: `amd-smi set --power-cap <power-cap-type> <new-cap>`. Acceptable power cap types are "ppt0" and "ppt1".  
-  Ex.
+- **The `amd-smi` command now shows hsmp rather than amd_hsmp**.  
+  - The hsmp driver version can be shown without the amdgpu version using `amd-smi version -c`
+
+  ```console
+   $ amd-smi version
+   AMDSMI Tool: 24.7.1+b446d6c-dirty | AMDSMI Library version: 24.7.2.0 | ROCm version: N/A | amdgpu version: 6.10.10 | hsmp version: 2.2
+
+   $ amd-smi version -c
+   AMDSMI Tool: 24.7.1+b446d6c-dirty | AMDSMI Library version: 24.7.2.0 | ROCm version: N/A | hsmp version: 2.2
+   ...
+  ```
+
+- **`amd-smi set --power-cap` now requires sepcification of the power cap type**.  
+  - Command now takes the form: `amd-smi set --power-cap <power-cap-type> <new-cap>`
+  - Acceptable power cap types are "ppt0" and "ppt1"
+
+  ```console
+  $ sudo amd-smi set --power-cap ppt1 1150
+  GPU: 0
+    POWERCAP: Successfully set ppt1 power cap to 1150W
+    ...
+  ```
 
-    ```console
-    $ sudo amd-smi set --power-cap ppt1 1150
-    GPU: 0
-      POWERCAP: Successfully set PPT1 power cap to 1150W
-      ...
-    ```  
 - **`amd-smi reset --power-cap` will attempt to reset both power caps**.  
   - When using the reset command, both PPT0 and PPT1 power caps will be reset to their default values. If a device only has PPT0, then only PPT0 will be reset.  
     Ex.
@@ -1402,7 +1415,7 @@ Functions affected by struct change are:
 - **Corrected CLI CPU argument name**.  
   - `--cpu-pwr-svi-telemtry-rails` to `--cpu-pwr-svi-telemetry-rails`
 
-- **Added amdgpu driver version and amd_hsmp driver version to `amd-smi version` command**.  
+- **Added amdgpu driver version and amd_hsmp driver version to `amd-smi version` command**.
   - The `amd-smi version` command can now also display the amdgpu driver version using the `-g` flag.
   - The amd_hsmp driver version can also be displayed using the `-c` flag.
   - The new default for the `version` command is to display all the version information, including both amdgpu and amd_hsmp driver versions.
diff --git a/amdsmi_cli/amdsmi_commands.py b/amdsmi_cli/amdsmi_commands.py
@@ -96,7 +96,7 @@ def __init__(self, format='human_readable', destination='stdout', helpers=None)
             except amdsmi_exception.AmdSmiLibraryException as e:
                 if e.err_code in (amdsmi_interface.amdsmi_wrapper.AMDSMI_STATUS_NOT_INIT,
                                 amdsmi_interface.amdsmi_wrapper.AMDSMI_STATUS_NO_DRV):
-                    logging.info('Unable to detect any CPU devices, check amd_hsmp version and module status (sudo modprobe amd_hsmp)')
+                    logging.info('Unable to detect any CPU devices, check amd_hsmp (or) hsmp_acpi version and module status (sudo modprobe amd_hsmp (or) sudo modprobe hsmp_acpi)')
                 else:
                     raise e
 
@@ -112,7 +112,7 @@ def __init__(self, format='human_readable', destination='stdout', helpers=None)
 
             if len(self.cpu_handles) == 0 and len(self.core_handles) == 0:
                 # No CPU's found post amd_hsmp driver initialization
-                logging.error('Unable to detect any CPU devices, check amd_hsmp version and module status (sudo modprobe amd_hsmp)')
+                logging.error('Unable to detect any CPU devices, check amd_hsmp (or) hsmp_acpi version and module status (sudo modprobe amd_hsmp (or) sudo modprobe hsmp_acpi)')
                 exit_flag = True
 
         self.convert_clock_type = {
@@ -200,7 +200,7 @@ def version(self, args, gpu_version=None, cpu_version=None):
             if args.gpu_version:
                 human_readable_output = human_readable_output + f" | amdgpu version: {gpu_version_str}"
             if args.cpu_version:
-                human_readable_output = human_readable_output + f" | amd_hsmp version: {cpu_version_str}"
+                human_readable_output = human_readable_output + f" | hsmp version: {cpu_version_str}"
             # Custom human readable handling for version
             if self.logger.destination == 'stdout':
                 print(human_readable_output)
@@ -2988,7 +2988,7 @@ def metric_cpu(self, args, multiple_devices=False, cpu=None, cpu_power_metrics=N
             try:
                 bandwidth = amdsmi_interface.amdsmi_get_cpu_current_io_bandwidth(args.cpu,
                                                                                     int(args.cpu_io_bandwidth[0][0]),
-                                                                                    args.cpu_io_bandwidth[0][1])
+                                                                                    args.cpu_io_bandwidth[0][1].upper())
                 static_dict["io_bandwidth"]["band_width"] = bandwidth
             except amdsmi_exception.AmdSmiLibraryException as e:
                 static_dict["io_bandwidth"]["band_width"] = "N/A"
@@ -2998,7 +2998,7 @@ def metric_cpu(self, args, multiple_devices=False, cpu=None, cpu_power_metrics=N
             try:
                 bandwidth = amdsmi_interface.amdsmi_get_cpu_current_xgmi_bw(args.cpu,
                                                                             int(args.cpu_xgmi_bandwidth[0][0]),
-                                                                            args.cpu_xgmi_bandwidth[0][1])
+                                                                            args.cpu_xgmi_bandwidth[0][1].upper())
                 static_dict["xgmi_bandwidth"]["band_width"] = bandwidth
             except amdsmi_exception.AmdSmiLibraryException as e:
                 static_dict["xgmi_bandwidth"]["band_width"] = "N/A"
diff --git a/amdsmi_cli/amdsmi_helpers.py b/amdsmi_cli/amdsmi_helpers.py
@@ -239,11 +239,11 @@ def get_cpu_choices(self):
         except amdsmi_interface.AmdSmiLibraryException as e:
             if e.err_code in (amdsmi_interface.amdsmi_wrapper.AMDSMI_STATUS_NOT_INIT,
                               amdsmi_interface.amdsmi_wrapper.AMDSMI_STATUS_DRIVER_NOT_LOADED):
-                logging.info('Unable to get device choices, driver not initialized (amd_hsmp not found in modules)')
+                logging.info('Unable to get device choices, driver not initialized (amd_hsmp  or hsmp_acpi not found in modules)')
             else:
                 raise e
         if len(cpu_handles) == 0:
-            logging.info('Unable to find any devices, check if driver is initialized (amd_hsmp not found in modules)')
+            logging.info('Unable to find any devices, check if driver is initialized (amd_hsmp or hsmp_acpi not found in modules)')
         else:
             # Handle spacing for the gpu_choices_str
             max_padding = int(math.log10(len(cpu_handles))) + 1
@@ -285,11 +285,11 @@ def get_core_choices(self):
         except amdsmi_interface.AmdSmiLibraryException as e:
             if e.err_code in (amdsmi_interface.amdsmi_wrapper.AMDSMI_STATUS_NOT_INIT,
                               amdsmi_interface.amdsmi_wrapper.AMDSMI_STATUS_DRIVER_NOT_LOADED):
-                logging.info('Unable to get device choices, driver not initialized (amd_hsmp not found in modules)')
+                logging.info('Unable to get device choices, driver not initialized (amd_hsmp  or hsmp_acpi not found in modules)')
             else:
                 raise e
         if len(core_handles) == 0:
-            logging.info('Unable to find any devices, check if driver is initialized (amd_hsmp not found in modules)')
+            logging.info('Unable to find any devices, check if driver is initialized (amd_hsmp or hsmp_acpi  not found in modules)')
         else:
             # Handle spacing for the gpu_choices_str
             max_padding = int(math.log10(len(core_handles))) + 1
diff --git a/amdsmi_cli/amdsmi_init.py b/amdsmi_cli/amdsmi_init.py
@@ -62,18 +62,17 @@ def check_amdgpu_driver():
 
 
 def check_amd_hsmp_driver():
-    """ Returns true if amd_hsmp is found in the list of initialized modules """
-    amd_cpu_status_file = Path("/sys/module/amd_hsmp/initstate")
+    """ Returns true if amd_hsmp or hsmp_acpi is found in the list of initialized modules """
+    amd_cpu_status_file = Path("/dev/hsmp")
     if amd_cpu_status_file.exists():
-        if amd_cpu_status_file.read_text(encoding="ascii").strip() == "live":
             return True
     return False
 
 
 def amdsmi_cli_init():
     """ Initializes AMDSMI Library for the CLI
 
-    Checks for the presence of the amdgpu and amd_hsmp drivers and initializes the
+    Checks for the presence of the amdgpu, amd_hsmp or hsmp_acpi drivers and initializes the
     AMD SMI library based on the live drivers found.
 
     Return:
@@ -85,13 +84,13 @@ def amdsmi_cli_init():
     init_flag = amdsmi_interface.AmdSmiInitFlags.INIT_ALL_PROCESSORS
     if check_amdgpu_driver() and check_amd_hsmp_driver():
         init_flag = amdsmi_interface.AmdSmiInitFlags.INIT_AMD_APUS
-        logging.debug("Both amdgpu and amd_hsmp driver's initstate is live")
+        logging.debug("Both amdgpu , amd_hsmp or hsmp_acpi  driver's initstate is live")
         try:
             amdsmi_interface.amdsmi_init(init_flag)
         except (amdsmi_interface.AmdSmiLibraryException, amdsmi_interface.AmdSmiParameterException) as e:
             if e.err_code in (amdsmi_interface.amdsmi_wrapper.AMDSMI_STATUS_NOT_INIT,
                               amdsmi_interface.amdsmi_wrapper.AMDSMI_STATUS_DRIVER_NOT_LOADED):
-                logging.error("Drivers not loaded (amdgpu and amd_hsmp drivers not found in modules)")
+                logging.error("Drivers not loaded (amdgpu, amd_hsmp or hsmp_acpi drivers not found in modules)")
                 sys.exit(-1)
             else:
                 raise e
@@ -107,20 +106,20 @@ def amdsmi_cli_init():
                 sys.exit(-1)
             else:
                 raise e
-        logging.debug("amdgpu driver initialized successfully, but amd_hsmp initstate was not live")
+        logging.debug("amdgpu driver initialized successfully, but amd_hsmp or hsmp_acpi initstate was not live")
     elif check_amd_hsmp_driver():
         init_flag = amdsmi_interface.AmdSmiInitFlags.INIT_AMD_CPUS
-        logging.debug("amd_hsmp driver initstate is live")
+        logging.debug("amd_hsmp or hsmp_acpi driver initstate is live")
         try:
             amdsmi_interface.amdsmi_init(init_flag)
         except (amdsmi_interface.AmdSmiLibraryException, amdsmi_interface.AmdSmiParameterException) as e:
             if e.err_code in (amdsmi_interface.amdsmi_wrapper.AMDSMI_STATUS_NOT_INIT,
                               amdsmi_interface.amdsmi_wrapper.AMDSMI_STATUS_DRIVER_NOT_LOADED):
-                logging.error("Driver not loaded (amd_hsmp not found in modules)")
+                logging.error("Driver not loaded (amd_hsmp or hsmp_acpi not found in modules)")
                 sys.exit(-1)
             else:
                 raise e
-        logging.debug("amd_hsmp driver initialized successfully, but amdgpu initstate was not live")
+        logging.debug("amd_hsmp or hsmp_acpi driver initialized successfully, but amdgpu initstate was not live")
 
     logging.debug(f"AMDSMI initialized with atleast one driver successfully | init flag: {init_flag}")
 
diff --git a/amdsmi_cli/amdsmi_parser.py b/amdsmi_cli/amdsmi_parser.py
@@ -754,7 +754,7 @@ def _add_version_parser(self, subparsers: argparse._SubParsersAction, func):
 
         # help info
         gpu_version_help = "Display the current amdgpu driver version"
-        cpu_version_help = "Display the current amd_hsmp driver version"
+        cpu_version_help = "Display the current amd_hsmp or hsmp_acpi driver version"
 
         # Add GPU and CPU version Arguments
         version_parser.add_argument('-g', '--gpu_version', action='store_true', required=False, help=gpu_version_help, default=None)
@@ -1252,8 +1252,7 @@ def _add_set_value_parser(self, subparsers: argparse._SubParsersAction, func):
                 set_perf_level_help = f"Set one of the following performance levels:\n\t{perf_level_help_choices_str}"
                 power_profile_choices_str = ", ".join(self.helpers.get_power_profiles()[0:-1])
                 set_profile_help = f"Set power profile level (#) or choose one of available profiles:\n\t{power_profile_choices_str}"
-                perf_det_choices_str = ", ".join(self.helpers.get_perf_det_levels())
-                set_perf_det_help = f"Set performance determinism and select one of the corresponding performance levels:\n\t{perf_det_choices_str}"
+                set_perf_det_help = "Enable performance determinism mode and set GFXCLK softmax limit (in MHz)"
                 (accelerator_set_choices, _) = self.helpers.get_accelerator_choices_types_indices()
                 memory_partition_choices_str = ", ".join(self.helpers.get_memory_partition_types())
                 accelerator_set_choices_str = ", ".join(accelerator_set_choices)
diff --git a/docs/how-to/amdsmi-cli-tool.md b/docs/how-to/amdsmi-cli-tool.md
@@ -563,8 +563,7 @@ Set Arguments:
                                                 AUTO, LOW, HIGH, MANUAL, STABLE_STD, STABLE_PEAK, STABLE_MIN_MCLK, STABLE_MIN_SCLK, DETERMINISM
   -P, --profile PROFILE_LEVEL                 Set power profile level (#) or choose one of available profiles:
                                                 CUSTOM_MASK, VIDEO_MASK, POWER_SAVING_MASK, COMPUTE_MASK, VR_MASK, THREE_D_FULL_SCR_MASK, BOOTUP_DEFAULT
-  -d, --perf-determinism SCLKMAX              Set performance determinism and select one of the corresponding performance levels:
-                                                AUTO, LOW, HIGH, MANUAL, STABLE_STD, STABLE_PEAK, STABLE_MIN_MCLK, STABLE_MIN_SCLK, DETERMINISM
+  -d, --perf-determinism SCLKMAX              Enable performance determinism mode and set GFXCLK softmax limit (in MHz)
   -C, --compute-partition TYPE/INDEX          Set one of the following the accelerator TYPE or profile INDEX:
                                                 N/A.
                                                 Use `sudo amd-smi partition --accelerator` to find acceptable values.
diff --git a/docs/install/install.md b/docs/install/install.md
@@ -37,8 +37,7 @@ AMD SMI library can run on AMD ROCm supported platforms. Refer to
 for more information.
 <!--https://rocm.docs.amd.com/projects/install-on-linux/en/latest/reference/system-requirements.html-->
 
-To run the AMD SMI library, the `amdgpu` driver and the `amd_hsmp` driver need
-to be installed. Optionally, `libdrm` can be installed to query firmware
+To run the AMD SMI library, the `amdgpu` driver and the `amd_hsmp` or `hsmp_acpi` driver need to be installed. Optionally, `libdrm` can be installed to query firmware
 information and hardware IPs.
 
 ### Python interface and CLI tool prerequisites
diff --git a/docs/reference/amdsmi-py-api.md b/docs/reference/amdsmi-py-api.md
@@ -1310,12 +1310,8 @@ Input parameters:
 * `cursor`           the zero based index at which to start retrieving cper entries; default value is 0; for example, if there are 10 cper entries available, then with a cursor value of 8, it will retrieve the last two cper entries only
 
 Output: Dictionary with fields, updated cursor, and a dictionary of the cper_data, status_code
-    status_code: 
-        AMDSMI_STATUS_SUCCESS: If all entries were retrieved successfully
-        AMDSMI_STATUS_MORE_DATA: If some of the entries were retrieved and: 
-            * A subsequent call to the API with the updated cursor will result in the fetching the next batch of entries, or
-            * Increasing the input buffer_size will allow more entries to be fetched with the same cursor
 
+Output1: Dictionary with fields
 Field | Description
 ---|---
 `error_severity`   | The severity of the CPER error ex: `non_fatal_uncorrected`, `fatal`, `non_fatal_corrected`. |
@@ -1326,12 +1322,25 @@ Field | Description
 `signature_end`    | A marker value (typically `0xFFFFFFFF`) confirming the integrity of the signature. |
 `sec_cnt`          | The count of sections included in the CPER entry. |
 `record_length`    | The total length in bytes of the CPER entry. |
+`serial_number`    | The product serial number. Exists in raw entries in C++ API |
 `platform_id`      | A character array identifying the GPU or platform. |
 `creator_id`       | A character array indicating the creator of the CPER entry. |
 `record_id`        | A unique identifier for the CPER entry. |
 `flags`            | Reserved flags related to the CPER entry. |
 `persistence_info` | Reserved information related to persistence. |
 
+Output2: Updated cursor (int type)
+* Cursor is the index of the next cper entry in the GPU ring buffer. For example, if 10 entries were fetched successfully, the value of cursor will be 11 upon return from the API. Subsequent call to the API with cursor value of 11 should fetch the next entry
+
+Output3: A list of dictionaries, each dictionary containing the CPER record and its size:
+* {"bytes": <raw bytes>, "size": <number of bytes>}
+
+Output4: status_code
+    AMDSMI_STATUS_SUCCESS: If all entries were retrieved successfully
+    AMDSMI_STATUS_MORE_DATA: If some of the entries were retrieved and: 
+        * A subsequent call to the API with the updated cursor will result in the fetching the next batch of entries, or
+        * Increasing the input buffer_size will allow more entries to be fetched with the same cursor
+
 Exceptions that can be thrown by `amdsmi_get_gpu_cper_entries` function:
 
 * `AmdSmiLibraryException`
diff --git a/goamdsmi_shim/smiwrapper/amdsmi_go_shim.c b/goamdsmi_shim/smiwrapper/amdsmi_go_shim.c
@@ -45,7 +45,7 @@
 #define AMDGPU_INITSTATE_FILE  "/sys/module/amdgpu/initstate"
 
 #define AMDHSMP_DRIVER_NAME    "AMDHSMPDriver"
-#define AMDHSMP_INITSTATE_FILE "/sys/module/amd_hsmp/initstate"
+#define AMDHSMP_INITSTATE_FILE "/dev/hsmp"
 
 static uint32_t num_apuSockets              = GOAMDSMI_VALUE_0;
 static uint32_t num_cpuSockets              = GOAMDSMI_VALUE_0;
diff --git a/include/amd_smi/impl/amd_smi_cper.h b/include/amd_smi/impl/amd_smi_cper.h
@@ -220,5 +220,5 @@ struct cper_1_0 {
 
 amdsmi_status_t amdsmi_get_gpu_cper_entries_by_path(const char *amdgpu_ring_cper_file, uint32_t severity_mask,
                                                     char *cper_data, uint64_t *buf_size, amdsmi_cper_hdr_t **cper_hdrs,
-                                                    uint64_t *entry_count, uint64_t *cursor);
+                                                    uint64_t *entry_count, uint64_t *cursor, uint64_t product_serial);
 std::vector<int> cper_decode(const amdsmi_cper_hdr_t *cper);
diff --git a/include/amd_smi/impl/amd_smi_utils.h b/include/amd_smi/impl/amd_smi_utils.h
@@ -187,4 +187,15 @@ void fill_2d_array(A& arr, T value) {
     }
 }
 
+/**
+ *  @brief Get the product serial number given the processor handle.
+ *
+ *  @param[in] processor_handle a pointer to amdsmi_processor_handle
+ *  which the corresponding processor_handle will be stored
+ *
+ *  @retval ::The serial number
+ *          ::0 if it cannot be determined
+ */
+uint64_t get_product_serial_number(amdsmi_processor_handle processor_handle);
+
 #endif  // AMD_SMI_INCLUDE_AMD_SMI_UTILS_H_
diff --git a/py-interface/amdsmi_interface.py b/py-interface/amdsmi_interface.py
@@ -2776,6 +2776,13 @@ def amdsmi_get_gpu_cper_entries(
             f"{entry_ptr.contents.timestamp.seconds:02d}"
         )
 
+        serial_number = ""
+        if isinstance(processor_handle, amdsmi_wrapper.amdsmi_processor_handle):
+            try:
+                board_info = amdsmi_get_gpu_board_info(processor_handle)
+                serial_number = board_info.get('product_serial', "")
+            except Exception:
+                serial_number = ""
         # Create a dictionary for the CPER entry.
         cper_entry = {
             "error_severity": amdsmi_wrapper.amdsmi_cper_sev_t__enumvalues.get(
@@ -2788,6 +2795,7 @@ def amdsmi_get_gpu_cper_entries(
             "signature_end": hex(entry_ptr.contents.signature_end),
             "sec_cnt": entry_ptr.contents.sec_cnt,
             "record_length": entry_ptr.contents.record_length,
+            "serial_number": serial_number,
             "platform_id": entry_ptr.contents.platform_id,
             "creator_id": entry_ptr.contents.creator_id,
             "record_id": entry_ptr.contents.record_id,
diff --git a/src/amd_smi/amd_smi.cc b/src/amd_smi/amd_smi.cc
@@ -4414,19 +4414,21 @@ amdsmi_get_gpu_cper_entries(
     if (status != AMDSMI_STATUS_SUCCESS) {
         return status;
     }
+
     std::string path = std::string("/sys/kernel/debug/dri/") +
         std::to_string(gpu_device->get_card_id()) +
         "/amdgpu_ring_cper";
 
-
     return amdsmi_get_gpu_cper_entries_by_path(
         path.c_str(),
         severity_mask,
         cper_data,
         buf_size,
         cper_hdrs,
         entry_count,
-        cursor);
+        cursor,
+        get_product_serial_number(processor_handle)
+    );
 }
 
 amdsmi_status_t amdsmi_get_afids_from_cper(
diff --git a/src/amd_smi/amd_smi_cper.cc b/src/amd_smi/amd_smi_cper.cc
diff --git a/src/amd_smi/amd_smi_utils.cc b/src/amd_smi/amd_smi_utils.cc
diff --git a/tests/amd_smi_test/functional/gpu_partition_metrics_read.cc b/tests/amd_smi_test/functional/gpu_partition_metrics_read.cc
diff --git a/tests/amd_smi_test/test_base.cc b/tests/amd_smi_test/test_base.cc
