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 A73AB46211 for ; Thu, 13 Feb 2025 11:03:43 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id A164442EE7; Thu, 13 Feb 2025 11:03:43 +0100 (CET) Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by mails.dpdk.org (Postfix) with ESMTP id 3E24B42EE7 for ; Thu, 13 Feb 2025 11:03:42 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1739441021; 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=4C3Eyhoy1RNiI7zVqWT0QAcf5rKcsqKlbkfOP9jbPdE=; b=Jcu3zGEFx335PVQ0L+12Pr5+CVpvN3jdWrWjsC5t5B42bAVlHZ2dxFQ10rBIr3snS9RV5l PIS/mDz1NqKr3SHsmiBm30Ey39zoldCSIJh21pYSbXirklCsi49W+z3rMWkCh+LXNt7Iee 8BDbqB3YYl+xX1r/bwEl4Okj5rgUKMU= Received: from mx-prod-mc-08.mail-002.prod.us-west-2.aws.redhat.com (ec2-35-165-154-97.us-west-2.compute.amazonaws.com [35.165.154.97]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-32-eHYWJr9bOSiwMiShmYCI1w-1; Thu, 13 Feb 2025 05:03:36 -0500 X-MC-Unique: eHYWJr9bOSiwMiShmYCI1w-1 X-Mimecast-MFC-AGG-ID: eHYWJr9bOSiwMiShmYCI1w_1739441015 Received: from mx-prod-int-06.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-06.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.93]) (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 mx-prod-mc-08.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id 9577D1801A2B; Thu, 13 Feb 2025 10:03:35 +0000 (UTC) Received: from rh.Home (unknown [10.45.224.21]) by mx-prod-int-06.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id B6D0F1800359; Thu, 13 Feb 2025 10:03:33 +0000 (UTC) From: Kevin Traynor To: Carolyn Wyborny Cc: Anatoly Burakov , Bruce Richardson , dpdk stable Subject: patch 'net/e1000/base: skip management check for 82575' has been queued to stable release 24.11.2 Date: Thu, 13 Feb 2025 09:59:06 +0000 Message-ID: <20250213095933.362078-99-ktraynor@redhat.com> In-Reply-To: <20250213095933.362078-1-ktraynor@redhat.com> References: <20250213095933.362078-1-ktraynor@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.4.1 on 10.30.177.93 X-Mimecast-Spam-Score: 0 X-Mimecast-MFC-PROC-ID: Ulm2BehbZNiWWOYjznhz93FEzmPhKP-V2M6SDtApWJs_1739441015 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 24.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 02/17/25. 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/a4739a0dd4123ff8e77ae931c0cb48d2bc641e08 Thanks. Kevin --- >From a4739a0dd4123ff8e77ae931c0cb48d2bc641e08 Mon Sep 17 00:00:00 2001 From: Carolyn Wyborny Date: Thu, 6 Feb 2025 16:08:47 +0000 Subject: [PATCH] net/e1000/base: skip management check for 82575 [ upstream commit d107a23f60c6a8b9543c386ecc48abc4f92f50d3 ] On 82575, driver is not supposed to check if management control is enabled, and flush the Rx FIFO unconditionally. Fixes: 44dddd14059f ("net/e1000/base: remove duplicated codes") Signed-off-by: Carolyn Wyborny Signed-off-by: Anatoly Burakov Acked-by: Bruce Richardson --- drivers/net/e1000/base/e1000_base.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/drivers/net/e1000/base/e1000_base.c b/drivers/net/e1000/base/e1000_base.c index 3ec32e7240..e10bc6907a 100644 --- a/drivers/net/e1000/base/e1000_base.c +++ b/drivers/net/e1000/base/e1000_base.c @@ -133,5 +133,6 @@ void e1000_rx_fifo_flush_base(struct e1000_hw *hw) E1000_WRITE_REG(hw, E1000_RFCTL, rfctl); - if (!(E1000_READ_REG(hw, E1000_MANC) & E1000_MANC_RCV_TCO_EN)) + if (hw->mac.type != e1000_82575 || + !(E1000_READ_REG(hw, E1000_MANC) & E1000_MANC_RCV_TCO_EN)) return; -- 2.48.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2025-02-12 17:29:45.066605196 +0000 +++ 0099-net-e1000-base-skip-management-check-for-82575.patch 2025-02-12 17:29:34.589947356 +0000 @@ -1 +1 @@ -From d107a23f60c6a8b9543c386ecc48abc4f92f50d3 Mon Sep 17 00:00:00 2001 +From a4739a0dd4123ff8e77ae931c0cb48d2bc641e08 Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit d107a23f60c6a8b9543c386ecc48abc4f92f50d3 ] + @@ -10 +11,0 @@ -Cc: stable@dpdk.org @@ -16 +17 @@ - drivers/net/intel/e1000/base/e1000_base.c | 3 ++- + drivers/net/e1000/base/e1000_base.c | 3 ++- @@ -19 +20 @@ -diff --git a/drivers/net/intel/e1000/base/e1000_base.c b/drivers/net/intel/e1000/base/e1000_base.c +diff --git a/drivers/net/e1000/base/e1000_base.c b/drivers/net/e1000/base/e1000_base.c @@ -21,2 +22,2 @@ ---- a/drivers/net/intel/e1000/base/e1000_base.c -+++ b/drivers/net/intel/e1000/base/e1000_base.c +--- a/drivers/net/e1000/base/e1000_base.c ++++ b/drivers/net/e1000/base/e1000_base.c