ath5k: Put core clock initialization on a new function
Nick Kossifidis
maintainerPATCH 10/30 ath5k: Put core clock initialization on a new function
* Handle all usec parameters in one function. It's much cleaner this way.
Signed-off-by Nick Kossifidis <[email protected]>
--- drivers/net/wireless/ath/ath5k/ath5k.h | 26 +++++-- drivers/net/wireless/ath/ath5k/phy.c | 1 - drivers/net/wireless/ath/ath5k/qcu.c | 4 - drivers/net/wireless/ath/ath5k/reset.c | 130 ++++++++++++++++++++++++++++---- 4 files changed, 134 insertions(+), 27 deletions(-)
drivers/net/wireless/ath/ath5k/ath5k.h +18 -8
@@ -242,14 +242,6 @@#define AR5K_INIT_SLG_RETRY AR5K_INIT_SSH_RETRY#define AR5K_INIT_TX_RETRY 10 -#define AR5K_INIT_TRANSMIT_LATENCY ( \ - (AR5K_INIT_TX_LATENCY << 14) | (AR5K_INIT_USEC_32 << 7) | \ - (AR5K_INIT_USEC) \ -) -#define AR5K_INIT_TRANSMIT_LATENCY_TURBO ( \ - (AR5K_INIT_TX_LATENCY << 14) | (AR5K_INIT_USEC_32 << 7) | \ - (AR5K_INIT_USEC_TURBO) \ -)#define AR5K_INIT_PROTO_TIME_CNTRL ( \ (AR5K_INIT_CARR_SENSE_EN << 26) | (AR5K_INIT_EIFS << 12) | \ (AR5K_INIT_PROG_IFS) \
@@ -259,6 +251,24 @@ (AR5K_INIT_PROG_IFS_TURBO) \ ) +/* Rx latency for 5 and 10MHz operation (max ?) */ +#define AR5K_INIT_RX_LAT_MAX 63 +/* Tx latencies from initvals (5212 only but no problem +* because we only tweak them on 5212) */ +#define AR5K_INIT_TX_LAT_A 54 +#define AR5K_INIT_TX_LAT_BG 384 +/* Tx latency for 40MHz (turbo) operation (min ?) */ +#define AR5K_INIT_TX_LAT_MIN 32 + +/* Tx frame to Tx data start delay */ +#define AR5K_INIT_TXF2TXD_START_DEFAULT 14 +#define AR5K_INIT_TXF2TXD_START_DELAY_10MHZ 12 +#define AR5K_INIT_TXF2TXD_START_DELAY_5MHZ 13 + +/* Default Tx/Rx latencies (same for 5211)*/ +#define AR5K_INIT_TX_LATENCY_5210 54 +#define AR5K_INIT_RX_LATENCY_5210 29 +/* GENERIC CHIPSET DEFINITIONS */
drivers/net/wireless/ath/ath5k/phy.c +0 -1
@@ -1235,7 +1235,6 @@ static int ath5k_hw_channel(struct ath5k_hw *ah, } ah->ah_current_channel = channel; -ath5k_hw_set_clockrate (ah);return 0 ; }
drivers/net/wireless/ath/ath5k/qcu.c +0 -4
@@ -253,10 +253,6 @@ int ath5k_hw_reset_tx_queue(struct ath5k_hw *ah, unsigned int queue)ath5k_hw_reg_write (ah, (ah->ah_bwmode ==AR5K_BWMODE_40MHZ ) ?AR5K_INIT_ACK_CTS_TIMEOUT_TURBO :AR5K_INIT_ACK_CTS_TIMEOUT ,AR5K_SLOT_TIME ); -/* Set Transmit Latency */ -ath5k_hw_reg_write (ah, (ah->ah_bwmode ==AR5K_BWMODE_40MHZ ) ? -AR5K_INIT_TRANSMIT_LATENCY_TURBO : -AR5K_INIT_TRANSMIT_LATENCY ,AR5K_USEC_5210 );/* Set IFS0 */ if (ah->ah_bwmode ==AR5K_BWMODE_40MHZ ) {
drivers/net/wireless/ath/ath5k/reset.c +116 -14
181 lines not on this page · raw message