summaryrefslogtreecommitdiffstats
path: root/pcidev.c
diff options
context:
space:
mode:
authorTURBO J <turboj@gmx.de>2009-09-02 23:00:46 +0000
committerUwe Hermann <uwe@hermann-uwe.de>2009-09-02 23:00:46 +0000
commitb0912c0adbe3d46bc49babe8c22388da7230d473 (patch)
tree6329f60d35e478942631b8f210b288e67dd96926 /pcidev.c
parent04aa59a8645510f212fc6a270b48a883f3d00fa5 (diff)
downloadast2050-flashrom-b0912c0adbe3d46bc49babe8c22388da7230d473.zip
ast2050-flashrom-b0912c0adbe3d46bc49babe8c22388da7230d473.tar.gz
Add support for parallel flash on Dr. Kaiser PC-Waechter PCI devices
The vendor sold different designs under that name, the patch works with the one that has an Actel FPGA as PCI-to-Flash bridge. The Flash chip is a "Macronix MX29F001B" (128 KB, parallel) soldered directly to the PCB. Flash operations (PROBE, READ, ERASE, WRITE) work as expected. Corresponding to flashrom svn r712. Signed-off-by: TURBO J <turboj@gmx.de> Acked-by: Uwe Hermann <uwe@hermann-uwe.de>
Diffstat (limited to 'pcidev.c')
-rw-r--r--pcidev.c12
1 files changed, 6 insertions, 6 deletions
diff --git a/pcidev.c b/pcidev.c
index 580ebae..3ad9db5 100644
--- a/pcidev.c
+++ b/pcidev.c
@@ -28,7 +28,7 @@ struct pci_access *pacc;
struct pci_filter filter;
struct pci_dev *pcidev_dev = NULL;
-uint32_t pcidev_validate(struct pci_dev *dev, struct pcidev_status *devs)
+uint32_t pcidev_validate(struct pci_dev *dev, uint32_t bar, struct pcidev_status *devs)
{
int i;
uint32_t addr;
@@ -37,9 +37,9 @@ uint32_t pcidev_validate(struct pci_dev *dev, struct pcidev_status *devs)
if (dev->device_id != devs[i].device_id)
continue;
- /* Don't use dev->base_addr[0], won't work on older libpci. */
- addr = pci_read_long(dev, PCI_BASE_ADDRESS_0) & ~0x03;
-
+ /* Don't use dev->base_addr[x] (as value for 'bar'), won't work on older libpci. */
+ addr = pci_read_long(dev, bar) & ~0x03;
+
printf("Found \"%s %s\" (%04x:%04x, BDF %02x:%02x.%x).\n",
devs[i].vendor_name, devs[i].device_name, dev->vendor_id,
dev->device_id, dev->bus, dev->dev, dev->func);
@@ -57,7 +57,7 @@ uint32_t pcidev_validate(struct pci_dev *dev, struct pcidev_status *devs)
return 0;
}
-uint32_t pcidev_init(uint16_t vendor_id, struct pcidev_status *devs, char *pcidev_bdf)
+uint32_t pcidev_init(uint16_t vendor_id, uint32_t bar, struct pcidev_status *devs, char *pcidev_bdf)
{
struct pci_dev *dev;
char *msg = NULL;
@@ -80,7 +80,7 @@ uint32_t pcidev_init(uint16_t vendor_id, struct pcidev_status *devs, char *pcide
for (dev = pacc->devices; dev; dev = dev->next) {
if (pci_filter_match(&filter, dev)) {
- if ((addr = pcidev_validate(dev, devs)) != 0) {
+ if ((addr = pcidev_validate(dev, bar, devs)) != 0) {
curaddr = addr;
pcidev_dev = dev;
found++;
OpenPOWER on IntegriCloud