[PATCH 2/2] wifi: rtw88: sdio: combine free TX page register reads
From: Leonard Lausen
Date: Sun Nov 15 2026 - 09:26:06 EST
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.
On RTL8822CS/NanoPi M5 at 198 MHz SDR104, median TCP upload increased
from 170 to 186 Mbit/s (+9%) with this patch alone, and from 258 to
287 Mbit/s (+11%) when added after control-frame filtering.
A separate download test measured 241 to 262 Mbit/s (+8%) with this
patch alone, and 263 to 274 Mbit/s (+4%) when added after filtering.
Assisted-by: LLM
Signed-off-by: Leonard Lausen <leonard@xxxxxxxxx>
---
drivers/net/wireless/realtek/rtw88/sdio.c | 58 +++++++++++++++++++++--
drivers/net/wireless/realtek/rtw88/sdio.h | 1 +
2 files changed, 55 insertions(+), 4 deletions(-)
diff --git a/drivers/net/wireless/realtek/rtw88/sdio.c b/drivers/net/wireless/realtek/rtw88/sdio.c
index dc2fd0f8f9fff..4aeff250a6d6a 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,40 @@ 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)
+{
+ struct rtw_sdio *rtwsdio = (struct rtw_sdio *)rtwdev->priv;
+ bool bus_claim = rtw_sdio_bus_claim_needed(rtwsdio);
+ u32 addr = rtw_sdio_to_bus_offset(rtwdev, REG_SDIO_FREE_TXPG);
+ 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, 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[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 +762,14 @@ 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:
@@ -1777,6 +1815,7 @@ int rtw_sdio_probe(struct sdio_func *sdio_func,
{
struct ieee80211_hw *hw;
struct rtw_dev *rtwdev;
+ struct rtw_sdio *rtwsdio;
int drv_data_size;
int ret;
@@ -1798,6 +1837,17 @@ 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 = devm_kmalloc_array(rtwdev->dev,
+ RTW_SDIO_FREE_TXPG_COUNT,
+ sizeof(*rtwsdio->free_txpg), GFP_KERNEL);
+ if (!rtwsdio->free_txpg) {
+ 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..8310bf6d54b59 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;
};
extern const struct dev_pm_ops rtw_sdio_pm_ops;