aboutsummaryrefslogtreecommitdiff
path: root/arch/ia64/Kconfig
diff options
context:
space:
mode:
authorTony Luck <tony.luck@intel.com>2008-10-17 13:52:22 -0700
committerTony Luck <tony.luck@intel.com>2008-10-17 13:52:22 -0700
commitfe393164c529f72def1952fb66c11732d0984d78 (patch)
tree56e4425988e90cb9608e95844f577cd18009618c /arch/ia64/Kconfig
parent22ca532a4d137545244fdff0b687325fd4e13eae (diff)
parent62fdd7678a26efadd6ac5c2869543caff77d2df0 (diff)
Pull vtd-iommu into release branch
Conflicts: arch/ia64/kernel/acpi.c
Diffstat (limited to 'arch/ia64/Kconfig')
-rw-r--r--arch/ia64/Kconfig17
1 files changed, 17 insertions, 0 deletions
diff --git a/arch/ia64/Kconfig b/arch/ia64/Kconfig
index 239ad6b1c74..6200a40ff50 100644
--- a/arch/ia64/Kconfig
+++ b/arch/ia64/Kconfig
@@ -145,6 +145,7 @@ config IA64_GENERIC
select NUMA
select ACPI_NUMA
select SWIOTLB
+ select PCI_MSI
help
This selects the system type of your hardware. A "generic" kernel
will run on any supported IA-64 system. However, if you configure
@@ -152,6 +153,7 @@ config IA64_GENERIC
generic For any supported IA-64 system
DIG-compliant For DIG ("Developer's Interface Guide") compliant systems
+ DIG+Intel+IOMMU For DIG systems with Intel IOMMU
HP-zx1/sx1000 For HP systems
HP-zx1/sx1000+swiotlb For HP systems with (broken) DMA-constrained devices.
SGI-SN2 For SGI Altix systems
@@ -165,6 +167,11 @@ config IA64_DIG
bool "DIG-compliant"
select SWIOTLB
+config IA64_DIG_VTD
+ bool "DIG+Intel+IOMMU"
+ select DMAR
+ select PCI_MSI
+
config IA64_HP_ZX1
bool "HP-zx1/sx1000"
help
@@ -614,6 +621,16 @@ source "drivers/pci/hotplug/Kconfig"
source "drivers/pcmcia/Kconfig"
+config DMAR
+ bool "Support for DMA Remapping Devices (EXPERIMENTAL)"
+ depends on IA64_GENERIC && ACPI && EXPERIMENTAL
+ help
+ DMA remapping (DMAR) devices support enables independent address
+ translations for Direct Memory Access (DMA) from devices.
+ These DMA remapping devices are reported via ACPI tables
+ and include PCI device scope covered by these DMA
+ remapping devices.
+
endmenu
endif