From 77d8364211f3aec2d89dac64b2f8dd3e8f9e48d3 Mon Sep 17 00:00:00 2001
From: "Galantsev, Dmitrii" <dmitrii.galantsev@amd.com>
Date: Fri, 14 Jul 2023 02:22:50 -0500
Subject: [PATCH] Fix sys and id tests

The following read tests were failing:
*.TestIdInfoRead
*.TestSysInfoRead

1. *.TestIdInfoRead failed because rsmi_dev_brand_get did not specify
   dependency on vbios_version.

2. *.TestSysInfoRead failed because the test didn't expect vbios_version to
   be missing. Which is a new behavior in Aqua Vanjaram.

Change-Id: I9ee88a12fcf6cff2032049e2ecdfb2957efb03ab
Signed-off-by: Galantsev, Dmitrii <dmitrii.galantsev@amd.com>


[ROCm/amdsmi commit: 8fe848d10e485af839fb43501027d2442994021f]
---
 projects/amdsmi/src/rocm_smi_device.cc                         | 3 ++-
 projects/amdsmi/tests/rocm_smi_test/functional/id_info_read.cc | 2 +-
 .../amdsmi/tests/rocm_smi_test/functional/sys_info_read.cc     | 2 +-
 3 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/projects/amdsmi/src/rocm_smi_device.cc b/projects/amdsmi/src/rocm_smi_device.cc
index 18c96b7f13..554b8c0eb8 100755
--- a/projects/amdsmi/src/rocm_smi_device.cc
+++ b/projects/amdsmi/src/rocm_smi_device.cc
@@ -379,7 +379,8 @@ static const std::map<const char *, dev_depends_t> kDevFuncDependsMap = {
   {"rsmi_dev_name_get",                  {{kDevVendorIDFName,
                                            kDevDevIDFName}, {}}},
   {"rsmi_dev_sku_get",                   {{kDevDevProdNumFName}, {}}},
-  {"rsmi_dev_brand_get",                 {{kDevVendorIDFName}, {}}},
+  {"rsmi_dev_brand_get",                 {{kDevVendorIDFName,
+                                           kDevVBiosVerFName}, {}}},
   {"rsmi_dev_vendor_name_get",           {{kDevVendorIDFName}, {}}},
   {"rsmi_dev_serial_number_get",         {{kDevSerialNumberFName}, {}}},
   {"rsmi_dev_subsystem_id_get",          {{kDevSubSysDevIDFName}, {}}},
diff --git a/projects/amdsmi/tests/rocm_smi_test/functional/id_info_read.cc b/projects/amdsmi/tests/rocm_smi_test/functional/id_info_read.cc
index 5c7eea1256..11828feb85 100755
--- a/projects/amdsmi/tests/rocm_smi_test/functional/id_info_read.cc
+++ b/projects/amdsmi/tests/rocm_smi_test/functional/id_info_read.cc
@@ -162,7 +162,7 @@ void TestIdInfoRead::Run(void) {
       IF_VERB(STANDARD) {
         std::cout << "\t**Device Vram Vendor name: " << buffer << std::endl;
       }
-      err = rsmi_dev_brand_get(i, nullptr, kBufferLen);
+      err = rsmi_dev_vram_vendor_get(i, nullptr, kBufferLen);
       ASSERT_EQ(err, RSMI_STATUS_INVALID_ARGS);
     }
     err = rsmi_dev_vendor_id_get(i, &id);
diff --git a/projects/amdsmi/tests/rocm_smi_test/functional/sys_info_read.cc b/projects/amdsmi/tests/rocm_smi_test/functional/sys_info_read.cc
index 14d1977676..dcff82aa84 100755
--- a/projects/amdsmi/tests/rocm_smi_test/functional/sys_info_read.cc
+++ b/projects/amdsmi/tests/rocm_smi_test/functional/sys_info_read.cc
@@ -105,7 +105,7 @@ void TestSysInfoRead::Run(void) {
     err = rsmi_dev_vbios_version_get(i, buffer, 80);
 
     if (err != RSMI_STATUS_SUCCESS) {
-      if (err == RSMI_STATUS_FILE_ERROR) {
+      if ((err == RSMI_STATUS_FILE_ERROR) || (err == RSMI_STATUS_NOT_SUPPORTED)) {
         IF_VERB(STANDARD) {
           std::cout << "\t**VBIOS read: Not supported on this machine"
                                                                 << std::endl;