From: Shaohua Li Date: Thu, 8 Jun 2017 18:27:14 +0000 (-0700) Subject: iommu/vt-d: Correctly disable Intel IOMMU force on X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=7304e8f28bb2f3cb2baf37c1bb2caa0f54ca4e43;p=GitHub%2Fmoto-9609%2Fandroid_kernel_motorola_exynos9610.git 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 Signed-off-by: Joerg Roedel --- 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) if (!tboot_enabled()) return 0; - if (!intel_iommu_tboot_noforce) + if (intel_iommu_tboot_noforce) return 1; if (no_iommu || swiotlb || dmar_disabled)