mirror of https://lore.kernel.org/lkml/
 help / color / mirror / Atom feed
* [PATCH rtw-next v3 0/2] wifi: rtw88: reduce RTL8822CS SDIO request overhead
@ 2026-11-16 20:57 Leonard Lausen
  2026-11-16 20:57 ` [PATCH rtw-next v3 1/2] wifi: rtw88: 8822c: filter hardware-handled control frames on SDIO Leonard Lausen
                   ` (2 more replies)
  0 siblings, 3 replies; 4+ messages in thread
From: Leonard Lausen @ 2026-11-16 20:57 UTC (permalink / raw)
  To: Ping-Ke Shih
  Cc: leonard, Luka Gejak, David Härdeman, Shawn Lin,
	Heiko Stuebner, linux-wireless, linux-rockchip, linux-kernel

Reduce RTL8822CS SDIO request overhead by filtering hardware-handled
control frames and combining adjacent TX-capacity reads.

Changes in v3:
- Include monitor-filter correction in patch 1 as suggested by Luka Gejak.
- Cache the current FIF_CONTROL request even when changed_flags omits it.
- Use a shared filter writer in every chip initializer and both
  beamforming paths, preserving the monitor override and normal default.
- Keep the TX-capacity read optimization unchanged from v2.

On RTL8822CS/NanoPi M5, v2 lost the monitor override after IPS wake and
managed association: REG_RXFLTMAP1 was 0xc5ff instead of 0xffff. V3 kept
0xffff in both cases and restored 0xc5ff after monitor removal. Function
tracing confirmed filter configuration preceded MAC initialization on
IPS wake and both MU beamforming functions ran during association.

TCP medians on the same board with v3, in Mbit/s:

                              Upload   Download
  rtw-next baseline             163.4      247.5
  Both patches                  285.4      277.0

Median upload improved by 74.6% and download by 11.9%. Each configuration used
three 20-second TCP samples per direction on a shared Wi-Fi network,
so throughput can vary. Drivers were built against the running v7.4-rc2
kernel and hot-loaded with the same test-only key-iteration API adaptation
in firmware recovery. The MMC stack stayed unchanged, at 198 MHz SDR104,
with performance governors, SDIO IRQ on CPU4, client on CPU6 and server
on CPU7. Traffic crossed Wi-Fi/AP/Ethernet between endpoints on the board.

Independent v1 tests measured 52% upload and 9% download gains from
filtering alone, and 9% upload and 8% download from combined reads alone.
Adding reads after filtering gave another 11% upload and 4% download.
V1 used v7.4-rc2 plus the RX-bounds and MMC voltage-switch fixes, stock
MMC host limits, four 20-second upload and four 30-second download samples.

All 20 configured rtw88 module objects built on ARM64 with W=1 without
warnings; the runtime build passed modpost. Source-extracted filter tests
with mocked I/O reproduced failures before the correction; all 198 checks
passed with address/undefined-behavior sanitizers after it, including MAC
reset, unchanged flags and beamforming sequences. Actual full-system
restart, suspend/resume, AP operation and other-chip hardware remain
untested.

AI assistance: Codex traced the filter writers, developed the state
correction and regression tests, prepared the messages, and automated
builds and hardware validation. Prompts requested preserving FIF_CONTROL
across initialization, flag replay and beamforming, then retesting.

v2: https://lore.kernel.org/linux-wireless/20261116100804.425592-2-leonard@lausen.nl/T/#t


Leonard Lausen (2):
  wifi: rtw88: 8822c: filter hardware-handled control frames on SDIO
  wifi: rtw88: sdio: combine free TX page register reads

 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 +-
 drivers/net/wireless/realtek/rtw88/sdio.c     | 64 +++++++++++++++++--
 drivers/net/wireless/realtek/rtw88/sdio.h     |  1 +
 13 files changed, 99 insertions(+), 18 deletions(-)


base-commit: 61a5eb87b2d9b4d5e353780b781cf691f39ba9e1

^ permalink raw reply	[flat|nested] 4+ messages in thread

* [PATCH rtw-next v3 1/2] wifi: rtw88: 8822c: filter hardware-handled control frames on SDIO
  2026-11-16 20:57 [PATCH rtw-next v3 0/2] wifi: rtw88: reduce RTL8822CS SDIO request overhead Leonard Lausen
