From: "David Härdeman" <david@hardeman.nu>
To: Ping-Ke Shih <pkshih@realtek.com>, linux-wireless@vger.kernel.org
Cc: linux-kernel@vger.kernel.org,
"Leonard Lausen" <leonard@lausen.nl>,
"Alastair D'Silva" <alastair@d-silva.org>,
"Luka Gejak" <luka.gejak@linux.dev>,
"Martin Blumenstingl" <martin.blumenstingl@googlemail.com>,
"Jernej Skrabec" <jernej.skrabec@gmail.com>,
"Bitterblue Smith" <rtl8821cerfe2@gmail.com>,
"David Härdeman" <david@hardeman.nu>
Subject: [PATCH rtw-next 5/5] wifi: rtw88: sdio: read neighbouring registers of the 88xx chips at once
Date: Mon, 16 Nov 2026 20:01:45 +0100 [thread overview]
Message-ID: <20261116190145.2736364-6-david@hardeman.nu> (raw)
In-Reply-To: <20261116190145.2736364-1-david@hardeman.nu>
Every register access costs a full SDIO command, about 40 us on a NanoPi
R76S (RTL8822CS, SDR104), no matter how many bytes it moves. The
interrupt handler reads HISR and then RX0_REQ_LEN, which follows it, and
a free page sync reads the three REG_SDIO_FREE_TXPG words one by one.
Read HISR together with RX0_REQ_LEN, and the three free page words, with
one transfer each, as Realtek's driver does. As in rtw_sdio_readl(),
this is only done while the chip is powered on; before that, and if the
small DMA-safe buffers this needs could not be allocated, the registers
are read one by one as before.
On the R76S acting as an AP, TCP throughput to a client goes from about
170 to about 190 Mbit/s, the other directions are unchanged.
Signed-off-by: David Härdeman <david@hardeman.nu>
---
drivers/net/wireless/realtek/rtw88/sdio.c | 84 ++++++++++++++++++++---
drivers/net/wireless/realtek/rtw88/sdio.h | 4 ++
2 files changed, 78 insertions(+), 10 deletions(-)
diff --git a/drivers/net/wireless/realtek/rtw88/sdio.c b/drivers/net/wireless/realtek/rtw88/sdio.c
index a7664486613..76309405b4e 100644
--- a/drivers/net/wireless/realtek/rtw88/sdio.c
+++ b/drivers/net/wireless/realtek/rtw88/sdio.c
@@ -700,16 +700,59 @@ static atomic_t *rtw_sdio_8723bs_free_txpg(struct rtw_dev *rtwdev, u8 queue)
* keep them and read the registers again only when they say a transfer does
* not fit.
*/
+/*
+ * Read consecutive SDIO local registers with one transfer instead of one per
+ * register. buf must be DMA-safe. Like rtw_sdio_readl(), this only uses CMD53
+ * while the chip is powered on; otherwise it fails with -EAGAIN and the caller
+ * reads the registers one by one.
+ */
+static int rtw_sdio_read_local_regs(struct rtw_dev *rtwdev, u32 addr,
+ __le32 *buf, unsigned int num)
+{
+ struct rtw_sdio *rtwsdio = (struct rtw_sdio *)rtwdev->priv;
+ bool bus_claim;
+ int ret;
+
+ if (!rtw_sdio_use_memcpy_io(rtwdev, addr, 4))
+ return -EAGAIN;
+
+ bus_claim = rtw_sdio_bus_claim_needed(rtwsdio);
+
+ if (bus_claim)
+ sdio_claim_host(rtwsdio->sdio_func);
+
+ ret = sdio_memcpy_fromio(rtwsdio->sdio_func, buf,
+ rtw_sdio_to_io_address(rtwdev, addr, true),
+ num * sizeof(*buf));
+
+ if (bus_claim)
+ sdio_release_host(rtwsdio->sdio_func);
+
+ if (ret)
+ rtw_warn(rtwdev, "sdio read of %u registers at 0x%x failed: %d",
+ num, addr, ret);
+
+ return ret;
+}
+
static void rtw_sdio_88xx_sync_free_txpg(struct rtw_dev *rtwdev)
{
struct rtw_sdio *rtwsdio = (struct rtw_sdio *)rtwdev->priv;
+ __le32 *regs = rtwsdio->txpg_regs;
u32 free_txpg[3];
lockdep_assert_held(&rtwsdio->tx_credit_lock);
- 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);
+ if (regs && !rtw_sdio_read_local_regs(rtwdev, REG_SDIO_FREE_TXPG,
+ regs, 3)) {
+ free_txpg[0] = le32_to_cpu(regs[0]);
+ free_txpg[1] = le32_to_cpu(regs[1]);
+ free_txpg[2] = le32_to_cpu(regs[2]);
+ } else {
+ 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);
+ }
atomic_set(&rtwsdio->free_pg_high, free_txpg[0] & 0xfff);
atomic_set(&rtwsdio->free_pg_normal, (free_txpg[0] >> 16) & 0xfff);
@@ -1633,12 +1676,15 @@ static bool rtw_sdio_rx_budget_left(struct rtw_dev *rtwdev, u32 rx_bytes)
!rtw_sdio_tx_pending(rtwdev);
}
-static void rtw_sdio_rx_isr(struct rtw_dev *rtwdev)
+/* rx_len: the RX request length if it was read together with HISR, or 0 */
+static void rtw_sdio_rx_isr(struct rtw_dev *rtwdev, u32 rx_len)
{
- u32 rx_len, hisr, total_rx_bytes = 0;
+ u32 hisr, total_rx_bytes = 0;
do {
- if (rtw_chip_wcpu_8051(rtwdev))
+ if (rx_len)
+ ;
+ else if (rtw_chip_wcpu_8051(rtwdev))
rx_len = rtw_read16(rtwdev, REG_SDIO_RX0_REQ_LEN);
else
rx_len = rtw_read32(rtwdev, REG_SDIO_RX0_REQ_LEN);
@@ -1649,6 +1695,7 @@ static void rtw_sdio_rx_isr(struct rtw_dev *rtwdev)
rtw_sdio_rxfifo_recv(rtwdev, rx_len);
total_rx_bytes += rx_len;
+ rx_len = 0;
if (rtw_chip_wcpu_8051(rtwdev)) {
/* Stop if no more RX requests are pending, even if
@@ -1676,20 +1723,28 @@ static void rtw_sdio_handle_interrupt(struct sdio_func *sdio_func)
struct ieee80211_hw *hw = sdio_get_drvdata(sdio_func);
struct rtw_sdio *rtwsdio;
struct rtw_dev *rtwdev;
- u32 hisr;
+ u32 hisr, rx_len = 0;
rtwdev = hw->priv;
rtwsdio = (struct rtw_sdio *)rtwdev->priv;
rtwsdio->irq_thread = current;
- hisr = rtw_read32(rtwdev, REG_SDIO_HISR);
+ /* RX0_REQ_LEN follows HISR, read both at once where possible */
+ if (rtwsdio->rx_regs &&
+ !rtw_sdio_read_local_regs(rtwdev, REG_SDIO_HISR,
+ rtwsdio->rx_regs, 2)) {
+ hisr = le32_to_cpu(rtwsdio->rx_regs[0]);
+ rx_len = le32_to_cpu(rtwsdio->rx_regs[1]);
+ } else {
+ hisr = rtw_read32(rtwdev, REG_SDIO_HISR);
+ }
if (hisr & REG_SDIO_HISR_TXERR)
rtw_sdio_tx_err_isr(rtwdev);
if (hisr & REG_SDIO_HISR_RX_REQUEST) {
hisr &= ~REG_SDIO_HISR_RX_REQUEST;
- rtw_sdio_rx_isr(rtwdev);
+ rtw_sdio_rx_isr(rtwdev, rx_len);
}
/*
@@ -2127,9 +2182,14 @@ static int rtw_sdio_init_tx(struct rtw_dev *rtwdev)
* that only the non-8051 chips keep; without the buffer, frames are
* sent one by one.
*/
- if (!rtw_chip_wcpu_8051(rtwdev))
+ if (!rtw_chip_wcpu_8051(rtwdev)) {
rtwsdio->tx_agg_buf = kmalloc(RTW_SDIO_TX_AGG_MAX_SIZE +
RTW_SDIO_BLOCK_SIZE, GFP_KERNEL);
+ /* without these, the registers are read one by one */
+ rtwsdio->rx_regs = kmalloc_array(2, sizeof(__le32), GFP_KERNEL);
+ rtwsdio->txpg_regs = kmalloc_array(3, sizeof(__le32),
+ GFP_KERNEL);
+ }
for (i = 0; i < RTK_MAX_TX_QUEUE_NUM; i++) {
skb_queue_head_init(&rtwsdio->tx_queue[i]);
@@ -2146,6 +2206,8 @@ static int rtw_sdio_init_tx(struct rtw_dev *rtwdev)
err_destroy_wq:
kfree(rtwsdio->tx_agg_buf);
+ kfree(rtwsdio->rx_regs);
+ kfree(rtwsdio->txpg_regs);
mutex_destroy(&rtwsdio->tx_credit_lock);
destroy_workqueue(rtwsdio->txwq);
return -ENOMEM;
@@ -2164,6 +2226,8 @@ static void rtw_sdio_deinit_tx(struct rtw_dev *rtwdev)
ieee80211_purge_tx_queue(rtwdev->hw, &rtwsdio->tx_queue[i]);
kfree(rtwsdio->tx_agg_buf);
+ kfree(rtwsdio->rx_regs);
+ kfree(rtwsdio->txpg_regs);
mutex_destroy(&rtwsdio->tx_credit_lock);
}
diff --git a/drivers/net/wireless/realtek/rtw88/sdio.h b/drivers/net/wireless/realtek/rtw88/sdio.h
index ab366f82d92..6aa59ed3db2 100644
--- a/drivers/net/wireless/realtek/rtw88/sdio.h
+++ b/drivers/net/wireless/realtek/rtw88/sdio.h
@@ -188,6 +188,10 @@ struct rtw_sdio {
bool free_txpg_valid;
/* TX aggregation buffer of the non-8051 chips, under tx_credit_lock */
u8 *tx_agg_buf;
+ /* non-8051 chips: HISR + RX0_REQ_LEN, read by the interrupt handler */
+ __le32 *rx_regs;
+ /* non-8051 chips: the REG_SDIO_FREE_TXPG words, under tx_credit_lock */
+ __le32 *txpg_regs;
/* one writer at a time between the credit check and the accounting */
struct mutex tx_credit_lock;
};
--
2.47.3
next prev parent reply other threads:[~2026-11-16 19:02 UTC|newest]
Thread overview: 14+ messages / expand[flat|nested] mbox.gz Atom feed top
2026-11-16 19:01 [PATCH rtw-next 0/5] wifi: rtw88: sdio: faster and fairer TX for the 88xx chips David Härdeman
2026-11-16 19:01 ` [PATCH rtw-next 1/5] wifi: rtw88: sdio: cache the free TX page counts of " David Härdeman
2026-11-17 7:20 ` Luka Gejak
2026-11-17 12:50 ` David Härdeman
2026-11-16 19:01 ` [PATCH rtw-next 2/5] wifi: rtw88: sdio: aggregate TX frames " David Härdeman
2026-11-16 19:01 ` [PATCH rtw-next 3/5] wifi: rtw88: sdio: limit the TX queue length " David Härdeman
2026-11-17 7:21 ` Luka Gejak
2026-11-17 12:57 ` David Härdeman
2026-11-16 19:01 ` [PATCH rtw-next 4/5] wifi: rtw88: sdio: let TX in while receiving on " David Härdeman
2026-11-16 19:01 ` David Härdeman [this message]
2026-11-16 21:59 ` [PATCH rtw-next 0/5] wifi: rtw88: sdio: faster and fairer TX for " Luka Gejak
2026-11-17 7:46 ` Ping-Ke Shih
2026-11-17 14:44 ` David Härdeman
2026-11-17 15:27 ` Luka Gejak
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20261116190145.2736364-6-david@hardeman.nu \
--to=david@hardeman.nu \
--cc=alastair@d-silva.org \
--cc=jernej.skrabec@gmail.com \
--cc=leonard@lausen.nl \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-wireless@vger.kernel.org \
--cc=luka.gejak@linux.dev \
--cc=martin.blumenstingl@googlemail.com \
--cc=pkshih@realtek.com \
--cc=rtl8821cerfe2@gmail.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.