diff options
| author | Edward O'Callaghan <quasisec@google.com> | 2021-11-13 13:14:06 +1100 |
|---|---|---|
| committer | Edward O'Callaghan <quasisec@chromium.org> | 2022-02-24 23:30:51 +0000 |
| commit | 634707a42d0a4670e5177638986232c4e992d403 (patch) | |
| tree | c8c0fdb6c2dc7a2a2505259b06831ec2f8432ee1 /internal.c | |
| parent | 2740a52dbd5bf4f32daee76c0c36649b8b547725 (diff) | |
| download | flashrom-634707a42d0a4670e5177638986232c4e992d403.tar.gz flashrom-634707a42d0a4670e5177638986232c4e992d403.tar.bz2 flashrom-634707a42d0a4670e5177638986232c4e992d403.zip | |
pcidev: Avoid internal programmer relying on pacc global
Make progress towards the goal of removing pacc from global
state as noted in the FIXME of programmer.h
BUG=b:220950271
TEST=```sudo ./flashrom -p internal --flash-size
<snip>
Found Programmer flash chip "Opaque flash chip" (16384 kB, Programmer-specific) mapped at physical address 0x0000000000000000.
16777216
```
Change-Id: Id83bfd41f785f907e52a65a6689e8c7016fc1b77
Signed-off-by: Edward O'Callaghan <quasisec@google.com>
Reviewed-on: https://review.coreboot.org/c/flashrom/+/59275
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Reviewed-by: Nico Huber <nico.h@gmx.de>
Reviewed-by: Anastasia Klimchuk <aklm@chromium.org>
Diffstat (limited to 'internal.c')
| -rw-r--r-- | internal.c | 37 |
1 files changed, 14 insertions, 23 deletions
diff --git a/internal.c b/internal.c index 995290e7f..dcb83cdb7 100644 --- a/internal.c +++ b/internal.c @@ -36,58 +36,49 @@ enum chipbustype internal_buses_supported = BUS_NONE; struct pci_dev *pci_dev_find_vendorclass(uint16_t vendor, uint16_t devclass) { - struct pci_dev *temp; + struct pci_dev *temp = NULL; struct pci_filter filter; uint16_t tmp2; pci_filter_init(NULL, &filter); filter.vendor = vendor; - for (temp = pacc->devices; temp; temp = temp->next) - if (pci_filter_match(&filter, temp)) { - /* Read PCI class */ - tmp2 = pci_read_word(temp, 0x0a); - if (tmp2 == devclass) - return temp; - } + while ((temp = pcidev_scandev(&filter, temp))) { + /* Read PCI class */ + tmp2 = pci_read_word(temp, 0x0a); + if (tmp2 == devclass) + return temp; + } return NULL; } struct pci_dev *pci_dev_find(uint16_t vendor, uint16_t device) { - struct pci_dev *temp; struct pci_filter filter; pci_filter_init(NULL, &filter); filter.vendor = vendor; filter.device = device; - for (temp = pacc->devices; temp; temp = temp->next) - if (pci_filter_match(&filter, temp)) - return temp; - - return NULL; + return pcidev_scandev(&filter, NULL); } struct pci_dev *pci_card_find(uint16_t vendor, uint16_t device, uint16_t card_vendor, uint16_t card_device) { - struct pci_dev *temp; + struct pci_dev *temp = NULL; struct pci_filter filter; pci_filter_init(NULL, &filter); filter.vendor = vendor; filter.device = device; - for (temp = pacc->devices; temp; temp = temp->next) - if (pci_filter_match(&filter, temp)) { - if ((card_vendor == - pci_read_word(temp, PCI_SUBSYSTEM_VENDOR_ID)) - && (card_device == - pci_read_word(temp, PCI_SUBSYSTEM_ID))) - return temp; - } + while ((temp = pcidev_scandev(&filter, temp))) { + if ((card_vendor == pci_read_word(temp, PCI_SUBSYSTEM_VENDOR_ID)) + && (card_device == pci_read_word(temp, PCI_SUBSYSTEM_ID))) + return temp; + } return NULL; } |