From nobody Sat Sep 28 09:12:08 2024 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 4XG1n44Yb6z5Y2RK; Sat, 28 Sep 2024 09:12:08 +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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4XG1n444Jhz4pH1; Sat, 28 Sep 2024 09:12:08 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1727514728; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=uBOaRnHOqR1MBLzy9n4x+x2icRUIXsHvgR49Ic2V91I=; b=y4qB4LaIRWh89gfW6N0UW3SDPRGHxVCiICOEUexUk+5IEN0URWrPx1fLVKWSq0az4SrFSB eE0BiJMb8HiIJG6ACiWJ8mCb9Y8Hi29AnocwMDS/5jHu1rOn8pJlE+b58ME7rrD6xMkywJ sAD55/c5j1RAInx52e4E+pONLPXFIH1TJujSpuu1R1yR16fwW4CNJDwc9M7QnI4lnf6bDH raU3Yb5gfYszSTAA9oR1l4/MvDvjMfbMXaVpXqJtO10u2tDK7wCUFV8sCUW4GGdAHo/CnN r/8ZTU57+tXUM0ghh/ZjRcg399Dgks5FfkxWJyvDLIf57Hi4OUqF1cS4pE4dbQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1727514728; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=uBOaRnHOqR1MBLzy9n4x+x2icRUIXsHvgR49Ic2V91I=; b=sjxLin2pzxMYyWkGBPVqattIgbOJ17Hwjr5459oAnyo1N0GSK1ZU4A+q4isJyHP5U5/LmO Od2iUSqS46dFEJvMic3CdXYBBl9xlx0StGfhmWtAoOA6qaZjKWZw84LMiO4rx5z/Eq9crO nqRY9Nl4xtsQ6nWlRwsVOT5H8VeHaai4bX62PCL5gQvJq6HwQ4JL12Ze010IHGCIi5hhca yyyNeubKRICNiPqLJqVbhR5Vs2nZm0UDxhf4oTwz3QctrOmFdsIxY+APYCrb9QRQdK/oiL VJlp6UFvmoa/PxlwmlP3L7fsfdgD1JXN21ap77CzCuGyewUCx0w1FAqlKvZDYQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1727514728; a=rsa-sha256; cv=none; b=J8+chTtE0gMGOBPmeQb5d4GwF2l+4INgtizP91BdeDiBos18JYnnjH6wc5WjKChWmOkpnp I4ETz7wVArFdjyk6JIB4TP3gQYSKHHkpD/2WmL5vMCBz/tGQBmwYuSWCTMErx7tX67kh5T NW9dp5vFOyIoH9lLWxHNpmETRG96bGmNu8p07PVdFMTmnqA7q2JYnJj5FF2LbMNV5HGeYi jTF4LA4NW7y9yG0OKkdUEItp37aadV/vZyFKq26UMkcm9q0p6xHwT/KQcbdeI4CC2Na1Lu kDuTq6QjGD78351AqeMT3YYeT6VsYA2qMRRbSH9/YSvlA/rc2wQpHSm3jjkJLg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (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 did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4XG1n43Zy3zJGH; Sat, 28 Sep 2024 09:12:08 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 48S9C8SM057605; Sat, 28 Sep 2024 09:12:08 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 48S9C8Tx057602; Sat, 28 Sep 2024 09:12:08 GMT (envelope-from git) Date: Sat, 28 Sep 2024 09:12:08 GMT Message-Id: <202409280912.48S9C8Tx057602@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Kevin Bowling Subject: git: 911b3c3aa648 - main - Revert "e1000: Remove redundant EITR shift from igb" 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 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: 911b3c3aa6484709f7a6020f1f25ab24737296ce Auto-Submitted: auto-generated The branch main has been updated by kbowling: URL: https://cgit.FreeBSD.org/src/commit/?id=911b3c3aa6484709f7a6020f1f25ab24737296ce commit 911b3c3aa6484709f7a6020f1f25ab24737296ce Author: Kevin Bowling AuthorDate: 2024-09-28 08:47:00 +0000 Commit: Kevin Bowling CommitDate: 2024-09-28 09:11:55 +0000 Revert "e1000: Remove redundant EITR shift from igb" Turns out this is necessary This reverts commit 26439b57877ccae7a2404f7d179afaa5ddb2f64d. --- sys/dev/e1000/if_em.h | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/sys/dev/e1000/if_em.h b/sys/dev/e1000/if_em.h index 83a0d4e96fc6..7219dc57c333 100644 --- a/sys/dev/e1000/if_em.h +++ b/sys/dev/e1000/if_em.h @@ -251,7 +251,8 @@ #define IGB_ITR_DIVIDEND 1000000 #define IGB_ITR_SHIFT 2 #define IGB_QVECTOR_MASK 0x7FFC -#define IGB_INTS_TO_EITR(i) ((IGB_ITR_DIVIDEND/i) & IGB_QVECTOR_MASK) +#define IGB_INTS_TO_EITR(i) (((IGB_ITR_DIVIDEND/i) & IGB_QVECTOR_MASK) << \ + IGB_ITR_SHIFT) #define IGB_LINK_ITR 2000 #define I210_LINK_DELAY 1000