diff options
| author | Zhenzhong Duan <zhenzhong.duan@gmail.com> | 2020-11-10 15:19:08 +0800 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2020-11-24 13:39:04 +0100 |
| commit | 3330e9f177a6278d7328b01ac5676396851891a5 (patch) | |
| tree | 85ed4591ab40ef563bbfb49331a17b3fa515a563 /include/linux | |
| parent | 5528e3d431bdee64edaafc6df8266f4f3c0975ce (diff) | |
| download | linux-stable-3330e9f177a6278d7328b01ac5676396851891a5.tar.gz linux-stable-3330e9f177a6278d7328b01ac5676396851891a5.tar.bz2 linux-stable-3330e9f177a6278d7328b01ac5676396851891a5.zip | |
iommu/vt-d: Avoid panic if iommu init fails in tboot system
[ Upstream commit 4d213e76a359e540ca786ee937da7f35faa8e5f8 ]
"intel_iommu=off" command line is used to disable iommu but iommu is force
enabled in a tboot system for security reason.
However for better performance on high speed network device, a new option
"intel_iommu=tboot_noforce" is introduced to disable the force on.
By default kernel should panic if iommu init fail in tboot for security
reason, but it's unnecessory if we use "intel_iommu=tboot_noforce,off".
Fix the code setting force_on and move intel_iommu_tboot_noforce
from tboot code to intel iommu code.
Fixes: 7304e8f28bb2 ("iommu/vt-d: Correctly disable Intel IOMMU force on")
Signed-off-by: Zhenzhong Duan <zhenzhong.duan@gmail.com>
Tested-by: Lukasz Hawrylko <lukasz.hawrylko@linux.intel.com>
Acked-by: Lu Baolu <baolu.lu@linux.intel.com>
Link: https://lore.kernel.org/r/20201110071908.3133-1-zhenzhong.duan@gmail.com
Signed-off-by: Will Deacon <will@kernel.org>
Signed-off-by: Sasha Levin <sashal@kernel.org>
Diffstat (limited to 'include/linux')
| -rw-r--r-- | include/linux/intel-iommu.h | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/include/linux/intel-iommu.h b/include/linux/intel-iommu.h index 6a3ddaabf3f5..bdf80d7a70fb 100644 --- a/include/linux/intel-iommu.h +++ b/include/linux/intel-iommu.h @@ -791,7 +791,6 @@ extern int iommu_calculate_agaw(struct intel_iommu *iommu); extern int iommu_calculate_max_sagaw(struct intel_iommu *iommu); extern int dmar_disabled; extern int intel_iommu_enabled; -extern int intel_iommu_tboot_noforce; extern int intel_iommu_gfx_mapped; #else static inline int iommu_calculate_agaw(struct intel_iommu *iommu) |