diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2020-11-20 19:20:16 +0100 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2020-11-20 19:20:16 +0100 |
| commit | fc8299f9f3b9f3b0e1c8c9f719b5deb2a74ab314 (patch) | |
| tree | e6b57d85889b4b699e22542af0863ceacbaca237 /arch | |
| parent | Merge tag 'mmc-v5.10-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/ul... (diff) | |
| parent | MAINTAINERS: Temporarily add myself to the IOMMU entry (diff) | |
| download | linux-fc8299f9f3b9f3b0e1c8c9f719b5deb2a74ab314.tar.xz linux-fc8299f9f3b9f3b0e1c8c9f719b5deb2a74ab314.zip | |
Merge tag 'iommu-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/arm64/linux
Pull iommu fixes from Will Deacon:
"Two straightforward vt-d fixes:
- Fix boot when intel iommu initialisation fails under TXT (tboot)
- Fix intel iommu compilation error when DMAR is enabled without ATS
and temporarily update IOMMU MAINTAINERs entry"
* tag 'iommu-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/arm64/linux:
MAINTAINERS: Temporarily add myself to the IOMMU entry
iommu/vt-d: Fix compile error with CONFIG_PCI_ATS not set
iommu/vt-d: Avoid panic if iommu init fails in tboot system
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/x86/kernel/tboot.c | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/arch/x86/kernel/tboot.c b/arch/x86/kernel/tboot.c index 992fb1415c0f..420be871d9d4 100644 --- a/arch/x86/kernel/tboot.c +++ b/arch/x86/kernel/tboot.c @@ -514,9 +514,6 @@ int tboot_force_iommu(void) if (!tboot_enabled()) return 0; - if (intel_iommu_tboot_noforce) - return 1; - if (no_iommu || swiotlb || dmar_disabled) pr_warn("Forcing Intel-IOMMU to enabled\n"); |