kernel: bcma: fallback-sprom: align extraction with upstream
authorÁlvaro Fernández Rojas <noltari@gmail.com>
Mon, 24 Apr 2023 18:31:48 +0000 (20:31 +0200)
committerÁlvaro Fernández Rojas <noltari@gmail.com>
Mon, 24 Apr 2023 19:02:15 +0000 (21:02 +0200)
The current bcma SPROM extraction from upstream only supports SPROMs with
revisions from 8 to 11.
Let's align the downstream fallback driver with upstream.

Signed-off-by: Álvaro Fernández Rojas <noltari@gmail.com>
target/linux/generic/files/drivers/bcma/fallback-sprom.c

index 12a0b6405362957a5087d36e8a934025f91202a9..c6c3cde7105a93cab06de7f885c03910be7fdf0d 100644 (file)
 
 #define BCMA_FBS_MAX_SIZE 468
 
-/* Get the word-offset for a SSB_SPROM_XXX define. */
+/* SPROM Extraction */
 #define SPOFF(offset)  ((offset) / sizeof(u16))
-/* Helper to extract some _offset, which is one of the SSB_SPROM_XXX defines. */
-#define SPEX16(_outvar, _offset, _mask, _shift)        \
+
+#define SPEX(_outvar, _offset, _mask, _shift)  \
        out->_outvar = ((in[SPOFF(_offset)] & (_mask)) >> (_shift))
+
 #define SPEX32(_outvar, _offset, _mask, _shift)        \
        out->_outvar = ((((u32)in[SPOFF((_offset)+2)] << 16 | \
                           in[SPOFF(_offset)]) & (_mask)) >> (_shift))
-#define SPEX(_outvar, _offset, _mask, _shift) \
-       SPEX16(_outvar, _offset, _mask, _shift)
 
 #define SPEX_ARRAY8(_field, _offset, _mask, _shift)    \
        do {    \
@@ -80,19 +79,15 @@ int bcma_get_fallback_sprom(struct bcma_bus *bus, struct ssb_sprom *out)
        return -EINVAL;
 }
 
