BACKPORT: PCI/pwrctrl: Move pci_pwrctrl_unregister() to pci_destroy_dev()
The PCI core will try to access the devices even after pci_stop_dev() for things like Data Object Exchange (DOE), ASPM, etc. So, move pci_pwrctrl_unregister() to the near end of pci_destroy_dev() to make sure that the devices are powered down only after the PCI core is done with them. Suggested-by: Lukas Wunner <lukas@wunner.de> Reviewed-by: Lukas Wunner <lukas@wunner.de> Tested-by: Bartosz Golaszewski <bartosz.golaszewski@linaro.org> Signed-off-by: Manivannan Sadhasivam <manivannan.sadhasivam@linaro.org> Link: https://lore.kernel.org/r/20250116-pci-pwrctrl-slot-v3-2-827473c8fbf4@linaro.org [kwilczynski: commit log] Signed-off-by: Krzysztof Wilczyński <kwilczynski@kernel.org> (cherry picked from commit 2d923930f2e3fe1ecf060169f57980da819a191f) [Brian: some context changes in pci_stop_dev()] Bug: 380139395 Change-Id: I3d0a13b8738cd087d56e2b57a9b4fd2863f23221 Signed-off-by: Brian Norris <briannorris@google.com>
This commit is contained in:
committed by
Treehugger Robot
parent
498c4a3752
commit
631ad858c7
@@ -39,7 +39,6 @@ static void pci_stop_dev(struct pci_dev *dev)
|
||||
pci_pme_active(dev, false);
|
||||
|
||||
if (pci_dev_is_added(dev)) {
|
||||
pci_pwrctrl_unregister(&dev->dev);
|
||||
device_release_driver(&dev->dev);
|
||||
pci_proc_detach_device(dev);
|
||||
pci_remove_sysfs_dev_files(dev);
|
||||
@@ -65,6 +64,7 @@ static void pci_destroy_dev(struct pci_dev *dev)
|
||||
pci_doe_destroy(dev);
|
||||
pcie_aspm_exit_link_state(dev);
|
||||
pci_bridge_d3_update(dev);
|
||||
pci_pwrctrl_unregister(&dev->dev);
|
||||
pci_free_resources(dev);
|
||||
put_device(&dev->dev);
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user