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 EAF3FA00C2 for ; Tue, 8 Mar 2022 15:15:50 +0100 (CET) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id E6A904068B; Tue, 8 Mar 2022 15:15:50 +0100 (CET) Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) by mails.dpdk.org (Postfix) with ESMTP id E94564068B for ; Tue, 8 Mar 2022 15:15:49 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1646748949; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=aX98YUj6Mnh42AxnItbU+fHh39D8UBqEq2hLHItDffs=; b=XkWuIRFKgNv9j53Oa/S/TnONvVH1kT5BdKBGX//yUMTDtbwPpYZGFBleqJHaBRiuftZll/ UbX7jeqccoRNwBt18pYRN360owIbJ6d9yNNqAbxww7gSDx0oWhodYMY1xVwma0PN1cG9MQ lVHOmuMAcQRSkOMQIWj8WparELQ7yjY= Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-621-inIE0ff9NUem_CIL6b8_ZA-1; Tue, 08 Mar 2022 09:15:46 -0500 X-MC-Unique: inIE0ff9NUem_CIL6b8_ZA-1 Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.phx2.redhat.com [10.5.11.13]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 0C529824FA6; Tue, 8 Mar 2022 14:15:45 +0000 (UTC) Received: from rh.Home (unknown [10.39.195.190]) by smtp.corp.redhat.com (Postfix) with ESMTP id D5B69865A4; Tue, 8 Mar 2022 14:15:43 +0000 (UTC) From: Kevin Traynor 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 21.11.1 Date: Tue, 8 Mar 2022 14:14:29 +0000 Message-Id: <20220308141500.286915-14-ktraynor@redhat.com> In-Reply-To: <20220308141500.286915-1-ktraynor@redhat.com> References: <20220308141500.286915-1-ktraynor@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.13 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=ktraynor@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII" 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 21.11.1 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/14/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/04134338465957566ff35028bba8363743e600af Thanks. Kevin --- >From 04134338465957566ff35028bba8363743e600af 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 d1d0bd13df..052fdb9639 100644 --- a/drivers/net/ixgbe/ixgbe_ethdev.c +++ b/drivers/net/ixgbe/ixgbe_ethdev.c @@ -782,4 +782,18 @@ ixgbe_is_sfp(struct ixgbe_hw *hw) 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.34.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2022-03-08 13:55:28.790548509 +0000 +++ 0014-net-ixgbe-fix-FSP-check-for-X550EM-devices.patch 2022-03-08 13:55:28.408314920 +0000 @@ -1 +1 @@ -From 05271b99a93ae306fe4abe09fa561f0220469724 Mon Sep 17 00:00:00 2001 +From 04134338465957566ff35028bba8363743e600af 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 d1d0bd13df..052fdb9639 100644