From: "Marek Behún" <kabel@kernel•org>
To: netdev@vger•kernel.org
Cc: davem@davemloft•net, "Marek Behún" <kabel@kernel•org>,
"Andrew Lunn" <andrew@lunn•ch>,
"Russell King" <rmk+kernel@armlinux•org.uk>
Subject: [PATCH net-next 2/5] net: phylink: allow attaching phy for SFP modules on 802.3z mode
Date: Wed, 28 Oct 2020 23:14:24 +0100 [thread overview]
Message-ID: <20201028221427.22968-3-kabel@kernel.org> (raw)
In-Reply-To: <20201028221427.22968-1-kabel@kernel.org>
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>
Cc: Andrew Lunn <andrew@lunn•ch>
Cc: Russell King <rmk+kernel@armlinux•org.uk>
---
drivers/net/phy/phylink.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/drivers/net/phy/phylink.c b/drivers/net/phy/phylink.c
index 5d8c015bc9f2..52954f12ca5e 100644
--- a/drivers/net/phy/phylink.c
+++ b/drivers/net/phy/phylink.c
@@ -1018,7 +1018,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)
--
2.26.2
next prev parent reply other threads:[~2020-10-28 22:14 UTC|newest]
Thread overview: 17+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-10-28 22:14 [PATCH net-next 0/5] Support for RollBall 10G copper SFP modules Marek Behún
2020-10-28 22:14 ` [PATCH net-next 1/5] net: phy: mdio-i2c: support I2C MDIO protocol for RollBall " Marek Behún
2020-10-29 12:41 ` Russell King - ARM Linux admin
2020-10-29 12:54 ` Andrew Lunn
2020-10-29 13:41 ` Russell King - ARM Linux admin
2020-10-29 22:53 ` Jakub Kicinski
2020-10-29 22:55 ` Marek Behún
2020-10-29 16:46 ` Marek Behún
2020-10-28 22:14 ` Marek Behún [this message]
2020-10-29 12:08 ` [PATCH net-next 2/5] net: phylink: allow attaching phy for SFP modules on 802.3z mode Russell King - ARM Linux admin
2020-10-28 22:14 ` [PATCH net-next 3/5] net: sfp: configure/destroy I2C mdiobus on transceiver plug/unplug Marek Behún
2020-10-29 13:21 ` Russell King - ARM Linux admin
2020-10-28 22:14 ` [PATCH net-next 4/5] net: phy: marvell10g: change MACTYPE if underlying MAC does not support it Marek Behún
2020-10-29 13:21 ` Russell King - ARM Linux admin
2020-10-28 22:14 ` [PATCH net-next 5/5] net: sfp: add support for multigig RollBall transceivers Marek Behún
2020-10-29 13:38 ` Russell King - ARM Linux admin
2020-10-29 16:49 ` Marek Behún
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20201028221427.22968-3-kabel@kernel.org \
--to=kabel@kernel$(echo .)org \
--cc=andrew@lunn$(echo .)ch \
--cc=davem@davemloft$(echo .)net \
--cc=netdev@vger$(echo .)kernel.org \
--cc=rmk+kernel@armlinux$(echo .)org.uk \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox