From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124]) by inbox.dpdk.org (Postfix) with ESMTP id 4EC18A0C41 for ; Tue, 30 Nov 2021 17:40:11 +0100 (CET) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 417C1410F7; Tue, 30 Nov 2021 17:40:11 +0100 (CET) Received: from smtp-relay-internal-1.canonical.com (smtp-relay-internal-1.canonical.com [185.125.188.123]) by mails.dpdk.org (Postfix) with ESMTP id 15067410F7 for ; Tue, 30 Nov 2021 17:40:09 +0100 (CET) Received: from mail-ed1-f70.google.com (mail-ed1-f70.google.com [209.85.208.70]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by smtp-relay-internal-1.canonical.com (Postfix) with ESMTPS id E4FC640009 for ; Tue, 30 Nov 2021 16:40:08 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=canonical.com; s=20210705; t=1638290408; bh=V5W5bnRvTXnhDZuZPXDV/I183CZacD65BYF7ZFS+BxY=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=eyCto456t5DEzcStlQ76KqR0fh1NPs0XQfS3b0pimPJSSO0xYvNImm3AO8kSHh/Dm gPpq6/wPlU5QwqV6pd+DbXvnI/d0G+4bz4O+Ky4QcM8sIcP/zvfRXj7lAX6Qi9Usvm 8WtQ231pL7Sg4hic2WYNmCpLeo/41GJ9hddV1gQW0sAV6ubFPEW0oFySxzt1rJ4x79 kaeuvtMIR0Vp/kwOcJxa/3sx9AOFHWPauL2itT5gx2DfB04JOEKAFEklnoVF4Me2Xo RB3Y4Z1zDHNJPi+a8c21hENqt7D4bevCF7BJPLrHkkvyxmiTSGDJAwxQA1Ea/KeNah L+/kwlBt8ZR3g== Received: by mail-ed1-f70.google.com with SMTP id y9-20020aa7c249000000b003e7bf7a1579so17436634edo.5 for ; Tue, 30 Nov 2021 08:40:08 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=V5W5bnRvTXnhDZuZPXDV/I183CZacD65BYF7ZFS+BxY=; b=JipFQnN1gRwR2Jh8Z29FW71CvEojxZL8wGiKc95bHuolrXPdeNcYtS8soQMpfljPSD t+y0473kbhbWAwiw5TnAkrmQzZyMfk7ViQilGnzewTVM/MqPQXGyCP5fo248XcTiVxXf MlWAi2pZ0t722mLnG6neCAd/e9zACOzMDEtFsVC5+wF+YU3cLsy188YwrRfIM8wpx7yO qFfOYsI8LxMJILGrQ9ByPJ4Bh5MN8HYpevMr4jcIRt4KbIDjlrAjcLM5jfLlXC/u1vm4 gY4F2CwyZYA/pOYuu7aE4m8IK0AJBVrtNArWZRdz7flbovlbe2lcAmy5yPc7mM8tnYaH 3QCw== X-Gm-Message-State: AOAM533CCceJMytzH3nTzjVv/rSgtD2eRbOSRU8bZ4iusT8F8I/H4voD fhKkQZoYAHTnX81AUDxi9ckkUhktKZwT+l/XTqUGa3SBm4mNxXQdEC2OiPFUHnQeEFR3YMk85xP 0J7GWz+9DqQGIl75eHn5lZxSr X-Received: by 2002:a50:9ec9:: with SMTP id a67mr108601edf.238.1638290408206; Tue, 30 Nov 2021 08:40:08 -0800 (PST) X-Google-Smtp-Source: ABdhPJxmAi3RxtLe/lCPQcxncNxO2fiQM0CDy2gMXmMw7itX+9bbq9ECGl8WqwXIuCURfNCnWLdn5w== X-Received: by 2002:a50:9ec9:: with SMTP id a67mr108572edf.238.1638290408003; Tue, 30 Nov 2021 08:40:08 -0800 (PST) Received: from localhost.localdomain ([2001:67c:1560:8007::aac:c4ad]) by smtp.gmail.com with ESMTPSA id z1sm11626017edq.54.2021.11.30.08.40.07 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 30 Nov 2021 08:40:07 -0800 (PST) From: christian.ehrhardt@canonical.com To: Robin Zhang Cc: Dawid Lukwinski , Beilei Xing , dpdk stable Subject: patch 'net/i40e/base: fix PHY identifiers for 2.5G and 5G adapters' has been queued to stable release 19.11.11 Date: Tue, 30 Nov 2021 17:34:41 +0100 Message-Id: <20211130163605.2460997-77-christian.ehrhardt@canonical.com> X-Mailer: git-send-email 2.34.0 In-Reply-To: <20211130163605.2460997-1-christian.ehrhardt@canonical.com> References: <20211130163605.2460997-1-christian.ehrhardt@canonical.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-BeenThere: stable@dpdk.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: patches for DPDK stable branches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: stable-bounces@dpdk.org Hi, FYI, your patch has been queued to stable release 19.11.11 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before December 10th 2021. So please shout if anyone has objections. Also note that after the patch there's a diff of the upstream commit vs the patch applied to the branch. This will indicate if there was any rebasing needed to apply to the stable branch. If there were code changes for rebasing (ie: not only metadata diffs), please double check that the rebase was correctly done. Queued patches are on a temporary branch at: https://github.com/cpaelzer/dpdk-stable-queue This queued commit can be viewed at: https://github.com/cpaelzer/dpdk-stable-queue/commit/acd346a95dc7069592bdcc6da8edca4919622fd3 Thanks. Christian Ehrhardt --- >From acd346a95dc7069592bdcc6da8edca4919622fd3 Mon Sep 17 00:00:00 2001 From: Robin Zhang Date: Sat, 9 Oct 2021 01:39:44 +0000 Subject: [PATCH] net/i40e/base: fix PHY identifiers for 2.5G and 5G adapters [ upstream commit dafd6c6308d441af5a215dc25a7942973c3eda15 ] Unlike other supported adapters, 2.5G and 5G use different PHY type identifiers for reading/writing PHY settings and for reading link status. This commit introduces separate PHY identifiers for these two operation types. Fixes: 988ed63c7441 ("net/i40e/base: add support for Carlsville device") Signed-off-by: Dawid Lukwinski Signed-off-by: Robin Zhang Acked-by: Beilei Xing --- drivers/net/i40e/base/i40e_adminq_cmd.h | 6 ++++-- drivers/net/i40e/base/i40e_common.c | 4 ++-- drivers/net/i40e/base/i40e_type.h | 8 ++------ 3 files changed, 8 insertions(+), 10 deletions(-) diff --git a/drivers/net/i40e/base/i40e_adminq_cmd.h b/drivers/net/i40e/base/i40e_adminq_cmd.h index 48f93313bd..3d56d12fe8 100644 --- a/drivers/net/i40e/base/i40e_adminq_cmd.h +++ b/drivers/net/i40e/base/i40e_adminq_cmd.h @@ -1935,8 +1935,10 @@ enum i40e_aq_phy_type { I40E_PHY_TYPE_25GBASE_LR = 0x22, I40E_PHY_TYPE_25GBASE_AOC = 0x23, I40E_PHY_TYPE_25GBASE_ACC = 0x24, - I40E_PHY_TYPE_2_5GBASE_T = 0x30, - I40E_PHY_TYPE_5GBASE_T = 0x31, + I40E_PHY_TYPE_2_5GBASE_T = 0x26, + I40E_PHY_TYPE_5GBASE_T = 0x27, + I40E_PHY_TYPE_2_5GBASE_T_LINK_STATUS = 0x30, + I40E_PHY_TYPE_5GBASE_T_LINK_STATUS = 0x31, I40E_PHY_TYPE_MAX, I40E_PHY_TYPE_NOT_SUPPORTED_HIGH_TEMP = 0xFD, I40E_PHY_TYPE_EMPTY = 0xFE, diff --git a/drivers/net/i40e/base/i40e_common.c b/drivers/net/i40e/base/i40e_common.c index 50812eb80e..e9aac841e8 100644 --- a/drivers/net/i40e/base/i40e_common.c +++ b/drivers/net/i40e/base/i40e_common.c @@ -1265,8 +1265,8 @@ STATIC enum i40e_media_type i40e_get_media_type(struct i40e_hw *hw) break; case I40E_PHY_TYPE_100BASE_TX: case I40E_PHY_TYPE_1000BASE_T: - case I40E_PHY_TYPE_2_5GBASE_T: - case I40E_PHY_TYPE_5GBASE_T: + case I40E_PHY_TYPE_2_5GBASE_T_LINK_STATUS: + case I40E_PHY_TYPE_5GBASE_T_LINK_STATUS: case I40E_PHY_TYPE_10GBASE_T: media = I40E_MEDIA_TYPE_BASET; break; diff --git a/drivers/net/i40e/base/i40e_type.h b/drivers/net/i40e/base/i40e_type.h index cc72cc0d58..98952d9cfc 100644 --- a/drivers/net/i40e/base/i40e_type.h +++ b/drivers/net/i40e/base/i40e_type.h @@ -329,12 +329,8 @@ struct i40e_phy_info { I40E_PHY_TYPE_OFFSET) #define I40E_CAP_PHY_TYPE_25GBASE_ACC BIT_ULL(I40E_PHY_TYPE_25GBASE_ACC + \ I40E_PHY_TYPE_OFFSET) -/* Offset for 2.5G/5G PHY Types value to bit number conversion */ -#define I40E_PHY_TYPE_OFFSET2 (-10) -#define I40E_CAP_PHY_TYPE_2_5GBASE_T BIT_ULL(I40E_PHY_TYPE_2_5GBASE_T + \ - I40E_PHY_TYPE_OFFSET2) -#define I40E_CAP_PHY_TYPE_5GBASE_T BIT_ULL(I40E_PHY_TYPE_5GBASE_T + \ - I40E_PHY_TYPE_OFFSET2) +#define I40E_CAP_PHY_TYPE_2_5GBASE_T BIT_ULL(I40E_PHY_TYPE_2_5GBASE_T) +#define I40E_CAP_PHY_TYPE_5GBASE_T BIT_ULL(I40E_PHY_TYPE_5GBASE_T) #define I40E_HW_CAP_MAX_GPIO 30 #define I40E_HW_CAP_MDIO_PORT_MODE_MDIO 0 #define I40E_HW_CAP_MDIO_PORT_MODE_I2C 1 -- 2.34.0 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2021-11-30 16:50:10.379376201 +0100 +++ 0077-net-i40e-base-fix-PHY-identifiers-for-2.5G-and-5G-ad.patch 2021-11-30 16:50:05.806873647 +0100 @@ -1 +1 @@ -From dafd6c6308d441af5a215dc25a7942973c3eda15 Mon Sep 17 00:00:00 2001 +From acd346a95dc7069592bdcc6da8edca4919622fd3 Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit dafd6c6308d441af5a215dc25a7942973c3eda15 ] + @@ -12 +13,0 @@ -Cc: stable@dpdk.org @@ -24 +25 @@ -index a96527f31c..af9dec1d7f 100644 +index 48f93313bd..3d56d12fe8 100644 @@ -27 +28 @@ -@@ -1947,8 +1947,10 @@ enum i40e_aq_phy_type { +@@ -1935,8 +1935,10 @@ enum i40e_aq_phy_type { @@ -41 +42 @@ -index 32642f3e2b..ceedec68bf 100644 +index 50812eb80e..e9aac841e8 100644 @@ -44 +45 @@ -@@ -1280,8 +1280,8 @@ STATIC enum i40e_media_type i40e_get_media_type(struct i40e_hw *hw) +@@ -1265,8 +1265,8 @@ STATIC enum i40e_media_type i40e_get_media_type(struct i40e_hw *hw) @@ -56 +57 @@ -index e5a3729183..0323887550 100644 +index cc72cc0d58..98952d9cfc 100644