git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
x86/amd-iommu: Add amd_iommu=off command line option
[pandora-kernel.git]
/
arch
/
x86
/
kernel
/
amd_iommu_init.c
diff --git
a/arch/x86/kernel/amd_iommu_init.c
b/arch/x86/kernel/amd_iommu_init.c
index
6360abf
..
3bacb4d
100644
(file)
--- a/
arch/x86/kernel/amd_iommu_init.c
+++ b/
arch/x86/kernel/amd_iommu_init.c
@@
-120,6
+120,7
@@
struct ivmd_header {
bool amd_iommu_dump;
static int __initdata amd_iommu_detected;
bool amd_iommu_dump;
static int __initdata amd_iommu_detected;
+static bool __initdata amd_iommu_disabled;
u16 amd_iommu_last_bdf; /* largest PCI device id we have
to handle */
u16 amd_iommu_last_bdf; /* largest PCI device id we have
to handle */
@@
-1372,6
+1373,9
@@
void __init amd_iommu_detect(void)
if (no_iommu || (iommu_detected && !gart_iommu_aperture))
return;
if (no_iommu || (iommu_detected && !gart_iommu_aperture))
return;
+ if (amd_iommu_disabled)
+ return;
+
if (acpi_table_parse("IVRS", early_amd_iommu_detect) == 0) {
iommu_detected = 1;
amd_iommu_detected = 1;
if (acpi_table_parse("IVRS", early_amd_iommu_detect) == 0) {
iommu_detected = 1;
amd_iommu_detected = 1;
@@
-1401,6
+1405,8
@@
static int __init parse_amd_iommu_options(char *str)
for (; *str; ++str) {
if (strncmp(str, "fullflush", 9) == 0)
amd_iommu_unmap_flush = true;
for (; *str; ++str) {
if (strncmp(str, "fullflush", 9) == 0)
amd_iommu_unmap_flush = true;
+ if (strncmp(str, "off", 3) == 0)
+ amd_iommu_disabled = true;
}
return 1;
}
return 1;