1 is the latest approved patch-set.
No files were changed between the latest approved patch-set and the submitted one.


pcidev: Always fetch ident info

As discovered earlier[1], the `vendor_id` and `device_id` fields are not
always automatically set. However, we use these fields throughout flash-
rom. To not lose track when we actually fetched them, let's always call
pci_fill_info(PCI_FILL_IDENT) before returning a `pci_dev` handle.

[1] Commit ca2e3bce0 (pcidev.c: populate IDs with pci_fill_info())

Backported to older versions where pcidev handling was much more
scattered.

Signed-off-by: Nico Huber <nico.h@gmx.de>
Change-Id: Iae2511178bec44343cbe902722fdca9eda036059
Ticket: https://ticket.coreboot.org/issues/367
Reviewed-on: https://review.coreboot.org/c/flashrom/+/64573
Reviewed-on: https://review.coreboot.org/c/flashrom/+/67859
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Reviewed-by: Felix Singer <felixsinger@posteo.net>
---
M board_enable.c
M internal.c
2 files changed, 42 insertions(+), 6 deletions(-)

diff --git a/board_enable.c b/board_enable.c
index 00809f7..aec69fc 100644
--- a/board_enable.c
+++ b/board_enable.c
@@ -1510,6 +1510,7 @@
 
 	/* First, look for a known LPC bridge */
 	for (dev = pacc->devices; dev; dev = dev->next) {
+		pci_fill_info(dev, PCI_FILL_IDENT);
 		uint16_t device_class;
 		/* libpci before version 2.2.4 does not store class info. */
 		device_class = pci_read_word(dev, PCI_CLASS_DEVICE);
diff --git a/internal.c b/internal.c
index 1d6cff6..b596c53 100644
--- a/internal.c
+++ b/internal.c
@@ -25,9 +25,12 @@
 {
 	struct pci_dev *temp;
 
-	for (temp = pacc->devices; temp; temp = temp->next)
-		if (pci_filter_match(&filter, temp))
+	for (temp = pacc->devices; temp; temp = temp->next) {
+		if (pci_filter_match(&filter, temp)) {
+			pci_fill_info(temp, PCI_FILL_IDENT);
 			return temp;
+		}
+	}
 
 	return NULL;
 }
@@ -45,8 +48,10 @@
 		if (pci_filter_match(&filter, temp)) {
 			/* Read PCI class */
 			tmp2 = pci_read_word(temp, 0x0a);
-			if (tmp2 == devclass)
+			if (tmp2 == devclass) {
+				pci_fill_info(temp, PCI_FILL_IDENT);
 				return temp;
+			}
 		}
 
 	return NULL;
@@ -61,9 +66,12 @@
 	filter.vendor = vendor;
 	filter.device = device;
 
-	for (temp = pacc->devices; temp; temp = temp->next)
-		if (pci_filter_match(&filter, temp))
+	for (temp = pacc->devices; temp; temp = temp->next) {
+		if (pci_filter_match(&filter, temp)) {
+			pci_fill_info(temp, PCI_FILL_IDENT);
 			return temp;
+		}
+	}
 
 	return NULL;
 }
@@ -83,8 +91,10 @@
 			if ((card_vendor ==
 			     pci_read_word(temp, PCI_SUBSYSTEM_VENDOR_ID))
 			    && (card_device ==
-				pci_read_word(temp, PCI_SUBSYSTEM_ID)))
+				pci_read_word(temp, PCI_SUBSYSTEM_ID))) {
+				pci_fill_info(temp, PCI_FILL_IDENT);
 				return temp;
+			}
 		}
 
 	return NULL;

