From 312034409ead767bb04d2285e06db8a7be7d52c1 Mon Sep 17 00:00:00 2001
From: Charis Poag <Charis.Poag@amd.com>
Date: Mon, 20 May 2024 11:26:29 -0500
Subject: [PATCH] SWDEV-462728 Add update-pciids to install + remove subsystem
 name

Added to install to update-pciids if there is network connection.
Removed subsystem name from outputting under model. Added TODO
to add later on.

Change-Id: I028269f2931f61e094116a85a7a1286de548122a
Signed-off-by: Charis Poag <Charis.Poag@amd.com>


[ROCm/amdsmi commit: c5da93ab906be4d6da0a1ab4edcd828e0c084bb3]
---
 projects/amdsmi/DEBIAN/postinst.in     |  5 +++++
 projects/amdsmi/RPM/post.in            |  5 +++++
 projects/amdsmi/src/amd_smi/amd_smi.cc | 15 +--------------
 3 files changed, 11 insertions(+), 14 deletions(-)

diff --git a/projects/amdsmi/DEBIAN/postinst.in b/projects/amdsmi/DEBIAN/postinst.in
index 3d0535d8a7..76c97b92f8 100755
--- a/projects/amdsmi/DEBIAN/postinst.in
+++ b/projects/amdsmi/DEBIAN/postinst.in
@@ -1,5 +1,9 @@
 #!/bin/bash
 
+do_updatepciids() {
+  update-pciids >/dev/null 2>&1 || true
+}
+
 do_configureLogrotate() {
   local IS_SYSTEMD=0
   local packageName="amd-smi-lib"
@@ -187,6 +191,7 @@ case "$1" in
   ( configure )
     do_install_amdsmi_python_lib
     do_ldconfig
+    do_updatepciids
     do_configureLogrotate || exit 0
   ;;
   ( abort-upgrade | abort-remove | abort-deconfigure )
diff --git a/projects/amdsmi/RPM/post.in b/projects/amdsmi/RPM/post.in
index 653b365f8f..f8591489b5 100755
--- a/projects/amdsmi/RPM/post.in
+++ b/projects/amdsmi/RPM/post.in
@@ -1,5 +1,9 @@
 #!/bin/bash
 
+do_updatepciids() {
+  update-pciids >/dev/null 2>&1 || true
+}
+
 do_configureLogrotate() {
   local IS_SYSTEMD=0
   local packageName="amd-smi-lib"
@@ -186,5 +190,6 @@ do_install_amdsmi_python_lib() {
 if [ "$1" -ge 1 ]; then
   do_install_amdsmi_python_lib
   do_ldconfig
+  do_updatepciids
   do_configureLogrotate || exit 0
 fi
diff --git a/projects/amdsmi/src/amd_smi/amd_smi.cc b/projects/amdsmi/src/amd_smi/amd_smi.cc
index d9c9b1244c..daa809247a 100644
--- a/projects/amdsmi/src/amd_smi/amd_smi.cc
+++ b/projects/amdsmi/src/amd_smi/amd_smi.cc
@@ -424,19 +424,6 @@ amdsmi_status_t amdsmi_get_gpu_board_info(amdsmi_processor_handle processor_hand
        << "\n; info->product_name: |" << board_info->product_name << "|";
     LOG_INFO(ss);
 
-    // Correct any missing details
-    if (board_info->model_number[0] == '\0') {
-        status = rsmi_wrapper(rsmi_dev_name_get, processor_handle, board_info->model_number,
-                            AMDSMI_256_LENGTH);
-         if (status != AMDSMI_STATUS_SUCCESS) {
-            memset(board_info->model_number, 0,
-                   AMDSMI_256_LENGTH * sizeof(board_info->model_number[0]));
-        }
-        ss << __PRETTY_FUNCTION__ << " | [rsmi_correction] board_info->model_number= |"
-        << board_info->model_number << "|";
-        LOG_INFO(ss);
-    }
-
     if (board_info->product_serial[0] == '\0') {
         status = rsmi_wrapper(rsmi_dev_serial_number_get, processor_handle,
                               board_info->product_serial, AMDSMI_NORMAL_STRING_LENGTH);
@@ -450,7 +437,7 @@ amdsmi_status_t amdsmi_get_gpu_board_info(amdsmi_processor_handle processor_hand
     }
 
     if (board_info->product_name[0] == '\0') {
-        status = rsmi_wrapper(rsmi_dev_subsystem_name_get,
+        status = rsmi_wrapper(rsmi_dev_name_get,
                               processor_handle, board_info->product_name,
                               AMDSMI_256_LENGTH);
         if (status != AMDSMI_STATUS_SUCCESS) {