aboutsummaryrefslogtreecommitdiffstats
path: root/arch/x86/kernel/amd_iommu_init.c
diff options
context:
space:
mode:
authorJoerg Roedel <joerg.roedel@amd.com>2009-11-27 05:40:33 -0500
committerJoerg Roedel <joerg.roedel@amd.com>2009-11-27 08:20:32 -0500
commit8793abeb783c12cc37f92f6133fd6468152b98df (patch)
treebdeacd3c9b2870c00ff532b50969f39010179f5b /arch/x86/kernel/amd_iommu_init.c
parent171e7b3739e175eea7b32eca9dbe189589e14a28 (diff)
x86/amd-iommu: Remove support for domain sharing
This patch makes device isolation mandatory and removes support for the amd_iommu=share option. This simplifies the code in several places. Signed-off-by: Joerg Roedel <joerg.roedel@amd.com>
Diffstat (limited to 'arch/x86/kernel/amd_iommu_init.c')
-rw-r--r--arch/x86/kernel/amd_iommu_init.c17
1 files changed, 0 insertions, 17 deletions
diff --git a/arch/x86/kernel/amd_iommu_init.c b/arch/x86/kernel/amd_iommu_init.c
index fbe4c3c02a91..fe1686f6f91b 100644
--- a/arch/x86/kernel/amd_iommu_init.c
+++ b/arch/x86/kernel/amd_iommu_init.c
@@ -125,13 +125,6 @@ u16 amd_iommu_last_bdf; /* largest PCI device id we have
125 to handle */ 125 to handle */
126LIST_HEAD(amd_iommu_unity_map); /* a list of required unity mappings 126LIST_HEAD(amd_iommu_unity_map); /* a list of required unity mappings
127 we find in ACPI */ 127 we find in ACPI */
128#ifdef CONFIG_IOMMU_STRESS
129bool amd_iommu_isolate = false;
130#else
131bool amd_iommu_isolate = true; /* if true, device isolation is
132 enabled */
133#endif
134
135bool amd_iommu_unmap_flush; /* if true, flush on every unmap */ 128bool amd_iommu_unmap_flush; /* if true, flush on every unmap */
136 129
137LIST_HEAD(amd_iommu_list); /* list of all AMD IOMMUs in the 130LIST_HEAD(amd_iommu_list); /* list of all AMD IOMMUs in the
@@ -1308,12 +1301,6 @@ static int __init amd_iommu_init(void)
1308 if (iommu_pass_through) 1301 if (iommu_pass_through)
1309 goto out; 1302 goto out;
1310 1303
1311 printk(KERN_INFO "AMD-Vi: device isolation ");
1312 if (amd_iommu_isolate)
1313 printk("enabled\n");
1314 else
1315 printk("disabled\n");
1316
1317 if (amd_iommu_unmap_flush) 1304 if (amd_iommu_unmap_flush)
1318 printk(KERN_INFO "AMD-Vi: IO/TLB flush on unmap enabled\n"); 1305 printk(KERN_INFO "AMD-Vi: IO/TLB flush on unmap enabled\n");
1319 else 1306 else
@@ -1387,10 +1374,6 @@ static int __init parse_amd_iommu_dump(char *str)
1387static int __init parse_amd_iommu_options(char *str) 1374static int __init parse_amd_iommu_options(char *str)
1388{ 1375{
1389 for (; *str; ++str) { 1376 for (; *str; ++str) {
1390 if (strncmp(str, "isolate", 7) == 0)
1391 amd_iommu_isolate = true;
1392 if (strncmp(str, "share", 5) == 0)
1393 amd_iommu_isolate = false;
1394 if (strncmp(str, "fullflush", 9) == 0) 1377 if (strncmp(str, "fullflush", 9) == 0)
1395 amd_iommu_unmap_flush = true; 1378 amd_iommu_unmap_flush = true;
1396 } 1379 }