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 9FA4FA0C41 for ; Tue, 30 Nov 2021 17:40:13 +0100 (CET) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 99EC2410F7; Tue, 30 Nov 2021 17:40:13 +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 393D341177 for ; Tue, 30 Nov 2021 17:40:12 +0100 (CET) Received: from mail-ed1-f72.google.com (mail-ed1-f72.google.com [209.85.208.72]) (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 0F46C3F044 for ; Tue, 30 Nov 2021 16:40:12 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=canonical.com; s=20210705; t=1638290412; bh=Cj6VHY+7HvFj4A+CtEZGkK+ReCAIyQ/pIGRCqr7wz44=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=ITR5iaxLft/Bo5flhvGlC5B5nDAKcldCN7kr/h8+YV3h4Dt+GSFADwjThj4V/xq8t AIutU+NP68DRkiPT+g2AJ0vdr0aMelBJVCI9WrCWFw3w4qz3e/GbB4U+mBUz0ohol5 CphXQq2c0cBtPXDksJt1hTiLCzbhesydrXIJ/9qtcC6ygDMePCwhevTBBoGQM4gK1n C3nLBpXmtc/xsut6RBoKbPccKFJFXZ3drv7nCvhi2GnJU4BkoPYepTrx9x/2FJKYzB AnAZeYlJY/4GZcLEANitbnXUL4nK1anB9jS0QUJ0LiKpK30cqli7SqsDaJOx6BVSDN L0xgczoOP7utA== Received: by mail-ed1-f72.google.com with SMTP id t9-20020aa7d709000000b003e83403a5cbso17492614edq.19 for ; Tue, 30 Nov 2021 08:40:12 -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=Cj6VHY+7HvFj4A+CtEZGkK+ReCAIyQ/pIGRCqr7wz44=; b=FM8BVK6y8FCrTB1XCbI9Yy1pytlTlNChcCF7Ea0gwtYzjsN47bxkz5hRVlohj2I1Ra N8XzwZEMYOjhpSsiEA3xUOXGde5nlcnA3kMIR85Q+JbX0O42pZUc45p7YLgcSah/1feF fwEi9295dzSiLekkQbShEXkXICP1mvMfynwzlf+Y6Jli6I8pSWOkXtkImzcuoaJzokLK XmS0u0DAChqyPmpKqs34aF33orIwpkYpZGEzIEJvO84vppOUQdnv5/6sPPf84JdxvrpZ Rn+y8WoLCCqvaeMJnF+Q4WjgZrxpNrg0Hb2rqOHiFyN6l/mIfprQWP7mK9+xdvT+kdM5 c9WA== X-Gm-Message-State: AOAM532RUKJHeGIrXdugvzlFZRQORNpXyF2sMyCdk0JnE3WKKVjvmPZ3 aJyrtex+LeiKC87A6DZfcFsWnvGmFG+j3XLJlwqM7z8f4E6z3L7VI15UTsalowOD5ZytNDNWkj5 CGPzRdmSUoL+YikajHPwJg04d X-Received: by 2002:a17:906:8256:: with SMTP id f22mr188746ejx.207.1638290411329; Tue, 30 Nov 2021 08:40:11 -0800 (PST) X-Google-Smtp-Source: ABdhPJxwy9z+Q0GKhlXyQZdiBOinBw28cHzb5kjy31bgm7dqofqq7mkmTMvlziUvOtzkceDPA04nxg== X-Received: by 2002:a17:906:8256:: with SMTP id f22mr188718ejx.207.1638290411156; Tue, 30 Nov 2021 08:40:11 -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.10 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 30 Nov 2021 08:40:10 -0800 (PST) From: christian.ehrhardt@canonical.com To: Robin Zhang Cc: Dawid Lukwinski , Beilei Xing , dpdk stable Subject: patch 'net/i40e/base: fix AOC media type' has been queued to stable release 19.11.11 Date: Tue, 30 Nov 2021 17:34:44 +0100 Message-Id: <20211130163605.2460997-80-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/69d0ba62c541391f2929d26e52543bb5ca95b73e Thanks. Christian Ehrhardt --- >From 69d0ba62c541391f2929d26e52543bb5ca95b73e Mon Sep 17 00:00:00 2001 From: Robin Zhang Date: Sat, 9 Oct 2021 01:39:47 +0000 Subject: [PATCH] net/i40e/base: fix AOC media type [ upstream commit 6acdc4263c53078b562c94745ad158291299a31c ] For Active Optical Cable (AOC) the correct media type is "Fibre", not "Direct Attach Copper". Fixes: d749d4d89969 ("i40e/base: add AOC PHY types") Fixes: aa153cc89ff0 ("net/i40e/base: add new PHY types for 25G AOC and ACC") Signed-off-by: Dawid Lukwinski Signed-off-by: Robin Zhang Acked-by: Beilei Xing --- drivers/net/i40e/base/i40e_common.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/drivers/net/i40e/base/i40e_common.c b/drivers/net/i40e/base/i40e_common.c index 5c75872661..7f95f7f867 100644 --- a/drivers/net/i40e/base/i40e_common.c +++ b/drivers/net/i40e/base/i40e_common.c @@ -1261,6 +1261,9 @@ STATIC enum i40e_media_type i40e_get_media_type(struct i40e_hw *hw) case I40E_PHY_TYPE_40GBASE_LR4: case I40E_PHY_TYPE_25GBASE_LR: case I40E_PHY_TYPE_25GBASE_SR: + case I40E_PHY_TYPE_10GBASE_AOC: + case I40E_PHY_TYPE_25GBASE_AOC: + case I40E_PHY_TYPE_40GBASE_AOC: media = I40E_MEDIA_TYPE_FIBER; break; case I40E_PHY_TYPE_100BASE_TX: @@ -1275,10 +1278,7 @@ STATIC enum i40e_media_type i40e_get_media_type(struct i40e_hw *hw) case I40E_PHY_TYPE_10GBASE_CR1: case I40E_PHY_TYPE_40GBASE_CR4: case I40E_PHY_TYPE_10GBASE_SFPP_CU: - case I40E_PHY_TYPE_40GBASE_AOC: - case I40E_PHY_TYPE_10GBASE_AOC: case I40E_PHY_TYPE_25GBASE_CR: - case I40E_PHY_TYPE_25GBASE_AOC: case I40E_PHY_TYPE_25GBASE_ACC: media = I40E_MEDIA_TYPE_DA; break; -- 2.34.0 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2021-11-30 16:50:10.573198100 +0100 +++ 0080-net-i40e-base-fix-AOC-media-type.patch 2021-11-30 16:50:05.838873882 +0100 @@ -1 +1 @@ -From 6acdc4263c53078b562c94745ad158291299a31c Mon Sep 17 00:00:00 2001 +From 69d0ba62c541391f2929d26e52543bb5ca95b73e Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit 6acdc4263c53078b562c94745ad158291299a31c ] + @@ -11 +12,0 @@ -Cc: stable@dpdk.org @@ -21 +22 @@ -index ef061a6b63..2ca6a13e79 100644 +index 5c75872661..7f95f7f867 100644 @@ -24 +25 @@ -@@ -1276,6 +1276,9 @@ STATIC enum i40e_media_type i40e_get_media_type(struct i40e_hw *hw) +@@ -1261,6 +1261,9 @@ STATIC enum i40e_media_type i40e_get_media_type(struct i40e_hw *hw) @@ -34 +35 @@ -@@ -1290,10 +1293,7 @@ STATIC enum i40e_media_type i40e_get_media_type(struct i40e_hw *hw) +@@ -1275,10 +1278,7 @@ STATIC enum i40e_media_type i40e_get_media_type(struct i40e_hw *hw)