diff options
| author | Lu Baolu <baolu.lu@linux.intel.com> | 2022-07-12 08:08:49 +0800 |
|---|---|---|
| committer | Joerg Roedel <jroedel@suse.de> | 2022-07-15 10:21:30 +0200 |
| commit | 853788b9a66ff089053df3b4ed7d166e61def449 (patch) | |
| tree | 7cbdb0af0fdebbc604f3629963f04642d5cd5bc9 /drivers/iommu/intel | |
| parent | bfd39a73879e80313bb634927f185ace60bb229b (diff) | |
| download | linux-853788b9a66ff089053df3b4ed7d166e61def449.tar.gz | |
x86/boot/tboot: Move tboot_force_iommu() to Intel IOMMU
tboot_force_iommu() is only called by the Intel IOMMU driver. Move the
helper into that driver. No functional change intended.
Signed-off-by: Lu Baolu <baolu.lu@linux.intel.com>
Reviewed-by: Christoph Hellwig <hch@lst.de>
Reviewed-by: Jason Gunthorpe <jgg@nvidia.com>
Reviewed-by: Steve Wahl <steve.wahl@hpe.com>
Link: https://lore.kernel.org/r/20220514014322.2927339-7-baolu.lu@linux.intel.com
Signed-off-by: Joerg Roedel <jroedel@suse.de>
Diffstat (limited to 'drivers/iommu/intel')
| -rw-r--r-- | drivers/iommu/intel/iommu.c | 14 |
1 files changed, 14 insertions, 0 deletions
diff --git a/drivers/iommu/intel/iommu.c b/drivers/iommu/intel/iommu.c index 6564af7ec0dd..c70948021e8e 100644 --- a/drivers/iommu/intel/iommu.c +++ b/drivers/iommu/intel/iommu.c @@ -4019,6 +4019,20 @@ static int __init probe_acpi_namespace_devices(void) return 0; } +static __init int tboot_force_iommu(void) +{ + if (!tboot_enabled()) + return 0; + + if (no_iommu || dmar_disabled) + pr_warn("Forcing Intel-IOMMU to enabled\n"); + + dmar_disabled = 0; + no_iommu = 0; + + return 1; +} + int __init intel_iommu_init(void) { int ret = -ENODEV; |