Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 8b14518f authored by Joerg Roedel's avatar Joerg Roedel Committed by Ingo Molnar
Browse files

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: default avatarJoerg 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: default avatarIngo Molnar <mingo@elte.hu>
parent 999ba417

arch/x86/kernel/amd_iommu_init.c

+1 −8
Original line number Original line Diff line number Diff line
@@ -101,8 +101,6 @@ struct ivmd_header { 
	u64 range_length;

	u64 range_length;

} __attribute__((packed));

} __attribute__((packed));





static int __initdata amd_iommu_disable;



u16 amd_iommu_last_bdf;

u16 amd_iommu_last_bdf;

struct list_head amd_iommu_unity_map;

struct list_head amd_iommu_unity_map;

unsigned amd_iommu_aperture_order = 26;

unsigned amd_iommu_aperture_order = 26;
@@ -686,7 +684,7 @@ int __init amd_iommu_init(void) 
	int i, ret = 0;

	int i, ret = 0;









	if (amd_iommu_disable) {

	if (no_iommu) {

		printk(KERN_INFO "AMD IOMMU disabled by kernel command line\n");

		printk(KERN_INFO "AMD IOMMU disabled by kernel command line\n");

		return 0;

		return 0;

	}

	}
@@ -831,9 +829,6 @@ void __init amd_iommu_detect(void) 
	if (swiotlb || no_iommu || iommu_detected)

	if (swiotlb || no_iommu || iommu_detected)

		return;

		return;





	if (amd_iommu_disable)

		return;



	if (acpi_table_parse("IVRS", early_amd_iommu_detect) == 0) {

	if (acpi_table_parse("IVRS", early_amd_iommu_detect) == 0) {

		iommu_detected = 1;

		iommu_detected = 1;

#ifdef CONFIG_GART_IOMMU

#ifdef CONFIG_GART_IOMMU
@@ -846,8 +841,6 @@ void __init amd_iommu_detect(void) 
static int __init parse_amd_iommu_options(char *str)

static int __init parse_amd_iommu_options(char *str)

{

{

	for (; *str; ++str) {

	for (; *str; ++str) {

		if (strcmp(str, "off") == 0)

			amd_iommu_disable = 1;

		if (strcmp(str, "isolate") == 0)

		if (strcmp(str, "isolate") == 0)

			amd_iommu_isolate = 1;

			amd_iommu_isolate = 1;

	}

	}