* [PATCH 00/10] rtlwifi: btcoex: Part 2 of fixes for halbtc8821a1ant.c
@ 2017-05-11 23:24 Larry Finger
2017-05-11 23:24 ` [PATCH 01/10] rtlwifi: btcoex: 21a 1ant: set tdma and coex table when wifi is idle Larry Finger
` (9 more replies)
0 siblings, 10 replies; 12+ messages in thread
From: Larry Finger @ 2017-05-11 23:24 UTC (permalink / raw)
To: kvalo
Cc: linux-wireless, Larry Finger, Yan-Hsuan Chuang, Pkshih,
Birming Chiu, Shaofu, Steven Ting
This set of patches continue the fixes for file halbtc8821a1ant.c. Some
of these patches were previously submitted, but withdrawn.
Signed-off-by: Larry Finger <Larry.Finger@lwfinger.net>
Cc: Yan-Hsuan Chuang <yhchuang@realtek.com>
Cc: Pkshih <pkshih@realtek.com>
Cc: Birming Chiu <birming@realtek.com>
Cc: Shaofu <shaofu@realtek.com>
Cc: Steven Ting <steventing@realtek.com>
Yan-Hsuan Chuang (10):
rtlwifi: btcoex: 21a 1ant: set tdma and coex table when wifi is idle
rtlwifi: btcoex: 21a 1ant: more bt profiling when wifi receives
special packet
rtlwifi: btcoex: 21a 1ant: shorten wifi slot when connected scan
rtlwifi: btcoex: 21a 1ant: react to special packet when wifi is not
scanning
rtlwifi: btcoex: 21a 1ant: coex table and tdma settings for softap
mode
rtlwifi: btcoex: 21a 1ant: wifi slot time adjustment
rtlwifi: btcoex: 21a 1ant: normal mode for retry limit when connected
rtlwifi: btcoex: 21a 1ant: mark packet high priority when scanning
rtlwifi: btcoex: 21a 1ant: use default value when initiating coex
rtlwifi: btcoex: 21a 1ant: re-init coex after wifi leaves IPS
.../realtek/rtlwifi/btcoexist/halbtc8821a1ant.c | 180 +++++++++++++--------
1 file changed, 117 insertions(+), 63 deletions(-)
--
2.12.2
^ permalink raw reply [flat|nested] 12+ messages in thread
* [PATCH 01/10] rtlwifi: btcoex: 21a 1ant: set tdma and coex table when wifi is idle
2017-05-11 23:24 [PATCH 00/10] rtlwifi: btcoex: Part 2 of fixes for halbtc8821a1ant.c Larry Finger
@ 2017-05-11 23:24 ` Larry Finger
2017-05-18 14:08 ` [01/10] " Kalle Valo
2017-05-11 23:24 ` [PATCH 02/10] rtlwifi: btcoex: 21a 1ant: more bt profiling when wifi receives special packet Larry Finger
` (8 subsequent siblings)
9 siblings, 1 reply; 12+ messages in thread
From: Larry Finger @ 2017-05-11 23:24 UTC (permalink / raw)
To: kvalo
Cc: linux-wireless, Yan-Hsuan Chuang, Larry Finger, Pkshih,
Birming Chiu, Shaofu, Steven Ting
From: Yan-Hsuan Chuang <yhchuang@realtek.com>
When wifi is idle, bt could have more resources to transmit, so set the
tdma and coex table to achieve this.
Signed-off-by: Yan-Hsuan Chuang <yhchuang@realtek.com>
Signed-off-by: Larry Finger <Larry.Finger@lwfinger.net>
Cc: Pkshih <pkshih@realtek.com>
Cc: Birming Chiu <birming@realtek.com>
Cc: Shaofu <shaofu@realtek.com>
Cc: Steven Ting <steventing@realtek.com>
---
.../realtek/rtlwifi/btcoexist/halbtc8821a1ant.c | 34 +++++++++++++++-------
1 file changed, 23 insertions(+), 11 deletions(-)
diff --git a/drivers/net/wireless/realtek/rtlwifi/btcoexist/halbtc8821a1ant.c b/drivers/net/wireless/realtek/rtlwifi/btcoexist/halbtc8821a1ant.c
index bd5f752f153d..087e3ffff2f0 100644
--- a/drivers/net/wireless/realtek/rtlwifi/btcoexist/halbtc8821a1ant.c
+++ b/drivers/net/wireless/realtek/rtlwifi/btcoexist/halbtc8821a1ant.c
@@ -1212,8 +1212,8 @@ static void btc8821a1ant_ps_tdma(struct btc_coexist *btcoexist,
0x1a, 0, 0x58);
break;
case 32:
- btc8821a1ant_set_fw_ps_tdma(btcoexist, 0x61, 0xa,
- 0x3, 0x10, 0x0);
+ btc8821a1ant_set_fw_ps_tdma(btcoexist, 0x61, 0x35,
+ 0x3, 0x11, 0x11);
break;
case 33:
btc8821a1ant_set_fw_ps_tdma(btcoexist, 0xa3, 0x25,
@@ -1231,6 +1231,10 @@ static void btc8821a1ant_ps_tdma(struct btc_coexist *btcoexist,
btc8821a1ant_set_fw_ps_tdma(btcoexist, 0xd3, 0x12,
0x3, 0x14, 0x50);
break;
+ case 43:
+ btc8821a1ant_set_fw_ps_tdma(btcoexist, 0x51, 0x30,
+ 0x3, 0x10, 0x11);
+ break;
}
} else {
/* disable PS tdma */
@@ -1619,15 +1623,23 @@ static void btc8821a1ant_act_wifi_con_bt_acl_busy(struct btc_coexist *btcoexist,
return;
} else if (bt_link_info->a2dp_only) {
/* A2DP */
- if ((bt_rssi_state != BTC_RSSI_STATE_HIGH) &&
- (bt_rssi_state != BTC_RSSI_STATE_STAY_HIGH)) {
+ if (wifi_status == BT_8821A_1ANT_WIFI_STATUS_CONNECTED_IDLE) {
+ btc8821a1ant_ps_tdma(btcoexist, NORMAL_EXEC, true, 32);
+ btc8821a1ant_coex_table_with_type(btcoexist,
+ NORMAL_EXEC, 1);
+ coex_dm->auto_tdma_adjust = false;
+ } else if ((bt_rssi_state != BTC_RSSI_STATE_HIGH) &&
+ (bt_rssi_state == BTC_RSSI_STATE_STAY_HIGH)) {
+ btc8821a1ant_ps_tdma(btcoexist, NORMAL_EXEC, true, 14);
+ btc8821a1ant_coex_table_with_type(btcoexist,
+ NORMAL_EXEC, 1);
+ } else {
/* for low BT RSSI */
- btc8821a1ant_ps_tdma(btcoexist, NORMAL_EXEC,
- true, 11);
+ btc8821a1ant_ps_tdma(btcoexist, NORMAL_EXEC, true, 14);
+ btc8821a1ant_coex_table_with_type(btcoexist,
+ NORMAL_EXEC, 1);
coex_dm->auto_tdma_adjust = false;
}
-
- btc8821a1ant_coex_table_with_type(btcoexist, NORMAL_EXEC, 1);
} else if (bt_link_info->hid_exist && bt_link_info->a2dp_exist) {
/* HID+A2DP */
if ((bt_rssi_state == BTC_RSSI_STATE_HIGH) ||
@@ -1638,7 +1650,7 @@ static void btc8821a1ant_act_wifi_con_bt_acl_busy(struct btc_coexist *btcoexist,
} else {
/*for low BT RSSI*/
btc8821a1ant_ps_tdma(btcoexist, NORMAL_EXEC,
- true, 11);
+ true, 14);
coex_dm->auto_tdma_adjust = false;
}
@@ -1647,13 +1659,13 @@ static void btc8821a1ant_act_wifi_con_bt_acl_busy(struct btc_coexist *btcoexist,
(bt_link_info->hid_exist && bt_link_info->pan_exist)) {
/* PAN(OPP, FTP), HID+PAN(OPP, FTP) */
btc8821a1ant_ps_tdma(btcoexist, NORMAL_EXEC, true, 3);
- btc8821a1ant_coex_table_with_type(btcoexist, NORMAL_EXEC, 1);
+ btc8821a1ant_coex_table_with_type(btcoexist, NORMAL_EXEC, 6);
coex_dm->auto_tdma_adjust = false;
} else if (((bt_link_info->a2dp_exist) && (bt_link_info->pan_exist)) ||
(bt_link_info->hid_exist && bt_link_info->a2dp_exist &&
bt_link_info->pan_exist)) {
/* A2DP+PAN(OPP, FTP), HID+A2DP+PAN(OPP, FTP) */
- btc8821a1ant_ps_tdma(btcoexist, NORMAL_EXEC, true, 13);
+ btc8821a1ant_ps_tdma(btcoexist, NORMAL_EXEC, true, 43);
btc8821a1ant_coex_table_with_type(btcoexist, NORMAL_EXEC, 1);
coex_dm->auto_tdma_adjust = false;
} else {
--
2.12.2
^ permalink raw reply related [flat|nested] 12+ messages in thread
* [PATCH 02/10] rtlwifi: btcoex: 21a 1ant: more bt profiling when wifi receives special packet
2017-05-11 23:24 [PATCH 00/10] rtlwifi: btcoex: Part 2 of fixes for halbtc8821a1ant.c Larry Finger
2017-05-11 23:24 ` [PATCH 01/10] rtlwifi: btcoex: 21a 1ant: set tdma and coex table when wifi is idle Larry Finger
@ 2017-05-11 23:24 ` Larry Finger
2017-05-11 23:24 ` [PATCH 03/10] rtlwifi: btcoex: 21a 1ant: shorten wifi slot when connected scan Larry Finger
` (7 subsequent siblings)
9 siblings, 0 replies; 12+ messages in thread
From: Larry Finger @ 2017-05-11 23:24 UTC (permalink / raw)
To: kvalo
Cc: linux-wireless, Yan-Hsuan Chuang, Larry Finger, Pkshih,
Birming Chiu, Shaofu, Steven Ting
From: Yan-Hsuan Chuang <yhchuang@realtek.com>
Consider bt profiling is sco or hid to set coex table and tdma.
Signed-off-by: Yan-Hsuan Chuang <yhchuang@realtek.com>
Signed-off-by: Larry Finger <Larry.Finger@lwfinger.net>
Cc: Pkshih <pkshih@realtek.com>
Cc: Birming Chiu <birming@realtek.com>
Cc: Shaofu <shaofu@realtek.com>
Cc: Steven Ting <steventing@realtek.com>
---
.../realtek/rtlwifi/btcoexist/halbtc8821a1ant.c | 31 ++++++++++------------
1 file changed, 14 insertions(+), 17 deletions(-)
diff --git a/drivers/net/wireless/realtek/rtlwifi/btcoexist/halbtc8821a1ant.c b/drivers/net/wireless/realtek/rtlwifi/btcoexist/halbtc8821a1ant.c
index 087e3ffff2f0..55cde3d85abd 100644
--- a/drivers/net/wireless/realtek/rtlwifi/btcoexist/halbtc8821a1ant.c
+++ b/drivers/net/wireless/realtek/rtlwifi/btcoexist/halbtc8821a1ant.c
@@ -1753,29 +1753,26 @@ void btc8821a1ant_action_wifi_connected_scan(struct btc_coexist *btcoexist)
static void btc8821a1ant_act_wifi_conn_sp_pkt(struct btc_coexist *btcoexist)
{
struct btc_bt_link_info *bt_link_info = &btcoexist->bt_link_info;
- bool hs_connecting = false;
-
- btcoexist->btc_get(btcoexist, BTC_GET_BL_HS_CONNECTING, &hs_connecting);
btc8821a1ant_power_save_state(btcoexist, BTC_PS_WIFI_NATIVE,
0x0, 0x0);
/* tdma and coex table */
- if (coex_dm->bt_status == BT_8821A_1ANT_BT_STATUS_ACL_BUSY) {
- if (bt_link_info->a2dp_exist && bt_link_info->pan_exist) {
- btc8821a1ant_ps_tdma(btcoexist, NORMAL_EXEC,
- true, 22);
- btc8821a1ant_coex_table_with_type(btcoexist,
- NORMAL_EXEC, 1);
- } else {
- btc8821a1ant_ps_tdma(btcoexist, NORMAL_EXEC,
- true, 20);
- btc8821a1ant_coex_table_with_type(btcoexist,
- NORMAL_EXEC, 1);
- }
- } else {
- btc8821a1ant_ps_tdma(btcoexist, NORMAL_EXEC, true, 20);
+ if ((bt_link_info->sco_exist) || (bt_link_info->hid_exist) ||
+ (bt_link_info->a2dp_exist)) {
+ btc8821a1ant_ps_tdma(btcoexist, NORMAL_EXEC, true, 32);
+ btc8821a1ant_coex_table_with_type(btcoexist, NORMAL_EXEC, 4);
+ }
+
+ if ((bt_link_info->hid_exist) && (bt_link_info->a2dp_exist)) {
+ btc8821a1ant_ps_tdma(btcoexist, NORMAL_EXEC, true, 14);
btc8821a1ant_coex_table_with_type(btcoexist, NORMAL_EXEC, 1);
+ } else if (bt_link_info->pan_exist) {
+ btc8821a1ant_ps_tdma(btcoexist, NORMAL_EXEC, true, 20);
+ btc8821a1ant_coex_table_with_type(btcoexist, NORMAL_EXEC, 4);
+ } else {
+ btc8821a1ant_ps_tdma(btcoexist, NORMAL_EXEC, false, 8);
+ btc8821a1ant_coex_table_with_type(btcoexist, NORMAL_EXEC, 2);
}
}
--
2.12.2
^ permalink raw reply related [flat|nested] 12+ messages in thread
* [PATCH 03/10] rtlwifi: btcoex: 21a 1ant: shorten wifi slot when connected scan
2017-05-11 23:24 [PATCH 00/10] rtlwifi: btcoex: Part 2 of fixes for halbtc8821a1ant.c Larry Finger
2017-05-11 23:24 ` [PATCH 01/10] rtlwifi: btcoex: 21a 1ant: set tdma and coex table when wifi is idle Larry Finger
2017-05-11 23:24 ` [PATCH 02/10] rtlwifi: btcoex: 21a 1ant: more bt profiling when wifi receives special packet Larry Finger
@ 2017-05-11 23:24 ` Larry Finger
2017-05-11 23:24 ` [PATCH 04/10] rtlwifi: btcoex: 21a 1ant: react to special packet when wifi is not scanning Larry Finger
` (6 subsequent siblings)
9 siblings, 0 replies; 12+ messages in thread
From: Larry Finger @ 2017-05-11 23:24 UTC (permalink / raw)
To: kvalo
Cc: linux-wireless, Yan-Hsuan Chuang, Larry Finger, Pkshih,
Birming Chiu, Shaofu, Steven Ting
From: Yan-Hsuan Chuang <yhchuang@realtek.com>
If the wifi is scanning when connected, it is better if the slot
is shortened and the priority is increased. Otherwise bt a2dp may have
low quality.
Signed-off-by: Yan-Hsuan Chuang <yhchuang@realtek.com>
Signed-off-by: Larry Finger <Larry.Finger@lwfinger.net>
Cc: Pkshih <pkshih@realtek.com>
Cc: Birming Chiu <birming@realtek.com>
Cc: Shaofu <shaofu@realtek.com>
Cc: Steven Ting <steventing@realtek.com>
---
.../realtek/rtlwifi/btcoexist/halbtc8821a1ant.c | 22 +++++++++++-----------
1 file changed, 11 insertions(+), 11 deletions(-)
diff --git a/drivers/net/wireless/realtek/rtlwifi/btcoexist/halbtc8821a1ant.c b/drivers/net/wireless/realtek/rtlwifi/btcoexist/halbtc8821a1ant.c
index 55cde3d85abd..13d8ac23b17a 100644
--- a/drivers/net/wireless/realtek/rtlwifi/btcoexist/halbtc8821a1ant.c
+++ b/drivers/net/wireless/realtek/rtlwifi/btcoexist/halbtc8821a1ant.c
@@ -1730,23 +1730,23 @@ void btc8821a1ant_action_wifi_connected_scan(struct btc_coexist *btcoexist)
/* tdma and coex table */
if (BT_8821A_1ANT_BT_STATUS_ACL_BUSY == coex_dm->bt_status) {
- if (bt_link_info->a2dp_exist && bt_link_info->pan_exist) {
- btc8821a1ant_ps_tdma(btcoexist, NORMAL_EXEC, true, 22);
+ if (bt_link_info->a2dp_exist) {
+ btc8821a1ant_ps_tdma(btcoexist, NORMAL_EXEC, true, 14);
btc8821a1ant_coex_table_with_type(btcoexist,
NORMAL_EXEC, 1);
} else {
- btc8821a1ant_ps_tdma(btcoexist, NORMAL_EXEC, true, 20);
- btc8821a1ant_coex_table_with_type(btcoexist, NORMAL_EXEC, 1);
- }
- } else if ((BT_8821A_1ANT_BT_STATUS_SCO_BUSY ==
- coex_dm->bt_status) ||
- (BT_8821A_1ANT_BT_STATUS_ACL_SCO_BUSY ==
- coex_dm->bt_status)) {
+ btc8821a1ant_ps_tdma(btcoexist, NORMAL_EXEC, true, 20);
+ btc8821a1ant_coex_table_with_type(btcoexist,
+ NORMAL_EXEC, 4);
+ }
+ } else if ((coex_dm->bt_status == BT_8821A_1ANT_BT_STATUS_SCO_BUSY) ||
+ (coex_dm->bt_status ==
+ BT_8821A_1ANT_BT_STATUS_ACL_SCO_BUSY)) {
btc8821a1ant_act_bt_sco_hid_only_busy(btcoexist,
BT_8821A_1ANT_WIFI_STATUS_CONNECTED_SCAN);
} else {
- btc8821a1ant_ps_tdma(btcoexist, NORMAL_EXEC, true, 20);
- btc8821a1ant_coex_table_with_type(btcoexist, NORMAL_EXEC, 1);
+ btc8821a1ant_ps_tdma(btcoexist, NORMAL_EXEC, false, 8);
+ btc8821a1ant_coex_table_with_type(btcoexist, NORMAL_EXEC, 2);
}
}
--
2.12.2
^ permalink raw reply related [flat|nested] 12+ messages in thread
* [PATCH 04/10] rtlwifi: btcoex: 21a 1ant: react to special packet when wifi is not scanning
2017-05-11 23:24 [PATCH 00/10] rtlwifi: btcoex: Part 2 of fixes for halbtc8821a1ant.c Larry Finger
` (2 preceding siblings ...)
2017-05-11 23:24 ` [PATCH 03/10] rtlwifi: btcoex: 21a 1ant: shorten wifi slot when connected scan Larry Finger
@ 2017-05-11 23:24 ` Larry Finger
2017-05-11 23:24 ` [PATCH 05/10] rtlwifi: btcoex: 21a 1ant: coex table and tdma settings for softap mode Larry Finger
` (5 subsequent siblings)
9 siblings, 0 replies; 12+ messages in thread
From: Larry Finger @ 2017-05-11 23:24 UTC (permalink / raw)
To: kvalo
Cc: linux-wireless, Yan-Hsuan Chuang, Larry Finger, Pkshih,
Birming Chiu, Shaofu, Steven Ting
From: Yan-Hsuan Chuang <yhchuang@realtek.com>
If wifi is not scanning, there may have some special and important
packets such as DHCP or EAPOL or ARP packets. Set tdma and coex table to
take care of them.
Signed-off-by: Yan-Hsuan Chuang <yhchuang@realtek.com>
Signed-off-by: Larry Finger <Larry.Finger@lwfinger.net>
Cc: Pkshih <pkshih@realtek.com>
Cc: Birming Chiu <birming@realtek.com>
Cc: Shaofu <shaofu@realtek.com>
Cc: Steven Ting <steventing@realtek.com>
---
drivers/net/wireless/realtek/rtlwifi/btcoexist/halbtc8821a1ant.c | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)
diff --git a/drivers/net/wireless/realtek/rtlwifi/btcoexist/halbtc8821a1ant.c b/drivers/net/wireless/realtek/rtlwifi/btcoexist/halbtc8821a1ant.c
index 13d8ac23b17a..f5a4640577c2 100644
--- a/drivers/net/wireless/realtek/rtlwifi/btcoexist/halbtc8821a1ant.c
+++ b/drivers/net/wireless/realtek/rtlwifi/btcoexist/halbtc8821a1ant.c
@@ -1799,7 +1799,11 @@ static void btc8821a1ant_action_wifi_connected(struct btc_coexist *btcoexist)
btcoexist->btc_get(btcoexist, BTC_GET_BL_WIFI_LINK, &link);
btcoexist->btc_get(btcoexist, BTC_GET_BL_WIFI_ROAM, &roam);
if (scan || link || roam) {
- btc8821a1ant_action_wifi_connected_scan(btcoexist);
+ if (scan)
+ btc8821a1ant_action_wifi_connected_scan(btcoexist);
+ else
+ btc8821a1ant_act_wifi_conn_sp_pkt(btcoexist);
+
RT_TRACE(rtlpriv, COMP_BT_COEXIST, DBG_LOUD,
"[BTCoex], CoexForWifiConnect(), return for wifi is under scan<===\n");
return;
--
2.12.2
^ permalink raw reply related [flat|nested] 12+ messages in thread
* [PATCH 05/10] rtlwifi: btcoex: 21a 1ant: coex table and tdma settings for softap mode
2017-05-11 23:24 [PATCH 00/10] rtlwifi: btcoex: Part 2 of fixes for halbtc8821a1ant.c Larry Finger
` (3 preceding siblings ...)
2017-05-11 23:24 ` [PATCH 04/10] rtlwifi: btcoex: 21a 1ant: react to special packet when wifi is not scanning Larry Finger
@ 2017-05-11 23:24 ` Larry Finger
2017-05-11 23:24 ` [PATCH 06/10] rtlwifi: btcoex: 21a 1ant: wifi slot time adjustment Larry Finger
` (4 subsequent siblings)
9 siblings, 0 replies; 12+ messages in thread
From: Larry Finger @ 2017-05-11 23:24 UTC (permalink / raw)
To: kvalo
Cc: linux-wireless, Yan-Hsuan Chuang, Larry Finger, Pkshih,
Birming Chiu, Shaofu, Steven Ting
From: Yan-Hsuan Chuang <yhchuang@realtek.com>
Monitor if the wifi is softap mode, and set the tdma and coex table
accordingly.
Signed-off-by: Yan-Hsuan Chuang <yhchuang@realtek.com>
Signed-off-by: Larry Finger <Larry.Finger@lwfinger.net>
Cc: Pkshih <pkshih@realtek.com>
Cc: Birming Chiu <birming@realtek.com>
Cc: Shaofu <shaofu@realtek.com>
Cc: Steven Ting <steventing@realtek.com>
---
.../realtek/rtlwifi/btcoexist/halbtc8821a1ant.c | 25 +++++++++++++++-------
1 file changed, 17 insertions(+), 8 deletions(-)
diff --git a/drivers/net/wireless/realtek/rtlwifi/btcoexist/halbtc8821a1ant.c b/drivers/net/wireless/realtek/rtlwifi/btcoexist/halbtc8821a1ant.c
index f5a4640577c2..6a434334a418 100644
--- a/drivers/net/wireless/realtek/rtlwifi/btcoexist/halbtc8821a1ant.c
+++ b/drivers/net/wireless/realtek/rtlwifi/btcoexist/halbtc8821a1ant.c
@@ -1782,6 +1782,7 @@ static void btc8821a1ant_action_wifi_connected(struct btc_coexist *btcoexist)
bool wifi_busy = false;
bool scan = false, link = false, roam = false;
bool under_4way = false;
+ bool ap_enable = false;
RT_TRACE(rtlpriv, COMP_BT_COEXIST, DBG_LOUD,
"[BTCoex], CoexForWifiConnect()===>\n");
@@ -1810,17 +1811,26 @@ static void btc8821a1ant_action_wifi_connected(struct btc_coexist *btcoexist)
}
/* power save state*/
+ btcoexist->btc_get(btcoexist, BTC_GET_BL_WIFI_AP_MODE_ENABLE,
+ &ap_enable);
+ btcoexist->btc_get(btcoexist, BTC_GET_BL_WIFI_BUSY, &wifi_busy);
if (BT_8821A_1ANT_BT_STATUS_ACL_BUSY ==
- coex_dm->bt_status && !btcoexist->bt_link_info.hid_only)
- btc8821a1ant_power_save_state(btcoexist,
- BTC_PS_LPS_ON, 0x50, 0x4);
- else
+ coex_dm->bt_status && !ap_enable &&
+ !btcoexist->bt_link_info.hid_only) {
+ if (!wifi_busy && btcoexist->bt_link_info.a2dp_only)
+ /* A2DP */
+ btc8821a1ant_power_save_state(btcoexist,
+ BTC_PS_WIFI_NATIVE, 0x0, 0x0);
+ else
+ btc8821a1ant_power_save_state(btcoexist, BTC_PS_LPS_ON,
+ 0x50, 0x4);
+ } else {
btc8821a1ant_power_save_state(btcoexist,
BTC_PS_WIFI_NATIVE,
0x0, 0x0);
+ }
/* tdma and coex table */
- btcoexist->btc_get(btcoexist, BTC_GET_BL_WIFI_BUSY, &wifi_busy);
if (!wifi_busy) {
if (BT_8821A_1ANT_BT_STATUS_ACL_BUSY == coex_dm->bt_status) {
btc8821a1ant_act_wifi_con_bt_acl_busy(btcoexist,
@@ -1832,8 +1842,7 @@ static void btc8821a1ant_action_wifi_connected(struct btc_coexist *btcoexist)
btc8821a1ant_act_bt_sco_hid_only_busy(btcoexist,
BT_8821A_1ANT_WIFI_STATUS_CONNECTED_IDLE);
} else {
- btc8821a1ant_ps_tdma(btcoexist, NORMAL_EXEC,
- true, 5);
+ btc8821a1ant_ps_tdma(btcoexist, NORMAL_EXEC, false, 8);
btc8821a1ant_coex_table_with_type(btcoexist,
NORMAL_EXEC, 2);
}
@@ -1848,7 +1857,7 @@ static void btc8821a1ant_action_wifi_connected(struct btc_coexist *btcoexist)
btc8821a1ant_act_bt_sco_hid_only_busy(btcoexist,
BT_8821A_1ANT_WIFI_STATUS_CONNECTED_BUSY);
} else {
- btc8821a1ant_ps_tdma(btcoexist, NORMAL_EXEC, true, 5);
+ btc8821a1ant_ps_tdma(btcoexist, NORMAL_EXEC, false, 8);
btc8821a1ant_coex_table_with_type(btcoexist,
NORMAL_EXEC, 2);
}
--
2.12.2
^ permalink raw reply related [flat|nested] 12+ messages in thread
* [PATCH 06/10] rtlwifi: btcoex: 21a 1ant: wifi slot time adjustment
2017-05-11 23:24 [PATCH 00/10] rtlwifi: btcoex: Part 2 of fixes for halbtc8821a1ant.c Larry Finger
` (4 preceding siblings ...)
2017-05-11 23:24 ` [PATCH 05/10] rtlwifi: btcoex: 21a 1ant: coex table and tdma settings for softap mode Larry Finger
@ 2017-05-11 23:24 ` Larry Finger
2017-05-11 23:24 ` [PATCH 07/10] rtlwifi: btcoex: 21a 1ant: normal mode for retry limit when connected Larry Finger
` (3 subsequent siblings)
9 siblings, 0 replies; 12+ messages in thread
From: Larry Finger @ 2017-05-11 23:24 UTC (permalink / raw)
To: kvalo
Cc: linux-wireless, Yan-Hsuan Chuang, Larry Finger, Pkshih,
Birming Chiu, Shaofu, Steven Ting
From: Yan-Hsuan Chuang <yhchuang@realtek.com>
Adjust wifi slot time to tune the performance of coexistence
Signed-off-by: Yan-Hsuan Chuang <yhchuang@realtek.com>
Signed-off-by: Larry Finger <Larry.Finger@lwfinger.net>
Cc: Pkshih <pkshih@realtek.com>
Cc: Birming Chiu <birming@realtek.com>
Cc: Shaofu <shaofu@realtek.com>
Cc: Steven Ting <steventing@realtek.com>
---
.../realtek/rtlwifi/btcoexist/halbtc8821a1ant.c | 38 ++++++++++++++++------
1 file changed, 28 insertions(+), 10 deletions(-)
diff --git a/drivers/net/wireless/realtek/rtlwifi/btcoexist/halbtc8821a1ant.c b/drivers/net/wireless/realtek/rtlwifi/btcoexist/halbtc8821a1ant.c
index 6a434334a418..834cf08103b2 100644
--- a/drivers/net/wireless/realtek/rtlwifi/btcoexist/halbtc8821a1ant.c
+++ b/drivers/net/wireless/realtek/rtlwifi/btcoexist/halbtc8821a1ant.c
@@ -1107,8 +1107,8 @@ static void btc8821a1ant_ps_tdma(struct btc_coexist *btcoexist,
0x3, 0x11, 0x10);
break;
case 6:
- btc8821a1ant_set_fw_ps_tdma(btcoexist, 0x13, 0xa,
- 0x3, 0x0, 0x0);
+ btc8821a1ant_set_fw_ps_tdma(btcoexist, 0x61, 0x20,
+ 0x3, 0x11, 0x13);
break;
case 7:
btc8821a1ant_set_fw_ps_tdma(btcoexist, 0x13, 0xc,
@@ -1128,8 +1128,8 @@ static void btc8821a1ant_ps_tdma(struct btc_coexist *btcoexist,
0xa, 0x0, 0x40);
break;
case 11:
- btc8821a1ant_set_fw_ps_tdma(btcoexist, 0x51, 0x14,
- 0x03, 0x10, 0x10);
+ btc8821a1ant_set_fw_ps_tdma(btcoexist, 0x51, 0x15,
+ 0x03, 0x10, 0x50);
rssi_adjust_val = 20;
break;
case 12:
@@ -1137,8 +1137,8 @@ static void btc8821a1ant_ps_tdma(struct btc_coexist *btcoexist,
0x0a, 0x0, 0x50);
break;
case 13:
- btc8821a1ant_set_fw_ps_tdma(btcoexist, 0x51, 0x18,
- 0x18, 0x0, 0x10);
+ btc8821a1ant_set_fw_ps_tdma(btcoexist, 0x51, 0x12,
+ 0x12, 0x0, 0x50);
break;
case 14:
btc8821a1ant_set_fw_ps_tdma(btcoexist, 0x51, 0x1e,
@@ -1163,8 +1163,8 @@ static void btc8821a1ant_ps_tdma(struct btc_coexist *btcoexist,
0x03, 0x11, 0x10);
break;
case 21:
- btc8821a1ant_set_fw_ps_tdma(btcoexist, 0x61, 0x15,
- 0x03, 0x11, 0x10);
+ btc8821a1ant_set_fw_ps_tdma(btcoexist, 0x61, 0x25,
+ 0x03, 0x11, 0x11);
break;
case 22:
btc8821a1ant_set_fw_ps_tdma(btcoexist, 0x61, 0x25,
@@ -1204,8 +1204,8 @@ static void btc8821a1ant_ps_tdma(struct btc_coexist *btcoexist,
0x1a, 0x1, 0x10);
break;
case 30:
- btc8821a1ant_set_fw_ps_tdma(btcoexist, 0x51, 0x14,
- 0x3, 0x10, 0x50);
+ btc8821a1ant_set_fw_ps_tdma(btcoexist, 0x51, 0x30,
+ 0x3, 0x10, 0x10);
break;
case 31:
btc8821a1ant_set_fw_ps_tdma(btcoexist, 0xd3, 0x1a,
@@ -1231,6 +1231,24 @@ static void btc8821a1ant_ps_tdma(struct btc_coexist *btcoexist,
btc8821a1ant_set_fw_ps_tdma(btcoexist, 0xd3, 0x12,
0x3, 0x14, 0x50);
break;
+ case 40:
+ /* SoftAP only with no sta associated, BT disable, TDMA
+ * mode for power saving
+ *
+ * here softap mode screen off will cost 70-80mA for
+ * phone
+ */
+ btc8821a1ant_set_fw_ps_tdma(btcoexist, 0x23, 0x18,
+ 0x00, 0x10, 0x24);
+ break;
+ case 41:
+ btc8821a1ant_set_fw_ps_tdma(btcoexist, 0x51, 0x15,
+ 0x3, 0x11, 0x11);
+ break;
+ case 42:
+ btc8821a1ant_set_fw_ps_tdma(btcoexist, 0x51, 0x20,
+ 0x3, 0x11, 0x11);
+ break;
case 43:
btc8821a1ant_set_fw_ps_tdma(btcoexist, 0x51, 0x30,
0x3, 0x10, 0x11);
--
2.12.2
^ permalink raw reply related [flat|nested] 12+ messages in thread
* [PATCH 07/10] rtlwifi: btcoex: 21a 1ant: normal mode for retry limit when connected
2017-05-11 23:24 [PATCH 00/10] rtlwifi: btcoex: Part 2 of fixes for halbtc8821a1ant.c Larry Finger
` (5 preceding siblings ...)
2017-05-11 23:24 ` [PATCH 06/10] rtlwifi: btcoex: 21a 1ant: wifi slot time adjustment Larry Finger
@ 2017-05-11 23:24 ` Larry Finger
2017-05-11 23:24 ` [PATCH 08/10] rtlwifi: btcoex: 21a 1ant: mark packet high priority when scanning Larry Finger
` (2 subsequent siblings)
9 siblings, 0 replies; 12+ messages in thread
From: Larry Finger @ 2017-05-11 23:24 UTC (permalink / raw)
To: kvalo
Cc: linux-wireless, Yan-Hsuan Chuang, Larry Finger, Pkshih,
Birming Chiu, Shaofu, Steven Ting
From: Yan-Hsuan Chuang <yhchuang@realtek.com>
When wifi is connected, use normal mode to set retry limit.
Signed-off-by: Yan-Hsuan Chuang <yhchuang@realtek.com>
Signed-off-by: Larry Finger <Larry.Finger@lwfinger.net>
Cc: Pkshih <pkshih@realtek.com>
Cc: Birming Chiu <birming@realtek.com>
Cc: Shaofu <shaofu@realtek.com>
Cc: Steven Ting <steventing@realtek.com>
---
drivers/net/wireless/realtek/rtlwifi/btcoexist/halbtc8821a1ant.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/drivers/net/wireless/realtek/rtlwifi/btcoexist/halbtc8821a1ant.c b/drivers/net/wireless/realtek/rtlwifi/btcoexist/halbtc8821a1ant.c
index 834cf08103b2..3d77d6bb48b1 100644
--- a/drivers/net/wireless/realtek/rtlwifi/btcoexist/halbtc8821a1ant.c
+++ b/drivers/net/wireless/realtek/rtlwifi/btcoexist/halbtc8821a1ant.c
@@ -2028,11 +2028,11 @@ static void btc8821a1ant_run_coexist_mechanism(struct btc_coexist *btcoexist)
(wifi_rssi_state == BTC_RSSI_STATE_STAY_HIGH)) {
btc8821a1ant_limited_tx(btcoexist,
NORMAL_EXEC, 1, 1,
- 1, 1);
+ 0, 1);
} else {
btc8821a1ant_limited_tx(btcoexist,
NORMAL_EXEC, 1, 1,
- 1, 1);
+ 0, 1);
}
} else {
btc8821a1ant_limited_tx(btcoexist, NORMAL_EXEC,
--
2.12.2
^ permalink raw reply related [flat|nested] 12+ messages in thread
* [PATCH 08/10] rtlwifi: btcoex: 21a 1ant: mark packet high priority when scanning
2017-05-11 23:24 [PATCH 00/10] rtlwifi: btcoex: Part 2 of fixes for halbtc8821a1ant.c Larry Finger
` (6 preceding siblings ...)
2017-05-11 23:24 ` [PATCH 07/10] rtlwifi: btcoex: 21a 1ant: normal mode for retry limit when connected Larry Finger
@ 2017-05-11 23:24 ` Larry Finger
2017-05-11 23:24 ` [PATCH 09/10] rtlwifi: btcoex: 21a 1ant: use default value when initiating coex Larry Finger
2017-05-11 23:24 ` [PATCH 10/10] rtlwifi: btcoex: 21a 1ant: re-init coex after wifi leaves IPS Larry Finger
9 siblings, 0 replies; 12+ messages in thread
From: Larry Finger @ 2017-05-11 23:24 UTC (permalink / raw)
To: kvalo
Cc: linux-wireless, Yan-Hsuan Chuang, Larry Finger, Pkshih,
Birming Chiu, Shaofu, Steven Ting
From: Yan-Hsuan Chuang <yhchuang@realtek.com>
When the wifi notifies the coexistence it is going to scan, set the coex
table to avoid issues when the scan result is empty.
Signed-off-by: Yan-Hsuan Chuang <yhchuang@realtek.com>
Signed-off-by: Larry Finger <Larry.Finger@lwfinger.net>
Cc: Pkshih <pkshih@realtek.com>
Cc: Birming Chiu <birming@realtek.com>
Cc: Shaofu <shaofu@realtek.com>
Cc: Steven Ting <steventing@realtek.com>
---
.../wireless/realtek/rtlwifi/btcoexist/halbtc8821a1ant.c | 13 +++++++++++++
1 file changed, 13 insertions(+)
diff --git a/drivers/net/wireless/realtek/rtlwifi/btcoexist/halbtc8821a1ant.c b/drivers/net/wireless/realtek/rtlwifi/btcoexist/halbtc8821a1ant.c
index 3d77d6bb48b1..13063f61e1f4 100644
--- a/drivers/net/wireless/realtek/rtlwifi/btcoexist/halbtc8821a1ant.c
+++ b/drivers/net/wireless/realtek/rtlwifi/btcoexist/halbtc8821a1ant.c
@@ -2524,6 +2524,19 @@ void ex_btc8821a1ant_scan_notify(struct btc_coexist *btcoexist, u8 type)
return;
}
+ if (type == BTC_SCAN_START) {
+ coex_sta->wifi_is_high_pri_task = true;
+ RT_TRACE(rtlpriv, COMP_BT_COEXIST, DBG_LOUD,
+ "[BTCoex], SCAN START notify\n");
+
+ /* Force antenna setup for no scan result issue */
+ btc8821a1ant_ps_tdma(btcoexist, FORCE_EXEC, false, 8);
+ } else {
+ coex_sta->wifi_is_high_pri_task = false;
+ RT_TRACE(rtlpriv, COMP_BT_COEXIST, DBG_LOUD,
+ "[BTCoex], SCAN FINISH notify\n");
+ }
+
if (coex_sta->bt_disabled)
return;
--
2.12.2
^ permalink raw reply related [flat|nested] 12+ messages in thread
* [PATCH 09/10] rtlwifi: btcoex: 21a 1ant: use default value when initiating coex
2017-05-11 23:24 [PATCH 00/10] rtlwifi: btcoex: Part 2 of fixes for halbtc8821a1ant.c Larry Finger
` (7 preceding siblings ...)
2017-05-11 23:24 ` [PATCH 08/10] rtlwifi: btcoex: 21a 1ant: mark packet high priority when scanning Larry Finger
@ 2017-05-11 23:24 ` Larry Finger
2017-05-11 23:24 ` [PATCH 10/10] rtlwifi: btcoex: 21a 1ant: re-init coex after wifi leaves IPS Larry Finger
9 siblings, 0 replies; 12+ messages in thread
From: Larry Finger @ 2017-05-11 23:24 UTC (permalink / raw)
To: kvalo
Cc: linux-wireless, Yan-Hsuan Chuang, Larry Finger, Pkshih,
Birming Chiu, Shaofu, Steven Ting
From: Yan-Hsuan Chuang <yhchuang@realtek.com>
For newer coex mechanism, it is not necessary to set a critical value to
avoid the power on instability, just use default value for PTA.
Signed-off-by: Yan-Hsuan Chuang <yhchuang@realtek.com>
Signed-off-by: Larry Finger <Larry.Finger@lwfinger.net>
Cc: Pkshih <pkshih@realtek.com>
Cc: Birming Chiu <birming@realtek.com>
Cc: Shaofu <shaofu@realtek.com>
Cc: Steven Ting <steventing@realtek.com>
---
drivers/net/wireless/realtek/rtlwifi/btcoexist/halbtc8821a1ant.c | 1 -
1 file changed, 1 deletion(-)
diff --git a/drivers/net/wireless/realtek/rtlwifi/btcoexist/halbtc8821a1ant.c b/drivers/net/wireless/realtek/rtlwifi/btcoexist/halbtc8821a1ant.c
index 13063f61e1f4..ab6530cfb653 100644
--- a/drivers/net/wireless/realtek/rtlwifi/btcoexist/halbtc8821a1ant.c
+++ b/drivers/net/wireless/realtek/rtlwifi/btcoexist/halbtc8821a1ant.c
@@ -2096,7 +2096,6 @@ static void btc8821a1ant_init_coex_dm(struct btc_coexist *btcoexist)
*/
btc8821a1ant_sw_mechanism(btcoexist, false);
- btc8821a1ant_ps_tdma(btcoexist, FORCE_EXEC, false, 8);
btc8821a1ant_coex_table_with_type(btcoexist, FORCE_EXEC, 0);
}
--
2.12.2
^ permalink raw reply related [flat|nested] 12+ messages in thread
* [PATCH 10/10] rtlwifi: btcoex: 21a 1ant: re-init coex after wifi leaves IPS
2017-05-11 23:24 [PATCH 00/10] rtlwifi: btcoex: Part 2 of fixes for halbtc8821a1ant.c Larry Finger
` (8 preceding siblings ...)
2017-05-11 23:24 ` [PATCH 09/10] rtlwifi: btcoex: 21a 1ant: use default value when initiating coex Larry Finger
@ 2017-05-11 23:24 ` Larry Finger
9 siblings, 0 replies; 12+ messages in thread
From: Larry Finger @ 2017-05-11 23:24 UTC (permalink / raw)
To: kvalo
Cc: linux-wireless, Yan-Hsuan Chuang, Larry Finger, Pkshih,
Birming Chiu, Shaofu, Steven Ting
From: Yan-Hsuan Chuang <yhchuang@realtek.com>
Before entering IPS, set the PTA control to default value and re-init it
after it leaves IPS to avoid running some redundant code in
run_coexist_mechanism.
Signed-off-by: Yan-Hsuan Chuang <yhchuang@realtek.com>
Signed-off-by: Larry Finger <Larry.Finger@lwfinger.net>
Cc: Pkshih <pkshih@realtek.com>
Cc: Birming Chiu <birming@realtek.com>
Cc: Shaofu <shaofu@realtek.com>
Cc: Steven Ting <steventing@realtek.com>
---
drivers/net/wireless/realtek/rtlwifi/btcoexist/halbtc8821a1ant.c | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/drivers/net/wireless/realtek/rtlwifi/btcoexist/halbtc8821a1ant.c b/drivers/net/wireless/realtek/rtlwifi/btcoexist/halbtc8821a1ant.c
index ab6530cfb653..84cc0bcc5f80 100644
--- a/drivers/net/wireless/realtek/rtlwifi/btcoexist/halbtc8821a1ant.c
+++ b/drivers/net/wireless/realtek/rtlwifi/btcoexist/halbtc8821a1ant.c
@@ -2473,7 +2473,7 @@ void ex_btc8821a1ant_ips_notify(struct btc_coexist *btcoexist, u8 type)
btc8821a1ant_set_ant_path(btcoexist,
BTC_ANT_PATH_BT, false, true);
/* set PTA control */
- btc8821a1ant_ps_tdma(btcoexist, NORMAL_EXEC, false, 8);
+ btc8821a1ant_ps_tdma(btcoexist, NORMAL_EXEC, false, 0);
btc8821a1ant_coex_table_with_type(btcoexist,
NORMAL_EXEC, 0);
} else if (BTC_IPS_LEAVE == type) {
@@ -2481,7 +2481,9 @@ void ex_btc8821a1ant_ips_notify(struct btc_coexist *btcoexist, u8 type)
"[BTCoex], IPS LEAVE notify\n");
coex_sta->under_ips = false;
- btc8821a1ant_run_coexist_mechanism(btcoexist);
+ btc8821a1ant_init_hw_config(btcoexist, false, false);
+ btc8821a1ant_init_coex_dm(btcoexist);
+ btc8821a1ant_query_bt_info(btcoexist);
}
}
--
2.12.2
^ permalink raw reply related [flat|nested] 12+ messages in thread
* Re: [01/10] rtlwifi: btcoex: 21a 1ant: set tdma and coex table when wifi is idle
2017-05-11 23:24 ` [PATCH 01/10] rtlwifi: btcoex: 21a 1ant: set tdma and coex table when wifi is idle Larry Finger
@ 2017-05-18 14:08 ` Kalle Valo
0 siblings, 0 replies; 12+ messages in thread
From: Kalle Valo @ 2017-05-18 14:08 UTC (permalink / raw)
To: Larry Finger
Cc: linux-wireless, Yan-Hsuan Chuang, Larry Finger, Pkshih,
Birming Chiu, Shaofu, Steven Ting
Larry Finger <Larry.Finger@lwfinger.net> wrote:
> From: Yan-Hsuan Chuang <yhchuang@realtek.com>
>
> When wifi is idle, bt could have more resources to transmit, so set the
> tdma and coex table to achieve this.
>
> Signed-off-by: Yan-Hsuan Chuang <yhchuang@realtek.com>
> Signed-off-by: Larry Finger <Larry.Finger@lwfinger.net>
> Cc: Pkshih <pkshih@realtek.com>
> Cc: Birming Chiu <birming@realtek.com>
> Cc: Shaofu <shaofu@realtek.com>
> Cc: Steven Ting <steventing@realtek.com>
10 patches applied to wireless-drivers-next.git, thanks.
8113b9c4000c rtlwifi: btcoex: 21a 1ant: set tdma and coex table when wifi is idle
2fb9ca230fc1 rtlwifi: btcoex: 21a 1ant: more bt profiling when wifi receives special packet
bcd6f89c013c rtlwifi: btcoex: 21a 1ant: shorten wifi slot when connected scan
a4da86768a27 rtlwifi: btcoex: 21a 1ant: react to special packet when wifi is not scanning
24697534ffc0 rtlwifi: btcoex: 21a 1ant: coex table and tdma settings for softap mode
7f1045d0cf87 rtlwifi: btcoex: 21a 1ant: wifi slot time adjustment
93cfe89765ad rtlwifi: btcoex: 21a 1ant: normal mode for retry limit when connected
af4295ad866e rtlwifi: btcoex: 21a 1ant: mark packet high priority when scanning
7ad6ff8897a8 rtlwifi: btcoex: 21a 1ant: use default value when initiating coex
ee406cec8789 rtlwifi: btcoex: 21a 1ant: re-init coex after wifi leaves IPS
--
https://patchwork.kernel.org/patch/9723237/
https://wireless.wiki.kernel.org/en/developers/documentation/submittingpatches
^ permalink raw reply [flat|nested] 12+ messages in thread
end of thread, other threads:[~2017-05-18 14:08 UTC | newest]
Thread overview: 12+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2017-05-11 23:24 [PATCH 00/10] rtlwifi: btcoex: Part 2 of fixes for halbtc8821a1ant.c Larry Finger
2017-05-11 23:24 ` [PATCH 01/10] rtlwifi: btcoex: 21a 1ant: set tdma and coex table when wifi is idle Larry Finger
2017-05-18 14:08 ` [01/10] " Kalle Valo
2017-05-11 23:24 ` [PATCH 02/10] rtlwifi: btcoex: 21a 1ant: more bt profiling when wifi receives special packet Larry Finger
2017-05-11 23:24 ` [PATCH 03/10] rtlwifi: btcoex: 21a 1ant: shorten wifi slot when connected scan Larry Finger
2017-05-11 23:24 ` [PATCH 04/10] rtlwifi: btcoex: 21a 1ant: react to special packet when wifi is not scanning Larry Finger
2017-05-11 23:24 ` [PATCH 05/10] rtlwifi: btcoex: 21a 1ant: coex table and tdma settings for softap mode Larry Finger
2017-05-11 23:24 ` [PATCH 06/10] rtlwifi: btcoex: 21a 1ant: wifi slot time adjustment Larry Finger
2017-05-11 23:24 ` [PATCH 07/10] rtlwifi: btcoex: 21a 1ant: normal mode for retry limit when connected Larry Finger
2017-05-11 23:24 ` [PATCH 08/10] rtlwifi: btcoex: 21a 1ant: mark packet high priority when scanning Larry Finger
2017-05-11 23:24 ` [PATCH 09/10] rtlwifi: btcoex: 21a 1ant: use default value when initiating coex Larry Finger
2017-05-11 23:24 ` [PATCH 10/10] rtlwifi: btcoex: 21a 1ant: re-init coex after wifi leaves IPS Larry Finger
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).