diff options
| author |   Marek Behún <kabel@kernel.org> | 2022-09-30 16:21:06 +0200 |
|---|---|---|
| committer |   David S. Miller <davem@davemloft.net> | 2022-10-03 11:08:33 +0100 |
| commit | 31eb8907aa5b9e9be1a63f2ac574973715172ab4 (patch) | |
| tree | 4d33ec4bdd80d76ad6efd1408d015dc76017ec5f /drivers/net/phy | |
| parent | net: phy: marvell10g: select host interface configuration (diff) | |
| download | linux-dev-31eb8907aa5b9e9be1a63f2ac574973715172ab4.tar.xz linux-dev-31eb8907aa5b9e9be1a63f2ac574973715172ab4.zip | |
net: phylink: allow attaching phy for SFP modules on 802.3z mode
Some SFPs may contain an internal PHY which may in some cases want to
connect with the host interface in 1000base-x/2500base-x mode.
Do not fail if such PHY is being attached in one of these PHY interface
modes.
Signed-off-by: Marek Behún <kabel@kernel.org>
Reviewed-by: Russell King <rmk+kernel@armlinux.org.uk>
Reviewed-by: Pali Rohár <pali@kernel.org>
Cc: Andrew Lunn <andrew@lunn.ch>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/phy')
| -rw-r--r-- | drivers/net/phy/phylink.c | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/drivers/net/phy/phylink.c b/drivers/net/phy/phylink.c index 9ff8eb516666..75464df191ef 100644 --- a/drivers/net/phy/phylink.c +++ b/drivers/net/phy/phylink.c @@ -1669,7 +1669,7 @@ static int phylink_attach_phy(struct phylink *pl, struct phy_device *phy, { if (WARN_ON(pl->cfg_link_an_mode == MLO_AN_FIXED || (pl->cfg_link_an_mode == MLO_AN_INBAND && - phy_interface_mode_is_8023z(interface)))) + phy_interface_mode_is_8023z(interface) && !pl->sfp_bus))) return -EINVAL; if (pl->phydev) @@ -2918,9 +2918,6 @@ static int phylink_sfp_config_phy(struct phylink *pl, u8 mode, return ret; } - if (phy_interface_mode_is_8023z(iface) && pl->phydev) - return -EINVAL; - pl->link_port = pl->sfp_port; phylink_sfp_set_config(pl, mode, support, &config); |