Author: adrian
Date: Fri May 13 14:33:45 2011
New Revision: 221837
URL: http://svn.freebsd.org/changeset/base/221837
Log:
Only do open loop power control and temperature compensation
for the AR9280 based NICs if it's actually enabled.
Some of the OLC code was erroneously called during setup
and calibration. This may have caused some incorrect behaviour.
Modified:
head/sys/dev/ath/ath_hal/ar5416/ar5416_cal.c
head/sys/dev/ath/ath_hal/ar5416/ar5416_reset.c
head/sys/dev/ath/ath_hal/ar9002/ar9280_olc.c
Modified: head/sys/dev/ath/ath_hal/ar5416/ar5416_cal.c
==============================================================================
--- head/sys/dev/ath/ath_hal/ar5416/ar5416_cal.c Fri May 13 14:29:28
2011 (r221836)
+++ head/sys/dev/ath/ath_hal/ar5416/ar5416_cal.c Fri May 13 14:33:45
2011 (r221837)
@@ -492,8 +492,9 @@ ar5416PerCalibrationN(struct ath_hal *ah
if (AH5416(ah)->ah_cal_pacal)
AH5416(ah)->ah_cal_pacal(ah, AH_FALSE);
- /* Do temperature compensation if the chipset needs it */
- AH5416(ah)->ah_olcTempCompensation(ah);
+ /* Do open-loop temperature compensation if the chipset needs
it */
+ if (ath_hal_eepromGetFlag(ah, AR_EEP_OL_PWRCTRL))
+ AH5416(ah)->ah_olcTempCompensation(ah);
/*
* Get the value from the previous NF cal
Modified: head/sys/dev/ath/ath_hal/ar5416/ar5416_reset.c
==============================================================================
--- head/sys/dev/ath/ath_hal/ar5416/ar5416_reset.c Fri May 13 14:29:28
2011 (r221836)
+++ head/sys/dev/ath/ath_hal/ar5416/ar5416_reset.c Fri May 13 14:33:45
2011 (r221837)
@@ -202,8 +202,11 @@ ar5416Reset(struct ath_hal *ah, HAL_OPMO
*/
ar5416InitChainMasks(ah);
- /* Setup the open-loop temperature compensation if required */
- AH5416(ah)->ah_olcInit(ah);
+ /* Setup the open-loop power calibration if required */
+ if (ath_hal_eepromGetFlag(ah, AR_EEP_OL_PWRCTRL)) {
+ AH5416(ah)->ah_olcInit(ah);
+ AH5416(ah)->ah_olcTempCompensation(ah);
+ }
/* Setup the transmit power values. */
if (!ah->ah_setTxPower(ah, chan, rfXpdGain)) {
Modified: head/sys/dev/ath/ath_hal/ar9002/ar9280_olc.c
==============================================================================
--- head/sys/dev/ath/ath_hal/ar9002/ar9280_olc.c Fri May 13 14:29:28
2011 (r221836)
+++ head/sys/dev/ath/ath_hal/ar9002/ar9280_olc.c Fri May 13 14:33:45
2011 (r221837)
@@ -43,6 +43,12 @@ ar9280olcInit(struct ath_hal *ah)
{
uint32_t i;
+ /* Only do OLC if it's enabled for this chipset */
+ if (! ath_hal_eepromGetFlag(ah, AR_EEP_OL_PWRCTRL))
+ return;
+
+ HALDEBUG(ah, HAL_DEBUG_RESET, "%s: Setting up TX gain tables.\n",
__func__);
+
for (i = 0; i < AR9280_TX_GAIN_TABLE_SIZE; i++)
AH9280(ah)->originalGain[i] = MS(OS_REG_READ(ah,
AR_PHY_TX_GAIN_TBL1 + i * 4), AR_PHY_TX_GAIN);
@@ -126,6 +132,9 @@ ar9280olcTemperatureCompensation(struct
int delta, currPDADC, regval;
uint8_t hpwr_5g = 0;
+ if (! ath_hal_eepromGetFlag(ah, AR_EEP_OL_PWRCTRL))
+ return;
+
rddata = OS_REG_READ(ah, AR_PHY_TX_PWRCTRL4);
currPDADC = MS(rddata, AR_PHY_TX_PWRCTRL_PD_AVG_OUT);
_______________________________________________
svn-src-head@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
