Edward O'Callaghan submitted this change.

View Change

pcidev: Move pci_card_find() from internal to canonical place

Also rename to `pcidev_card_find()` in fitting with pcidev.c helpers.

BUG=b:220950271
TEST=```sudo ./flashrom -p internal -r /tmp/bios
<snip>
Found Programmer flash chip "Opaque flash chip" (16384 kB, Programmer-specific) mapped at physical address 0x0000000000000000.
Reading flash... done.
```

Change-Id: I026bfbecba114411728d4ad1ed8969b469fa7d2d
Signed-off-by: Edward O'Callaghan <quasisec@google.com>
Reviewed-on: https://review.coreboot.org/c/flashrom/+/59279
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Reviewed-by: Thomas Heijligen <src@posteo.de>
Reviewed-by: Nikolai Artemiev <nartemiev@google.com>
Reviewed-by: Anastasia Klimchuk <aklm@chromium.org>
---
M board_enable.c
M internal.c
M pcidev.c
M programmer.h
4 files changed, 27 insertions(+), 28 deletions(-)

diff --git a/board_enable.c b/board_enable.c
index 0ac522e..22db492 100644
--- a/board_enable.c
+++ b/board_enable.c
@@ -2645,17 +2645,17 @@
 		if (board->phase != phase)
 			continue;
 
-		if (!pci_card_find(board->first_vendor, board->first_device,
-				   board->first_card_vendor,
-				   board->first_card_device))
+		if (!pcidev_card_find(board->first_vendor, board->first_device,
+					board->first_card_vendor,
+					board->first_card_device))
 			continue;
 
 		if (board->second_vendor) {
 			if (board->second_card_vendor) {
-				if (!pci_card_find(board->second_vendor,
-						   board->second_device,
-						   board->second_card_vendor,
-						   board->second_card_device))
+				if (!pcidev_card_find(board->second_vendor,
+							board->second_device,
+							board->second_card_vendor,
+							board->second_card_device))
 					continue;
 			} else {
 				if (!pci_dev_find(board->second_vendor,
diff --git a/internal.c b/internal.c
index 7a326fc..cf9faf6 100644
--- a/internal.c
+++ b/internal.c
@@ -45,25 +45,6 @@
 	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 = NULL;
-	struct pci_filter filter;
-
-	pci_filter_init(NULL, &filter);
-	filter.vendor = vendor;
-	filter.device = device;
-
-	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;
-}
-
 #if defined(__i386__) || defined(__x86_64__)
 void probe_superio(void)
 {
diff --git a/pcidev.c b/pcidev.c
index 8b8b478..0049f0c 100644
--- a/pcidev.c
+++ b/pcidev.c
@@ -157,6 +157,25 @@
 	return NULL;
 }
 
+struct pci_dev *pcidev_card_find(uint16_t vendor, uint16_t device,
+				 uint16_t card_vendor, uint16_t card_device)
+{
+	struct pci_dev *temp = NULL;
+	struct pci_filter filter;
+
+	pci_filter_init(NULL, &filter);
+	filter.vendor = vendor;
+	filter.device = device;
+
+	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;
+}
+
 struct pci_dev *pcidev_getdevfn(struct pci_dev *dev, const int func)
 {
 #if !defined(OLD_PCI_GET_DEV)
diff --git a/programmer.h b/programmer.h
index 6a0c3fa..50753cf 100644
--- a/programmer.h
+++ b/programmer.h
@@ -128,6 +128,7 @@
 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);
 /* 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
@@ -262,8 +263,6 @@
 #endif
 #if NEED_PCI == 1
 struct pci_dev *pci_dev_find(uint16_t vendor, uint16_t device);
-struct pci_dev *pci_card_find(uint16_t vendor, uint16_t device,
-			      uint16_t card_vendor, uint16_t card_device);
 #endif
 #if CONFIG_INTERNAL == 1
 extern int is_laptop;

To view, visit change 59279. To unsubscribe, or for help writing mail filters, visit settings.