Skip to content

Commit

Permalink
intel_txt: Force IOMMU on for Intel TXT launch
Browse files Browse the repository at this point in the history
The tboot module will DMA protect all of memory in order to ensure the that
kernel will be able to initialize without compromise (from DMA).  Consequently,
the kernel must enable Intel Virtualization Technology for Directed I/O
(VT-d or Intel IOMMU) in order to replace this broad protection with the
appropriate page-granular protection.  Otherwise DMA devices will be unable
to read or write from memory and the kernel will eventually panic.

Because runtime IOMMU support is configurable by command line options, this
patch will force it to be enabled regardless of the options specified, and will
log a message if it was required to force it on.

 dmar.c        |    7 +++++++
 intel-iommu.c |   17 +++++++++++++++--
 2 files changed, 22 insertions(+), 2 deletions(-)

Signed-off-by: Joseph Cihula <joseph.cihula@intel.com>
Signed-off-by: Shane Wang <shane.wang@intel.com>
Cc: David Woodhouse <dwmw2@infradead.org>
Signed-off-by: H. Peter Anvin <hpa@zytor.com>
  • Loading branch information
Joseph Cihula authored and H. Peter Anvin committed Jul 21, 2009
1 parent 86886e5 commit a59b50e
Show file tree
Hide file tree
Showing 2 changed files with 22 additions and 2 deletions.
7 changes: 7 additions & 0 deletions drivers/pci/dmar.c
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,7 @@
#include <linux/timer.h>
#include <linux/irq.h>
#include <linux/interrupt.h>
#include <asm/tboot.h>

#undef PREFIX
#define PREFIX "DMAR:"
Expand Down Expand Up @@ -413,6 +414,12 @@ parse_dmar_table(void)
*/
dmar_table_detect();

/*
* ACPI tables may not be DMA protected by tboot, so use DMAR copy
* SINIT saved in SinitMleData in TXT heap (which is DMA protected)
*/
dmar_tbl = tboot_get_dmar_table(dmar_tbl);

dmar = (struct acpi_table_dmar *)dmar_tbl;
if (!dmar)
return -ENODEV;
Expand Down
17 changes: 15 additions & 2 deletions drivers/pci/intel-iommu.c
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,7 @@
#include <linux/intel-iommu.h>
#include <linux/sysdev.h>
#include <asm/cacheflush.h>
#include <asm/tboot.h>
#include <asm/iommu.h>
#include "pci.h"

Expand Down Expand Up @@ -3183,12 +3184,22 @@ static int __init init_iommu_sysfs(void)
int __init intel_iommu_init(void)
{
int ret = 0;
int force_on = 0;

if (dmar_table_init())
/* VT-d is required for a TXT/tboot launch, so enforce that */
force_on = tboot_force_iommu();

if (dmar_table_init()) {
if (force_on)
panic("tboot: Failed to initialize DMAR table\n");
return -ENODEV;
}

if (dmar_dev_scope_init())
if (dmar_dev_scope_init()) {
if (force_on)
panic("tboot: Failed to initialize DMAR device scope\n");
return -ENODEV;
}

/*
* Check the need for DMA-remapping initialization now.
Expand All @@ -3204,6 +3215,8 @@ int __init intel_iommu_init(void)

ret = init_dmars();
if (ret) {
if (force_on)
panic("tboot: Failed to initialize DMARs\n");
printk(KERN_ERR "IOMMU: dmar init failed\n");
put_iova_domain(&reserved_iova_list);
iommu_exit_mempool();
Expand Down

0 comments on commit a59b50e

Please sign in to comment.