summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThomas Heijligen <thomas.heijligen@secunet.com>2023-03-14 10:45:27 +0100
committerThomas Heijligen <src@posteo.de>2023-03-20 14:36:27 +0000
commite1cdbdbbfb98a28fe7198ae6cd3e571269a04403 (patch)
treee1f7b7510ffaa2abec5c5d6b13fcb8272ecf592f
parent0c774d6b6a075f37f21ca9c3506141cb0d4ae34b (diff)
downloadflashrom-e1cdbdbbfb98a28fe7198ae6cd3e571269a04403.tar.gz
flashrom-e1cdbdbbfb98a28fe7198ae6cd3e571269a04403.tar.bz2
flashrom-e1cdbdbbfb98a28fe7198ae6cd3e571269a04403.zip
Revert "pcidev: remove pcidev_getdevfn() function"
As Edward pointed out correctly this function does more than abstracting the different versions of `pci_get_dev()`. It also hide the usage of the global `struct pci_access pacc` from the caller. This reverts commit 0e8902f1ff2b927bb91a5e89e4fde3d8d71f6692. Change-Id: I0cd2f54cb6a6e35dc353476e0f5e502cbbd06cba Signed-off-by: Thomas Heijligen <thomas.heijligen@secunet.com> Reviewed-on: https://review.coreboot.org/c/flashrom/+/73730 Tested-by: build bot (Jenkins) <no-reply@coreboot.org> Reviewed-by: Edward O'Callaghan <quasisec@chromium.org> Reviewed-by: Anastasia Klimchuk <aklm@chromium.org>
-rw-r--r--board_enable.c3
-rw-r--r--include/programmer.h1
-rw-r--r--pcidev.c8
3 files changed, 10 insertions, 2 deletions
diff --git a/board_enable.c b/board_enable.c
index 3e6a5a7c6..d35b151b0 100644
--- a/board_enable.c
+++ b/board_enable.c
@@ -1095,12 +1095,11 @@ static int nvidia_mcp_gpio_set(int gpio, int raise)
return -1;
}
- dev = pci_get_dev(pacc, dev->domain, dev->bus, dev->dev, 1);
+ dev = pcidev_getdevfn(dev, 1);
if (!dev) {
msg_perr("MCP SMBus controller could not be found\n");
return -1;
}
- pci_fill_info(dev, PCI_FILL_IDENT);
devclass = pci_read_word(dev, PCI_CLASS_DEVICE);
if (devclass != 0x0C05) {
msg_perr("Unexpected device class %04x for SMBus"
diff --git a/include/programmer.h b/include/programmer.h
index 9728d8d31..d8d8b4a20 100644
--- a/include/programmer.h
+++ b/include/programmer.h
@@ -125,6 +125,7 @@ int pci_init_common(void);
uintptr_t pcidev_readbar(struct pci_dev *dev, int bar);
struct pci_dev *pcidev_init(const struct programmer_cfg *cfg, 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);
struct pci_dev *pcidev_find_vendorclass(uint16_t vendor, uint16_t devclass);
struct pci_dev *pcidev_card_find(uint16_t vendor, uint16_t device, uint16_t card_vendor, uint16_t card_device);
struct pci_dev *pcidev_find(uint16_t vendor, uint16_t device);
diff --git a/pcidev.c b/pcidev.c
index 68da32787..696510edc 100644
--- a/pcidev.c
+++ b/pcidev.c
@@ -190,6 +190,14 @@ struct pci_dev *pcidev_find(uint16_t vendor, uint16_t device)
return pcidev_scandev(&filter, NULL);
}
+struct pci_dev *pcidev_getdevfn(struct pci_dev *dev, const int func)
+{
+ struct pci_dev *const new = pci_get_dev(pacc, dev->domain, dev->bus, dev->dev, func);
+ if (new)
+ pci_fill_info(new, PCI_FILL_IDENT);
+ return new;
+}
+
struct pci_dev *pcidev_find_vendorclass(uint16_t vendor, uint16_t devclass)
{
struct pci_dev *temp = NULL;