diff options
author | Joerg Roedel <joerg.roedel@amd.com> | 2009-11-27 05:40:33 -0500 |
---|---|---|
committer | Joerg Roedel <joerg.roedel@amd.com> | 2009-11-27 08:20:32 -0500 |
commit | 8793abeb783c12cc37f92f6133fd6468152b98df (patch) | |
tree | bdeacd3c9b2870c00ff532b50969f39010179f5b /arch/x86/kernel/amd_iommu.c | |
parent | 171e7b3739e175eea7b32eca9dbe189589e14a28 (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.c')
-rw-r--r-- | arch/x86/kernel/amd_iommu.c | 10 |
1 files changed, 2 insertions, 8 deletions
diff --git a/arch/x86/kernel/amd_iommu.c b/arch/x86/kernel/amd_iommu.c index 14b60c0cdc70..ed58a1688391 100644 --- a/arch/x86/kernel/amd_iommu.c +++ b/arch/x86/kernel/amd_iommu.c | |||
@@ -148,7 +148,6 @@ DECLARE_STATS_COUNTER(alloced_io_mem); | |||
148 | DECLARE_STATS_COUNTER(total_map_requests); | 148 | DECLARE_STATS_COUNTER(total_map_requests); |
149 | 149 | ||
150 | static struct dentry *stats_dir; | 150 | static struct dentry *stats_dir; |
151 | static struct dentry *de_isolate; | ||
152 | static struct dentry *de_fflush; | 151 | static struct dentry *de_fflush; |
153 | 152 | ||
154 | static void amd_iommu_stats_add(struct __iommu_counter *cnt) | 153 | static void amd_iommu_stats_add(struct __iommu_counter *cnt) |
@@ -166,9 +165,6 @@ static void amd_iommu_stats_init(void) | |||
166 | if (stats_dir == NULL) | 165 | if (stats_dir == NULL) |
167 | return; | 166 | return; |
168 | 167 | ||
169 | de_isolate = debugfs_create_bool("isolation", 0444, stats_dir, | ||
170 | (u32 *)&amd_iommu_isolate); | ||
171 | |||
172 | de_fflush = debugfs_create_bool("fullflush", 0444, stats_dir, | 168 | de_fflush = debugfs_create_bool("fullflush", 0444, stats_dir, |
173 | (u32 *)&amd_iommu_unmap_flush); | 169 | (u32 *)&amd_iommu_unmap_flush); |
174 | 170 | ||
@@ -2135,11 +2131,9 @@ int __init amd_iommu_init_dma_ops(void) | |||
2135 | } | 2131 | } |
2136 | 2132 | ||
2137 | /* | 2133 | /* |
2138 | * If device isolation is enabled, pre-allocate the protection | 2134 | * Pre-allocate the protection domains for each device. |
2139 | * domains for each device. | ||
2140 | */ | 2135 | */ |
2141 | if (amd_iommu_isolate) | 2136 | prealloc_protection_domains(); |
2142 | prealloc_protection_domains(); | ||
2143 | 2137 | ||
2144 | iommu_detected = 1; | 2138 | iommu_detected = 1; |
2145 | swiotlb = 0; | 2139 | swiotlb = 0; |