[PATCH v3 03/11] mt76: mt7915: rework dma.c to adapt mt7916 changes
Felix Fietkau
nbd at nbd.name
Wed Dec 1 04:36:26 PST 2021
On 2021-11-23 08:49, Bo Jiao wrote:
> From: Bo Jiao <Bo.Jiao at mediatek.com>
>
> The RXQ of mt7916 are separated to MT_RXQ_MAIN_WA and MT_RXQ_MCU_WA,
> which causes a hole for queue iteration so modify it accordingly.
>
> This is an intermediate patch to add mt7916 support.
>
> Co-developed-by: Sujuan Chen <sujuan.chen at mediatek.com>
> Signed-off-by: Sujuan Chen <sujuan.chen at mediatek.com>
> Co-developed-by: Ryder Lee <ryder.lee at mediatek.com>
> Signed-off-by: Ryder Lee <ryder.lee at mediatek.com>
> Signed-off-by: Bo Jiao <Bo.Jiao at mediatek.com>
> ---
> v2:
> - revert the modify to mt76_for_each_q_rx() which may cause
> not work for sdo/usb chip.
> ---
> drivers/net/wireless/mediatek/mt76/dma.c | 13 +-
> drivers/net/wireless/mediatek/mt76/mt76.h | 1 +
> .../net/wireless/mediatek/mt76/mt7915/dma.c | 375 ++++++++++++------
> .../net/wireless/mediatek/mt76/mt7915/init.c | 9 +-
> .../net/wireless/mediatek/mt76/mt7915/mac.c | 4 +
> .../net/wireless/mediatek/mt76/mt7915/mmio.c | 38 +-
> .../wireless/mediatek/mt76/mt7915/mt7915.h | 3 +-
> .../net/wireless/mediatek/mt76/mt7915/regs.h | 60 ++-
> 8 files changed, 358 insertions(+), 145 deletions(-)
>
> diff --git a/drivers/net/wireless/mediatek/mt76/dma.c b/drivers/net/wireless/mediatek/mt76/dma.c
> index 5e1c150..3cc1acf 100644
> --- a/drivers/net/wireless/mediatek/mt76/dma.c
> +++ b/drivers/net/wireless/mediatek/mt76/dma.c
> @@ -93,7 +93,7 @@ mt76_dma_queue_reset(struct mt76_dev *dev, struct mt76_queue *q)
> {
> int i;
>
> - if (!q)
> + if (!q || !q->ndesc)
> return;
>
> /* clear descriptors */
> @@ -233,7 +233,7 @@ mt76_dma_tx_cleanup(struct mt76_dev *dev, struct mt76_queue *q, bool flush)
> struct mt76_queue_entry entry;
> int last;
>
> - if (!q)
> + if (!q || !q->ndesc)
> return;
>
> spin_lock_bh(&q->cleanup_lock);
> @@ -448,6 +448,9 @@ mt76_dma_rx_fill(struct mt76_dev *dev, struct mt76_queue *q)
> int len = SKB_WITH_OVERHEAD(q->buf_size);
> int offset = q->buf_offset;
>
> + if (!q->ndesc)
> + return 0;
> +
> spin_lock_bh(&q->lock);
>
> while (q->queued < q->ndesc - 1) {
> @@ -484,6 +487,9 @@ mt76_dma_rx_cleanup(struct mt76_dev *dev, struct mt76_queue *q)
> void *buf;
> bool more;
>
> + if (!q->ndesc)
> + return;
> +
> spin_lock_bh(&q->lock);
> do {
> buf = mt76_dma_dequeue(dev, q, true, NULL, NULL, &more);
> @@ -508,6 +514,9 @@ mt76_dma_rx_reset(struct mt76_dev *dev, enum mt76_rxq_id qid)
> struct mt76_queue *q = &dev->q_rx[qid];
> int i;
>
> + if (!q->ndesc)
> + return;
> +
> for (i = 0; i < q->ndesc; i++)
> q->desc[i].ctrl = cpu_to_le32(MT_DMA_CTL_DMA_DONE);
>
> diff --git a/drivers/net/wireless/mediatek/mt76/mt76.h b/drivers/net/wireless/mediatek/mt76/mt76.h
> index e2da720..8fd6890 100644
> --- a/drivers/net/wireless/mediatek/mt76/mt76.h
> +++ b/drivers/net/wireless/mediatek/mt76/mt76.h
> @@ -85,6 +85,7 @@ enum mt76_rxq_id {
> MT_RXQ_MCU_WA,
> MT_RXQ_EXT,
> MT_RXQ_EXT_WA,
> + MT_RXQ_MAIN_WA,
> __MT_RXQ_MAX
> };
>
The mt76 core changes should be in a separate patch.
> diff --git a/drivers/net/wireless/mediatek/mt76/mt7915/dma.c b/drivers/net/wireless/mediatek/mt76/mt7915/dma.c
> index ad9678b..05104b1 100644
> --- a/drivers/net/wireless/mediatek/mt76/mt7915/dma.c
> +++ b/drivers/net/wireless/mediatek/mt76/mt7915/dma.c
> @@ -44,31 +44,52 @@ static int mt7915_poll_tx(struct napi_struct *napi, int budget)
> static void __mt7915_dma_prefetch(struct mt7915_dev *dev, u32 ofs)
> {
> #define PREFETCH(base, depth) ((base) << 16 | (depth))
> -
> - mt76_wr(dev, MT_WFDMA0_RX_RING0_EXT_CTRL + ofs, PREFETCH(0x0, 0x4));
> - mt76_wr(dev, MT_WFDMA0_RX_RING1_EXT_CTRL + ofs, PREFETCH(0x40, 0x4));
> - mt76_wr(dev, MT_WFDMA0_RX_RING2_EXT_CTRL + ofs, PREFETCH(0x80, 0x0));
> -
> - mt76_wr(dev, MT_WFDMA1_TX_RING0_EXT_CTRL + ofs, PREFETCH(0x80, 0x4));
> - mt76_wr(dev, MT_WFDMA1_TX_RING1_EXT_CTRL + ofs, PREFETCH(0xc0, 0x4));
> - mt76_wr(dev, MT_WFDMA1_TX_RING2_EXT_CTRL + ofs, PREFETCH(0x100, 0x4));
> - mt76_wr(dev, MT_WFDMA1_TX_RING3_EXT_CTRL + ofs, PREFETCH(0x140, 0x4));
> - mt76_wr(dev, MT_WFDMA1_TX_RING4_EXT_CTRL + ofs, PREFETCH(0x180, 0x4));
> - mt76_wr(dev, MT_WFDMA1_TX_RING5_EXT_CTRL + ofs, PREFETCH(0x1c0, 0x4));
> - mt76_wr(dev, MT_WFDMA1_TX_RING6_EXT_CTRL + ofs, PREFETCH(0x200, 0x4));
> - mt76_wr(dev, MT_WFDMA1_TX_RING7_EXT_CTRL + ofs, PREFETCH(0x240, 0x4));
> -
> - mt76_wr(dev, MT_WFDMA1_TX_RING16_EXT_CTRL + ofs, PREFETCH(0x280, 0x4));
> - mt76_wr(dev, MT_WFDMA1_TX_RING17_EXT_CTRL + ofs, PREFETCH(0x2c0, 0x4));
> - mt76_wr(dev, MT_WFDMA1_TX_RING18_EXT_CTRL + ofs, PREFETCH(0x300, 0x4));
> - mt76_wr(dev, MT_WFDMA1_TX_RING19_EXT_CTRL + ofs, PREFETCH(0x340, 0x4));
> - mt76_wr(dev, MT_WFDMA1_TX_RING20_EXT_CTRL + ofs, PREFETCH(0x380, 0x4));
> - mt76_wr(dev, MT_WFDMA1_TX_RING21_EXT_CTRL + ofs, PREFETCH(0x3c0, 0x0));
> -
> - mt76_wr(dev, MT_WFDMA1_RX_RING0_EXT_CTRL + ofs, PREFETCH(0x3c0, 0x4));
> - mt76_wr(dev, MT_WFDMA1_RX_RING1_EXT_CTRL + ofs, PREFETCH(0x400, 0x4));
> - mt76_wr(dev, MT_WFDMA1_RX_RING2_EXT_CTRL + ofs, PREFETCH(0x440, 0x4));
> - mt76_wr(dev, MT_WFDMA1_RX_RING3_EXT_CTRL + ofs, PREFETCH(0x480, 0x0));
> + struct mt76_dev *mdev = &dev->mt76;
> + u32 base_ofs = 0;
> +
> + /* prefetch SRAM wrapping boundary for tx/rx ring. */
> + mt76_wr(dev, MT_WFDMA_TX_RING_EXT_CTRL_FWDL + ofs,
> + PREFETCH(0x0, 0x4));
> + mt76_wr(dev, MT_WFDMA_TX_RING_EXT_CTRL_WM + ofs,
> + PREFETCH(0x40, 0x4));
> + mt76_wr(dev, MT_WFDMA_TX_RING_EXT_CTRL_BAND0 + ofs,
> + PREFETCH(0x80, 0x4));
> + mt76_wr(dev, MT_WFDMA_TX_RING_EXT_CTRL_BAND1 + ofs,
> + PREFETCH(0xc0, 0x4));
> + mt76_wr(dev, MT_WFDMA_TX_RING_EXT_CTRL_WA + ofs,
> + PREFETCH(0x100, 0x4));
> + mt76_wr(dev, MT_WFDMA1_TX_RING21_EXT_CTRL + ofs,
> + PREFETCH(0x140, 0x0));
> +
> + mt76_wr(dev, MT_WFDMA_RX_RING_EXT_CTRL_WM + ofs,
> + PREFETCH(0x140, 0x4));
> + if (!is_mt7915(mdev)) {
> + mt76_wr(dev, MT_WFDMA_RX_RING_EXT_CTRL_WA + ofs,
> + PREFETCH(0x180, 0x4));
> + base_ofs = 0x40;
> + }
> + mt76_wr(dev, MT_WFDMA_RX_RING_EXT_CTRL_STS0 + ofs,
> + PREFETCH(0x180 + base_ofs, 0x4));
> + mt76_wr(dev, MT_WFDMA_RX_RING_EXT_CTRL_STS1 + ofs,
> + PREFETCH(0x1c0 + base_ofs, 0x4));
> + mt76_wr(dev, MT_WFDMA_RX_RING_EXT_CTRL_BAND0 + ofs,
> + PREFETCH(0x200 + base_ofs, 0x4));
> + mt76_wr(dev, MT_WFDMA_RX_RING_EXT_CTRL_BAND1 + ofs,
> + PREFETCH(0x240 + base_ofs, 0x4));
> +
> + /* for mt7915, the ring which is next the last
> + * used ring must be initialized.
> + */
> + if (is_mt7915(mdev)) {
> + mt76_wr(dev, MT_WFDMA1_TX_RING21_EXT_CTRL + ofs,
> + PREFETCH(0x140, 0x0));
> +
> + mt76_wr(dev, MT_WFDMA1_RX_RING3_EXT_CTRL + ofs,
> + PREFETCH(0x200 + base_ofs, 0x0));
> +
> + mt76_wr(dev, MT_WFDMA0_RX_RING2_EXT_CTRL + ofs,
> + PREFETCH(0x280 + base_ofs, 0x0));
> + }
It seems to me that a large part of the tx/rx ring related register
differences come from the fact that they're distributed differently over
WFDMA0 and WFDMA1 on 7915 vs 7916. Maybe this could be simplified a lot
by using a chip specific mask for rx/tx queues that indicates which ones
should be on WFDMA1.
This could be used in queue allocation, prefetch configuration and maybe
in a few other places too.
- Felix
More information about the Linux-mediatek
mailing list