From nobody Tue Aug 11 20:10:44 2026 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4hKN6F6XSPz6pG9L for ; Tue, 11 Aug 2026 20:10:45 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "YR1" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4hKN6F1sFyz3wN1 for ; Tue, 11 Aug 2026 20:10:45 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1786479045; 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; bh=iIet46Y7yCnybnYoB9r6wVMxGlLFtP9fLRjSO6r8KaM=; b=RzByREvqK5foVEuWiWmpRAaagaSuXzFtH6ZiPd5MlDHoftpwoRmwlvzxqiQbzRBm84+BAC bvhmU6Dydo90vuorxXGoC7jFp/lMwRVB3VWAl/0C/d/MRLyUbjhcXGrUAWRv64FcYiVMDi ihzdS/oUsKWLwxs3fazPK6ioijIv1uh4j0a9+kIzgXVNh50A6ro9vIH9mRC0hNepQsc3tb dik9gqBcD5E7Trr5wFJ8ZDYFsE3qMB4HmuBA2vtUxjAqX9wuB9LGPU2l8lCePxG61IgZUa tPf9+km4h8tuGtgF7sbIRrW9CLeuIeXm2AYdFl26HffYxKqW8e64UEI8kkR4ng== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1786479045; a=rsa-sha256; cv=none; b=C0XP0Og6D3D557SRIDpNxn0EMDrDn/lvHMVtjQhtNEwnM9tj4hRIR2NLN/yfiEU0YbDRrs 26ezxi6CKr9cuvtYohCb6nqhrnsOvahWo3VvJM7e8kS1LISXV9AbnLz+LGvwz1XCdJBkDD ENGLLfqekr/XFIn2peClbq05dHZw79345JKmuZzUDfZ4QzHAoLmHwNmAAO/gegOjpT+3ai 99gO9pNhyDgP7hwCeUFFt4UET1CEzbZP2AfQbNMRgIw7D96ueQ0fQYKRV5Txr1M8m/hami w8a79OT0DfcUtKDEoutlMzPyKe10hCT4JBb9lI7RdrAOTZ498/ByTuIeeL7fPg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1786479045; 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; bh=iIet46Y7yCnybnYoB9r6wVMxGlLFtP9fLRjSO6r8KaM=; b=PZTRWPaJJT1hdSNu3BcrgrWW3QNzMejgz9lcAjxG3eRkZK5l8lspsX5KwwMZPj0Sfh/GQW XiKsqITXAAxMHwKmoEM6oS68WKVDyojBgPc8L9k0FcDkZCKWKgEYyChc3PPwZep9Qx4znl juc5zsfGKsrJzv37+AIaDTztE3mJkSO1+ijP22oqKXM+3Prsc69tFezPuAuEjDGbKWBLDg r4Nb61zQXZfni2DbON4FK4w1waaWXgZzoseqeQS8AUEos7m/7qhC8Kz9sRE1OrTO/ksUH0 YdCgJuQ4kVZjcZ3bnQffGHPw/B421nKaRA8L7+lqdYNX/Js72kBlqyLC2eYluA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4hKN6F03wsz18Kd for ; Tue, 11 Aug 2026 20:10:45 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 325f5 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 11 Aug 2026 20:10:44 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org Cc: Pawel Malinowski From: Kevin Bowling Subject: git: ea2e8b056b45 - main - e1000: fix semaphore timeout value List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kbowling X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: ea2e8b056b455e92830bd1bae56b4d72a42018c3 Auto-Submitted: auto-generated Date: Tue, 11 Aug 2026 20:10:44 +0000 Message-Id: <6a7b81c4.325f5.482be40@gitrepo.freebsd.org> The branch main has been updated by kbowling: URL: https://cgit.FreeBSD.org/src/commit/?id=ea2e8b056b455e92830bd1bae56b4d72a42018c3 commit ea2e8b056b455e92830bd1bae56b4d72a42018c3 Author: Pawel Malinowski AuthorDate: 2025-02-06 16:08:37 +0000 Commit: Kevin Bowling CommitDate: 2026-08-11 20:09:06 +0000 e1000: fix semaphore timeout value DPDK commit message net/e1000/base: fix semaphore timeout value 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") Cc: stable@dpdk.org Signed-off-by: Pawel Malinowski Signed-off-by: Anatoly Burakov Acked-by: Bruce Richardson Obtained from: DPDK (c8bcaf0f2a) MFC after: 2 weeks --- sys/dev/e1000/e1000_defines.h | 1 + sys/dev/e1000/e1000_mac.c | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/sys/dev/e1000/e1000_defines.h b/sys/dev/e1000/e1000_defines.h index fb21ad3d24b0..afa8bb4cce0d 100644 --- a/sys/dev/e1000/e1000_defines.h +++ b/sys/dev/e1000/e1000_defines.h @@ -536,6 +536,7 @@ /* SW Semaphore Register */ #define E1000_SWSM_SMBI 0x00000001 /* Driver Semaphore bit */ #define E1000_SWSM_SWESMBI 0x00000002 /* FW Semaphore bit */ +#define E1000_SWSM_TIMEOUT 2000 /* 100 ms at 50 us per poll */ #define E1000_SWSM_DRV_LOAD 0x00000008 /* Driver Loaded Bit */ #define E1000_SWSM2_LOCK 0x00000002 /* Secondary driver semaphore bit */ diff --git a/sys/dev/e1000/e1000_mac.c b/sys/dev/e1000/e1000_mac.c index a2e05498c681..c61f5b47b746 100644 --- a/sys/dev/e1000/e1000_mac.c +++ b/sys/dev/e1000/e1000_mac.c @@ -2198,7 +2198,7 @@ s32 e1000_write_8bit_ctrl_reg_generic(struct e1000_hw *hw, u32 reg, 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; DEBUGFUNC("e1000_get_hw_semaphore_generic");