acpi: Add back `hw.acpi.suspend_state` sysctl
ClosedPublic
Actions

Authored by obiwac on Wed, Sep 17, 10:32 PM.

Details

Reviewers

zarychtam_plan-b.pwste.edu.pl
markj
cy
jkim

Commits

rG9e1e29bd5ec6: acpi: Add back `hw.acpi.suspend_state` sysctl

Summary

When writing an ACPI S-state to it it will set kern.power.suspend to the
appropriate sleep type, and when reading from it it will return the
corresponding ACPI S-state to the sleep type in kern.power.suspend.

This is deprecated and kern.power.suspend should be used directly
instead, but add this back because zzz(1) makes use of this and we can't
easily rewrite it just now.

PR: 289634
Sponsored by: The FreeBSD Foundation

Diff Detail

Repository

rG FreeBSD src repository

Lint

Lint Skipped

Unit

Tests Skipped

Build Status

Buildable 67278
Build 64161: arc lint + arc unit

Event Timeline

obiwac created this revision.Wed, Sep 17, 10:32 PM

Herald added a subscriber: imp. · View Herald TranscriptWed, Sep 17, 10:32 PM

obiwac requested review of this revision.Wed, Sep 17, 10:32 PM

Harbormaster completed remote builds in B67138: Diff 162297.Wed, Sep 17, 10:32 PM

This patch fails to address the regression.

This revision now requires changes to proceed.Thu, Sep 18, 5:00 AM

In D52600#1201315, @cy wrote:

This patch fails to address the regression.

As said in the bug report, this means to address the zzz(1) issue.

The regression you brought up is completely separate and isn't supposed to be addressed by this revision but D52598.

markj accepted this revision.Thu, Sep 18, 12:41 PM

obiwac added a parent revision: D52705: acpi: Use sleep types defined in sys/power.h.Wed, Sep 24, 11:43 AM

rebase

Harbormaster completed remote builds in B67278: Diff 162735.Wed, Sep 24, 2:06 PM

In D52600#1204074, @obiwac wrote:

rebase

It still fails to apply.

fgit@slippy$ git apply /tmp/D52600.diff
error: patch failed: sys/dev/acpica/acpi.c:195
error: sys/dev/acpica/acpi.c: patch does not apply
fgit@slippy$ patch -C -p1 < /tmp/D52600.diff
Hmm... Looks like a unified diff to me...

The text leading up to this was:

diff --git a/sys/dev/acpica/acpi.c b/sys/dev/acpica/acpi.c

--- a/sys/dev/acpica/acpi.c

+++ b/sys/dev/acpica/acpi.c

Patching file sys/dev/acpica/acpi.c using Plan A...
Hunk #1 failed at 195.
Hunk #2 failed at 617.
Hunk #3 succeeded at 1244 with fuzz 2 (offset -3114 lines).
2 out of 3 hunks failed while patching sys/dev/acpica/acpi.c
Hmm... Ignoring the trailing garbage.
done
fgit@slippy$