aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/pci/host/vmd.c
diff options
context:
space:
mode:
authorJon Derrick <jonathan.derrick@intel.com>2017-06-22 11:15:42 -0400
committerBjorn Helgaas <bhelgaas@google.com>2017-07-02 19:47:15 -0400
commit0cb259c47a4df466d641c1f07ae3eccaa9ba3ccb (patch)
tree097db8d12169db5a88ae407739fbf40a3d6b5618 /drivers/pci/host/vmd.c
parent575a144e7b3006c1b583ccecc4ede8b180d00d0c (diff)
PCI: vmd: Move SRCU cleanup after bus, child device removal
Recent __call_srcu() changes have exposed that we need to cleanup SRCU structures after pci_stop_root_bus() calls into vmd_msi_free(). Fixes: 3906b91844d6 ("PCI: vmd: Use SRCU as a local RCU to prevent delaying global RCU") Signed-off-by: Jon Derrick <jonathan.derrick@intel.com> Signed-off-by: Bjorn Helgaas <bhelgaas@google.com> Acked-by: Keith Busch <keith.busch@intel.com> Cc: <stable@vger.kernel.org> # 4.11
Diffstat (limited to 'drivers/pci/host/vmd.c')
-rw-r--r--drivers/pci/host/vmd.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/pci/host/vmd.c b/drivers/pci/host/vmd.c
index 53aa1d4b17e8..9d83f37b4cb7 100644
--- a/drivers/pci/host/vmd.c
+++ b/drivers/pci/host/vmd.c
@@ -736,10 +736,10 @@ static void vmd_remove(struct pci_dev *dev)
736 struct vmd_dev *vmd = pci_get_drvdata(dev); 736 struct vmd_dev *vmd = pci_get_drvdata(dev);
737 737
738 vmd_detach_resources(vmd); 738 vmd_detach_resources(vmd);
739 vmd_cleanup_srcu(vmd);
740 sysfs_remove_link(&vmd->dev->dev.kobj, "domain"); 739 sysfs_remove_link(&vmd->dev->dev.kobj, "domain");
741 pci_stop_root_bus(vmd->bus); 740 pci_stop_root_bus(vmd->bus);
742 pci_remove_root_bus(vmd->bus); 741 pci_remove_root_bus(vmd->bus);
742 vmd_cleanup_srcu(vmd);
743 vmd_teardown_dma_ops(vmd); 743 vmd_teardown_dma_ops(vmd);
744 irq_domain_remove(vmd->irq_domain); 744 irq_domain_remove(vmd->irq_domain);
745} 745}