Commit 6b10bfc5 authored Mar 01, 2019 by Antoine Tenart Committed by David S. Miller Mar 01, 2019

net: mvpp2: always disable both MACs when disabling a port



This patch modifies the port_disable() helper to always disable both the
GMAC and the XLG MAC when called. At boot time we do not know of a port
was enabled in the firmware/bootloader, and if so what mode was used
(hence which of the two MACs was used).

This also help in implementing a logic where all blocks are disabled
when not used, and only enabled regarding the current mode used on a
given port.

Signed-off-by: Antoine Tenart <antoine.tenart@bootlin.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

parent 9a490e34

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

+4 −4

Original line number	Diff line number	Diff line
		@@ -1213,12 +1213,12 @@ static void mvpp2_port_disable(struct mvpp2_port *port)
		/* Disable & reset should be done separately */
		val &= ~MVPP22_XLG_CTRL0_MAC_RESET_DIS;
		writel(val, port->base + MVPP22_XLG_CTRL0_REG);
		} else {
		}

		val = readl(port->base + MVPP2_GMAC_CTRL_0_REG);
		val &= ~(MVPP2_GMAC_PORT_EN_MASK);
		writel(val, port->base + MVPP2_GMAC_CTRL_0_REG);
		}
		}

		/* Set IEEE 802.3x Flow Control Xon Packet Transmission Mode */
		static void mvpp2_port_periodic_xon_disable(struct mvpp2_port *port)

Admin message