Commit fd580c98 authored by Russell King's avatar Russell King Committed by David S. Miller
Browse files

net: sfp: augment SFP parsing with phy_interface_t bitmap 



We currently parse the SFP EEPROM to a bitmap of ethtool link modes,
and then attempt to convert the link modes to a PHY interface mode.
While this works at present, there are cases where this is sub-optimal.
For example, where a module can operate with several different PHY
interface modes.

To start addressing this, arrange for the SFP EEPROM parsing to also
provide a bitmap of the possible PHY interface modes.

Signed-off-by: default avatarRussell King <rmk+kernel@armlinux.org.uk>
Signed-off-by: default avatarMarek Behún <kabel@kernel.org>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 1645f44d

drivers/net/phy/at803x.c

+2 −1
Original line number Diff line number Diff line
@@ -676,6 +676,7 @@ static int at803x_sfp_insert(void *upstream, const struct sfp_eeprom_id *id) 
	struct phy_device *phydev = upstream;

	__ETHTOOL_DECLARE_LINK_MODE_MASK(phy_support);

	__ETHTOOL_DECLARE_LINK_MODE_MASK(sfp_support);

	DECLARE_PHY_INTERFACE_MASK(interfaces);

	phy_interface_t iface;



	linkmode_zero(phy_support);
@@ -686,7 +687,7 @@ static int at803x_sfp_insert(void *upstream, const struct sfp_eeprom_id *id) 
	phylink_set(phy_support, Asym_Pause);



	linkmode_zero(sfp_support);

	sfp_parse_support(phydev->sfp_bus, id, sfp_support);

	sfp_parse_support(phydev->sfp_bus, id, sfp_support, interfaces);

	/* Some modules support 10G modes as well as others we support.

	 * Mask out non-supported modes so the correct interface is picked.

	 */

drivers/net/phy/marvell-88x2222.c

+2 −1
Original line number Diff line number Diff line
@@ -478,6 +478,7 @@ static int mv2222_config_init(struct phy_device *phydev) 


static int mv2222_sfp_insert(void *upstream, const struct sfp_eeprom_id *id)

{

	DECLARE_PHY_INTERFACE_MASK(interfaces);

	struct phy_device *phydev = upstream;

	phy_interface_t sfp_interface;

	struct mv2222_data *priv;
@@ -489,7 +490,7 @@ static int mv2222_sfp_insert(void *upstream, const struct sfp_eeprom_id *id) 
	priv = (struct mv2222_data *)phydev->priv;

	dev = &phydev->mdio.dev;



	sfp_parse_support(phydev->sfp_bus, id, sfp_supported);

	sfp_parse_support(phydev->sfp_bus, id, sfp_supported, interfaces);

	phydev->port = sfp_parse_port(phydev->sfp_bus, id, sfp_supported);

	sfp_interface = sfp_select_interface(phydev->sfp_bus, sfp_supported);

drivers/net/phy/marvell.c

+2 −1
Original line number Diff line number Diff line
@@ -2845,6 +2845,7 @@ static int marvell_probe(struct phy_device *phydev) 


static int m88e1510_sfp_insert(void *upstream, const struct sfp_eeprom_id *id)

{

	DECLARE_PHY_INTERFACE_MASK(interfaces);

	struct phy_device *phydev = upstream;

	phy_interface_t interface;

	struct device *dev;
@@ -2856,7 +2857,7 @@ static int m88e1510_sfp_insert(void *upstream, const struct sfp_eeprom_id *id) 


	dev = &phydev->mdio.dev;



	sfp_parse_support(phydev->sfp_bus, id, supported);

	sfp_parse_support(phydev->sfp_bus, id, supported, interfaces);

	interface = sfp_select_interface(phydev->sfp_bus, supported);



	dev_info(dev, "%s SFP module inserted\n", phy_modes(interface));

drivers/net/phy/marvell10g.c

+2 −1
Original line number Diff line number Diff line
@@ -466,9 +466,10 @@ static int mv3310_sfp_insert(void *upstream, const struct sfp_eeprom_id *id) 
{

	struct phy_device *phydev = upstream;

	__ETHTOOL_DECLARE_LINK_MODE_MASK(support) = { 0, };

	DECLARE_PHY_INTERFACE_MASK(interfaces);

	phy_interface_t iface;



	sfp_parse_support(phydev->sfp_bus, id, support);

	sfp_parse_support(phydev->sfp_bus, id, support, interfaces);

	iface = sfp_select_interface(phydev->sfp_bus, support);



	if (iface != PHY_INTERFACE_MODE_10GBASER) {

drivers/net/phy/phylink.c

+3 −1
Original line number Diff line number Diff line
@@ -77,6 +77,7 @@ struct phylink { 


	struct sfp_bus *sfp_bus;

	bool sfp_may_have_phy;

	DECLARE_PHY_INTERFACE_MASK(sfp_interfaces);

	__ETHTOOL_DECLARE_LINK_MODE_MASK(sfp_support);

	u8 sfp_port;

};
@@ -2898,7 +2899,8 @@ static int phylink_sfp_module_insert(void *upstream, 
	ASSERT_RTNL();



	linkmode_zero(support);

	sfp_parse_support(pl->sfp_bus, id, support);

	phy_interface_zero(pl->sfp_interfaces);

	sfp_parse_support(pl->sfp_bus, id, support, pl->sfp_interfaces);

	pl->sfp_port = sfp_parse_port(pl->sfp_bus, id, support);



	/* If this module may have a PHY connecting later, defer until later */