diff options
| author |   Hauke Mehrtens <hauke@hauke-m.de> | 2012-09-29 20:38:11 +0200 |
|---|---|---|
| committer |   John W. Linville <linville@tuxdriver.com> | 2012-10-19 15:52:53 -0400 |
| commit | 017c4c3bdeb4e6c38094eb2330a57370f68f4853 (patch) | |
| tree | d0eee869017c910a1e97c18650f97b15d0225125 /drivers/bcma/sprom.c | |
| parent | ssb: add attribute to indicate a parallel flash is available (diff) | |
| download | linux-dev-017c4c3bdeb4e6c38094eb2330a57370f68f4853.tar.xz linux-dev-017c4c3bdeb4e6c38094eb2330a57370f68f4853.zip | |
bcma: use fallback sprom if sprom on card was not valid
Sometimes the PCIe card indicates that it has a sprom somewhere and we
are able to read the memory region, but it is empty and not valid. In
these cases we should try to use the fallback sprom as a last chance.
This is the case for the PCIe cards in my ASUS RT-N66U (BCM4706 + 2
times BCM4331) and I have heard of someone having the same problem with
an other PCIe card connected to an other Broadcom SoC.
Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'drivers/bcma/sprom.c')
| -rw-r--r-- | drivers/bcma/sprom.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/drivers/bcma/sprom.c b/drivers/bcma/sprom.c index 0d546b64be34..4adf9ef9a113 100644 --- a/drivers/bcma/sprom.c +++ b/drivers/bcma/sprom.c @@ -595,8 +595,11 @@ int bcma_sprom_get(struct bcma_bus *bus) bcma_chipco_bcm4331_ext_pa_lines_ctl(&bus->drv_cc, true); err = bcma_sprom_valid(sprom); - if (err) + if (err) { + bcma_warn(bus, "invalid sprom read from the PCIe card, try to use fallback sprom\n"); + err = bcma_fill_sprom_with_fallback(bus, &bus->sprom); goto out; + } bcma_sprom_extract_r8(bus, sprom); |