path: root/nicintel_spi.c
diff options
authorCarl-Daniel Hailfinger <>2013-01-05 23:52:45 +0000
committerCarl-Daniel Hailfinger <>2013-01-05 23:52:45 +0000
commita2faddf7d38e4651ce6654c62b668ab02b909b58 (patch)
tree1a13a2aa0134dbede16c017dd102efc81eb97ee0 /nicintel_spi.c
parentc6fa32d2b5c08d2fcc92fee2974a3fc02a3ca1f7 (diff)
Decouple BAR reading from pci device init, handle errors gracefully
Pcidev_init() now returns struct pci_device * instead of a BAR stored in PCI config space. This allows for real error checking instead of having exit(1) everywhere in pcidev.c. Thanks to Niklas Söderlund for coming up with the original error handling patch which was slightly modified and folded into this patch. Move the declaration of struct pci_device in programmer.h before the first user. Corresponding to flashrom svn r1644. Signed-off-by: Carl-Daniel Hailfinger <> Acked-by: Stefan Tauner <>
Diffstat (limited to 'nicintel_spi.c')
1 files changed, 5 insertions, 2 deletions
diff --git a/nicintel_spi.c b/nicintel_spi.c
index f61c2b1..0045c09 100644
--- a/nicintel_spi.c
+++ b/nicintel_spi.c
@@ -166,14 +166,17 @@ static int nicintel_spi_shutdown(void *data)
int nicintel_spi_init(void)
+ struct pci_dev *dev = NULL;
uint32_t tmp;
if (rget_io_perms())
return 1;
- /* No need to check for errors, pcidev_init() will not return in case of errors. */
- io_base_addr = pcidev_init(PCI_BASE_ADDRESS_0, nics_intel_spi);
+ dev = pcidev_init(nics_intel_spi, PCI_BASE_ADDRESS_0);
+ if (!dev)
+ return 1;
+ io_base_addr = pcidev_readbar(dev, PCI_BASE_ADDRESS_0);
nicintel_spibar = physmap("Intel Gigabit NIC w/ SPI flash",
io_base_addr, MEMMAP_SIZE);
/* Automatic restore of EECD on shutdown is not possible because EECD
OpenPOWER on IntegriCloud