Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 0cb259c4 authored by Jon Derrick's avatar Jon Derrick Committed by Bjorn Helgaas
Browse files

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: 3906b918 ("PCI: vmd: Use SRCU as a local RCU to prevent delaying global RCU")
Signed-off-by: default avatarJon Derrick <jonathan.derrick@intel.com>
Signed-off-by: default avatarBjorn Helgaas <bhelgaas@google.com>
Acked-by: default avatarKeith Busch <keith.busch@intel.com>
Cc: <stable@vger.kernel.org> # 4.11
parent 575a144e

drivers/pci/host/vmd.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -736,10 +736,10 @@ static void vmd_remove(struct pci_dev *dev) 
	struct vmd_dev *vmd = pci_get_drvdata(dev);

	struct vmd_dev *vmd = pci_get_drvdata(dev);





	vmd_detach_resources(vmd);

	vmd_detach_resources(vmd);

	vmd_cleanup_srcu(vmd);

	sysfs_remove_link(&vmd->dev->dev.kobj, "domain");

	sysfs_remove_link(&vmd->dev->dev.kobj, "domain");

	pci_stop_root_bus(vmd->bus);

	pci_stop_root_bus(vmd->bus);

	pci_remove_root_bus(vmd->bus);

	pci_remove_root_bus(vmd->bus);

	vmd_cleanup_srcu(vmd);

	vmd_teardown_dma_ops(vmd);

	vmd_teardown_dma_ops(vmd);

	irq_domain_remove(vmd->irq_domain);

	irq_domain_remove(vmd->irq_domain);

}

}