b43: N-PHY: fix BPHY init
PATCH 1/3 b43: N-PHY: fix BPHY init
Signed-off-by Rafał Miłecki <[email protected]>
--- drivers/net/wireless/b43/phy_n.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-)
drivers/net/wireless/b43/phy_n.c +2 -2
@@ -1579,13 +1579,13 @@ static void b43_nphy_bphy_init(struct b43_wldev *dev)u16 val; val =0x1E1F ; -for (i =0 ; i <14 ; i++) { +for (i =0 ; i <16 ; i++) {b43_phy_write (dev,B43_PHY_N_BMODE (0x88 + i), val); val -=0x202 ; } val =0x3E3F ;for (i =0 ; i <16 ; i++) { -b43_phy_write (dev,B43_PHY_N_BMODE (0x97 + i), val); +b43_phy_write (dev,B43_PHY_N_BMODE (0x98 + i), val); val -=0x202 ; }b43_phy_write (dev,B43_PHY_N_BMODE (0x38 ),0x668 );
Signature · 1 line
1.7.1
PATCH 2/3 b43: N-PHY: rev2: save and restore PHY regs on RSSI poll
Signed-off-by Rafał Miłecki <[email protected]>
--- drivers/net/wireless/b43/phy_n.c | 16 ++++++++++++++++ 1 files changed, 16 insertions(+), 0 deletions(-)
drivers/net/wireless/b43/phy_n.c +16 -0
@@ -1845,6 +1845,14 @@ static int b43_nphy_poll_rssi(struct b43_wldev *dev, u8 type, s32 *buf, save_regs_phy[5 ] =b43_phy_read (dev,B43_NPHY_AFECTL_OVER ); save_regs_phy[6 ] =b43_phy_read (dev,B43_NPHY_TXF_40CO_B1S0 ); save_regs_phy[7 ] =b43_phy_read (dev,B43_NPHY_TXF_40CO_B32S1 ); + }else if (dev->phy.rev ==2 ) { + save_regs_phy[0 ] =b43_phy_read (dev,B43_NPHY_AFECTL_C1 ); + save_regs_phy[1 ] =b43_phy_read (dev,B43_NPHY_AFECTL_C2 ); + save_regs_phy[2 ] =b43_phy_read (dev,B43_NPHY_AFECTL_OVER ); + save_regs_phy[3 ] =b43_phy_read (dev,B43_NPHY_RFCTL_CMD ); + save_regs_phy[4 ] =b43_phy_read (dev,B43_NPHY_RFCTL_OVER ); + save_regs_phy[5 ] =b43_phy_read (dev,B43_NPHY_RFCTL_RSSIO1 ); + save_regs_phy[6 ] =b43_phy_read (dev,B43_NPHY_RFCTL_RSSIO2 ); }b43_nphy_rssi_select (dev,5 , type);
@@ -1888,6 +1896,14 @@ static int b43_nphy_poll_rssi(struct b43_wldev *dev, u8 type, s32 *buf,b43_phy_write (dev,B43_NPHY_AFECTL_OVER , save_regs_phy[5 ]);b43_phy_write (dev,B43_NPHY_TXF_40CO_B1S0 , save_regs_phy[6 ]);b43_phy_write (dev,B43_NPHY_TXF_40CO_B32S1 , save_regs_phy[7 ]); + }else if (dev->phy.rev ==2 ) { +b43_phy_write (dev,B43_NPHY_AFECTL_C1 , save_regs_phy[0 ]); +b43_phy_write (dev,B43_NPHY_AFECTL_C2 , save_regs_phy[1 ]); +b43_phy_write (dev,B43_NPHY_AFECTL_OVER , save_regs_phy[2 ]); +b43_phy_write (dev,B43_NPHY_RFCTL_CMD , save_regs_phy[3 ]); +b43_phy_write (dev,B43_NPHY_RFCTL_OVER , save_regs_phy[4 ]); +b43_phy_write (dev,B43_NPHY_RFCTL_RSSIO1 , save_regs_phy[5 ]); +b43_phy_write (dev,B43_NPHY_RFCTL_RSSIO2 , save_regs_phy[6 ]); }return out;
Signature · 1 line
1.7.1
PATCH 3/3 b43: N-PHY: little cleanups
In reply to Rafał MiłeckiRemove some typos, warnings, initialize some values to follow wl's code path.
Signed-off-by Rafał Miłecki <[email protected]>
--- drivers/net/wireless/b43/phy_n.c | 13 +++++-------- 1 files changed, 5 insertions(+), 8 deletions(-)
drivers/net/wireless/b43/phy_n.c +5 -8
@@ -573,7 +573,6 @@ static void b43_nphy_calc_rx_iq_comp(struct b43_wldev *dev, u8 mask) ii = est.i1_pwr; qq = est.q1_pwr; }else { -B43_WARN_ON (1 );continue ; }
@@ -2028,7 +2027,7 @@ static void b43_nphy_rev2_rssi_cal(struct b43_wldev *dev, u8 type) }b43_radio_maskset (dev,B2055_C1_PD_RSSIMISC ,0xF8 , state[0 ]); -b43_radio_maskset (dev,B2055_C1_PD_RSSIMISC ,0xF8 , state[1 ]); +b43_radio_maskset (dev,B2055_C2_PD_RSSIMISC ,0xF8 , state[1 ]);switch (state[2 ]) {case 1 :
@@ -3112,7 +3111,7 @@ static void b43_nphy_set_rx_core_state(struct b43_wldev *dev, u8 mask) {struct b43_phy *phy = &dev->phy;struct b43_phy_n *nphy = phy->n; -u16 buf[16 ]; +/* u16 buf[16]; it's rev3+ */ nphy->phyrxchain = mask;
@@ -3408,7 +3407,6 @@ static int b43_nphy_set_channel(struct b43_wldev *dev, enum nl80211_channel_type channel_type) {struct b43_phy *phy = &dev->phy; -struct b43_phy_n *nphy = dev->phy.n;const struct b43_nphy_channeltab_entry_rev2 *tabent_r2;const struct b43_nphy_channeltab_entry_rev3 *tabent_r3;
@@ -3478,8 +3476,9 @@ static void b43_nphy_op_prepare_structs(struct b43_wldev *dev)memset (nphy,0 ,sizeof (*nphy)); -/* wl goes path which is executed for gain_boost, assume it is true */ - nphy->gain_boost = true; + nphy->gain_boost = true;/* this way we follow wl, assume it is true */ + nphy->txrx_chain =2 ;/* sth different than 0 and 1 for now */ + nphy->phyrxchain =3 ;/* to avoid b43_nphy_set_rx_core_state like wl */ }static void b43_nphy_op_free (struct b43_wldev *dev)
@@ -3552,8 +3551,6 @@ static void b43_nphy_op_radio_write(struct b43_wldev *dev, u16 reg, u16 value)static void b43_nphy_op_software_rfkill (struct b43_wldev *dev,bool blocked) { -struct b43_phy_n *nphy = dev->phy.n; -if (b43_read32 (dev,B43_MMIO_MACCTL ) &B43_MACCTL_ENABLED )b43err (dev->wl,"MAC not suspended\n" );
Signature · 1 line
1.7.1