diff options
| author | Kevin Mitchell <kevmitch@arista.com> | 2019-06-12 14:52:04 -0700 |
|---|---|---|
| committer | Joerg Roedel <jroedel@suse.de> | 2019-07-01 14:03:07 +0200 |
| commit | bf4bff46eac151c3fd299741d71c4216e45b5d8b (patch) | |
| tree | 4aeea2759525b1a62a868e4f46c7f964df00da53 /drivers/iommu | |
| parent | 3ddbe913e55516d3e2165d43d4d5570761769878 (diff) | |
| download | linux-bf4bff46eac151c3fd299741d71c4216e45b5d8b.tar.gz | |
iommu/amd: Move gart fallback to amd_iommu_init
The fallback to the GART driver in the case amd_iommu doesn't work was executed in a function called free_iommu_resources, which didn't really make sense. This was even being called twice if amd_iommu=off was specified on the command line. The only complication is that it needs to be verified that amd_iommu has fully relinquished control by calling free_iommu_resources and emptying the amd_iommu_list. Signed-off-by: Kevin Mitchell <kevmitch@arista.com> Signed-off-by: Joerg Roedel <jroedel@suse.de>
Diffstat (limited to 'drivers/iommu')
| -rw-r--r-- | drivers/iommu/amd_iommu_init.c | 19 |
1 files changed, 10 insertions, 9 deletions
diff --git a/drivers/iommu/amd_iommu_init.c b/drivers/iommu/amd_iommu_init.c index df144dc6d8ac..b90e26effe0a 100644 --- a/drivers/iommu/amd_iommu_init.c +++ b/drivers/iommu/amd_iommu_init.c @@ -2340,15 +2340,6 @@ static void __init free_iommu_resources(void) amd_iommu_dev_table = NULL; free_iommu_all(); - -#ifdef CONFIG_GART_IOMMU - /* - * We failed to initialize the AMD IOMMU - try fallback to GART - * if possible. - */ - gart_iommu_init(); - -#endif } /* SB IOAPIC is always on this device in AMD systems */ @@ -2767,6 +2758,16 @@ static int __init amd_iommu_init(void) } } +#ifdef CONFIG_GART_IOMMU + if (ret && list_empty(&amd_iommu_list)) { + /* + * We failed to initialize the AMD IOMMU - try fallback + * to GART if possible. + */ + gart_iommu_init(); + } +#endif + for_each_iommu(iommu) amd_iommu_debugfs_setup(iommu); |