openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

acpiphp: stop bus device before acpi_bus_trim 

Contrary to PCI bridge hot-add, we need to follow the sequence below
for PCI bridge hot-removal.

  (1) Stop devices (detach drivers, remove from the global list, etc.)
  (2) Unbind ACPI node from the devices (remove the _PRT entries)
  (3) Remove devices (remove from the device list, etc.)

This patch fixes acpiphp driver to follow above sequence for P2P
bridge hot-removal.

Signed-off-by: Kenji Kaneshige <kaneshige.kenji@jp.fujitsu.com>
Signed-off-by: MUNEDA Takahiro <muneda.takahiro@jp.fujitsu.com>
Signed-off-by: Satoru Takeuchi <takeuchi_satoru@jp.fujitsu.com>
Signed-off-by: Kristen Carlson Accardi <kristen.c.accardi@intel.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
This commit is contained in:
Satoru Takeuchi 2006-09-12 10:17:46 -07:00 committed by Greg Kroah-Hartman
parent 24f8aa9b46
commit 0dad3510ee
1 changed files with 3 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
drivers/pci/hotplug/acpiphp_glue.c
View File

@ -1129,6 +1129,9 @@ static int disable_device(struct acpiphp_slot *slot)
func->bridge = NULL; func->bridge = NULL;
} }
if (func->pci_dev)
pci_stop_bus_device(func->pci_dev);
acpiphp_bus_trim(func->handle); acpiphp_bus_trim(func->handle);
/* try to remove anyway. /* try to remove anyway.
* acpiphp_bus_add might have been failed */ * acpiphp_bus_add might have been failed */