renegade-project/linux-next
2
0
Fork 0
mirror of https://github.com/edk2-porting/linux-next.git synced 2025-01-23 22:25:40 +08:00
Code

rtw88: coex: add separate flag for manual control

Browse Source 
The original stop_dm flag is shared with the wifi and coexistence
mechanism internal usage, which represent two meanings, and makes
developers hard to debug.
Add a new flag manual_control for coexistence mechanism usage only.

Signed-off-by: Ching-Te Ku <ku920601@realtek.com>
Signed-off-by: Ping-Ke Shih <pkshih@realtek.com>
Signed-off-by: Kalle Valo <kvalo@codeaurora.org>
Link: https://lore.kernel.org/r/20201109085909.9143-7-pkshih@realtek.com
This commit is contained in:
Ching-Te Ku 2020-11-09 16:59:04 +08:00 committed by Kalle Valo
parent ae8732d767
commit 32c3a8c7d9
3 changed files with 12 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
drivers/net/wireless/realtek/rtw88/coex.c
View File

@ -124,7 +124,7 @@ static void rtw_coex_wl_ccklock_action(struct rtw_dev *rtwdev)
struct rtw_coex_stat *coex_stat = &coex->stat;
u8 para[6] = {0};
if (coex->stop_dm)
if (coex->manual_control || coex->stop_dm)
return;
para[0] = COEX_H2C69_WL_LEAKAP;
@ -829,7 +829,7 @@ static void rtw_coex_ignore_wlan_act(struct rtw_dev *rtwdev, bool enable)
{
struct rtw_coex *coex = &rtwdev->coex;
if (coex->stop_dm)
if (coex->manual_control || coex->stop_dm)
return;
rtw_fw_bt_ignore_wlan_action(rtwdev, enable);
@ -1987,7 +1987,7 @@ static void rtw_coex_run_coex(struct rtw_dev *rtwdev, u8 reason)
rtw_coex_monitor_bt_enable(rtwdev);
if (coex->stop_dm)
if (coex->manual_control || coex->stop_dm)
return;
if (coex_stat->wl_under_ips)
@ -2154,7 +2154,7 @@ void rtw_coex_ips_notify(struct rtw_dev *rtwdev, u8 type)
struct rtw_coex *coex = &rtwdev->coex;
struct rtw_coex_stat *coex_stat = &coex->stat;
if (coex->stop_dm)
if (coex->manual_control || coex->stop_dm)
return;
if (type == COEX_IPS_ENTER) {
@ -2180,7 +2180,7 @@ void rtw_coex_lps_notify(struct rtw_dev *rtwdev, u8 type)
struct rtw_coex *coex = &rtwdev->coex;
struct rtw_coex_stat *coex_stat = &coex->stat;
if (coex->stop_dm)
if (coex->manual_control || coex->stop_dm)
return;
if (type == COEX_LPS_ENABLE) {
@ -2211,7 +2211,7 @@ void rtw_coex_scan_notify(struct rtw_dev *rtwdev, u8 type)
struct rtw_coex *coex = &rtwdev->coex;
struct rtw_coex_stat *coex_stat = &coex->stat;
if (coex->stop_dm)
if (coex->manual_control || coex->stop_dm)
return;
coex->freeze = false;
@ -2239,7 +2239,7 @@ void rtw_coex_switchband_notify(struct rtw_dev *rtwdev, u8 type)
{
struct rtw_coex *coex = &rtwdev->coex;
if (coex->stop_dm)
if (coex->manual_control || coex->stop_dm)
return;
if (type == COEX_SWITCH_TO_5G)
@ -2255,7 +2255,7 @@ void rtw_coex_connect_notify(struct rtw_dev *rtwdev, u8 type)
struct rtw_coex *coex = &rtwdev->coex;
struct rtw_coex_stat *coex_stat = &coex->stat;
if (coex->stop_dm)
if (coex->manual_control || coex->stop_dm)
return;
rtw_coex_write_scbd(rtwdev, COEX_SCBD_ACTIVE | COEX_SCBD_SCAN |
@ -2296,7 +2296,7 @@ void rtw_coex_media_status_notify(struct rtw_dev *rtwdev, u8 type)
struct rtw_coex_stat *coex_stat = &coex->stat;
u8 para[6] = {0};
if (coex->stop_dm)
if (coex->manual_control || coex->stop_dm)
return;
if (type == COEX_MEDIA_CONNECT_5G) {

4
drivers/net/wireless/realtek/rtw88/debug.c
View File

@ -775,7 +775,7 @@ static ssize_t rtw_debugfs_set_coex_enable(struct file *filp,
}
mutex_lock(&rtwdev->mutex);
coex->stop_dm = enable == 0;
coex->manual_control = enable == 0;
mutex_unlock(&rtwdev->mutex);
return count;
@ -788,7 +788,7 @@ static int rtw_debugfs_get_coex_enable(struct seq_file *m, void *v)
struct rtw_coex *coex = &rtwdev->coex;
seq_printf(m, "coex mechanism %s\n",
coex->stop_dm ? "disabled" : "enabled");
coex->manual_control ? "disabled" : "enabled");
return 0;
}

1
drivers/net/wireless/realtek/rtw88/main.h
View File

@ -1379,6 +1379,7 @@ struct rtw_coex {
bool freeze;
bool freerun;
bool wl_rf_off;
bool manual_control;
struct rtw_coex_stat stat;
struct rtw_coex_dm dm;