Minki/linux
1
0
Fork 1
mirror of https://github.com/torvalds/linux.git synced 2024-11-18 18:11:56 +00:00
Code Issues Packages Projects Releases Wiki Activity

x86, AMD IOMMU: honor iommu=off instead of amd_iommu=off

Browse Source 
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>
This commit is contained in:
Joerg Roedel 2008-07-03 19:35:09 +02:00 committed by Ingo Molnar
parent 999ba417cc
commit 8b14518fad
1 changed files with 1 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
arch/x86/kernel/amd_iommu_init.c
View File

@ -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;
}