Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit d0cd8481 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'dmaengine-3.17' of git://git.kernel.org/pub/scm/linux/kernel/git/djbw/dmaengine 

Pull dmaengine updates from Dan Williams:
 "Even though this has fixes marked for -stable, given the size and the
  needed conflict resolutions this is 3.18-rc1/merge-window material.

  These patches have been languishing in my tree for a long while.  The
  fact that I do not have the time to do proper/prompt maintenance of
  this tree is a primary factor in the decision to step down as
  dmaengine maintainer.  That and the fact that the bulk of drivers/dma/
  activity is going through Vinod these days.

  The net_dma removal has not been in -next.  It has developed simple
  conflicts against mainline and net-next (for-3.18).

  Continuing thanks to Vinod for staying on top of drivers/dma/.

  Summary:

   1/ Step down as dmaengine maintainer see commit 08223d80
      "dmaengine maintainer update"

   2/ Removal of net_dma, as it has been marked 'broken' since 3.13
      (commit 77873803 "net_dma: mark broken"), without reports of
      performance regression.

   3/ Miscellaneous fixes"

* tag 'dmaengine-3.17' of git://git.kernel.org/pub/scm/linux/kernel/git/djbw/dmaengine:
  net: make tcp_cleanup_rbuf private
  net_dma: revert 'copied_early'
  net_dma: simple removal
  dmaengine maintainer update
  dmatest: prevent memory leakage on error path in thread
  ioat: Use time_before_jiffies()
  dmaengine: fix xor sources continuation
  dma: mv_xor: Rename __mv_xor_slot_cleanup() to mv_xor_slot_cleanup()
  dma: mv_xor: Remove all callers of mv_xor_slot_cleanup()
  dma: mv_xor: Remove unneeded mv_xor_clean_completed_slots() call
  ioat: Use pci_enable_msix_exact() instead of pci_enable_msix()
  drivers: dma: Include appropriate header file in dca.c
  drivers: dma: Mark functions as static in dma_v3.c
  dma: mv_xor: Add DMA API error checks
  ioat/dca: Use dev_is_pci() to check whether it is pci device
parents bdf428fe 3f334078

Documentation/ABI/removed/net_dma

0 → 100644
+8 −0
Original line number Diff line number Diff line 
What:		tcp_dma_copybreak sysctl

Date:		Removed in kernel v3.13

Contact:	Dan Williams <dan.j.williams@intel.com>

Description:

	Formerly the lower limit, in bytes, of the size of socket reads

	that will be offloaded to a DMA copy engine.  Removed due to

	coherency issues of the cpu potentially touching the buffers

	while dma is in flight.

Documentation/networking/ip-sysctl.txt

+0 −6
Original line number Diff line number Diff line
@@ -580,12 +580,6 @@ tcp_workaround_signed_windows - BOOLEAN 
	not receive a window scaling option from them.

	Default: 0



tcp_dma_copybreak - INTEGER

	Lower limit, in bytes, of the size of socket reads that will be

	offloaded to a DMA copy engine, if one is present in the system

	and CONFIG_NET_DMA is enabled.

	Default: 4096



tcp_thin_linear_timeouts - BOOLEAN

	Enable dynamic triggering of linear timeouts for thin streams.

	If set, a check is performed upon retransmission by timeout to

MAINTAINERS

+6 −13
Original line number Diff line number Diff line
@@ -1025,24 +1025,20 @@ F: arch/arm/mach-pxa/colibri-pxa270-income.c 


ARM/INTEL IOP32X ARM ARCHITECTURE

M:	Lennert Buytenhek <kernel@wantstofly.org>

M:	Dan Williams <dan.j.williams@intel.com>

L:	linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)

S:	Maintained



ARM/INTEL IOP33X ARM ARCHITECTURE

M:	Dan Williams <dan.j.williams@intel.com>

L:	linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)

S:	Maintained

S:	Orphan



ARM/INTEL IOP13XX ARM ARCHITECTURE

M:	Lennert Buytenhek <kernel@wantstofly.org>

M:	Dan Williams <dan.j.williams@intel.com>

L:	linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)

S:	Maintained



ARM/INTEL IQ81342EX MACHINE SUPPORT

