* [PATCH rtw-next v2 1/2] wifi: rtw88: 8822c: filter hardware-handled control frames on SDIO
2026-11-16 10:08 [PATCH rtw-next v2 0/2] wifi: rtw88: reduce RTL8822CS SDIO request overhead Leonard Lausen
@ 2026-11-16 10:08 ` Leonard Lausen
2026-11-16 16:30 ` Luka Gejak
2026-11-16 10:08 ` [PATCH rtw-next v2 2/2] wifi: rtw88: sdio: combine free TX page register reads Leonard Lausen
1 sibling, 1 reply; 4+ messages in thread
From: Leonard Lausen @ 2026-11-16 10:08 UTC (permalink / raw)
To: Ping-Ke Shih
Cc: leonard, Luka Gejak, Shawn Lin, Heiko Stuebner, linux-wireless,
linux-rockchip, linux-kernel
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 SDIO default RX filter. Retain BAR,
PS-Poll and the remaining subtypes, and store the default in rxfltmap1
so FIF_CONTROL can still request all control frames.
Limit the new default to SDIO, where profiling identified this overhead.
PCIe and USB receive paths have not been tested with this filter setting.
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
Signed-off-by: Leonard Lausen <leonard@lausen.nl>
---
drivers/net/wireless/realtek/rtw88/reg.h | 4 ++++
drivers/net/wireless/realtek/rtw88/rtw8822c.c | 10 ++++++++++
2 files changed, 14 insertions(+)
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/rtw8822c.c b/drivers/net/wireless/realtek/rtw88/rtw8822c.c
index 09315d23e2c40..03e714c3c2e7a 100644
--- a/drivers/net/wireless/realtek/rtw88/rtw8822c.c
+++ b/drivers/net/wireless/realtek/rtw88/rtw8822c.c
@@ -2096,6 +2096,16 @@ 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;
+ if (rtw_hci_type(rtwdev) == RTW_HCI_TYPE_SDIO) {
+ /*
+ * Hardware handles these frames; retain BAR and PS-Poll for
+ * mac80211. FIF_CONTROL restores all subtypes for monitors.
+ */
+ rtwdev->hal.rxfltmap1 &= ~(BIT_RXFLTMAP1_BACK |
+ BIT_RXFLTMAP1_RTS |
+ BIT_RXFLTMAP1_CTS |
+ BIT_RXFLTMAP1_ACK);
+ }
rtw_write16(rtwdev, REG_RXFLTMAP1, rtwdev->hal.rxfltmap1);
rtw_write16(rtwdev, REG_RXFLTMAP2, WLAN_RX_FILTER2);
rtw_write32(rtwdev, REG_RCR, WLAN_RCR_CFG);
_______________________________________________
Linux-rockchip mailing list
Linux-rockchip@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-rockchip
^ permalink raw reply related [flat|nested] 4+ messages in thread* [PATCH rtw-next v2 2/2] wifi: rtw88: sdio: combine free TX page register reads
2026-11-16 10:08 [PATCH rtw-next v2 0/2] wifi: rtw88: reduce RTL8822CS SDIO request overhead Leonard Lausen
2026-11-16 10:08 ` [PATCH rtw-next v2 1/2] wifi: rtw88: 8822c: filter hardware-handled control frames on SDIO Leonard Lausen
@ 2026-11-16 10:08 ` Leonard Lausen
1 sibling, 0 replies; 4+ messages in thread
From: Leonard Lausen @ 2026-11-16 10:08 UTC (permalink / raw)
To: Ping-Ke Shih
Cc: leonard, Luka Gejak, Shawn Lin, Heiko Stuebner, linux-wireless,
linux-rockchip, linux-kernel
TX capacity checks on non-8051 chips read three adjacent 32-bit registers
in separate SDIO requests. Combine them into one 12-byte CMD53 read when
the existing power/alignment check permits it, with the per-register
fallback otherwise. Propagate read errors before checking queue capacity.
Allocate a DMA-safe buffer at probe and copy its little-endian values
into the caller's array before releasing the host. Holding the host
through the read and copy serializes access to the shared buffer.
Signed-off-by: Leonard Lausen <leonard@lausen.nl>
---
drivers/net/wireless/realtek/rtw88/sdio.c | 64 +++++++++++++++++++++++++++++--
drivers/net/wireless/realtek/rtw88/sdio.h | 1 +
2 files changed, 61 insertions(+), 4 deletions(-)
diff --git a/drivers/net/wireless/realtek/rtw88/sdio.c b/drivers/net/wireless/realtek/rtw88/sdio.c
index ecd4d751c05a5..09337acb76749 100644
--- a/drivers/net/wireless/realtek/rtw88/sdio.c
+++ b/drivers/net/wireless/realtek/rtw88/sdio.c
@@ -26,6 +26,7 @@
#define RTW_SDIO_TX_FIFO_HIWATER 16
#define RTW_SDIO_TX_FIFO_LOWATER 8
#define RTW_SDIO_TX_RETRY_DELAY msecs_to_jiffies(1)
+#define RTW_SDIO_FREE_TXPG_COUNT 3
static bool rtw_sdio_is_bus_addr(u32 addr)
{
@@ -675,6 +676,43 @@ static atomic_t *rtw_sdio_8723bs_free_txpg(struct rtw_dev *rtwdev, u8 queue)
}
}
+static int rtw_sdio_read_free_txpg(struct rtw_dev *rtwdev, u32 *free_txpg)
+{
+ u32 addr = rtw_sdio_to_bus_offset(rtwdev, REG_SDIO_FREE_TXPG);
+ struct rtw_sdio *rtwsdio = (struct rtw_sdio *)rtwdev->priv;
+ bool bus_claim = rtw_sdio_bus_claim_needed(rtwsdio);
+ int i, ret;
+
+ if (bus_claim)
+ sdio_claim_host(rtwsdio->sdio_func);
+
+ if (!rtw_sdio_use_memcpy_io(rtwdev, addr, sizeof(u32))) {
+ for (i = 0; i < RTW_SDIO_FREE_TXPG_COUNT; i++) {
+ free_txpg[i] = rtw_sdio_readl(rtwdev,
+ addr + i * sizeof(u32),
+ &ret);
+ if (ret)
+ break;
+ }
+ goto out;
+ }
+
+ ret = sdio_memcpy_fromio(rtwsdio->sdio_func,
+ rtwsdio->free_txpg_buf, addr,
+ RTW_SDIO_FREE_TXPG_COUNT * sizeof(__le32));
+ if (!ret) {
+ /* Copy the shared DMA buffer before releasing the host. */
+ for (i = 0; i < RTW_SDIO_FREE_TXPG_COUNT; i++)
+ free_txpg[i] = le32_to_cpu(rtwsdio->free_txpg_buf[i]);
+ }
+
+out:
+ if (bus_claim)
+ sdio_release_host(rtwsdio->sdio_func);
+
+ return ret;
+}
+
static int rtw_sdio_check_free_txpg(struct rtw_dev *rtwdev, u8 queue,
size_t count)
{
@@ -727,11 +765,15 @@ static int rtw_sdio_check_free_txpg(struct rtw_dev *rtwdev, u8 queue,
/* add the pages from the public queue */
pages_free += (free_txpg >> 24) & 0xff;
} else {
- u32 free_txpg[3];
+ u32 free_txpg[RTW_SDIO_FREE_TXPG_COUNT];
+ int ret;
- free_txpg[0] = rtw_sdio_read32(rtwdev, REG_SDIO_FREE_TXPG);
- free_txpg[1] = rtw_sdio_read32(rtwdev, REG_SDIO_FREE_TXPG + 4);
- free_txpg[2] = rtw_sdio_read32(rtwdev, REG_SDIO_FREE_TXPG + 8);
+ ret = rtw_sdio_read_free_txpg(rtwdev, free_txpg);
+ if (ret) {
+ rtw_warn(rtwdev, "Failed to read free TX pages: %d\n",
+ ret);
+ return ret;
+ }
switch (queue) {
case RTW_TX_QUEUE_BCN:
@@ -1782,6 +1824,7 @@ static void rtw_sdio_deinit_tx(struct rtw_dev *rtwdev)
int rtw_sdio_probe(struct sdio_func *sdio_func,
const struct sdio_device_id *id)
{
+ struct rtw_sdio *rtwsdio;
struct ieee80211_hw *hw;
struct rtw_dev *rtwdev;
int drv_data_size;
@@ -1805,6 +1848,19 @@ int rtw_sdio_probe(struct sdio_func *sdio_func,
if (ret)
goto err_release_hw;
+ rtwsdio = (struct rtw_sdio *)rtwdev->priv;
+ if (!rtw_chip_wcpu_8051(rtwdev)) {
+ rtwsdio->free_txpg_buf =
+ devm_kmalloc_array(rtwdev->dev,
+ RTW_SDIO_FREE_TXPG_COUNT,
+ sizeof(*rtwsdio->free_txpg_buf),
+ GFP_KERNEL);
+ if (!rtwsdio->free_txpg_buf) {
+ ret = -ENOMEM;
+ goto err_deinit_core;
+ }
+ }
+
rtw_dbg(rtwdev, RTW_DBG_SDIO,
"rtw88 SDIO probe: vendor=0x%04x device=%04x class=%02x",
id->vendor, id->device, id->class);
diff --git a/drivers/net/wireless/realtek/rtw88/sdio.h b/drivers/net/wireless/realtek/rtw88/sdio.h
index 6e7e6009744b0..5c2337ccffb2a 100644
--- a/drivers/net/wireless/realtek/rtw88/sdio.h
+++ b/drivers/net/wireless/realtek/rtw88/sdio.h
@@ -181,6 +181,7 @@ struct rtw_sdio {
atomic_t tx_oqt_free;
/* one writer at a time between the credit check and the accounting */
struct mutex tx_credit_lock;
+ __le32 *free_txpg_buf;
};
extern const struct dev_pm_ops rtw_sdio_pm_ops;
_______________________________________________
Linux-rockchip mailing list
Linux-rockchip@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-rockchip
^ permalink raw reply related [flat|nested] 4+ messages in thread