Merge amd-staging into amd-master 20220128

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


[ROCm/rocm_smi_lib commit: 25e32e9daf]

projects/rocm-smi-lib/CMakeLists.txt

@@ -176,6 +176,7 @@ install(EXPORT rocm_smiTargets DESTINATION
   "${ROCM_SMI}/lib/cmake" COMPONENT dev)
 
 #License file
+set(CPACK_RPM_PACKAGE_LICENSE "NCSA")
 install( FILES ${CPACK_RESOURCE_FILE_LICENSE} DESTINATION share/doc/smi-lib RENAME LICENSE.txt)
 
 ###########################

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

@@ -630,7 +630,7 @@ int Device::writeDevInfoStr(DevInfoTypes type, std::string valStr) {
     ret = RSMI_STATUS_NOT_SUPPORTED;
   }
   fs.close();
-  
+
   return ret;
 }
 
@@ -742,7 +742,8 @@ int Device::readDevInfoMultiLineStr(DevInfoTypes type,
     return 0;
   }
   // Remove any *trailing* empty (whitespace) lines
-  while (retVec->back().find_first_not_of(" \t\n\v\f\r") == std::string::npos) {
+  while (retVec->size() != 0 &&
+        retVec->back().find_first_not_of(" \t\n\v\f\r") == std::string::npos) {
     retVec->pop_back();
   }
   return 0;

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

@@ -102,7 +102,16 @@ void TestFanRead::Run(void) {
         std::cout << "\t**Current Fan Speed: ";
       }
       err = rsmi_dev_fan_speed_get(i, 0, &val_i64);
-      CHK_ERR_ASRT(err)
+      if (err == RSMI_STATUS_NOT_SUPPORTED) {
+          IF_VERB(STANDARD) {
+            std::cout << "\t**" <<  ": " <<
+                               "Not supported on this machine" << std::endl;
+          }
+          return;
+      } else {
+        CHK_ERR_ASRT(err)
+      }
+
 
       // Verify api support checking functionality is working
       err = rsmi_dev_fan_speed_get(i, 0, nullptr);

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

@@ -101,7 +101,15 @@ void TestFanReadWrite::Run(void) {
     PrintDeviceHeader(dv_ind);
 
     ret = rsmi_dev_fan_speed_get(dv_ind, 0, &orig_speed);
-    CHK_ERR_ASRT(ret)
+    if (ret == RSMI_STATUS_NOT_SUPPORTED) {
+       IF_VERB(STANDARD) {
+          std::cout << "\t**" <<  ": " <<
+                             "Not supported on this machine" << std::endl;
+        }
+        return;
+    } else {
+        CHK_ERR_ASRT(ret)
+    }
     IF_VERB(STANDARD) {
       std::cout << "Original fan speed: " << orig_speed << std::endl;
     }

projects/rocm-smi-lib/tests/rocm_smi_test/rsmitst.exclude

@@ -48,4 +48,9 @@ $BLACKLIST_ALL_ASICS\
 "rsmitstReadWrite.FanReadWrite:"\
 "rsmitstReadWrite.TestFrequenciesReadWrite:"\
 "rsmitstReadWrite.TestPciReadWrite:"\
-"rsmitstReadWrite.TestPowerReadWrite"
+"rsmitstReadWrite.TestPowerReadWrite"
+
+# SWDEV-319795
+FILTER[sienna_cichlid]=\
+$BLACKLIST_ALL_ASICS\
+"rsmitstReadWrite.TestPerfLevelReadWrite"