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

Commit e0122ea1 authored by Greg Kroah-Hartman's avatar Greg Kroah-Hartman
Browse files

Revert "net: mvpp2: disable force link UP during port init procedure" 

This reverts commit f595e44b which is
commit 87508224485323ce2d4e7fb929ec80f51adcc238 upstream.

It causes reported problems so should be removed.

Link: https://lore.kernel.org/r/YZv1SBrYTXmorcLJ@shell.armlinux.org.uk


Reported-by: default avatarJordan Vrtanoski <jordan.vrtanoski@gmail.com>
Reported-by: default avatarRussell King <linux@armlinux.org.uk>
Cc: Stefan Chulski <stefanc@marvell.com>
Cc: Marcin Wojtas <mw@semihalf.com>
Cc: Jakub Kicinski <kuba@kernel.org>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 4efa2509

drivers/net/ethernet/marvell/mvpp2/mvpp2_main.c

+1 −13
Original line number Diff line number Diff line
@@ -4545,7 +4545,7 @@ static int mvpp2_port_init(struct mvpp2_port *port) 
	struct mvpp2 *priv = port->priv;

	struct mvpp2_txq_pcpu *txq_pcpu;

	unsigned int thread;

	int queue, err, val;

	int queue, err;



	/* Checks for hardware constraints */

	if (port->first_rxq + port->nrxqs >
@@ -4559,18 +4559,6 @@ static int mvpp2_port_init(struct mvpp2_port *port) 
	mvpp2_egress_disable(port);

	mvpp2_port_disable(port);



	if (mvpp2_is_xlg(port->phy_interface)) {

		val = readl(port->base + MVPP22_XLG_CTRL0_REG);

		val &= ~MVPP22_XLG_CTRL0_FORCE_LINK_PASS;

		val |= MVPP22_XLG_CTRL0_FORCE_LINK_DOWN;

		writel(val, port->base + MVPP22_XLG_CTRL0_REG);

	} else {

		val = readl(port->base + MVPP2_GMAC_AUTONEG_CONFIG);

		val &= ~MVPP2_GMAC_FORCE_LINK_PASS;

		val |= MVPP2_GMAC_FORCE_LINK_DOWN;

		writel(val, port->base + MVPP2_GMAC_AUTONEG_CONFIG);

	}



	port->tx_time_coal = MVPP2_TXDONE_COAL_USEC;



	port->txqs = devm_kcalloc(dev, port->ntxqs, sizeof(*port->txqs),