[flashrom-gerrit] [M] Change in flashrom[1.0.x]: pcidev: Always fetch ident info

[Felix Singer (Code Review)]

Felix Singer has submitted this change. ( https://review.coreboot.org/c/flashrom/+/67845 )

(

1 is the latest approved patch-set.
No files were changed between the latest approved patch-set and the submitted one.
 )Change subject: pcidev: Always fetch ident info
......................................................................

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 
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/+/67845
Tested-by: build bot (Jenkins) 
Reviewed-by: Felix Singer 
Reviewed-by: Edward O'Callaghan 
Reviewed-by: Angel Pons 
---
M board_enable.c
M internal.c
2 files changed, 44 insertions(+), 6 deletions(-)

Approvals:
  build bot (Jenkins): Verified
  Felix Singer: Looks good to me, approved
  Angel Pons: Looks good to me, approved
  Edward O'Callaghan: Looks good to me, approved

diff --git a/board_enable.c b/board_enable.c
index 3b6755e..97bb15a 100644
--- a/board_enable.c
+++ b/board_enable.c
@@ -1514,6 +1514,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 cb02753..7628988 100644
--- a/internal.c
+++ b/internal.c
@@ -30,9 +30,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;
 }
@@ -50,8 +53,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;
@@ -66,9 +71,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;
 }
@@ -88,8 +96,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;