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 6E5D0A0C41 for ; Tue, 30 Nov 2021 17:36:22 +0100 (CET) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 05C4E41170; Tue, 30 Nov 2021 17:36:22 +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 5FD02410F7 for ; Tue, 30 Nov 2021 17:36:20 +0100 (CET) Received: from mail-ed1-f69.google.com (mail-ed1-f69.google.com [209.85.208.69]) (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 2CAB03F044 for ; Tue, 30 Nov 2021 16:36:14 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=canonical.com; s=20210705; t=1638290174; bh=wJJisdlrdaBwqueIi2eH2Q3mj+87kF/kv54KaDHDx54=; h=From:To:Cc:Subject:Date:Message-Id:MIME-Version; b=B3nHPGaFpid9qPig0KVk8s8PxnwNkx/tnFnOwHir+cXXtuy2I9gQYKBZdiBNDqIag b0LepgfbToXZa/c6C5HfMQGG7fsUWzQIMALGzuPZXhR7sTg2Xy6igx/zDXkRFQi0kB htA0+U0/a+fBu8v2V4ZxF6Qbmp5dvhERAnxyCpR8XbP6r1CXZAAuPz5ItceDrPpR+q YrxtOhUpi7xrH3BH9sBYLUnL7djJZpSbIy+JsSqEY/razMSz6hKW7d5gxnWPNLF3U1 Kmhp7iLoIYqqOLO7gr9BnvYncbPBW8DZV9fogNCOLs28e8cRHnkCj/cfW1fc+IM6RF rBnZt2sLWtM8A== Received: by mail-ed1-f69.google.com with SMTP id 30-20020a508e5e000000b003f02e458b17so10711768edx.17 for ; Tue, 30 Nov 2021 08:36:14 -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:mime-version :content-transfer-encoding; bh=wJJisdlrdaBwqueIi2eH2Q3mj+87kF/kv54KaDHDx54=; b=BtsJFq0rpQK0xN3VCddYUvUTs2/1SY/ZUq/NeWRlHZVfABQG497NtGLzrREsm0x6Wm BsqFJqqC6PvlXdpcA9b68ilsiPPinly4K2JJ+RajnryYyMSL5kNiJRdKY58TKayGKSM3 RDnsWUuxv6n50izlhnqrSXOXJZ0/V2uUee7vjALgDiEl3T73KjeBWfkQIp9MLxphgE4U rk+E34A/CRKz9DXFVcXDKJKUmaG+ZlhHBdII14JxqY+kDFyFpobXZSt3E8jd6UXVeVCa DRfjAe36n2nmdFbn4J2kXPkmh7WHrycFxtW7Xv0vN4rCL/+uqGlrmDynG2swAI5bYfkL H54w== X-Gm-Message-State: AOAM5333c1X2ajechziJ70oLb9j4z1JX6TtfKm8N7wLkqJQIE/ncUqiM uSvSAga7zP3CpFHjpdYLlTUwD2IuaQh4iZNVascuWFktEGQctb+QUZYuE+7/6ynuF8dJy4hn2ql JNYIKM1FtIuaH9vK7xT6Q7Wa9 X-Received: by 2002:a17:907:c0b:: with SMTP id ga11mr178796ejc.39.1638290173090; Tue, 30 Nov 2021 08:36:13 -0800 (PST) X-Google-Smtp-Source: ABdhPJww0C/MwUn6H+smBF36+L2kYmJGoMfQzJ4jy5RfRRyX6IMhncdZVzhKzzXZHs69A5lnD7dv+A== X-Received: by 2002:a17:907:c0b:: with SMTP id ga11mr178778ejc.39.1638290172888; Tue, 30 Nov 2021 08:36:12 -0800 (PST) Received: from localhost.localdomain ([2001:67c:1560:8007::aac:c4ad]) by smtp.gmail.com with ESMTPSA id e1sm8859798ejy.82.2021.11.30.08.36.12 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 30 Nov 2021 08:36:12 -0800 (PST) From: christian.ehrhardt@canonical.com To: Yury Kylulin Cc: Ashish Paul , Christian Ehrhardt , dpdk stable Subject: patch 'net/i40e: support 25G AOC/ACC cables' has been queued to stable release 19.11.11 Date: Tue, 30 Nov 2021 17:33:25 +0100 Message-Id: <20211130163605.2460997-1-christian.ehrhardt@canonical.com> X-Mailer: git-send-email 2.34.0 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/f81d60e607bb8c13fcb13450e85d74721f1d9c8f Thanks. Christian Ehrhardt --- >From f81d60e607bb8c13fcb13450e85d74721f1d9c8f Mon Sep 17 00:00:00 2001 From: Yury Kylulin Date: Tue, 13 Apr 2021 18:29:50 +0300 Subject: [PATCH] net/i40e: support 25G AOC/ACC cables [ 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 Cc: stable@dpdk.org Signed-off-by: Yury Kylulin Tested-by: Ashish Paul Signed-off-by: Christian Ehrhardt --- 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 508f90595f..0c896ea915 100644 --- a/drivers/net/i40e/i40e_ethdev.c +++ b/drivers/net/i40e/i40e_ethdev.c @@ -2264,7 +2264,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.34.0 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2021-11-30 16:50:06.280423439 +0100 +++ 0001-net-i40e-support-25G-AOC-ACC-cables.patch 2021-11-30 16:50:05.482871270 +0100 @@ -1 +1 @@ -From b1daa3461429e7674206a714c17adca65e9b44b4 Mon Sep 17 00:00:00 2001 +From f81d60e607bb8c13fcb13450e85d74721f1d9c8f Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit b1daa3461429e7674206a714c17adca65e9b44b4 ] + @@ -8,0 +11,3 @@ +Ubuntu bug: https://bugs.launchpad.net/ubuntu/+source/dpdk/+bug/1940957 +Cc: stable@dpdk.org + @@ -10,0 +16 @@ +Signed-off-by: Christian Ehrhardt @@ -16 +22 @@ -index ea5d384283..e6206a7e51 100644 +index 508f90595f..0c896ea915 100644 @@ -19 +25 @@ -@@ -2307,7 +2307,8 @@ i40e_phy_conf_link(struct i40e_hw *hw, +@@ -2264,7 +2264,8 @@ i40e_phy_conf_link(struct i40e_hw *hw,