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 0930FA00C2 for ; Thu, 3 Nov 2022 10:30:01 +0100 (CET) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 056C040694; Thu, 3 Nov 2022 10:30:01 +0100 (CET) Received: from mail-wr1-f49.google.com (mail-wr1-f49.google.com [209.85.221.49]) by mails.dpdk.org (Postfix) with ESMTP id 3FA8740693 for ; Thu, 3 Nov 2022 10:29:59 +0100 (CET) Received: by mail-wr1-f49.google.com with SMTP id w14so1704765wru.8 for ; Thu, 03 Nov 2022 02:29:59 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=YI8Cg+8lgcrGrgrN98XabakQQcb0E2rJaQHEB1VD20k=; b=Zv/kzRIW0ht0HVqg1Qy41IOLIlbHIzTCi1OaPHew1yxvTqZDwRZf85KgIiLkJriRNH vIpGSeXmh4r9y0xxUl6Rgk2Jtldu8tn0DeL7jC+/4qVSh4vDIZJo/7pe/GcO+RUvFDc+ bS5utmyEcMMnpfOL27DuUkriknpMKhZRbWHoLsVwcr7fh1qhJ1bTGETyyJgJorfs1hBS kSuxLWNrk/KKplP5N/n5wcZy+NODewQLyom4mxys/T5b/MQNIJSHY30tlfXK1cYQgvpO Um69jjaJvkfwJlhB+TD4N+b2/2UGr6840vXlGJdbOtBBIMvH6IZ/PZA5iCz2DqBY4HPc jc6A== 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=YI8Cg+8lgcrGrgrN98XabakQQcb0E2rJaQHEB1VD20k=; b=saClp/YZDpJ2x8DaobZNW14qLtkgnfK91yNj70n+mzXJSAaxxlGPCfJ6NZfLL+5198 dIrs2b+OMYMb+rsxPpJSkPmCKGRpag/k30ezPcTvPre7mj8KYiG74D7TJ3G5LhsTZ3uX a/kUxiUH2lDtE/ETMtpIUISBxVby63VN84cCx8pVAeMLzFQCL0h+EILNezHrsxK09OwB eigqyJ4Obp1RH42NZvbvbDcworIgQ1VXbFLwAqP7j/l0j/2p/ExCX5KlBclY/vJLI00o y4eEW5oIIueDy8qPNkJiSfVabl00gM/CRNvfbEQ9KdAzVJDJdETezDEl0mVYz2DQOxF5 QU6A== X-Gm-Message-State: ACrzQf2TTRNp1QeCNAu8/FN5c+IPCUvQVlDHFNBqqwyzcNkMivyw7VFX EvBTkzJUIZrKCKRn+w3z+18= X-Google-Smtp-Source: AMsMyM4FQHZAhVrbXH5qwR0qa3eOfZYzLTEcbygA+dzzy8ESsyxZ8oFQiFgzDVfCZXHBdHdZLCP5/A== X-Received: by 2002:adf:f4c7:0:b0:236:c415:c707 with SMTP id h7-20020adff4c7000000b00236c415c707mr14839088wrp.24.1667467798908; Thu, 03 Nov 2022 02:29:58 -0700 (PDT) Received: from localhost ([137.220.119.58]) by smtp.gmail.com with ESMTPSA id q11-20020adfdfcb000000b002366e8eee11sm326137wrn.101.2022.11.03.02.29.58 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 03 Nov 2022 02:29:58 -0700 (PDT) From: luca.boccassi@gmail.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 20.11.7 Date: Thu, 3 Nov 2022 09:26:53 +0000 Message-Id: <20221103092758.1099402-35-luca.boccassi@gmail.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20221103092758.1099402-1-luca.boccassi@gmail.com> References: <20221103092758.1099402-1-luca.boccassi@gmail.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 20.11.7 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/05/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/kevintraynor/dpdk-stable This queued commit can be viewed at: https://github.com/kevintraynor/dpdk-stable/commit/9b74993d8dfa9bf6d218af524c948f953f8362ef Thanks. Luca Boccassi --- >From 9b74993d8dfa9bf6d218af524c948f953f8362ef 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 2b53f78512..43cc91b7c2 100644 --- a/drivers/net/ice/base/ice_common.c +++ b/drivers/net/ice/base/ice_common.c @@ -289,7 +289,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: @@ -346,6 +345,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.34.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2022-11-03 09:27:27.538238508 +0000 +++ 0035-net-ice-base-fix-media-type-of-PHY-10G-SFI-C2C.patch 2022-11-03 09:27:25.385422673 +0000 @@ -1 +1 @@ -From ef12579699a3b03bc1c66e05be0d1a73a6ae8ce9 Mon Sep 17 00:00:00 2001 +From 9b74993d8dfa9bf6d218af524c948f953f8362ef 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 2b53f78512..43cc91b7c2 100644 @@ -27 +28 @@ -@@ -561,7 +561,6 @@ static enum ice_media_type ice_get_media_type(struct ice_port_info *pi) +@@ -289,7 +289,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) +@@ -346,6 +345,7 @@ static enum ice_media_type ice_get_media_type(struct ice_port_info *pi)