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;