From nobody Fri Jan 9 21:03:15 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 4dnvPb3gyRz6MMkQ for ; Fri, 09 Jan 2026 21:03:15 +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 "R13" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dnvPb1DTMz3SZ3 for ; Fri, 09 Jan 2026 21:03:15 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1767992595; 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=dImSlSENP4g7suHF1HfwEw8OJCbLTNW6k58zXk93QT8=; b=XVy1ZnH3T8CuVBKEflR9BOBCNu/1lw+dCaFVdiBucjYSFAtCGA7RsoQTHJh6JTrGqCXsX8 rI4P8zfD3tDfRIuOlK4ZHIXzNHFEkyo4Q0xQU8oDzBH6Mc3RWP50L6Q5A2O3SbFOJBfzw+ YFJtztXc0g+wxJoH5vQU9qQHfp11KVjTgtZFT06/XtDmZgACfJw60/AZXUUeLGzcRWWmWE s3tsHiIZhIzhVgmvrTagDKup/lbM4GRKngigwP4SwLBxM1QxIgASlBq0It5AB7LZecrDY0 BbblAF//gaJeQUpO/pmgLt15uxmr+GRR9udo6RtW+t5NuMYo6tE/+pTAYvFeWw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1767992595; 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=dImSlSENP4g7suHF1HfwEw8OJCbLTNW6k58zXk93QT8=; b=bDffJMyM3SPQoTA4v9owwBThColHeINKNuuonwnYp6gGGhOi6D+SV18+30qzlHyhrVQfB3 B9rnRRAZdmVVDYG1MPB1fz/HTEn2jMjeBCF0wJGOuYuWAdVUdXMmyC5nYY1F8rLqOr4TkA YFi50L4Z5Y9HO49vI0goxkW1DAtlLQ/a7GiFOTUiRth7bBOoBxVXPf962mCZRm1ju2WZx6 QTWsvz/eqOw5/Ya0GfbYUrYiydGn46s5Nw92BHA94eGQygiox/+nO2A8QLwcdoMiKIp4wL B2FpA/gatmnzxwxH0mXlH+Svq9cFtPoITMImlCzAanwjE+EwHeEu8t2q7iPTeQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1767992595; a=rsa-sha256; cv=none; b=PZkc0yJIWMQtCUnJjNy9H06LckZDR27UGF2RabY4TeVRP/LhdLs2u9HNn/krbYmReUJE36 7dPe+GlqJUckTQwZLJVRDMVVI+liZgmeKGbW5e2zRtPMXniW2h/nB6JdlChAz01+DsLY9T MIampsmQdqIBFu6Vm5ExXZUX/eC0xCokVwP4uMYzi1dsl4xKoC98Og1f1L/NolDF1Gh2Vm 2IZxMfcmwKyl8nUhiGGkGhO/oyoKPUQpHJBihiGhkIfzhaPln7OcxU/rlrk2Wfcc4o0FDT sbu44Btcc+OqO3+IzNN+XwuyJ72QDY2TmgBmdDTf0KChlsbhctzwY7UYXs5QJw== 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 4dnvPb09yyz8v3 for ; Fri, 09 Jan 2026 21:03:15 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id ca13 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Fri, 09 Jan 2026 21:03:15 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org Cc: Alexey Sukhoguzov From: Warner Losh Subject: git: a24932dcec45 - main - nvme: Support Autonomous Power State Transition (APST) 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 MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: imp X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: a24932dcec45ca68fa5ca2f49bbf0df539cfd710 Auto-Submitted: auto-generated Date: Fri, 09 Jan 2026 21:03:15 +0000 Message-Id: <69616d13.ca13.6b6492c6@gitrepo.freebsd.org> The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=a24932dcec45ca68fa5ca2f49bbf0df539cfd710 commit a24932dcec45ca68fa5ca2f49bbf0df539cfd710 Author: Alexey Sukhoguzov AuthorDate: 2024-10-30 11:03:30 +0000 Commit: Warner Losh CommitDate: 2026-01-09 20:32:49 +0000 nvme: Support Autonomous Power State Transition (APST) APST is an optional NVMe power-saving feature that allows devices to autonomously enter higher non-operational power states after a certain amount of idle time, reducing the controller's overall power consumption. Signed-off-by: Alexey Sukhoguzov Reviewed by: imp Pull Request: https://github.com/freebsd/freebsd-src/pull/1444 --- share/man/man4/nvme.4 | 9 +++++++++ sys/dev/nvme/nvme_ctrlr.c | 36 ++++++++++++++++++++++++++++++++++++ 2 files changed, 45 insertions(+) diff --git a/share/man/man4/nvme.4 b/share/man/man4/nvme.4 index dcd2ec86f5fa..d24ffc07ef9e 100644 --- a/share/man/man4/nvme.4 +++ b/share/man/man4/nvme.4 @@ -128,6 +128,15 @@ hw.nvme.hmb_max .Pp The default value is 5% of physical memory size per device. .Pp +To enable Autonomous Power State Transition (APST), set the following +tunable value in +.Xr loader.conf 5 : +.Bd -literal -offset indent +hw.nvme.apst_enable=1 +.Ed +.Pp +The default vendor-provided settings, if any, will be applied. +.Pp The .Xr nvd 4 driver is used to provide a disk driver to the system by default. diff --git a/sys/dev/nvme/nvme_ctrlr.c b/sys/dev/nvme/nvme_ctrlr.c index 7e1a3f02f326..2c13dac96342 100644 --- a/sys/dev/nvme/nvme_ctrlr.c +++ b/sys/dev/nvme/nvme_ctrlr.c @@ -781,6 +781,41 @@ nvme_ctrlr_configure_aer(struct nvme_controller *ctrlr) } } +static void +nvme_ctrlr_configure_apst(struct nvme_controller *ctrlr) +{ + struct nvme_completion_poll_status status; + uint64_t *data; + int data_size; + bool enable, error = true; + + if (TUNABLE_BOOL_FETCH("hw.nvme.apst_enable", &enable) == 0 || + ctrlr->cdata.apsta == 0) + return; + + data_size = 32 * sizeof(*data); + data = malloc(data_size, M_NVME, M_WAITOK | M_ZERO); + + status.done = 0; + nvme_ctrlr_cmd_get_feature(ctrlr, + NVME_FEAT_AUTONOMOUS_POWER_STATE_TRANSITION, 0, + data, data_size, nvme_completion_poll_cb, &status); + nvme_completion_poll(&status); + if (nvme_completion_is_error(&status.cpl)) + goto out; + + status.done = 0; + nvme_ctrlr_cmd_set_feature(ctrlr, + NVME_FEAT_AUTONOMOUS_POWER_STATE_TRANSITION, enable, 0, 0, + 0, 0, data, data_size, nvme_completion_poll_cb, &status); + nvme_completion_poll(&status); + error = nvme_completion_is_error(&status.cpl); +out: + if (error && bootverbose) + nvme_printf(ctrlr, "failed to configure APST\n"); + free(data, M_NVME); +} + static void nvme_ctrlr_configure_int_coalescing(struct nvme_controller *ctrlr) { @@ -1047,6 +1082,7 @@ nvme_ctrlr_start(void *ctrlr_arg, bool resetting) } nvme_ctrlr_configure_aer(ctrlr); + nvme_ctrlr_configure_apst(ctrlr); nvme_ctrlr_configure_int_coalescing(ctrlr); for (i = 0; i < ctrlr->num_io_queues; i++)