Skip to content

Commit c56da25

Browse files
rmileckilinvjw
rmilecki
authored and
linvjw
committed
b43: N-PHY: random trivial fixes for typos, missing writes
Signed-off-by: Rafał Miłecki <zajec5@gmail.com> Signed-off-by: John W. Linville <linville@tuxdriver.com>
1 parent e5f0a27 commit c56da25

File tree

3 files changed

+30
-23
lines changed

3 files changed

+30
-23
lines changed

‎drivers/net/wireless/b43/phy_n.c

Lines changed: 15 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1493,8 +1493,8 @@ static void b43_nphy_workarounds_rev3plus(struct b43_wldev *dev)
14931493
struct ssb_sprom *sprom = dev->dev->bus_sprom;
14941494

14951495
/* TX to RX */
1496-
u8 tx2rx_events[9] = { 0x4, 0x3, 0x6, 0x5, 0x2, 0x1, 0x8, 0x1F };
1497-
u8 tx2rx_delays[9] = { 8, 4, 2, 2, 4, 4, 6, 1 };
1496+
u8 tx2rx_events[8] = { 0x4, 0x3, 0x6, 0x5, 0x2, 0x1, 0x8, 0x1F };
1497+
u8 tx2rx_delays[8] = { 8, 4, 2, 2, 4, 4, 6, 1 };
14981498
/* RX to TX */
14991499
u8 rx2tx_events_ipa[9] = { 0x0, 0x1, 0x2, 0x8, 0x5, 0x6, 0xF, 0x3,
15001500
0x1F };
@@ -1505,6 +1505,9 @@ static void b43_nphy_workarounds_rev3plus(struct b43_wldev *dev)
15051505
u16 tmp16;
15061506
u32 tmp32;
15071507

1508+
b43_phy_write(dev, 0x23f, 0x1f8);
1509+
b43_phy_write(dev, 0x240, 0x1f8);
1510+
15081511
tmp32 = b43_ntab_read(dev, B43_NTAB32(30, 0));
15091512
tmp32 &= 0xffffff;
15101513
b43_ntab_write(dev, B43_NTAB32(30, 0), tmp32);
@@ -1520,20 +1523,22 @@ static void b43_nphy_workarounds_rev3plus(struct b43_wldev *dev)
15201523
b43_phy_write(dev, 0x2AE, 0x000C);
15211524

15221525
/* TX to RX */
1523-
b43_nphy_set_rf_sequence(dev, 1, tx2rx_events, tx2rx_delays, 9);
1526+
b43_nphy_set_rf_sequence(dev, 1, tx2rx_events, tx2rx_delays,
1527+
ARRAY_SIZE(tx2rx_events));
15241528

15251529
/* RX to TX */
15261530
if (b43_nphy_ipa(dev))
1527-
b43_nphy_set_rf_sequence(dev, 1, rx2tx_events_ipa,
1528-
rx2tx_delays_ipa, 9);
1531+
b43_nphy_set_rf_sequence(dev, 0, rx2tx_events_ipa,
1532+
rx2tx_delays_ipa, ARRAY_SIZE(rx2tx_events_ipa));
15291533
if (nphy->hw_phyrxchain != 3 &&
15301534
nphy->hw_phyrxchain != nphy->hw_phytxchain) {
15311535
if (b43_nphy_ipa(dev)) {
15321536
rx2tx_delays[5] = 59;
15331537
rx2tx_delays[6] = 1;
15341538
rx2tx_events[7] = 0x1F;
15351539
}
1536-
b43_nphy_set_rf_sequence(dev, 1, rx2tx_events, rx2tx_delays, 9);
1540+
b43_nphy_set_rf_sequence(dev, 1, rx2tx_events, rx2tx_delays,
1541+
ARRAY_SIZE(rx2tx_events));
15371542
}
15381543

15391544
tmp16 = (b43_current_band(dev->wl) == IEEE80211_BAND_2GHZ) ?
@@ -1547,8 +1552,8 @@ static void b43_nphy_workarounds_rev3plus(struct b43_wldev *dev)
15471552

15481553
b43_nphy_gain_ctrl_workarounds(dev);
15491554

1550-
b43_ntab_write(dev, B43_NTAB32(8, 0), 2);
1551-
b43_ntab_write(dev, B43_NTAB32(8, 16), 2);
1555+
b43_ntab_write(dev, B43_NTAB16(8, 0), 2);
1556+
b43_ntab_write(dev, B43_NTAB16(8, 16), 2);
15521557

15531558
/* TODO */
15541559

@@ -1560,6 +1565,8 @@ static void b43_nphy_workarounds_rev3plus(struct b43_wldev *dev)
15601565
b43_radio_write(dev, B2056_RX1 | B2056_RX_MIXA_BIAS_AUX, 0x07);
15611566
b43_radio_write(dev, B2056_RX0 | B2056_RX_MIXA_LOB_BIAS, 0x88);
15621567
b43_radio_write(dev, B2056_RX1 | B2056_RX_MIXA_LOB_BIAS, 0x88);
1568+
b43_radio_write(dev, B2056_RX0 | B2056_RX_MIXA_CMFB_IDAC, 0x00);
1569+
b43_radio_write(dev, B2056_RX1 | B2056_RX_MIXA_CMFB_IDAC, 0x00);
15631570
b43_radio_write(dev, B2056_RX0 | B2056_RX_MIXG_CMFB_IDAC, 0x00);
15641571
b43_radio_write(dev, B2056_RX1 | B2056_RX_MIXG_CMFB_IDAC, 0x00);
15651572

