d/freebsd-skq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Add pci_resume() to reestablish interrupt routing after

Browse Source 
suspend/resume.
Especially after hibernation, interrupt routing went back to initial
status on some machines.
This commit is contained in:
iwasaki 2003-09-17 08:32:44 +00:00
parent ab6ce03a9b
commit 9fac14e51f
3 changed files with 35 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
sys/dev/acpica/acpi_pci.c
View File

@ -79,7 +79,7 @@ static device_method_t acpi_pci_methods[] = {
DEVMETHOD(device_attach, acpi_pci_attach),
DEVMETHOD(device_shutdown, bus_generic_shutdown),
DEVMETHOD(device_suspend, bus_generic_suspend),
DEVMETHOD(device_resume, bus_generic_resume),
DEVMETHOD(device_resume, pci_resume),
/* Bus interface */
DEVMETHOD(bus_print_child, pci_print_child),

34
sys/dev/pci/pci.c
View File

@ -89,7 +89,7 @@ static device_method_t pci_methods[] = {
DEVMETHOD(device_attach, pci_attach),
DEVMETHOD(device_shutdown, bus_generic_shutdown),
DEVMETHOD(device_suspend, bus_generic_suspend),
DEVMETHOD(device_resume, bus_generic_resume),
DEVMETHOD(device_resume, pci_resume),
/* Bus interface */
DEVMETHOD(bus_print_child, pci_print_child),
@ -1509,3 +1509,35 @@ pci_modevent(module_t mod, int what, void *arg)
return (0);
}
int
pci_resume(device_t dev)
{
int numdevs;
int i;
device_t *children;
device_t child;
struct pci_devinfo *dinfo;
pcicfgregs *cfg;
device_get_children(dev, &children, &numdevs);
for (i = 0; i < numdevs; i++) {
child = children[i];
dinfo = device_get_ivars(child);
cfg = &dinfo->cfg;
if (cfg->intpin > 0 && PCI_INTERRUPT_VALID(cfg->intline)) {
cfg->intline = PCI_ASSIGN_INTERRUPT(dev, child);
if (PCI_INTERRUPT_VALID(cfg->intline)) {
pci_write_config(child, PCIR_INTLINE,
cfg->intline, 1);
}
}
}
free(children, M_TEMP);
return (bus_generic_resume(dev));
}

1
sys/dev/pci/pci_private.h
View File

@ -73,4 +73,5 @@ int pci_child_location_str_method(device_t cbdev, device_t child,
int pci_child_pnpinfo_str_method(device_t cbdev, device_t child,
char *buf, size_t buflen);
int pci_assign_interrupt_method(device_t dev, device_t child);
int pci_resume(device_t dev);
#endif /* _PCI_PRIVATE_H_ */