From nobody Sat Oct 31 20:24:37 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 4jH8Zs1v7gz6xF8q for ; Sat, 31 Oct 2026 20:24:37 +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) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 4jH8Zs0hMzz4P41 for ; Sat, 31 Oct 2026 20:24:37 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1793478277; 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=POhFlk9S0bGBjbop4MwC8sociFVxP9cEEdMieTOvK0A=; b=KkAOZMpO4osbS8hM0OpSlQMSXr8jK78fQyf673wcbyPNmCi0/TZUTVNqb0uKr7UmU9rcLj YubFDWVhgYyknXMdF5moKoiDdmtCZDrHVZ36U3Kmx3CxacEDovBs9Q47Ey9IqOTAnWFJCX S6SEQLmI3cf/4EfQhZdI06O09C57GgNMWoUx5VeOp1dhvQs1n4sfaZ0OUnTGEAzcw1Y09L jSLykbUkb4jA4bGdQ35hOfvtyMeHtXpqKx9RTE00L+NfbfCH0mAfn05DQ2q9fXMx0nKpuy hZ1hV9rhJVkpBMQJTWZgX1a0qMvc8b8VZUocOZ//d95ZmsX2wpJdLKc61GojQQ== ARC-Seal: i=1; a=rsa-sha256; d=freebsd.org; s=dkim; cv=none; t=1793478277; b=led1lVEiC1VuNDaXJww4PAvV91KtiknF1txpYU1APQpS/1Kn2vJAqpQJN7wtzdWNNjEBTO GrUapLpyEM5U1eHMVNxcX4LqVbN1/s4q8cqxm0WXbwGGELn4yfwULz9+udbmlv3ED14zmv CLXLLg6FwYiyvSC2tqsTNhh/5+Qv8KezXxnbAlI5idRZe37hn+5aAGkyTE7TQ9U0alvzJ3 6ivrwYoOIPxPtwsz1jtmh3KRLoOt9+kvkU0W1+egT8rbUmidrj+E3LyEs+d1PH/dPHeB1P w7+NLZehgPbhrQBkZCkX3yAuiWoLAr0xYb0rUsaZfhVSzl9tM2InRAeBpVRTJw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1793478277; 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=POhFlk9S0bGBjbop4MwC8sociFVxP9cEEdMieTOvK0A=; b=oM87dP9JwLQ0fZkW8XSz33MLWgjfnZ3GjuvQwhfXlcIZla+Wp5HMKMlLRyK4abWwtPL/AD JyDluUZkrmpZB4vjNFg/1CtrAsMzsqtfKoGyMq9FF27+mVME6K/lOUENDxXOUcK769+aSP WmzpF0Osp9SIoE0w5IHKVXEQ25rP6JGPoYYg5iSz48DlO8LCCGGZPyRd2BaQrV7Nm+mGho T1j3o/mBwrq8M7usYc48pBgiBHsIxq/m7UPwkXRDiwfhfNER0TOvSoTPpUshXLWgvzJrXp rXAjrxvFXWtzCvag2NVC7CCARg400fTiXMFXZyEfzV0XQefLwcYLE/RTrr0tOQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4jH8Zs0LQGzRK5 for ; Sat, 31 Oct 2026 20:24:37 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 34975 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sat, 31 Oct 2026 20:24:37 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org Cc: Christos Longros From: Adrian Chadd Subject: git: 75a29ec97714 - stable/15 - rge: add disable_aspm tunable for PCIe power management List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org List-Id: Commit messages for all branches of the src repository 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: adrian X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: 75a29ec9771419e1496604daaa8d104c73b85d14 Auto-Submitted: auto-generated Date: Sat, 31 Oct 2026 20:24:37 +0000 Message-Id: <6ae64e85.34975.10d786ee@gitrepo.freebsd.org> The branch stable/15 has been updated by adrian: URL: https://cgit.FreeBSD.org/src/commit/?id=75a29ec9771419e1496604daaa8d104c73b85d14 commit 75a29ec9771419e1496604daaa8d104c73b85d14 Author: Christos Longros AuthorDate: 2026-04-17 02:34:55 +0000 Commit: Adrian Chadd CommitDate: 2026-10-31 20:15:06 +0000 rge: add disable_aspm tunable for PCIe power management Add a per-interface loader tunable dev.rge.%d.disable_aspm to disable PCIe ASPM (L0s/L1) and ECPM on the RTL8125/8126/8127. Disabling ASPM reduces latency at the cost of higher power consumption. Default is off (ASPM left as configured by BIOS). Signed-off-by: Christos Longros Reviewed by: adrian Differential Revision: https://reviews.freebsd.org/D56103 (cherry picked from commit 4390c37b5c94b6de4cb4bdbcc3967efe74fa7517) --- share/man/man4/rge.4 | 9 +++++++++ sys/dev/rge/if_rge.c | 28 ++++++++++++---------------- sys/dev/rge/if_rge_sysctl.c | 5 +++++ sys/dev/rge/if_rgevar.h | 1 + 4 files changed, 27 insertions(+), 16 deletions(-) diff --git a/share/man/man4/rge.4 b/share/man/man4/rge.4 index f9077a56f28b..24c42f9106dc 100644 --- a/share/man/man4/rge.4 +++ b/share/man/man4/rge.4 @@ -152,6 +152,15 @@ Maximum number of RX packets to process per interrupt. The default value is 16. Increasing this value may improve throughput on high-speed links at the cost of increased interrupt latency. +.It Va dev.rge.%d.disable_aspm +Disable PCIe Active State Power Management (ASPM) and Extended +Configuration Power Management (ECPM). +The default value is 0 (leave ASPM enabled). +Setting this to 1 reduces latency at the cost of increased power +consumption. +This tunable can only be set in +.Xr loader.conf 5 +and requires a reboot to take effect. .El .Sh DIAGNOSTICS .Bl -diag diff --git a/sys/dev/rge/if_rge.c b/sys/dev/rge/if_rge.c index 17225e065482..8887e8d39ae4 100644 --- a/sys/dev/rge/if_rge.c +++ b/sys/dev/rge/if_rge.c @@ -445,23 +445,19 @@ rge_attach(device_t dev) rge_config_imtype(sc, RGE_IMTYPE_SIM); - /* TODO: disable ASPM/ECPM? */ - -#if 0 - /* - * PCI Express check. - */ - if (pci_get_capability(pa->pa_pc, pa->pa_tag, PCI_CAP_PCIEXPRESS, - &offset, NULL)) { - /* Disable PCIe ASPM and ECPM. */ - reg = pci_conf_read(pa->pa_pc, pa->pa_tag, - offset + PCI_PCIE_LCSR); - reg &= ~(PCI_PCIE_LCSR_ASPM_L0S | PCI_PCIE_LCSR_ASPM_L1 | - PCI_PCIE_LCSR_ECPM); - pci_conf_write(pa->pa_pc, pa->pa_tag, offset + PCI_PCIE_LCSR, - reg); + /* Disable PCIe ASPM and ECPM if requested. */ + if (sc->sc_disable_aspm) { + int ecap; + if (pci_find_cap(dev, PCIY_EXPRESS, &ecap) == 0) { + uint16_t lctl; + lctl = pci_read_config(dev, + ecap + PCIER_LINK_CTL, 2); + lctl &= ~(PCIEM_LINK_CTL_ASPMC | + PCIEM_LINK_CTL_ECPM); + pci_write_config(dev, + ecap + PCIER_LINK_CTL, lctl, 2); + } } -#endif RGE_LOCK(sc); if (rge_chipinit(sc)) { diff --git a/sys/dev/rge/if_rge_sysctl.c b/sys/dev/rge/if_rge_sysctl.c index 16001b4c1d94..75e2316042ea 100644 --- a/sys/dev/rge/if_rge_sysctl.c +++ b/sys/dev/rge/if_rge_sysctl.c @@ -237,6 +237,11 @@ rge_sysctl_attach(struct rge_softc *sc) "rx_process_limit", CTLFLAG_RW, &sc->sc_rx_process_limit, 0, "max number of RX packets to process per interrupt"); + sc->sc_disable_aspm = 0; + SYSCTL_ADD_INT(ctx, SYSCTL_CHILDREN(tree), OID_AUTO, + "disable_aspm", CTLFLAG_RDTUN, &sc->sc_disable_aspm, 0, + "disable PCIe ASPM and ECPM (requires reboot)"); + /* Stats */ rge_sysctl_drv_stats_attach(sc); rge_sysctl_mac_stats_attach(sc); diff --git a/sys/dev/rge/if_rgevar.h b/sys/dev/rge/if_rgevar.h index 89d02e8acb72..2e80dcf42187 100644 --- a/sys/dev/rge/if_rgevar.h +++ b/sys/dev/rge/if_rgevar.h @@ -205,6 +205,7 @@ struct rge_softc { uint32_t sc_debug; int sc_rx_process_limit; + int sc_disable_aspm; struct rge_drv_stats sc_drv_stats;