aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/brcm47xx
diff options
context:
space:
mode:
authorHauke Mehrtens <hauke@openwrt.org>2012-09-30 11:45:31 +0000
committerHauke Mehrtens <hauke@openwrt.org>2012-09-30 11:45:31 +0000
commitb2385c1538cd1ba6a468feefcf1cd90dae6b1871 (patch)
tree87a19f5f336cc83c00cb7a17b84434a540e57f3d /target/linux/brcm47xx
parent0056094a9819c28bb56f2d161c4f0a0fa86ec821 (diff)
downloadupstream-b2385c1538cd1ba6a468feefcf1cd90dae6b1871.tar.gz
upstream-b2385c1538cd1ba6a468feefcf1cd90dae6b1871.tar.bz2
upstream-b2385c1538cd1ba6a468feefcf1cd90dae6b1871.zip
[brcm47xx]: 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. git-svn-id: svn://svn.openwrt.org/openwrt/trunk@33601 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target/linux/brcm47xx')
-rw-r--r--target/linux/brcm47xx/patches-3.3/203-bcma-use-fallback-sprom-if-sprom-on-card-was-not-val.patch15
1 files changed, 15 insertions, 0 deletions
diff --git a/target/linux/brcm47xx/patches-3.3/203-bcma-use-fallback-sprom-if-sprom-on-card-was-not-val.patch b/target/linux/brcm47xx/patches-3.3/203-bcma-use-fallback-sprom-if-sprom-on-card-was-not-val.patch
new file mode 100644
index 0000000000..b6e6480567
--- /dev/null
+++ b/target/linux/brcm47xx/patches-3.3/203-bcma-use-fallback-sprom-if-sprom-on-card-was-not-val.patch
@@ -0,0 +1,15 @@
+--- a/drivers/bcma/sprom.c
++++ b/drivers/bcma/sprom.c
+@@ -591,8 +591,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);
+