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=-6.8 required=3.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_PASS 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 6137AC282CE for ; Sat, 13 Apr 2019 18:54:03 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 2757120674 for ; Sat, 13 Apr 2019 18:54:03 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="BAvV6xa+" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727019AbfDMSyC (ORCPT ); Sat, 13 Apr 2019 14:54:02 -0400 Received: from mail-wm1-f67.google.com ([209.85.128.67]:35033 "EHLO mail-wm1-f67.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726922AbfDMSyB (ORCPT ); Sat, 13 Apr 2019 14:54:01 -0400 Received: by mail-wm1-f67.google.com with SMTP id y197so3006659wmd.0 for ; Sat, 13 Apr 2019 11:54:00 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=subject:from:to:references:message-id:date:user-agent:mime-version :in-reply-to:content-language:content-transfer-encoding; bh=OpUMRlozu5kJrQUJbROvsMhXyf1DeYvUtsLhHxbViQE=; b=BAvV6xa+wmjkf7OpdgVY9w7N5Qg2zsu+bZ2Q5o/bRC9GzSsmjkcWsrt78VN3KPViS2 TM/Py+Nk6wzI9Jp3mnE4Alkz4oJjPn0/krxsHiUZbBdPC7fP+Zwy/+qQS9GmB1tt7LRZ HMTFsjRi327PQSjLqfN7q3gDSlL7H4pjiYRgm3fCjGskXevcurttNltsra+4z2gZRmGC vKkPJKznTPfmGPG9T1rmVMIhVWcVO6fABn9iH7ni7W7GGjxPUmO6Od9N85iOay2eNFW7 CvNbaHxmARhXEHpD/oNb8N8xShlDHveG77cftRZQHd2yUznC0y+s9nA9jNjS4JHQg7si zWdg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:subject:from:to:references:message-id:date :user-agent:mime-version:in-reply-to:content-language :content-transfer-encoding; bh=OpUMRlozu5kJrQUJbROvsMhXyf1DeYvUtsLhHxbViQE=; b=fL5/hv1AXGmPPi02Y75XZR+dr7xpOC5JjE490w7cAxWu+6cu8AMUnOKKA7glhxG5yb +lqSE2RFn4vlNNND1R5KwwDDgMTuszmgVo2PYOWaau8Y5rAkLaMgwkMCASqOeq76D9h+ kawH1SD25Nw0e4djRXKSt9P6qxYlUr9fItrFEm20vYArySW5fsdPQhbI16OGa07goc/q Gm3KQtF1WIghTh1CO3Pus9W09FJb3s2Huv8muSDqtYrt6DBdek2gFyRqsi0lKRwUHrr1 +khoPpCwTCwWIQTxQ6f+pCvc/ma8pGTsUXmG3fSUO6Hcbds/cEql4aZFXj8q3JSbk7eG VWbQ== X-Gm-Message-State: APjAAAUtJtm/+pLDgbX9BKvNsFdILh5xcjOJlBE19OWG7gtqEBQObVQ6 P63yIW+Tv0tMT2xjZiCDCqYrXHoG X-Google-Smtp-Source: APXvYqzA3bLK19I92xn0eQ1GZfFPTVj7CBTeL6JyZ+81+nEC0/THl2QB5HGLNmve/H1pbyp6WcPyzg== X-Received: by 2002:a05:600c:2055:: with SMTP id p21mr14891708wmg.118.1555181639934; Sat, 13 Apr 2019 11:53:59 -0700 (PDT) Received: from ?IPv6:2003:ea:8bd4:5700:55d5:e2ee:33f5:6950? (p200300EA8BD4570055D5E2EE33F56950.dip0.t-ipconnect.de. [2003:ea:8bd4:5700:55d5:e2ee:33f5:6950]) by smtp.googlemail.com with ESMTPSA id 192sm23090466wme.13.2019.04.13.11.53.59 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sat, 13 Apr 2019 11:53:59 -0700 (PDT) Subject: [PATCH v2 net-next 2/3] net: phy: add support for new modes in phylib From: Heiner Kallweit To: Andrew Lunn , Florian Fainelli , David Miller , "netdev@vger.kernel.org" References: Message-ID: <59a32d77-3b2c-44b9-b546-91332ba2dd30@gmail.com> Date: Sat, 13 Apr 2019 20:50:24 +0200 User-Agent: Mozilla/5.0 (Windows NT 10.0; WOW64; rv:60.0) Gecko/20100101 Thunderbird/60.6.1 MIME-Version: 1.0 In-Reply-To: Content-Type: text/plain; charset=utf-8 Content-Language: en-US Content-Transfer-Encoding: 7bit Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org Recently new modes have been added to ethtool.h, but the related extension to phylib hasn't been done yet. So add support for these modes. v2: - add missing 100Gbps and 50Gbps modes Signed-off-by: Heiner Kallweit --- drivers/net/phy/phy-core.c | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/drivers/net/phy/phy-core.c b/drivers/net/phy/phy-core.c index 4a9042ad4..2366d720f 100644 --- a/drivers/net/phy/phy-core.c +++ b/drivers/net/phy/phy-core.c @@ -35,6 +35,8 @@ const char *phy_speed_to_str(int speed) return "56Gbps"; case SPEED_100000: return "100Gbps"; + case SPEED_200000: + return "200Gbps"; case SPEED_UNKNOWN: return "Unknown"; default: @@ -63,11 +65,22 @@ EXPORT_SYMBOL_GPL(phy_duplex_to_str); .bit = ETHTOOL_LINK_MODE_ ## b ## _BIT} static const struct phy_setting settings[] = { + /* 200G */ + PHY_SETTING( 200000, FULL, 200000baseCR4_Full ), + PHY_SETTING( 200000, FULL, 200000baseKR4_Full ), + PHY_SETTING( 200000, FULL, 200000baseLR4_ER4_FR4_Full ), + PHY_SETTING( 200000, FULL, 200000baseDR4_Full ), + PHY_SETTING( 200000, FULL, 200000baseSR4_Full ), /* 100G */ PHY_SETTING( 100000, FULL, 100000baseCR4_Full ), PHY_SETTING( 100000, FULL, 100000baseKR4_Full ), PHY_SETTING( 100000, FULL, 100000baseLR4_ER4_Full ), PHY_SETTING( 100000, FULL, 100000baseSR4_Full ), + PHY_SETTING( 100000, FULL, 100000baseCR2_Full ), + PHY_SETTING( 100000, FULL, 100000baseKR2_Full ), + PHY_SETTING( 100000, FULL, 100000baseLR2_ER2_FR2_Full ), + PHY_SETTING( 100000, FULL, 100000baseDR2_Full ), + PHY_SETTING( 100000, FULL, 100000baseSR2_Full ), /* 56G */ PHY_SETTING( 56000, FULL, 56000baseCR4_Full ), PHY_SETTING( 56000, FULL, 56000baseKR4_Full ), @@ -77,6 +90,11 @@ static const struct phy_setting settings[] = { PHY_SETTING( 50000, FULL, 50000baseCR2_Full ), PHY_SETTING( 50000, FULL, 50000baseKR2_Full ), PHY_SETTING( 50000, FULL, 50000baseSR2_Full ), + PHY_SETTING( 50000, FULL, 50000baseCR_Full ), + PHY_SETTING( 50000, FULL, 50000baseKR_Full ), + PHY_SETTING( 50000, FULL, 50000baseLR_ER_FR_Full ), + PHY_SETTING( 50000, FULL, 50000baseDR_Full ), + PHY_SETTING( 50000, FULL, 50000baseSR_Full ), /* 40G */ PHY_SETTING( 40000, FULL, 40000baseCR4_Full ), PHY_SETTING( 40000, FULL, 40000baseKR4_Full ), -- 2.21.0