From 4059598a068f7694f2238a3811d85cbfa520a8d5 Mon Sep 17 00:00:00 2001 From: Uwe Hermann Date: Sat, 16 May 2009 01:30:48 +0000 Subject: Older libpci versions (e.g 2.2.8, as it's default on current FreeBSD 7.2) don't properly fill the base_addr[0] struct member, so revert back to an explicit pci_read_long() call, otherwise detection of PCI devices and their base address will fail with strange error messages. Thanks Idwer Vollering for reporting and testing. Corresponding to flashrom svn r518. Signed-off-by: Uwe Hermann Acked-by: Uwe Hermann --- pcidev.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/pcidev.c b/pcidev.c index 549d083..f07fe80 100644 --- a/pcidev.c +++ b/pcidev.c @@ -26,6 +26,8 @@ #include #include "flash.h" +#define PCI_IO_BASE_ADDRESS 0x10 + uint32_t io_base_addr; struct pci_access *pacc; struct pci_filter filter; @@ -40,7 +42,8 @@ uint32_t pcidev_validate(struct pci_dev *dev, struct pcidev_status *devs) if (dev->device_id != devs[i].device_id) continue; - addr = (uint32_t)(dev->base_addr[0] & ~0x03); + /* Don't use dev->base_addr[0], won't work on older libpci. */ + addr = pci_read_long(dev, PCI_IO_BASE_ADDRESS) & ~0x03; printf("Found \"%s %s\" (%04x:%04x, BDF %02x:%02x.%x)\n", devs[i].vendor_name, devs[i].device_name, dev->vendor_id, -- cgit v1.1