From nobody Sat Aug 22 00:49:50 2026 X-Original-To: dev-commits-src-branches@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 4hRdqg1tcVz6prVQ for ; Sat, 22 Aug 2026 00:49:51 +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 "YR2" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4hRdqg10Pkz3NYG for ; Sat, 22 Aug 2026 00:49:51 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1787359791; 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=zH2Cf4lRY1Q9KNhAJZFW5FFGOyQq0Z2v8nfe/udQmdo=; b=HV8eTdHg7Giil1RMWlvg8aqzt8FxyqVN8sMV5tyR9jgMi6HxEBvzQIqNwIwyqbrh+g2NRO cecGIYxbBvw7xxIX1XReu7geqLEduFC+wLkp7kw4DeAJm3aRU0/tfN1ik/4oW+p0boviYB lN/4UUjmG7PF3Wd6p2iVY0sZAlA7OaGjvNLLcGg5/BkyKHBY2ApOOgLfYgIlQVuFhTh9OA VdcxRK57IuNSrRtTbO4YPBWzyZAfBaXQ0WC8f09ty6hkYOF2woJTRcawWlWZj/S88Zddb/ ahkVJ8yG/qPtU/UiZa2jWGBa7U5TfDPiAaALk7uIThdpXpBPAXnmI2Pr9NtvpA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1787359791; a=rsa-sha256; cv=none; b=stdGrAgrQG4g0CBSFsY3EBKh0uQxUK0k2IjCNyvWVFwBXCe5PovZIeRGDe2Edd7scF1gMB 1y3NRXbgB13CItASF9gWZ50aKHa2Kdg93U0FCtOAAbGQby6deRR/3anDuKC3LRyV5Oo/kj rOmZi9Y8N32POYDb2YF6kPg18ai3kRRvrxSPHN7gjdZpflzz2lcDSj+XXzP0QMpf/7ZyYz 25XhhsDdqq++rTuyDEEMMHi0Aco08f8AHPw7loYqDpIYrCX+wTJxcbxQbZVj2c3Qj7fU4+ VL2mLuzruNMikItXPKcKQdp7AdgNTQBRr0BXoFhPh6oj6FFx9iA0E73OAyGF+g== 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=1787359791; 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=zH2Cf4lRY1Q9KNhAJZFW5FFGOyQq0Z2v8nfe/udQmdo=; b=kQTmqJNoL7wAkrlHlWkvM2vQmS+rswSH4AIonbjNLt07zAJ74IRXbgHT4fcbw+2oQ8LeiO QDGVAtACo/ofyQXfGQbDPbJ1hZZIuGKCYm+4JDODQT5/zMYnwNZa7qNxP0Jz4Z0kEs+jBn znHSey5ODYS8152d0/UaW3P8bRl67fcXIMsAjocJ5GNlOSkfPiuf7P+r0KjCssH143UIux WC8rOWYStUvR/fb3JfWNTgnJIDfzNjY4uUlMWX/NJfR2BpRxyp+LJ5mP6D4bKFX/ymSg5A C/gbbqmPpk+wVHcw3k31wbZtgcOoqK9dBzv0V4OShipWieGTOvJB0IA4RD0QEw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4hRdqf6p1DzBff for ; Sat, 22 Aug 2026 00:49:50 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 268a5 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sat, 22 Aug 2026 00:49:50 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Kevin Bowling Subject: git: 98b95af873ac - stable/14 - e1000: Correct Rx descriptor threshold programming List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@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/stable/14 X-Git-Reftype: branch X-Git-Commit: 98b95af873acf4beeb4ac9a0c83e5d009fb78cd9 Auto-Submitted: auto-generated Date: Sat, 22 Aug 2026 00:49:50 +0000 Message-Id: <6a88f22e.268a5.61596530@gitrepo.freebsd.org> The branch stable/14 has been updated by kbowling: URL: https://cgit.FreeBSD.org/src/commit/?id=98b95af873acf4beeb4ac9a0c83e5d009fb78cd9 commit 98b95af873acf4beeb4ac9a0c83e5d009fb78cd9 Author: Kevin Bowling AuthorDate: 2026-08-08 12:26:23 +0000 Commit: Kevin Bowling CommitDate: 2026-08-22 00:49:40 +0000 e1000: Correct Rx descriptor threshold programming Jumbo receive tuning on integrated controllers enabled PTHRESH without a nonzero HTHRESH, contrary to the hardware programming requirements. It also covered only the integrated MAC generations present when the workaround was added. Enumerate every jumbo-capable ICH and PCH type and program PTHRESH=3 with HTHRESH=1. Linux fixed the same HTHRESH omission in b701cacdbcfb. The 82574 path combined threshold values with the reset values using bitwise OR. Requesting WTHRESH=4 while the reset value was one thus programmed five. Clear the complete threshold fields before installing the established PTHRESH=32, HTHRESH=4, WTHRESH=4 descriptor-granularity policy. (cherry picked from commit abe22383f1b144f0868aa0654ec4514d36f7a4f5) --- sys/dev/e1000/if_em.c | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) diff --git a/sys/dev/e1000/if_em.c b/sys/dev/e1000/if_em.c index a35e14e20c1f..5603d63e480b 100644 --- a/sys/dev/e1000/if_em.c +++ b/sys/dev/e1000/if_em.c @@ -3920,6 +3920,27 @@ em_integrated_jumbo_rx(struct e1000_hw *hw) } } +static bool +em_integrated_jumbo_rx(struct e1000_hw *hw) +{ + switch (hw->mac.type) { + case e1000_ich9lan: + case e1000_ich10lan: + case e1000_pchlan: + case e1000_pch2lan: + case e1000_pch_lpt: + case e1000_pch_spt: + case e1000_pch_cnp: + case e1000_pch_tgp: + case e1000_pch_adp: + case e1000_pch_mtp: + case e1000_pch_ptp: + return (true); + default: + return (false); + } +} + static void em_initialize_receive_unit(if_ctx_t ctx) {