diff options
Diffstat (limited to 'package/mac80211')
5 files changed, 1662 insertions, 5 deletions
diff --git a/package/mac80211/patches/321-ath9k_pending_cleanups.patch b/package/mac80211/patches/321-ath9k_pending_cleanups.patch new file mode 100644 index 000000000..8b61e7830 --- /dev/null +++ b/package/mac80211/patches/321-ath9k_pending_cleanups.patch @@ -0,0 +1,1657 @@ +--- a/drivers/net/wireless/ath/ath9k/ar9002_hw.c ++++ b/drivers/net/wireless/ath/ath9k/ar9002_hw.c +@@ -26,24 +26,6 @@ MODULE_PARM_DESC(nohwcrypt, "Force new A + + /* General hardware code for the A5008/AR9001/AR9002 hadware families */ + +-static bool ar9002_hw_macversion_supported(u32 macversion) +-{ +- switch (macversion) { +- case AR_SREV_VERSION_5416_PCI: +- case AR_SREV_VERSION_5416_PCIE: +- case AR_SREV_VERSION_9160: +- case AR_SREV_VERSION_9100: +- case AR_SREV_VERSION_9280: +- case AR_SREV_VERSION_9285: +- case AR_SREV_VERSION_9287: +- case AR_SREV_VERSION_9271: +- return true; +- default: +- break; +- } +- return false; +-} +- + static void ar9002_hw_init_mode_regs(struct ath_hw *ah) + { + if (AR_SREV_9271(ah)) { +@@ -565,7 +547,6 @@ void ar9002_hw_attach_ops(struct ath_hw + + priv_ops->init_mode_regs = ar9002_hw_init_mode_regs; + priv_ops->init_mode_gain_regs = ar9002_hw_init_mode_gain_regs; +- priv_ops->macversion_supported = ar9002_hw_macversion_supported; + + ops->config_pci_powersave = ar9002_hw_configpcipowersave; + +--- a/drivers/net/wireless/ath/ath9k/ar9002_mac.c ++++ b/drivers/net/wireless/ath/ath9k/ar9002_mac.c +@@ -283,7 +283,6 @@ static void ar9002_hw_set11n_txdesc(stru + { + struct ar5416_desc *ads = AR5416DESC(ds); + +- txPower += ah->txpower_indexoffset; + if (txPower > 63) + txPower = 63; + +--- a/drivers/net/wireless/ath/ath9k/ar9003_eeprom.c ++++ b/drivers/net/wireless/ath/ath9k/ar9003_eeprom.c +@@ -72,7 +72,7 @@ static const struct ar9300_eeprom ar9300 + .regDmn = { LE16(0), LE16(0x1f) }, + .txrxMask = 0x77, /* 4 bits tx and 4 bits rx */ + .opCapFlags = { +- .opFlags = AR9300_OPFLAGS_11G | AR9300_OPFLAGS_11A, ++ .opFlags = AR5416_OPFLAGS_11G | AR5416_OPFLAGS_11A, + .eepMisc = 0, + }, + .rfSilent = 0, +@@ -649,7 +649,7 @@ static const struct ar9300_eeprom ar9300 + .regDmn = { LE16(0), LE16(0x1f) }, + .txrxMask = 0x77, /* 4 bits tx and 4 bits rx */ + .opCapFlags = { +- .opFlags = AR9300_OPFLAGS_11G | AR9300_OPFLAGS_11A, ++ .opFlags = AR5416_OPFLAGS_11G | AR5416_OPFLAGS_11A, + .eepMisc = 0, + }, + .rfSilent = 0, +@@ -1227,7 +1227,7 @@ static const struct ar9300_eeprom ar9300 + .regDmn = { LE16(0), LE16(0x1f) }, + .txrxMask = 0x77, /* 4 bits tx and 4 bits rx */ + .opCapFlags = { +- .opFlags = AR9300_OPFLAGS_11G | AR9300_OPFLAGS_11A, ++ .opFlags = AR5416_OPFLAGS_11G | AR5416_OPFLAGS_11A, + .eepMisc = 0, + }, + .rfSilent = 0, +@@ -1805,7 +1805,7 @@ static const struct ar9300_eeprom ar9300 + .regDmn = { LE16(0), LE16(0x1f) }, + .txrxMask = 0x77, /* 4 bits tx and 4 bits rx */ + .opCapFlags = { +- .opFlags = AR9300_OPFLAGS_11G | AR9300_OPFLAGS_11A, ++ .opFlags = AR5416_OPFLAGS_11G | AR5416_OPFLAGS_11A, + .eepMisc = 0, + }, + .rfSilent = 0, +@@ -2382,7 +2382,7 @@ static const struct ar9300_eeprom ar9300 + .regDmn = { LE16(0), LE16(0x1f) }, + .txrxMask = 0x33, /* 4 bits tx and 4 bits rx */ + .opCapFlags = { +- .opFlags = AR9300_OPFLAGS_11G | AR9300_OPFLAGS_11A, ++ .opFlags = AR5416_OPFLAGS_11G | AR5416_OPFLAGS_11A, + .eepMisc = 0, + }, + .rfSilent = 0, +@@ -2974,7 +2974,7 @@ static const struct ar9300_eeprom *ar900 + + static u16 ath9k_hw_fbin2freq(u8 fbin, bool is2GHz) + { +- if (fbin == AR9300_BCHAN_UNUSED) ++ if (fbin == AR5416_BCHAN_UNUSED) + return fbin; + + return (u16) ((is2GHz) ? (2300 + fbin) : (4800 + 5 * fbin)); +@@ -3427,18 +3427,6 @@ static int ath9k_hw_ar9300_get_eeprom_re + return 0; + } + +-static u8 ath9k_hw_ar9300_get_num_ant_config(struct ath_hw *ah, +- enum ath9k_hal_freq_band freq_band) +-{ +- return 1; +-} +- +-static u32 ath9k_hw_ar9300_get_eeprom_antenna_cfg(struct ath_hw *ah, +- struct ath9k_channel *chan) +-{ +- return -EINVAL; +-} +- + static s32 ar9003_hw_xpa_bias_level_get(struct ath_hw *ah, bool is2ghz) + { + struct ar9300_eeprom *eep = &ah->eeprom.ar9300_eep; +@@ -4485,7 +4473,7 @@ static u16 ar9003_hw_get_indirect_edge_p + return CTL_EDGE_TPOWER(ctl_5g[idx].ctlEdges[edge - 1]); + } + +- return AR9300_MAX_RATE_POWER; ++ return MAX_RATE_POWER; + } + + /* +@@ -4494,7 +4482,7 @@ static u16 ar9003_hw_get_indirect_edge_p + static u16 ar9003_hw_get_max_edge_power(struct ar9300_eeprom *eep, + u16 freq, int idx, bool is2GHz) + { +- u16 twiceMaxEdgePower = AR9300_MAX_RATE_POWER; ++ u16 twiceMaxEdgePower = MAX_RATE_POWER; + u8 *ctl_freqbin = is2GHz ? + &eep->ctl_freqbin_2G[idx][0] : + &eep->ctl_freqbin_5G[idx][0]; +@@ -4504,7 +4492,7 @@ static u16 ar9003_hw_get_max_edge_power( + + /* Get the edge power */ + for (edge = 0; +- (edge < num_edges) && (ctl_freqbin[edge] != AR9300_BCHAN_UNUSED); ++ (edge < num_edges) && (ctl_freqbin[edge] != AR5416_BCHAN_UNUSED); + edge++) { + /* + * If there's an exact channel match or an inband flag set +@@ -4542,9 +4530,9 @@ static void ar9003_hw_set_power_per_rate + struct ath_regulatory *regulatory = ath9k_hw_regulatory(ah); + struct ath_common *common = ath9k_hw_common(ah); + struct ar9300_eeprom *pEepData = &ah->eeprom.ar9300_eep; +- u16 twiceMaxEdgePower = AR9300_MAX_RATE_POWER; ++ u16 twiceMaxEdgePower = MAX_RATE_POWER; + static const u16 tpScaleReductionTable[5] = { +- 0, 3, 6, 9, AR9300_MAX_RATE_POWER ++ 0, 3, 6, 9, MAX_RATE_POWER + }; + int i; + int16_t twiceLargestAntenna; +@@ -4848,8 +4836,6 @@ const struct eeprom_ops eep_ar9300_ops = + .fill_eeprom = ath9k_hw_ar9300_fill_eeprom, + .get_eeprom_ver = ath9k_hw_ar9300_get_eeprom_ver, + .get_eeprom_rev = ath9k_hw_ar9300_get_eeprom_rev, +- .get_num_ant_config = ath9k_hw_ar9300_get_num_ant_config, +- .get_eeprom_antenna_cfg = ath9k_hw_ar9300_get_eeprom_antenna_cfg, + .set_board_values = ath9k_hw_ar9300_set_board_values, + .set_addac = ath9k_hw_ar9300_set_addac, + .set_txpower = ath9k_hw_ar9300_set_txpower, +--- a/drivers/net/wireless/ath/ath9k/ar9003_hw.c ++++ b/drivers/net/wireless/ath/ath9k/ar9003_hw.c +@@ -21,18 +21,6 @@ + + /* General hardware code for the AR9003 hadware family */ + +-static bool ar9003_hw_macversion_supported(u32 macversion) +-{ +- switch (macversion) { +- case AR_SREV_VERSION_9300: +- case AR_SREV_VERSION_9485: +- return true; +- default: +- break; +- } +- return false; +-} +- + /* + * The AR9003 family uses a new INI format (pre, core, post + * arrays per subsystem). This provides support for the +@@ -322,7 +310,6 @@ void ar9003_hw_attach_ops(struct ath_hw + + priv_ops->init_mode_regs = ar9003_hw_init_mode_regs; + priv_ops->init_mode_gain_regs = ar9003_hw_init_mode_gain_regs; +- priv_ops->macversion_supported = ar9003_hw_macversion_supported; + + ops->config_pci_powersave = ar9003_hw_configpcipowersave; + +--- a/drivers/net/wireless/ath/ath9k/ar9003_mac.c ++++ b/drivers/net/wireless/ath/ath9k/ar9003_mac.c +@@ -322,7 +322,6 @@ static void ar9003_hw_set11n_txdesc(stru + if (txpower > ah->txpower_limit) + txpower = ah->txpower_limit; + +- txpower += ah->txpower_indexoffset; + if (txpower > 63) + txpower = 63; + +--- a/drivers/net/wireless/ath/ath9k/eeprom.c ++++ b/drivers/net/wireless/ath/ath9k/eeprom.c +@@ -234,7 +234,7 @@ void ath9k_hw_get_target_powers(struct a + u16 ath9k_hw_get_max_edge_power(u16 freq, struct cal_ctl_edges *pRdEdgesPower, + bool is2GHz, int num_band_edges) + { +- u16 twiceMaxEdgePower = AR5416_MAX_RATE_POWER; ++ u16 twiceMaxEdgePower = MAX_RATE_POWER; + int i; + + for (i = 0; (i < num_band_edges) && +@@ -279,6 +279,219 @@ void ath9k_hw_update_regulatory_maxpower + } + } + ++void ath9k_hw_get_gain_boundaries_pdadcs(struct ath_hw *ah, ++ struct ath9k_channel *chan, ++ void *pRawDataSet, ++ u8 *bChans, u16 availPiers, ++ u16 tPdGainOverlap, ++ u16 *pPdGainBoundaries, u8 *pPDADCValues, ++ u16 numXpdGains) ++{ ++ int i, j, k; ++ int16_t ss; ++ u16 idxL = 0, idxR = 0, numPiers; ++ static u8 vpdTableL[AR5416_NUM_PD_GAINS] ++ [AR5416_MAX_PWR_RANGE_IN_HALF_DB]; ++ static u8 vpdTableR[AR5416_NUM_PD_GAINS] ++ [AR5416_MAX_PWR_RANGE_IN_HALF_DB]; ++ static u8 vpdTableI[AR5416_NUM_PD_GAINS] ++ [AR5416_MAX_PWR_RANGE_IN_HALF_DB]; ++ ++ u8 *pVpdL, *pVpdR, *pPwrL, *pPwrR; ++ u8 minPwrT4[AR5416_NUM_PD_GAINS]; ++ u8 maxPwrT4[AR5416_NUM_PD_GAINS]; ++ int16_t vpdStep; ++ int16_t tmpVal; ++ u16 sizeCurrVpdTable, maxIndex, tgtIndex; ++ bool match; ++ int16_t minDelta = 0; ++ struct chan_centers centers; ++ int pdgain_boundary_default; ++ struct cal_data_per_freq *data_def = pRawDataSet; ++ struct cal_data_per_freq_4k *data_4k = pRawDataSet; ++ struct cal_data_per_freq_ar9287 *data_9287 = pRawDataSet; ++ bool eeprom_4k = AR_SREV_9285(ah) || AR_SREV_9271(ah); ++ int intercepts; ++ ++ if (AR_SREV_9287(ah)) ++ intercepts = AR9287_PD_GAIN_ICEPTS; ++ else ++ intercepts = AR5416_PD_GAIN_ICEPTS; ++ ++ memset(&minPwrT4, 0, AR5416_NUM_PD_GAINS); ++ ath9k_hw_get_channel_centers(ah, chan, ¢ers); ++ ++ for (numPiers = 0; numPiers < availPiers; numPiers++) { ++ if (bChans[numPiers] == AR5416_BCHAN_UNUSED) ++ break; ++ } ++ ++ match = ath9k_hw_get_lower_upper_index((u8)FREQ2FBIN(centers.synth_center, ++ IS_CHAN_2GHZ(chan)), ++ bChans, numPiers, &idxL, &idxR); ++ ++ if (match) { ++ if (AR_SREV_9287(ah)) { ++ /* FIXME: array overrun? */ ++ for (i = 0; i < numXpdGains; i++) { ++ minPwrT4[i] = data_9287[idxL].pwrPdg[i][0]; ++ maxPwrT4[i] = data_9287[idxL].pwrPdg[i][4]; ++ ath9k_hw_fill_vpd_table(minPwrT4[i], maxPwrT4[i], ++ data_9287[idxL].pwrPdg[i], ++ data_9287[idxL].vpdPdg[i], ++ intercepts, ++ vpdTableI[i]); ++ } ++ } else if (eeprom_4k) { ++ for (i = 0; i < numXpdGains; i++) { ++ minPwrT4[i] = data_4k[idxL].pwrPdg[i][0]; ++ maxPwrT4[i] = data_4k[idxL].pwrPdg[i][4]; ++ ath9k_hw_fill_vpd_table(minPwrT4[i], maxPwrT4[i], ++ data_4k[idxL].pwrPdg[i], ++ data_4k[idxL].vpdPdg[i], ++ intercepts, ++ vpdTableI[i]); ++ } ++ } else { ++ for (i = 0; i < numXpdGains; i++) { ++ minPwrT4[i] = data_def[idxL].pwrPdg[i][0]; ++ maxPwrT4[i] = data_def[idxL].pwrPdg[i][4]; ++ ath9k_hw_fill_vpd_table(minPwrT4[i], maxPwrT4[i], ++ data_def[idxL].pwrPdg[i], ++ data_def[idxL].vpdPdg[i], ++ intercepts, ++ vpdTableI[i]); ++ } ++ } ++ } else { ++ for (i = 0; i < numXpdGains; i++) { ++ if (AR_SREV_9287(ah)) { ++ pVpdL = data_9287[idxL].vpdPdg[i]; ++ pPwrL = data_9287[idxL].pwrPdg[i]; ++ pVpdR = data_9287[idxR].vpdPdg[i]; ++ pPwrR = data_9287[idxR].pwrPdg[i]; ++ } else if (eeprom_4k) { ++ pVpdL = data_4k[idxL].vpdPdg[i]; ++ pPwrL = data_4k[idxL].pwrPdg[i]; ++ pVpdR = data_4k[idxR].vpdPdg[i]; ++ pPwrR = data_4k[idxR].pwrPdg[i]; ++ } else { ++ pVpdL = data_def[idxL].vpdPdg[i]; ++ pPwrL = data_def[idxL].pwrPdg[i]; ++ pVpdR = data_def[idxR].vpdPdg[i]; ++ pPwrR = data_def[idxR].pwrPdg[i]; ++ } ++ ++ minPwrT4[i] = max(pPwrL[0], pPwrR[0]); ++ ++ maxPwrT4[i] = ++ min(pPwrL[intercepts - 1], ++ pPwrR[intercepts - 1]); ++ ++ ++ ath9k_hw_fill_vpd_table(minPwrT4[i], maxPwrT4[i], ++ pPwrL, pVpdL, ++ intercepts, ++ vpdTableL[i]); ++ ath9k_hw_fill_vpd_table(minPwrT4[i], maxPwrT4[i], ++ pPwrR, pVpdR, ++ intercepts, ++ vpdTableR[i]); ++ ++ for (j = 0; j <= (maxPwrT4[i] - minPwrT4[i]) / 2; j++) { ++ vpdTableI[i][j] = ++ (u8)(ath9k_hw_interpolate((u16) ++ FREQ2FBIN(centers. ++ synth_center, ++ IS_CHAN_2GHZ ++ (chan)), ++ bChans[idxL], bChans[idxR], ++ vpdTableL[i][j], vpdTableR[i][j])); ++ } ++ } ++ } ++ ++ k = 0; ++ ++ for (i = 0; i < numXpdGains; i++) { ++ if (i == (numXpdGains - 1)) ++ pPdGainBoundaries[i] = ++ (u16)(maxPwrT4[i] / 2); ++ else ++ pPdGainBoundaries[i] = ++ (u16)((maxPwrT4[i] + minPwrT4[i + 1]) / 4); ++ ++ pPdGainBoundaries[i] = ++ min((u16)MAX_RATE_POWER, pPdGainBoundaries[i]); ++ ++ if ((i == 0) && !AR_SREV_5416_20_OR_LATER(ah)) { ++ minDelta = pPdGainBoundaries[0] - 23; ++ pPdGainBoundaries[0] = 23; ++ } else { ++ minDelta = 0; ++ } ++ ++ if (i == 0) { ++ if (AR_SREV_9280_20_OR_LATER(ah)) ++ ss = (int16_t)(0 - (minPwrT4[i] / 2)); ++ else ++ ss = 0; ++ } else { ++ ss = (int16_t)((pPdGainBoundaries[i - 1] - ++ (minPwrT4[i] / 2)) - ++ tPdGainOverlap + 1 + minDelta); ++ } ++ vpdStep = (int16_t)(vpdTableI[i][1] - vpdTableI[i][0]); ++ vpdStep = (int16_t)((vpdStep < 1) ? 1 : vpdStep); ++ ++ while ((ss < 0) && (k < (AR5416_NUM_PDADC_VALUES - 1))) { ++ tmpVal = (int16_t)(vpdTableI[i][0] + ss * vpdStep); ++ pPDADCValues[k++] = (u8)((tmpVal < 0) ? 0 : tmpVal); ++ ss++; ++ } ++ ++ sizeCurrVpdTable = (u8) ((maxPwrT4[i] - minPwrT4[i]) / 2 + 1); ++ tgtIndex = (u8)(pPdGainBoundaries[i] + tPdGainOverlap - ++ (minPwrT4[i] / 2)); ++ maxIndex = (tgtIndex < sizeCurrVpdTable) ? ++ tgtIndex : sizeCurrVpdTable; ++ ++ while ((ss < maxIndex) && (k < (AR5416_NUM_PDADC_VALUES - 1))) { ++ pPDADCValues[k++] = vpdTableI[i][ss++]; ++ } ++ ++ vpdStep = (int16_t)(vpdTableI[i][sizeCurrVpdTable - 1] - ++ vpdTableI[i][sizeCurrVpdTable - 2]); ++ vpdStep = (int16_t)((vpdStep < 1) ? 1 : vpdStep); ++ ++ if (tgtIndex >= maxIndex) { ++ while ((ss <= tgtIndex) && ++ (k < (AR5416_NUM_PDADC_VALUES - 1))) { ++ tmpVal = (int16_t)((vpdTableI[i][sizeCurrVpdTable - 1] + ++ (ss - maxIndex + 1) * vpdStep)); ++ pPDADCValues[k++] = (u8)((tmpVal > 255) ? ++ 255 : tmpVal); ++ ss++; ++ } ++ } ++ } ++ ++ if (eeprom_4k) ++ pdgain_boundary_default = 58; ++ else ++ pdgain_boundary_default = pPdGainBoundaries[i - 1]; ++ ++ while (i < AR5416_PD_GAINS_IN_MASK) { ++ pPdGainBoundaries[i] = pdgain_boundary_default; ++ i++; ++ } ++ ++ while (k < AR5416_NUM_PDADC_VALUES) { ++ pPDADCValues[k] = pPDADCValues[k - 1]; ++ k++; ++ } ++} ++ + int ath9k_hw_eeprom_init(struct ath_hw *ah) + { + int status; +--- a/drivers/net/wireless/ath/ath9k/eeprom.h ++++ b/drivers/net/wireless/ath/ath9k/eeprom.h +@@ -17,6 +17,8 @@ + #ifndef EEPROM_H + #define EEPROM_H + ++#define AR_EEPROM_MODAL_SPURS 5 ++ + #include "../ath.h" + #include <net/cfg80211.h> + #include "ar9003_eeprom.h" +@@ -149,8 +151,6 @@ + #define AR5416_NUM_PD_GAINS 4 + #define AR5416_PD_GAINS_IN_MASK 4 + #define AR5416_PD_GAIN_ICEPTS 5 +-#define AR5416_EEPROM_MODAL_SPURS 5 +-#define AR5416_MAX_RATE_POWER 63 + #define AR5416_NUM_PDADC_VALUES 128 + #define AR5416_BCHAN_UNUSED 0xFF + #define AR5416_MAX_PWR_RANGE_IN_HALF_DB 64 +@@ -175,8 +175,6 @@ + #define AR5416_EEP4K_NUM_CTLS 12 + #define AR5416_EEP4K_NUM_BAND_EDGES 4 + #define AR5416_EEP4K_NUM_PD_GAINS 2 +-#define AR5416_EEP4K_PD_GAINS_IN_MASK 4 +-#define AR5416_EEP4K_PD_GAIN_ICEPTS 5 + #define AR5416_EEP4K_MAX_CHAINS 1 + + #define AR9280_TX_GAIN_TABLE_SIZE 22 +@@ -198,35 +196,12 @@ + #define AR9287_NUM_2G_40_TARGET_POWERS 3 + #define AR9287_NUM_CTLS 12 + #define AR9287_NUM_BAND_EDGES 4 +-#define AR9287_NUM_PD_GAINS 4 +-#define AR9287_PD_GAINS_IN_MASK 4 + #define AR9287_PD_GAIN_ICEPTS 1 +-#define AR9287_EEPROM_MODAL_SPURS 5 +-#define AR9287_MAX_RATE_POWER 63 +-#define AR9287_NUM_PDADC_VALUES 128 +-#define AR9287_NUM_RATES 16 +-#define AR9287_BCHAN_UNUSED 0xFF +-#define AR9287_MAX_PWR_RANGE_IN_HALF_DB 64 +-#define AR9287_OPFLAGS_11A 0x01 +-#define AR9287_OPFLAGS_11G 0x02 +-#define AR9287_OPFLAGS_2G_HT40 0x08 +-#define AR9287_OPFLAGS_2G_HT20 0x20 +-#define AR9287_OPFLAGS_5G_HT40 0x04 +-#define AR9287_OPFLAGS_5G_HT20 0x10 + #define AR9287_EEPMISC_BIG_ENDIAN 0x01 + #define AR9287_EEPMISC_WOW 0x02 + #define AR9287_MAX_CHAINS 2 + #define AR9287_ANT_16S 32 +-#define AR9287_custdatasize 20 + +-#define AR9287_NUM_ANT_CHAIN_FIELDS 6 +-#define AR9287_NUM_ANT_COMMON_FIELDS 4 +-#define AR9287_SIZE_ANT_CHAIN_FIELD 2 +-#define AR9287_SIZE_ANT_COMMON_FIELD 4 +-#define AR9287_ANT_CHAIN_MASK 0x3 +-#define AR9287_ANT_COMMON_MASK 0xf +-#define AR9287_CHAIN_0_IDX 0 +-#define AR9287_CHAIN_1_IDX 1 + #define AR9287_DATA_SZ 32 + + #define AR9287_PWR_TABLE_OFFSET_DB -5 +@@ -396,7 +371,7 @@ struct modal_eep_header { + u16 xpaBiasLvlFreq[3]; + u8 futureModal[6]; + +- struct spur_chan spurChans[AR5416_EEPROM_MODAL_SPURS]; ++ struct spur_chan spurChans[AR_EEPROM_MODAL_SPURS]; + } __packed; + + struct calDataPerFreqOpLoop { +@@ -464,7 +439,7 @@ struct modal_eep_4k_header { + u8 db2_4:4, reserved:4; + #endif + u8 futureModal[4]; +- struct spur_chan spurChans[AR5416_EEPROM_MODAL_SPURS]; ++ struct spur_chan spurChans[AR_EEPROM_MODAL_SPURS]; + } __packed; + + struct base_eep_ar9287_header { +@@ -522,7 +497,7 @@ struct modal_eep_ar9287_header { + u8 ob_qam; + u8 ob_pal_off; + u8 futureModal[30]; +- struct spur_chan spurChans[AR9287_EEPROM_MODAL_SPURS]; ++ struct spur_chan spurChans[AR_EEPROM_MODAL_SPURS]; + } __packed; + + struct cal_data_per_freq { +@@ -531,8 +506,8 @@ struct cal_data_per_freq { + } __packed; + + struct cal_data_per_freq_4k { +- u8 pwrPdg[AR5416_EEP4K_NUM_PD_GAINS][AR5416_EEP4K_PD_GAIN_ICEPTS]; +- u8 vpdPdg[AR5416_EEP4K_NUM_PD_GAINS][AR5416_EEP4K_PD_GAIN_ICEPTS]; ++ u8 pwrPdg[AR5416_EEP4K_NUM_PD_GAINS][AR5416_PD_GAIN_ICEPTS]; ++ u8 vpdPdg[AR5416_EEP4K_NUM_PD_GAINS][AR5416_PD_GAIN_ICEPTS]; + } __packed; + + struct cal_target_power_leg { +@@ -558,8 +533,8 @@ struct cal_data_op_loop_ar9287 { + } __packed; + + struct cal_data_per_freq_ar9287 { +- u8 pwrPdg[AR9287_NUM_PD_GAINS][AR9287_PD_GAIN_ICEPTS]; +- u8 vpdPdg[AR9287_NUM_PD_GAINS][AR9287_PD_GAIN_ICEPTS]; ++ u8 pwrPdg[AR5416_NUM_PD_GAINS][AR9287_PD_GAIN_ICEPTS]; ++ u8 vpdPdg[AR5416_NUM_PD_GAINS][AR9287_PD_GAIN_ICEPTS]; + } __packed; + + union cal_data_per_freq_ar9287_u { +@@ -674,10 +649,6 @@ struct eeprom_ops { + bool (*fill_eeprom)(struct ath_hw *hw); + int (*get_eeprom_ver)(struct ath_hw *hw); + int (*get_eeprom_rev)(struct ath_hw *hw); +- u8 (*get_num_ant_config)(struct ath_hw *hw, +- enum ath9k_hal_freq_band band); +- u32 (*get_eeprom_antenna_cfg)(struct ath_hw *hw, +- struct ath9k_channel *chan); + void (*set_board_values)(struct ath_hw *hw, struct ath9k_channel *chan); + void (*set_addac)(struct ath_hw *hw, struct ath9k_channel *chan); + void (*set_txpower)(struct ath_hw *hw, struct ath9k_channel *chan, +@@ -716,6 +687,14 @@ u16 ath9k_hw_get_max_edge_power(u16 freq + void ath9k_hw_update_regulatory_maxpower(struct ath_hw *ah); + int ath9k_hw_eeprom_init(struct ath_hw *ah); + ++void ath9k_hw_get_gain_boundaries_pdadcs(struct ath_hw *ah, ++ struct ath9k_channel *chan, ++ void *pRawDataSet, ++ u8 *bChans, u16 availPiers, ++ u16 tPdGainOverlap, ++ u16 *pPdGainBoundaries, u8 *pPDADCValues, ++ u16 numXpdGains); ++ + #define ar5416_get_ntxchains(_txchainmask) \ + (((_txchainmask >> 2) & 1) + \ + ((_txchainmask >> 1) & 1) + (_txchainmask & 1)) +--- a/drivers/net/wireless/ath/ath9k/eeprom_4k.c ++++ b/drivers/net/wireless/ath/ath9k/eeprom_4k.c +@@ -153,7 +153,7 @@ static int ath9k_hw_4k_check_eeprom(stru + eep->modalHeader.antCtrlChain[i] = integer; + } + +- for (i = 0; i < AR5416_EEPROM_MODAL_SPURS; i++) { ++ for (i = 0; i < AR_EEPROM_MODAL_SPURS; i++) { + word = swab16(eep->modalHeader.spurChans[i].spurChan); + eep->modalHeader.spurChans[i].spurChan = word; + } +@@ -227,173 +227,6 @@ static u32 ath9k_hw_4k_get_eeprom(struct + } + } + +-static void ath9k_hw_get_4k_gain_boundaries_pdadcs(struct ath_hw *ah, +- struct ath9k_channel *chan, +- struct cal_data_per_freq_4k *pRawDataSet, +- u8 *bChans, u16 availPiers, +- u16 tPdGainOverlap, +- u16 *pPdGainBoundaries, u8 *pPDADCValues, +- u16 numXpdGains) +-{ +-#define TMP_VAL_VPD_TABLE \ +- ((vpdTableI[i][sizeCurrVpdTable - 1] + (ss - maxIndex + 1) * vpdStep)); +- int i, j, k; +- int16_t ss; +- u16 idxL = 0, idxR = 0, numPiers; +- static u8 vpdTableL[AR5416_EEP4K_NUM_PD_GAINS] +- [AR5416_MAX_PWR_RANGE_IN_HALF_DB]; +- static u8 vpdTableR[AR5416_EEP4K_NUM_PD_GAINS] +- [AR5416_MAX_PWR_RANGE_IN_HALF_DB]; +- static u8 vpdTableI[AR5416_EEP4K_NUM_PD_GAINS] +- [AR5416_MAX_PWR_RANGE_IN_HALF_DB]; +- +- u8 *pVpdL, *pVpdR, *pPwrL, *pPwrR; +- u8 minPwrT4[AR5416_EEP4K_NUM_PD_GAINS]; +- u8 maxPwrT4[AR5416_EEP4K_NUM_PD_GAINS]; +- int16_t vpdStep; +- int16_t tmpVal; +- u16 sizeCurrVpdTable, maxIndex, tgtIndex; +- bool match; +- int16_t minDelta = 0; +- struct chan_centers centers; +-#define PD_GAIN_BOUNDARY_DEFAULT 58; +- +- memset(&minPwrT4, 0, AR9287_NUM_PD_GAINS); +- ath9k_hw_get_channel_centers(ah, chan, ¢ers); +- +- for (numPiers = 0; numPiers < availPiers; numPiers++) { +- if (bChans[numPiers] == AR5416_BCHAN_UNUSED) +- break; +- } +- +- match = ath9k_hw_get_lower_upper_index( +- (u8)FREQ2FBIN(centers.synth_center, +- IS_CHAN_2GHZ(chan)), bChans, numPiers, +- &idxL, &idxR); +- +- if (match) { +- for (i = 0; i < numXpdGains; i++) { +- minPwrT4[i] = pRawDataSet[idxL].pwrPdg[i][0]; +- maxPwrT4[i] = pRawDataSet[idxL].pwrPdg[i][4]; +- ath9k_hw_fill_vpd_table(minPwrT4[i], maxPwrT4[i], +- pRawDataSet[idxL].pwrPdg[i], +- pRawDataSet[idxL].vpdPdg[i], +- AR5416_EEP4K_PD_GAIN_ICEPTS, +- vpdTableI[i]); +- } +- } else { +- for (i = 0; i < numXpdGains; i++) { +- pVpdL = pRawDataSet[idxL].vpdPdg[i]; +- pPwrL = pRawDataSet[idxL].pwrPdg[i]; +- pVpdR = pRawDataSet[idxR].vpdPdg[i]; +- pPwrR = pRawDataSet[idxR].pwrPdg[i]; +- +- minPwrT4[i] = max(pPwrL[0], pPwrR[0]); +- +- maxPwrT4[i] = +- min(pPwrL[AR5416_EEP4K_PD_GAIN_ICEPTS - 1], +- pPwrR[AR5416_EEP4K_PD_GAIN_ICEPTS - 1]); +- +- +- ath9k_hw_fill_vpd_table(minPwrT4[i], maxPwrT4[i], +- pPwrL, pVpdL, +- AR5416_EEP4K_PD_GAIN_ICEPTS, +- vpdTableL[i]); +- ath9k_hw_fill_vpd_table(minPwrT4[i], maxPwrT4[i], +- pPwrR, pVpdR, +- AR5416_EEP4K_PD_GAIN_ICEPTS, +- vpdTableR[i]); +- +- for (j = 0; j <= (maxPwrT4[i] - minPwrT4[i]) / 2; j++) { +- vpdTableI[i][j] = +- (u8)(ath9k_hw_interpolate((u16) +- FREQ2FBIN(centers. +- synth_center, +- IS_CHAN_2GHZ +- (chan)), +- bChans[idxL], bChans[idxR], +- vpdTableL[i][j], vpdTableR[i][j])); +- } +- } +- } +- +- k = 0; +- +- for (i = 0; i < numXpdGains; i++) { +- if (i == (numXpdGains - 1)) +- pPdGainBoundaries[i] = +- (u16)(maxPwrT4[i] / 2); +- else +- pPdGainBoundaries[i] = +- (u16)((maxPwrT4[i] + minPwrT4[i + 1]) / 4); +- +- pPdGainBoundaries[i] = +- min((u16)AR5416_MAX_RATE_POWER, pPdGainBoundaries[i]); +- +- if ((i == 0) && !AR_SREV_5416_20_OR_LATER(ah)) { +- minDelta = pPdGainBoundaries[0] - 23; +- pPdGainBoundaries[0] = 23; +- } else { +- minDelta = 0; +- } +- +- if (i == 0) { +- if (AR_SREV_9280_20_OR_LATER(ah)) +- ss = (int16_t)(0 - (minPwrT4[i] / 2)); +- else +- ss = 0; +- } else { +- ss = (int16_t)((pPdGainBoundaries[i - 1] - +- (minPwrT4[i] / 2)) - +- tPdGainOverlap + 1 + minDelta); +- } +- vpdStep = (int16_t)(vpdTableI[i][1] - vpdTableI[i][0]); +- vpdStep = (int16_t)((vpdStep < 1) ? 1 : vpdStep); +- +- while ((ss < 0) && (k < (AR5416_NUM_PDADC_VALUES - 1))) { +- tmpVal = (int16_t)(vpdTableI[i][0] + ss * vpdStep); +- pPDADCValues[k++] = (u8)((tmpVal < 0) ? 0 : tmpVal); +- ss++; +- } +- +- sizeCurrVpdTable = (u8) ((maxPwrT4[i] - minPwrT4[i]) / 2 + 1); +- tgtIndex = (u8)(pPdGainBoundaries[i] + tPdGainOverlap - +- (minPwrT4[i] / 2)); +- maxIndex = (tgtIndex < sizeCurrVpdTable) ? +- tgtIndex : sizeCurrVpdTable; +- +- while ((ss < maxIndex) && (k < (AR5416_NUM_PDADC_VALUES - 1))) +- pPDADCValues[k++] = vpdTableI[i][ss++]; +- +- vpdStep = (int16_t)(vpdTableI[i][sizeCurrVpdTable - 1] - +- vpdTableI[i][sizeCurrVpdTable - 2]); +- vpdStep = (int16_t)((vpdStep < 1) ? 1 : vpdStep); +- +- if (tgtIndex >= maxIndex) { +- while ((ss <= tgtIndex) && +- (k < (AR5416_NUM_PDADC_VALUES - 1))) { +- tmpVal = (int16_t) TMP_VAL_VPD_TABLE; +- pPDADCValues[k++] = (u8)((tmpVal > 255) ? +- 255 : tmpVal); +- ss++; +- } +- } +- } +- +- while (i < AR5416_EEP4K_PD_GAINS_IN_MASK) { +- pPdGainBoundaries[i] = PD_GAIN_BOUNDARY_DEFAULT; +- i++; +- } +- +- while (k < AR5416_NUM_PDADC_VALUES) { +- pPDADCValues[k] = pPDADCValues[k - 1]; +- k++; +- } +- +- return; +-#undef TMP_VAL_VPD_TABLE +-} +- + static void ath9k_hw_set_4k_power_cal_table(struct ath_hw *ah, + struct ath9k_channel *chan, + int16_t *pTxPowerIndexOffset) +@@ -404,7 +237,7 @@ static void ath9k_hw_set_4k_power_cal_ta + u8 *pCalBChans = NULL; + u16 pdGainOverlap_t2; + static u8 pdadcValues[AR5416_NUM_PDADC_VALUES]; +- u16 gainBoundaries[AR5416_EEP4K_PD_GAINS_IN_MASK]; ++ u16 gainBoundaries[AR5416_PD_GAINS_IN_MASK]; + u16 numPiers, i, j; + u16 numXpdGain, xpdMask; + u16 xpdGainValues[AR5416_EEP4K_NUM_PD_GAINS] = { 0, 0 }; +@@ -426,12 +259,12 @@ static void ath9k_hw_set_4k_power_cal_ta + + numXpdGain = 0; + +- for (i = 1; i <= AR5416_EEP4K_PD_GAINS_IN_MASK; i++) { +- if ((xpdMask >> (AR5416_EEP4K_PD_GAINS_IN_MASK - i)) & 1) { ++ for (i = 1; i <= AR5416_PD_GAINS_IN_MASK; i++) { ++ if ((xpdMask >> (AR5416_PD_GAINS_IN_MASK - i)) & 1) { + if (numXpdGain >= AR5416_EEP4K_NUM_PD_GAINS) + break; + xpdGainValues[numXpdGain] = +- (u16)(AR5416_EEP4K_PD_GAINS_IN_MASK - i); ++ (u16)(AR5416_PD_GAINS_IN_MASK - i); + numXpdGain++; + } + } +@@ -455,7 +288,7 @@ static void ath9k_hw_set_4k_power_cal_ta + if (pEepData->baseEepHeader.txMask & (1 << i)) { + pRawDataset = pEepData->calPierData2G[i]; + +- ath9k_hw_get_4k_gain_boundaries_pdadcs(ah, chan, ++ ath9k_hw_get_gain_boundaries_pdadcs(ah, chan, + pRawDataset, pCalBChans, + numPiers, pdGainOverlap_t2, + gainBoundaries, +@@ -528,7 +361,7 @@ static void ath9k_hw_set_4k_power_per_ra + int i; + int16_t twiceLargestAntenna; + u16 twiceMinEdgePower; +- u16 twiceMaxEdgePower = AR5416_MAX_RATE_POWER; ++ u16 twiceMaxEdgePower = MAX_RATE_POWER; + u16 scaledPower = 0, minCtlPower, maxRegAllowedPower; + u16 numCtlModes; + const u16 *pCtlMode; +@@ -537,7 +370,7 @@ static void ath9k_hw_set_4k_power_per_ra + struct cal_ctl_data_4k *rep; + struct ar5416_eeprom_4k *pEepData = &ah->eeprom.map4k; + static const u16 tpScaleReductionTable[5] = +- { 0, 3, 6, 9, AR5416_MAX_RATE_POWER }; ++ { 0, 3, 6, 9, MAX_RATE_POWER }; + struct cal_target_power_leg targetPowerOfdm, targetPowerCck = { + 0, { 0, 0, 0, 0} + }; +@@ -613,7 +446,7 @@ static void ath9k_hw_set_4k_power_per_ra + + if (ah->eep_ops->get_eeprom_ver(ah) == 14 && + ah->eep_ops->get_eeprom_rev(ah) <= 2) +- twiceMaxEdgePower = AR5416_MAX_RATE_POWER; ++ twiceMaxEdgePower = MAX_RATE_POWER; + + for (i = 0; (i < AR5416_EEP4K_NUM_CTLS) && + pEepData->ctlIndex[i]; i++) { +@@ -752,8 +585,8 @@ static void ath9k_hw_4k_set_txpower(stru + regulatory->max_power_level = 0; + for (i = 0; i < ARRAY_SIZE(ratesArray); i++) { + ratesArray[i] = (int16_t)(txPowerIndexOffset + ratesArray[i]); +- if (ratesArray[i] > AR5416_MAX_RATE_POWER) +- ratesArray[i] = AR5416_MAX_RATE_POWER; ++ if (ratesArray[i] > MAX_RATE_POWER) ++ ratesArray[i] = MAX_RATE_POWER; + + if (ratesArray[i] > regulatory->max_power_level) + regulatory->max_power_level = ratesArray[i]; +@@ -937,8 +770,7 @@ static void ath9k_hw_4k_set_board_values + pModal = &eep->modalHeader; + txRxAttenLocal = 23; + +- REG_WRITE(ah, AR_PHY_SWITCH_COM, +- ah->eep_ops->get_eeprom_antenna_cfg(ah, chan)); ++ REG_WRITE(ah, AR_PHY_SWITCH_COM, pModal->antCtrlCommon); + + /* Single chain for 4K EEPROM*/ + ath9k_hw_4k_set_gain(ah, pModal, eep, txRxAttenLocal); +@@ -1154,21 +986,6 @@ static void ath9k_hw_4k_set_board_values + } + } + +-static u32 ath9k_hw_4k_get_eeprom_antenna_cfg(struct ath_hw *ah, +- struct ath9k_channel *chan) +-{ +- struct ar5416_eeprom_4k *eep = &ah->eeprom.map4k; +- struct modal_eep_4k_header *pModal = &eep->modalHeader; +- +- return pModal->antCtrlCommon; +-} +- +-static u8 ath9k_hw_4k_get_num_ant_config(struct ath_hw *ah, +- enum ath9k_hal_freq_band freq_band) +-{ +- return 1; +-} +- + static u16 ath9k_hw_4k_get_spur_channel(struct ath_hw *ah, u16 i, bool is2GHz) + { + #define EEP_MAP4K_SPURCHAN \ +@@ -1205,8 +1022,6 @@ const struct eeprom_ops eep_4k_ops = { + .fill_eeprom = ath9k_hw_4k_fill_eeprom, + .get_eeprom_ver = ath9k_hw_4k_get_eeprom_ver, + .get_eeprom_rev = ath9k_hw_4k_get_eeprom_rev, +- .get_num_ant_config = ath9k_hw_4k_get_num_ant_config, +- .get_eeprom_antenna_cfg = ath9k_hw_4k_get_eeprom_antenna_cfg, + .set_board_values = ath9k_hw_4k_set_board_values, + .set_addac = ath9k_hw_4k_set_addac, + .set_txpower = ath9k_hw_4k_set_txpower, +--- a/drivers/net/wireless/ath/ath9k/eeprom_9287.c ++++ b/drivers/net/wireless/ath/ath9k/eeprom_9287.c +@@ -150,7 +150,7 @@ static int ath9k_hw_ar9287_check_eeprom( + eep->modalHeader.antCtrlChain[i] = integer; + } + +- for (i = 0; i < AR9287_EEPROM_MODAL_SPURS; i++) { ++ for (i = 0; i < AR_EEPROM_MODAL_SPURS; i++) { + word = swab16(eep->modalHeader.spurChans[i].spurChan); + eep->modalHeader.spurChans[i].spurChan = word; + } +@@ -220,163 +220,6 @@ static u32 ath9k_hw_ar9287_get_eeprom(st + } + } + +-static void ath9k_hw_get_ar9287_gain_boundaries_pdadcs(struct ath_hw *ah, +- struct ath9k_channel *chan, +- struct cal_data_per_freq_ar9287 *pRawDataSet, +- u8 *bChans, u16 availPiers, +- u16 tPdGainOverlap, +- u16 *pPdGainBoundaries, +- u8 *pPDADCValues, +- u16 numXpdGains) +-{ +-#define TMP_VAL_VPD_TABLE \ +- ((vpdTableI[i][sizeCurrVpdTable - 1] + (ss - maxIndex + 1) * vpdStep)); +- +- int i, j, k; +- int16_t ss; +- u16 idxL = 0, idxR = 0, numPiers; +- u8 *pVpdL, *pVpdR, *pPwrL, *pPwrR; +- u8 minPwrT4[AR9287_NUM_PD_GAINS]; +- u8 maxPwrT4[AR9287_NUM_PD_GAINS]; +- int16_t vpdStep; +- int16_t tmpVal; +- u16 sizeCurrVpdTable, maxIndex, tgtIndex; +- bool match; +- int16_t minDelta = 0; +- struct chan_centers centers; +- static u8 vpdTableL[AR5416_EEP4K_NUM_PD_GAINS] +- [AR5416_MAX_PWR_RANGE_IN_HALF_DB]; +- static u8 vpdTableR[AR5416_EEP4K_NUM_PD_GAINS] +- [AR5416_MAX_PWR_RANGE_IN_HALF_DB]; +- static u8 vpdTableI[AR5416_EEP4K_NUM_PD_GAINS] +- [AR5416_MAX_PWR_RANGE_IN_HALF_DB]; +- +- memset(&minPwrT4, 0, AR9287_NUM_PD_GAINS); +- ath9k_hw_get_channel_centers(ah, chan, ¢ers); +- +- for (numPiers = 0; numPiers < availPiers; numPiers++) { +- if (bChans[numPiers] == AR9287_BCHAN_UNUSED) +- break; +- } +- +- match = ath9k_hw_get_lower_upper_index( +- (u8)FREQ2FBIN(centers.synth_center, IS_CHAN_2GHZ(chan)), +- bChans, numPiers, &idxL, &idxR); +- +- if (match) { +- for (i = 0; i < numXpdGains; i++) { +- minPwrT4[i] = pRawDataSet[idxL].pwrPdg[i][0]; +- maxPwrT4[i] = pRawDataSet[idxL].pwrPdg[i][4]; +- ath9k_hw_fill_vpd_table(minPwrT4[i], maxPwrT4[i], +- pRawDataSet[idxL].pwrPdg[i], +- pRawDataSet[idxL].vpdPdg[i], +- AR9287_PD_GAIN_ICEPTS, +- vpdTableI[i]); +- } +- } else { +- for (i = 0; i < numXpdGains; i++) { +- pVpdL = pRawDataSet[idxL].vpdPdg[i]; +- pPwrL = pRawDataSet[idxL].pwrPdg[i]; +- pVpdR = pRawDataSet[idxR].vpdPdg[i]; +- pPwrR = pRawDataSet[idxR].pwrPdg[i]; +- +- minPwrT4[i] = max(pPwrL[0], pPwrR[0]); +- +- maxPwrT4[i] = min(pPwrL[AR9287_PD_GAIN_ICEPTS - 1], +- pPwrR[AR9287_PD_GAIN_ICEPTS - 1]); +- +- ath9k_hw_fill_vpd_table(minPwrT4[i], maxPwrT4[i], +- pPwrL, pVpdL, +- AR9287_PD_GAIN_ICEPTS, +- vpdTableL[i]); +- ath9k_hw_fill_vpd_table(minPwrT4[i], maxPwrT4[i], +- pPwrR, pVpdR, +- AR9287_PD_GAIN_ICEPTS, +- vpdTableR[i]); +- +- for (j = 0; j <= (maxPwrT4[i] - minPwrT4[i]) / 2; j++) { +- vpdTableI[i][j] = (u8)(ath9k_hw_interpolate( +- (u16)FREQ2FBIN(centers. synth_center, +- IS_CHAN_2GHZ(chan)), +- bChans[idxL], bChans[idxR], +- vpdTableL[i][j], vpdTableR[i][j])); +- } +- } +- } +- +- k = 0; +- +- for (i = 0; i < numXpdGains; i++) { +- if (i == (numXpdGains - 1)) +- pPdGainBoundaries[i] = +- (u16)(maxPwrT4[i] / 2); +- else +- pPdGainBoundaries[i] = +- (u16)((maxPwrT4[i] + minPwrT4[i+1]) / 4); +- +- pPdGainBoundaries[i] = min((u16)AR5416_MAX_RATE_POWER, +- pPdGainBoundaries[i]); +- +- +- minDelta = 0; +- +- if (i == 0) { +- if (AR_SREV_9280_20_OR_LATER(ah)) +- ss = (int16_t)(0 - (minPwrT4[i] / 2)); +- else +- ss = 0; +- } else { +- ss = (int16_t)((pPdGainBoundaries[i-1] - +- (minPwrT4[i] / 2)) - +- tPdGainOverlap + 1 + minDelta); +- } +- +- vpdStep = (int16_t)(vpdTableI[i][1] - vpdTableI[i][0]); +- vpdStep = (int16_t)((vpdStep < 1) ? 1 : vpdStep); +- +- while ((ss < 0) && (k < (AR9287_NUM_PDADC_VALUES - 1))) { +- tmpVal = (int16_t)(vpdTableI[i][0] + ss * vpdStep); +- pPDADCValues[k++] = (u8)((tmpVal < 0) ? 0 : tmpVal); +- ss++; +- } +- +- sizeCurrVpdTable = (u8)((maxPwrT4[i] - minPwrT4[i]) / 2 + 1); +- tgtIndex = (u8)(pPdGainBoundaries[i] + +- tPdGainOverlap - (minPwrT4[i] / 2)); +- maxIndex = (tgtIndex < sizeCurrVpdTable) ? +- tgtIndex : sizeCurrVpdTable; +- +- while ((ss < maxIndex) && (k < (AR9287_NUM_PDADC_VALUES - 1))) +- pPDADCValues[k++] = vpdTableI[i][ss++]; +- +- vpdStep = (int16_t)(vpdTableI[i][sizeCurrVpdTable - 1] - +- vpdTableI[i][sizeCurrVpdTable - 2]); +- vpdStep = (int16_t)((vpdStep < 1) ? 1 : vpdStep); +- +- if (tgtIndex > maxIndex) { +- while ((ss <= tgtIndex) && +- (k < (AR9287_NUM_PDADC_VALUES - 1))) { +- tmpVal = (int16_t) TMP_VAL_VPD_TABLE; +- pPDADCValues[k++] = +- (u8)((tmpVal > 255) ? 255 : tmpVal); +- ss++; +- } +- } +- } +- +- while (i < AR9287_PD_GAINS_IN_MASK) { +- pPdGainBoundaries[i] = pPdGainBoundaries[i-1]; +- i++; +- } +- +- while (k < AR9287_NUM_PDADC_VALUES) { +- pPDADCValues[k] = pPDADCValues[k-1]; +- k++; +- } +- +-#undef TMP_VAL_VPD_TABLE +-} +- + static void ar9287_eeprom_get_tx_gain_index(struct ath_hw *ah, + struct ath9k_channel *chan, + struct cal_data_op_loop_ar9287 *pRawDatasetOpLoop, +@@ -389,7 +232,7 @@ static void ar9287_eeprom_get_tx_gain_in + ath9k_hw_get_channel_centers(ah, chan, ¢ers); + + for (numPiers = 0; numPiers < availPiers; numPiers++) { +- if (pCalChans[numPiers] == AR9287_BCHAN_UNUSED) ++ if (pCalChans[numPiers] == AR5416_BCHAN_UNUSED) + break; + } + +@@ -455,11 +298,11 @@ static void ath9k_hw_set_ar9287_power_ca + struct cal_data_op_loop_ar9287 *pRawDatasetOpenLoop; + u8 *pCalBChans = NULL; + u16 pdGainOverlap_t2; +- u8 pdadcValues[AR9287_NUM_PDADC_VALUES]; +- u16 gainBoundaries[AR9287_PD_GAINS_IN_MASK]; ++ u8 pdadcValues[AR5416_NUM_PDADC_VALUES]; ++ u16 gainBoundaries[AR5416_PD_GAINS_IN_MASK]; + u16 numPiers = 0, i, j; + u16 numXpdGain, xpdMask; +- u16 xpdGainValues[AR9287_NUM_PD_GAINS] = {0, 0, 0, 0}; ++ u16 xpdGainValues[AR5416_NUM_PD_GAINS] = {0, 0, 0, 0}; + u32 reg32, regOffset, regChainOffset, regval; + int16_t modalIdx, diff = 0; + struct ar9287_eeprom *pEepData = &ah->eeprom.map9287; +@@ -487,12 +330,12 @@ static void ath9k_hw_set_ar9287_power_ca + numXpdGain = 0; + + /* Calculate the value of xpdgains from the xpdGain Mask */ +- for (i = 1; i <= AR9287_PD_GAINS_IN_MASK; i++) { +- if ((xpdMask >> (AR9287_PD_GAINS_IN_MASK - i)) & 1) { +- if (numXpdGain >= AR9287_NUM_PD_GAINS) ++ for (i = 1; i <= AR5416_PD_GAINS_IN_MASK; i++) { ++ if ((xpdMask >> (AR5416_PD_GAINS_IN_MASK - i)) & 1) { ++ if (numXpdGain >= AR5416_NUM_PD_GAINS) + break; + xpdGainValues[numXpdGain] = +- (u16)(AR9287_PD_GAINS_IN_MASK-i); ++ (u16)(AR5416_PD_GAINS_IN_MASK-i); + numXpdGain++; + } + } +@@ -525,7 +368,7 @@ static void ath9k_hw_set_ar9287_power_ca + (struct cal_data_per_freq_ar9287 *) + pEepData->calPierData2G[i]; + +- ath9k_hw_get_ar9287_gain_boundaries_pdadcs(ah, chan, ++ ath9k_hw_get_gain_boundaries_pdadcs(ah, chan, + pRawDataset, + pCalBChans, numPiers, + pdGainOverlap_t2, +@@ -561,13 +404,13 @@ static void ath9k_hw_set_ar9287_power_ca + (int32_t)AR9287_PWR_TABLE_OFFSET_DB); + diff *= 2; + +- for (j = 0; j < ((u16)AR9287_NUM_PDADC_VALUES-diff); j++) ++ for (j = 0; j < ((u16)AR5416_NUM_PDADC_VALUES-diff); j++) + pdadcValues[j] = pdadcValues[j+diff]; + +- for (j = (u16)(AR9287_NUM_PDADC_VALUES-diff); +- j < AR9287_NUM_PDADC_VALUES; j++) ++ for (j = (u16)(AR5416_NUM_PDADC_VALUES-diff); ++ j < AR5416_NUM_PDADC_VALUES; j++) + pdadcValues[j] = +- pdadcValues[AR9287_NUM_PDADC_VALUES-diff]; ++ pdadcValues[AR5416_NUM_PDADC_VALUES-diff]; + } + + if (!ath9k_hw_ar9287_get_eeprom(ah, EEP_OL_PWRCTRL)) { +@@ -610,9 +453,9 @@ static void ath9k_hw_set_ar9287_power_pe + #define REDUCE_SCALED_POWER_BY_THREE_CHAIN 10 + + struct ath_regulatory *regulatory = ath9k_hw_regulatory(ah); +- u16 twiceMaxEdgePower = AR5416_MAX_RATE_POWER; ++ u16 twiceMaxEdgePower = MAX_RATE_POWER; + static const u16 tpScaleReductionTable[5] = +- { 0, 3, 6, 9, AR5416_MAX_RATE_POWER }; ++ { 0, 3, 6, 9, MAX_RATE_POWER }; + int i; + int16_t twiceLargestAntenna; + struct cal_ctl_data_ar9287 *rep; +@@ -877,8 +720,8 @@ static void ath9k_hw_ar9287_set_txpower( + regulatory->max_power_level = 0; + for (i = 0; i < ARRAY_SIZE(ratesArray); i++) { + ratesArray[i] = (int16_t)(txPowerIndexOffset + ratesArray[i]); +- if (ratesArray[i] > AR9287_MAX_RATE_POWER) +- ratesArray[i] = AR9287_MAX_RATE_POWER; ++ if (ratesArray[i] > MAX_RATE_POWER) ++ ratesArray[i] = MAX_RATE_POWER; + + if (ratesArray[i] > regulatory->max_power_level) + regulatory->max_power_level = ratesArray[i]; +@@ -1023,8 +866,7 @@ static void ath9k_hw_ar9287_set_board_va + antWrites[j++] = (u16)(pModal->antCtrlChain[i] & 0x3); + } + +- REG_WRITE(ah, AR_PHY_SWITCH_COM, +- ah->eep_ops->get_eeprom_antenna_cfg(ah, chan)); ++ REG_WRITE(ah, AR_PHY_SWITCH_COM, pModal->antCtrlCommon); + + for (i = 0; i < AR9287_MAX_CHAINS; i++) { + regChainOffset = i * 0x1000; +@@ -1125,21 +967,6 @@ static void ath9k_hw_ar9287_set_board_va + pModal->xpaBiasLvl); + } + +-static u8 ath9k_hw_ar9287_get_num_ant_config(struct ath_hw *ah, +- enum ath9k_hal_freq_band freq_band) +-{ +- return 1; +-} +- +-static u32 ath9k_hw_ar9287_get_eeprom_antenna_cfg(struct ath_hw *ah, +- struct ath9k_channel *chan) +-{ +- struct ar9287_eeprom *eep = &ah->eeprom.map9287; +- struct modal_eep_ar9287_header *pModal = &eep->modalHeader; +- +- return pModal->antCtrlCommon; +-} +- + static u16 ath9k_hw_ar9287_get_spur_channel(struct ath_hw *ah, + u16 i, bool is2GHz) + { +@@ -1177,8 +1004,6 @@ const struct eeprom_ops eep_ar9287_ops = + .fill_eeprom = ath9k_hw_ar9287_fill_eeprom, + .get_eeprom_ver = ath9k_hw_ar9287_get_eeprom_ver, + .get_eeprom_rev = ath9k_hw_ar9287_get_eeprom_rev, +- .get_num_ant_config = ath9k_hw_ar9287_get_num_ant_config, +- .get_eeprom_antenna_cfg = ath9k_hw_ar9287_get_eeprom_antenna_cfg, + .set_board_values = ath9k_hw_ar9287_set_board_values, + .set_addac = ath9k_hw_ar9287_set_addac, + .set_txpower = ath9k_hw_ar9287_set_txpower, +--- a/drivers/net/wireless/ath/ath9k/eeprom_def.c ++++ b/drivers/net/wireless/ath/ath9k/eeprom_def.c +@@ -206,7 +206,7 @@ static int ath9k_hw_def_check_eeprom(str + pModal->antCtrlChain[i] = integer; + } + +- for (i = 0; i < AR5416_EEPROM_MODAL_SPURS; i++) { ++ for (i = 0; i < AR_EEPROM_MODAL_SPURS; i++) { + word = swab16(pModal->spurChans[i].spurChan); + pModal->spurChans[i].spurChan = word; + } +@@ -374,8 +374,7 @@ static void ath9k_hw_def_set_board_value + pModal = &(eep->modalHeader[IS_CHAN_2GHZ(chan)]); + txRxAttenLocal = IS_CHAN_2GHZ(chan) ? 23 : 44; + +- REG_WRITE(ah, AR_PHY_SWITCH_COM, +- ah->eep_ops->get_eeprom_antenna_cfg(ah, chan)); ++ REG_WRITE(ah, AR_PHY_SWITCH_COM, pModal->antCtrlCommon & 0xffff); + + for (i = 0; i < AR5416_MAX_CHAINS; i++) { + if (AR_SREV_9280(ah)) { +@@ -588,168 +587,6 @@ static void ath9k_hw_def_set_addac(struc + #undef XPA_LVL_FREQ + } + +-static void ath9k_hw_get_def_gain_boundaries_pdadcs(struct ath_hw *ah, +- struct ath9k_channel *chan, +- struct cal_data_per_freq *pRawDataSet, +- u8 *bChans, u16 availPiers, +- u16 tPdGainOverlap, +- u16 *pPdGainBoundaries, u8 *pPDADCValues, +- u16 numXpdGains) +-{ +- int i, j, k; +- int16_t ss; +- u16 idxL = 0, idxR = 0, numPiers; +- static u8 vpdTableL[AR5416_NUM_PD_GAINS] +- [AR5416_MAX_PWR_RANGE_IN_HALF_DB]; +- static u8 vpdTableR[AR5416_NUM_PD_GAINS] +- [AR5416_MAX_PWR_RANGE_IN_HALF_DB]; +- static u8 vpdTableI[AR5416_NUM_PD_GAINS] +- [AR5416_MAX_PWR_RANGE_IN_HALF_DB]; +- +- u8 *pVpdL, *pVpdR, *pPwrL, *pPwrR; +- u8 minPwrT4[AR5416_NUM_PD_GAINS]; +- u8 maxPwrT4[AR5416_NUM_PD_GAINS]; +- int16_t vpdStep; +- int16_t tmpVal; +- u16 sizeCurrVpdTable, maxIndex, tgtIndex; +- bool match; +- int16_t minDelta = 0; +- struct chan_centers centers; +- +- memset(&minPwrT4, 0, AR9287_NUM_PD_GAINS); +- ath9k_hw_get_channel_centers(ah, chan, ¢ers); +- +- for (numPiers = 0; numPiers < availPiers; numPiers++) { +- if (bChans[numPiers] == AR5416_BCHAN_UNUSED) +- break; +- } +- +- match = ath9k_hw_get_lower_upper_index((u8)FREQ2FBIN(centers.synth_center, +- IS_CHAN_2GHZ(chan)), +- bChans, numPiers, &idxL, &idxR); +- +- if (match) { +- for (i = 0; i < numXpdGains; i++) { +- minPwrT4[i] = pRawDataSet[idxL].pwrPdg[i][0]; +- maxPwrT4[i] = pRawDataSet[idxL].pwrPdg[i][4]; +- ath9k_hw_fill_vpd_table(minPwrT4[i], maxPwrT4[i], +- pRawDataSet[idxL].pwrPdg[i], +- pRawDataSet[idxL].vpdPdg[i], +- AR5416_PD_GAIN_ICEPTS, +- vpdTableI[i]); +- } +- } else { +- for (i = 0; i < numXpdGains; i++) { +- pVpdL = pRawDataSet[idxL].vpdPdg[i]; +- pPwrL = pRawDataSet[idxL].pwrPdg[i]; +- pVpdR = pRawDataSet[idxR].vpdPdg[i]; +- pPwrR = pRawDataSet[idxR].pwrPdg[i]; +- +- minPwrT4[i] = max(pPwrL[0], pPwrR[0]); +- +- maxPwrT4[i] = +- min(pPwrL[AR5416_PD_GAIN_ICEPTS - 1], +- pPwrR[AR5416_PD_GAIN_ICEPTS - 1]); +- +- +- ath9k_hw_fill_vpd_table(minPwrT4[i], maxPwrT4[i], +- pPwrL, pVpdL, +- AR5416_PD_GAIN_ICEPTS, +- vpdTableL[i]); +- ath9k_hw_fill_vpd_table(minPwrT4[i], maxPwrT4[i], +- pPwrR, pVpdR, +- AR5416_PD_GAIN_ICEPTS, +- vpdTableR[i]); +- +- for (j = 0; j <= (maxPwrT4[i] - minPwrT4[i]) / 2; j++) { +- vpdTableI[i][j] = +- (u8)(ath9k_hw_interpolate((u16) +- FREQ2FBIN(centers. +- synth_center, +- IS_CHAN_2GHZ +- (chan)), +- bChans[idxL], bChans[idxR], +- vpdTableL[i][j], vpdTableR[i][j])); +- } +- } +- } +- +- k = 0; +- +- for (i = 0; i < numXpdGains; i++) { +- if (i == (numXpdGains - 1)) +- pPdGainBoundaries[i] = +- (u16)(maxPwrT4[i] / 2); +- else +- pPdGainBoundaries[i] = +- (u16)((maxPwrT4[i] + minPwrT4[i + 1]) / 4); +- +- pPdGainBoundaries[i] = +- min((u16)AR5416_MAX_RATE_POWER, pPdGainBoundaries[i]); +- +- if ((i == 0) && !AR_SREV_5416_20_OR_LATER(ah)) { +- minDelta = pPdGainBoundaries[0] - 23; +- pPdGainBoundaries[0] = 23; +- } else { +- minDelta = 0; +- } +- +- if (i == 0) { +- if (AR_SREV_9280_20_OR_LATER(ah)) +- ss = (int16_t)(0 - (minPwrT4[i] / 2)); +- else +- ss = 0; +- } else { +- ss = (int16_t)((pPdGainBoundaries[i - 1] - +- (minPwrT4[i] / 2)) - +- tPdGainOverlap + 1 + minDelta); +- } +- vpdStep = (int16_t)(vpdTableI[i][1] - vpdTableI[i][0]); +- vpdStep = (int16_t)((vpdStep < 1) ? 1 : vpdStep); +- +- while ((ss < 0) && (k < (AR5416_NUM_PDADC_VALUES - 1))) { +- tmpVal = (int16_t)(vpdTableI[i][0] + ss * vpdStep); +- pPDADCValues[k++] = (u8)((tmpVal < 0) ? 0 : tmpVal); +- ss++; +- } +- +- sizeCurrVpdTable = (u8) ((maxPwrT4[i] - minPwrT4[i]) / 2 + 1); +- tgtIndex = (u8)(pPdGainBoundaries[i] + tPdGainOverlap - +- (minPwrT4[i] / 2)); +- maxIndex = (tgtIndex < sizeCurrVpdTable) ? +- tgtIndex : sizeCurrVpdTable; +- +- while ((ss < maxIndex) && (k < (AR5416_NUM_PDADC_VALUES - 1))) { +- pPDADCValues[k++] = vpdTableI[i][ss++]; +- } +- +- vpdStep = (int16_t)(vpdTableI[i][sizeCurrVpdTable - 1] - +- vpdTableI[i][sizeCurrVpdTable - 2]); +- vpdStep = (int16_t)((vpdStep < 1) ? 1 : vpdStep); +- +- if (tgtIndex >= maxIndex) { +- while ((ss <= tgtIndex) && +- (k < (AR5416_NUM_PDADC_VALUES - 1))) { +- tmpVal = (int16_t)((vpdTableI[i][sizeCurrVpdTable - 1] + +- (ss - maxIndex + 1) * vpdStep)); +- pPDADCValues[k++] = (u8)((tmpVal > 255) ? +- 255 : tmpVal); +- ss++; +- } +- } +- } +- +- while (i < AR5416_PD_GAINS_IN_MASK) { +- pPdGainBoundaries[i] = pPdGainBoundaries[i - 1]; +- i++; +- } +- +- while (k < AR5416_NUM_PDADC_VALUES) { +- pPDADCValues[k] = pPDADCValues[k - 1]; +- k++; +- } +-} +- + static int16_t ath9k_change_gain_boundary_setting(struct ath_hw *ah, + u16 *gb, + u16 numXpdGain, +@@ -782,7 +619,7 @@ static int16_t ath9k_change_gain_boundar + /* Because of a hardware limitation, ensure the gain boundary + * is not larger than (63 - overlap) + */ +- gb_limit = (u16)(AR5416_MAX_RATE_POWER - pdGainOverlap_t2); ++ gb_limit = (u16)(MAX_RATE_POWER - pdGainOverlap_t2); + + for (k = 0; k < numXpdGain; k++) + gb[k] = (u16)min(gb_limit, gb[k]); +@@ -916,7 +753,7 @@ static void ath9k_hw_set_def_power_cal_t + ath9k_olc_get_pdadcs(ah, pcdacIdx, + txPower/2, pdadcValues); + } else { +- ath9k_hw_get_def_gain_boundaries_pdadcs(ah, ++ ath9k_hw_get_gain_boundaries_pdadcs(ah, + chan, pRawDataset, + pCalBChans, numPiers, + pdGainOverlap_t2, +@@ -1001,9 +838,9 @@ static void ath9k_hw_set_def_power_per_r + + struct ath_regulatory *regulatory = ath9k_hw_regulatory(ah); + struct ar5416_eeprom_def *pEepData = &ah->eeprom.def; +- u16 twiceMaxEdgePower = AR5416_MAX_RATE_POWER; ++ u16 twiceMaxEdgePower = MAX_RATE_POWER; + static const u16 tpScaleReductionTable[5] = +- { 0, 3, 6, 9, AR5416_MAX_RATE_POWER }; ++ { 0, 3, 6, 9, MAX_RATE_POWER }; + + int i; + int16_t twiceLargestAntenna; +@@ -1148,7 +985,7 @@ static void ath9k_hw_set_def_power_per_r + + if (ah->eep_ops->get_eeprom_ver(ah) == 14 && + ah->eep_ops->get_eeprom_rev(ah) <= 2) +- twiceMaxEdgePower = AR5416_MAX_RATE_POWER; ++ twiceMaxEdgePower = MAX_RATE_POWER; + + for (i = 0; (i < AR5416_NUM_CTLS) && pEepData->ctlIndex[i]; i++) { + if ((((cfgCtl & ~CTL_MODE_M) | +@@ -1293,8 +1130,8 @@ static void ath9k_hw_def_set_txpower(str + regulatory->max_power_level = 0; + for (i = 0; i < ARRAY_SIZE(ratesArray); i++) { + ratesArray[i] = (int16_t)(txPowerIndexOffset + ratesArray[i]); +- if (ratesArray[i] > AR5416_MAX_RATE_POWER) +- ratesArray[i] = AR5416_MAX_RATE_POWER; ++ if (ratesArray[i] > MAX_RATE_POWER) ++ ratesArray[i] = MAX_RATE_POWER; + if (ratesArray[i] > regulatory->max_power_level) + regulatory->max_power_level = ratesArray[i]; + } +@@ -1426,34 +1263,6 @@ static void ath9k_hw_def_set_txpower(str + | ATH9K_POW_SM(pModal->pwrDecreaseFor2Chain, 0)); + } + +-static u8 ath9k_hw_def_get_num_ant_config(struct ath_hw *ah, +- enum ath9k_hal_freq_band freq_band) +-{ +- struct ar5416_eeprom_def *eep = &ah->eeprom.def; +- struct modal_eep_header *pModal = +- &(eep->modalHeader[freq_band]); +- struct base_eep_header *pBase = &eep->baseEepHeader; +- u8 num_ant_config; +- +- num_ant_config = 1; +- +- if (pBase->version >= 0x0E0D && +- (pModal->lna_ctl & LNA_CTL_USE_ANT1)) +- num_ant_config += 1; +- +- return num_ant_config; +-} +- +-static u32 ath9k_hw_def_get_eeprom_antenna_cfg(struct ath_hw *ah, +- struct ath9k_channel *chan) +-{ +- struct ar5416_eeprom_def *eep = &ah->eeprom.def; +- struct modal_eep_header *pModal = +- &(eep->modalHeader[IS_CHAN_2GHZ(chan)]); +- +- return pModal->antCtrlCommon; +-} +- + static u16 ath9k_hw_def_get_spur_channel(struct ath_hw *ah, u16 i, bool is2GHz) + { + #define EEP_DEF_SPURCHAN \ +@@ -1490,8 +1299,6 @@ const struct eeprom_ops eep_def_ops = { + .fill_eeprom = ath9k_hw_def_fill_eeprom, + .get_eeprom_ver = ath9k_hw_def_get_eeprom_ver, + .get_eeprom_rev = ath9k_hw_def_get_eeprom_rev, +- .get_num_ant_config = ath9k_hw_def_get_num_ant_config, +- .get_eeprom_antenna_cfg = ath9k_hw_def_get_eeprom_antenna_cfg, + .set_board_values = ath9k_hw_def_set_board_values, + .set_addac = ath9k_hw_def_set_addac, + .set_txpower = ath9k_hw_def_set_txpower, +--- a/drivers/net/wireless/ath/ath9k/hw.c ++++ b/drivers/net/wireless/ath/ath9k/hw.c +@@ -54,13 +54,6 @@ static void ath9k_hw_init_mode_regs(stru + ath9k_hw_private_ops(ah)->init_mode_regs(ah); + } + +-static bool ath9k_hw_macversion_supported(struct ath_hw *ah) +-{ +- struct ath_hw_private_ops *priv_ops = ath9k_hw_private_ops(ah); +- +- return priv_ops->macversion_supported(ah->hw_version.macVersion); +-} +- + static u32 ath9k_hw_compute_pll_control(struct ath_hw *ah, + struct ath9k_channel *chan) + { +@@ -414,7 +407,6 @@ static void ath9k_hw_init_defaults(struc + ah->sta_id1_defaults = + AR_STA_ID1_CRPT_MIC_ENABLE | + AR_STA_ID1_MCAST_KSRCH; +- ah->beacon_interval = 100; + ah->enable_32kHz_clock = DONT_USE_32KHZ; + ah->slottime = (u32) -1; + ah->globaltxtimeout = (u32) -1; +@@ -534,10 +526,22 @@ static int __ath9k_hw_init(struct ath_hw + else + ah->config.max_txtrig_level = MAX_TX_FIFO_THRESHOLD; + +- if (!ath9k_hw_macversion_supported(ah)) { +- ath_err(common, +- "Mac Chip Rev 0x%02x.%x is not supported by this driver\n", +- ah->hw_version.macVersion, ah->hw_version.macRev); ++ switch (ah->hw_version.macVersion) { ++ case AR_SREV_VERSION_5416_PCI: ++ case AR_SREV_VERSION_5416_PCIE: ++ case AR_SREV_VERSION_9160: ++ case AR_SREV_VERSION_9100: ++ case AR_SREV_VERSION_9280: ++ case AR_SREV_VERSION_9285: ++ case AR_SREV_VERSION_9287: ++ case AR_SREV_VERSION_9271: ++ case AR_SREV_VERSION_9300: ++ case AR_SREV_VERSION_9485: ++ break; ++ default: ++ ath_err(common, "Mac Chip Rev 0x%02x.%x is not supported by " ++ "this driver\n", ah->hw_version.macVersion, ++ ah->hw_version.macRev); + return -EOPNOTSUPP; + } + +@@ -1639,8 +1643,6 @@ void ath9k_hw_beaconinit(struct ath_hw * + { + int flags = 0; + +- ah->beacon_interval = beacon_period; +- + ENABLE_REGWRITE_BUFFER(ah); + + switch (ah->opmode) { +@@ -1932,11 +1934,6 @@ int ath9k_hw_fill_cap_info(struct ath_hw + AR_SREV_5416(ah)) + pCap->reg_cap |= AR_EEPROM_EEREGCAP_EN_FCC_MIDBAND; + +- pCap->num_antcfg_5ghz = +- ah->eep_ops->get_num_ant_config(ah, ATH9K_HAL_FREQ_BAND_5GHZ); +- pCap->num_antcfg_2ghz = +- ah->eep_ops->get_num_ant_config(ah, ATH9K_HAL_FREQ_BAND_2GHZ); +- + if (AR_SREV_9280_20_OR_LATER(ah) && common->btcoex_enabled) { + btcoex_hw->btactive_gpio = ATH_BTACTIVE_GPIO; + btcoex_hw->wlanactive_gpio = ATH_WLANACTIVE_GPIO; +--- a/drivers/net/wireless/ath/ath9k/hw.h ++++ b/drivers/net/wireless/ath/ath9k/hw.h +@@ -204,8 +204,6 @@ struct ath9k_hw_capabilities { + u16 tx_triglevel_max; + u16 reg_cap; + u8 num_gpio_pins; +- u8 num_antcfg_2ghz; +- u8 num_antcfg_5ghz; + u8 rx_hp_qdepth; + u8 rx_lp_qdepth; + u8 rx_status_len; +@@ -238,7 +236,6 @@ struct ath9k_ops_config { + #define SPUR_DISABLE 0 + #define SPUR_ENABLE_IOCTL 1 + #define SPUR_ENABLE_EEPROM 2 +-#define AR_EEPROM_MODAL_SPURS 5 + #define AR_SPUR_5413_1 1640 + #define AR_SPUR_5413_2 1200 + #define AR_NO_SPUR 0x8000 +@@ -535,7 +532,6 @@ struct ath_hw_radar_conf { + * + * @init_mode_regs: Initializes mode registers + * @init_mode_gain_regs: Initialize TX/RX gain registers +- * @macversion_supported: If this specific mac revision is supported + * + * @rf_set_freq: change frequency + * @spur_mitigate_freq: spur mitigation +@@ -557,7 +553,6 @@ struct ath_hw_private_ops { + + void (*init_mode_regs)(struct ath_hw *ah); + void (*init_mode_gain_regs)(struct ath_hw *ah); +- bool (*macversion_supported)(u32 macversion); + void (*setup_calibration)(struct ath_hw *ah, + struct ath9k_cal_list *currCal); + +@@ -767,9 +762,7 @@ struct ath_hw { + u32 *bank6Temp; + + u8 txpower_limit; +- int16_t txpower_indexoffset; + int coverage_class; +- u32 beacon_interval; + u32 slottime; + u32 globaltxtimeout; + +--- a/drivers/net/wireless/ath/ath9k/ar9003_eeprom.h ++++ b/drivers/net/wireless/ath/ath9k/ar9003_eeprom.h +@@ -20,48 +20,17 @@ + /* #define AR9300_NUM_CTLS 21 */ + #define AR9300_NUM_CTLS_5G 9 + #define AR9300_NUM_CTLS_2G 12 +-#define AR9300_CTL_MODE_M 0xF + #define AR9300_NUM_BAND_EDGES_5G 8 + #define AR9300_NUM_BAND_EDGES_2G 4 +-#define AR9300_NUM_PD_GAINS 4 +-#define AR9300_PD_GAINS_IN_MASK 4 +-#define AR9300_PD_GAIN_ICEPTS 5 +-#define AR9300_EEPROM_MODAL_SPURS 5 +-#define AR9300_MAX_RATE_POWER 63 +-#define AR9300_NUM_PDADC_VALUES 128 +-#define AR9300_NUM_RATES 16 +-#define AR9300_BCHAN_UNUSED 0xFF +-#define AR9300_MAX_PWR_RANGE_IN_HALF_DB 64 +-#define AR9300_OPFLAGS_11A 0x01 +-#define AR9300_OPFLAGS_11G 0x02 +-#define AR9300_OPFLAGS_5G_HT40 0x04 +-#define AR9300_OPFLAGS_2G_HT40 0x08 +-#define AR9300_OPFLAGS_5G_HT20 0x10 +-#define AR9300_OPFLAGS_2G_HT20 0x20 + #define AR9300_EEPMISC_BIG_ENDIAN 0x01 + #define AR9300_EEPMISC_WOW 0x02 + #define AR9300_CUSTOMER_DATA_SIZE 20 + +-#define FREQ2FBIN(x, y) ((y) ? ((x) - 2300) : (((x) - 4800) / 5)) + #define FBIN2FREQ(x, y) ((y) ? (2300 + x) : (4800 + 5 * x)) + #define AR9300_MAX_CHAINS 3 + #define AR9300_ANT_16S 25 + #define AR9300_FUTURE_MODAL_SZ 6 + +-#define AR9300_NUM_ANT_CHAIN_FIELDS 7 +-#define AR9300_NUM_ANT_COMMON_FIELDS 4 +-#define AR9300_SIZE_ANT_CHAIN_FIELD 3 +-#define AR9300_SIZE_ANT_COMMON_FIELD 4 +-#define AR9300_ANT_CHAIN_MASK 0x7 +-#define AR9300_ANT_COMMON_MASK 0xf +-#define AR9300_CHAIN_0_IDX 0 +-#define AR9300_CHAIN_1_IDX 1 +-#define AR9300_CHAIN_2_IDX 2 +- +-#define AR928X_NUM_ANT_CHAIN_FIELDS 6 +-#define AR928X_SIZE_ANT_CHAIN_FIELD 2 +-#define AR928X_ANT_CHAIN_MASK 0x3 +- + /* Delta from which to start power to pdadc table */ + /* This offset is used in both open loop and closed loop power control + * schemes. In open loop power control, it is not really needed, but for +@@ -71,12 +40,8 @@ + */ + #define AR9300_PWR_TABLE_OFFSET 0 + +-/* enable flags for voltage and temp compensation */ +-#define ENABLE_TEMP_COMPENSATION 0x01 +-#define ENABLE_VOLT_COMPENSATION 0x02 + /* byte addressable */ + #define AR9300_EEPROM_SIZE (16*1024) +-#define FIXED_CCA_THRESHOLD 15 + + #define AR9300_BASE_ADDR_4K 0xfff + #define AR9300_BASE_ADDR 0x3ff +@@ -226,7 +191,7 @@ struct ar9300_modal_eep_header { + int8_t tempSlope; + int8_t voltSlope; + /* spur channels in usual fbin coding format */ +- u8 spurChans[AR9300_EEPROM_MODAL_SPURS]; ++ u8 spurChans[AR_EEPROM_MODAL_SPURS]; + /* 3 Check if the register is per chain */ + int8_t noiseFloorThreshCh[AR9300_MAX_CHAINS]; + u8 ob[AR9300_MAX_CHAINS]; diff --git a/package/mac80211/patches/403-ath9k-fix-invalid-mac-address-handling.patch b/package/mac80211/patches/403-ath9k-fix-invalid-mac-address-handling.patch index a47552399..700854d21 100644 --- a/package/mac80211/patches/403-ath9k-fix-invalid-mac-address-handling.patch +++ b/package/mac80211/patches/403-ath9k-fix-invalid-mac-address-handling.patch @@ -8,7 +8,7 @@ #include <asm/unaligned.h> #include "hw.h" -@@ -436,8 +437,16 @@ static int ath9k_hw_init_macaddr(struct +@@ -428,8 +429,16 @@ static int ath9k_hw_init_macaddr(struct common->macaddr[2 * i] = eeval >> 8; common->macaddr[2 * i + 1] = eeval & 0xff; } diff --git a/package/mac80211/patches/409-ath9k_platform_settings.patch b/package/mac80211/patches/409-ath9k_platform_settings.patch index 7b56ee23d..b6df84f20 100644 --- a/package/mac80211/patches/409-ath9k_platform_settings.patch +++ b/package/mac80211/patches/409-ath9k_platform_settings.patch @@ -18,7 +18,7 @@ common->ops = &ath9k_common_ops; --- a/drivers/net/wireless/ath/ath9k/hw.h +++ b/drivers/net/wireless/ath/ath9k/hw.h -@@ -794,7 +794,7 @@ struct ath_hw { +@@ -787,7 +787,7 @@ struct ath_hw { u32 originalGain[22]; int initPDADC; int PDADCdelta; diff --git a/package/mac80211/patches/520-ath9k_slottime_init.patch b/package/mac80211/patches/520-ath9k_slottime_init.patch index 1eb83583b..847afeca9 100644 --- a/package/mac80211/patches/520-ath9k_slottime_init.patch +++ b/package/mac80211/patches/520-ath9k_slottime_init.patch @@ -1,8 +1,8 @@ --- a/drivers/net/wireless/ath/ath9k/hw.c +++ b/drivers/net/wireless/ath/ath9k/hw.c -@@ -417,7 +417,7 @@ static void ath9k_hw_init_defaults(struc +@@ -409,7 +409,7 @@ static void ath9k_hw_init_defaults(struc + AR_STA_ID1_CRPT_MIC_ENABLE | AR_STA_ID1_MCAST_KSRCH; - ah->beacon_interval = 100; ah->enable_32kHz_clock = DONT_USE_32KHZ; - ah->slottime = (u32) -1; + ah->slottime = 9; diff --git a/package/mac80211/patches/521-ath9k_fix_distance_setting.patch b/package/mac80211/patches/521-ath9k_fix_distance_setting.patch index 6d54945d1..fd0a5c63f 100644 --- a/package/mac80211/patches/521-ath9k_fix_distance_setting.patch +++ b/package/mac80211/patches/521-ath9k_fix_distance_setting.patch @@ -1,6 +1,6 @@ --- a/drivers/net/wireless/ath/ath9k/hw.c +++ b/drivers/net/wireless/ath/ath9k/hw.c -@@ -813,7 +813,7 @@ void ath9k_hw_init_global_settings(struc +@@ -817,7 +817,7 @@ void ath9k_hw_init_global_settings(struc if (conf->channel && conf->channel->band == IEEE80211_BAND_2GHZ) acktimeout += 64 - sifstime - ah->slottime; |