1 files changed, 82 insertions, 6 deletions

diff --git a/drivers/ssb/pci.c b/drivers/ssb/pci.c
index ed4124469a3a..e9d94968f394 100644
--- a/drivers/ssb/pci.c
+++ b/drivers/ssb/pci.c
@@ -178,6 +178,18 @@ err_pci:
 #define SPEX(_outvar, _offset, _mask, _shift) \
         SPEX16(_outvar, _offset, _mask, _shift)
 
+#define SPEX_ARRAY8(_field, _offset, _mask, _shift)     \
+        do {    \
+                SPEX(_field[0], _offset +  0, _mask, _shift);   \
+                SPEX(_field[1], _offset +  2, _mask, _shift);   \
+                SPEX(_field[2], _offset +  4, _mask, _shift);   \
+                SPEX(_field[3], _offset +  6, _mask, _shift);   \
+                SPEX(_field[4], _offset +  8, _mask, _shift);   \
+                SPEX(_field[5], _offset + 10, _mask, _shift);   \
+                SPEX(_field[6], _offset + 12, _mask, _shift);   \
+                SPEX(_field[7], _offset + 14, _mask, _shift);   \
+        } while (0)
+
 
 static inline u8 ssb_crc8(u8 crc, u8 data)
 {
@@ -360,8 +372,9 @@ static void sprom_extract_r123(struct ssb_sprom *out, const u16 *in)
         SPEX(et0mdcport, SSB_SPROM1_ETHPHY, SSB_SPROM1_ETHPHY_ET0M, 14);
         SPEX(et1mdcport, SSB_SPROM1_ETHPHY, SSB_SPROM1_ETHPHY_ET1M, 15);
         SPEX(board_rev, SSB_SPROM1_BINF, SSB_SPROM1_BINF_BREV, 0);
-        SPEX(country_code, SSB_SPROM1_BINF, SSB_SPROM1_BINF_CCODE,
-             SSB_SPROM1_BINF_CCODE_SHIFT);
+        if (out->revision == 1)
+                SPEX(country_code, SSB_SPROM1_BINF, SSB_SPROM1_BINF_CCODE,
+                     SSB_SPROM1_BINF_CCODE_SHIFT);
         SPEX(ant_available_a, SSB_SPROM1_BINF, SSB_SPROM1_BINF_ANTA,
              SSB_SPROM1_BINF_ANTA_SHIFT);
         SPEX(ant_available_bg, SSB_SPROM1_BINF, SSB_SPROM1_BINF_ANTBG,
@@ -387,6 +400,8 @@ static void sprom_extract_r123(struct ssb_sprom *out, const u16 *in)
         SPEX(boardflags_lo, SSB_SPROM1_BFLLO, 0xFFFF, 0);
         if (out->revision >= 2)
                 SPEX(boardflags_hi, SSB_SPROM2_BFLHI, 0xFFFF, 0);
+        SPEX(alpha2[0], SSB_SPROM1_CCODE, 0xff00, 8);
+        SPEX(alpha2[1], SSB_SPROM1_CCODE, 0x00ff, 0);
 
         /* Extract the antenna gain values. */
         out->antenna_gain.a0 = r123_extract_antgain(out->revision, in,
@@ -455,14 +470,17 @@ static void sprom_extract_r45(struct ssb_sprom *out, const u16 *in)
         SPEX(et0phyaddr, SSB_SPROM4_ETHPHY, SSB_SPROM4_ETHPHY_ET0A, 0);
         SPEX(et1phyaddr, SSB_SPROM4_ETHPHY, SSB_SPROM4_ETHPHY_ET1A,
              SSB_SPROM4_ETHPHY_ET1A_SHIFT);
+        SPEX(board_rev, SSB_SPROM4_BOARDREV, 0xFFFF, 0);
         if (out->revision == 4) {
-                SPEX(country_code, SSB_SPROM4_CCODE, 0xFFFF, 0);
+                SPEX(alpha2[0], SSB_SPROM4_CCODE, 0xff00, 8);
+                SPEX(alpha2[1], SSB_SPROM4_CCODE, 0x00ff, 0);
                 SPEX(boardflags_lo, SSB_SPROM4_BFLLO, 0xFFFF, 0);
                 SPEX(boardflags_hi, SSB_SPROM4_BFLHI, 0xFFFF, 0);
                 SPEX(boardflags2_lo, SSB_SPROM4_BFL2LO, 0xFFFF, 0);
                 SPEX(boardflags2_hi, SSB_SPROM4_BFL2HI, 0xFFFF, 0);
         } else {
-                SPEX(country_code, SSB_SPROM5_CCODE, 0xFFFF, 0);
+                SPEX(alpha2[0], SSB_SPROM5_CCODE, 0xff00, 8);
+                SPEX(alpha2[1], SSB_SPROM5_CCODE, 0x00ff, 0);
                 SPEX(boardflags_lo, SSB_SPROM5_BFLLO, 0xFFFF, 0);
                 SPEX(boardflags_hi, SSB_SPROM5_BFLHI, 0xFFFF, 0);
                 SPEX(boardflags2_lo, SSB_SPROM5_BFL2LO, 0xFFFF, 0);
@@ -525,7 +543,9 @@ static void sprom_extract_r8(struct ssb_sprom *out, const u16 *in)
                 v = in[SPOFF(SSB_SPROM8_IL0MAC) + i];
                 *(((__be16 *)out->il0mac) + i) = cpu_to_be16(v);
         }
-        SPEX(country_code, SSB_SPROM8_CCODE, 0xFFFF, 0);
+        SPEX(board_rev, SSB_SPROM8_BOARDREV, 0xFFFF, 0);
+        SPEX(alpha2[0], SSB_SPROM8_CCODE, 0xff00, 8);
+        SPEX(alpha2[1], SSB_SPROM8_CCODE, 0x00ff, 0);
         SPEX(boardflags_lo, SSB_SPROM8_BFLLO, 0xFFFF, 0);
         SPEX(boardflags_hi, SSB_SPROM8_BFLHI, 0xFFFF, 0);
         SPEX(boardflags2_lo, SSB_SPROM8_BFL2LO, 0xFFFF, 0);
@@ -655,6 +675,63 @@ static void sprom_extract_r8(struct ssb_sprom *out, const u16 *in)
         SPEX(fem.ghz5.antswlut, SSB_SPROM8_FEM5G,
                 SSB_SROM8_FEM_ANTSWLUT, SSB_SROM8_FEM_ANTSWLUT_SHIFT);
 
+        SPEX(leddc_on_time, SSB_SPROM8_LEDDC, SSB_SPROM8_LEDDC_ON,
+             SSB_SPROM8_LEDDC_ON_SHIFT);
+        SPEX(leddc_off_time, SSB_SPROM8_LEDDC, SSB_SPROM8_LEDDC_OFF,
+             SSB_SPROM8_LEDDC_OFF_SHIFT);
+
+        SPEX(txchain, SSB_SPROM8_TXRXC, SSB_SPROM8_TXRXC_TXCHAIN,
+             SSB_SPROM8_TXRXC_TXCHAIN_SHIFT);
+        SPEX(rxchain, SSB_SPROM8_TXRXC, SSB_SPROM8_TXRXC_RXCHAIN,
+             SSB_SPROM8_TXRXC_RXCHAIN_SHIFT);
+        SPEX(antswitch, SSB_SPROM8_TXRXC, SSB_SPROM8_TXRXC_SWITCH,
+             SSB_SPROM8_TXRXC_SWITCH_SHIFT);
+
+        SPEX(opo, SSB_SPROM8_OFDM2GPO, 0x00ff, 0);
+
+        SPEX_ARRAY8(mcs2gpo, SSB_SPROM8_2G_MCSPO, ~0, 0);
+        SPEX_ARRAY8(mcs5gpo, SSB_SPROM8_5G_MCSPO, ~0, 0);
+        SPEX_ARRAY8(mcs5glpo, SSB_SPROM8_5GL_MCSPO, ~0, 0);
+        SPEX_ARRAY8(mcs5ghpo, SSB_SPROM8_5GH_MCSPO, ~0, 0);
+
+        SPEX(rawtempsense, SSB_SPROM8_RAWTS, SSB_SPROM8_RAWTS_RAWTEMP,
+             SSB_SPROM8_RAWTS_RAWTEMP_SHIFT);
+        SPEX(measpower, SSB_SPROM8_RAWTS, SSB_SPROM8_RAWTS_MEASPOWER,
+             SSB_SPROM8_RAWTS_MEASPOWER_SHIFT);
+        SPEX(tempsense_slope, SSB_SPROM8_OPT_CORRX,
+             SSB_SPROM8_OPT_CORRX_TEMP_SLOPE,
+             SSB_SPROM8_OPT_CORRX_TEMP_SLOPE_SHIFT);
+        SPEX(tempcorrx, SSB_SPROM8_OPT_CORRX, SSB_SPROM8_OPT_CORRX_TEMPCORRX,
+             SSB_SPROM8_OPT_CORRX_TEMPCORRX_SHIFT);
+        SPEX(tempsense_option, SSB_SPROM8_OPT_CORRX,
+             SSB_SPROM8_OPT_CORRX_TEMP_OPTION,
+             SSB_SPROM8_OPT_CORRX_TEMP_OPTION_SHIFT);
+        SPEX(freqoffset_corr, SSB_SPROM8_HWIQ_IQSWP,
+             SSB_SPROM8_HWIQ_IQSWP_FREQ_CORR,
+             SSB_SPROM8_HWIQ_IQSWP_FREQ_CORR_SHIFT);
+        SPEX(iqcal_swp_dis, SSB_SPROM8_HWIQ_IQSWP,
+             SSB_SPROM8_HWIQ_IQSWP_IQCAL_SWP,
+             SSB_SPROM8_HWIQ_IQSWP_IQCAL_SWP_SHIFT);
+        SPEX(hw_iqcal_en, SSB_SPROM8_HWIQ_IQSWP, SSB_SPROM8_HWIQ_IQSWP_HW_IQCAL,
+             SSB_SPROM8_HWIQ_IQSWP_HW_IQCAL_SHIFT);
+
+        SPEX(bw40po, SSB_SPROM8_BW40PO, ~0, 0);
+        SPEX(cddpo, SSB_SPROM8_CDDPO, ~0, 0);
+        SPEX(stbcpo, SSB_SPROM8_STBCPO, ~0, 0);
+        SPEX(bwduppo, SSB_SPROM8_BWDUPPO, ~0, 0);
+
+        SPEX(tempthresh, SSB_SPROM8_THERMAL, SSB_SPROM8_THERMAL_TRESH,
+             SSB_SPROM8_THERMAL_TRESH_SHIFT);
+        SPEX(tempoffset, SSB_SPROM8_THERMAL, SSB_SPROM8_THERMAL_OFFSET,
+             SSB_SPROM8_THERMAL_OFFSET_SHIFT);
+        SPEX(phycal_tempdelta, SSB_SPROM8_TEMPDELTA,
+             SSB_SPROM8_TEMPDELTA_PHYCAL,
+             SSB_SPROM8_TEMPDELTA_PHYCAL_SHIFT);
+        SPEX(temps_period, SSB_SPROM8_TEMPDELTA, SSB_SPROM8_TEMPDELTA_PERIOD,
+             SSB_SPROM8_TEMPDELTA_PERIOD_SHIFT);
+        SPEX(temps_hysteresis, SSB_SPROM8_TEMPDELTA,
+             SSB_SPROM8_TEMPDELTA_HYSTERESIS,
+             SSB_SPROM8_TEMPDELTA_HYSTERESIS_SHIFT);
         sprom_extract_r458(out, in);
 
         /* TODO - get remaining rev 8 stuff needed */
@@ -784,7 +861,6 @@ static void ssb_pci_get_boardinfo(struct ssb_bus *bus,
 {
         bi->vendor = bus->host_pci->subsystem_vendor;
         bi->type = bus->host_pci->subsystem_device;
-        bi->rev = bus->host_pci->revision;
 }
 
 int ssb_pci_get_invariants(struct ssb_bus *bus,