lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branches 'dma-debug/fixes' and 'amd-iommu/fixes' into iommu/fixes

Browse Source
This commit is contained in:
Joerg Roedel
2009-12-21 15:58:19 +01:00
parent f797d9881b 0f76480643
commit ce9277fb08
1 changed files with 10 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -137,6 +137,11 @@ int amd_iommus_present;
/* IOMMUs have a non-present cache? */ /* IOMMUs have a non-present cache? */
bool amd_iommu_np_cache __read_mostly; bool amd_iommu_np_cache __read_mostly;
/*
* Set to true if ACPI table parsing and hardware intialization went properly
*/
static bool amd_iommu_initialized;
/* /*
* List of protection domains - used during resume * List of protection domains - used during resume
*/ */
@@ -929,6 +934,8 @@ static int __init init_iommu_all(struct acpi_table_header *table)
} }
WARN_ON(p != end); WARN_ON(p != end);
amd_iommu_initialized = true;
return 0; return 0;
} }
@@ -1263,6 +1270,9 @@ static int __init amd_iommu_init(void)
if (acpi_table_parse("IVRS", init_iommu_all) != 0) if (acpi_table_parse("IVRS", init_iommu_all) != 0)
goto free; goto free;
if (!amd_iommu_initialized)
goto free;
if (acpi_table_parse("IVRS", init_memory_definitions) != 0) if (acpi_table_parse("IVRS", init_memory_definitions) != 0)
goto free; goto free;