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

wifi: mt76: mt7915: enable WED RX support 



Enable RX Wireless Ethernet Dispatch available on MT7986 Soc in oreder
to offlad traffic received by WLAN NIC and forwarded to LAN/WAN one.

Tested-by: default avatarDaniel Golle <daniel@makrotopia.org>
Co-developed-by: default avatarSujuan Chen <sujuan.chen@mediatek.com>
Signed-off-by: default avatarSujuan Chen <sujuan.chen@mediatek.com>
Signed-off-by: default avatarLorenzo Bianconi <lorenzo@kernel.org>
Signed-off-by: default avatarFelix Fietkau <nbd@nbd.name>
parent d1369e51

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

+4 −1
Original line number Diff line number Diff line
@@ -1297,6 +1297,9 @@ void mt76_rx_poll_complete(struct mt76_dev *dev, enum mt76_rxq_id q, 


	while ((skb = __skb_dequeue(&dev->rx_skb[q])) != NULL) {

		mt76_check_sta(dev, skb);

		if (mtk_wed_device_active(&dev->mmio.wed))

			__skb_queue_tail(&frames, skb);

		else

			mt76_rx_aggr_reorder(skb, &frames);

	}

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

+19 −1
Original line number Diff line number Diff line
@@ -365,6 +365,7 @@ static int mt7915_dma_enable(struct mt7915_dev *dev) 
		wed_irq_mask |= MT_INT_TX_DONE_BAND0 | MT_INT_TX_DONE_BAND1;

		if (!is_mt7986(&dev->mt76))

			mt76_wr(dev, MT_INT_WED_MASK_CSR, wed_irq_mask);

		else

			mt76_wr(dev, MT_INT_MASK_CSR, wed_irq_mask);

		mtk_wed_device_start(&dev->mt76.mmio.wed, wed_irq_mask);

	}
