* [GIT PULL] wireless-2026-11-22
From: Johannes Berg @ 2026-01-22 11:00 UTC (permalink / raw)
To: netdev; +Cc: linux-wireless
Hi,
Some more updates from wireless. The only interesting thing here is
that there's a merge conflict with net-next, see here:
https://lore.kernel.org/all/98386125-c0bb-495e-b2ba-2765aaed19d8@oss.qualcomm.com/
Please pull and let us know if there's any problem.
Thanks,
johannes
The following changes since commit f2a3b12b305c7bb72467b2a56d19a4587b6007f9:
Merge tag 'net-6.19-rc5' of git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net (2026-01-08 08:40:35 -1000)
are available in the Git repository at:
https://git.kernel.org/pub/scm/linux/kernel/git/wireless/wireless.git tags/wireless-2026-11-22
for you to fetch changes up to 50b359896fe55d0443ed550e1fabba71d242031a:
wifi: cfg80211: ignore link disabled flag from userspace (2026-01-20 10:02:01 +0100)
----------------------------------------------------------------
Another set of updates:
- various small fixes for ath10k/ath12k/mwifiex/rsi
- cfg80211 fix for HE bitrate overflow
- mac80211 fixes
- S1G beacon handling in scan
- skb tailroom handling for HW encryption
- CSA fix for multi-link
- handling of disabled links during association
----------------------------------------------------------------
Baochen Qiang (2):
wifi: ath12k: don't force radio frequency check in freq_to_idx()
wifi: ath12k: fix dead lock while flushing management frames
Benjamin Berg (3):
wifi: mac80211: parse all TTLM entries
wifi: mac80211: apply advertised TTLM from association response
wifi: cfg80211: ignore link disabled flag from userspace
Dan Carpenter (1):
wifi: mwifiex: Fix a loop in mwifiex_update_ampdu_rxwinsize()
Johannes Berg (1):
Merge tag 'ath-current-20260113' of git://git.kernel.org/pub/scm/linux/kernel/git/ath/ath into wireless
Lachlan Hodges (1):
wifi: mac80211: don't perform DA check on S1G beacon
Manish Dharanenthiran (1):
wifi: ath12k: cancel scan only on active scan vdev
Marek Vasut (1):
wifi: rsi: Fix memory corruption due to not set vif driver data size
Miri Korenblit (2):
wifi: mac80211: correctly check if CSA is active
wifi: mac80211: don't increment crypto_tx_tailroom_needed_cnt twice
Thomas Fourier (2):
wifi: ath10k: fix dma_free_coherent() pointer
wifi: ath12k: fix dma_free_coherent() pointer
Veerendranath Jakkam (1):
wifi: cfg80211: Fix bitrate calculation overflow for HE rates
Yingying Tang (2):
wifi: ath12k: Fix scan state stuck in ABORTING after cancel_remain_on_channel
wifi: ath12k: Fix wrong P2P device link id issue
drivers/net/wireless/ath/ath10k/ce.c | 16 +-
drivers/net/wireless/ath/ath12k/ce.c | 12 +-
drivers/net/wireless/ath/ath12k/mac.c | 16 +-
drivers/net/wireless/ath/ath12k/wmi.c | 9 +-
.../net/wireless/marvell/mwifiex/11n_rxreorder.c | 6 +-
drivers/net/wireless/rsi/rsi_91x_mac80211.c | 1 +
include/net/cfg80211.h | 3 -
include/uapi/linux/nl80211.h | 5 +-
net/mac80211/ieee80211_i.h | 2 -
net/mac80211/iface.c | 8 +-
net/mac80211/key.c | 3 +-
net/mac80211/mlme.c | 213 ++++++++++++---------
net/mac80211/scan.c | 9 +-
net/wireless/nl80211.c | 10 -
net/wireless/util.c | 8 +-
15 files changed, 171 insertions(+), 150 deletions(-)
^ permalink raw reply
* [PATCH mt76 v2 17/17] wifi: mt76: Enable NPU support for MT7996 devices
From: Lorenzo Bianconi @ 2026-01-22 10:40 UTC (permalink / raw)
To: Felix Fietkau, Ryder Lee, Shayne Chen, Sean Wang,
Matthias Brugger, AngeloGioacchino Del Regno, Lorenzo Bianconi
Cc: linux-wireless, linux-arm-kernel, linux-mediatek, Kang Yang
In-Reply-To: <20260122-mt76-npu-eagle-offload-v2-0-2374614c0de6@kernel.org>
Enable NPU offloading for MT7990 chipset.
Tested-by: Kang Yang <kang.yang@airoha.com>
Signed-off-by: Lorenzo Bianconi <lorenzo@kernel.org>
---
drivers/net/wireless/mediatek/mt76/npu.c | 6 +-----
1 file changed, 1 insertion(+), 5 deletions(-)
diff --git a/drivers/net/wireless/mediatek/mt76/npu.c b/drivers/net/wireless/mediatek/mt76/npu.c
index bc8f2012be9dbe2c7fc1fc885b6135d796d8c0d6..c4c7c0af63217a7e85b2d97b37febba16899e332 100644
--- a/drivers/net/wireless/mediatek/mt76/npu.c
+++ b/drivers/net/wireless/mediatek/mt76/npu.c
@@ -450,10 +450,6 @@ int mt76_npu_init(struct mt76_dev *dev, phys_addr_t phy_addr, int type)
struct airoha_npu *npu;
int err = 0;
- /* NPU offloading is only supported by MT7992 */
- if (!is_mt7992(dev))
- return 0;
-
mutex_lock(&dev->mutex);
npu = airoha_npu_get(dev->dev);
@@ -486,7 +482,7 @@ int mt76_npu_init(struct mt76_dev *dev, phys_addr_t phy_addr, int type)
dev->mmio.phy_addr = phy_addr;
dev->mmio.npu_type = type;
/* NPU offloading requires HW-RRO for RX packet reordering. */
- dev->hwrro_mode = MT76_HWRRO_V3_1;
+ dev->hwrro_mode = is_mt7996(dev) ? MT76_HWRRO_V3 : MT76_HWRRO_V3_1;
dev->rx_token_size = 32768;
rcu_assign_pointer(dev->mmio.npu, npu);
--
2.52.0
^ permalink raw reply related
* [PATCH mt76 v2 16/17] wifi: mt76: mt7996: Store DMA mapped buffer addresses in mt7996_npu_hw_init()
From: Lorenzo Bianconi @ 2026-01-22 10:40 UTC (permalink / raw)
To: Felix Fietkau, Ryder Lee, Shayne Chen, Sean Wang,
Matthias Brugger, AngeloGioacchino Del Regno, Lorenzo Bianconi
Cc: linux-wireless, linux-arm-kernel, linux-mediatek, Kang Yang
In-Reply-To: <20260122-mt76-npu-eagle-offload-v2-0-2374614c0de6@kernel.org>
In order to not always reallocate them during NPU reset, store the DMA
mapped buffer addresses allocated by mt7996_npu_hw_init routine in
mt7996 structure.
Tested-by: Kang Yang <kang.yang@airoha.com>
Signed-off-by: Lorenzo Bianconi <lorenzo@kernel.org>
---
drivers/net/wireless/mediatek/mt76/mt7996/mt7996.h | 4 ++
drivers/net/wireless/mediatek/mt76/mt7996/npu.c | 58 +++++++++++++---------
2 files changed, 39 insertions(+), 23 deletions(-)
diff --git a/drivers/net/wireless/mediatek/mt76/mt7996/mt7996.h b/drivers/net/wireless/mediatek/mt76/mt7996/mt7996.h
index a823292814ee589070fb5930a70a16d165855300..195e8ab7876caba602fb520dff8cfdd78bb495dc 100644
--- a/drivers/net/wireless/mediatek/mt76/mt7996/mt7996.h
+++ b/drivers/net/wireless/mediatek/mt76/mt7996/mt7996.h
@@ -31,6 +31,8 @@
#define MT7996_RX_MCU_RING_SIZE_WA 1024
#define MT7996_NPU_TX_RING_SIZE 1024
#define MT7996_NPU_RX_RING_SIZE 1024
+#define MT7996_NPU_TXD_SIZE 3
+
/* scatter-gather of mcu event is not supported in connac3 */
#define MT7996_RX_MCU_BUF_SIZE (2048 + \
SKB_DATA_ALIGN(sizeof(struct skb_shared_info)))
@@ -475,6 +477,8 @@ struct mt7996_dev {
struct list_head page_map[MT7996_RRO_MSDU_PG_HASH_SIZE];
} wed_rro;
+ dma_addr_t npu_txd_addr[2 * MT7996_NPU_TXD_SIZE];
+
bool ibf;
u8 fw_debug_wm;
u8 fw_debug_wa;
diff --git a/drivers/net/wireless/mediatek/mt76/mt7996/npu.c b/drivers/net/wireless/mediatek/mt76/mt7996/npu.c
index 7941996891c88333d121e4c739001ea19bff94c9..897918a31b162679c9e133c93894fa88b5a75f6a 100644
--- a/drivers/net/wireless/mediatek/mt76/mt7996/npu.c
+++ b/drivers/net/wireless/mediatek/mt76/mt7996/npu.c
@@ -344,12 +344,14 @@ static int mt7996_npu_txd_init(struct mt7996_dev *dev, struct airoha_npu *npu)
MT_BAND0,
is_mt7996(&dev->mt76) ? MT_BAND2 : MT_BAND1,
};
- int i;
+ int i, index = 0;
+
+ BUILD_BUG_ON(ARRAY_SIZE(band_list) * 3 !=
+ ARRAY_SIZE(dev->npu_txd_addr));
for (i = 0; i < ARRAY_SIZE(band_list); i++) {
int err, band = band_list[i], phy_id;
- dma_addr_t dma_addr;
- u32 val, size;
+ u32 val;
err = mt76_npu_get_msg(npu, band + 5,
WLAN_FUNC_GET_WAIT_RXDESC_BASE,
@@ -364,43 +366,29 @@ static int mt7996_npu_txd_init(struct mt7996_dev *dev, struct airoha_npu *npu)
: band;
writel(val, &dev->mt76.phys[phy_id]->q_tx[0]->regs->desc_base);
- size = is_mt7996(&dev->mt76) ? band == MT_BAND2
- ? MT7996_NPU_TX_RING_SIZE
- : MT7996_NPU_RX_RING_SIZE / 2
- : MT7996_TX_RING_SIZE;
- if (!dmam_alloc_coherent(dev->mt76.dma_dev, 256 * size,
- &dma_addr, GFP_KERNEL))
- return -ENOMEM;
-
err = mt76_npu_send_msg(npu, band,
WLAN_FUNC_SET_WAIT_TX_BUF_SPACE_HW_BASE,
- dma_addr, GFP_KERNEL);
+ dev->npu_txd_addr[index++], GFP_KERNEL);
if (err) {
dev_warn(dev->mt76.dev,
"failed setting NPU wlan queue buf addr\n");
return err;
}
- if (!dmam_alloc_coherent(dev->mt76.dma_dev, 256 * size,
- &dma_addr, GFP_KERNEL))
- return -ENOMEM;
-
err = mt76_npu_send_msg(npu, band + 5,
WLAN_FUNC_SET_WAIT_TX_BUF_SPACE_HW_BASE,
- dma_addr, GFP_KERNEL);
+ dev->npu_txd_addr[index++],
+ GFP_KERNEL);
if (err) {
dev_warn(dev->mt76.dev,
"failed setting NPU wlan tx buf addr\n");
return err;
}
- if (!dmam_alloc_coherent(dev->mt76.dma_dev, 256 * 1024,
- &dma_addr, GFP_KERNEL))
- return -ENOMEM;
-
err = mt76_npu_send_msg(npu, band + 10,
WLAN_FUNC_SET_WAIT_TX_BUF_SPACE_HW_BASE,
- dma_addr, GFP_KERNEL);
+ dev->npu_txd_addr[index++],
+ GFP_KERNEL);
if (err) {
dev_warn(dev->mt76.dev,
"failed setting NPU wlan tx buf base\n");
@@ -570,7 +558,31 @@ int __mt7996_npu_hw_init(struct mt7996_dev *dev)
int mt7996_npu_hw_init(struct mt7996_dev *dev)
{
- int err;
+ int i, err;
+
+ BUILD_BUG_ON(ARRAY_SIZE(dev->npu_txd_addr) % 3);
+
+ for (i = 0; i < ARRAY_SIZE(dev->npu_txd_addr); i += 3) {
+ int band = i && is_mt7996(&dev->mt76) ? MT_BAND2 : MT_BAND0;
+ u32 size = is_mt7996(&dev->mt76) ? band == MT_BAND2
+ ? MT7996_NPU_TX_RING_SIZE
+ : MT7996_NPU_RX_RING_SIZE / 2
+ : MT7996_TX_RING_SIZE;
+
+ if (!dmam_alloc_coherent(dev->mt76.dma_dev, 256 * size,
+ &dev->npu_txd_addr[i], GFP_KERNEL))
+ return -ENOMEM;
+
+ if (!dmam_alloc_coherent(dev->mt76.dma_dev, 256 * size,
+ &dev->npu_txd_addr[i + 1],
+ GFP_KERNEL))
+ return -ENOMEM;
+
+ if (!dmam_alloc_coherent(dev->mt76.dma_dev, 256 * 1024,
+ &dev->npu_txd_addr[i + 2],
+ GFP_KERNEL))
+ return -ENOMEM;
+ }
mutex_lock(&dev->mt76.mutex);
err = __mt7996_npu_hw_init(dev);
--
2.52.0
^ permalink raw reply related
* [PATCH mt76 v2 15/17] wifi: mt76: mt7996: Do not schedule RRO and TxFree queues during reset for NPU
From: Lorenzo Bianconi @ 2026-01-22 10:39 UTC (permalink / raw)
To: Felix Fietkau, Ryder Lee, Shayne Chen, Sean Wang,
Matthias Brugger, AngeloGioacchino Del Regno, Lorenzo Bianconi
Cc: linux-wireless, linux-arm-kernel, linux-mediatek, Kang Yang
In-Reply-To: <20260122-mt76-npu-eagle-offload-v2-0-2374614c0de6@kernel.org>
This is a preliminary patch to properly manage reset procedure when NPU
offloading is enabled.
Tested-by: Kang Yang <kang.yang@airoha.com>
Signed-off-by: Lorenzo Bianconi <lorenzo@kernel.org>
---
drivers/net/wireless/mediatek/mt76/dma.c | 11 +++++++++++
drivers/net/wireless/mediatek/mt76/mt76.h | 10 ++++++++++
drivers/net/wireless/mediatek/mt76/mt7996/dma.c | 5 +++++
drivers/net/wireless/mediatek/mt76/mt7996/mac.c | 14 ++++++++++++++
4 files changed, 40 insertions(+)
diff --git a/drivers/net/wireless/mediatek/mt76/dma.c b/drivers/net/wireless/mediatek/mt76/dma.c
index f5c6bb94ccbbda6afe03b24cf245b30c797e855d..2d133ace7c33ac5492e287a53510ee4b6a6b7403 100644
--- a/drivers/net/wireless/mediatek/mt76/dma.c
+++ b/drivers/net/wireless/mediatek/mt76/dma.c
@@ -881,6 +881,10 @@ mt76_dma_rx_cleanup(struct mt76_dev *dev, struct mt76_queue *q)
mt76_queue_is_wed_rro(q))
continue;
+ if (mt76_npu_device_active(dev) &&
+ mt76_queue_is_wed_rro(q))
+ continue;
+
if (!mt76_queue_is_wed_rro_rxdmad_c(q) &&
!mt76_queue_is_wed_rro_ind(q))
mt76_put_page_pool_buf(buf, false);
@@ -923,6 +927,13 @@ mt76_dma_rx_reset(struct mt76_dev *dev, enum mt76_rxq_id qid)
mt76_queue_is_wed_rro(q))
return;
+ if (mt76_npu_device_active(dev) &&
+ mt76_queue_is_wed_rro(q))
+ return;
+
+ if (mt76_queue_is_npu_txfree(q))
+ return;
+
mt76_dma_sync_idx(dev, q);
if (mt76_queue_is_npu(q))
mt76_npu_fill_rx_queue(dev, q);
diff --git a/drivers/net/wireless/mediatek/mt76/mt76.h b/drivers/net/wireless/mediatek/mt76/mt76.h
index eefc3f555f8afea2af67517683d522b657e20b7b..5e68efc367fce63bcc60a8792e6f9d118283e3ed 100644
--- a/drivers/net/wireless/mediatek/mt76/mt76.h
+++ b/drivers/net/wireless/mediatek/mt76/mt76.h
@@ -55,6 +55,8 @@
FIELD_PREP(MT_QFLAG_WED_RING, _n))
#define MT_NPU_Q_TX(_n) __MT_NPU_Q(MT76_WED_Q_TX, _n)
#define MT_NPU_Q_RX(_n) __MT_NPU_Q(MT76_WED_Q_RX, _n)
+#define MT_NPU_Q_TXFREE(_n) (FIELD_PREP(MT_QFLAG_WED_TYPE, MT76_WED_Q_TXFREE) | \
+ FIELD_PREP(MT_QFLAG_WED_RING, _n))
struct mt76_dev;
struct mt76_phy;
@@ -2003,6 +2005,14 @@ static inline bool mt76_queue_is_npu_rx(struct mt76_queue *q)
FIELD_GET(MT_QFLAG_WED_TYPE, q->flags) == MT76_WED_Q_RX;
}
+static inline bool mt76_queue_is_npu_txfree(struct mt76_queue *q)
+{
+ if (q->flags & MT_QFLAG_WED)
+ return false;
+
+ return FIELD_GET(MT_QFLAG_WED_TYPE, q->flags) == MT76_WED_Q_TXFREE;
+}
+
struct mt76_txwi_cache *
mt76_token_release(struct mt76_dev *dev, int token, bool *wake);
int mt76_token_consume(struct mt76_dev *dev, struct mt76_txwi_cache **ptxwi);
diff --git a/drivers/net/wireless/mediatek/mt76/mt7996/dma.c b/drivers/net/wireless/mediatek/mt76/mt7996/dma.c
index 1a4f5f5b2a8435933070bb7d8feab26a0c174922..8f5d297dafce23dcb3c1e53678f8d67dab9e8987 100644
--- a/drivers/net/wireless/mediatek/mt76/mt7996/dma.c
+++ b/drivers/net/wireless/mediatek/mt76/mt7996/dma.c
@@ -756,6 +756,9 @@ int mt7996_dma_init(struct mt7996_dev *dev)
(is_mt7992(&dev->mt76)))) {
dev->mt76.q_rx[MT_RXQ_MAIN_WA].flags = MT_WED_Q_TXFREE;
dev->mt76.q_rx[MT_RXQ_MAIN_WA].wed = wed;
+ } else if (is_mt7992(&dev->mt76) &&
+ mt76_npu_device_active(&dev->mt76)) {
+ dev->mt76.q_rx[MT_RXQ_MAIN_WA].flags = MT_NPU_Q_TXFREE(0);
}
if (mt7996_has_wa(dev)) {
@@ -888,6 +891,8 @@ int mt7996_dma_init(struct mt7996_dev *dev)
/* tx free notify event from WA for band0 */
dev->mt76.q_rx[MT_RXQ_TXFREE_BAND0].flags = MT_WED_Q_TXFREE;
dev->mt76.q_rx[MT_RXQ_TXFREE_BAND0].wed = wed;
+ } else if (mt76_npu_device_active(&dev->mt76)) {
+ dev->mt76.q_rx[MT_RXQ_TXFREE_BAND0].flags = MT_NPU_Q_TXFREE(0);
}
ret = mt76_queue_alloc(dev,
diff --git a/drivers/net/wireless/mediatek/mt76/mt7996/mac.c b/drivers/net/wireless/mediatek/mt76/mt7996/mac.c
index ebce6b080886896be746c37690ef38713fe2cbc2..c88a97dbab8d529e71c8bcbb146e7e319c32e6e4 100644
--- a/drivers/net/wireless/mediatek/mt76/mt7996/mac.c
+++ b/drivers/net/wireless/mediatek/mt76/mt7996/mac.c
@@ -2563,6 +2563,13 @@ void mt7996_mac_reset_work(struct work_struct *work)
mt76_queue_is_wed_rro(&dev->mt76.q_rx[i]))
continue;
+ if (mt76_npu_device_active(&dev->mt76) &&
+ mt76_queue_is_wed_rro(&dev->mt76.q_rx[i]))
+ continue;
+
+ if (mt76_queue_is_npu_txfree(&dev->mt76.q_rx[i]))
+ continue;
+
napi_disable(&dev->mt76.napi[i]);
}
napi_disable(&dev->mt76.tx_napi);
@@ -2618,6 +2625,13 @@ void mt7996_mac_reset_work(struct work_struct *work)
mt76_queue_is_wed_rro(&dev->mt76.q_rx[i]))
continue;
+ if (mt76_npu_device_active(&dev->mt76) &&
+ mt76_queue_is_wed_rro(&dev->mt76.q_rx[i]))
+ continue;
+
+ if (mt76_queue_is_npu_txfree(&dev->mt76.q_rx[i]))
+ continue;
+
napi_enable(&dev->mt76.napi[i]);
local_bh_disable();
napi_schedule(&dev->mt76.napi[i]);
--
2.52.0
^ permalink raw reply related
* [PATCH mt76 v2 14/17] wifi: mt76: Do not reset idx for NPU tx queues during reset
From: Lorenzo Bianconi @ 2026-01-22 10:39 UTC (permalink / raw)
To: Felix Fietkau, Ryder Lee, Shayne Chen, Sean Wang,
Matthias Brugger, AngeloGioacchino Del Regno, Lorenzo Bianconi
Cc: linux-wireless, linux-arm-kernel, linux-mediatek, Kang Yang
In-Reply-To: <20260122-mt76-npu-eagle-offload-v2-0-2374614c0de6@kernel.org>
Do not run reset_q callaback with reset_idx set to true for NPU Tx
queues. This is a preliminary patch to properly manage reset procedure
when NPU offloading is enabled.
Tested-by: Kang Yang <kang.yang@airoha.com>
Signed-off-by: Lorenzo Bianconi <lorenzo@kernel.org>
---
drivers/net/wireless/mediatek/mt76/dma.h | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/drivers/net/wireless/mediatek/mt76/dma.h b/drivers/net/wireless/mediatek/mt76/dma.h
index 4a63de6c5bf5a34cb76f10a427649bc04ebe78b2..2a0226c83f3c92a615d34846b8fcb5fafb42d07c 100644
--- a/drivers/net/wireless/mediatek/mt76/dma.h
+++ b/drivers/net/wireless/mediatek/mt76/dma.h
@@ -174,7 +174,9 @@ void mt76_dma_queue_reset(struct mt76_dev *dev, struct mt76_queue *q,
static inline void
mt76_dma_reset_tx_queue(struct mt76_dev *dev, struct mt76_queue *q)
{
- dev->queue_ops->reset_q(dev, q, true);
+ bool reset_idx = q && !mt76_queue_is_npu_tx(q);
+
+ dev->queue_ops->reset_q(dev, q, reset_idx);
if (mtk_wed_device_active(&dev->mmio.wed))
mt76_wed_dma_setup(dev, q, true);
}
--
2.52.0
^ permalink raw reply related
* [PATCH mt76 v2 13/17] wifi: mt76: mt7996: Move RRO dma start in a dedicated routine
From: Lorenzo Bianconi @ 2026-01-22 10:39 UTC (permalink / raw)
To: Felix Fietkau, Ryder Lee, Shayne Chen, Sean Wang,
Matthias Brugger, AngeloGioacchino Del Regno, Lorenzo Bianconi
Cc: linux-wireless, linux-arm-kernel, linux-mediatek, Kang Yang
In-Reply-To: <20260122-mt76-npu-eagle-offload-v2-0-2374614c0de6@kernel.org>
This is a preliminary patch to properly enable NPU offloading for MT7996
chipset since NPU initialization must be completed before kicking rx
queues.
Tested-by: Kang Yang <kang.yang@airoha.com>
Signed-off-by: Lorenzo Bianconi <lorenzo@kernel.org>
---
drivers/net/wireless/mediatek/mt76/mt7996/dma.c | 69 ++++++++++++----------
drivers/net/wireless/mediatek/mt76/mt7996/init.c | 2 +
drivers/net/wireless/mediatek/mt76/mt7996/mt7996.h | 1 +
3 files changed, 41 insertions(+), 31 deletions(-)
diff --git a/drivers/net/wireless/mediatek/mt76/mt7996/dma.c b/drivers/net/wireless/mediatek/mt76/mt7996/dma.c
index 07212d93bc62df69720963f5ba04090bc82003fc..1a4f5f5b2a8435933070bb7d8feab26a0c174922 100644
--- a/drivers/net/wireless/mediatek/mt76/mt7996/dma.c
+++ b/drivers/net/wireless/mediatek/mt76/mt7996/dma.c
@@ -521,7 +521,7 @@ static void mt7996_dma_enable(struct mt7996_dev *dev, bool reset)
int mt7996_dma_rro_init(struct mt7996_dev *dev)
{
struct mt76_dev *mdev = &dev->mt76;
- u32 irq_mask, size;
+ u32 size;
int ret;
if (dev->mt76.hwrro_mode == MT76_HWRRO_V3_1) {
@@ -548,7 +548,8 @@ int mt7996_dma_rro_init(struct mt7996_dev *dev)
mt76_queue_reset(dev, &mdev->q_rx[MT_RXQ_RRO_RXDMAD_C],
true);
}
- goto start_hw_rro;
+
+ return 0;
}
/* ind cmd */
@@ -615,43 +616,49 @@ int mt7996_dma_rro_init(struct mt7996_dev *dev)
return ret;
}
-start_hw_rro:
- if (mtk_wed_device_active(&mdev->mmio.wed)) {
- irq_mask = mdev->mmio.irqmask |
+ return 0;
+}
+
+void mt7996_dma_rro_start(struct mt7996_dev *dev)
+{
+ u32 irq_mask;
+
+ if (mtk_wed_device_active(&dev->mt76.mmio.wed)) {
+ irq_mask = dev->mt76.mmio.irqmask |
MT_INT_TX_DONE_BAND2;
mt76_wr(dev, MT_INT_MASK_CSR, irq_mask);
- mtk_wed_device_start_hw_rro(&mdev->mmio.wed, irq_mask, false);
+ mtk_wed_device_start_hw_rro(&dev->mt76.mmio.wed, irq_mask,
+ false);
mt7996_irq_enable(dev, irq_mask);
- } else {
- if (is_mt7996(&dev->mt76)) {
- mt76_queue_rx_init(dev, MT_RXQ_MSDU_PAGE_BAND1,
- mt76_dma_rx_poll);
- mt76_queue_rx_init(dev, MT_RXQ_MSDU_PAGE_BAND2,
- mt76_dma_rx_poll);
- mt76_queue_rx_init(dev, MT_RXQ_RRO_BAND2,
- mt76_dma_rx_poll);
- } else {
- mt76_queue_rx_init(dev, MT_RXQ_RRO_BAND1,
- mt76_dma_rx_poll);
- }
+ return;
+ }
- mt76_queue_rx_init(dev, MT_RXQ_RRO_BAND0, mt76_dma_rx_poll);
- if (dev->mt76.hwrro_mode == MT76_HWRRO_V3_1) {
- mt76_queue_rx_init(dev, MT_RXQ_RRO_RXDMAD_C,
- mt76_dma_rx_poll);
- } else {
- mt76_queue_rx_init(dev, MT_RXQ_RRO_IND,
- mt76_dma_rx_poll);
- mt76_queue_rx_init(dev, MT_RXQ_MSDU_PAGE_BAND0,
- mt76_dma_rx_poll);
- }
+ if (is_mt7996(&dev->mt76)) {
+ mt76_queue_rx_init(dev, MT_RXQ_MSDU_PAGE_BAND1,
+ mt76_dma_rx_poll);
+ mt76_queue_rx_init(dev, MT_RXQ_MSDU_PAGE_BAND2,
+ mt76_dma_rx_poll);
+ mt76_queue_rx_init(dev, MT_RXQ_RRO_BAND2,
+ mt76_dma_rx_poll);
+ } else {
+ mt76_queue_rx_init(dev, MT_RXQ_RRO_BAND1,
+ mt76_dma_rx_poll);
+ }
- if (!mt76_npu_device_active(&dev->mt76))
- mt7996_irq_enable(dev, MT_INT_RRO_RX_DONE);
+ mt76_queue_rx_init(dev, MT_RXQ_RRO_BAND0, mt76_dma_rx_poll);
+ if (dev->mt76.hwrro_mode == MT76_HWRRO_V3_1) {
+ mt76_queue_rx_init(dev, MT_RXQ_RRO_RXDMAD_C,
+ mt76_dma_rx_poll);
+ } else {
+ mt76_queue_rx_init(dev, MT_RXQ_RRO_IND,
+ mt76_dma_rx_poll);
+ mt76_queue_rx_init(dev, MT_RXQ_MSDU_PAGE_BAND0,
+ mt76_dma_rx_poll);
}
- return 0;
+ if (!mt76_npu_device_active(&dev->mt76))
+ mt7996_irq_enable(dev, MT_INT_RRO_RX_DONE);
}
int mt7996_dma_init(struct mt7996_dev *dev)
diff --git a/drivers/net/wireless/mediatek/mt76/mt7996/init.c b/drivers/net/wireless/mediatek/mt76/mt7996/init.c
index 526a2cb298fd7f9dc8d0fcdd8de0e4071c07338f..de4ae79073fbfe364994d5284ee19ee652bda6c8 100644
--- a/drivers/net/wireless/mediatek/mt76/mt7996/init.c
+++ b/drivers/net/wireless/mediatek/mt76/mt7996/init.c
@@ -1721,6 +1721,8 @@ int mt7996_register_device(struct mt7996_dev *dev)
if (ret)
return ret;
+ mt7996_dma_rro_start(dev);
+
ret = mt76_register_device(&dev->mt76, true, mt76_rates,
ARRAY_SIZE(mt76_rates));
if (ret)
diff --git a/drivers/net/wireless/mediatek/mt76/mt7996/mt7996.h b/drivers/net/wireless/mediatek/mt76/mt7996/mt7996.h
index 3928e059fd2a41aa7d4aa41b0d303b0763384523..a823292814ee589070fb5930a70a16d165855300 100644
--- a/drivers/net/wireless/mediatek/mt76/mt7996/mt7996.h
+++ b/drivers/net/wireless/mediatek/mt76/mt7996/mt7996.h
@@ -879,6 +879,7 @@ int mt7996_mtk_init_debugfs(struct mt7996_phy *phy, struct dentry *dir);
#endif
int mt7996_dma_rro_init(struct mt7996_dev *dev);
+void mt7996_dma_rro_start(struct mt7996_dev *dev);
#ifdef CONFIG_MT7996_NPU
int __mt7996_npu_hw_init(struct mt7996_dev *dev);
--
2.52.0
^ permalink raw reply related
* [PATCH mt76 v2 12/17] wifi: mt76: mt7996: Add __mt7996_npu_hw_init routine
From: Lorenzo Bianconi @ 2026-01-22 10:39 UTC (permalink / raw)
To: Felix Fietkau, Ryder Lee, Shayne Chen, Sean Wang,
Matthias Brugger, AngeloGioacchino Del Regno, Lorenzo Bianconi
Cc: linux-wireless, linux-arm-kernel, linux-mediatek, Kang Yang
In-Reply-To: <20260122-mt76-npu-eagle-offload-v2-0-2374614c0de6@kernel.org>
Introduce __mt7996_npu_hw_init utility routine in order to run it
holding mt76 mutex and move NPU hw re-initialization before restarting
the NAPIs during device reset.
Tested-by: Kang Yang <kang.yang@airoha.com>
Signed-off-by: Lorenzo Bianconi <lorenzo@kernel.org>
---
drivers/net/wireless/mediatek/mt76/mt7996/mac.c | 4 +--
drivers/net/wireless/mediatek/mt76/mt7996/mt7996.h | 6 +++++
drivers/net/wireless/mediatek/mt76/mt7996/npu.c | 31 +++++++++++++---------
3 files changed, 27 insertions(+), 14 deletions(-)
diff --git a/drivers/net/wireless/mediatek/mt76/mt7996/mac.c b/drivers/net/wireless/mediatek/mt76/mt7996/mac.c
index db2eda2f1c4c097aafc55245e523e39c7bc71e34..ebce6b080886896be746c37690ef38713fe2cbc2 100644
--- a/drivers/net/wireless/mediatek/mt76/mt7996/mac.c
+++ b/drivers/net/wireless/mediatek/mt76/mt7996/mac.c
@@ -2607,6 +2607,8 @@ void mt7996_mac_reset_work(struct work_struct *work)
MT_INT_TX_RX_DONE_EXT);
}
+ __mt7996_npu_hw_init(dev);
+
clear_bit(MT76_MCU_RESET, &dev->mphy.state);
mt7996_for_each_phy(dev, phy)
clear_bit(MT76_RESET, &phy->mt76->state);
@@ -2636,8 +2638,6 @@ void mt7996_mac_reset_work(struct work_struct *work)
mutex_unlock(&dev->mt76.mutex);
- mt7996_npu_hw_init(dev);
-
mt7996_for_each_phy(dev, phy)
ieee80211_queue_delayed_work(hw, &phy->mt76->mac_work,
MT7996_WATCHDOG_TIME);
diff --git a/drivers/net/wireless/mediatek/mt76/mt7996/mt7996.h b/drivers/net/wireless/mediatek/mt76/mt7996/mt7996.h
index de31385aa966116b34e545de92623a214bddc8f8..3928e059fd2a41aa7d4aa41b0d303b0763384523 100644
--- a/drivers/net/wireless/mediatek/mt76/mt7996/mt7996.h
+++ b/drivers/net/wireless/mediatek/mt76/mt7996/mt7996.h
@@ -881,10 +881,16 @@ int mt7996_mtk_init_debugfs(struct mt7996_phy *phy, struct dentry *dir);
int mt7996_dma_rro_init(struct mt7996_dev *dev);
#ifdef CONFIG_MT7996_NPU
+int __mt7996_npu_hw_init(struct mt7996_dev *dev);
int mt7996_npu_hw_init(struct mt7996_dev *dev);
int mt7996_npu_hw_stop(struct mt7996_dev *dev);
int mt7996_npu_rx_queues_init(struct mt7996_dev *dev);
#else
+static inline int __mt7996_npu_hw_init(struct mt7996_dev *dev)
+{
+ return 0;
+}
+
static inline int mt7996_npu_hw_init(struct mt7996_dev *dev)
{
return 0;
diff --git a/drivers/net/wireless/mediatek/mt76/mt7996/npu.c b/drivers/net/wireless/mediatek/mt76/mt7996/npu.c
index 1a77a7dc103762c8cc998508348e418858c30029..7941996891c88333d121e4c739001ea19bff94c9 100644
--- a/drivers/net/wireless/mediatek/mt76/mt7996/npu.c
+++ b/drivers/net/wireless/mediatek/mt76/mt7996/npu.c
@@ -525,20 +525,18 @@ int mt7996_npu_rx_queues_init(struct mt7996_dev *dev)
&dev->mt76.q_rx[MT_RXQ_NPU1]);
}
-int mt7996_npu_hw_init(struct mt7996_dev *dev)
+int __mt7996_npu_hw_init(struct mt7996_dev *dev)
{
struct airoha_npu *npu;
- int i, err = 0;
-
- mutex_lock(&dev->mt76.mutex);
+ int i, err;
npu = rcu_dereference_protected(dev->mt76.mmio.npu, &dev->mt76.mutex);
if (!npu)
- goto unlock;
+ return 0;
err = mt7996_npu_offload_init(dev, npu);
if (err)
- goto unlock;
+ return err;
if (is_mt7996(&dev->mt76))
err = mt7996_npu_rxd_init(dev, npu);
@@ -546,27 +544,36 @@ int mt7996_npu_hw_init(struct mt7996_dev *dev)
err = mt7992_npu_rxd_init(dev, npu);
if (err)
- goto unlock;
+ return err;
err = mt7996_npu_txd_init(dev, npu);
if (err)
- goto unlock;
+ return err;
err = mt7996_npu_rx_event_init(dev, npu);
if (err)
- goto unlock;
+ return err;
err = mt7996_npu_set_pcie_addr(dev, npu);
if (err)
- goto unlock;
+ return err;
err = mt7996_npu_tx_done_init(dev, npu);
if (err)
- goto unlock;
+ return err;
for (i = MT_RXQ_NPU0; i <= MT_RXQ_NPU1; i++)
airoha_npu_wlan_enable_irq(npu, i - MT_RXQ_NPU0);
-unlock:
+
+ return 0;
+}
+
+int mt7996_npu_hw_init(struct mt7996_dev *dev)
+{
+ int err;
+
+ mutex_lock(&dev->mt76.mutex);
+ err = __mt7996_npu_hw_init(dev);
mutex_unlock(&dev->mt76.mutex);
return err;
--
2.52.0
^ permalink raw reply related
* [PATCH mt76 v2 11/17] wifi: mt76: mt7996: Integrate MT7990 dma configuration for NPU
From: Lorenzo Bianconi @ 2026-01-22 10:39 UTC (permalink / raw)
To: Felix Fietkau, Ryder Lee, Shayne Chen, Sean Wang,
Matthias Brugger, AngeloGioacchino Del Regno, Lorenzo Bianconi
Cc: linux-wireless, linux-arm-kernel, linux-mediatek, Kang Yang
In-Reply-To: <20260122-mt76-npu-eagle-offload-v2-0-2374614c0de6@kernel.org>
Add NPU integration in MT7996 dma codebase for MT7990 chipset.
This is a preliminary patch to enable NPU offload for MT7996 (Eagle)
chipset.
Tested-by: Kang Yang <kang.yang@airoha.com>
Signed-off-by: Lorenzo Bianconi <lorenzo@kernel.org>
---
drivers/net/wireless/mediatek/mt76/mt7996/dma.c | 132 +++++++++++++++---------
1 file changed, 86 insertions(+), 46 deletions(-)
diff --git a/drivers/net/wireless/mediatek/mt76/mt7996/dma.c b/drivers/net/wireless/mediatek/mt76/mt7996/dma.c
index 274b273df1ee941e83db2bf2f9771cbdd4da8b6f..07212d93bc62df69720963f5ba04090bc82003fc 100644
--- a/drivers/net/wireless/mediatek/mt76/mt7996/dma.c
+++ b/drivers/net/wireless/mediatek/mt76/mt7996/dma.c
@@ -128,15 +128,27 @@ static void mt7996_dma_config(struct mt7996_dev *dev)
/* data tx queue */
if (is_mt7996(&dev->mt76)) {
- TXQ_CONFIG(0, WFDMA0, MT_INT_TX_DONE_BAND0, MT7996_TXQ_BAND0);
if (dev->hif2) {
- /* default bn1:ring19 bn2:ring21 */
- TXQ_CONFIG(1, WFDMA0, MT_INT_TX_DONE_BAND1,
- MT7996_TXQ_BAND1);
- TXQ_CONFIG(2, WFDMA0, MT_INT_TX_DONE_BAND2,
- MT7996_TXQ_BAND2);
+ if (mt76_npu_device_active(&dev->mt76)) {
+ TXQ_CONFIG(0, WFDMA0, MT_INT_TX_DONE_BAND2,
+ MT7996_TXQ_BAND2);
+ TXQ_CONFIG(1, WFDMA0, MT_INT_TX_DONE_BAND0,
+ MT7996_TXQ_BAND0);
+ TXQ_CONFIG(2, WFDMA0, MT_INT_TX_DONE_BAND1,
+ MT7996_TXQ_BAND1);
+ } else {
+ /* default bn1:ring19 bn2:ring21 */
+ TXQ_CONFIG(0, WFDMA0, MT_INT_TX_DONE_BAND0,
+ MT7996_TXQ_BAND0);
+ TXQ_CONFIG(1, WFDMA0, MT_INT_TX_DONE_BAND1,
+ MT7996_TXQ_BAND1);
+ TXQ_CONFIG(2, WFDMA0, MT_INT_TX_DONE_BAND2,
+ MT7996_TXQ_BAND2);
+ }
} else {
/* single pcie bn0/1:ring18 bn2:ring19 */
+ TXQ_CONFIG(0, WFDMA0, MT_INT_TX_DONE_BAND0,
+ MT7996_TXQ_BAND0);
TXQ_CONFIG(2, WFDMA0, MT_INT_TX_DONE_BAND1,
MT7996_TXQ_BAND1);
}
@@ -350,6 +362,9 @@ void mt7996_dma_start(struct mt7996_dev *dev, bool reset, bool wed_reset)
if (!mt7996_has_wa(dev) || mt76_npu_device_active(&dev->mt76))
irq_mask &= ~(MT_INT_RX(MT_RXQ_MAIN_WA) |
MT_INT_RX(MT_RXQ_BAND1_WA));
+ if (is_mt7996(&dev->mt76) && mt76_npu_device_active(&dev->mt76))
+ irq_mask &= ~(MT_INT_RX(MT_RXQ_TXFREE_BAND0) |
+ MT_INT_RX(MT_RXQ_MSDU_PAGE_BAND2));
irq_mask = reset ? MT_INT_MCU_CMD : irq_mask;
mt7996_irq_enable(dev, irq_mask);
@@ -430,39 +445,48 @@ static void mt7996_dma_enable(struct mt7996_dev *dev, bool reset)
MT_WFDMA_HOST_CONFIG_BAND1_PCIE1 |
MT_WFDMA_HOST_CONFIG_BAND2_PCIE1);
- if (is_mt7996(&dev->mt76))
- mt76_set(dev, MT_WFDMA_HOST_CONFIG,
- MT_WFDMA_HOST_CONFIG_BAND2_PCIE1);
- else
+ if (is_mt7996(&dev->mt76)) {
+ if (mt76_npu_device_active(&dev->mt76))
+ mt76_set(dev, MT_WFDMA_HOST_CONFIG,
+ MT_WFDMA_HOST_CONFIG_BAND0_PCIE1);
+ else
+ mt76_set(dev, MT_WFDMA_HOST_CONFIG,
+ MT_WFDMA_HOST_CONFIG_BAND2_PCIE1);
+ } else {
mt76_set(dev, MT_WFDMA_HOST_CONFIG,
MT_WFDMA_HOST_CONFIG_BAND1_PCIE1);
+ }
/* AXI read outstanding number */
mt76_rmw(dev, MT_WFDMA_AXI_R2A_CTRL,
MT_WFDMA_AXI_R2A_CTRL_OUTSTAND_MASK, 0x14);
- if (dev->hif2->speed < PCIE_SPEED_5_0GT ||
- (dev->hif2->speed == PCIE_SPEED_5_0GT &&
- dev->hif2->width < PCIE_LNK_X2)) {
- mt76_rmw(dev, WF_WFDMA0_GLO_CFG_EXT0 + hif1_ofs,
- WF_WFDMA0_GLO_CFG_EXT0_OUTSTAND_MASK,
- FIELD_PREP(WF_WFDMA0_GLO_CFG_EXT0_OUTSTAND_MASK,
- 0x1));
- mt76_rmw(dev, MT_WFDMA_AXI_R2A_CTRL2,
- MT_WFDMA_AXI_R2A_CTRL2_OUTSTAND_MASK,
- FIELD_PREP(MT_WFDMA_AXI_R2A_CTRL2_OUTSTAND_MASK,
- 0x1));
- } else if (dev->hif2->speed < PCIE_SPEED_8_0GT ||
- (dev->hif2->speed == PCIE_SPEED_8_0GT &&
- dev->hif2->width < PCIE_LNK_X2)) {
- mt76_rmw(dev, WF_WFDMA0_GLO_CFG_EXT0 + hif1_ofs,
- WF_WFDMA0_GLO_CFG_EXT0_OUTSTAND_MASK,
- FIELD_PREP(WF_WFDMA0_GLO_CFG_EXT0_OUTSTAND_MASK,
- 0x2));
- mt76_rmw(dev, MT_WFDMA_AXI_R2A_CTRL2,
- MT_WFDMA_AXI_R2A_CTRL2_OUTSTAND_MASK,
- FIELD_PREP(MT_WFDMA_AXI_R2A_CTRL2_OUTSTAND_MASK,
- 0x2));
+ if (!is_mt7996(&dev->mt76) ||
+ !mt76_npu_device_active(&dev->mt76)) {
+ if (dev->hif2->speed < PCIE_SPEED_5_0GT ||
+ (dev->hif2->speed == PCIE_SPEED_5_0GT &&
+ dev->hif2->width < PCIE_LNK_X2)) {
+ mt76_rmw(dev,
+ WF_WFDMA0_GLO_CFG_EXT0 + hif1_ofs,
+ WF_WFDMA0_GLO_CFG_EXT0_OUTSTAND_MASK,
+ FIELD_PREP(WF_WFDMA0_GLO_CFG_EXT0_OUTSTAND_MASK,
+ 0x1));
+ mt76_rmw(dev, MT_WFDMA_AXI_R2A_CTRL2,
+ MT_WFDMA_AXI_R2A_CTRL2_OUTSTAND_MASK,
+ FIELD_PREP(MT_WFDMA_AXI_R2A_CTRL2_OUTSTAND_MASK,
+ 0x1));
+ } else if (dev->hif2->speed < PCIE_SPEED_8_0GT ||
+ (dev->hif2->speed == PCIE_SPEED_8_0GT &&
+ dev->hif2->width < PCIE_LNK_X2)) {
+ mt76_rmw(dev, WF_WFDMA0_GLO_CFG_EXT0 + hif1_ofs,
+ WF_WFDMA0_GLO_CFG_EXT0_OUTSTAND_MASK,
+ FIELD_PREP(WF_WFDMA0_GLO_CFG_EXT0_OUTSTAND_MASK,
+ 0x2));
+ mt76_rmw(dev, MT_WFDMA_AXI_R2A_CTRL2,
+ MT_WFDMA_AXI_R2A_CTRL2_OUTSTAND_MASK,
+ FIELD_PREP(MT_WFDMA_AXI_R2A_CTRL2_OUTSTAND_MASK,
+ 0x2));
+ }
}
/* WFDMA rx threshold */
@@ -497,7 +521,7 @@ static void mt7996_dma_enable(struct mt7996_dev *dev, bool reset)
int mt7996_dma_rro_init(struct mt7996_dev *dev)
{
struct mt76_dev *mdev = &dev->mt76;
- u32 irq_mask;
+ u32 irq_mask, size;
int ret;
if (dev->mt76.hwrro_mode == MT76_HWRRO_V3_1) {
@@ -545,10 +569,12 @@ int mt7996_dma_rro_init(struct mt7996_dev *dev)
if (mtk_wed_device_active(&mdev->mmio.wed) &&
mtk_wed_get_rx_capa(&mdev->mmio.wed))
mdev->q_rx[MT_RXQ_MSDU_PAGE_BAND0].wed = &mdev->mmio.wed;
+
+ size = is_mt7996(mdev) && mt76_npu_device_active(mdev)
+ ? MT7996_NPU_RX_RING_SIZE / 4 : MT7996_RX_RING_SIZE;
ret = mt76_queue_alloc(dev, &mdev->q_rx[MT_RXQ_MSDU_PAGE_BAND0],
MT_RXQ_ID(MT_RXQ_MSDU_PAGE_BAND0),
- MT7996_RX_RING_SIZE,
- MT7996_RX_MSDU_PAGE_SIZE,
+ size, MT7996_RX_MSDU_PAGE_SIZE,
MT_RXQ_RING_BASE(MT_RXQ_MSDU_PAGE_BAND0));
if (ret)
return ret;
@@ -560,10 +586,12 @@ int mt7996_dma_rro_init(struct mt7996_dev *dev)
if (mtk_wed_device_active(&mdev->mmio.wed) &&
mtk_wed_get_rx_capa(&mdev->mmio.wed))
mdev->q_rx[MT_RXQ_MSDU_PAGE_BAND1].wed = &mdev->mmio.wed;
+
+ size = is_mt7996(mdev) && mt76_npu_device_active(mdev)
+ ? MT7996_NPU_RX_RING_SIZE / 2 : MT7996_RX_RING_SIZE;
ret = mt76_queue_alloc(dev, &mdev->q_rx[MT_RXQ_MSDU_PAGE_BAND1],
MT_RXQ_ID(MT_RXQ_MSDU_PAGE_BAND1),
- MT7996_RX_RING_SIZE,
- MT7996_RX_MSDU_PAGE_SIZE,
+ size, MT7996_RX_MSDU_PAGE_SIZE,
MT_RXQ_RING_BASE(MT_RXQ_MSDU_PAGE_BAND1));
if (ret)
return ret;
@@ -576,10 +604,12 @@ int mt7996_dma_rro_init(struct mt7996_dev *dev)
if (mtk_wed_device_active(&mdev->mmio.wed) &&
mtk_wed_get_rx_capa(&mdev->mmio.wed))
mdev->q_rx[MT_RXQ_MSDU_PAGE_BAND2].wed = &mdev->mmio.wed;
+
+ size = is_mt7996(mdev) && mt76_npu_device_active(mdev)
+ ? MT7996_NPU_RX_RING_SIZE : MT7996_RX_RING_SIZE;
ret = mt76_queue_alloc(dev, &mdev->q_rx[MT_RXQ_MSDU_PAGE_BAND2],
MT_RXQ_ID(MT_RXQ_MSDU_PAGE_BAND2),
- MT7996_RX_RING_SIZE,
- MT7996_RX_MSDU_PAGE_SIZE,
+ size, MT7996_RX_MSDU_PAGE_SIZE,
MT_RXQ_RING_BASE(MT_RXQ_MSDU_PAGE_BAND2));
if (ret)
return ret;
@@ -642,11 +672,16 @@ int mt7996_dma_init(struct mt7996_dev *dev)
mt7996_dma_disable(dev, true);
/* init tx queue */
- ret = mt7996_init_tx_queues(&dev->phy,
- MT_TXQ_ID(dev->mphy.band_idx),
- MT7996_TX_RING_SIZE,
- MT_TXQ_RING_BASE(0),
- wed);
+ if (is_mt7996(&dev->mt76) && mt76_npu_device_active(&dev->mt76))
+ ret = mt7996_init_tx_queues(&dev->phy, MT_TXQ_ID(0),
+ MT7996_NPU_TX_RING_SIZE,
+ MT_TXQ_RING_BASE(0) + hif1_ofs,
+ NULL);
+ else
+ ret = mt7996_init_tx_queues(&dev->phy,
+ MT_TXQ_ID(dev->mphy.band_idx),
+ MT7996_TX_RING_SIZE,
+ MT_TXQ_RING_BASE(0), wed);
if (ret)
return ret;
@@ -859,16 +894,21 @@ int mt7996_dma_init(struct mt7996_dev *dev)
}
if (mt7996_band_valid(dev, MT_BAND2)) {
+ u32 size;
+
/* rx rro data queue for band2 */
dev->mt76.q_rx[MT_RXQ_RRO_BAND2].flags =
MT_WED_RRO_Q_DATA(1) | MT_QFLAG_WED_RRO_EN;
if (mtk_wed_device_active(wed) &&
mtk_wed_get_rx_capa(wed))
dev->mt76.q_rx[MT_RXQ_RRO_BAND2].wed = wed;
+
+ size = is_mt7996(&dev->mt76) &&
+ mt76_npu_device_active(&dev->mt76)
+ ? MT7996_NPU_RX_RING_SIZE : MT7996_RX_RING_SIZE;
ret = mt76_queue_alloc(dev, &dev->mt76.q_rx[MT_RXQ_RRO_BAND2],
MT_RXQ_ID(MT_RXQ_RRO_BAND2),
- MT7996_RX_RING_SIZE,
- MT7996_RX_BUF_SIZE,
+ size, MT7996_RX_BUF_SIZE,
MT_RXQ_RING_BASE(MT_RXQ_RRO_BAND2) + hif1_ofs);
if (ret)
return ret;
--
2.52.0
^ permalink raw reply related
* [PATCH mt76 v2 10/17] wifi: mt76: mt7996: Integrate MT7990 init configuration for NPU
From: Lorenzo Bianconi @ 2026-01-22 10:39 UTC (permalink / raw)
To: Felix Fietkau, Ryder Lee, Shayne Chen, Sean Wang,
Matthias Brugger, AngeloGioacchino Del Regno, Lorenzo Bianconi
Cc: linux-wireless, linux-arm-kernel, linux-mediatek, Kang Yang
In-Reply-To: <20260122-mt76-npu-eagle-offload-v2-0-2374614c0de6@kernel.org>
Add NPU integration in MT7996 init codebase for MT7990 chipset.
This is a preliminary patch to enable NPU offload for MT7996 (Eagle)
chipset.
Tested-by: Kang Yang <kang.yang@airoha.com>
Signed-off-by: Lorenzo Bianconi <lorenzo@kernel.org>
---
drivers/net/wireless/mediatek/mt76/mt7996/init.c | 13 +++++++++----
1 file changed, 9 insertions(+), 4 deletions(-)
diff --git a/drivers/net/wireless/mediatek/mt76/mt7996/init.c b/drivers/net/wireless/mediatek/mt76/mt7996/init.c
index 03c1ccb49ef02ebe9c2ae91db836593e680ee2c0..526a2cb298fd7f9dc8d0fcdd8de0e4071c07338f 100644
--- a/drivers/net/wireless/mediatek/mt76/mt7996/init.c
+++ b/drivers/net/wireless/mediatek/mt76/mt7996/init.c
@@ -592,7 +592,7 @@ static void mt7996_mac_init_basic_rates(struct mt7996_dev *dev)
void mt7996_mac_init(struct mt7996_dev *dev)
{
#define HIF_TXD_V2_1 0x21
- int i;
+ int i, rx_path_type;
mt76_clear(dev, MT_MDP_DCR2, MT_MDP_DCR2_RX_TRANS_SHORT);
@@ -606,11 +606,16 @@ void mt7996_mac_init(struct mt7996_dev *dev)
}
/* rro module init */
- if (dev->hif2)
+ if (dev->hif2) {
+ if (mt76_npu_device_active(&dev->mt76))
+ rx_path_type = is_mt7996(&dev->mt76) ? 6 : 8;
+ else
+ rx_path_type = is_mt7996(&dev->mt76) ? 2 : 7;
mt7996_mcu_set_rro(dev, UNI_RRO_SET_PLATFORM_TYPE,
- is_mt7996(&dev->mt76) ? 2 : 7);
- else
+ rx_path_type);
+ } else {
mt7996_mcu_set_rro(dev, UNI_RRO_SET_PLATFORM_TYPE, 0);
+ }
if (mt7996_has_hwrro(dev)) {
u16 timeout;
--
2.52.0
^ permalink raw reply related
* [PATCH mt76 v2 09/17] wifi: mt76: mt7996: Integrate NPU in RRO session management
From: Lorenzo Bianconi @ 2026-01-22 10:39 UTC (permalink / raw)
To: Felix Fietkau, Ryder Lee, Shayne Chen, Sean Wang,
Matthias Brugger, AngeloGioacchino Del Regno, Lorenzo Bianconi
Cc: linux-wireless, linux-arm-kernel, linux-mediatek, Kang Yang
In-Reply-To: <20260122-mt76-npu-eagle-offload-v2-0-2374614c0de6@kernel.org>
Add NPU integration in RRO 3.0 session management.
This is a preliminary patch to enable NPU offload for MT7996 (Eagle)
chipset.
Tested-by: Kang Yang <kang.yang@airoha.com>
Signed-off-by: Lorenzo Bianconi <lorenzo@kernel.org>
---
drivers/net/wireless/mediatek/mt76/mt76.h | 10 ++++++++
drivers/net/wireless/mediatek/mt76/mt7996/init.c | 16 ++++++++++++-
drivers/net/wireless/mediatek/mt76/npu.c | 30 ++++++++++++++++++++++++
3 files changed, 55 insertions(+), 1 deletion(-)
diff --git a/drivers/net/wireless/mediatek/mt76/mt76.h b/drivers/net/wireless/mediatek/mt76/mt76.h
index d05e83ea1cacc43512f37743e1708390c3cb2f35..eefc3f555f8afea2af67517683d522b657e20b7b 100644
--- a/drivers/net/wireless/mediatek/mt76/mt76.h
+++ b/drivers/net/wireless/mediatek/mt76/mt76.h
@@ -1649,6 +1649,9 @@ void mt76_npu_txdesc_cleanup(struct mt76_queue *q, int index);
int mt76_npu_net_setup_tc(struct ieee80211_hw *hw, struct ieee80211_vif *vif,
struct net_device *dev, enum tc_setup_type type,
void *type_data);
+int mt76_npu_send_txrx_addr(struct mt76_dev *dev, int ifindex,
+ u32 direction, u32 i_count_addr,
+ u32 o_status_addr, u32 o_count_addr);
#else
static inline void mt76_npu_check_ppe(struct mt76_dev *dev,
struct sk_buff *skb, u32 info)
@@ -1707,6 +1710,13 @@ static inline int mt76_npu_net_setup_tc(struct ieee80211_hw *hw,
{
return -EOPNOTSUPP;
}
+
+static inline int mt76_npu_send_txrx_addr(struct mt76_dev *dev, int ifindex,
+ u32 direction, u32 i_count_addr,
+ u32 o_status_addr, u32 o_count_addr)
+{
+ return -EOPNOTSUPP;
+}
#endif /* CONFIG_MT76_NPU */
static inline bool mt76_npu_device_active(struct mt76_dev *dev)
diff --git a/drivers/net/wireless/mediatek/mt76/mt7996/init.c b/drivers/net/wireless/mediatek/mt76/mt7996/init.c
index 9fbe4235de0d0d42776d5661fa1c297e431b8d27..03c1ccb49ef02ebe9c2ae91db836593e680ee2c0 100644
--- a/drivers/net/wireless/mediatek/mt76/mt7996/init.c
+++ b/drivers/net/wireless/mediatek/mt76/mt7996/init.c
@@ -941,6 +941,12 @@ static int mt7996_wed_rro_init(struct mt7996_dev *dev)
addr++;
}
+ if (is_mt7996(&dev->mt76) &&
+ mt76_npu_device_active(&dev->mt76))
+ mt76_npu_send_txrx_addr(&dev->mt76, 0, i,
+ dev->wed_rro.addr_elem[i].phy_addr,
+ 0, 0);
+
#ifdef CONFIG_NET_MEDIATEK_SOC_WED
if (mtk_wed_device_active(&dev->mt76.mmio.wed) &&
mtk_wed_get_rx_capa(&dev->mt76.mmio.wed)) {
@@ -1001,6 +1007,10 @@ static int mt7996_wed_rro_init(struct mt7996_dev *dev)
addr++;
}
+ if (is_mt7996(&dev->mt76) && mt76_npu_device_active(&dev->mt76))
+ mt76_npu_send_txrx_addr(&dev->mt76, 1, 0,
+ dev->wed_rro.session.phy_addr, 0, 0);
+
mt7996_rro_hw_init(dev);
return mt7996_dma_rro_init(dev);
@@ -1087,8 +1097,12 @@ static void mt7996_wed_rro_work(struct work_struct *work)
list);
list_del_init(&e->list);
- if (mt76_npu_device_active(&dev->mt76))
+ if (mt76_npu_device_active(&dev->mt76)) {
+ if (is_mt7996(&dev->mt76))
+ mt76_npu_send_txrx_addr(&dev->mt76, 3, e->id,
+ 0, 0, 0);
goto reset_session;
+ }
for (i = 0; i < MT7996_RRO_WINDOW_MAX_LEN; i++) {
void *ptr = dev->wed_rro.session.ptr;
diff --git a/drivers/net/wireless/mediatek/mt76/npu.c b/drivers/net/wireless/mediatek/mt76/npu.c
index 9679237f739842bd44497e0b1022a868cb3a0d6c..bc8f2012be9dbe2c7fc1fc885b6135d796d8c0d6 100644
--- a/drivers/net/wireless/mediatek/mt76/npu.c
+++ b/drivers/net/wireless/mediatek/mt76/npu.c
@@ -390,6 +390,36 @@ int mt76_npu_net_setup_tc(struct ieee80211_hw *hw, struct ieee80211_vif *vif,
}
EXPORT_SYMBOL_GPL(mt76_npu_net_setup_tc);
+int mt76_npu_send_txrx_addr(struct mt76_dev *dev, int ifindex,
+ u32 direction, u32 i_count_addr,
+ u32 o_status_addr, u32 o_count_addr)
+{
+ struct {
+ __le32 dir;
+ __le32 in_count_addr;
+ __le32 out_status_addr;
+ __le32 out_count_addr;
+ } info = {
+ .dir = cpu_to_le32(direction),
+ .in_count_addr = cpu_to_le32(i_count_addr),
+ .out_status_addr = cpu_to_le32(o_status_addr),
+ .out_count_addr = cpu_to_le32(o_count_addr),
+ };
+ struct airoha_npu *npu;
+ int err = -ENODEV;
+
+ rcu_read_lock();
+ npu = rcu_dereference(dev->mmio.npu);
+ if (npu)
+ err = airoha_npu_wlan_send_msg(npu, ifindex,
+ WLAN_FUNC_SET_WAIT_INODE_TXRX_REG_ADDR,
+ &info, sizeof(info), GFP_ATOMIC);
+ rcu_read_unlock();
+
+ return err;
+}
+EXPORT_SYMBOL_GPL(mt76_npu_send_txrx_addr);
+
void mt76_npu_disable_irqs(struct mt76_dev *dev)
{
struct airoha_npu *npu;
--
2.52.0
^ permalink raw reply related
* [PATCH mt76 v2 08/17] wifi: mt76: mt7996: Add NPU support for MT7990 chipset
From: Lorenzo Bianconi @ 2026-01-22 10:39 UTC (permalink / raw)
To: Felix Fietkau, Ryder Lee, Shayne Chen, Sean Wang,
Matthias Brugger, AngeloGioacchino Del Regno, Lorenzo Bianconi
Cc: linux-wireless, linux-arm-kernel, linux-mediatek, Kang Yang
In-Reply-To: <20260122-mt76-npu-eagle-offload-v2-0-2374614c0de6@kernel.org>
Introduce support for MT7990 chipset in MT7996 npu configuration
codebase.
Tested-by: Kang Yang <kang.yang@airoha.com>
Signed-off-by: Lorenzo Bianconi <lorenzo@kernel.org>
---
drivers/net/wireless/mediatek/mt76/mt7996/mt7996.h | 1 +
drivers/net/wireless/mediatek/mt76/mt7996/npu.c | 308 ++++++++++++++++++---
2 files changed, 277 insertions(+), 32 deletions(-)
diff --git a/drivers/net/wireless/mediatek/mt76/mt7996/mt7996.h b/drivers/net/wireless/mediatek/mt76/mt7996/mt7996.h
index 29a77d75099033727f5df5a487216c043fd04f85..de31385aa966116b34e545de92623a214bddc8f8 100644
--- a/drivers/net/wireless/mediatek/mt76/mt7996/mt7996.h
+++ b/drivers/net/wireless/mediatek/mt76/mt7996/mt7996.h
@@ -30,6 +30,7 @@
#define MT7996_RX_MCU_RING_SIZE 512
#define MT7996_RX_MCU_RING_SIZE_WA 1024
#define MT7996_NPU_TX_RING_SIZE 1024
+#define MT7996_NPU_RX_RING_SIZE 1024
/* scatter-gather of mcu event is not supported in connac3 */
#define MT7996_RX_MCU_BUF_SIZE (2048 + \
SKB_DATA_ALIGN(sizeof(struct skb_shared_info)))
diff --git a/drivers/net/wireless/mediatek/mt76/mt7996/npu.c b/drivers/net/wireless/mediatek/mt76/mt7996/npu.c
index a9569278f73bf83454a0357e93602837c6ccaa86..1a77a7dc103762c8cc998508348e418858c30029 100644
--- a/drivers/net/wireless/mediatek/mt76/mt7996/npu.c
+++ b/drivers/net/wireless/mediatek/mt76/mt7996/npu.c
@@ -17,21 +17,6 @@ static int mt7992_npu_txrx_offload_init(struct mt7996_dev *dev,
int i, err;
for (i = MT_BAND0; i < MT_BAND2; i++) {
- dma_addr = phy_addr;
- if (i)
- dma_addr += MT_RXQ_RING_BASE(MT_RXQ_RRO_BAND1) + 0x90 +
- hif1_ofs;
- else
- dma_addr += MT_RXQ_RING_BASE(MT_RXQ_RRO_BAND0) + 0x80;
-
- err = mt76_npu_send_msg(npu, i, WLAN_FUNC_SET_WAIT_PCIE_ADDR,
- dma_addr, GFP_KERNEL);
- if (err) {
- dev_warn(dev->mt76.dev,
- "failed setting NPU wlan PCIe desc addr\n");
- return err;
- }
-
err = mt76_npu_send_msg(npu, i, WLAN_FUNC_SET_WAIT_DESC,
MT7996_RX_RING_SIZE, GFP_KERNEL);
if (err) {
@@ -84,6 +69,134 @@ static int mt7992_npu_txrx_offload_init(struct mt7996_dev *dev,
return 0;
}
+static int mt7996_npu_txrx_offload_init(struct mt7996_dev *dev,
+ struct airoha_npu *npu)
+{
+ u32 hif1_ofs = dev->hif2 ? MT_WFDMA0_PCIE1(0) - MT_WFDMA0(0) : 0;
+ phys_addr_t phy_addr = dev->mt76.mmio.phy_addr;
+ u32 dma_addr;
+ int err;
+
+ /* npu rx rro ring0 */
+ err = mt76_npu_send_msg(npu, 0, WLAN_FUNC_SET_WAIT_DESC,
+ MT7996_RX_RING_SIZE, GFP_KERNEL);
+ if (err) {
+ dev_warn(dev->mt76.dev,
+ "failed setting NPU wlan rx desc size\n");
+ return err;
+ }
+
+ /* npu rx rro ring1 */
+ err = mt76_npu_send_msg(npu, 2, WLAN_FUNC_SET_WAIT_DESC,
+ MT7996_NPU_RX_RING_SIZE, GFP_KERNEL);
+ if (err) {
+ dev_warn(dev->mt76.dev,
+ "failed setting NPU wlan rx desc size\n");
+ return err;
+ }
+
+ /* msdu pg 2GHz */
+ dma_addr = phy_addr + MT_RXQ_RING_BASE(MT_RXQ_MSDU_PAGE_BAND0) + 0xa0;
+ err = mt76_npu_send_msg(npu, 5, WLAN_FUNC_SET_WAIT_PCIE_ADDR,
+ dma_addr, GFP_KERNEL);
+ if (err) {
+ dev_warn(dev->mt76.dev,
+ "failed setting NPU wlan PCIe desc addr\n");
+ return err;
+ }
+
+ err = mt76_npu_send_msg(npu, 5, WLAN_FUNC_SET_WAIT_DESC,
+ MT7996_NPU_RX_RING_SIZE / 4, GFP_KERNEL);
+ if (err) {
+ dev_warn(dev->mt76.dev,
+ "failed setting NPU wlan rx desc size\n");
+ return err;
+ }
+
+ /* msdu pg 5GHz */
+ dma_addr = phy_addr + MT_RXQ_RING_BASE(MT_RXQ_MSDU_PAGE_BAND1) + 0xb0;
+ err = mt76_npu_send_msg(npu, 6, WLAN_FUNC_SET_WAIT_PCIE_ADDR,
+ dma_addr, GFP_KERNEL);
+ if (err) {
+ dev_warn(dev->mt76.dev,
+ "failed setting NPU wlan PCIe desc addr\n");
+ return err;
+ }
+
+ err = mt76_npu_send_msg(npu, 6, WLAN_FUNC_SET_WAIT_DESC,
+ MT7996_NPU_RX_RING_SIZE / 2, GFP_KERNEL);
+ if (err) {
+ dev_warn(dev->mt76.dev,
+ "failed setting NPU wlan rx desc size\n");
+ return err;
+ }
+
+ /* msdu pg 6GHz */
+ dma_addr = phy_addr + MT_RXQ_RING_BASE(MT_RXQ_MSDU_PAGE_BAND2) + 0xc0;
+ err = mt76_npu_send_msg(npu, 7, WLAN_FUNC_SET_WAIT_PCIE_ADDR,
+ dma_addr, GFP_KERNEL);
+ if (err) {
+ dev_warn(dev->mt76.dev,
+ "failed setting NPU wlan PCIe desc addr\n");
+ return err;
+ }
+
+ err = mt76_npu_send_msg(npu, 7, WLAN_FUNC_SET_WAIT_DESC,
+ MT7996_NPU_RX_RING_SIZE, GFP_KERNEL);
+ if (err) {
+ dev_warn(dev->mt76.dev,
+ "failed setting NPU wlan rx desc size\n");
+ return err;
+ }
+
+ /* ind cmd ring */
+ err = mt76_npu_send_msg(npu, 8, WLAN_FUNC_SET_WAIT_PCIE_ADDR,
+ phy_addr + MT_RXQ_RRO_IND_RING_BASE,
+ GFP_KERNEL);
+ if (err) {
+ dev_warn(dev->mt76.dev,
+ "failed setting NPU wlan PCIe desc addr\n");
+ return err;
+ }
+
+ err = mt76_npu_send_msg(npu, 8, WLAN_FUNC_SET_WAIT_DESC,
+ MT7996_RX_RING_SIZE, GFP_KERNEL);
+ if (err) {
+ dev_warn(dev->mt76.dev,
+ "failed setting NPU wlan rx desc size\n");
+ return err;
+ }
+
+ err = mt76_npu_send_msg(npu, 3, WLAN_FUNC_SET_WAIT_TX_RING_PCIE_ADDR,
+ phy_addr + MT_RRO_ACK_SN_CTRL, GFP_KERNEL);
+ if (err) {
+ dev_warn(dev->mt76.dev,
+ "failed setting NPU wlan tx desc addr\n");
+ return err;
+ }
+
+ /* npu tx */
+ dma_addr = phy_addr + MT_TXQ_RING_BASE(1) + 0x120;
+ err = mt76_npu_send_msg(npu, 0, WLAN_FUNC_SET_WAIT_TX_RING_PCIE_ADDR,
+ dma_addr, GFP_KERNEL);
+ if (err) {
+ dev_warn(dev->mt76.dev,
+ "failed setting NPU wlan tx desc addr\n");
+ return err;
+ }
+
+ dma_addr = phy_addr + MT_TXQ_RING_BASE(0) + 0x150 + hif1_ofs;
+ err = mt76_npu_send_msg(npu, 2, WLAN_FUNC_SET_WAIT_TX_RING_PCIE_ADDR,
+ dma_addr, GFP_KERNEL);
+ if (err) {
+ dev_warn(dev->mt76.dev,
+ "failed setting NPU wlan tx desc addr\n");
+ return err;
+ }
+
+ return 0;
+}
+
static int mt7996_npu_offload_init(struct mt7996_dev *dev,
struct airoha_npu *npu)
{
@@ -108,7 +221,11 @@ static int mt7996_npu_offload_init(struct mt7996_dev *dev,
return err;
}
- err = mt7992_npu_txrx_offload_init(dev, npu);
+ if (is_mt7996(&dev->mt76))
+ err = mt7996_npu_txrx_offload_init(dev, npu);
+ else
+ err = mt7992_npu_txrx_offload_init(dev, npu);
+
if (err)
return err;
@@ -157,15 +274,84 @@ static int mt7992_npu_rxd_init(struct mt7996_dev *dev, struct airoha_npu *npu)
return 0;
}
-static int mt7996_npu_txd_init(struct mt7996_dev *dev, struct airoha_npu *npu)
+static int mt7996_npu_rxd_init(struct mt7996_dev *dev, struct airoha_npu *npu)
{
- int i, err;
+ u32 val;
+ int err;
- for (i = MT_BAND0; i < MT_BAND2; i++) {
+ err = mt76_npu_get_msg(npu, 0, WLAN_FUNC_GET_WAIT_RXDESC_BASE,
+ &val, GFP_KERNEL);
+ if (err) {
+ dev_warn(dev->mt76.dev,
+ "failed retriving NPU wlan rx ring0 addr\n");
+ return err;
+ }
+ writel(val, &dev->mt76.q_rx[MT_RXQ_RRO_BAND0].regs->desc_base);
+
+ err = mt76_npu_get_msg(npu, 2, WLAN_FUNC_GET_WAIT_RXDESC_BASE,
+ &val, GFP_KERNEL);
+ if (err) {
+ dev_warn(dev->mt76.dev,
+ "failed retriving NPU wlan rx ring2 addr\n");
+ return err;
+ }
+ writel(val, &dev->mt76.q_rx[MT_RXQ_RRO_BAND2].regs->desc_base);
+
+ /* msdu pg ring */
+ err = mt76_npu_get_msg(npu, 10, WLAN_FUNC_GET_WAIT_RXDESC_BASE,
+ &val, GFP_KERNEL);
+ if (err) {
+ dev_warn(dev->mt76.dev,
+ "failed retriving NPU wlan msdu pg ring addr\n");
+ return err;
+ }
+ writel(val, &dev->mt76.q_rx[MT_RXQ_MSDU_PAGE_BAND0].regs->desc_base);
+
+ err = mt76_npu_get_msg(npu, 11, WLAN_FUNC_GET_WAIT_RXDESC_BASE,
+ &val, GFP_KERNEL);
+ if (err) {
+ dev_warn(dev->mt76.dev,
+ "failed retriving NPU wlan msdu pg ring addr\n");
+ return err;
+ }
+ writel(val, &dev->mt76.q_rx[MT_RXQ_MSDU_PAGE_BAND1].regs->desc_base);
+
+ err = mt76_npu_get_msg(npu, 12, WLAN_FUNC_GET_WAIT_RXDESC_BASE,
+ &val, GFP_KERNEL);
+ if (err) {
+ dev_warn(dev->mt76.dev,
+ "failed retriving NPU wlan msdu pg ring addr\n");
+ return err;
+ }
+ writel(val, &dev->mt76.q_rx[MT_RXQ_MSDU_PAGE_BAND2].regs->desc_base);
+
+ /* ind_cmd ring */
+ err = mt76_npu_get_msg(npu, 8, WLAN_FUNC_GET_WAIT_RXDESC_BASE,
+ &val, GFP_KERNEL);
+ if (err) {
+ dev_warn(dev->mt76.dev,
+ "failed retriving NPU wlan ind_cmd ring addr\n");
+ return err;
+ }
+ writel(val, &dev->mt76.q_rx[MT_RXQ_RRO_IND].regs->desc_base);
+
+ return 0;
+}
+
+static int mt7996_npu_txd_init(struct mt7996_dev *dev, struct airoha_npu *npu)
+{
+ const enum mt76_band_id band_list[] = {
+ MT_BAND0,
+ is_mt7996(&dev->mt76) ? MT_BAND2 : MT_BAND1,
+ };
+ int i;
+
+ for (i = 0; i < ARRAY_SIZE(band_list); i++) {
+ int err, band = band_list[i], phy_id;
dma_addr_t dma_addr;
- u32 val;
+ u32 val, size;
- err = mt76_npu_get_msg(npu, i + 5,
+ err = mt76_npu_get_msg(npu, band + 5,
WLAN_FUNC_GET_WAIT_RXDESC_BASE,
&val, GFP_KERNEL);
if (err) {
@@ -173,14 +359,20 @@ static int mt7996_npu_txd_init(struct mt7996_dev *dev, struct airoha_npu *npu)
"failed retriving NPU wlan tx ring addr\n");
return err;
}
- writel(val, &dev->mt76.phys[i]->q_tx[0]->regs->desc_base);
- if (!dmam_alloc_coherent(dev->mt76.dma_dev,
- 256 * MT7996_TX_RING_SIZE,
+ phy_id = is_mt7996(&dev->mt76) ? band == MT_BAND0 ? 1 : 0
+ : band;
+ writel(val, &dev->mt76.phys[phy_id]->q_tx[0]->regs->desc_base);
+
+ size = is_mt7996(&dev->mt76) ? band == MT_BAND2
+ ? MT7996_NPU_TX_RING_SIZE
+ : MT7996_NPU_RX_RING_SIZE / 2
+ : MT7996_TX_RING_SIZE;
+ if (!dmam_alloc_coherent(dev->mt76.dma_dev, 256 * size,
&dma_addr, GFP_KERNEL))
return -ENOMEM;
- err = mt76_npu_send_msg(npu, i,
+ err = mt76_npu_send_msg(npu, band,
WLAN_FUNC_SET_WAIT_TX_BUF_SPACE_HW_BASE,
dma_addr, GFP_KERNEL);
if (err) {
@@ -189,12 +381,11 @@ static int mt7996_npu_txd_init(struct mt7996_dev *dev, struct airoha_npu *npu)
return err;
}
- if (!dmam_alloc_coherent(dev->mt76.dma_dev,
- 256 * MT7996_TX_RING_SIZE,
+ if (!dmam_alloc_coherent(dev->mt76.dma_dev, 256 * size,
&dma_addr, GFP_KERNEL))
return -ENOMEM;
- err = mt76_npu_send_msg(npu, i + 5,
+ err = mt76_npu_send_msg(npu, band + 5,
WLAN_FUNC_SET_WAIT_TX_BUF_SPACE_HW_BASE,
dma_addr, GFP_KERNEL);
if (err) {
@@ -207,7 +398,7 @@ static int mt7996_npu_txd_init(struct mt7996_dev *dev, struct airoha_npu *npu)
&dma_addr, GFP_KERNEL))
return -ENOMEM;
- err = mt76_npu_send_msg(npu, i + 10,
+ err = mt76_npu_send_msg(npu, band + 10,
WLAN_FUNC_SET_WAIT_TX_BUF_SPACE_HW_BASE,
dma_addr, GFP_KERNEL);
if (err) {
@@ -223,8 +414,9 @@ static int mt7996_npu_txd_init(struct mt7996_dev *dev, struct airoha_npu *npu)
static int mt7996_npu_rx_event_init(struct mt7996_dev *dev,
struct airoha_npu *npu)
{
- struct mt76_queue *q = &dev->mt76.q_rx[MT_RXQ_MAIN_WA];
+ int qid = is_mt7996(&dev->mt76) ? MT_RXQ_TXFREE_BAND0 : MT_RXQ_MAIN_WA;
phys_addr_t phy_addr = dev->mt76.mmio.phy_addr;
+ struct mt76_queue *q = &dev->mt76.q_rx[qid];
int err;
err = mt76_npu_send_msg(npu, 0,
@@ -244,7 +436,8 @@ static int mt7996_npu_rx_event_init(struct mt7996_dev *dev,
return err;
}
- phy_addr += MT_RXQ_RING_BASE(MT_RXQ_MAIN_WA) + 0x20;
+ phy_addr += MT_RXQ_RING_BASE(qid);
+ phy_addr += is_mt7996(&dev->mt76) ? 0x90 : 0x20;
err = mt76_npu_send_msg(npu, 10, WLAN_FUNC_SET_WAIT_PCIE_ADDR,
phy_addr, GFP_KERNEL);
if (err)
@@ -253,11 +446,54 @@ static int mt7996_npu_rx_event_init(struct mt7996_dev *dev,
return err;
}
+static int mt7996_npu_set_pcie_addr(struct mt7996_dev *dev,
+ struct airoha_npu *npu)
+{
+ u32 hif1_ofs = dev->hif2 ? MT_WFDMA0_PCIE1(0) - MT_WFDMA0(0) : 0;
+ dma_addr_t dma_addr = dev->mt76.mmio.phy_addr;
+ int err;
+
+ dma_addr += MT_RXQ_RING_BASE(MT_RXQ_RRO_BAND0) + 0x80;
+ err = mt76_npu_send_msg(npu, 0, WLAN_FUNC_SET_WAIT_PCIE_ADDR,
+ dma_addr, GFP_KERNEL);
+ if (err) {
+ dev_warn(dev->mt76.dev,
+ "failed setting NPU wlan PCIe desc addr\n");
+ return err;
+ }
+
+ dma_addr = dev->mt76.mmio.phy_addr + hif1_ofs;
+ if (is_mt7996(&dev->mt76)) {
+ dma_addr += MT_RXQ_RING_BASE(MT_RXQ_RRO_BAND2) + 0x60;
+ err = mt76_npu_send_msg(npu, 2, WLAN_FUNC_SET_WAIT_PCIE_ADDR,
+ dma_addr, GFP_KERNEL);
+ } else {
+ dma_addr += MT_RXQ_RING_BASE(MT_RXQ_RRO_BAND1) + 0x90;
+ err = mt76_npu_send_msg(npu, 1, WLAN_FUNC_SET_WAIT_PCIE_ADDR,
+ dma_addr, GFP_KERNEL);
+ }
+
+ if (err)
+ dev_warn(dev->mt76.dev,
+ "failed setting NPU wlan PCIe desc addr\n");
+
+ return err;
+}
+
static int mt7996_npu_tx_done_init(struct mt7996_dev *dev,
struct airoha_npu *npu)
{
int err;
+ /* rro ring cpu idx */
+ err = mt76_npu_send_msg(npu, 15, WLAN_FUNC_SET_WAIT_PCIE_ADDR,
+ 0, GFP_KERNEL);
+ if (err) {
+ dev_warn(dev->mt76.dev,
+ "failed setting NPU wlan PCIe desc addr\n");
+ return err;
+ }
+
err = mt76_npu_send_msg(npu, 2, WLAN_FUNC_SET_WAIT_INODE_TXRX_REG_ADDR,
0, GFP_KERNEL);
if (err) {
@@ -304,7 +540,11 @@ int mt7996_npu_hw_init(struct mt7996_dev *dev)
if (err)
goto unlock;
- err = mt7992_npu_rxd_init(dev, npu);
+ if (is_mt7996(&dev->mt76))
+ err = mt7996_npu_rxd_init(dev, npu);
+ else
+ err = mt7992_npu_rxd_init(dev, npu);
+
if (err)
goto unlock;
@@ -316,6 +556,10 @@ int mt7996_npu_hw_init(struct mt7996_dev *dev)
if (err)
goto unlock;
+ err = mt7996_npu_set_pcie_addr(dev, npu);
+ if (err)
+ goto unlock;
+
err = mt7996_npu_tx_done_init(dev, npu);
if (err)
goto unlock;
--
2.52.0
^ permalink raw reply related
* [PATCH mt76 v2 07/17] wifi: mt76: mt7996: Rename mt7996_npu_rxd_init() in mt7992_npu_rxd_init()
From: Lorenzo Bianconi @ 2026-01-22 10:39 UTC (permalink / raw)
To: Felix Fietkau, Ryder Lee, Shayne Chen, Sean Wang,
Matthias Brugger, AngeloGioacchino Del Regno, Lorenzo Bianconi
Cc: linux-wireless, linux-arm-kernel, linux-mediatek, Kang Yang
In-Reply-To: <20260122-mt76-npu-eagle-offload-v2-0-2374614c0de6@kernel.org>
This is a preliminary patch to enable NPU offload for MT7996 (Eagle)
chipset.
Tested-by: Kang Yang <kang.yang@airoha.com>
Signed-off-by: Lorenzo Bianconi <lorenzo@kernel.org>
---
drivers/net/wireless/mediatek/mt76/mt7996/npu.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/drivers/net/wireless/mediatek/mt76/mt7996/npu.c b/drivers/net/wireless/mediatek/mt76/mt7996/npu.c
index d79f8dfbd7faa7695ea54b632ac86063fa8ffe3a..a9569278f73bf83454a0357e93602837c6ccaa86 100644
--- a/drivers/net/wireless/mediatek/mt76/mt7996/npu.c
+++ b/drivers/net/wireless/mediatek/mt76/mt7996/npu.c
@@ -122,7 +122,7 @@ static int mt7996_npu_offload_init(struct mt7996_dev *dev,
return 0;
}
-static int mt7996_npu_rxd_init(struct mt7996_dev *dev, struct airoha_npu *npu)
+static int mt7992_npu_rxd_init(struct mt7996_dev *dev, struct airoha_npu *npu)
{
u32 val;
int err;
@@ -304,7 +304,7 @@ int mt7996_npu_hw_init(struct mt7996_dev *dev)
if (err)
goto unlock;
- err = mt7996_npu_rxd_init(dev, npu);
+ err = mt7992_npu_rxd_init(dev, npu);
if (err)
goto unlock;
--
2.52.0
^ permalink raw reply related
* [PATCH mt76 v2 06/17] wifi: mt76: mt7996: Add mt7992_npu_txrx_offload_init routine
From: Lorenzo Bianconi @ 2026-01-22 10:39 UTC (permalink / raw)
To: Felix Fietkau, Ryder Lee, Shayne Chen, Sean Wang,
Matthias Brugger, AngeloGioacchino Del Regno, Lorenzo Bianconi
Cc: linux-wireless, linux-arm-kernel, linux-mediatek, Kang Yang
In-Reply-To: <20260122-mt76-npu-eagle-offload-v2-0-2374614c0de6@kernel.org>
Introduce mt7992_npu_txrx_offload_init utility routine.
This is a preliminary patch to enable NPU offload for MT7996 (Eagle)
chipset.
Tested-by: Kang Yang <kang.yang@airoha.com>
Signed-off-by: Lorenzo Bianconi <lorenzo@kernel.org>
---
drivers/net/wireless/mediatek/mt76/mt7996/npu.c | 63 +++++++++++++++----------
1 file changed, 37 insertions(+), 26 deletions(-)
diff --git a/drivers/net/wireless/mediatek/mt76/mt7996/npu.c b/drivers/net/wireless/mediatek/mt76/mt7996/npu.c
index 067ef647e404073173833aad3a2800d6591a5188..d79f8dfbd7faa7695ea54b632ac86063fa8ffe3a 100644
--- a/drivers/net/wireless/mediatek/mt76/mt7996/npu.c
+++ b/drivers/net/wireless/mediatek/mt76/mt7996/npu.c
@@ -8,34 +8,14 @@
#include "mt7996.h"
-static int mt7996_npu_offload_init(struct mt7996_dev *dev,
- struct airoha_npu *npu)
+static int mt7992_npu_txrx_offload_init(struct mt7996_dev *dev,
+ struct airoha_npu *npu)
{
+ u32 hif1_ofs = dev->hif2 ? MT_WFDMA0_PCIE1(0) - MT_WFDMA0(0) : 0;
phys_addr_t phy_addr = dev->mt76.mmio.phy_addr;
- u32 val, hif1_ofs = 0, dma_addr;
+ u32 dma_addr;
int i, err;
- err = mt76_npu_get_msg(npu, 0, WLAN_FUNC_GET_WAIT_NPU_VERSION,
- &val, GFP_KERNEL);
- if (err) {
- dev_warn(dev->mt76.dev, "failed getting NPU fw version\n");
- return err;
- }
-
- dev_info(dev->mt76.dev, "NPU version: %0d.%d\n",
- (val >> 16) & 0xffff, val & 0xffff);
-
- err = mt76_npu_send_msg(npu, 0, WLAN_FUNC_SET_WAIT_PCIE_PORT_TYPE,
- dev->mt76.mmio.npu_type, GFP_KERNEL);
- if (err) {
- dev_warn(dev->mt76.dev,
- "failed setting NPU wlan PCIe port type\n");
- return err;
- }
-
- if (dev->hif2)
- hif1_ofs = MT_WFDMA0_PCIE1(0) - MT_WFDMA0(0);
-
for (i = MT_BAND0; i < MT_BAND2; i++) {
dma_addr = phy_addr;
if (i)
@@ -56,7 +36,7 @@ static int mt7996_npu_offload_init(struct mt7996_dev *dev,
MT7996_RX_RING_SIZE, GFP_KERNEL);
if (err) {
dev_warn(dev->mt76.dev,
- "failed setting NPU wlan PCIe desc size\n");
+ "failed setting NPU wlan rx desc size\n");
return err;
}
@@ -97,10 +77,41 @@ static int mt7996_npu_offload_init(struct mt7996_dev *dev,
phy_addr + MT_RRO_ACK_SN_CTRL, GFP_KERNEL);
if (err) {
dev_warn(dev->mt76.dev,
- "failed setting NPU wlan rro_ack_sn desc addr\n");
+ "failed setting NPU wlan tx desc addr\n");
return err;
}
+ return 0;
+}
+
+static int mt7996_npu_offload_init(struct mt7996_dev *dev,
+ struct airoha_npu *npu)
+{
+ u32 val;
+ int err;
+
+ err = mt76_npu_get_msg(npu, 0, WLAN_FUNC_GET_WAIT_NPU_VERSION,
+ &val, GFP_KERNEL);
+ if (err) {
+ dev_warn(dev->mt76.dev, "failed getting NPU fw version\n");
+ return err;
+ }
+
+ dev_info(dev->mt76.dev, "NPU version: %0d.%d\n",
+ (val >> 16) & 0xffff, val & 0xffff);
+
+ err = mt76_npu_send_msg(npu, 0, WLAN_FUNC_SET_WAIT_PCIE_PORT_TYPE,
+ dev->mt76.mmio.npu_type, GFP_KERNEL);
+ if (err) {
+ dev_warn(dev->mt76.dev,
+ "failed setting NPU wlan PCIe port type\n");
+ return err;
+ }
+
+ err = mt7992_npu_txrx_offload_init(dev, npu);
+ if (err)
+ return err;
+
err = mt76_npu_send_msg(npu, 0, WLAN_FUNC_SET_WAIT_TOKEN_ID_SIZE,
MT7996_HW_TOKEN_SIZE, GFP_KERNEL);
if (err)
--
2.52.0
^ permalink raw reply related
* [PATCH mt76 v2 05/17] wifi: mt76: mt7996: Fix wdma_idx for MT7996 device if NPU is enabled
From: Lorenzo Bianconi @ 2026-01-22 10:39 UTC (permalink / raw)
To: Felix Fietkau, Ryder Lee, Shayne Chen, Sean Wang,
Matthias Brugger, AngeloGioacchino Del Regno, Lorenzo Bianconi
Cc: linux-wireless, linux-arm-kernel, linux-mediatek, Kang Yang
In-Reply-To: <20260122-mt76-npu-eagle-offload-v2-0-2374614c0de6@kernel.org>
This is a preliminary patch to enable NPU offload for MT7996 (Eagle)
chipset.
Tested-by: Kang Yang <kang.yang@airoha.com>
Signed-off-by: Lorenzo Bianconi <lorenzo@kernel.org>
---
drivers/net/wireless/mediatek/mt76/mt7996/main.c | 4 ++++
1 file changed, 4 insertions(+)
diff --git a/drivers/net/wireless/mediatek/mt76/mt7996/main.c b/drivers/net/wireless/mediatek/mt76/mt7996/main.c
index 78151197feccb0197e44f3f73c0f01c4589314ae..3aa0a7bf830550a05c6f5925014c7c34e0e99f78 100644
--- a/drivers/net/wireless/mediatek/mt76/mt7996/main.c
+++ b/drivers/net/wireless/mediatek/mt76/mt7996/main.c
@@ -2237,6 +2237,10 @@ mt7996_net_fill_forward_path(struct ieee80211_hw *hw,
path->mtk_wdma.wdma_idx = wed->wdma_idx;
else
#endif
+ if (is_mt7996(&dev->mt76) && mt76_npu_device_active(&dev->mt76) &&
+ msta_link->wcid.phy_idx == MT_BAND2)
+ path->mtk_wdma.wdma_idx = 1;
+ else
path->mtk_wdma.wdma_idx = link->mt76.band_idx;
path->mtk_wdma.bss = link->mt76.idx;
path->mtk_wdma.queue = 0;
--
2.52.0
^ permalink raw reply related
* [PATCH mt76 v2 04/17] wifi: mt76: mt7996: Fix BAND2 tx queues initialization when NPU is enabled
From: Lorenzo Bianconi @ 2026-01-22 10:39 UTC (permalink / raw)
To: Felix Fietkau, Ryder Lee, Shayne Chen, Sean Wang,
Matthias Brugger, AngeloGioacchino Del Regno, Lorenzo Bianconi
Cc: linux-wireless, linux-arm-kernel, linux-mediatek, Kang Yang
In-Reply-To: <20260122-mt76-npu-eagle-offload-v2-0-2374614c0de6@kernel.org>
Fix BAND2 tx queues initialization for MT7990 chipset when NPU is
enabled. This is a preliminary patch to enable NPU offload for MT7996
(Eagle) chipset.
Tested-by: Kang Yang <kang.yang@airoha.com>
Signed-off-by: Lorenzo Bianconi <lorenzo@kernel.org>
---
drivers/net/wireless/mediatek/mt76/mt7996/init.c | 18 ++++++++++++------
drivers/net/wireless/mediatek/mt76/mt7996/mt7996.h | 1 +
2 files changed, 13 insertions(+), 6 deletions(-)
diff --git a/drivers/net/wireless/mediatek/mt76/mt7996/init.c b/drivers/net/wireless/mediatek/mt76/mt7996/init.c
index 00a8286bd136862d756706d6ad8098a2ddc3ca4e..9fbe4235de0d0d42776d5661fa1c297e431b8d27 100644
--- a/drivers/net/wireless/mediatek/mt76/mt7996/init.c
+++ b/drivers/net/wireless/mediatek/mt76/mt7996/init.c
@@ -668,8 +668,9 @@ static int mt7996_register_phy(struct mt7996_dev *dev, enum mt76_band_id band)
return 0;
if (dev->hif2 &&
- ((is_mt7996(&dev->mt76) && band == MT_BAND2) ||
- (is_mt7992(&dev->mt76) && band == MT_BAND1))) {
+ ((is_mt7992(&dev->mt76) && band == MT_BAND1) ||
+ (is_mt7996(&dev->mt76) && band == MT_BAND2 &&
+ !mt76_npu_device_active(&dev->mt76)))) {
hif1_ofs = MT_WFDMA0_PCIE1(0) - MT_WFDMA0(0);
wed = &dev->mt76.mmio.wed_hif2;
}
@@ -709,14 +710,19 @@ static int mt7996_register_phy(struct mt7996_dev *dev, enum mt76_band_id band)
/* init wiphy according to mphy and phy */
mt7996_init_wiphy_band(mphy->hw, phy);
- if (is_mt7996(&dev->mt76) && !dev->hif2 && band == MT_BAND1) {
+ if (is_mt7996(&dev->mt76) &&
+ ((band == MT_BAND1 && !dev->hif2) ||
+ (band == MT_BAND2 && mt76_npu_device_active(&dev->mt76)))) {
int i;
for (i = 0; i <= MT_TXQ_PSD; i++)
- mphy->q_tx[i] = dev->mt76.phys[MT_BAND0]->q_tx[0];
+ mphy->q_tx[i] = dev->mt76.phys[band - 1]->q_tx[0];
} else {
- ret = mt7996_init_tx_queues(mphy->priv, MT_TXQ_ID(band),
- MT7996_TX_RING_SIZE,
+ int size = is_mt7996(&dev->mt76) &&
+ mt76_npu_device_active(&dev->mt76)
+ ? MT7996_NPU_TX_RING_SIZE / 2 : MT7996_TX_RING_SIZE;
+
+ ret = mt7996_init_tx_queues(mphy->priv, MT_TXQ_ID(band), size,
MT_TXQ_RING_BASE(band) + hif1_ofs,
wed);
if (ret)
diff --git a/drivers/net/wireless/mediatek/mt76/mt7996/mt7996.h b/drivers/net/wireless/mediatek/mt76/mt7996/mt7996.h
index 7a884311800ea8cfc0e302b2a140a4072ce18b69..29a77d75099033727f5df5a487216c043fd04f85 100644
--- a/drivers/net/wireless/mediatek/mt76/mt7996/mt7996.h
+++ b/drivers/net/wireless/mediatek/mt76/mt7996/mt7996.h
@@ -29,6 +29,7 @@
#define MT7996_RX_RING_SIZE 1536
#define MT7996_RX_MCU_RING_SIZE 512
#define MT7996_RX_MCU_RING_SIZE_WA 1024
+#define MT7996_NPU_TX_RING_SIZE 1024
/* scatter-gather of mcu event is not supported in connac3 */
#define MT7996_RX_MCU_BUF_SIZE (2048 + \
SKB_DATA_ALIGN(sizeof(struct skb_shared_info)))
--
2.52.0
^ permalink raw reply related
* [PATCH mt76 v2 03/17] wifi: mt76: always enable RRO queues for non-MT7992 chipset
From: Lorenzo Bianconi @ 2026-01-22 10:39 UTC (permalink / raw)
To: Felix Fietkau, Ryder Lee, Shayne Chen, Sean Wang,
Matthias Brugger, AngeloGioacchino Del Regno, Lorenzo Bianconi
Cc: linux-wireless, linux-arm-kernel, linux-mediatek, Kang Yang
In-Reply-To: <20260122-mt76-npu-eagle-offload-v2-0-2374614c0de6@kernel.org>
MT7990 NPU binary requires to initialize NPU desc_base after configuring
ring_size. This is a preliminary patch to enable NPU offload for MT7996
(Eagle) chipset.
Tested-by: Kang Yang <kang.yang@airoha.com>
Signed-off-by: Lorenzo Bianconi <lorenzo@kernel.org>
---
drivers/net/wireless/mediatek/mt76/dma.c | 9 ++++++---
1 file changed, 6 insertions(+), 3 deletions(-)
diff --git a/drivers/net/wireless/mediatek/mt76/dma.c b/drivers/net/wireless/mediatek/mt76/dma.c
index 893ac14285cab3c22f70945d490627a64b643efe..f5c6bb94ccbbda6afe03b24cf245b30c797e855d 100644
--- a/drivers/net/wireless/mediatek/mt76/dma.c
+++ b/drivers/net/wireless/mediatek/mt76/dma.c
@@ -6,6 +6,7 @@
#include <linux/dma-mapping.h>
#include "mt76.h"
#include "dma.h"
+#include "mt76_connac.h"
static struct mt76_txwi_cache *
mt76_alloc_txwi(struct mt76_dev *dev)
@@ -188,16 +189,18 @@ mt76_dma_queue_magic_cnt_init(struct mt76_dev *dev, struct mt76_queue *q)
static void
mt76_dma_sync_idx(struct mt76_dev *dev, struct mt76_queue *q)
{
- Q_WRITE(q, desc_base, q->desc_dma);
- if ((q->flags & MT_QFLAG_WED_RRO_EN) && !mt76_npu_device_active(dev))
+ if ((q->flags & MT_QFLAG_WED_RRO_EN) &&
+ (!is_mt7992(dev) || !mt76_npu_device_active(dev)))
Q_WRITE(q, ring_size, MT_DMA_RRO_EN | q->ndesc);
else
Q_WRITE(q, ring_size, q->ndesc);
if (mt76_queue_is_npu_tx(q)) {
- writel(q->desc_dma, &q->regs->desc_base);
writel(q->ndesc, &q->regs->ring_size);
+ writel(q->desc_dma, &q->regs->desc_base);
}
+
+ Q_WRITE(q, desc_base, q->desc_dma);
q->head = Q_READ(q, dma_idx);
q->tail = q->head;
}
--
2.52.0
^ permalink raw reply related
* [PATCH mt76 v2 02/17] wifi: mt76: npu: Add missing rx_token_size initialization
From: Lorenzo Bianconi @ 2026-01-22 10:39 UTC (permalink / raw)
To: Felix Fietkau, Ryder Lee, Shayne Chen, Sean Wang,
Matthias Brugger, AngeloGioacchino Del Regno, Lorenzo Bianconi
Cc: linux-wireless, linux-arm-kernel, linux-mediatek, Kang Yang
In-Reply-To: <20260122-mt76-npu-eagle-offload-v2-0-2374614c0de6@kernel.org>
Add missing rx_token_size initialization for NPU offloading.
Fixes: 7fb554b1b623 ("wifi: mt76: Introduce the NPU generic layer")
Tested-by: Kang Yang <kang.yang@airoha.com>
Signed-off-by: Lorenzo Bianconi <lorenzo@kernel.org>
---
drivers/net/wireless/mediatek/mt76/npu.c | 1 +
1 file changed, 1 insertion(+)
diff --git a/drivers/net/wireless/mediatek/mt76/npu.c b/drivers/net/wireless/mediatek/mt76/npu.c
index ec36975f6dc946f5dbc5ab6029b0574fbc602615..9679237f739842bd44497e0b1022a868cb3a0d6c 100644
--- a/drivers/net/wireless/mediatek/mt76/npu.c
+++ b/drivers/net/wireless/mediatek/mt76/npu.c
@@ -457,6 +457,7 @@ int mt76_npu_init(struct mt76_dev *dev, phys_addr_t phy_addr, int type)
dev->mmio.npu_type = type;
/* NPU offloading requires HW-RRO for RX packet reordering. */
dev->hwrro_mode = MT76_HWRRO_V3_1;
+ dev->rx_token_size = 32768;
rcu_assign_pointer(dev->mmio.npu, npu);
rcu_assign_pointer(dev->mmio.ppe_dev, ppe_dev);
--
2.52.0
^ permalink raw reply related
* [PATCH mt76 v2 01/17] wifi: mt76: mt7996: Fix NPU stop procedure
From: Lorenzo Bianconi @ 2026-01-22 10:39 UTC (permalink / raw)
To: Felix Fietkau, Ryder Lee, Shayne Chen, Sean Wang,
Matthias Brugger, AngeloGioacchino Del Regno, Lorenzo Bianconi
Cc: linux-wireless, linux-arm-kernel, linux-mediatek, Kang Yang
In-Reply-To: <20260122-mt76-npu-eagle-offload-v2-0-2374614c0de6@kernel.org>
Move mt7996_npu_hw_stop routine before disabling rx NAPIs in order to
fix NPU stop procedure used during device L1 SER recovery.
Add missing usleep_range in mt7996_npu_hw_stop().
Fixes: 377aa17d2aedc ("wifi: mt76: mt7996: Add NPU offload support to MT7996 driver")
Tested-by: Kang Yang <kang.yang@airoha.com>
Signed-off-by: Lorenzo Bianconi <lorenzo@kernel.org>
---
drivers/net/wireless/mediatek/mt76/mt7996/mac.c | 3 +--
drivers/net/wireless/mediatek/mt76/mt7996/npu.c | 23 ++++++++++++++---------
2 files changed, 15 insertions(+), 11 deletions(-)
diff --git a/drivers/net/wireless/mediatek/mt76/mt7996/mac.c b/drivers/net/wireless/mediatek/mt76/mt7996/mac.c
index aab79c042b52fbc67e14352665e0905397e4a301..db2eda2f1c4c097aafc55245e523e39c7bc71e34 100644
--- a/drivers/net/wireless/mediatek/mt76/mt7996/mac.c
+++ b/drivers/net/wireless/mediatek/mt76/mt7996/mac.c
@@ -2542,6 +2542,7 @@ void mt7996_mac_reset_work(struct work_struct *work)
if (mtk_wed_device_active(&dev->mt76.mmio.wed))
mtk_wed_device_stop(&dev->mt76.mmio.wed);
+ mt7996_npu_hw_stop(dev);
ieee80211_stop_queues(mt76_hw(dev));
set_bit(MT76_RESET, &dev->mphy.state);
@@ -2568,8 +2569,6 @@ void mt7996_mac_reset_work(struct work_struct *work)
mutex_lock(&dev->mt76.mutex);
- mt7996_npu_hw_stop(dev);
-
mt76_wr(dev, MT_MCU_INT_EVENT, MT_MCU_INT_EVENT_DMA_STOPPED);
if (mt7996_wait_reset_state(dev, MT_MCU_CMD_RESET_DONE)) {
diff --git a/drivers/net/wireless/mediatek/mt76/mt7996/npu.c b/drivers/net/wireless/mediatek/mt76/mt7996/npu.c
index 29bb735da4cb8f5998c9483567c65f3e3530c771..067ef647e404073173833aad3a2800d6591a5188 100644
--- a/drivers/net/wireless/mediatek/mt76/mt7996/npu.c
+++ b/drivers/net/wireless/mediatek/mt76/mt7996/npu.c
@@ -320,33 +320,38 @@ int mt7996_npu_hw_init(struct mt7996_dev *dev)
int mt7996_npu_hw_stop(struct mt7996_dev *dev)
{
struct airoha_npu *npu;
- int i, err;
+ int i, err = 0;
u32 info;
+ mutex_lock(&dev->mt76.mutex);
+
npu = rcu_dereference_protected(dev->mt76.mmio.npu, &dev->mt76.mutex);
if (!npu)
- return 0;
+ goto unlock;
err = mt76_npu_send_msg(npu, 4, WLAN_FUNC_SET_WAIT_INODE_TXRX_REG_ADDR,
0, GFP_KERNEL);
if (err)
- return err;
+ goto unlock;
for (i = 0; i < 10; i++) {
err = mt76_npu_get_msg(npu, 3, WLAN_FUNC_GET_WAIT_NPU_INFO,
&info, GFP_KERNEL);
- if (err)
- continue;
+ if (!err && !info)
+ break;
- if (info) {
- err = -ETIMEDOUT;
- continue;
- }
+ err = -ETIMEDOUT;
+ usleep_range(10000, 15000);
}
if (!err)
err = mt76_npu_send_msg(npu, 6,
WLAN_FUNC_SET_WAIT_INODE_TXRX_REG_ADDR,
0, GFP_KERNEL);
+ else
+ dev_err(dev->mt76.dev, "npu stop failed\n");
+unlock:
+ mutex_unlock(&dev->mt76.mutex);
+
return err;
}
--
2.52.0
^ permalink raw reply related
* [PATCH mt76 v2 00/17] wifi: mt76: mt7996: support for MT7996 NPU offloading
From: Lorenzo Bianconi @ 2026-01-22 10:39 UTC (permalink / raw)
To: Felix Fietkau, Ryder Lee, Shayne Chen, Sean Wang,
Matthias Brugger, AngeloGioacchino Del Regno, Lorenzo Bianconi
Cc: linux-wireless, linux-arm-kernel, linux-mediatek, Kang Yang
Introduce support for NPU offloading in MT7996 (7990-Eagle) chipset.
---
Changes in v2:
- Rebase on top of mt76 tree
- Fix NPU reset procedure
- Link to v1: https://lore.kernel.org/linux-wireless/20251204-mt76-npu-eagle-offload-v1-0-7819c52c0893@kernel.org/
---
Lorenzo Bianconi (17):
wifi: mt76: mt7996: Fix NPU stop procedure
wifi: mt76: npu: Add missing rx_token_size initialization
wifi: mt76: always enable RRO queues for non-MT7992 chipset
wifi: mt76: mt7996: Fix BAND2 tx queues initialization when NPU is enabled
wifi: mt76: mt7996: Fix wdma_idx for MT7996 device if NPU is enabled
wifi: mt76: mt7996: Add mt7992_npu_txrx_offload_init routine
wifi: mt76: mt7996: Rename mt7996_npu_rxd_init() in mt7992_npu_rxd_init()
wifi: mt76: mt7996: Add NPU support for MT7990 chipset
wifi: mt76: mt7996: Integrate NPU in RRO session management
wifi: mt76: mt7996: Integrate MT7990 init configuration for NPU
wifi: mt76: mt7996: Integrate MT7990 dma configuration for NPU
wifi: mt76: mt7996: Add __mt7996_npu_hw_init routine
wifi: mt76: mt7996: Move RRO dma start in a dedicated routine
wifi: mt76: Do not reset idx for NPU tx queues during reset
wifi: mt76: mt7996: Do not schedule RRO and TxFree queues during reset for NPU
wifi: mt76: mt7996: Store DMA mapped buffer addresses in mt7996_npu_hw_init()
wifi: mt76: Enable NPU support for MT7996 devices
drivers/net/wireless/mediatek/mt76/dma.c | 20 +-
drivers/net/wireless/mediatek/mt76/dma.h | 4 +-
drivers/net/wireless/mediatek/mt76/mt76.h | 20 +
drivers/net/wireless/mediatek/mt76/mt7996/dma.c | 204 +++++----
drivers/net/wireless/mediatek/mt76/mt7996/init.c | 49 ++-
drivers/net/wireless/mediatek/mt76/mt7996/mac.c | 21 +-
drivers/net/wireless/mediatek/mt76/mt7996/main.c | 4 +
drivers/net/wireless/mediatek/mt76/mt7996/mt7996.h | 13 +
drivers/net/wireless/mediatek/mt76/mt7996/npu.c | 457 +++++++++++++++++----
drivers/net/wireless/mediatek/mt76/npu.c | 37 +-
10 files changed, 640 insertions(+), 189 deletions(-)
---
base-commit: 3bc60b741f6a2d51b6743fd0e5639beaffc39953
change-id: 20260122-mt76-npu-eagle-offload-fb1db48aa1ce
Best regards,
--
Lorenzo Bianconi <lorenzo@kernel.org>
^ permalink raw reply
* [PATCH v3] wifi: p54: Fix memory leak in p54_beacon_update()
From: Zilin Guan @ 2026-01-22 8:59 UTC (permalink / raw)
To: chunkeey
Cc: johannes.berg, quic_rdevanat, linux-wireless, linux-kernel,
jianhao.xu, Zilin Guan
In p54_beacon_update(), beacon is allocated via ieee80211_beacon_get().
If p54_beacon_format_ie_tim() fails, the function returns immediately
without freeing the allocated beacon skb, which would lead to a memory
leak.
Since no other references to this memory exist, it must be freed locally
before returning the error. Fix this by freeing the buffer using
dev_kfree_skb_any() in the error path.
Note that this error path is unreachable in practice because mac80211
guarantees a minimum TIM length of 4 bytes for non-S1G devices. This
change primarily serves to silence static analysis warnings and keep
the error handling logic complete.
Compile tested only. Issue found using a prototype static analysis tool
and code review.
Signed-off-by: Zilin Guan <zilin@seu.edu.cn>
---
Changes in v3:
- Add a note in the commit message about the code path being unreachable
in practice.
- Remove the Fixes tag as the issue is theoretical and unreachable.
Changes in v2:
- Correct the Fixes tag to point to the commit that introduced this issue.
drivers/net/wireless/intersil/p54/main.c | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/drivers/net/wireless/intersil/p54/main.c b/drivers/net/wireless/intersil/p54/main.c
index 2ec3655f1a9c..57a62108cbc3 100644
--- a/drivers/net/wireless/intersil/p54/main.c
+++ b/drivers/net/wireless/intersil/p54/main.c
@@ -143,8 +143,10 @@ static int p54_beacon_update(struct p54_common *priv,
if (!beacon)
return -ENOMEM;
ret = p54_beacon_format_ie_tim(beacon);
- if (ret)
+ if (ret) {
+ dev_kfree_skb_any(beacon);
return ret;
+ }
/*
* During operation, the firmware takes care of beaconing.
--
2.34.1
^ permalink raw reply related
* Re: [PATCH 2/2] wifi: rtw88: add WQ_PERCPU to alloc_workqueue users
From: Marco Crivellari @ 2026-01-22 8:59 UTC (permalink / raw)
To: Ping-Ke Shih
Cc: linux-kernel, linux-wireless, Tejun Heo, Lai Jiangshan,
Frederic Weisbecker, Sebastian Andrzej Siewior, Michal Hocko
In-Reply-To: <03d9df21-039c-4aa2-b227-9da4f8076388@RTKEXHMBS03.realtek.com.tw>
On Thu, Jan 22, 2026 at 2:29 AM Ping-Ke Shih <pkshih@realtek.com> wrote:
> [...]
> 1 patch(es) applied to rtw-next branch of rtw.git, thanks.
>
> f65ca6c51179 wifi: rtw88: add WQ_PERCPU to alloc_workqueue users
>
Many thanks!
--
Marco Crivellari
L3 Support Engineer
^ permalink raw reply
* Re: [DESIGN RFC v3] AP Architecture for Wi-Fi-8 Multi-AP Coordination (MAPC)
From: Abhishek Rajkapur Suryawanshi @ 2026-01-22 8:42 UTC (permalink / raw)
To: Johannes Berg, Jeff Johnson, ath12k, hostap; +Cc: linux-wireless
In-Reply-To: <52356be3d21920d84579d1a8fd803540c6f9644d.camel@sipsolutions.net>
On 1/15/2026 6:17 AM, Johannes Berg wrote:
> On Wed, 2026-01-14 at 11:15 -0800, Jeff Johnson wrote:
>> On 1/12/2026 11:18 AM, Johannes Berg wrote:
>>> On Mon, 2026-01-12 at 20:12 +0100, Johannes Berg wrote:
>>>>
>>>> Why do you always want to let firmware be in control of everything?
>>>> Seems at least for some of this you'd really want the upper layers to
>>>> control it for purposes of coordination? How does the FW even know which
>>>> other AP it can coordinate with, isn't that something a network
>>>> controller would determine?
>>>
>>> A less generous reading of this could be: you guys want everything to be
>>> controlled by FW, so you don't have to open-source it in hostapd. Now
>>> you realize oops, don't really want to do all the security handshake in
>>> FW, so we need to ask hostapd and then we need keys and stations and all
>>> this stuff. So let's build something nobody else can use, upstream it
>>> and we get the best of both worlds - others will maintain the mac80211
>>> code for us anyway.
>>>
>>> Am I wrong? Is there a technical reason for not simply doing MAPC
>>> discovery/agreement negotiation etc. in hostapd as well, based on
>>> driver/hw/fw capabilities, and then you don't need all these strange
>>> "triggered by firmware" flows?
>>
>> My perception is that Qualcomm would love for all the Wi-Fi 8 functionality to
>> be in userspace and nl/cfg/mac80211 since then there would be no code
>> maintenance overhead on our part -- just you and the userspace maintainers.
>
> :)
>
>> But there are concerns about latency, and internal consensus is that some
>> aspects of this functionality has to be handled in firmware (or even hardware)
>> in order to meet customer KPIs. This comes from our history of supporting
>> large-scale deployments of APs, and the expectations of how Wi-Fi 8 will make
>> things better. That is why we are posting design RFCs, so that you, as well as
>> engineers from other vendors, can review our proposals and give your feedback
>> and counter-proposals. We want to avoid developing what might be an
>> architecturally pure design that doesn't actually meet customer needs.
>
> Sure, that's fair.
>
> Maybe I can just ask folks to spell out the constraints and reasoning
> behind the design?
>
> Taking this specific example, it basically says "FW sends a request to
> hostapd, hostapd does the handshake and installs the MAPC station. This
> is how we think we should handle the MAPC stations."
hostapd controls and manages all MAPC related discovery and MAPC peer
creation part. No trigger from firmware for MAPC Discovery Phase.
> It never says _why_ and how any of this happens. What's the magic thing
> only the firmware can do to figure out it should start coordinating a
> given AP? (Clearly that operation can't be concerned much about latency
> if it asks hostapd.)
In our offload architecture, the firmware monitors various telemetry
and controls all data‑path‑related scheduling. That's the primary reason
why our design requires offload-based trigger for MAPC feature. Additionally,
the offload-based design only signals intent or need; hostapd still owns
MAPC peer selection to kick-start the MAPC negotiation. This trigger will
be configurable (i.e could be enable/disable from user-space).
> In fact I'd have expected that in certain cases some controller
> infrastructure sitting *on top of hostapd* would decide which APs
> coordinate with each other, rather than the firmware. Although I guess
> if you hear the beacon on the same channel with a good enough RSSI then
> you can coordinate.
Offload based MAPC negotiation trigger is primarily intended for
non‑controller-based AP deployments. In controller‑based AP configuration
& deployments, controller is fully responsible for triggering hostapd to
initiate the MAPC Negotiation Request (e.g., via centralized telemetry and
policy enforcement). In these deployments, the offload base MAPC negotiation
trigger shall be disabled.
> I could keep guessing - maybe there's a limited space to do this in FW?
> But there's not even anything built into the design where the firmware
> can ask to _remove_ it again, as far as I can tell, unless there was an
> (unstated) assumption that it can just delete the MAPC station and send
> a DEL_STATION notification about it.
Like offload based MAPC trigger intent for adding MAPC neighbors, it would
be extended for the MAPC teardown intent as well. hostapd will still controls
MAPC peer deletion & MAPC tear down protocol
> The document even says that phase 1 is discovery, and then goes to
> completely ignore phase 1 (it's hidden in FW), and describes basically
> only phase 2.
Phase 1 discovery is completely handled by hostapd, as outlined under
section (A)hostapd
>> And apologies for the "firehose" of both design and code, but we have a desire
>> to ship Wi-Fi 8 products using upstream code. I've passed along information
>> that you want our engineering team to focus on the base NPCA patches so that
>> there is the appropriate foundation. But in parallel we do also hope there is
>> engagement from other vendors on the Design RFCs we are posting. Our goal is
>> to upstream as much AP functionality as you can absorb.
>
> Sure, and I appreciate that this is coming. I'm a little overwhelmed by
> having so many parallel things going on right now, and all the parallel
> design documents don't help.
>
> Maybe this is the point where we consider inviting everyone who wants to
> a room for a few days? Even a video room might be better ;-) List some
> topics first, present the design briefly, etc.? But I don't know if it's
> just the medium.
>
> johannes
Abhishek
^ permalink raw reply
* Re: [PATCH v2] wifi: p54: Fix memory leak in p54_beacon_update()
From: Zilin Guan @ 2026-01-22 8:34 UTC (permalink / raw)
To: chunkeey
Cc: jianhao.xu, johannes.berg, johannes, linux-kernel, linux-wireless,
quic_rdevanat, zilin
In-Reply-To: <819fc850-98b4-4a0c-af4d-da2cf41cfcbd@gmail.com>
On Thu, Jan 22, 2026 at 09:14:50AM +0100, Christian Lamparter wrote:
> Hi Zilin,
>
> On 1/21/26 10:05 AM, Zilin Guan wrote:
> > On Tue, Jan 20, 2026 at 09:25:15PM +0100, Christian Lamparter wrote:
> >> Ok, from what I remember, this return basically is/was and likely will be a dead-code path.
> >> So adding something there is only there to "look" good for the static analysis tools.
> >> But many commits like these have been merged before. As long as it is mentioned that
> >> static analysis was the reason for this. Yeah sure why not.
> >>
> >>
> >> Reason being why this is dead-code is that in order for the path to trigger, mac80211's
> >> ieee80211_beacon_get must have prepared an invalid beacon (with an invalid TIM Element)
> >> to start with... And looking at ieee80211_beacon_add_tim_pvb, it still looks to me like
> >> the IE length can't be less than 3 ever. But, I've been wrong before, if you do see please
> >> correct me. (If not, you don't neet to really bother with the Fixes-Tag)
> >
> > I agree with your analysis. I checked the code and confirmed that mac80211
> > guarantees a minimum TIM length of 4 bytes for non-S1G devices.
> >
> > I appreciate you accepting this patch to silence the static analysis warning.
>
> Phew, and so far no buildbot replied with comments.
>
> I have one last request: Can you please add a sentence about that analysis into the commit log as well?
> Our future selves could maybe appreciate that one day, if this comes up again. Because then we won't have
> to remember all or search/look for it again, if it's already neatly written down directly there.
>
> Thank you,
> Christian
Hi Christian,
Sure, I will add a note about the analysis to the commit message as
requested and send a v3 patch shortly.
Thanks,
Zilin
^ permalink raw reply
* Re: [PATCH v2] wifi: p54: Fix memory leak in p54_beacon_update()
From: Christian Lamparter @ 2026-01-22 8:14 UTC (permalink / raw)
To: Zilin Guan
Cc: jianhao.xu, johannes.berg, johannes, linux-kernel, linux-wireless,
quic_rdevanat
In-Reply-To: <20260121090507.3442567-1-zilin@seu.edu.cn>
Hi Zilin,
On 1/21/26 10:05 AM, Zilin Guan wrote:
> On Tue, Jan 20, 2026 at 09:25:15PM +0100, Christian Lamparter wrote:
>> Ok, from what I remember, this return basically is/was and likely will be a dead-code path.
>> So adding something there is only there to "look" good for the static analysis tools.
>> But many commits like these have been merged before. As long as it is mentioned that
>> static analysis was the reason for this. Yeah sure why not.
>>
>>
>> Reason being why this is dead-code is that in order for the path to trigger, mac80211's
>> ieee80211_beacon_get must have prepared an invalid beacon (with an invalid TIM Element)
>> to start with... And looking at ieee80211_beacon_add_tim_pvb, it still looks to me like
>> the IE length can't be less than 3 ever. But, I've been wrong before, if you do see please
>> correct me. (If not, you don't neet to really bother with the Fixes-Tag)
>
> I agree with your analysis. I checked the code and confirmed that mac80211
> guarantees a minimum TIM length of 4 bytes for non-S1G devices.
>
> I appreciate you accepting this patch to silence the static analysis warning.
Phew, and so far no buildbot replied with comments.
I have one last request: Can you please add a sentence about that analysis into the commit log as well?
Our future selves could maybe appreciate that one day, if this comes up again. Because then we won't have
to remember all or search/look for it again, if it's already neatly written down directly there.
Thank you,
Christian
^ permalink raw reply
* Re: [PATCH rtw-next 1/9] wifi: rtw89: phy: add chip_ops to calculate RX gain from efuse to support PS mode
From: Ping-Ke Shih @ 2026-01-22 3:31 UTC (permalink / raw)
To: Ping-Ke Shih, linux-wireless; +Cc: echuang, phhuang, kevin_yang
In-Reply-To: <20260117044157.2392958-2-pkshih@realtek.com>
Ping-Ke Shih <pkshih@realtek.com> wrote:
> In PS mode, it needs to restore RX gain settings while waking up. Add to
> get RX gain values from chip specific ops, and pass these data to firmware
> when going to enter PS mode.
>
> Signed-off-by: Ping-Ke Shih <pkshih@realtek.com>
9 patch(es) applied to rtw-next branch of rtw.git, thanks.
32f6bf1872cb wifi: rtw89: phy: add chip_ops to calculate RX gain from efuse to support PS mode
496a0752fe50 wifi: rtw89: phy: handle C2H event for PS mode report
20380a039ddd wifi: rtw89: phy: add H2C command to send detail RX gain and link parameters for PS mode
bcd23ebfef1c wifi: rtw89: phy: update edcca log parsing for RTL8922D
4809013c088c wifi: rtw89: phy: add firmware element of digital TX power compensation
5fe702e4b2cd wifi: rtw89: phy: update TSSI flow for RTL8922D
9cc1a84c53d4 wifi: rtw89: mac: clear DTOP disable excluding CID7090 variant for RTL8922D
1945c83dc5ce wifi: rtw89: mac: set force MBA duration to 0
8da7e88682d5 wifi: rtw89: 8922a: add digital compensation for 2GHz
---
https://github.com/pkshih/rtw.git
^ permalink raw reply
page: next (older) | prev (newer) | latest
- recent:[subjects (threaded)|topics (new)|topics (active)]
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox