[PATCH RFC russell-king 4/4] net: phylink: don't fail attaching phy on 1000base-x/2500base-x mode

From: "Marek Behún" <marek.behun@nic.cz>
To: Russell King <rmk+kernel@armlinux.org.uk>
Cc: "Andrew Lunn" <andrew@lunn.ch>,
	"Maxime Chevallier" <maxime.chevallier@bootlin.com>,
	"Baruch Siach" <baruch@tkos.co.il>,
	"Chris Healy" <cphealy@gmail.com>,
	"Florian Fainelli" <f.fainelli@gmail.com>,
	netdev@vger.kernel.org, "Marek Behún" <marek.behun@nic.cz>
Subject: [PATCH RFC russell-king 4/4] net: phylink: don't fail attaching phy on 1000base-x/2500base-x mode
Date: Tue, 11 Aug 2020 00:06:45 +0200	[thread overview]
Message-ID: <20200810220645.19326-5-marek.behun@nic.cz> (raw)
In-Reply-To: <20200810220645.19326-1-marek.behun@nic.cz>

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 <marek.behun@nic.cz>
---
 drivers/net/phy/phylink.c | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/drivers/net/phy/phylink.c b/drivers/net/phy/phylink.c
index 83e14176baba1..e20f6770b5c4b 100644
--- a/drivers/net/phy/phylink.c
+++ b/drivers/net/phy/phylink.c
@@ -1015,9 +1015,7 @@ static int phylink_bringup_phy(struct phylink *pl, struct phy_device *phy,
 static int phylink_attach_phy(struct phylink *pl, struct phy_device *phy,
 			      phy_interface_t interface)
 {
-	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))))
+	if (WARN_ON(pl->cfg_link_an_mode == MLO_AN_FIXED))
 		return -EINVAL;
 
 	if (pl->phydev)
-- 
2.26.2

