pci: include a minimum pci.ids with classes, note when pci.ids is missing

Noticed that the RPi4 has a PCIe bus, but pci.ids is not included with
the standard Raspbian image, so everything is "(Unknown)."
Now there will be some basic information about what the device is, and
a note about installing pci.ids for more information.

Signed-off-by: Burt P <pburt0@gmail.com>

5 files changed, 250 insertions, 9 deletions

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 39cd191b..657d3106 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -126,6 +126,7 @@ set(HARDINFO_RESOURCES
 	"deps/sysobj_early/data/arm.ids"
 	"deps/sysobj_early/data/edid.ids"
 	"deps/sysobj_early/data/ieee_oui.ids"
+	"deps/sysobj_early/data/pci.ids.min"
 )
 
 set(HARDINFO_MANPAGES
diff --git a/deps/sysobj_early/data/pci.ids.min b/deps/sysobj_early/data/pci.ids.min
new file mode 100644
index 00000000..3a9009d6
--- /dev/null
+++ b/deps/sysobj_early/data/pci.ids.min
@@ -0,0 +1,211 @@
+
+# A minumum version of the pci.ids
+# from https://pci-ids.ucw.cz/
+
+ffff  Illegal Vendor ID
+
+# List of known device classes, subclasses and programming interfaces
+
+# Syntax:
+# C class	class_name
+#	subclass	subclass_name  		<-- single tab
+#		prog-if  prog-if_name  	<-- two tabs
+
+C 00  Unclassified device
+	00  Non-VGA unclassified device
+	01  VGA compatible unclassified device
+C 01  Mass storage controller
+	00  SCSI storage controller
+	01  IDE interface
+		00  ISA Compatibility mode-only controller
+		05  PCI native mode-only controller
+		0a  ISA Compatibility mode controller, supports both channels switched to PCI native mode
+		0f  PCI native mode controller, supports both channels switched to ISA compatibility mode
+		80  ISA Compatibility mode-only controller, supports bus mastering
+		85  PCI native mode-only controller, supports bus mastering
+		8a  ISA Compatibility mode controller, supports both channels switched to PCI native mode, supports bus mastering
+		8f  PCI native mode controller, supports both channels switched to ISA compatibility mode, supports bus mastering
+	02  Floppy disk controller
+	03  IPI bus controller
+	04  RAID bus controller
+	05  ATA controller
+		20  ADMA single stepping
+		30  ADMA continuous operation
+	06  SATA controller
+		00  Vendor specific
+		01  AHCI 1.0
+		02  Serial Storage Bus
+	07  Serial Attached SCSI controller
+		01  Serial Storage Bus
+	08  Non-Volatile memory controller
+		01  NVMHCI
+		02  NVM Express
+	80  Mass storage controller
+C 02  Network controller
+	00  Ethernet controller
+	01  Token ring network controller
+	02  FDDI network controller
+	03  ATM network controller
+	04  ISDN controller
+	05  WorldFip controller
+	06  PICMG controller
+	07  Infiniband controller
+	08  Fabric controller
+	80  Network controller
+C 03  Display controller
+	00  VGA compatible controller
+		00  VGA controller
+		01  8514 controller
+	01  XGA compatible controller
+	02  3D controller
+	80  Display controller
+C 04  Multimedia controller
+	00  Multimedia video controller
+	01  Multimedia audio controller
+	02  Computer telephony device
+	03  Audio device
+	80  Multimedia controller
+C 05  Memory controller
+	00  RAM memory
+	01  FLASH memory
+	80  Memory controller
+C 06  Bridge
+	00  Host bridge
+	01  ISA bridge
+	02  EISA bridge
+	03  MicroChannel bridge
+	04  PCI bridge
+		00  Normal decode
+		01  Subtractive decode
+	05  PCMCIA bridge
+	06  NuBus bridge
+	07  CardBus bridge
+	08  RACEway bridge
+		00  Transparent mode
+		01  Endpoint mode
+	09  Semi-transparent PCI-to-PCI bridge
+		40  Primary bus towards host CPU
+		80  Secondary bus towards host CPU
+	0a  InfiniBand to PCI host bridge
+	80  Bridge
+C 07  Communication controller
+	00  Serial controller
+		00  8250
+		01  16450
+		02  16550
+		03  16650
+		04  16750
+		05  16850
+		06  16950
+	01  Parallel controller
+		00  SPP
+		01  BiDir
+		02  ECP
+		03  IEEE1284
+		fe  IEEE1284 Target
+	02  Multiport serial controller
+	03  Modem
+		00  Generic
+		01  Hayes/16450
+		02  Hayes/16550
+		03  Hayes/16650
+		04  Hayes/16750
+	04  GPIB controller
+	05  Smard Card controller
+	80  Communication controller
+C 08  Generic system peripheral
+	00  PIC
+		00  8259
+		01  ISA PIC
+		02  EISA PIC
+		10  IO-APIC
+		20  IO(X)-APIC
+	01  DMA controller
+		00  8237
+		01  ISA DMA
+		02  EISA DMA
+	02  Timer
+		00  8254
+		01  ISA Timer
+		02  EISA Timers
+		03  HPET
+	03  RTC
+		00  Generic
+		01  ISA RTC
+	04  PCI Hot-plug controller
+	05  SD Host controller
+	06  IOMMU
+	80  System peripheral
+C 09  Input device controller
+	00  Keyboard controller
+	01  Digitizer Pen
+	02  Mouse controller
+	03  Scanner controller
+	04  Gameport controller
+		00  Generic
+		10  Extended
+	80  Input device controller
+C 0a  Docking station
+	00  Generic Docking Station
+	80  Docking Station
+C 0b  Processor
+	00  386
+	01  486
+	02  Pentium
+	10  Alpha
+	20  Power PC
+	30  MIPS
+	40  Co-processor
+C 0c  Serial bus controller
+	00  FireWire (IEEE 1394)
+		00  Generic
+		10  OHCI
+	01  ACCESS Bus
+	02  SSA
+	03  USB controller
+		00  UHCI
+		10  OHCI
+		20  EHCI
+		30  XHCI
+		80  Unspecified
+		fe  USB Device
+	04  Fibre Channel
+	05  SMBus
+	06  InfiniBand
+	07  IPMI Interface
+		00  SMIC
+		01  KCS
+		02  BT (Block Transfer)
+	08  SERCOS interface
+	09  CANBUS
+C 0d  Wireless controller
+	00  IRDA controller
+	01  Consumer IR controller
+	10  RF controller
+	11  Bluetooth
+	12  Broadband
+	20  802.1a controller
+	21  802.1b controller
+	80  Wireless controller
+C 0e  Intelligent controller
+	00  I2O
+C 0f  Satellite communications controller
+	01  Satellite TV controller
+	02  Satellite audio communication controller
+	03  Satellite voice communication controller
+	04  Satellite data communication controller
+C 10  Encryption controller
+	00  Network and computing encryption device
+	10  Entertainment encryption device
+	80  Encryption controller
+C 11  Signal processing controller
+	00  DPIO module
+	01  Performance counters
+	10  Communication synchronizer
+	20  Signal processing management
+	80  Signal processing controller
+C 12  Processing accelerators
+	00  Processing accelerators
+C 13  Non-Essential Instrumentation
+C 40  Coprocessor
+C ff  Unassigned class
diff --git a/hardinfo/pci_util.c b/hardinfo/pci_util.c
index 5f03d54a..3078f477 100644
--- a/hardinfo/pci_util.c
+++ b/hardinfo/pci_util.c
@@ -23,6 +23,7 @@
 #include "util_ids.h"
 
 gchar *pci_ids_file = NULL;
+GTimer *pci_ids_timer = NULL;
 const gboolean nolspci = FALSE; /* true for testing */
 
 /* Two pieces of info still only from lspci:
@@ -33,13 +34,24 @@ const gboolean nolspci = FALSE; /* true for testing */
  * - /sys/bus/pci/devices/<addy>/driver is a symlink
  */
 
-static void find_pci_ids_file() {
-    if (pci_ids_file) return;
+const gchar *find_pci_ids_file() {
+    if (pci_ids_file) {
+        if (!strstr(pci_ids_file, ".min"))
+            return pci_ids_file;
+        if (g_timer_elapsed(pci_ids_timer, NULL) > 2.0) {
+            /* try again for the full version */
+            DEBUG("find_pci_ids_file() found only a \".min\" version, trying again...");
+            g_free(pci_ids_file);
+            pci_ids_file = NULL;
+        }
+    }
     char *file_search_order[] = {
         g_strdup("/usr/share/hwdata/pci.ids"),
         g_strdup("/usr/share/misc/pci.ids"),
         g_build_filename(g_get_user_config_dir(), "hardinfo", "pci.ids", NULL),
         g_build_filename(params.path_data, "pci.ids", NULL),
+        g_build_filename(g_get_user_config_dir(), "hardinfo", "pci.ids.min", NULL),
+        g_build_filename(params.path_data, "pci.ids.min", NULL),
         NULL
     };
     int n;
@@ -49,6 +61,14 @@ static void find_pci_ids_file() {
         else
             g_free(file_search_order[n]);
     }
+    DEBUG("find_pci_ids_file() result: %s", pci_ids_file);
+    if (pci_ids_file) {
+        if (!pci_ids_timer)
+            pci_ids_timer = g_timer_new();
+        else
+            g_timer_reset(pci_ids_timer);
+    }
+    return pci_ids_file;
 }
 
 char *pci_lookup_ids_vendor_str(uint32_t id) {
@@ -57,10 +77,8 @@ char *pci_lookup_ids_vendor_str(uint32_t id) {
     ids_query_result result = {};
     gchar *qpath;
 
-    if (!pci_ids_file)
-        find_pci_ids_file();
-    if (!pci_ids_file)
-        return NULL;
+    if (!find_pci_ids_file())
+        return FALSE;
 
     qpath = g_strdup_printf("%04x", id);
     scan_ids_file(pci_ids_file, qpath, &result, -1);
@@ -77,9 +95,8 @@ static gboolean pci_lookup_ids(pcid *d) {
     ids_query_result result = {};
     gchar *qpath;
 
-    if (!pci_ids_file)
-        find_pci_ids_file();
-    if (!pci_ids_file) return FALSE;
+    if (!find_pci_ids_file())
+        return FALSE;
 
     /* lookup vendor, device, sub device */
     qpath = g_strdup_printf("%04x/%04x/%04x %04x",
diff --git a/includes/pci_util.h b/includes/pci_util.h
index 476c3212..2a9e4a4b 100644
--- a/includes/pci_util.h
+++ b/includes/pci_util.h
@@ -73,4 +73,6 @@ void pcid_free(pcid *);
 
 char *pci_lookup_ids_vendor_str(uint32_t id);
 
+const gchar *find_pci_ids_file();
+
 #endif
diff --git a/modules/devices.c b/modules/devices.c
index 429dd6b6..63cbaef4 100644
--- a/modules/devices.c
+++ b/modules/devices.c
@@ -887,6 +887,16 @@ gchar **hi_module_get_dependencies(void)
 
 const gchar *hi_note_func(gint entry)
 {
+    if (entry == ENTRY_PCI
+        || entry == ENTRY_GPU) {
+            const gchar *ids = find_pci_ids_file();
+            if (!ids) {
+                return g_strdup(_("A copy of <i><b>pci.ids</b></i> is not available on the system."));
+            }
+            if (ids && strstr(ids, ".min")) {
+                return g_strdup(_("A full <i><b>pci.ids</b></i> is not available on the system."));
+            }
+    }
     if (entry == ENTRY_RESOURCES) {
         if (root_required_for_resources()) {
             return g_strdup(_("Resource information requires superuser privileges"));