summaryrefslogtreecommitdiff
path: root/sys/dev
diff options
context:
space:
mode:
authorjoerg <joerg@NetBSD.org>2008-11-17 23:29:49 +0000
committerjoerg <joerg@NetBSD.org>2008-11-17 23:29:49 +0000
commita5be52d405632098ec6152202de107e5bee5d5b3 (patch)
tree3cbd04362c089cb3ee5151fa319005f25252edd5 /sys/dev
parentc42112239bd7c79c10c80571bd44746ba5a434d9 (diff)
On resum-from-RAM explicitly restore PCI link device state before
reenabling interrupts. At least one BIOS doesn't do this automatically as reported by Christoph Egger.
Diffstat (limited to 'sys/dev')
-rw-r--r--sys/dev/acpi/acpi_pci_link.c18
-rw-r--r--sys/dev/acpi/acpivar.h3
2 files changed, 18 insertions, 3 deletions
diff --git a/sys/dev/acpi/acpi_pci_link.c b/sys/dev/acpi/acpi_pci_link.c
index 13c1d90a5fa..8331dbf466f 100644
--- a/sys/dev/acpi/acpi_pci_link.c
+++ b/sys/dev/acpi/acpi_pci_link.c
@@ -1,4 +1,4 @@
-/* $NetBSD: acpi_pci_link.c,v 1.13 2008/06/04 21:37:03 jmcneill Exp $ */
+/* $NetBSD: acpi_pci_link.c,v 1.14 2008/11/17 23:29:49 joerg Exp $ */
/*-
* Copyright (c) 2002 Mitsuru IWASAKI <iwasaki@jp.freebsd.org>
@@ -27,7 +27,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: acpi_pci_link.c,v 1.13 2008/06/04 21:37:03 jmcneill Exp $");
+__KERNEL_RCSID(0, "$NetBSD: acpi_pci_link.c,v 1.14 2008/11/17 23:29:49 joerg Exp $");
#include "opt_acpi.h"
#include <sys/param.h>
@@ -1156,6 +1156,20 @@ acpi_pci_link_devbyhandle(ACPI_HANDLE handle)
return (void *)sc;
}
+void
+acpi_pci_link_resume(void)
+{
+ struct acpi_pci_link_softc *sc;
+ ACPI_BUFFER srsbuf;
+
+ TAILQ_FOREACH(sc, &acpi_pci_linkdevs, pl_list) {
+ ACPI_SERIAL_BEGIN(pci_link);
+ if (ACPI_SUCCESS(acpi_pci_link_srs(sc, &srsbuf)))
+ AcpiOsFree(srsbuf.Pointer);
+ ACPI_SERIAL_END(pci_link);
+ }
+}
+
ACPI_HANDLE
acpi_pci_link_handle(void *v)
{
diff --git a/sys/dev/acpi/acpivar.h b/sys/dev/acpi/acpivar.h
index 8f476f9287b..e9f8becda79 100644
--- a/sys/dev/acpi/acpivar.h
+++ b/sys/dev/acpi/acpivar.h
@@ -1,4 +1,4 @@
-/* $NetBSD: acpivar.h,v 1.33 2008/07/15 16:15:28 dyoung Exp $ */
+/* $NetBSD: acpivar.h,v 1.34 2008/11/17 23:29:49 joerg Exp $ */
/*
* Copyright 2001 Wasabi Systems, Inc.
@@ -289,6 +289,7 @@ int acpi_pci_link_route_interrupt(void *, int, int *, int *, int *);
char * acpi_pci_link_name(void *);
ACPI_HANDLE acpi_pci_link_handle(void *);
void acpi_pci_link_state(void);
+void acpi_pci_link_resume(void);
struct acpi_io *acpi_res_io(struct acpi_resources *, int);
struct acpi_iorange *acpi_res_iorange(struct acpi_resources *, int);