Commit 40da0c32 authored Jul 13, 2023 by Russell King (Oracle) Committed by David S. Miller Jul 14, 2023

net: dsa: mv88e6xxx: remove handling for DSA and CPU ports



As we now always use a fixed-link for DSA and CPU ports, we no longer
need the hack in the Marvell code to make this work. Remove it.

This is especially important with the conversion of DSA drivers to
phylink_pcs, as the PCS code only gets called if we are using
phylink for the port.

Signed-off-by: Russell King (Oracle) <rmk+kernel@armlinux.org.uk>
Signed-off-by: David S. Miller <davem@davemloft.net>

parent e6a45700

drivers/net/dsa/mv88e6xxx/chip.c

+5 −43

Original line number	Diff line number	Diff line
		@@ -3315,56 +3315,17 @@ static int mv88e6xxx_setup_port(struct mv88e6xxx_chip *chip, int port)
		{
		struct device_node *phy_handle = NULL;
		struct dsa_switch *ds = chip->ds;
		phy_interface_t mode;
		struct dsa_port *dp;
		int tx_amp, speed;
		int tx_amp;
		int err;
		u16 reg;

		chip->ports[port].chip = chip;
		chip->ports[port].port = port;

		dp = dsa_to_port(ds, port);

		/* MAC Forcing register: don't force link, speed, duplex or flow control
		* state to any particular values on physical ports, but force the CPU
		* port and all DSA ports to their maximum bandwidth and full duplex.
		*/
		if (dsa_is_cpu_port(ds, port) \|\| dsa_is_dsa_port(ds, port)) {
		struct phylink_config pl_config = {};
		unsigned long caps;

		chip->info->ops->phylink_get_caps(chip, port, &pl_config);

		caps = pl_config.mac_capabilities;

		if (chip->info->ops->port_max_speed_mode)
		mode = chip->info->ops->port_max_speed_mode(chip, port);
		else
		mode = PHY_INTERFACE_MODE_NA;

		if (caps & MAC_10000FD)
		speed = SPEED_10000;
		else if (caps & MAC_5000FD)
		speed = SPEED_5000;
		else if (caps & MAC_2500FD)
		speed = SPEED_2500;
		else if (caps & MAC_1000)
		speed = SPEED_1000;
		else if (caps & MAC_100)
		speed = SPEED_100;
		else
		speed = SPEED_10;

		err = mv88e6xxx_port_setup_mac(chip, port, LINK_FORCED_UP,
		speed, DUPLEX_FULL,
		PAUSE_OFF, mode);
		} else {
		err = mv88e6xxx_port_setup_mac(chip, port, LINK_UNFORCED,
		SPEED_UNFORCED, DUPLEX_UNFORCED,
		PAUSE_ON,
		PHY_INTERFACE_MODE_NA);
		}
		PAUSE_ON, PHY_INTERFACE_MODE_NA);
		if (err)
		return err;

		@@ -3541,6 +3502,7 @@ static int mv88e6xxx_setup_port(struct mv88e6xxx_chip *chip, int port)
		}

		if (chip->info->ops->serdes_set_tx_amplitude) {
		dp = dsa_to_port(ds, port);
		if (dp)
		phy_handle = of_parse_phandle(dp->dn, "phy-handle", 0);