summaryrefslogtreecommitdiff
path: root/drivers/iommu/amd_iommu_init.c
diff options
context:
space:
mode:
authorJoerg Roedel <joerg.roedel@amd.com>2012-08-06 16:18:42 +0400
committerJoerg Roedel <joerg.roedel@amd.com>2012-08-06 20:07:43 +0400
commit1adb7d31b051cd97fbb75c46772b00c13ec29c9e (patch)
treeaa574647db7c3b289f163529b42159e8233ac46d /drivers/iommu/amd_iommu_init.c
parenteb51637b6ec73ff5f8eaca57658a9945aa7bd45f (diff)
downloadlinux-1adb7d31b051cd97fbb75c46772b00c13ec29c9e.tar.xz
iommu/amd: Fix pci_request_acs() call-place
The pci_request_acs() function needs to be called before PCI probing to be effective. So move it to another call-place to ensure that. Signed-off-by: Joerg Roedel <joerg.roedel@amd.com>
Diffstat (limited to 'drivers/iommu/amd_iommu_init.c')
-rw-r--r--drivers/iommu/amd_iommu_init.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/iommu/amd_iommu_init.c b/drivers/iommu/amd_iommu_init.c
index 500e7f15f5c2..0a2ea317120a 100644
--- a/drivers/iommu/amd_iommu_init.c
+++ b/drivers/iommu/amd_iommu_init.c
@@ -1131,9 +1131,6 @@ static int __init amd_iommu_init_pci(void)
break;
}
- /* Make sure ACS will be enabled */
- pci_request_acs();
-
ret = amd_iommu_init_devices();
print_iommu_info();
@@ -1652,6 +1649,9 @@ static bool detect_ivrs(void)
early_acpi_os_unmap_memory((char __iomem *)ivrs_base, ivrs_size);
+ /* Make sure ACS will be enabled during PCI probe */
+ pci_request_acs();
+
return true;
}