Merge branch 'remotes/lorenzo/pci/vmd'

bjorn-helgaas · bjorn-helgaas · commit 7e4e95897663 · 2018-10-20T11:45:55.000-05:00
- Detach VMD resources after stopping root bus to prevent orphan
    resources (Jon Derrick)

* remotes/lorenzo/pci/vmd:
  PCI: vmd: Detach resources after stopping root bus
diff --git a/drivers/pci/controller/vmd.c b/drivers/pci/controller/vmd.c
@@ -813,12 +813,12 @@ static void vmd_remove(struct pci_dev *dev)
 {
 	struct vmd_dev *vmd = pci_get_drvdata(dev);
 
-	vmd_detach_resources(vmd);
 	sysfs_remove_link(&vmd->dev->dev.kobj, "domain");
 	pci_stop_root_bus(vmd->bus);
 	pci_remove_root_bus(vmd->bus);
 	vmd_cleanup_srcu(vmd);
 	vmd_teardown_dma_ops(vmd);
+	vmd_detach_resources(vmd);
 	irq_domain_remove(vmd->irq_domain);
 }
 

Original file line number	Diff line number	Diff line change
`@@ -813,12 +813,12 @@ static void vmd_remove(struct pci_dev *dev)`
`813`	`813`	`{`
`814`	`814`	`struct vmd_dev *vmd = pci_get_drvdata(dev);`
`815`	`815`
`816`		`- vmd_detach_resources(vmd);`
`817`	`816`	`sysfs_remove_link(&vmd->dev->dev.kobj, "domain");`
`818`	`817`	`pci_stop_root_bus(vmd->bus);`
`819`	`818`	`pci_remove_root_bus(vmd->bus);`
`820`	`819`	`vmd_cleanup_srcu(vmd);`
`821`	`820`	`vmd_teardown_dma_ops(vmd);`
	`821`	`+ vmd_detach_resources(vmd);`
`822`	`822`	`irq_domain_remove(vmd->irq_domain);`
`823`	`823`	`}`
`824`	`824`