package/kernel/broadcom-wl/patches/910-fallback-sprom.patch

   1 --- a/driver/bcmsrom.c
   2 +++ b/driver/bcmsrom.c
   3 @@ -39,6 +39,11 @@
   4  #include <sbsdpcmdev.h>
   5  #endif
   6
   7 +#if defined(CONFIG_SSB_PCIHOST) && defined(CONFIG_BOARD_BCM963XX)
   8 +#include <linux/ssb/ssb.h>
   9 +extern int bcm63xx_get_fallback_sprom(uint pci_bus, uint pci_slot, struct ssb_sprom *out);
  10 +#endif
  11 +
  12  #ifdef WLTEST
  13  #include <sbsprom.h>
  14  #endif /* WLTEST */
  15 @@ -2120,6 +2125,63 @@ BCMATTACHFN(initvars_srom_pci)(si_t *sih
  16                         goto varscont;
  17                 }
  18
  19 +#if defined(CONFIG_SSB_PCIHOST) && defined(CONFIG_BOARD_BCM963XX)
  20 +               base = vp = MALLOC(osh, MAXSZ_NVRAM_VARS);
  21 +
  22 +               if( base != NULL )
  23 +               {
  24 +                       char eabuf[18];
  25 +                       struct ssb_sprom bcm63xx_sprom;
  26 +                       uint pci_bus = osl_pci_bus(osh), pci_slot = osl_pci_slot(osh);
  27 +
  28 +                       bcm63xx_get_fallback_sprom(pci_bus, pci_slot, &bcm63xx_sprom);
  29 +                       printk("BCM%X(%02x:%02x) using sprom version %i\n", sih->chip, pci_bus, pci_slot, bcm63xx_sprom.revision);
  30 +
  31 +                       varbuf_init(&b, base, MAXSZ_NVRAM_VARS);
  32 +
  33 +                       varbuf_append(&b, vstr_sromrev, bcm63xx_sprom.revision);
  34 +                       varbuf_append(&b, vstr_boardrev, bcm63xx_sprom.board_rev);
  35 +
  36 +                       /* ToDo: map bcm63xx_sprom.country_code */
  37 +                       varbuf_append(&b, vstr_noccode);
  38 +
  39 +                       varbuf_append(&b, vstr_aa2g, bcm63xx_sprom.ant_available_bg);
  40 +
  41 +                       varbuf_append(&b, vstr_pa0b[0], bcm63xx_sprom.pa0b0);
  42 +                       varbuf_append(&b, vstr_pa1b[0], bcm63xx_sprom.pa1b0);
  43 +                       varbuf_append(&b, vstr_pa0b[1], bcm63xx_sprom.pa0b1);
  44 +                       varbuf_append(&b, vstr_pa1b[1], bcm63xx_sprom.pa1b1);
  45 +                       varbuf_append(&b, vstr_pa0b[2], bcm63xx_sprom.pa0b2);
  46 +                       varbuf_append(&b, vstr_pa1b[2], bcm63xx_sprom.pa1b2);
  47 +
  48 +                       varbuf_append(&b, vstr_pa0maxpwr, bcm63xx_sprom.maxpwr_bg);
  49 +                       varbuf_append(&b, vstr_pa0itssit, bcm63xx_sprom.itssi_bg);
  50 +
  51 +                       varbuf_append(&b, vstr_boardflags, (bcm63xx_sprom.boardflags_hi << 16) | bcm63xx_sprom.boardflags_lo);
  52 +                       varbuf_append(&b, vstr_boardflags2, (bcm63xx_sprom.boardflags2_hi << 16) | bcm63xx_sprom.boardflags2_lo);
  53 +
  54 +                       snprintf(eabuf, sizeof(eabuf), "%02x:%02x:%02x:%02x:%02x:%02x",
  55 +                               bcm63xx_sprom.il0mac[0], bcm63xx_sprom.il0mac[1], bcm63xx_sprom.il0mac[2],
  56 +                               bcm63xx_sprom.il0mac[3], bcm63xx_sprom.il0mac[4], bcm63xx_sprom.il0mac[5]
  57 +                       );
  58 +
  59 +                       varbuf_append(&b, vstr_macaddr, eabuf);
  60 +
  61 +                       /* final nullbyte terminator */
  62 +                       ASSERT(b.size >= 1);
  63 +                       vp = b.buf;
  64 +                       *vp++ = '\0';
  65 +
  66 +                       ASSERT((vp - base) <= MAXSZ_NVRAM_VARS);
  67 +                       goto varsdone;
  68 +               }
  69 +               else
  70 +               {
  71 +                       err = -2;
  72 +                       goto errout;
  73 +               }
  74 +#endif
  75 +
  76                 BS_ERROR(("SROM CRC Error\n"));
  77
  78  #if defined(WLTEST)