@ 2026-11-16 20:57 ` Leonard Lausen
  2026-11-16 20:57 ` [PATCH rtw-next v3 2/2] wifi: rtw88: sdio: combine free TX page register reads Leonard Lausen
  2026-11-16 21:46 ` [PATCH rtw-next v3 0/2] wifi: rtw88: reduce RTL8822CS SDIO request overhead Luka Gejak
  2 siblings, 0 replies; 4+ messages in thread
From: Leonard Lausen @ 2026-11-16 20:57 UTC (permalink / raw)
  To: Ping-Ke Shih
  Cc: leonard, Luka Gejak, David Härdeman, 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 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 <luka.gejak@linux.dev>
Signed-off-by: Leonard Lausen <leonard@lausen.nl>
---
 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);

^ permalink raw reply	[flat|nested] 4+ messages in thread

* [PATCH rtw-next v3 2/2] wifi: rtw88: sdio: combine free TX page register reads
  2026-11-16 20:57 [PATCH rtw-next v3 0/2] wifi: rtw88: reduce RTL8822CS SDIO request overhead Leonard Lausen
  2026-11-16 20:57 ` [PATCH rtw-next v3 1/2] wifi: rtw88: 8822c: filter hardware-handled control frames on SDIO Leonard Lausen
@ 2026-11-16 20:57 ` Leonard Lausen
  2026-11-16 21:46 ` [PATCH rtw-next v3 0/2] wifi: rtw88: reduce RTL8822CS SDIO request overhead Luka Gejak
  2 siblings, 0 replies; 4+ messages in thread
From: Leonard Lausen @ 2026-11-16 20:57 UTC (permalink / raw)
  To: Ping-Ke Shih
  Cc: leonard, Luka Gejak, David Härdeman, 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;

^ permalink raw reply	[flat|nested] 4+ messages in thread

* Re: [PATCH rtw-next v3 0/2] wifi: rtw88: reduce RTL8822CS SDIO request overhead
  2026-11-16 20:57 [PATCH rtw-next v3 0/2] wifi: rtw88: reduce RTL8822CS SDIO request overhead Leonard Lausen
  2026-11-16 20:57 ` [PATCH rtw-next v3 1/2] wifi: rtw88: 8822c: filter hardware-handled control frames on SDIO Leonard Lausen
  2026-11-16 20:57 ` [PATCH rtw-next v3 2/2] wifi: rtw88: sdio: combine free TX page register reads Leonard Lausen
@ 2026-11-16 21:46 ` Luka Gejak
  2 siblings, 0 replies; 4+ messages in thread
From: Luka Gejak @ 2026-11-16 21:46 UTC (permalink / raw)
  To: Leonard Lausen, Ping-Ke Shih
  Cc: leonard, David Härdeman, Shawn Lin, Heiko Stuebner,
	linux-wireless, linux-rockchip, linux-kernel

Hi Leonard,

On November 16, 2026 9:57:36 PM GMT+01:00, Leonard Lausen
<leonard@lausen.nl> wrote:
>Reduce RTL8822CS SDIO request overhead by filtering hardware-handled
>control frames and combining adjacent TX-capacity reads.
>
>Changes in v3:
>- Include monitor-filter correction in patch 1 as suggested by Luka Gejak.
>- Cache the current FIF_CONTROL request even when changed_flags omits it.
>- Use a shared filter writer in every chip initializer and both
>  beamforming paths, preserving the monitor override and normal default.
>- Keep the TX-capacity read optimization unchanged from v2.
>

Thanks for v3. It looks good to me, so for the series,

Reviewed-by: Luka Gejak <luka.gejak@linux.dev>

Best regards,
Luka Gejak

^ permalink raw reply	[flat|nested] 4+ messages in thread

end of thread, other threads:[~2026-11-16 21:47 UTC | newest]

Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2026-11-16 20:57 [PATCH rtw-next v3 0/2] wifi: rtw88: reduce RTL8822CS SDIO request overhead Leonard Lausen
2026-11-16 20:57 ` [PATCH rtw-next v3 1/2] wifi: rtw88: 8822c: filter hardware-handled control frames on SDIO Leonard Lausen
2026-11-16 20:57 ` [PATCH rtw-next v3 2/2] wifi: rtw88: sdio: combine free TX page register reads Leonard Lausen
2026-11-16 21:46 ` [PATCH rtw-next v3 0/2] wifi: rtw88: reduce RTL8822CS SDIO request overhead Luka Gejak

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox

all inboxes | Powered by JetHome®