Commit b92158a8 authored by Lorenzo Bianconi's avatar Lorenzo Bianconi Committed by Felix Fietkau
Browse files

wifi: mt76: mmio: move mt76_mmio_wed_{init,release}_rx_buf in common code 



Move mt76_mmio_wed_init_rx_buf and mt76_mmio_wed_release_rx_buf routines
in common code.
This is a preliminary patch to introduce WED support for mt7996

Signed-off-by: default avatarLorenzo Bianconi <lorenzo@kernel.org>
Signed-off-by: default avatarFelix Fietkau <nbd@nbd.name>
parent 2fac91f2

drivers/net/wireless/mediatek/mt76/mmio.c

+75 −0
Original line number Diff line number Diff line
@@ -4,6 +4,7 @@ 
 */



#include "mt76.h"

#include "dma.h"

#include "trace.h"



static u32 mt76_mmio_rr(struct mt76_dev *dev, u32 offset)
@@ -84,6 +85,80 @@ void mt76_set_irq_mask(struct mt76_dev *dev, u32 addr, 
}

EXPORT_SYMBOL_GPL(mt76_set_irq_mask);



#ifdef CONFIG_NET_MEDIATEK_SOC_WED

void mt76_mmio_wed_release_rx_buf(struct mtk_wed_device *wed)

{

	struct mt76_dev *dev = container_of(wed, struct mt76_dev, mmio.wed);

	int i;



	for (i = 0; i < dev->rx_token_size; i++) {

		struct mt76_txwi_cache *t;



		t = mt76_rx_token_release(dev, i);

		if (!t || !t->ptr)

			continue;



		mt76_put_page_pool_buf(t->ptr, false);

		t->ptr = NULL;



		mt76_put_rxwi(dev, t);

	}



	mt76_free_pending_rxwi(dev);

}

EXPORT_SYMBOL_GPL(mt76_mmio_wed_release_rx_buf);



u32 mt76_mmio_wed_init_rx_buf(struct mtk_wed_device *wed, int size)

{

	struct mt76_dev *dev = container_of(wed, struct mt76_dev, mmio.wed);

	struct mtk_wed_bm_desc *desc = wed->rx_buf_ring.desc;

	struct mt76_queue *q = &dev->q_rx[MT_RXQ_MAIN];

	int i, len = SKB_WITH_OVERHEAD(q->buf_size);

	struct mt76_txwi_cache *t = NULL;



	for (i = 0; i < size; i++) {

		enum dma_data_direction dir;

		dma_addr_t addr;

		u32 offset;

		int token;

		void *buf;



		t = mt76_get_rxwi(dev);

		if (!t)

			goto unmap;



		buf = mt76_get_page_pool_buf(q, &offset, q->buf_size);

		if (!buf)

			goto unmap;



		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);



		desc->buf0 = cpu_to_le32(addr);

		token = mt76_rx_token_consume(dev, buf, t, addr);

		if (token < 0) {

			mt76_put_page_pool_buf(buf, false);

			goto unmap;

		}



		desc->token |= cpu_to_le32(FIELD_PREP(MT_DMA_CTL_TOKEN,

						      token));

		desc++;

	}



	return 0;



unmap:

	if (t)

		mt76_put_rxwi(dev, t);

	mt76_mmio_wed_release_rx_buf(wed);



	return -ENOMEM;

}

EXPORT_SYMBOL_GPL(mt76_mmio_wed_init_rx_buf);

#endif /*CONFIG_NET_MEDIATEK_SOC_WED */



void mt76_mmio_init(struct mt76_dev *dev, void __iomem *regs)

