wifi: rtw89: mcc: stop TX during MCC prepare

Stop TX during the MCC configuration period to prevent packet leakage.
The stop time is defined as 'start_tsf - tsf', which means the duration
from when MCC configuration begins until MCC starts.

Signed-off-by: Chih-Kang Chang <gary.chang@realtek.com>
Signed-off-by: Ping-Ke Shih <pkshih@realtek.com>
Link: https://patch.msgid.link/20250610130034.14692-6-pkshih@realtek.com

diff --git a/drivers/net/wireless/realtek/rtw89/chan.c b/drivers/net/wireless/realtek/rtw89/chan.c
index 2575aa174b05fbce945e874c8568d4b7cb82628e..7539bba2e094853dc03c1d3d58e0eecb36bd8056 100644 (file)
--- a/drivers/net/wireless/realtek/rtw89/chan.c
+++ b/drivers/net/wireless/realtek/rtw89/chan.c
@@ -1602,6 +1602,35 @@ static bool rtw89_mcc_duration_decision_on_bt(struct rtw89_dev *rtwdev)
        return false;
 }
 
+void rtw89_mcc_prepare_done_work(struct wiphy *wiphy, struct wiphy_work *work)
+{
+       struct rtw89_dev *rtwdev = container_of(work, struct rtw89_dev,
+                                               mcc_prepare_done_work.work);
+
+       lockdep_assert_wiphy(wiphy);
+
+       ieee80211_wake_queues(rtwdev->hw);
+}
+
+static void rtw89_mcc_prepare(struct rtw89_dev *rtwdev, bool start)
+{
+       struct rtw89_mcc_info *mcc = &rtwdev->mcc;
+       struct rtw89_mcc_config *config = &mcc->config;
+
+       if (start) {
+               ieee80211_stop_queues(rtwdev->hw);
+
+               wiphy_delayed_work_queue(rtwdev->hw->wiphy,
+                                        &rtwdev->mcc_prepare_done_work,
+                                        usecs_to_jiffies(config->prepare_delay));
+       } else {
+               wiphy_delayed_work_queue(rtwdev->hw->wiphy,
+                                        &rtwdev->mcc_prepare_done_work, 0);
+               wiphy_delayed_work_flush(rtwdev->hw->wiphy,
+                                        &rtwdev->mcc_prepare_done_work);
+       }
+}
+
 static int rtw89_mcc_fill_start_tsf(struct rtw89_dev *rtwdev)
 {
        struct rtw89_mcc_info *mcc = &rtwdev->mcc;
@@ -1637,6 +1666,8 @@ static int rtw89_mcc_fill_start_tsf(struct rtw89_dev *rtwdev)
 
        config->start_tsf = start_tsf;
        config->start_tsf_in_aux_domain = tsf_aux + start_tsf - tsf;
+       config->prepare_delay = start_tsf - tsf;
+
        return 0;
 }
 
@@ -2247,6 +2278,8 @@ static int rtw89_mcc_start(struct rtw89_dev *rtwdev)
        rtw89_chanctx_notify(rtwdev, RTW89_CHANCTX_STATE_MCC_START);
 
        rtw89_mcc_start_beacon_noa(rtwdev);
+
+       rtw89_mcc_prepare(rtwdev, true);
        return 0;
 }
 
@@ -2335,6 +2368,8 @@ static void rtw89_mcc_stop(struct rtw89_dev *rtwdev,
        rtw89_chanctx_notify(rtwdev, RTW89_CHANCTX_STATE_MCC_STOP);
 
        rtw89_mcc_stop_beacon_noa(rtwdev);
+
+       rtw89_mcc_prepare(rtwdev, false);
 }
 
 static int rtw89_mcc_update(struct rtw89_dev *rtwdev)

