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

Commit 3d9017d9 authored by Thomas Petazzoni's avatar Thomas Petazzoni Committed by David S. Miller
Browse files

net: mvpp2: adapt mvpp2_defaults_set() to PPv2.2 



This commit modifies the mvpp2_defaults_set() function to not do the
loopback and FIFO threshold initialization, which are not needed for
PPv2.2.

Signed-off-by: default avatarThomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 5eac892a

drivers/net/ethernet/marvell/mvpp2.c

+12 −10
Original line number Diff line number Diff line
@@ -4157,6 +4157,7 @@ static void mvpp2_defaults_set(struct mvpp2_port *port) 
{

	int tx_port_num, val, queue, ptxq, lrxq;



	if (port->priv->hw_version == MVPP21) {

		/* Configure port to loopback if needed */

		if (port->flags & MVPP2_F_LOOPBACK)

			mvpp2_port_loopback_set(port);
@@ -4167,6 +4168,7 @@ static void mvpp2_defaults_set(struct mvpp2_port *port) 
		/* Min. TX threshold must be less than minimal packet length */

		val |= MVPP2_GMAC_TX_FIFO_MIN_TH_MASK(64 - 4 - 2);

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

	}



	/* Disable Legacy WRR, Disable EJP, Release from reset */

	tx_port_num = mvpp2_egress_port(port);