wifi: rtw89: coex: Separated Wi-Fi connecting event from Wi-Fi scan event

Wi-Fi connecting process don't need to assign to firmware slot control,
if assign firmware slot control for Wi-Fi connecting event, firmware will
not toggle slots because driver don't tell the slot schedule to firmware.
Wi-Fi connecting event end should also cancel the 4way handshake status.

Signed-off-by: Ching-Te Ku <ku920601@realtek.com>
Signed-off-by: Ping-Ke Shih <pkshih@realtek.com>
Link: https://patch.msgid.link/20250110015416.10704-3-pkshih@realtek.com

diff --git a/drivers/net/wireless/realtek/rtw89/coex.c b/drivers/net/wireless/realtek/rtw89/coex.c
index d5b8091e7541d097bb9387a501707b377743822f..cde65ee43bac4e23c070ac9fa5f44b30876aa4fd 100644 (file)
--- a/drivers/net/wireless/realtek/rtw89/coex.c
+++ b/drivers/net/wireless/realtek/rtw89/coex.c
@@ -5399,7 +5399,8 @@ static void _action_wl_scan(struct rtw89_dev *rtwdev)
        struct rtw89_btc_wl_info *wl = &btc->cx.wl;
        struct rtw89_btc_wl_dbcc_info *wl_dinfo = &wl->dbcc_info;
 
-       if (RTW89_CHK_FW_FEATURE(SCAN_OFFLOAD, &rtwdev->fw)) {
+       if (btc->cx.state_map != BTC_WLINKING &&
+           RTW89_CHK_FW_FEATURE(SCAN_OFFLOAD, &rtwdev->fw)) {
                _action_wl_25g_mcc(rtwdev);
                rtw89_debug(rtwdev, RTW89_DBG_BTC, "[BTC], Scan offload!\n");
        } else if (rtwdev->dbcc_en) {
@@ -7214,6 +7215,8 @@ void rtw89_btc_ntfy_scan_finish(struct rtw89_dev *rtwdev, u8 phy_idx)
                _fw_set_drv_info(rtwdev, CXDRVINFO_DBCC);
        }
 
+       btc->dm.tdma_instant_excute = 1;
+
        _run_coex(rtwdev, BTC_RSN_NTFY_SCAN_FINISH);
 }
 
@@ -7662,7 +7665,8 @@ void rtw89_btc_ntfy_role_info(struct rtw89_dev *rtwdev,
        else
                wl->status.map.connecting = 0;
 
-       if (state == BTC_ROLE_MSTS_STA_DIS_CONN)
+       if (state == BTC_ROLE_MSTS_STA_DIS_CONN ||
+           state == BTC_ROLE_MSTS_STA_CONN_END)
                wl->status.map._4way = false;
 
        _run_coex(rtwdev, BTC_RSN_NTFY_ROLE_INFO);