@@ -401,6 +402,9 @@ int mt7915_dma_init(struct mt7915_dev *dev, struct mt7915_phy *phy2) 
				FIELD_PREP(MT_WFDMA_WED_RING_CONTROL_TX1, 19) |

				FIELD_PREP(MT_WFDMA_WED_RING_CONTROL_RX1,

					   wed_control_rx1));

			if (is_mt7915(mdev))

				mt76_rmw(dev, MT_WFDMA0_EXT0_CFG, MT_WFDMA0_EXT0_RXWB_KEEP,

					 MT_WFDMA0_EXT0_RXWB_KEEP);

		}

	} else {

		mt76_clear(dev, MT_WFDMA_HOST_CONFIG, MT_WFDMA_HOST_CONFIG_WED);
@@ -473,6 +477,13 @@ int mt7915_dma_init(struct mt7915_dev *dev, struct mt7915_phy *phy2) 


	/* rx data queue for band0 */

	if (!dev->phy.band_idx) {

		if (mtk_wed_device_active(&mdev->mmio.wed) &&

		    mtk_wed_get_rx_capa(&mdev->mmio.wed)) {

			dev->mt76.q_rx[MT_RXQ_MAIN].flags =

				MT_WED_Q_RX(MT7915_RXQ_BAND0);

			dev->mt76.rx_token_size += MT7915_RX_RING_SIZE;

		}



		ret = mt76_queue_alloc(dev, &dev->mt76.q_rx[MT_RXQ_MAIN],

				       MT_RXQ_ID(MT_RXQ_MAIN),

				       MT7915_RX_RING_SIZE,
@@ -503,6 +514,13 @@ int mt7915_dma_init(struct mt7915_dev *dev, struct mt7915_phy *phy2) 
	}



	if (dev->dbdc_support || dev->phy.band_idx) {

		if (mtk_wed_device_active(&mdev->mmio.wed) &&

		    mtk_wed_get_rx_capa(&mdev->mmio.wed)) {

			dev->mt76.q_rx[MT_RXQ_BAND1].flags =

				MT_WED_Q_RX(MT7915_RXQ_BAND1);

			dev->mt76.rx_token_size += MT7915_RX_RING_SIZE;

		}



		/* rx data queue for band1 */

		ret = mt76_queue_alloc(dev, &dev->mt76.q_rx[MT_RXQ_BAND1],

				       MT_RXQ_ID(MT_RXQ_BAND1),

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

+4 −0
Original line number Diff line number Diff line
@@ -1677,6 +1677,10 @@ int mt7915_mcu_add_sta(struct mt7915_dev *dev, struct ieee80211_vif *vif, 
		return ret;

	}

out:

	ret = mt76_connac_mcu_sta_wed_update(&dev->mt76, skb);

	if (ret)

		return ret;



	return mt76_mcu_skb_send_msg(&dev->mt76, skb,

				     MCU_EXT_CMD(STA_REC_UPDATE), true);

}

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

+202 −91
Original line number Diff line number Diff line
@@ -9,6 +9,7 @@ 
#include "mt7915.h"

#include "mac.h"

#include "../trace.h"

#include "../dma.h"



static bool wed_enable;

module_param(wed_enable, bool, 0644);
@@ -44,6 +45,7 @@ static const u32 mt7915_reg[] = { 
	[SWDEF_BASE_ADDR]		= 0x41f200,

	[TXQ_WED_RING_BASE]		= 0xd7300,

	[RXQ_WED_RING_BASE]		= 0xd7410,

	[RXQ_WED_DATA_RING_BASE]	= 0xd4500,

};



static const u32 mt7916_reg[] = {
@@ -77,6 +79,7 @@ static const u32 mt7916_reg[] = { 
	[SWDEF_BASE_ADDR]		= 0x411400,

	[TXQ_WED_RING_BASE]		= 0xd7300,

	[RXQ_WED_RING_BASE]		= 0xd7410,

	[RXQ_WED_DATA_RING_BASE]	= 0xd4540,

};



static const u32 mt7986_reg[] = {
@@ -110,6 +113,7 @@ static const u32 mt7986_reg[] = { 
	[SWDEF_BASE_ADDR]		= 0x411400,

	[TXQ_WED_RING_BASE]		= 0x24420,

	[RXQ_WED_RING_BASE]		= 0x24520,

	[RXQ_WED_DATA_RING_BASE]	= 0x24540,

};



static const u32 mt7915_offs[] = {
@@ -585,6 +589,80 @@ static void mt7915_mmio_wed_offload_disable(struct mtk_wed_device *wed) 
		mt76_clear(dev, MT_AGG_ACR4(phy->band_idx),

			   MT_AGG_ACR_PPDU_TXS2H);

}



static void mt7915_wed_release_rx_buf(struct mtk_wed_device *wed)

{

	struct mt7915_dev *dev;

	struct page *page;

	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;



		dma_unmap_single(dev->mt76.dma_dev, t->dma_addr,

				 wed->wlan.rx_size, DMA_FROM_DEVICE);

		skb_free_frag(t->ptr);

		t->ptr = NULL;



		mt76_put_rxwi(&dev->mt76, t);

	}



	if (!wed->rx_buf_ring.rx_page.va)

		return;



	page = virt_to_page(wed->rx_buf_ring.rx_page.va);

	__page_frag_cache_drain(page, wed->rx_buf_ring.rx_page.pagecnt_bias);

	memset(&wed->rx_buf_ring.rx_page, 0, sizeof(wed->rx_buf_ring.rx_page));

}



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

{

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

	struct mt7915_dev *dev;

	u32 length;

	int i;



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

	length = SKB_DATA_ALIGN(NET_SKB_PAD + wed->wlan.rx_size +

				sizeof(struct skb_shared_info));



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

		struct mt76_txwi_cache *t = mt76_get_rxwi(&dev->mt76);

		dma_addr_t phy_addr;

		int token;

		void *ptr;



		ptr = page_frag_alloc(&wed->rx_buf_ring.rx_page, length,

				      GFP_KERNEL);

		if (!ptr)

			goto unmap;



		phy_addr = dma_map_single(dev->mt76.dma_dev, ptr,

					  wed->wlan.rx_size,

					  DMA_TO_DEVICE);

		if (unlikely(dma_mapping_error(dev->mt76.dev, phy_addr))) {

			skb_free_frag(ptr);

			goto unmap;

		}



		desc->buf0 = cpu_to_le32(phy_addr);

		token = mt76_rx_token_consume(&dev->mt76, ptr, t, phy_addr);

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

						      token));

		desc++;

	}



	return 0;



unmap:

	mt7915_wed_release_rx_buf(wed);

	return -ENOMEM;

}

#endif



int mt7915_mmio_wed_init(struct mt7915_dev *dev, void *pdev_ptr,
@@ -602,6 +680,10 @@ int mt7915_mmio_wed_init(struct mt7915_dev *dev, void *pdev_ptr, 


		wed->wlan.pci_dev = pci_dev;

		wed->wlan.bus_type = MTK_WED_BUS_PCIE;

		wed->wlan.base = devm_ioremap(dev->mt76.dev,

					      pci_resource_start(pci_dev, 0),

					      pci_resource_len(pci_dev, 0));

		wed->wlan.phy_base = pci_resource_start(pci_dev, 0);

		wed->wlan.wpdma_int = pci_resource_start(pci_dev, 0) +

				      MT_INT_WED_SOURCE_CSR;

		wed->wlan.wpdma_mask = pci_resource_start(pci_dev, 0) +
@@ -612,6 +694,10 @@ int mt7915_mmio_wed_init(struct mt7915_dev *dev, void *pdev_ptr, 
				     MT_TXQ_WED_RING_BASE;

		wed->wlan.wpdma_txfree = pci_resource_start(pci_dev, 0) +

					 MT_RXQ_WED_RING_BASE;

		wed->wlan.wpdma_rx_glo = pci_resource_start(pci_dev, 0) +

					 MT_WPDMA_GLO_CFG;

		wed->wlan.wpdma_rx = pci_resource_start(pci_dev, 0) +

				     MT_RXQ_WED_DATA_RING_BASE;

	} else {

		struct platform_device *plat_dev = pdev_ptr;

		struct resource *res;
@@ -622,19 +708,44 @@ int mt7915_mmio_wed_init(struct mt7915_dev *dev, void *pdev_ptr, 


		wed->wlan.platform_dev = plat_dev;

		wed->wlan.bus_type = MTK_WED_BUS_AXI;

		wed->wlan.base = devm_ioremap(dev->mt76.dev, res->start,

					      resource_size(res));

		wed->wlan.phy_base = res->start;

		wed->wlan.wpdma_int = res->start + MT_INT_SOURCE_CSR;

		wed->wlan.wpdma_mask = res->start + MT_INT_MASK_CSR;

		wed->wlan.wpdma_tx = res->start + MT_TXQ_WED_RING_BASE;

		wed->wlan.wpdma_txfree = res->start + MT_RXQ_WED_RING_BASE;

		wed->wlan.wpdma_rx_glo = res->start + MT_WPDMA_GLO_CFG;

		wed->wlan.wpdma_rx = res->start + MT_RXQ_WED_DATA_RING_BASE;

	}

	wed->wlan.nbuf = 4096;

	wed->wlan.tx_tbit[0] = is_mt7915(&dev->mt76) ? 4 : 30;

	wed->wlan.tx_tbit[1] = is_mt7915(&dev->mt76) ? 5 : 31;

	wed->wlan.txfree_tbit = is_mt7915(&dev->mt76) ? 1 : 2;

	wed->wlan.txfree_tbit = is_mt7986(&dev->mt76) ? 2 : 1;

	wed->wlan.token_start = MT7915_TOKEN_SIZE - wed->wlan.nbuf;

	wed->wlan.wcid_512 = !is_mt7915(&dev->mt76);



	wed->wlan.rx_nbuf = 65536;

	wed->wlan.rx_npkt = MT7915_WED_RX_TOKEN_SIZE;

	wed->wlan.rx_size = SKB_WITH_OVERHEAD(MT_RX_BUF_SIZE);

	if (is_mt7915(&dev->mt76)) {

		wed->wlan.rx_tbit[0] = 16;

		wed->wlan.rx_tbit[1] = 17;

	} else if (is_mt7986(&dev->mt76)) {

		wed->wlan.rx_tbit[0] = 22;

		wed->wlan.rx_tbit[1] = 23;

	} else {

		wed->wlan.rx_tbit[0] = 18;

		wed->wlan.rx_tbit[1] = 19;

	}



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

	wed->wlan.release_rx_buf = mt7915_wed_release_rx_buf;



	dev->mt76.rx_token_size = wed->wlan.rx_npkt;



	if (mtk_wed_device_attach(wed))

		return 0;

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

+2 −0
Original line number Diff line number Diff line
@@ -68,6 +68,8 @@ 
#define MT7915_MIN_TWT_DUR 64

#define MT7915_MAX_QUEUE		(MT_RXQ_BAND2 + __MT_MCUQ_MAX + 2)



#define MT7915_WED_RX_TOKEN_SIZE	12288



struct mt7915_vif;

struct mt7915_sta;

struct mt7915_dfs_pulse;