Merge branch 'sched/for-linus' into tracing/for-linus

[linux-2.6-omap-h63xx.git] / arch / x86 / kernel / amd_iommu_init.c

diff --git a/arch/x86/kernel/amd_iommu_init.c b/arch/x86/kernel/amd_iommu_init.c
index d1aa2344cd90b087dd5040a0bb9759c0f2616e30..2a13e430437dc5f1e05793aa995df4befcbc8938 100644 (file)
--- a/arch/x86/kernel/amd_iommu_init.c
+++ b/arch/x86/kernel/amd_iommu_init.c
@@ -21,6 +21,7 @@
 #include <linux/acpi.h>
 #include <linux/gfp.h>
 #include <linux/list.h>
+#include <linux/sysdev.h>
 #include <asm/pci-direct.h>
 #include <asm/amd_iommu_types.h>
 #include <asm/amd_iommu.h>
@@ -100,7 +101,7 @@ struct ivmd_header {
        u64 range_length;
 } __attribute__((packed));
 
-static int __initdata amd_iommu_disable;
+static int __initdata amd_iommu_detected;
 
 u16 amd_iommu_last_bdf;
 struct list_head amd_iommu_unity_map;
@@ -168,14 +169,11 @@ static void __init iommu_feature_disable(struct amd_iommu *iommu, u8 bit)
 
 void __init iommu_enable(struct amd_iommu *iommu)
 {
-       u32 ctrl;
-
        printk(KERN_INFO "AMD IOMMU: Enabling IOMMU at ");
        print_devid(iommu->devid, 0);
        printk(" cap 0x%hx\n", iommu->cap_ptr);
 
        iommu_feature_enable(iommu, CONTROL_IOMMU_EN);
-       ctrl = readl(iommu->mmio_base + MMIO_CONTROL_OFFSET);
 }
 
 static u8 * __init iommu_map_mmio_space(u64 address)
@@ -654,16 +652,45 @@ static void __init enable_iommus(void)
        }
 }
 
+/*
+ * Suspend/Resume support
+ * disable suspend until real resume implemented
+ */
+
+static int amd_iommu_resume(struct sys_device *dev)
+{
+       return 0;
+}
+
+static int amd_iommu_suspend(struct sys_device *dev, pm_message_t state)
+{
+       return -EINVAL;
+}
+
+static struct sysdev_class amd_iommu_sysdev_class = {
+       .name = "amd_iommu",
+       .suspend = amd_iommu_suspend,
+       .resume = amd_iommu_resume,
+};
+
+static struct sys_device device_amd_iommu = {
+       .id = 0,
+       .cls = &amd_iommu_sysdev_class,
+};
+
 int __init amd_iommu_init(void)
 {
        int i, ret = 0;
 
 
-       if (amd_iommu_disable) {
+       if (no_iommu) {
                printk(KERN_INFO "AMD IOMMU disabled by kernel command line\n");
                return 0;
        }
 
+       if (!amd_iommu_detected)
+               return -ENODEV;
+
        /*
         * First parse ACPI tables to find the largest Bus/Dev/Func
         * we need to handle. Upon this information the shared data
@@ -745,6 +772,14 @@ int __init amd_iommu_init(void)
        if (ret)
                goto free;
 
+       ret = sysdev_class_register(&amd_iommu_sysdev_class);
+       if (ret)
+               goto free;
+
+       ret = sysdev_register(&device_amd_iommu);
+       if (ret)
+               goto free;
+
        enable_iommus();
 
        printk(KERN_INFO "AMD IOMMU: aperture size is %d MB\n",
@@ -796,21 +831,19 @@ void __init amd_iommu_detect(void)
        if (swiotlb || no_iommu || iommu_detected)
                return;
 
-       if (amd_iommu_disable)
-               return;
-
        if (acpi_table_parse("IVRS", early_amd_iommu_detect) == 0) {
                iommu_detected = 1;
+               amd_iommu_detected = 1;
+#ifdef CONFIG_GART_IOMMU
                gart_iommu_aperture_disabled = 1;
                gart_iommu_aperture = 0;
+#endif
        }
 }
 
 static int __init parse_amd_iommu_options(char *str)
 {
        for (; *str; ++str) {
-               if (strcmp(str, "off") == 0)
-                       amd_iommu_disable = 1;
                if (strcmp(str, "isolate") == 0)
                        amd_iommu_isolate = 1;
        }