UBUNTU: [Config] enable CONFIG_DMAR

Enable CONFIG_DMAR, support for DMA remapping devices which allows
devices to be used more efficiently under KVM.

BugLink: http://bugs.launchpad.net/bugs/552311
Signed-off-by: Andy Whitcroft <apw@canonical.com>

diff --git a/debian.master/config/amd64/config.common.amd64 b/debian.master/config/amd64/config.common.amd64
index aebe5da..4cd2463 100644 (file)
--- a/debian.master/config/amd64/config.common.amd64
+++ b/debian.master/config/amd64/config.common.amd64
@@ -148,7 +148,6 @@ CONFIG_IIO=m
 CONFIG_ILLEGAL_POINTER_VALUE=0xdead000000000000
 CONFIG_INPUT_TOUCHSCREEN=y
 CONFIG_INTR_REMAP=y
-CONFIG_IOMMU_API=y
 CONFIG_IOMMU_HELPER=y
 CONFIG_IPC_NS=y
 CONFIG_IPMI_HANDLER=m

diff --git a/debian.master/config/amd64/config.flavour.generic b/debian.master/config/amd64/config.flavour.generic
index 58adfb5..f3bc678 100644 (file)
--- a/debian.master/config/amd64/config.flavour.generic
+++ b/debian.master/config/amd64/config.flavour.generic
@@ -5,6 +5,7 @@ CONFIG_DEFAULT_CFQ=y
 # CONFIG_DEFAULT_DEADLINE is not set
 CONFIG_DEFAULT_IOSCHED="cfq"
 CONFIG_INTEL_IDLE=y
+CONFIG_INTEL_TXT=y
 # CONFIG_MEMORY_HOTPLUG is not set
 CONFIG_NR_CPUS=64
 # CONFIG_PREEMPT_NONE is not set

diff --git a/debian.master/config/amd64/config.flavour.server b/debian.master/config/amd64/config.flavour.server
index fa42131..c94463b 100644 (file)
--- a/debian.master/config/amd64/config.flavour.server
+++ b/debian.master/config/amd64/config.flavour.server
@@ -5,6 +5,7 @@
 CONFIG_DEFAULT_DEADLINE=y
 CONFIG_DEFAULT_IOSCHED="deadline"
 CONFIG_INTEL_IDLE=y
+# CONFIG_INTEL_TXT is not set
 CONFIG_MEMORY_HOTPLUG=y
 CONFIG_NR_CPUS=256
 CONFIG_PREEMPT_NONE=y

diff --git a/debian.master/config/amd64/config.flavour.virtual b/debian.master/config/amd64/config.flavour.virtual
index ed3931c..231e6bf 100644 (file)
--- a/debian.master/config/amd64/config.flavour.virtual
+++ b/debian.master/config/amd64/config.flavour.virtual
@@ -5,6 +5,7 @@
 CONFIG_DEFAULT_DEADLINE=y
 CONFIG_DEFAULT_IOSCHED="deadline"
 # CONFIG_INTEL_IDLE is not set
+# CONFIG_INTEL_TXT is not set
 CONFIG_MEMORY_HOTPLUG=y
 CONFIG_NR_CPUS=64
 CONFIG_PREEMPT_NONE=y

diff --git a/debian.master/config/config.common.ubuntu b/debian.master/config/config.common.ubuntu
index 90acf76..5415933 100644 (file)
--- a/debian.master/config/config.common.ubuntu
+++ b/debian.master/config/config.common.ubuntu
@@ -1152,7 +1152,9 @@ CONFIG_DLM=m
 # CONFIG_DM9000 is not set
 CONFIG_DM9102=m
 # CONFIG_DMADEVICES_DEBUG is not set
-# CONFIG_DMAR is not set
+CONFIG_DMAR=y
+# CONFIG_DMAR_DEFAULT_ON is not set
+CONFIG_DMAR_FLOPPY_WA=y
 # CONFIG_DMATEST is not set
 # CONFIG_DMA_API_DEBUG is not set
 CONFIG_DMA_ENGINE=y
@@ -1720,6 +1722,7 @@ CONFIG_HAVE_FUNCTION_TRACE_MCOUNT_TEST=y
 CONFIG_HAVE_GENERIC_HARDIRQS=y
 CONFIG_HAVE_HW_BREAKPOINT=y
 CONFIG_HAVE_IDE=y
+CONFIG_HAVE_INTEL_TXT=y
 CONFIG_HAVE_IOREMAP_PROT=y
 CONFIG_HAVE_IRQ_WORK=y
 CONFIG_HAVE_KERNEL_BZIP2=y
@@ -2180,6 +2183,7 @@ CONFIG_INTEL_IOATDMA=m
 CONFIG_INTEL_IPS=m
 CONFIG_INTEL_MENLOW=m
 CONFIG_INTEL_MID_DMAC=m
+CONFIG_IOMMU_API=y
 # CONFIG_IOMMU_DEBUG is not set
 # CONFIG_IOMMU_STRESS is not set
 CONFIG_IOSCHED_CFQ=y

diff --git a/debian.master/config/i386/config.common.i386 b/debian.master/config/i386/config.common.i386
index 42ed9c5..7861dae 100644 (file)
--- a/debian.master/config/i386/config.common.i386
+++ b/debian.master/config/i386/config.common.i386
@@ -147,8 +147,8 @@ CONFIG_IGB=m
 CONFIG_IIO=m
 CONFIG_ILLEGAL_POINTER_VALUE=0
 CONFIG_INPUT_TOUCHSCREEN=y
+# CONFIG_INTEL_TXT is not set
 # CONFIG_INTR_REMAP is not set
-# CONFIG_IOMMU_API is not set
 CONFIG_IPC_NS=y
 CONFIG_IPMI_HANDLER=m
 CONFIG_IPV6_MULTIPLE_TABLES=y
@@ -241,7 +241,7 @@ CONFIG_MTD_SM_COMMON=m
 CONFIG_MTD_SST25L=m
 CONFIG_MUTEX_SPIN_ON_OWNER=y
 CONFIG_NATIONAL_PHY=y
-# CONFIG_NEED_DMA_MAP_STATE is not set
+CONFIG_NEED_DMA_MAP_STATE=y
 CONFIG_NEED_PER_CPU_EMBED_FIRST_CHUNK=y
 CONFIG_NETFILTER_XT_MATCH_IPRANGE=m
 CONFIG_NETFILTER_XT_MATCH_OWNER=m