From patchwork Sat Nov 10 22:43:37 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andrew Lunn X-Patchwork-Id: 996026 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming-netdev@ozlabs.org Delivered-To: patchwork-incoming-netdev@ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=vger.kernel.org (client-ip=209.132.180.67; helo=vger.kernel.org; envelope-from=netdev-owner@vger.kernel.org; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=lunn.ch Authentication-Results: ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=lunn.ch header.i=@lunn.ch header.b="PYH34t0d"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 42ssYN5JZ6z9sC7 for ; Sun, 11 Nov 2018 09:45:28 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727272AbeKKIcC (ORCPT ); Sun, 11 Nov 2018 03:32:02 -0500 Received: from vps0.lunn.ch ([185.16.172.187]:58330 "EHLO vps0.lunn.ch" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726082AbeKKIcC (ORCPT ); Sun, 11 Nov 2018 03:32:02 -0500 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lunn.ch; s=20171124; h=References:In-Reply-To:Message-Id:Date:Subject:Cc:To:From; bh=by2E+qKd9BfUK6i7iFUemHK4g2lrZNwHLa7GuUmCIeo=; b=PYH34t0dsW/wNol0u+rROGiKW8Vv9aN4rWLX3sH7+CT6/bM6wKYwTcXiRw2yLcNHlAZGwgoaj6eD0wgXs54qWEya0K3/JkEOqlzIB2KqRh11G/JxRKrXm8OKfBhSFQNqGwyYln7zqIyEW3Swufyz+k7clRL5r6cNIrAetyDlNsA=; Received: from andrew by vps0.lunn.ch with local (Exim 4.84_2) (envelope-from ) id 1gLbyo-0000c1-1q; Sat, 10 Nov 2018 23:43:50 +0100 From: Andrew Lunn To: David Miller Cc: netdev , florain@lunn.ch, Andrew Lunn Subject: [PATCH net-next 5/5] net: phy: Add support for resolving 5G and 2.5G autoneg Date: Sat, 10 Nov 2018 23:43:37 +0100 Message-Id: <1541889817-2295-6-git-send-email-andrew@lunn.ch> X-Mailer: git-send-email 2.1.4 In-Reply-To: <1541889817-2295-1-git-send-email-andrew@lunn.ch> References: <1541889817-2295-1-git-send-email-andrew@lunn.ch> Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org Now that 2.5G and 5G can be represented in phydev->advertising and phydev->lp_advertising, add these two links modes as possible resolutions to auto negotiation. Signed-off-by: Andrew Lunn --- drivers/net/phy/phy-core.c | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/drivers/net/phy/phy-core.c b/drivers/net/phy/phy-core.c index 6d274cdc2796..20fbd5eb56fd 100644 --- a/drivers/net/phy/phy-core.c +++ b/drivers/net/phy/phy-core.c @@ -359,6 +359,14 @@ void phy_resolve_aneg_linkmode(struct phy_device *phydev) if (linkmode_test_bit(ETHTOOL_LINK_MODE_10000baseT_Full_BIT, common)) { phydev->speed = SPEED_10000; phydev->duplex = DUPLEX_FULL; + } else if (linkmode_test_bit(ETHTOOL_LINK_MODE_5000baseT_Full_BIT, + common)) { + phydev->speed = SPEED_5000; + phydev->duplex = DUPLEX_FULL; + } else if (linkmode_test_bit(ETHTOOL_LINK_MODE_2500baseT_Full_BIT, + common)) { + phydev->speed = SPEED_2500; + phydev->duplex = DUPLEX_FULL; } else if (linkmode_test_bit(ETHTOOL_LINK_MODE_1000baseT_Full_BIT, common)) { phydev->speed = SPEED_1000;