net: mvpp2: do not disable GMAC padding
commitpull/10/heade749aca84b
upstream. Short fragmented packets may never be sent by the hardware when padding is disabled. This patch stop modifying the GMAC padding bits, to leave them to their reset value (disabled). Fixes:3919357fb0
("net: mvpp2: initialize the GMAC when using a port") Signed-off-by: Yan Markman <ymarkman@marvell.com> [Antoine: commit message] Signed-off-by: Antoine Tenart <antoine.tenart@free-electrons.com> Signed-off-by: David S. Miller <davem@davemloft.net> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
parent
3abb4c1103
commit
0c2870761e
|
@ -4552,11 +4552,6 @@ static void mvpp2_port_mii_gmac_configure_mode(struct mvpp2_port *port)
|
|||
MVPP22_CTRL4_QSGMII_BYPASS_ACTIVE;
|
||||
val &= ~MVPP22_CTRL4_EXT_PIN_GMII_SEL;
|
||||
writel(val, port->base + MVPP22_GMAC_CTRL_4_REG);
|
||||
|
||||
val = readl(port->base + MVPP2_GMAC_CTRL_2_REG);
|
||||
val |= MVPP2_GMAC_DISABLE_PADDING;
|
||||
val &= ~MVPP2_GMAC_FLOW_CTRL_MASK;
|
||||
writel(val, port->base + MVPP2_GMAC_CTRL_2_REG);
|
||||
} else if (phy_interface_mode_is_rgmii(port->phy_interface)) {
|
||||
val = readl(port->base + MVPP22_GMAC_CTRL_4_REG);
|
||||
val |= MVPP22_CTRL4_EXT_PIN_GMII_SEL |
|
||||
|
@ -4564,10 +4559,6 @@ static void mvpp2_port_mii_gmac_configure_mode(struct mvpp2_port *port)
|
|||
MVPP22_CTRL4_QSGMII_BYPASS_ACTIVE;
|
||||
val &= ~MVPP22_CTRL4_DP_CLK_SEL;
|
||||
writel(val, port->base + MVPP22_GMAC_CTRL_4_REG);
|
||||
|
||||
val = readl(port->base + MVPP2_GMAC_CTRL_2_REG);
|
||||
val &= ~MVPP2_GMAC_DISABLE_PADDING;
|
||||
writel(val, port->base + MVPP2_GMAC_CTRL_2_REG);
|
||||
}
|
||||
|
||||
/* The port is connected to a copper PHY */
|
||||
|
|
Loading…
Reference in New Issue