Commit 14b517cb authored by Vladimir Oltean's avatar Vladimir Oltean Committed by David S. Miller
Browse files

net: pcs: xpcs: export xpcs_config_eee 



There is no good reason why we need to go through:

stmmac_xpcs_config_eee
-> stmmac_do_callback
   -> mdio_xpcs_ops->config_eee
      -> xpcs_config_eee

when we can simply call xpcs_config_eee.

priv->hw->xpcs is of the type "const struct mdio_xpcs_ops *" and is used
as a placeholder/synonym for priv->plat->mdio_bus_data->has_xpcs. It is
done that way because the mdio_bus_data pointer might or might not be
populated in all stmmac instantiations.

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

drivers/net/ethernet/stmicro/stmmac/hwif.h

+0 −2
Original line number Diff line number Diff line
@@ -622,8 +622,6 @@ struct stmmac_mmc_ops { 
	stmmac_do_callback(__priv, xpcs, link_up, __args)

#define stmmac_xpcs_probe(__priv, __args...) \

	stmmac_do_callback(__priv, xpcs, probe, __args)

#define stmmac_xpcs_config_eee(__priv, __args...) \

	stmmac_do_callback(__priv, xpcs, config_eee, __args)



struct stmmac_regs_off {

	u32 ptp_off;

drivers/net/ethernet/stmicro/stmmac/stmmac_ethtool.c

+7 −5
Original line number Diff line number Diff line
@@ -720,11 +720,13 @@ static int stmmac_ethtool_op_set_eee(struct net_device *dev, 
		netdev_warn(priv->dev,

			    "Setting EEE tx-lpi is not supported\n");



	ret = stmmac_xpcs_config_eee(priv, &priv->hw->xpcs_args,

	if (priv->hw->xpcs) {

		ret = xpcs_config_eee(&priv->hw->xpcs_args,

				      priv->plat->mult_fact_100ns,

				      edata->eee_enabled);

		if (ret)

			return ret;

	}



	if (!edata->eee_enabled)

		stmmac_disable_eee_mode(priv);

drivers/net/pcs/pcs-xpcs.c

+3 −3
Original line number Diff line number Diff line
@@ -715,7 +715,7 @@ void xpcs_validate(struct mdio_xpcs_args *xpcs, unsigned long *supported, 
}

EXPORT_SYMBOL_GPL(xpcs_validate);



static int xpcs_config_eee(struct mdio_xpcs_args *xpcs, int mult_fact_100ns,

int xpcs_config_eee(struct mdio_xpcs_args *xpcs, int mult_fact_100ns,

		    int enable)

{

	int ret;
@@ -747,6 +747,7 @@ static int xpcs_config_eee(struct mdio_xpcs_args *xpcs, int mult_fact_100ns, 
	ret |= DW_VR_MII_EEE_TRN_LPI;

	return xpcs_write(xpcs, MDIO_MMD_VEND2, DW_VR_MII_EEE_MCTRL1, ret);

}

EXPORT_SYMBOL_GPL(xpcs_config_eee);



static int xpcs_config_aneg_c37_sgmii(struct mdio_xpcs_args *xpcs)

{
@@ -1033,7 +1034,6 @@ static struct mdio_xpcs_ops xpcs_ops = { 
	.get_state = xpcs_get_state,

	.link_up = xpcs_link_up,

	.probe = xpcs_probe,

	.config_eee = xpcs_config_eee,

};



struct mdio_xpcs_ops *mdio_xpcs_get_ops(void)

include/linux/pcs/pcs-xpcs.h

+2 −2
Original line number Diff line number Diff line
@@ -30,13 +30,13 @@ struct mdio_xpcs_ops { 
	int (*link_up)(struct mdio_xpcs_args *xpcs, int speed,

		       phy_interface_t interface);

	int (*probe)(struct mdio_xpcs_args *xpcs, phy_interface_t interface);

	int (*config_eee)(struct mdio_xpcs_args *xpcs, int mult_fact_100ns,

			  int enable);

};



int xpcs_get_an_mode(struct mdio_xpcs_args *xpcs, phy_interface_t interface);

struct mdio_xpcs_ops *mdio_xpcs_get_ops(void);

void xpcs_validate(struct mdio_xpcs_args *xpcs, unsigned long *supported,

		   struct phylink_link_state *state);

int xpcs_config_eee(struct mdio_xpcs_args *xpcs, int mult_fact_100ns,

		    int enable);



#endif /* __LINUX_PCS_XPCS_H */