Commit ca732e99 authored by Russell King (Oracle)'s avatar Russell King (Oracle) Committed by Jakub Kicinski
Browse files

net: stmmac: add get_interfaces() platform method 



Add a get_interfaces() platform method to allow platforms to indicate
to phylink which interface modes they support - which then allows
phylink to validate on initialisation that the configured PHY interface
mode is actually supported.

Signed-off-by: default avatarRussell King (Oracle) <rmk+kernel@armlinux.org.uk>
Link: https://patch.msgid.link/E1uASLn-0021Qd-Mi@rmk-PC.armlinux.org.uk


Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
parent 1966be55

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

+13 −3
Original line number Diff line number Diff line
@@ -1283,10 +1283,20 @@ static int stmmac_phy_setup(struct stmmac_priv *priv) 
	if (mdio_bus_data)

		config->default_an_inband = mdio_bus_data->default_an_inband;



	/* Set the platform/firmware specified interface mode. Note, phylink

	 * deals with the PHY interface mode, not the MAC interface mode.

	/* Get the PHY interface modes (at the PHY end of the link) that

	 * are supported by the platform.

	 */

	__set_bit(priv->plat->phy_interface, config->supported_interfaces);

	if (priv->plat->get_interfaces)

		priv->plat->get_interfaces(priv, priv->plat->bsp_priv,

					   config->supported_interfaces);



	/* Set the platform/firmware specified interface mode if the

	 * supported interfaces have not already been provided using

	 * phy_interface as a last resort.

	 */

	if (phy_interface_empty(config->supported_interfaces))

		__set_bit(priv->plat->phy_interface,

			  config->supported_interfaces);



	/* If we have an xpcs, it defines which PHY interfaces are supported. */

	if (priv->hw->xpcs)

include/linux/stmmac.h

+2 −0
Original line number Diff line number Diff line
@@ -233,6 +233,8 @@ struct plat_stmmacenet_data { 
	u8 tx_sched_algorithm;

	struct stmmac_rxq_cfg rx_queues_cfg[MTL_MAX_RX_QUEUES];

	struct stmmac_txq_cfg tx_queues_cfg[MTL_MAX_TX_QUEUES];

	void (*get_interfaces)(struct stmmac_priv *priv, void *bsp_priv,

			       unsigned long *interfaces);

	int (*set_clk_tx_rate)(void *priv, struct clk *clk_tx_i,

			       phy_interface_t interface, int speed);

	void (*fix_mac_speed)(void *priv, int speed, unsigned int mode);