[SWDEV-543308] Revert amdsmi_link_metrics structure change

Moved the bit_rate and max_bandwidth back into links in the
amdsmi_link_metrics_t struct as this change was impacting
other teams. Modified the C and python API's, wrapper, and
CLI accordingly.

Signed-off-by: Bindhiya Kanangot Balakrishnan <Bindhiya.KanangotBalakrishnan@amd.com>


[ROCm/amdsmi commit: 645c313f00]

projects/amdsmi/py-interface/amdsmi_interface.py

@@ -3126,6 +3126,8 @@ def amdsmi_get_link_metrics(processor_handle: processor_handle):
         link = link_metrics.links[i]
         links.append({
             "bdf": _format_bdf(link.bdf),
+            "bit_rate": link.bit_rate,
+            "max_bandwidth": link.max_bandwidth,
             "link_type": link.link_type,
             "read": link.read,
             "write": link.write,
@@ -3133,8 +3135,6 @@ def amdsmi_get_link_metrics(processor_handle: processor_handle):
 
     return {
         "num_links": link_metrics.num_links,
-        "bit_rate": link_metrics.bit_rate,
-        "max_bandwidth": link_metrics.max_bandwidth,
         "links": links
     }
 

projects/amdsmi/py-interface/amdsmi_wrapper.py

@@ -1160,6 +1160,8 @@ class struct__links(Structure):
 struct__links._pack_ = 1 # source:False
 struct__links._fields_ = [
     ('bdf', amdsmi_bdf_t),
+    ('bit_rate', ctypes.c_uint32),
+    ('max_bandwidth', ctypes.c_uint32),
     ('link_type', amdsmi_link_type_t),
     ('PADDING_0', ctypes.c_ubyte * 4),
     ('read', ctypes.c_uint64),
@@ -1170,8 +1172,6 @@ struct__links._fields_ = [
 struct_amdsmi_link_metrics_t._pack_ = 1 # source:False
 struct_amdsmi_link_metrics_t._fields_ = [
     ('num_links', ctypes.c_uint32),
-    ('bit_rate', ctypes.c_uint32),
-    ('max_bandwidth', ctypes.c_uint32),
     ('PADDING_0', ctypes.c_ubyte * 4),
     ('links', struct__links * 64),
     ('reserved', ctypes.c_uint64 * 7),