From nobody Thu Aug 20 05:35:28 2026 X-Original-To: dev-commits-src-main@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 4hQXG86jmLz6p9MQ for ; Thu, 20 Aug 2026 05:35:28 +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 4hQXG86B0hz3LPH for ; Thu, 20 Aug 2026 05:35:28 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1787204128; 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=rtsJ7oibdqrJld1Go25Kd7vGKwJTS250ogjQWBLNfhk=; b=RIMBbmp5pAghNTA24FZwqXlcW2wWk/1u1Z97GWqlipklyAAwQ6uFq/f3/xaF+LBz8KulJ0 RI8rW9JDJo3QLH2d04jDEY4no6+Mu4Rf4KnB2Yki0J966qukYiKErVLLZqNb6dNhI5WSDS zWpEwBjGA9z0UwENI/Q4vF+Dchk3BLv6A/UkYB8y0iTeFcTZ5A2F9WHHbjEw+1s6oEw+kO 5BoiNlqx6SkV6P3FNx3QbHsp2yC8JebDMP21AIOjPvfbJFxDSslWlfhEM8V3jb26VQJVdf RCj9u0D83ZUxeG1lq/O64OHo2xq3UIzy93ycJJ4SA8+0BX6qGsbbe+GuTYUeyQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1787204128; a=rsa-sha256; cv=none; b=sEwPlE6bE+MPNQpJNr6troc/+4wr+4+NZffw1KPUy8FgPgvDGIYP4nHu9al+3+kHZdbv+7 h6lcP4YjOw19vjxJpnD9uj4MgEs11VWhkuzwhC9Ia40mb0RN+sVvEUnSaRYuRzEU/zIbe0 KopZQlJTlEaS597FpCkPkQZIT0N/wdNOOOg+tm0k9JUWrgEFWvZqtzz8TiDsYpSke6gg3T nn5Y1760Rj4/hvctp2aKXR13ekJUWZbprLzenw9dQ9sp/GFa8hSTv8cWlBKsZbRVRHCCm5 /ox5zvS3sb28O0ECHsBQ82KrEQ/JSc4zMqf73zltinWJvsTbfkPuIzXgCWd6aQ== 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=1787204128; 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=rtsJ7oibdqrJld1Go25Kd7vGKwJTS250ogjQWBLNfhk=; b=sCuCfd/bGIO8EPlvcUI895e3ClMUo+uISNwsXmhqF3d7lQR6TTgrK7OXEmojRoIVSIW44y bofCYpKPP3HXAVyzJBkFXG7BrVx59SvxVDrBR6DOiY5sC4XkzKwsJwkwkOiNftS6YkhbRr oyh0lsnotn1zt5LhODV2f2achllAMYpT/h1ca61KI98GaYmXR9MfOHWWUI7IuBw78CvKze gT7Ysl9R4qSCpCDbzEiYu4gFya17CvU9q7O5CIi4qE8teE2caxfSSIf4QDa1srr0KwBNaS vbR5DQqpjTYdn5+EZRJR80aCfljiBiDWtjtP5Ujme8YT+kfGXUow14SDy8kL6Q== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4hQXG855NVz141B for ; Thu, 20 Aug 2026 05:35:28 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3f3ac by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Thu, 20 Aug 2026 05:35:28 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Kevin Bowling Subject: git: aec0f1b85b54 - main - e1000: Report 82571 packet buffer ECC errors List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@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: aec0f1b85b54d14819747ed3364f366d21e76d88 Auto-Submitted: auto-generated Date: Thu, 20 Aug 2026 05:35:28 +0000 Message-Id: <6a869220.3f3ac.3d352bc1@gitrepo.freebsd.org> The branch main has been updated by kbowling: URL: https://cgit.FreeBSD.org/src/commit/?id=aec0f1b85b54d14819747ed3364f366d21e76d88 commit aec0f1b85b54d14819747ed3364f366d21e76d88 Author: Kevin Bowling AuthorDate: 2026-08-16 07:11:57 +0000 Commit: Kevin Bowling CommitDate: 2026-08-20 05:33:54 +0000 e1000: Report 82571 packet buffer ECC errors The 82571 PBA_ECC register contains a 12-bit count of packet buffer ECC detections. The shared code enables single-bit correction, but neither FreeBSD nor the DPDK base driver consumes the counter. Sample it with the ordinary statistics timer, accumulate the value under dev.em.N.memory_errors.detected_packet_buffer, and clear the hardware counter while preserving correction and reserved register state. Do not enable its shared interrupt: the register does not distinguish corrected from uncorrectable events and does not provide a safe fatal recovery policy. Validated on a dual port 82571EB. Both functions reported zero after a clean boot, and a controlled link down/up cycle left the counter at zero while the management link recovered at 1 Gb/s without issue. MFC after: 2 weeks Sponsored by: BBOX.io --- sys/dev/e1000/if_em.c | 54 ++++++++++++++++++++++++++++++++++++++++++++------- 1 file changed, 47 insertions(+), 7 deletions(-) diff --git a/sys/dev/e1000/if_em.c b/sys/dev/e1000/if_em.c index f07f75100650..7e312399b132 100644 --- a/sys/dev/e1000/if_em.c +++ b/sys/dev/e1000/if_em.c @@ -2189,6 +2189,13 @@ em_has_pch_ecc(const struct e1000_hw *hw) hw->mac.type < e1000_82575); } +static bool +em_has_82571_ecc_stats(const struct e1000_hw *hw) +{ + + return (hw->mac.type == e1000_82571); +} + static bool em_has_82575_memory_errors(const struct e1000_hw *hw) { @@ -2335,6 +2342,13 @@ em_has_memory_errors(const struct e1000_hw *hw) return (em_memory_error_intr_mask(hw) != 0); } +static bool +em_has_memory_error_stats(const struct e1000_hw *hw) +{ + + return (em_has_82571_ecc_stats(hw) || em_has_memory_errors(hw)); +} + static u32 em_fatal_error_intr_mask(struct e1000_softc *sc) { @@ -2429,6 +2443,24 @@ em_update_pch_ecc_stats(struct e1000_softc *sc, u32 pbeccsts) E1000_PBECCSTS_UNCORR_ERR_CNT_SHIFT; } +static void +em_update_82571_ecc_stats(struct e1000_softc *sc) +{ + struct e1000_hw *hw; + u32 count, pba_ecc; + + hw = &sc->hw; + pba_ecc = E1000_READ_REG(hw, E1000_PBA_ECC); + count = (pba_ecc & E1000_PBA_ECC_COUNTER_MASK) >> + E1000_PBA_ECC_COUNTER_SHIFT; + if (count == 0) + return; + sc->corrected_error_packet_buffer_count += count; + /* Preserve correction and reserved state while clearing statistics. */ + E1000_WRITE_REG(hw, E1000_PBA_ECC, + pba_ecc | E1000_PBA_ECC_STAT_CLR); +} + static void em_update_i210_ecc_stats(struct e1000_softc *sc) { @@ -6380,7 +6412,9 @@ em_update_stats_counters(struct e1000_softc *sc) E1000_READ_REG(&sc->hw, E1000_TSCTFC); } - if (em_has_pch_ecc(&sc->hw)) + if (em_has_82571_ecc_stats(&sc->hw)) + em_update_82571_ecc_stats(sc); + else if (em_has_pch_ecc(&sc->hw)) em_update_pch_ecc_stats(sc, E1000_READ_REG(&sc->hw, E1000_PBECCSTS)); else if (em_has_82575_memory_errors(&sc->hw)) @@ -6806,7 +6840,7 @@ em_add_hw_stats(struct e1000_softc *sc) SYSCTL_ADD_UQUAD(ctx, eee_list, OID_AUTO, "rx_lpi_count", CTLFLAG_RD, &stats->rlpic, "RX LPI event count"); } - if (em_has_memory_errors(&sc->hw)) { + if (em_has_memory_error_stats(&sc->hw)) { struct sysctl_oid *memerr_node; struct sysctl_oid_list *memerr_list; @@ -6814,11 +6848,17 @@ em_add_hw_stats(struct e1000_softc *sc) "memory_errors", CTLFLAG_RD | CTLFLAG_MPSAFE, NULL, "Internal memory error indications"); memerr_list = SYSCTL_CHILDREN(memerr_node); - SYSCTL_ADD_UQUAD(ctx, memerr_list, OID_AUTO, - "fatal_resets", CTLFLAG_RD, - &sc->fatal_error_reset_count, - "Resets requested for fatal internal memory errors"); - if (em_has_pch_ecc(&sc->hw)) { + if (em_has_memory_errors(&sc->hw)) + SYSCTL_ADD_UQUAD(ctx, memerr_list, OID_AUTO, + "fatal_resets", CTLFLAG_RD, + &sc->fatal_error_reset_count, + "Resets requested for fatal internal memory errors"); + if (em_has_82571_ecc_stats(&sc->hw)) { + SYSCTL_ADD_UQUAD(ctx, memerr_list, OID_AUTO, + "detected_packet_buffer", CTLFLAG_RD, + &sc->corrected_error_packet_buffer_count, + "Detected packet-buffer ECC errors"); + } else if (em_has_pch_ecc(&sc->hw)) { SYSCTL_ADD_UQUAD(ctx, memerr_list, OID_AUTO, "corrected_packet_buffer", CTLFLAG_RD, &sc->corrected_error_packet_buffer_count,