ath5k: Read Spur channels from EEPROM
PATCH 2/7 ath5k: Read Spur channels from EEPROM
*Read Spur channel information from EEPROM and use default channels for RF5413 compatible chips that don't have this info on EEPROM.
--- drivers/net/wireless/ath/ath5k/eeprom.c | 37 ++++++++++++++++++++++++++++++- drivers/net/wireless/ath/ath5k/eeprom.h | 20 ++++++++++++++++ 2 files changed, 56 insertions(+), 1 deletions(-)
drivers/net/wireless/ath/ath5k/eeprom.c +36 -1
@@ -1694,9 +1694,40 @@ ath5k_eeprom_read_ctl_info(struct ath5k_hw *ah)return 0 ; } +static int +ath5k_eeprom_read_spur_chans (struct ath5k_hw *ah) +{ +struct ath5k_eeprom_info *ee = &ah->ah_capabilities.cap_eeprom; +u32 offset; +u16 val; +int ret =0 , i; + + offset =AR5K_EEPROM_CTL (ee->ee_version) + +AR5K_EEPROM_N_CTLS (ee->ee_version); + +if (ee->ee_version <AR5K_EEPROM_VERSION_5_3 ) { +/* No spur info for 5GHz */ + ee->ee_spur_chans[0 ][0 ] =AR5K_EEPROM_NO_SPUR ; +/* 2 channels for 2GHz (2464/2420) */ + ee->ee_spur_chans[0 ][1 ] =AR5K_EEPROM_5413_SPUR_CHAN_1 ; + ee->ee_spur_chans[1 ][1 ] =AR5K_EEPROM_5413_SPUR_CHAN_2 ; + ee->ee_spur_chans[2 ][1 ] =AR5K_EEPROM_NO_SPUR ; + }else if (ee->ee_version >=AR5K_EEPROM_VERSION_5_3 ) { +for (i =0 ; i <AR5K_EEPROM_N_SPUR_CHANS ; i++) { +AR5K_EEPROM_READ (offset, val); + ee->ee_spur_chans[i][0 ] = val; +AR5K_EEPROM_READ (offset +AR5K_EEPROM_N_SPUR_CHANS , + val); + ee->ee_spur_chans[i][1 ] = val; + offset++; + } + } + +return ret; +}/* -* Initialize eeprom power tables +* Initialize eeprom data structure */ int ath5k_eeprom_init (struct ath5k_hw *ah)
@@ -1719,6 +1750,10 @@ ath5k_eeprom_init(struct ath5k_hw *ah)if (err <0 )return err; + err =ath5k_eeprom_read_spur_chans (ah); +if (err <0 ) +return err; +return 0 ; }
drivers/net/wireless/ath/ath5k/eeprom.h +20 -0
@@ -211,6 +211,23 @@#define AR5K_EEPROM_I_GAIN 10#define AR5K_EEPROM_CCK_OFDM_DELTA 15#define AR5K_EEPROM_N_IQ_CAL 2 +/* 5GHz/2GHz */ +enum ath5k_eeprom_freq_bands { +AR5K_EEPROM_BAND_5GHZ =0 , +AR5K_EEPROM_BAND_2GHZ =1 , +AR5K_EEPROM_N_FREQ_BANDS , +}; +/* Spur chans per freq band */ +#define AR5K_EEPROM_N_SPUR_CHANS 5 +/* fbin value for chan 2464 x2 */ +#define AR5K_EEPROM_5413_SPUR_CHAN_1 1640 +/* fbin value for chan 2420 x2 */ +#define AR5K_EEPROM_5413_SPUR_CHAN_2 1200 +#define AR5K_EEPROM_SPUR_CHAN_MASK 0x3FFF +#define AR5K_EEPROM_NO_SPUR 0x8000 +#define AR5K_SPUR_CHAN_WIDTH 87 +#define AR5K_SPUR_SYMBOL_WIDTH_BASE_100Hz 3125 +#define AR5K_SPUR_SYMBOL_WIDTH_TURBO_100Hz 6250#define AR5K_EEPROM_READ (_o, _v) do { \ ret = ath5k_hw_eeprom_read(ah, (_o), &(_v)); \
@@ -436,6 +453,9 @@ struct ath5k_eeprom_info {s8 ee_pga_desired_size_turbo[AR5K_EEPROM_N_MODES ];s8 ee_pd_gain_overlap; +/* Spur mitigation data (fbin values for spur channels) */ +u16 ee_spur_chans[AR5K_EEPROM_N_SPUR_CHANS ][AR5K_EEPROM_N_FREQ_BANDS ]; +u32 ee_antenna[AR5K_EEPROM_N_MODES ][AR5K_ANT_MAX ]; };
Quoted 1 line · Nick Kossifidis
*Read Spur channel information from EEPROM and use default channels for RF5413 compatible chips that don't have this info on EEPROM.
I think you should break the changelog at fewer columns than that.
johannes
Nick Kossifidis
maintainer2009/4/16 Johannes Berg <[email protected]>:
Quoted 7 lines · Nick Kossifidis
Quoted 1 line
*Read Spur channel information from EEPROM and use default channels for RF5413 compatible chips that don't have this info on EEPROM.
I think you should break the changelog at fewer columns than that.
johannes
ACK, are 80 cols ok ?
Signature · 3 lines
GPG ID: 0xD21DB2DB As you read this post global entropy rises. Have Fun ;-) Nick
Quoted 10 lines · Nick Kossifidis
2009/4/16 Johannes Berg <[email protected]>:
Quoted 7 lines · Nick Kossifidis
Quoted 1 line
*Read Spur channel information from EEPROM and use default channels for RF5413 compatible chips that don't have this info on EEPROM.
I think you should break the changelog at fewer columns than that.
johannes
ACK, are 80 cols ok ?
I don't know if there's a standard on that, I tend to use around 60-70, but 80 seems good too. It's not just the "doesn't fit terminal" argument anyway, it's much easier to read if it's less.
johannes
Quoted 6 lines · Johannes Berg
Quoted 1 line · Nick Kossifidis
ACK, are 80 cols ok ?
I don't know if there's a standard on that, I tend to use around 60-70, but 80 seems good too. It's not just the "doesn't fit terminal" argument anyway, it's much easier to read if it's less.
When one uses git log, it gets moved few (4) columns to the right. So something little less than 76 is usually preferred :).
Quoted 10 lines · Jiri Slaby
Quoted 6 lines · Johannes Berg
Quoted 1 line · Nick Kossifidis
ACK, are 80 cols ok ?
I don't know if there's a standard on that, I tend to use around 60-70, but 80 seems good too. It's not just the "doesn't fit terminal" argument anyway, it's much easier to read if it's less.
When one uses git log, it gets moved few (4) columns to the right. So something little less than 76 is usually preferred :).
I think in usenet 72 characters was the recommended width, right? That way quoting was also easier.
Signature · 1 line
Kalle Valo
Quoted 10 lines · Kalle Valo
Quoted 8 lines · Jiri Slaby
Quoted 6 lines · Johannes Berg
Quoted 1 line · Nick Kossifidis
ACK, are 80 cols ok ?
I don't know if there's a standard on that, I tend to use around 60-70, but 80 seems good too. It's not just the "doesn't fit terminal" argument anyway, it's much easier to read if it's less.
Quoted 5 lines
Quoted 2 lines
When one uses git log, it gets moved few (4) columns to the right. So something little less than 76 is usually preferred :).
I think in usenet 72 characters was the recommended width, right? That way quoting was also easier.
72 is my vote...thanks!
John
Signature · 2 lines
John W. Linville Someday the world will need a hero, and you [email protected] might be all we have. Be ready.