Commit 7ed9e062 authored by Ching-Te Ku's avatar Ching-Te Ku Committed by Kalle Valo
Browse files

rtw88: coex: update TDMA settings for different beacon interval 



Add considering for different WLAN beacon interval in coexistence
mechanism.
Because the WLAN beacon period may be not 100 ms, so it's necessary
to consider any beacon period and set timer according to the interval.

Signed-off-by: default avatarChing-Te Ku <ku920601@realtek.com>
Signed-off-by: default avatarPing-Ke Shih <pkshih@realtek.com>
Signed-off-by: default avatarKalle Valo <kvalo@codeaurora.org>
Link: https://lore.kernel.org/r/20201112031430.4846-2-pkshih@realtek.com
parent 760bb2ab

drivers/net/wireless/realtek/rtw88/coex.c

+23 −4
Original line number Diff line number Diff line
@@ -225,6 +225,8 @@ static void rtw_coex_tdma_timer_base(struct rtw_dev *rtwdev, u8 type) 
	struct rtw_coex *coex = &rtwdev->coex;

	struct rtw_coex_stat *coex_stat = &coex->stat;

	u8 para[2] = {0};

	u8 times;

	u16 tbtt_interval = coex_stat->wl_beacon_interval;



	if (coex_stat->tdma_timer_base == type)

		return;
@@ -233,10 +235,27 @@ static void rtw_coex_tdma_timer_base(struct rtw_dev *rtwdev, u8 type) 


	para[0] = COEX_H2C69_TDMA_SLOT;



	if (type == 3) /* 4-slot  */

	rtw_dbg(rtwdev, RTW_DBG_COEX, "[BTCoex], tbtt_interval = %d\n",

		tbtt_interval);



	if (type == TDMA_TIMER_TYPE_4SLOT) {

		para[1] = PARA1_H2C69_TDMA_4SLOT; /* 4-slot */

	else /* 2-slot  */

	} else if (tbtt_interval < 80 && tbtt_interval > 0) {

		times = 100 / tbtt_interval;

		if (100 % tbtt_interval != 0)

			times++;



		para[1] = FIELD_PREP(PARA1_H2C69_TBTT_TIMES, times);

	} else if (tbtt_interval >= 180) {

		times = tbtt_interval / 100;

		if (tbtt_interval % 100 <= 80)

			times--;



		para[1] = FIELD_PREP(PARA1_H2C69_TBTT_TIMES, times) |

			  FIELD_PREP(PARA1_H2C69_TBTT_DIV100, 1);

	} else {

		para[1] = PARA1_H2C69_TDMA_2SLOT;

	}



	rtw_fw_bt_wifi_control(rtwdev, para[0], &para[1]);
@@ -973,9 +992,9 @@ static void rtw_coex_tdma(struct rtw_dev *rtwdev, bool force, u32 tcase) 
	bool wl_busy = false;



	if (tcase & TDMA_4SLOT)/* 4-slot (50ms) mode */

		rtw_coex_tdma_timer_base(rtwdev, 3);

		rtw_coex_tdma_timer_base(rtwdev, TDMA_TIMER_TYPE_4SLOT);

	else

		rtw_coex_tdma_timer_base(rtwdev, 0);

		rtw_coex_tdma_timer_base(rtwdev, TDMA_TIMER_TYPE_2SLOT);



	type = (u8)(tcase & 0xff);

drivers/net/wireless/realtek/rtw88/coex.h

+5 −0
Original line number Diff line number Diff line
@@ -21,9 +21,14 @@ 
#define COEX_H2C69_TDMA_SLOT	0xb

#define PARA1_H2C69_TDMA_4SLOT	0xc1

#define PARA1_H2C69_TDMA_2SLOT	0x1

#define PARA1_H2C69_TBTT_TIMES	GENMASK(5, 0)

#define PARA1_H2C69_TBTT_DIV100	BIT(7)



#define TDMA_4SLOT	BIT(8)



#define TDMA_TIMER_TYPE_2SLOT 0

#define TDMA_TIMER_TYPE_4SLOT 3



#define COEX_RSSI_STEP		4



#define COEX_RSSI_HIGH(rssi) \

drivers/net/wireless/realtek/rtw88/mac80211.c

+7 −0
Original line number Diff line number Diff line
@@ -351,6 +351,8 @@ static void rtw_ops_bss_info_changed(struct ieee80211_hw *hw, 
{

	struct rtw_dev *rtwdev = hw->priv;

	struct rtw_vif *rtwvif = (struct rtw_vif *)vif->drv_priv;

	struct rtw_coex *coex = &rtwdev->coex;

	struct rtw_coex_stat *coex_stat = &coex->stat;

	u32 config = 0;



	mutex_lock(&rtwdev->mutex);
@@ -381,6 +383,11 @@ static void rtw_ops_bss_info_changed(struct ieee80211_hw *hw, 
		config |= PORT_SET_BSSID;

	}



	if (changed & BSS_CHANGED_BEACON_INT) {

		if (ieee80211_vif_type_p2p(vif) == NL80211_IFTYPE_STATION)

			coex_stat->wl_beacon_interval = conf->beacon_int;

	}



	if (changed & BSS_CHANGED_BEACON)

		rtw_fw_download_rsvd_page(rtwdev);

drivers/net/wireless/realtek/rtw88/main.h

+1 −0
Original line number Diff line number Diff line
@@ -1354,6 +1354,7 @@ struct rtw_coex_stat { 
	u8 bt_a2dp_bitpool;

	u8 bt_iqk_state;



	u16 wl_beacon_interval;

	u8 wl_noisy_level;

	u8 wl_fw_dbg_info[10];

	u8 wl_fw_dbg_info_pre[10];

CRA Git | Maintained and supported by SUSTech CRA and CCSE