From ca2e3bce02beadc8a2d498fbecf399ae815ebbfc Mon Sep 17 00:00:00 2001 From: Daniel Verkamp Date: Mon, 12 Oct 2020 12:55:56 -0700 Subject: 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 Change-Id: Ia011d4d801f8a54160e45a70b14b740e6dcc00ef Reviewed-on: https://review.coreboot.org/c/flashrom/+/46310 Reviewed-by: Angel Pons Reviewed-by: Nico Huber Reviewed-by: Edward O'Callaghan Tested-by: build bot (Jenkins) --- pcidev.c | 1 + 1 file changed, 1 insertion(+) diff --git a/pcidev.c b/pcidev.c index e13b78ce..892f7b1c 100644 --- a/pcidev.c +++ b/pcidev.c @@ -206,6 +206,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) && -- cgit v1.2.3