Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 0c287076 authored by Yan Markman's avatar Yan Markman Committed by Greg Kroah-Hartman
Browse files

net: mvpp2: do not disable GMAC padding 



commit e749aca84b10f3987b2ee1f76e0c7d8aacc5653c 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: 3919357f ("net: mvpp2: initialize the GMAC when using a port")
Signed-off-by: default avatarYan Markman <ymarkman@marvell.com>
[Antoine: commit message]
Signed-off-by: default avatarAntoine Tenart <antoine.tenart@free-electrons.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 3abb4c11

drivers/net/ethernet/marvell/mvpp2.c

+0 −9
Original line number Diff line number Diff line
@@ -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 */