From mboxrd@z Thu Jan 1 00:00:00 1970 Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.remote-ip=95.143.172.20 ARC-Seal: i=1; d=subspace.kernel.org; s=arc20261015; a=rsa-sha256; cv=none; t=1794823917; b=DRdFUpb8wRzlcWOmbzbArUW5yEGSLaHxCAF8KBRdR9TsXaEqLVCZlNIe2VxcAvODDujE 76S5VZkHM9bsv7v8kOpvKLTCp9Uy/hXpyMN5t5TqI3HQjJ5iQrPSJc2+I1UaeBv/ir3Tc 740SO3txa8oBiC3hZjxrAf2k4ss95Zq6Sgw8h+PrnioO36V63JS3MhBlOCPNveggC42i0 dbTE2jIJ0p3u+U15heVZtpFgGx9daARzMTjXeM8nUx6NS0vsa/Q6YXxAvOO6kMCdbCXtG 3IDLgd8fqd2IsF7GP4eHrhZUGTcqiz4m1v2lhhXGLxaTWazZc6ziFYEdiBAF1g5VSaQ== ARC-Message-Signature: i=1; d=subspace.kernel.org; s=arc20261015; a=rsa-sha256; c=relaxed/relaxed; t=1794823917; h=DMARC-Filter:Received:Received:Received:From:To:Cc:Subject:Date: Message-ID:X-Mailer:In-Reply-To:References:MIME-Version: Content-Transfer-Encoding:X-Rspamd-Bar:X-Rspamd-Report:X-Rspamd-Score: DKIM-Signature; bh=5jH2tJA0uI2n3x3vkbX24aFcRenl7hpMtrCEnX84aIs=; b=j3oHsjLo/v8TuFN1Vwy5/F+QfV2vUQDKr8zHaE5+vWpRC/KALbOQhEq7hVnPV/fJgocH 7t47tjkq8qXIjfqrUOkZCU3hs2C+4dLT1LIlUtLiB6Jm81HHRJjhbVGvTxQe/oVTqMFRI 1AeK2uC1ppgymBj2iGecL5wJRY9jm8fl5bEilL2h1vwiRiZ7PQ79y3TFeud5l20rzF0Oe gelRTIG5U+F58JubibWp8OCgwljEUgPUV4fgcr4ibMVISeBwze3GyrJKOqPKgh2Hho7Hy idSz6ZmPRC70bkwZnm3GyXVvXrkKt9OBHRUFoFiAbu8sM7e61RKtB1QLBw7IXsH/rqg== ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass header.from=lausen.nl; spf=pass smtp.mailfrom=lausen.nl; dkim=pass header.d=lausen.nl header.i=@lausen.nl header.a=rsa-sha256 header.s=uberspace header.b=FNsTOjKf; arc=none smtp.remote-ip=95.143.172.20 Received: from mailgate01.uberspace.is (mailgate01.uberspace.is [95.143.172.20]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (prime256v1)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id EA538606A329 for ; Mon, 16 Nov 2026 10:11:55 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.4.2 smtp.subspace.kernel.org EA538606A329 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=lausen.nl Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=lausen.nl Authentication-Results: smtp.subspace.kernel.org; dkim=pass (4096-bit key) header.d=lausen.nl header.i=@lausen.nl header.a=rsa-sha256 header.s=uberspace header.b=FNsTOjKf Received: from devico.uberspace.de (devico.uberspace.de [185.26.156.185]) by mailgate01.uberspace.is (Postfix) with ESMTPS id 6CE9860F23 for ; Mon, 16 Nov 2026 11:11:54 +0100 (CET) Received: (qmail 32747 invoked by uid 990); 16 Nov 2026 10:11:54 -0000 Authentication-Results: devico.uberspace.de; auth=pass (plain) Received: from unknown (HELO unknown) (::1) by devico.uberspace.de (Haraka/3.1.1) with ESMTPSA; Mon, 16 Nov 2026 11:11:53 +0100 From: Leonard Lausen To: Ping-Ke Shih Cc: leonard@lausen.nl, Luka Gejak , Shawn Lin , Heiko Stuebner , linux-wireless@vger.kernel.org, linux-rockchip@lists.infradead.org, linux-kernel@vger.kernel.org Subject: [PATCH rtw-next v2 2/2] wifi: rtw88: sdio: combine free TX page register reads Date: Mon, 16 Nov 2026 10:08:05 +0000 Message-ID: <20261116100804.425592-6-leonard@lausen.nl> X-Mailer: git-send-email 2.47.3 In-Reply-To: <20261116100804.425592-2-leonard@lausen.nl> References: <20261116100804.425592-2-leonard@lausen.nl> X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Rspamd-Bar: ----- X-Rspamd-Report: REPLY(-4) BAYES_HAM(-3) MID_CONTAINS_FROM(1) MIME_GOOD(-0.1) R_MISSING_CHARSET(0.5) X-Rspamd-Score: -5.6 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=lausen.nl; s=uberspace; h=from:to:cc:subject:date; bh=CnMs8NT+xPKw7Y8nLMvWZzG8vTWG9cCa8Tj+HGNDofQ=; b=FNsTOjKffSt9/4uddZlxuurPBC/5wYuB48nKpcsujdN8+eLzgqiYlrDEdp66ZtN6aBrd2Xo3ZV rXDwBThP7AimteRhAI5s3tL4KxSqvwS+J8xwDzyI/26kwlASP+C7B3A0A1Bnt1YNny1uPTfftNMX QkJvSvzPcqif1hbn0qlXLrGi05bG+esZDyGBptcyX4iaGNN7dBOXfKXxhFAR3TT4RmoTD12dI563 49pZHjVM1q+t95gKJ6k0Q447UP+oewTgAsa+fdDZdEO/Uaxh+cKn+WPVEEJ+/anIjHlllXbve3Dv Zbf4/fpDnsHIKyeDjMx16cr26dlZesh3eX3zHSnVvjeOvW/q8Z59n7vyxIKMMtFp16qiBRUDWvXc RSYpMSCKnqBb8JUW5n9CKIiZSTHDcKGbd0sPSEiYFkBNWD6x2AaUMig8ckUw8A/3qItxO5B7Wjl0 7Ff77u6cVwWULa791EIEIB7u2TZbQr6Zj5VTcXxs9BsWs5oXqgeZj0bqdB+XvmEmCrrlVzW1wzAL GHo3NM68h9Vw+z6Mcd9kFU43DjYCN+0nFNwVTdlZnOROZBzjmj1tWoO2YM5ydU7MT9d+qhPrf5Q5 7XYYJ8zh/7YEWgUobuNBgUFUeu8RRYOqCbX+pyQd1BE/LEuoszy3K1EH0R7Z3npX0ya3wCnYxs8l I= 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 --- 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;