* Add in some board settings debugging to log what's being written
to the TX closed-loop power control registers. * Modify a couple of functions to take the register chain number, rather than the regChainOffset value. This allows for the register chain to be logged.
This commit is contained in:
Adrian Chadd
parent
89033280b7
commit
b90b8dd2b2
@ -249,13 +249,13 @@ extern void ar5416GetGainBoundariesAndPdadcs(struct ath_hal *ah,
|
||||
uint16_t * pPdGainBoundaries, uint8_t * pPDADCValues,
|
||||
uint16_t numXpdGains);
|
||||
extern void ar5416SetGainBoundariesClosedLoop(struct ath_hal *ah,
|
||||
int regChainOffset, uint16_t pdGainOverlap_t2,
|
||||
int i, uint16_t pdGainOverlap_t2,
|
||||
uint16_t gainBoundaries[]);
|
||||
extern uint16_t ar5416GetXpdGainValues(struct ath_hal *ah, uint16_t xpdMask,
|
||||
uint16_t xpdGainValues[]);
|
||||
extern void ar5416WriteDetectorGainBiases(struct ath_hal *ah,
|
||||
uint16_t numXpdGain, uint16_t xpdGainValues[]);
|
||||
extern void ar5416WritePdadcValues(struct ath_hal *ah, int regChainOffset,
|
||||
extern void ar5416WritePdadcValues(struct ath_hal *ah, int i,
|
||||
uint8_t pdadcValues[]);
|
||||
extern HAL_BOOL ar5416SetPowerCalTable(struct ath_hal *ah,
|
||||
struct ar5416eeprom *pEepData, const struct ieee80211_channel *chan,
|
||||
|
||||
@ -1944,9 +1944,17 @@ ar5416GetTargetPowersLeg(struct ath_hal *ah,
|
||||
* target TX power.
|
||||
*/
|
||||
void
|
||||
ar5416SetGainBoundariesClosedLoop(struct ath_hal *ah, int regChainOffset,
|
||||
ar5416SetGainBoundariesClosedLoop(struct ath_hal *ah, int i,
|
||||
uint16_t pdGainOverlap_t2, uint16_t gainBoundaries[])
|
||||
{
|
||||
int regChainOffset;
|
||||
|
||||
regChainOffset = ar5416GetRegChainOffset(ah, i);
|
||||
|
||||
HALDEBUG(ah, HAL_DEBUG_EEPROM, "%s: chain %d: gainOverlap_t2: %d,"
|
||||
" gainBoundaries: %d, %d, %d, %d\n", __func__, i, pdGainOverlap_t2,
|
||||
gainBoundaries[0], gainBoundaries[1], gainBoundaries[2],
|
||||
gainBoundaries[3]);
|
||||
OS_REG_WRITE(ah, AR_PHY_TPCRG5 + regChainOffset,
|
||||
SM(pdGainOverlap_t2, AR_PHY_TPCRG5_PD_GAIN_OVERLAP) |
|
||||
SM(gainBoundaries[0], AR_PHY_TPCRG5_PD_GAIN_BOUNDARY_1) |
|
||||
@ -1998,6 +2006,10 @@ void
|
||||
ar5416WriteDetectorGainBiases(struct ath_hal *ah, uint16_t numXpdGain,
|
||||
uint16_t xpdGainValues[])
|
||||
{
|
||||
HALDEBUG(ah, HAL_DEBUG_EEPROM, "%s: numXpdGain: %d,"
|
||||
" xpdGainValues: %d, %d, %d\n", __func__, numXpdGain,
|
||||
xpdGainValues[0], xpdGainValues[1], xpdGainValues[2]);
|
||||
|
||||
OS_REG_WRITE(ah, AR_PHY_TPCRG1, (OS_REG_READ(ah, AR_PHY_TPCRG1) &
|
||||
~(AR_PHY_TPCRG1_NUM_PD_GAIN | AR_PHY_TPCRG1_PD_GAIN_1 |
|
||||
AR_PHY_TPCRG1_PD_GAIN_2 | AR_PHY_TPCRG1_PD_GAIN_3)) |
|
||||
@ -2008,20 +2020,20 @@ ar5416WriteDetectorGainBiases(struct ath_hal *ah, uint16_t numXpdGain,
|
||||
}
|
||||
|
||||
/*
|
||||
* Write the PDADC array to the given chain offset.
|
||||
* Write the PDADC array to the given radio chain i.
|
||||
*
|
||||
* The 32 PDADC registers are written without any care about
|
||||
* their contents - so if various chips treat values as "special",
|
||||
* this routine will not care.
|
||||
*/
|
||||
void
|
||||
ar5416WritePdadcValues(struct ath_hal *ah, int regChainOffset,
|
||||
uint8_t pdadcValues[])
|
||||
ar5416WritePdadcValues(struct ath_hal *ah, int i, uint8_t pdadcValues[])
|
||||
{
|
||||
int regOffset;
|
||||
int regOffset, regChainOffset;
|
||||
int j;
|
||||
int reg32;
|
||||
|
||||
regChainOffset = ar5416GetRegChainOffset(ah, i);
|
||||
regOffset = AR_PHY_BASE + (672 << 2) + regChainOffset;
|
||||
|
||||
for (j = 0; j < 32; j++) {
|
||||
@ -2030,16 +2042,14 @@ ar5416WritePdadcValues(struct ath_hal *ah, int regChainOffset,
|
||||
((pdadcValues[4*j + 2] & 0xFF) << 16) |
|
||||
((pdadcValues[4*j + 3] & 0xFF) << 24) ;
|
||||
OS_REG_WRITE(ah, regOffset, reg32);
|
||||
#ifdef PDADC_DUMP
|
||||
ath_hal_printf(ah, "PDADC: Chain %d | PDADC %3d Value %3d |"
|
||||
HALDEBUG(ah, HAL_DEBUG_EEPROM, "PDADC: Chain %d |"
|
||||
" PDADC %3d Value %3d | PDADC %3d Value %3d | PDADC %3d"
|
||||
" Value %3d |\n",
|
||||
" Value %3d | PDADC %3d Value %3d |\n",
|
||||
i,
|
||||
4*j, pdadcValues[4*j],
|
||||
4*j+1, pdadcValues[4*j + 1],
|
||||
4*j+2, pdadcValues[4*j + 2],
|
||||
4*j+3, pdadcValues[4*j + 3]);
|
||||
#endif
|
||||
regOffset += 4;
|
||||
}
|
||||
}
|
||||
@ -2108,12 +2118,12 @@ ar5416SetPowerCalTable(struct ath_hal *ah, struct ar5416eeprom *pEepData,
|
||||
pdadcValues, numXpdGain);
|
||||
|
||||
if ((i == 0) || AR_SREV_OWL_20_OR_LATER(ah)) {
|
||||
ar5416SetGainBoundariesClosedLoop(ah, regChainOffset,
|
||||
pdGainOverlap_t2, gainBoundaries);
|
||||
ar5416SetGainBoundariesClosedLoop(ah, i, pdGainOverlap_t2,
|
||||
gainBoundaries);
|
||||
}
|
||||
|
||||
/* Write the power values into the baseband power table */
|
||||
ar5416WritePdadcValues(ah, regChainOffset, pdadcValues);
|
||||
ar5416WritePdadcValues(ah, i, pdadcValues);
|
||||
}
|
||||
}
|
||||
*pTxPowerIndexOffset = 0;
|
||||
|
||||
@ -231,13 +231,20 @@ ar9280AdjustPDADCValues(struct ath_hal *ah, int8_t pwr_table_offset,
|
||||
* to the open-loop TX power control.
|
||||
*/
|
||||
static void
|
||||
ar9280SetGainBoundariesOpenLoop(struct ath_hal *ah, int regChainOffset,
|
||||
ar9280SetGainBoundariesOpenLoop(struct ath_hal *ah, int i,
|
||||
uint16_t pdGainOverlap_t2, uint16_t gainBoundaries[])
|
||||
{
|
||||
int regChainOffset;
|
||||
|
||||
regChainOffset = ar5416GetRegChainOffset(ah, i);
|
||||
|
||||
/* These are unused for OLC */
|
||||
(void) pdGainOverlap_t2;
|
||||
(void) gainBoundaries;
|
||||
|
||||
HALDEBUG(ah, HAL_DEBUG_EEPROM, "%s: chain %d: writing closed loop values\n",
|
||||
__func__, i);
|
||||
|
||||
OS_REG_WRITE(ah, AR_PHY_TPCRG5 + regChainOffset,
|
||||
SM(0x6, AR_PHY_TPCRG5_PD_GAIN_OVERLAP) |
|
||||
SM(0x38, AR_PHY_TPCRG5_PD_GAIN_BOUNDARY_1) |
|
||||
@ -366,11 +373,11 @@ ar9280SetPowerCalTable(struct ath_hal *ah, struct ar5416eeprom *pEepData,
|
||||
if (AR_SREV_MERLIN_20_OR_LATER(ah) &&
|
||||
ath_hal_eepromGetFlag(ah, AR_EEP_OL_PWRCTRL))
|
||||
ar9280SetGainBoundariesOpenLoop(ah,
|
||||
regChainOffset, pdGainOverlap_t2,
|
||||
i, pdGainOverlap_t2,
|
||||
gainBoundaries);
|
||||
else
|
||||
ar5416SetGainBoundariesClosedLoop(ah,
|
||||
regChainOffset, pdGainOverlap_t2,
|
||||
i, pdGainOverlap_t2,
|
||||
gainBoundaries);
|
||||
}
|
||||
|
||||
@ -383,7 +390,7 @@ ar9280SetPowerCalTable(struct ath_hal *ah, struct ar5416eeprom *pEepData,
|
||||
ar9280AdjustPDADCValues(ah, pwr_table_offset, diff, pdadcValues);
|
||||
|
||||
/* Write the power values into the baseband power table */
|
||||
ar5416WritePdadcValues(ah, regChainOffset, pdadcValues);
|
||||
ar5416WritePdadcValues(ah, i, pdadcValues);
|
||||
}
|
||||
}
|
||||
*pTxPowerIndexOffset = 0;
|
||||
|
||||
@ -603,11 +603,11 @@ ar9285SetPowerCalTable(struct ath_hal *ah, struct ar5416eeprom_4k *pEepData,
|
||||
* negative or greater than 0. Need to offset the power
|
||||
* values by the amount of minPower for griffin
|
||||
*/
|
||||
ar5416SetGainBoundariesClosedLoop(ah, regChainOffset, pdGainOverlap_t2, gainBoundaries);
|
||||
ar5416SetGainBoundariesClosedLoop(ah, i, pdGainOverlap_t2, gainBoundaries);
|
||||
}
|
||||
|
||||
/* Write the power values into the baseband power table */
|
||||
ar5416WritePdadcValues(ah, regChainOffset, pdadcValues);
|
||||
ar5416WritePdadcValues(ah, i, pdadcValues);
|
||||
}
|
||||
}
|
||||
*pTxPowerIndexOffset = 0;
|
||||
|
||||
Loading…
Reference in New Issue
Block a user