Merge amd-staging into amd-master 20230714

Signed-off-by: Hao Zhou <Hao.Zhou@amd.com>
Change-Id: Ibb3ad39fdb94f93b6c8ef77e0d2447791ec6a20c

amdsmi_cli/amdsmi_commands.py

@@ -212,7 +212,7 @@ class AMDSMICommands():
                 asic_info['device_id'] = hex(asic_info['device_id'])
                 asic_info['rev_id'] = hex(asic_info['rev_id'])
                 if asic_info['asic_serial'] != '':
-                    asic_info['asic_serial'] = '0x' + asic_info['asic_serial']
+                    asic_info['asic_serial'] = hex(int(asic_info['asic_serial'], base=16))
 
                 static_dict['asic'] = asic_info
             except amdsmi_exception.AmdSmiLibraryException as e:
@@ -224,9 +224,10 @@ class AMDSMICommands():
 
             try:
                 bus_info = amdsmi_interface.amdsmi_get_pcie_link_caps(args.gpu)
-
+                pcie_speed_GTs_value = round(bus_info['pcie_speed'] / 1000, 1) if bus_info['pcie_speed'] % 1000 != 0 else  round(bus_info['pcie_speed'] / 1000)
+                bus_info['pcie_speed'] = pcie_speed_GTs_value
                 if self.logger.is_human_readable_format():
-                    unit ='MT/s'
+                    unit ='GT/s'
                     bus_info['pcie_speed'] = f"{bus_info['pcie_speed']} {unit}"
             except amdsmi_exception.AmdSmiLibraryException as e:
                 bus_info = e.get_error_info()
@@ -915,8 +916,10 @@ class AMDSMICommands():
             if args.pcie:
                 try:
                     pcie_link_status = amdsmi_interface.amdsmi_get_pcie_link_caps(args.gpu)
+                    pcie_speed_GTs_value = round(pcie_link_status['pcie_speed'] / 1000, 1) if pcie_link_status['pcie_speed'] % 1000 != 0 else  round(pcie_link_status['pcie_speed'] / 1000)
+                    pcie_link_status['pcie_speed'] = pcie_speed_GTs_value
                     if self.logger.is_human_readable_format():
-                        unit ='MT/s'
+                        unit ='GT/s'
                         pcie_link_status['pcie_speed'] = f"{pcie_link_status['pcie_speed']} {unit}"
                     if self.logger.is_gpuvsmi_compatibility():
                         pcie_link_status['current_width'] = pcie_link_status.pop('pcie_lanes')

tests/amd_smi_test/functional/frequencies_read_write.cc

@@ -176,6 +176,12 @@ void TestFrequenciesReadWrite::Run(void) {
           std::cout << "Resetting mask to all frequencies." << std::endl;
         }
         ret =  amdsmi_set_clk_freq(processor_handles_[dv_ind], amdsmi_clk, 0xFFFFFFFF);
+        if (ret == AMDSMI_STATUS_NOT_SUPPORTED) {
+          std::cout << "\t**Set all frequencies: Not supported on this machine. Skipping..."
+                    << std::endl;
+          ret = AMDSMI_STATUS_SUCCESS;
+          return;
+        }
         if (ret != AMDSMI_STATUS_SUCCESS) {
           return;
         }

tests/amd_smi_test/functional/volt_freq_curv_read.cc

@@ -158,15 +158,18 @@ void TestVoltCurvRead::Run(void) {
     PrintDeviceHeader(processor_handles_[i]);
 
     err =  amdsmi_get_gpu_od_volt_info(processor_handles_[i], &odv);
-    if (err == AMDSMI_STATUS_NOT_SUPPORTED) {
+    if (err == AMDSMI_STATUS_NOT_SUPPORTED
+          || err == AMDSMI_STATUS_NOT_YET_IMPLEMENTED) {
       IF_VERB(STANDARD) {
         std::cout <<
             "\t** amdsmi_get_gpu_od_volt_info: Not supported on this machine"
                                                                << std::endl;
       }
       // Verify api support checking functionality is working
-      err =  amdsmi_get_gpu_od_volt_info(processor_handles_[i], nullptr);
-      ASSERT_EQ(err, AMDSMI_STATUS_NOT_SUPPORTED);
+      if (err == AMDSMI_STATUS_NOT_SUPPORTED) {
+        err =  amdsmi_get_gpu_od_volt_info(processor_handles_[i], nullptr);
+        ASSERT_EQ(err, AMDSMI_STATUS_NOT_SUPPORTED);
+      }
     } else {
       CHK_ERR_ASRT(err)
       // Verify api support checking functionality is working