Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit e82cb03f authored by Rajkumar Manoharan's avatar Rajkumar Manoharan Committed by John W. Linville
Browse files

ath9k: adjust WLAN and BT concurrent transmission 



The simulataneous transmission of both WLAN and BT might cause
increase in power levels. To avoid regulatory violation, WLAN tx
power will be adjusted according to BT power index based on avaliability
of BT scheduling messages. WLAN tx power reduction might affect its
performance. So WLAN tx power is only be lowered when the signal strength
is good enough. Otherwise concurrent tx will be disabled and WLAN uses
it default power levels. Also concurrent tx is disabled whenever WLAN is
moving to off-channel which might be used by BT.

Signed-off-by: default avatarRajkumar Manoharan <rmanohar@qca.qualcomm.com>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent 77d84837

drivers/net/wireless/ath/ath9k/ar9003_eeprom.c

+15 −3
Original line number Diff line number Diff line
@@ -18,6 +18,7 @@ 
#include "hw.h"

#include "ar9003_phy.h"

#include "ar9003_eeprom.h"

#include "ar9003_mci.h"



#define COMP_HDR_LEN 4

#define COMP_CKSUM_LEN 2
@@ -41,7 +42,6 @@ 
static int ar9003_hw_power_interpolate(int32_t x,

				       int32_t *px, int32_t *py, u_int16_t np);





static const struct ar9300_eeprom ar9300_default = {

	.eepromVersion = 2,

	.templateVersion = 2,
@@ -5037,16 +5037,28 @@ static void ar9003_hw_set_power_per_rate_table(struct ath_hw *ah, 
		case CTL_5GHT20:

		case CTL_2GHT20:

			for (i = ALL_TARGET_HT20_0_8_16;

			     i <= ALL_TARGET_HT20_23; i++)

			     i <= ALL_TARGET_HT20_23; i++) {

				pPwrArray[i] = (u8)min((u16)pPwrArray[i],

						       minCtlPower);

				if (ath9k_hw_mci_is_enabled(ah))

					pPwrArray[i] =

						(u8)min((u16)pPwrArray[i],

						ar9003_mci_get_max_txpower(ah,

							pCtlMode[ctlMode]));

			}

			break;

		case CTL_5GHT40:

		case CTL_2GHT40:

			for (i = ALL_TARGET_HT40_0_8_16;

			     i <= ALL_TARGET_HT40_23; i++)

			     i <= ALL_TARGET_HT40_23; i++) {

				pPwrArray[i] = (u8)min((u16)pPwrArray[i],

						       minCtlPower);

				if (ath9k_hw_mci_is_enabled(ah))

					pPwrArray[i] =

						(u8)min((u16)pPwrArray[i],

						ar9003_mci_get_max_txpower(ah,

							pCtlMode[ctlMode]));

			}

			break;

		default:

			break;

drivers/net/wireless/ath/ath9k/ar9003_mci.c

