RE: [PATCH rtw-next v3 1/2] wifi: rtw88: 8822c: filter hardware-handled control frames on SDIO

From: Ping-Ke Shih

Date: Tue Nov 17 2026 - 02:01:31 EST


Leonard Lausen <leonard@xxxxxxxxx> wrote:

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

a blank line.

> if (changed_flags & FIF_ALLMULTI) {
> if (*new_flags & FIF_ALLMULTI)
> rtwdev->hal.rcr |= BIT_AM;

[...]

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

In reverse order, see existing pattern.

> #define REG_RXFLTMAP2 0x06A4
> #define REG_RXFLTMAP4 0x068A
> #define REG_BT_COEX_TABLE0 0x06C0

[...]

> 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

I prefer the wording "not forward".

> + * 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);