Skip to contentSkip to conversation

dmaengine: Xilinx MPMC Kconfig/make

PATCH In review Steven J. Magnani 2 participants 2 messages Mar 17, 2010 – Mar 25, 2010 dmaengine

lore
Share & tools
lore
#0 lore raw

PATCH 2/4 dmaengine: Xilinx MPMC Kconfig/make

Integrate xlldma drivers into the build.

---

drivers/dma/Kconfig +25 -3
diff -uprN a/drivers/dma/Kconfig b/drivers/dma/Kconfig
@@ -126,6 +126,28 @@ config AMCC_PPC440SPE_ADMA
 	help
 	  Enable support for the AMCC PPC440SPe RAID engines.
 
+config XLL_DMA
+	tristate "Xilinx LocalLink DMA support"
+	depends on XILINX_VIRTEX || MICROBLAZE
+	select DMA_ENGINE
+	---help---
+	  Enable support for the Xilinx MPMC DMA controller.
+	  This requires at least one MPMC SDMA port wired as a "loopback".
+
+	  If unsure, say N.
+
+config XLL_DMA_OF
+        tristate "Xilinx LocalLink DMA OF device"
+        depends on XLL_DMA && OF
+        help
+          OpenFirmware bus attachment for the Xilinx LocalLink DMA engine.
+
+config XLL_DMA_PLAT
+        tristate "Xilinx LocalLink DMA platform device"
+        depends on XLL_DMA
+        help
+          Platform bus attachment for the Xilinx LocalLink DMA engine.
+
 config ARCH_HAS_ASYNC_TX_FIND_CHANNEL
 	bool
 
@@ -138,13 +160,13 @@ comment "DMA Clients"
 config NET_DMA
 	bool "Network: TCP receive copy offload"
 	depends on DMA_ENGINE && NET
-	default (INTEL_IOATDMA || FSL_DMA)
+	default (INTEL_IOATDMA || FSL_DMA || XLL_DMA)
 	help
 	  This enables the use of DMA engines in the network stack to
 	  offload receive copy-to-user operations, freeing CPU cycles.
 
-	  Say Y here if you enabled INTEL_IOATDMA or FSL_DMA, otherwise
-	  say N.
+	  Say Y here if you enabled INTEL_IOATDMA, FSL_DMA, or XLL_DMA,
+	  otherwise say N.
 
 config ASYNC_TX_DMA
 	bool "Async_tx: Offload support for the async_tx api"
drivers/dma/Makefile +3 -0
diff -uprN a/drivers/dma/Makefile b/drivers/dma/Makefile
@@ -11,4 +11,7 @@ obj-$(CONFIG_MX3_IPU) += ipu/
 obj-$(CONFIG_TXX9_DMAC) += txx9dmac.o
 obj-$(CONFIG_SH_DMAE) += shdma.o
 obj-$(CONFIG_COH901318) += coh901318.o coh901318_lli.o
+obj-$(CONFIG_XLL_DMA) += xlldma.o
+obj-$(CONFIG_XLL_DMA_OF) += xlldma_of.o
+obj-$(CONFIG_XLL_DMA_PLAT) += xlldma_plat.o
 obj-$(CONFIG_AMCC_PPC440SPE_ADMA) += ppc4xx/
#1 lore raw
Quoted 22 lines · Steven J. Magnani

Integrate xlldma drivers into the build.

---
diff -uprN a/drivers/dma/Kconfig b/drivers/dma/Kconfig

drivers/dma/Kconfig       2010-03-17 11:11:57.000000000 -0500 renamed from drivers/dma/Kconfig       2010-03-16 13:27:42.000000000 -0500 +0 -0
@@ -126,6 +126,28 @@ config AMCC_PPC440SPE_ADMA

       help
         Enable support for the AMCC PPC440SPe RAID engines.

drivers/dma/Kconfig       2010-03-17 11:11:57.000000000 -0500 renamed from drivers/dma/Kconfig       2010-03-16 13:27:42.000000000 -0500 +11 -0
+config XLL_DMA
+       tristate "Xilinx LocalLink DMA support"
+       depends on XILINX_VIRTEX || MICROBLAZE
+       select DMA_ENGINE
+       ---help---
+         Enable support for the Xilinx MPMC DMA controller.
+         This requires at least one MPMC SDMA port wired as a "loopback".
+
+         If unsure, say N.
+
+config XLL_DMA_OF

drivers/dma/Kconfig       2010-03-17 11:11:57.000000000 -0500

Quoted 10 lines
drivers/dma/Kconfig       2010-03-17 11:11:57.000000000 -0500 renamed from drivers/dma/Kconfig       2010-03-16 13:27:42.000000000 -0500 +10 -0
+        tristate "Xilinx LocalLink DMA OF device"
+        depends on XLL_DMA && OF
+        help
+          OpenFirmware bus attachment for the Xilinx LocalLink DMA engine.
+
+config XLL_DMA_PLAT
+        tristate "Xilinx LocalLink DMA platform device"
+        depends on XLL_DMA
+        help
+          Platform bus attachment for the Xilinx LocalLink DMA engine.

I think these should be in the per-arch Kconfig, if at all.

Quoted 10 lines

+
 config ARCH_HAS_ASYNC_TX_FIND_CHANNEL
       bool

drivers/dma/Kconfig       2010-03-17 11:11:57.000000000 -0500 renamed from drivers/dma/Kconfig       2010-03-16 13:27:42.000000000 -0500 +0 -0
@@ -138,13 +160,13 @@ comment "DMA Clients"

 config NET_DMA
       bool "Network: TCP receive copy offload"
       depends on DMA_ENGINE && NET

-       default (INTEL_IOATDMA || FSL_DMA)
+       default (INTEL_IOATDMA || FSL_DMA || XLL_DMA)

NET_DMA is actively harmful for platforms with a non-io-coherent caches. So it should not default to y on Microblaze.