diff options
-rw-r--r-- | drivers/pci/host/vmd.c | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/drivers/pci/host/vmd.c b/drivers/pci/host/vmd.c index 784f63beb487..4c8a1257ab5d 100644 --- a/drivers/pci/host/vmd.c +++ b/drivers/pci/host/vmd.c | |||
@@ -539,7 +539,10 @@ static void vmd_detach_resources(struct vmd_dev *vmd) | |||
539 | } | 539 | } |
540 | 540 | ||
541 | /* | 541 | /* |
542 | * VMD domains start at 0x1000 to not clash with ACPI _SEG domains. | 542 | * VMD domains start at 0x10000 to not clash with ACPI _SEG domains. |
543 | * Per ACPI r6.0, sec 6.5.6, _SEG returns an integer, of which the lower | ||
544 | * 16 bits are the PCI Segment Group (domain) number. Other bits are | ||
545 | * currently reserved. | ||
543 | */ | 546 | */ |
544 | static int vmd_find_free_domain(void) | 547 | static int vmd_find_free_domain(void) |
545 | { | 548 | { |
@@ -734,10 +737,10 @@ static void vmd_remove(struct pci_dev *dev) | |||
734 | struct vmd_dev *vmd = pci_get_drvdata(dev); | 737 | struct vmd_dev *vmd = pci_get_drvdata(dev); |
735 | 738 | ||
736 | vmd_detach_resources(vmd); | 739 | vmd_detach_resources(vmd); |
737 | vmd_cleanup_srcu(vmd); | ||
738 | sysfs_remove_link(&vmd->dev->dev.kobj, "domain"); | 740 | sysfs_remove_link(&vmd->dev->dev.kobj, "domain"); |
739 | pci_stop_root_bus(vmd->bus); | 741 | pci_stop_root_bus(vmd->bus); |
740 | pci_remove_root_bus(vmd->bus); | 742 | pci_remove_root_bus(vmd->bus); |
743 | vmd_cleanup_srcu(vmd); | ||
741 | vmd_teardown_dma_ops(vmd); | 744 | vmd_teardown_dma_ops(vmd); |
742 | irq_domain_remove(vmd->irq_domain); | 745 | irq_domain_remove(vmd->irq_domain); |
743 | } | 746 | } |