b43: N-PHY: use correct channel tables for rev4+
PATCH 1/2 b43: N-PHY: use correct channel tables for rev4+
--- drivers/net/wireless/b43/phy_n.c | 1 - drivers/net/wireless/b43/radio_2056.c | 37 +++++++++++++++++++++++++++++--- 2 files changed, 33 insertions(+), 5 deletions(-)
drivers/net/wireless/b43/phy_n.c +0 -1
@@ -3607,7 +3607,6 @@ static int b43_nphy_set_channel(struct b43_wldev *dev,if (dev->phy.rev >=3 ) { tabent_r3 =b43_nphy_get_chantabent_rev3 (dev, channel->center_freq); - tabent_r3 =NULL ;if (!tabent_r3)return -ESRCH ; }else {
drivers/net/wireless/b43/radio_2056.c +33 -4
@@ -9053,15 +9053,44 @@ void b2056_upload_inittabs(struct b43_wldev *dev, B2056_RX1, pts->rx, pts->rx_length); } -/* TODO: add support for rev4+ devices by searching in rev4+ tables */ const struct b43_nphy_channeltab_entry_rev3 *b43_nphy_get_chantabent_rev3 (struct b43_wldev *dev,u16 freq) {const struct b43_nphy_channeltab_entry_rev3 *e; -unsigned int i; +unsigned int length, i; -for (i =0 ; i <ARRAY_SIZE (b43_nphy_channeltab_rev3); i++) { - e = &(b43_nphy_channeltab_rev3[i]); +switch (dev->phy.rev) { +case 3 : + e = b43_nphy_channeltab_rev3; + length =ARRAY_SIZE (b43_nphy_channeltab_rev3); +break ; +case 4 : + e = b43_nphy_channeltab_rev4; + length =ARRAY_SIZE (b43_nphy_channeltab_rev4); +break ; +case 5 : + e = b43_nphy_channeltab_rev5; + length =ARRAY_SIZE (b43_nphy_channeltab_rev5); +break ; +case 6 : + e = b43_nphy_channeltab_rev6; + length =ARRAY_SIZE (b43_nphy_channeltab_rev6); +break ; +case 7 : +case 9 : + e = b43_nphy_channeltab_rev7_9; + length =ARRAY_SIZE (b43_nphy_channeltab_rev7_9); +break ; +case 8 : + e = b43_nphy_channeltab_rev8; + length =ARRAY_SIZE (b43_nphy_channeltab_rev8); +break ; +default : +B43_WARN_ON (1 ); +return NULL ; + } + +for (i =0 ; i < length; i++, e++) {if (e->freq == freq)return e; }
Signature · 1 line
1.6.3.3
PATCH 2/2 b43: N-PHY: update 2056 radio on channel switch on rev3+
---
John: I ignored over 80 chars warnings, as this is very simple code (write-by-write, line-by-line) and I believe this can improve readibility.
--- drivers/net/wireless/b43/phy_n.c | 66 +++++++++++++++++++++++++++++++++++++- 1 files changed, 65 insertions(+), 1 deletions(-)
drivers/net/wireless/b43/phy_n.c +65 -1
@@ -139,6 +139,70 @@ static void b43_chantab_radio_upload(struct b43_wldev *dev,b43_radio_write (dev,B2055_C2_TX_MXBGTRIM , e->radio_c2_tx_mxbgtrim); } +static void b43_chantab_radio_2056_upload (struct b43_wldev *dev, +const struct b43_nphy_channeltab_entry_rev3 *e) +{ +b43_radio_write (dev,B2056_SYN_PLL_VCOCAL1 , e->radio_syn_pll_vcocal1); +b43_radio_write (dev,B2056_SYN_PLL_VCOCAL2 , e->radio_syn_pll_vcocal2); +b43_radio_write (dev,B2056_SYN_PLL_REFDIV , e->radio_syn_pll_refdiv); +b43_radio_write (dev,B2056_SYN_PLL_MMD2 , e->radio_syn_pll_mmd2); +b43_radio_write (dev,B2056_SYN_PLL_MMD1 , e->radio_syn_pll_mmd1); +b43_radio_write (dev,B2056_SYN_PLL_LOOPFILTER1 , e->radio_syn_pll_loopfilter1); +b43_radio_write (dev,B2056_SYN_PLL_LOOPFILTER2 , e->radio_syn_pll_loopfilter2); +b43_radio_write (dev,B2056_SYN_PLL_LOOPFILTER3 , e->radio_syn_pll_loopfilter3); +b43_radio_write (dev,B2056_SYN_PLL_LOOPFILTER4 , e->radio_syn_pll_loopfilter4); +b43_radio_write (dev,B2056_SYN_PLL_LOOPFILTER5 , e->radio_syn_pll_loopfilter5); +b43_radio_write (dev,B2056_SYN_RESERVED_ADDR27 , e->radio_syn_reserved_addr27); +b43_radio_write (dev,B2056_SYN_RESERVED_ADDR28 , e->radio_syn_reserved_addr28); +b43_radio_write (dev,B2056_SYN_RESERVED_ADDR29 , e->radio_syn_reserved_addr29); +b43_radio_write (dev,B2056_SYN_LOGEN_VCOBUF1 , e->radio_syn_logen_vcobuf1); +b43_radio_write (dev,B2056_SYN_LOGEN_MIXER2 , e->radio_syn_logen_mixer2); +b43_radio_write (dev,B2056_SYN_LOGEN_BUF3 , e->radio_syn_logen_buf3); +b43_radio_write (dev,B2056_SYN_LOGEN_BUF4 , e->radio_syn_logen_buf4); + +b43_radio_write (dev,B2056_RX0 |B2056_RX_LNAA_TUNE , e->radio_rx0_lnaa_tune); +b43_radio_write (dev,B2056_RX0 |B2056_RX_LNAG_TUNE , e->radio_rx0_lnag_tune); + +b43_radio_write (dev,B2056_TX0 |B2056_TX_INTPAA_BOOST_TUNE , e->radio_tx0_intpaa_boost_tune); +b43_radio_write (dev,B2056_TX0 |B2056_TX_INTPAG_BOOST_TUNE , e->radio_tx0_intpag_boost_tune); +b43_radio_write (dev,B2056_TX0 |B2056_TX_PADA_BOOST_TUNE , e->radio_tx0_pada_boost_tune); +b43_radio_write (dev,B2056_TX0 |B2056_TX_PADG_BOOST_TUNE , e->radio_tx0_padg_boost_tune); +b43_radio_write (dev,B2056_TX0 |B2056_TX_PGAA_BOOST_TUNE , e->radio_tx0_pgaa_boost_tune); +b43_radio_write (dev,B2056_TX0 |B2056_TX_PGAG_BOOST_TUNE , e->radio_tx0_pgag_boost_tune); +b43_radio_write (dev,B2056_TX0 |B2056_TX_MIXA_BOOST_TUNE , e->radio_tx0_mixa_boost_tune); +b43_radio_write (dev,B2056_TX0 |B2056_TX_MIXG_BOOST_TUNE , e->radio_tx0_mixg_boost_tune); + +b43_radio_write (dev,B2056_RX1 |B2056_RX_LNAA_TUNE , e->radio_rx1_lnaa_tune); +b43_radio_write (dev,B2056_RX1 |B2056_RX_LNAG_TUNE , e->radio_rx1_lnag_tune); + +b43_radio_write (dev,B2056_TX1 |B2056_TX_INTPAA_BOOST_TUNE , e->radio_tx1_intpaa_boost_tune); +b43_radio_write (dev,B2056_TX1 |B2056_TX_INTPAG_BOOST_TUNE , e->radio_tx1_intpag_boost_tune); +b43_radio_write (dev,B2056_TX1 |B2056_TX_PADA_BOOST_TUNE , e->radio_tx1_pada_boost_tune); +b43_radio_write (dev,B2056_TX1 |B2056_TX_PADG_BOOST_TUNE , e->radio_tx1_padg_boost_tune); +b43_radio_write (dev,B2056_TX1 |B2056_TX_PGAA_BOOST_TUNE , e->radio_tx1_pgaa_boost_tune); +b43_radio_write (dev,B2056_TX1 |B2056_TX_PGAG_BOOST_TUNE , e->radio_tx1_pgag_boost_tune); +b43_radio_write (dev,B2056_TX1 |B2056_TX_MIXA_BOOST_TUNE , e->radio_tx1_mixa_boost_tune); +b43_radio_write (dev,B2056_TX1 |B2056_TX_MIXG_BOOST_TUNE , e->radio_tx1_mixg_boost_tune); +} + +/* http://bcm-v4.sipsolutions.net/802.11/PHY/Radio/2056Setup */ +static void b43_radio_2056_setup (struct b43_wldev *dev, +const struct b43_nphy_channeltab_entry_rev3 *e) +{ +B43_WARN_ON (dev->phy.rev <3 ); + +b43_chantab_radio_2056_upload (dev, e); +/* TODO */ +udelay (50 ); +/* VCO calibration */ +b43_radio_write (dev,B2056_SYN_PLL_VCOCAL12 ,0x00 ); +b43_radio_write (dev,B2056_TX_INTPAA_PA_MISC ,0x38 ); +b43_radio_write (dev,B2056_TX_INTPAA_PA_MISC ,0x18 ); +b43_radio_write (dev,B2056_TX_INTPAA_PA_MISC ,0x38 ); +b43_radio_write (dev,B2056_TX_INTPAA_PA_MISC ,0x39 ); +udelay (300 ); +} +static void b43_chantab_phy_upload (struct b43_wldev *dev,const struct b43_phy_n_sfo_cfg *e) {
@@ -3635,7 +3699,7 @@ static int b43_nphy_set_channel(struct b43_wldev *dev,if (dev->phy.rev >=3 ) { tmp = (channel->band ==IEEE80211_BAND_5GHZ ) ?4 :0 ;b43_radio_maskset (dev,0x08 ,0xFFFB , tmp); -/* TODO: PHY Radio2056 Setup (dev, tabent_r3); */ +b43_radio_2056_setup (dev, tabent_r3);b43_nphy_channel_setup (dev, &(tabent_r3->phy_regs), channel); }else { tmp = (channel->band ==IEEE80211_BAND_5GHZ ) ?0x0020 :0x0050 ;
Signature · 1 line
1.6.3.3
PATCH 2/2 b43: N-PHY: update 2056 radio on channel switch on rev3+
Quoted 4 lines · Rafa? Mi?ecki
Signed-off-by Rafa? Mi?ecki <[email protected]>---
John: I ignored over 80 chars warnings, as this is very simple code (write-by-write, line-by-line) and I believe this can improve readibility.
Not if you are looking at it with line breaks...
Do you really object to breaking a function call at its third parameter?
John
Signature · 2 lines
John W. Linville Someday the world will need a hero, and you linville at tuxdriver.com might be all we have. Be ready.
A message that is not in the archive (sent off-list or not yet received): [email protected]
PATCH v2 2/2 b43: N-PHY: update 2056 radio on channel switch on rev3+
---
V2: break lines to match 80 chars width
John: not a big problem at all :)
--- drivers/net/wireless/b43/phy_n.c | 95 +++++++++++++++++++++++++++++++++++++- 1 files changed, 94 insertions(+), 1 deletions(-)
drivers/net/wireless/b43/phy_n.c +94 -1
@@ -139,6 +139,99 @@ static void b43_chantab_radio_upload(struct b43_wldev *dev,b43_radio_write (dev,B2055_C2_TX_MXBGTRIM , e->radio_c2_tx_mxbgtrim); } +static void b43_chantab_radio_2056_upload (struct b43_wldev *dev, +const struct b43_nphy_channeltab_entry_rev3 *e) +{ +b43_radio_write (dev,B2056_SYN_PLL_VCOCAL1 , e->radio_syn_pll_vcocal1); +b43_radio_write (dev,B2056_SYN_PLL_VCOCAL2 , e->radio_syn_pll_vcocal2); +b43_radio_write (dev,B2056_SYN_PLL_REFDIV , e->radio_syn_pll_refdiv); +b43_radio_write (dev,B2056_SYN_PLL_MMD2 , e->radio_syn_pll_mmd2); +b43_radio_write (dev,B2056_SYN_PLL_MMD1 , e->radio_syn_pll_mmd1); +b43_radio_write (dev,B2056_SYN_PLL_LOOPFILTER1 , + e->radio_syn_pll_loopfilter1); +b43_radio_write (dev,B2056_SYN_PLL_LOOPFILTER2 , + e->radio_syn_pll_loopfilter2); +b43_radio_write (dev,B2056_SYN_PLL_LOOPFILTER3 , + e->radio_syn_pll_loopfilter3); +b43_radio_write (dev,B2056_SYN_PLL_LOOPFILTER4 , + e->radio_syn_pll_loopfilter4); +b43_radio_write (dev,B2056_SYN_PLL_LOOPFILTER5 , + e->radio_syn_pll_loopfilter5); +b43_radio_write (dev,B2056_SYN_RESERVED_ADDR27 , + e->radio_syn_reserved_addr27); +b43_radio_write (dev,B2056_SYN_RESERVED_ADDR28 , + e->radio_syn_reserved_addr28); +b43_radio_write (dev,B2056_SYN_RESERVED_ADDR29 , + e->radio_syn_reserved_addr29); +b43_radio_write (dev,B2056_SYN_LOGEN_VCOBUF1 , + e->radio_syn_logen_vcobuf1); +b43_radio_write (dev,B2056_SYN_LOGEN_MIXER2 , e->radio_syn_logen_mixer2); +b43_radio_write (dev,B2056_SYN_LOGEN_BUF3 , e->radio_syn_logen_buf3); +b43_radio_write (dev,B2056_SYN_LOGEN_BUF4 , e->radio_syn_logen_buf4); + +b43_radio_write (dev,B2056_RX0 |B2056_RX_LNAA_TUNE , + e->radio_rx0_lnaa_tune); +b43_radio_write (dev,B2056_RX0 |B2056_RX_LNAG_TUNE , + e->radio_rx0_lnag_tune); + +b43_radio_write (dev,B2056_TX0 |B2056_TX_INTPAA_BOOST_TUNE , + e->radio_tx0_intpaa_boost_tune); +b43_radio_write (dev,B2056_TX0 |B2056_TX_INTPAG_BOOST_TUNE , + e->radio_tx0_intpag_boost_tune); +b43_radio_write (dev,B2056_TX0 |B2056_TX_PADA_BOOST_TUNE , + e->radio_tx0_pada_boost_tune); +b43_radio_write (dev,B2056_TX0 |B2056_TX_PADG_BOOST_TUNE , + e->radio_tx0_padg_boost_tune); +b43_radio_write (dev,B2056_TX0 |B2056_TX_PGAA_BOOST_TUNE , + e->radio_tx0_pgaa_boost_tune); +b43_radio_write (dev,B2056_TX0 |B2056_TX_PGAG_BOOST_TUNE , + e->radio_tx0_pgag_boost_tune); +b43_radio_write (dev,B2056_TX0 |B2056_TX_MIXA_BOOST_TUNE , + e->radio_tx0_mixa_boost_tune); +b43_radio_write (dev,B2056_TX0 |B2056_TX_MIXG_BOOST_TUNE , + e->radio_tx0_mixg_boost_tune); + +b43_radio_write (dev,B2056_RX1 |B2056_RX_LNAA_TUNE , + e->radio_rx1_lnaa_tune); +b43_radio_write (dev,B2056_RX1 |B2056_RX_LNAG_TUNE , + e->radio_rx1_lnag_tune); + +b43_radio_write (dev,B2056_TX1 |B2056_TX_INTPAA_BOOST_TUNE , + e->radio_tx1_intpaa_boost_tune); +b43_radio_write (dev,B2056_TX1 |B2056_TX_INTPAG_BOOST_TUNE , + e->radio_tx1_intpag_boost_tune); +b43_radio_write (dev,B2056_TX1 |B2056_TX_PADA_BOOST_TUNE , + e->radio_tx1_pada_boost_tune); +b43_radio_write (dev,B2056_TX1 |B2056_TX_PADG_BOOST_TUNE , + e->radio_tx1_padg_boost_tune); +b43_radio_write (dev,B2056_TX1 |B2056_TX_PGAA_BOOST_TUNE , + e->radio_tx1_pgaa_boost_tune); +b43_radio_write (dev,B2056_TX1 |B2056_TX_PGAG_BOOST_TUNE , + e->radio_tx1_pgag_boost_tune); +b43_radio_write (dev,B2056_TX1 |B2056_TX_MIXA_BOOST_TUNE , + e->radio_tx1_mixa_boost_tune); +b43_radio_write (dev,B2056_TX1 |B2056_TX_MIXG_BOOST_TUNE , + e->radio_tx1_mixg_boost_tune); +} + +/* http://bcm-v4.sipsolutions.net/802.11/PHY/Radio/2056Setup */ +static void b43_radio_2056_setup (struct b43_wldev *dev, +const struct b43_nphy_channeltab_entry_rev3 *e) +{ +B43_WARN_ON (dev->phy.rev <3 ); + +b43_chantab_radio_2056_upload (dev, e); +/* TODO */ +udelay (50 ); +/* VCO calibration */ +b43_radio_write (dev,B2056_SYN_PLL_VCOCAL12 ,0x00 ); +b43_radio_write (dev,B2056_TX_INTPAA_PA_MISC ,0x38 ); +b43_radio_write (dev,B2056_TX_INTPAA_PA_MISC ,0x18 ); +b43_radio_write (dev,B2056_TX_INTPAA_PA_MISC ,0x38 ); +b43_radio_write (dev,B2056_TX_INTPAA_PA_MISC ,0x39 ); +udelay (300 ); +} +static void b43_chantab_phy_upload (struct b43_wldev *dev,const struct b43_phy_n_sfo_cfg *e) {
@@ -3635,7 +3728,7 @@ static int b43_nphy_set_channel(struct b43_wldev *dev,if (dev->phy.rev >=3 ) { tmp = (channel->band ==IEEE80211_BAND_5GHZ ) ?4 :0 ;b43_radio_maskset (dev,0x08 ,0xFFFB , tmp); -/* TODO: PHY Radio2056 Setup (dev, tabent_r3); */ +b43_radio_2056_setup (dev, tabent_r3);b43_nphy_channel_setup (dev, &(tabent_r3->phy_regs), channel); }else { tmp = (channel->band ==IEEE80211_BAND_5GHZ ) ?0x0020 :0x0050 ;
Signature · 1 line
1.6.3.3