git: 8ba4d145d351 - main - mt76: update Mediatek's mt76 driver
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Sun, 04 May 2025 22:57:35 UTC
The branch main has been updated by bz:
URL: https://cgit.FreeBSD.org/src/commit/?id=8ba4d145d351db26e07695b8e90697398c5dfec2
commit 8ba4d145d351db26e07695b8e90697398c5dfec2
Merge: 2013c4e0dc73 fbdea4ebdf0f
Author: Bjoern A. Zeeb <bz@FreeBSD.org>
AuthorDate: 2025-05-02 11:27:19 +0000
Commit: Bjoern A. Zeeb <bz@FreeBSD.org>
CommitDate: 2025-05-04 22:55:08 +0000
mt76: update Mediatek's mt76 driver
This version is based on
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
38fec10eb60d687e30c8c6b5420d86e8149f7557 ( tag: v6.14 ).
Sponsored by: The FreeBSD Foundation
.../common/include/linux/soc/mediatek/mtk_wed.h | 1 +
sys/contrib/dev/mediatek/mt76/agg-rx.c | 2 +-
sys/contrib/dev/mediatek/mt76/channel.c | 406 +++
sys/contrib/dev/mediatek/mt76/debugfs.c | 8 +-
sys/contrib/dev/mediatek/mt76/dma.c | 336 +-
sys/contrib/dev/mediatek/mt76/dma.h | 68 +-
sys/contrib/dev/mediatek/mt76/eeprom.c | 58 +-
sys/contrib/dev/mediatek/mt76/mac80211.c | 407 ++-
sys/contrib/dev/mediatek/mt76/mcu.c | 23 +
sys/contrib/dev/mediatek/mt76/mmio.c | 1 +
sys/contrib/dev/mediatek/mt76/mt76.h | 354 +-
sys/contrib/dev/mediatek/mt76/mt7603/beacon.c | 78 +-
sys/contrib/dev/mediatek/mt76/mt7603/core.c | 2 +
sys/contrib/dev/mediatek/mt76/mt7603/dma.c | 57 +-
sys/contrib/dev/mediatek/mt76/mt7603/eeprom.c | 1 +
sys/contrib/dev/mediatek/mt76/mt7603/init.c | 17 +-
sys/contrib/dev/mediatek/mt76/mt7603/mac.c | 71 +-
sys/contrib/dev/mediatek/mt76/mt7603/main.c | 54 +-
sys/contrib/dev/mediatek/mt76/mt7603/mt7603.h | 5 +-
sys/contrib/dev/mediatek/mt76/mt7603/regs.h | 5 +
sys/contrib/dev/mediatek/mt76/mt7603/soc.c | 5 +-
sys/contrib/dev/mediatek/mt76/mt7615/dma.c | 12 +-
sys/contrib/dev/mediatek/mt76/mt7615/init.c | 10 +-
sys/contrib/dev/mediatek/mt76/mt7615/mac.c | 14 +-
sys/contrib/dev/mediatek/mt76/mt7615/main.c | 47 +-
sys/contrib/dev/mediatek/mt76/mt7615/mcu.c | 36 +-
sys/contrib/dev/mediatek/mt76/mt7615/mmio.c | 2 +
sys/contrib/dev/mediatek/mt76/mt7615/mt7615.h | 5 +-
sys/contrib/dev/mediatek/mt76/mt7615/pci.c | 20 +-
sys/contrib/dev/mediatek/mt76/mt7615/pci_init.c | 4 +
sys/contrib/dev/mediatek/mt76/mt7615/pci_mac.c | 12 +-
sys/contrib/dev/mediatek/mt76/mt7615/sdio.c | 8 +-
sys/contrib/dev/mediatek/mt76/mt7615/sdio_mcu.c | 180 +
sys/contrib/dev/mediatek/mt76/mt7615/soc.c | 4 +-
sys/contrib/dev/mediatek/mt76/mt7615/testmode.c | 2 +-
sys/contrib/dev/mediatek/mt76/mt7615/usb.c | 8 +-
sys/contrib/dev/mediatek/mt76/mt7615/usb_mcu.c | 100 +
sys/contrib/dev/mediatek/mt76/mt7615/usb_sdio.c | 5 +
sys/contrib/dev/mediatek/mt76/mt76_connac.h | 33 +-
sys/contrib/dev/mediatek/mt76/mt76_connac2_mac.h | 12 +
sys/contrib/dev/mediatek/mt76/mt76_connac3_mac.c | 86 +
sys/contrib/dev/mediatek/mt76/mt76_connac3_mac.h | 58 +-
sys/contrib/dev/mediatek/mt76/mt76_connac_mac.c | 91 +-
sys/contrib/dev/mediatek/mt76/mt76_connac_mcu.c | 369 +-
sys/contrib/dev/mediatek/mt76/mt76_connac_mcu.h | 183 +-
sys/contrib/dev/mediatek/mt76/mt76x0/pci.c | 16 +-
sys/contrib/dev/mediatek/mt76/mt76x02_beacon.c | 8 +-
sys/contrib/dev/mediatek/mt76/mt76x02_dfs.c | 4 +-
sys/contrib/dev/mediatek/mt76/mt76x02_eeprom.c | 9 +-
sys/contrib/dev/mediatek/mt76/mt76x02_mmio.c | 30 +-
sys/contrib/dev/mediatek/mt76/mt76x02_usb_core.c | 18 +-
sys/contrib/dev/mediatek/mt76/mt76x02_usb_mcu.c | 1 +
sys/contrib/dev/mediatek/mt76/mt76x02_util.c | 6 +-
sys/contrib/dev/mediatek/mt76/mt76x2/eeprom.c | 16 +-
sys/contrib/dev/mediatek/mt76/mt76x2/mt76x2.h | 2 +
sys/contrib/dev/mediatek/mt76/mt76x2/pci.c | 9 +-
sys/contrib/dev/mediatek/mt76/mt76x2/pci_main.c | 31 +-
sys/contrib/dev/mediatek/mt76/mt76x2/phy.c | 2 +-
sys/contrib/dev/mediatek/mt76/mt76x2/usb.c | 3 +
sys/contrib/dev/mediatek/mt76/mt76x2/usb_main.c | 31 +-
sys/contrib/dev/mediatek/mt76/mt7915/Kconfig | 2 +-
sys/contrib/dev/mediatek/mt76/mt7915/debugfs.c | 9 +-
sys/contrib/dev/mediatek/mt76/mt7915/dma.c | 48 +-
sys/contrib/dev/mediatek/mt76/mt7915/eeprom.c | 53 +-
sys/contrib/dev/mediatek/mt76/mt7915/eeprom.h | 50 +-
sys/contrib/dev/mediatek/mt76/mt7915/init.c | 104 +-
sys/contrib/dev/mediatek/mt76/mt7915/mac.c | 110 +-
sys/contrib/dev/mediatek/mt76/mt7915/main.c | 280 +-
sys/contrib/dev/mediatek/mt76/mt7915/mcu.c | 333 +-
sys/contrib/dev/mediatek/mt76/mt7915/mcu.h | 28 +-
sys/contrib/dev/mediatek/mt76/mt7915/mmio.c | 174 +-
sys/contrib/dev/mediatek/mt76/mt7915/mt7915.h | 21 +-
sys/contrib/dev/mediatek/mt76/mt7915/pci.c | 1 +
sys/contrib/dev/mediatek/mt76/mt7915/regs.h | 8 +
sys/contrib/dev/mediatek/mt76/mt7915/soc.c | 13 +-
sys/contrib/dev/mediatek/mt76/mt7915/testmode.c | 6 +-
sys/contrib/dev/mediatek/mt76/mt7921/init.c | 102 +-
sys/contrib/dev/mediatek/mt76/mt7921/mac.c | 76 +-
sys/contrib/dev/mediatek/mt76/mt7921/main.c | 430 ++-
sys/contrib/dev/mediatek/mt76/mt7921/mcu.c | 322 +-
sys/contrib/dev/mediatek/mt76/mt7921/mcu.h | 18 +
sys/contrib/dev/mediatek/mt76/mt7921/mt7921.h | 39 +-
sys/contrib/dev/mediatek/mt76/mt7921/pci.c | 69 +-
sys/contrib/dev/mediatek/mt76/mt7921/pci_mac.c | 15 +-
sys/contrib/dev/mediatek/mt76/mt7921/sdio.c | 16 +-
sys/contrib/dev/mediatek/mt76/mt7921/sdio_mac.c | 5 +-
sys/contrib/dev/mediatek/mt76/mt7921/sdio_mcu.c | 2 +-
sys/contrib/dev/mediatek/mt76/mt7921/usb.c | 23 +-
sys/contrib/dev/mediatek/mt76/mt7925/Kconfig | 30 +
sys/contrib/dev/mediatek/mt76/mt7925/Makefile | 9 +
sys/contrib/dev/mediatek/mt76/mt7925/debugfs.c | 319 ++
sys/contrib/dev/mediatek/mt76/mt7925/init.c | 327 ++
sys/contrib/dev/mediatek/mt76/mt7925/mac.c | 1499 ++++++++
sys/contrib/dev/mediatek/mt76/mt7925/mac.h | 23 +
sys/contrib/dev/mediatek/mt76/mt7925/main.c | 2209 ++++++++++++
sys/contrib/dev/mediatek/mt76/mt7925/mcu.c | 3597 ++++++++++++++++++++
sys/contrib/dev/mediatek/mt76/mt7925/mcu.h | 649 ++++
sys/contrib/dev/mediatek/mt76/mt7925/mt7925.h | 347 ++
sys/contrib/dev/mediatek/mt76/mt7925/pci.c | 625 ++++
sys/contrib/dev/mediatek/mt76/mt7925/pci_mac.c | 151 +
sys/contrib/dev/mediatek/mt76/mt7925/pci_mcu.c | 53 +
sys/contrib/dev/mediatek/mt76/mt7925/regs.h | 92 +
sys/contrib/dev/mediatek/mt76/mt7925/usb.c | 343 ++
sys/contrib/dev/mediatek/mt76/mt792x.h | 175 +-
sys/contrib/dev/mediatek/mt76/mt792x_acpi_sar.c | 83 +-
sys/contrib/dev/mediatek/mt76/mt792x_acpi_sar.h | 2 +
sys/contrib/dev/mediatek/mt76/mt792x_core.c | 189 +-
sys/contrib/dev/mediatek/mt76/mt792x_dma.c | 60 +-
sys/contrib/dev/mediatek/mt76/mt792x_mac.c | 10 +-
sys/contrib/dev/mediatek/mt76/mt792x_regs.h | 8 +
sys/contrib/dev/mediatek/mt76/mt792x_usb.c | 84 +-
sys/contrib/dev/mediatek/mt76/mt7996/Kconfig | 2 +-
sys/contrib/dev/mediatek/mt76/mt7996/debugfs.c | 160 +-
sys/contrib/dev/mediatek/mt76/mt7996/dma.c | 401 ++-
sys/contrib/dev/mediatek/mt76/mt7996/eeprom.c | 228 +-
sys/contrib/dev/mediatek/mt76/mt7996/eeprom.h | 5 +
sys/contrib/dev/mediatek/mt76/mt7996/init.c | 1017 +++++-
sys/contrib/dev/mediatek/mt76/mt7996/mac.c | 493 ++-
sys/contrib/dev/mediatek/mt76/mt7996/main.c | 1016 ++++--
sys/contrib/dev/mediatek/mt76/mt7996/mcu.c | 1502 ++++++--
sys/contrib/dev/mediatek/mt76/mt7996/mcu.h | 276 +-
sys/contrib/dev/mediatek/mt76/mt7996/mmio.c | 380 ++-
sys/contrib/dev/mediatek/mt76/mt7996/mt7996.h | 337 +-
sys/contrib/dev/mediatek/mt76/mt7996/pci.c | 82 +-
sys/contrib/dev/mediatek/mt76/mt7996/regs.h | 202 +-
sys/contrib/dev/mediatek/mt76/pci.c | 23 +
sys/contrib/dev/mediatek/mt76/scan.c | 168 +
sys/contrib/dev/mediatek/mt76/sdio.c | 36 +-
sys/contrib/dev/mediatek/mt76/sdio_txrx.c | 4 +
sys/contrib/dev/mediatek/mt76/testmode.c | 2 +-
sys/contrib/dev/mediatek/mt76/tx.c | 161 +-
sys/contrib/dev/mediatek/mt76/usb.c | 63 +-
sys/contrib/dev/mediatek/mt76/util.c | 11 +-
sys/contrib/dev/mediatek/mt76/wed.c | 213 ++
sys/modules/mt76/Makefile | 1 +
sys/modules/mt76/core/Makefile | 3 +
sys/modules/mt76/mt7925/Makefile | 24 +
137 files changed, 20305 insertions(+), 3192 deletions(-)
diff --cc sys/compat/linuxkpi/common/include/linux/soc/mediatek/mtk_wed.h
index 74038f0e7520,000000000000..903053e7f6e8
mode 100644,000000..100644
--- a/sys/compat/linuxkpi/common/include/linux/soc/mediatek/mtk_wed.h
+++ b/sys/compat/linuxkpi/common/include/linux/soc/mediatek/mtk_wed.h
@@@ -1,61 -1,0 +1,62 @@@
+/*-
+ * SPDX-License-Identifier: BSD-2-Clause
+ *
+ * Copyright (c) 2022-2023 Bjoern A. Zeeb
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ */
+
+#ifndef _LINUXKPI_LINUX_SOC_MEDIATEK_MTK_WED_H
+#define _LINUXKPI_LINUX_SOC_MEDIATEK_MTK_WED_H
+
+struct mtk_wed_device {
+};
+
+#define WED_WO_STA_REC 0x6
+
+#define mtk_wed_device_start(_dev, _mask) do { } while(0)
+#define mtk_wed_device_detach(_dev) do { } while(0)
+#define mtk_wed_device_irq_get(_dev, _mask) 0
+#define mtk_wed_device_irq_set_mask(_dev, _mask) do { } while(0)
+#define mtk_wed_device_update_msg(_dev, _id, _msg, _len) (-ENODEV)
+#define mtk_wed_device_dma_reset(_dev) do {} while (0)
+#define mtk_wed_device_ppe_check(_dev, _skb, _reason, _entry) \
+ do {} while (0)
+#define mtk_wed_device_stop(_dev) do { } while(0)
+#define mtk_wed_device_start_hw_rro(_dev, _mask, _b) do { } while(0)
++#define mtk_wed_device_setup_tc(_dev, _ndev, _type, _tdata) (-EOPNOTSUPP)
+
+static inline bool
+mtk_wed_device_active(struct mtk_wed_device *dev __unused)
+{
+
+ return (false);
+}
+
+static inline bool
+mtk_wed_get_rx_capa(struct mtk_wed_device *dev __unused)
+{
+
+ return (false);
+}
+
+#endif /* _LINUXKPI_LINUX_SOC_MEDIATEK_MTK_WED_H */
diff --cc sys/contrib/dev/mediatek/mt76/channel.c
index 000000000000,6a35c6ebd823..6a35c6ebd823
mode 000000,100644..100644
--- a/sys/contrib/dev/mediatek/mt76/channel.c
+++ b/sys/contrib/dev/mediatek/mt76/channel.c
diff --cc sys/contrib/dev/mediatek/mt76/dma.c
index eaa793e4b18e,000000000000..6765e1281ac3
mode 100644,000000..100644
--- a/sys/contrib/dev/mediatek/mt76/dma.c
+++ b/sys/contrib/dev/mediatek/mt76/dma.c
@@@ -1,1004 -1,0 +1,1066 @@@
+// SPDX-License-Identifier: ISC
+/*
+ * Copyright (C) 2016 Felix Fietkau <nbd@nbd.name>
+ */
+
+#include <linux/dma-mapping.h>
+#if defined(__FreeBSD__)
+#include <linux/cache.h>
+#include <net/page_pool.h>
+#endif
+#include "mt76.h"
+#include "dma.h"
+
+#if IS_ENABLED(CONFIG_NET_MEDIATEK_SOC_WED)
+
- #define Q_READ(_dev, _q, _field) ({ \
++#define Q_READ(_q, _field) ({ \
+ u32 _offset = offsetof(struct mt76_queue_regs, _field); \
+ u32 _val; \
+ if ((_q)->flags & MT_QFLAG_WED) \
- _val = mtk_wed_device_reg_read(&(_dev)->mmio.wed, \
++ _val = mtk_wed_device_reg_read((_q)->wed, \
+ ((_q)->wed_regs + \
+ _offset)); \
+ else \
+ _val = readl(&(_q)->regs->_field); \
+ _val; \
+})
+
- #define Q_WRITE(_dev, _q, _field, _val) do { \
++#define Q_WRITE(_q, _field, _val) do { \
+ u32 _offset = offsetof(struct mt76_queue_regs, _field); \
+ if ((_q)->flags & MT_QFLAG_WED) \
- mtk_wed_device_reg_write(&(_dev)->mmio.wed, \
++ mtk_wed_device_reg_write((_q)->wed, \
+ ((_q)->wed_regs + _offset), \
+ _val); \
+ else \
+ writel(_val, &(_q)->regs->_field); \
+} while (0)
+
+#else
+
- #define Q_READ(_dev, _q, _field) readl(&(_q)->regs->_field)
- #define Q_WRITE(_dev, _q, _field, _val) writel(_val, &(_q)->regs->_field)
++#define Q_READ(_q, _field) readl(&(_q)->regs->_field)
++#define Q_WRITE(_q, _field, _val) writel(_val, &(_q)->regs->_field)
+
+#endif
+
+static struct mt76_txwi_cache *
+mt76_alloc_txwi(struct mt76_dev *dev)
+{
+ struct mt76_txwi_cache *t;
+ dma_addr_t addr;
+ u8 *txwi;
+ int size;
+
+ size = L1_CACHE_ALIGN(dev->drv->txwi_size + sizeof(*t));
+ txwi = kzalloc(size, GFP_ATOMIC);
+ if (!txwi)
+ return NULL;
+
+ addr = dma_map_single(dev->dma_dev, txwi, dev->drv->txwi_size,
+ DMA_TO_DEVICE);
++ if (unlikely(dma_mapping_error(dev->dma_dev, addr))) {
++ kfree(txwi);
++ return NULL;
++ }
++
+ t = (struct mt76_txwi_cache *)(txwi + dev->drv->txwi_size);
+ t->dma_addr = addr;
+
+ return t;
+}
+
+static struct mt76_txwi_cache *
+mt76_alloc_rxwi(struct mt76_dev *dev)
+{
+ struct mt76_txwi_cache *t;
+
+ t = kzalloc(L1_CACHE_ALIGN(sizeof(*t)), GFP_ATOMIC);
+ if (!t)
+ return NULL;
+
+ t->ptr = NULL;
+ return t;
+}
+
+static struct mt76_txwi_cache *
+__mt76_get_txwi(struct mt76_dev *dev)
+{
+ struct mt76_txwi_cache *t = NULL;
+
+ spin_lock(&dev->lock);
+ if (!list_empty(&dev->txwi_cache)) {
+ t = list_first_entry(&dev->txwi_cache, struct mt76_txwi_cache,
+ list);
+ list_del(&t->list);
+ }
+ spin_unlock(&dev->lock);
+
+ return t;
+}
+
+static struct mt76_txwi_cache *
+__mt76_get_rxwi(struct mt76_dev *dev)
+{
+ struct mt76_txwi_cache *t = NULL;
+
- spin_lock(&dev->wed_lock);
++ spin_lock_bh(&dev->wed_lock);
+ if (!list_empty(&dev->rxwi_cache)) {
+ t = list_first_entry(&dev->rxwi_cache, struct mt76_txwi_cache,
+ list);
+ list_del(&t->list);
+ }
- spin_unlock(&dev->wed_lock);
++ spin_unlock_bh(&dev->wed_lock);
+
+ return t;
+}
+
+static struct mt76_txwi_cache *
+mt76_get_txwi(struct mt76_dev *dev)
+{
+ struct mt76_txwi_cache *t = __mt76_get_txwi(dev);
+
+ if (t)
+ return t;
+
+ return mt76_alloc_txwi(dev);
+}
+
+struct mt76_txwi_cache *
+mt76_get_rxwi(struct mt76_dev *dev)
+{
+ struct mt76_txwi_cache *t = __mt76_get_rxwi(dev);
+
+ if (t)
+ return t;
+
+ return mt76_alloc_rxwi(dev);
+}
+EXPORT_SYMBOL_GPL(mt76_get_rxwi);
+
+void
+mt76_put_txwi(struct mt76_dev *dev, struct mt76_txwi_cache *t)
+{
+ if (!t)
+ return;
+
+ spin_lock(&dev->lock);
+ list_add(&t->list, &dev->txwi_cache);
+ spin_unlock(&dev->lock);
+}
+EXPORT_SYMBOL_GPL(mt76_put_txwi);
+
+void
+mt76_put_rxwi(struct mt76_dev *dev, struct mt76_txwi_cache *t)
+{
+ if (!t)
+ return;
+
- spin_lock(&dev->wed_lock);
++ spin_lock_bh(&dev->wed_lock);
+ list_add(&t->list, &dev->rxwi_cache);
- spin_unlock(&dev->wed_lock);
++ spin_unlock_bh(&dev->wed_lock);
+}
+EXPORT_SYMBOL_GPL(mt76_put_rxwi);
+
+static void
+mt76_free_pending_txwi(struct mt76_dev *dev)
+{
+ struct mt76_txwi_cache *t;
+
+ local_bh_disable();
+ while ((t = __mt76_get_txwi(dev)) != NULL) {
+ dma_unmap_single(dev->dma_dev, t->dma_addr, dev->drv->txwi_size,
+ DMA_TO_DEVICE);
+ kfree(mt76_get_txwi_ptr(dev, t));
+ }
+ local_bh_enable();
+}
+
+void
+mt76_free_pending_rxwi(struct mt76_dev *dev)
+{
+ struct mt76_txwi_cache *t;
+
+ local_bh_disable();
+ while ((t = __mt76_get_rxwi(dev)) != NULL) {
+ if (t->ptr)
+ mt76_put_page_pool_buf(t->ptr, false);
+ kfree(t);
+ }
+ local_bh_enable();
+}
+EXPORT_SYMBOL_GPL(mt76_free_pending_rxwi);
+
+static void
+mt76_dma_sync_idx(struct mt76_dev *dev, struct mt76_queue *q)
+{
- Q_WRITE(dev, q, desc_base, q->desc_dma);
- Q_WRITE(dev, q, ring_size, q->ndesc);
- q->head = Q_READ(dev, q, dma_idx);
++ Q_WRITE(q, desc_base, q->desc_dma);
++ if (q->flags & MT_QFLAG_WED_RRO_EN)
++ Q_WRITE(q, ring_size, MT_DMA_RRO_EN | q->ndesc);
++ else
++ Q_WRITE(q, ring_size, q->ndesc);
++ q->head = Q_READ(q, dma_idx);
+ q->tail = q->head;
+}
+
- static void
- mt76_dma_queue_reset(struct mt76_dev *dev, struct mt76_queue *q)
++void __mt76_dma_queue_reset(struct mt76_dev *dev, struct mt76_queue *q,
++ bool reset_idx)
+{
- int i;
-
+ if (!q || !q->ndesc)
+ return;
+
- /* clear descriptors */
- for (i = 0; i < q->ndesc; i++)
- q->desc[i].ctrl = cpu_to_le32(MT_DMA_CTL_DMA_DONE);
++ if (!mt76_queue_is_wed_rro_ind(q)) {
++ int i;
++
++ /* clear descriptors */
++ for (i = 0; i < q->ndesc; i++)
++ q->desc[i].ctrl = cpu_to_le32(MT_DMA_CTL_DMA_DONE);
++ }
+
- Q_WRITE(dev, q, cpu_idx, 0);
- Q_WRITE(dev, q, dma_idx, 0);
++ if (reset_idx) {
++ Q_WRITE(q, cpu_idx, 0);
++ Q_WRITE(q, dma_idx, 0);
++ }
+ mt76_dma_sync_idx(dev, q);
+}
+
++void mt76_dma_queue_reset(struct mt76_dev *dev, struct mt76_queue *q)
++{
++ __mt76_dma_queue_reset(dev, q, true);
++}
++
+static int
+mt76_dma_add_rx_buf(struct mt76_dev *dev, struct mt76_queue *q,
+ struct mt76_queue_buf *buf, void *data)
+{
- struct mt76_desc *desc = &q->desc[q->head];
+ struct mt76_queue_entry *entry = &q->entry[q->head];
+ struct mt76_txwi_cache *txwi = NULL;
- u32 buf1 = 0, ctrl;
++ struct mt76_desc *desc;
+ int idx = q->head;
++ u32 buf1 = 0, ctrl;
+ int rx_token;
+
++ if (mt76_queue_is_wed_rro_ind(q)) {
++ struct mt76_wed_rro_desc *rro_desc;
++
++ rro_desc = (struct mt76_wed_rro_desc *)q->desc;
++ data = &rro_desc[q->head];
++ goto done;
++ }
++
++ desc = &q->desc[q->head];
+ ctrl = FIELD_PREP(MT_DMA_CTL_SD_LEN0, buf[0].len);
++#ifdef CONFIG_ARCH_DMA_ADDR_T_64BIT
++ buf1 = FIELD_PREP(MT_DMA_CTL_SDP0_H, buf->addr >> 32);
++#endif
+
+ if (mt76_queue_is_wed_rx(q)) {
+ txwi = mt76_get_rxwi(dev);
+ if (!txwi)
+ return -ENOMEM;
+
+ rx_token = mt76_rx_token_consume(dev, data, txwi, buf->addr);
+ if (rx_token < 0) {
+ mt76_put_rxwi(dev, txwi);
+ return -ENOMEM;
+ }
+
+ buf1 |= FIELD_PREP(MT_DMA_CTL_TOKEN, rx_token);
+ ctrl |= MT_DMA_CTL_TO_HOST;
+ }
+
+ WRITE_ONCE(desc->buf0, cpu_to_le32(buf->addr));
+ WRITE_ONCE(desc->buf1, cpu_to_le32(buf1));
+ WRITE_ONCE(desc->ctrl, cpu_to_le32(ctrl));
+ WRITE_ONCE(desc->info, 0);
+
++done:
+ entry->dma_addr[0] = buf->addr;
+ entry->dma_len[0] = buf->len;
+ entry->txwi = txwi;
+ entry->buf = data;
+ entry->wcid = 0xffff;
+ entry->skip_buf1 = true;
+ q->head = (q->head + 1) % q->ndesc;
+ q->queued++;
+
+ return idx;
+}
+
+static int
+mt76_dma_add_buf(struct mt76_dev *dev, struct mt76_queue *q,
+ struct mt76_queue_buf *buf, int nbufs, u32 info,
+ struct sk_buff *skb, void *txwi)
+{
+ struct mt76_queue_entry *entry;
+ struct mt76_desc *desc;
+ int i, idx = -1;
+ u32 ctrl, next;
+
+ if (txwi) {
+ q->entry[q->head].txwi = DMA_DUMMY_DATA;
+ q->entry[q->head].skip_buf0 = true;
+ }
+
+ for (i = 0; i < nbufs; i += 2, buf += 2) {
+ u32 buf0 = buf[0].addr, buf1 = 0;
+
+ idx = q->head;
+ next = (q->head + 1) % q->ndesc;
+
+ desc = &q->desc[idx];
+ entry = &q->entry[idx];
+
+ if (buf[0].skip_unmap)
+ entry->skip_buf0 = true;
+ entry->skip_buf1 = i == nbufs - 1;
+
+ entry->dma_addr[0] = buf[0].addr;
+ entry->dma_len[0] = buf[0].len;
+
+ ctrl = FIELD_PREP(MT_DMA_CTL_SD_LEN0, buf[0].len);
++#ifdef CONFIG_ARCH_DMA_ADDR_T_64BIT
++ info |= FIELD_PREP(MT_DMA_CTL_SDP0_H, buf[0].addr >> 32);
++#endif
+ if (i < nbufs - 1) {
+ entry->dma_addr[1] = buf[1].addr;
+ entry->dma_len[1] = buf[1].len;
+ buf1 = buf[1].addr;
+ ctrl |= FIELD_PREP(MT_DMA_CTL_SD_LEN1, buf[1].len);
++#ifdef CONFIG_ARCH_DMA_ADDR_T_64BIT
++ info |= FIELD_PREP(MT_DMA_CTL_SDP1_H,
++ buf[1].addr >> 32);
++#endif
+ if (buf[1].skip_unmap)
+ entry->skip_buf1 = true;
+ }
+
+ if (i == nbufs - 1)
+ ctrl |= MT_DMA_CTL_LAST_SEC0;
+ else if (i == nbufs - 2)
+ ctrl |= MT_DMA_CTL_LAST_SEC1;
+
+ WRITE_ONCE(desc->buf0, cpu_to_le32(buf0));
+ WRITE_ONCE(desc->buf1, cpu_to_le32(buf1));
+ WRITE_ONCE(desc->info, cpu_to_le32(info));
+ WRITE_ONCE(desc->ctrl, cpu_to_le32(ctrl));
+
+ q->head = next;
+ q->queued++;
+ }
+
+ q->entry[idx].txwi = txwi;
+ q->entry[idx].skb = skb;
+ q->entry[idx].wcid = 0xffff;
+
+ return idx;
+}
+
+static void
+mt76_dma_tx_cleanup_idx(struct mt76_dev *dev, struct mt76_queue *q, int idx,
+ struct mt76_queue_entry *prev_e)
+{
+ struct mt76_queue_entry *e = &q->entry[idx];
+
+ if (!e->skip_buf0)
+ dma_unmap_single(dev->dma_dev, e->dma_addr[0], e->dma_len[0],
+ DMA_TO_DEVICE);
+
+ if (!e->skip_buf1)
+ dma_unmap_single(dev->dma_dev, e->dma_addr[1], e->dma_len[1],
+ DMA_TO_DEVICE);
+
+ if (e->txwi == DMA_DUMMY_DATA)
+ e->txwi = NULL;
+
- if (e->skb == DMA_DUMMY_DATA)
- e->skb = NULL;
-
+ *prev_e = *e;
+ memset(e, 0, sizeof(*e));
+}
+
+static void
+mt76_dma_kick_queue(struct mt76_dev *dev, struct mt76_queue *q)
+{
+ wmb();
- Q_WRITE(dev, q, cpu_idx, q->head);
++ Q_WRITE(q, cpu_idx, q->head);
+}
+
+static void
+mt76_dma_tx_cleanup(struct mt76_dev *dev, struct mt76_queue *q, bool flush)
+{
+ struct mt76_queue_entry entry;
+ int last;
+
+ if (!q || !q->ndesc)
+ return;
+
+ spin_lock_bh(&q->cleanup_lock);
+ if (flush)
+ last = -1;
+ else
- last = Q_READ(dev, q, dma_idx);
++ last = Q_READ(q, dma_idx);
+
+ while (q->queued > 0 && q->tail != last) {
+ mt76_dma_tx_cleanup_idx(dev, q, q->tail, &entry);
+ mt76_queue_tx_complete(dev, q, &entry);
+
+ if (entry.txwi) {
+ if (!(dev->drv->drv_flags & MT_DRV_TXWI_NO_FREE))
+ mt76_put_txwi(dev, entry.txwi);
+ }
+
+ if (!flush && q->tail == last)
- last = Q_READ(dev, q, dma_idx);
++ last = Q_READ(q, dma_idx);
+ }
+ spin_unlock_bh(&q->cleanup_lock);
+
+ if (flush) {
+ spin_lock_bh(&q->lock);
+ mt76_dma_sync_idx(dev, q);
+ mt76_dma_kick_queue(dev, q);
+ spin_unlock_bh(&q->lock);
+ }
+
+ if (!q->queued)
+ wake_up(&dev->tx_wait);
+}
+
+static void *
+mt76_dma_get_buf(struct mt76_dev *dev, struct mt76_queue *q, int idx,
+ int *len, u32 *info, bool *more, bool *drop)
+{
+ struct mt76_queue_entry *e = &q->entry[idx];
+ struct mt76_desc *desc = &q->desc[idx];
- void *buf;
++ u32 ctrl, desc_info, buf1;
++ void *buf = e->buf;
++
++ if (mt76_queue_is_wed_rro_ind(q))
++ goto done;
+
++ ctrl = le32_to_cpu(READ_ONCE(desc->ctrl));
+ if (len) {
- u32 ctrl = le32_to_cpu(READ_ONCE(desc->ctrl));
+ *len = FIELD_GET(MT_DMA_CTL_SD_LEN0, ctrl);
+ *more = !(ctrl & MT_DMA_CTL_LAST_SEC0);
+ }
+
++ desc_info = le32_to_cpu(desc->info);
+ if (info)
- *info = le32_to_cpu(desc->info);
++ *info = desc_info;
++
++ buf1 = le32_to_cpu(desc->buf1);
++ mt76_dma_should_drop_buf(drop, ctrl, buf1, desc_info);
+
+ if (mt76_queue_is_wed_rx(q)) {
- u32 buf1 = le32_to_cpu(desc->buf1);
+ u32 token = FIELD_GET(MT_DMA_CTL_TOKEN, buf1);
+ struct mt76_txwi_cache *t = mt76_rx_token_release(dev, token);
+
+ if (!t)
+ return NULL;
+
+ dma_sync_single_for_cpu(dev->dma_dev, t->dma_addr,
+ SKB_WITH_OVERHEAD(q->buf_size),
+ page_pool_get_dma_dir(q->page_pool));
+
+ buf = t->ptr;
+ t->dma_addr = 0;
+ t->ptr = NULL;
+
+ mt76_put_rxwi(dev, t);
-
- if (drop) {
- u32 ctrl = le32_to_cpu(READ_ONCE(desc->ctrl));
-
- *drop = !!(ctrl & (MT_DMA_CTL_TO_HOST_A |
- MT_DMA_CTL_DROP));
-
++ if (drop)
+ *drop |= !!(buf1 & MT_DMA_CTL_WO_DROP);
- }
+ } else {
- buf = e->buf;
- e->buf = NULL;
+ dma_sync_single_for_cpu(dev->dma_dev, e->dma_addr[0],
+ SKB_WITH_OVERHEAD(q->buf_size),
+ page_pool_get_dma_dir(q->page_pool));
+ }
+
++done:
++ e->buf = NULL;
+ return buf;
+}
+
+static void *
+mt76_dma_dequeue(struct mt76_dev *dev, struct mt76_queue *q, bool flush,
+ int *len, u32 *info, bool *more, bool *drop)
+{
+ int idx = q->tail;
+
+ *more = false;
+ if (!q->queued)
+ return NULL;
+
- if (flush)
- q->desc[idx].ctrl |= cpu_to_le32(MT_DMA_CTL_DMA_DONE);
- else if (!(q->desc[idx].ctrl & cpu_to_le32(MT_DMA_CTL_DMA_DONE)))
++ if (mt76_queue_is_wed_rro_data(q))
+ return NULL;
+
++ if (!mt76_queue_is_wed_rro_ind(q)) {
++ if (flush)
++ q->desc[idx].ctrl |= cpu_to_le32(MT_DMA_CTL_DMA_DONE);
++ else if (!(q->desc[idx].ctrl & cpu_to_le32(MT_DMA_CTL_DMA_DONE)))
++ return NULL;
++ }
++
+ q->tail = (q->tail + 1) % q->ndesc;
+ q->queued--;
+
+ return mt76_dma_get_buf(dev, q, idx, len, info, more, drop);
+}
+
+static int
+mt76_dma_tx_queue_skb_raw(struct mt76_dev *dev, struct mt76_queue *q,
+ struct sk_buff *skb, u32 tx_info)
+{
+ struct mt76_queue_buf buf = {};
+ dma_addr_t addr;
+
+ if (test_bit(MT76_MCU_RESET, &dev->phy.state))
+ goto error;
+
+ if (q->queued + 1 >= q->ndesc - 1)
+ goto error;
+
+ addr = dma_map_single(dev->dma_dev, skb->data, skb->len,
+ DMA_TO_DEVICE);
+ if (unlikely(dma_mapping_error(dev->dma_dev, addr)))
+ goto error;
+
+ buf.addr = addr;
+ buf.len = skb->len;
+
+ spin_lock_bh(&q->lock);
+ mt76_dma_add_buf(dev, q, &buf, 1, tx_info, skb, NULL);
+ mt76_dma_kick_queue(dev, q);
+ spin_unlock_bh(&q->lock);
+
+ return 0;
+
+error:
+ dev_kfree_skb(skb);
+ return -ENOMEM;
+}
+
+static int
- mt76_dma_tx_queue_skb(struct mt76_dev *dev, struct mt76_queue *q,
++mt76_dma_tx_queue_skb(struct mt76_phy *phy, struct mt76_queue *q,
+ enum mt76_txq_id qid, struct sk_buff *skb,
+ struct mt76_wcid *wcid, struct ieee80211_sta *sta)
+{
+ struct ieee80211_tx_status status = {
+ .sta = sta,
+ };
+ struct mt76_tx_info tx_info = {
+ .skb = skb,
+ };
++ struct mt76_dev *dev = phy->dev;
+ struct ieee80211_hw *hw;
+ int len, n = 0, ret = -ENOMEM;
+ struct mt76_txwi_cache *t;
+ struct sk_buff *iter;
+ dma_addr_t addr;
+ u8 *txwi;
+
- if (test_bit(MT76_RESET, &dev->phy.state))
++ if (test_bit(MT76_RESET, &phy->state))
+ goto free_skb;
+
+ t = mt76_get_txwi(dev);
+ if (!t)
+ goto free_skb;
+
+ txwi = mt76_get_txwi_ptr(dev, t);
+
+ skb->prev = skb->next = NULL;
+ if (dev->drv->drv_flags & MT_DRV_TX_ALIGNED4_SKBS)
+ mt76_insert_hdr_pad(skb);
+
+ len = skb_headlen(skb);
+ addr = dma_map_single(dev->dma_dev, skb->data, len, DMA_TO_DEVICE);
+ if (unlikely(dma_mapping_error(dev->dma_dev, addr)))
+ goto free;
+
+ tx_info.buf[n].addr = t->dma_addr;
+ tx_info.buf[n++].len = dev->drv->txwi_size;
+ tx_info.buf[n].addr = addr;
+ tx_info.buf[n++].len = len;
+
+ skb_walk_frags(skb, iter) {
+ if (n == ARRAY_SIZE(tx_info.buf))
+ goto unmap;
+
+ addr = dma_map_single(dev->dma_dev, iter->data, iter->len,
+ DMA_TO_DEVICE);
+ if (unlikely(dma_mapping_error(dev->dma_dev, addr)))
+ goto unmap;
+
+ tx_info.buf[n].addr = addr;
+ tx_info.buf[n++].len = iter->len;
+ }
+ tx_info.nbuf = n;
+
+ if (q->queued + (tx_info.nbuf + 1) / 2 >= q->ndesc - 1) {
+ ret = -ENOMEM;
+ goto unmap;
+ }
+
+ dma_sync_single_for_cpu(dev->dma_dev, t->dma_addr, dev->drv->txwi_size,
+ DMA_TO_DEVICE);
+ ret = dev->drv->tx_prepare_skb(dev, txwi, qid, wcid, sta, &tx_info);
+ dma_sync_single_for_device(dev->dma_dev, t->dma_addr, dev->drv->txwi_size,
+ DMA_TO_DEVICE);
+ if (ret < 0)
+ goto unmap;
+
+ return mt76_dma_add_buf(dev, q, tx_info.buf, tx_info.nbuf,
+ tx_info.info, tx_info.skb, t);
+
+unmap:
+ for (n--; n > 0; n--)
+ dma_unmap_single(dev->dma_dev, tx_info.buf[n].addr,
+ tx_info.buf[n].len, DMA_TO_DEVICE);
+
+free:
+#ifdef CONFIG_NL80211_TESTMODE
+ /* fix tx_done accounting on queue overflow */
+ if (mt76_is_testmode_skb(dev, skb, &hw)) {
+ struct mt76_phy *phy = hw->priv;
+
+ if (tx_info.skb == phy->test.tx_skb)
+ phy->test.tx_done--;
+ }
+#endif
+
+ mt76_put_txwi(dev, t);
+
+free_skb:
+ status.skb = tx_info.skb;
+ hw = mt76_tx_status_get_hw(dev, tx_info.skb);
+ spin_lock_bh(&dev->rx_lock);
+ ieee80211_tx_status_ext(hw, &status);
+ spin_unlock_bh(&dev->rx_lock);
+
+ return ret;
+}
+
+static int
- mt76_dma_rx_fill(struct mt76_dev *dev, struct mt76_queue *q,
- bool allow_direct)
++mt76_dma_rx_fill_buf(struct mt76_dev *dev, struct mt76_queue *q,
++ bool allow_direct)
+{
+ int len = SKB_WITH_OVERHEAD(q->buf_size);
+ int frames = 0;
+
+ if (!q->ndesc)
+ return 0;
+
- spin_lock_bh(&q->lock);
-
+ while (q->queued < q->ndesc - 1) {
++ struct mt76_queue_buf qbuf = {};
+ enum dma_data_direction dir;
- struct mt76_queue_buf qbuf;
+ dma_addr_t addr;
+ int offset;
- void *buf;
++ void *buf = NULL;
++
++ if (mt76_queue_is_wed_rro_ind(q))
++ goto done;
+
+ buf = mt76_get_page_pool_buf(q, &offset, q->buf_size);
+ if (!buf)
+ break;
+
+ addr = page_pool_get_dma_addr(virt_to_head_page(buf)) + offset;
+ dir = page_pool_get_dma_dir(q->page_pool);
+ dma_sync_single_for_device(dev->dma_dev, addr, len, dir);
+
+ qbuf.addr = addr + q->buf_offset;
++done:
+ qbuf.len = len - q->buf_offset;
+ qbuf.skip_unmap = false;
+ if (mt76_dma_add_rx_buf(dev, q, &qbuf, buf) < 0) {
+ mt76_put_page_pool_buf(buf, allow_direct);
+ break;
+ }
+ frames++;
+ }
+
- if (frames)
++ if (frames || mt76_queue_is_wed_rx(q))
+ mt76_dma_kick_queue(dev, q);
+
- spin_unlock_bh(&q->lock);
-
+ return frames;
+}
+
- int mt76_dma_wed_setup(struct mt76_dev *dev, struct mt76_queue *q, bool reset)
++int mt76_dma_rx_fill(struct mt76_dev *dev, struct mt76_queue *q,
++ bool allow_direct)
+{
- #ifdef CONFIG_NET_MEDIATEK_SOC_WED
- struct mtk_wed_device *wed = &dev->mmio.wed;
- int ret, type, ring;
- u8 flags;
++ int frames;
*** 40955 LINES SKIPPED ***