Commit b51cb82c authored by Bjorn Helgaas's avatar Bjorn Helgaas
Browse files

Merge branch 'pci/host-vmd' into next 

* pci/host-vmd:
  PCI: vmd: Move SRCU cleanup after bus, child device removal
  PCI: vmd: Correct comment: VMD domains start at 0x10000, not 0x1000
parents 10fc139f 0cb259c4

drivers/pci/host/vmd.c

+5 −2
Original line number Diff line number Diff line
@@ -539,7 +539,10 @@ static void vmd_detach_resources(struct vmd_dev *vmd) 
}



/*

 * VMD domains start at 0x1000 to not clash with ACPI _SEG domains.

 * VMD domains start at 0x10000 to not clash with ACPI _SEG domains.

 * Per ACPI r6.0, sec 6.5.6,  _SEG returns an integer, of which the lower

 * 16 bits are the PCI Segment Group (domain) number.  Other bits are

 * currently reserved.

 */

static int vmd_find_free_domain(void)

{
@@ -734,10 +737,10 @@ static void vmd_remove(struct pci_dev *dev) 
	struct vmd_dev *vmd = pci_get_drvdata(dev);



	vmd_detach_resources(vmd);

	vmd_cleanup_srcu(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);

	irq_domain_remove(vmd->irq_domain);

}