{

	static const struct mt76_bus_ops mt76_mmio_ops = {

drivers/net/wireless/mediatek/mt76/mt76.h

+5 −0
Original line number Diff line number Diff line
@@ -1057,6 +1057,11 @@ static inline u16 mt76_rev(struct mt76_dev *dev) 
	return dev->rev & 0xffff;

}



#ifdef CONFIG_NET_MEDIATEK_SOC_WED

u32 mt76_mmio_wed_init_rx_buf(struct mtk_wed_device *wed, int size);

void mt76_mmio_wed_release_rx_buf(struct mtk_wed_device *wed);

#endif /*CONFIG_NET_MEDIATEK_SOC_WED */



#define mt76xx_chip(dev) mt76_chip(&((dev)->mt76))

#define mt76xx_rev(dev) mt76_rev(&((dev)->mt76))

drivers/net/wireless/mediatek/mt76/mt7915/mmio.c

+2 −76
Original line number Diff line number Diff line
@@ -567,80 +567,6 @@ static void mt7915_mmio_wed_offload_disable(struct mtk_wed_device *wed) 
	spin_unlock_bh(&dev->mt76.token_lock);

}



static void mt7915_mmio_wed_release_rx_buf(struct mtk_wed_device *wed)

{

	struct mt7915_dev *dev;

	int i;



	dev = container_of(wed, struct mt7915_dev, mt76.mmio.wed);

	for (i = 0; i < dev->mt76.rx_token_size; i++) {

		struct mt76_txwi_cache *t;



		t = mt76_rx_token_release(&dev->mt76, i);

		if (!t || !t->ptr)

			continue;



		mt76_put_page_pool_buf(t->ptr, false);

		t->ptr = NULL;



		mt76_put_rxwi(&dev->mt76, t);

	}



	mt76_free_pending_rxwi(&dev->mt76);

}



static u32 mt7915_mmio_wed_init_rx_buf(struct mtk_wed_device *wed, int size)

{

	struct mtk_wed_bm_desc *desc = wed->rx_buf_ring.desc;

	struct mt76_txwi_cache *t = NULL;

	struct mt7915_dev *dev;

	struct mt76_queue *q;

	int i, len;



	dev = container_of(wed, struct mt7915_dev, mt76.mmio.wed);

	q = &dev->mt76.q_rx[MT_RXQ_MAIN];

	len = SKB_WITH_OVERHEAD(q->buf_size);



	for (i = 0; i < size; i++) {

		enum dma_data_direction dir;

		dma_addr_t addr;

		u32 offset;

		int token;

		void *buf;



		t = mt76_get_rxwi(&dev->mt76);

		if (!t)

			goto unmap;



		buf = mt76_get_page_pool_buf(q, &offset, q->buf_size);

		if (!buf)

			goto unmap;



		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->mt76.dma_dev, addr, len, dir);



		desc->buf0 = cpu_to_le32(addr);

		token = mt76_rx_token_consume(&dev->mt76, buf, t, addr);

		if (token < 0) {

			mt76_put_page_pool_buf(buf, false);

			goto unmap;

		}



		desc->token |= cpu_to_le32(FIELD_PREP(MT_DMA_CTL_TOKEN,

						      token));

		desc++;

	}



	return 0;



unmap:

	if (t)

		mt76_put_rxwi(&dev->mt76, t);

	mt7915_mmio_wed_release_rx_buf(wed);

	return -ENOMEM;

}



static void mt7915_mmio_wed_update_rx_stats(struct mtk_wed_device *wed,

					    struct mtk_wed_wo_rx_stats *stats)

{
@@ -780,8 +706,8 @@ int mt7915_mmio_wed_init(struct mt7915_dev *dev, void *pdev_ptr, 
	wed->wlan.init_buf = mt7915_wed_init_buf;

	wed->wlan.offload_enable = mt7915_mmio_wed_offload_enable;

	wed->wlan.offload_disable = mt7915_mmio_wed_offload_disable;

	wed->wlan.init_rx_buf = mt7915_mmio_wed_init_rx_buf;

	wed->wlan.release_rx_buf = mt7915_mmio_wed_release_rx_buf;

	wed->wlan.init_rx_buf = mt76_mmio_wed_init_rx_buf;

	wed->wlan.release_rx_buf = mt76_mmio_wed_release_rx_buf;

	wed->wlan.update_wo_rx_stats = mt7915_mmio_wed_update_rx_stats;

	wed->wlan.reset = mt7915_mmio_wed_reset;

	wed->wlan.reset_complete = mt7915_mmio_wed_reset_complete;