From: Joerg Roedel <joerg.roedel@amd.com>
Date: Mon, 6 Aug 2012 12:18:42 +0000 (+0200)
Subject: iommu/amd: Fix pci_request_acs() call-place
X-Git-Tag: upstream/snapshot3+hdmi~6807^2~4
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=1adb7d31b051cd97fbb75c46772b00c13ec29c9e;p=platform%2Fadaptation%2Frenesas_rcar%2Frenesas_kernel.git

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>
---

diff --git a/drivers/iommu/amd_iommu_init.c b/drivers/iommu/amd_iommu_init.c
index 500e7f1..0a2ea31 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;
 }