Commit 9d87e7dc authored by Ping-Ke Shih's avatar Ping-Ke Shih Committed by Kalle Valo
Browse files

wifi: rtw89: mac: define register address of rx_filter to generalize code 



rx_filter is used to decide which kind of packets are received to driver,
or just dropped by MAC layer to reduce bus traffic.

The bit definitions of old and new chips are the sames, but only address
is changed, so define a field to generalize usage.

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/20230822125822.23817-5-pkshih@realtek.com
parent 3a7e4f56

drivers/net/wireless/realtek/rtw89/core.c

+4 −2
Original line number Diff line number Diff line
@@ -2477,6 +2477,7 @@ static int rtw89_core_send_nullfunc(struct rtw89_dev *rtwdev, 


void rtw89_roc_start(struct rtw89_dev *rtwdev, struct rtw89_vif *rtwvif)

{

	const struct rtw89_mac_gen_def *mac = rtwdev->chip->mac_def;

	struct ieee80211_hw *hw = rtwdev->hw;

	struct rtw89_roc *roc = &rtwvif->roc;

	struct cfg80211_chan_def roc_chan;
@@ -2504,7 +2505,7 @@ void rtw89_roc_start(struct rtw89_dev *rtwdev, struct rtw89_vif *rtwvif) 
	rtw89_config_roc_chandef(rtwdev, rtwvif->sub_entity_idx, &roc_chan);

	rtw89_set_channel(rtwdev);

	rtw89_write32_clr(rtwdev,

			  rtw89_mac_reg_by_idx(rtwdev, R_AX_RX_FLTR_OPT, RTW89_MAC_0),

			  rtw89_mac_reg_by_idx(rtwdev, mac->rx_fltr, RTW89_MAC_0),

			  B_AX_A_UC_CAM_MATCH | B_AX_A_BC_CAM_MATCH);



	ieee80211_ready_on_channel(hw);
@@ -2512,6 +2513,7 @@ void rtw89_roc_start(struct rtw89_dev *rtwdev, struct rtw89_vif *rtwvif) 


void rtw89_roc_end(struct rtw89_dev *rtwdev, struct rtw89_vif *rtwvif)

{

	const struct rtw89_mac_gen_def *mac = rtwdev->chip->mac_def;

	struct ieee80211_hw *hw = rtwdev->hw;

	struct rtw89_roc *roc = &rtwvif->roc;

	struct rtw89_vif *tmp;
@@ -2525,7 +2527,7 @@ void rtw89_roc_end(struct rtw89_dev *rtwdev, struct rtw89_vif *rtwvif) 
	rtw89_leave_lps(rtwdev);



	rtw89_write32_mask(rtwdev,

			   rtw89_mac_reg_by_idx(rtwdev, R_AX_RX_FLTR_OPT, RTW89_MAC_0),

			   rtw89_mac_reg_by_idx(rtwdev, mac->rx_fltr, RTW89_MAC_0),

			   B_AX_RX_FLTR_CFG_MASK,

			   rtwdev->hal.rx_fltr);

drivers/net/wireless/realtek/rtw89/fw.c

+4 −2
Original line number Diff line number Diff line
@@ -3863,6 +3863,7 @@ void rtw89_hw_scan_start(struct rtw89_dev *rtwdev, struct ieee80211_vif *vif, 
			 struct ieee80211_scan_request *scan_req)

{

	struct rtw89_vif *rtwvif = (struct rtw89_vif *)vif->drv_priv;

	const struct rtw89_mac_gen_def *mac = rtwdev->chip->mac_def;

	struct cfg80211_scan_request *req = &scan_req->req;

	u32 rx_fltr = rtwdev->hal.rx_fltr;

	u8 mac_addr[ETH_ALEN];
@@ -3885,7 +3886,7 @@ void rtw89_hw_scan_start(struct rtw89_dev *rtwdev, struct ieee80211_vif *vif, 
	rx_fltr &= ~B_AX_A_BC;

	rx_fltr &= ~B_AX_A_A1_MATCH;

	rtw89_write32_mask(rtwdev,

			   rtw89_mac_reg_by_idx(rtwdev, R_AX_RX_FLTR_OPT, RTW89_MAC_0),

			   rtw89_mac_reg_by_idx(rtwdev, mac->rx_fltr, RTW89_MAC_0),

			   B_AX_RX_FLTR_CFG_MASK,

			   rx_fltr);

}
@@ -3893,6 +3894,7 @@ void rtw89_hw_scan_start(struct rtw89_dev *rtwdev, struct ieee80211_vif *vif, 
void rtw89_hw_scan_complete(struct rtw89_dev *rtwdev, struct ieee80211_vif *vif,

			    bool aborted)

{

	const struct rtw89_mac_gen_def *mac = rtwdev->chip->mac_def;

	struct rtw89_hw_scan_info *scan_info = &rtwdev->scan_info;

	struct cfg80211_scan_info info = {

		.aborted = aborted,
@@ -3903,7 +3905,7 @@ void rtw89_hw_scan_complete(struct rtw89_dev *rtwdev, struct ieee80211_vif *vif, 
		return;



	rtw89_write32_mask(rtwdev,

			   rtw89_mac_reg_by_idx(rtwdev, R_AX_RX_FLTR_OPT, RTW89_MAC_0),

			   rtw89_mac_reg_by_idx(rtwdev, mac->rx_fltr, RTW89_MAC_0),

			   B_AX_RX_FLTR_CFG_MASK,

			   rtwdev->hal.rx_fltr);

drivers/net/wireless/realtek/rtw89/mac.c

+1 −0
Original line number Diff line number Diff line
@@ -5689,5 +5689,6 @@ const struct rtw89_mac_gen_def rtw89_mac_gen_ax = { 
	.filter_model_addr = R_AX_FILTER_MODEL_ADDR,

	.indir_access_addr = R_AX_INDIR_ACCESS_ENTRY,

	.mem_base_addrs = rtw89_mac_mem_base_addrs_ax,

	.rx_fltr = R_AX_RX_FLTR_OPT,

};

EXPORT_SYMBOL(rtw89_mac_gen_ax);

drivers/net/wireless/realtek/rtw89/mac.h

+1 −0
Original line number Diff line number Diff line
@@ -857,6 +857,7 @@ struct rtw89_mac_gen_def { 
	u32 filter_model_addr;

	u32 indir_access_addr;

	const u32 *mem_base_addrs;

	u32 rx_fltr;

};



extern const struct rtw89_mac_gen_def rtw89_mac_gen_ax;

drivers/net/wireless/realtek/rtw89/mac80211.c

+3 −2
Original line number Diff line number Diff line
@@ -224,6 +224,7 @@ static void rtw89_ops_configure_filter(struct ieee80211_hw *hw, 
				       u64 multicast)

{

	struct rtw89_dev *rtwdev = hw->priv;

	const struct rtw89_mac_gen_def *mac = rtwdev->chip->mac_def;



	mutex_lock(&rtwdev->mutex);

	rtw89_leave_ps_mode(rtwdev);
@@ -271,13 +272,13 @@ static void rtw89_ops_configure_filter(struct ieee80211_hw *hw, 
	}



	rtw89_write32_mask(rtwdev,

			   rtw89_mac_reg_by_idx(rtwdev, R_AX_RX_FLTR_OPT, RTW89_MAC_0),

			   rtw89_mac_reg_by_idx(rtwdev, mac->rx_fltr, RTW89_MAC_0),

			   B_AX_RX_FLTR_CFG_MASK,

			   rtwdev->hal.rx_fltr);

	if (!rtwdev->dbcc_en)

		goto out;

	rtw89_write32_mask(rtwdev,

			   rtw89_mac_reg_by_idx(rtwdev, R_AX_RX_FLTR_OPT, RTW89_MAC_1),

			   rtw89_mac_reg_by_idx(rtwdev, mac->rx_fltr, RTW89_MAC_1),

			   B_AX_RX_FLTR_CFG_MASK,

			   rtwdev->hal.rx_fltr);