Commit 7d5a7273 authored by Lorenzo Bianconi's avatar Lorenzo Bianconi Committed by Paolo Abeni
Browse files

net: ethernet: mtk_wed: do not configure rx offload if not supported 



Check if rx offload is supported running mtk_wed_get_rx_capa routine
before configuring it. This is a preliminary patch to introduce Wireless
Ethernet Dispatcher (WED) support for MT7988 SoC.

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 avatarPaolo Abeni <pabeni@redhat.com>
parent d274d523

drivers/net/ethernet/mediatek/mtk_wed.c

+69 −57
Original line number Diff line number Diff line
@@ -606,7 +606,7 @@ mtk_wed_stop(struct mtk_wed_device *dev) 
	wdma_w32(dev, MTK_WDMA_INT_GRP2, 0);

	wed_w32(dev, MTK_WED_WPDMA_INT_MASK, 0);



	if (mtk_wed_is_v1(dev->hw))

	if (!mtk_wed_get_rx_capa(dev))

		return;



	wed_w32(dev, MTK_WED_EXT_INT_MASK1, 0);
@@ -733,17 +733,22 @@ mtk_wed_set_wpdma(struct mtk_wed_device *dev) 
{

	if (mtk_wed_is_v1(dev->hw)) {

		wed_w32(dev, MTK_WED_WPDMA_CFG_BASE,  dev->wlan.wpdma_phys);

	} else {

		return;

	}



	mtk_wed_bus_init(dev);



	wed_w32(dev, MTK_WED_WPDMA_CFG_BASE, dev->wlan.wpdma_int);

	wed_w32(dev, MTK_WED_WPDMA_CFG_INT_MASK, dev->wlan.wpdma_mask);

	wed_w32(dev, MTK_WED_WPDMA_CFG_TX, dev->wlan.wpdma_tx);

	wed_w32(dev, MTK_WED_WPDMA_CFG_TX_FREE, dev->wlan.wpdma_txfree);



	if (!mtk_wed_get_rx_capa(dev))

		return;



	wed_w32(dev, MTK_WED_WPDMA_RX_GLO_CFG, dev->wlan.wpdma_rx_glo);

	wed_w32(dev, MTK_WED_WPDMA_RX_RING, dev->wlan.wpdma_rx);

}

}



static void