‎drivers/net/wireless/b43/tables_nphy.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2652,7 +2652,7 @@ const u16 tbl_tx_iqlo_cal_cmds_fullcal_nphyrev3[] = {
26522652
const s16 tbl_tx_filter_coef_rev4[7][15] = {
26532653
{ -377, 137, -407, 208, -1527,
26542654
956, 93, 186, 93, 230,
2655-
-44, 230, 20, -191, 201 },
2655+
-44, 230, 201, -191, 201 },
26562656
{ -77, 20, -98, 49, -93,
26572657
60, 56, 111, 56, 26,
26582658
-5, 26, 34, -32, 34 },

‎drivers/net/wireless/b43/tables_nphy.h

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -127,25 +127,25 @@ struct nphy_gain_ctl_workaround_entry *b43_nphy_get_gain_ctl_workaround_ent(
127127
#define B43_NTAB_C1_LOFEEDTH_SIZE 128
128128

129129
/* Static N-PHY tables, PHY revision >= 3 */
130-
#define B43_NTAB_FRAMESTRUCT_R3 B43_NTAB32(10, 000) /* frame struct */
131-
#define B43_NTAB_PILOT_R3 B43_NTAB16(11, 000) /* pilot */
132-
#define B43_NTAB_TMAP_R3 B43_NTAB32(12, 000) /* TM AP */
133-
#define B43_NTAB_INTLEVEL_R3 B43_NTAB32(13, 000) /* INT LV */
134-
#define B43_NTAB_TDTRN_R3 B43_NTAB32(14, 000) /* TD TRN */
135-
#define B43_NTAB_NOISEVAR0_R3 B43_NTAB32(16, 000) /* noise variance 0 */
130+
#define B43_NTAB_FRAMESTRUCT_R3 B43_NTAB32(10, 0) /* frame struct */
131+
#define B43_NTAB_PILOT_R3 B43_NTAB16(11, 0) /* pilot */
132+
#define B43_NTAB_TMAP_R3 B43_NTAB32(12, 0) /* TM AP */
133+
#define B43_NTAB_INTLEVEL_R3 B43_NTAB32(13, 0) /* INT LV */
134+
#define B43_NTAB_TDTRN_R3 B43_NTAB32(14, 0) /* TD TRN */
135+
#define B43_NTAB_NOISEVAR0_R3 B43_NTAB32(16, 0) /* noise variance 0 */
136136
#define B43_NTAB_NOISEVAR1_R3 B43_NTAB32(16, 128) /* noise variance 1 */
137-
#define B43_NTAB_MCS_R3 B43_NTAB16(18, 000) /* MCS */
137+
#define B43_NTAB_MCS_R3 B43_NTAB16(18, 0) /* MCS */
138138
#define B43_NTAB_TDI20A0_R3 B43_NTAB32(19, 128) /* TDI 20/0 */
139139
#define B43_NTAB_TDI20A1_R3 B43_NTAB32(19, 256) /* TDI 20/1 */
140140
#define B43_NTAB_TDI40A0_R3 B43_NTAB32(19, 640) /* TDI 40/0 */
141141
#define B43_NTAB_TDI40A1_R3 B43_NTAB32(19, 768) /* TDI 40/1 */
142-
#define B43_NTAB_PILOTLT_R3 B43_NTAB32(20, 000) /* PLT lookup */
143-
#define B43_NTAB_CHANEST_R3 B43_NTAB32(22, 000) /* channel estimate */
144-
#define B43_NTAB_FRAMELT_R3 B43_NTAB8 (24, 000) /* frame lookup */
145-
#define B43_NTAB_C0_ESTPLT_R3 B43_NTAB8 (26, 000) /* estimated power lookup 0 */
146-
#define B43_NTAB_C1_ESTPLT_R3 B43_NTAB8 (27, 000) /* estimated power lookup 1 */
147-
#define B43_NTAB_C0_ADJPLT_R3 B43_NTAB8 (26, 064) /* adjusted power lookup 0 */
148-
#define B43_NTAB_C1_ADJPLT_R3 B43_NTAB8 (27, 064) /* adjusted power lookup 1 */
142+
#define B43_NTAB_PILOTLT_R3 B43_NTAB32(20, 0) /* PLT lookup */
143+
#define B43_NTAB_CHANEST_R3 B43_NTAB32(22, 0) /* channel estimate */
144+
#define B43_NTAB_FRAMELT_R3 B43_NTAB8(24, 0) /* frame lookup */
145+
#define B43_NTAB_C0_ESTPLT_R3 B43_NTAB8(26, 0) /* estimated power lookup 0 */
146+
#define B43_NTAB_C1_ESTPLT_R3 B43_NTAB8(27, 0) /* estimated power lookup 1 */
147+
#define B43_NTAB_C0_ADJPLT_R3 B43_NTAB8(26, 64) /* adjusted power lookup 0 */
148+
#define B43_NTAB_C1_ADJPLT_R3 B43_NTAB8(27, 64) /* adjusted power lookup 1 */
149149
#define B43_NTAB_C0_GAINCTL_R3 B43_NTAB32(26, 192) /* gain control lookup 0 */
150150
#define B43_NTAB_C1_GAINCTL_R3 B43_NTAB32(27, 192) /* gain control lookup 1 */
151151
#define B43_NTAB_C0_IQLT_R3 B43_NTAB32(26, 320) /* I/Q lookup 0 */

0 commit comments

Comments
 (0)