diff options
| author | Jo-Philipp Wich <jow@openwrt.org> | 2010-07-13 16:55:57 +0000 |
|---|---|---|
| committer | Jo-Philipp Wich <jow@openwrt.org> | 2010-07-13 16:55:57 +0000 |
| commit | 4ae595a3aa1a94198d604794c46dbcc110652893 (patch) | |
| tree | 4cce6ce03cda8c3a5cdd30c077443a68ab76e6be /package/broadcom-wl/patches/910-fallback-sprom.patch | |
| parent | d14e9e706e4f535af703b3f626b978910a861a4d (diff) | |
| download | upstream-4ae595a3aa1a94198d604794c46dbcc110652893.tar.gz upstream-4ae595a3aa1a94198d604794c46dbcc110652893.tar.bz2 upstream-4ae595a3aa1a94198d604794c46dbcc110652893.zip | |
broadcom-wl: - update to v5.10.56.27.3 - get fallback SPROM from SSB if neither on-device SPROM nor nvram is available - working brcm63xx support
SVN-Revision: 22173
Diffstat (limited to 'package/broadcom-wl/patches/910-fallback-sprom.patch')
| -rw-r--r-- | package/broadcom-wl/patches/910-fallback-sprom.patch | 88 |
1 files changed, 88 insertions, 0 deletions
diff --git a/package/broadcom-wl/patches/910-fallback-sprom.patch b/package/broadcom-wl/patches/910-fallback-sprom.patch new file mode 100644 index 0000000000..2bcd77b9a8 --- /dev/null +++ b/package/broadcom-wl/patches/910-fallback-sprom.patch @@ -0,0 +1,88 @@ +--- a/driver/bcmsrom.c ++++ b/driver/bcmsrom.c +@@ -39,6 +39,10 @@ + #include <sbsdpcmdev.h> + #endif + ++#ifdef CONFIG_SSB ++#include <linux/ssb/ssb.h> ++#endif ++ + #ifdef WLTEST + #include <sbsprom.h> + #endif /* WLTEST */ +@@ -2058,6 +2062,11 @@ BCMATTACHFN(initvars_srom_pci)(si_t *sih + bool flash = FALSE; + int err = 0; + ++#ifdef CONFIG_SSB ++ struct ssb_sprom *fbrom; ++ char eabuf[18]; ++#endif ++ + /* + * Apply CRC over SROM content regardless SROM is present or not, + * and use variable <devpath>sromrev's existance in flash to decide +@@ -2120,6 +2129,62 @@ BCMATTACHFN(initvars_srom_pci)(si_t *sih + goto varscont; + } + ++#ifdef CONFIG_SSB ++ base = vp = MALLOC(osh, MAXSZ_NVRAM_VARS); ++ ++ if( base != NULL ) ++ { ++ varbuf_init(&b, base, MAXSZ_NVRAM_VARS); ++ ++ /* Try to load ssb fallback sprom */ ++ if ((fbrom = ssb_get_fallback_sprom()) != NULL) ++ { ++ printk("Got version %i SPROM from SSB\n", fbrom->revision); ++ ++ varbuf_append(&b, vstr_sromrev, fbrom->revision); ++ varbuf_append(&b, vstr_boardrev, fbrom->board_rev); ++ ++ /* ToDo: map fbrom->country_code */ ++ varbuf_append(&b, vstr_noccode); ++ ++ varbuf_append(&b, vstr_aa2g, fbrom->ant_available_bg); ++ ++ varbuf_append(&b, vstr_pa0b[0], fbrom->pa0b0); ++ varbuf_append(&b, vstr_pa1b[0], fbrom->pa1b0); ++ varbuf_append(&b, vstr_pa0b[1], fbrom->pa0b1); ++ varbuf_append(&b, vstr_pa1b[1], fbrom->pa1b1); ++ varbuf_append(&b, vstr_pa0b[2], fbrom->pa0b2); ++ varbuf_append(&b, vstr_pa1b[2], fbrom->pa1b2); ++ ++ varbuf_append(&b, vstr_pa0maxpwr, fbrom->maxpwr_bg); ++ varbuf_append(&b, vstr_pa0itssit, fbrom->itssi_bg); ++ ++ varbuf_append(&b, vstr_boardflags, (fbrom->boardflags_hi << 16) | fbrom->boardflags_lo); ++ varbuf_append(&b, vstr_boardflags2, (fbrom->boardflags2_hi << 16) | fbrom->boardflags2_lo); ++ ++ snprintf(eabuf, sizeof(eabuf), "%02x:%02x:%02x:%02x:%02x:%02x", ++ fbrom->il0mac[0], fbrom->il0mac[1], fbrom->il0mac[2], ++ fbrom->il0mac[3], fbrom->il0mac[4], fbrom->il0mac[5] ++ ); ++ ++ varbuf_append(&b, vstr_macaddr, eabuf); ++ } ++ ++ /* final nullbyte terminator */ ++ ASSERT(b.size >= 1); ++ vp = b.buf; ++ *vp++ = '\0'; ++ ++ ASSERT((vp - base) <= MAXSZ_NVRAM_VARS); ++ goto varsdone; ++ } ++ else ++ { ++ err = -2; ++ goto errout; ++ } ++#endif ++ + BS_ERROR(("SROM CRC Error\n")); + + #if defined(WLTEST) |