RTL8822C forwards every control-frame subtype to the host by default. ACK, Block Ack, RTS and CTS frames are handled by hardware, but forwarding them also adds small SDIO transfers to the data path. Clear these four subtypes from the normal SDIO RX filter, retaining BAR, PS-Poll and the remaining subtypes. Cache the current FIF_CONTROL request separately from that default, using the full requested flags even when changed_flags does not contain FIF_CONTROL. Use a shared writer in filter configuration, every chip initializer and both beamforming paths. This keeps the monitor override across IPS wake, MAC reinitialization and beamforming, while removing the request restores the current normal filter. Limit the reduced default to SDIO, where profiling identified this overhead. PCIe and USB receive paths have not been tested with it. FriendlyElec's RTL8822CS driver also filters control frames at startup; this change retains additional subtypes for mac80211. Link: https://github.com/friendlyarm/rtl8822cs/blob/c8b944a34bba2116fcdb060362bde40242bb87e5/hal/rtl8822c/rtl8822c_halinit.c Suggested-by: Luka Gejak Signed-off-by: Leonard Lausen --- drivers/net/wireless/realtek/rtw88/bf.c | 4 ++-- drivers/net/wireless/realtek/rtw88/mac80211.c | 9 +++------ drivers/net/wireless/realtek/rtw88/main.c | 11 +++++++++++ drivers/net/wireless/realtek/rtw88/main.h | 2 ++ drivers/net/wireless/realtek/rtw88/reg.h | 4 ++++ drivers/net/wireless/realtek/rtw88/rtw8723x.c | 2 +- drivers/net/wireless/realtek/rtw88/rtw8814a.c | 2 +- drivers/net/wireless/realtek/rtw88/rtw8821c.c | 2 +- drivers/net/wireless/realtek/rtw88/rtw8822b.c | 2 +- drivers/net/wireless/realtek/rtw88/rtw8822c.c | 12 +++++++++++- drivers/net/wireless/realtek/rtw88/rtw88xxa.c | 2 +- 11 files changed, 38 insertions(+), 14 deletions(-) diff --git a/drivers/net/wireless/realtek/rtw88/bf.c b/drivers/net/wireless/realtek/rtw88/bf.c index 7313ecc5c82a2..088e4ac88055f 100644 --- a/drivers/net/wireless/realtek/rtw88/bf.c +++ b/drivers/net/wireless/realtek/rtw88/bf.c @@ -138,7 +138,7 @@ void rtw_bf_cfg_sounding(struct rtw_dev *rtwdev, struct rtw_vif *vif, RTW_SND_CTRL_SOUNDING); rtw_write8(rtwdev, REG_SND_PTCL_CTRL + 3, 0x26); rtwdev->hal.rxfltmap1 &= ~BIT_RXFLTMAP1_BF_REPORT_POLL; - rtw_write16(rtwdev, REG_RXFLTMAP1, rtwdev->hal.rxfltmap1); + rtw_update_rx_filter(rtwdev); rtw_write8_clr(rtwdev, REG_RXFLTMAP4, BIT_RXFLTMAP4_BF_REPORT_POLL); if (vif->net_type == RTW_NET_AP_MODE) @@ -271,7 +271,7 @@ void rtw_bf_enable_bfee_mu(struct rtw_dev *rtwdev, struct rtw_vif *vif, /* accept NDPA and BF report poll */ rtwdev->hal.rxfltmap1 |= BIT_RXFLTMAP1_BF; - rtw_write16(rtwdev, REG_RXFLTMAP1, rtwdev->hal.rxfltmap1); + rtw_update_rx_filter(rtwdev); } EXPORT_SYMBOL(rtw_bf_enable_bfee_mu); diff --git a/drivers/net/wireless/realtek/rtw88/mac80211.c b/drivers/net/wireless/realtek/rtw88/mac80211.c index 5e40cf06a9e32..8ad7c56bd0053 100644 --- a/drivers/net/wireless/realtek/rtw88/mac80211.c +++ b/drivers/net/wireless/realtek/rtw88/mac80211.c @@ -285,14 +285,11 @@ static void rtw_ops_configure_filter(struct ieee80211_hw *hw, mutex_lock(&rtwdev->mutex); + rtwdev->hal.rx_control = *new_flags & FIF_CONTROL; + rtw_leave_lps_deep(rtwdev); - if (changed_flags & FIF_CONTROL) { - if (*new_flags & FIF_CONTROL) - rtw_write16(rtwdev, REG_RXFLTMAP1, 0xffff); - else - rtw_write16(rtwdev, REG_RXFLTMAP1, rtwdev->hal.rxfltmap1); - } + rtw_update_rx_filter(rtwdev); if (changed_flags & FIF_ALLMULTI) { if (*new_flags & FIF_ALLMULTI) rtwdev->hal.rcr |= BIT_AM; diff --git a/drivers/net/wireless/realtek/rtw88/main.c b/drivers/net/wireless/realtek/rtw88/main.c index f7708ad17b6f5..f857273417137 100644 --- a/drivers/net/wireless/realtek/rtw88/main.c +++ b/drivers/net/wireless/realtek/rtw88/main.c @@ -728,6 +728,17 @@ void rtw_set_rx_freq_band(struct rtw_rx_pkt_stat *pkt_stat, u8 channel) } EXPORT_SYMBOL(rtw_set_rx_freq_band); +void rtw_update_rx_filter(struct rtw_dev *rtwdev) +{ + u16 rxfltmap1 = rtwdev->hal.rxfltmap1; + + if (rtwdev->hal.rx_control) + rxfltmap1 = 0xffff; + + rtw_write16(rtwdev, REG_RXFLTMAP1, rxfltmap1); +} +EXPORT_SYMBOL(rtw_update_rx_filter); + void rtw_set_dtim_period(struct rtw_dev *rtwdev, u8 dtim_period) { rtw_write32_set(rtwdev, REG_TCR, BIT_TCR_UPDATE_TIMIE); diff --git a/drivers/net/wireless/realtek/rtw88/main.h b/drivers/net/wireless/realtek/rtw88/main.h index 6ecbeb4ffe4be..b2df77098723a 100644 --- a/drivers/net/wireless/realtek/rtw88/main.h +++ b/drivers/net/wireless/realtek/rtw88/main.h @@ -1966,6 +1966,7 @@ struct rtw_sar { struct rtw_hal { u32 rcr; u16 rxfltmap1; + bool rx_control; u32 chip_version; u8 cut_version; @@ -2241,6 +2242,7 @@ enum nl80211_band rtw_hw_to_nl80211_band(enum rtw_supported_band hw_band) } void rtw_set_rx_freq_band(struct rtw_rx_pkt_stat *pkt_stat, u8 channel); +void rtw_update_rx_filter(struct rtw_dev *rtwdev); void rtw_set_dtim_period(struct rtw_dev *rtwdev, u8 dtim_period); void rtw_get_channel_params(struct cfg80211_chan_def *chandef, struct rtw_channel_params *ch_param); diff --git a/drivers/net/wireless/realtek/rtw88/reg.h b/drivers/net/wireless/realtek/rtw88/reg.h index afcdb66fdb9a1..8e220580be4f8 100644 --- a/drivers/net/wireless/realtek/rtw88/reg.h +++ b/drivers/net/wireless/realtek/rtw88/reg.h @@ -587,6 +587,10 @@ #define REG_RXFLTMAP0 0x06A0 #define REG_RXFLTMAP1 0x06A2 +#define BIT_RXFLTMAP1_BACK BIT(9) +#define BIT_RXFLTMAP1_RTS BIT(11) +#define BIT_RXFLTMAP1_CTS BIT(12) +#define BIT_RXFLTMAP1_ACK BIT(13) #define REG_RXFLTMAP2 0x06A4 #define REG_RXFLTMAP4 0x068A #define REG_BT_COEX_TABLE0 0x06C0 diff --git a/drivers/net/wireless/realtek/rtw88/rtw8723x.c b/drivers/net/wireless/realtek/rtw88/rtw8723x.c index 5dd306cb058ea..66d37b61dc9db 100644 --- a/drivers/net/wireless/realtek/rtw88/rtw8723x.c +++ b/drivers/net/wireless/realtek/rtw88/rtw8723x.c @@ -357,7 +357,7 @@ static int __rtw8723x_mac_init(struct rtw_dev *rtwdev) rtw_write16(rtwdev, REG_RXFLTMAP0, WLAN_RX_FILTER0); rtwdev->hal.rxfltmap1 = WLAN_RX_FILTER1; - rtw_write16(rtwdev, REG_RXFLTMAP1, rtwdev->hal.rxfltmap1); + rtw_update_rx_filter(rtwdev); rtw_write16(rtwdev, REG_RXFLTMAP2, WLAN_RX_FILTER2); rtw_write32(rtwdev, REG_RCR, WLAN_RCR_CFG); diff --git a/drivers/net/wireless/realtek/rtw88/rtw8814a.c b/drivers/net/wireless/realtek/rtw88/rtw8814a.c index b6916d3dc6d33..b401a4581d078 100644 --- a/drivers/net/wireless/realtek/rtw88/rtw8814a.c +++ b/drivers/net/wireless/realtek/rtw88/rtw8814a.c @@ -401,7 +401,7 @@ static int rtw8814a_mac_init(struct rtw_dev *rtwdev) rtw_write16(rtwdev, REG_RXFLTMAP0, 0xffff); rtwdev->hal.rxfltmap1 = 0x0400; - rtw_write16(rtwdev, REG_RXFLTMAP1, rtwdev->hal.rxfltmap1); + rtw_update_rx_filter(rtwdev); rtw_write16(rtwdev, REG_RXFLTMAP2, 0xffff); rtw_write8(rtwdev, REG_MAX_AGGR_NUM, 0x36); diff --git a/drivers/net/wireless/realtek/rtw88/rtw8821c.c b/drivers/net/wireless/realtek/rtw88/rtw8821c.c index 83ac6b732e800..ea97c9658979f 100644 --- a/drivers/net/wireless/realtek/rtw88/rtw8821c.c +++ b/drivers/net/wireless/realtek/rtw88/rtw8821c.c @@ -250,7 +250,7 @@ static int rtw8821c_mac_init(struct rtw_dev *rtwdev) /* WMAC configuration */ rtw_write16(rtwdev, REG_RXFLTMAP0, WLAN_RX_FILTER0); rtwdev->hal.rxfltmap1 = WLAN_RX_FILTER1; - rtw_write16(rtwdev, REG_RXFLTMAP1, rtwdev->hal.rxfltmap1); + rtw_update_rx_filter(rtwdev); rtw_write16(rtwdev, REG_RXFLTMAP2, WLAN_RX_FILTER2); rtw_write32(rtwdev, REG_RCR, WLAN_RCR_CFG); rtw_write8(rtwdev, REG_RX_PKT_LIMIT, WLAN_RXPKT_MAX_SZ_512); diff --git a/drivers/net/wireless/realtek/rtw88/rtw8822b.c b/drivers/net/wireless/realtek/rtw88/rtw8822b.c index cb05891c16274..f87a6ae567ee8 100644 --- a/drivers/net/wireless/realtek/rtw88/rtw8822b.c +++ b/drivers/net/wireless/realtek/rtw88/rtw8822b.c @@ -276,7 +276,7 @@ static int rtw8822b_mac_init(struct rtw_dev *rtwdev) /* WMAC configuration */ rtw_write16(rtwdev, REG_RXFLTMAP0, WLAN_RX_FILTER0); rtwdev->hal.rxfltmap1 = WLAN_RX_FILTER1; - rtw_write16(rtwdev, REG_RXFLTMAP1, rtwdev->hal.rxfltmap1); + rtw_update_rx_filter(rtwdev); rtw_write16(rtwdev, REG_RXFLTMAP2, WLAN_RX_FILTER2); rtw_write32(rtwdev, REG_RCR, WLAN_RCR_CFG); rtw_write8(rtwdev, REG_RX_PKT_LIMIT, WLAN_RXPKT_MAX_SZ_512); diff --git a/drivers/net/wireless/realtek/rtw88/rtw8822c.c b/drivers/net/wireless/realtek/rtw88/rtw8822c.c index 09315d23e2c40..5a5215c05276c 100644 --- a/drivers/net/wireless/realtek/rtw88/rtw8822c.c +++ b/drivers/net/wireless/realtek/rtw88/rtw8822c.c @@ -2096,7 +2096,17 @@ static int rtw8822c_mac_init(struct rtw_dev *rtwdev) rtw_write8(rtwdev, REG_WMAC_TRXPTCL_CTL_H + 2, WLAN_BAR_ACK_TYPE); rtw_write16(rtwdev, REG_RXFLTMAP0, WLAN_RX_FILTER0); rtwdev->hal.rxfltmap1 = WLAN_RX_FILTER1; - rtw_write16(rtwdev, REG_RXFLTMAP1, rtwdev->hal.rxfltmap1); + if (rtw_hci_type(rtwdev) == RTW_HCI_TYPE_SDIO) { + /* + * Hardware handles these frames; retain BAR and PS-Poll for + * mac80211. The common writer preserves FIF_CONTROL requests. + */ + rtwdev->hal.rxfltmap1 &= ~(BIT_RXFLTMAP1_BACK | + BIT_RXFLTMAP1_RTS | + BIT_RXFLTMAP1_CTS | + BIT_RXFLTMAP1_ACK); + } + rtw_update_rx_filter(rtwdev); rtw_write16(rtwdev, REG_RXFLTMAP2, WLAN_RX_FILTER2); rtw_write32(rtwdev, REG_RCR, WLAN_RCR_CFG); rtw_write8(rtwdev, REG_RX_PKT_LIMIT, WLAN_RXPKT_MAX_SZ_512); diff --git a/drivers/net/wireless/realtek/rtw88/rtw88xxa.c b/drivers/net/wireless/realtek/rtw88/rtw88xxa.c index 5ffa29d18168e..7aacdb64c6e3c 100644 --- a/drivers/net/wireless/realtek/rtw88/rtw88xxa.c +++ b/drivers/net/wireless/realtek/rtw88/rtw88xxa.c @@ -513,7 +513,7 @@ static void rtw88xxa_init_wmac_setting(struct rtw_dev *rtwdev) { rtw_write16(rtwdev, REG_RXFLTMAP0, 0xffff); rtwdev->hal.rxfltmap1 = 0x0400; - rtw_write16(rtwdev, REG_RXFLTMAP1, rtwdev->hal.rxfltmap1); + rtw_update_rx_filter(rtwdev); rtw_write16(rtwdev, REG_RXFLTMAP2, 0xffff); rtw_write32(rtwdev, REG_MAR, 0xffffffff);