Skip to content

Commit

Permalink
rtw88: LPS enter/leave should be protected by lock
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Yan-Hsuan Chuang authored and Kalle Valo committed Oct 2, 2019
1 parent 5235d63 commit d3e20fd
Show file tree
Hide file tree
Showing 3 changed files with 13 additions and 4 deletions.
4 changes: 2 additions & 2 deletions drivers/net/wireless/realtek/rtw88/mac80211.c
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down
9 changes: 7 additions & 2 deletions drivers/net/wireless/realtek/rtw88/main.c
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down Expand Up @@ -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)
Expand Down
4 changes: 4 additions & 0 deletions drivers/net/wireless/realtek/rtw88/ps.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;

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

Expand Down

0 comments on commit d3e20fd

Please sign in to comment.