b43: use defines for board_type
PATCH 1/6 b43: use defines for board_type
Signed-off-by Rafa? Mi?ecki <[email protected]>
--- drivers/net/wireless/b43/phy_lp.c | 4 ++-- drivers/net/wireless/b43/phy_n.c | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-)
drivers/net/wireless/b43/phy_lp.c +2 -2
@@ -281,8 +281,8 @@ static void lpphy_baseband_rev0_1_init(struct b43_wldev *dev)b43_phy_maskset (dev,B43_LPPHY_TR_LOOKUP_8 ,0xFFC0 ,0x000A );b43_phy_maskset (dev,B43_LPPHY_TR_LOOKUP_8 ,0xC0FF ,0x0B00 ); }else if (b43_current_band (dev->wl) ==IEEE80211_BAND_5GHZ || - (dev->dev->board_type ==0x048A ) || ((dev->phy.rev ==0 ) && - (sprom->boardflags_lo &B43_BFL_FEM ))) { + dev->dev->board_type ==SSB_BOARD_BU4312 || + (dev->phy.rev ==0 && (sprom->boardflags_lo &B43_BFL_FEM ))) {b43_phy_maskset (dev,B43_LPPHY_TR_LOOKUP_1 ,0xFFC0 ,0x0001 );b43_phy_maskset (dev,B43_LPPHY_TR_LOOKUP_1 ,0xC0FF ,0x0400 );b43_phy_maskset (dev,B43_LPPHY_TR_LOOKUP_2 ,0xFFC0 ,0x0001 );
drivers/net/wireless/b43/phy_n.c +3 -3
@@ -1016,7 +1016,7 @@ static void b43_radio_init2055_post(struct b43_wldev *dev)if (sprom->revision <4 ) workaround = (dev->dev->board_vendor !=PCI_VENDOR_ID_BROADCOM - && dev->dev->board_type ==0x46D + && dev->dev->board_type ==SSB_BOARD_CB2_4321 && dev->dev->board_rev >=0x41 );else workaround =
@@ -2616,7 +2616,7 @@ static void b43_nphy_workarounds_rev1_2(struct b43_wldev *dev)u8 delays2[7 ] = {0x8 ,0x6 ,0x2 ,0x4 ,0x4 ,0x6 ,0x1 };if (sprom->boardflags2_lo &B43_BFL2_SKWRKFEM_BRD || - dev->dev->board_type ==0x8B ) { + dev->dev->board_type ==BCMA_BOARD_TYPE_BCM943224M93 ) { delays1[0 ] =0x1 ; delays1[5 ] =0x14 ; }
@@ -5006,7 +5006,7 @@ int b43_phy_initn(struct b43_wldev *dev)if (sprom->boardflags2_lo &B43_BFL2_SKWRKFEM_BRD || (dev->dev->board_vendor ==PCI_VENDOR_ID_APPLE && - dev->dev->board_type ==0x8B )) + dev->dev->board_type ==BCMA_BOARD_TYPE_BCM943224M93 ))b43_phy_write (dev,B43_NPHY_TXREALFD ,0xA0 );else b43_phy_write (dev,B43_NPHY_TXREALFD ,0xB8 );
Signature · 1 line
1.7.10.4
PATCH 2/6 b43: N-PHY: define missing registers
Signed-off-by Rafa? Mi?ecki <[email protected]>
--- drivers/net/wireless/b43/phy_n.c | 74 ++++++++++--------- drivers/net/wireless/b43/phy_n.h | 146 ++++++++++++++++++++++++++++++++++++++ 2 files changed, 182 insertions(+), 38 deletions(-)
drivers/net/wireless/b43/phy_n.c +36 -38
@@ -1974,10 +1974,8 @@ static void b43_nphy_gain_ctl_workarounds_rev3plus(struct b43_wldev *dev)b43_phy_set (dev,B43_NPHY_RXCTL ,0x0040 );/* Set Clip 2 detect */ -b43_phy_set (dev,B43_NPHY_C1_CGAINI , -B43_NPHY_C1_CGAINI_CL2DETECT ); -b43_phy_set (dev,B43_NPHY_C2_CGAINI , -B43_NPHY_C2_CGAINI_CL2DETECT ); +b43_phy_set (dev,B43_NPHY_C1_CGAINI ,B43_NPHY_C1_CGAINI_CL2DETECT ); +b43_phy_set (dev,B43_NPHY_C2_CGAINI ,B43_NPHY_C2_CGAINI_CL2DETECT );b43_radio_write (dev,B2056_RX0 |B2056_RX_BIASPOLE_LNAG1_IDAC ,0x17 );
@@ -2011,22 +2009,22 @@ static void b43_nphy_gain_ctl_workarounds_rev3plus(struct b43_wldev *dev)b43_ntab_write_bulk (dev,B43_NTAB8 (2 ,0x40 ),6 , lpf_bits);b43_ntab_write_bulk (dev,B43_NTAB8 (3 ,0x40 ),6 , lpf_bits); -b43_phy_write (dev,B43_NPHY_C1_INITGAIN , e->init_gain); -b43_phy_write (dev,0x2A7 , e->init_gain); +b43_phy_write (dev,B43_NPHY_REV3_C1_INITGAIN_A , e->init_gain); +b43_phy_write (dev,B43_NPHY_REV3_C2_INITGAIN_A , e->init_gain); +b43_ntab_write_bulk (dev,B43_NTAB16 (7 ,0x106 ),2 , e->rfseq_init); -/* TODO: check defines. Do not match variables names */ -b43_phy_write (dev,B43_NPHY_C1_CLIP1_MEDGAIN , e->cliphi_gain); -b43_phy_write (dev,0x2A9 , e->cliphi_gain); -b43_phy_write (dev,B43_NPHY_C1_CLIP2_GAIN , e->clipmd_gain); -b43_phy_write (dev,0x2AB , e->clipmd_gain); -b43_phy_write (dev,B43_NPHY_C2_CLIP1_HIGAIN , e->cliplo_gain); -b43_phy_write (dev,0x2AD , e->cliplo_gain); - -b43_phy_maskset (dev,0x27D ,0xFF00 , e->crsmin); -b43_phy_maskset (dev,0x280 ,0xFF00 , e->crsminl); -b43_phy_maskset (dev,0x283 ,0xFF00 , e->crsminu); +b43_phy_write (dev,B43_NPHY_REV3_C1_CLIP_HIGAIN_A , e->cliphi_gain); +b43_phy_write (dev,B43_NPHY_REV3_C2_CLIP_HIGAIN_A , e->cliphi_gain); +b43_phy_write (dev,B43_NPHY_REV3_C1_CLIP_MEDGAIN_A , e->clipmd_gain); +b43_phy_write (dev,B43_NPHY_REV3_C2_CLIP_MEDGAIN_A , e->clipmd_gain); +b43_phy_write (dev,B43_NPHY_REV3_C1_CLIP_LOGAIN_A , e->cliplo_gain); +b43_phy_write (dev,B43_NPHY_REV3_C2_CLIP_LOGAIN_A , e->cliplo_gain); + +b43_phy_maskset (dev,B43_NPHY_CRSMINPOWER0 ,0xFF00 , e->crsmin); +b43_phy_maskset (dev,B43_NPHY_CRSMINPOWERL0 ,0xFF00 , e->crsminl); +b43_phy_maskset (dev,B43_NPHY_CRSMINPOWERU0 ,0xFF00 , e->crsminu);b43_phy_write (dev,B43_NPHY_C1_NBCLIPTHRES , e->nbclip);b43_phy_write (dev,B43_NPHY_C2_NBCLIPTHRES , e->nbclip); b43_phy_maskset(dev, B43_NPHY_C1_CLIPWBTHRES,
@@ -2208,8 +2206,8 @@ static void b43_nphy_workarounds_rev7plus(struct b43_wldev *dev)b43_phy_maskset (dev,B43_NPHY_FREQGAIN7 ,0x80FF ,0x4000 ); }if (phy->rev <=8 ) { -b43_phy_write (dev,0x23F ,0x1B0 ); -b43_phy_write (dev,0x240 ,0x1B0 ); +b43_phy_write (dev,B43_NPHY_FORCEFRONT0 ,0x1B0 ); +b43_phy_write (dev,B43_NPHY_FORCEFRONT1 ,0x1B0 ); }if (phy->rev >=8 )b43_phy_maskset (dev,B43_NPHY_TXTAILCNT , ~0xFF ,0x72 );
@@ -2226,8 +2224,8 @@ static void b43_nphy_workarounds_rev7plus(struct b43_wldev *dev)b43_nphy_set_rf_sequence (dev,0 , rx2tx_events_ipa, rx2tx_delays_ipa,ARRAY_SIZE (rx2tx_events_ipa)); -b43_phy_maskset (dev,0x299 ,0x3FFF ,0x4000 ); -b43_phy_maskset (dev,0x29D ,0x3FFF ,0x4000 ); +b43_phy_maskset (dev,B43_NPHY_EPS_OVERRIDEI_0 ,0x3FFF ,0x4000 ); +b43_phy_maskset (dev,B43_NPHY_EPS_OVERRIDEI_1 ,0x3FFF ,0x4000 ); lpf_20 =b43_nphy_read_lpf_ctl (dev,0x154 ); lpf_40 =b43_nphy_read_lpf_ctl (dev,0x159 );
@@ -2494,8 +2492,8 @@ static void b43_nphy_workarounds_rev3plus(struct b43_wldev *dev)u16 tmp16;u32 tmp32; -b43_phy_write (dev,0x23f ,0x1f8 ); -b43_phy_write (dev,0x240 ,0x1f8 ); +b43_phy_write (dev,B43_NPHY_FORCEFRONT0 ,0x1f8 ); +b43_phy_write (dev,B43_NPHY_FORCEFRONT1 ,0x1f8 ); tmp32 =b43_ntab_read (dev,B43_NTAB32 (30 ,0 )); tmp32 &=0xffffff ;
@@ -2508,8 +2506,8 @@ static void b43_nphy_workarounds_rev3plus(struct b43_wldev *dev)b43_phy_write (dev,B43_NPHY_PHASETR_B1 ,0x00CD );b43_phy_write (dev,B43_NPHY_PHASETR_B2 ,0x0020 ); -b43_phy_write (dev,B43_NPHY_C2_CLIP1_MEDGAIN ,0x000C ); -b43_phy_write (dev,0x2AE ,0x000C ); +b43_phy_write (dev,B43_NPHY_REV3_C1_CLIP_LOGAIN_B ,0x000C ); +b43_phy_write (dev,B43_NPHY_REV3_C2_CLIP_LOGAIN_B ,0x000C );/* TX to RX */ b43_nphy_set_rf_sequence(dev, 1, tx2rx_events, tx2rx_delays,
@@ -2534,7 +2532,7 @@ static void b43_nphy_workarounds_rev3plus(struct b43_wldev *dev) 0x2 : 0x9C40;b43_phy_write (dev,B43_NPHY_ENDROP_TLEN , tmp16); -b43_phy_maskset (dev,0x294 ,0xF0FF ,0x0700 ); +b43_phy_maskset (dev,B43_NPHY_SGILTRNOFFSET ,0xF0FF ,0x0700 );if (!dev->phy.is_40mhz) {b43_ntab_write (dev,B43_NTAB32 (16 ,3 ),0x18D );
@@ -2586,18 +2584,18 @@ static void b43_nphy_workarounds_rev3plus(struct b43_wldev *dev) }/* Dropped probably-always-true condition */ -b43_phy_write (dev,0x224 ,0x03eb ); -b43_phy_write (dev,0x225 ,0x03eb ); -b43_phy_write (dev,0x226 ,0x0341 ); -b43_phy_write (dev,0x227 ,0x0341 ); -b43_phy_write (dev,0x228 ,0x042b ); -b43_phy_write (dev,0x229 ,0x042b ); -b43_phy_write (dev,0x22a ,0x0381 ); -b43_phy_write (dev,0x22b ,0x0381 ); -b43_phy_write (dev,0x22c ,0x042b ); -b43_phy_write (dev,0x22d ,0x042b ); -b43_phy_write (dev,0x22e ,0x0381 ); -b43_phy_write (dev,0x22f ,0x0381 ); +b43_phy_write (dev,B43_NPHY_ED_CRS40ASSERTTHRESH0 ,0x03eb ); +b43_phy_write (dev,B43_NPHY_ED_CRS40ASSERTTHRESH1 ,0x03eb ); +b43_phy_write (dev,B43_NPHY_ED_CRS40DEASSERTTHRESH1 ,0x0341 ); +b43_phy_write (dev,B43_NPHY_ED_CRS40DEASSERTTHRESH1 ,0x0341 ); +b43_phy_write (dev,B43_NPHY_ED_CRS20LASSERTTHRESH0 ,0x042b ); +b43_phy_write (dev,B43_NPHY_ED_CRS20LASSERTTHRESH1 ,0x042b ); +b43_phy_write (dev,B43_NPHY_ED_CRS20LDEASSERTTHRESH0 ,0x0381 ); +b43_phy_write (dev,B43_NPHY_ED_CRS20LDEASSERTTHRESH1 ,0x0381 ); +b43_phy_write (dev,B43_NPHY_ED_CRS20UASSERTTHRESH0 ,0x042b ); +b43_phy_write (dev,B43_NPHY_ED_CRS20UASSERTTHRESH1 ,0x042b ); +b43_phy_write (dev,B43_NPHY_ED_CRS20UDEASSERTTHRESH0 ,0x0381 ); +b43_phy_write (dev,B43_NPHY_ED_CRS20UDEASSERTTHRESH1 ,0x0381 );if (dev->phy.rev >=6 && sprom->boardflags2_lo &B43_BFL2_SINGLEANT_CCK ) ;/* TODO: 0x0080000000000000 HF */
drivers/net/wireless/b43/phy_n.h +146 -0
176 lines not on this page · raw message
Signature · 1 line
1.7.10.4
PATCH 3/6 b43: N-PHY: use enum for INTC override function argument
In reply to Rafał MiłeckiAlso make a function name shorter so we can easily fit 80 chars.
Signed-off-by Rafa? Mi?ecki <[email protected]>
--- drivers/net/wireless/b43/phy_n.c | 46 +++++++++++++++++++++++--------------- 1 file changed, 28 insertions(+), 18 deletions(-)
drivers/net/wireless/b43/phy_n.c +28 -18
@@ -69,6 +69,14 @@ enum b43_nphy_rf_sequence { B43_RFSEQ_UPDATE_GAINU, }; +enum n_intc_override { +N_INTC_OVERRIDE_OFF =0 , +N_INTC_OVERRIDE_TRSW =1 , +N_INTC_OVERRIDE_PA =2 , +N_INTC_OVERRIDE_EXT_LNA_PU =3 , +N_INTC_OVERRIDE_EXT_LNA_GAIN =4 , +}; +enum n_rssi_type {N_RSSI_W1 =0 ,N_RSSI_W2 ,
@@ -99,7 +107,7 @@ static u8 b43_nphy_get_rx_core_state(struct b43_wldev *dev) }/************************************************** -* RF (just without b43_nphy_rf_control_intc_override) +* RF (just without b43_nphy_rf_ctl_intc_override) **************************************************/ /* http://bcm-v4.sipsolutions.net/802.11/PHY/N/ForceRFSeq */
@@ -249,14 +257,14 @@ static void b43_nphy_rf_control_override(struct b43_wldev *dev, u16 field, }/* http://bcm-v4.sipsolutions.net/802.11/PHY/N/RFCtrlIntcOverride */ -static void b43_nphy_rf_control_intc_override (struct b43_wldev *dev,u8 field, -u16 value,u8 core) +static void b43_nphy_rf_ctl_intc_override (struct b43_wldev *dev, +enum n_intc_override intc_override, +u16 value,u8 core) {u8 i, j;u16 reg, tmp, val;B43_WARN_ON (dev->phy.rev <3 ); -B43_WARN_ON (field >4 );for (i =0 ; i <2 ; i++) {if ((core ==1 && i ==1 ) || (core ==2 && !i))
@@ -266,12 +274,12 @@ static void b43_nphy_rf_control_intc_override(struct b43_wldev *dev, u8 field, B43_NPHY_RFCTL_INTC1 :B43_NPHY_RFCTL_INTC2 ;b43_phy_set (dev, reg,0x400 ); -switch (field) { -case 0 : +switch (intc_override) { +case N_INTC_OVERRIDE_OFF :b43_phy_write (dev, reg,0 );b43_nphy_force_rf_sequence (dev,B43_RFSEQ_RESET2RX );break ; -case 1 : +case N_INTC_OVERRIDE_TRSW :if (!i) {b43_phy_maskset (dev,B43_NPHY_RFCTL_INTC1 ,0xFC3F , (value <<6 ));
@@ -312,7 +320,7 @@ static void b43_nphy_rf_control_intc_override(struct b43_wldev *dev, u8 field, 0xFFFE); }break ; -case 2 : +case N_INTC_OVERRIDE_PA :if (b43_current_band (dev->wl) ==IEEE80211_BAND_5GHZ ) { tmp =0x0020 ; val = value <<5 ;
@@ -322,7 +330,7 @@ static void b43_nphy_rf_control_intc_override(struct b43_wldev *dev, u8 field, }b43_phy_maskset (dev, reg, ~tmp, val);break ; -case 3 : +case N_INTC_OVERRIDE_EXT_LNA_PU :if (b43_current_band (dev->wl) ==IEEE80211_BAND_5GHZ ) { tmp =0x0001 ; val = value;
@@ -332,7 +340,7 @@ static void b43_nphy_rf_control_intc_override(struct b43_wldev *dev, u8 field, }b43_phy_maskset (dev, reg, ~tmp, val);break ; -case 4 : +case N_INTC_OVERRIDE_EXT_LNA_GAIN :if (b43_current_band (dev->wl) ==IEEE80211_BAND_5GHZ ) { tmp =0x0002 ; val = value <<1 ;
@@ -1618,8 +1626,8 @@ static void b43_nphy_rev3_rssi_cal(struct b43_wldev *dev)for (i =0 ; i <ARRAY_SIZE (regs_to_store); i++) saved_regs_phy[i] =b43_phy_read (dev, regs_to_store[i]); -b43_nphy_rf_control_intc_override (dev,0 ,0 ,7 ); -b43_nphy_rf_control_intc_override (dev,1 ,1 ,7 ); +b43_nphy_rf_ctl_intc_override (dev,N_INTC_OVERRIDE_OFF ,0 ,7 ); +b43_nphy_rf_ctl_intc_override (dev,N_INTC_OVERRIDE_TRSW ,1 ,7 );b43_nphy_rf_control_override (dev,0x1 ,0 ,0 , false);b43_nphy_rf_control_override (dev,0x2 ,1 ,0 , false);b43_nphy_rf_control_override (dev,0x80 ,1 ,0 , false);
@@ -3619,7 +3627,7 @@ static void b43_nphy_rx_cal_phy_setup(struct b43_wldev *dev, u8 core)b43_phy_set (dev,B43_NPHY_AFECTL_OVER ,0x0007 ); } -b43_nphy_rf_control_intc_override (dev,2 ,0 ,3 ); +b43_nphy_rf_ctl_intc_override (dev,N_INTC_OVERRIDE_PA ,0 ,3 );b43_nphy_rf_control_override (dev,8 ,0 ,3 , false);b43_nphy_force_rf_sequence (dev,B43_RFSEQ_RX2TX );
@@ -3630,8 +3638,10 @@ static void b43_nphy_rx_cal_phy_setup(struct b43_wldev *dev, u8 core) rxval =4 ; txval = 2; } -b43_nphy_rf_control_intc_override (dev,1 , rxval, (core +1 )); -b43_nphy_rf_control_intc_override (dev,1 , txval, (2 - core)); +b43_nphy_rf_ctl_intc_override (dev,N_INTC_OVERRIDE_TRSW , rxval, + core +1 ); +b43_nphy_rf_ctl_intc_override (dev,N_INTC_OVERRIDE_TRSW , txval, +2 - core); }#endif
@@ -4190,9 +4200,9 @@ static void b43_nphy_tx_cal_phy_setup(struct b43_wldev *dev) regs[7 ] =b43_phy_read (dev,B43_NPHY_RFCTL_INTC1 ); regs[8 ] =b43_phy_read (dev,B43_NPHY_RFCTL_INTC2 ); -b43_nphy_rf_control_intc_override (dev,2 ,1 ,3 ); -b43_nphy_rf_control_intc_override (dev,1 ,2 ,1 ); -b43_nphy_rf_control_intc_override (dev,1 ,8 ,2 ); +b43_nphy_rf_ctl_intc_override (dev,N_INTC_OVERRIDE_PA ,1 ,3 ); +b43_nphy_rf_ctl_intc_override (dev,N_INTC_OVERRIDE_TRSW ,2 ,1 ); +b43_nphy_rf_ctl_intc_override (dev,N_INTC_OVERRIDE_TRSW ,8 ,2 ); regs[9 ] =b43_phy_read (dev,B43_NPHY_PAPD_EN0 ); regs[10 ] =b43_phy_read (dev,B43_NPHY_PAPD_EN1 );
Signature · 1 line
1.7.10.4
PATCH 4/6 b43: N-PHY: use shortcut "ctl" in functions names
In reply to Rafał Miłecki--- drivers/net/wireless/b43/phy_n.c | 44 +++++++++++++++++++------------------- 1 file changed, 22 insertions(+), 22 deletions(-)
drivers/net/wireless/b43/phy_n.c +22 -22
@@ -141,9 +141,9 @@ ok: }/* http://bcm-v4.sipsolutions.net/802.11/PHY/N/RFCtrlOverrideRev7 */ -static void b43_nphy_rf_control_override_rev7 (struct b43_wldev *dev,u16 field, -u16 value,u8 core,bool off, -u8 override) +static void b43_nphy_rf_ctl_override_rev7 (struct b43_wldev *dev,u16 field, +u16 value,u8 core,bool off, +u8 override) {const struct nphy_rf_control_override_rev7 *e;u16 en_addrs[3 ][2 ] = {
@@ -181,8 +181,8 @@ static void b43_nphy_rf_control_override_rev7(struct b43_wldev *dev, u16 field, }/* http://bcm-v4.sipsolutions.net/802.11/PHY/N/RFCtrlOverride */ -static void b43_nphy_rf_control_override (struct b43_wldev *dev,u16 field, -u16 value,u8 core,bool off) +static void b43_nphy_rf_ctl_override (struct b43_wldev *dev,u16 field, +u16 value,u8 core,bool off) {int i;u8 index =fls (field);
@@ -1628,17 +1628,17 @@ static void b43_nphy_rev3_rssi_cal(struct b43_wldev *dev)b43_nphy_rf_ctl_intc_override (dev,N_INTC_OVERRIDE_OFF ,0 ,7 );b43_nphy_rf_ctl_intc_override (dev,N_INTC_OVERRIDE_TRSW ,1 ,7 ); -b43_nphy_rf_control_override (dev,0x1 ,0 ,0 , false); -b43_nphy_rf_control_override (dev,0x2 ,1 ,0 , false); -b43_nphy_rf_control_override (dev,0x80 ,1 ,0 , false); -b43_nphy_rf_control_override (dev,0x40 ,1 ,0 , false); +b43_nphy_rf_ctl_override (dev,0x1 ,0 ,0 , false); +b43_nphy_rf_ctl_override (dev,0x2 ,1 ,0 , false); +b43_nphy_rf_ctl_override (dev,0x80 ,1 ,0 , false); +b43_nphy_rf_ctl_override (dev,0x40 ,1 ,0 , false);if (b43_current_band (dev->wl) ==IEEE80211_BAND_5GHZ ) { -b43_nphy_rf_control_override (dev,0x20 ,0 ,0 , false); -b43_nphy_rf_control_override (dev,0x10 ,1 ,0 , false); +b43_nphy_rf_ctl_override (dev,0x20 ,0 ,0 , false); +b43_nphy_rf_ctl_override (dev,0x10 ,1 ,0 , false); }else { -b43_nphy_rf_control_override (dev,0x10 ,0 ,0 , false); -b43_nphy_rf_control_override (dev,0x20 ,1 ,0 , false); +b43_nphy_rf_ctl_override (dev,0x10 ,0 ,0 , false); +b43_nphy_rf_ctl_override (dev,0x20 ,1 ,0 , false); } rx_core_state =b43_nphy_get_rx_core_state (dev);
@@ -2310,11 +2310,11 @@ static void b43_nphy_workarounds_rev7plus(struct b43_wldev *dev)b43_ntab_write (dev,B43_NTAB16 (7 ,0x159 + core *16 ), rx2tx_lut_40_11n); } -b43_nphy_rf_control_override_rev7 (dev,16 ,1 ,3 , false,2 ); +b43_nphy_rf_ctl_override_rev7 (dev,16 ,1 ,3 , false,2 ); }b43_phy_write (dev,0x32F ,0x3 );if (phy->radio_rev ==4 || phy->radio_rev ==6 ) -b43_nphy_rf_control_override_rev7 (dev,4 ,1 ,3 , false,0 ); +b43_nphy_rf_ctl_override_rev7 (dev,4 ,1 ,3 , false,0 );if (phy->radio_rev ==3 || phy->radio_rev ==4 || phy->radio_rev ==6 ) { if (sprom->revision &&
@@ -3174,9 +3174,9 @@ static void b43_nphy_tx_power_ctl_idle_tssi(struct b43_wldev *dev)b43_nphy_ipa_internal_tssi_setup (dev);if (phy->rev >=7 ) -b43_nphy_rf_control_override_rev7 (dev,0x2000 ,0 ,3 , false,0 ); +b43_nphy_rf_ctl_override_rev7 (dev,0x2000 ,0 ,3 , false,0 );else if (phy->rev >=3 ) -b43_nphy_rf_control_override (dev,0x2000 ,0 ,3 , false); +b43_nphy_rf_ctl_override (dev,0x2000 ,0 ,3 , false);b43_nphy_stop_playback (dev);b43_nphy_tx_tone (dev,0xFA0 ,0 , false, false);
@@ -3186,9 +3186,9 @@ static void b43_nphy_tx_power_ctl_idle_tssi(struct b43_wldev *dev)b43_nphy_rssi_select (dev,0 ,N_RSSI_W1 );if (phy->rev >=7 ) -b43_nphy_rf_control_override_rev7 (dev,0x2000 ,0 ,3 , true,0 ); +b43_nphy_rf_ctl_override_rev7 (dev,0x2000 ,0 ,3 , true,0 );else if (phy->rev >=3 ) -b43_nphy_rf_control_override (dev,0x2000 ,0 ,3 , true); +b43_nphy_rf_ctl_override (dev,0x2000 ,0 ,3 , true);if (phy->rev >=3 ) { nphy->pwr_ctl_info[0 ].idle_tssi_5g = (tmp >>24 ) &0xFF ;
@@ -3628,7 +3628,7 @@ static void b43_nphy_rx_cal_phy_setup(struct b43_wldev *dev, u8 core) }b43_nphy_rf_ctl_intc_override (dev,N_INTC_OVERRIDE_PA ,0 ,3 ); -b43_nphy_rf_control_override (dev,8 ,0 ,3 , false); +b43_nphy_rf_ctl_override (dev,8 ,0 ,3 , false);b43_nphy_force_rf_sequence (dev,B43_RFSEQ_RX2TX );if (core ==0 ) {
@@ -4735,7 +4735,7 @@ static int b43_nphy_rev2_cal_rx_iq(struct b43_wldev *dev, tmp[0 ] = ((cur_hpf2 <<8 ) | (cur_hpf1 <<4 ) | (cur_lna <<2 )); -b43_nphy_rf_control_override (dev,0x400 , tmp[0 ],3 , +b43_nphy_rf_ctl_override (dev,0x400 , tmp[0 ],3 , false);b43_nphy_force_rf_sequence (dev,B43_RFSEQ_RESET2RX );b43_nphy_stop_playback (dev);
@@ -4784,7 +4784,7 @@ static int b43_nphy_rev2_cal_rx_iq(struct b43_wldev *dev,break ; } -b43_nphy_rf_control_override (dev,0x400 ,0 ,3 , true); +b43_nphy_rf_ctl_override (dev,0x400 ,0 ,3 , true);b43_nphy_force_rf_sequence (dev,B43_RFSEQ_RESET2RX );b43_ntab_write_bulk (dev,B43_NTAB16 (7 ,0x110 ),2 , gain_save);
Signature · 1 line
1.7.10.4
PATCH 5/6 b43: N-PHY: use defines for (re)storing VCM config
In reply to Rafał Miłecki--- drivers/net/wireless/b43/phy_n.c | 19 ++++++++++++++----- 1 file changed, 14 insertions(+), 5 deletions(-)
drivers/net/wireless/b43/phy_n.c +14 -5
@@ -1748,8 +1748,13 @@ static void b43_nphy_rev3_rssi_cal(struct b43_wldev *dev) rssical_radio_regs = nphy->rssical_cache.rssical_radio_regs_5G; rssical_phy_regs = nphy->rssical_cache.rssical_phy_regs_5G; } - rssical_radio_regs[0 ] =b43_radio_read (dev,0x602B ); - rssical_radio_regs[0 ] =b43_radio_read (dev,0x702B ); +if (dev->phy.rev >=7 ) { + }else { + rssical_radio_regs[0 ] =b43_radio_read (dev,B2056_RX0 | +B2056_RX_RSSI_MISC ); + rssical_radio_regs[1 ] =b43_radio_read (dev,B2056_RX1 | +B2056_RX_RSSI_MISC ); + } rssical_phy_regs[0 ] =b43_phy_read (dev,B43_NPHY_RSSIMC_0I_RSSI_Z ); rssical_phy_regs[1 ] =b43_phy_read (dev,B43_NPHY_RSSIMC_0Q_RSSI_Z ); rssical_phy_regs[2 ] =b43_phy_read (dev,B43_NPHY_RSSIMC_1I_RSSI_Z );
@@ -3903,9 +3908,13 @@ static void b43_nphy_restore_rssi_cal(struct b43_wldev *dev) rssical_phy_regs = nphy->rssical_cache.rssical_phy_regs_5G; } -/* TODO use some definitions */ -b43_radio_maskset (dev,0x602B ,0xE3 , rssical_radio_regs[0 ]); -b43_radio_maskset (dev,0x702B ,0xE3 , rssical_radio_regs[1 ]); +if (dev->phy.rev >=7 ) { + }else { +b43_radio_maskset (dev,B2056_RX0 |B2056_RX_RSSI_MISC ,0xE3 , + rssical_radio_regs[0 ]); +b43_radio_maskset (dev,B2056_RX1 |B2056_RX_RSSI_MISC ,0xE3 , + rssical_radio_regs[1 ]); + }b43_phy_write (dev,B43_NPHY_RSSIMC_0I_RSSI_Z , rssical_phy_regs[0 ]);b43_phy_write (dev,B43_NPHY_RSSIMC_0Q_RSSI_Z , rssical_phy_regs[1 ]);
Signature · 1 line
1.7.10.4
PATCH 6/6 b43: N-PHY: move tables init function to tables file
In reply to Rafał Miłecki--- drivers/net/wireless/b43/phy_n.c | 12 ------------ drivers/net/wireless/b43/tables_nphy.c | 13 +++++++++++-- drivers/net/wireless/b43/tables_nphy.h | 3 +-- 3 files changed, 12 insertions(+), 16 deletions(-)
drivers/net/wireless/b43/phy_n.c +0 -12
@@ -4862,18 +4862,6 @@ static void b43_nphy_set_rx_core_state(struct b43_wldev *dev, u8 mask)* N-PHY init **************************************************/ -/* -* Upload the N-PHY tables. -* http://bcm-v4.sipsolutions.net/802.11/PHY/N/InitTables -*/ -static void b43_nphy_tables_init (struct b43_wldev *dev) -{ -if (dev->phy.rev <3 ) -b43_nphy_rev0_1_2_tables_init (dev); -else -b43_nphy_rev3plus_tables_init (dev); -} -/* http://bcm-v4.sipsolutions.net/802.11/PHY/N/MIMOConfig */ static void b43_nphy_update_mimo_config (struct b43_wldev *dev,s32 preamble) {
drivers/net/wireless/b43/tables_nphy.c +11 -2
@@ -3097,7 +3097,7 @@ void b43_ntab_write_bulk(struct b43_wldev *dev, u32 offset,#define ntab_upload (dev, offset, data) do { \ b43_ntab_write_bulk(dev, offset, offset##_SIZE, data); \ } while (0) -void b43_nphy_rev0_1_2_tables_init (struct b43_wldev *dev) +static void b43_nphy_tables_init_rev0 (struct b43_wldev *dev) {/* Static tables */ ntab_upload (dev,B43_NTAB_FRAMESTRUCT , b43_ntab_framestruct);
@@ -3133,7 +3133,7 @@ void b43_nphy_rev0_1_2_tables_init(struct b43_wldev *dev)#define ntab_upload_r3 (dev, offset, data) do { \ b43_ntab_write_bulk(dev, offset, ARRAY_SIZE(data), data); \ } while (0) -void b43_nphy_rev3plus_tables_init (struct b43_wldev *dev) +static void b43_nphy_tables_init_rev3 (struct b43_wldev *dev) {struct ssb_sprom *sprom = dev->dev->bus_sprom;
@@ -3174,6 +3174,15 @@ void b43_nphy_rev3plus_tables_init(struct b43_wldev *dev)B43_WARN_ON (1 ); } +/* http://bcm-v4.sipsolutions.net/802.11/PHY/N/InitTables */ +void b43_nphy_tables_init (struct b43_wldev *dev) +{ +if (dev->phy.rev >=3 ) +b43_nphy_tables_init_rev3 (dev); +else +b43_nphy_tables_init_rev0 (dev); +} +/* http://bcm-v4.sipsolutions.net/802.11/PHY/N/GetIpaGainTbl */ static const u32 *b43_nphy_get_ipa_gain_table (struct b43_wldev *dev) {
drivers/net/wireless/b43/tables_nphy.h +1 -2
@@ -182,8 +182,7 @@ void b43_ntab_write(struct b43_wldev *dev, u32 offset, u32 value);void b43_ntab_write_bulk (struct b43_wldev *dev,u32 offset,unsigned int nr_elements,const void *_data); -void b43_nphy_rev0_1_2_tables_init (struct b43_wldev *dev); -void b43_nphy_rev3plus_tables_init (struct b43_wldev *dev); +void b43_nphy_tables_init (struct b43_wldev *dev);const u32 *b43_nphy_get_tx_gain_table (struct b43_wldev *dev);
Signature · 1 line
1.7.10.4