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 C99CD4624E for ; Mon, 17 Feb 2025 18:08:10 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id C359A400EF; Mon, 17 Feb 2025 18:08:10 +0100 (CET) Received: from mail-lf1-f50.google.com (mail-lf1-f50.google.com [209.85.167.50]) by mails.dpdk.org (Postfix) with ESMTP id 80AAA400EF for ; Mon, 17 Feb 2025 18:08:09 +0100 (CET) Received: by mail-lf1-f50.google.com with SMTP id 2adb3069b0e04-5461f2ca386so1228107e87.1 for ; Mon, 17 Feb 2025 09:08:09 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1739812089; x=1740416889; darn=dpdk.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=pa4T6248DdMMzoxtaP0WlRZUJ+4nRe/7fZkRkFnyomE=; b=NzMQt+wL5lv/hxCT9qLAJ6a4inqiTngEHq7t8y9DQIQY/mhOMyDGFostbz1L49kZ8j 36PqGAdyAH0RFlxb7gpUtSLVKz51l4Z7FGe9y531yQwqIwuq+3LcT3AcmJkT/+Pn6yp5 WLUXWpti2D2DZ7YRCUVBH2AaVWnY1WAgRg9vbNp2XFyKe+lOmGynxk1xg4aPRrmUEnCb tzreTr85PF0A2w2lIlIPNpREPKONTaoggCzqSzEOw+RzBxA0ZvYS67ZC/WCuM+tTN9Cy HCGraWyxMG0PP547D1JNpFsQL1ksolix8GA5Eg8vGFGRKvuv4AG18AKGnLN92zzPA1cl D9kA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1739812089; x=1740416889; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=pa4T6248DdMMzoxtaP0WlRZUJ+4nRe/7fZkRkFnyomE=; b=O6XDU6Wl6tSd9IdUDU0iT8wITlRiJmgD9dZmsk6DERRpqgKEXi9WBBr9Ht+fqLJLED zRdFARcZnWSw7sMHnGKWXRiXLM+9zWRh1RjgZ4r3GSKqn1LJw/5CUiBlDtPD/bnJxksv ooWfiKYoK4dyatg++8Cpl69pXJ93wztXtOTl++IqrSI2oxLwlcStpT2cPuJ4dkltP8Qn ueOB2sgdoWOcOX9gqs6VITh2YuETEZblQFy+2A+1r2G+1PRbxk/2Mgh+zkvIyqnz4h2k qAUIfI80AnUptUtjODX1WyOQi4p9DyHd63vKTBJEO2zXxji5lwGe/8PBk8IaOUsCEsLs O7vQ== X-Forwarded-Encrypted: i=1; AJvYcCVG5SFpMavmzo7BbNPaT7ZI5YHGxC6C8pGNxbAWyqAuNpFmkSOrKiOixzy7uwufb6ghkg3nju0=@dpdk.org X-Gm-Message-State: AOJu0YyVpeX6KRwhhlC9TtQFcCIipt9VCTibRa+6KrgK8wK3YZwy8eCZ HVwmMfIFC/gmnejZIFW8+8+iGrOLXzPC2MR0P5G+LCt0SZWzYMljEHKV0HbG8FNhAA== X-Gm-Gg: ASbGnctS1VfnEskSAWXy2iA6DSpRVg3aAryPRO0SP+KIrj/D59n/ktShOzYFGqZI/sY Zxa9uKrkfawdll+vHoD6SJrvY/OxdDMwqZJnXxRjb68ZmyitJYGPkmXhbPiYFI2xXjksw849ca/ LJIuzJCTuYtHoAPWSCkcwyGffc76PU2fR1sbZxcHoK9OBGw8Y+zxUZbL7hNbLgwbnCCJcjkF83v hQTpoawR3G2z0slMEKzlGItqo4h3jDHKtiXJnHjNpDnPL1u9HXUU3rVKFFUQA2cmUlPYViiv0IC pMi1w4xH63RD6Pwn5dJHzg== X-Google-Smtp-Source: AGHT+IFgOCEth1QqMQAOXu/zUOHP2mnYr6ywEAWlAj3e8xh4kfkV+u1HghslgBgRazYwKxKso+vsNQ== X-Received: by 2002:a5d:59ab:0:b0:38f:32ac:7e69 with SMTP id ffacd0b85a97d-38f3406786dmr11038468f8f.41.1739812069674; Mon, 17 Feb 2025 09:07:49 -0800 (PST) Received: from localhost ([2a01:4b00:d036:ae00:f83c:95e7:29fd:a997]) by smtp.gmail.com with UTF8SMTPSA id 5b1f17b1804b1-4395a04f22fsm157092125e9.5.2025.02.17.09.07.49 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 17 Feb 2025 09:07:49 -0800 (PST) From: luca.boccassi@gmail.com 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 22.11.8 Date: Mon, 17 Feb 2025 17:04:28 +0000 Message-ID: <20250217170456.1068278-55-luca.boccassi@gmail.com> X-Mailer: git-send-email 2.47.2 In-Reply-To: <20250217170456.1068278-1-luca.boccassi@gmail.com> References: <20250217170456.1068278-1-luca.boccassi@gmail.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 22.11.8 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/19/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/bluca/dpdk-stable This queued commit can be viewed at: https://github.com/bluca/dpdk-stable/commit/8b374b7900060cba14fd2a4fe79d7fcf380a3ebf Thanks. Luca Boccassi --- >From 8b374b7900060cba14fd2a4fe79d7fcf380a3ebf 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 7c78649393..77c76685d8 100644 --- a/drivers/net/e1000/base/e1000_82575.c +++ b/drivers/net/e1000/base/e1000_82575.c @@ -2279,7 +2279,7 @@ STATIC s32 e1000_reset_hw_82580(struct e1000_hw *hw) s32 ret_val = E1000_SUCCESS; /* 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; DEBUGFUNC("e1000_reset_hw_82580"); @@ -2344,7 +2344,8 @@ 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. */ E1000_WRITE_REG(hw, E1000_IMC, 0xffffffff); -- 2.47.2 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2025-02-17 16:13:18.791290048 +0000 +++ 0055-net-e1000-base-fix-reset-for-82580.patch 2025-02-17 16:13:16.850441592 +0000 @@ -1 +1 @@ -From 88a1eb79ef08d309af58ad4921db7200fa7c5073 Mon Sep 17 00:00:00 2001 +From 8b374b7900060cba14fd2a4fe79d7fcf380a3ebf 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,5 +21,5 @@ -diff --git a/drivers/net/intel/e1000/base/e1000_82575.c b/drivers/net/intel/e1000/base/e1000_82575.c -index 53900cf8f1..948c80f2fa 100644 ---- a/drivers/net/intel/e1000/base/e1000_82575.c -+++ b/drivers/net/intel/e1000/base/e1000_82575.c -@@ -2280,7 +2280,7 @@ STATIC s32 e1000_reset_hw_82580(struct e1000_hw *hw) +diff --git a/drivers/net/e1000/base/e1000_82575.c b/drivers/net/e1000/base/e1000_82575.c +index 7c78649393..77c76685d8 100644 +--- a/drivers/net/e1000/base/e1000_82575.c ++++ b/drivers/net/e1000/base/e1000_82575.c +@@ -2279,7 +2279,7 @@ STATIC s32 e1000_reset_hw_82580(struct e1000_hw *hw) @@ -33 +34 @@ -@@ -2345,7 +2345,8 @@ STATIC s32 e1000_reset_hw_82580(struct e1000_hw *hw) +@@ -2344,7 +2344,8 @@ STATIC s32 e1000_reset_hw_82580(struct e1000_hw *hw)