Skip to content

Commit 445521c

Browse files
committed
1 parent ddbe48a commit 445521c

2 files changed

Lines changed: 9 additions & 9 deletions

File tree

drivers/net/ethernet/mediatek/mtk_eth_soc.c

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -3156,12 +3156,6 @@ static int mtk_hwlro_rx_init(struct mtk_eth *eth)
31563156
MTK_RX_CFG_SDL_OFFSET), reg_map->pdma.rx_cfg);
31573157

31583158
lro_ctrl_dw0 |= MTK_PDMA_LRO_SDL << MTK_CTRL_DW0_SDL_OFFSET;
3159-
3160-
/* enable cpu reason black list */
3161-
lro_ctrl_dw0 |= MTK_LRO_CRSN_BNW(eth);
3162-
3163-
/* no use PPE cpu reason */
3164-
mtk_w32(eth, 0xffffffff, MTK_PDMA_LRO_CTRL_DW1(reg_map));
31653159
} else {
31663160
/* set HW LRO mode & the max aggregation count for rx packets */
31673161
lro_ctrl_dw3 |= MTK_ADMA_MODE | (MTK_HW_LRO_MAX_AGG_CNT & 0xff);
@@ -3173,9 +3167,15 @@ static int mtk_hwlro_rx_init(struct mtk_eth *eth)
31733167
/* enable HW LRO */
31743168
lro_ctrl_dw0 |= MTK_LRO_EN;
31753169

3170+
/* enable cpu reason black list */
3171+
lro_ctrl_dw0 |= MTK_LRO_CRSN_BNW(eth);
3172+
31763173
mtk_w32(eth, lro_ctrl_dw3, MTK_PDMA_LRO_CTRL_DW3(reg_map));
31773174
mtk_w32(eth, lro_ctrl_dw0, MTK_PDMA_LRO_CTRL_DW0(reg_map));
31783175

3176+
/* no use PPE cpu reason */
3177+
mtk_w32(eth, 0xffffffff, MTK_PDMA_LRO_CTRL_DW1(reg_map));
3178+
31793179
if (mtk_is_netsys_v2_or_greater(eth)) {
31803180
i = (soc->rx.desc_size == sizeof(struct mtk_rx_dma_v2)) ? 1 : 0;
31813181
mtk_m32(eth, MTK_RX_DONE_INT(eth, MTK_HW_LRO_RING(eth, i)),
@@ -6677,7 +6677,7 @@ static const struct mtk_soc_data mt7981_data = {
66776677
},
66786678
.rx = {
66796679
.desc_size = sizeof(struct mtk_rx_dma),
6680-
.dma_l4_valid = RX_DMA_L4_VALID_V2,
6680+
.dma_l4_valid = RX_DMA_L4_VALID,
66816681
.dma_max_len = MTK_TX_DMA_BUF_LEN,
66826682
.dma_len_offset = 16,
66836683
.dma_size = MTK_DMA_SIZE(2K),
@@ -6707,7 +6707,7 @@ static const struct mtk_soc_data mt7986_data = {
67076707
},
67086708
.rx = {
67096709
.desc_size = sizeof(struct mtk_rx_dma),
6710-
.dma_l4_valid = RX_DMA_L4_VALID_V2,
6710+
.dma_l4_valid = RX_DMA_L4_VALID,
67116711
.dma_max_len = MTK_TX_DMA_BUF_LEN,
67126712
.dma_len_offset = 16,
67136713
.dma_size = MTK_DMA_SIZE(2K),

drivers/net/ethernet/mediatek/mtk_eth_soc.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1328,7 +1328,7 @@ enum mkt_eth_capabilities {
13281328

13291329
#define MT7986_CAPS (MTK_GMAC1_SGMII | MTK_GMAC2_SGMII | \
13301330
MTK_MUX_GMAC12_TO_GEPHY_SGMII | MTK_QDMA | \
1331-
MTK_RSTCTRL_PPE1 | MTK_SRAM | MTK_PDMA_INT | MTK_RSS)
1331+
MTK_RSTCTRL_PPE1 | MTK_SRAM | MTK_PDMA_INT | MTK_HWLRO)
13321332

13331333
#define MT7987_CAPS (MTK_36BIT_DMA | MTK_GMAC1_SGMII | \
13341334
MTK_GMAC2_2P5GPHY_V2 | MTK_GMAC2_SGMII | MTK_GMAC3_SGMII | \

0 commit comments

Comments
 (0)