Minki/linux
1
0
Fork 1
mirror of https://github.com/torvalds/linux.git synced 2024-12-04 01:51:34 +00:00
Code Issues Packages Projects Releases Wiki Activity

rtw88: LPS enter/leave should be protected by lock

Browse Source 
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>
This commit is contained in:
Yan-Hsuan Chuang 2019-10-02 10:31:22 +08:00 committed by Kalle Valo
parent 5235d63640
commit d3e20fd17d
3 changed files with 13 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -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);

9
drivers/net/wireless/realtek/rtw88/main.c
View File

@ -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)

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

@ -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;