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 4E08446211 for ; Thu, 13 Feb 2025 11:03:34 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 4967B42F5D; Thu, 13 Feb 2025 11:03:34 +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 95C5642F67 for ; Thu, 13 Feb 2025 11:03:33 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1739441013; 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=hRwLtSfD6PHzprAnon/f/rgD2RCjgtpxXIyT454Oywk=; b=NcqDla3idjuuQl6eCBwIBgYblNpTDSv+/P7xKXDDyUsKFK7gws6xf2bs7M2FA5J42Uoir8 /iKj8e2dYTz/93soZJMIl6lDwvVH72Qkht+FQpikuOJfAu/oNCTPhRbrctLAxDqPpDxXKg Z5oEBzNuM2oZveTifI+5Kolfuf9vgI0= 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-622-lkwgVKwAOcGPE9TWEsXMtg-1; Thu, 13 Feb 2025 05:03:31 -0500 X-MC-Unique: lkwgVKwAOcGPE9TWEsXMtg-1 X-Mimecast-MFC-AGG-ID: lkwgVKwAOcGPE9TWEsXMtg 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 A89AD180087C; Thu, 13 Feb 2025 10:03:30 +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 D7E001800365; Thu, 13 Feb 2025 10:03:28 +0000 (UTC) From: Kevin Traynor To: Barbara Skobiej Cc: Anatoly Burakov , Bruce Richardson , dpdk stable Subject: patch 'net/e1000/base: fix reset for 82580' has been queued to stable release 24.11.2 Date: Thu, 13 Feb 2025 09:59:04 +0000 Message-ID: <20250213095933.362078-97-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: Op04pvAHIpvIbula63IEPdUAvdOSYoRsiKY1dJekcDg_1739441010 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/f0c0d2ff0ebb7d77ce3b58eedaec7fd338d897e2 Thanks. Kevin --- >From f0c0d2ff0ebb7d77ce3b58eedaec7fd338d897e2 Mon Sep 17 00:00:00 2001 From: Barbara Skobiej Date: Thu, 6 Feb 2025 16:08:45 +0000 Subject: [PATCH] net/e1000/base: fix reset for 82580 [ upstream commit 88a1eb79ef08d309af58ad4921db7200fa7c5073 ] Fix setting device reset status bit in e1000_reset_hw_82580() function for 82580 by first reading the register value, and then setting the device reset bit. Fixes: af75078fece3 ("first public release") Signed-off-by: Barbara Skobiej Signed-off-by: Anatoly Burakov Acked-by: Bruce Richardson --- drivers/net/e1000/base/e1000_82575.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/drivers/net/e1000/base/e1000_82575.c b/drivers/net/e1000/base/e1000_82575.c index 53900cf8f1..948c80f2fa 100644 --- a/drivers/net/e1000/base/e1000_82575.c +++ b/drivers/net/e1000/base/e1000_82575.c @@ -2281,5 +2281,5 @@ STATIC s32 e1000_reset_hw_82580(struct e1000_hw *hw) /* BH SW mailbox bit in SW_FW_SYNC */ u16 swmbsw_mask = E1000_SW_SYNCH_MB; - u32 ctrl; + u32 ctrl, status; bool global_device_reset = hw->dev_spec._82575.global_device_reset; @@ -2346,5 +2346,6 @@ STATIC s32 e1000_reset_hw_82580(struct e1000_hw *hw) /* clear global device reset status bit */ - E1000_WRITE_REG(hw, E1000_STATUS, E1000_STAT_DEV_RST_SET); + status = E1000_READ_REG(hw, E1000_STATUS); + E1000_WRITE_REG(hw, E1000_STATUS, status | E1000_STAT_DEV_RST_SET); /* Clear any pending interrupt events. */ -- 2.48.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2025-02-12 17:29:44.870518382 +0000 +++ 0097-net-e1000-base-fix-reset-for-82580.patch 2025-02-12 17:29:34.580947302 +0000 @@ -1 +1 @@ -From 88a1eb79ef08d309af58ad4921db7200fa7c5073 Mon Sep 17 00:00:00 2001 +From f0c0d2ff0ebb7d77ce3b58eedaec7fd338d897e2 Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit 88a1eb79ef08d309af58ad4921db7200fa7c5073 ] + @@ -11 +12,0 @@ -Cc: stable@dpdk.org @@ -17 +18 @@ - drivers/net/intel/e1000/base/e1000_82575.c | 5 +++-- + drivers/net/e1000/base/e1000_82575.c | 5 +++-- @@ -20 +21 @@ -diff --git a/drivers/net/intel/e1000/base/e1000_82575.c b/drivers/net/intel/e1000/base/e1000_82575.c +diff --git a/drivers/net/e1000/base/e1000_82575.c b/drivers/net/e1000/base/e1000_82575.c @@ -22,2 +23,2 @@ ---- a/drivers/net/intel/e1000/base/e1000_82575.c -+++ b/drivers/net/intel/e1000/base/e1000_82575.c +--- a/drivers/net/e1000/base/e1000_82575.c ++++ b/drivers/net/e1000/base/e1000_82575.c