Module Name: src
Committed By: jruoho
Date: Tue Jan 4 05:48:49 UTC 2011
Modified Files:
src/sys/dev/acpi: acpi_acad.c acpi_bat.c acpi_cpu_cstate.c
Log Message:
Revert the changes made in the commit:
"Do not queue functions via sysmon_taskq(9) in the pmf(9) resume hooks.
There is a small and unlikely race when the drivers are loaded as modules;
suspend, resume, queue a function, and immediately unload the module."
Queueing the checks in the resume hooks was observed to improve the resume
time by several seconds (!) on a system with poorly implemented AML code.
The observed race condition is a wider issue related to modules; things like
sysmon_taskq(9) should be modified to allow cancelling of queued functions.
To generate a diff of this commit:
cvs rdiff -u -r1.47 -r1.48 src/sys/dev/acpi/acpi_acad.c
cvs rdiff -u -r1.105 -r1.106 src/sys/dev/acpi/acpi_bat.c
cvs rdiff -u -r1.34 -r1.35 src/sys/dev/acpi/acpi_cpu_cstate.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/dev/acpi/acpi_acad.c
diff -u src/sys/dev/acpi/acpi_acad.c:1.47 src/sys/dev/acpi/acpi_acad.c:1.48
--- src/sys/dev/acpi/acpi_acad.c:1.47 Thu Oct 28 18:03:11 2010
+++ src/sys/dev/acpi/acpi_acad.c Tue Jan 4 05:48:48 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: acpi_acad.c,v 1.47 2010/10/28 18:03:11 jruoho Exp $ */
+/* $NetBSD: acpi_acad.c,v 1.48 2011/01/04 05:48:48 jruoho Exp $ */
/*
* Copyright 2001 Wasabi Systems, Inc.
@@ -40,7 +40,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: acpi_acad.c,v 1.47 2010/10/28 18:03:11 jruoho Exp $");
+__KERNEL_RCSID(0, "$NetBSD: acpi_acad.c,v 1.48 2011/01/04 05:48:48 jruoho Exp $");
#include <sys/param.h>
#include <sys/device.h>
@@ -159,7 +159,7 @@
acpiacad_resume(device_t dv, const pmf_qual_t *qual)
{
- acpiacad_get_status(dv);
+ (void)AcpiOsExecute(OSL_NOTIFY_HANDLER, acpiacad_get_status, dv);
return true;
}
Index: src/sys/dev/acpi/acpi_bat.c
diff -u src/sys/dev/acpi/acpi_bat.c:1.105 src/sys/dev/acpi/acpi_bat.c:1.106
--- src/sys/dev/acpi/acpi_bat.c:1.105 Mon Oct 25 07:48:03 2010
+++ src/sys/dev/acpi/acpi_bat.c Tue Jan 4 05:48:48 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: acpi_bat.c,v 1.105 2010/10/25 07:48:03 jruoho Exp $ */
+/* $NetBSD: acpi_bat.c,v 1.106 2011/01/04 05:48:48 jruoho Exp $ */
/*-
* Copyright (c) 2003 The NetBSD Foundation, Inc.
@@ -75,7 +75,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: acpi_bat.c,v 1.105 2010/10/25 07:48:03 jruoho Exp $");
+__KERNEL_RCSID(0, "$NetBSD: acpi_bat.c,v 1.106 2011/01/04 05:48:48 jruoho Exp $");
#include <sys/param.h>
#include <sys/condvar.h>
@@ -786,8 +786,8 @@
acpibat_resume(device_t dv, const pmf_qual_t *qual)
{
- acpibat_update_info(dv);
- acpibat_update_status(dv);
+ (void)AcpiOsExecute(OSL_NOTIFY_HANDLER, acpibat_update_info, dv);
+ (void)AcpiOsExecute(OSL_NOTIFY_HANDLER, acpibat_update_status, dv);
return true;
}
Index: src/sys/dev/acpi/acpi_cpu_cstate.c
diff -u src/sys/dev/acpi/acpi_cpu_cstate.c:1.34 src/sys/dev/acpi/acpi_cpu_cstate.c:1.35
--- src/sys/dev/acpi/acpi_cpu_cstate.c:1.34 Tue Nov 30 04:31:00 2010
+++ src/sys/dev/acpi/acpi_cpu_cstate.c Tue Jan 4 05:48:48 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: acpi_cpu_cstate.c,v 1.34 2010/11/30 04:31:00 jruoho Exp $ */
+/* $NetBSD: acpi_cpu_cstate.c,v 1.35 2011/01/04 05:48:48 jruoho Exp $ */
/*-
* Copyright (c) 2010 Jukka Ruohonen <jruoho...@iki.fi>
@@ -27,7 +27,7 @@
* SUCH DAMAGE.
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: acpi_cpu_cstate.c,v 1.34 2010/11/30 04:31:00 jruoho Exp $");
+__KERNEL_RCSID(0, "$NetBSD: acpi_cpu_cstate.c,v 1.35 2011/01/04 05:48:48 jruoho Exp $");
#include <sys/param.h>
#include <sys/cpu.h>
@@ -224,17 +224,17 @@
bool
acpicpu_cstate_suspend(device_t self)
{
-
return true;
}
bool
acpicpu_cstate_resume(device_t self)
{
+ static const ACPI_OSD_EXEC_CALLBACK func = acpicpu_cstate_callback;
struct acpicpu_softc *sc = device_private(self);
if ((sc->sc_flags & ACPICPU_FLAG_C_FADT) == 0)
- acpicpu_cstate_callback(self);
+ (void)AcpiOsExecute(OSL_NOTIFY_HANDLER, func, sc->sc_dev);
return true;
}
