summaryrefslogtreecommitdiffstats
path: root/arch/x86/kernel/amd_iommu_init.c
diff options
context:
space:
mode:
authorJoerg Roedel <joerg.roedel@amd.com>2008-07-03 19:35:09 +0200
committerIngo Molnar <mingo@elte.hu>2008-07-04 11:44:41 +0200
commit8b14518fadd9d5915827d86d5c10e602fedf042e (patch)
treeb43c76dd09702e3442c3797aa1494d7127bb7b64 /arch/x86/kernel/amd_iommu_init.c
parent999ba417cc1a43881126d08876d5d7e653113ae3 (diff)
downloadblackbird-op-linux-8b14518fadd9d5915827d86d5c10e602fedf042e.tar.gz
blackbird-op-linux-8b14518fadd9d5915827d86d5c10e602fedf042e.zip
x86, AMD IOMMU: honor iommu=off instead of amd_iommu=off
This patch removes the amd_iommu=off kernel parameter and honors the generic iommu=off parameter for the same purpose. Signed-off-by: Joerg Roedel <joerg.roedel@amd.com> Cc: iommu@lists.linux-foundation.org Cc: bhavna.sarathy@amd.com Cc: robert.richter@amd.com Cc: Joerg Roedel <joerg.roedel@amd.com> Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'arch/x86/kernel/amd_iommu_init.c')
-rw-r--r--arch/x86/kernel/amd_iommu_init.c9
1 files changed, 1 insertions, 8 deletions
diff --git a/arch/x86/kernel/amd_iommu_init.c b/arch/x86/kernel/amd_iommu_init.c
index 5d9e45c7cea2..c54c82305af4 100644
--- a/arch/x86/kernel/amd_iommu_init.c
+++ b/arch/x86/kernel/amd_iommu_init.c
@@ -101,8 +101,6 @@ struct ivmd_header {
u64 range_length;
} __attribute__((packed));
-static int __initdata amd_iommu_disable;
-
u16 amd_iommu_last_bdf;
struct list_head amd_iommu_unity_map;
unsigned amd_iommu_aperture_order = 26;
@@ -686,7 +684,7 @@ 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;
}
@@ -831,9 +829,6 @@ 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;
#ifdef CONFIG_GART_IOMMU
@@ -846,8 +841,6 @@ void __init amd_iommu_detect(void)
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;
}
OpenPOWER on IntegriCloud