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 3D074A0093 for ; Wed, 9 Mar 2022 12:03:26 +0100 (CET) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 342B44068E; Wed, 9 Mar 2022 12:03:26 +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 1EDA940150 for ; Wed, 9 Mar 2022 12:03:25 +0100 (CET) Received: from mail-ej1-f71.google.com (mail-ej1-f71.google.com [209.85.218.71]) (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 AE9443F79C for ; Wed, 9 Mar 2022 11:03:24 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=canonical.com; s=20210705; t=1646823804; bh=Dht+Ak0t9enJvccB87C68KytY6kghQrFCFUk5Oq7gg4=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=iFfTgec8kD9J5TQ1X4nq58yCgMjcRTxc7psthknYjMHnAGlLfmvWWUDPTbLIfnD+X 9iHQ3hGoF9hbwhCre+kdyVhrSVtNT34Km/k62aPzHrFdCxEllyXKrGWwRwjXqaDs7J Feer8NIeIwMNQWyM0aawzPOhcZgZ7u65ata46EOtwBt0fH3h1snQ1UlYNowRWUeV6j 1WTtBa9C0WyxdqJ/c7+ZrUFydFxpDgtPRlnVxxt4wi6S6F9ruJHEl36/nnORXx95sD stscl7wFTQwqPAZNujijw8ihZ9z8homqeWjmCfyyeZBmr5o+9hUGe50zy2TZM+KF+r 4GVoEyS1/OY9Q== Received: by mail-ej1-f71.google.com with SMTP id hx13-20020a170906846d00b006db02e1a307so1116947ejc.2 for ; Wed, 09 Mar 2022 03:03:24 -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=Dht+Ak0t9enJvccB87C68KytY6kghQrFCFUk5Oq7gg4=; b=Zsph1waAi2AqkjE41SRQS4yMMupJmTyne/kP/1JTKIvP4h4FRsBgLCd5YbEOYtOpm3 8fwLOfVKdbsRvbeg5V8WRnBk257snWBzmKguhjFSsTCpTvCz1bSE52IKyGW2nCycNpwg g4G7ZTP2TkUaPj/7OWx++On9wbLJCUqFjkPFSs2LlGcWRJ6DJ/gpVfKgRwxjB+ACTxDU ZG1s3/gr6tPPhCg0t+CMREg+S0IyjCLJ1vwBDM2wsg1tmNbiM9KWdUdC6RxkZsmvCOsb 8/9OZiO+8ZWXUm5OP32fRoYKK4oq7GeMYyf0sW4psqNItr8cQHVj7zwkSAwmCMS15org h28g== X-Gm-Message-State: AOAM531M8M9k8i5LGsBIwKtHaLrU4hIPWEGv5s5tpyFyR+EasuDWH/4h Byo+LI+vpfndSd1sgwpYXTjDfcOMzELeIeF6MTpr2fg+e7FTtLVBaUNhlcidd0bBC2c4c3ts/Sz EFAruYejIUS3XcOeZHboFXq9A X-Received: by 2002:a17:907:6e8c:b0:6da:7ac4:5346 with SMTP id sh12-20020a1709076e8c00b006da7ac45346mr17050703ejc.300.1646823803872; Wed, 09 Mar 2022 03:03:23 -0800 (PST) X-Google-Smtp-Source: ABdhPJyJrBbFcOvsBCSqD4SDbnPRMHF9foJKrlKmIdyGbKmRAcPFcKmv0l5po5s6/mT/vCiJXcxl/Q== X-Received: by 2002:a17:907:6e8c:b0:6da:7ac4:5346 with SMTP id sh12-20020a1709076e8c00b006da7ac45346mr17050690ejc.300.1646823803647; Wed, 09 Mar 2022 03:03:23 -0800 (PST) Received: from localhost.localdomain (068-133-067-156.ip-addr.inexio.net. [156.67.133.68]) by smtp.gmail.com with ESMTPSA id c1-20020a170906762100b006d00ae72b0csm568601ejn.221.2022.03.09.03.03.23 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 09 Mar 2022 03:03:23 -0800 (PST) From: christian.ehrhardt@canonical.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 19.11.12 Date: Wed, 9 Mar 2022 12:01:08 +0100 Message-Id: <20220309110116.1295395-37-christian.ehrhardt@canonical.com> X-Mailer: git-send-email 2.35.1 In-Reply-To: <20220309110116.1295395-1-christian.ehrhardt@canonical.com> References: <20220309110116.1295395-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.12 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/cpaelzer/dpdk-stable-queue This queued commit can be viewed at: https://github.com/cpaelzer/dpdk-stable-queue/commit/5243c1dd8ed176a70fbde70abeb115d0a6df02a9 Thanks. Christian Ehrhardt --- >From 5243c1dd8ed176a70fbde70abeb115d0a6df02a9 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 0c4eb682bc..b06ff64faa 100644 --- a/drivers/net/ixgbe/ixgbe_ethdev.c +++ b/drivers/net/ixgbe/ixgbe_ethdev.c @@ -834,6 +834,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.35.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2022-03-09 11:57:45.289093145 +0100 +++ 0037-net-ixgbe-fix-FSP-check-for-X550EM-devices.patch 2022-03-09 11:57:43.408938482 +0100 @@ -1 +1 @@ -From 05271b99a93ae306fe4abe09fa561f0220469724 Mon Sep 17 00:00:00 2001 +From 5243c1dd8ed176a70fbde70abeb115d0a6df02a9 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 0c4eb682bc..b06ff64faa 100644 @@ -23 +24 @@ -@@ -781,6 +781,20 @@ ixgbe_is_sfp(struct ixgbe_hw *hw) +@@ -834,6 +834,20 @@ ixgbe_is_sfp(struct ixgbe_hw *hw)