-static s8 sprom_extract_antgain(u8 sprom_revision, const u16 *in, u16 offset,
-                               u16 mask, u16 shift)
+static s8 sprom_extract_antgain(const u16 *in, u16 offset, u16 mask, u16 shift)
 {
        u16 v;
        u8 gain;
 
        v = in[SPOFF(offset)];
        gain = (v & mask) >> shift;
-       if (gain == 0xFF)
-               gain = 2; /* If unset use 2dBm */
-       if (sprom_revision == 1) {
-               /* Convert to Q5.2 */
-               gain <<= 2;
+       if (gain == 0xFF) {
+               gain = 8; /* If unset use 2dBm */
        } else {
                /* Q5.2 Fractional part is stored in 0xC0 */
                gain = ((gain & 0xC0) >> 6) | ((gain & 0x3F) << 2);
@@ -101,259 +96,119 @@ static s8 sprom_extract_antgain(u8 sprom_revision, const u16 *in, u16 offset,
        return (s8)gain;
 }
 
-static void sprom_extract_r23(struct ssb_sprom *out, const u16 *in)
-{
-       SPEX(boardflags_hi, SSB_SPROM2_BFLHI, 0xFFFF, 0);
-       SPEX(opo, SSB_SPROM2_OPO, SSB_SPROM2_OPO_VALUE, 0);
-       SPEX(pa1lob0, SSB_SPROM2_PA1LOB0, 0xFFFF, 0);
-       SPEX(pa1lob1, SSB_SPROM2_PA1LOB1, 0xFFFF, 0);
-       SPEX(pa1lob2, SSB_SPROM2_PA1LOB2, 0xFFFF, 0);
-       SPEX(pa1hib0, SSB_SPROM2_PA1HIB0, 0xFFFF, 0);
-       SPEX(pa1hib1, SSB_SPROM2_PA1HIB1, 0xFFFF, 0);
-       SPEX(pa1hib2, SSB_SPROM2_PA1HIB2, 0xFFFF, 0);
-       SPEX(maxpwr_ah, SSB_SPROM2_MAXP_A, SSB_SPROM2_MAXP_A_HI, 0);
-       SPEX(maxpwr_al, SSB_SPROM2_MAXP_A, SSB_SPROM2_MAXP_A_LO,
-            SSB_SPROM2_MAXP_A_LO_SHIFT);
-}
-
-static void sprom_extract_r123(struct ssb_sprom *out, const u16 *in)
-{
-       u16 loc[3];
-
-       if (out->revision == 3)                 /* rev 3 moved MAC */
-               loc[0] = SSB_SPROM3_IL0MAC;
-       else {
-               loc[0] = SSB_SPROM1_IL0MAC;
-               loc[1] = SSB_SPROM1_ET0MAC;
-               loc[2] = SSB_SPROM1_ET1MAC;
-       }
-
-       SPEX(et0phyaddr, SSB_SPROM1_ETHPHY, SSB_SPROM1_ETHPHY_ET0A, 0);
-       SPEX(et1phyaddr, SSB_SPROM1_ETHPHY, SSB_SPROM1_ETHPHY_ET1A,
-            SSB_SPROM1_ETHPHY_ET1A_SHIFT);
-       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(board_type, SSB_SPROM1_SPID, 0xFFFF, 0);
-       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,
-            SSB_SPROM1_BINF_ANTBG_SHIFT);
-       SPEX(pa0b0, SSB_SPROM1_PA0B0, 0xFFFF, 0);
-       SPEX(pa0b1, SSB_SPROM1_PA0B1, 0xFFFF, 0);
-       SPEX(pa0b2, SSB_SPROM1_PA0B2, 0xFFFF, 0);
-       SPEX(pa1b0, SSB_SPROM1_PA1B0, 0xFFFF, 0);
-       SPEX(pa1b1, SSB_SPROM1_PA1B1, 0xFFFF, 0);
-       SPEX(pa1b2, SSB_SPROM1_PA1B2, 0xFFFF, 0);
-       SPEX(gpio0, SSB_SPROM1_GPIOA, SSB_SPROM1_GPIOA_P0, 0);
-       SPEX(gpio1, SSB_SPROM1_GPIOA, SSB_SPROM1_GPIOA_P1,
-            SSB_SPROM1_GPIOA_P1_SHIFT);
-       SPEX(gpio2, SSB_SPROM1_GPIOB, SSB_SPROM1_GPIOB_P2, 0);
-       SPEX(gpio3, SSB_SPROM1_GPIOB, SSB_SPROM1_GPIOB_P3,
-            SSB_SPROM1_GPIOB_P3_SHIFT);
-       SPEX(maxpwr_a, SSB_SPROM1_MAXPWR, SSB_SPROM1_MAXPWR_A,
-            SSB_SPROM1_MAXPWR_A_SHIFT);
-       SPEX(maxpwr_bg, SSB_SPROM1_MAXPWR, SSB_SPROM1_MAXPWR_BG, 0);
-       SPEX(itssi_a, SSB_SPROM1_ITSSI, SSB_SPROM1_ITSSI_A,
-            SSB_SPROM1_ITSSI_A_SHIFT);
-       SPEX(itssi_bg, SSB_SPROM1_ITSSI, SSB_SPROM1_ITSSI_BG, 0);
-       SPEX(boardflags_lo, SSB_SPROM1_BFLLO, 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 = sprom_extract_antgain(out->revision, in,
-                                                    SSB_SPROM1_AGAIN,
-                                                    SSB_SPROM1_AGAIN_BG,
-                                                    SSB_SPROM1_AGAIN_BG_SHIFT);
-       out->antenna_gain.a1 = sprom_extract_antgain(out->revision, in,
-                                                    SSB_SPROM1_AGAIN,
-                                                    SSB_SPROM1_AGAIN_A,
-                                                    SSB_SPROM1_AGAIN_A_SHIFT);
-       if (out->revision >= 2)
-               sprom_extract_r23(out, in);
-}
-
-/* Revs 4 5 and 8 have partially shared layout */
-static void sprom_extract_r458(struct ssb_sprom *out, const u16 *in)
-{
-       SPEX(txpid2g[0], SSB_SPROM4_TXPID2G01,
-            SSB_SPROM4_TXPID2G0, SSB_SPROM4_TXPID2G0_SHIFT);
-       SPEX(txpid2g[1], SSB_SPROM4_TXPID2G01,
-            SSB_SPROM4_TXPID2G1, SSB_SPROM4_TXPID2G1_SHIFT);
-       SPEX(txpid2g[2], SSB_SPROM4_TXPID2G23,
-            SSB_SPROM4_TXPID2G2, SSB_SPROM4_TXPID2G2_SHIFT);
-       SPEX(txpid2g[3], SSB_SPROM4_TXPID2G23,
-            SSB_SPROM4_TXPID2G3, SSB_SPROM4_TXPID2G3_SHIFT);
-
-       SPEX(txpid5gl[0], SSB_SPROM4_TXPID5GL01,
-            SSB_SPROM4_TXPID5GL0, SSB_SPROM4_TXPID5GL0_SHIFT);
-       SPEX(txpid5gl[1], SSB_SPROM4_TXPID5GL01,
-            SSB_SPROM4_TXPID5GL1, SSB_SPROM4_TXPID5GL1_SHIFT);
-       SPEX(txpid5gl[2], SSB_SPROM4_TXPID5GL23,
-            SSB_SPROM4_TXPID5GL2, SSB_SPROM4_TXPID5GL2_SHIFT);
-       SPEX(txpid5gl[3], SSB_SPROM4_TXPID5GL23,
-            SSB_SPROM4_TXPID5GL3, SSB_SPROM4_TXPID5GL3_SHIFT);
-
-       SPEX(txpid5g[0], SSB_SPROM4_TXPID5G01,
-            SSB_SPROM4_TXPID5G0, SSB_SPROM4_TXPID5G0_SHIFT);
-       SPEX(txpid5g[1], SSB_SPROM4_TXPID5G01,
-            SSB_SPROM4_TXPID5G1, SSB_SPROM4_TXPID5G1_SHIFT);
-       SPEX(txpid5g[2], SSB_SPROM4_TXPID5G23,
-            SSB_SPROM4_TXPID5G2, SSB_SPROM4_TXPID5G2_SHIFT);
-       SPEX(txpid5g[3], SSB_SPROM4_TXPID5G23,
-            SSB_SPROM4_TXPID5G3, SSB_SPROM4_TXPID5G3_SHIFT);
-
-       SPEX(txpid5gh[0], SSB_SPROM4_TXPID5GH01,
-            SSB_SPROM4_TXPID5GH0, SSB_SPROM4_TXPID5GH0_SHIFT);
-       SPEX(txpid5gh[1], SSB_SPROM4_TXPID5GH01,
-            SSB_SPROM4_TXPID5GH1, SSB_SPROM4_TXPID5GH1_SHIFT);
-       SPEX(txpid5gh[2], SSB_SPROM4_TXPID5GH23,
-            SSB_SPROM4_TXPID5GH2, SSB_SPROM4_TXPID5GH2_SHIFT);
-       SPEX(txpid5gh[3], SSB_SPROM4_TXPID5GH23,
-            SSB_SPROM4_TXPID5GH3, SSB_SPROM4_TXPID5GH3_SHIFT);
-}
-
-static void sprom_extract_r45(struct ssb_sprom *out, const u16 *in)
+static void sprom_extract_r8(struct ssb_sprom *out, const u16 *in)
 {
        static const u16 pwr_info_offset[] = {
-               SSB_SPROM4_PWR_INFO_CORE0, SSB_SPROM4_PWR_INFO_CORE1,
-               SSB_SPROM4_PWR_INFO_CORE2, SSB_SPROM4_PWR_INFO_CORE3
+               SSB_SROM8_PWR_INFO_CORE0, SSB_SROM8_PWR_INFO_CORE1,
+               SSB_SROM8_PWR_INFO_CORE2, SSB_SROM8_PWR_INFO_CORE3
        };
+       u16 o;
        int i;
 
        BUILD_BUG_ON(ARRAY_SIZE(pwr_info_offset) !=
                     ARRAY_SIZE(out->core_pwr_info));
 
-       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);
-       SPEX(board_type, SSB_SPROM1_SPID, 0xFFFF, 0);
-       if (out->revision == 4) {
-               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(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);
-               SPEX(boardflags2_hi, SSB_SPROM5_BFL2HI, 0xFFFF, 0);
-       }
-       SPEX(ant_available_a, SSB_SPROM4_ANTAVAIL, SSB_SPROM4_ANTAVAIL_A,
-            SSB_SPROM4_ANTAVAIL_A_SHIFT);
-       SPEX(ant_available_bg, SSB_SPROM4_ANTAVAIL, SSB_SPROM4_ANTAVAIL_BG,
-            SSB_SPROM4_ANTAVAIL_BG_SHIFT);
-       SPEX(maxpwr_bg, SSB_SPROM4_MAXP_BG, SSB_SPROM4_MAXP_BG_MASK, 0);
-       SPEX(itssi_bg, SSB_SPROM4_MAXP_BG, SSB_SPROM4_ITSSI_BG,
-            SSB_SPROM4_ITSSI_BG_SHIFT);
-       SPEX(maxpwr_a, SSB_SPROM4_MAXP_A, SSB_SPROM4_MAXP_A_MASK, 0);
-       SPEX(itssi_a, SSB_SPROM4_MAXP_A, SSB_SPROM4_ITSSI_A,
-            SSB_SPROM4_ITSSI_A_SHIFT);
-       if (out->revision == 4) {
-               SPEX(gpio0, SSB_SPROM4_GPIOA, SSB_SPROM4_GPIOA_P0, 0);
-               SPEX(gpio1, SSB_SPROM4_GPIOA, SSB_SPROM4_GPIOA_P1,
-                    SSB_SPROM4_GPIOA_P1_SHIFT);
-               SPEX(gpio2, SSB_SPROM4_GPIOB, SSB_SPROM4_GPIOB_P2, 0);
-               SPEX(gpio3, SSB_SPROM4_GPIOB, SSB_SPROM4_GPIOB_P3,
-                    SSB_SPROM4_GPIOB_P3_SHIFT);
-       } else {
-               SPEX(gpio0, SSB_SPROM5_GPIOA, SSB_SPROM5_GPIOA_P0, 0);
-               SPEX(gpio1, SSB_SPROM5_GPIOA, SSB_SPROM5_GPIOA_P1,
-                    SSB_SPROM5_GPIOA_P1_SHIFT);
-               SPEX(gpio2, SSB_SPROM5_GPIOB, SSB_SPROM5_GPIOB_P2, 0);
-               SPEX(gpio3, SSB_SPROM5_GPIOB, SSB_SPROM5_GPIOB_P3,
-                    SSB_SPROM5_GPIOB_P3_SHIFT);
-       }
+       SPEX(board_rev, SSB_SPROM8_BOARDREV, ~0, 0);
+       SPEX(board_type, SSB_SPROM1_SPID, ~0, 0);
+
+       SPEX(txpid2g[0], SSB_SPROM4_TXPID2G01, SSB_SPROM4_TXPID2G0,
+            SSB_SPROM4_TXPID2G0_SHIFT);
+       SPEX(txpid2g[1], SSB_SPROM4_TXPID2G01, SSB_SPROM4_TXPID2G1,
+            SSB_SPROM4_TXPID2G1_SHIFT);
+       SPEX(txpid2g[2], SSB_SPROM4_TXPID2G23, SSB_SPROM4_TXPID2G2,
+            SSB_SPROM4_TXPID2G2_SHIFT);
+       SPEX(txpid2g[3], SSB_SPROM4_TXPID2G23, SSB_SPROM4_TXPID2G3,
+            SSB_SPROM4_TXPID2G3_SHIFT);
+
+       SPEX(txpid5gl[0], SSB_SPROM4_TXPID5GL01, SSB_SPROM4_TXPID5GL0,
+            SSB_SPROM4_TXPID5GL0_SHIFT);
+       SPEX(txpid5gl[1], SSB_SPROM4_TXPID5GL01, SSB_SPROM4_TXPID5GL1,
+            SSB_SPROM4_TXPID5GL1_SHIFT);
+       SPEX(txpid5gl[2], SSB_SPROM4_TXPID5GL23, SSB_SPROM4_TXPID5GL2,
+            SSB_SPROM4_TXPID5GL2_SHIFT);
+       SPEX(txpid5gl[3], SSB_SPROM4_TXPID5GL23, SSB_SPROM4_TXPID5GL3,
+            SSB_SPROM4_TXPID5GL3_SHIFT);
+
+       SPEX(txpid5g[0], SSB_SPROM4_TXPID5G01, SSB_SPROM4_TXPID5G0,
+            SSB_SPROM4_TXPID5G0_SHIFT);
+       SPEX(txpid5g[1], SSB_SPROM4_TXPID5G01, SSB_SPROM4_TXPID5G1,
+            SSB_SPROM4_TXPID5G1_SHIFT);
+       SPEX(txpid5g[2], SSB_SPROM4_TXPID5G23, SSB_SPROM4_TXPID5G2,
+            SSB_SPROM4_TXPID5G2_SHIFT);
+       SPEX(txpid5g[3], SSB_SPROM4_TXPID5G23, SSB_SPROM4_TXPID5G3,
+            SSB_SPROM4_TXPID5G3_SHIFT);
+
+       SPEX(txpid5gh[0], SSB_SPROM4_TXPID5GH01, SSB_SPROM4_TXPID5GH0,
+            SSB_SPROM4_TXPID5GH0_SHIFT);
+       SPEX(txpid5gh[1], SSB_SPROM4_TXPID5GH01, SSB_SPROM4_TXPID5GH1,
+            SSB_SPROM4_TXPID5GH1_SHIFT);
+       SPEX(txpid5gh[2], SSB_SPROM4_TXPID5GH23, SSB_SPROM4_TXPID5GH2,
+            SSB_SPROM4_TXPID5GH2_SHIFT);
+       SPEX(txpid5gh[3], SSB_SPROM4_TXPID5GH23, SSB_SPROM4_TXPID5GH3,
+            SSB_SPROM4_TXPID5GH3_SHIFT);
+
+       SPEX(boardflags_lo, SSB_SPROM8_BFLLO, ~0, 0);
+       SPEX(boardflags_hi, SSB_SPROM8_BFLHI, ~0, 0);
+       SPEX(boardflags2_lo, SSB_SPROM8_BFL2LO, ~0, 0);
+       SPEX(boardflags2_hi, SSB_SPROM8_BFL2HI, ~0, 0);
 
-       /* Extract the antenna gain values. */
-       out->antenna_gain.a0 = sprom_extract_antgain(out->revision, in,
-                                                    SSB_SPROM4_AGAIN01,
-                                                    SSB_SPROM4_AGAIN0,
-                                                    SSB_SPROM4_AGAIN0_SHIFT);
-       out->antenna_gain.a1 = sprom_extract_antgain(out->revision, in,
-                                                    SSB_SPROM4_AGAIN01,
-                                                    SSB_SPROM4_AGAIN1,
-                                                    SSB_SPROM4_AGAIN1_SHIFT);
-       out->antenna_gain.a2 = sprom_extract_antgain(out->revision, in,
-                                                    SSB_SPROM4_AGAIN23,
-                                                    SSB_SPROM4_AGAIN2,
-                                                    SSB_SPROM4_AGAIN2_SHIFT);
-       out->antenna_gain.a3 = sprom_extract_antgain(out->revision, in,
-                                                    SSB_SPROM4_AGAIN23,
-                                                    SSB_SPROM4_AGAIN3,
-                                                    SSB_SPROM4_AGAIN3_SHIFT);
-
-       /* Extract cores power info info */
+       SPEX(alpha2[0], SSB_SPROM8_CCODE, 0xff00, 8);
+       SPEX(alpha2[1], SSB_SPROM8_CCODE, 0x00ff, 0);
+
+       /* Extract core's power info */
        for (i = 0; i < ARRAY_SIZE(pwr_info_offset); i++) {
-               u16 o = pwr_info_offset[i];
-
-               SPEX(core_pwr_info[i].itssi_2g, o + SSB_SPROM4_2G_MAXP_ITSSI,
-                       SSB_SPROM4_2G_ITSSI, SSB_SPROM4_2G_ITSSI_SHIFT);
-               SPEX(core_pwr_info[i].maxpwr_2g, o + SSB_SPROM4_2G_MAXP_ITSSI,
-                       SSB_SPROM4_2G_MAXP, 0);
-
-               SPEX(core_pwr_info[i].pa_2g[0], o + SSB_SPROM4_2G_PA_0, ~0, 0);
-               SPEX(core_pwr_info[i].pa_2g[1], o + SSB_SPROM4_2G_PA_1, ~0, 0);
-               SPEX(core_pwr_info[i].pa_2g[2], o + SSB_SPROM4_2G_PA_2, ~0, 0);
-               SPEX(core_pwr_info[i].pa_2g[3], o + SSB_SPROM4_2G_PA_3, ~0, 0);
-
-               SPEX(core_pwr_info[i].itssi_5g, o + SSB_SPROM4_5G_MAXP_ITSSI,
-                       SSB_SPROM4_5G_ITSSI, SSB_SPROM4_5G_ITSSI_SHIFT);
-               SPEX(core_pwr_info[i].maxpwr_5g, o + SSB_SPROM4_5G_MAXP_ITSSI,
-                       SSB_SPROM4_5G_MAXP, 0);
-               SPEX(core_pwr_info[i].maxpwr_5gh, o + SSB_SPROM4_5GHL_MAXP,
-                       SSB_SPROM4_5GH_MAXP, 0);
-               SPEX(core_pwr_info[i].maxpwr_5gl, o + SSB_SPROM4_5GHL_MAXP,
-                       SSB_SPROM4_5GL_MAXP, SSB_SPROM4_5GL_MAXP_SHIFT);
-
-               SPEX(core_pwr_info[i].pa_5gl[0], o + SSB_SPROM4_5GL_PA_0, ~0, 0);
-               SPEX(core_pwr_info[i].pa_5gl[1], o + SSB_SPROM4_5GL_PA_1, ~0, 0);
-               SPEX(core_pwr_info[i].pa_5gl[2], o + SSB_SPROM4_5GL_PA_2, ~0, 0);
-               SPEX(core_pwr_info[i].pa_5gl[3], o + SSB_SPROM4_5GL_PA_3, ~0, 0);
-               SPEX(core_pwr_info[i].pa_5g[0], o + SSB_SPROM4_5G_PA_0, ~0, 0);
-               SPEX(core_pwr_info[i].pa_5g[1], o + SSB_SPROM4_5G_PA_1, ~0, 0);
-               SPEX(core_pwr_info[i].pa_5g[2], o + SSB_SPROM4_5G_PA_2, ~0, 0);
-               SPEX(core_pwr_info[i].pa_5g[3], o + SSB_SPROM4_5G_PA_3, ~0, 0);
-               SPEX(core_pwr_info[i].pa_5gh[0], o + SSB_SPROM4_5GH_PA_0, ~0, 0);
-               SPEX(core_pwr_info[i].pa_5gh[1], o + SSB_SPROM4_5GH_PA_1, ~0, 0);
-               SPEX(core_pwr_info[i].pa_5gh[2], o + SSB_SPROM4_5GH_PA_2, ~0, 0);
-               SPEX(core_pwr_info[i].pa_5gh[3], o + SSB_SPROM4_5GH_PA_3, ~0, 0);
-       }
+               o = pwr_info_offset[i];
+               SPEX(core_pwr_info[i].itssi_2g, o + SSB_SROM8_2G_MAXP_ITSSI,
+                       SSB_SPROM8_2G_ITSSI, SSB_SPROM8_2G_ITSSI_SHIFT);
+               SPEX(core_pwr_info[i].maxpwr_2g, o + SSB_SROM8_2G_MAXP_ITSSI,
+                       SSB_SPROM8_2G_MAXP, 0);
 
-       sprom_extract_r458(out, in);
+               SPEX(core_pwr_info[i].pa_2g[0], o + SSB_SROM8_2G_PA_0, ~0, 0);
+               SPEX(core_pwr_info[i].pa_2g[1], o + SSB_SROM8_2G_PA_1, ~0, 0);
+               SPEX(core_pwr_info[i].pa_2g[2], o + SSB_SROM8_2G_PA_2, ~0, 0);
 
-       /* TODO - get remaining rev 4 stuff needed */
-}
+               SPEX(core_pwr_info[i].itssi_5g, o + SSB_SROM8_5G_MAXP_ITSSI,
+                       SSB_SPROM8_5G_ITSSI, SSB_SPROM8_5G_ITSSI_SHIFT);
+               SPEX(core_pwr_info[i].maxpwr_5g, o + SSB_SROM8_5G_MAXP_ITSSI,
+                       SSB_SPROM8_5G_MAXP, 0);
+               SPEX(core_pwr_info[i].maxpwr_5gh, o + SSB_SPROM8_5GHL_MAXP,
+                       SSB_SPROM8_5GH_MAXP, 0);
+               SPEX(core_pwr_info[i].maxpwr_5gl, o + SSB_SPROM8_5GHL_MAXP,
+                       SSB_SPROM8_5GL_MAXP, SSB_SPROM8_5GL_MAXP_SHIFT);
 
-static void sprom_extract_r8(struct ssb_sprom *out, const u16 *in)
-{
-       int i;
-       u16 o;
-       static const u16 pwr_info_offset[] = {
-               SSB_SROM8_PWR_INFO_CORE0, SSB_SROM8_PWR_INFO_CORE1,
-               SSB_SROM8_PWR_INFO_CORE2, SSB_SROM8_PWR_INFO_CORE3
-       };
-       BUILD_BUG_ON(ARRAY_SIZE(pwr_info_offset) !=
-                       ARRAY_SIZE(out->core_pwr_info));
+               SPEX(core_pwr_info[i].pa_5gl[0], o + SSB_SROM8_5GL_PA_0, ~0, 0);
+               SPEX(core_pwr_info[i].pa_5gl[1], o + SSB_SROM8_5GL_PA_1, ~0, 0);
+               SPEX(core_pwr_info[i].pa_5gl[2], o + SSB_SROM8_5GL_PA_2, ~0, 0);
+               SPEX(core_pwr_info[i].pa_5g[0], o + SSB_SROM8_5G_PA_0, ~0, 0);
+               SPEX(core_pwr_info[i].pa_5g[1], o + SSB_SROM8_5G_PA_1, ~0, 0);
+               SPEX(core_pwr_info[i].pa_5g[2], o + SSB_SROM8_5G_PA_2, ~0, 0);
+               SPEX(core_pwr_info[i].pa_5gh[0], o + SSB_SROM8_5GH_PA_0, ~0, 0);
+               SPEX(core_pwr_info[i].pa_5gh[1], o + SSB_SROM8_5GH_PA_1, ~0, 0);
+               SPEX(core_pwr_info[i].pa_5gh[2], o + SSB_SROM8_5GH_PA_2, ~0, 0);
+       }
+
+       SPEX(fem.ghz2.tssipos, SSB_SPROM8_FEM2G, SSB_SROM8_FEM_TSSIPOS,
+            SSB_SROM8_FEM_TSSIPOS_SHIFT);
+       SPEX(fem.ghz2.extpa_gain, SSB_SPROM8_FEM2G, SSB_SROM8_FEM_EXTPA_GAIN,
+            SSB_SROM8_FEM_EXTPA_GAIN_SHIFT);
+       SPEX(fem.ghz2.pdet_range, SSB_SPROM8_FEM2G, SSB_SROM8_FEM_PDET_RANGE,
+            SSB_SROM8_FEM_PDET_RANGE_SHIFT);
+       SPEX(fem.ghz2.tr_iso, SSB_SPROM8_FEM2G, SSB_SROM8_FEM_TR_ISO,
+            SSB_SROM8_FEM_TR_ISO_SHIFT);
+       SPEX(fem.ghz2.antswlut, SSB_SPROM8_FEM2G, SSB_SROM8_FEM_ANTSWLUT,
+            SSB_SROM8_FEM_ANTSWLUT_SHIFT);
+
+       SPEX(fem.ghz5.tssipos, SSB_SPROM8_FEM5G, SSB_SROM8_FEM_TSSIPOS,
+            SSB_SROM8_FEM_TSSIPOS_SHIFT);
+       SPEX(fem.ghz5.extpa_gain, SSB_SPROM8_FEM5G, SSB_SROM8_FEM_EXTPA_GAIN,
+            SSB_SROM8_FEM_EXTPA_GAIN_SHIFT);
+       SPEX(fem.ghz5.pdet_range, SSB_SPROM8_FEM5G, SSB_SROM8_FEM_PDET_RANGE,
+            SSB_SROM8_FEM_PDET_RANGE_SHIFT);
+       SPEX(fem.ghz5.tr_iso, SSB_SPROM8_FEM5G, SSB_SROM8_FEM_TR_ISO,
+            SSB_SROM8_FEM_TR_ISO_SHIFT);
+       SPEX(fem.ghz5.antswlut, SSB_SPROM8_FEM5G, SSB_SROM8_FEM_ANTSWLUT,
+            SSB_SROM8_FEM_ANTSWLUT_SHIFT);
 
-       SPEX(board_rev, SSB_SPROM8_BOARDREV, 0xFFFF, 0);
-       SPEX(board_type, SSB_SPROM1_SPID, 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);
-       SPEX(boardflags2_hi, SSB_SPROM8_BFL2HI, 0xFFFF, 0);
        SPEX(ant_available_a, SSB_SPROM8_ANTAVAIL, SSB_SPROM8_ANTAVAIL_A,
             SSB_SPROM8_ANTAVAIL_A_SHIFT);
        SPEX(ant_available_bg, SSB_SPROM8_ANTAVAIL, SSB_SPROM8_ANTAVAIL_BG,
@@ -379,7 +234,8 @@ static void sprom_extract_r8(struct ssb_sprom *out, const u16 *in)
        SPEX(tri5gl, SSB_SPROM8_TRI5GHL, SSB_SPROM8_TRI5GL, 0);
        SPEX(tri5gh, SSB_SPROM8_TRI5GHL, SSB_SPROM8_TRI5GH,
             SSB_SPROM8_TRI5GH_SHIFT);
-       SPEX(rxpo2g, SSB_SPROM8_RXPO, SSB_SPROM8_RXPO2G, 0);
+       SPEX(rxpo2g, SSB_SPROM8_RXPO, SSB_SPROM8_RXPO2G,
+            SSB_SPROM8_RXPO2G_SHIFT);
        SPEX(rxpo5g, SSB_SPROM8_RXPO, SSB_SPROM8_RXPO5G,
             SSB_SPROM8_RXPO5G_SHIFT);
        SPEX(rssismf2g, SSB_SPROM8_RSSIPARM2G, SSB_SPROM8_RSSISMF2G, 0);
@@ -396,97 +252,43 @@ static void sprom_extract_r8(struct ssb_sprom *out, const u16 *in)
             SSB_SPROM8_RSSISAV5G_SHIFT);
        SPEX(bxa5g, SSB_SPROM8_RSSIPARM5G, SSB_SPROM8_BXA5G,
             SSB_SPROM8_BXA5G_SHIFT);
-       SPEX(pa0b0, SSB_SPROM8_PA0B0, 0xFFFF, 0);
-       SPEX(pa0b1, SSB_SPROM8_PA0B1, 0xFFFF, 0);
-       SPEX(pa0b2, SSB_SPROM8_PA0B2, 0xFFFF, 0);
-       SPEX(pa1b0, SSB_SPROM8_PA1B0, 0xFFFF, 0);
-       SPEX(pa1b1, SSB_SPROM8_PA1B1, 0xFFFF, 0);
-       SPEX(pa1b2, SSB_SPROM8_PA1B2, 0xFFFF, 0);
-       SPEX(pa1lob0, SSB_SPROM8_PA1LOB0, 0xFFFF, 0);
-       SPEX(pa1lob1, SSB_SPROM8_PA1LOB1, 0xFFFF, 0);
-       SPEX(pa1lob2, SSB_SPROM8_PA1LOB2, 0xFFFF, 0);
-       SPEX(pa1hib0, SSB_SPROM8_PA1HIB0, 0xFFFF, 0);
-       SPEX(pa1hib1, SSB_SPROM8_PA1HIB1, 0xFFFF, 0);
-       SPEX(pa1hib2, SSB_SPROM8_PA1HIB2, 0xFFFF, 0);
-       SPEX(cck2gpo, SSB_SPROM8_CCK2GPO, 0xFFFF, 0);
-       SPEX32(ofdm2gpo, SSB_SPROM8_OFDM2GPO, 0xFFFFFFFF, 0);
-       SPEX32(ofdm5glpo, SSB_SPROM8_OFDM5GLPO, 0xFFFFFFFF, 0);
-       SPEX32(ofdm5gpo, SSB_SPROM8_OFDM5GPO, 0xFFFFFFFF, 0);
-       SPEX32(ofdm5ghpo, SSB_SPROM8_OFDM5GHPO, 0xFFFFFFFF, 0);
+
+       SPEX(pa0b0, SSB_SPROM8_PA0B0, ~0, 0);
+       SPEX(pa0b1, SSB_SPROM8_PA0B1, ~0, 0);
+       SPEX(pa0b2, SSB_SPROM8_PA0B2, ~0, 0);
+       SPEX(pa1b0, SSB_SPROM8_PA1B0, ~0, 0);
+       SPEX(pa1b1, SSB_SPROM8_PA1B1, ~0, 0);
+       SPEX(pa1b2, SSB_SPROM8_PA1B2, ~0, 0);
+       SPEX(pa1lob0, SSB_SPROM8_PA1LOB0, ~0, 0);
+       SPEX(pa1lob1, SSB_SPROM8_PA1LOB1, ~0, 0);
+       SPEX(pa1lob2, SSB_SPROM8_PA1LOB2, ~0, 0);
+       SPEX(pa1hib0, SSB_SPROM8_PA1HIB0, ~0, 0);
+       SPEX(pa1hib1, SSB_SPROM8_PA1HIB1, ~0, 0);
+       SPEX(pa1hib2, SSB_SPROM8_PA1HIB2, ~0, 0);
+       SPEX(cck2gpo, SSB_SPROM8_CCK2GPO, ~0, 0);
+       SPEX32(ofdm2gpo, SSB_SPROM8_OFDM2GPO, ~0, 0);
+       SPEX32(ofdm5glpo, SSB_SPROM8_OFDM5GLPO, ~0, 0);
+       SPEX32(ofdm5gpo, SSB_SPROM8_OFDM5GPO, ~0, 0);
+       SPEX32(ofdm5ghpo, SSB_SPROM8_OFDM5GHPO, ~0, 0);
 
        /* Extract the antenna gain values. */
-       out->antenna_gain.a0 = sprom_extract_antgain(out->revision, in,
+       out->antenna_gain.a0 = sprom_extract_antgain(in,
                                                     SSB_SPROM8_AGAIN01,
                                                     SSB_SPROM8_AGAIN0,
                                                     SSB_SPROM8_AGAIN0_SHIFT);
-       out->antenna_gain.a1 = sprom_extract_antgain(out->revision, in,
+       out->antenna_gain.a1 = sprom_extract_antgain(in,
                                                     SSB_SPROM8_AGAIN01,
                                                     SSB_SPROM8_AGAIN1,
                                                     SSB_SPROM8_AGAIN1_SHIFT);
-       out->antenna_gain.a2 = sprom_extract_antgain(out->revision, in,
+       out->antenna_gain.a2 = sprom_extract_antgain(in,
                                                     SSB_SPROM8_AGAIN23,
                                                     SSB_SPROM8_AGAIN2,
                                                     SSB_SPROM8_AGAIN2_SHIFT);
-       out->antenna_gain.a3 = sprom_extract_antgain(out->revision, in,
+       out->antenna_gain.a3 = sprom_extract_antgain(in,
                                                     SSB_SPROM8_AGAIN23,
                                                     SSB_SPROM8_AGAIN3,
                                                     SSB_SPROM8_AGAIN3_SHIFT);
 
-       /* Extract cores power info info */
-       for (i = 0; i < ARRAY_SIZE(pwr_info_offset); i++) {
-               o = pwr_info_offset[i];
-               SPEX(core_pwr_info[i].itssi_2g, o + SSB_SROM8_2G_MAXP_ITSSI,
-                       SSB_SPROM8_2G_ITSSI, SSB_SPROM8_2G_ITSSI_SHIFT);
-               SPEX(core_pwr_info[i].maxpwr_2g, o + SSB_SROM8_2G_MAXP_ITSSI,
-                       SSB_SPROM8_2G_MAXP, 0);
-
-               SPEX(core_pwr_info[i].pa_2g[0], o + SSB_SROM8_2G_PA_0, ~0, 0);
-               SPEX(core_pwr_info[i].pa_2g[1], o + SSB_SROM8_2G_PA_1, ~0, 0);
-               SPEX(core_pwr_info[i].pa_2g[2], o + SSB_SROM8_2G_PA_2, ~0, 0);
-
-               SPEX(core_pwr_info[i].itssi_5g, o + SSB_SROM8_5G_MAXP_ITSSI,
-                       SSB_SPROM8_5G_ITSSI, SSB_SPROM8_5G_ITSSI_SHIFT);
-               SPEX(core_pwr_info[i].maxpwr_5g, o + SSB_SROM8_5G_MAXP_ITSSI,
-                       SSB_SPROM8_5G_MAXP, 0);
-               SPEX(core_pwr_info[i].maxpwr_5gh, o + SSB_SPROM8_5GHL_MAXP,
-                       SSB_SPROM8_5GH_MAXP, 0);
-               SPEX(core_pwr_info[i].maxpwr_5gl, o + SSB_SPROM8_5GHL_MAXP,
-                       SSB_SPROM8_5GL_MAXP, SSB_SPROM8_5GL_MAXP_SHIFT);
-
-               SPEX(core_pwr_info[i].pa_5gl[0], o + SSB_SROM8_5GL_PA_0, ~0, 0);
-               SPEX(core_pwr_info[i].pa_5gl[1], o + SSB_SROM8_5GL_PA_1, ~0, 0);
-               SPEX(core_pwr_info[i].pa_5gl[2], o + SSB_SROM8_5GL_PA_2, ~0, 0);
-               SPEX(core_pwr_info[i].pa_5g[0], o + SSB_SROM8_5G_PA_0, ~0, 0);
-               SPEX(core_pwr_info[i].pa_5g[1], o + SSB_SROM8_5G_PA_1, ~0, 0);
-               SPEX(core_pwr_info[i].pa_5g[2], o + SSB_SROM8_5G_PA_2, ~0, 0);
-               SPEX(core_pwr_info[i].pa_5gh[0], o + SSB_SROM8_5GH_PA_0, ~0, 0);
-               SPEX(core_pwr_info[i].pa_5gh[1], o + SSB_SROM8_5GH_PA_1, ~0, 0);
-               SPEX(core_pwr_info[i].pa_5gh[2], o + SSB_SROM8_5GH_PA_2, ~0, 0);
-       }
-
-       /* Extract FEM info */
-       SPEX(fem.ghz2.tssipos, SSB_SPROM8_FEM2G,
-               SSB_SROM8_FEM_TSSIPOS, SSB_SROM8_FEM_TSSIPOS_SHIFT);
-       SPEX(fem.ghz2.extpa_gain, SSB_SPROM8_FEM2G,
-               SSB_SROM8_FEM_EXTPA_GAIN, SSB_SROM8_FEM_EXTPA_GAIN_SHIFT);
-       SPEX(fem.ghz2.pdet_range, SSB_SPROM8_FEM2G,
-               SSB_SROM8_FEM_PDET_RANGE, SSB_SROM8_FEM_PDET_RANGE_SHIFT);
-       SPEX(fem.ghz2.tr_iso, SSB_SPROM8_FEM2G,
-               SSB_SROM8_FEM_TR_ISO, SSB_SROM8_FEM_TR_ISO_SHIFT);
-       SPEX(fem.ghz2.antswlut, SSB_SPROM8_FEM2G,
-               SSB_SROM8_FEM_ANTSWLUT, SSB_SROM8_FEM_ANTSWLUT_SHIFT);
-
-       SPEX(fem.ghz5.tssipos, SSB_SPROM8_FEM5G,
-               SSB_SROM8_FEM_TSSIPOS, SSB_SROM8_FEM_TSSIPOS_SHIFT);
-       SPEX(fem.ghz5.extpa_gain, SSB_SPROM8_FEM5G,
-               SSB_SROM8_FEM_EXTPA_GAIN, SSB_SROM8_FEM_EXTPA_GAIN_SHIFT);
-       SPEX(fem.ghz5.pdet_range, SSB_SPROM8_FEM5G,
-               SSB_SROM8_FEM_PDET_RANGE, SSB_SROM8_FEM_PDET_RANGE_SHIFT);
-       SPEX(fem.ghz5.tr_iso, SSB_SPROM8_FEM5G,
-               SSB_SROM8_FEM_TR_ISO, SSB_SROM8_FEM_TR_ISO_SHIFT);
-       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,
@@ -544,9 +346,6 @@ static void sprom_extract_r8(struct ssb_sprom *out, const u16 *in)
        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 */
 }
 
 static int sprom_extract(struct bcma_fbs *priv, const u16 *in, u16 size)
@@ -556,35 +355,15 @@ static int sprom_extract(struct bcma_fbs *priv, const u16 *in, u16 size)
        memset(out, 0, sizeof(*out));
 
        out->revision = in[size - 1] & 0x00FF;
-       memset(out->et0mac, 0xFF, 6);
-       memset(out->et1mac, 0xFF, 6);
-
-       switch (out->revision) {
-       case 1:
-       case 2:
-       case 3:
-               sprom_extract_r123(out, in);
-               break;
-       case 4:
-       case 5:
-               sprom_extract_r45(out, in);
-               break;
-       case 8:
-               sprom_extract_r8(out, in);
-               break;
-       default:
+       if (out->revision < 8 || out->revision > 11) {
                dev_warn(priv->dev,
                         "Unsupported SPROM revision %d detected."
-                        " Will extract v1\n",
+                        " Will extract v8\n",
                         out->revision);
-               out->revision = 1;
-               sprom_extract_r123(out, in);
+               out->revision = 8;
        }
 
-       if (out->boardflags_lo == 0xFFFF)
-               out->boardflags_lo = 0;  /* per specs */
-       if (out->boardflags_hi == 0xFFFF)
-               out->boardflags_hi = 0;  /* per specs */
+       sprom_extract_r8(out, in);
 
        return 0;
 }