M:	Lennert Buytenhek <kernel@wantstofly.org>

M:	Dan Williams <dan.j.williams@intel.com>

L:	linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)

S:	Maintained
@@ -1067,7 +1063,6 @@ F: drivers/pcmcia/pxa2xx_stargate2.c 


ARM/INTEL XSC3 (MANZANO) ARM CORE

M:	Lennert Buytenhek <kernel@wantstofly.org>

M:	Dan Williams <dan.j.williams@intel.com>

L:	linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)

S:	Maintained
@@ -1562,9 +1557,9 @@ F: drivers/platform/x86/asus*.c 
F:	drivers/platform/x86/eeepc*.c



ASYNCHRONOUS TRANSFERS/TRANSFORMS (IOAT) API

M:	Dan Williams <dan.j.williams@intel.com>

R:	Dan Williams <dan.j.williams@intel.com>

W:	http://sourceforge.net/projects/xscaleiop

S:	Maintained

S:	Odd fixes

F:	Documentation/crypto/async-tx-api.txt

F:	crypto/async_tx/

F:	drivers/dma/
@@ -2995,13 +2990,11 @@ T: git git://git.linaro.org/people/sumitsemwal/linux-dma-buf.git 


DMA GENERIC OFFLOAD ENGINE SUBSYSTEM

M:	Vinod Koul <vinod.koul@intel.com>

M:	Dan Williams <dan.j.williams@intel.com>

L:	dmaengine@vger.kernel.org

Q:	https://patchwork.kernel.org/project/linux-dmaengine/list/

S:	Supported

S:	Maintained

F:	drivers/dma/

F:	include/linux/dma*

T:	git git://git.kernel.org/pub/scm/linux/kernel/git/djbw/async_tx.git

T:	git git://git.infradead.org/users/vkoul/slave-dma.git (slave-dma)



DME1737 HARDWARE MONITOR DRIVER
@@ -4754,8 +4747,8 @@ F: arch/x86/kernel/cpu/microcode/core* 
F:	arch/x86/kernel/cpu/microcode/intel*



INTEL I/OAT DMA DRIVER

M:	Dan Williams <dan.j.williams@intel.com>

M:	Dave Jiang <dave.jiang@intel.com>

R:	Dan Williams <dan.j.williams@intel.com>

L:	dmaengine@vger.kernel.org

Q:	https://patchwork.kernel.org/project/linux-dmaengine/list/

S:	Supported
@@ -4770,7 +4763,7 @@ F: drivers/iommu/intel-iommu.c 
F:	include/linux/intel-iommu.h



INTEL IOP-ADMA DMA DRIVER

M:	Dan Williams <dan.j.williams@intel.com>

R:	Dan Williams <dan.j.williams@intel.com>

S:	Odd fixes

F:	drivers/dma/iop-adma.c

crypto/async_tx/async_xor.c

+1 −2
Original line number Diff line number Diff line
@@ -78,8 +78,6 @@ do_async_xor(struct dma_chan *chan, struct dmaengine_unmap_data *unmap, 
		tx = dma->device_prep_dma_xor(chan, dma_dest, src_list,

					      xor_src_cnt, unmap->len,

					      dma_flags);

		src_list[0] = tmp;





		if (unlikely(!tx))

			async_tx_quiesce(&submit->depend_tx);
@@ -92,6 +90,7 @@ do_async_xor(struct dma_chan *chan, struct dmaengine_unmap_data *unmap, 
						      xor_src_cnt, unmap->len,

						      dma_flags);

		}

		src_list[0] = tmp;



		dma_set_unmap(tx, unmap);

		async_tx_submit(chan, tx, submit);

drivers/dma/Kconfig

+0 −12
Original line number Diff line number Diff line
@@ -427,18 +427,6 @@ config DMA_OF 
comment "DMA Clients"

	depends on DMA_ENGINE



config NET_DMA

	bool "Network: TCP receive copy offload"

	depends on DMA_ENGINE && NET

	default (INTEL_IOATDMA || FSL_DMA)

	depends on BROKEN

	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.



config ASYNC_TX_DMA

	bool "Async_tx: Offload support for the async_tx api"

	depends on DMA_ENGINE