Merge branch 'amd-iommu/fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/joro/linux-2.6-iommu into x86/urgent

2 files changed, 51 insertions, 4 deletions

diff --git a/arch/x86/kernel/amd_iommu.c b/arch/x86/kernel/amd_iommu.c
index 32fb09102a13..a83185080e91 100644
--- a/arch/x86/kernel/amd_iommu.c
+++ b/arch/x86/kernel/amd_iommu.c
@@ -166,6 +166,43 @@ static void iommu_uninit_device(struct device *dev)
 {
         kfree(dev->archdata.iommu);
 }
+
+void __init amd_iommu_uninit_devices(void)
+{
+        struct pci_dev *pdev = NULL;
+
+        for_each_pci_dev(pdev) {
+
+                if (!check_device(&pdev->dev))
+                        continue;
+
+                iommu_uninit_device(&pdev->dev);
+        }
+}
+
+int __init amd_iommu_init_devices(void)
+{
+        struct pci_dev *pdev = NULL;
+        int ret = 0;
+
+        for_each_pci_dev(pdev) {
+
+                if (!check_device(&pdev->dev))
+                        continue;
+
+                ret = iommu_init_device(&pdev->dev);
+                if (ret)
+                        goto out_free;
+        }
+
+        return 0;
+
+out_free:
+
+        amd_iommu_uninit_devices();
+
+        return ret;
+}
 #ifdef CONFIG_AMD_IOMMU_STATS
 
 /*
@@ -1587,6 +1624,11 @@ static struct notifier_block device_nb = {
         .notifier_call = device_change_notifier,
 };
 
+void amd_iommu_init_notifier(void)
+{
+        bus_register_notifier(&pci_bus_type, &device_nb);
+}
+
 /*****************************************************************************
  *
  * The next functions belong to the dma_ops mapping/unmapping code.
@@ -2145,8 +2187,6 @@ static void prealloc_protection_domains(void)
                 if (!check_device(&dev->dev))
                         continue;
 
-                iommu_init_device(&dev->dev);
-
                 /* Is there already any domain for it? */
                 if (domain_for_device(&dev->dev))
                         continue;
@@ -2215,8 +2255,6 @@ int __init amd_iommu_init_dma_ops(void)
 
         register_iommu(&amd_iommu_ops);
 
-        bus_register_notifier(&pci_bus_type, &device_nb);
-
         amd_iommu_stats_init();
 
         return 0;
diff --git a/arch/x86/kernel/amd_iommu_init.c b/arch/x86/kernel/amd_iommu_init.c
index 7ffc39965233..309a52f96e0b 100644
--- a/arch/x86/kernel/amd_iommu_init.c
+++ b/arch/x86/kernel/amd_iommu_init.c
@@ -1274,6 +1274,10 @@ static int __init amd_iommu_init(void)
         if (ret)
                 goto free;
 
+        ret = amd_iommu_init_devices();
+        if (ret)
+                goto free;
+
         if (iommu_pass_through)
                 ret = amd_iommu_init_passthrough();
         else
@@ -1281,6 +1285,8 @@ static int __init amd_iommu_init(void)
         if (ret)
                 goto free;
 
+        amd_iommu_init_notifier();
+
         enable_iommus();
 
         if (iommu_pass_through)
@@ -1296,6 +1302,9 @@ out:
         return ret;
 
 free:
+
+        amd_iommu_uninit_devices();
+
         free_pages((unsigned long)amd_iommu_pd_alloc_bitmap,
                    get_order(MAX_DOMAIN_ID/8));