summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDaniel Verkamp <dverkamp@chromium.org>2020-10-12 12:55:56 -0700
committerFelix Singer <felixsinger@posteo.net>2022-09-29 17:04:11 +0000
commit84982ce1f22095ac7018564693d5e471293473c9 (patch)
tree07f9f54e101e4a73edf06729f3c5a105be591408
parentfd42af008714bb608b6223dd87d7424897eab020 (diff)
downloadflashrom-84982ce1f22095ac7018564693d5e471293473c9.tar.gz
flashrom-84982ce1f22095ac7018564693d5e471293473c9.tar.bz2
flashrom-84982ce1f22095ac7018564693d5e471293473c9.zip
pcidev.c: populate IDs with pci_fill_info()
With pciutils 3.7.0, flashrom is unable to match any PCI devices by vendor/device ID because the vendor_id and device_id fields of struct pci_dev are not filled in. Call pci_fill_info() to request these identifiers before trying to match them against the supported device list. The pciutils ChangeLog for 3.7.0 mentions that the documentation and back-end behavior for pci_fill_info() was updated; it seems that a call to pci_fill_info() was always intended to be required, but some backends (such as the sysfs one used on Linux) would fill the identifier fields even when not requested by the user. The pci_fill_info() function and the PCI_FILL_IDENT flag have been available for all versions of pciutils since at least 2.0 from 1999, so it should be safe to add without any version checks. With this change, reading/writing a nicintel_spi boot ROM is successful. Signed-off-by: Daniel Verkamp <dverkamp@chromium.org> Change-Id: Ia011d4d801f8a54160e45a70b14b740e6dcc00ef Reviewed-on: https://review.coreboot.org/c/flashrom/+/46310 Reviewed-by: Angel Pons <th3fanbus@gmail.com> Reviewed-by: Nico Huber <nico.h@gmx.de> Reviewed-by: Edward O'Callaghan <quasisec@chromium.org> Tested-by: build bot (Jenkins) <no-reply@coreboot.org> Reviewed-on: https://review.coreboot.org/c/flashrom/+/67844 Reviewed-by: Felix Singer <felixsinger@posteo.net>
-rw-r--r--pcidev.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/pcidev.c b/pcidev.c
index f4e554207..4bc32c1ed 100644
--- a/pcidev.c
+++ b/pcidev.c
@@ -211,6 +211,7 @@ struct pci_dev *pcidev_init(const struct dev_entry *devs, int bar)
for (dev = pacc->devices; dev; dev = dev->next) {
if (pci_filter_match(&filter, dev)) {
+ pci_fill_info(dev, PCI_FILL_IDENT);
/* Check against list of supported devices. */
for (i = 0; devs[i].device_name != NULL; i++)
if ((dev->vendor_id == devs[i].vendor_id) &&