Commit 46efe4ef authored by Vladimir Oltean's avatar Vladimir Oltean Committed by David S. Miller
Browse files

net: dsa: felix: stop calling ocelot_port_{enable,disable} 



ocelot_port_enable touches ANA_PORT_PORT_CFG, which has the following
fields:

- LOCKED_PORTMOVE_CPU, LEARNDROP, LEARNCPU, LEARNAUTO, RECV_ENA, all of
  which are written with their hardware default values, also runtime
  invariants. So it makes no sense to write these during every .ndo_open.

- PORTID_VAL: this field has an out-of-reset value of zero for all ports
  and must be initialized by software. Additionally, the
  ocelot_setup_logical_port_ids() code path sets up different logical
  port IDs for the ports in a hardware LAG, and we absolutely don't want
  .ndo_open to interfere there and reset those values.

So in fact the write from ocelot_port_enable can better be moved to
ocelot_init_port, and the .ndo_open hook deleted.

ocelot_port_disable touches DEV_MAC_ENA_CFG and QSYS_SWITCH_PORT_MODE_PORT_ENA,
in an attempt to undo what ocelot_adjust_link did. But since .ndo_stop
does not get called each time the link falls (i.e. this isn't a
substitute for .phylink_mac_link_down), felix already does better at
this by writing those registers already in felix_phylink_mac_link_down.

So keep ocelot_port_disable (for now, until ocelot is converted to
phylink too), and just delete the felix call to it, which is not
necessary.

Signed-off-by: default avatarVladimir Oltean <vladimir.oltean@nxp.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent e871ee69

drivers/net/dsa/ocelot/felix.c

+0 −19
Original line number Diff line number Diff line
@@ -796,23 +796,6 @@ static int felix_vlan_del(struct dsa_switch *ds, int port, 
	return ocelot_vlan_del(ocelot, port, vlan->vid);

}



static int felix_port_enable(struct dsa_switch *ds, int port,

			     struct phy_device *phy)

{

	struct ocelot *ocelot = ds->priv;



	ocelot_port_enable(ocelot, port, phy);



	return 0;

}



static void felix_port_disable(struct dsa_switch *ds, int port)

{

	struct ocelot *ocelot = ds->priv;



	return ocelot_port_disable(ocelot, port);

}



static void felix_phylink_validate(struct dsa_switch *ds, int port,

				   unsigned long *supported,

				   struct phylink_link_state *state)
@@ -1615,8 +1598,6 @@ const struct dsa_switch_ops felix_switch_ops = { 
	.phylink_mac_config		= felix_phylink_mac_config,

	.phylink_mac_link_down		= felix_phylink_mac_link_down,

	.phylink_mac_link_up		= felix_phylink_mac_link_up,

	.port_enable			= felix_port_enable,

	.port_disable			= felix_port_disable,

	.port_fdb_dump			= felix_fdb_dump,

	.port_fdb_add			= felix_fdb_add,

	.port_fdb_del			= felix_fdb_del,

drivers/net/ethernet/mscc/ocelot.c

+9 −13
Original line number Diff line number Diff line
@@ -514,19 +514,6 @@ void ocelot_adjust_link(struct ocelot *ocelot, int port, 
}

EXPORT_SYMBOL(ocelot_adjust_link);



void ocelot_port_enable(struct ocelot *ocelot, int port,

			struct phy_device *phy)

{

	/* Enable receiving frames on the port, and activate auto-learning of

	 * MAC addresses.

	 */

	ocelot_write_gix(ocelot, ANA_PORT_PORT_CFG_LEARNAUTO |

			 ANA_PORT_PORT_CFG_RECV_ENA |

			 ANA_PORT_PORT_CFG_PORTID_VAL(port),

			 ANA_PORT_PORT_CFG, port);

}

EXPORT_SYMBOL(ocelot_port_enable);



void ocelot_port_disable(struct ocelot *ocelot, int port)

{

	struct ocelot_port *ocelot_port = ocelot->ports[port];
@@ -1956,6 +1943,15 @@ void ocelot_init_port(struct ocelot *ocelot, int port) 
	/* Disable source address learning for standalone mode */

	ocelot_port_set_learning(ocelot, port, false);



	/* Set the port's initial logical port ID value, enable receiving

	 * frames on it, and configure the MAC address learning type to

	 * automatic.

	 */

	ocelot_write_gix(ocelot, ANA_PORT_PORT_CFG_LEARNAUTO |

			 ANA_PORT_PORT_CFG_RECV_ENA |

			 ANA_PORT_PORT_CFG_PORTID_VAL(port),

			 ANA_PORT_PORT_CFG, port);



	/* Enable vcap lookups */

	ocelot_vcap_enable(ocelot, port);

}

drivers/net/ethernet/mscc/ocelot_net.c

+0 −4
Original line number Diff line number Diff line
@@ -449,8 +449,6 @@ static int ocelot_port_open(struct net_device *dev) 
{

	struct ocelot_port_private *priv = netdev_priv(dev);

	struct ocelot_port *ocelot_port = &priv->port;

	struct ocelot *ocelot = ocelot_port->ocelot;

	int port = priv->chip_port;

	int err;



	if (priv->serdes) {
@@ -474,8 +472,6 @@ static int ocelot_port_open(struct net_device *dev) 
	phy_attached_info(priv->phy);

	phy_start(priv->phy);



	ocelot_port_enable(ocelot, port, priv->phy);



	return 0;

}

include/soc/mscc/ocelot.h

+0 −2
Original line number Diff line number Diff line
@@ -798,8 +798,6 @@ void ocelot_init_port(struct ocelot *ocelot, int port); 
void ocelot_deinit_port(struct ocelot *ocelot, int port);



/* DSA callbacks */

void ocelot_port_enable(struct ocelot *ocelot, int port,

			struct phy_device *phy);

void ocelot_port_disable(struct ocelot *ocelot, int port);

void ocelot_get_strings(struct ocelot *ocelot, int port, u32 sset, u8 *data);

void ocelot_get_ethtool_stats(struct ocelot *ocelot, int port, u64 *data);