diff options
author | David S. Miller <davem@davemloft.net> | 2010-01-19 14:43:42 -0500 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2010-01-19 14:43:42 -0500 |
commit | 6373464288cab09bc641be301d8d30fc9f64ba71 (patch) | |
tree | c1bc92dc630aa15da2e12bc0d09c92169817a702 /drivers/net/wireless/b43 | |
parent | 6d955180b2f9ccff444df06265160868cabb289a (diff) | |
parent | 730dd70549e0ec755dd55615ba5cfc38a482a947 (diff) |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next-2.6
Conflicts:
drivers/net/wireless/iwlwifi/iwl-core.h
Diffstat (limited to 'drivers/net/wireless/b43')
-rw-r--r-- | drivers/net/wireless/b43/b43.h | 8 | ||||
-rw-r--r-- | drivers/net/wireless/b43/main.c | 8 | ||||
-rw-r--r-- | drivers/net/wireless/b43/phy_lp.c | 24 | ||||
-rw-r--r-- | drivers/net/wireless/b43/phy_n.c | 1795 | ||||
-rw-r--r-- | drivers/net/wireless/b43/phy_n.h | 87 | ||||
-rw-r--r-- | drivers/net/wireless/b43/tables_nphy.c | 577 | ||||
-rw-r--r-- | drivers/net/wireless/b43/tables_nphy.h | 71 |
7 files changed, 2414 insertions, 156 deletions
diff --git a/drivers/net/wireless/b43/b43.h b/drivers/net/wireless/b43/b43.h index 2f12a750bc9..54d6085a887 100644 --- a/drivers/net/wireless/b43/b43.h +++ b/drivers/net/wireless/b43/b43.h | |||
@@ -253,6 +253,14 @@ enum { | |||
253 | #define B43_SHM_SH_MAXBFRAMES 0x0080 /* Maximum number of frames in a burst */ | 253 | #define B43_SHM_SH_MAXBFRAMES 0x0080 /* Maximum number of frames in a burst */ |
254 | #define B43_SHM_SH_SPUWKUP 0x0094 /* pre-wakeup for synth PU in us */ | 254 | #define B43_SHM_SH_SPUWKUP 0x0094 /* pre-wakeup for synth PU in us */ |
255 | #define B43_SHM_SH_PRETBTT 0x0096 /* pre-TBTT in us */ | 255 | #define B43_SHM_SH_PRETBTT 0x0096 /* pre-TBTT in us */ |
256 | /* SHM_SHARED tx iq workarounds */ | ||
257 | #define B43_SHM_SH_NPHY_TXIQW0 0x0700 | ||
258 | #define B43_SHM_SH_NPHY_TXIQW1 0x0702 | ||
259 | #define B43_SHM_SH_NPHY_TXIQW2 0x0704 | ||
260 | #define B43_SHM_SH_NPHY_TXIQW3 0x0706 | ||
261 | /* SHM_SHARED tx pwr ctrl */ | ||
262 | #define B43_SHM_SH_NPHY_TXPWR_INDX0 0x0708 | ||
263 | #define B43_SHM_SH_NPHY_TXPWR_INDX1 0x070E | ||
256 | 264 | ||
257 | /* SHM_SCRATCH offsets */ | 265 | /* SHM_SCRATCH offsets */ |
258 | #define B43_SHM_SC_MINCONT 0x0003 /* Minimum contention window */ | 266 | #define B43_SHM_SC_MINCONT 0x0003 /* Minimum contention window */ |
diff --git a/drivers/net/wireless/b43/main.c b/drivers/net/wireless/b43/main.c index 60290c06e95..9c5c7c9ad53 100644 --- a/drivers/net/wireless/b43/main.c +++ b/drivers/net/wireless/b43/main.c | |||
@@ -67,7 +67,12 @@ MODULE_AUTHOR("Gábor Stefanik"); | |||
67 | MODULE_LICENSE("GPL"); | 67 | MODULE_LICENSE("GPL"); |
68 | 68 | ||
69 | MODULE_FIRMWARE(B43_SUPPORTED_FIRMWARE_ID); | 69 | MODULE_FIRMWARE(B43_SUPPORTED_FIRMWARE_ID); |
70 | 70 | MODULE_FIRMWARE("b43/ucode11.fw"); | |
71 | MODULE_FIRMWARE("b43/ucode13.fw"); | ||
72 | MODULE_FIRMWARE("b43/ucode14.fw"); | ||
73 | MODULE_FIRMWARE("b43/ucode15.fw"); | ||
74 | MODULE_FIRMWARE("b43/ucode5.fw"); | ||
75 | MODULE_FIRMWARE("b43/ucode9.fw"); | ||
71 | 76 | ||
72 | static int modparam_bad_frames_preempt; | 77 | static int modparam_bad_frames_preempt; |
73 | module_param_named(bad_frames_preempt, modparam_bad_frames_preempt, int, 0444); | 78 | module_param_named(bad_frames_preempt, modparam_bad_frames_preempt, int, 0444); |
@@ -113,6 +118,7 @@ static const struct ssb_device_id b43_ssb_tbl[] = { | |||
113 | SSB_DEVICE(SSB_VENDOR_BROADCOM, SSB_DEV_80211, 9), | 118 | SSB_DEVICE(SSB_VENDOR_BROADCOM, SSB_DEV_80211, 9), |
114 | SSB_DEVICE(SSB_VENDOR_BROADCOM, SSB_DEV_80211, 10), | 119 | SSB_DEVICE(SSB_VENDOR_BROADCOM, SSB_DEV_80211, 10), |
115 | SSB_DEVICE(SSB_VENDOR_BROADCOM, SSB_DEV_80211, 11), | 120 | SSB_DEVICE(SSB_VENDOR_BROADCOM, SSB_DEV_80211, 11), |
121 | SSB_DEVICE(SSB_VENDOR_BROADCOM, SSB_DEV_80211, 12), | ||
116 | SSB_DEVICE(SSB_VENDOR_BROADCOM, SSB_DEV_80211, 13), | 122 | SSB_DEVICE(SSB_VENDOR_BROADCOM, SSB_DEV_80211, 13), |
117 | SSB_DEVICE(SSB_VENDOR_BROADCOM, SSB_DEV_80211, 15), | 123 | SSB_DEVICE(SSB_VENDOR_BROADCOM, SSB_DEV_80211, 15), |
118 | SSB_DEVICE(SSB_VENDOR_BROADCOM, SSB_DEV_80211, 16), | 124 | SSB_DEVICE(SSB_VENDOR_BROADCOM, SSB_DEV_80211, 16), |
diff --git a/drivers/net/wireless/b43/phy_lp.c b/drivers/net/wireless/b43/phy_lp.c index 3e046ec1ff8..b58d6cf2658 100644 --- a/drivers/net/wireless/b43/phy_lp.c +++ b/drivers/net/wireless/b43/phy_lp.c | |||
@@ -80,6 +80,7 @@ static void b43_lpphy_op_free(struct b43_wldev *dev) | |||
80 | dev->phy.lp = NULL; | 80 | dev->phy.lp = NULL; |
81 | } | 81 | } |
82 | 82 | ||
83 | /* http://bcm-v4.sipsolutions.net/802.11/PHY/LP/ReadBandSrom */ | ||
83 | static void lpphy_read_band_sprom(struct b43_wldev *dev) | 84 | static void lpphy_read_band_sprom(struct b43_wldev *dev) |
84 | { | 85 | { |
85 | struct b43_phy_lp *lpphy = dev->phy.lp; | 86 | struct b43_phy_lp *lpphy = dev->phy.lp; |
@@ -101,6 +102,12 @@ static void lpphy_read_band_sprom(struct b43_wldev *dev) | |||
101 | maxpwr = bus->sprom.maxpwr_bg; | 102 | maxpwr = bus->sprom.maxpwr_bg; |
102 | lpphy->max_tx_pwr_med_band = maxpwr; | 103 | lpphy->max_tx_pwr_med_band = maxpwr; |
103 | cckpo = bus->sprom.cck2gpo; | 104 | cckpo = bus->sprom.cck2gpo; |
105 | /* | ||
106 | * We don't read SPROM's opo as specs say. On rev8 SPROMs | ||
107 | * opo == ofdm2gpo and we don't know any SSB with LP-PHY | ||
108 | * and SPROM rev below 8. | ||
109 | */ | ||
110 | B43_WARN_ON(bus->sprom.revision < 8); | ||
104 | ofdmpo = bus->sprom.ofdm2gpo; | 111 | ofdmpo = bus->sprom.ofdm2gpo; |
105 | if (cckpo) { | 112 | if (cckpo) { |
106 | for (i = 0; i < 4; i++) { | 113 | for (i = 0; i < 4; i++) { |
@@ -1703,19 +1710,6 @@ static const struct lpphy_rx_iq_comp lpphy_rev2plus_iq_comp = { | |||
1703 | .c0 = 0, | 1710 | .c0 = 0, |
1704 | }; | 1711 | }; |
1705 | 1712 | ||
1706 | static u8 lpphy_nbits(s32 val) | ||
1707 | { | ||
1708 | u32 tmp = abs(val); | ||
1709 | u8 nbits = 0; | ||
1710 | |||
1711 | while (tmp != 0) { | ||
1712 | nbits++; | ||
1713 | tmp >>= 1; | ||
1714 | } | ||
1715 | |||
1716 | return nbits; | ||
1717 | } | ||
1718 | |||
1719 | static int lpphy_calc_rx_iq_comp(struct b43_wldev *dev, u16 samples) | 1713 | static int lpphy_calc_rx_iq_comp(struct b43_wldev *dev, u16 samples) |
1720 | { | 1714 | { |
1721 | struct lpphy_iq_est iq_est; | 1715 | struct lpphy_iq_est iq_est; |
@@ -1742,8 +1736,8 @@ static int lpphy_calc_rx_iq_comp(struct b43_wldev *dev, u16 samples) | |||
1742 | goto out; | 1736 | goto out; |
1743 | } | 1737 | } |
1744 | 1738 | ||
1745 | prod_msb = lpphy_nbits(prod); | 1739 | prod_msb = fls(abs(prod)); |
1746 | q_msb = lpphy_nbits(qpwr); | 1740 | q_msb = fls(abs(qpwr)); |
1747 | tmp1 = prod_msb - 20; | 1741 | tmp1 = prod_msb - 20; |
1748 | 1742 | ||
1749 | if (tmp1 >= 0) { | 1743 | if (tmp1 >= 0) { |
diff --git a/drivers/net/wireless/b43/phy_n.c b/drivers/net/wireless/b43/phy_n.c index 992318a7807..4a817e3da16 100644 --- a/drivers/net/wireless/b43/phy_n.c +++ b/drivers/net/wireless/b43/phy_n.c | |||
@@ -28,7 +28,32 @@ | |||
28 | #include "b43.h" | 28 | #include "b43.h" |
29 | #include "phy_n.h" | 29 | #include "phy_n.h" |
30 | #include "tables_nphy.h" | 30 | #include "tables_nphy.h" |
31 | #include "main.h" | ||
31 | 32 | ||
33 | struct nphy_txgains { | ||
34 | u16 txgm[2]; | ||
35 | u16 pga[2]; | ||
36 | u16 pad[2]; | ||
37 | u16 ipa[2]; | ||
38 | }; | ||
39 | |||
40 | struct nphy_iqcal_params { | ||
41 | u16 txgm; | ||
42 | u16 pga; | ||
43 | u16 pad; | ||
44 | u16 ipa; | ||
45 | u16 cal_gain; | ||
46 | u16 ncorr[5]; | ||
47 | }; | ||
48 | |||
49 | struct nphy_iq_est { | ||
50 | s32 iq0_prod; | ||
51 | u32 i0_pwr; | ||
52 | u32 q0_pwr; | ||
53 | s32 iq1_prod; | ||
54 | u32 i1_pwr; | ||
55 | u32 q1_pwr; | ||
56 | }; | ||
32 | 57 | ||
33 | void b43_nphy_set_rxantenna(struct b43_wldev *dev, int antenna) | 58 | void b43_nphy_set_rxantenna(struct b43_wldev *dev, int antenna) |
34 | {//TODO | 59 | {//TODO |
@@ -197,44 +222,16 @@ void b43_nphy_radio_turn_off(struct b43_wldev *dev) | |||
197 | ~B43_NPHY_RFCTL_CMD_EN); | 222 | ~B43_NPHY_RFCTL_CMD_EN); |
198 | } | 223 | } |
199 | 224 | ||
200 | #define ntab_upload(dev, offset, data) do { \ | 225 | /* |
201 | unsigned int i; \ | 226 | * Upload the N-PHY tables. |
202 | for (i = 0; i < (offset##_SIZE); i++) \ | 227 | * http://bcm-v4.sipsolutions.net/802.11/PHY/N/InitTables |
203 | b43_ntab_write(dev, (offset) + i, (data)[i]); \ | 228 | */ |
204 | } while (0) | ||
205 | |||
206 | /* Upload the N-PHY tables. */ | ||
207 | static void b43_nphy_tables_init(struct b43_wldev *dev) | 229 | static void b43_nphy_tables_init(struct b43_wldev *dev) |
208 | { | 230 | { |
209 | /* Static tables */ | 231 | if (dev->phy.rev < 3) |
210 | ntab_upload(dev, B43_NTAB_FRAMESTRUCT, b43_ntab_framestruct); | 232 | b43_nphy_rev0_1_2_tables_init(dev); |
211 | ntab_upload(dev, B43_NTAB_FRAMELT, b43_ntab_framelookup); | 233 | else |
212 | ntab_upload(dev, B43_NTAB_TMAP, b43_ntab_tmap); | 234 | b43_nphy_rev3plus_tables_init(dev); |
213 | ntab_upload(dev, B43_NTAB_TDTRN, b43_ntab_tdtrn); | ||
214 | ntab_upload(dev, B43_NTAB_INTLEVEL, b43_ntab_intlevel); | ||
215 | ntab_upload(dev, B43_NTAB_PILOT, b43_ntab_pilot); | ||
216 | ntab_upload(dev, B43_NTAB_PILOTLT, b43_ntab_pilotlt); | ||
217 | ntab_upload(dev, B43_NTAB_TDI20A0, b43_ntab_tdi20a0); | ||
218 | ntab_upload(dev, B43_NTAB_TDI20A1, b43_ntab_tdi20a1); | ||
219 | ntab_upload(dev, B43_NTAB_TDI40A0, b43_ntab_tdi40a0); | ||
220 | ntab_upload(dev, B43_NTAB_TDI40A1, b43_ntab_tdi40a1); | ||
221 | ntab_upload(dev, B43_NTAB_BDI, b43_ntab_bdi); | ||
222 | ntab_upload(dev, B43_NTAB_CHANEST, b43_ntab_channelest); | ||
223 | ntab_upload(dev, B43_NTAB_MCS, b43_ntab_mcs); | ||
224 | |||
225 | /* Volatile tables */ | ||
226 | ntab_upload(dev, B43_NTAB_NOISEVAR10, b43_ntab_noisevar10); | ||
227 | ntab_upload(dev, B43_NTAB_NOISEVAR11, b43_ntab_noisevar11); | ||
228 | ntab_upload(dev, B43_NTAB_C0_ESTPLT, b43_ntab_estimatepowerlt0); | ||
229 | ntab_upload(dev, B43_NTAB_C1_ESTPLT, b43_ntab_estimatepowerlt1); | ||
230 | ntab_upload(dev, B43_NTAB_C0_ADJPLT, b43_ntab_adjustpower0); | ||
231 | ntab_upload(dev, B43_NTAB_C1_ADJPLT, b43_ntab_adjustpower1); | ||
232 | ntab_upload(dev, B43_NTAB_C0_GAINCTL, b43_ntab_gainctl0); | ||
233 | ntab_upload(dev, B43_NTAB_C1_GAINCTL, b43_ntab_gainctl1); | ||
234 | ntab_upload(dev, B43_NTAB_C0_IQLT, b43_ntab_iqlt0); | ||
235 | ntab_upload(dev, B43_NTAB_C1_IQLT, b43_ntab_iqlt1); | ||
236 | ntab_upload(dev, B43_NTAB_C0_LOFEEDTH, b43_ntab_loftlt0); | ||
237 | ntab_upload(dev, B43_NTAB_C1_LOFEEDTH, b43_ntab_loftlt1); | ||
238 | } | 235 | } |
239 | 236 | ||
240 | static void b43_nphy_workarounds(struct b43_wldev *dev) | 237 | static void b43_nphy_workarounds(struct b43_wldev *dev) |
@@ -341,18 +338,386 @@ static void b43_nphy_workarounds(struct b43_wldev *dev) | |||
341 | b43_phy_write(dev, B43_NPHY_PHASETR_B2, 0x20); | 338 | b43_phy_write(dev, B43_NPHY_PHASETR_B2, 0x20); |
342 | } | 339 | } |
343 | 340 | ||
341 | /* http://bcm-v4.sipsolutions.net/802.11/PHY/N/PA%20override */ | ||
342 | static void b43_nphy_pa_override(struct b43_wldev *dev, bool enable) | ||
343 | { | ||
344 | struct b43_phy_n *nphy = dev->phy.n; | ||
345 | enum ieee80211_band band; | ||
346 | u16 tmp; | ||
347 | |||
348 | if (!enable) { | ||
349 | nphy->rfctrl_intc1_save = b43_phy_read(dev, | ||
350 | B43_NPHY_RFCTL_INTC1); | ||
351 | nphy->rfctrl_intc2_save = b43_phy_read(dev, | ||
352 | B43_NPHY_RFCTL_INTC2); | ||
353 | band = b43_current_band(dev->wl); | ||
354 | if (dev->phy.rev >= 3) { | ||
355 | if (band == IEEE80211_BAND_5GHZ) | ||
356 | tmp = 0x600; | ||
357 | else | ||
358 | tmp = 0x480; | ||
359 | } else { | ||
360 | if (band == IEEE80211_BAND_5GHZ) | ||
361 | tmp = 0x180; | ||
362 | else | ||
363 | tmp = 0x120; | ||
364 | } | ||
365 | b43_phy_write(dev, B43_NPHY_RFCTL_INTC1, tmp); | ||
366 | b43_phy_write(dev, B43_NPHY_RFCTL_INTC2, tmp); | ||
367 | } else { | ||
368 | b43_phy_write(dev, B43_NPHY_RFCTL_INTC1, | ||
369 | nphy->rfctrl_intc1_save); | ||
370 | b43_phy_write(dev, B43_NPHY_RFCTL_INTC2, | ||
371 | nphy->rfctrl_intc2_save); | ||
372 | } | ||
373 | } | ||
374 | |||
375 | /* http://bcm-v4.sipsolutions.net/802.11/PHY/N/TxLpFbw */ | ||
376 | static void b43_nphy_tx_lp_fbw(struct b43_wldev *dev) | ||
377 | { | ||
378 | struct b43_phy_n *nphy = dev->phy.n; | ||
379 | u16 tmp; | ||
380 | enum ieee80211_band band = b43_current_band(dev->wl); | ||
381 | bool ipa = (nphy->ipa2g_on && band == IEEE80211_BAND_2GHZ) || | ||
382 | (nphy->ipa5g_on && band == IEEE80211_BAND_5GHZ); | ||
383 | |||
384 | if (dev->phy.rev >= 3) { | ||
385 | if (ipa) { | ||
386 | tmp = 4; | ||
387 | b43_phy_write(dev, B43_NPHY_TXF_40CO_B32S2, | ||
388 | (((((tmp << 3) | tmp) << 3) | tmp) << 3) | tmp); | ||
389 | } | ||
390 | |||
391 | tmp = 1; | ||
392 | b43_phy_write(dev, B43_NPHY_TXF_40CO_B1S2, | ||
393 | (((((tmp << 3) | tmp) << 3) | tmp) << 3) | tmp); | ||
394 | } | ||
395 | } | ||
396 | |||
397 | /* http://bcm-v4.sipsolutions.net/802.11/PHY/N/BmacPhyClkFgc */ | ||
398 | static void b43_nphy_bmac_clock_fgc(struct b43_wldev *dev, bool force) | ||
399 | { | ||
400 | u32 tmslow; | ||
401 | |||
402 | if (dev->phy.type != B43_PHYTYPE_N) | ||
403 | return; | ||
404 | |||
405 | tmslow = ssb_read32(dev->dev, SSB_TMSLOW); | ||
406 | if (force) | ||
407 | tmslow |= SSB_TMSLOW_FGC; | ||
408 | else | ||
409 | tmslow &= ~SSB_TMSLOW_FGC; | ||
410 | ssb_write32(dev->dev, SSB_TMSLOW, tmslow); | ||
411 | } | ||
412 | |||
413 | /* http://bcm-v4.sipsolutions.net/802.11/PHY/N/CCA */ | ||
344 | static void b43_nphy_reset_cca(struct b43_wldev *dev) | 414 | static void b43_nphy_reset_cca(struct b43_wldev *dev) |
345 | { | 415 | { |
346 | u16 bbcfg; | 416 | u16 bbcfg; |
347 | 417 | ||
348 | ssb_write32(dev->dev, SSB_TMSLOW, | 418 | b43_nphy_bmac_clock_fgc(dev, 1); |
349 | ssb_read32(dev->dev, SSB_TMSLOW) | SSB_TMSLOW_FGC); | ||
350 | bbcfg = b43_phy_read(dev, B43_NPHY_BBCFG); | 419 | bbcfg = b43_phy_read(dev, B43_NPHY_BBCFG); |
351 | b43_phy_set(dev, B43_NPHY_BBCFG, B43_NPHY_BBCFG_RSTCCA); | 420 | b43_phy_write(dev, B43_NPHY_BBCFG, bbcfg | B43_NPHY_BBCFG_RSTCCA); |
352 | b43_phy_write(dev, B43_NPHY_BBCFG, | 421 | udelay(1); |
353 | bbcfg & ~B43_NPHY_BBCFG_RSTCCA); | 422 | b43_phy_write(dev, B43_NPHY_BBCFG, bbcfg & ~B43_NPHY_BBCFG_RSTCCA); |
354 | ssb_write32(dev->dev, SSB_TMSLOW, | 423 | b43_nphy_bmac_clock_fgc(dev, 0); |
355 | ssb_read32(dev->dev, SSB_TMSLOW) & ~SSB_TMSLOW_FGC); | 424 | /* TODO: N PHY Force RF Seq with argument 2 */ |
425 | } | ||
426 | |||
427 | /* http://bcm-v4.sipsolutions.net/802.11/PHY/N/RxIqEst */ | ||
428 | static void b43_nphy_rx_iq_est(struct b43_wldev *dev, struct nphy_iq_est *est, | ||
429 | u16 samps, u8 time, bool wait) | ||
430 | { | ||
431 | int i; | ||
432 | u16 tmp; | ||
433 | |||
434 | b43_phy_write(dev, B43_NPHY_IQEST_SAMCNT, samps); | ||
435 | b43_phy_maskset(dev, B43_NPHY_IQEST_WT, ~B43_NPHY_IQEST_WT_VAL, time); | ||
436 | if (wait) | ||
437 | b43_phy_set(dev, B43_NPHY_IQEST_CMD, B43_NPHY_IQEST_CMD_MODE); | ||
438 | else | ||
439 | b43_phy_mask(dev, B43_NPHY_IQEST_CMD, ~B43_NPHY_IQEST_CMD_MODE); | ||
440 | |||
441 | b43_phy_set(dev, B43_NPHY_IQEST_CMD, B43_NPHY_IQEST_CMD_START); | ||
442 | |||
443 | for (i = 1000; i; i--) { | ||
444 | tmp = b43_phy_read(dev, B43_NPHY_IQEST_CMD); | ||
445 | if (!(tmp & B43_NPHY_IQEST_CMD_START)) { | ||
446 | est->i0_pwr = (b43_phy_read(dev, B43_NPHY_IQEST_IPACC_HI0) << 16) | | ||
447 | b43_phy_read(dev, B43_NPHY_IQEST_IPACC_LO0); | ||
448 | est->q0_pwr = (b43_phy_read(dev, B43_NPHY_IQEST_QPACC_HI0) << 16) | | ||
449 | b43_phy_read(dev, B43_NPHY_IQEST_QPACC_LO0); | ||
450 | est->iq0_prod = (b43_phy_read(dev, B43_NPHY_IQEST_IQACC_HI0) << 16) | | ||
451 | b43_phy_read(dev, B43_NPHY_IQEST_IQACC_LO0); | ||
452 | |||
453 | est->i1_pwr = (b43_phy_read(dev, B43_NPHY_IQEST_IPACC_HI1) << 16) | | ||
454 | b43_phy_read(dev, B43_NPHY_IQEST_IPACC_LO1); | ||
455 | est->q1_pwr = (b43_phy_read(dev, B43_NPHY_IQEST_QPACC_HI1) << 16) | | ||
456 | b43_phy_read(dev, B43_NPHY_IQEST_QPACC_LO1); | ||
457 | est->iq1_prod = (b43_phy_read(dev, B43_NPHY_IQEST_IQACC_HI1) << 16) | | ||
458 | b43_phy_read(dev, B43_NPHY_IQEST_IQACC_LO1); | ||
459 | return; | ||
460 | } | ||
461 | udelay(10); | ||
462 | } | ||
463 | memset(est, 0, sizeof(*est)); | ||
464 | } | ||
465 | |||
466 | /* http://bcm-v4.sipsolutions.net/802.11/PHY/N/RxIqCoeffs */ | ||
467 | static void b43_nphy_rx_iq_coeffs(struct b43_wldev *dev, bool write, | ||
468 | struct b43_phy_n_iq_comp *pcomp) | ||
469 | { | ||
470 | if (write) { | ||
471 | b43_phy_write(dev, B43_NPHY_C1_RXIQ_COMPA0, pcomp->a0); | ||
472 | b43_phy_write(dev, B43_NPHY_C1_RXIQ_COMPB0, pcomp->b0); | ||
473 | b43_phy_write(dev, B43_NPHY_C2_RXIQ_COMPA1, pcomp->a1); | ||
474 | b43_phy_write(dev, B43_NPHY_C2_RXIQ_COMPB1, pcomp->b1); | ||
475 | } else { | ||
476 | pcomp->a0 = b43_phy_read(dev, B43_NPHY_C1_RXIQ_COMPA0); | ||
477 | pcomp->b0 = b43_phy_read(dev, B43_NPHY_C1_RXIQ_COMPB0); | ||
478 | pcomp->a1 = b43_phy_read(dev, B43_NPHY_C2_RXIQ_COMPA1); | ||
479 | pcomp->b1 = b43_phy_read(dev, B43_NPHY_C2_RXIQ_COMPB1); | ||
480 | } | ||
481 | } | ||
482 | |||
483 | /* http://bcm-v4.sipsolutions.net/802.11/PHY/N/CalcRxIqComp */ | ||
484 | static void b43_nphy_calc_rx_iq_comp(struct b43_wldev *dev, u8 mask) | ||
485 | { | ||
486 | int i; | ||
487 | s32 iq; | ||
488 | u32 ii; | ||
489 | u32 qq; | ||
490 | int iq_nbits, qq_nbits; | ||
491 | int arsh, brsh; | ||
492 | u16 tmp, a, b; | ||
493 | |||
494 | struct nphy_iq_est est; | ||
495 | struct b43_phy_n_iq_comp old; | ||
496 | struct b43_phy_n_iq_comp new = { }; | ||
497 | bool error = false; | ||
498 | |||
499 | if (mask == 0) | ||
500 | return; | ||
501 | |||
502 | b43_nphy_rx_iq_coeffs(dev, false, &old); | ||
503 | b43_nphy_rx_iq_coeffs(dev, true, &new); | ||
504 | b43_nphy_rx_iq_est(dev, &est, 0x4000, 32, false); | ||
505 | new = old; | ||
506 | |||
507 | for (i = 0; i < 2; i++) { | ||
508 | if (i == 0 && (mask & 1)) { | ||
509 | iq = est.iq0_prod; | ||
510 | ii = est.i0_pwr; | ||
511 | qq = est.q0_pwr; | ||
512 | } else if (i == 1 && (mask & 2)) { | ||
513 | iq = est.iq1_prod; | ||
514 | ii = est.i1_pwr; | ||
515 | qq = est.q1_pwr; | ||
516 | } else { | ||
517 | B43_WARN_ON(1); | ||
518 | continue; | ||
519 | } | ||
520 | |||
521 | if (ii + qq < 2) { | ||
522 | error = true; | ||
523 | break; | ||
524 | } | ||
525 | |||
526 | iq_nbits = fls(abs(iq)); | ||
527 | qq_nbits = fls(qq); | ||
528 | |||
529 | arsh = iq_nbits - 20; | ||
530 | if (arsh >= 0) { | ||
531 | a = -((iq << (30 - iq_nbits)) + (ii >> (1 + arsh))); | ||
532 | tmp = ii >> arsh; | ||
533 | } else { | ||
534 | a = -((iq << (30 - iq_nbits)) + (ii << (-1 - arsh))); | ||
535 | tmp = ii << -arsh; | ||
536 | } | ||
537 | if (tmp == 0) { | ||
538 | error = true; | ||
539 | break; | ||
540 | } | ||
541 | a /= tmp; | ||
542 | |||
543 | brsh = qq_nbits - 11; | ||
544 | if (brsh >= 0) { | ||
545 | b = (qq << (31 - qq_nbits)); | ||
546 | tmp = ii >> brsh; | ||
547 | } else { | ||
548 | b = (qq << (31 - qq_nbits)); | ||
549 | tmp = ii << -brsh; | ||
550 | } | ||
551 | if (tmp == 0) { | ||
552 | error = true; | ||
553 | break; | ||
554 | } | ||
555 | b = int_sqrt(b / tmp - a * a) - (1 << 10); | ||
556 | |||
557 | if (i == 0 && (mask & 0x1)) { | ||
558 | if (dev->phy.rev >= 3) { | ||
559 | new.a0 = a & 0x3FF; | ||
560 | new.b0 = b & 0x3FF; | ||
561 | } else { | ||
562 | new.a0 = b & 0x3FF; | ||
563 | new.b0 = a & 0x3FF; | ||
564 | } | ||
565 | } else if (i == 1 && (mask & 0x2)) { | ||
566 | if (dev->phy.rev >= 3) { | ||
567 | new.a1 = a & 0x3FF; | ||
568 | new.b1 = b & 0x3FF; | ||
569 | } else { | ||
570 | new.a1 = b & 0x3FF; | ||
571 | new.b1 = a & 0x3FF; | ||
572 | } | ||
573 | } | ||
574 | } | ||
575 | |||
576 | if (error) | ||
577 | new = old; | ||
578 | |||
579 | b43_nphy_rx_iq_coeffs(dev, true, &new); | ||
580 | } | ||
581 | |||
582 | /* http://bcm-v4.sipsolutions.net/802.11/PHY/N/TxIqWar */ | ||
583 | static void b43_nphy_tx_iq_workaround(struct b43_wldev *dev) | ||
584 | { | ||
585 | u16 array[4]; | ||
586 | int i; | ||
587 | |||
588 | b43_phy_write(dev, B43_NPHY_TABLE_ADDR, 0x3C50); | ||
589 | for (i = 0; i < 4; i++) | ||
590 | array[i] = b43_phy_read(dev, B43_NPHY_TABLE_DATALO); | ||
591 | |||
592 | b43_shm_write16(dev, B43_SHM_SHARED, B43_SHM_SH_NPHY_TXIQW0, array[0]); | ||
593 | b43_shm_write16(dev, B43_SHM_SHARED, B43_SHM_SH_NPHY_TXIQW1, array[1]); | ||
594 | b43_shm_write16(dev, B43_SHM_SHARED, B43_SHM_SH_NPHY_TXIQW2, array[2]); | ||
595 | b43_shm_write16(dev, B43_SHM_SHARED, B43_SHM_SH_NPHY_TXIQW3, array[3]); | ||
596 | } | ||
597 | |||
598 | /* http://bcm-v4.sipsolutions.net/802.11/PHY/N/clip-detection */ | ||
599 | static void b43_nphy_write_clip_detection(struct b43_wldev *dev, u16 *clip_st) | ||
600 | { | ||
601 | b43_phy_write(dev, B43_NPHY_C1_CLIP1THRES, clip_st[0]); | ||
602 | b43_phy_write(dev, B43_NPHY_C2_CLIP1THRES, clip_st[1]); | ||
603 | } | ||
604 | |||
605 | /* http://bcm-v4.sipsolutions.net/802.11/PHY/N/clip-detection */ | ||
606 | static void b43_nphy_read_clip_detection(struct b43_wldev *dev, u16 *clip_st) | ||
607 | { | ||
608 | clip_st[0] = b43_phy_read(dev, B43_NPHY_C1_CLIP1THRES); | ||
609 | clip_st[1] = b43_phy_read(dev, B43_NPHY_C2_CLIP1THRES); | ||
610 | } | ||
611 | |||
612 | /* http://bcm-v4.sipsolutions.net/802.11/PHY/N/classifier */ | ||
613 | static u16 b43_nphy_classifier(struct b43_wldev *dev, u16 mask, u16 val) | ||
614 | { | ||
615 | u16 tmp; | ||
616 | |||
617 | if (dev->dev->id.revision == 16) | ||
618 | b43_mac_suspend(dev); | ||
619 | |||
620 | tmp = b43_phy_read(dev, B43_NPHY_CLASSCTL); | ||
621 | tmp &= (B43_NPHY_CLASSCTL_CCKEN | B43_NPHY_CLASSCTL_OFDMEN | | ||
622 | B43_NPHY_CLASSCTL_WAITEDEN); | ||
623 | tmp &= ~mask; | ||
624 | tmp |= (val & mask); | ||
625 | b43_phy_maskset(dev, B43_NPHY_CLASSCTL, 0xFFF8, tmp); | ||
626 | |||
627 | if (dev->dev->id.revision == 16) | ||
628 | b43_mac_enable(dev); | ||
629 | |||
630 | return tmp; | ||
631 | } | ||
632 | |||
633 | /* http://bcm-v4.sipsolutions.net/802.11/PHY/N/carriersearch */ | ||
634 | static void b43_nphy_stay_in_carrier_search(struct b43_wldev *dev, bool enable) | ||
635 | { | ||
636 | struct b43_phy *phy = &dev->phy; | ||
637 | struct b43_phy_n *nphy = phy->n; | ||
638 | |||
639 | if (enable) { | ||
640 | u16 clip[] = { 0xFFFF, 0xFFFF }; | ||
641 | if (nphy->deaf_count++ == 0) { | ||
642 | nphy->classifier_state = b43_nphy_classifier(dev, 0, 0); | ||
643 | b43_nphy_classifier(dev, 0x7, 0); | ||
644 | b43_nphy_read_clip_detection(dev, nphy->clip_state); | ||
645 | b43_nphy_write_clip_detection(dev, clip); | ||
646 | } | ||
647 | b43_nphy_reset_cca(dev); | ||
648 | } else { | ||
649 | if (--nphy->deaf_count == 0) { | ||
650 | b43_nphy_classifier(dev, 0x7, nphy->classifier_state); | ||
651 | b43_nphy_write_clip_detection(dev, nphy->clip_state); | ||
652 | } | ||
653 | } | ||
654 | } | ||
655 | |||
656 | /* http://bcm-v4.sipsolutions.net/802.11/PHY/N/TxPwrCtrlCoefSetup */ | ||
657 | static void b43_nphy_tx_pwr_ctrl_coef_setup(struct b43_wldev *dev) | ||
658 | { | ||
659 | struct b43_phy_n *nphy = dev->phy.n; | ||
660 | int i, j; | ||
661 | u32 tmp; | ||
662 | u32 cur_real, cur_imag, real_part, imag_part; | ||
663 | |||
664 | u16 buffer[7]; | ||
665 | |||
666 | if (nphy->hang_avoid) | ||
667 | b43_nphy_stay_in_carrier_search(dev, true); | ||
668 | |||
669 | /* TODO: Read an N PHY Table with ID 15, length 7, offset 80, | ||
670 | width 16, and data pointer buffer */ | ||
671 | |||
672 | for (i = 0; i < 2; i++) { | ||
673 | tmp = ((buffer[i * 2] & 0x3FF) << 10) | | ||
674 | (buffer[i * 2 + 1] & 0x3FF); | ||
675 | b43_phy_write(dev, B43_NPHY_TABLE_ADDR, | ||
676 | (((i + 26) << 10) | 320)); | ||
677 | for (j = 0; j < 128; j++) { | ||
678 | b43_phy_write(dev, B43_NPHY_TABLE_DATAHI, | ||
679 | ((tmp >> 16) & 0xFFFF)); | ||
680 | b43_phy_write(dev, B43_NPHY_TABLE_DATALO, | ||
681 | (tmp & 0xFFFF)); | ||
682 | } | ||
683 | } | ||
684 | |||
685 | for (i = 0; i < 2; i++) { | ||
686 | tmp = buffer[5 + i]; | ||
687 | real_part = (tmp >> 8) & 0xFF; | ||
688 | imag_part = (tmp & 0xFF); | ||
689 | b43_phy_write(dev, B43_NPHY_TABLE_ADDR, | ||
690 | (((i + 26) << 10) | 448)); | ||
691 | |||
692 | if (dev->phy.rev >= 3) { | ||
693 | cur_real = real_part; | ||
694 | cur_imag = imag_part; | ||
695 | tmp = ((cur_real & 0xFF) << 8) | (cur_imag & 0xFF); | ||
696 | } | ||
697 | |||
698 | for (j = 0; j < 128; j++) { | ||
699 | if (dev->phy.rev < 3) { | ||
700 | cur_real = (real_part * loscale[j] + 128) >> 8; | ||
701 | cur_imag = (imag_part * loscale[j] + 128) >> 8; | ||
702 | tmp = ((cur_real & 0xFF) << 8) | | ||
703 | (cur_imag & 0xFF); | ||
704 | } | ||
705 | b43_phy_write(dev, B43_NPHY_TABLE_DATAHI, | ||
706 | ((tmp >> 16) & 0xFFFF)); | ||
707 | b43_phy_write(dev, B43_NPHY_TABLE_DATALO, | ||
708 | (tmp & 0xFFFF)); | ||
709 | } | ||
710 | } | ||
711 | |||
712 | if (dev->phy.rev >= 3) { | ||
713 | b43_shm_write16(dev, B43_SHM_SHARED, | ||
714 | B43_SHM_SH_NPHY_TXPWR_INDX0, 0xFFFF); | ||
715 | b43_shm_write16(dev, B43_SHM_SHARED, | ||
716 | B43_SHM_SH_NPHY_TXPWR_INDX1, 0xFFFF); | ||
717 | } | ||
718 | |||
719 | if (nphy->hang_avoid) | ||
720 | b43_nphy_stay_in_carrier_search(dev, false); | ||
356 | } | 721 | } |
357 | 722 | ||
358 | enum b43_nphy_rf_sequence { | 723 | enum b43_nphy_rf_sequence { |
@@ -411,81 +776,1339 @@ static void b43_nphy_bphy_init(struct b43_wldev *dev) | |||
411 | b43_phy_write(dev, B43_PHY_N_BMODE(0x38), 0x668); | 776 | b43_phy_write(dev, B43_PHY_N_BMODE(0x38), 0x668); |
412 | } | 777 | } |
413 | 778 | ||
414 | /* RSSI Calibration */ | 779 | /* http://bcm-v4.sipsolutions.net/802.11/PHY/N/ScaleOffsetRssi */ |
415 | static void b43_nphy_rssi_cal(struct b43_wldev *dev, u8 type) | 780 | static void b43_nphy_scale_offset_rssi(struct b43_wldev *dev, u16 scale, |
781 | s8 offset, u8 core, u8 rail, u8 type) | ||
416 | { | 782 | { |
417 | //TODO | 783 | u16 tmp; |
784 | bool core1or5 = (core == 1) || (core == 5); | ||
785 | bool core2or5 = (core == 2) || (core == 5); | ||
786 | |||
787 | offset = clamp_val(offset, -32, 31); | ||
788 | tmp = ((scale & 0x3F) << 8) | (offset & 0x3F); | ||
789 | |||
790 | if (core1or5 && (rail == 0) && (type == 2)) | ||
791 | b43_phy_write(dev, B43_NPHY_RSSIMC_0I_RSSI_Z, tmp); | ||
792 | if (core1or5 && (rail == 1) && (type == 2)) | ||
793 | b43_phy_write(dev, B43_NPHY_RSSIMC_0Q_RSSI_Z, tmp); | ||
794 | if (core2or5 && (rail == 0) && (type == 2)) | ||
795 | b43_phy_write(dev, B43_NPHY_RSSIMC_1I_RSSI_Z, tmp); | ||
796 | if (core2or5 && (rail == 1) && (type == 2)) | ||
797 | b43_phy_write(dev, B43_NPHY_RSSIMC_1Q_RSSI_Z, tmp); | ||
798 | if (core1or5 && (rail == 0) && (type == 0)) | ||
799 | b43_phy_write(dev, B43_NPHY_RSSIMC_0I_RSSI_X, tmp); | ||
800 | if (core1or5 && (rail == 1) && (type == 0)) | ||
801 | b43_phy_write(dev, B43_NPHY_RSSIMC_0Q_RSSI_X, tmp); | ||
802 | if (core2or5 && (rail == 0) && (type == 0)) | ||
803 | b43_phy_write(dev, B43_NPHY_RSSIMC_1I_RSSI_X, tmp); | ||
804 | if (core2or5 && (rail == 1) && (type == 0)) | ||
805 | b43_phy_write(dev, B43_NPHY_RSSIMC_1Q_RSSI_X, tmp); | ||
806 | if (core1or5 && (rail == 0) && (type == 1)) | ||
807 | b43_phy_write(dev, B43_NPHY_RSSIMC_0I_RSSI_Y, tmp); | ||
808 | if (core1or5 && (rail == 1) && (type == 1)) | ||
809 | b43_phy_write(dev, B43_NPHY_RSSIMC_0Q_RSSI_Y, tmp); | ||
810 | if (core2or5 && (rail == 0) && (type == 1)) | ||
811 | b43_phy_write(dev, B43_NPHY_RSSIMC_1I_RSSI_Y, tmp); | ||
812 | if (core2or5 && (rail == 1) && (type == 1)) | ||
813 | b43_phy_write(dev, B43_NPHY_RSSIMC_1Q_RSSI_Y, tmp); | ||
814 | if (core1or5 && (rail == 0) && (type == 6)) | ||
815 | b43_phy_write(dev, B43_NPHY_RSSIMC_0I_TBD, tmp); | ||
816 | if (core1or5 && (rail == 1) && (type == 6)) | ||
817 | b43_phy_write(dev, B43_NPHY_RSSIMC_0Q_TBD, tmp); | ||
818 | if (core2or5 && (rail == 0) && (type == 6)) | ||
819 | b43_phy_write(dev, B43_NPHY_RSSIMC_1I_TBD, tmp); | ||
820 | if (core2or5 && (rail == 1) && (type == 6)) | ||
821 | b43_phy_write(dev, B43_NPHY_RSSIMC_1Q_TBD, tmp); | ||
822 | if (core1or5 && (rail == 0) && (type == 3)) | ||
823 | b43_phy_write(dev, B43_NPHY_RSSIMC_0I_PWRDET, tmp); | ||
824 | if (core1or5 && (rail == 1) && (type == 3)) | ||
825 | b43_phy_write(dev, B43_NPHY_RSSIMC_0Q_PWRDET, tmp); | ||
826 | if (core2or5 && (rail == 0) && (type == 3)) | ||
827 | b43_phy_write(dev, B43_NPHY_RSSIMC_1I_PWRDET, tmp); | ||
828 | if (core2or5 && (rail == 1) && (type == 3)) | ||
829 | b43_phy_write(dev, B43_NPHY_RSSIMC_1Q_PWRDET, tmp); | ||
830 | if (core1or5 && (type == 4)) | ||
831 | b43_phy_write(dev, B43_NPHY_RSSIMC_0I_TSSI, tmp); | ||
832 | if (core2or5 && (type == 4)) | ||
833 | b43_phy_write(dev, B43_NPHY_RSSIMC_1I_TSSI, tmp); | ||
834 | if (core1or5 && (type == 5)) | ||
835 | b43_phy_write(dev, B43_NPHY_RSSIMC_0Q_TSSI, tmp); | ||
836 | if (core2or5 && (type == 5)) | ||
837 | b43_phy_write(dev, B43_NPHY_RSSIMC_1Q_TSSI, tmp); | ||
838 | } | ||
839 | |||
840 | /* http://bcm-v4.sipsolutions.net/802.11/PHY/N/RSSISel */ | ||
841 | static void b43_nphy_rssi_select(struct b43_wldev *dev, u8 code, u8 type) | ||
842 | { | ||
843 | u16 val; | ||
844 | |||
845 | if (dev->phy.rev >= 3) { | ||
846 | /* TODO */ | ||
847 | } else { | ||
848 | if (type < 3) | ||
849 | val = 0; | ||
850 | else if (type == 6) | ||
851 | val = 1; | ||
852 | else if (type == 3) | ||
853 | val = 2; | ||
854 | else | ||
855 | val = 3; | ||
856 | |||
857 | val = (val << 12) | (val << 14); | ||
858 | b43_phy_maskset(dev, B43_NPHY_AFECTL_C1, 0x0FFF, val); | ||
859 | b43_phy_maskset(dev, B43_NPHY_AFECTL_C2, 0x0FFF, val); | ||
860 | |||
861 | if (type < 3) { | ||
862 | b43_phy_maskset(dev, B43_NPHY_RFCTL_RSSIO1, 0xFFCF, | ||
863 | (type + 1) << 4); | ||
864 | b43_phy_maskset(dev, B43_NPHY_RFCTL_RSSIO2, 0xFFCF, | ||
865 | (type + 1) << 4); | ||
866 | } | ||
867 | |||
868 | /* TODO use some definitions */ | ||
869 | if (code == 0) { | ||
870 | b43_phy_maskset(dev, B43_NPHY_AFECTL_OVER, 0xCFFF, 0); | ||
871 | if (type < 3) { | ||
872 | b43_phy_maskset(dev, B43_NPHY_RFCTL_CMD, | ||
873 | 0xFEC7, 0); | ||
874 | b43_phy_maskset(dev, B43_NPHY_RFCTL_OVER, | ||
875 | 0xEFDC, 0); | ||
876 | b43_phy_maskset(dev, B43_NPHY_RFCTL_CMD, | ||
877 | 0xFFFE, 0); | ||
878 | udelay(20); | ||
879 | b43_phy_maskset(dev, B43_NPHY_RFCTL_OVER, | ||
880 | 0xFFFE, 0); | ||
881 | } | ||
882 | } else { | ||
883 | b43_phy_maskset(dev, B43_NPHY_AFECTL_OVER, 0xCFFF, | ||
884 | 0x3000); | ||
885 | if (type < 3) { | ||
886 | b43_phy_maskset(dev, B43_NPHY_RFCTL_CMD, | ||
887 | 0xFEC7, 0x0180); | ||
888 | b43_phy_maskset(dev, B43_NPHY_RFCTL_OVER, | ||
889 | 0xEFDC, (code << 1 | 0x1021)); | ||
890 | b43_phy_maskset(dev, B43_NPHY_RFCTL_CMD, | ||
891 | 0xFFFE, 0x0001); | ||
892 | udelay(20); | ||
893 | b43_phy_maskset(dev, B43_NPHY_RFCTL_OVER, | ||
894 | 0xFFFE, 0); | ||
895 | } | ||
896 | } | ||
897 | } | ||
898 | } | ||
899 | |||
900 | /* http://bcm-v4.sipsolutions.net/802.11/PHY/N/SetRssi2055Vcm */ | ||
901 | static void b43_nphy_set_rssi_2055_vcm(struct b43_wldev *dev, u8 type, u8 *buf) | ||
902 | { | ||
903 | int i; | ||
904 | for (i = 0; i < 2; i++) { | ||
905 | if (type == 2) { | ||
906 | if (i == 0) { | ||
907 | b43_radio_maskset(dev, B2055_C1_B0NB_RSSIVCM, | ||
908 | 0xFC, buf[0]); | ||
909 | b43_radio_maskset(dev, B2055_C1_RX_BB_RSSICTL5, | ||
910 | 0xFC, buf[1]); | ||
911 | } else { | ||
912 | b43_radio_maskset(dev, B2055_C2_B0NB_RSSIVCM, | ||
913 | 0xFC, buf[2 * i]); | ||
914 | b43_radio_maskset(dev, B2055_C2_RX_BB_RSSICTL5, | ||
915 | 0xFC, buf[2 * i + 1]); | ||
916 | } | ||
917 | } else { | ||
918 | if (i == 0) | ||
919 | b43_radio_maskset(dev, B2055_C1_RX_BB_RSSICTL5, | ||
920 | 0xF3, buf[0] << 2); | ||
921 | else | ||
922 | b43_radio_maskset(dev, B2055_C2_RX_BB_RSSICTL5, | ||
923 | 0xF3, buf[2 * i + 1] << 2); | ||
924 | } | ||
925 | } | ||
926 | } | ||
927 | |||
928 | /* http://bcm-v4.sipsolutions.net/802.11/PHY/N/PollRssi */ | ||
929 | static int b43_nphy_poll_rssi(struct b43_wldev *dev, u8 type, s32 *buf, | ||
930 | u8 nsamp) | ||
931 | { | ||
932 | int i; | ||
933 | int out; | ||
934 | u16 save_regs_phy[9]; | ||
935 | u16 s[2]; | ||
936 | |||
937 | if (dev->phy.rev >= 3) { | ||
938 | save_regs_phy[0] = b43_phy_read(dev, | ||
939 | B43_NPHY_RFCTL_LUT_TRSW_UP1); | ||
940 | save_regs_phy[1] = b43_phy_read(dev, | ||
941 | B43_NPHY_RFCTL_LUT_TRSW_UP2); | ||
942 | save_regs_phy[2] = b43_phy_read(dev, B43_NPHY_AFECTL_C1); | ||
943 | save_regs_phy[3] = b43_phy_read(dev, B43_NPHY_AFECTL_C2); | ||
944 | save_regs_phy[4] = b43_phy_read(dev, B43_NPHY_AFECTL_OVER1); | ||
945 | save_regs_phy[5] = b43_phy_read(dev, B43_NPHY_AFECTL_OVER); | ||
946 | save_regs_phy[6] = b43_phy_read(dev, B43_NPHY_TXF_40CO_B1S0); | ||
947 | save_regs_phy[7] = b43_phy_read(dev, B43_NPHY_TXF_40CO_B32S1); | ||
948 | } | ||
949 | |||
950 | b43_nphy_rssi_select(dev, 5, type); | ||
951 | |||
952 | if (dev->phy.rev < 2) { | ||
953 | save_regs_phy[8] = b43_phy_read(dev, B43_NPHY_GPIO_SEL); | ||
954 | b43_phy_write(dev, B43_NPHY_GPIO_SEL, 5); | ||
955 | } | ||
956 | |||
957 | for (i = 0; i < 4; i++) | ||
958 | buf[i] = 0; | ||
959 | |||
960 | for (i = 0; i < nsamp; i++) { | ||
961 | if (dev->phy.rev < 2) { | ||
962 | s[0] = b43_phy_read(dev, B43_NPHY_GPIO_LOOUT); | ||
963 | s[1] = b43_phy_read(dev, B43_NPHY_GPIO_HIOUT); | ||
964 | } else { | ||
965 | s[0] = b43_phy_read(dev, B43_NPHY_RSSI1); | ||
966 | s[1] = b43_phy_read(dev, B43_NPHY_RSSI2); | ||
967 | } | ||
968 | |||
969 | buf[0] += ((s8)((s[0] & 0x3F) << 2)) >> 2; | ||
970 | buf[1] += ((s8)(((s[0] >> 8) & 0x3F) << 2)) >> 2; | ||
971 | buf[2] += ((s8)((s[1] & 0x3F) << 2)) >> 2; | ||
972 | buf[3] += ((s8)(((s[1] >> 8) & 0x3F) << 2)) >> 2; | ||
973 | } | ||
974 | out = (buf[0] & 0xFF) << 24 | (buf[1] & 0xFF) << 16 | | ||
975 | (buf[2] & 0xFF) << 8 | (buf[3] & 0xFF); | ||
976 | |||
977 | if (dev->phy.rev < 2) | ||
978 | b43_phy_write(dev, B43_NPHY_GPIO_SEL, save_regs_phy[8]); | ||
979 | |||
980 | if (dev->phy.rev >= 3) { | ||
981 | b43_phy_write(dev, B43_NPHY_RFCTL_LUT_TRSW_UP1, | ||
982 | save_regs_phy[0]); | ||
983 | b43_phy_write(dev, B43_NPHY_RFCTL_LUT_TRSW_UP2, | ||
984 | save_regs_phy[1]); | ||
985 | b43_phy_write(dev, B43_NPHY_AFECTL_C1, save_regs_phy[2]); | ||
986 | b43_phy_write(dev, B43_NPHY_AFECTL_C2, save_regs_phy[3]); | ||
987 | b43_phy_write(dev, B43_NPHY_AFECTL_OVER1, save_regs_phy[4]); | ||
988 | b43_phy_write(dev, B43_NPHY_AFECTL_OVER, save_regs_phy[5]); | ||
989 | b43_phy_write(dev, B43_NPHY_TXF_40CO_B1S0, save_regs_phy[6]); | ||
990 | b43_phy_write(dev, B43_NPHY_TXF_40CO_B32S1, save_regs_phy[7]); | ||
991 | } | ||
992 | |||
993 | return out; | ||
994 | } | ||
995 | |||
996 | /* http://bcm-v4.sipsolutions.net/802.11/PHY/N/RSSICal */ | ||
997 | static void b43_nphy_rev2_rssi_cal(struct b43_wldev *dev, u8 type) | ||
998 | { | ||
999 | int i, j; | ||
1000 | u8 state[4]; | ||
1001 | u8 code, val; | ||
1002 | u16 class, override; | ||
1003 | u8 regs_save_radio[2]; | ||
1004 | u16 regs_save_phy[2]; | ||
1005 | s8 offset[4]; | ||
1006 | |||
1007 | u16 clip_state[2]; | ||
1008 | u16 clip_off[2] = { 0xFFFF, 0xFFFF }; | ||
1009 | s32 results_min[4] = { }; | ||
1010 | u8 vcm_final[4] = { }; | ||
1011 | s32 results[4][4] = { }; | ||
1012 | s32 miniq[4][2] = { }; | ||
1013 | |||
1014 | if (type == 2) { | ||
1015 | code = 0; | ||
1016 | val = 6; | ||
1017 | } else if (type < 2) { | ||
1018 | code = 25; | ||
1019 | val = 4; | ||
1020 | } else { | ||
1021 | B43_WARN_ON(1); | ||
1022 | return; | ||
1023 | } | ||
1024 | |||
1025 | class = b43_nphy_classifier(dev, 0, 0); | ||
1026 | b43_nphy_classifier(dev, 7, 4); | ||
1027 | b43_nphy_read_clip_detection(dev, clip_state); | ||
1028 | b43_nphy_write_clip_detection(dev, clip_off); | ||
1029 | |||
1030 | if (b43_current_band(dev->wl) == IEEE80211_BAND_5GHZ) | ||
1031 | override = 0x140; | ||
1032 | else | ||
1033 | override = 0x110; | ||
1034 | |||
1035 | regs_save_phy[0] = b43_phy_read(dev, B43_NPHY_RFCTL_INTC1); | ||
1036 | regs_save_radio[0] = b43_radio_read16(dev, B2055_C1_PD_RXTX); | ||
1037 | b43_phy_write(dev, B43_NPHY_RFCTL_INTC1, override); | ||
1038 | b43_radio_write16(dev, B2055_C1_PD_RXTX, val); | ||
1039 | |||
1040 | regs_save_phy[1] = b43_phy_read(dev, B43_NPHY_RFCTL_INTC2); | ||
1041 | regs_save_radio[1] = b43_radio_read16(dev, B2055_C2_PD_RXTX); | ||
1042 | b43_phy_write(dev, B43_NPHY_RFCTL_INTC2, override); | ||
1043 | b43_radio_write16(dev, B2055_C2_PD_RXTX, val); | ||
1044 | |||
1045 | state[0] = b43_radio_read16(dev, B2055_C1_PD_RSSIMISC) & 0x07; | ||
1046 | state[1] = b43_radio_read16(dev, B2055_C2_PD_RSSIMISC) & 0x07; | ||
1047 | b43_radio_mask(dev, B2055_C1_PD_RSSIMISC, 0xF8); | ||
1048 | b43_radio_mask(dev, B2055_C2_PD_RSSIMISC, 0xF8); | ||
1049 | state[2] = b43_radio_read16(dev, B2055_C1_SP_RSSI) & 0x07; | ||
1050 | state[3] = b43_radio_read16(dev, B2055_C2_SP_RSSI) & 0x07; | ||
1051 | |||
1052 | b43_nphy_rssi_select(dev, 5, type); | ||
1053 | b43_nphy_scale_offset_rssi(dev, 0, 0, 5, 0, type); | ||
1054 | b43_nphy_scale_offset_rssi(dev, 0, 0, 5, 1, type); | ||
1055 | |||
1056 | for (i = 0; i < 4; i++) { | ||
1057 | u8 tmp[4]; | ||
1058 | for (j = 0; j < 4; j++) | ||
1059 | tmp[j] = i; | ||
1060 | if (type != 1) | ||
1061 | b43_nphy_set_rssi_2055_vcm(dev, type, tmp); | ||
1062 | b43_nphy_poll_rssi(dev, type, results[i], 8); | ||
1063 | if (type < 2) | ||
1064 | for (j = 0; j < 2; j++) | ||
1065 | miniq[i][j] = min(results[i][2 * j], | ||
1066 | results[i][2 * j + 1]); | ||
1067 | } | ||
1068 | |||
1069 | for (i = 0; i < 4; i++) { | ||
1070 | s32 mind = 40; | ||
1071 | u8 minvcm = 0; | ||
1072 | s32 minpoll = 249; | ||
1073 | s32 curr; | ||
1074 | for (j = 0; j < 4; j++) { | ||
1075 | if (type == 2) | ||
1076 | curr = abs(results[j][i]); | ||
1077 | else | ||
1078 | curr = abs(miniq[j][i / 2] - code * 8); | ||
1079 | |||
1080 | if (curr < mind) { | ||
1081 | mind = curr; | ||
1082 | minvcm = j; | ||
1083 | } | ||
1084 | |||
1085 | if (results[j][i] < minpoll) | ||
1086 | minpoll = results[j][i]; | ||
1087 | } | ||
1088 | results_min[i] = minpoll; | ||
1089 | vcm_final[i] = minvcm; | ||
1090 | } | ||
1091 | |||
1092 | if (type != 1) | ||
1093 | b43_nphy_set_rssi_2055_vcm(dev, type, vcm_final); | ||
1094 | |||
1095 | for (i = 0; i < 4; i++) { | ||
1096 | offset[i] = (code * 8) - results[vcm_final[i]][i]; | ||
1097 | |||
1098 | if (offset[i] < 0) | ||
1099 | offset[i] = -((abs(offset[i]) + 4) / 8); | ||
1100 | else | ||
1101 | offset[i] = (offset[i] + 4) / 8; | ||
1102 | |||
1103 | if (results_min[i] == 248) | ||
1104 | offset[i] = code - 32; | ||
1105 | |||
1106 | if (i % 2 == 0) | ||
1107 | b43_nphy_scale_offset_rssi(dev, 0, offset[i], 1, 0, | ||
1108 | type); | ||
1109 | else | ||
1110 | b43_nphy_scale_offset_rssi(dev, 0, offset[i], 2, 1, | ||
1111 | type); | ||
1112 | } | ||
1113 | |||
1114 | b43_radio_maskset(dev, B2055_C1_PD_RSSIMISC, 0xF8, state[0]); | ||
1115 | b43_radio_maskset(dev, B2055_C1_PD_RSSIMISC, 0xF8, state[1]); | ||
1116 | |||
1117 | switch (state[2]) { | ||
1118 | case 1: | ||
1119 | b43_nphy_rssi_select(dev, 1, 2); | ||
1120 | break; | ||
1121 | case 4: | ||
1122 | b43_nphy_rssi_select(dev, 1, 0); | ||
1123 | break; | ||
1124 | case 2: | ||
1125 | b43_nphy_rssi_select(dev, 1, 1); | ||
1126 | break; | ||
1127 | default: | ||
1128 | b43_nphy_rssi_select(dev, 1, 1); | ||
1129 | break; | ||
1130 | } | ||
1131 | |||
1132 | switch (state[3]) { | ||
1133 | case 1: | ||
1134 | b43_nphy_rssi_select(dev, 2, 2); | ||
1135 | break; | ||
1136 | case 4: | ||
1137 | b43_nphy_rssi_select(dev, 2, 0); | ||
1138 | break; | ||
1139 | default: | ||
1140 | b43_nphy_rssi_select(dev, 2, 1); | ||
1141 | break; | ||
1142 | } | ||
1143 | |||
1144 | b43_nphy_rssi_select(dev, 0, type); | ||
1145 | |||
1146 | b43_phy_write(dev, B43_NPHY_RFCTL_INTC1, regs_save_phy[0]); | ||
1147 | b43_radio_write16(dev, B2055_C1_PD_RXTX, regs_save_radio[0]); | ||
1148 | b43_phy_write(dev, B43_NPHY_RFCTL_INTC2, regs_save_phy[1]); | ||
1149 | b43_radio_write16(dev, B2055_C2_PD_RXTX, regs_save_radio[1]); | ||
1150 | |||
1151 | b43_nphy_classifier(dev, 7, class); | ||
1152 | b43_nphy_write_clip_detection(dev, clip_state); | ||
1153 | } | ||
1154 | |||
1155 | /* http://bcm-v4.sipsolutions.net/802.11/PHY/N/RSSICalRev3 */ | ||
1156 | static void b43_nphy_rev3_rssi_cal(struct b43_wldev *dev) | ||
1157 | { | ||
1158 | /* TODO */ | ||
1159 | } | ||
1160 | |||
1161 | /* | ||
1162 | * RSSI Calibration | ||
1163 | * http://bcm-v4.sipsolutions.net/802.11/PHY/N/RSSICal | ||
1164 | */ | ||
1165 | static void b43_nphy_rssi_cal(struct b43_wldev *dev) | ||
1166 | { | ||
1167 | if (dev->phy.rev >= 3) { | ||
1168 | b43_nphy_rev3_rssi_cal(dev); | ||
1169 | } else { | ||
1170 | b43_nphy_rev2_rssi_cal(dev, 2); | ||
1171 | b43_nphy_rev2_rssi_cal(dev, 0); | ||
1172 | b43_nphy_rev2_rssi_cal(dev, 1); | ||
1173 | } | ||
1174 | } | ||
1175 | |||
1176 | /* | ||
1177 | * Restore RSSI Calibration | ||
1178 | * http://bcm-v4.sipsolutions.net/802.11/PHY/N/RestoreRssiCal | ||
1179 | */ | ||
1180 | static void b43_nphy_restore_rssi_cal(struct b43_wldev *dev) | ||
1181 | { | ||
1182 | struct b43_phy_n *nphy = dev->phy.n; | ||
1183 | |||
1184 | u16 *rssical_radio_regs = NULL; | ||
1185 | u16 *rssical_phy_regs = NULL; | ||
1186 | |||
1187 | if (b43_current_band(dev->wl) == IEEE80211_BAND_2GHZ) { | ||
1188 | if (!nphy->rssical_chanspec_2G) | ||
1189 | return; | ||
1190 | rssical_radio_regs = nphy->rssical_cache.rssical_radio_regs_2G; | ||
1191 | rssical_phy_regs = nphy->rssical_cache.rssical_phy_regs_2G; | ||
1192 | } else { | ||
1193 | if (!nphy->rssical_chanspec_5G) | ||
1194 | return; | ||
1195 | rssical_radio_regs = nphy->rssical_cache.rssical_radio_regs_5G; | ||
1196 | rssical_phy_regs = nphy->rssical_cache.rssical_phy_regs_5G; | ||
1197 | } | ||
1198 | |||
1199 | /* TODO use some definitions */ | ||
1200 | b43_radio_maskset(dev, 0x602B, 0xE3, rssical_radio_regs[0]); | ||
1201 | b43_radio_maskset(dev, 0x702B, 0xE3, rssical_radio_regs[1]); | ||
1202 | |||
1203 | b43_phy_write(dev, B43_NPHY_RSSIMC_0I_RSSI_Z, rssical_phy_regs[0]); | ||
1204 | b43_phy_write(dev, B43_NPHY_RSSIMC_0Q_RSSI_Z, rssical_phy_regs[1]); | ||
1205 | b43_phy_write(dev, B43_NPHY_RSSIMC_1I_RSSI_Z, rssical_phy_regs[2]); | ||
1206 | b43_phy_write(dev, B43_NPHY_RSSIMC_1Q_RSSI_Z, rssical_phy_regs[3]); | ||
1207 | |||
1208 | b43_phy_write(dev, B43_NPHY_RSSIMC_0I_RSSI_X, rssical_phy_regs[4]); | ||
1209 | b43_phy_write(dev, B43_NPHY_RSSIMC_0Q_RSSI_X, rssical_phy_regs[5]); | ||
1210 | b43_phy_write(dev, B43_NPHY_RSSIMC_1I_RSSI_X, rssical_phy_regs[6]); | ||
1211 | b43_phy_write(dev, B43_NPHY_RSSIMC_1Q_RSSI_X, rssical_phy_regs[7]); | ||
1212 | |||
1213 | b43_phy_write(dev, B43_NPHY_RSSIMC_0I_RSSI_Y, rssical_phy_regs[8]); | ||
1214 | b43_phy_write(dev, B43_NPHY_RSSIMC_0Q_RSSI_Y, rssical_phy_regs[9]); | ||
1215 | b43_phy_write(dev, B43_NPHY_RSSIMC_1I_RSSI_Y, rssical_phy_regs[10]); | ||
1216 | b43_phy_write(dev, B43_NPHY_RSSIMC_1Q_RSSI_Y, rssical_phy_regs[11]); | ||
1217 | } | ||
1218 | |||
1219 | /* http://bcm-v4.sipsolutions.net/802.11/PHY/N/GetIpaGainTbl */ | ||
1220 | static const u32 *b43_nphy_get_ipa_gain_table(struct b43_wldev *dev) | ||
1221 | { | ||
1222 | if (b43_current_band(dev->wl) == IEEE80211_BAND_2GHZ) { | ||
1223 | if (dev->phy.rev >= 6) { | ||
1224 | /* TODO If the chip is 47162 | ||
1225 | return txpwrctrl_tx_gain_ipa_rev5 */ | ||
1226 | return txpwrctrl_tx_gain_ipa_rev6; | ||
1227 | } else if (dev->phy.rev >= 5) { | ||
1228 | return txpwrctrl_tx_gain_ipa_rev5; | ||
1229 | } else { | ||
1230 | return txpwrctrl_tx_gain_ipa; | ||
1231 | } | ||
1232 | } else { | ||
1233 | return txpwrctrl_tx_gain_ipa_5g; | ||
1234 | } | ||
1235 | } | ||
1236 | |||
1237 | /* http://bcm-v4.sipsolutions.net/802.11/PHY/N/TxCalRadioSetup */ | ||
1238 | static void b43_nphy_tx_cal_radio_setup(struct b43_wldev *dev) | ||
1239 | { | ||
1240 | struct b43_phy_n *nphy = dev->phy.n; | ||
1241 | u16 *save = nphy->tx_rx_cal_radio_saveregs; | ||
1242 | |||
1243 | if (dev->phy.rev >= 3) { | ||
1244 | /* TODO */ | ||
1245 | } else { | ||
1246 | save[0] = b43_radio_read16(dev, B2055_C1_TX_RF_IQCAL1); | ||
1247 | b43_radio_write16(dev, B2055_C1_TX_RF_IQCAL1, 0x29); | ||
1248 | |||
1249 | save[1] = b43_radio_read16(dev, B2055_C1_TX_RF_IQCAL2); | ||
1250 | b43_radio_write16(dev, B2055_C1_TX_RF_IQCAL2, 0x54); | ||
1251 | |||
1252 | save[2] = b43_radio_read16(dev, B2055_C2_TX_RF_IQCAL1); | ||
1253 | b43_radio_write16(dev, B2055_C2_TX_RF_IQCAL1, 0x29); | ||
1254 | |||
1255 | save[3] = b43_radio_read16(dev, B2055_C2_TX_RF_IQCAL2); | ||
1256 | b43_radio_write16(dev, B2055_C2_TX_RF_IQCAL2, 0x54); | ||
1257 | |||
1258 | save[3] = b43_radio_read16(dev, B2055_C1_PWRDET_RXTX); | ||
1259 | save[4] = b43_radio_read16(dev, B2055_C2_PWRDET_RXTX); | ||
1260 | |||
1261 | if (!(b43_phy_read(dev, B43_NPHY_BANDCTL) & | ||
1262 | B43_NPHY_BANDCTL_5GHZ)) { | ||
1263 | b43_radio_write16(dev, B2055_C1_PWRDET_RXTX, 0x04); | ||
1264 | b43_radio_write16(dev, B2055_C2_PWRDET_RXTX, 0x04); | ||
1265 | } else { | ||
1266 | b43_radio_write16(dev, B2055_C1_PWRDET_RXTX, 0x20); | ||
1267 | b43_radio_write16(dev, B2055_C2_PWRDET_RXTX, 0x20); | ||
1268 | } | ||
1269 | |||
1270 | if (dev->phy.rev < 2) { | ||
1271 | b43_radio_set(dev, B2055_C1_TX_BB_MXGM, 0x20); | ||
1272 | b43_radio_set(dev, B2055_C2_TX_BB_MXGM, 0x20); | ||
1273 | } else { | ||
1274 | b43_radio_mask(dev, B2055_C1_TX_BB_MXGM, ~0x20); | ||
1275 | b43_radio_mask(dev, B2055_C2_TX_BB_MXGM, ~0x20); | ||
1276 | } | ||
1277 | } | ||
1278 | } | ||
1279 | |||
1280 | /* http://bcm-v4.sipsolutions.net/802.11/PHY/N/IqCalGainParams */ | ||
1281 | static void b43_nphy_iq_cal_gain_params(struct b43_wldev *dev, u16 core, | ||
1282 | struct nphy_txgains target, | ||
1283 | struct nphy_iqcal_params *params) | ||
1284 | { | ||
1285 | int i, j, indx; | ||
1286 | u16 gain; | ||
1287 | |||
1288 | if (dev->phy.rev >= 3) { | ||
1289 | params->txgm = target.txgm[core]; | ||
1290 | params->pga = target.pga[core]; | ||
1291 | params->pad = target.pad[core]; | ||
1292 | params->ipa = target.ipa[core]; | ||
1293 | params->cal_gain = (params->txgm << 12) | (params->pga << 8) | | ||
1294 | (params->pad << 4) | (params->ipa); | ||
1295 | for (j = 0; j < 5; j++) | ||
1296 | params->ncorr[j] = 0x79; | ||
1297 | } else { | ||
1298 | gain = (target.pad[core]) | (target.pga[core] << 4) | | ||
1299 | (target.txgm[core] << 8); | ||
1300 | |||
1301 | indx = (b43_current_band(dev->wl) == IEEE80211_BAND_5GHZ) ? | ||
1302 | 1 : 0; | ||
1303 | for (i = 0; i < 9; i++) | ||
1304 | if (tbl_iqcal_gainparams[indx][i][0] == gain) | ||
1305 | break; | ||
1306 | i = min(i, 8); | ||
1307 | |||
1308 | params->txgm = tbl_iqcal_gainparams[indx][i][1]; | ||
1309 | params->pga = tbl_iqcal_gainparams[indx][i][2]; | ||
1310 | params->pad = tbl_iqcal_gainparams[indx][i][3]; | ||
1311 | params->cal_gain = (params->txgm << 7) | (params->pga << 4) | | ||
1312 | (params->pad << 2); | ||
1313 | for (j = 0; j < 4; j++) | ||
1314 | params->ncorr[j] = tbl_iqcal_gainparams[indx][i][4 + j]; | ||
1315 | } | ||
1316 | } | ||
1317 | |||
1318 | /* http://bcm-v4.sipsolutions.net/802.11/PHY/N/UpdateTxCalLadder */ | ||
1319 | static void b43_nphy_update_tx_cal_ladder(struct b43_wldev *dev, u16 core) | ||
1320 | { | ||
1321 | struct b43_phy_n *nphy = dev->phy.n; | ||
1322 | int i; | ||
1323 | u16 scale, entry; | ||
1324 | |||
1325 | u16 tmp = nphy->txcal_bbmult; | ||
1326 | if (core == 0) | ||
1327 | tmp >>= 8; | ||
1328 | tmp &= 0xff; | ||
1329 | |||
1330 | for (i = 0; i < 18; i++) { | ||
1331 | scale = (ladder_lo[i].percent * tmp) / 100; | ||
1332 | entry = ((scale & 0xFF) << 8) | ladder_lo[i].g_env; | ||
1333 | /* TODO: Write an N PHY Table with ID 15, length 1, | ||
1334 | offset i, width 16, and data entry */ | ||
1335 | |||
1336 | scale = (ladder_iq[i].percent * tmp) / 100; | ||
1337 | entry = ((scale & 0xFF) << 8) | ladder_iq[i].g_env; | ||
1338 | /* TODO: Write an N PHY Table with ID 15, length 1, | ||
1339 | offset i + 32, width 16, and data entry */ | ||
1340 | } | ||
1341 | } | ||
1342 | |||
1343 | /* http://bcm-v4.sipsolutions.net/802.11/PHY/N/GetTxGain */ | ||
1344 | static struct nphy_txgains b43_nphy_get_tx_gains(struct b43_wldev *dev) | ||
1345 | { | ||
1346 | struct b43_phy_n *nphy = dev->phy.n; | ||
1347 | |||
1348 | u16 curr_gain[2]; | ||
1349 | struct nphy_txgains target; | ||
1350 | const u32 *table = NULL; | ||
1351 | |||
1352 | if (nphy->txpwrctrl == 0) { | ||
1353 | int i; | ||
1354 | |||
1355 | if (nphy->hang_avoid) | ||
1356 | b43_nphy_stay_in_carrier_search(dev, true); | ||
1357 | /* TODO: Read an N PHY Table with ID 7, length 2, | ||
1358 | offset 0x110, width 16, and curr_gain */ | ||
1359 | if (nphy->hang_avoid) | ||
1360 | b43_nphy_stay_in_carrier_search(dev, false); | ||
1361 | |||
1362 | for (i = 0; i < 2; ++i) { | ||
1363 | if (dev->phy.rev >= 3) { | ||
1364 | target.ipa[i] = curr_gain[i] & 0x000F; | ||
1365 | target.pad[i] = (curr_gain[i] & 0x00F0) >> 4; | ||
1366 | target.pga[i] = (curr_gain[i] & 0x0F00) >> 8; | ||
1367 | target.txgm[i] = (curr_gain[i] & 0x7000) >> 12; | ||
1368 | } else { | ||
1369 | target.ipa[i] = curr_gain[i] & 0x0003; | ||
1370 | target.pad[i] = (curr_gain[i] & 0x000C) >> 2; | ||
1371 | target.pga[i] = (curr_gain[i] & 0x0070) >> 4; | ||
1372 | target.txgm[i] = (curr_gain[i] & 0x0380) >> 7; | ||
1373 | } | ||
1374 | } | ||
1375 | } else { | ||
1376 | int i; | ||
1377 | u16 index[2]; | ||
1378 | index[0] = (b43_phy_read(dev, B43_NPHY_C1_TXPCTL_STAT) & | ||
1379 | B43_NPHY_TXPCTL_STAT_BIDX) >> | ||
1380 | B43_NPHY_TXPCTL_STAT_BIDX_SHIFT; | ||
1381 | index[1] = (b43_phy_read(dev, B43_NPHY_C2_TXPCTL_STAT) & | ||
1382 | B43_NPHY_TXPCTL_STAT_BIDX) >> | ||
1383 | B43_NPHY_TXPCTL_STAT_BIDX_SHIFT; | ||
1384 | |||
1385 | for (i = 0; i < 2; ++i) { | ||
1386 | if (dev->phy.rev >= 3) { | ||
1387 | enum ieee80211_band band = | ||
1388 | b43_current_band(dev->wl); | ||
1389 | |||
1390 | if ((nphy->ipa2g_on && | ||
1391 | band == IEEE80211_BAND_2GHZ) || | ||
1392 | (nphy->ipa5g_on && | ||
1393 | band == IEEE80211_BAND_5GHZ)) { | ||
1394 | table = b43_nphy_get_ipa_gain_table(dev); | ||
1395 | } else { | ||
1396 | if (band == IEEE80211_BAND_5GHZ) { | ||
1397 | if (dev->phy.rev == 3) | ||
1398 | table = b43_ntab_tx_gain_rev3_5ghz; | ||
1399 | else if (dev->phy.rev == 4) | ||
1400 | table = b43_ntab_tx_gain_rev4_5ghz; | ||
1401 | else | ||
1402 | table = b43_ntab_tx_gain_rev5plus_5ghz; | ||
1403 | } else { | ||
1404 | table = b43_ntab_tx_gain_rev3plus_2ghz; | ||
1405 | } | ||
1406 | } | ||
1407 | |||
1408 | target.ipa[i] = (table[index[i]] >> 16) & 0xF; | ||
1409 | target.pad[i] = (table[index[i]] >> 20) & 0xF; | ||
1410 | target.pga[i] = (table[index[i]] >> 24) & 0xF; | ||
1411 | target.txgm[i] = (table[index[i]] >> 28) & 0xF; | ||
1412 | } else { | ||
1413 | table = b43_ntab_tx_gain_rev0_1_2; | ||
1414 | |||
1415 | target.ipa[i] = (table[index[i]] >> 16) & 0x3; | ||
1416 | target.pad[i] = (table[index[i]] >> 18) & 0x3; | ||
1417 | target.pga[i] = (table[index[i]] >> 20) & 0x7; | ||
1418 | target.txgm[i] = (table[index[i]] >> 23) & 0x7; | ||
1419 | } | ||
1420 | } | ||
1421 | } | ||
1422 | |||
1423 | return target; | ||
1424 | } | ||
1425 | |||
1426 | /* http://bcm-v4.sipsolutions.net/802.11/PHY/N/RestoreCal */ | ||
1427 | static void b43_nphy_restore_cal(struct b43_wldev *dev) | ||
1428 | { | ||
1429 | struct b43_phy_n *nphy = dev->phy.n; | ||
1430 | |||
1431 | u16 coef[4]; | ||
1432 | u16 *loft = NULL; | ||
1433 | u16 *table = NULL; | ||
1434 | |||
1435 | int i; | ||
1436 | u16 *txcal_radio_regs = NULL; | ||
1437 | struct b43_phy_n_iq_comp *rxcal_coeffs = NULL; | ||
1438 | |||
1439 | if (b43_current_band(dev->wl) == IEEE80211_BAND_2GHZ) { | ||
1440 | if (nphy->iqcal_chanspec_2G == 0) | ||
1441 | return; | ||
1442 | table = nphy->cal_cache.txcal_coeffs_2G; | ||
1443 | loft = &nphy->cal_cache.txcal_coeffs_2G[5]; | ||
1444 | } else { | ||
1445 | if (nphy->iqcal_chanspec_5G == 0) | ||
1446 | return; | ||
1447 | table = nphy->cal_cache.txcal_coeffs_5G; | ||
1448 | loft = &nphy->cal_cache.txcal_coeffs_5G[5]; | ||
1449 | } | ||
1450 | |||
1451 | /* TODO: Write an N PHY table with ID 15, length 4, offset 80, | ||
1452 | width 16, and data from table */ | ||
1453 | |||
1454 | for (i = 0; i < 4; i++) { | ||
1455 | if (dev->phy.rev >= 3) | ||
1456 | table[i] = coef[i]; | ||
1457 | else | ||
1458 | coef[i] = 0; | ||
1459 | } | ||
1460 | |||
1461 | /* TODO: Write an N PHY table with ID 15, length 4, offset 88, | ||
1462 | width 16, and data from coef */ | ||
1463 | /* TODO: Write an N PHY table with ID 15, length 2, offset 85, | ||
1464 | width 16 and data from loft */ | ||
1465 | /* TODO: Write an N PHY table with ID 15, length 2, offset 93, | ||
1466 | width 16 and data from loft */ | ||
1467 | |||
1468 | if (dev->phy.rev < 2) | ||
1469 | b43_nphy_tx_iq_workaround(dev); | ||
1470 | |||
1471 | if (b43_current_band(dev->wl) == IEEE80211_BAND_2GHZ) { | ||
1472 | txcal_radio_regs = nphy->cal_cache.txcal_radio_regs_2G; | ||
1473 | rxcal_coeffs = &nphy->cal_cache.rxcal_coeffs_2G; | ||
1474 | } else { | ||
1475 | txcal_radio_regs = nphy->cal_cache.txcal_radio_regs_5G; | ||
1476 | rxcal_coeffs = &nphy->cal_cache.rxcal_coeffs_5G; | ||
1477 | } | ||
1478 | |||
1479 | /* TODO use some definitions */ | ||
1480 | if (dev->phy.rev >= 3) { | ||
1481 | b43_radio_write(dev, 0x2021, txcal_radio_regs[0]); | ||
1482 | b43_radio_write(dev, 0x2022, txcal_radio_regs[1]); | ||
1483 | b43_radio_write(dev, 0x3021, txcal_radio_regs[2]); | ||
1484 | b43_radio_write(dev, 0x3022, txcal_radio_regs[3]); | ||
1485 | b43_radio_write(dev, 0x2023, txcal_radio_regs[4]); | ||
1486 | b43_radio_write(dev, 0x2024, txcal_radio_regs[5]); | ||
1487 | b43_radio_write(dev, 0x3023, txcal_radio_regs[6]); | ||
1488 | b43_radio_write(dev, 0x3024, txcal_radio_regs[7]); | ||
1489 | } else { | ||
1490 | b43_radio_write(dev, 0x8B, txcal_radio_regs[0]); | ||
1491 | b43_radio_write(dev, 0xBA, txcal_radio_regs[1]); | ||
1492 | b43_radio_write(dev, 0x8D, txcal_radio_regs[2]); | ||
1493 | b43_radio_write(dev, 0xBC, txcal_radio_regs[3]); | ||
1494 | } | ||
1495 | b43_nphy_rx_iq_coeffs(dev, true, rxcal_coeffs); | ||
1496 | } | ||
1497 | |||
1498 | /* http://bcm-v4.sipsolutions.net/802.11/PHY/N/CalTxIqlo */ | ||
1499 | static int b43_nphy_cal_tx_iq_lo(struct b43_wldev *dev, | ||
1500 | struct nphy_txgains target, | ||
1501 | bool full, bool mphase) | ||
1502 | { | ||
1503 | struct b43_phy_n *nphy = dev->phy.n; | ||
1504 | int i; | ||
1505 | int error = 0; | ||
1506 | int freq; | ||
1507 | bool avoid = false; | ||
1508 | u8 length; | ||
1509 | u16 tmp, core, type, count, max, numb, last, cmd; | ||
1510 | const u16 *table; | ||
1511 | bool phy6or5x; | ||
1512 | |||
1513 | u16 buffer[11]; | ||
1514 | u16 diq_start = 0; | ||
1515 | u16 save[2]; | ||
1516 | u16 gain[2]; | ||
1517 | struct nphy_iqcal_params params[2]; | ||
1518 | bool updated[2] = { }; | ||
1519 | |||
1520 | b43_nphy_stay_in_carrier_search(dev, true); | ||
1521 | |||
1522 | if (dev->phy.rev >= 4) { | ||
1523 | avoid = nphy->hang_avoid; | ||
1524 | nphy->hang_avoid = 0; | ||
1525 | } | ||
1526 | |||
1527 | /* TODO: Read an N PHY Table with ID 7, length 2, offset 0x110, | ||
1528 | width 16, and data pointer save */ | ||
1529 | |||
1530 | for (i = 0; i < 2; i++) { | ||
1531 | b43_nphy_iq_cal_gain_params(dev, i, target, ¶ms[i]); | ||
1532 | gain[i] = params[i].cal_gain; | ||
1533 | } | ||
1534 | /* TODO: Write an N PHY Table with ID 7, length 2, offset 0x110, | ||
1535 | width 16, and data pointer gain */ | ||
1536 | |||
1537 | b43_nphy_tx_cal_radio_setup(dev); | ||
1538 | /* TODO: Call N PHY TX Cal PHY Setup */ | ||
1539 | |||
1540 | phy6or5x = dev->phy.rev >= 6 || | ||
1541 | (dev->phy.rev == 5 && nphy->ipa2g_on && | ||
1542 | b43_current_band(dev->wl) == IEEE80211_BAND_2GHZ); | ||
1543 | if (phy6or5x) { | ||
1544 | /* TODO */ | ||
1545 | } | ||
1546 | |||
1547 | b43_phy_write(dev, B43_NPHY_IQLOCAL_CMDGCTL, 0x8AA9); | ||
1548 | |||
1549 | if (1 /* FIXME: the band width is 20 MHz */) | ||
1550 | freq = 2500; | ||
1551 | else | ||
1552 | freq = 5000; | ||
1553 | |||
1554 | if (nphy->mphase_cal_phase_id > 2) | ||
1555 | ;/* TODO: Call N PHY Run Samples with (band width * 8), | ||
1556 | 0xFFFF, 0, 1, 0 as arguments */ | ||
1557 | else | ||
1558 | ;/* TODO: Call N PHY TX Tone with freq, 250, 1, 0 as arguments | ||
1559 | and save result as error */ | ||
1560 | |||
1561 | if (error == 0) { | ||
1562 | if (nphy->mphase_cal_phase_id > 2) { | ||
1563 | table = nphy->mphase_txcal_bestcoeffs; | ||
1564 | length = 11; | ||
1565 | if (dev->phy.rev < 3) | ||
1566 | length -= 2; | ||
1567 | } else { | ||
1568 | if (!full && nphy->txiqlocal_coeffsvalid) { | ||
1569 | table = nphy->txiqlocal_bestc; | ||
1570 | length = 11; | ||
1571 | if (dev->phy.rev < 3) | ||
1572 | length -= 2; | ||
1573 | } else { | ||
1574 | full = true; | ||
1575 | if (dev->phy.rev >= 3) { | ||
1576 | table = tbl_tx_iqlo_cal_startcoefs_nphyrev3; | ||
1577 | length = B43_NTAB_TX_IQLO_CAL_STARTCOEFS_REV3; | ||
1578 | } else { | ||
1579 | table = tbl_tx_iqlo_cal_startcoefs; | ||
1580 | length = B43_NTAB_TX_IQLO_CAL_STARTCOEFS; | ||
1581 | } | ||
1582 | } | ||
1583 | } | ||
1584 | |||
1585 | /* TODO: Write an N PHY Table with ID 15, length from above, | ||
1586 | offset 64, width 16, and the data pointer from above */ | ||
1587 | |||
1588 | if (full) { | ||
1589 | if (dev->phy.rev >= 3) | ||
1590 | max = B43_NTAB_TX_IQLO_CAL_CMDS_FULLCAL_REV3; | ||
1591 | else | ||
1592 | max = B43_NTAB_TX_IQLO_CAL_CMDS_FULLCAL; | ||
1593 | } else { | ||
1594 | if (dev->phy.rev >= 3) | ||
1595 | max = B43_NTAB_TX_IQLO_CAL_CMDS_RECAL_REV3; | ||
1596 | else | ||
1597 | max = B43_NTAB_TX_IQLO_CAL_CMDS_RECAL; | ||
1598 | } | ||
1599 | |||
1600 | if (mphase) { | ||
1601 | count = nphy->mphase_txcal_cmdidx; | ||
1602 | numb = min(max, | ||
1603 | (u16)(count + nphy->mphase_txcal_numcmds)); | ||
1604 | } else { | ||
1605 | count = 0; | ||
1606 | numb = max; | ||
1607 | } | ||
1608 | |||
1609 | for (; count < numb; count++) { | ||
1610 | if (full) { | ||
1611 | if (dev->phy.rev >= 3) | ||
1612 | cmd = tbl_tx_iqlo_cal_cmds_fullcal_nphyrev3[count]; | ||
1613 | else | ||
1614 | cmd = tbl_tx_iqlo_cal_cmds_fullcal[count]; | ||
1615 | } else { | ||
1616 | if (dev->phy.rev >= 3) | ||
1617 | cmd = tbl_tx_iqlo_cal_cmds_recal_nphyrev3[count]; | ||
1618 | else | ||
1619 | cmd = tbl_tx_iqlo_cal_cmds_recal[count]; | ||
1620 | } | ||
1621 | |||
1622 | core = (cmd & 0x3000) >> 12; | ||
1623 | type = (cmd & 0x0F00) >> 8; | ||
1624 | |||
1625 | if (phy6or5x && updated[core] == 0) { | ||
1626 | b43_nphy_update_tx_cal_ladder(dev, core); | ||
1627 | updated[core] = 1; | ||
1628 | } | ||
1629 | |||
1630 | tmp = (params[core].ncorr[type] << 8) | 0x66; | ||
1631 | b43_phy_write(dev, B43_NPHY_IQLOCAL_CMDNNUM, tmp); | ||
1632 | |||
1633 | if (type == 1 || type == 3 || type == 4) { | ||
1634 | /* TODO: Read an N PHY Table with ID 15, | ||
1635 | length 1, offset 69 + core, | ||
1636 | width 16, and data pointer buffer */ | ||
1637 | diq_start = buffer[0]; | ||
1638 | buffer[0] = 0; | ||
1639 | /* TODO: Write an N PHY Table with ID 15, | ||
1640 | length 1, offset 69 + core, width 16, | ||
1641 | and data of 0 */ | ||
1642 | } | ||
1643 | |||
1644 | b43_phy_write(dev, B43_NPHY_IQLOCAL_CMD, cmd); | ||
1645 | for (i = 0; i < 2000; i++) { | ||
1646 | tmp = b43_phy_read(dev, B43_NPHY_IQLOCAL_CMD); | ||
1647 | if (tmp & 0xC000) | ||
1648 | break; | ||
1649 | udelay(10); | ||
1650 | } | ||
1651 | |||
1652 | /* TODO: Read an N PHY Table with ID 15, | ||
1653 | length table_length, offset 96, width 16, | ||
1654 | and data pointer buffer */ | ||
1655 | /* TODO: Write an N PHY Table with ID 15, | ||
1656 | length table_length, offset 64, width 16, | ||
1657 | and data pointer buffer */ | ||
1658 | |||
1659 | if (type == 1 || type == 3 || type == 4) | ||
1660 | buffer[0] = diq_start; | ||
1661 | } | ||
1662 | |||
1663 | if (mphase) | ||
1664 | nphy->mphase_txcal_cmdidx = (numb >= max) ? 0 : numb; | ||
1665 | |||
1666 | last = (dev->phy.rev < 3) ? 6 : 7; | ||
1667 | |||
1668 | if (!mphase || nphy->mphase_cal_phase_id == last) { | ||
1669 | /* TODO: Write an N PHY Table with ID 15, length 4, | ||
1670 | offset 96, width 16, and data pointer buffer */ | ||
1671 | /* TODO: Read an N PHY Table with ID 15, length 4, | ||
1672 | offset 80, width 16, and data pointer buffer */ | ||
1673 | if (dev->phy.rev < 3) { | ||
1674 | buffer[0] = 0; | ||
1675 | buffer[1] = 0; | ||
1676 | buffer[2] = 0; | ||
1677 | buffer[3] = 0; | ||
1678 | } | ||
1679 | /* TODO: Write an N PHY Table with ID 15, length 4, | ||
1680 | offset 88, width 16, and data pointer buffer */ | ||
1681 | /* TODO: Read an N PHY Table with ID 15, length 2, | ||
1682 | offset 101, width 16, and data pointer buffer*/ | ||
1683 | /* TODO: Write an N PHY Table with ID 15, length 2, | ||
1684 | offset 85, width 16, and data pointer buffer */ | ||
1685 | /* TODO: Write an N PHY Table with ID 15, length 2, | ||
1686 | offset 93, width 16, and data pointer buffer */ | ||
1687 | length = 11; | ||
1688 | if (dev->phy.rev < 3) | ||
1689 | length -= 2; | ||
1690 | /* TODO: Read an N PHY Table with ID 15, length length, | ||
1691 | offset 96, width 16, and data pointer | ||
1692 | nphy->txiqlocal_bestc */ | ||
1693 | nphy->txiqlocal_coeffsvalid = true; | ||
1694 | /* TODO: Set nphy->txiqlocal_chanspec to | ||
1695 | the current channel */ | ||
1696 | } else { | ||
1697 | length = 11; | ||
1698 | if (dev->phy.rev < 3) | ||
1699 | length -= 2; | ||
1700 | /* TODO: Read an N PHY Table with ID 5, length length, | ||
1701 | offset 96, width 16, and data pointer | ||
1702 | nphy->mphase_txcal_bestcoeffs */ | ||
1703 | } | ||
1704 | |||
1705 | /* TODO: Call N PHY Stop Playback */ | ||
1706 | b43_phy_write(dev, B43_NPHY_IQLOCAL_CMDGCTL, 0); | ||
1707 | } | ||
1708 | |||
1709 | /* TODO: Call N PHY TX Cal PHY Cleanup */ | ||
1710 | /* TODO: Write an N PHY Table with ID 7, length 2, offset 0x110, | ||
1711 | width 16, and data from save */ | ||
1712 | |||
1713 | if (dev->phy.rev < 2 && (!mphase || nphy->mphase_cal_phase_id == last)) | ||
1714 | b43_nphy_tx_iq_workaround(dev); | ||
1715 | |||
1716 | if (dev->phy.rev >= 4) | ||
1717 | nphy->hang_avoid = avoid; | ||
1718 | |||
1719 | b43_nphy_stay_in_carrier_search(dev, false); | ||
1720 | |||
1721 | return error; | ||
418 | } | 1722 | } |
419 | 1723 | ||
1724 | /* http://bcm-v4.sipsolutions.net/802.11/PHY/N/CalRxIqRev2 */ | ||
1725 | static int b43_nphy_rev2_cal_rx_iq(struct b43_wldev *dev, | ||
1726 | struct nphy_txgains target, u8 type, bool debug) | ||
1727 | { | ||
1728 | struct b43_phy_n *nphy = dev->phy.n; | ||
1729 | int i, j, index; | ||
1730 | u8 rfctl[2]; | ||
1731 | u8 afectl_core; | ||
1732 | u16 tmp[6]; | ||
1733 | u16 cur_hpf1, cur_hpf2, cur_lna; | ||
1734 | u32 real, imag; | ||
1735 | enum ieee80211_band band; | ||
1736 | |||
1737 | u8 use; | ||
1738 | u16 cur_hpf; | ||
1739 | u16 lna[3] = { 3, 3, 1 }; | ||
1740 | u16 hpf1[3] = { 7, 2, 0 }; | ||
1741 | u16 hpf2[3] = { 2, 0, 0 }; | ||
1742 | u32 power[3]; | ||
1743 | u16 gain_save[2]; | ||
1744 | u16 cal_gain[2]; | ||
1745 | struct nphy_iqcal_params cal_params[2]; | ||
1746 | struct nphy_iq_est est; | ||
1747 | int ret = 0; | ||
1748 | bool playtone = true; | ||
1749 | int desired = 13; | ||
1750 | |||
1751 | b43_nphy_stay_in_carrier_search(dev, 1); | ||
1752 | |||
1753 | if (dev->phy.rev < 2) | ||
1754 | ;/* TODO: Call N PHY Reapply TX Cal Coeffs */ | ||
1755 | /* TODO: Read an N PHY Table with ID 7, length 2, offset 0x110, | ||
1756 | width 16, and data gain_save */ | ||
1757 | for (i = 0; i < 2; i++) { | ||
1758 | b43_nphy_iq_cal_gain_params(dev, i, target, &cal_params[i]); | ||
1759 | cal_gain[i] = cal_params[i].cal_gain; | ||
1760 | } | ||
1761 | /* TODO: Write an N PHY Table with ID 7, length 2, offset 0x110, | ||
1762 | width 16, and data from cal_gain */ | ||
1763 | |||
1764 | for (i = 0; i < 2; i++) { | ||
1765 | if (i == 0) { | ||
1766 | rfctl[0] = B43_NPHY_RFCTL_INTC1; | ||
1767 | rfctl[1] = B43_NPHY_RFCTL_INTC2; | ||
1768 | afectl_core = B43_NPHY_AFECTL_C1; | ||
1769 | } else { | ||
1770 | rfctl[0] = B43_NPHY_RFCTL_INTC2; | ||
1771 | rfctl[1] = B43_NPHY_RFCTL_INTC1; | ||
1772 | afectl_core = B43_NPHY_AFECTL_C2; | ||
1773 | } | ||
1774 | |||
1775 | tmp[1] = b43_phy_read(dev, B43_NPHY_RFSEQCA); | ||
1776 | tmp[2] = b43_phy_read(dev, afectl_core); | ||
1777 | tmp[3] = b43_phy_read(dev, B43_NPHY_AFECTL_OVER); | ||
1778 | tmp[4] = b43_phy_read(dev, rfctl[0]); | ||
1779 | tmp[5] = b43_phy_read(dev, rfctl[1]); | ||
1780 | |||
1781 | b43_phy_maskset(dev, B43_NPHY_RFSEQCA, | ||
1782 | (u16)~B43_NPHY_RFSEQCA_RXDIS, | ||
1783 | ((1 - i) << B43_NPHY_RFSEQCA_RXDIS_SHIFT)); | ||
1784 | b43_phy_maskset(dev, B43_NPHY_RFSEQCA, ~B43_NPHY_RFSEQCA_TXEN, | ||
1785 | (1 - i)); | ||
1786 | b43_phy_set(dev, afectl_core, 0x0006); | ||
1787 | b43_phy_set(dev, B43_NPHY_AFECTL_OVER, 0x0006); | ||
1788 | |||
1789 | band = b43_current_band(dev->wl); | ||
1790 | |||
1791 | if (nphy->rxcalparams & 0xFF000000) { | ||
1792 | if (band == IEEE80211_BAND_5GHZ) | ||
1793 | b43_phy_write(dev, rfctl[0], 0x140); | ||
1794 | else | ||
1795 | b43_phy_write(dev, rfctl[0], 0x110); | ||
1796 | } else { | ||
1797 | if (band == IEEE80211_BAND_5GHZ) | ||
1798 | b43_phy_write(dev, rfctl[0], 0x180); | ||
1799 | else | ||
1800 | b43_phy_write(dev, rfctl[0], 0x120); | ||
1801 | } | ||
1802 | |||
1803 | if (band == IEEE80211_BAND_5GHZ) | ||
1804 | b43_phy_write(dev, rfctl[1], 0x148); | ||
1805 | else | ||
1806 | b43_phy_write(dev, rfctl[1], 0x114); | ||
1807 | |||
1808 | if (nphy->rxcalparams & 0x10000) { | ||
1809 | b43_radio_maskset(dev, B2055_C1_GENSPARE2, 0xFC, | ||
1810 | (i + 1)); | ||
1811 | b43_radio_maskset(dev, B2055_C2_GENSPARE2, 0xFC, | ||
1812 | (2 - i)); | ||
1813 | } | ||
1814 | |||
1815 | for (j = 0; i < 4; j++) { | ||
1816 | if (j < 3) { | ||
1817 | cur_lna = lna[j]; | ||
1818 | cur_hpf1 = hpf1[j]; | ||
1819 | cur_hpf2 = hpf2[j]; | ||
1820 | } else { | ||
1821 | if (power[1] > 10000) { | ||
1822 | use = 1; | ||
1823 | cur_hpf = cur_hpf1; | ||
1824 | index = 2; | ||
1825 | } else { | ||
1826 | if (power[0] > 10000) { | ||
1827 | use = 1; | ||
1828 | cur_hpf = cur_hpf1; | ||
1829 | index = 1; | ||
1830 | } else { | ||
1831 | index = 0; | ||
1832 | use = 2; | ||
1833 | cur_hpf = cur_hpf2; | ||
1834 | } | ||
1835 | } | ||
1836 | cur_lna = lna[index]; | ||
1837 | cur_hpf1 = hpf1[index]; | ||
1838 | cur_hpf2 = hpf2[index]; | ||
1839 | cur_hpf += desired - hweight32(power[index]); | ||
1840 | cur_hpf = clamp_val(cur_hpf, 0, 10); | ||
1841 | if (use == 1) | ||
1842 | cur_hpf1 = cur_hpf; | ||
1843 | else | ||
1844 | cur_hpf2 = cur_hpf; | ||
1845 | } | ||
1846 | |||
1847 | tmp[0] = ((cur_hpf2 << 8) | (cur_hpf1 << 4) | | ||
1848 | (cur_lna << 2)); | ||
1849 | /* TODO:Call N PHY RF Ctrl Override with 0x400, tmp[0], | ||
1850 | 3, 0 as arguments */ | ||
1851 | /* TODO: Call N PHY Force RF Seq with 2 as argument */ | ||
1852 | /* TODO: Call N PHT Stop Playback */ | ||
1853 | |||
1854 | if (playtone) { | ||
1855 | /* TODO: Call N PHY TX Tone with 4000, | ||
1856 | (nphy_rxcalparams & 0xffff), 0, 0 | ||
1857 | as arguments and save result as ret */ | ||
1858 | playtone = false; | ||
1859 | } else { | ||
1860 | /* TODO: Call N PHY Run Samples with 160, | ||
1861 | 0xFFFF, 0, 0, 0 as arguments */ | ||
1862 | } | ||
1863 | |||
1864 | if (ret == 0) { | ||
1865 | if (j < 3) { | ||
1866 | b43_nphy_rx_iq_est(dev, &est, 1024, 32, | ||
1867 | false); | ||
1868 | if (i == 0) { | ||
1869 | real = est.i0_pwr; | ||
1870 | imag = est.q0_pwr; | ||
1871 | } else { | ||
1872 | real = est.i1_pwr; | ||
1873 | imag = est.q1_pwr; | ||
1874 | } | ||
1875 | power[i] = ((real + imag) / 1024) + 1; | ||
1876 | } else { | ||
1877 | b43_nphy_calc_rx_iq_comp(dev, 1 << i); | ||
1878 | } | ||
1879 | /* TODO: Call N PHY Stop Playback */ | ||
1880 | } | ||
1881 | |||
1882 | if (ret != 0) | ||
1883 | break; | ||
1884 | } | ||
1885 | |||
1886 | b43_radio_mask(dev, B2055_C1_GENSPARE2, 0xFC); | ||
1887 | b43_radio_mask(dev, B2055_C2_GENSPARE2, 0xFC); | ||
1888 | b43_phy_write(dev, rfctl[1], tmp[5]); | ||
1889 | b43_phy_write(dev, rfctl[0], tmp[4]); | ||
1890 | b43_phy_write(dev, B43_NPHY_AFECTL_OVER, tmp[3]); | ||
1891 | b43_phy_write(dev, afectl_core, tmp[2]); | ||
1892 | b43_phy_write(dev, B43_NPHY_RFSEQCA, tmp[1]); | ||
1893 | |||
1894 | if (ret != 0) | ||
1895 | break; | ||
1896 | } | ||
1897 | |||
1898 | /* TODO: Call N PHY RF Ctrl Override with 0x400, 0, 3, 1 as arguments*/ | ||
1899 | /* TODO: Call N PHY Force RF Seq with 2 as argument */ | ||
1900 | /* TODO: Write an N PHY Table with ID 7, length 2, offset 0x110, | ||
1901 | width 16, and data from gain_save */ | ||
1902 | |||
1903 | b43_nphy_stay_in_carrier_search(dev, 0); | ||
1904 | |||
1905 | return ret; | ||
1906 | } | ||
1907 | |||
1908 | static int b43_nphy_rev3_cal_rx_iq(struct b43_wldev *dev, | ||
1909 | struct nphy_txgains target, u8 type, bool debug) | ||
1910 | { | ||
1911 | return -1; | ||
1912 | } | ||
1913 | |||
1914 | /* http://bcm-v4.sipsolutions.net/802.11/PHY/N/CalRxIq */ | ||
1915 | static int b43_nphy_cal_rx_iq(struct b43_wldev *dev, | ||
1916 | struct nphy_txgains target, u8 type, bool debug) | ||
1917 | { | ||
1918 | if (dev->phy.rev >= 3) | ||
1919 | return b43_nphy_rev3_cal_rx_iq(dev, target, type, debug); | ||
1920 | else | ||
1921 | return b43_nphy_rev2_cal_rx_iq(dev, target, type, debug); | ||
1922 | } | ||
1923 | |||
1924 | /* | ||
1925 | * Init N-PHY | ||
1926 | * http://bcm-v4.sipsolutions.net/802.11/PHY/Init/N | ||
1927 | */ | ||
420 | int b43_phy_initn(struct b43_wldev *dev) | 1928 | int b43_phy_initn(struct b43_wldev *dev) |
421 | { | 1929 | { |
1930 | struct ssb_bus *bus = dev->dev->bus; | ||
422 | struct b43_phy *phy = &dev->phy; | 1931 | struct b43_phy *phy = &dev->phy; |
1932 | struct b43_phy_n *nphy = phy->n; | ||
1933 | u8 tx_pwr_state; | ||
1934 | struct nphy_txgains target; | ||
423 | u16 tmp; | 1935 | u16 tmp; |
1936 | enum ieee80211_band tmp2; | ||
1937 | bool do_rssi_cal; | ||
1938 | |||
1939 | u16 clip[2]; | ||
1940 | bool do_cal = false; | ||
424 | 1941 | ||
425 | //TODO: Spectral management | 1942 | if ((dev->phy.rev >= 3) && |
1943 | (bus->sprom.boardflags_lo & B43_BFL_EXTLNA) && | ||
1944 | (b43_current_band(dev->wl) == IEEE80211_BAND_2GHZ)) { | ||
1945 | chipco_set32(&dev->dev->bus->chipco, SSB_CHIPCO_CHIPCTL, 0x40); | ||
1946 | } | ||
1947 | nphy->deaf_count = 0; | ||
426 | b43_nphy_tables_init(dev); | 1948 | b43_nphy_tables_init(dev); |
1949 | nphy->crsminpwr_adjusted = false; | ||
1950 | nphy->noisevars_adjusted = false; | ||
427 | 1951 | ||
428 | /* Clear all overrides */ | 1952 | /* Clear all overrides */ |
429 | b43_phy_write(dev, B43_NPHY_RFCTL_OVER, 0); | 1953 | if (dev->phy.rev >= 3) { |
1954 | b43_phy_write(dev, B43_NPHY_TXF_40CO_B1S1, 0); | ||
1955 | b43_phy_write(dev, B43_NPHY_RFCTL_OVER, 0); | ||
1956 | b43_phy_write(dev, B43_NPHY_TXF_40CO_B1S0, 0); | ||
1957 | b43_phy_write(dev, B43_NPHY_TXF_40CO_B32S1, 0); | ||
1958 | } else { | ||
1959 | b43_phy_write(dev, B43_NPHY_RFCTL_OVER, 0); | ||
1960 | } | ||
430 | b43_phy_write(dev, B43_NPHY_RFCTL_INTC1, 0); | 1961 | b43_phy_write(dev, B43_NPHY_RFCTL_INTC1, 0); |
431 | b43_phy_write(dev, B43_NPHY_RFCTL_INTC2, 0); | 1962 | b43_phy_write(dev, B43_NPHY_RFCTL_INTC2, 0); |
432 | b43_phy_write(dev, B43_NPHY_RFCTL_INTC3, 0); | 1963 | if (dev->phy.rev < 6) { |
433 | b43_phy_write(dev, B43_NPHY_RFCTL_INTC4, 0); | 1964 | b43_phy_write(dev, B43_NPHY_RFCTL_INTC3, 0); |
1965 | b43_phy_write(dev, B43_NPHY_RFCTL_INTC4, 0); | ||
1966 | } | ||
434 | b43_phy_mask(dev, B43_NPHY_RFSEQMODE, | 1967 | b43_phy_mask(dev, B43_NPHY_RFSEQMODE, |
435 | ~(B43_NPHY_RFSEQMODE_CAOVER | | 1968 | ~(B43_NPHY_RFSEQMODE_CAOVER | |
436 | B43_NPHY_RFSEQMODE_TROVER)); | 1969 | B43_NPHY_RFSEQMODE_TROVER)); |
1970 | if (dev->phy.rev >= 3) | ||
1971 | b43_phy_write(dev, B43_NPHY_AFECTL_OVER1, 0); | ||
437 | b43_phy_write(dev, B43_NPHY_AFECTL_OVER, 0); | 1972 | b43_phy_write(dev, B43_NPHY_AFECTL_OVER, 0); |
438 | 1973 | ||
439 | tmp = (phy->rev < 2) ? 64 : 59; | 1974 | if (dev->phy.rev <= 2) { |
440 | b43_phy_maskset(dev, B43_NPHY_BPHY_CTL3, | 1975 | tmp = (dev->phy.rev == 2) ? 0x3B : 0x40; |
441 | ~B43_NPHY_BPHY_CTL3_SCALE, | 1976 | b43_phy_maskset(dev, B43_NPHY_BPHY_CTL3, |
442 | tmp << B43_NPHY_BPHY_CTL3_SCALE_SHIFT); | 1977 | ~B43_NPHY_BPHY_CTL3_SCALE, |
443 | 1978 | tmp << B43_NPHY_BPHY_CTL3_SCALE_SHIFT); | |
1979 | } | ||
444 | b43_phy_write(dev, B43_NPHY_AFESEQ_TX2RX_PUD_20M, 0x20); | 1980 | b43_phy_write(dev, B43_NPHY_AFESEQ_TX2RX_PUD_20M, 0x20); |
445 | b43_phy_write(dev, B43_NPHY_AFESEQ_TX2RX_PUD_40M, 0x20); | 1981 | b43_phy_write(dev, B43_NPHY_AFESEQ_TX2RX_PUD_40M, 0x20); |
446 | 1982 | ||
447 | b43_phy_write(dev, B43_NPHY_TXREALFD, 184); | 1983 | if (bus->sprom.boardflags2_lo & 0x100 || |
448 | b43_phy_write(dev, B43_NPHY_MIMO_CRSTXEXT, 200); | 1984 | (bus->boardinfo.vendor == PCI_VENDOR_ID_APPLE && |
449 | b43_phy_write(dev, B43_NPHY_PLOAD_CSENSE_EXTLEN, 80); | 1985 | bus->boardinfo.type == 0x8B)) |
450 | b43_phy_write(dev, B43_NPHY_C2_BCLIPBKOFF, 511); | 1986 | b43_phy_write(dev, B43_NPHY_TXREALFD, 0xA0); |
1987 | else | ||
1988 | b43_phy_write(dev, B43_NPHY_TXREALFD, 0xB8); | ||
1989 | b43_phy_write(dev, B43_NPHY_MIMO_CRSTXEXT, 0xC8); | ||
1990 | b43_phy_write(dev, B43_NPHY_PLOAD_CSENSE_EXTLEN, 0x50); | ||
1991 | b43_phy_write(dev, B43_NPHY_TXRIFS_FRDEL, 0x30); | ||
451 | 1992 | ||
452 | //TODO MIMO-Config | 1993 | /* TODO MIMO-Config */ |
453 | //TODO Update TX/RX chain | 1994 | /* TODO Update TX/RX chain */ |
454 | 1995 | ||
455 | if (phy->rev < 2) { | 1996 | if (phy->rev < 2) { |
456 | b43_phy_write(dev, B43_NPHY_DUP40_GFBL, 0xAA8); | 1997 | b43_phy_write(dev, B43_NPHY_DUP40_GFBL, 0xAA8); |
457 | b43_phy_write(dev, B43_NPHY_DUP40_BL, 0x9A4); | 1998 | b43_phy_write(dev, B43_NPHY_DUP40_BL, 0x9A4); |
458 | } | 1999 | } |
2000 | |||
2001 | tmp2 = b43_current_band(dev->wl); | ||
2002 | if ((nphy->ipa2g_on && tmp2 == IEEE80211_BAND_2GHZ) || | ||
2003 | (nphy->ipa5g_on && tmp2 == IEEE80211_BAND_5GHZ)) { | ||
2004 | b43_phy_set(dev, B43_NPHY_PAPD_EN0, 0x1); | ||
2005 | b43_phy_maskset(dev, B43_NPHY_EPS_TABLE_ADJ0, 0x007F, | ||
2006 | nphy->papd_epsilon_offset[0] << 7); | ||
2007 | b43_phy_set(dev, B43_NPHY_PAPD_EN1, 0x1); | ||
2008 | b43_phy_maskset(dev, B43_NPHY_EPS_TABLE_ADJ1, 0x007F, | ||
2009 | nphy->papd_epsilon_offset[1] << 7); | ||
2010 | /* TODO N PHY IPA Set TX Dig Filters */ | ||
2011 | } else if (phy->rev >= 5) { | ||
2012 | /* TODO N PHY Ext PA Set TX Dig Filters */ | ||
2013 | } | ||
2014 | |||
459 | b43_nphy_workarounds(dev); | 2015 | b43_nphy_workarounds(dev); |
460 | b43_nphy_reset_cca(dev); | ||
461 | 2016 | ||
462 | ssb_write32(dev->dev, SSB_TMSLOW, | 2017 | /* Reset CCA, in init code it differs a little from standard way */ |
463 | ssb_read32(dev->dev, SSB_TMSLOW) | B43_TMSLOW_MACPHYCLKEN); | 2018 | b43_nphy_bmac_clock_fgc(dev, 1); |
2019 | tmp = b43_phy_read(dev, B43_NPHY_BBCFG); | ||
2020 | b43_phy_write(dev, B43_NPHY_BBCFG, tmp | B43_NPHY_BBCFG_RSTCCA); | ||
2021 | b43_phy_write(dev, B43_NPHY_BBCFG, tmp & ~B43_NPHY_BBCFG_RSTCCA); | ||
2022 | b43_nphy_bmac_clock_fgc(dev, 0); | ||
2023 | |||
2024 | /* TODO N PHY MAC PHY Clock Set with argument 1 */ | ||
2025 | |||
2026 | b43_nphy_pa_override(dev, false); | ||
464 | b43_nphy_force_rf_sequence(dev, B43_RFSEQ_RX2TX); | 2027 | b43_nphy_force_rf_sequence(dev, B43_RFSEQ_RX2TX); |
465 | b43_nphy_force_rf_sequence(dev, B43_RFSEQ_RESET2RX); | 2028 | b43_nphy_force_rf_sequence(dev, B43_RFSEQ_RESET2RX); |
2029 | b43_nphy_pa_override(dev, true); | ||
2030 | |||
2031 | b43_nphy_classifier(dev, 0, 0); | ||
2032 | b43_nphy_read_clip_detection(dev, clip); | ||
2033 | tx_pwr_state = nphy->txpwrctrl; | ||
2034 | /* TODO N PHY TX power control with argument 0 | ||
2035 | (turning off power control) */ | ||
2036 | /* TODO Fix the TX Power Settings */ | ||
2037 | /* TODO N PHY TX Power Control Idle TSSI */ | ||
2038 | /* TODO N PHY TX Power Control Setup */ | ||
2039 | |||
2040 | if (phy->rev >= 3) { | ||
2041 | /* TODO */ | ||
2042 | } else { | ||
2043 | /* TODO Write an N PHY table with ID 26, length 128, offset 192, width 32, and the data from Rev 2 TX Power Control Table */ | ||
2044 | /* TODO Write an N PHY table with ID 27, length 128, offset 192, width 32, and the data from Rev 2 TX Power Control Table */ | ||
2045 | } | ||
2046 | |||
2047 | if (nphy->phyrxchain != 3) | ||
2048 | ;/* TODO N PHY RX Core Set State with phyrxchain as argument */ | ||
2049 | if (nphy->mphase_cal_phase_id > 0) | ||
2050 | ;/* TODO PHY Periodic Calibration Multi-Phase Restart */ | ||
2051 | |||
2052 | do_rssi_cal = false; | ||
2053 | if (phy->rev >= 3) { | ||
2054 | if (b43_current_band(dev->wl) == IEEE80211_BAND_2GHZ) | ||
2055 | do_rssi_cal = (nphy->rssical_chanspec_2G == 0); | ||
2056 | else | ||
2057 | do_rssi_cal = (nphy->rssical_chanspec_5G == 0); | ||
2058 | |||
2059 | if (do_rssi_cal) | ||
2060 | b43_nphy_rssi_cal(dev); | ||
2061 | else | ||
2062 | b43_nphy_restore_rssi_cal(dev); | ||
2063 | } else { | ||
2064 | b43_nphy_rssi_cal(dev); | ||
2065 | } | ||
2066 | |||
2067 | if (!((nphy->measure_hold & 0x6) != 0)) { | ||
2068 | if (b43_current_band(dev->wl) == IEEE80211_BAND_2GHZ) | ||
2069 | do_cal = (nphy->iqcal_chanspec_2G == 0); | ||
2070 | else | ||
2071 | do_cal = (nphy->iqcal_chanspec_5G == 0); | ||
2072 | |||
2073 | if (nphy->mute) | ||
2074 | do_cal = false; | ||
2075 | |||
2076 | if (do_cal) { | ||
2077 | target = b43_nphy_get_tx_gains(dev); | ||
2078 | |||
2079 | if (nphy->antsel_type == 2) | ||
2080 | ;/*TODO NPHY Superswitch Init with argument 1*/ | ||
2081 | if (nphy->perical != 2) { | ||
2082 | b43_nphy_rssi_cal(dev); | ||
2083 | if (phy->rev >= 3) { | ||
2084 | nphy->cal_orig_pwr_idx[0] = | ||
2085 | nphy->txpwrindex[0].index_internal; | ||
2086 | nphy->cal_orig_pwr_idx[1] = | ||
2087 | nphy->txpwrindex[1].index_internal; | ||
2088 | /* TODO N PHY Pre Calibrate TX Gain */ | ||
2089 | target = b43_nphy_get_tx_gains(dev); | ||
2090 | } | ||
2091 | } | ||
2092 | } | ||
2093 | } | ||
2094 | |||
2095 | if (!b43_nphy_cal_tx_iq_lo(dev, target, true, false)) { | ||
2096 | if (b43_nphy_cal_rx_iq(dev, target, 2, 0) == 0) | ||
2097 | ;/* Call N PHY Save Cal */ | ||
2098 | else if (nphy->mphase_cal_phase_id == 0) | ||
2099 | ;/* N PHY Periodic Calibration with argument 3 */ | ||
2100 | } else { | ||
2101 | b43_nphy_restore_cal(dev); | ||
2102 | } | ||
466 | 2103 | ||
467 | b43_phy_read(dev, B43_NPHY_CLASSCTL); /* dummy read */ | 2104 | b43_nphy_tx_pwr_ctrl_coef_setup(dev); |
468 | //TODO read core1/2 clip1 thres regs | 2105 | /* TODO N PHY TX Power Control Enable with argument tx_pwr_state */ |
469 | 2106 | b43_phy_write(dev, B43_NPHY_TXMACIF_HOLDOFF, 0x0015); | |
470 | if (1 /* FIXME Band is 2.4GHz */) | 2107 | b43_phy_write(dev, B43_NPHY_TXMACDELAY, 0x0320); |
471 | b43_nphy_bphy_init(dev); | 2108 | if (phy->rev >= 3 && phy->rev <= 6) |
472 | //TODO disable TX power control | 2109 | b43_phy_write(dev, B43_NPHY_PLOAD_CSENSE_EXTLEN, 0x0014); |
473 | //TODO Fix the TX power settings | 2110 | b43_nphy_tx_lp_fbw(dev); |
474 | //TODO Init periodic calibration with reason 3 | 2111 | /* TODO N PHY Spur Workaround */ |
475 | b43_nphy_rssi_cal(dev, 2); | ||
476 | b43_nphy_rssi_cal(dev, 0); | ||
477 | b43_nphy_rssi_cal(dev, 1); | ||
478 | //TODO get TX gain | ||
479 | //TODO init superswitch | ||
480 | //TODO calibrate LO | ||
481 | //TODO idle TSSI TX pctl | ||
482 | //TODO TX power control power setup | ||
483 | //TODO table writes | ||
484 | //TODO TX power control coefficients | ||
485 | //TODO enable TX power control | ||
486 | //TODO control antenna selection | ||
487 | //TODO init radar detection | ||
488 | //TODO reset channel if changed | ||
489 | 2112 | ||
490 | b43err(dev->wl, "IEEE 802.11n devices are not supported, yet.\n"); | 2113 | b43err(dev->wl, "IEEE 802.11n devices are not supported, yet.\n"); |
491 | return 0; | 2114 | return 0; |
diff --git a/drivers/net/wireless/b43/phy_n.h b/drivers/net/wireless/b43/phy_n.h index 1749aef4147..4572866756f 100644 --- a/drivers/net/wireless/b43/phy_n.h +++ b/drivers/net/wireless/b43/phy_n.h | |||
@@ -231,6 +231,7 @@ | |||
231 | #define B43_NPHY_C2_TXIQ_COMP_OFF B43_PHY_N(0x088) /* Core 2 TX I/Q comp offset */ | 231 | #define B43_NPHY_C2_TXIQ_COMP_OFF B43_PHY_N(0x088) /* Core 2 TX I/Q comp offset */ |
232 | #define B43_NPHY_C1_TXCTL B43_PHY_N(0x08B) /* Core 1 TX control */ | 232 | #define B43_NPHY_C1_TXCTL B43_PHY_N(0x08B) /* Core 1 TX control */ |
233 | #define B43_NPHY_C2_TXCTL B43_PHY_N(0x08C) /* Core 2 TX control */ | 233 | #define B43_NPHY_C2_TXCTL B43_PHY_N(0x08C) /* Core 2 TX control */ |
234 | #define B43_NPHY_AFECTL_OVER1 B43_PHY_N(0x08F) /* AFE control override 1 */ | ||
234 | #define B43_NPHY_SCRAM_SIGCTL B43_PHY_N(0x090) /* Scram signal control */ | 235 | #define B43_NPHY_SCRAM_SIGCTL B43_PHY_N(0x090) /* Scram signal control */ |
235 | #define B43_NPHY_SCRAM_SIGCTL_INITST 0x007F /* Initial state value */ | 236 | #define B43_NPHY_SCRAM_SIGCTL_INITST 0x007F /* Initial state value */ |
236 | #define B43_NPHY_SCRAM_SIGCTL_INITST_SHIFT 0 | 237 | #define B43_NPHY_SCRAM_SIGCTL_INITST_SHIFT 0 |
@@ -705,6 +706,10 @@ | |||
705 | #define B43_NPHY_TXPCTL_INIT B43_PHY_N(0x222) /* TX power controll init */ | 706 | #define B43_NPHY_TXPCTL_INIT B43_PHY_N(0x222) /* TX power controll init */ |
706 | #define B43_NPHY_TXPCTL_INIT_PIDXI1 0x00FF /* Power index init 1 */ | 707 | #define B43_NPHY_TXPCTL_INIT_PIDXI1 0x00FF /* Power index init 1 */ |
707 | #define B43_NPHY_TXPCTL_INIT_PIDXI1_SHIFT 0 | 708 | #define B43_NPHY_TXPCTL_INIT_PIDXI1_SHIFT 0 |
709 | #define B43_NPHY_PAPD_EN0 B43_PHY_N(0x297) /* PAPD Enable0 TBD */ | ||
710 | #define B43_NPHY_EPS_TABLE_ADJ0 B43_PHY_N(0x298) /* EPS Table Adj0 TBD */ | ||
711 | #define B43_NPHY_PAPD_EN1 B43_PHY_N(0x29B) /* PAPD Enable1 TBD */ | ||
712 | #define B43_NPHY_EPS_TABLE_ADJ1 B43_PHY_N(0x29C) /* EPS Table Adj1 TBD */ | ||
708 | 713 | ||
709 | 714 | ||
710 | 715 | ||
@@ -919,8 +924,88 @@ | |||
919 | 924 | ||
920 | struct b43_wldev; | 925 | struct b43_wldev; |
921 | 926 | ||
927 | struct b43_phy_n_iq_comp { | ||
928 | s16 a0; | ||
929 | s16 b0; | ||
930 | s16 a1; | ||
931 | s16 b1; | ||
932 | }; | ||
933 | |||
934 | struct b43_phy_n_rssical_cache { | ||
935 | u16 rssical_radio_regs_2G[2]; | ||
936 | u16 rssical_phy_regs_2G[12]; | ||
937 | |||
938 | u16 rssical_radio_regs_5G[2]; | ||
939 | u16 rssical_phy_regs_5G[12]; | ||
940 | }; | ||
941 | |||
942 | struct b43_phy_n_cal_cache { | ||
943 | u16 txcal_radio_regs_2G[8]; | ||
944 | u16 txcal_coeffs_2G[8]; | ||
945 | struct b43_phy_n_iq_comp rxcal_coeffs_2G; | ||
946 | |||
947 | u16 txcal_radio_regs_5G[8]; | ||
948 | u16 txcal_coeffs_5G[8]; | ||
949 | struct b43_phy_n_iq_comp rxcal_coeffs_5G; | ||
950 | }; | ||
951 | |||
952 | struct b43_phy_n_txpwrindex { | ||
953 | s8 index; | ||
954 | s8 index_internal; | ||
955 | s8 index_internal_save; | ||
956 | u16 AfectrlOverride; | ||
957 | u16 AfeCtrlDacGain; | ||
958 | u16 rad_gain; | ||
959 | u8 bbmult; | ||
960 | u16 iqcomp_a; | ||
961 | u16 iqcomp_b; | ||
962 | u16 locomp; | ||
963 | }; | ||
964 | |||
922 | struct b43_phy_n { | 965 | struct b43_phy_n { |
923 | //TODO lots of missing stuff | 966 | u8 antsel_type; |
967 | u8 cal_orig_pwr_idx[2]; | ||
968 | u8 measure_hold; | ||
969 | u8 phyrxchain; | ||
970 | u8 perical; | ||
971 | u32 deaf_count; | ||
972 | u32 rxcalparams; | ||
973 | bool hang_avoid; | ||
974 | bool mute; | ||
975 | u16 papd_epsilon_offset[2]; | ||
976 | |||
977 | u8 mphase_cal_phase_id; | ||
978 | u16 mphase_txcal_cmdidx; | ||
979 | u16 mphase_txcal_numcmds; | ||
980 | u16 mphase_txcal_bestcoeffs[11]; | ||
981 | |||
982 | u8 txpwrctrl; | ||
983 | u16 txcal_bbmult; | ||
984 | u16 txiqlocal_bestc[11]; | ||
985 | bool txiqlocal_coeffsvalid; | ||
986 | struct b43_phy_n_txpwrindex txpwrindex[2]; | ||
987 | |||
988 | u16 tx_rx_cal_phy_saveregs[11]; | ||
989 | u16 tx_rx_cal_radio_saveregs[22]; | ||
990 | |||
991 | u16 rfctrl_intc1_save; | ||
992 | u16 rfctrl_intc2_save; | ||
993 | |||
994 | u16 classifier_state; | ||
995 | u16 clip_state[2]; | ||
996 | |||
997 | bool ipa2g_on; | ||
998 | u8 iqcal_chanspec_2G; | ||
999 | u8 rssical_chanspec_2G; | ||
1000 | |||
1001 | bool ipa5g_on; | ||
1002 | u8 iqcal_chanspec_5G; | ||
1003 | u8 rssical_chanspec_5G; | ||
1004 | |||
1005 | struct b43_phy_n_rssical_cache rssical_cache; | ||
1006 | struct b43_phy_n_cal_cache cal_cache; | ||
1007 | bool crsminpwr_adjusted; | ||
1008 | bool noisevars_adjusted; | ||
924 | }; | 1009 | }; |
925 | 1010 | ||
926 | 1011 | ||
diff --git a/drivers/net/wireless/b43/tables_nphy.c b/drivers/net/wireless/b43/tables_nphy.c index 4e233631554..7dff853ab96 100644 --- a/drivers/net/wireless/b43/tables_nphy.c +++ b/drivers/net/wireless/b43/tables_nphy.c | |||
@@ -1336,7 +1336,7 @@ b43_nphy_get_chantabent(struct b43_wldev *dev, u8 channel) | |||
1336 | } | 1336 | } |
1337 | 1337 | ||
1338 | 1338 | ||
1339 | const u8 b43_ntab_adjustpower0[] = { | 1339 | static const u8 b43_ntab_adjustpower0[] = { |
1340 | 0x00, 0x00, 0x00, 0x00, 0x01, 0x01, 0x01, 0x01, | 1340 | 0x00, 0x00, 0x00, 0x00, 0x01, 0x01, 0x01, 0x01, |
1341 | 0x02, 0x02, 0x02, 0x02, 0x03, 0x03, 0x03, 0x03, | 1341 | 0x02, 0x02, 0x02, 0x02, 0x03, 0x03, 0x03, 0x03, |
1342 | 0x04, 0x04, 0x04, 0x04, 0x05, 0x05, 0x05, 0x05, | 1342 | 0x04, 0x04, 0x04, 0x04, 0x05, 0x05, 0x05, 0x05, |
@@ -1355,7 +1355,7 @@ const u8 b43_ntab_adjustpower0[] = { | |||
1355 | 0x1E, 0x1E, 0x1E, 0x1E, 0x1F, 0x1F, 0x1F, 0x1F, | 1355 | 0x1E, 0x1E, 0x1E, 0x1E, 0x1F, 0x1F, 0x1F, 0x1F, |
1356 | }; | 1356 | }; |
1357 | 1357 | ||
1358 | const u8 b43_ntab_adjustpower1[] = { | 1358 | static const u8 b43_ntab_adjustpower1[] = { |
1359 | 0x00, 0x00, 0x00, 0x00, 0x01, 0x01, 0x01, 0x01, | 1359 | 0x00, 0x00, 0x00, 0x00, 0x01, 0x01, 0x01, 0x01, |
1360 | 0x02, 0x02, 0x02, 0x02, 0x03, 0x03, 0x03, 0x03, | 1360 | 0x02, 0x02, 0x02, 0x02, 0x03, 0x03, 0x03, 0x03, |
1361 | 0x04, 0x04, 0x04, 0x04, 0x05, 0x05, 0x05, 0x05, | 1361 | 0x04, 0x04, 0x04, 0x04, 0x05, 0x05, 0x05, 0x05, |
@@ -1374,11 +1374,11 @@ const u8 b43_ntab_adjustpower1[] = { | |||
1374 | 0x1E, 0x1E, 0x1E, 0x1E, 0x1F, 0x1F, 0x1F, 0x1F, | 1374 | 0x1E, 0x1E, 0x1E, 0x1E, 0x1F, 0x1F, 0x1F, 0x1F, |
1375 | }; | 1375 | }; |
1376 | 1376 | ||
1377 | const u16 b43_ntab_bdi[] = { | 1377 | static const u16 b43_ntab_bdi[] = { |
1378 | 0x0070, 0x0126, 0x012C, 0x0246, 0x048D, 0x04D2, | 1378 | 0x0070, 0x0126, 0x012C, 0x0246, 0x048D, 0x04D2, |
1379 | }; | 1379 | }; |
1380 | 1380 | ||
1381 | const u32 b43_ntab_channelest[] = { | 1381 | static const u32 b43_ntab_channelest[] = { |
1382 | 0x44444444, 0x44444444, 0x44444444, 0x44444444, | 1382 | 0x44444444, 0x44444444, 0x44444444, 0x44444444, |
1383 | 0x44444444, 0x44444444, 0x44444444, 0x44444444, | 1383 | 0x44444444, 0x44444444, 0x44444444, 0x44444444, |
1384 | 0x10101010, 0x10101010, 0x10101010, 0x10101010, | 1384 | 0x10101010, 0x10101010, 0x10101010, 0x10101010, |
@@ -1405,7 +1405,7 @@ const u32 b43_ntab_channelest[] = { | |||
1405 | 0x10101010, 0x10101010, 0x10101010, 0x10101010, | 1405 | 0x10101010, 0x10101010, 0x10101010, 0x10101010, |
1406 | }; | 1406 | }; |
1407 | 1407 | ||
1408 | const u8 b43_ntab_estimatepowerlt0[] = { | 1408 | static const u8 b43_ntab_estimatepowerlt0[] = { |
1409 | 0x50, 0x4F, 0x4E, 0x4D, 0x4C, 0x4B, 0x4A, 0x49, | 1409 | 0x50, 0x4F, 0x4E, 0x4D, 0x4C, 0x4B, 0x4A, 0x49, |
1410 | 0x48, 0x47, 0x46, 0x45, 0x44, 0x43, 0x42, 0x41, | 1410 | 0x48, 0x47, 0x46, 0x45, 0x44, 0x43, 0x42, 0x41, |
1411 | 0x40, 0x3F, 0x3E, 0x3D, 0x3C, 0x3B, 0x3A, 0x39, | 1411 | 0x40, 0x3F, 0x3E, 0x3D, 0x3C, 0x3B, 0x3A, 0x39, |
@@ -1416,7 +1416,7 @@ const u8 b43_ntab_estimatepowerlt0[] = { | |||
1416 | 0x18, 0x17, 0x16, 0x15, 0x14, 0x13, 0x12, 0x11, | 1416 | 0x18, 0x17, 0x16, 0x15, 0x14, 0x13, 0x12, 0x11, |
1417 | }; | 1417 | }; |
1418 | 1418 | ||
1419 | const u8 b43_ntab_estimatepowerlt1[] = { | 1419 | static const u8 b43_ntab_estimatepowerlt1[] = { |
1420 | 0x50, 0x4F, 0x4E, 0x4D, 0x4C, 0x4B, 0x4A, 0x49, | 1420 | 0x50, 0x4F, 0x4E, 0x4D, 0x4C, 0x4B, 0x4A, 0x49, |
1421 | 0x48, 0x47, 0x46, 0x45, 0x44, 0x43, 0x42, 0x41, | 1421 | 0x48, 0x47, 0x46, 0x45, 0x44, 0x43, 0x42, 0x41, |
1422 | 0x40, 0x3F, 0x3E, 0x3D, 0x3C, 0x3B, 0x3A, 0x39, | 1422 | 0x40, 0x3F, 0x3E, 0x3D, 0x3C, 0x3B, 0x3A, 0x39, |
@@ -1427,14 +1427,14 @@ const u8 b43_ntab_estimatepowerlt1[] = { | |||
1427 | 0x18, 0x17, 0x16, 0x15, 0x14, 0x13, 0x12, 0x11, | 1427 | 0x18, 0x17, 0x16, 0x15, 0x14, 0x13, 0x12, 0x11, |
1428 | }; | 1428 | }; |
1429 | 1429 | ||
1430 | const u8 b43_ntab_framelookup[] = { | 1430 | static const u8 b43_ntab_framelookup[] = { |
1431 | 0x02, 0x04, 0x14, 0x14, 0x03, 0x05, 0x16, 0x16, | 1431 | 0x02, 0x04, 0x14, 0x14, 0x03, 0x05, 0x16, 0x16, |
1432 | 0x0A, 0x0C, 0x1C, 0x1C, 0x0B, 0x0D, 0x1E, 0x1E, | 1432 | 0x0A, 0x0C, 0x1C, 0x1C, 0x0B, 0x0D, 0x1E, 0x1E, |
1433 | 0x06, 0x08, 0x18, 0x18, 0x07, 0x09, 0x1A, 0x1A, | 1433 | 0x06, 0x08, 0x18, 0x18, 0x07, 0x09, 0x1A, 0x1A, |
1434 | 0x0E, 0x10, 0x20, 0x28, 0x0F, 0x11, 0x22, 0x2A, | 1434 | 0x0E, 0x10, 0x20, 0x28, 0x0F, 0x11, 0x22, 0x2A, |
1435 | }; | 1435 | }; |
1436 | 1436 | ||
1437 | const u32 b43_ntab_framestruct[] = { | 1437 | static const u32 b43_ntab_framestruct[] = { |
1438 | 0x08004A04, 0x00100000, 0x01000A05, 0x00100020, | 1438 | 0x08004A04, 0x00100000, 0x01000A05, 0x00100020, |
1439 | 0x09804506, 0x00100030, 0x09804507, 0x00100030, | 1439 | 0x09804506, 0x00100030, 0x09804507, 0x00100030, |
1440 | 0x00000000, 0x00000000, 0x00000000, 0x00000000, | 1440 | 0x00000000, 0x00000000, 0x00000000, 0x00000000, |
@@ -1645,7 +1645,7 @@ const u32 b43_ntab_framestruct[] = { | |||
1645 | 0x00000000, 0x00000000, 0x00000000, 0x00000000, | 1645 | 0x00000000, 0x00000000, 0x00000000, 0x00000000, |
1646 | }; | 1646 | }; |
1647 | 1647 | ||
1648 | const u32 b43_ntab_gainctl0[] = { | 1648 | static const u32 b43_ntab_gainctl0[] = { |
1649 | 0x007F003F, 0x007E013F, 0x007D023E, 0x007C033E, | 1649 | 0x007F003F, 0x007E013F, 0x007D023E, 0x007C033E, |
1650 | 0x007B043D, 0x007A053D, 0x0079063C, 0x0078073C, | 1650 | 0x007B043D, 0x007A053D, 0x0079063C, 0x0078073C, |
1651 | 0x0077083B, 0x0076093B, 0x00750A3A, 0x00740B3A, | 1651 | 0x0077083B, 0x0076093B, 0x00750A3A, 0x00740B3A, |
@@ -1680,7 +1680,7 @@ const u32 b43_ntab_gainctl0[] = { | |||
1680 | 0x00030C01, 0x00020D01, 0x00010E00, 0x00000F00, | 1680 | 0x00030C01, 0x00020D01, 0x00010E00, 0x00000F00, |
1681 | }; | 1681 | }; |
1682 | 1682 | ||
1683 | const u32 b43_ntab_gainctl1[] = { | 1683 | static const u32 b43_ntab_gainctl1[] = { |
1684 | 0x007F003F, 0x007E013F, 0x007D023E, 0x007C033E, | 1684 | 0x007F003F, 0x007E013F, 0x007D023E, 0x007C033E, |
1685 | 0x007B043D, 0x007A053D, 0x0079063C, 0x0078073C, | 1685 | 0x007B043D, 0x007A053D, 0x0079063C, 0x0078073C, |
1686 | 0x0077083B, 0x0076093B, 0x00750A3A, 0x00740B3A, | 1686 | 0x0077083B, 0x0076093B, 0x00750A3A, 0x00740B3A, |
@@ -1715,12 +1715,12 @@ const u32 b43_ntab_gainctl1[] = { | |||
1715 | 0x00030C01, 0x00020D01, 0x00010E00, 0x00000F00, | 1715 | 0x00030C01, 0x00020D01, 0x00010E00, 0x00000F00, |
1716 | }; | 1716 | }; |
1717 | 1717 | ||
1718 | const u32 b43_ntab_intlevel[] = { | 1718 | static const u32 b43_ntab_intlevel[] = { |
1719 | 0x00802070, 0x0671188D, 0x0A60192C, 0x0A300E46, | 1719 | 0x00802070, 0x0671188D, 0x0A60192C, 0x0A300E46, |
1720 | 0x00C1188D, 0x080024D2, 0x00000070, | 1720 | 0x00C1188D, 0x080024D2, 0x00000070, |
1721 | }; | 1721 | }; |
1722 | 1722 | ||
1723 | const u32 b43_ntab_iqlt0[] = { | 1723 | static const u32 b43_ntab_iqlt0[] = { |
1724 | 0x0000007F, 0x0000007F, 0x0000007F, 0x0000007F, | 1724 | 0x0000007F, 0x0000007F, 0x0000007F, 0x0000007F, |
1725 | 0x0000007F, 0x0000007F, 0x0000007F, 0x0000007F, | 1725 | 0x0000007F, 0x0000007F, 0x0000007F, 0x0000007F, |
1726 | 0x0000007F, 0x0000007F, 0x0000007F, 0x0000007F, | 1726 | 0x0000007F, 0x0000007F, 0x0000007F, 0x0000007F, |
@@ -1755,7 +1755,7 @@ const u32 b43_ntab_iqlt0[] = { | |||
1755 | 0x0000007F, 0x0000007F, 0x0000007F, 0x0000007F, | 1755 | 0x0000007F, 0x0000007F, 0x0000007F, 0x0000007F, |
1756 | }; | 1756 | }; |
1757 | 1757 | ||
1758 | const u32 b43_ntab_iqlt1[] = { | 1758 | static const u32 b43_ntab_iqlt1[] = { |
1759 | 0x0000007F, 0x0000007F, 0x0000007F, 0x0000007F, | 1759 | 0x0000007F, 0x0000007F, 0x0000007F, 0x0000007F, |
1760 | 0x0000007F, 0x0000007F, 0x0000007F, 0x0000007F, | 1760 | 0x0000007F, 0x0000007F, 0x0000007F, 0x0000007F, |
1761 | 0x0000007F, 0x0000007F, 0x0000007F, 0x0000007F, | 1761 | 0x0000007F, 0x0000007F, 0x0000007F, 0x0000007F, |
@@ -1790,7 +1790,7 @@ const u32 b43_ntab_iqlt1[] = { | |||
1790 | 0x0000007F, 0x0000007F, 0x0000007F, 0x0000007F, | 1790 | 0x0000007F, 0x0000007F, 0x0000007F, 0x0000007F, |
1791 | }; | 1791 | }; |
1792 | 1792 | ||
1793 | const u16 b43_ntab_loftlt0[] = { | 1793 | static const u16 b43_ntab_loftlt0[] = { |
1794 | 0x0000, 0x0101, 0x0002, 0x0103, 0x0000, 0x0101, | 1794 | 0x0000, 0x0101, 0x0002, 0x0103, 0x0000, 0x0101, |
1795 | 0x0002, 0x0103, 0x0000, 0x0101, 0x0002, 0x0103, | 1795 | 0x0002, 0x0103, 0x0000, 0x0101, 0x0002, 0x0103, |
1796 | 0x0000, 0x0101, 0x0002, 0x0103, 0x0000, 0x0101, | 1796 | 0x0000, 0x0101, 0x0002, 0x0103, 0x0000, 0x0101, |
@@ -1815,7 +1815,7 @@ const u16 b43_ntab_loftlt0[] = { | |||
1815 | 0x0002, 0x0103, | 1815 | 0x0002, 0x0103, |
1816 | }; | 1816 | }; |
1817 | 1817 | ||
1818 | const u16 b43_ntab_loftlt1[] = { | 1818 | static const u16 b43_ntab_loftlt1[] = { |
1819 | 0x0000, 0x0101, 0x0002, 0x0103, 0x0000, 0x0101, | 1819 | 0x0000, 0x0101, 0x0002, 0x0103, 0x0000, 0x0101, |
1820 | 0x0002, 0x0103, 0x0000, 0x0101, 0x0002, 0x0103, | 1820 | 0x0002, 0x0103, 0x0000, 0x0101, 0x0002, 0x0103, |
1821 | 0x0000, 0x0101, 0x0002, 0x0103, 0x0000, 0x0101, | 1821 | 0x0000, 0x0101, 0x0002, 0x0103, 0x0000, 0x0101, |
@@ -1840,7 +1840,7 @@ const u16 b43_ntab_loftlt1[] = { | |||
1840 | 0x0002, 0x0103, | 1840 | 0x0002, 0x0103, |
1841 | }; | 1841 | }; |
1842 | 1842 | ||
1843 | const u8 b43_ntab_mcs[] = { | 1843 | static const u8 b43_ntab_mcs[] = { |
1844 | 0x00, 0x08, 0x0A, 0x10, 0x12, 0x19, 0x1A, 0x1C, | 1844 | 0x00, 0x08, 0x0A, 0x10, 0x12, 0x19, 0x1A, 0x1C, |
1845 | 0x40, 0x48, 0x4A, 0x50, 0x52, 0x59, 0x5A, 0x5C, | 1845 | 0x40, 0x48, 0x4A, 0x50, 0x52, 0x59, 0x5A, 0x5C, |
1846 | 0x80, 0x88, 0x8A, 0x90, 0x92, 0x99, 0x9A, 0x9C, | 1846 | 0x80, 0x88, 0x8A, 0x90, 0x92, 0x99, 0x9A, 0x9C, |
@@ -1859,7 +1859,7 @@ const u8 b43_ntab_mcs[] = { | |||
1859 | 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, | 1859 | 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, |
1860 | }; | 1860 | }; |
1861 | 1861 | ||
1862 | const u32 b43_ntab_noisevar10[] = { | 1862 | static const u32 b43_ntab_noisevar10[] = { |
1863 | 0x020C020C, 0x0000014D, 0x020C020C, 0x0000014D, | 1863 | 0x020C020C, 0x0000014D, 0x020C020C, 0x0000014D, |
1864 | 0x020C020C, 0x0000014D, 0x020C020C, 0x0000014D, | 1864 | 0x020C020C, 0x0000014D, 0x020C020C, 0x0000014D, |
1865 | 0x020C020C, 0x0000014D, 0x020C020C, 0x0000014D, | 1865 | 0x020C020C, 0x0000014D, 0x020C020C, 0x0000014D, |
@@ -1926,7 +1926,7 @@ const u32 b43_ntab_noisevar10[] = { | |||
1926 | 0x020C020C, 0x0000014D, 0x020C020C, 0x0000014D, | 1926 | 0x020C020C, 0x0000014D, 0x020C020C, 0x0000014D, |
1927 | }; | 1927 | }; |
1928 | 1928 | ||
1929 | const u32 b43_ntab_noisevar11[] = { | 1929 | static const u32 b43_ntab_noisevar11[] = { |
1930 | 0x020C020C, 0x0000014D, 0x020C020C, 0x0000014D, | 1930 | 0x020C020C, 0x0000014D, 0x020C020C, 0x0000014D, |
1931 | 0x020C020C, 0x0000014D, 0x020C020C, 0x0000014D, | 1931 | 0x020C020C, 0x0000014D, 0x020C020C, 0x0000014D, |
1932 | 0x020C020C, 0x0000014D, 0x020C020C, 0x0000014D, | 1932 | 0x020C020C, 0x0000014D, 0x020C020C, 0x0000014D, |
@@ -1993,7 +1993,7 @@ const u32 b43_ntab_noisevar11[] = { | |||
1993 | 0x020C020C, 0x0000014D, 0x020C020C, 0x0000014D, | 1993 | 0x020C020C, 0x0000014D, 0x020C020C, 0x0000014D, |
1994 | }; | 1994 | }; |
1995 | 1995 | ||
1996 | const u16 b43_ntab_pilot[] = { | 1996 | static const u16 b43_ntab_pilot[] = { |
1997 | 0xFF08, 0xFF08, 0xFF08, 0xFF08, 0xFF08, 0xFF08, | 1997 | 0xFF08, 0xFF08, 0xFF08, 0xFF08, 0xFF08, 0xFF08, |
1998 | 0xFF08, 0xFF08, 0x80D5, 0x80D5, 0x80D5, 0x80D5, | 1998 | 0xFF08, 0xFF08, 0x80D5, 0x80D5, 0x80D5, 0x80D5, |
1999 | 0x80D5, 0x80D5, 0x80D5, 0x80D5, 0xFF0A, 0xFF82, | 1999 | 0x80D5, 0x80D5, 0x80D5, 0x80D5, 0xFF0A, 0xFF82, |
@@ -2011,12 +2011,12 @@ const u16 b43_ntab_pilot[] = { | |||
2011 | 0xF0A0, 0xF028, 0xFFFF, 0xFFFF, | 2011 | 0xF0A0, 0xF028, 0xFFFF, 0xFFFF, |
2012 | }; | 2012 | }; |
2013 | 2013 | ||
2014 | const u32 b43_ntab_pilotlt[] = { | 2014 | static const u32 b43_ntab_pilotlt[] = { |
2015 | 0x76540123, 0x62407351, 0x76543201, 0x76540213, | 2015 | 0x76540123, 0x62407351, 0x76543201, 0x76540213, |
2016 | 0x76540123, 0x76430521, | 2016 | 0x76540123, 0x76430521, |
2017 | }; | 2017 | }; |
2018 | 2018 | ||
2019 | const u32 b43_ntab_tdi20a0[] = { | 2019 | static const u32 b43_ntab_tdi20a0[] = { |
2020 | 0x00091226, 0x000A1429, 0x000B56AD, 0x000C58B0, | 2020 | 0x00091226, 0x000A1429, 0x000B56AD, 0x000C58B0, |
2021 | 0x000D5AB3, 0x000E9CB6, 0x000F9EBA, 0x0000C13D, | 2021 | 0x000D5AB3, 0x000E9CB6, 0x000F9EBA, 0x0000C13D, |
2022 | 0x00020301, 0x00030504, 0x00040708, 0x0005090B, | 2022 | 0x00020301, 0x00030504, 0x00040708, 0x0005090B, |
@@ -2033,7 +2033,7 @@ const u32 b43_ntab_tdi20a0[] = { | |||
2033 | 0x00000000, 0x00000000, 0x00000000, | 2033 | 0x00000000, 0x00000000, 0x00000000, |
2034 | }; | 2034 | }; |
2035 | 2035 | ||
2036 | const u32 b43_ntab_tdi20a1[] = { | 2036 | static const u32 b43_ntab_tdi20a1[] = { |
2037 | 0x00014B26, 0x00028D29, 0x000393AD, 0x00049630, | 2037 | 0x00014B26, 0x00028D29, 0x000393AD, 0x00049630, |
2038 | 0x0005D833, 0x0006DA36, 0x00099C3A, 0x000A9E3D, | 2038 | 0x0005D833, 0x0006DA36, 0x00099C3A, 0x000A9E3D, |
2039 | 0x000BC081, 0x000CC284, 0x000DC488, 0x000F068B, | 2039 | 0x000BC081, 0x000CC284, 0x000DC488, 0x000F068B, |
@@ -2050,7 +2050,7 @@ const u32 b43_ntab_tdi20a1[] = { | |||
2050 | 0x00000000, 0x00000000, 0x00000000, | 2050 | 0x00000000, 0x00000000, 0x00000000, |
2051 | }; | 2051 | }; |
2052 | 2052 | ||
2053 | const u32 b43_ntab_tdi40a0[] = { | 2053 | static const u32 b43_ntab_tdi40a0[] = { |
2054 | 0x0011A346, 0x00136CCF, 0x0014F5D9, 0x001641E2, | 2054 | 0x0011A346, 0x00136CCF, 0x0014F5D9, 0x001641E2, |
2055 | 0x0017CB6B, 0x00195475, 0x001B2383, 0x001CAD0C, | 2055 | 0x0017CB6B, 0x00195475, 0x001B2383, 0x001CAD0C, |
2056 | 0x001E7616, 0x0000821F, 0x00020BA8, 0x0003D4B2, | 2056 | 0x001E7616, 0x0000821F, 0x00020BA8, 0x0003D4B2, |
@@ -2081,7 +2081,7 @@ const u32 b43_ntab_tdi40a0[] = { | |||
2081 | 0x00000000, 0x00000000, | 2081 | 0x00000000, 0x00000000, |
2082 | }; | 2082 | }; |
2083 | 2083 | ||
2084 | const u32 b43_ntab_tdi40a1[] = { | 2084 | static const u32 b43_ntab_tdi40a1[] = { |
2085 | 0x001EDB36, 0x000129CA, 0x0002B353, 0x00047CDD, | 2085 | 0x001EDB36, 0x000129CA, 0x0002B353, 0x00047CDD, |
2086 | 0x0005C8E6, 0x000791EF, 0x00091BF9, 0x000AAA07, | 2086 | 0x0005C8E6, 0x000791EF, 0x00091BF9, 0x000AAA07, |
2087 | 0x000C3391, 0x000DFD1A, 0x00120923, 0x0013D22D, | 2087 | 0x000C3391, 0x000DFD1A, 0x00120923, 0x0013D22D, |
@@ -2112,7 +2112,7 @@ const u32 b43_ntab_tdi40a1[] = { | |||
2112 | 0x00000000, 0x00000000, | 2112 | 0x00000000, 0x00000000, |
2113 | }; | 2113 | }; |
2114 | 2114 | ||
2115 | const u32 b43_ntab_tdtrn[] = { | 2115 | static const u32 b43_ntab_tdtrn[] = { |
2116 | 0x061C061C, 0x0050EE68, 0xF592FE36, 0xFE5212F6, | 2116 | 0x061C061C, 0x0050EE68, 0xF592FE36, 0xFE5212F6, |
2117 | 0x00000C38, 0xFE5212F6, 0xF592FE36, 0x0050EE68, | 2117 | 0x00000C38, 0xFE5212F6, 0xF592FE36, 0x0050EE68, |
2118 | 0x061C061C, 0xEE680050, 0xFE36F592, 0x12F6FE52, | 2118 | 0x061C061C, 0xEE680050, 0xFE36F592, 0x12F6FE52, |
@@ -2291,7 +2291,7 @@ const u32 b43_ntab_tdtrn[] = { | |||
2291 | 0xFA58FC00, 0x0B64FC7E, 0x0800F7B6, 0x00F006BE, | 2291 | 0xFA58FC00, 0x0B64FC7E, 0x0800F7B6, 0x00F006BE, |
2292 | }; | 2292 | }; |
2293 | 2293 | ||
2294 | const u32 b43_ntab_tmap[] = { | 2294 | static const u32 b43_ntab_tmap[] = { |
2295 | 0x8A88AA80, 0x8AAAAA8A, 0x8A8A8AA8, 0x00000888, | 2295 | 0x8A88AA80, 0x8AAAAA8A, 0x8A8A8AA8, 0x00000888, |
2296 | 0x88000000, 0x8A8A88AA, 0x8AA88888, 0x8888A8A8, | 2296 | 0x88000000, 0x8A8A88AA, 0x8AA88888, 0x8888A8A8, |
2297 | 0xF1111110, 0x11111111, 0x11F11111, 0x00000111, | 2297 | 0xF1111110, 0x11111111, 0x11F11111, 0x00000111, |
@@ -2406,6 +2406,483 @@ const u32 b43_ntab_tmap[] = { | |||
2406 | 0x00000000, 0x00000000, 0x00000000, 0x00000000, | 2406 | 0x00000000, 0x00000000, 0x00000000, 0x00000000, |
2407 | }; | 2407 | }; |
2408 | 2408 | ||
2409 | const u32 b43_ntab_tx_gain_rev0_1_2[] = { | ||
2410 | 0x03cc2b44, 0x03cc2b42, 0x03cc2a44, 0x03cc2a42, | ||
2411 | 0x03cc2944, 0x03c82b44, 0x03c82b42, 0x03c82a44, | ||
2412 | 0x03c82a42, 0x03c82944, 0x03c82942, 0x03c82844, | ||
2413 | 0x03c82842, 0x03c42b44, 0x03c42b42, 0x03c42a44, | ||
2414 | 0x03c42a42, 0x03c42944, 0x03c42942, 0x03c42844, | ||
2415 | 0x03c42842, 0x03c42744, 0x03c42742, 0x03c42644, | ||
2416 | 0x03c42642, 0x03c42544, 0x03c42542, 0x03c42444, | ||
2417 | 0x03c42442, 0x03c02b44, 0x03c02b42, 0x03c02a44, | ||
2418 | 0x03c02a42, 0x03c02944, 0x03c02942, 0x03c02844, | ||
2419 | 0x03c02842, 0x03c02744, 0x03c02742, 0x03b02b44, | ||
2420 | 0x03b02b42, 0x03b02a44, 0x03b02a42, 0x03b02944, | ||
2421 | 0x03b02942, 0x03b02844, 0x03b02842, 0x03b02744, | ||
2422 | 0x03b02742, 0x03b02644, 0x03b02642, 0x03b02544, | ||
2423 | 0x03b02542, 0x03a02b44, 0x03a02b42, 0x03a02a44, | ||
2424 | 0x03a02a42, 0x03a02944, 0x03a02942, 0x03a02844, | ||
2425 | 0x03a02842, 0x03a02744, 0x03a02742, 0x03902b44, | ||
2426 | 0x03902b42, 0x03902a44, 0x03902a42, 0x03902944, | ||
2427 | 0x03902942, 0x03902844, 0x03902842, 0x03902744, | ||
2428 | 0x03902742, 0x03902644, 0x03902642, 0x03902544, | ||
2429 | 0x03902542, 0x03802b44, 0x03802b42, 0x03802a44, | ||
2430 | 0x03802a42, 0x03802944, 0x03802942, 0x03802844, | ||
2431 | 0x03802842, 0x03802744, 0x03802742, 0x03802644, | ||
2432 | 0x03802642, 0x03802544, 0x03802542, 0x03802444, | ||
2433 | 0x03802442, 0x03802344, 0x03802342, 0x03802244, | ||
2434 | 0x03802242, 0x03802144, 0x03802142, 0x03802044, | ||
2435 | 0x03802042, 0x03801f44, 0x03801f42, 0x03801e44, | ||
2436 | 0x03801e42, 0x03801d44, 0x03801d42, 0x03801c44, | ||
2437 | 0x03801c42, 0x03801b44, 0x03801b42, 0x03801a44, | ||
2438 | 0x03801a42, 0x03801944, 0x03801942, 0x03801844, | ||
2439 | 0x03801842, 0x03801744, 0x03801742, 0x03801644, | ||
2440 | 0x03801642, 0x03801544, 0x03801542, 0x03801444, | ||
2441 | 0x03801442, 0x03801344, 0x03801342, 0x00002b00, | ||
2442 | }; | ||
2443 | |||
2444 | const u32 b43_ntab_tx_gain_rev3plus_2ghz[] = { | ||
2445 | 0x1f410044, 0x1f410042, 0x1f410040, 0x1f41003e, | ||
2446 | 0x1f41003c, 0x1f41003b, 0x1f410039, 0x1f410037, | ||
2447 | 0x1e410044, 0x1e410042, 0x1e410040, 0x1e41003e, | ||
2448 | 0x1e41003c, 0x1e41003b, 0x1e410039, 0x1e410037, | ||
2449 | 0x1d410044, 0x1d410042, 0x1d410040, 0x1d41003e, | ||
2450 | 0x1d41003c, 0x1d41003b, 0x1d410039, 0x1d410037, | ||
2451 | 0x1c410044, 0x1c410042, 0x1c410040, 0x1c41003e, | ||
2452 | 0x1c41003c, 0x1c41003b, 0x1c410039, 0x1c410037, | ||
2453 | 0x1b410044, 0x1b410042, 0x1b410040, 0x1b41003e, | ||
2454 | 0x1b41003c, 0x1b41003b, 0x1b410039, 0x1b410037, | ||
2455 | 0x1a410044, 0x1a410042, 0x1a410040, 0x1a41003e, | ||
2456 | 0x1a41003c, 0x1a41003b, 0x1a410039, 0x1a410037, | ||
2457 | 0x19410044, 0x19410042, 0x19410040, 0x1941003e, | ||
2458 | 0x1941003c, 0x1941003b, 0x19410039, 0x19410037, | ||
2459 | 0x18410044, 0x18410042, 0x18410040, 0x1841003e, | ||
2460 | 0x1841003c, 0x1841003b, 0x18410039, 0x18410037, | ||
2461 | 0x17410044, 0x17410042, 0x17410040, 0x1741003e, | ||
2462 | 0x1741003c, 0x1741003b, 0x17410039, 0x17410037, | ||
2463 | 0x16410044, 0x16410042, 0x16410040, 0x1641003e, | ||
2464 | 0x1641003c, 0x1641003b, 0x16410039, 0x16410037, | ||
2465 | 0x15410044, 0x15410042, 0x15410040, 0x1541003e, | ||
2466 | 0x1541003c, 0x1541003b, 0x15410039, 0x15410037, | ||
2467 | 0x14410044, 0x14410042, 0x14410040, 0x1441003e, | ||
2468 | 0x1441003c, 0x1441003b, 0x14410039, 0x14410037, | ||
2469 | 0x13410044, 0x13410042, 0x13410040, 0x1341003e, | ||
2470 | 0x1341003c, 0x1341003b, 0x13410039, 0x13410037, | ||
2471 | 0x12410044, 0x12410042, 0x12410040, 0x1241003e, | ||
2472 | 0x1241003c, 0x1241003b, 0x12410039, 0x12410037, | ||
2473 | 0x11410044, 0x11410042, 0x11410040, 0x1141003e, | ||
2474 | 0x1141003c, 0x1141003b, 0x11410039, 0x11410037, | ||
2475 | 0x10410044, 0x10410042, 0x10410040, 0x1041003e, | ||
2476 | 0x1041003c, 0x1041003b, 0x10410039, 0x10410037, | ||
2477 | }; | ||
2478 | |||
2479 | const u32 b43_ntab_tx_gain_rev3_5ghz[] = { | ||
2480 | 0xcff70044, 0xcff70042, 0xcff70040, 0xcff7003e, | ||
2481 | 0xcff7003c, 0xcff7003b, 0xcff70039, 0xcff70037, | ||
2482 | 0xcef70044, 0xcef70042, 0xcef70040, 0xcef7003e, | ||
2483 | 0xcef7003c, 0xcef7003b, 0xcef70039, 0xcef70037, | ||
2484 | 0xcdf70044, 0xcdf70042, 0xcdf70040, 0xcdf7003e, | ||
2485 | 0xcdf7003c, 0xcdf7003b, 0xcdf70039, 0xcdf70037, | ||
2486 | 0xccf70044, 0xccf70042, 0xccf70040, 0xccf7003e, | ||
2487 | 0xccf7003c, 0xccf7003b, 0xccf70039, 0xccf70037, | ||
2488 | 0xcbf70044, 0xcbf70042, 0xcbf70040, 0xcbf7003e, | ||
2489 | 0xcbf7003c, 0xcbf7003b, 0xcbf70039, 0xcbf70037, | ||
2490 | 0xcaf70044, 0xcaf70042, 0xcaf70040, 0xcaf7003e, | ||
2491 | 0xcaf7003c, 0xcaf7003b, 0xcaf70039, 0xcaf70037, | ||
2492 | 0xc9f70044, 0xc9f70042, 0xc9f70040, 0xc9f7003e, | ||
2493 | 0xc9f7003c, 0xc9f7003b, 0xc9f70039, 0xc9f70037, | ||
2494 | 0xc8f70044, 0xc8f70042, 0xc8f70040, 0xc8f7003e, | ||
2495 | 0xc8f7003c, 0xc8f7003b, 0xc8f70039, 0xc8f70037, | ||
2496 | 0xc7f70044, 0xc7f70042, 0xc7f70040, 0xc7f7003e, | ||
2497 | 0xc7f7003c, 0xc7f7003b, 0xc7f70039, 0xc7f70037, | ||
2498 | 0xc6f70044, 0xc6f70042, 0xc6f70040, 0xc6f7003e, | ||
2499 | 0xc6f7003c, 0xc6f7003b, 0xc6f70039, 0xc6f70037, | ||
2500 | 0xc5f70044, 0xc5f70042, 0xc5f70040, 0xc5f7003e, | ||
2501 | 0xc5f7003c, 0xc5f7003b, 0xc5f70039, 0xc5f70037, | ||
2502 | 0xc4f70044, 0xc4f70042, 0xc4f70040, 0xc4f7003e, | ||
2503 | 0xc4f7003c, 0xc4f7003b, 0xc4f70039, 0xc4f70037, | ||
2504 | 0xc3f70044, 0xc3f70042, 0xc3f70040, 0xc3f7003e, | ||
2505 | 0xc3f7003c, 0xc3f7003b, 0xc3f70039, 0xc3f70037, | ||
2506 | 0xc2f70044, 0xc2f70042, 0xc2f70040, 0xc2f7003e, | ||
2507 | 0xc2f7003c, 0xc2f7003b, 0xc2f70039, 0xc2f70037, | ||
2508 | 0xc1f70044, 0xc1f70042, 0xc1f70040, 0xc1f7003e, | ||
2509 | 0xc1f7003c, 0xc1f7003b, 0xc1f70039, 0xc1f70037, | ||
2510 | 0xc0f70044, 0xc0f70042, 0xc0f70040, 0xc0f7003e, | ||
2511 | 0xc0f7003c, 0xc0f7003b, 0xc0f70039, 0xc0f70037, | ||
2512 | }; | ||
2513 | |||
2514 | const u32 b43_ntab_tx_gain_rev4_5ghz[] = { | ||
2515 | 0x2ff20044, 0x2ff20042, 0x2ff20040, 0x2ff2003e, | ||
2516 | 0x2ff2003c, 0x2ff2003b, 0x2ff20039, 0x2ff20037, | ||
2517 | 0x2ef20044, 0x2ef20042, 0x2ef20040, 0x2ef2003e, | ||
2518 | 0x2ef2003c, 0x2ef2003b, 0x2ef20039, 0x2ef20037, | ||
2519 | 0x2df20044, 0x2df20042, 0x2df20040, 0x2df2003e, | ||
2520 | 0x2df2003c, 0x2df2003b, 0x2df20039, 0x2df20037, | ||
2521 | 0x2cf20044, 0x2cf20042, 0x2cf20040, 0x2cf2003e, | ||
2522 | 0x2cf2003c, 0x2cf2003b, 0x2cf20039, 0x2cf20037, | ||
2523 | 0x2bf20044, 0x2bf20042, 0x2bf20040, 0x2bf2003e, | ||
2524 | 0x2bf2003c, 0x2bf2003b, 0x2bf20039, 0x2bf20037, | ||
2525 | 0x2af20044, 0x2af20042, 0x2af20040, 0x2af2003e, | ||
2526 | 0x2af2003c, 0x2af2003b, 0x2af20039, 0x2af20037, | ||
2527 | 0x29f20044, 0x29f20042, 0x29f20040, 0x29f2003e, | ||
2528 | 0x29f2003c, 0x29f2003b, 0x29f20039, 0x29f20037, | ||
2529 | 0x28f20044, 0x28f20042, 0x28f20040, 0x28f2003e, | ||
2530 | 0x28f2003c, 0x28f2003b, 0x28f20039, 0x28f20037, | ||
2531 | 0x27f20044, 0x27f20042, 0x27f20040, 0x27f2003e, | ||
2532 | 0x27f2003c, 0x27f2003b, 0x27f20039, 0x27f20037, | ||
2533 | 0x26f20044, 0x26f20042, 0x26f20040, 0x26f2003e, | ||
2534 | 0x26f2003c, 0x26f2003b, 0x26f20039, 0x26f20037, | ||
2535 | 0x25f20044, 0x25f20042, 0x25f20040, 0x25f2003e, | ||
2536 | 0x25f2003c, 0x25f2003b, 0x25f20039, 0x25f20037, | ||
2537 | 0x24f20044, 0x24f20042, 0x24f20040, 0x24f2003e, | ||
2538 | 0x24f2003c, 0x24f2003b, 0x24f20039, 0x24f20038, | ||
2539 | 0x23f20041, 0x23f20040, 0x23f2003f, 0x23f2003e, | ||
2540 | 0x23f2003c, 0x23f2003b, 0x23f20039, 0x23f20037, | ||
2541 | 0x22f20044, 0x22f20042, 0x22f20040, 0x22f2003e, | ||
2542 | 0x22f2003c, 0x22f2003b, 0x22f20039, 0x22f20037, | ||
2543 | 0x21f20044, 0x21f20042, 0x21f20040, 0x21f2003e, | ||
2544 | 0x21f2003c, 0x21f2003b, 0x21f20039, 0x21f20037, | ||
2545 | 0x20d20043, 0x20d20041, 0x20d2003e, 0x20d2003c, | ||
2546 | 0x20d2003a, 0x20d20038, 0x20d20036, 0x20d20034, | ||
2547 | }; | ||
2548 | |||
2549 | const u32 b43_ntab_tx_gain_rev5plus_5ghz[] = { | ||
2550 | 0x0f62004a, 0x0f620048, 0x0f620046, 0x0f620044, | ||
2551 | 0x0f620042, 0x0f620040, 0x0f62003e, 0x0f62003c, | ||
2552 | 0x0e620044, 0x0e620042, 0x0e620040, 0x0e62003e, | ||
2553 | 0x0e62003c, 0x0e62003d, 0x0e62003b, 0x0e62003a, | ||
2554 | 0x0d620043, 0x0d620041, 0x0d620040, 0x0d62003e, | ||
2555 | 0x0d62003d, 0x0d62003c, 0x0d62003b, 0x0d62003a, | ||
2556 | 0x0c620041, 0x0c620040, 0x0c62003f, 0x0c62003e, | ||
2557 | 0x0c62003c, 0x0c62003b, 0x0c620039, 0x0c620037, | ||
2558 | 0x0b620046, 0x0b620044, 0x0b620042, 0x0b620040, | ||
2559 | 0x0b62003e, 0x0b62003c, 0x0b62003b, 0x0b62003a, | ||
2560 | 0x0a620041, 0x0a620040, 0x0a62003e, 0x0a62003c, | ||
2561 | 0x0a62003b, 0x0a62003a, 0x0a620039, 0x0a620038, | ||
2562 | 0x0962003e, 0x0962003d, 0x0962003c, 0x0962003b, | ||
2563 | 0x09620039, 0x09620037, 0x09620035, 0x09620033, | ||
2564 | 0x08620044, 0x08620042, 0x08620040, 0x0862003e, | ||
2565 | 0x0862003c, 0x0862003b, 0x0862003a, 0x08620039, | ||
2566 | 0x07620043, 0x07620042, 0x07620040, 0x0762003f, | ||
2567 | 0x0762003d, 0x0762003b, 0x0762003a, 0x07620039, | ||
2568 | 0x0662003e, 0x0662003d, 0x0662003c, 0x0662003b, | ||
2569 | 0x06620039, 0x06620037, 0x06620035, 0x06620033, | ||
2570 | 0x05620046, 0x05620044, 0x05620042, 0x05620040, | ||
2571 | 0x0562003e, 0x0562003c, 0x0562003b, 0x05620039, | ||
2572 | 0x04620044, 0x04620042, 0x04620040, 0x0462003e, | ||
2573 | 0x0462003c, 0x0462003b, 0x04620039, 0x04620038, | ||
2574 | 0x0362003c, 0x0362003b, 0x0362003a, 0x03620039, | ||
2575 | 0x03620038, 0x03620037, 0x03620035, 0x03620033, | ||
2576 | 0x0262004c, 0x0262004a, 0x02620048, 0x02620047, | ||
2577 | 0x02620046, 0x02620044, 0x02620043, 0x02620042, | ||
2578 | 0x0162004a, 0x01620048, 0x01620046, 0x01620044, | ||
2579 | 0x01620043, 0x01620042, 0x01620041, 0x01620040, | ||
2580 | 0x00620042, 0x00620040, 0x0062003e, 0x0062003c, | ||
2581 | 0x0062003b, 0x00620039, 0x00620037, 0x00620035, | ||
2582 | }; | ||
2583 | |||
2584 | const u32 txpwrctrl_tx_gain_ipa[] = { | ||
2585 | 0x5ff7002d, 0x5ff7002b, 0x5ff7002a, 0x5ff70029, | ||
2586 | 0x5ff70028, 0x5ff70027, 0x5ff70026, 0x5ff70025, | ||
2587 | 0x5ef7002d, 0x5ef7002b, 0x5ef7002a, 0x5ef70029, | ||
2588 | 0x5ef70028, 0x5ef70027, 0x5ef70026, 0x5ef70025, | ||
2589 | 0x5df7002d, 0x5df7002b, 0x5df7002a, 0x5df70029, | ||
2590 | 0x5df70028, 0x5df70027, 0x5df70026, 0x5df70025, | ||
2591 | 0x5cf7002d, 0x5cf7002b, 0x5cf7002a, 0x5cf70029, | ||
2592 | 0x5cf70028, 0x5cf70027, 0x5cf70026, 0x5cf70025, | ||
2593 | 0x5bf7002d, 0x5bf7002b, 0x5bf7002a, 0x5bf70029, | ||
2594 | 0x5bf70028, 0x5bf70027, 0x5bf70026, 0x5bf70025, | ||
2595 | 0x5af7002d, 0x5af7002b, 0x5af7002a, 0x5af70029, | ||
2596 | 0x5af70028, 0x5af70027, 0x5af70026, 0x5af70025, | ||
2597 | 0x59f7002d, 0x59f7002b, 0x59f7002a, 0x59f70029, | ||
2598 | 0x59f70028, 0x59f70027, 0x59f70026, 0x59f70025, | ||
2599 | 0x58f7002d, 0x58f7002b, 0x58f7002a, 0x58f70029, | ||
2600 | 0x58f70028, 0x58f70027, 0x58f70026, 0x58f70025, | ||
2601 | 0x57f7002d, 0x57f7002b, 0x57f7002a, 0x57f70029, | ||
2602 | 0x57f70028, 0x57f70027, 0x57f70026, 0x57f70025, | ||
2603 | 0x56f7002d, 0x56f7002b, 0x56f7002a, 0x56f70029, | ||
2604 | 0x56f70028, 0x56f70027, 0x56f70026, 0x56f70025, | ||
2605 | 0x55f7002d, 0x55f7002b, 0x55f7002a, 0x55f70029, | ||
2606 | 0x55f70028, 0x55f70027, 0x55f70026, 0x55f70025, | ||
2607 | 0x54f7002d, 0x54f7002b, 0x54f7002a, 0x54f70029, | ||
2608 | 0x54f70028, 0x54f70027, 0x54f70026, 0x54f70025, | ||
2609 | 0x53f7002d, 0x53f7002b, 0x53f7002a, 0x53f70029, | ||
2610 | 0x53f70028, 0x53f70027, 0x53f70026, 0x53f70025, | ||
2611 | 0x52f7002d, 0x52f7002b, 0x52f7002a, 0x52f70029, | ||
2612 | 0x52f70028, 0x52f70027, 0x52f70026, 0x52f70025, | ||
2613 | 0x51f7002d, 0x51f7002b, 0x51f7002a, 0x51f70029, | ||
2614 | 0x51f70028, 0x51f70027, 0x51f70026, 0x51f70025, | ||
2615 | 0x50f7002d, 0x50f7002b, 0x50f7002a, 0x50f70029, | ||
2616 | 0x50f70028, 0x50f70027, 0x50f70026, 0x50f70025, | ||
2617 | }; | ||
2618 | |||
2619 | const u32 txpwrctrl_tx_gain_ipa_rev5[] = { | ||
2620 | 0x1ff7002d, 0x1ff7002b, 0x1ff7002a, 0x1ff70029, | ||
2621 | 0x1ff70028, 0x1ff70027, 0x1ff70026, 0x1ff70025, | ||
2622 | 0x1ef7002d, 0x1ef7002b, 0x1ef7002a, 0x1ef70029, | ||
2623 | 0x1ef70028, 0x1ef70027, 0x1ef70026, 0x1ef70025, | ||
2624 | 0x1df7002d, 0x1df7002b, 0x1df7002a, 0x1df70029, | ||
2625 | 0x1df70028, 0x1df70027, 0x1df70026, 0x1df70025, | ||
2626 | 0x1cf7002d, 0x1cf7002b, 0x1cf7002a, 0x1cf70029, | ||
2627 | 0x1cf70028, 0x1cf70027, 0x1cf70026, 0x1cf70025, | ||
2628 | 0x1bf7002d, 0x1bf7002b, 0x1bf7002a, 0x1bf70029, | ||
2629 | 0x1bf70028, 0x1bf70027, 0x1bf70026, 0x1bf70025, | ||
2630 | 0x1af7002d, 0x1af7002b, 0x1af7002a, 0x1af70029, | ||
2631 | 0x1af70028, 0x1af70027, 0x1af70026, 0x1af70025, | ||
2632 | 0x19f7002d, 0x19f7002b, 0x19f7002a, 0x19f70029, | ||
2633 | 0x19f70028, 0x19f70027, 0x19f70026, 0x19f70025, | ||
2634 | 0x18f7002d, 0x18f7002b, 0x18f7002a, 0x18f70029, | ||
2635 | 0x18f70028, 0x18f70027, 0x18f70026, 0x18f70025, | ||
2636 | 0x17f7002d, 0x17f7002b, 0x17f7002a, 0x17f70029, | ||
2637 | 0x17f70028, 0x17f70027, 0x17f70026, 0x17f70025, | ||
2638 | 0x16f7002d, 0x16f7002b, 0x16f7002a, 0x16f70029, | ||
2639 | 0x16f70028, 0x16f70027, 0x16f70026, 0x16f70025, | ||
2640 | 0x15f7002d, 0x15f7002b, 0x15f7002a, 0x15f70029, | ||
2641 | 0x15f70028, 0x15f70027, 0x15f70026, 0x15f70025, | ||
2642 | 0x14f7002d, 0x14f7002b, 0x14f7002a, 0x14f70029, | ||
2643 | 0x14f70028, 0x14f70027, 0x14f70026, 0x14f70025, | ||
2644 | 0x13f7002d, 0x13f7002b, 0x13f7002a, 0x13f70029, | ||
2645 | 0x13f70028, 0x13f70027, 0x13f70026, 0x13f70025, | ||
2646 | 0x12f7002d, 0x12f7002b, 0x12f7002a, 0x12f70029, | ||
2647 | 0x12f70028, 0x12f70027, 0x12f70026, 0x12f70025, | ||
2648 | 0x11f7002d, 0x11f7002b, 0x11f7002a, 0x11f70029, | ||
2649 | 0x11f70028, 0x11f70027, 0x11f70026, 0x11f70025, | ||
2650 | 0x10f7002d, 0x10f7002b, 0x10f7002a, 0x10f70029, | ||
2651 | 0x10f70028, 0x10f70027, 0x10f70026, 0x10f70025, | ||
2652 | }; | ||
2653 | |||
2654 | const u32 txpwrctrl_tx_gain_ipa_rev6[] = { | ||
2655 | 0x0ff7002d, 0x0ff7002b, 0x0ff7002a, 0x0ff70029, | ||
2656 | 0x0ff70028, 0x0ff70027, 0x0ff70026, 0x0ff70025, | ||
2657 | 0x0ef7002d, 0x0ef7002b, 0x0ef7002a, 0x0ef70029, | ||
2658 | 0x0ef70028, 0x0ef70027, 0x0ef70026, 0x0ef70025, | ||
2659 | 0x0df7002d, 0x0df7002b, 0x0df7002a, 0x0df70029, | ||
2660 | 0x0df70028, 0x0df70027, 0x0df70026, 0x0df70025, | ||
2661 | 0x0cf7002d, 0x0cf7002b, 0x0cf7002a, 0x0cf70029, | ||
2662 | 0x0cf70028, 0x0cf70027, 0x0cf70026, 0x0cf70025, | ||
2663 | 0x0bf7002d, 0x0bf7002b, 0x0bf7002a, 0x0bf70029, | ||
2664 | 0x0bf70028, 0x0bf70027, 0x0bf70026, 0x0bf70025, | ||
2665 | 0x0af7002d, 0x0af7002b, 0x0af7002a, 0x0af70029, | ||
2666 | 0x0af70028, 0x0af70027, 0x0af70026, 0x0af70025, | ||
2667 | 0x09f7002d, 0x09f7002b, 0x09f7002a, 0x09f70029, | ||
2668 | 0x09f70028, 0x09f70027, 0x09f70026, 0x09f70025, | ||
2669 | 0x08f7002d, 0x08f7002b, 0x08f7002a, 0x08f70029, | ||
2670 | 0x08f70028, 0x08f70027, 0x08f70026, 0x08f70025, | ||
2671 | 0x07f7002d, 0x07f7002b, 0x07f7002a, 0x07f70029, | ||
2672 | 0x07f70028, 0x07f70027, 0x07f70026, 0x07f70025, | ||
2673 | 0x06f7002d, 0x06f7002b, 0x06f7002a, 0x06f70029, | ||
2674 | 0x06f70028, 0x06f70027, 0x06f70026, 0x06f70025, | ||
2675 | 0x05f7002d, 0x05f7002b, 0x05f7002a, 0x05f70029, | ||
2676 | 0x05f70028, 0x05f70027, 0x05f70026, 0x05f70025, | ||
2677 | 0x04f7002d, 0x04f7002b, 0x04f7002a, 0x04f70029, | ||
2678 | 0x04f70028, 0x04f70027, 0x04f70026, 0x04f70025, | ||
2679 | 0x03f7002d, 0x03f7002b, 0x03f7002a, 0x03f70029, | ||
2680 | 0x03f70028, 0x03f70027, 0x03f70026, 0x03f70025, | ||
2681 | 0x02f7002d, 0x02f7002b, 0x02f7002a, 0x02f70029, | ||
2682 | 0x02f70028, 0x02f70027, 0x02f70026, 0x02f70025, | ||
2683 | 0x01f7002d, 0x01f7002b, 0x01f7002a, 0x01f70029, | ||
2684 | 0x01f70028, 0x01f70027, 0x01f70026, 0x01f70025, | ||
2685 | 0x00f7002d, 0x00f7002b, 0x00f7002a, 0x00f70029, | ||
2686 | 0x00f70028, 0x00f70027, 0x00f70026, 0x00f70025, | ||
2687 | }; | ||
2688 | |||
2689 | const u32 txpwrctrl_tx_gain_ipa_5g[] = { | ||
2690 | 0x7ff70035, 0x7ff70033, 0x7ff70032, 0x7ff70031, | ||
2691 | 0x7ff7002f, 0x7ff7002e, 0x7ff7002d, 0x7ff7002b, | ||
2692 | 0x7ff7002a, 0x7ff70029, 0x7ff70028, 0x7ff70027, | ||
2693 | 0x7ff70026, 0x7ff70024, 0x7ff70023, 0x7ff70022, | ||
2694 | 0x7ef70028, 0x7ef70027, 0x7ef70026, 0x7ef70025, | ||
2695 | 0x7ef70024, 0x7ef70023, 0x7df70028, 0x7df70027, | ||
2696 | 0x7df70026, 0x7df70025, 0x7df70024, 0x7df70023, | ||
2697 | 0x7df70022, 0x7cf70029, 0x7cf70028, 0x7cf70027, | ||
2698 | 0x7cf70026, 0x7cf70025, 0x7cf70023, 0x7cf70022, | ||
2699 | 0x7bf70029, 0x7bf70028, 0x7bf70026, 0x7bf70025, | ||
2700 | 0x7bf70024, 0x7bf70023, 0x7bf70022, 0x7bf70021, | ||
2701 | 0x7af70029, 0x7af70028, 0x7af70027, 0x7af70026, | ||
2702 | 0x7af70025, 0x7af70024, 0x7af70023, 0x7af70022, | ||
2703 | 0x79f70029, 0x79f70028, 0x79f70027, 0x79f70026, | ||
2704 | 0x79f70025, 0x79f70024, 0x79f70023, 0x79f70022, | ||
2705 | 0x78f70029, 0x78f70028, 0x78f70027, 0x78f70026, | ||
2706 | 0x78f70025, 0x78f70024, 0x78f70023, 0x78f70022, | ||
2707 | 0x77f70029, 0x77f70028, 0x77f70027, 0x77f70026, | ||
2708 | 0x77f70025, 0x77f70024, 0x77f70023, 0x77f70022, | ||
2709 | 0x76f70029, 0x76f70028, 0x76f70027, 0x76f70026, | ||
2710 | 0x76f70024, 0x76f70023, 0x76f70022, 0x76f70021, | ||
2711 | 0x75f70029, 0x75f70028, 0x75f70027, 0x75f70026, | ||
2712 | 0x75f70025, 0x75f70024, 0x75f70023, 0x74f70029, | ||
2713 | 0x74f70028, 0x74f70026, 0x74f70025, 0x74f70024, | ||
2714 | 0x74f70023, 0x74f70022, 0x73f70029, 0x73f70027, | ||
2715 | 0x73f70026, 0x73f70025, 0x73f70024, 0x73f70023, | ||
2716 | 0x73f70022, 0x72f70028, 0x72f70027, 0x72f70026, | ||
2717 | 0x72f70025, 0x72f70024, 0x72f70023, 0x72f70022, | ||
2718 | 0x71f70028, 0x71f70027, 0x71f70026, 0x71f70025, | ||
2719 | 0x71f70024, 0x71f70023, 0x70f70028, 0x70f70027, | ||
2720 | 0x70f70026, 0x70f70024, 0x70f70023, 0x70f70022, | ||
2721 | 0x70f70021, 0x70f70020, 0x70f70020, 0x70f7001f, | ||
2722 | }; | ||
2723 | |||
2724 | const u16 tbl_iqcal_gainparams[2][9][8] = { | ||
2725 | { | ||
2726 | { 0x000, 0, 0, 2, 0x69, 0x69, 0x69, 0x69 }, | ||
2727 | { 0x700, 7, 0, 0, 0x69, 0x69, 0x69, 0x69 }, | ||
2728 | { 0x710, 7, 1, 0, 0x68, 0x68, 0x68, 0x68 }, | ||
2729 | { 0x720, 7, 2, 0, 0x67, 0x67, 0x67, 0x67 }, | ||
2730 | { 0x730, 7, 3, 0, 0x66, 0x66, 0x66, 0x66 }, | ||
2731 | { 0x740, 7, 4, 0, 0x65, 0x65, 0x65, 0x65 }, | ||
2732 | { 0x741, 7, 4, 1, 0x65, 0x65, 0x65, 0x65 }, | ||
2733 | { 0x742, 7, 4, 2, 0x65, 0x65, 0x65, 0x65 }, | ||
2734 | { 0x743, 7, 4, 3, 0x65, 0x65, 0x65, 0x65 } | ||
2735 | }, | ||
2736 | { | ||
2737 | { 0x000, 7, 0, 0, 0x79, 0x79, 0x79, 0x79 }, | ||
2738 | { 0x700, 7, 0, 0, 0x79, 0x79, 0x79, 0x79 }, | ||
2739 | { 0x710, 7, 1, 0, 0x79, 0x79, 0x79, 0x79 }, | ||
2740 | { 0x720, 7, 2, 0, 0x78, 0x78, 0x78, 0x78 }, | ||
2741 | { 0x730, 7, 3, 0, 0x78, 0x78, 0x78, 0x78 }, | ||
2742 | { 0x740, 7, 4, 0, 0x78, 0x78, 0x78, 0x78 }, | ||
2743 | { 0x741, 7, 4, 1, 0x78, 0x78, 0x78, 0x78 }, | ||
2744 | { 0x742, 7, 4, 2, 0x78, 0x78, 0x78, 0x78 }, | ||
2745 | { 0x743, 7, 4, 3, 0x78, 0x78, 0x78, 0x78 } | ||
2746 | } | ||
2747 | }; | ||
2748 | |||
2749 | const struct nphy_txiqcal_ladder ladder_lo[] = { | ||
2750 | { 3, 0 }, | ||
2751 | { 4, 0 }, | ||
2752 | { 6, 0 }, | ||
2753 | { 9, 0 }, | ||
2754 | { 13, 0 }, | ||
2755 | { 18, 0 }, | ||
2756 | { 25, 0 }, | ||
2757 | { 25, 1 }, | ||
2758 | { 25, 2 }, | ||
2759 | { 25, 3 }, | ||
2760 | { 25, 4 }, | ||
2761 | { 25, 5 }, | ||
2762 | { 25, 6 }, | ||
2763 | { 25, 7 }, | ||
2764 | { 35, 7 }, | ||
2765 | { 50, 7 }, | ||
2766 | { 71, 7 }, | ||
2767 | { 100, 7 } | ||
2768 | }; | ||
2769 | |||
2770 | const struct nphy_txiqcal_ladder ladder_iq[] = { | ||
2771 | { 3, 0 }, | ||
2772 | { 4, 0 }, | ||
2773 | { 6, 0 }, | ||
2774 | { 9, 0 }, | ||
2775 | { 13, 0 }, | ||
2776 | { 18, 0 }, | ||
2777 | { 25, 0 }, | ||
2778 | { 35, 0 }, | ||
2779 | { 50, 0 }, | ||
2780 | { 71, 0 }, | ||
2781 | { 100, 0 }, | ||
2782 | { 100, 1 }, | ||
2783 | { 100, 2 }, | ||
2784 | { 100, 3 }, | ||
2785 | { 100, 4 }, | ||
2786 | { 100, 5 }, | ||
2787 | { 100, 6 }, | ||
2788 | { 100, 7 } | ||
2789 | }; | ||
2790 | |||
2791 | const u16 loscale[] = { | ||
2792 | 256, 256, 271, 271, | ||
2793 | 287, 256, 256, 271, | ||
2794 | 271, 287, 287, 304, | ||
2795 | 304, 256, 256, 271, | ||
2796 | 271, 287, 287, 304, | ||
2797 | 304, 322, 322, 341, | ||
2798 | 341, 362, 362, 383, | ||
2799 | 383, 256, 256, 271, | ||
2800 | 271, 287, 287, 304, | ||
2801 | 304, 322, 322, 256, | ||
2802 | 256, 271, 271, 287, | ||
2803 | 287, 304, 304, 322, | ||
2804 | 322, 341, 341, 362, | ||
2805 | 362, 256, 256, 271, | ||
2806 | 271, 287, 287, 304, | ||
2807 | 304, 322, 322, 256, | ||
2808 | 256, 271, 271, 287, | ||
2809 | 287, 304, 304, 322, | ||
2810 | 322, 341, 341, 362, | ||
2811 | 362, 256, 256, 271, | ||
2812 | 271, 287, 287, 304, | ||
2813 | 304, 322, 322, 341, | ||
2814 | 341, 362, 362, 383, | ||
2815 | 383, 406, 406, 430, | ||
2816 | 430, 455, 455, 482, | ||
2817 | 482, 511, 511, 541, | ||
2818 | 541, 573, 573, 607, | ||
2819 | 607, 643, 643, 681, | ||
2820 | 681, 722, 722, 764, | ||
2821 | 764, 810, 810, 858, | ||
2822 | 858, 908, 908, 962, | ||
2823 | 962, 1019, 1019, 256 | ||
2824 | }; | ||
2825 | |||
2826 | const u16 tbl_tx_iqlo_cal_loft_ladder_40[] = { | ||
2827 | 0x0200, 0x0300, 0x0400, 0x0700, | ||
2828 | 0x0900, 0x0c00, 0x1200, 0x1201, | ||
2829 | 0x1202, 0x1203, 0x1204, 0x1205, | ||
2830 | 0x1206, 0x1207, 0x1907, 0x2307, | ||
2831 | 0x3207, 0x4707 | ||
2832 | }; | ||
2833 | |||
2834 | const u16 tbl_tx_iqlo_cal_loft_ladder_20[] = { | ||
2835 | 0x0300, 0x0500, 0x0700, 0x0900, | ||
2836 | 0x0d00, 0x1100, 0x1900, 0x1901, | ||
2837 | 0x1902, 0x1903, 0x1904, 0x1905, | ||
2838 | 0x1906, 0x1907, 0x2407, 0x3207, | ||
2839 | 0x4607, 0x6407 | ||
2840 | }; | ||
2841 | |||
2842 | const u16 tbl_tx_iqlo_cal_iqimb_ladder_40[] = { | ||
2843 | 0x0100, 0x0200, 0x0400, 0x0700, | ||
2844 | 0x0900, 0x0c00, 0x1200, 0x1900, | ||
2845 | 0x2300, 0x3200, 0x4700, 0x4701, | ||
2846 | 0x4702, 0x4703, 0x4704, 0x4705, | ||
2847 | 0x4706, 0x4707 | ||
2848 | }; | ||
2849 | |||
2850 | const u16 tbl_tx_iqlo_cal_iqimb_ladder_20[] = { | ||
2851 | 0x0200, 0x0300, 0x0600, 0x0900, | ||
2852 | 0x0d00, 0x1100, 0x1900, 0x2400, | ||
2853 | 0x3200, 0x4600, 0x6400, 0x6401, | ||
2854 | 0x6402, 0x6403, 0x6404, 0x6405, | ||
2855 | 0x6406, 0x6407 | ||
2856 | }; | ||
2857 | |||
2858 | const u16 tbl_tx_iqlo_cal_startcoefs_nphyrev3[B43_NTAB_TX_IQLO_CAL_STARTCOEFS_REV3] = { }; | ||
2859 | |||
2860 | const u16 tbl_tx_iqlo_cal_startcoefs[B43_NTAB_TX_IQLO_CAL_STARTCOEFS] = { }; | ||
2861 | |||
2862 | const u16 tbl_tx_iqlo_cal_cmds_recal_nphyrev3[] = { | ||
2863 | 0x8423, 0x8323, 0x8073, 0x8256, | ||
2864 | 0x8045, 0x8223, 0x9423, 0x9323, | ||
2865 | 0x9073, 0x9256, 0x9045, 0x9223 | ||
2866 | }; | ||
2867 | |||
2868 | const u16 tbl_tx_iqlo_cal_cmds_recal[] = { | ||
2869 | 0x8101, 0x8253, 0x8053, 0x8234, | ||
2870 | 0x8034, 0x9101, 0x9253, 0x9053, | ||
2871 | 0x9234, 0x9034 | ||
2872 | }; | ||
2873 | |||
2874 | const u16 tbl_tx_iqlo_cal_cmds_fullcal[] = { | ||
2875 | 0x8123, 0x8264, 0x8086, 0x8245, | ||
2876 | 0x8056, 0x9123, 0x9264, 0x9086, | ||
2877 | 0x9245, 0x9056 | ||
2878 | }; | ||
2879 | |||
2880 | const u16 tbl_tx_iqlo_cal_cmds_fullcal_nphyrev3[] = { | ||
2881 | 0x8434, 0x8334, 0x8084, 0x8267, | ||
2882 | 0x8056, 0x8234, 0x9434, 0x9334, | ||
2883 | 0x9084, 0x9267, 0x9056, 0x9234 | ||
2884 | }; | ||
2885 | |||
2409 | static inline void assert_ntab_array_sizes(void) | 2886 | static inline void assert_ntab_array_sizes(void) |
2410 | { | 2887 | { |
2411 | #undef check | 2888 | #undef check |
@@ -2474,3 +2951,51 @@ void b43_ntab_write(struct b43_wldev *dev, u32 offset, u32 value) | |||
2474 | /* Some compiletime assertions... */ | 2951 | /* Some compiletime assertions... */ |
2475 | assert_ntab_array_sizes(); | 2952 | assert_ntab_array_sizes(); |
2476 | } | 2953 | } |
2954 | |||
2955 | #define ntab_upload(dev, offset, data) do { \ | ||
2956 | unsigned int i; \ | ||
2957 | for (i = 0; i < (offset##_SIZE); i++) \ | ||
2958 | b43_ntab_write(dev, (offset) + i, (data)[i]); \ | ||
2959 | } while (0) | ||
2960 | |||
2961 | void b43_nphy_rev0_1_2_tables_init(struct b43_wldev *dev) | ||
2962 | { | ||
2963 | /* Static tables */ | ||
2964 | ntab_upload(dev, B43_NTAB_FRAMESTRUCT, b43_ntab_framestruct); | ||
2965 | ntab_upload(dev, B43_NTAB_FRAMELT, b43_ntab_framelookup); | ||
2966 | ntab_upload(dev, B43_NTAB_TMAP, b43_ntab_tmap); | ||
2967 | ntab_upload(dev, B43_NTAB_TDTRN, b43_ntab_tdtrn); | ||
2968 | ntab_upload(dev, B43_NTAB_INTLEVEL, b43_ntab_intlevel); | ||
2969 | ntab_upload(dev, B43_NTAB_PILOT, b43_ntab_pilot); | ||
2970 | ntab_upload(dev, B43_NTAB_PILOTLT, b43_ntab_pilotlt); | ||
2971 | ntab_upload(dev, B43_NTAB_TDI20A0, b43_ntab_tdi20a0); | ||
2972 | ntab_upload(dev, B43_NTAB_TDI20A1, b43_ntab_tdi20a1); | ||
2973 | ntab_upload(dev, B43_NTAB_TDI40A0, b43_ntab_tdi40a0); | ||
2974 | ntab_upload(dev, B43_NTAB_TDI40A1, b43_ntab_tdi40a1); | ||
2975 | ntab_upload(dev, B43_NTAB_BDI, b43_ntab_bdi); | ||
2976 | ntab_upload(dev, B43_NTAB_CHANEST, b43_ntab_channelest); | ||
2977 | ntab_upload(dev, B43_NTAB_MCS, b43_ntab_mcs); | ||
2978 | |||
2979 | /* Volatile tables */ | ||
2980 | ntab_upload(dev, B43_NTAB_NOISEVAR10, b43_ntab_noisevar10); | ||
2981 | ntab_upload(dev, B43_NTAB_NOISEVAR11, b43_ntab_noisevar11); | ||
2982 | ntab_upload(dev, B43_NTAB_C0_ESTPLT, b43_ntab_estimatepowerlt0); | ||
2983 | ntab_upload(dev, B43_NTAB_C1_ESTPLT, b43_ntab_estimatepowerlt1); | ||
2984 | ntab_upload(dev, B43_NTAB_C0_ADJPLT, b43_ntab_adjustpower0); | ||
2985 | ntab_upload(dev, B43_NTAB_C1_ADJPLT, b43_ntab_adjustpower1); | ||
2986 | ntab_upload(dev, B43_NTAB_C0_GAINCTL, b43_ntab_gainctl0); | ||
2987 | ntab_upload(dev, B43_NTAB_C1_GAINCTL, b43_ntab_gainctl1); | ||
2988 | ntab_upload(dev, B43_NTAB_C0_IQLT, b43_ntab_iqlt0); | ||
2989 | ntab_upload(dev, B43_NTAB_C1_IQLT, b43_ntab_iqlt1); | ||
2990 | ntab_upload(dev, B43_NTAB_C0_LOFEEDTH, b43_ntab_loftlt0); | ||
2991 | ntab_upload(dev, B43_NTAB_C1_LOFEEDTH, b43_ntab_loftlt1); | ||
2992 | } | ||
2993 | |||
2994 | void b43_nphy_rev3plus_tables_init(struct b43_wldev *dev) | ||
2995 | { | ||
2996 | /* Static tables */ | ||
2997 | /* TODO */ | ||
2998 | |||
2999 | /* Volatile tables */ | ||
3000 | /* TODO */ | ||
3001 | } | ||
diff --git a/drivers/net/wireless/b43/tables_nphy.h b/drivers/net/wireless/b43/tables_nphy.h index 4d498b053ec..51636d02f8b 100644 --- a/drivers/net/wireless/b43/tables_nphy.h +++ b/drivers/net/wireless/b43/tables_nphy.h | |||
@@ -46,6 +46,11 @@ struct b43_nphy_channeltab_entry { | |||
46 | 46 | ||
47 | struct b43_wldev; | 47 | struct b43_wldev; |
48 | 48 | ||
49 | struct nphy_txiqcal_ladder { | ||
50 | u8 percent; | ||
51 | u8 g_env; | ||
52 | }; | ||
53 | |||
49 | /* Upload the default register value table. | 54 | /* Upload the default register value table. |
50 | * If "ghz5" is true, we upload the 5Ghz table. Otherwise the 2.4Ghz | 55 | * If "ghz5" is true, we upload the 5Ghz table. Otherwise the 2.4Ghz |
51 | * table is uploaded. If "ignore_uploadflag" is true, we upload any value | 56 | * table is uploaded. If "ignore_uploadflag" is true, we upload any value |
@@ -126,34 +131,46 @@ b43_nphy_get_chantabent(struct b43_wldev *dev, u8 channel); | |||
126 | #define B43_NTAB_C1_LOFEEDTH B43_NTAB16(0x1B, 0x1C0) /* Local Oscillator Feed Through Lookup Table Core 1 */ | 131 | #define B43_NTAB_C1_LOFEEDTH B43_NTAB16(0x1B, 0x1C0) /* Local Oscillator Feed Through Lookup Table Core 1 */ |
127 | #define B43_NTAB_C1_LOFEEDTH_SIZE 128 | 132 | #define B43_NTAB_C1_LOFEEDTH_SIZE 128 |
128 | 133 | ||
129 | void b43_ntab_write(struct b43_wldev *dev, u32 offset, u32 value); | 134 | #define B43_NTAB_TX_IQLO_CAL_LOFT_LADDER_40_SIZE 18 |
135 | #define B43_NTAB_TX_IQLO_CAL_LOFT_LADDER_20_SIZE 18 | ||
136 | #define B43_NTAB_TX_IQLO_CAL_IQIMB_LADDER_40_SIZE 18 | ||
137 | #define B43_NTAB_TX_IQLO_CAL_IQIMB_LADDER_20_SIZE 18 | ||
138 | #define B43_NTAB_TX_IQLO_CAL_STARTCOEFS_REV3 11 | ||
139 | #define B43_NTAB_TX_IQLO_CAL_STARTCOEFS 9 | ||
140 | #define B43_NTAB_TX_IQLO_CAL_CMDS_RECAL_REV3 12 | ||
141 | #define B43_NTAB_TX_IQLO_CAL_CMDS_RECAL 10 | ||
142 | #define B43_NTAB_TX_IQLO_CAL_CMDS_FULLCAL 10 | ||
143 | #define B43_NTAB_TX_IQLO_CAL_CMDS_FULLCAL_REV3 12 | ||
130 | 144 | ||
131 | extern const u8 b43_ntab_adjustpower0[]; | 145 | void b43_ntab_write(struct b43_wldev *dev, u32 offset, u32 value); |
132 | extern const u8 b43_ntab_adjustpower1[]; | ||
133 | extern const u16 b43_ntab_bdi[]; | ||
134 | extern const u32 b43_ntab_channelest[]; | ||
135 | extern const u8 b43_ntab_estimatepowerlt0[]; | ||
136 | extern const u8 b43_ntab_estimatepowerlt1[]; | ||
137 | extern const u8 b43_ntab_framelookup[]; | ||
138 | extern const u32 b43_ntab_framestruct[]; | ||
139 | extern const u32 b43_ntab_gainctl0[]; | ||
140 | extern const u32 b43_ntab_gainctl1[]; | ||
141 | extern const u32 b43_ntab_intlevel[]; | ||
142 | extern const u32 b43_ntab_iqlt0[]; | ||
143 | extern const u32 b43_ntab_iqlt1[]; | ||
144 | extern const u16 b43_ntab_loftlt0[]; | ||
145 | extern const u16 b43_ntab_loftlt1[]; | ||
146 | extern const u8 b43_ntab_mcs[]; | ||
147 | extern const u32 b43_ntab_noisevar10[]; | ||
148 | extern const u32 b43_ntab_noisevar11[]; | ||
149 | extern const u16 b43_ntab_pilot[]; | ||
150 | extern const u32 b43_ntab_pilotlt[]; | ||
151 | extern const u32 b43_ntab_tdi20a0[]; | ||
152 | extern const u32 b43_ntab_tdi20a1[]; | ||
153 | extern const u32 b43_ntab_tdi40a0[]; | ||
154 | extern const u32 b43_ntab_tdi40a1[]; | ||
155 | extern const u32 b43_ntab_tdtrn[]; | ||
156 | extern const u32 b43_ntab_tmap[]; | ||
157 | 146 | ||
147 | void b43_nphy_rev0_1_2_tables_init(struct b43_wldev *dev); | ||
148 | void b43_nphy_rev3plus_tables_init(struct b43_wldev *dev); | ||
149 | |||
150 | extern const u32 b43_ntab_tx_gain_rev0_1_2[]; | ||
151 | extern const u32 b43_ntab_tx_gain_rev3plus_2ghz[]; | ||
152 | extern const u32 b43_ntab_tx_gain_rev3_5ghz[]; | ||
153 | extern const u32 b43_ntab_tx_gain_rev4_5ghz[]; | ||
154 | extern const u32 b43_ntab_tx_gain_rev5plus_5ghz[]; | ||
155 | |||
156 | extern const u32 txpwrctrl_tx_gain_ipa[]; | ||
157 | extern const u32 txpwrctrl_tx_gain_ipa_rev5[]; | ||
158 | extern const u32 txpwrctrl_tx_gain_ipa_rev6[]; | ||
159 | extern const u32 txpwrctrl_tx_gain_ipa_5g[]; | ||
160 | extern const u16 tbl_iqcal_gainparams[2][9][8]; | ||
161 | extern const struct nphy_txiqcal_ladder ladder_lo[]; | ||
162 | extern const struct nphy_txiqcal_ladder ladder_iq[]; | ||
163 | extern const u16 loscale[]; | ||
164 | |||
165 | extern const u16 tbl_tx_iqlo_cal_loft_ladder_40[]; | ||
166 | extern const u16 tbl_tx_iqlo_cal_loft_ladder_20[]; | ||
167 | extern const u16 tbl_tx_iqlo_cal_iqimb_ladder_40[]; | ||
168 | extern const u16 tbl_tx_iqlo_cal_iqimb_ladder_20[]; | ||
169 | extern const u16 tbl_tx_iqlo_cal_startcoefs_nphyrev3[]; | ||
170 | extern const u16 tbl_tx_iqlo_cal_startcoefs[]; | ||
171 | extern const u16 tbl_tx_iqlo_cal_cmds_recal_nphyrev3[]; | ||
172 | extern const u16 tbl_tx_iqlo_cal_cmds_recal[]; | ||
173 | extern const u16 tbl_tx_iqlo_cal_cmds_fullcal[]; | ||
174 | extern const u16 tbl_tx_iqlo_cal_cmds_fullcal_nphyrev3[]; | ||
158 | 175 | ||
159 | #endif /* B43_TABLES_NPHY_H_ */ | 176 | #endif /* B43_TABLES_NPHY_H_ */ |