rtw88: LPS enter/leave should be protected by lock

Protect LPS enter/leave routine with rtwdev->mutex.
This helps to synchronize with driver's states correctly.

Signed-off-by: Yan-Hsuan Chuang <yhchuang@realtek.com>
Signed-off-by: Kalle Valo <kvalo@codeaurora.org>

diff --git a/drivers/net/wireless/realtek/rtw88/mac80211.c b/drivers/net/wireless/realtek/rtw88/mac80211.c
index 66c05c4925870deffb74d7ef9a828cccc38f18c3..984644f646108294c54c1eee95d741c80c1e0f93 100644 (file)
--- a/drivers/net/wireless/realtek/rtw88/mac80211.c
+++ b/drivers/net/wireless/realtek/rtw88/mac80211.c
@@ -464,10 +464,10 @@ static void rtw_ops_sw_scan_start(struct ieee80211_hw *hw,
        struct rtw_vif *rtwvif = (struct rtw_vif *)vif->drv_priv;
        u32 config = 0;
 
-       rtw_leave_lps(rtwdev);
-
        mutex_lock(&rtwdev->mutex);
 
+       rtw_leave_lps(rtwdev);
+
        ether_addr_copy(rtwvif->mac_addr, mac_addr);
        config |= PORT_SET_MAC_ADDR;
        rtw_vif_port_config(rtwdev, rtwvif, config);

diff --git a/drivers/net/wireless/realtek/rtw88/main.c b/drivers/net/wireless/realtek/rtw88/main.c
index 85d83f154f712045a211745e8d7fcdbd7d18c5af..f55eda9da82708ee2bd169a3375a51032f1a72d7 100644 (file)
--- a/drivers/net/wireless/realtek/rtw88/main.c
+++ b/drivers/net/wireless/realtek/rtw88/main.c
@@ -152,8 +152,10 @@ static void rtw_watch_dog_work(struct work_struct *work)
        struct rtw_watch_dog_iter_data data = {};
        bool busy_traffic = test_bit(RTW_FLAG_BUSY_TRAFFIC, rtwdev->flags);
 
+       mutex_lock(&rtwdev->mutex);
+
        if (!test_bit(RTW_FLAG_RUNNING, rtwdev->flags))
-               return;
+               goto unlock;
 
        ieee80211_queue_delayed_work(rtwdev->hw, &rtwdev->watch_dog_work,
                                     RTW_WATCH_DOG_DELAY_TIME);
@@ -186,11 +188,14 @@ static void rtw_watch_dog_work(struct work_struct *work)
                rtw_leave_lps(rtwdev);
 
        if (test_bit(RTW_FLAG_SCANNING, rtwdev->flags))
-               return;
+               goto unlock;
 
        rtw_phy_dynamic_mechanism(rtwdev);
 
        rtwdev->watch_dog_cnt++;
+
+unlock:
+       mutex_unlock(&rtwdev->mutex);
 }
 
 static void rtw_c2h_work(struct work_struct *work)

diff --git a/drivers/net/wireless/realtek/rtw88/ps.c b/drivers/net/wireless/realtek/rtw88/ps.c
index d57996e446fb3652b0308a14e7dde46e86d83fe9..af5c7be2ef0fab30039cde473b479e279721f70b 100644 (file)
--- a/drivers/net/wireless/realtek/rtw88/ps.c
+++ b/drivers/net/wireless/realtek/rtw88/ps.c
@@ -95,6 +95,8 @@ void rtw_enter_lps(struct rtw_dev *rtwdev, u8 port_id)
 {
        struct rtw_lps_conf *conf = &rtwdev->lps_conf;
 
+       lockdep_assert_held(&rtwdev->mutex);
+
        if (test_bit(RTW_FLAG_LEISURE_PS, rtwdev->flags))
                return;
 
@@ -108,6 +110,8 @@ void rtw_leave_lps(struct rtw_dev *rtwdev)
 {
        struct rtw_lps_conf *conf = &rtwdev->lps_conf;
 
+       lockdep_assert_held(&rtwdev->mutex);
+
        if (!test_bit(RTW_FLAG_LEISURE_PS, rtwdev->flags))
                return;