ath9k_hw: make ath9k_phy_modify_rx_buffer() static
To do this we reorder callers in order in which they are called. Signed-off-by: Luis R. Rodriguez <lrodriguez@atheros.com> Signed-off-by: John W. Linville <linville@tuxdriver.com>
This commit is contained in:
Luis R. Rodriguez
John W. Linville
parent
a776582861
commit
ddcd4c0818
@ -41,10 +41,6 @@
|
|||||||
|
|
||||||
#include "hw.h"
|
#include "hw.h"
|
||||||
|
|
||||||
static void ath9k_phy_modify_rx_buffer(u32 *rfBuf, u32 reg32,
|
|
||||||
u32 numBits, u32 firstBit,
|
|
||||||
u32 column);
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* ath9k_hw_write_regs - ??
|
* ath9k_hw_write_regs - ??
|
||||||
*
|
*
|
||||||
@ -433,6 +429,43 @@ void ath9k_hw_9280_spur_mitigate(struct ath_hw *ah, struct ath9k_channel *chan)
|
|||||||
|
|
||||||
/* All code below is for non single-chip solutions */
|
/* All code below is for non single-chip solutions */
|
||||||
|
|
||||||
|
/**
|
||||||
|
* ath9k_phy_modify_rx_buffer() - perform analog swizzling of parameters
|
||||||
|
* @rfbuf:
|
||||||
|
* @reg32:
|
||||||
|
* @numBits:
|
||||||
|
* @firstBit:
|
||||||
|
* @column:
|
||||||
|
*
|
||||||
|
* Performs analog "swizzling" of parameters into their location.
|
||||||
|
* Used on external AR2133/AR5133 radios.
|
||||||
|
*/
|
||||||
|
static void ath9k_phy_modify_rx_buffer(u32 *rfBuf, u32 reg32,
|
||||||
|
u32 numBits, u32 firstBit,
|
||||||
|
u32 column)
|
||||||
|
{
|
||||||
|
u32 tmp32, mask, arrayEntry, lastBit;
|
||||||
|
int32_t bitPosition, bitsLeft;
|
||||||
|
|
||||||
|
tmp32 = ath9k_hw_reverse_bits(reg32, numBits);
|
||||||
|
arrayEntry = (firstBit - 1) / 8;
|
||||||
|
bitPosition = (firstBit - 1) % 8;
|
||||||
|
bitsLeft = numBits;
|
||||||
|
while (bitsLeft > 0) {
|
||||||
|
lastBit = (bitPosition + bitsLeft > 8) ?
|
||||||
|
8 : bitPosition + bitsLeft;
|
||||||
|
mask = (((1 << lastBit) - 1) ^ ((1 << bitPosition) - 1)) <<
|
||||||
|
(column * 8);
|
||||||
|
rfBuf[arrayEntry] &= ~mask;
|
||||||
|
rfBuf[arrayEntry] |= ((tmp32 << bitPosition) <<
|
||||||
|
(column * 8)) & mask;
|
||||||
|
bitsLeft -= 8 - bitPosition;
|
||||||
|
tmp32 = tmp32 >> (8 - bitPosition);
|
||||||
|
bitPosition = 0;
|
||||||
|
arrayEntry++;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* Fix on 2.4 GHz band for orientation sensitivity issue by increasing
|
* Fix on 2.4 GHz band for orientation sensitivity issue by increasing
|
||||||
* rf_pwd_icsyndiv.
|
* rf_pwd_icsyndiv.
|
||||||
@ -494,6 +527,95 @@ static void ath9k_hw_force_bias(struct ath_hw *ah, u16 synth_freq)
|
|||||||
REG_WRITE_RF_ARRAY(&ah->iniBank6, ah->analogBank6Data, reg_writes);
|
REG_WRITE_RF_ARRAY(&ah->iniBank6, ah->analogBank6Data, reg_writes);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* ath9k_hw_decrease_chain_power()
|
||||||
|
*
|
||||||
|
* @ah: atheros hardware structure
|
||||||
|
* @chan:
|
||||||
|
*
|
||||||
|
* Only used on the AR5416 and AR5418 with the external AR2133/AR5133 radios.
|
||||||
|
*
|
||||||
|
* Sets a chain internal RF path to the lowest output power. Any
|
||||||
|
* further writes to bank6 after this setting will override these
|
||||||
|
* changes. Thus this function must be the last function in the
|
||||||
|
* sequence to modify bank 6.
|
||||||
|
*
|
||||||
|
* This function must be called after ar5416SetRfRegs() which is
|
||||||
|
* called from ath9k_hw_process_ini() due to swizzling of bank 6.
|
||||||
|
* Depends on ah->analogBank6Data being initialized by
|
||||||
|
* ath9k_hw_set_rf_regs()
|
||||||
|
*
|
||||||
|
* Additional additive reduction in power -
|
||||||
|
* change chain's switch table so chain's tx state is actually the rx
|
||||||
|
* state value. May produce different results in 2GHz/5GHz as well as
|
||||||
|
* board to board but in general should be a reduction.
|
||||||
|
*
|
||||||
|
* Activated by #ifdef ALTER_SWITCH. Not tried yet. If so, must be
|
||||||
|
* called after ah->eep_ops->set_board_values() due to RMW of
|
||||||
|
* PHY_SWITCH_CHAIN_0.
|
||||||
|
*/
|
||||||
|
void ath9k_hw_decrease_chain_power(struct ath_hw *ah,
|
||||||
|
struct ath9k_channel *chan)
|
||||||
|
{
|
||||||
|
int i, regWrites = 0;
|
||||||
|
u32 bank6SelMask;
|
||||||
|
u32 *bank6Temp = ah->bank6Temp;
|
||||||
|
|
||||||
|
BUG_ON(AR_SREV_9280_10_OR_LATER(ah));
|
||||||
|
|
||||||
|
switch (ah->config.diversity_control) {
|
||||||
|
case ATH9K_ANT_FIXED_A:
|
||||||
|
bank6SelMask =
|
||||||
|
(ah->config.antenna_switch_swap & ANTSWAP_AB) ?
|
||||||
|
REDUCE_CHAIN_0 : /* swapped, reduce chain 0 */
|
||||||
|
REDUCE_CHAIN_1; /* normal, select chain 1/2 to reduce */
|
||||||
|
break;
|
||||||
|
case ATH9K_ANT_FIXED_B:
|
||||||
|
bank6SelMask =
|
||||||
|
(ah->config.antenna_switch_swap & ANTSWAP_AB) ?
|
||||||
|
REDUCE_CHAIN_1 : /* swapped, reduce chain 1/2 */
|
||||||
|
REDUCE_CHAIN_0; /* normal, select chain 0 to reduce */
|
||||||
|
break;
|
||||||
|
case ATH9K_ANT_VARIABLE:
|
||||||
|
return; /* do not change anything */
|
||||||
|
break;
|
||||||
|
default:
|
||||||
|
return; /* do not change anything */
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
|
||||||
|
for (i = 0; i < ah->iniBank6.ia_rows; i++)
|
||||||
|
bank6Temp[i] = ah->analogBank6Data[i];
|
||||||
|
|
||||||
|
/* Write Bank 5 to switch Bank 6 write to selected chain only */
|
||||||
|
REG_WRITE(ah, AR_PHY_BASE + 0xD8, bank6SelMask);
|
||||||
|
|
||||||
|
/*
|
||||||
|
* Modify Bank6 selected chain to use lowest amplification.
|
||||||
|
* Modifies the parameters to a value of 1.
|
||||||
|
* Depends on existing bank 6 values to be cached in
|
||||||
|
* ah->analogBank6Data
|
||||||
|
*/
|
||||||
|
ath9k_phy_modify_rx_buffer(bank6Temp, 1, 1, 189, 0);
|
||||||
|
ath9k_phy_modify_rx_buffer(bank6Temp, 1, 1, 190, 0);
|
||||||
|
ath9k_phy_modify_rx_buffer(bank6Temp, 1, 1, 191, 0);
|
||||||
|
ath9k_phy_modify_rx_buffer(bank6Temp, 1, 1, 192, 0);
|
||||||
|
ath9k_phy_modify_rx_buffer(bank6Temp, 1, 1, 193, 0);
|
||||||
|
ath9k_phy_modify_rx_buffer(bank6Temp, 1, 1, 222, 0);
|
||||||
|
ath9k_phy_modify_rx_buffer(bank6Temp, 1, 1, 245, 0);
|
||||||
|
ath9k_phy_modify_rx_buffer(bank6Temp, 1, 1, 246, 0);
|
||||||
|
ath9k_phy_modify_rx_buffer(bank6Temp, 1, 1, 247, 0);
|
||||||
|
|
||||||
|
REG_WRITE_RF_ARRAY(&ah->iniBank6, bank6Temp, regWrites);
|
||||||
|
|
||||||
|
REG_WRITE(ah, AR_PHY_BASE + 0xD8, 0x00000053);
|
||||||
|
#ifdef ALTER_SWITCH
|
||||||
|
REG_WRITE(ah, PHY_SWITCH_CHAIN_0,
|
||||||
|
(REG_READ(ah, PHY_SWITCH_CHAIN_0) & ~0x38)
|
||||||
|
| ((REG_READ(ah, PHY_SWITCH_CHAIN_0) >> 3) & 0x38));
|
||||||
|
#endif
|
||||||
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* ath9k_hw_set_channel - tune to a channel on the external AR2133/AR5133 radios
|
* ath9k_hw_set_channel - tune to a channel on the external AR2133/AR5133 radios
|
||||||
* @ah: atheros hardware stucture
|
* @ah: atheros hardware stucture
|
||||||
@ -853,43 +975,6 @@ ath9k_hw_rf_free_ext_banks(struct ath_hw *ah)
|
|||||||
#undef ATH_FREE_BANK
|
#undef ATH_FREE_BANK
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
|
||||||
* ath9k_phy_modify_rx_buffer() - perform analog swizzling of parameters
|
|
||||||
* @rfbuf:
|
|
||||||
* @reg32:
|
|
||||||
* @numBits:
|
|
||||||
* @firstBit:
|
|
||||||
* @column:
|
|
||||||
*
|
|
||||||
* Performs analog "swizzling" of parameters into their location.
|
|
||||||
* Used on external AR2133/AR5133 radios.
|
|
||||||
*/
|
|
||||||
static void ath9k_phy_modify_rx_buffer(u32 *rfBuf, u32 reg32,
|
|
||||||
u32 numBits, u32 firstBit,
|
|
||||||
u32 column)
|
|
||||||
{
|
|
||||||
u32 tmp32, mask, arrayEntry, lastBit;
|
|
||||||
int32_t bitPosition, bitsLeft;
|
|
||||||
|
|
||||||
tmp32 = ath9k_hw_reverse_bits(reg32, numBits);
|
|
||||||
arrayEntry = (firstBit - 1) / 8;
|
|
||||||
bitPosition = (firstBit - 1) % 8;
|
|
||||||
bitsLeft = numBits;
|
|
||||||
while (bitsLeft > 0) {
|
|
||||||
lastBit = (bitPosition + bitsLeft > 8) ?
|
|
||||||
8 : bitPosition + bitsLeft;
|
|
||||||
mask = (((1 << lastBit) - 1) ^ ((1 << bitPosition) - 1)) <<
|
|
||||||
(column * 8);
|
|
||||||
rfBuf[arrayEntry] &= ~mask;
|
|
||||||
rfBuf[arrayEntry] |= ((tmp32 << bitPosition) <<
|
|
||||||
(column * 8)) & mask;
|
|
||||||
bitsLeft -= 8 - bitPosition;
|
|
||||||
tmp32 = tmp32 >> (8 - bitPosition);
|
|
||||||
bitPosition = 0;
|
|
||||||
arrayEntry++;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
/* *
|
/* *
|
||||||
* ath9k_hw_set_rf_regs - programs rf registers based on EEPROM
|
* ath9k_hw_set_rf_regs - programs rf registers based on EEPROM
|
||||||
* @ah: atheros hardware structure
|
* @ah: atheros hardware structure
|
||||||
@ -979,92 +1064,3 @@ bool ath9k_hw_set_rf_regs(struct ath_hw *ah, struct ath9k_channel *chan,
|
|||||||
|
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
|
||||||
* ath9k_hw_decrease_chain_power()
|
|
||||||
*
|
|
||||||
* @ah: atheros hardware structure
|
|
||||||
* @chan:
|
|
||||||
*
|
|
||||||
* Only used on the AR5416 and AR5418 with the external AR2133/AR5133 radios.
|
|
||||||
*
|
|
||||||
* Sets a chain internal RF path to the lowest output power. Any
|
|
||||||
* further writes to bank6 after this setting will override these
|
|
||||||
* changes. Thus this function must be the last function in the
|
|
||||||
* sequence to modify bank 6.
|
|
||||||
*
|
|
||||||
* This function must be called after ar5416SetRfRegs() which is
|
|
||||||
* called from ath9k_hw_process_ini() due to swizzling of bank 6.
|
|
||||||
* Depends on ah->analogBank6Data being initialized by
|
|
||||||
* ath9k_hw_set_rf_regs()
|
|
||||||
*
|
|
||||||
* Additional additive reduction in power -
|
|
||||||
* change chain's switch table so chain's tx state is actually the rx
|
|
||||||
* state value. May produce different results in 2GHz/5GHz as well as
|
|
||||||
* board to board but in general should be a reduction.
|
|
||||||
*
|
|
||||||
* Activated by #ifdef ALTER_SWITCH. Not tried yet. If so, must be
|
|
||||||
* called after ah->eep_ops->set_board_values() due to RMW of
|
|
||||||
* PHY_SWITCH_CHAIN_0.
|
|
||||||
*/
|
|
||||||
void
|
|
||||||
ath9k_hw_decrease_chain_power(struct ath_hw *ah, struct ath9k_channel *chan)
|
|
||||||
{
|
|
||||||
int i, regWrites = 0;
|
|
||||||
u32 bank6SelMask;
|
|
||||||
u32 *bank6Temp = ah->bank6Temp;
|
|
||||||
|
|
||||||
BUG_ON(AR_SREV_9280_10_OR_LATER(ah));
|
|
||||||
|
|
||||||
switch (ah->config.diversity_control) {
|
|
||||||
case ATH9K_ANT_FIXED_A:
|
|
||||||
bank6SelMask =
|
|
||||||
(ah->config.antenna_switch_swap & ANTSWAP_AB) ?
|
|
||||||
REDUCE_CHAIN_0 : /* swapped, reduce chain 0 */
|
|
||||||
REDUCE_CHAIN_1; /* normal, select chain 1/2 to reduce */
|
|
||||||
break;
|
|
||||||
case ATH9K_ANT_FIXED_B:
|
|
||||||
bank6SelMask =
|
|
||||||
(ah->config.antenna_switch_swap & ANTSWAP_AB) ?
|
|
||||||
REDUCE_CHAIN_1 : /* swapped, reduce chain 1/2 */
|
|
||||||
REDUCE_CHAIN_0; /* normal, select chain 0 to reduce */
|
|
||||||
break;
|
|
||||||
case ATH9K_ANT_VARIABLE:
|
|
||||||
return; /* do not change anything */
|
|
||||||
break;
|
|
||||||
default:
|
|
||||||
return; /* do not change anything */
|
|
||||||
break;
|
|
||||||
}
|
|
||||||
|
|
||||||
for (i = 0; i < ah->iniBank6.ia_rows; i++)
|
|
||||||
bank6Temp[i] = ah->analogBank6Data[i];
|
|
||||||
|
|
||||||
/* Write Bank 5 to switch Bank 6 write to selected chain only */
|
|
||||||
REG_WRITE(ah, AR_PHY_BASE + 0xD8, bank6SelMask);
|
|
||||||
|
|
||||||
/*
|
|
||||||
* Modify Bank6 selected chain to use lowest amplification.
|
|
||||||
* Modifies the parameters to a value of 1.
|
|
||||||
* Depends on existing bank 6 values to be cached in
|
|
||||||
* ah->analogBank6Data
|
|
||||||
*/
|
|
||||||
ath9k_phy_modify_rx_buffer(bank6Temp, 1, 1, 189, 0);
|
|
||||||
ath9k_phy_modify_rx_buffer(bank6Temp, 1, 1, 190, 0);
|
|
||||||
ath9k_phy_modify_rx_buffer(bank6Temp, 1, 1, 191, 0);
|
|
||||||
ath9k_phy_modify_rx_buffer(bank6Temp, 1, 1, 192, 0);
|
|
||||||
ath9k_phy_modify_rx_buffer(bank6Temp, 1, 1, 193, 0);
|
|
||||||
ath9k_phy_modify_rx_buffer(bank6Temp, 1, 1, 222, 0);
|
|
||||||
ath9k_phy_modify_rx_buffer(bank6Temp, 1, 1, 245, 0);
|
|
||||||
ath9k_phy_modify_rx_buffer(bank6Temp, 1, 1, 246, 0);
|
|
||||||
ath9k_phy_modify_rx_buffer(bank6Temp, 1, 1, 247, 0);
|
|
||||||
|
|
||||||
REG_WRITE_RF_ARRAY(&ah->iniBank6, bank6Temp, regWrites);
|
|
||||||
|
|
||||||
REG_WRITE(ah, AR_PHY_BASE + 0xD8, 0x00000053);
|
|
||||||
#ifdef ALTER_SWITCH
|
|
||||||
REG_WRITE(ah, PHY_SWITCH_CHAIN_0,
|
|
||||||
(REG_READ(ah, PHY_SWITCH_CHAIN_0) & ~0x38)
|
|
||||||
| ((REG_READ(ah, PHY_SWITCH_CHAIN_0) >> 3) & 0x38));
|
|
||||||
#endif
|
|
||||||
}
|
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user