Paths

Table of Contentst

Differential D52043

acpi: Use sleep types defined in sys/power.h
ClosedPublic
Actions

Authored by obiwac on Aug 20 2025, 10:33 AM.

Tags

None

Referenced Files

	Unknown Object (File)
	Sun, Oct 12, 4:53 PM

	Unknown Object (File)
	Sun, Oct 12, 3:12 PM

	Unknown Object (File)
	Sun, Oct 12, 3:57 AM

	Unknown Object (File)
	Thu, Oct 9, 9:53 PM

	Unknown Object (File)
	Thu, Oct 9, 9:53 PM

	Unknown Object (File)
	Thu, Oct 9, 9:53 PM

	Unknown Object (File)
	Thu, Oct 9, 9:53 PM

	Unknown Object (File)
	Thu, Oct 9, 9:53 PM

View All 35 Files

Subscribers

Details

Reviewers

jkim
imp
emaste
jhb
markj
mckusick

Commits

rGce5e22b28ef6: acpi: Use sleep types defined in sys/power.h

Summary

This is as opposed to using ACPI sleep states (ACPI_STATE_S*). We now use POWER_STYPE_* added in D52036.

This is in preparation for adding support for s2idle, which is not an ACPI sleep state, but needs to be handled specially by acpi_EnterSleepState.

Superseeds D48732.

Diff Detail

Repository

rG FreeBSD src repository

Lint

Lint Not Applicable

Unit

Tests Not Applicable

Event Timeline

obiwac requested review of this revision.Aug 20 2025, 10:33 AM

obiwac created this revision.

Harbormaster completed remote builds in B66373: Diff 160654.Aug 20 2025, 10:33 AM

obiwac added a parent revision: D52036: sys/power: Generic sleep types.Aug 20 2025, 10:34 AM

obiwac edited the summary of this revision. (Show Details)

obiwac added a child revision: D52044: sys/power: Sleep type reporting by PM backends.Aug 20 2025, 10:38 AM

obiwac mentioned this in D48732: acpi: Abstract over ACPI Sx sleep states with `enum sleep_type`.

markj added inline comments.Sep 4 2025, 2:37 PM

sys/dev/acpica/acpi.c
174	Indentation looks wonky here. I think the prevailing style is to tab until aligned with the function name, then add four spaces, so it'd be nice to match.
600	Aren't you effectively breaking compatibility for these sysctls? After this change they report the generic power_stype names instead of ACPI sleep state names.

Fix indentation

Harbormaster completed remote builds in B66841: Diff 161586.Sep 5 2025, 3:15 PM

obiwac marked an inline comment as done and an inline comment as not done.Sep 5 2025, 3:19 PM

obiwac added inline comments.

sys/dev/acpica/acpi.c
600	Yeah I am. This is sort of the main reason why I'm unsure of these changes. We want to be able to tell OSPM to enter a generic "suspend" sleep type instead of an ACPI S-state upon pressing the power button, because this could mean either entering S3 or S0ix (which is not an ACPI state).
610–612	TODO gotta fix this description

markj added inline comments.Sep 8 2025, 1:17 PM

sys/dev/acpica/acpi.c
116	Why are these not both `bool` or `BOOLEAN`?
600	I think these sysctls are probably too widely used for such breakage to be a good idea. There are quite a few references to these sysctls on various forums. They're also documented in acpi.4, which needs to be updated here. Since they're taking a string as input, can we instead have sysctl handlers which still accept the old sleep state names as well as the new ones? And perhaps print a warning to the console if one is using the legacy names.

obiwac added inline comments.Sep 8 2025, 2:11 PM

sys/dev/acpica/acpi.c
116	oops, I'll make both `bool`s
600	Since they're taking a string as input, can we instead have sysctl handlers which still accept the old sleep state names as well as the new ones? And perhaps print a warning to the console if one is using the legacy names. That sounds like a good solution. It still would be a breaking change if e.g. you were to attempt to set it to S1 and `standby_state` is set to S2, but that's probably not a big deal.

Use own sysctl handler for ACPI stuff so we can still support old S-states here (even though deprecated).

Harbormaster completed remote builds in B66940: Diff 161845.Sep 10 2025, 11:10 AM

obiwac marked 3 inline comments as done.Sep 10 2025, 11:15 AM

This looks ok to me. It would be best to land this with a man page update, whether that's here or in a separate commit.

sys/dev/acpica/acpi.c
4388	Do you plan to update acpi.4 in this patch?

This revision is now accepted and ready to land.Sep 12 2025, 12:49 PM

Mentor approval.

Closed by commit rGce5e22b28ef6: acpi: Use sleep types defined in sys/power.h (authored by obiwac). · Explain WhySep 14 2025, 9:58 PM

This revision was automatically updated to reflect the committed changes.

obiwac added a commit: rGce5e22b28ef6: acpi: Use sleep types defined in sys/power.h.

obiwac added a reverting change: rG506b36c4fdde: Revert "acpi: Use sleep types defined in sys/power.h".Sep 18 2025, 9:50 AM

obiwac mentioned this in D52705: acpi: Use sleep types defined in sys/power.h.Wed, Sep 24, 11:42 AM

Revision Contents
Changeset List

Path

Size

sys/

dev/

acpica/

368 lines

4 lines

15 lines

x86/

acpica/

25 lines

Diff 162017

sys/dev/acpica/acpi.c

Loading...

sys/dev/acpica/acpi_lid.c

Loading...

sys/dev/acpica/acpivar.h

Loading...

sys/x86/acpica/acpi_apm.c

Loading...