Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

net: mvpp2: fix the packet size configuration for 10G

The MVPP22_XLG_CTRL1_FRAMESIZELIMIT define is used as an offset, but is
defined as BIT(0). Updated its name to contains "OFFS" as in offset and
fix its value using the offset value, 0.

Reported-by: Stefan Chulski <stefanc@marvell.com>
Signed-off-by: Antoine Tenart <antoine.tenart@free-electrons.com>
Fixes: 76eb1b1de5b6 ("net: mvpp2: set maximum packet size for 10G ports")
Signed-off-by: David S. Miller <davem@davemloft.net>

authored by

Antoine Ténart and committed by
David S. Miller
ec15ecde 49107fcb

+2 -2
+2 -2
drivers/net/ethernet/marvell/mvpp2.c
··· 367 367 #define MVPP22_XLG_CTRL0_RX_FLOW_CTRL_EN BIT(7) 368 368 #define MVPP22_XLG_CTRL0_MIB_CNT_DIS BIT(14) 369 369 #define MVPP22_XLG_CTRL1_REG 0x104 370 - #define MVPP22_XLG_CTRL1_FRAMESIZELIMIT BIT(0) 370 + #define MVPP22_XLG_CTRL1_FRAMESIZELIMIT_OFFS 0 371 371 #define MVPP22_XLG_CTRL1_FRAMESIZELIMIT_MASK 0x1fff 372 372 #define MVPP22_XLG_CTRL3_REG 0x11c 373 373 #define MVPP22_XLG_CTRL3_MACMODESELECT_MASK (7 << 13) ··· 4669 4669 val = readl(port->base + MVPP22_XLG_CTRL1_REG); 4670 4670 val &= ~MVPP22_XLG_CTRL1_FRAMESIZELIMIT_MASK; 4671 4671 val |= ((port->pkt_size - MVPP2_MH_SIZE) / 2) << 4672 - MVPP22_XLG_CTRL1_FRAMESIZELIMIT; 4672 + MVPP22_XLG_CTRL1_FRAMESIZELIMIT_OFFS; 4673 4673 writel(val, port->base + MVPP22_XLG_CTRL1_REG); 4674 4674 } 4675 4675