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 06A10A0544 for ; Fri, 11 Nov 2022 12:40:15 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id EEE294014F; Fri, 11 Nov 2022 12:40:14 +0100 (CET) Received: from smtp-relay-internal-0.canonical.com (smtp-relay-internal-0.canonical.com [185.125.188.122]) by mails.dpdk.org (Postfix) with ESMTP id ED6BD42D0E for ; Fri, 11 Nov 2022 12:40:13 +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-0.canonical.com (Postfix) with ESMTPS id 8E25C423E3 for ; Fri, 11 Nov 2022 11:40:11 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=canonical.com; s=20210705; t=1668166812; bh=bQA7LLPInLyA3GM+Pxd0TmZ0Yb6XPTm9oF4OUevevRU=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=kGTM4an5F9fE/ABT/36YxFbUEkqH9erdPkbRusFVbEAJkKbvesnyNO7HTWwEpqn81 12WScjr31VCEx7/pbO7FzNe5Ixj13NnHBNiAbP3/eTQe4kly9jDD8B2+co8MHe2Bvb EI2HgL0Yus7kGfm1t/Yu9H/aC/ia1hWq5e+JyaeB4DcOz6QkwfHxxMyg3tQEY1gxCS 3BS2/1h8NW43BZEnhwXjoWsdOldix5nNA6TsADPbh/dbBn45BThSzfJT2ba2kbiHjm 8VSCm7UCXn+CSkMcLdcCvGJh2TXEA1UcuV1ipr2c/85MLJap2HlWTFzTsigkYtEhs7 A7/ImILX9EnFg== Received: by mail-ed1-f72.google.com with SMTP id z15-20020a05640240cf00b00461b253c220so3448548edb.3 for ; Fri, 11 Nov 2022 03:40:11 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=bQA7LLPInLyA3GM+Pxd0TmZ0Yb6XPTm9oF4OUevevRU=; b=e41F1eM3lf+oHvV/KYJBz6kwhgEgL8mXcnjYVDUgE5JpghGBsTEgEyWyQw2uOdpmeZ p/MEj1DMIwnV+qyXCOR8CHLtS1x2Br7jKZTPMR1IyX7MeyDbrVuLu36ZRWeEu93EXAi+ pRjnKJCenJdFFRln+3ApEouLXggcSiOo3H5DA6WR6Dko+CG7k+VouqbGYQci39c6dXmK b+gRQUKD4X9885cIxaiWoP6iNjiNo7oKnql+KjBhNRJ8eskizPU+lzr7TPeVZrWpSBnA RXLFjvPe+CA5gqX4Qglk9h3R/oVcXfGvztDlyG6F0IzNVt72qZ32OIW6rs79yyc1vAj/ pwZQ== X-Gm-Message-State: ANoB5pm9mjfLz/09vTjSkbVdpBLtAB5PnoaAssRUfjuwLvdsJi69ifJ5 /mXO9txDsOUOufqSODZUSLlEOTB7J+aQv5xHVI5s0A/Z+DFTj9YsrCL4iFR45s2RIn79kV9Nq9X 8l2RYZyqnjyo6qIE/ZIpyAXa3 X-Received: by 2002:a50:fc12:0:b0:461:5b2f:2d8f with SMTP id i18-20020a50fc12000000b004615b2f2d8fmr1086795edr.348.1668166811307; Fri, 11 Nov 2022 03:40:11 -0800 (PST) X-Google-Smtp-Source: AA0mqf6M0N870VtaC7z8b0Wwcr/g64ZWabL13ADee//0Q+BBSM+RavsGqKGi5zAnw+bb/evlV4Cbog== X-Received: by 2002:a50:fc12:0:b0:461:5b2f:2d8f with SMTP id i18-20020a50fc12000000b004615b2f2d8fmr1086781edr.348.1668166811020; Fri, 11 Nov 2022 03:40:11 -0800 (PST) Received: from localhost.localdomain ([2a02:6d40:39af:c100:1891:6c61:50fd:e567]) by smtp.gmail.com with ESMTPSA id s6-20020a170906bc4600b007815ca7ae57sm751435ejv.212.2022.11.11.03.40.09 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 11 Nov 2022 03:40:10 -0800 (PST) From: christian.ehrhardt@canonical.com To: Qi Zhang Cc: Paul Greenwalt , Qiming Yang , dpdk stable Subject: patch 'net/ice/base: fix media type of PHY 10G SFI C2C' has been queued to stable release 19.11.14 Date: Fri, 11 Nov 2022 12:38:37 +0100 Message-Id: <20221111113904.1549618-20-christian.ehrhardt@canonical.com> X-Mailer: git-send-email 2.38.1 In-Reply-To: <20221111113904.1549618-1-christian.ehrhardt@canonical.com> References: <20221111113904.1549618-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.14 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/18/22. 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/b9fcd7aaa000841cfde6d11ecff39c17ceab9284 Thanks. Christian Ehrhardt --- >From b9fcd7aaa000841cfde6d11ecff39c17ceab9284 Mon Sep 17 00:00:00 2001 From: Qi Zhang Date: Mon, 15 Aug 2022 03:31:15 -0400 Subject: [PATCH] net/ice/base: fix media type of PHY 10G SFI C2C [ upstream commit ef12579699a3b03bc1c66e05be0d1a73a6ae8ce9 ] PHY type ICE_PHY_TYPE_LOW_10G_SFI_C2C is incorrectly mapped to media type Fiber which results in ethtool reporting the wrong Supported ports. PHY type ICE_PHY_TYPE_LOW_10G_SFI_C2C should map to media type Backplane. Fixes: 453d087ccaff ("net/ice/base: add common functions") Signed-off-by: Paul Greenwalt Signed-off-by: Qi Zhang Acked-by: Qiming Yang --- drivers/net/ice/base/ice_common.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/net/ice/base/ice_common.c b/drivers/net/ice/base/ice_common.c index 2926a1d474..9dad1c9b3a 100644 --- a/drivers/net/ice/base/ice_common.c +++ b/drivers/net/ice/base/ice_common.c @@ -227,7 +227,6 @@ static enum ice_media_type ice_get_media_type(struct ice_port_info *pi) case ICE_PHY_TYPE_LOW_1000BASE_LX: case ICE_PHY_TYPE_LOW_10GBASE_SR: case ICE_PHY_TYPE_LOW_10GBASE_LR: - case ICE_PHY_TYPE_LOW_10G_SFI_C2C: case ICE_PHY_TYPE_LOW_25GBASE_SR: case ICE_PHY_TYPE_LOW_25GBASE_LR: case ICE_PHY_TYPE_LOW_40GBASE_SR4: @@ -275,6 +274,7 @@ static enum ice_media_type ice_get_media_type(struct ice_port_info *pi) case ICE_PHY_TYPE_LOW_2500BASE_X: case ICE_PHY_TYPE_LOW_5GBASE_KR: case ICE_PHY_TYPE_LOW_10GBASE_KR_CR1: + case ICE_PHY_TYPE_LOW_10G_SFI_C2C: case ICE_PHY_TYPE_LOW_25GBASE_KR: case ICE_PHY_TYPE_LOW_25GBASE_KR1: case ICE_PHY_TYPE_LOW_25GBASE_KR_S: -- 2.38.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2022-11-11 12:35:05.499429063 +0100 +++ 0020-net-ice-base-fix-media-type-of-PHY-10G-SFI-C2C.patch 2022-11-11 12:35:04.753191952 +0100 @@ -1 +1 @@ -From ef12579699a3b03bc1c66e05be0d1a73a6ae8ce9 Mon Sep 17 00:00:00 2001 +From b9fcd7aaa000841cfde6d11ecff39c17ceab9284 Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit ef12579699a3b03bc1c66e05be0d1a73a6ae8ce9 ] + @@ -14 +15,0 @@ -Cc: stable@dpdk.org @@ -24 +25 @@ -index cedce2dcf5..57602a31e1 100644 +index 2926a1d474..9dad1c9b3a 100644 @@ -27 +28 @@ -@@ -561,7 +561,6 @@ static enum ice_media_type ice_get_media_type(struct ice_port_info *pi) +@@ -227,7 +227,6 @@ static enum ice_media_type ice_get_media_type(struct ice_port_info *pi) @@ -35 +36 @@ -@@ -618,6 +617,7 @@ static enum ice_media_type ice_get_media_type(struct ice_port_info *pi) +@@ -275,6 +274,7 @@ static enum ice_media_type ice_get_media_type(struct ice_port_info *pi)