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 3305746211 for ; Thu, 13 Feb 2025 11:03:19 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 2EFA342F45; Thu, 13 Feb 2025 11:03:19 +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 46C2442EE7 for ; Thu, 13 Feb 2025 11:03:18 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1739440997; 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=60cLSi9nnA6ptCKY59hp+qniDesFYuJ45IOpPGrPCP8=; b=iiYxENgBDtJvX8+rBk+5fUriFX6pSmJSDq197bBnreaJAdrwCAJRmxhD1iHyZ+dbdQPnJz uq7ahNJoIS/mFfie9iLmYJOzpSQfrjQW+WgPdDbWdMxAX706KdF4c0hbDybpeO5m+LUqJI SV8JyIZSifszDqcMgQv3P/cps4ozWvA= Received: from mx-prod-mc-06.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-556-W-ED5PmQPDK_JFfzb4oN8w-1; Thu, 13 Feb 2025 05:03:12 -0500 X-MC-Unique: W-ED5PmQPDK_JFfzb4oN8w-1 X-Mimecast-MFC-AGG-ID: W-ED5PmQPDK_JFfzb4oN8w 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-06.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id 6E876180034E; Thu, 13 Feb 2025 10:03:11 +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 8E49B1800365; Thu, 13 Feb 2025 10:03:09 +0000 (UTC) From: Kevin Traynor To: Pawel Malinowski Cc: Anatoly Burakov , Bruce Richardson , dpdk stable Subject: patch 'net/e1000/base: fix semaphore timeout value' has been queued to stable release 24.11.2 Date: Thu, 13 Feb 2025 09:58:56 +0000 Message-ID: <20250213095933.362078-89-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: lNj2e8rZ08D2e7vGwgRT2yKWoQ-NHnxPCAFpb2Z1LXA_1739440991 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/dd2a3409a576403fd8a7dfc89a99800a14e6e60b Thanks. Kevin --- >From dd2a3409a576403fd8a7dfc89a99800a14e6e60b Mon Sep 17 00:00:00 2001 From: Pawel Malinowski Date: Thu, 6 Feb 2025 16:08:37 +0000 Subject: [PATCH] net/e1000/base: fix semaphore timeout value [ upstream commit c8bcaf0f2a02995b447c121e860fd550b9c55114 ] According to datasheet, software ownership of SWSM.SWESMBI bit should not exceed 100ms. Current implementation caused incorrect timeout counter values, where each iteration equals 50us delay. Because of that driver was allowed to wait for semaphore even for 1.5s. This might trigger DPC timeout. This implementation hardcodes value to 2000, which multiplied by 50us, gives 100ms of possible wait time. Fixes: af75078fece3 ("first public release") Signed-off-by: Pawel Malinowski Signed-off-by: Anatoly Burakov Acked-by: Bruce Richardson --- drivers/net/e1000/base/e1000_defines.h | 1 + drivers/net/e1000/base/e1000_mac.c | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/drivers/net/e1000/base/e1000_defines.h b/drivers/net/e1000/base/e1000_defines.h index 3fbb6c8ea4..97cc2797b2 100644 --- a/drivers/net/e1000/base/e1000_defines.h +++ b/drivers/net/e1000/base/e1000_defines.h @@ -505,4 +505,5 @@ #define E1000_SWSM_SMBI 0x00000001 /* Driver Semaphore bit */ #define E1000_SWSM_SWESMBI 0x00000002 /* FW Semaphore bit */ +#define E1000_SWSM_TIMEOUT 2000 /* Driver Semaphore max timeout counter */ #define E1000_SWSM_DRV_LOAD 0x00000008 /* Driver Loaded Bit */ diff --git a/drivers/net/e1000/base/e1000_mac.c b/drivers/net/e1000/base/e1000_mac.c index d3b3a6bac9..cf0a9f21e1 100644 --- a/drivers/net/e1000/base/e1000_mac.c +++ b/drivers/net/e1000/base/e1000_mac.c @@ -1689,5 +1689,5 @@ s32 e1000_get_hw_semaphore_generic(struct e1000_hw *hw) { u32 swsm; - s32 timeout = hw->nvm.word_size + 1; + s32 timeout = E1000_SWSM_TIMEOUT; s32 i = 0; -- 2.48.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2025-02-12 17:29:44.090109931 +0000 +++ 0089-net-e1000-base-fix-semaphore-timeout-value.patch 2025-02-12 17:29:34.550947123 +0000 @@ -1 +1 @@ -From c8bcaf0f2a02995b447c121e860fd550b9c55114 Mon Sep 17 00:00:00 2001 +From dd2a3409a576403fd8a7dfc89a99800a14e6e60b Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit c8bcaf0f2a02995b447c121e860fd550b9c55114 ] + @@ -16 +17,0 @@ -Cc: stable@dpdk.org @@ -22,2 +23,2 @@ - drivers/net/intel/e1000/base/e1000_defines.h | 1 + - drivers/net/intel/e1000/base/e1000_mac.c | 2 +- + drivers/net/e1000/base/e1000_defines.h | 1 + + drivers/net/e1000/base/e1000_mac.c | 2 +- @@ -26 +27 @@ -diff --git a/drivers/net/intel/e1000/base/e1000_defines.h b/drivers/net/intel/e1000/base/e1000_defines.h +diff --git a/drivers/net/e1000/base/e1000_defines.h b/drivers/net/e1000/base/e1000_defines.h @@ -28,2 +29,2 @@ ---- a/drivers/net/intel/e1000/base/e1000_defines.h -+++ b/drivers/net/intel/e1000/base/e1000_defines.h +--- a/drivers/net/e1000/base/e1000_defines.h ++++ b/drivers/net/e1000/base/e1000_defines.h @@ -36 +37 @@ -diff --git a/drivers/net/intel/e1000/base/e1000_mac.c b/drivers/net/intel/e1000/base/e1000_mac.c +diff --git a/drivers/net/e1000/base/e1000_mac.c b/drivers/net/e1000/base/e1000_mac.c @@ -38,2 +39,2 @@ ---- a/drivers/net/intel/e1000/base/e1000_mac.c -+++ b/drivers/net/intel/e1000/base/e1000_mac.c +--- a/drivers/net/e1000/base/e1000_mac.c ++++ b/drivers/net/e1000/base/e1000_mac.c