From nobody Sun Sep 14 21:59:05 2025 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 4cQ2B16yJ1z67Y7K; Sun, 14 Sep 2025 21:59:05 +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 "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4cQ2B16Hd2z3H7s; Sun, 14 Sep 2025 21:59:05 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1757887145; 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=JQ7KmQ5f/Ei/f2DGeFqAbE+MDdgIvo1OuBXVf2V0v5Y=; b=ip3Bpb0JFaDh7VG11rlI5XUZgc4ykn/Y19LMBHE/wRgT2GMWy1OnaW8NvUfZvo3IkwpdNK ZjDp/PvuxxlOcxI10Pq2QlAPkmNVtjM5MWQ/DsSNtThqB0SHcmRWlTbe3dZMi5KnDASjlh +E87isjw8cy2QNmhxl8rt+3D7MVjROzzE+PQN6pCFnItDBCUVIV646/KhgtLmMia9qa3nf eCd/FccE9WQlNhKKQqZVPiIugH4unw1o18rrNe/+82HDRR2pbvmKOBsmknhHt2enbq1/g5 8hzd75wVNbx/8VQM6o7nV1ehIQyXDFqodbULZ2p1pYxQOKVQfuoSSoFRtWpmhQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1757887145; 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=JQ7KmQ5f/Ei/f2DGeFqAbE+MDdgIvo1OuBXVf2V0v5Y=; b=YRBWFd20LbjxrxX9klceUT7g7/GO84JzcIUe48EKl5mlYJUbOk6IIuDeKtx8dCDNc6bTGG /X4XqkFAHnsOH4qUEVUMmYCoGRHqQuc2i/3osDT4fBQ6N45dKqVf/NOfUz5fL89040YT/K riQg0JodYwQiHrn8XGp/pYQz1jwN+pv3OlKttDvMkFsI9Kz6L5dSvY68k1aLsnraBbn+5s /Nct4XjZIwSo3G95jJ4qxnaqedTyc0bAwpHHBl1BxA56XZgOzrcirg7xwlg1IPCPlMDqFJ RJ0MklTLbNteyx4scKb+VpHo9RPu0gVxSEaXVIntSAdyLq3xmn04X++337OJjA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1757887145; a=rsa-sha256; cv=none; b=TdluPFQ2mPbFPHmLkyoN5wUhERwm+R8xqTx+MZDXS+ppDh85Pe80I47VXTwNO+gx9szXmf 79cyXMJ2n3j+E8MWIP6k+l1Bbz8bHM2SmPYVIoU1puJPCI6QODBMCr8jb/Ox4bPBQ6Nm7C 1gqKPFQD0lXZ2fNK+NJRjwqTy17nkYRKGuC9/s/QNcCtwSbFcJu+xt247QMnRRyLd97YgA g2o+ONVV/Q9WXj+9/35JL/uuZiZtJaE4KZnJbRLnIWvFh7jOpBXO4V1iu86wRYi3rUVeTg OYrdvPe4oJu1m7fwE1UN/hd1lAFdeKY+4o+2IJPzCPnDeKIkgSmTcZ6wIY2veQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none 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 4cQ2B15djZzBL0; Sun, 14 Sep 2025 21:59:05 +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 58ELx5IP054610; Sun, 14 Sep 2025 21:59:05 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 58ELx5Rg054606; Sun, 14 Sep 2025 21:59:05 GMT (envelope-from git) Date: Sun, 14 Sep 2025 21:59:05 GMT Message-Id: <202509142159.58ELx5Rg054606@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Aymeric Wibo Subject: git: e779891327b1 - main - sys/power: Sleep type reporting by PM backends 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: obiwac X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: e779891327b1d9b9ab10ba482e59f498790505a7 Auto-Submitted: auto-generated The branch main has been updated by obiwac: URL: https://cgit.FreeBSD.org/src/commit/?id=e779891327b1d9b9ab10ba482e59f498790505a7 commit e779891327b1d9b9ab10ba482e59f498790505a7 Author: Aymeric Wibo AuthorDate: 2025-09-14 21:58:13 +0000 Commit: Aymeric Wibo CommitDate: 2025-09-14 21:58:15 +0000 sys/power: Sleep type reporting by PM backends Allow PM backends to report supported sleep types when registering through `power_pm_register`. Expose this information through `kern.power.supported_stype` sysctl, and set defaults for `power_standby/suspend/hibernate_stype` based on this. Implement this in ACPI PM backend. Reviewed by: mckusick (mentor), markj Approved by: mckusick (mentor), markj Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D52044 --- sys/dev/acpica/acpi.c | 6 ++++-- sys/kern/subr_power.c | 46 +++++++++++++++++++++++++++++++++++++++++----- sys/sys/power.h | 3 ++- 3 files changed, 47 insertions(+), 8 deletions(-) diff --git a/sys/dev/acpica/acpi.c b/sys/dev/acpica/acpi.c index 8dd879a573cc..702e1ecb5340 100644 --- a/sys/dev/acpica/acpi.c +++ b/sys/dev/acpica/acpi.c @@ -734,7 +734,8 @@ acpi_attach(device_t dev) goto out; /* Register ACPI again to pass the correct argument of pm_func. */ - power_pm_register(POWER_PM_TYPE_ACPI, acpi_pm_func, sc); + power_pm_register(POWER_PM_TYPE_ACPI, acpi_pm_func, sc, + acpi_supported_stypes); acpi_platform_osc(dev); @@ -4776,7 +4777,8 @@ acpi_pm_register(void *arg) if (!cold || resource_disabled("acpi", 0)) return; - power_pm_register(POWER_PM_TYPE_ACPI, acpi_pm_func, NULL); + power_pm_register(POWER_PM_TYPE_ACPI, acpi_pm_func, NULL, + acpi_supported_stypes); } SYSINIT(power, SI_SUB_KLD, SI_ORDER_ANY, acpi_pm_register, NULL); diff --git a/sys/kern/subr_power.c b/sys/kern/subr_power.c index eb5bd03f5018..44ad82860649 100644 --- a/sys/kern/subr_power.c +++ b/sys/kern/subr_power.c @@ -39,13 +39,14 @@ #include #include -enum power_stype power_standby_stype = POWER_STYPE_STANDBY; -enum power_stype power_suspend_stype = POWER_STYPE_SUSPEND_TO_IDLE; -enum power_stype power_hibernate_stype = POWER_STYPE_HIBERNATE; +enum power_stype power_standby_stype = POWER_STYPE_UNKNOWN; +enum power_stype power_suspend_stype = POWER_STYPE_UNKNOWN; +enum power_stype power_hibernate_stype = POWER_STYPE_UNKNOWN; static u_int power_pm_type = POWER_PM_TYPE_NONE; static power_pm_fn_t power_pm_fn = NULL; static void *power_pm_arg = NULL; +static bool power_pm_supported[POWER_STYPE_COUNT] = {0}; static struct task power_pm_task; enum power_stype @@ -70,6 +71,26 @@ power_stype_to_name(enum power_stype stype) return (power_stype_names[stype]); } +static int +sysctl_supported_stypes(SYSCTL_HANDLER_ARGS) +{ + int error; + struct sbuf sb; + enum power_stype stype; + + sbuf_new(&sb, NULL, 32, SBUF_AUTOEXTEND); + for (stype = 0; stype < POWER_STYPE_COUNT; stype++) { + if (power_pm_supported[stype]) + sbuf_printf(&sb, "%s ", power_stype_to_name(stype)); + } + sbuf_trim(&sb); + sbuf_finish(&sb); + error = sysctl_handle_string(oidp, sbuf_data(&sb), sbuf_len(&sb), req); + sbuf_delete(&sb); + + return (error); +} + static int power_sysctl_stype(SYSCTL_HANDLER_ARGS) { @@ -86,7 +107,8 @@ power_sysctl_stype(SYSCTL_HANDLER_ARGS) new_stype = power_name_to_stype(name); if (new_stype == POWER_STYPE_UNKNOWN) return (EINVAL); - /* TODO Check to see if the new stype is supported. */ + if (!power_pm_supported[new_stype]) + return (EOPNOTSUPP); if (new_stype != old_stype) *(enum power_stype *)oidp->oid_arg1 = new_stype; return (0); @@ -95,6 +117,9 @@ power_sysctl_stype(SYSCTL_HANDLER_ARGS) static SYSCTL_NODE(_kern, OID_AUTO, power, CTLFLAG_RW, 0, "Generic power management related sysctls"); +SYSCTL_PROC(_kern_power, OID_AUTO, supported_stype, + CTLTYPE_STRING | CTLFLAG_RD, 0, 0, sysctl_supported_stypes, "A", + "List supported sleep types"); SYSCTL_PROC(_kern_power, OID_AUTO, standby, CTLTYPE_STRING | CTLFLAG_RW, &power_standby_stype, 0, power_sysctl_stype, "A", "Sleep type to enter on standby"); @@ -114,7 +139,8 @@ power_pm_deferred_fn(void *arg, int pending) } int -power_pm_register(u_int pm_type, power_pm_fn_t pm_fn, void *pm_arg) +power_pm_register(u_int pm_type, power_pm_fn_t pm_fn, void *pm_arg, + bool pm_supported[static POWER_STYPE_COUNT]) { int error; @@ -123,6 +149,16 @@ power_pm_register(u_int pm_type, power_pm_fn_t pm_fn, void *pm_arg) power_pm_type = pm_type; power_pm_fn = pm_fn; power_pm_arg = pm_arg; + memcpy(power_pm_supported, pm_supported, + sizeof(power_pm_supported)); + if (power_pm_supported[POWER_STYPE_STANDBY]) + power_standby_stype = POWER_STYPE_STANDBY; + if (power_pm_supported[POWER_STYPE_SUSPEND_TO_IDLE]) + power_suspend_stype = POWER_STYPE_SUSPEND_TO_IDLE; + else if (power_pm_supported[POWER_STYPE_SUSPEND_TO_MEM]) + power_suspend_stype = POWER_STYPE_SUSPEND_TO_MEM; + if (power_pm_supported[POWER_STYPE_HIBERNATE]) + power_hibernate_stype = POWER_STYPE_HIBERNATE; error = 0; TASK_INIT(&power_pm_task, 0, power_pm_deferred_fn, NULL); } else { diff --git a/sys/sys/power.h b/sys/sys/power.h index 44d7fc354423..33ace400bfd2 100644 --- a/sys/sys/power.h +++ b/sys/sys/power.h @@ -91,7 +91,8 @@ extern const char *power_stype_to_name(enum power_stype _stype); typedef int (*power_pm_fn_t)(u_long _cmd, void* _arg, enum power_stype _stype); extern int power_pm_register(u_int _pm_type, power_pm_fn_t _pm_fn, - void *_pm_arg); + void *_pm_arg, + bool _pm_supported[static POWER_STYPE_COUNT]); extern u_int power_pm_get_type(void); extern void power_pm_suspend(int);