b43: HT-PHY: Move radio preparation into init function
PATCH 1/4 b43: HT-PHY: Move radio preparation into init function
Radio should be prepared only before initialization. We need this to be able to call b43_radio_2059_init conditionally (in the future). This also documents RF control register a bit.
Signed-off-by Rafa? Mi?ecki <[email protected]>
--- drivers/net/wireless/b43/phy_ht.c | 24 +++++++++++++----------- drivers/net/wireless/b43/phy_ht.h | 4 +++- 2 files changed, 16 insertions(+), 12 deletions(-)
drivers/net/wireless/b43/phy_ht.c +13 -11
@@ -89,6 +89,14 @@ static void b43_radio_2059_channel_setup(struct b43_wldev *dev,udelay (300 ); } +static void b43_radio_2059_init_pre (struct b43_wldev *dev) +{ +b43_phy_mask (dev,B43_PHY_HT_RF_CTL_CMD , ~B43_PHY_HT_RF_CTL_CMD_CHIP0_PU ); +b43_phy_set (dev,B43_PHY_HT_RF_CTL_CMD ,B43_PHY_HT_RF_CTL_CMD_FORCE ); +b43_phy_mask (dev,B43_PHY_HT_RF_CTL_CMD , ~B43_PHY_HT_RF_CTL_CMD_FORCE ); +b43_phy_set (dev,B43_PHY_HT_RF_CTL_CMD ,B43_PHY_HT_RF_CTL_CMD_CHIP0_PU ); +} +static void b43_radio_2059_init (struct b43_wldev *dev) {const u16 routing[] = {R2059_C1 ,R2059_C2 ,R2059_C3 };
@@ -97,6 +105,9 @@ static void b43_radio_2059_init(struct b43_wldev *dev) };u16 i, j; +/* Prepare (reset?) radio */ +b43_radio_2059_init_pre (dev); +b43_radio_write (dev,R2059_ALL |0x51 ,0x0070 );b43_radio_write (dev,R2059_ALL |0x5a ,0x0003 );
@@ -1002,19 +1013,10 @@ static void b43_phy_ht_op_software_rfkill(struct b43_wldev *dev,if (b43_read32 (dev,B43_MMIO_MACCTL ) &B43_MACCTL_ENABLED )b43err (dev->wl,"MAC not suspended\n" ); -/* In the following PHY ops we copy wl's dummy behaviour. -* TODO: Find out if reads (currently hidden in masks/masksets) are -* needed and replace following ops with just writes or w&r. -* Note: B43_PHY_HT_RF_CTL1 register is tricky, wrong operation can -* cause delayed (!) machine lock up. */ if (blocked) { -b43_phy_mask (dev,B43_PHY_HT_RF_CTL1 ,0 ); +b43_phy_mask (dev,B43_PHY_HT_RF_CTL_CMD , + ~B43_PHY_HT_RF_CTL_CMD_CHIP0_PU ); }else { -b43_phy_mask (dev,B43_PHY_HT_RF_CTL1 ,0 ); -b43_phy_maskset (dev,B43_PHY_HT_RF_CTL1 ,0 ,0x1 ); -b43_phy_mask (dev,B43_PHY_HT_RF_CTL1 ,0 ); -b43_phy_maskset (dev,B43_PHY_HT_RF_CTL1 ,0 ,0x2 ); -if (dev->phy.radio_ver ==0x2059 )b43_radio_2059_init (dev);else
drivers/net/wireless/b43/phy_ht.h +3 -1
@@ -81,7 +81,9 @@#define B43_PHY_HT_RF_SEQ_STATUS B43_PHY_EXTG(0x004)/* Values for the status are the same as for the trigger */ -#define B43_PHY_HT_RF_CTL1 B43_PHY_EXTG(0x010) +#define B43_PHY_HT_RF_CTL_CMD 0x810 +#define B43_PHY_HT_RF_CTL_CMD_FORCE 0x0001 +#define B43_PHY_HT_RF_CTL_CMD_CHIP0_PU 0x0002#define B43_PHY_HT_RF_CTL_INT_C1 B43_PHY_EXTG(0x04c)#define B43_PHY_HT_RF_CTL_INT_C2 B43_PHY_EXTG(0x06c)
Signature · 1 line
1.8.4.5
PATCH 2/4 b43: HT-PHY: Move radio calibration to separated functions
Also use b43_radio_wait_value to simplify the code and usleep_range when needed.
Signed-off-by Rafa? Mi?ecki <[email protected]>
--- drivers/net/wireless/b43/phy_ht.c | 93 ++++++++++++++++++++------------------- 1 file changed, 47 insertions(+), 46 deletions(-)
drivers/net/wireless/b43/phy_ht.c +47 -46
@@ -89,6 +89,50 @@ static void b43_radio_2059_channel_setup(struct b43_wldev *dev,udelay (300 ); } +/* Calibrate resistors in LPF of PLL? */ +static void b43_radio_2059_rcal (struct b43_wldev *dev) +{ +b43_radio_set (dev,R2059_C3 |0x4 ,0x1 ); +usleep_range (10 ,20 ); +b43_radio_set (dev,R2059_C3 |0x0BF ,0x1 ); +b43_radio_maskset (dev,R2059_C3 |0x19B ,0x3 ,0x2 ); + +b43_radio_set (dev,R2059_C3 |0x4 ,0x2 ); +usleep_range (100 ,200 ); +b43_radio_mask (dev,R2059_C3 |0x4 , ~0x2 ); + +if (!b43_radio_wait_value (dev,R2059_C3 |0x145 ,1 ,1 ,100 , +1000000 )) +b43err (dev->wl,"Radio 0x2059 rcal timeout\n" ); + +b43_radio_mask (dev,R2059_C3 |0x4 , ~0x1 ); +b43_radio_set (dev,0xa ,0x60 ); +} + +/* Calibrate the internal RC oscillator? */ +static void b43_radio_2057_rccal (struct b43_wldev *dev) +{ +const u16 radio_values[3 ][2 ] = { + {0x61 ,0xE9 }, {0x69 ,0xD5 }, {0x73 ,0x99 }, + }; +int i; + +for (i =0 ; i <3 ; i++) { +b43_radio_write (dev,0x17F , radio_values[i][0 ]); +b43_radio_write (dev,0x13D ,0x6E ); +b43_radio_write (dev,0x13E , radio_values[i][1 ]); +b43_radio_write (dev,0x13C ,0x55 ); + +if (!b43_radio_wait_value (dev,0x140 ,2 ,2 , +500 ,5000000 )) +b43err (dev->wl,"Radio 0x2059 rccal timeout\n" ); + +b43_radio_write (dev,0x13C ,0x15 ); + } + +b43_radio_mask (dev,0x17F , ~0x1 ); +} +static void b43_radio_2059_init_pre (struct b43_wldev *dev) {b43_phy_mask (dev,B43_PHY_HT_RF_CTL_CMD , ~B43_PHY_HT_RF_CTL_CMD_CHIP0_PU );
@@ -100,10 +144,7 @@ static void b43_radio_2059_init_pre(struct b43_wldev *dev)static void b43_radio_2059_init (struct b43_wldev *dev) {const u16 routing[] = {R2059_C1 ,R2059_C2 ,R2059_C3 }; -const u16 radio_values[3 ][2 ] = { - {0x61 ,0xE9 }, {0x69 ,0xD5 }, {0x73 ,0x99 }, - }; -u16 i, j; +int i;/* Prepare (reset?) radio */ b43_radio_2059_init_pre (dev);
@@ -121,48 +162,8 @@ static void b43_radio_2059_init(struct b43_wldev *dev)b43_radio_mask (dev,0xc0 , ~0x0080 );if (1 ) {/* FIXME */ -b43_radio_set (dev,R2059_C3 |0x4 ,0x1 ); -udelay (10 ); -b43_radio_set (dev,R2059_C3 |0x0BF ,0x1 ); -b43_radio_maskset (dev,R2059_C3 |0x19B ,0x3 ,0x2 ); - -b43_radio_set (dev,R2059_C3 |0x4 ,0x2 ); -udelay (100 ); -b43_radio_mask (dev,R2059_C3 |0x4 , ~0x2 ); - -for (i =0 ; i <10000 ; i++) { -if (b43_radio_read (dev,R2059_C3 |0x145 ) &1 ) { - i =0 ; -break ; - } -udelay (100 ); - } -if (i) -b43err (dev->wl,"radio 0x945 timeout\n" ); - -b43_radio_mask (dev,R2059_C3 |0x4 , ~0x1 ); -b43_radio_set (dev,0xa ,0x60 ); - -for (i =0 ; i <3 ; i++) { -b43_radio_write (dev,0x17F , radio_values[i][0 ]); -b43_radio_write (dev,0x13D ,0x6E ); -b43_radio_write (dev,0x13E , radio_values[i][1 ]); -b43_radio_write (dev,0x13C ,0x55 ); - -for (j =0 ; j <10000 ; j++) { -if (b43_radio_read (dev,0x140 ) &2 ) { - j =0 ; -break ; - } -udelay (500 ); - } -if (j) -b43err (dev->wl,"radio 0x140 timeout\n" ); - -b43_radio_write (dev,0x13C ,0x15 ); - } - -b43_radio_mask (dev,0x17F , ~0x1 ); +b43_radio_2059_rcal (dev); +b43_radio_2057_rccal (dev); }b43_radio_mask (dev,0x11 , ~0x0008 );
Signature · 1 line
1.8.4.5
PATCH 3/4 b43: HT-PHY: Define some regs for 0x2059 radio
In reply to Rafał MiłeckiSigned-off-by Rafa? Mi?ecki <[email protected]>
--- drivers/net/wireless/b43/phy_ht.c | 55 ++++++++++++++++++++++------------- drivers/net/wireless/b43/radio_2059.h | 12 ++++++++ 2 files changed, 46 insertions(+), 21 deletions(-)
drivers/net/wireless/b43/phy_ht.c +34 -21
@@ -81,10 +81,10 @@ static void b43_radio_2059_channel_setup(struct b43_wldev *dev,udelay (50 );/* Calibration */ -b43_radio_mask (dev,0x2b , ~0x1 ); -b43_radio_mask (dev,0x2e , ~0x4 ); -b43_radio_set (dev,0x2e ,0x4 ); -b43_radio_set (dev,0x2b ,0x1 ); +b43_radio_mask (dev,R2059_RFPLL_MISC_EN , ~0x1 ); +b43_radio_mask (dev,R2059_RFPLL_MISC_CAL_RESETN , ~0x4 ); +b43_radio_set (dev,R2059_RFPLL_MISC_CAL_RESETN ,0x4 ); +b43_radio_set (dev,R2059_RFPLL_MISC_EN ,0x1 );udelay (300 ); }
@@ -92,20 +92,27 @@ static void b43_radio_2059_channel_setup(struct b43_wldev *dev,/* Calibrate resistors in LPF of PLL? */ static void b43_radio_2059_rcal (struct b43_wldev *dev) { -b43_radio_set (dev,R2059_C3 |0x4 ,0x1 ); +/* Enable */ +b43_radio_set (dev,R2059_C3 |R2059_RCAL_CONFIG ,0x1 );usleep_range (10 ,20 ); +b43_radio_set (dev,R2059_C3 |0x0BF ,0x1 );b43_radio_maskset (dev,R2059_C3 |0x19B ,0x3 ,0x2 ); -b43_radio_set (dev,R2059_C3 |0x4 ,0x2 ); +/* Start */ +b43_radio_set (dev,R2059_C3 |R2059_RCAL_CONFIG ,0x2 );usleep_range (100 ,200 ); -b43_radio_mask (dev,R2059_C3 |0x4 , ~0x2 ); -if (!b43_radio_wait_value (dev,R2059_C3 |0x145 ,1 ,1 ,100 , +/* Stop */ +b43_radio_mask (dev,R2059_C3 |R2059_RCAL_CONFIG , ~0x2 ); + +if (!b43_radio_wait_value (dev,R2059_C3 |R2059_RCAL_STATUS ,1 ,1 ,100 ,1000000 ))b43err (dev->wl,"Radio 0x2059 rcal timeout\n" ); -b43_radio_mask (dev,R2059_C3 |0x4 , ~0x1 ); +/* Disable */ +b43_radio_mask (dev,R2059_C3 |R2059_RCAL_CONFIG , ~0x1 ); +b43_radio_set (dev,0xa ,0x60 ); }
@@ -118,19 +125,23 @@ static void b43_radio_2057_rccal(struct b43_wldev *dev)int i;for (i =0 ; i <3 ; i++) { -b43_radio_write (dev,0x17F , radio_values[i][0 ]); -b43_radio_write (dev,0x13D ,0x6E ); -b43_radio_write (dev,0x13E , radio_values[i][1 ]); -b43_radio_write (dev,0x13C ,0x55 ); +b43_radio_write (dev,R2059_RCCAL_MASTER , radio_values[i][0 ]); +b43_radio_write (dev,R2059_RCCAL_X1 ,0x6E ); +b43_radio_write (dev,R2059_RCCAL_TRC0 , radio_values[i][1 ]); -if (!b43_radio_wait_value (dev,0x140 ,2 ,2 , +/* Start */ +b43_radio_write (dev,R2059_RCCAL_START_R1_Q1_P1 ,0x55 ); + +/* Wait */ +if (!b43_radio_wait_value (dev,R2059_RCCAL_DONE_OSCCAP ,2 ,2 ,500 ,5000000 ))b43err (dev->wl,"Radio 0x2059 rccal timeout\n" ); -b43_radio_write (dev,0x13C ,0x15 ); +/* Stop */ +b43_radio_write (dev,R2059_RCCAL_START_R1_Q1_P1 ,0x15 ); } -b43_radio_mask (dev,0x17F , ~0x1 ); +b43_radio_mask (dev,R2059_RCCAL_MASTER , ~0x1 ); }static void b43_radio_2059_init_pre (struct b43_wldev *dev)
@@ -155,18 +166,20 @@ static void b43_radio_2059_init(struct b43_wldev *dev)for (i =0 ; i <ARRAY_SIZE (routing); i++)b43_radio_set (dev, routing[i] |0x146 ,0x3 ); -b43_radio_set (dev,0x2e ,0x0078 ); -b43_radio_set (dev,0xc0 ,0x0080 ); +/* Post init starts below */ + +b43_radio_set (dev,R2059_RFPLL_MISC_CAL_RESETN ,0x0078 ); +b43_radio_set (dev,R2059_XTAL_CONFIG2 ,0x0080 );msleep (2 ); -b43_radio_mask (dev,0x2e , ~0x0078 ); -b43_radio_mask (dev,0xc0 , ~0x0080 ); +b43_radio_mask (dev,R2059_RFPLL_MISC_CAL_RESETN , ~0x0078 ); +b43_radio_mask (dev,R2059_XTAL_CONFIG2 , ~0x0080 );if (1 ) {/* FIXME */ b43_radio_2059_rcal (dev);b43_radio_2057_rccal (dev); } -b43_radio_mask (dev,0x11 , ~0x0008 ); +b43_radio_mask (dev,R2059_RFPLL_MASTER , ~0x0008 ); }/**************************************************
drivers/net/wireless/b43/radio_2059.h +12 -0
@@ -10,6 +10,18 @@#define R2059_C3 0x800#define R2059_ALL 0xC00 +#define R2059_RCAL_CONFIG 0x004 +#define R2059_RFPLL_MASTER 0x011 +#define R2059_RFPLL_MISC_EN 0x02b +#define R2059_RFPLL_MISC_CAL_RESETN 0x02e +#define R2059_XTAL_CONFIG2 0x0c0 +#define R2059_RCCAL_START_R1_Q1_P1 0x13c +#define R2059_RCCAL_X1 0x13d +#define R2059_RCCAL_TRC0 0x13e +#define R2059_RCCAL_DONE_OSCCAP 0x140 +#define R2059_RCAL_STATUS 0x145 +#define R2059_RCCAL_MASTER 0x17f +/* Values for various registers uploaded on channel switching */ struct b43_phy_ht_channeltab_e_radio2059 {/* The channel frequency in MHz */
Signature · 1 line
1.8.4.5
PATCH 4/4 b43: HT-PHY: Complete radio init (add missing entries)
In reply to Rafał MiłeckiSigned-off-by Rafa? Mi?ecki <[email protected]>
--- drivers/net/wireless/b43/phy_ht.c | 3 +-- drivers/net/wireless/b43/radio_2059.c | 27 +++++++++++++++++++++++++++ drivers/net/wireless/b43/radio_2059.h | 2 ++ 3 files changed, 30 insertions(+), 2 deletions(-)
drivers/net/wireless/b43/phy_ht.c +1 -2
@@ -160,8 +160,7 @@ static void b43_radio_2059_init(struct b43_wldev *dev)/* Prepare (reset?) radio */ b43_radio_2059_init_pre (dev); -b43_radio_write (dev,R2059_ALL |0x51 ,0x0070 ); -b43_radio_write (dev,R2059_ALL |0x5a ,0x0003 ); +r2059_upload_inittabs (dev);for (i =0 ; i <ARRAY_SIZE (routing); i++)b43_radio_set (dev, routing[i] |0x146 ,0x3 );
drivers/net/wireless/b43/radio_2059.c +27 -0
@@ -25,6 +25,13 @@#include "b43.h" #include "radio_2059.h" +/* Extracted from MMIO dump of 6.30.223.141 */ +static u16 r2059_phy_rev1_init[][2 ] = { + {0x051 ,0x70 }, {0x05a ,0x03 }, {0x079 ,0x01 }, {0x082 ,0x70 }, + {0x083 ,0x00 }, {0x084 ,0x70 }, {0x09a ,0x7f }, {0x0b6 ,0x10 }, + {0x188 ,0x05 }, +}; +#define RADIOREGS (r00, r01, r02, r03, r04, r05, r06, r07, r08, r09, \ r10, r11, r12, r13, r14, r15, r16, r17, r18, r19, \ r20) \
@@ -139,6 +146,26 @@ static const struct b43_phy_ht_channeltab_e_radio2059 b43_phy_ht_channeltab_radi }, }; +void r2059_upload_inittabs (struct b43_wldev *dev) +{ +struct b43_phy *phy = &dev->phy; +u16 *table =NULL ; +u16 size, i; + +switch (phy->rev) { +case 1 : + table = r2059_phy_rev1_init[0 ]; + size =ARRAY_SIZE (r2059_phy_rev1_init); +break ; +default : +B43_WARN_ON (1 ); +return ; + } + +for (i =0 ; i < size; i++, table +=2 ) +b43_radio_write (dev,R2059_ALL | table[0 ], table[1 ]); +} +const struct b43_phy_ht_channeltab_e_radio2059 *b43_phy_ht_get_channeltab_e_r2059 (struct b43_wldev *dev,u16 freq) {
drivers/net/wireless/b43/radio_2059.h +2 -0
@@ -52,6 +52,8 @@ struct b43_phy_ht_channeltab_e_radio2059 {struct b43_phy_ht_channeltab_e_phy phy_regs; }; +void r2059_upload_inittabs (struct b43_wldev *dev); +const struct b43_phy_ht_channeltab_e_radio2059 *b43_phy_ht_get_channeltab_e_r2059 (struct b43_wldev *dev,u16 freq);
Signature · 1 line
1.8.4.5