ath9k: Remove unneeded ref. count initialization
PATCH 1/4 ath9k: Remove unneeded ref. count initialization
From: Sujith Manoharan <[email protected]>
The interrupt reference counter is always initialized in ath9k_start().
--- drivers/net/wireless/ath/ath9k/init.c | 1 - 1 file changed, 1 deletion(-)
drivers/net/wireless/ath/ath9k/init.c +0 -1
@@ -705,7 +705,6 @@ static int ath9k_init_softc(u16 devid, struct ath_softc *sc, ah->reg_ops.read = ath9k_ioread32; ah->reg_ops.write = ath9k_iowrite32; ah->reg_ops.rmw = ath9k_reg_rmw; -atomic_set (&ah->intr_ref_cnt,-1 ); sc->sc_ah = ah; pCap = &ah->caps;
Signature · 1 line
1.8.5.1
PATCH 2/4 ath9k: Initialize "switchcomspdt" eeprom field explicitly
From: Sujith Manoharan <[email protected]>
--- drivers/net/wireless/ath/ath9k/ar9003_eeprom.c | 10 ++++++++++ 1 file changed, 10 insertions(+)
drivers/net/wireless/ath/ath9k/ar9003_eeprom.c +10 -0
@@ -131,6 +131,7 @@ static const struct ar9300_eeprom ar9300_default = { .thresh62 = 28, .papdRateMaskHt20 = LE32(0x0cf0e0e0), .papdRateMaskHt40 = LE32(0x6cf0e0e0), + .switchcomspdt = 0, .xlna_bias_strength = 0, .futureModal = { 0, 0, 0, 0, 0, 0, 0,
@@ -333,6 +334,7 @@ static const struct ar9300_eeprom ar9300_default = { .thresh62 = 28, .papdRateMaskHt20 = LE32(0x0c80c080), .papdRateMaskHt40 = LE32(0x0080c080), + .switchcomspdt = 0, .xlna_bias_strength = 0, .futureModal = { 0, 0, 0, 0, 0, 0, 0,
@@ -707,6 +709,7 @@ static const struct ar9300_eeprom ar9300_x113 = { .thresh62 = 28, .papdRateMaskHt20 = LE32(0x0c80c080), .papdRateMaskHt40 = LE32(0x0080c080), + .switchcomspdt = 0, .xlna_bias_strength = 0, .futureModal = { 0, 0, 0, 0, 0, 0, 0,
@@ -909,6 +912,7 @@ static const struct ar9300_eeprom ar9300_x113 = { .thresh62 = 28, .papdRateMaskHt20 = LE32(0x0cf0e0e0), .papdRateMaskHt40 = LE32(0x6cf0e0e0), + .switchcomspdt = 0, .xlna_bias_strength = 0, .futureModal = { 0, 0, 0, 0, 0, 0, 0,
@@ -1284,6 +1288,7 @@ static const struct ar9300_eeprom ar9300_h112 = { .thresh62 = 28, .papdRateMaskHt20 = LE32(0x0c80c080), .papdRateMaskHt40 = LE32(0x0080c080), + .switchcomspdt = 0, .xlna_bias_strength = 0, .futureModal = { 0, 0, 0, 0, 0, 0, 0,
@@ -1486,6 +1491,7 @@ static const struct ar9300_eeprom ar9300_h112 = { .thresh62 = 28, .papdRateMaskHt20 = LE32(0x0cf0e0e0), .papdRateMaskHt40 = LE32(0x6cf0e0e0), + .switchcomspdt = 0, .xlna_bias_strength = 0, .futureModal = { 0, 0, 0, 0, 0, 0, 0,
@@ -1861,6 +1867,7 @@ static const struct ar9300_eeprom ar9300_x112 = { .thresh62 = 28, .papdRateMaskHt20 = LE32(0x0c80c080), .papdRateMaskHt40 = LE32(0x0080c080), + .switchcomspdt = 0, .xlna_bias_strength = 0, .futureModal = { 0, 0, 0, 0, 0, 0, 0,
@@ -2063,6 +2070,7 @@ static const struct ar9300_eeprom ar9300_x112 = { .thresh62 = 28, .papdRateMaskHt20 = LE32(0x0cf0e0e0), .papdRateMaskHt40 = LE32(0x6cf0e0e0), + .switchcomspdt = 0, .xlna_bias_strength = 0, .futureModal = { 0, 0, 0, 0, 0, 0, 0,
@@ -2437,6 +2445,7 @@ static const struct ar9300_eeprom ar9300_h116 = { .thresh62 = 28, .papdRateMaskHt20 = LE32(0x0c80C080), .papdRateMaskHt40 = LE32(0x0080C080), + .switchcomspdt = 0, .xlna_bias_strength = 0, .futureModal = { 0, 0, 0, 0, 0, 0, 0,
@@ -2639,6 +2648,7 @@ static const struct ar9300_eeprom ar9300_h116 = { .thresh62 = 28, .papdRateMaskHt20 = LE32(0x0cf0e0e0), .papdRateMaskHt40 = LE32(0x6cf0e0e0), + .switchcomspdt = 0, .xlna_bias_strength = 0, .futureModal = { 0, 0, 0, 0, 0, 0, 0,
Signature · 1 line
1.8.5.1
PATCH 3/4 ath9k: Update BaseExtension_1 eeprom structure
In reply to Sujith ManoharanFrom: Sujith Manoharan <[email protected]>
* Add a new field "misc_enable"
* Use int_8 for tempslopextension.
--- drivers/net/wireless/ath/ath9k/ar9003_eeprom.c | 10 +++++----- drivers/net/wireless/ath/ath9k/ar9003_eeprom.h | 14 ++++++++++++-- 2 files changed, 17 insertions(+), 7 deletions(-)
drivers/net/wireless/ath/ath9k/ar9003_eeprom.c +5 -5
@@ -139,7 +139,7 @@ static const struct ar9300_eeprom ar9300_default = { }, .base_ext1 = { .ant_div_control = 0, - .future = {0, 0, 0}, + .future = {0, 0}, .tempslopextension = {0, 0, 0, 0, 0, 0, 0, 0} }, .calFreqPier2G = {
@@ -717,7 +717,7 @@ static const struct ar9300_eeprom ar9300_x113 = { }, .base_ext1 = { .ant_div_control = 0, - .future = {0, 0, 0}, + .future = {0, 0}, .tempslopextension = {0, 0, 0, 0, 0, 0, 0, 0} }, .calFreqPier2G = {
@@ -1296,7 +1296,7 @@ static const struct ar9300_eeprom ar9300_h112 = { }, .base_ext1 = { .ant_div_control = 0, - .future = {0, 0, 0}, + .future = {0, 0}, .tempslopextension = {0, 0, 0, 0, 0, 0, 0, 0} }, .calFreqPier2G = {
@@ -1875,7 +1875,7 @@ static const struct ar9300_eeprom ar9300_x112 = { }, .base_ext1 = { .ant_div_control = 0, - .future = {0, 0, 0}, + .future = {0, 0}, .tempslopextension = {0, 0, 0, 0, 0, 0, 0, 0} }, .calFreqPier2G = {
@@ -2453,7 +2453,7 @@ static const struct ar9300_eeprom ar9300_h116 = { }, .base_ext1 = { .ant_div_control = 0, - .future = {0, 0, 0}, + .future = {0, 0}, .tempslopextension = {0, 0, 0, 0, 0, 0, 0, 0} }, .calFreqPier2G = {
drivers/net/wireless/ath/ath9k/ar9003_eeprom.h +12 -2
@@ -270,10 +270,20 @@ struct cal_ctl_data_5g {u8 ctlEdges[AR9300_NUM_BAND_EDGES_5G ]; } __packed; +#define MAX_BASE_EXTENSION_FUTURE 2 +struct ar9300_BaseExtension_1 {u8 ant_div_control; -u8 future[3 ]; -u8 tempslopextension[8 ]; +u8 future[MAX_BASE_EXTENSION_FUTURE ]; +/* +* misc_enable: +* +* BIT 0 - TX Gain Cap enable. +* BIT 1 - Uncompressed Checksum enable. +* BIT 2/3 - MinCCApwr enable 2g/5g. +*/ +u8 misc_enable; +int8_t tempslopextension[8 ];int8_t quick_drop_low;int8_t quick_drop_high; } __packed;
Signature · 1 line
1.8.5.1
PATCH 4/4 ath9k: Fix regulatory compliance
In reply to Sujith ManoharanFrom: Sujith Manoharan <[email protected]>
To comply with ETSI regulations, make sure that the CCA registers are programmed with the threshold values from the EEPROM/Caldata. A new field is used to indicate if the card has been calibrated with the required threshold information.
--- drivers/net/wireless/ath/ath9k/ar9003_eeprom.c | 32 ++++++++++++++++++++++++++ drivers/net/wireless/ath/ath9k/ar9003_phy.h | 4 +++- 2 files changed, 35 insertions(+), 1 deletion(-)
drivers/net/wireless/ath/ath9k/ar9003_eeprom.c +32 -0
@@ -4121,6 +4121,37 @@ static void ar9003_hw_thermo_cal_apply(struct ath_hw *ah) } } +static void ar9003_hw_apply_minccapwr_thresh (struct ath_hw *ah, +bool is2ghz) +{ +struct ar9300_eeprom *eep = &ah->eeprom.ar9300_eep; +const u_int32_t cca_ctrl[AR9300_MAX_CHAINS ] = { +AR_PHY_CCA_CTRL_0 , +AR_PHY_CCA_CTRL_1 , +AR_PHY_CCA_CTRL_2 , + }; +int chain; +u32 val; + +if (is2ghz) { +if (!(eep->base_ext1.misc_enable &BIT (2 ))) +return ; + }else { +if (!(eep->base_ext1.misc_enable &BIT (3 ))) +return ; + } + +for (chain =0 ; chain <AR9300_MAX_CHAINS ; chain++) { +if (!(ah->caps.tx_chainmask &BIT (chain))) +continue ; + + val =ar9003_modal_header (ah, is2ghz)->noiseFloorThreshCh[chain]; +REG_RMW_FIELD (ah, cca_ctrl[chain], +AR_PHY_EXT_CCA0_THRESH62_1 , val); + } + +} +static void ath9k_hw_ar9300_set_board_values (struct ath_hw *ah,struct ath9k_channel *chan) {
@@ -4135,6 +4166,7 @@ static void ath9k_hw_ar9300_set_board_values(struct ath_hw *ah,if (!AR_SREV_9330 (ah) && !AR_SREV_9340 (ah))ar9003_hw_internal_regulator_apply (ah);ar9003_hw_apply_tuning_caps (ah); +ar9003_hw_apply_minccapwr_thresh (ah, chan);ar9003_hw_txend_to_xpa_off_apply (ah, is2ghz);ar9003_hw_thermometer_apply (ah);ar9003_hw_thermo_cal_apply (ah);
drivers/net/wireless/ath/ath9k/ar9003_phy.h +3 -1
@@ -270,7 +270,7 @@#define AR_PHY_AGC (AR_AGC_BASE + 0x14)#define AR_PHY_EXT_ATTEN_CTL_0 (AR_AGC_BASE + 0x18)#define AR_PHY_CCA_0 (AR_AGC_BASE + 0x1c) -#define AR_PHY_EXT_CCA0 (AR_AGC_BASE + 0x20) +#define AR_PHY_CCA_CTRL_0 (AR_AGC_BASE + 0x20)#define AR_PHY_RESTART (AR_AGC_BASE + 0x24)/*
@@ -398,6 +398,8 @@#define AR9280_PHY_CCA_THRESH62_S 12#define AR_PHY_EXT_CCA0_THRESH62 0x000000FF#define AR_PHY_EXT_CCA0_THRESH62_S 0 +#define AR_PHY_EXT_CCA0_THRESH62_1 0x000001FF +#define AR_PHY_EXT_CCA0_THRESH62_1_S 0#define AR_PHY_CCK_DETECT_WEAK_SIG_THR_CCK 0x0000003F#define AR_PHY_CCK_DETECT_WEAK_SIG_THR_CCK_S 0#define AR_PHY_CCK_DETECT_ANT_SWITCH_TIME 0x00001FC0
Signature · 1 line
1.8.5.1