b43: channel switching little cleaning
cover b43: channel switching little cleaning
It defines B43_SHM_SH_CHAN_40MHZ and simplifies channel switching for N-PHY.
Rafał Miłecki (3):
b43: N-PHY: simplify channel switching
b43: define B43_SHM_SH_CHAN_40MHZ
b43: N-PHY: don't duplicate setting channel in shared memory
drivers/net/wireless/b43/b43.h | 3 ++- drivers/net/wireless/b43/phy_common.c | 6 ++++-- drivers/net/wireless/b43/phy_n.c | 32 ++++++++++---------------------- 3 files changed, 16 insertions(+), 25 deletions(-)
PATCH 1/3 b43: N-PHY: simplify channel switching
--- drivers/net/wireless/b43/phy_n.c | 27 +++++++++++---------------- 1 files changed, 11 insertions(+), 16 deletions(-)
drivers/net/wireless/b43/phy_n.c +11 -16
@@ -73,7 +73,8 @@ static void b43_nphy_rf_control_override(struct b43_wldev *dev, u16 field, u16 value, u8 core, bool off);static void b43_nphy_rf_control_intc_override (struct b43_wldev *dev,u8 field,u16 value,u8 core); -static int nphy_channel_switch (struct b43_wldev *dev,unsigned int channel); +static int b43_nphy_op_switch_channel (struct b43_wldev *dev, +unsigned int new_channel);static inline bool b43_empty_chanspec (struct b43_chanspec *chanspec) {
@@ -223,7 +224,7 @@ static void b43_radio_init2055_post(struct b43_wldev *dev)if (i)b43err (dev->wl,"radio post init timeout\n" );b43_radio_mask (dev,B2055_CAL_LPOCTL ,0xFF7F ); -nphy_channel_switch (dev, dev->phy.channel); +b43_nphy_op_switch_channel (dev, dev->phy.channel);b43_radio_write (dev,B2055_C1_RX_BB_LPF ,0x9 );b43_radio_write (dev,B2055_C2_RX_BB_LPF ,0x9 );b43_radio_write (dev,B2055_C1_RX_BB_MIDACHP ,0x83 );
@@ -3438,18 +3439,6 @@ static int b43_nphy_set_chanspec(struct b43_wldev *dev,return 0 ; } -/* Tune the hardware to a new channel */ -static int nphy_channel_switch (struct b43_wldev *dev,unsigned int channel) -{ -struct b43_phy_n *nphy = dev->phy.n; - -struct b43_chanspec chanspec; - chanspec = nphy->radio_chanspec; - chanspec.channel = channel; - -return b43_nphy_set_chanspec (dev, chanspec); -} -static int b43_nphy_op_allocate (struct b43_wldev *dev) {struct b43_phy_n *nphy;
@@ -3570,7 +3559,7 @@ static void b43_nphy_op_software_rfkill(struct b43_wldev *dev, }else {if (dev->phy.rev >=3 ) {b43_radio_init2056 (dev); -b43_nphy_set_chanspec (dev, nphy->radio_chanspec); +b43_nphy_op_switch_channel (dev, dev->phy.channel); }else {b43_radio_init2055 (dev); }
@@ -3586,6 +3575,9 @@ static void b43_nphy_op_switch_analog(struct b43_wldev *dev, bool on)static int b43_nphy_op_switch_channel (struct b43_wldev *dev,unsigned int new_channel) { +struct b43_phy_n *nphy = dev->phy.n; +struct b43_chanspec chanspec; +if (b43_current_band (dev->wl) ==IEEE80211_BAND_2GHZ ) {if ((new_channel <1 ) || (new_channel >14 ))return -EINVAL ;
@@ -3594,7 +3586,10 @@ static int b43_nphy_op_switch_channel(struct b43_wldev *dev,return -EINVAL ; } -return nphy_channel_switch (dev, new_channel); + chanspec = nphy->radio_chanspec; + chanspec.channel = new_channel; + +return b43_nphy_set_chanspec (dev, chanspec); }static unsigned int b43_nphy_op_get_default_chan (struct b43_wldev *dev)
Signature · 1 line
1.7.1
PATCH 2/3 b43: define B43_SHM_SH_CHAN_40MHZ
In reply to Rafał Miłecki--- drivers/net/wireless/b43/b43.h | 3 ++- drivers/net/wireless/b43/phy_common.c | 6 ++++-- 2 files changed, 6 insertions(+), 3 deletions(-)
drivers/net/wireless/b43/b43.h +2 -1
@@ -187,7 +187,8 @@ enum {#define B43_SHM_SH_PHYTXNOI 0x006E/* PHY noise directly after TX (lower 8bit only) */ #define B43_SHM_SH_RFRXSP1 0x0072/* RF RX SP Register 1 */ #define B43_SHM_SH_CHAN 0x00A0/* Current channel (low 8bit only) */ -#define B43_SHM_SH_CHAN_5GHZ 0x0100/* Bit set, if 5Ghz channel */ +#define B43_SHM_SH_CHAN_5GHZ 0x0100/* Bit set, if 5 Ghz channel */ +#define B43_SHM_SH_CHAN_40MHZ 0x0200/* Bit set, if 40 Mhz channel width */ #define B43_SHM_SH_BCMCFIFOID 0x0108/* Last posted cookie to the bcast/mcast FIFO */ /* TSSI information */ #define B43_SHM_SH_TSSI_CCK 0x0058/* TSSI for last 4 CCK frames (32bit) */
drivers/net/wireless/b43/phy_common.c +4 -2
@@ -294,8 +294,10 @@ int b43_switch_channel(struct b43_wldev *dev, unsigned int new_channel)*/ channelcookie = new_channel;if (b43_current_band (dev->wl) ==IEEE80211_BAND_5GHZ ) - channelcookie |=0x100 ; -//FIXME set 40Mhz flag if required + channelcookie |=B43_SHM_SH_CHAN_5GHZ ; +/* FIXME: set 40Mhz flag if required */ +if (0 ) + channelcookie |=B43_SHM_SH_CHAN_40MHZ ; savedcookie =b43_shm_read16 (dev,B43_SHM_SHARED ,B43_SHM_SH_CHAN );b43_shm_write16 (dev,B43_SHM_SHARED ,B43_SHM_SH_CHAN , channelcookie);
Signature · 1 line
1.7.1
PATCH 3/3 b43: N-PHY: don't duplicate setting channel in shared memory
In reply to Rafał MiłeckiIt's already set in PHY common code.
--- drivers/net/wireless/b43/phy_n.c | 13 +++---------- 1 files changed, 3 insertions(+), 10 deletions(-)
drivers/net/wireless/b43/phy_n.c +3 -10
@@ -73,8 +73,6 @@ static void b43_nphy_rf_control_override(struct b43_wldev *dev, u16 field, u16 value, u8 core, bool off);static void b43_nphy_rf_control_intc_override (struct b43_wldev *dev,u8 field,u16 value,u8 core); -static int b43_nphy_op_switch_channel (struct b43_wldev *dev, -unsigned int new_channel);static inline bool b43_empty_chanspec (struct b43_chanspec *chanspec) {
@@ -224,7 +222,7 @@ static void b43_radio_init2055_post(struct b43_wldev *dev)if (i)b43err (dev->wl,"radio post init timeout\n" );b43_radio_mask (dev,B2055_CAL_LPOCTL ,0xFF7F ); -b43_nphy_op_switch_channel (dev, dev->phy.channel); +b43_switch_channel (dev, dev->phy.channel);b43_radio_write (dev,B2055_C1_RX_BB_LPF ,0x9 );b43_radio_write (dev,B2055_C2_RX_BB_LPF ,0x9 );b43_radio_write (dev,B2055_C1_RX_BB_MIDACHP ,0x83 );
@@ -3352,12 +3350,7 @@ static void b43_nphy_chanspec_setup(struct b43_wldev *dev,b43_chantab_phy_upload (dev, e); - tmp = chanspec.channel; -if (chanspec.b_freq ==1 ) - tmp |=0x0100 ; -if (chanspec.b_width ==3 ) - tmp |=0x0200 ; -b43_shm_write16 (dev,B43_SHM_SHARED ,0xA0 , tmp); +/* Don't follow specs, B43_SHM_SH_CHAN is set by b43_switch_channel */ if (nphy->radio_chanspec.channel ==14 ) {b43_nphy_classifier (dev,2 ,0 );
@@ -3559,7 +3552,7 @@ static void b43_nphy_op_software_rfkill(struct b43_wldev *dev, }else {if (dev->phy.rev >=3 ) {b43_radio_init2056 (dev); -b43_nphy_op_switch_channel (dev, dev->phy.channel); +b43_switch_channel (dev, dev->phy.channel); }else {b43_radio_init2055 (dev); }
Signature · 1 line
1.7.1
PATCH 3/3 b43: N-PHY: don't duplicate setting channel in shared memory
Quoted 30 lines · Rafa? Mi?ecki
It's already set in PHY common code.
Signed-off-by Rafa? Mi?ecki <[email protected]>--- drivers/net/wireless/b43/phy_n.c | 13 +++---------- 1 files changed, 3 insertions(+), 10 deletions(-)drivers/net/wireless/b43/phy_n.c +1
-3@@ -73,8 +73,6 @@ static void b43_nphy_rf_control_override(struct b43_wldev *dev, u16 field, u16 value, u8 core, bool off);static void b43_nphy_rf_control_intc_override (struct b43_wldev *dev,u8 field,u16 value,u8 core); -static int b43_nphy_op_switch_channel (struct b43_wldev *dev, -unsigned int new_channel);static inline bool b43_empty_chanspec (struct b43_chanspec *chanspec) {@@ -224,7 +222,7 @@ static void b43_radio_init2055_post(struct b43_wldev *dev)if (i)b43err (dev->wl,"radio post init timeout\n" );b43_radio_mask (dev,B2055_CAL_LPOCTL ,0xFF7F ); -b43_nphy_op_switch_channel (dev, dev->phy.channel); +b43_switch_channel (dev, dev->phy.channel);b43_radio_write (dev,B2055_C1_RX_BB_LPF ,0x9 );b43_radio_write (dev,B2055_C2_RX_BB_LPF ,0x9 );b43_radio_write (dev,B2055_C1_RX_BB_MIDACHP ,0x83 );
drivers/net/wireless/b43/phy_n.c static void b43_nphy_chanspec_setup(struct b43_wldev *dev, · line 3353
Quoted 10 lines
drivers/net/wireless/b43/phy_n.c +1
-6@@ -3352,12 +3350,7 @@ static void b43_nphy_chanspec_setup(struct b43_wldev *dev,b43_chantab_phy_upload (dev, e); - tmp = chanspec.channel; -if (chanspec.b_freq ==1 ) - tmp |=0x0100 ; -if (chanspec.b_width ==3 ) - tmp |=0x0200 ; -b43_shm_write16 (dev,B43_SHM_SHARED ,0xA0 , tmp); +/* Don't follow specs, B43_SHM_SH_CHAN is set by b43_switch_channel */
Looks great. I dunno if a comment is really needed and whether it is correct, though. We _do_ follow the specs. We just do it elsewhere.
Quoted 11 lines
drivers/net/wireless/b43/phy_n.c +1
-1if (nphy->radio_chanspec.channel ==14 ) {b43_nphy_classifier (dev,2 ,0 );@@ -3559,7 +3552,7 @@ static void b43_nphy_op_software_rfkill(struct b43_wldev *dev, }else {if (dev->phy.rev >=3 ) {b43_radio_init2056 (dev); -b43_nphy_op_switch_channel (dev, dev->phy.channel); +b43_switch_channel (dev, dev->phy.channel); }else {b43_radio_init2055 (dev); }
Signature · 1 line
Greetings Michael.
PATCH 3/3 b43: N-PHY: don't duplicate setting channel in shared memory
W dniu 6 pa?dziernika 2010 17:30 u?ytkownik Michael B?sch <[email protected]> napisa?:
Quoted 34 lines · Rafa? Mi?ecki
Quoted 33 lines
It's already set in PHY common code.
Signed-off-by Rafa? Mi?ecki <[email protected]>---
?drivers/net/wireless/b43/phy_n.c | ? 13 +++---------- ?1 files changed, 3 insertions(+), 10 deletions(-)drivers/net/wireless/b43/phy_n.c +1
-3@@ -73,8 +73,6 @@ static void b43_nphy_rf_control_override(struct b43_wldev *dev, u16 field, ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? u16 value, u8 core, bool off); ?static void b43_nphy_rf_control_intc_override(struct b43_wldev *dev, u8 field, ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? u16 value, u8 core); -static int b43_nphy_op_switch_channel (struct b43_wldev *dev, - ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? unsigned int new_channel); ?static inline bool b43_empty_chanspec(struct b43_chanspec *chanspec) ?{@@ -224,7 +222,7 @@ static void b43_radio_init2055_post(struct b43_wldev *dev) ? ? ? if (i) ? ? ? ? ? ? ? b43err(dev->wl, "radio post init timeout\n"); ? ? ? b43_radio_mask(dev, B2055_CAL_LPOCTL, 0xFF7F); - ? ? b43_nphy_op_switch_channel(dev, dev->phy.channel); + ? ? b43_switch_channel(dev, dev->phy.channel); ? ? ? b43_radio_write(dev, B2055_C1_RX_BB_LPF, 0x9); ? ? ? b43_radio_write(dev, B2055_C2_RX_BB_LPF, 0x9); ? ? ? b43_radio_write(dev, B2055_C1_RX_BB_MIDACHP, 0x83);@@ -3352,12 +3350,7 @@ static void b43_nphy_chanspec_setup(struct b43_wldev *dev, ? ? ? b43_chantab_phy_upload(dev, e);
Quoted 10 lines
drivers/net/wireless/b43/phy_n.c static void b43_nphy_chanspec_setup(struct b43_wldev *dev, · line 3353
Quoted 7 lines
drivers/net/wireless/b43/phy_n.c +1
-6- ? ? tmp = chanspec.channel; - ? ? if (chanspec.b_freq == 1) - ? ? ? ? ? ? tmp |= 0x0100; - ? ? if (chanspec.b_width == 3) - ? ? ? ? ? ? tmp |= 0x0200; - ? ? b43_shm_write16(dev, B43_SHM_SHARED, 0xA0, tmp); + ? ? /* Don't follow specs, B43_SHM_SH_CHAN is set by b43_switch_channel */Looks great. I dunno if a comment is really needed and whether it is correct, though. We _do_ follow the specs. We just do it elsewhere.
I got "Don't strictly follow specs here" earlier, but made it shorter to match 80 chars ;) Maybe it wasn't too good idea. Should left it longer or don't put at all.
John: could you drop this comment line when applying? Or would you like me to resend this fixed?
Signature · 1 line
Rafa?
PATCH 3/3 b43: N-PHY: don't duplicate setting channel in shared memory
Quoted 9 lines · Rafa? Mi?ecki
W dniu 6 pa?dziernika 2010 17:30 u?ytkownik Michael B?sch <[email protected]> napisa?:
Quoted 6 lines · Rafa? Mi?ecki
Quoted 2 lines
+ ? ? /* Don't follow specs,
B43_SHM_SH_CHANis set byb43_switch_channel*/Looks great. I dunno if a comment is really needed and whether it is correct, though. We _do_ follow the specs. We just do it elsewhere.
Quoted 6 lines
I got "Don't strictly follow specs here" earlier, but made it shorter to match 80 chars ;) Maybe it wasn't too good idea. Should left it longer or don't put at all.
John: could you drop this comment line when applying? Or would you like me to resend this fixed?
Got it...
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.