From patchwork Mon Nov 16 11:15:08 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Marek_Beh=C3=BAn?= X-Patchwork-Id: 11908347 X-Patchwork-Delegate: kuba@kernel.org Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-13.1 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,INCLUDES_PATCH,MAILING_LIST_MULTI, SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id B3405C83035 for ; Mon, 16 Nov 2020 12:37:46 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 7772120855 for ; Mon, 16 Nov 2020 12:37:46 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (1024-bit key) header.d=kernel.org header.i=@kernel.org header.b="nRiVtjWf" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729544AbgKPLPY (ORCPT ); Mon, 16 Nov 2020 06:15:24 -0500 Received: from mail.kernel.org ([198.145.29.99]:55526 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726353AbgKPLPX (ORCPT ); Mon, 16 Nov 2020 06:15:23 -0500 Received: from dellmb.labs.office.nic.cz (nat-1.nic.cz [217.31.205.1]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 1043422409; Mon, 16 Nov 2020 11:15:21 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1605525323; bh=3DMmJq3u2+Mh3SQzxFn535kPTLi2pH12gIlw9NO36Wg=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=nRiVtjWfHp+ccBkn8TbjOgATmac+H7rltNa5zGvz2UFqXFis6hxFu6TckiyvU7qYV SWLhvzDD5emJr6I9h3Ysn1/z4rs0F+42BZwkT/eKGqfbGwCk0KP2I/9RntH0fpDt94 kdD3ONVVuWawT5NtNs2lXT9Ldi2MtKJB390CZL04= From: =?utf-8?q?Marek_Beh=C3=BAn?= To: Russell King , netdev@vger.kernel.org, davem@davemloft.net, Jakub Kicinski Cc: =?utf-8?q?Marek_Beh=C3=BAn?= , Andrew Lunn Subject: [PATCH net-next v3 2/5] net: phylink: allow attaching phy for SFP modules on 802.3z mode Date: Mon, 16 Nov 2020 12:15:08 +0100 Message-Id: <20201116111511.5061-3-kabel@kernel.org> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20201116111511.5061-1-kabel@kernel.org> References: <20201116111511.5061-1-kabel@kernel.org> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org X-Patchwork-Delegate: kuba@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 Reviewed-by: Russell King Cc: Andrew Lunn --- drivers/net/phy/phylink.c | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/drivers/net/phy/phylink.c b/drivers/net/phy/phylink.c index 5d8c015bc9f2..705c49c37348 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) @@ -2069,9 +2069,6 @@ static int phylink_sfp_config(struct phylink *pl, u8 mode, phylink_an_mode_str(mode), phy_modes(config.interface), __ETHTOOL_LINK_MODE_MASK_NBITS, support); - if (phy_interface_mode_is_8023z(iface) && pl->phydev) - return -EINVAL; - changed = !linkmode_equal(pl->supported, support); if (changed) { linkmode_copy(pl->supported, support);