rtw88: coex: add separate flag for manual control

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

diff --git a/drivers/net/wireless/realtek/rtw88/coex.c b/drivers/net/wireless/realtek/rtw88/coex.c
index af7e692137ba5eee490c93fa6e72e14bdb3e378f..6de98414e3bfbc52d8bd969f5e85c9a6e49cb732 100644 (file)
--- a/drivers/net/wireless/realtek/rtw88/coex.c
+++ b/drivers/net/wireless/realtek/rtw88/coex.c
@@ -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) {

diff --git a/drivers/net/wireless/realtek/rtw88/debug.c b/drivers/net/wireless/realtek/rtw88/debug.c
index 3852c4f0ac0b094c9fb44b848fcdd4b283ba3a3a..5974a8ef8b34f2428b4493e13a60bc15db0530ea 100644 (file)
--- a/drivers/net/wireless/realtek/rtw88/debug.c
+++ b/drivers/net/wireless/realtek/rtw88/debug.c
@@ -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;
 }

diff --git a/drivers/net/wireless/realtek/rtw88/main.h b/drivers/net/wireless/realtek/rtw88/main.h
index 8d11d56c83f23e687b17a834eaeacf8b8ee7c1bd..632d14683b6194ea1b59d8e248160477a1d3d9c1 100644 (file)
--- a/drivers/net/wireless/realtek/rtw88/main.h
+++ b/drivers/net/wireless/realtek/rtw88/main.h
@@ -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;