Commit 69f7f89c authored by Colin Foster's avatar Colin Foster Committed by David S. Miller
Browse files

net: mscc: ocelot: expose generic phylink_mac_config routine 



The ocelot-switch driver can utilize the phylink_mac_config routine. Move
this to the ocelot library location and export the symbol to make this
possible.

Signed-off-by: default avatarColin Foster <colin.foster@in-advantage.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent fec53f44

drivers/net/ethernet/mscc/ocelot.c

+26 −0
Original line number Diff line number Diff line
@@ -809,6 +809,32 @@ static int ocelot_port_flush(struct ocelot *ocelot, int port) 
	return err;

}



void ocelot_phylink_mac_config(struct ocelot *ocelot, int port,

			       unsigned int link_an_mode,

			       const struct phylink_link_state *state)

{

	struct ocelot_port *ocelot_port = ocelot->ports[port];



	/* Disable HDX fast control */

	ocelot_port_writel(ocelot_port, DEV_PORT_MISC_HDX_FAST_DIS,

			   DEV_PORT_MISC);



	/* SGMII only for now */

	ocelot_port_writel(ocelot_port, PCS1G_MODE_CFG_SGMII_MODE_ENA,

			   PCS1G_MODE_CFG);

	ocelot_port_writel(ocelot_port, PCS1G_SD_CFG_SD_SEL, PCS1G_SD_CFG);



	/* Enable PCS */

	ocelot_port_writel(ocelot_port, PCS1G_CFG_PCS_ENA, PCS1G_CFG);



	/* No aneg on SGMII */

	ocelot_port_writel(ocelot_port, 0, PCS1G_ANEG_CFG);



	/* No loopback */

	ocelot_port_writel(ocelot_port, 0, PCS1G_LB_CFG);

}

EXPORT_SYMBOL_GPL(ocelot_phylink_mac_config);



void ocelot_phylink_mac_link_down(struct ocelot *ocelot, int port,

				  unsigned int link_an_mode,

				  phy_interface_t interface,

drivers/net/ethernet/mscc/ocelot_net.c

+3 −18
Original line number Diff line number Diff line
@@ -1675,25 +1675,10 @@ static void vsc7514_phylink_mac_config(struct phylink_config *config, 
{

	struct net_device *ndev = to_net_dev(config->dev);

	struct ocelot_port_private *priv = netdev_priv(ndev);

	struct ocelot_port *ocelot_port = &priv->port;



	/* Disable HDX fast control */

	ocelot_port_writel(ocelot_port, DEV_PORT_MISC_HDX_FAST_DIS,

			   DEV_PORT_MISC);



	/* SGMII only for now */

	ocelot_port_writel(ocelot_port, PCS1G_MODE_CFG_SGMII_MODE_ENA,

			   PCS1G_MODE_CFG);

	ocelot_port_writel(ocelot_port, PCS1G_SD_CFG_SD_SEL, PCS1G_SD_CFG);



	/* Enable PCS */

	ocelot_port_writel(ocelot_port, PCS1G_CFG_PCS_ENA, PCS1G_CFG);



	/* No aneg on SGMII */

	ocelot_port_writel(ocelot_port, 0, PCS1G_ANEG_CFG);

	struct ocelot *ocelot = priv->port.ocelot;

	int port = priv->port.index;



	/* No loopback */

	ocelot_port_writel(ocelot_port, 0, PCS1G_LB_CFG);

	ocelot_phylink_mac_config(ocelot, port, link_an_mode, state);

}



static void vsc7514_phylink_mac_link_down(struct phylink_config *config,

include/soc/mscc/ocelot.h

+3 −0
Original line number Diff line number Diff line
@@ -1111,6 +1111,9 @@ int ocelot_sb_occ_tc_port_bind_get(struct ocelot *ocelot, int port, 
				   enum devlink_sb_pool_type pool_type,

				   u32 *p_cur, u32 *p_max);



void ocelot_phylink_mac_config(struct ocelot *ocelot, int port,

			       unsigned int link_an_mode,

			       const struct phylink_link_state *state);

void ocelot_phylink_mac_link_down(struct ocelot *ocelot, int port,

				  unsigned int link_an_mode,

				  phy_interface_t interface,