I/OAT: Add DCA services

Add code to connect to the DCA driver and provide cpu tags for use by
drivers that would like to use Direct Cache Access hints.

    [Adrian Bunk]                Several Kconfig cleanup items
    [Andrew Morten, Chris Leech] Fix for using cpu_physical_id() even when
			         built for uni-processor

Signed-off-by: Shannon Nelson <shannon.nelson@intel.com>
Acked-by: David S. Miller <davem@davemloft.net>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

1 files changed, 35 insertions, 25 deletions

diff --git a/drivers/dma/Kconfig b/drivers/dma/Kconfig
index 8f670dae53bb..9c91b0fd134f 100644
--- a/drivers/dma/Kconfig
+++ b/drivers/dma/Kconfig
@@ -2,42 +2,52 @@
 # DMA engine configuration
 #
 
-menu "DMA Engine support"
-        depends on HAS_DMA
+menuconfig DMADEVICES
+        bool "DMA Offload Engine support"
+        depends on (PCI && X86) || ARCH_IOP32X || ARCH_IOP33X || ARCH_IOP13XX
+        help
+          Intel(R) offload engines enable offloading memory copies in the
+          network stack and RAID operations in the MD driver.
+
+if DMADEVICES
+
+comment "DMA Devices"
+
+config INTEL_IOATDMA
+        tristate "Intel I/OAT DMA support"
+        depends on PCI && X86
+        select DMA_ENGINE
+        select DCA
+        help
+          Enable support for the Intel(R) I/OAT DMA engine present
+          in recent Intel Xeon chipsets.
+
+          Say Y here if you have such a chipset.
+
+          If unsure, say N.
+
+config INTEL_IOP_ADMA
+        tristate "Intel IOP ADMA support"
+        depends on ARCH_IOP32X || ARCH_IOP33X || ARCH_IOP13XX
+        select ASYNC_CORE
+        select DMA_ENGINE
+        help
+          Enable support for the Intel(R) IOP Series RAID engines.
 
 config DMA_ENGINE
-        bool "Support for DMA engines"
-        ---help---
-          DMA engines offload bulk memory operations from the CPU to dedicated
-          hardware, allowing the operations to happen asynchronously.
+        bool
 
 comment "DMA Clients"
+        depends on DMA_ENGINE
 
 config NET_DMA
         bool "Network: TCP receive copy offload"
         depends on DMA_ENGINE && NET
         default y
-        ---help---
+        help
           This enables the use of DMA engines in the network stack to
           offload receive copy-to-user operations, freeing CPU cycles.
           Since this is the main user of the DMA engine, it should be enabled;
           say Y here.
 
-comment "DMA Devices"
-
-config INTEL_IOATDMA
-        tristate "Intel I/OAT DMA support"
-        depends on DMA_ENGINE && PCI
-        default m
-        ---help---
-          Enable support for the Intel(R) I/OAT DMA engine.
-
-config INTEL_IOP_ADMA
-        tristate "Intel IOP ADMA support"
-        depends on DMA_ENGINE && (ARCH_IOP32X || ARCH_IOP33X || ARCH_IOP13XX)
-        select ASYNC_CORE
-        default m
-        ---help---
-          Enable support for the Intel(R) IOP Series RAID engines.
-
-endmenu
+endif