mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-08-26 10:49:33 +00:00
ath9k: add TX power per-rate tables
Add TX power per-rate tables for different MIMO modes (e.g STBC) in order to cap the maximum TX power value per-rate in the TX descriptor path. Cap TX power for self generated frames (ACK, RTS/CTS). Currently TPC is supported just by AR9003 based chips Signed-off-by: Lorenzo Bianconi <lorenzo.bianconi83@gmail.com> Signed-off-by: John W. Linville <linville@tuxdriver.com>
This commit is contained in:
Lorenzo Bianconi
John W. Linville
parent
4f3fff1486
commit
23f53dd306
4 changed files with 229 additions and 0 deletions
|
|
@ -4377,6 +4377,25 @@ static u8 ar9003_hw_eeprom_get_cck_tgt_pwr(struct ath_hw *ah,
|
|||
targetPowerArray, numPiers);
|
||||
}
|
||||
|
||||
static void ar9003_hw_selfgen_tpc_txpower(struct ath_hw *ah,
|
||||
struct ath9k_channel *chan,
|
||||
u8 *pwr_array)
|
||||
{
|
||||
u32 val;
|
||||
|
||||
/* target power values for self generated frames (ACK,RTS/CTS) */
|
||||
if (IS_CHAN_2GHZ(chan)) {
|
||||
val = SM(pwr_array[ALL_TARGET_LEGACY_1L_5L], AR_TPC_ACK) |
|
||||
SM(pwr_array[ALL_TARGET_LEGACY_1L_5L], AR_TPC_CTS) |
|
||||
SM(0x3f, AR_TPC_CHIRP) | SM(0x3f, AR_TPC_RPT);
|
||||
} else {
|
||||
val = SM(pwr_array[ALL_TARGET_LEGACY_6_24], AR_TPC_ACK) |
|
||||
SM(pwr_array[ALL_TARGET_LEGACY_6_24], AR_TPC_CTS) |
|
||||
SM(0x3f, AR_TPC_CHIRP) | SM(0x3f, AR_TPC_RPT);
|
||||
}
|
||||
REG_WRITE(ah, AR_TPC, val);
|
||||
}
|
||||
|
||||
/* Set tx power registers to array of values passed in */
|
||||
static int ar9003_hw_tx_power_regwrite(struct ath_hw *ah, u8 * pPwrArray)
|
||||
{
|
||||
|
|
@ -5312,6 +5331,7 @@ static void ath9k_hw_ar9300_set_txpower(struct ath_hw *ah,
|
|||
struct ar9300_modal_eep_header *modal_hdr;
|
||||
u8 targetPowerValT2[ar9300RateSize];
|
||||
u8 target_power_val_t2_eep[ar9300RateSize];
|
||||
u8 targetPowerValT2_tpc[ar9300RateSize];
|
||||
unsigned int i = 0, paprd_scale_factor = 0;
|
||||
u8 pwr_idx, min_pwridx = 0;
|
||||
|
||||
|
|
@ -5363,6 +5383,9 @@ static void ath9k_hw_ar9300_set_txpower(struct ath_hw *ah,
|
|||
twiceAntennaReduction,
|
||||
powerLimit);
|
||||
|
||||
memcpy(targetPowerValT2_tpc, targetPowerValT2,
|
||||
sizeof(targetPowerValT2));
|
||||
|
||||
if (ar9003_is_paprd_enabled(ah)) {
|
||||
for (i = 0; i < ar9300RateSize; i++) {
|
||||
if ((ah->paprd_ratemask & (1 << i)) &&
|
||||
|
|
@ -5396,6 +5419,30 @@ static void ath9k_hw_ar9300_set_txpower(struct ath_hw *ah,
|
|||
ar9003_hw_tx_power_regwrite(ah, targetPowerValT2);
|
||||
ar9003_hw_calibration_apply(ah, chan->channel);
|
||||
ar9003_paprd_set_txpower(ah, chan, targetPowerValT2);
|
||||
|
||||
ar9003_hw_selfgen_tpc_txpower(ah, chan, targetPowerValT2);
|
||||
|
||||
/* TPC initializations */
|
||||
if (ah->tpc_enabled) {
|
||||
u32 val;
|
||||
|
||||
ar9003_hw_init_rate_txpower(ah, targetPowerValT2_tpc, chan);
|
||||
|
||||
/* Enable TPC */
|
||||
REG_WRITE(ah, AR_PHY_PWRTX_MAX,
|
||||
AR_PHY_POWER_TX_RATE_MAX_TPC_ENABLE);
|
||||
/* Disable per chain power reduction */
|
||||
val = REG_READ(ah, AR_PHY_POWER_TX_SUB);
|
||||
if (AR_SREV_9340(ah))
|
||||
REG_WRITE(ah, AR_PHY_POWER_TX_SUB,
|
||||
val & 0xFFFFFFC0);
|
||||
else
|
||||
REG_WRITE(ah, AR_PHY_POWER_TX_SUB,
|
||||
val & 0xFFFFF000);
|
||||
} else {
|
||||
/* Disable TPC */
|
||||
REG_WRITE(ah, AR_PHY_PWRTX_MAX, 0);
|
||||
}
|
||||
}
|
||||
|
||||
static u16 ath9k_hw_ar9300_get_spur_channel(struct ath_hw *ah,
|
||||
|
|
|
|||
|
|
@ -18,6 +18,21 @@
|
|||
#include "hw.h"
|
||||
#include "ar9003_phy.h"
|
||||
|
||||
#define AR9300_OFDM_RATES 8
|
||||
#define AR9300_HT_SS_RATES 8
|
||||
#define AR9300_HT_DS_RATES 8
|
||||
#define AR9300_HT_TS_RATES 8
|
||||
|
||||
#define AR9300_11NA_OFDM_SHIFT 0
|
||||
#define AR9300_11NA_HT_SS_SHIFT 8
|
||||
#define AR9300_11NA_HT_DS_SHIFT 16
|
||||
#define AR9300_11NA_HT_TS_SHIFT 24
|
||||
|
||||
#define AR9300_11NG_OFDM_SHIFT 4
|
||||
#define AR9300_11NG_HT_SS_SHIFT 12
|
||||
#define AR9300_11NG_HT_DS_SHIFT 20
|
||||
#define AR9300_11NG_HT_TS_SHIFT 28
|
||||
|
||||
static const int firstep_table[] =
|
||||
/* level: 0 1 2 3 4 5 6 7 8 */
|
||||
{ -4, -2, 0, 2, 4, 6, 8, 10, 12 }; /* lvl 0-8, default 2 */
|
||||
|
|
@ -40,6 +55,71 @@ static const int m2ThreshLowExt_off = 127;
|
|||
static const int m1ThreshExt_off = 127;
|
||||
static const int m2ThreshExt_off = 127;
|
||||
|
||||
static const u8 ofdm2pwr[] = {
|
||||
ALL_TARGET_LEGACY_6_24,
|
||||
ALL_TARGET_LEGACY_6_24,
|
||||
ALL_TARGET_LEGACY_6_24,
|
||||
ALL_TARGET_LEGACY_6_24,
|
||||
ALL_TARGET_LEGACY_6_24,
|
||||
ALL_TARGET_LEGACY_36,
|
||||
ALL_TARGET_LEGACY_48,
|
||||
ALL_TARGET_LEGACY_54
|
||||
};
|
||||
|
||||
static const u8 mcs2pwr_ht20[] = {
|
||||
ALL_TARGET_HT20_0_8_16,
|
||||
ALL_TARGET_HT20_1_3_9_11_17_19,
|
||||
ALL_TARGET_HT20_1_3_9_11_17_19,
|
||||
ALL_TARGET_HT20_1_3_9_11_17_19,
|
||||
ALL_TARGET_HT20_4,
|
||||
ALL_TARGET_HT20_5,
|
||||
ALL_TARGET_HT20_6,
|
||||
ALL_TARGET_HT20_7,
|
||||
ALL_TARGET_HT20_0_8_16,
|
||||
ALL_TARGET_HT20_1_3_9_11_17_19,
|
||||
ALL_TARGET_HT20_1_3_9_11_17_19,
|
||||
ALL_TARGET_HT20_1_3_9_11_17_19,
|
||||
ALL_TARGET_HT20_12,
|
||||
ALL_TARGET_HT20_13,
|
||||
ALL_TARGET_HT20_14,
|
||||
ALL_TARGET_HT20_15,
|
||||
ALL_TARGET_HT20_0_8_16,
|
||||
ALL_TARGET_HT20_1_3_9_11_17_19,
|
||||
ALL_TARGET_HT20_1_3_9_11_17_19,
|
||||
ALL_TARGET_HT20_1_3_9_11_17_19,
|
||||
ALL_TARGET_HT20_20,
|
||||
ALL_TARGET_HT20_21,
|
||||
ALL_TARGET_HT20_22,
|
||||
ALL_TARGET_HT20_23
|
||||
};
|
||||
|
||||
static const u8 mcs2pwr_ht40[] = {
|
||||
ALL_TARGET_HT40_0_8_16,
|
||||
ALL_TARGET_HT40_1_3_9_11_17_19,
|
||||
ALL_TARGET_HT40_1_3_9_11_17_19,
|
||||
ALL_TARGET_HT40_1_3_9_11_17_19,
|
||||
ALL_TARGET_HT40_4,
|
||||
ALL_TARGET_HT40_5,
|
||||
ALL_TARGET_HT40_6,
|
||||
ALL_TARGET_HT40_7,
|
||||
ALL_TARGET_HT40_0_8_16,
|
||||
ALL_TARGET_HT40_1_3_9_11_17_19,
|
||||
ALL_TARGET_HT40_1_3_9_11_17_19,
|
||||
ALL_TARGET_HT40_1_3_9_11_17_19,
|
||||
ALL_TARGET_HT40_12,
|
||||
ALL_TARGET_HT40_13,
|
||||
ALL_TARGET_HT40_14,
|
||||
ALL_TARGET_HT40_15,
|
||||
ALL_TARGET_HT40_0_8_16,
|
||||
ALL_TARGET_HT40_1_3_9_11_17_19,
|
||||
ALL_TARGET_HT40_1_3_9_11_17_19,
|
||||
ALL_TARGET_HT40_1_3_9_11_17_19,
|
||||
ALL_TARGET_HT40_20,
|
||||
ALL_TARGET_HT40_21,
|
||||
ALL_TARGET_HT40_22,
|
||||
ALL_TARGET_HT40_23,
|
||||
};
|
||||
|
||||
/**
|
||||
* ar9003_hw_set_channel - set channel on single-chip device
|
||||
* @ah: atheros hardware structure
|
||||
|
|
@ -1799,6 +1879,100 @@ static void ar9003_hw_tx99_set_txpower(struct ath_hw *ah, u8 txpower)
|
|||
ATH9K_POW_SM(p_pwr_array[ALL_TARGET_HT40_14], 0));
|
||||
}
|
||||
|
||||
static void ar9003_hw_init_txpower_cck(struct ath_hw *ah, u8 *rate_array)
|
||||
{
|
||||
ah->tx_power[0] = rate_array[ALL_TARGET_LEGACY_1L_5L];
|
||||
ah->tx_power[1] = rate_array[ALL_TARGET_LEGACY_1L_5L];
|
||||
ah->tx_power[2] = min(rate_array[ALL_TARGET_LEGACY_1L_5L],
|
||||
rate_array[ALL_TARGET_LEGACY_5S]);
|
||||
ah->tx_power[3] = min(rate_array[ALL_TARGET_LEGACY_11L],
|
||||
rate_array[ALL_TARGET_LEGACY_11S]);
|
||||
}
|
||||
|
||||
static void ar9003_hw_init_txpower_ofdm(struct ath_hw *ah, u8 *rate_array,
|
||||
int offset)
|
||||
{
|
||||
int i, j;
|
||||
|
||||
for (i = offset; i < offset + AR9300_OFDM_RATES; i++) {
|
||||
/* OFDM rate to power table idx */
|
||||
j = ofdm2pwr[i - offset];
|
||||
ah->tx_power[i] = rate_array[j];
|
||||
}
|
||||
}
|
||||
|
||||
static void ar9003_hw_init_txpower_ht(struct ath_hw *ah, u8 *rate_array,
|
||||
int ss_offset, int ds_offset,
|
||||
int ts_offset, bool is_40)
|
||||
{
|
||||
int i, j, mcs_idx = 0;
|
||||
const u8 *mcs2pwr = (is_40) ? mcs2pwr_ht40 : mcs2pwr_ht20;
|
||||
|
||||
for (i = ss_offset; i < ss_offset + AR9300_HT_SS_RATES; i++) {
|
||||
j = mcs2pwr[mcs_idx];
|
||||
ah->tx_power[i] = rate_array[j];
|
||||
mcs_idx++;
|
||||
}
|
||||
|
||||
for (i = ds_offset; i < ds_offset + AR9300_HT_DS_RATES; i++) {
|
||||
j = mcs2pwr[mcs_idx];
|
||||
ah->tx_power[i] = rate_array[j];
|
||||
mcs_idx++;
|
||||
}
|
||||
|
||||
for (i = ts_offset; i < ts_offset + AR9300_HT_TS_RATES; i++) {
|
||||
j = mcs2pwr[mcs_idx];
|
||||
ah->tx_power[i] = rate_array[j];
|
||||
mcs_idx++;
|
||||
}
|
||||
}
|
||||
|
||||
static void ar9003_hw_init_txpower_stbc(struct ath_hw *ah, int ss_offset,
|
||||
int ds_offset, int ts_offset)
|
||||
{
|
||||
memcpy(&ah->tx_power_stbc[ss_offset], &ah->tx_power[ss_offset],
|
||||
AR9300_HT_SS_RATES);
|
||||
memcpy(&ah->tx_power_stbc[ds_offset], &ah->tx_power[ds_offset],
|
||||
AR9300_HT_DS_RATES);
|
||||
memcpy(&ah->tx_power_stbc[ts_offset], &ah->tx_power[ts_offset],
|
||||
AR9300_HT_TS_RATES);
|
||||
}
|
||||
|
||||
void ar9003_hw_init_rate_txpower(struct ath_hw *ah, u8 *rate_array,
|
||||
struct ath9k_channel *chan)
|
||||
{
|
||||
if (IS_CHAN_5GHZ(chan)) {
|
||||
ar9003_hw_init_txpower_ofdm(ah, rate_array,
|
||||
AR9300_11NA_OFDM_SHIFT);
|
||||
if (IS_CHAN_HT20(chan) || IS_CHAN_HT40(chan)) {
|
||||
ar9003_hw_init_txpower_ht(ah, rate_array,
|
||||
AR9300_11NA_HT_SS_SHIFT,
|
||||
AR9300_11NA_HT_DS_SHIFT,
|
||||
AR9300_11NA_HT_TS_SHIFT,
|
||||
IS_CHAN_HT40(chan));
|
||||
ar9003_hw_init_txpower_stbc(ah,
|
||||
AR9300_11NA_HT_SS_SHIFT,
|
||||
AR9300_11NA_HT_DS_SHIFT,
|
||||
AR9300_11NA_HT_TS_SHIFT);
|
||||
}
|
||||
} else {
|
||||
ar9003_hw_init_txpower_cck(ah, rate_array);
|
||||
ar9003_hw_init_txpower_ofdm(ah, rate_array,
|
||||
AR9300_11NG_OFDM_SHIFT);
|
||||
if (IS_CHAN_HT20(chan) || IS_CHAN_HT40(chan)) {
|
||||
ar9003_hw_init_txpower_ht(ah, rate_array,
|
||||
AR9300_11NG_HT_SS_SHIFT,
|
||||
AR9300_11NG_HT_DS_SHIFT,
|
||||
AR9300_11NG_HT_TS_SHIFT,
|
||||
IS_CHAN_HT40(chan));
|
||||
ar9003_hw_init_txpower_stbc(ah,
|
||||
AR9300_11NG_HT_SS_SHIFT,
|
||||
AR9300_11NG_HT_DS_SHIFT,
|
||||
AR9300_11NG_HT_TS_SHIFT);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
void ar9003_hw_attach_phy_ops(struct ath_hw *ah)
|
||||
{
|
||||
struct ath_hw_private_ops *priv_ops = ath9k_hw_private_ops(ah);
|
||||
|
|
|
|||
|
|
@ -940,6 +940,10 @@ struct ath_hw {
|
|||
const struct firmware *eeprom_blob;
|
||||
|
||||
struct ath_dynack dynack;
|
||||
|
||||
bool tpc_enabled;
|
||||
u8 tx_power[Ar5416RateSize];
|
||||
u8 tx_power_stbc[Ar5416RateSize];
|
||||
};
|
||||
|
||||
struct ath_bus_ops {
|
||||
|
|
@ -1080,6 +1084,8 @@ int ar9003_paprd_init_table(struct ath_hw *ah);
|
|||
bool ar9003_paprd_is_done(struct ath_hw *ah);
|
||||
bool ar9003_is_paprd_enabled(struct ath_hw *ah);
|
||||
void ar9003_hw_set_chain_masks(struct ath_hw *ah, u8 rx, u8 tx);
|
||||
void ar9003_hw_init_rate_txpower(struct ath_hw *ah, u8 *rate_array,
|
||||
struct ath9k_channel *chan);
|
||||
|
||||
/* Hardware family op attach helpers */
|
||||
int ar5008_hw_attach_phy_ops(struct ath_hw *ah);
|
||||
|
|
|
|||
|
|
@ -1724,6 +1724,8 @@ enum {
|
|||
#define AR_TPC_CTS_S 8
|
||||
#define AR_TPC_CHIRP 0x003f0000
|
||||
#define AR_TPC_CHIRP_S 16
|
||||
#define AR_TPC_RPT 0x3f000000
|
||||
#define AR_TPC_RPT_S 24
|
||||
|
||||
#define AR_QUIET1 0x80fc
|
||||
#define AR_QUIET1_NEXT_QUIET_S 0
|
||||
|
|
|
|||
Loading…
Reference in a new issue