summaryrefslogtreecommitdiff
path: root/sys/dev/pci/ppb.c
diff options
context:
space:
mode:
authorTheo de Raadt <deraadt@cvs.openbsd.org>2012-10-08 21:47:52 +0000
committerTheo de Raadt <deraadt@cvs.openbsd.org>2012-10-08 21:47:52 +0000
commit4a7a1f17c7d6f8e79f29d4fde2ba5faf09b7f5a8 (patch)
treefdc5670bf4d0a8cd810fe846698cb565f1f51cb9 /sys/dev/pci/ppb.c
parentc7f240fd53223122e6fe8cee52bb76b460263763 (diff)
Revamp the sequences for suspend/hibernate -> resume so that the code
paths are reflexive. It is now possible to fail part-way through a suspend sequence, and recover along the resume code path. Split DVACT_SUSPEND by adding a new DVACT_POWERDOWN method is used after hibernate (and suspend too) to finish the job. Some drivers must be converted at the same time to use this instead of shutdown hooks (the others will follow at a later time) ok kettenis mlarkin
Diffstat (limited to 'sys/dev/pci/ppb.c')
-rw-r--r--sys/dev/pci/ppb.c7
1 files changed, 5 insertions, 2 deletions
diff --git a/sys/dev/pci/ppb.c b/sys/dev/pci/ppb.c
index 32dfce9523e..c9a7f9cca53 100644
--- a/sys/dev/pci/ppb.c
+++ b/sys/dev/pci/ppb.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ppb.c,v 1.54 2012/09/07 19:26:48 kettenis Exp $ */
+/* $OpenBSD: ppb.c,v 1.55 2012/10/08 21:47:50 deraadt Exp $ */
/* $NetBSD: ppb.c,v 1.16 1997/06/06 23:48:05 thorpej Exp $ */
/*
@@ -389,7 +389,10 @@ ppbactivate(struct device *self, int act)
}
sc->sc_msi_mc = reg;
}
-
+ break;
+ case DVACT_POWERDOWN:
+ rv = config_activate_children(self, act);
+
if (pci_dopm) {
/*
* Place the bridge into the lowest possible