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

Commit 978f78bf authored by Vivek Natarajan's avatar Vivek Natarajan Committed by John W. Linville
Browse files

ath9k_hw: Move bt_stomp to hw from common. 



Move bt_stomp to ath9k_hw and add its support for latest chipsets.

Signed-off-by: default avatarVivek Natarajan <vnatarajan@atheros.com>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent 8178d38b

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

+66 −0
Original line number Diff line number Diff line
@@ -209,3 +209,69 @@ void ath9k_hw_btcoex_disable(struct ath_hw *ah) 
	ah->btcoex_hw.enabled = false;

}

EXPORT_SYMBOL(ath9k_hw_btcoex_disable);



static void ar9003_btcoex_bt_stomp(struct ath_hw *ah,

			 enum ath_stomp_type stomp_type)

{

	ah->bt_coex_bt_weight[0] = AR9300_BT_WGHT;

	ah->bt_coex_bt_weight[1] = AR9300_BT_WGHT;

	ah->bt_coex_bt_weight[2] = AR9300_BT_WGHT;

	ah->bt_coex_bt_weight[3] = AR9300_BT_WGHT;





	switch (stomp_type) {

	case ATH_BTCOEX_STOMP_ALL:

		ah->bt_coex_wlan_weight[0] = AR9300_STOMP_ALL_WLAN_WGHT0;

		ah->bt_coex_wlan_weight[1] = AR9300_STOMP_ALL_WLAN_WGHT1;

		break;

	case ATH_BTCOEX_STOMP_LOW:

		ah->bt_coex_wlan_weight[0] = AR9300_STOMP_LOW_WLAN_WGHT0;

		ah->bt_coex_wlan_weight[1] = AR9300_STOMP_LOW_WLAN_WGHT1;

		break;

	case ATH_BTCOEX_STOMP_NONE:

		ah->bt_coex_wlan_weight[0] = AR9300_STOMP_NONE_WLAN_WGHT0;

		ah->bt_coex_wlan_weight[1] = AR9300_STOMP_NONE_WLAN_WGHT1;

		break;



	default:

		ath_dbg(ath9k_hw_common(ah), ATH_DBG_BTCOEX,

				"Invalid Stomptype\n");

		break;

	}



	ath9k_hw_btcoex_enable(ah);

}



/*

 * Configures appropriate weight based on stomp type.

 */

void ath9k_hw_btcoex_bt_stomp(struct ath_hw *ah,

			      enum ath_stomp_type stomp_type)

{

	if (AR_SREV_9300_20_OR_LATER(ah)) {

		ar9003_btcoex_bt_stomp(ah, stomp_type);

		return;

	}



	switch (stomp_type) {

	case ATH_BTCOEX_STOMP_ALL:

		ath9k_hw_btcoex_set_weight(ah, AR_BT_COEX_WGHT,

				AR_STOMP_ALL_WLAN_WGHT);

		break;

	case ATH_BTCOEX_STOMP_LOW:

		ath9k_hw_btcoex_set_weight(ah, AR_BT_COEX_WGHT,

				AR_STOMP_LOW_WLAN_WGHT);

		break;

	case ATH_BTCOEX_STOMP_NONE:

		ath9k_hw_btcoex_set_weight(ah, AR_BT_COEX_WGHT,

				AR_STOMP_NONE_WLAN_WGHT);

		break;

	default:

		ath_dbg(ath9k_hw_common(ah), ATH_DBG_BTCOEX,

				"Invalid Stomptype\n");

		break;

	}



	ath9k_hw_btcoex_enable(ah);

}

EXPORT_SYMBOL(ath9k_hw_btcoex_bt_stomp);

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

+10 −0
Original line number Diff line number Diff line
@@ -32,6 +32,14 @@ 
#define ATH_BT_CNT_THRESHOLD	       3

#define ATH_BT_CNT_SCAN_THRESHOLD      15



/* Defines the BT AR_BT_COEX_WGHT used */

enum ath_stomp_type {

	ATH_BTCOEX_NO_STOMP,

	ATH_BTCOEX_STOMP_ALL,

	ATH_BTCOEX_STOMP_LOW,

	ATH_BTCOEX_STOMP_NONE

};



enum ath_btcoex_scheme {

	ATH_BTCOEX_CFG_NONE,