diff --git a/drivers/net/wireless/realtek/rtw89/chan.h b/drivers/net/wireless/realtek/rtw89/chan.h
index 6036f3ca6f67570e58902782be049ca5443b6353..5f10f3955e5c469ea65ee0ac6e200bfb40d20de5 100644 (file)
--- a/drivers/net/wireless/realtek/rtw89/chan.h
+++ b/drivers/net/wireless/realtek/rtw89/chan.h
@@ -133,6 +133,8 @@ const struct rtw89_chan *__rtw89_mgnt_chan_get(struct rtw89_dev *rtwdev,
 #define rtw89_mgnt_chan_get(rtwdev, link_index) \
        __rtw89_mgnt_chan_get(rtwdev, __func__, link_index)
 
+void rtw89_mcc_prepare_done_work(struct wiphy *wiphy, struct wiphy_work *work);
+
 int rtw89_chanctx_ops_add(struct rtw89_dev *rtwdev,
                          struct ieee80211_chanctx_conf *ctx);
 void rtw89_chanctx_ops_remove(struct rtw89_dev *rtwdev,

diff --git a/drivers/net/wireless/realtek/rtw89/core.c b/drivers/net/wireless/realtek/rtw89/core.c
index e7e2315d1867c6f898bdff5f7779c8054c12ff61..130e89743991b985b982a46906da9a11b3886ab7 100644 (file)
--- a/drivers/net/wireless/realtek/rtw89/core.c
+++ b/drivers/net/wireless/realtek/rtw89/core.c
@@ -4884,6 +4884,7 @@ void rtw89_core_stop(struct rtw89_dev *rtwdev)
        wiphy_delayed_work_cancel(wiphy, &rtwdev->coex_bt_devinfo_work);
        wiphy_delayed_work_cancel(wiphy, &rtwdev->coex_rfk_chk_work);
        wiphy_delayed_work_cancel(wiphy, &rtwdev->cfo_track_work);
+       wiphy_delayed_work_cancel(wiphy, &rtwdev->mcc_prepare_done_work);
        cancel_delayed_work_sync(&rtwdev->forbid_ba_work);
        wiphy_delayed_work_cancel(wiphy, &rtwdev->antdiv_work);
 
@@ -5110,6 +5111,7 @@ int rtw89_core_init(struct rtw89_dev *rtwdev)
        wiphy_delayed_work_init(&rtwdev->coex_bt_devinfo_work, rtw89_coex_bt_devinfo_work);
        wiphy_delayed_work_init(&rtwdev->coex_rfk_chk_work, rtw89_coex_rfk_chk_work);
        wiphy_delayed_work_init(&rtwdev->cfo_track_work, rtw89_phy_cfo_track_work);
+       wiphy_delayed_work_init(&rtwdev->mcc_prepare_done_work, rtw89_mcc_prepare_done_work);
        INIT_DELAYED_WORK(&rtwdev->forbid_ba_work, rtw89_forbid_ba_work);
        wiphy_delayed_work_init(&rtwdev->antdiv_work, rtw89_phy_antdiv_work);
        rtwdev->txq_wq = alloc_workqueue("rtw89_tx_wq", WQ_UNBOUND | WQ_HIGHPRI, 0);

diff --git a/drivers/net/wireless/realtek/rtw89/core.h b/drivers/net/wireless/realtek/rtw89/core.h
index 84c0d5814747535f3b65c9b1a0dee53b7e94adfe..ce2f133138266251fafa29183a5165ae1489c8e7 100644 (file)
--- a/drivers/net/wireless/realtek/rtw89/core.h
+++ b/drivers/net/wireless/realtek/rtw89/core.h
@@ -5742,6 +5742,7 @@ struct rtw89_mcc_config {
        struct rtw89_mcc_sync sync;
        u64 start_tsf;
        u64 start_tsf_in_aux_domain;
+       u64 prepare_delay;
        u16 mcc_interval; /* TU */
        u16 beacon_offset; /* TU */
 };
@@ -5872,6 +5873,7 @@ struct rtw89_dev {
        struct wiphy_delayed_work coex_bt_devinfo_work;
        struct wiphy_delayed_work coex_rfk_chk_work;
        struct wiphy_delayed_work cfo_track_work;
+       struct wiphy_delayed_work mcc_prepare_done_work;
        struct delayed_work forbid_ba_work;
        struct wiphy_delayed_work antdiv_work;
        struct rtw89_ppdu_sts_info ppdu_sts;