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 00734A0093 for ; Wed, 9 Mar 2022 17:31:19 +0100 (CET) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id EEBF0410F5; Wed, 9 Mar 2022 17:31:19 +0100 (CET) Received: from mail-wm1-f48.google.com (mail-wm1-f48.google.com [209.85.128.48]) by mails.dpdk.org (Postfix) with ESMTP id 7B355410E6 for ; Wed, 9 Mar 2022 17:31:19 +0100 (CET) Received: by mail-wm1-f48.google.com with SMTP id r187-20020a1c2bc4000000b003810e6b192aso1822086wmr.1 for ; Wed, 09 Mar 2022 08:31:19 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=WPuHYNnbq0MvkyoODQkiL8QoBVi5A8F23UUoCSb8PKs=; b=SX9gMOhv+jcKooCTKUJgCMB/E2jX9j+sVriK7nFPjkg+Nto9ZS0dMdyXnMyfBJi33n 3SVk4UdBeUMrLBb79NXs2k9UtwVEaOG3cFF/PcYQcYHSGjOTEV5lfpaE47vggUZprFSz TSidOei60BdS8Fs/jJLKZTSz4ysJgPh31z3UmYQ0Hn4UZfy4WwM/dJE3DlmBlCdN8RRJ z6WukgYVrwxJM7/PI62VTx03B5ztdmPGt6kMhX1yWuTm3GXG3HF86D9gZ+Zzi9DraSRC ohEeQWvOh/bXIvANUezK2WPNpupOspB4NdyWxNU/meO2oRjAkmTQTntyWbMovqtp1JmQ zD3g== 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=WPuHYNnbq0MvkyoODQkiL8QoBVi5A8F23UUoCSb8PKs=; b=VDm3/LJkKZ+9DdwW/dGWXM4d+vdFV2qnq97g8rUW6Vm/HNxSM5xzeFbemqEBW91x+K KpAymqeP7do0kSfDYzO/Cnz34WrP21ncXnXkNsegIJ2gIGNbC06CzsGuItlVrluL8BWS c9nanW7uBnkAHNk+dqq5LoPAKWnTTm47axMTE1dAsKFmTyctNw0Ta2727ZBfOnfR3So4 FQxk9AAcTRYy1zIVQLwO9TVVHhEA48zsKLOT95o4vRSuBqLte1LDF0849d3n4BrkioJK nDZfrgHG135yF+bc1FSInRM9c9XPQ7HEVBAtXO7CA0eI96v3hQ5V5Dzuy1KQEB9Ko8L1 UN6Q== X-Gm-Message-State: AOAM530ajjImd4CNwkIqsT6leYNOTSVW3hDjsBA3da0E6dP4pV+LD7jk WftFCtw0GuCqjfc10xzurFQ= X-Google-Smtp-Source: ABdhPJxt6Ghu0QqjE5pKCuz2qNQ769NOHmconJRMarXcG62+ijJ0Vw2J/48YV3pwijDVAYojPE2dgA== X-Received: by 2002:a7b:c8c2:0:b0:389:9746:847c with SMTP id f2-20020a7bc8c2000000b003899746847cmr8310103wml.156.1646843479237; Wed, 09 Mar 2022 08:31:19 -0800 (PST) Received: from localhost ([137.220.125.106]) by smtp.gmail.com with ESMTPSA id c11-20020a05600c0a4b00b0037c91e085ddsm6558895wmq.40.2022.03.09.08.31.18 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 09 Mar 2022 08:31:18 -0800 (PST) From: luca.boccassi@gmail.com To: Stephen Douthit Cc: Jeff Daly , Haiyue Wang , dpdk stable Subject: patch 'net/ixgbe: fix FSP check for X550EM devices' has been queued to stable release 20.11.5 Date: Wed, 9 Mar 2022 16:30:26 +0000 Message-Id: <20220309163053.245754-10-luca.boccassi@gmail.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20220309163053.245754-1-luca.boccassi@gmail.com> References: <20220218123931.1749595-1-luca.boccassi@gmail.com> <20220309163053.245754-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.5 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 03/11/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/bluca/dpdk-stable This queued commit can be viewed at: https://github.com/bluca/dpdk-stable/commit/f0a47837dd5090aebd748f244d5c333bfbebf0b3 Thanks. Luca Boccassi --- >From f0a47837dd5090aebd748f244d5c333bfbebf0b3 Mon Sep 17 00:00:00 2001 From: Stephen Douthit Date: Mon, 28 Feb 2022 10:29:35 -0500 Subject: [PATCH] net/ixgbe: fix FSP check for X550EM devices [ upstream commit 05271b99a93ae306fe4abe09fa561f0220469724 ] Currently all X500EM* MAC types fall through to the default case and get reported as non-SFP regardless of media type, which isn't correct. Fixes: 0790adeb5675 ("ixgbe/base: support X550em_a device") Signed-off-by: Stephen Douthit Signed-off-by: Jeff Daly Acked-by: Haiyue Wang --- drivers/net/ixgbe/ixgbe_ethdev.c | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/drivers/net/ixgbe/ixgbe_ethdev.c b/drivers/net/ixgbe/ixgbe_ethdev.c index c741698d70..08d6bb66a5 100644 --- a/drivers/net/ixgbe/ixgbe_ethdev.c +++ b/drivers/net/ixgbe/ixgbe_ethdev.c @@ -788,6 +788,20 @@ ixgbe_is_sfp(struct ixgbe_hw *hw) case ixgbe_phy_sfp_passive_unknown: return 1; default: + /* x550em devices may be SFP, check media type */ + switch (hw->mac.type) { + case ixgbe_mac_X550EM_x: + case ixgbe_mac_X550EM_a: + switch (ixgbe_get_media_type(hw)) { + case ixgbe_media_type_fiber: + case ixgbe_media_type_fiber_qsfp: + return 1; + default: + break; + } + default: + break; + } return 0; } } -- 2.30.2 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2022-03-09 16:30:08.911145714 +0000 +++ 0010-net-ixgbe-fix-FSP-check-for-X550EM-devices.patch 2022-03-09 16:30:08.507024258 +0000 @@ -1 +1 @@ -From 05271b99a93ae306fe4abe09fa561f0220469724 Mon Sep 17 00:00:00 2001 +From f0a47837dd5090aebd748f244d5c333bfbebf0b3 Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit 05271b99a93ae306fe4abe09fa561f0220469724 ] + @@ -10 +11,0 @@ -Cc: stable@dpdk.org @@ -20 +21 @@ -index 7643842560..2da3f67bbc 100644 +index c741698d70..08d6bb66a5 100644 @@ -23 +24 @@ -@@ -781,6 +781,20 @@ ixgbe_is_sfp(struct ixgbe_hw *hw) +@@ -788,6 +788,20 @@ ixgbe_is_sfp(struct ixgbe_hw *hw)