diff options
| author |   Joerg Roedel <jroedel@suse.de> | 2017-06-16 16:09:54 +0200 |
|---|---|---|
| committer | Joerg Roedel <jroedel@suse.de> | 2017-06-22 12:54:19 +0200 |
| commit | 111237415393acdef9b4f700c747a2e92c9be62e (patch) | |
| tree | 48bfe64b182f328c543c7ae00d478284c535d9d2 /drivers/iommu/amd_iommu_init.c | |
| parent | iommu/amd: Suppress IO_PAGE_FAULTs in kdump kernel (diff) | |
| download | linux-dev-111237415393acdef9b4f700c747a2e92c9be62e.tar.xz linux-dev-111237415393acdef9b4f700c747a2e92c9be62e.zip | |
iommu/amd: Disable IOMMUs at boot if they are enabled
When booting, make sure the IOMMUs are disabled. They could
be previously enabled if we boot into a kexec or kdump
kernel. So make sure they are off.
Signed-off-by: Joerg Roedel <jroedel@suse.de>
Diffstat (limited to 'drivers/iommu/amd_iommu_init.c')
| -rw-r--r-- | drivers/iommu/amd_iommu_init.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/drivers/iommu/amd_iommu_init.c b/drivers/iommu/amd_iommu_init.c index cf7896550e75..f123fa5a7adb 100644 --- a/drivers/iommu/amd_iommu_init.c +++ b/drivers/iommu/amd_iommu_init.c @@ -2318,6 +2318,9 @@ static int __init early_amd_iommu_init(void) if (ret) goto out; + /* Disable any previously enabled IOMMUs */ + disable_iommus(); + if (amd_iommu_irq_remap) amd_iommu_irq_remap = check_ioapic_information(); |