mirror of
https://git.openwrt.org/openwrt/openwrt.git
synced 2024-10-20 06:28:12 +02:00
f0cc5f6c0a
Backport upstream changes to initialize GDM settings and reset PPE Allow GMAC to recognize the special tag to fix PPE packet parsing Improve GRO performance by passing PPE L4 hash as skb hash Signed-off-by: Felix Fietkau <nbd@nbd.name>
81 lines
2.3 KiB
Diff
81 lines
2.3 KiB
Diff
From: MarkLee <Mark-MC.Lee@mediatek.com>
|
|
Date: Wed, 13 Nov 2019 10:38:42 +0800
|
|
Subject: [PATCH] net: ethernet: mediatek: Integrate GDM/PSE setup operations
|
|
|
|
Integrate GDM/PSE setup operations into single function "mtk_gdm_config"
|
|
|
|
Signed-off-by: MarkLee <Mark-MC.Lee@mediatek.com>
|
|
Signed-off-by: David S. Miller <davem@davemloft.net>
|
|
---
|
|
|
|
--- a/drivers/net/ethernet/mediatek/mtk_eth_soc.c
|
|
+++ b/drivers/net/ethernet/mediatek/mtk_eth_soc.c
|
|
@@ -2211,6 +2211,28 @@ static int mtk_start_dma(struct mtk_eth
|
|
return 0;
|
|
}
|
|
|
|
+static void mtk_gdm_config(struct mtk_eth *eth, u32 config)
|
|
+{
|
|
+ int i;
|
|
+
|
|
+ for (i = 0; i < MTK_MAC_COUNT; i++) {
|
|
+ u32 val = mtk_r32(eth, MTK_GDMA_FWD_CFG(i));
|
|
+
|
|
+ /* default setup the forward port to send frame to PDMA */
|
|
+ val &= ~0xffff;
|
|
+
|
|
+ /* Enable RX checksum */
|
|
+ val |= MTK_GDMA_ICS_EN | MTK_GDMA_TCS_EN | MTK_GDMA_UCS_EN;
|
|
+
|
|
+ val |= config;
|
|
+
|
|
+ mtk_w32(eth, val, MTK_GDMA_FWD_CFG(i));
|
|
+ }
|
|
+ /* Reset and enable PSE */
|
|
+ mtk_w32(eth, RST_GL_PSE, MTK_RST_GL);
|
|
+ mtk_w32(eth, 0, MTK_RST_GL);
|
|
+}
|
|
+
|
|
static int mtk_open(struct net_device *dev)
|
|
{
|
|
struct mtk_mac *mac = netdev_priv(dev);
|
|
@@ -2406,8 +2428,6 @@ static int mtk_hw_init(struct mtk_eth *e
|
|
mtk_w32(eth, 0, MTK_QDMA_DELAY_INT);
|
|
mtk_tx_irq_disable(eth, ~0);
|
|
mtk_rx_irq_disable(eth, ~0);
|
|
- mtk_w32(eth, RST_GL_PSE, MTK_RST_GL);
|
|
- mtk_w32(eth, 0, MTK_RST_GL);
|
|
|
|
/* FE int grouping */
|
|
mtk_w32(eth, MTK_TX_DONE_INT, MTK_PDMA_INT_GRP1);
|
|
@@ -2416,18 +2436,7 @@ static int mtk_hw_init(struct mtk_eth *e
|
|
mtk_w32(eth, MTK_RX_DONE_INT, MTK_QDMA_INT_GRP2);
|
|
mtk_w32(eth, 0x21021000, MTK_FE_INT_GRP);
|
|
|
|
- for (i = 0; i < MTK_MAC_COUNT; i++) {
|
|
- u32 val = mtk_r32(eth, MTK_GDMA_FWD_CFG(i));
|
|
-
|
|
- /* setup the forward port to send frame to PDMA */
|
|
- val &= ~0xffff;
|
|
-
|
|
- /* Enable RX checksum */
|
|
- val |= MTK_GDMA_ICS_EN | MTK_GDMA_TCS_EN | MTK_GDMA_UCS_EN;
|
|
-
|
|
- /* setup the mac dma */
|
|
- mtk_w32(eth, val, MTK_GDMA_FWD_CFG(i));
|
|
- }
|
|
+ mtk_gdm_config(eth, MTK_GDMA_TO_PDMA);
|
|
|
|
return 0;
|
|
|
|
--- a/drivers/net/ethernet/mediatek/mtk_eth_soc.h
|
|
+++ b/drivers/net/ethernet/mediatek/mtk_eth_soc.h
|
|
@@ -84,6 +84,7 @@
|
|
#define MTK_GDMA_ICS_EN BIT(22)
|
|
#define MTK_GDMA_TCS_EN BIT(21)
|
|
#define MTK_GDMA_UCS_EN BIT(20)
|
|
+#define MTK_GDMA_TO_PDMA 0x0
|
|
|
|
/* Unicast Filter MAC Address Register - Low */
|
|
#define MTK_GDMA_MAC_ADRL(x) (0x508 + (x * 0x1000))
|