Merge amd-staging into amd-master 20230203

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

python_smi_tools/rocm_smi.py

@@ -2088,7 +2088,9 @@ def showProductName(deviceList):
                     device_sku = vbios.value.decode().split('-')[1]
                 else:
                     device_sku = 'unknown'
-            printLog(device, 'Card SKU', '\t\t' + device_sku)
+                printLog(device, 'Card SKU', '\t\t' + device_sku)
+            else:
+                printErrLog(device, "Unable to decode VBIOS value for device SKU")
         else:
             printLog(device, 'Incompatible device.\n' \
                              'GPU[%s]\t\t: Expected vendor name: Advanced Micro Devices, Inc. [AMD/ATI]\n' \