diff options
| author | Shaohua Li <shli@fb.com> | 2017-06-08 14:27:14 -0400 |
|---|---|---|
| committer | Joerg Roedel <jroedel@suse.de> | 2017-06-15 10:41:10 -0400 |
| commit | 7304e8f28bb2f3cb2baf37c1bb2caa0f54ca4e43 (patch) | |
| tree | 7eb5f08582b5e1e407f0311638051f4779f8883c | |
| parent | 32c1431eea4881a6b17bd7c639315010aeefa452 (diff) | |
iommu/vt-d: Correctly disable Intel IOMMU force on
I made a mistake in commit bfd20f1. We should skip the force on with the
option enabled instead of vice versa. Not sure why this passed our
performance test, sorry.
Fixes: bfd20f1cc850 ('x86, iommu/vt-d: Add an option to disable Intel IOMMU force on')
Signed-off-by: Shaohua Li <shli@fb.com>
Signed-off-by: Joerg Roedel <jroedel@suse.de>
| -rw-r--r-- | arch/x86/kernel/tboot.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/x86/kernel/tboot.c b/arch/x86/kernel/tboot.c index 4b1724059909..a4eb27918ceb 100644 --- a/arch/x86/kernel/tboot.c +++ b/arch/x86/kernel/tboot.c | |||
| @@ -514,7 +514,7 @@ int tboot_force_iommu(void) | |||
| 514 | if (!tboot_enabled()) | 514 | if (!tboot_enabled()) |
| 515 | return 0; | 515 | return 0; |
| 516 | 516 | ||
| 517 | if (!intel_iommu_tboot_noforce) | 517 | if (intel_iommu_tboot_noforce) |
| 518 | return 1; | 518 | return 1; |
| 519 | 519 | ||
| 520 | if (no_iommu || swiotlb || dmar_disabled) | 520 | if (no_iommu || swiotlb || dmar_disabled) |