Merge 'master' into 'amd-master'

Change-Id: Ib08c07571f3c3a68e56d06dbdc5d7ee60cdb32c2


[ROCm/rocm_smi_lib commit: 4750b33579]

projects/rocm-smi-lib/src/rocm_smi.cc

@@ -662,7 +662,11 @@ static rsmi_status_t get_od_clk_volt_info(uint32_t dv_ind,
   p->curr_sclk_range.upper_bound = freq_string_to_int(val_vec, nullptr,
                                      nullptr, kOD_SCLK_label_array_index + 2);
 
-  assert(val_vec[kOD_MCLK_label_array_index] == "OD_MCLK:");
+
+  // The condition below indicates old style format, which is not supported
+  if (val_vec[kOD_MCLK_label_array_index] != "OD_MCLK:") {
+    return RSMI_STATUS_NOT_YET_IMPLEMENTED;
+  }
   p->curr_mclk_range.lower_bound = 0;
 
   p->curr_mclk_range.upper_bound = freq_string_to_int(val_vec, nullptr,

projects/rocm-smi-lib/tests/rocm_smi_test/functional/rsmi_sanity.cc

@@ -650,7 +650,16 @@ void TestSanity::Run(void) {
       }
 
       err = rsmi_dev_od_volt_info_get(i, &odv);
-      DISPLAY_RSMI_ERR(err)
+      if (err == RSMI_STATUS_FILE_ERROR ||
+                                     err == RSMI_STATUS_NOT_YET_IMPLEMENTED) {
+        IF_VERB(STANDARD) {
+          std::cout <<
+              "\t**rsmi_dev_od_volt_info_get: Not supported on this machine"
+                                                                 << std::endl;
+        }
+      } else {
+        CHK_ERR_ASRT(err)
+      }
 
       if (err == RSMI_STATUS_SUCCESS) {
         std::cout << "\t**Frequency-voltage curve data:" << std::endl;