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 9FCF9A0555 for ; Thu, 9 Jun 2022 13:38:03 +0200 (CEST) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 9AAB940220; Thu, 9 Jun 2022 13:38:03 +0200 (CEST) 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 3284040220 for ; Thu, 9 Jun 2022 13:38:02 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1654774681; 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=60I5tMyX80Q6DxfGIcc9uFkK9CFwSOuSMTEU4Ah1DK8=; b=XG89dsG5ujZFqlzlPag/F8V3nIIPHFx9bgCJJIw5kx9EoQ1bQQ5qBgEPMB29DbxuxR/1rc uMPzW/6QX4ZqNn23fW6Q1wd25BPgBGtzT2tJ+q9e/kd+xddgbaVkGAvA+axE1FOccMy1r+ YCQPsivSWOjds18NNAPPNbYs6LuvILs= Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-427-6vZZV9z9NiCpmtio4mQl2Q-1; Thu, 09 Jun 2022 07:38:00 -0400 X-MC-Unique: 6vZZV9z9NiCpmtio4mQl2Q-1 Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.rdu2.redhat.com [10.11.54.5]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 6B76780B712; Thu, 9 Jun 2022 11:38:00 +0000 (UTC) Received: from rh.redhat.com (unknown [10.39.195.82]) by smtp.corp.redhat.com (Postfix) with ESMTP id 9ED2E18EA9; Thu, 9 Jun 2022 11:37:59 +0000 (UTC) From: Kevin Traynor To: Jiawen Wu Cc: dpdk stable Subject: patch 'net/ngbe: fix link speed check' has been queued to stable release 21.11.2 Date: Thu, 9 Jun 2022 12:36:23 +0100 Message-Id: <20220609113701.386938-36-ktraynor@redhat.com> In-Reply-To: <20220609113701.386938-1-ktraynor@redhat.com> References: <20220609113701.386938-1-ktraynor@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.11.54.5 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-default=true 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.2 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 06/13/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/c2f1874e68453fa6cc7a51c7cc28da29b8a73753 Thanks. Kevin --- >From c2f1874e68453fa6cc7a51c7cc28da29b8a73753 Mon Sep 17 00:00:00 2001 From: Jiawen Wu Date: Mon, 30 May 2022 17:30:08 +0800 Subject: [PATCH] net/ngbe: fix link speed check [ upstream commit bf1bc993eab153ffc488c435ad007bd827b7cd37 ] Since the bit of ETH_LINK_SPEED_FIXED was set for the force link speed, it conflicts with '~allowed_speeds'. Fixes: 3518df5774c7 ("net/ngbe: support device start/stop") Signed-off-by: Jiawen Wu --- drivers/net/ngbe/ngbe_ethdev.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/net/ngbe/ngbe_ethdev.c b/drivers/net/ngbe/ngbe_ethdev.c index 30c9e68579..af8d6911d1 100644 --- a/drivers/net/ngbe/ngbe_ethdev.c +++ b/drivers/net/ngbe/ngbe_ethdev.c @@ -1042,5 +1042,5 @@ ngbe_dev_start(struct rte_eth_dev *dev) allowed_speeds |= RTE_ETH_LINK_SPEED_10M; - if (*link_speeds & ~allowed_speeds) { + if (((*link_speeds) >> 1) & ~(allowed_speeds >> 1)) { PMD_INIT_LOG(ERR, "Invalid link setting"); goto error; -- 2.34.3 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2022-06-09 12:34:30.628146466 +0100 +++ 0036-net-ngbe-fix-link-speed-check.patch 2022-06-09 12:34:29.741980634 +0100 @@ -1 +1 @@ -From bf1bc993eab153ffc488c435ad007bd827b7cd37 Mon Sep 17 00:00:00 2001 +From c2f1874e68453fa6cc7a51c7cc28da29b8a73753 Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit bf1bc993eab153ffc488c435ad007bd827b7cd37 ] + @@ -10 +11,0 @@ -Cc: stable@dpdk.org @@ -18 +19 @@ -index 4a2a9dde10..c7301a9616 100644 +index 30c9e68579..af8d6911d1 100644 @@ -21 +22 @@ -@@ -1049,5 +1049,5 @@ ngbe_dev_start(struct rte_eth_dev *dev) +@@ -1042,5 +1042,5 @@ ngbe_dev_start(struct rte_eth_dev *dev)