mtk_wed_hw_init_early(struct mtk_wed_device *dev)
@@ -974,6 +979,7 @@ mtk_wed_hw_init(struct mtk_wed_device *dev) 
			MTK_WED_CTRL_WED_TX_FREE_AGENT_EN);

	} else {

		wed_clr(dev, MTK_WED_TX_TKID_CTRL, MTK_WED_TX_TKID_CTRL_PAUSE);

		if (mtk_wed_get_rx_capa(dev)) {

			/* rx hw init */

			wed_w32(dev, MTK_WED_WPDMA_RX_D_RST_IDX,

				MTK_WED_WPDMA_RX_D_RST_CRX_IDX |
@@ -984,6 +990,7 @@ mtk_wed_hw_init(struct mtk_wed_device *dev) 
			mtk_wed_rro_hw_init(dev);

			mtk_wed_route_qm_hw_init(dev);

		}

	}



	wed_clr(dev, MTK_WED_TX_BM_CTRL, MTK_WED_TX_BM_CTRL_PAUSE);

}
@@ -1354,8 +1361,6 @@ mtk_wed_configure_irq(struct mtk_wed_device *dev, u32 irq_mask) 


		wed_clr(dev, MTK_WED_WDMA_INT_CTRL, wdma_mask);

	} else {

		wdma_mask |= FIELD_PREP(MTK_WDMA_INT_MASK_TX_DONE,

					GENMASK(1, 0));

		/* initail tx interrupt trigger */

		wed_w32(dev, MTK_WED_WPDMA_INT_CTRL_TX,

			MTK_WED_WPDMA_INT_CTRL_TX0_DONE_EN |
@@ -1374,6 +1379,7 @@ mtk_wed_configure_irq(struct mtk_wed_device *dev, u32 irq_mask) 
			FIELD_PREP(MTK_WED_WPDMA_INT_CTRL_TX_FREE_DONE_TRIG,

				   dev->wlan.txfree_tbit));



		if (mtk_wed_get_rx_capa(dev)) {

			wed_w32(dev, MTK_WED_WPDMA_INT_CTRL_RX,

				MTK_WED_WPDMA_INT_CTRL_RX0_EN |

				MTK_WED_WPDMA_INT_CTRL_RX0_CLR |
@@ -1384,6 +1390,10 @@ mtk_wed_configure_irq(struct mtk_wed_device *dev, u32 irq_mask) 
				FIELD_PREP(MTK_WED_WPDMA_INT_CTRL_RX1_DONE_TRIG,

					   dev->wlan.rx_tbit[1]));



			wdma_mask |= FIELD_PREP(MTK_WDMA_INT_MASK_TX_DONE,

						GENMASK(1, 0));

		}



		wed_w32(dev, MTK_WED_WDMA_INT_CLR, wdma_mask);

		wed_set(dev, MTK_WED_WDMA_INT_CTRL,

			FIELD_PREP(MTK_WED_WDMA_INT_CTRL_POLL_SRC_SEL,
@@ -1401,6 +1411,8 @@ mtk_wed_configure_irq(struct mtk_wed_device *dev, u32 irq_mask) 
static void

mtk_wed_dma_enable(struct mtk_wed_device *dev)

{

	int i;



	wed_set(dev, MTK_WED_WPDMA_INT_CTRL, MTK_WED_WPDMA_INT_CTRL_SUBRT_ADV);



	wed_set(dev, MTK_WED_GLO_CFG,
@@ -1420,24 +1432,25 @@ mtk_wed_dma_enable(struct mtk_wed_device *dev) 
	if (mtk_wed_is_v1(dev->hw)) {

		wdma_set(dev, MTK_WDMA_GLO_CFG,

			 MTK_WDMA_GLO_CFG_RX_INFO3_PRERES);

	} else {

		int i;

		return;

	}



	wed_set(dev, MTK_WED_WPDMA_CTRL,

		MTK_WED_WPDMA_CTRL_SDL1_FIXED);



		wed_set(dev, MTK_WED_WDMA_GLO_CFG,

			MTK_WED_WDMA_GLO_CFG_TX_DRV_EN |

			MTK_WED_WDMA_GLO_CFG_TX_DDONE_CHK);



	wed_set(dev, MTK_WED_WPDMA_GLO_CFG,

		MTK_WED_WPDMA_GLO_CFG_RX_DRV_R0_PKT_PROC |

		MTK_WED_WPDMA_GLO_CFG_RX_DRV_R0_CRX_SYNC);



	wed_clr(dev, MTK_WED_WPDMA_GLO_CFG,

		MTK_WED_WPDMA_GLO_CFG_TX_TKID_KEEP |

		MTK_WED_WPDMA_GLO_CFG_TX_DMAD_DW3_PREV);



	if (!mtk_wed_get_rx_capa(dev))

		return;



	wed_set(dev, MTK_WED_WDMA_GLO_CFG,

		MTK_WED_WDMA_GLO_CFG_TX_DRV_EN |

		MTK_WED_WDMA_GLO_CFG_TX_DDONE_CHK);



	wed_set(dev, MTK_WED_WPDMA_RX_D_GLO_CFG,

		MTK_WED_WPDMA_RX_D_RX_DRV_EN |

		FIELD_PREP(MTK_WED_WPDMA_RX_D_RXD_READ_LEN, 0x18) |
@@ -1447,7 +1460,6 @@ mtk_wed_dma_enable(struct mtk_wed_device *dev) 
	for (i = 0; i < MTK_WED_RX_QUEUES; i++)

		mtk_wed_check_wfdma_rx_fill(dev, i);

}

}



static void

mtk_wed_start(struct mtk_wed_device *dev, u32 irq_mask)
@@ -1473,7 +1485,7 @@ mtk_wed_start(struct mtk_wed_device *dev, u32 irq_mask) 


		val |= BIT(0) | (BIT(1) * !!dev->hw->index);

		regmap_write(dev->hw->mirror, dev->hw->index * 4, val);

	} else {

	} else if (mtk_wed_get_rx_capa(dev)) {

		/* driver set mid ready and only once */

		wed_w32(dev, MTK_WED_EXT_INT_MASK1,

			MTK_WED_EXT_INT_STATUS_WPDMA_MID_RDY);
@@ -1485,7 +1497,6 @@ mtk_wed_start(struct mtk_wed_device *dev, u32 irq_mask) 


		if (mtk_wed_rro_cfg(dev))

			return;



	}



	mtk_wed_set_512_support(dev, dev->wlan.wcid_512);
@@ -1551,13 +1562,14 @@ mtk_wed_attach(struct mtk_wed_device *dev) 
	}



	mtk_wed_hw_init_early(dev);

	if (mtk_wed_is_v1(hw)) {

	if (mtk_wed_is_v1(hw))

		regmap_update_bits(hw->hifsys, HIFSYS_DMA_AG_MAP,

				   BIT(hw->index), 0);

	} else {

	else

		dev->rev_id = wed_r32(dev, MTK_WED_REV_ID);



	if (mtk_wed_get_rx_capa(dev))

		ret = mtk_wed_wo_init(hw);

	}

out:

	if (ret) {

		dev_err(dev->hw->dev, "failed to attach wed device\n");

drivers/net/ethernet/mediatek/mtk_wed_mcu.c

+1 −1
Original line number Diff line number Diff line
@@ -207,7 +207,7 @@ int mtk_wed_mcu_msg_update(struct mtk_wed_device *dev, int id, void *data, 
{

	struct mtk_wed_wo *wo = dev->hw->wed_wo;



	if (mtk_wed_is_v1(dev->hw))

	if (!mtk_wed_get_rx_capa(dev))

		return 0;



	if (WARN_ON(!wo))