Move the reset beep tunable/sysctl to debug.acpi.resume_beep. This makes

more sense than under hw.acpi.  Also, document this in the man page.

3 files changed, 17 insertions, 9 deletions

diff --git a/share/man/man4/acpi.4 b/share/man/man4/acpi.4
index 8b0a912..dab30d0 100644
--- a/share/man/man4/acpi.4
+++ b/share/man/man4/acpi.4
@@ -93,6 +93,9 @@ Tunables can be set at the
 .Xr loader 8
 prompt before booting the kernel or stored in
 .Pa /boot/loader.conf .
+Many of these tunables also have a matching
+.Xr sysctl 8
+entry for access after boot.
 .Bl -tag -width indent
 .It Va acpi_dsdt_load
 Enables loading of a custom ACPI DSDT.
@@ -107,6 +110,10 @@ handle parallel requests.
 The default value is 3.
 .It Va debug.acpi.quirks
 Override any automatic quirks completely.
+.It Va debug.acpi.resume_beep
+Beep the PC speaker on resume.
+This can help diagnose suspend/resume problems.
+Default is 0 (disabled).
 .It Va hint.acpi.0.disabled
 Set this to 1 to disable all of ACPI.
 If ACPI has been disabled on your system due to a blacklist entry for your
@@ -119,8 +126,9 @@ Try increasing this number if you get the error
 Override the assumed memory starting address for PCI host bridges.
 .It Va hw.acpi.reset_video
 Enables calling the VESA reset BIOS vector on the resume path.
-Some graphic chips have problems such as LCD white-out after resume.
-Try setting this to 0 if this causes problems for you.
+This can fix some graphics cards that have problems such as LCD white-out
+after resume.
+Default is 0 (disabled).
 .It Va hw.acpi.serialize_methods
 Allow override of whether methods execute in parallel or not.
 Enable this for serial behavior, which fixes
diff --git a/sys/i386/acpica/acpi_machdep.c b/sys/i386/acpica/acpi_machdep.c
index 867c2e6..725f43f 100644
--- a/sys/i386/acpica/acpi_machdep.c
+++ b/sys/i386/acpica/acpi_machdep.c
@@ -52,8 +52,12 @@ __FBSDID("$FreeBSD$");
 
 #include <i386/bios/apm.h>
 
+SYSCTL_DECL(_debug_acpi);
+
 uint32_t acpi_resume_beep;
-TUNABLE_INT("hw.acpi.resume_beep", &acpi_resume_beep);
+TUNABLE_INT("debug.acpi.resume_beep", &acpi_resume_beep);
+SYSCTL_UINT(_debug_acpi, OID_AUTO, resume_beep, CTLFLAG_RW, &acpi_resume_beep,
+    0, "Beep the PC speaker when resuming");
 uint32_t acpi_reset_video;
 TUNABLE_INT("hw.acpi.reset_video", &acpi_reset_video);
 
@@ -322,11 +326,7 @@ acpi_machdep_init(device_t dev)
 
 	SYSCTL_ADD_UINT(&sc->acpi_sysctl_ctx,
 	    SYSCTL_CHILDREN(sc->acpi_sysctl_tree), OID_AUTO,
-	    "resume_beep", CTLFLAG_RD | CTLFLAG_RW, &acpi_resume_beep, 0,
-	    "Beep the PC speaker when resuming");
-	SYSCTL_ADD_UINT(&sc->acpi_sysctl_ctx,
-	    SYSCTL_CHILDREN(sc->acpi_sysctl_tree), OID_AUTO,
-	    "reset_video", CTLFLAG_RD | CTLFLAG_RW, &acpi_reset_video, 0,
+	    "reset_video", CTLFLAG_RW, &acpi_reset_video, 0,
 	    "Call the VESA reset BIOS vector on the resume path");
 
 	return (0);
diff --git a/sys/i386/acpica/acpi_wakecode.S b/sys/i386/acpica/acpi_wakecode.S
index ecbb4cd..e8033e8 100644
--- a/sys/i386/acpica/acpi_wakecode.S
+++ b/sys/i386/acpica/acpi_wakecode.S
@@ -34,7 +34,7 @@
 
 #include "assym.s"
 
-	.align 4096
+	.align 4
 	.code16
 wakeup_16:
 	nop