+27 −1
Original line number Diff line number Diff line
@@ -818,7 +818,7 @@ int ar9003_mci_reset(struct ath_hw *ah, bool en_int, bool is_2g, 
{

	struct ath_common *common = ath9k_hw_common(ah);

	struct ath9k_hw_mci *mci = &ah->btcoex_hw.mci;

	u32 regval;

	u32 regval, i;



	ath_dbg(common, MCI, "MCI Reset (full_sleep = %d, is_2g = %d)\n",

		is_full_sleep, is_2g);
@@ -868,6 +868,18 @@ int ar9003_mci_reset(struct ath_hw *ah, bool en_int, bool is_2g, 
	REG_RMW_FIELD(ah, AR_BTCOEX_CTRL2, AR_BTCOEX_CTRL2_RX_DEWEIGHT, 1);

	REG_RMW_FIELD(ah, AR_PCU_MISC, AR_PCU_BT_ANT_PREVENT_RX, 0);



	/* concurrent tx priority */

	if (mci->config & ATH_MCI_CONFIG_CONCUR_TX) {

		REG_RMW_FIELD(ah, AR_BTCOEX_CTRL2,

			      AR_BTCOEX_CTRL2_DESC_BASED_TXPWR_ENABLE, 0);

		REG_RMW_FIELD(ah, AR_BTCOEX_CTRL2,

			      AR_BTCOEX_CTRL2_TXPWR_THRESH, 0x7f);

		REG_RMW_FIELD(ah, AR_BTCOEX_CTRL,

			      AR_BTCOEX_CTRL_REDUCE_TXPWR, 0);

		for (i = 0; i < 8; i++)

			REG_WRITE(ah, AR_BTCOEX_MAX_TXPWR(i), 0x7f7f7f7f);

	}



	regval = MS(mci->config, ATH_MCI_CONFIG_CLK_DIV);

	REG_RMW_FIELD(ah, AR_MCI_TX_CTRL, AR_MCI_TX_CTRL_CLK_DIV, regval);

	REG_SET_BIT(ah, AR_BTCOEX_CTRL, AR_BTCOEX_CTRL_MCI_MODE_EN);
@@ -1426,3 +1438,17 @@ void ar9003_mci_send_wlan_channels(struct ath_hw *ah) 
	ar9003_mci_send_coex_wlan_channels(ah, true);

}

EXPORT_SYMBOL(ar9003_mci_send_wlan_channels);



u16 ar9003_mci_get_max_txpower(struct ath_hw *ah, u8 ctlmode)

{

	if (!ah->btcoex_hw.mci.concur_tx)

		goto out;



	if (ctlmode == CTL_2GHT20)

		return ATH_BTCOEX_HT20_MAX_TXPOWER;

	else if (ctlmode == CTL_2GHT40)

		return ATH_BTCOEX_HT40_MAX_TXPOWER;



out:

	return -1;

}

drivers/net/wireless/ath/ath9k/ar9003_mci.h

+5 −0
Original line number Diff line number Diff line
@@ -277,6 +277,7 @@ void ar9003_mci_get_isr(struct ath_hw *ah, enum ath9k_int *masked); 
void ar9003_mci_bt_gain_ctrl(struct ath_hw *ah);

void ar9003_mci_set_power_awake(struct ath_hw *ah);

void ar9003_mci_check_gpm_offset(struct ath_hw *ah);

u16 ar9003_mci_get_max_txpower(struct ath_hw *ah, u8 ctlmode);



#else
@@ -323,6 +324,10 @@ static inline void ar9003_mci_set_power_awake(struct ath_hw *ah) 
static inline void ar9003_mci_check_gpm_offset(struct ath_hw *ah)

{

}

static inline u16 ar9003_mci_get_max_txpower(struct ath_hw *ah, u8 ctlmode)

{

	return -1;

}

#endif /* CONFIG_ATH9K_BTCOEX_SUPPORT */



#endif

drivers/net/wireless/ath/ath9k/ath9k.h

+1 −0
Original line number Diff line number Diff line
@@ -479,6 +479,7 @@ struct ath_btcoex { 
	u32 btscan_no_stomp; /* in usec */

	u32 duty_cycle;

	u32 bt_wait_time;

	int rssi_count;

	struct ath_gen_timer *no_stomp_timer; /* Timer for no BT stomping */

	struct ath_mci_profile mci;

};

drivers/net/wireless/ath/ath9k/btcoex.h

+3 −0
Original line number Diff line number Diff line
@@ -39,6 +39,9 @@ 
#define ATH_BTCOEX_RX_WAIT_TIME       100

#define ATH_BTCOEX_STOMP_FTP_THRESH   5



#define ATH_BTCOEX_HT20_MAX_TXPOWER   0x14

#define ATH_BTCOEX_HT40_MAX_TXPOWER   0x10



#define AR9300_NUM_BT_WEIGHTS   4

#define AR9300_NUM_WLAN_WEIGHTS 4

/* Defines the BT AR_BT_COEX_WGHT used */