openwrt/flashrom
1
0
Fork 0
mirror of https://review.coreboot.org/flashrom.git synced 2025-04-27 23:22:37 +02:00
Code Issues Releases Wiki Activity

pcidev: Avoid internal programmer relying on pacc global

Browse Source 
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>
This commit is contained in:
Edward O'Callaghan 2021-11-13 13:14:06 +11:00 committed by Edward O'Callaghan
parent 2740a52dbd
commit 634707a42d
3 changed files with 25 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
internal.c
View File

@ -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 *pci_dev_find_vendorclass(uint16_t vendor, uint16_t devclass)
{ {
struct pci_dev *temp; struct pci_dev *temp = NULL;
struct pci_filter filter; struct pci_filter filter;
uint16_t tmp2; uint16_t tmp2;
pci_filter_init(NULL, &filter); pci_filter_init(NULL, &filter);
filter.vendor = vendor; filter.vendor = vendor;
for (temp = pacc->devices; temp; temp = temp->next) while ((temp = pcidev_scandev(&filter, temp))) {
if (pci_filter_match(&filter, temp)) { /* Read PCI class */
/* Read PCI class */ tmp2 = pci_read_word(temp, 0x0a);
tmp2 = pci_read_word(temp, 0x0a); if (tmp2 == devclass)
if (tmp2 == devclass) return temp;
return temp; }
}
return NULL; return NULL;
} }
struct pci_dev *pci_dev_find(uint16_t vendor, uint16_t device) struct pci_dev *pci_dev_find(uint16_t vendor, uint16_t device)
{ {
struct pci_dev *temp;
struct pci_filter filter; struct pci_filter filter;
pci_filter_init(NULL, &filter); pci_filter_init(NULL, &filter);
filter.vendor = vendor; filter.vendor = vendor;
filter.device = device; filter.device = device;
for (temp = pacc->devices; temp; temp = temp->next) return pcidev_scandev(&filter, NULL);
if (pci_filter_match(&filter, temp))
return temp;
return NULL;
} }
struct pci_dev *pci_card_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) uint16_t card_vendor, uint16_t card_device)
{ {
struct pci_dev *temp; struct pci_dev *temp = NULL;
struct pci_filter filter; struct pci_filter filter;
pci_filter_init(NULL, &filter); pci_filter_init(NULL, &filter);
filter.vendor = vendor; filter.vendor = vendor;
filter.device = device; filter.device = device;
for (temp = pacc->devices; temp; temp = temp->next) while ((temp = pcidev_scandev(&filter, temp))) {
if (pci_filter_match(&filter, temp)) { if ((card_vendor == pci_read_word(temp, PCI_SUBSYSTEM_VENDOR_ID))
if ((card_vendor == && (card_device == pci_read_word(temp, PCI_SUBSYSTEM_ID)))
pci_read_word(temp, PCI_SUBSYSTEM_VENDOR_ID)) return temp;
&& (card_device == }
pci_read_word(temp, PCI_SUBSYSTEM_ID)))
return temp;
}
return NULL; return NULL;
} }

9
pcidev.c
View File

@ -148,6 +148,15 @@ uintptr_t pcidev_readbar(struct pci_dev *dev, int bar)
return (uintptr_t)addr; return (uintptr_t)addr;
} }
struct pci_dev *pcidev_scandev(struct pci_filter *filter, struct pci_dev *start)
{
struct pci_dev *temp;
for (temp = start ? start->next : pacc->devices; temp; temp = temp->next)
if (pci_filter_match(filter, temp))
return temp;
return NULL;
}
static int pcidev_shutdown(void *data) static int pcidev_shutdown(void *data)
{ {
if (pacc == NULL) { if (pacc == NULL) {

2
programmer.h
View File

@ -117,6 +117,7 @@ struct bitbang_spi_master {
#if NEED_PCI == 1 #if NEED_PCI == 1
struct pci_dev; struct pci_dev;
struct pci_filter;
/* pcidev.c */ /* pcidev.c */
// FIXME: This needs to be local, not global(?) // FIXME: This needs to be local, not global(?)
@ -124,6 +125,7 @@ extern struct pci_access *pacc;
int pci_init_common(void); int pci_init_common(void);
uintptr_t pcidev_readbar(struct pci_dev *dev, int bar); 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_init(const struct dev_entry *devs, int bar);
struct pci_dev *pcidev_scandev(struct pci_filter *filter, struct pci_dev *start);
/* rpci_write_* are reversible writes. The original PCI config space register /* rpci_write_* are reversible writes. The original PCI config space register
* contents will be restored on shutdown. * contents will be restored on shutdown.
* To clone the pci_dev instances internally, the `pacc` global * To clone the pci_dev instances internally, the `pacc` global