more HT-PHY improvements
cover more HT-PHY improvements
That are patches from my git repo [0] [1], just sending them to see if you have any comments. I'll send them to John later, in a bigger pack, or maybe will ask him to pull the tree.
[0] git://git.infradead.org/users/rafal/b43-next.git
[1] http://git.infradead.org/users/rafal/b43-next.git
Rafa? Mi?ecki (4):
b43: HT-PHY: rename defines addressing cores on the 2059 radio
b43: HT-PHY: tables: don't duplicate core-generic regs
b43: HT-PHY: finish calculating values for idle TSSI
b43: HT-PHY: do some extra TSSI setup after configuring TX
drivers/net/wireless/b43/phy_ht.c | 86 +++++++++++++++++++++------------ drivers/net/wireless/b43/radio_2059.c | 39 ++++----------- drivers/net/wireless/b43/radio_2059.h | 14 ++---- 3 files changed, 66 insertions(+), 73 deletions(-)
Signature · 1 line
1.7.10.4
PATCH 1/4 b43: HT-PHY: rename defines addressing cores on the 2059 radio
After comparing writes to registers at 0x000, 0x400 and 0x800 it seems there are many very similar writes. So 0x000 offset is not for accessing something totally different, but probably just the first out of three cores.
--- drivers/net/wireless/b43/phy_ht.c | 22 +++++++++++----------- drivers/net/wireless/b43/radio_2059.h | 6 +++--- 2 files changed, 14 insertions(+), 14 deletions(-)
drivers/net/wireless/b43/phy_ht.c +11 -11
@@ -63,7 +63,7 @@ static void b43_radio_2059_channel_setup(struct b43_wldev *dev,b43_radio_write (dev,0x98 , e->radio_syn98);for (i =0 ; i <2 ; i++) { - routing = i ?R2059_RXRX1 :R2059_TXRX0 ; + routing = i ?R2059_C3 :R2059_C2 ;b43_radio_write (dev, routing |0x4a , e->radio_rxtx4a);b43_radio_write (dev, routing |0x58 , e->radio_rxtx58);b43_radio_write (dev, routing |0x5a , e->radio_rxtx5a);
@@ -87,7 +87,7 @@ static void b43_radio_2059_channel_setup(struct b43_wldev *dev,static void b43_radio_2059_init (struct b43_wldev *dev) { -const u16 routing[] = {R2059_SYN ,R2059_TXRX0 ,R2059_RXRX1 }; +const u16 routing[] = {R2059_C1 ,R2059_C2 ,R2059_C3 };const u16 radio_values[3 ][2 ] = { {0x61 ,0xE9 }, {0x69 ,0xD5 }, {0x73 ,0x99 }, };
@@ -106,17 +106,17 @@ static void b43_radio_2059_init(struct b43_wldev *dev)b43_radio_mask (dev,0xc0 , ~0x0080 );if (1 ) {/* FIXME */ -b43_radio_set (dev,R2059_RXRX1 |0x4 ,0x1 ); +b43_radio_set (dev,R2059_C3 |0x4 ,0x1 );udelay (10 ); -b43_radio_set (dev,R2059_RXRX1 |0x0BF ,0x1 ); -b43_radio_maskset (dev,R2059_RXRX1 |0x19B ,0x3 ,0x2 ); +b43_radio_set (dev,R2059_C3 |0x0BF ,0x1 ); +b43_radio_maskset (dev,R2059_C3 |0x19B ,0x3 ,0x2 ); -b43_radio_set (dev,R2059_RXRX1 |0x4 ,0x2 ); +b43_radio_set (dev,R2059_C3 |0x4 ,0x2 );udelay (100 ); -b43_radio_mask (dev,R2059_RXRX1 |0x4 , ~0x2 ); +b43_radio_mask (dev,R2059_C3 |0x4 , ~0x2 );for (i =0 ; i <10000 ; i++) { -if (b43_radio_read (dev,R2059_RXRX1 |0x145 ) &1 ) { +if (b43_radio_read (dev,R2059_C3 |0x145 ) &1 ) { i =0 ;break ; }
@@ -125,7 +125,7 @@ static void b43_radio_2059_init(struct b43_wldev *dev)if (i)b43err (dev->wl,"radio 0x945 timeout\n" ); -b43_radio_mask (dev,R2059_RXRX1 |0x4 , ~0x1 ); +b43_radio_mask (dev,R2059_C3 |0x4 , ~0x1 );b43_radio_set (dev,0xa ,0x60 );for (i =0 ; i <3 ; i++) {
@@ -397,7 +397,7 @@ static void b43_phy_ht_rssi_select(struct b43_wldev *dev, u8 core_sel, { B43_PHY_HT_AFE_C2, B43_PHY_HT_AFE_C2_OVER, }, { B43_PHY_HT_AFE_C3, B43_PHY_HT_AFE_C3_OVER, }, }; -static const u16 radio_r[] = {R2059_SYN ,R2059_TXRX0 ,R2059_RXRX1 , }; +static const u16 radio_r[] = {R2059_C1 ,R2059_C2 ,R2059_C3 , };int core;if (core_sel ==0 ) {
@@ -417,7 +417,7 @@ static void b43_phy_ht_rssi_select(struct b43_wldev *dev, u8 core_sel,b43_phy_set (dev, ctl_regs[core][1 ],0x1 <<9 );b43_phy_set (dev, ctl_regs[core][1 ],0x1 <<10 ); -b43_radio_set (dev,R2059_RXRX1 |0xbf ,0x1 ); +b43_radio_set (dev,R2059_C3 |0xbf ,0x1 );b43_radio_write (dev, radio_r[core] |0x159 ,0x11 );break ;
drivers/net/wireless/b43/radio_2059.h +3 -3
@@ -5,9 +5,9 @@#include "phy_ht.h" -#define R2059_SYN 0x000 -#define R2059_TXRX0 0x400 -#define R2059_RXRX1 0x800 +#define R2059_C1 0x000 +#define R2059_C2 0x400 +#define R2059_C3 0x800#define R2059_ALL 0xC00/* Values for various registers uploaded on channel switching */
Signature · 1 line
1.7.10.4
PATCH 2/4 b43: HT-PHY: tables: don't duplicate core-generic regs
In reply to Rafał MiłeckiNow when we know many radio regs at 0x000 are core-generic, I've noticed we duplicate some values in the tables.
--- drivers/net/wireless/b43/phy_ht.c | 33 +++++++++++----------------- drivers/net/wireless/b43/radio_2059.c | 39 ++++++++------------------------- drivers/net/wireless/b43/radio_2059.h | 8 ------- 3 files changed, 22 insertions(+), 58 deletions(-)
drivers/net/wireless/b43/phy_ht.c +13 -20
@@ -37,8 +37,9 @@static void b43_radio_2059_channel_setup (struct b43_wldev *dev,const struct b43_phy_ht_channeltab_e_radio2059 *e) { +static const u16 routing[] = {R2059_C1 ,R2059_C2 ,R2059_C3 , }; +u16 r;u8 i; -u16 routing;b43_radio_write (dev,0x16 , e->radio_syn16);b43_radio_write (dev,0x17 , e->radio_syn17);
@@ -53,25 +54,17 @@ static void b43_radio_2059_channel_setup(struct b43_wldev *dev,b43_radio_write (dev,0x41 , e->radio_syn41);b43_radio_write (dev,0x43 , e->radio_syn43);b43_radio_write (dev,0x47 , e->radio_syn47); -b43_radio_write (dev,0x4a , e->radio_syn4a); -b43_radio_write (dev,0x58 , e->radio_syn58); -b43_radio_write (dev,0x5a , e->radio_syn5a); -b43_radio_write (dev,0x6a , e->radio_syn6a); -b43_radio_write (dev,0x6d , e->radio_syn6d); -b43_radio_write (dev,0x6e , e->radio_syn6e); -b43_radio_write (dev,0x92 , e->radio_syn92); -b43_radio_write (dev,0x98 , e->radio_syn98); - -for (i =0 ; i <2 ; i++) { - routing = i ?R2059_C3 :R2059_C2 ; -b43_radio_write (dev, routing |0x4a , e->radio_rxtx4a); -b43_radio_write (dev, routing |0x58 , e->radio_rxtx58); -b43_radio_write (dev, routing |0x5a , e->radio_rxtx5a); -b43_radio_write (dev, routing |0x6a , e->radio_rxtx6a); -b43_radio_write (dev, routing |0x6d , e->radio_rxtx6d); -b43_radio_write (dev, routing |0x6e , e->radio_rxtx6e); -b43_radio_write (dev, routing |0x92 , e->radio_rxtx92); -b43_radio_write (dev, routing |0x98 , e->radio_rxtx98); + +for (i =0 ; i <3 ; i++) { + r = routing[i]; +b43_radio_write (dev, r |0x4a , e->radio_rxtx4a); +b43_radio_write (dev, r |0x58 , e->radio_rxtx58); +b43_radio_write (dev, r |0x5a , e->radio_rxtx5a); +b43_radio_write (dev, r |0x6a , e->radio_rxtx6a); +b43_radio_write (dev, r |0x6d , e->radio_rxtx6d); +b43_radio_write (dev, r |0x6e , e->radio_rxtx6e); +b43_radio_write (dev, r |0x92 , e->radio_rxtx92); +b43_radio_write (dev, r |0x98 , e->radio_rxtx98); }udelay (50 );
drivers/net/wireless/b43/radio_2059.c +9 -30
@@ -27,7 +27,7 @@#define RADIOREGS (r00, r01, r02, r03, r04, r05, r06, r07, r08, r09, \ r10, r11, r12, r13, r14, r15, r16, r17, r18, r19, \ - r20, r21, r22, r23, r24, r25, r26, r27, r28) \ + r20) \ .radio_syn16 = r00, \ .radio_syn17 = r01, \ .radio_syn22 = r02, \
@@ -41,22 +41,14 @@ .radio_syn41 = r10, \ .radio_syn43 = r11, \ .radio_syn47 = r12, \ - .radio_syn4a = r13, \ - .radio_syn58 = r14, \ - .radio_syn5a = r15, \ - .radio_syn6a = r16, \ - .radio_syn6d = r17, \ - .radio_syn6e = r18, \ - .radio_syn92 = r19, \ - .radio_syn98 = r20, \ - .radio_rxtx4a = r21, \ - .radio_rxtx58 = r22, \ - .radio_rxtx5a = r23, \ - .radio_rxtx6a = r24, \ - .radio_rxtx6d = r25, \ - .radio_rxtx6e = r26, \ - .radio_rxtx92 = r27, \ - .radio_rxtx98 = r28 + .radio_rxtx4a = r13, \ + .radio_rxtx58 = r14, \ + .radio_rxtx5a = r15, \ + .radio_rxtx6a = r16, \ + .radio_rxtx6d = r17, \ + .radio_rxtx6e = r18, \ + .radio_rxtx92 = r19, \ + .radio_rxtx98 = r20#define PHYREGS (r0, r1, r2, r3, r4, r5) \ .phy_regs.bw1 = r0, \
@@ -70,91 +62,78 @@ static const struct b43_phy_ht_channeltab_e_radio2059 b43_phy_ht_channeltab_radi { .freq = 2412,RADIOREGS (0x48 ,0x16 ,0x30 ,0x1b ,0x0a ,0x0a ,0x30 ,0x6c ,0x09 ,0x0f ,0x0a ,0x00 ,0x0a ,0x00 ,0x61 ,0x03 , -0x00 ,0x00 ,0x00 ,0xf0 ,0x00 ,0x00 ,0x61 ,0x03 ,0x00 ,0x00 ,0x00 ,0xf0 ,0x00 ),PHYREGS (0x03c9 ,0x03c5 ,0x03c1 ,0x043a ,0x043f ,0x0443 ), }, { .freq = 2417,RADIOREGS (0x4b ,0x16 ,0x30 ,0x1b ,0x0a ,0x0a ,0x30 ,0x71 ,0x09 ,0x0f ,0x0a ,0x00 ,0x0a ,0x00 ,0x61 ,0x03 , -0x00 ,0x00 ,0x00 ,0xf0 ,0x00 ,0x00 ,0x61 ,0x03 ,0x00 ,0x00 ,0x00 ,0xf0 ,0x00 ),PHYREGS (0x03cb ,0x03c7 ,0x03c3 ,0x0438 ,0x043d ,0x0441 ), }, { .freq = 2422,RADIOREGS (0x4e ,0x16 ,0x30 ,0x1b ,0x0a ,0x0a ,0x30 ,0x76 ,0x09 ,0x0f ,0x09 ,0x00 ,0x09 ,0x00 ,0x61 ,0x03 , -0x00 ,0x00 ,0x00 ,0xf0 ,0x00 ,0x00 ,0x61 ,0x03 ,0x00 ,0x00 ,0x00 ,0xf0 ,0x00 ),PHYREGS (0x03cd ,0x03c9 ,0x03c5 ,0x0436 ,0x043a ,0x043f ), }, { .freq = 2427,RADIOREGS (0x52 ,0x16 ,0x30 ,0x1b ,0x0a ,0x0a ,0x30 ,0x7b ,0x09 ,0x0f ,0x09 ,0x00 ,0x09 ,0x00 ,0x61 ,0x03 , -0x00 ,0x00 ,0x00 ,0xf0 ,0x00 ,0x00 ,0x61 ,0x03 ,0x00 ,0x00 ,0x00 ,0xf0 ,0x00 ),PHYREGS (0x03cf ,0x03cb ,0x03c7 ,0x0434 ,0x0438 ,0x043d ), }, { .freq = 2432,RADIOREGS (0x55 ,0x16 ,0x30 ,0x1b ,0x0a ,0x0a ,0x30 ,0x80 ,0x09 ,0x0f ,0x08 ,0x00 ,0x08 ,0x00 ,0x61 ,0x03 , -0x00 ,0x00 ,0x00 ,0xf0 ,0x00 ,0x00 ,0x61 ,0x03 ,0x00 ,0x00 ,0x00 ,0xf0 ,0x00 ),PHYREGS (0x03d1 ,0x03cd ,0x03c9 ,0x0431 ,0x0436 ,0x043a ), }, { .freq = 2437,RADIOREGS (0x58 ,0x16 ,0x30 ,0x1b ,0x0a ,0x0a ,0x30 ,0x85 ,0x09 ,0x0f ,0x08 ,0x00 ,0x08 ,0x00 ,0x61 ,0x03 , -0x00 ,0x00 ,0x00 ,0xf0 ,0x00 ,0x00 ,0x61 ,0x03 ,0x00 ,0x00 ,0x00 ,0xf0 ,0x00 ),PHYREGS (0x03d3 ,0x03cf ,0x03cb ,0x042f ,0x0434 ,0x0438 ), }, { .freq = 2442,RADIOREGS (0x5c ,0x16 ,0x30 ,0x1b ,0x0a ,0x0a ,0x30 ,0x8a ,0x09 ,0x0f ,0x07 ,0x00 ,0x07 ,0x00 ,0x61 ,0x03 , -0x00 ,0x00 ,0x00 ,0xf0 ,0x00 ,0x00 ,0x61 ,0x03 ,0x00 ,0x00 ,0x00 ,0xf0 ,0x00 ),PHYREGS (0x03d5 ,0x03d1 ,0x03cd ,0x042d ,0x0431 ,0x0436 ), }, { .freq = 2447,RADIOREGS (0x5f ,0x16 ,0x30 ,0x1b ,0x0a ,0x0a ,0x30 ,0x8f ,0x09 ,0x0f ,0x07 ,0x00 ,0x07 ,0x00 ,0x61 ,0x03 , -0x00 ,0x00 ,0x00 ,0xf0 ,0x00 ,0x00 ,0x61 ,0x03 ,0x00 ,0x00 ,0x00 ,0xf0 ,0x00 ),PHYREGS (0x03d7 ,0x03d3 ,0x03cf ,0x042b ,0x042f ,0x0434 ), }, { .freq = 2452,RADIOREGS (0x62 ,0x16 ,0x30 ,0x1b ,0x0a ,0x0a ,0x30 ,0x94 ,0x09 ,0x0f ,0x07 ,0x00 ,0x07 ,0x00 ,0x61 ,0x03 , -0x00 ,0x00 ,0x00 ,0xf0 ,0x00 ,0x00 ,0x61 ,0x03 ,0x00 ,0x00 ,0x00 ,0xf0 ,0x00 ),PHYREGS (0x03d9 ,0x03d5 ,0x03d1 ,0x0429 ,0x042d ,0x0431 ), }, { .freq = 2457,RADIOREGS (0x66 ,0x16 ,0x30 ,0x1b ,0x0a ,0x0a ,0x30 ,0x99 ,0x09 ,0x0f ,0x06 ,0x00 ,0x06 ,0x00 ,0x61 ,0x03 , -0x00 ,0x00 ,0x00 ,0xf0 ,0x00 ,0x00 ,0x61 ,0x03 ,0x00 ,0x00 ,0x00 ,0xf0 ,0x00 ),PHYREGS (0x03db ,0x03d7 ,0x03d3 ,0x0427 ,0x042b ,0x042f ), }, { .freq = 2462,RADIOREGS (0x69 ,0x16 ,0x30 ,0x1b ,0x0a ,0x0a ,0x30 ,0x9e ,0x09 ,0x0f ,0x06 ,0x00 ,0x06 ,0x00 ,0x61 ,0x03 , -0x00 ,0x00 ,0x00 ,0xf0 ,0x00 ,0x00 ,0x61 ,0x03 ,0x00 ,0x00 ,0x00 ,0xf0 ,0x00 ),PHYREGS (0x03dd ,0x03d9 ,0x03d5 ,0x0424 ,0x0429 ,0x042d ), }, { .freq = 2467,RADIOREGS (0x6c ,0x16 ,0x30 ,0x1b ,0x0a ,0x0a ,0x30 ,0xa3 ,0x09 ,0x0f ,0x05 ,0x00 ,0x05 ,0x00 ,0x61 ,0x03 , -0x00 ,0x00 ,0x00 ,0xf0 ,0x00 ,0x00 ,0x61 ,0x03 ,0x00 ,0x00 ,0x00 ,0xf0 ,0x00 ),PHYREGS (0x03df ,0x03db ,0x03d7 ,0x0422 ,0x0427 ,0x042b ), }, { .freq = 2472,RADIOREGS (0x70 ,0x16 ,0x30 ,0x1b ,0x0a ,0x0a ,0x30 ,0xa8 ,0x09 ,0x0f ,0x05 ,0x00 ,0x05 ,0x00 ,0x61 ,0x03 , -0x00 ,0x00 ,0x00 ,0xf0 ,0x00 ,0x00 ,0x61 ,0x03 ,0x00 ,0x00 ,0x00 ,0xf0 ,0x00 ), PHYREGS(0x03e1, 0x03dd, 0x03d9, 0x0420, 0x0424, 0x0429), },
drivers/net/wireless/b43/radio_2059.h +0 -8
@@ -28,14 +28,6 @@ struct b43_phy_ht_channeltab_e_radio2059 {u8 radio_syn41;u8 radio_syn43;u8 radio_syn47; -u8 radio_syn4a; -u8 radio_syn58; -u8 radio_syn5a; -u8 radio_syn6a; -u8 radio_syn6d; -u8 radio_syn6e; -u8 radio_syn92; -u8 radio_syn98;u8 radio_rxtx4a;u8 radio_rxtx58;u8 radio_rxtx5a;
Signature · 1 line
1.7.10.4
PATCH 3/4 b43: HT-PHY: finish calculating values for idle TSSI
In reply to Rafał Miłeckidrivers/net/wireless/b43/phy_ht.c +18 -2
@@ -529,9 +529,21 @@ static void b43_phy_ht_tx_power_ctl(struct b43_wldev *dev, bool enable)static void b43_phy_ht_tx_power_ctl_idle_tssi (struct b43_wldev *dev) {struct b43_phy_ht *phy_ht = dev->phy.ht; +static const u16 base[] = {0x840 ,0x860 ,0x880 }; +u16 save_regs[3 ][3 ];s32 rssi_buf[6 ]; +int i; -/* TODO */ +for (i =0 ; i <3 ; i++) { + save_regs[i][1 ] =b43_phy_read (dev, base[i] +6 ); + save_regs[i][2 ] =b43_phy_read (dev, base[i] +7 ); + save_regs[i][0 ] =b43_phy_read (dev, base[i] +0 ); + +b43_phy_write (dev, base[i] +6 ,0 ); +b43_phy_mask (dev, base[i] +7 , ~0xF );/* 0xF? Or just 0x6? */ +b43_phy_set (dev, base[i] +0 ,0x0400 ); +b43_phy_set (dev, base[i] +0 ,0x1000 ); + }b43_phy_ht_tx_tone (dev);udelay (20 );
@@ -543,7 +555,11 @@ static void b43_phy_ht_tx_power_ctl_idle_tssi(struct b43_wldev *dev) phy_ht->idle_tssi[1 ] = rssi_buf[2 ] &0xff ; phy_ht->idle_tssi[2 ] = rssi_buf[4 ] &0xff ; -/* TODO */ +for (i =0 ; i <3 ; i++) { +b43_phy_write (dev, base[i] +0 , save_regs[i][0 ]); +b43_phy_write (dev, base[i] +6 , save_regs[i][1 ]); +b43_phy_write (dev, base[i] +7 , save_regs[i][2 ]); + } }static void b43_phy_ht_tx_power_ctl_setup (struct b43_wldev *dev)
Signature · 1 line
1.7.10.4
PATCH 4/4 b43: HT-PHY: do some extra TSSI setup after configuring TX
In reply to Rafał MiłeckiAfter b43_phy_ht_tx_power_ctl_setup there are some extra radio ops:
radio_read(0x08bf) -> 0x0001radio_write(0x08bf) <- 0x0001radio_write(0x0159) <- 0x0011
On N-PHY we write 0x11 to TSSI regs, so it's probably sth similar.
--- drivers/net/wireless/b43/phy_ht.c | 13 +++++++++++++ 1 file changed, 13 insertions(+)
drivers/net/wireless/b43/phy_ht.c +13 -0
@@ -562,6 +562,18 @@ static void b43_phy_ht_tx_power_ctl_idle_tssi(struct b43_wldev *dev) } } +static void b43_phy_ht_tssi_setup (struct b43_wldev *dev) +{ +static const u16 routing[] = {R2059_C1 ,R2059_C2 ,R2059_C3 , }; +u8 i; + +/* 0x159 is probably TX_SSI_MUX or TSSIG (by comparing to N-PHY) */ +for (i =0 ; i <3 ; i++) { +b43_radio_set (dev,0x8bf ,0x1 ); +b43_radio_write (dev, routing[i] |0x0159 ,0x0011 ); + } +} +static void b43_phy_ht_tx_power_ctl_setup (struct b43_wldev *dev) {struct b43_phy_ht *phy_ht = dev->phy.ht;
@@ -955,6 +967,7 @@ static int b43_phy_ht_op_init(struct b43_wldev *dev)b43_phy_ht_tx_power_ctl (dev, false);b43_phy_ht_tx_power_ctl_idle_tssi (dev);b43_phy_ht_tx_power_ctl_setup (dev); +b43_phy_ht_tssi_setup (dev);b43_phy_ht_tx_power_ctl (dev, saved_tx_pwr_ctl);return 0 ;
Signature · 1 line
1.7.10.4