aboutsummaryrefslogtreecommitdiff
path: root/sys/dev/pci
diff options
context:
space:
mode:
authorJung-uk Kim <jkim@FreeBSD.org>2010-11-22 21:58:00 +0000
committerJung-uk Kim <jkim@FreeBSD.org>2010-11-22 21:58:00 +0000
commitf68ff88c879936d6f53f19452b5c9d4cc4e849e3 (patch)
tree6bebb67cc68ee239e150541c8d4bde085d0a258b /sys/dev/pci
parent54e1a99c149028f4935bf85a0215dfb88bbe863e (diff)
downloadsrc-f68ff88c879936d6f53f19452b5c9d4cc4e849e3.tar.gz
src-f68ff88c879936d6f53f19452b5c9d4cc4e849e3.zip
Resume critical PCI devices (and their children) first, then everything else
later. This give us better chance to catch device driver problems.
Notes
Notes: svn path=/head/; revision=215719
Diffstat (limited to 'sys/dev/pci')
-rw-r--r--sys/dev/pci/pci.c29
1 files changed, 28 insertions, 1 deletions
diff --git a/sys/dev/pci/pci.c b/sys/dev/pci/pci.c
index 6069b6da7d82..e3b61595ce63 100644
--- a/sys/dev/pci/pci.c
+++ b/sys/dev/pci/pci.c
@@ -3022,8 +3022,35 @@ pci_resume(device_t dev)
if (!device_is_attached(child))
pci_cfg_save(child, dinfo, 1);
}
+
+ /*
+ * Resume critical devices first, then everything else later.
+ */
+ for (i = 0; i < numdevs; i++) {
+ child = devlist[i];
+ switch (pci_get_class(child)) {
+ case PCIC_DISPLAY:
+ case PCIC_MEMORY:
+ case PCIC_BRIDGE:
+ case PCIC_BASEPERIPH:
+ DEVICE_RESUME(child);
+ break;
+ }
+ }
+ for (i = 0; i < numdevs; i++) {
+ child = devlist[i];
+ switch (pci_get_class(child)) {
+ case PCIC_DISPLAY:
+ case PCIC_MEMORY:
+ case PCIC_BRIDGE:
+ case PCIC_BASEPERIPH:
+ break;
+ default:
+ DEVICE_RESUME(child);
+ }
+ }
free(devlist, M_TEMP);
- return (bus_generic_resume(dev));
+ return (0);
}
static void