Commit 685b474b authored by Chih-Kang Chang's avatar Chih-Kang Chang Committed by Kalle Valo
Browse files

wifi: rtw88: add mutex when set regulatory and get Tx power table 



Applying regulatory and getting Tx power table will access hal
data, it should hold rtwdev::mutex to avoid hal data changed during
setting flow.

Signed-off-by: default avatarChih-Kang Chang <gary.chang@realtek.com>
Signed-off-by: default avatarPing-Ke Shih <pkshih@realtek.com>
Signed-off-by: default avatarKalle Valo <kvalo@kernel.org>
Link: https://lore.kernel.org/r/20220809084107.38137-3-pkshih@realtek.com
parent 9a72db41

drivers/net/wireless/realtek/rtw88/debug.c

+7 −4
Original line number Diff line number Diff line
@@ -621,11 +621,13 @@ static int rtw_debugfs_get_tx_pwr_tbl(struct seq_file *m, void *v) 
	struct rtw_debugfs_priv *debugfs_priv = m->private;

	struct rtw_dev *rtwdev = debugfs_priv->rtwdev;

	struct rtw_hal *hal = &rtwdev->hal;

	u8 path, rate;

	u8 path, rate, bw, ch, regd;

	struct rtw_power_params pwr_param = {0};

	u8 bw = hal->current_band_width;

	u8 ch = hal->current_channel;

	u8 regd = rtw_regd_get(rtwdev);



	mutex_lock(&rtwdev->mutex);

	bw = hal->current_band_width;

	ch = hal->current_channel;

	regd = rtw_regd_get(rtwdev);



	seq_printf(m, "channel: %u\n", ch);

	seq_printf(m, "bandwidth: %u\n", bw);
@@ -667,6 +669,7 @@ static int rtw_debugfs_get_tx_pwr_tbl(struct seq_file *m, void *v) 
	}



	mutex_unlock(&hal->tx_power_mutex);

	mutex_unlock(&rtwdev->mutex);



	return 0;

}

drivers/net/wireless/realtek/rtw88/regd.c

+2 −0
Original line number Diff line number Diff line
@@ -479,6 +479,7 @@ void rtw_regd_notifier(struct wiphy *wiphy, struct regulatory_request *request) 
	rtw_dbg(rtwdev, RTW_DBG_REGD, "regd state: %d -> %d\n",

		rtwdev->regd.state, next_regd.state);



	mutex_lock(&rtwdev->mutex);

	rtwdev->regd = next_regd;

	rtw_dbg_regd_dump(rtwdev, "get alpha2 %c%c from initiator %d: ",

			  request->alpha2[0],
@@ -487,6 +488,7 @@ void rtw_regd_notifier(struct wiphy *wiphy, struct regulatory_request *request) 


	rtw_phy_adaptivity_set_mode(rtwdev);

	rtw_phy_set_tx_power_level(rtwdev, hal->current_channel);

	mutex_unlock(&rtwdev->mutex);

}



u8 rtw_regd_get(struct rtw_dev *rtwdev)