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 122AFA034F for ; Wed, 10 Nov 2021 07:32:50 +0100 (CET) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 0820940142; Wed, 10 Nov 2021 07:32:50 +0100 (CET) Received: from NAM11-CO1-obe.outbound.protection.outlook.com (mail-co1nam11on2049.outbound.protection.outlook.com [40.107.220.49]) by mails.dpdk.org (Postfix) with ESMTP id D28B14068B for ; Wed, 10 Nov 2021 07:32:47 +0100 (CET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=irGMcgwGmCt+K5pRWNggTmFnhAdKwCctvD3rOVQQvd48j7gHiYydjny1jeZVusjuQVeQurrG3FI0KN0XarYWOQNi0jSTkfZfNaFWwNwewh1EuQwCrGsZOPHNrQWyEbh+QzUK3E2IUo/u7qKBL5Z+RjqEsgkZdnwCiw/bRHvQ5FFjh8OYcU/PogtAznWpcbXGoJKdTf+lMYtdaeRmo1YjtxmWxVN0HjH/lxN99dZKsrbj2y0mFAC/5EHdQEYrWNwXOC8lYrEmVqmOl74Gruo5HL1N915Dz7IWwI+tr7eNVnJUZDSRdsgzc4BpSr3B9wN/gOXL+Z+6yddJG/39+XdA6A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=lS5h+gT7+7UXu7T70wvgYPp/RDLZktceHgD2MWgcCRg=; b=ezDQcHYQ1bWmMU3uqdBCwWU+qqnB3dBzMDd16edW2Uqx4Ufn6XdBk1zL3eTqH3GFeTa3MSBk+JfCGlW2UDWMXR6SX1H52fWHV53TCAR3ITaPEJGbunMsar+28KVAD2g65qrKISpjr7GXVdcEQXL1bzSbCQYhesS6fwVsm6Vh+4KRmbu5Z1qXwkcB7CIWGXp5sEn29PwNFwhbVWxH8IyKBarr15b4t+v6N7wi+SNBSnITKkLicoH37YazYInhzlKxpLQpOnDeaDd6pWntitvMXHHH5RwDqfNr7CfxzlAKpQjGnd5Cs2Z1m2bU08Z2uaYneRR1evTEUR9OvRwMpa+Ynw== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 216.228.112.34) smtp.rcpttodomain=canonical.com smtp.mailfrom=nvidia.com; dmarc=pass (p=quarantine sp=quarantine pct=100) action=none header.from=nvidia.com; dkim=none (message not signed); arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=Nvidia.com; s=selector2; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=lS5h+gT7+7UXu7T70wvgYPp/RDLZktceHgD2MWgcCRg=; b=FdcUHBP4zjhX00ZKS+kfh0Ky1KnBqy52D3fVv3UTC6F02jlKMmo7IopHGs0xw6Eufv/LiXtYIWDuhae0O6nD5zLGLcQbismR1zzg0HLaUIw53Wq9UuFyUA/HCC7WSEPSJ0xz9eAe7r7/6G0MYPTbfuFJ1S/OdXIiREL+Lcj2ueZQ0fRm809Gg0AOqHcTiSAVA8RfJXW5XxgB3f2oRGTx0aKsA9jhGnmBBJpzXB4XvDW+Q37FaUaeSUSQG01hqvNZqZTdJKMU4RFCxGKr+rcZC5FmUDpLWsNf/JnLKqxMx9rmAY1PXDw8e5UeYRpcRyd9A2/kE+Y8xNX6f3yLCaE8Ow== Received: from DM6PR01CA0016.prod.exchangelabs.com (2603:10b6:5:296::21) by MN2PR12MB3582.namprd12.prod.outlook.com (2603:10b6:208:cd::12) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4669.10; Wed, 10 Nov 2021 06:32:45 +0000 Received: from DM6NAM11FT060.eop-nam11.prod.protection.outlook.com (2603:10b6:5:296:cafe::69) by DM6PR01CA0016.outlook.office365.com (2603:10b6:5:296::21) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4669.11 via Frontend Transport; Wed, 10 Nov 2021 06:32:45 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 216.228.112.34) smtp.mailfrom=nvidia.com; canonical.com; dkim=none (message not signed) header.d=none;canonical.com; dmarc=pass action=none header.from=nvidia.com; Received-SPF: Pass (protection.outlook.com: domain of nvidia.com designates 216.228.112.34 as permitted sender) receiver=protection.outlook.com; client-ip=216.228.112.34; helo=mail.nvidia.com; Received: from mail.nvidia.com (216.228.112.34) by DM6NAM11FT060.mail.protection.outlook.com (10.13.173.63) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384) id 15.20.4690.15 via Frontend Transport; Wed, 10 Nov 2021 06:32:44 +0000 Received: from nvidia.com (172.20.187.5) by HQMAIL107.nvidia.com (172.20.187.13) with Microsoft SMTP Server (TLS) id 15.0.1497.18; Wed, 10 Nov 2021 06:32:42 +0000 From: Xueming Li To: Yury Kylulin CC: Luca Boccassi , Ashish Paul , Christian Ehrhardt , Luca Boccassi , dpdk stable Date: Wed, 10 Nov 2021 14:28:05 +0800 Message-ID: <20211110063216.2744012-2-xuemingl@nvidia.com> X-Mailer: git-send-email 2.33.0 In-Reply-To: <20211110063216.2744012-1-xuemingl@nvidia.com> References: <20211110063216.2744012-1-xuemingl@nvidia.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain X-Originating-IP: [172.20.187.5] X-ClientProxiedBy: HQMAIL101.nvidia.com (172.20.187.10) To HQMAIL107.nvidia.com (172.20.187.13) X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 61049ff2-d9d1-4cf0-3244-08d9a413e7b5 X-MS-TrafficTypeDiagnostic: MN2PR12MB3582: X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:10000; X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: xnmYg0qWdg5cOUmZKRfnKeOAgus4IlbgmmtGl0fg3BC3+9XnZ/I6NV7rQVK9jl9P0WTYvuFkDcLS9qNMe3UmKOAIrvj7pCBvuicsEhaDw1uCcgnS/QIaBsJe0cQbAfKInSTrh2ABuVFN+t8cMT7UXRXDLDKzsUpjZQAb7DQFwKb7FClBqvibp9WIO68jlcbLtWAZj/apogQPeT3c+d5axOjHXsLcEzEEqgDKrRTC/ahbgGd0Q+5xK3WFdRs8YU7JksSeTc4FYv73J3ZEFXykYMqFYe7xPMUfR8wP0jtAcz7SU0/LcivAIrqj20VU6xPnHJl6lZY69YaFUiBdBDgv2sAQqa1eI4gmJSvdPzmVgtlVZbXMgKAw0FESdSj3ysv3cAz1HUdB7YcZ+1wDOsG8nc42hEd5bHD/ubYHJ+0zjOJc/04r04kAk2hvL6IaqkXifypTb/RKPE3l5xBzowR+SDUgA0i4xCSHnh6Jy/vb9onMidiKweMrKAlALvBOK8lfX55U9zVWBKHT7reh+PdZ8qYioFY96Kx1wAhk6HfHwlNR18pa2nUtYpBknYtPVM9WBmL7aU1cjrsiLDS4x4CGVpU9LRxGdnOmJcX/kJMq/Y8WBaHbJ6sIqIIpp0hp4miQtpT+Qk37FcoND2UwfWHv09WkjmRhpA4n26yx9xfMJ/TvuVFUAcDlgKG0CkPCzgfxtDiERtcLlLT2UkA/oPCNcBz1o9rVcScwEBw1o7UYWlQizGydX5Zsi01/p3NMfp3oq9kJy67/wsBrXqgfAooe3cSfULnOewE3kvheI1V57L8Ldk/5pAn4VtDpWG24/4Nbq6H2t6sBcAMcrLfIZ6mCoA== X-Forefront-Antispam-Report: CIP:216.228.112.34; CTRY:US; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:mail.nvidia.com; PTR:schybrid03.nvidia.com; CAT:NONE; SFS:(4636009)(46966006)(36840700001)(356005)(7696005)(26005)(316002)(7636003)(186003)(16526019)(83380400001)(8936002)(70586007)(70206006)(36860700001)(4326008)(6916009)(6286002)(5660300002)(8676002)(966005)(36756003)(1076003)(54906003)(2616005)(55016002)(45080400002)(336012)(6666004)(82310400003)(426003)(53546011)(86362001)(508600001)(2906002)(4001150100001)(47076005); DIR:OUT; SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 10 Nov 2021 06:32:44.7272 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 61049ff2-d9d1-4cf0-3244-08d9a413e7b5 X-MS-Exchange-CrossTenant-Id: 43083d15-7273-40c1-b7db-39efd9ccc17a X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=43083d15-7273-40c1-b7db-39efd9ccc17a; Ip=[216.228.112.34]; Helo=[mail.nvidia.com] X-MS-Exchange-CrossTenant-AuthSource: DM6NAM11FT060.eop-nam11.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: MN2PR12MB3582 Subject: [dpdk-stable] patch 'net/i40e: support 25G AOC/ACC cables' has been queued to stable release 20.11.4 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 Sender: "stable" Hi, FYI, your patch has been queued to stable release 20.11.4 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 11/12/21. 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/steevenlee/dpdk This queued commit can be viewed at: https://github.com/steevenlee/dpdk/commit/cd9f079d8799f40cf1739045bc7ff5429981cc09 Thanks. Xueming Li --- >From cd9f079d8799f40cf1739045bc7ff5429981cc09 Mon Sep 17 00:00:00 2001 From: Yury Kylulin Date: Mon, 6 Sep 2021 10:17:44 +0200 Subject: [PATCH] net/i40e: support 25G AOC/ACC cables Cc: Xueming Li [ upstream commit b1daa3461429e7674206a714c17adca65e9b44b4 ] Enable additional PHY types (25G-AOC and 25G-ACC) for set PHY config command. Ubuntu bug: https://bugs.launchpad.net/ubuntu/+source/dpdk/+bug/1940957 Signed-off-by: Yury Kylulin Tested-by: Ashish Paul Signed-off-by: Christian Ehrhardt Acked-by: Luca Boccassi --- drivers/net/i40e/i40e_ethdev.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/drivers/net/i40e/i40e_ethdev.c b/drivers/net/i40e/i40e_ethdev.c index 0dc20de9a0..5e3b80a6b8 100644 --- a/drivers/net/i40e/i40e_ethdev.c +++ b/drivers/net/i40e/i40e_ethdev.c @@ -2372,7 +2372,8 @@ i40e_phy_conf_link(struct i40e_hw *hw, phy_conf.phy_type = is_up ? cpu_to_le32(phy_type_mask) : 0; phy_conf.phy_type_ext = is_up ? (I40E_AQ_PHY_TYPE_EXT_25G_KR | I40E_AQ_PHY_TYPE_EXT_25G_CR | I40E_AQ_PHY_TYPE_EXT_25G_SR | - I40E_AQ_PHY_TYPE_EXT_25G_LR) : 0; + I40E_AQ_PHY_TYPE_EXT_25G_LR | I40E_AQ_PHY_TYPE_EXT_25G_AOC | + I40E_AQ_PHY_TYPE_EXT_25G_ACC) : 0; phy_conf.fec_config = phy_ab.fec_cfg_curr_mod_ext_info; phy_conf.eee_capability = phy_ab.eee_capability; phy_conf.eeer = phy_ab.eeer_val; -- 2.33.0 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2021-11-10 14:17:02.172063822 +0800 +++ 0001-net-i40e-support-25G-AOC-ACC-cables.patch 2021-11-10 14:17:01.730747236 +0800 @@ -1 +1 @@ -From b1daa3461429e7674206a714c17adca65e9b44b4 Mon Sep 17 00:00:00 2001 +From cd9f079d8799f40cf1739045bc7ff5429981cc09 Mon Sep 17 00:00:00 2001 @@ -3 +3 @@ -Date: Tue, 13 Apr 2021 18:29:50 +0300 +Date: Mon, 6 Sep 2021 10:17:44 +0200 @@ -4,0 +5,3 @@ +Cc: Xueming Li + +[ upstream commit b1daa3461429e7674206a714c17adca65e9b44b4 ] @@ -8,0 +12,2 @@ +Ubuntu bug: https://bugs.launchpad.net/ubuntu/+source/dpdk/+bug/1940957 + @@ -10,0 +16,2 @@ +Signed-off-by: Christian Ehrhardt +Acked-by: Luca Boccassi @@ -16 +23 @@ -index ea5d384283..e6206a7e51 100644 +index 0dc20de9a0..5e3b80a6b8 100644 @@ -19 +26 @@ -@@ -2307,7 +2307,8 @@ i40e_phy_conf_link(struct i40e_hw *hw, +@@ -2372,7 +2372,8 @@ i40e_phy_conf_link(struct i40e_hw *hw,