Merge pull request #6 from stephenchengCloud/private/stephenche/CP-47959

CP-47959: Parse lspci-vv for driver information

Author: stephenchengCloud

hwinfo/pci/__init__.py

@@ -76,6 +76,9 @@ def get_subvendor_name(self):
     def get_subvendor_id(self):
         return self._fmt(self.lookup_value('pci_subvendor_id'))
 
+    def get_driver(self):
+        return self._fmt(self.lookup_value('pci_device_driver'))
+
     def get_pci_id(self):
         return "%s:%s %s:%s" % (
             self._fmt(self.lookup_value('pci_vendor_id')),
@@ -109,5 +112,6 @@ def get_rec(self):
         rec['subdevice_name'] = self.get_subdevice_name()
         rec['subvendor_id'] = self.get_subvendor_id()
         rec['subdevice_id'] = self.get_subdevice_id()
+        rec['driver'] = self.get_driver()
 
         return rec

hwinfo/pci/lspci.py

@@ -16,6 +16,7 @@ class LspciVVParser(CommandParser):
         r'(?P<pci_device_bus_id>(' + BUSID_REGEX + r'))\ (?P<pci_device_class_name>' + LABEL_REGEX + r'):\ (?P<pci_device_string>(.*))\n',
         r'Product\ Name:\ (?P<pci_device_vpd_product_name>(.)*)\n',
         r'Subsystem:\ (?P<pci_device_sub_string>(.)*)\n',
+        r'Kernel driver in use:\ (?P<pci_device_driver>\S+)\n',
     ]
 
     ITEM_SEPERATOR = "\n\n"
@@ -24,6 +25,7 @@ class LspciVVParser(CommandParser):
         'pci_device_bus_id',
         'pci_device_class_name',
         'pci_device_string',
+        'pci_device_driver',
     ]
 
 class LspciNParser(CommandParser):

hwinfo/tools/inspector.py

@@ -112,6 +112,9 @@ def exec_command(self, cmd):
 
     def get_lspci_data(self):
         return self.exec_command(['lspci', '-nnmm'])
+    
+    def get_lspci_vv_data(self):
+        return self.exec_command(['lspci', '-vv'])
 
     def get_dmidecode_data(self):
         return self.exec_command(['dmidecode'])
@@ -134,6 +137,16 @@ def get_pci_devices(self):
         data = self.get_lspci_data()
         parser = LspciNNMMParser(data)
         devices = parser.parse_items()
+        # Parse also lspci -vv for driver information
+        data = self.get_lspci_vv_data()
+        parser = LspciVVParser(data)
+        devices_vv = parser.parse_items()
+        driver_info = {d['pci_device_bus_id']: d.get('pci_device_driver') for d in devices_vv if 'pci_device_bus_id' in d}
+        # Add driver information to devices
+        for device in devices:
+            bus_id = device.get('pci_device_bus_id')
+            if bus_id and bus_id in driver_info:
+                device['pci_device_driver'] = driver_info[bus_id]
         return [PCIDevice(device) for device in devices]
 
     def get_info(self):
@@ -206,6 +219,9 @@ def _load_from_file(self, filename):
 
     def get_lspci_data(self):
         return self._load_from_file('lspci-nnm.out')
+    
+    def get_lspci_vv_data(self):
+        return self._load_from_file('lspci-vv.out')
 
     def get_dmidecode_data(self):
         return self._load_from_file('dmidecode.out')
@@ -360,7 +376,7 @@ def system_info(host, options):
 
     return "".join(info).strip()
 
-def export_system_info(host, options):
+def system_info_as_dict(host, options):
     rec = {}
 
     if 'bios' in options:
@@ -381,6 +397,11 @@ def export_system_info(host, options):
         devices = pci_filter_for_gpu(host.get_pci_devices())
         rec["gpus"] = [dev.get_rec() for dev in devices]
 
+    return rec
+
+def export_system_info(host, options):
+    rec = system_info_as_dict(host, options)
+
     return json.dumps(rec, indent=4, separators=(',', ': '))
 
 def main():