ath9k: Add open loop control support
PATCH 1/1 ath9k: Add open loop control support
This patch adds Open Loop Control support for Atheros chipsets that supports open loop power control.
Signed-off-by Senthil Balasubramanian <[email protected]>
--- drivers/net/wireless/ath9k/calib.c | 31 +++++ drivers/net/wireless/ath9k/eeprom.c | 210 +++++++++++++++++++++++++++++------ drivers/net/wireless/ath9k/eeprom.h | 13 ++- drivers/net/wireless/ath9k/hw.c | 26 ++++- drivers/net/wireless/ath9k/hw.h | 7 +- drivers/net/wireless/ath9k/phy.h | 25 ++++ drivers/net/wireless/ath9k/rc.c | 4 +- 7 files changed, 277 insertions(+), 39 deletions(-)
drivers/net/wireless/ath9k/calib.c +31 -0
@@ -718,10 +718,39 @@ s16 ath9k_hw_getchan_noise(struct ath_hw *ah, struct ath9k_channel *chan)return nf; } +static void ath9k_olc_temp_compensation (struct ath_hw *ah) +{ +u32 rddata, i; +int delta, currPDADC, regval; + + rddata =REG_READ (ah,AR_PHY_TX_PWRCTRL4 ); + + currPDADC =MS (rddata,AR_PHY_TX_PWRCTRL_PD_AVG_OUT ); + +if (ah->eep_ops->get_eeprom (ah,EEP_DAC_HPWR_5G )) + delta = (currPDADC - ah->initPDADC +4 ) /8 ; +else + delta = (currPDADC - ah->initPDADC +5 ) /10 ; + +if (delta != ah->PDADCdelta) { + ah->PDADCdelta = delta; +for (i =1 ; i <AR9280_TX_GAIN_TABLE_SIZE ; i++) { + regval = ah->originalGain[i] - delta; +if (regval <0 ) + regval =0 ; + +REG_RMW_FIELD (ah,AR_PHY_TX_GAIN_TBL1 + i *4 , +AR_PHY_TX_GAIN , regval); + } + } +} +bool ath9k_hw_calibrate (struct ath_hw *ah,struct ath9k_channel *chan,u8 rxchainmask,bool longcal,bool *isCalDone) { +#define OLC_FOR_AR9280_20_LATER (AR_SREV_9280_20_OR_LATER(ah) && \ + ah->eep_ops->get_eeprom(ah, EEP_OL_PWRCTRL))struct hal_cal_list *currCal = ah->cal_list_curr; *isCalDone = true;
@@ -742,6 +771,8 @@ bool ath9k_hw_calibrate(struct ath_hw *ah, struct ath9k_channel *chan, }if (longcal) { +if (OLC_FOR_AR9280_20_LATER ) +ath9k_olc_temp_compensation (ah);ath9k_hw_getnf (ah, chan);ath9k_hw_loadnf (ah, ah->curchan);ath9k_hw_start_nfcal (ah);
drivers/net/wireless/ath9k/eeprom.c +175 -35
285 lines not on this page · raw message
drivers/net/wireless/ath9k/eeprom.h +12 -1
@@ -168,6 +168,8 @@#define AR5416_EEP4K_PD_GAIN_ICEPTS 5#define AR5416_EEP4K_MAX_CHAINS 1 +#define AR9280_TX_GAIN_TABLE_SIZE 22 +enum eeprom_param {EEP_NFTHRESH_5 ,EEP_NFTHRESH_2 ,
@@ -188,6 +190,8 @@ enum eeprom_param {EEP_RX_MASK ,EEP_RXGAIN_TYPE ,EEP_TXGAIN_TYPE , +EEP_OL_PWRCTRL , +EEP_RC_CHAIN_MASK ,EEP_DAC_HPWR_5G , EEP_FRAC_N_5G };
@@ -229,7 +233,7 @@ struct base_eep_header {u8 futureBase_1[2 ];u8 rxGainType;u8 dacHiPwrMode_5G; -u8 futureBase_2; +u8 openLoopPwrCntl;u8 dacLpMode;u8 txGainType;u8 rcChainMask;
@@ -310,6 +314,13 @@ struct modal_eep_header {struct spur_chan spurChans[AR5416_EEPROM_MODAL_SPURS ]; } __packed; +struct calDataPerFreqOpLoop { +u8 pwrPdg[2 ][5 ]; +u8 vpdPdg[2 ][5 ]; +u8 pcdac[2 ][5 ]; +u8 empty[2 ][5 ]; +} __packed; +struct modal_eep_4k_header {u32 antCtrlChain[AR5416_EEP4K_MAX_CHAINS ];u32 antCtrlCommon;
drivers/net/wireless/ath9k/hw.c +25 -1
@@ -1202,10 +1202,23 @@ static u32 ath9k_hw_ini_fixup(struct ath_hw *ah,return ath9k_hw_def_ini_fixup (ah, pEepData, reg, value); } +static void ath9k_olc_init (struct ath_hw *ah) +{ +u32 i; + +for (i =0 ; i <AR9280_TX_GAIN_TABLE_SIZE ; i++) + ah->originalGain[i] = +MS (REG_READ (ah,AR_PHY_TX_GAIN_TBL1 + i *4 ), +AR_PHY_TX_GAIN ); + ah->PDADCdelta =0 ; +} +static int ath9k_hw_process_ini (struct ath_hw *ah,struct ath9k_channel *chan,enum ath9k_ht_macmode macmode) { +#define OLC_FOR_AR9280_20_LATER (AR_SREV_9280_20_OR_LATER(ah) && \ + ah->eep_ops->get_eeprom(ah, EEP_OL_PWRCTRL))int i, regWrites =0 ;struct ieee80211_channel *channel = chan->chan;u32 modesIndex, freqIndex;
@@ -1308,6 +1321,9 @@ static int ath9k_hw_process_ini(struct ath_hw *ah,ath9k_hw_set_regs (ah, chan, macmode);ath9k_hw_init_chain_masks (ah); +if (OLC_FOR_AR9280_20_LATER ) +ath9k_olc_init (ah); + status = ah->eep_ops->set_txpower(ah, chan, ath9k_regd_get_ctl(ah, chan), channel->max_antenna_gain * 2,
@@ -1515,6 +1531,7 @@ static bool ath9k_hw_set_reset_power_on(struct ath_hw *ah) AR_RTC_FORCE_WAKE_ON_INT);REG_WRITE (ah,AR_RTC_RESET ,0 ); +udelay (2 );REG_WRITE (ah,AR_RTC_RESET ,1 ); if (!ath9k_hw_wait(ah,
@@ -1582,7 +1599,10 @@ static void ath9k_hw_set_regs(struct ath_hw *ah, struct ath9k_channel *chan,static bool ath9k_hw_chip_reset (struct ath_hw *ah,struct ath9k_channel *chan) { -if (!ath9k_hw_set_reset_reg (ah,ATH9K_RESET_WARM )) +if (OLC_FOR_AR9280_20_LATER ) { +if (!ath9k_hw_set_reset_reg (ah,ATH9K_RESET_POWER_ON )) +return false; + }else if (!ath9k_hw_set_reset_reg (ah,ATH9K_RESET_WARM ))return false;if (!ath9k_hw_setpower (ah,ATH9K_PM_AWAKE ))
@@ -3404,6 +3424,10 @@ bool ath9k_hw_getcapability(struct ath_hw *ah, enum ath9k_capability_type type,return 0 ; }return false; +case ATH9K_CAP_DS : +return (AR_SREV_9280_20_OR_LATER (ah) && + (ah->eep_ops->get_eeprom (ah,EEP_RC_CHAIN_MASK ) ==1 )) + ? false : true;default :return false; }
drivers/net/wireless/ath9k/hw.h +6 -1
@@ -162,7 +162,8 @@ enum ath9k_capability_type {ATH9K_CAP_WME_TKIPMIC ,ATH9K_CAP_RFSILENT ,ATH9K_CAP_ANT_CFG_2GHZ , -ATH9K_CAP_ANT_CFG_5GHZ +ATH9K_CAP_ANT_CFG_5GHZ , +ATH9K_CAP_DS }; struct ath9k_hw_capabilities {
@@ -551,6 +552,10 @@ struct ath_hw {u8 txchainmask;u8 rxchainmask; +u32 originalGain[22 ]; +int initPDADC; +int PDADCdelta; +struct ar5416IniArray iniModes;struct ar5416IniArray iniCommon;struct ar5416IniArray iniBank0;
drivers/net/wireless/ath9k/phy.h +25 -0
@@ -387,6 +387,8 @@ bool ath9k_hw_init_rf(struct ath_hw *ah,#define AR_PHY_CCK_TX_CTRL 0xA204#define AR_PHY_CCK_TX_CTRL_JAPAN 0x00000010 +#define AR_PHY_CCK_TX_CTRL_TX_DAC_SCALE_CCK 0x0000000C +#define AR_PHY_CCK_TX_CTRL_TX_DAC_SCALE_CCK_S 2#define AR_PHY_CCK_DETECT 0xA208#define AR_PHY_CCK_DETECT_WEAK_SIG_THR_CCK 0x0000003F
@@ -444,6 +446,29 @@ bool ath9k_hw_init_rf(struct ath_hw *ah,#define AR_PHY_TPCRG1_PD_GAIN_3 0x00300000#define AR_PHY_TPCRG1_PD_GAIN_3_S 20 +#define AR_PHY_TX_PWRCTRL4 0xa264 +#define AR_PHY_TX_PWRCTRL_PD_AVG_VALID 0x00000001 +#define AR_PHY_TX_PWRCTRL_PD_AVG_VALID_S 0 +#define AR_PHY_TX_PWRCTRL_PD_AVG_OUT 0x000001FE +#define AR_PHY_TX_PWRCTRL_PD_AVG_OUT_S 1 + +#define AR_PHY_TX_PWRCTRL6_0 0xa270 +#define AR_PHY_TX_PWRCTRL6_1 0xb270 +#define AR_PHY_TX_PWRCTRL_ERR_EST_MODE 0x03000000 +#define AR_PHY_TX_PWRCTRL_ERR_EST_MODE_S 24 + +#define AR_PHY_TX_PWRCTRL7 0xa274 +#define AR_PHY_TX_PWRCTRL_INIT_TX_GAIN 0x01F80000 +#define AR_PHY_TX_PWRCTRL_INIT_TX_GAIN_S 19 + +#define AR_PHY_TX_PWRCTRL9 0xa27C +#define AR_PHY_TX_DESIRED_SCALE_CCK 0x00007C00 +#define AR_PHY_TX_DESIRED_SCALE_CCK_S 10 + +#define AR_PHY_TX_GAIN_TBL1 0xa300 +#define AR_PHY_TX_GAIN 0x0007F000 +#define AR_PHY_TX_GAIN_S 12 +#define AR_PHY_VIT_MASK2_M_46_61 0xa3a0#define AR_PHY_MASK2_M_31_45 0xa3a4#define AR_PHY_MASK2_M_16_30 0xa3a8
drivers/net/wireless/ath9k/rc.c +3 -1
@@ -1392,6 +1392,7 @@ static void ath_rc_init(struct ath_softc *sc,struct ath_rateset *rateset = &ath_rc_priv->neg_rates;u8 *ht_mcs = (u8 *)&ath_rc_priv->neg_ht_rates;u8 i, j, k, hi =0 , hthi =0 ; +struct ath_hw *ah = sc->sc_ah;/* FIXME: Adhoc */ if ((sc->sc_ah->opmode == NL80211_IFTYPE_STATION) ||
@@ -1412,7 +1413,8 @@ static void ath_rc_init(struct ath_softc *sc,if (sta->ht_cap.ht_supported) { ath_rc_priv->ht_cap =WLAN_RC_HT_FLAG ; -if (sc->sc_ah->caps.tx_chainmask !=1 ) +if (sc->sc_ah->caps.tx_chainmask !=1 && +ath9k_hw_getcapability (ah,ATH9K_CAP_DS ,0 ,NULL )) ath_rc_priv->ht_cap |=WLAN_RC_DS_FLAG ;if (sta->ht_cap.cap &IEEE80211_HT_CAP_SUP_WIDTH_20_40 ) ath_rc_priv->ht_cap |=WLAN_RC_40_FLAG ;
Signature · 1 line
1.6.0.4