	ATH_BTCOEX_CFG_2WIRE,
@@ -57,5 +65,7 @@ void ath9k_hw_btcoex_set_weight(struct ath_hw *ah, 
				u32 wlan_weight);

void ath9k_hw_btcoex_enable(struct ath_hw *ah);

void ath9k_hw_btcoex_disable(struct ath_hw *ah);

void ath9k_hw_btcoex_bt_stomp(struct ath_hw *ah,

			      enum ath_stomp_type stomp_type);



#endif

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

+0 −31
Original line number Diff line number Diff line
@@ -158,37 +158,6 @@ int ath9k_cmn_count_streams(unsigned int chainmask, int max) 
}

EXPORT_SYMBOL(ath9k_cmn_count_streams);



/*

 * Configures appropriate weight based on stomp type.

 */

void ath9k_cmn_btcoex_bt_stomp(struct ath_common *common,

				  enum ath_stomp_type stomp_type)

{

	struct ath_hw *ah = common->ah;



	switch (stomp_type) {

	case ATH_BTCOEX_STOMP_ALL:

		ath9k_hw_btcoex_set_weight(ah, AR_BT_COEX_WGHT,

					   AR_STOMP_ALL_WLAN_WGHT);

		break;

	case ATH_BTCOEX_STOMP_LOW:

		ath9k_hw_btcoex_set_weight(ah, AR_BT_COEX_WGHT,

					   AR_STOMP_LOW_WLAN_WGHT);

		break;

	case ATH_BTCOEX_STOMP_NONE:

		ath9k_hw_btcoex_set_weight(ah, AR_BT_COEX_WGHT,

					   AR_STOMP_NONE_WLAN_WGHT);

		break;

	default:

		ath_dbg(common, ATH_DBG_BTCOEX,

			"Invalid Stomptype\n");

		break;

	}



	ath9k_hw_btcoex_enable(ah);

}

EXPORT_SYMBOL(ath9k_cmn_btcoex_bt_stomp);



void ath9k_cmn_update_txpow(struct ath_hw *ah, u16 cur_txpow,

			    u16 new_txpow, u16 *txpower)

{

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

+0 −8
Original line number Diff line number Diff line
@@ -50,14 +50,6 @@ 
#define ATH_EP_RND(x, mul) 						\

	((((x)%(mul)) >= ((mul)/2)) ? ((x) + ((mul) - 1)) / (mul) : (x)/(mul))



/* Defines the BT AR_BT_COEX_WGHT used */

enum ath_stomp_type {

	ATH_BTCOEX_NO_STOMP,

	ATH_BTCOEX_STOMP_ALL,

	ATH_BTCOEX_STOMP_LOW,

	ATH_BTCOEX_STOMP_NONE

};



int ath9k_cmn_padpos(__le16 frame_control);

int ath9k_cmn_get_hw_crypto_keytype(struct sk_buff *skb);

void ath9k_cmn_update_ichannel(struct ath9k_channel *ichan,

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

+3 −4
Original line number Diff line number Diff line
@@ -176,7 +176,6 @@ static void ath_btcoex_period_timer(unsigned long data) 
	struct ath_softc *sc = (struct ath_softc *) data;

	struct ath_hw *ah = sc->sc_ah;

	struct ath_btcoex *btcoex = &sc->btcoex;

	struct ath_common *common = ath9k_hw_common(ah);

	u32 timer_period;

	bool is_btscan;
@@ -186,7 +185,7 @@ static void ath_btcoex_period_timer(unsigned long data) 


	spin_lock_bh(&btcoex->btcoex_lock);



	ath9k_cmn_btcoex_bt_stomp(common, is_btscan ? ATH_BTCOEX_STOMP_ALL :

	ath9k_hw_btcoex_bt_stomp(ah, is_btscan ? ATH_BTCOEX_STOMP_ALL :

			      btcoex->bt_stomp_type);



	spin_unlock_bh(&btcoex->btcoex_lock);
@@ -224,9 +223,9 @@ static void ath_btcoex_no_stomp_timer(void *arg) 
	spin_lock_bh(&btcoex->btcoex_lock);



	if (btcoex->bt_stomp_type == ATH_BTCOEX_STOMP_LOW || is_btscan)

		ath9k_cmn_btcoex_bt_stomp(common, ATH_BTCOEX_STOMP_NONE);

		ath9k_hw_btcoex_bt_stomp(ah, ATH_BTCOEX_STOMP_NONE);

	 else if (btcoex->bt_stomp_type == ATH_BTCOEX_STOMP_ALL)

		ath9k_cmn_btcoex_bt_stomp(common, ATH_BTCOEX_STOMP_LOW);

		ath9k_hw_btcoex_bt_stomp(ah, ATH_BTCOEX_STOMP_LOW);



	spin_unlock_bh(&btcoex->btcoex_lock);

}