aboutsummaryrefslogtreecommitdiffstats
path: root/arch/ia64/Kconfig
diff options
context:
space:
mode:
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 3b7aa38254a8..a924a84df325 100644
--- a/arch/ia64/Kconfig
+++ b/arch/ia64/Kconfig
@@ -117,6 +117,7 @@ config IA64_GENERIC
117 select NUMA 117 select NUMA
118 select ACPI_NUMA 118 select ACPI_NUMA
119 select SWIOTLB 119 select SWIOTLB
120 select PCI_MSI
120 help 121 help
121 This selects the system type of your hardware. A "generic" kernel 122 This selects the system type of your hardware. A "generic" kernel
122 will run on any supported IA-64 system. However, if you configure 123 will run on any supported IA-64 system. However, if you configure
@@ -124,6 +125,7 @@ config IA64_GENERIC
124 125
125 generic For any supported IA-64 system 126 generic For any supported IA-64 system
126 DIG-compliant For DIG ("Developer's Interface Guide") compliant systems 127 DIG-compliant For DIG ("Developer's Interface Guide") compliant systems
128 DIG+Intel+IOMMU For DIG systems with Intel IOMMU
127 HP-zx1/sx1000 For HP systems 129 HP-zx1/sx1000 For HP systems
128 HP-zx1/sx1000+swiotlb For HP systems with (broken) DMA-constrained devices. 130 HP-zx1/sx1000+swiotlb For HP systems with (broken) DMA-constrained devices.
129 SGI-SN2 For SGI Altix systems 131 SGI-SN2 For SGI Altix systems
@@ -136,6 +138,11 @@ config IA64_DIG
136 bool "DIG-compliant" 138 bool "DIG-compliant"
137 select SWIOTLB 139 select SWIOTLB
138 140
141config IA64_DIG_VTD
142 bool "DIG+Intel+IOMMU"
143 select DMAR
144 select PCI_MSI
145
139config IA64_HP_ZX1 146config IA64_HP_ZX1
140 bool "HP-zx1/sx1000" 147 bool "HP-zx1/sx1000"
141 help 148 help
@@ -581,6 +588,16 @@ source "drivers/pci/hotplug/Kconfig"
581 588
582source "drivers/pcmcia/Kconfig" 589source "drivers/pcmcia/Kconfig"
583 590
591config DMAR
592 bool "Support for DMA Remapping Devices (EXPERIMENTAL)"
593 depends on IA64_GENERIC && ACPI && EXPERIMENTAL
594 help
595 DMA remapping (DMAR) devices support enables independent address
596 translations for Direct Memory Access (DMA) from devices.
597 These DMA remapping devices are reported via ACPI tables
598 and include PCI device scope covered by these DMA
599 remapping devices.
600
584endmenu 601endmenu
585 602
586endif 603endif