diff options
| author | Edward O'Callaghan <quasisec@google.com> | 2021-11-13 13:29:06 +1100 |
|---|---|---|
| committer | Edward O'Callaghan <quasisec@chromium.org> | 2022-03-02 22:32:16 +0000 |
| commit | 00194eadde8c082258880a44528aff8d0f7b3e24 (patch) | |
| tree | 0a82f2bc988eda70903257c195e616b4e4ff252a | |
| parent | 12dbc4e04508aecfff53ad95b6f68865da1b4f07 (diff) | |
| download | flashrom-00194eadde8c082258880a44528aff8d0f7b3e24.tar.gz flashrom-00194eadde8c082258880a44528aff8d0f7b3e24.tar.bz2 flashrom-00194eadde8c082258880a44528aff8d0f7b3e24.zip | |
pcidev: Move pci_get_dev() logic into canonical place
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: Id9ce055d5e5d347520ec5002b8c6548e60eaa0a7
Signed-off-by: Edward O'Callaghan <quasisec@google.com>
Reviewed-on: https://review.coreboot.org/c/flashrom/+/59276
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Reviewed-by: Subrata Banik <subratabanik@google.com>
| -rw-r--r-- | board_enable.c | 10 | ||||
| -rw-r--r-- | pcidev.c | 13 | ||||
| -rw-r--r-- | programmer.h | 1 |
3 files changed, 15 insertions, 9 deletions
diff --git a/board_enable.c b/board_enable.c index 94cfc9d0..194357a3 100644 --- a/board_enable.c +++ b/board_enable.c @@ -1094,15 +1094,7 @@ static int nvidia_mcp_gpio_set(int gpio, int raise) return -1; } -#if !defined(OLD_PCI_GET_DEV) - dev = pci_get_dev(pacc, dev->domain, dev->bus, dev->dev, 1); -#else - /* pciutils/libpci before version 2.2 is too old to support - * PCI domains. Such old machines usually don't have domains - * besides domain 0, so this is not a problem. - */ - dev = pci_get_dev(pacc, dev->bus, dev->dev, 1); -#endif + dev = pcidev_getdevfn(dev, 1); if (!dev) { msg_perr("MCP SMBus controller could not be found\n"); return -1; @@ -157,6 +157,19 @@ struct pci_dev *pcidev_scandev(struct pci_filter *filter, struct pci_dev *start) return NULL; } +struct pci_dev *pcidev_getdevfn(struct pci_dev *dev, const int func) +{ +#if !defined(OLD_PCI_GET_DEV) + return pci_get_dev(pacc, dev->domain, dev->bus, dev->dev, func); +#else + /* pciutils/libpci before version 2.2 is too old to support + * PCI domains. Such old machines usually don't have domains + * besides domain 0, so this is not a problem. + */ + return pci_get_dev(pacc, dev->bus, dev->dev, func); +#endif +} + static int pcidev_shutdown(void *data) { if (pacc == NULL) { diff --git a/programmer.h b/programmer.h index 4024966e..d0e86a46 100644 --- a/programmer.h +++ b/programmer.h @@ -126,6 +126,7 @@ int pci_init_common(void); uintptr_t pcidev_readbar(struct pci_dev *dev, int bar); struct pci_dev *pcidev_init(const struct dev_entry *devs, int bar); struct pci_dev *pcidev_scandev(struct pci_filter *filter, struct pci_dev *start); +struct pci_dev *pcidev_getdevfn(struct pci_dev *dev, const int func); /* rpci_write_* are reversible writes. The original PCI config space register * contents will be restored on shutdown. * To clone the pci_dev instances internally, the `pacc` global |