Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/djbw/async_tx (bd99f5e1) · Commits · e / devices / android_kernel_teracube_2e

drivers/dma/dmaengine.c

+11 −6

Original line number	Original line	Diff line number	Diff line
	@@ -804,11 +804,14 @@ dma_async_memcpy_buf_to_buf(struct dma_chan chan, void dest,
	dma_addr_t dma_dest, dma_src;		dma_addr_t dma_dest, dma_src;
	dma_cookie_t cookie;		dma_cookie_t cookie;
	int cpu;		int cpu;
			unsigned long flags;

	dma_src = dma_map_single(dev->dev, src, len, DMA_TO_DEVICE);		dma_src = dma_map_single(dev->dev, src, len, DMA_TO_DEVICE);
	dma_dest = dma_map_single(dev->dev, dest, len, DMA_FROM_DEVICE);		dma_dest = dma_map_single(dev->dev, dest, len, DMA_FROM_DEVICE);
	tx = dev->device_prep_dma_memcpy(chan, dma_dest, dma_src, len,		flags = DMA_CTRL_ACK \|
	DMA_CTRL_ACK);		DMA_COMPL_SRC_UNMAP_SINGLE \|
			DMA_COMPL_DEST_UNMAP_SINGLE;
			tx = dev->device_prep_dma_memcpy(chan, dma_dest, dma_src, len, flags);

	if (!tx) {		if (!tx) {
	dma_unmap_single(dev->dev, dma_src, len, DMA_TO_DEVICE);		dma_unmap_single(dev->dev, dma_src, len, DMA_TO_DEVICE);
	@@ -850,11 +853,12 @@ dma_async_memcpy_buf_to_pg(struct dma_chan chan, struct page page,
	dma_addr_t dma_dest, dma_src;		dma_addr_t dma_dest, dma_src;
	dma_cookie_t cookie;		dma_cookie_t cookie;
	int cpu;		int cpu;
			unsigned long flags;

	dma_src = dma_map_single(dev->dev, kdata, len, DMA_TO_DEVICE);		dma_src = dma_map_single(dev->dev, kdata, len, DMA_TO_DEVICE);
	dma_dest = dma_map_page(dev->dev, page, offset, len, DMA_FROM_DEVICE);		dma_dest = dma_map_page(dev->dev, page, offset, len, DMA_FROM_DEVICE);
	tx = dev->device_prep_dma_memcpy(chan, dma_dest, dma_src, len,		flags = DMA_CTRL_ACK \| DMA_COMPL_SRC_UNMAP_SINGLE;
	DMA_CTRL_ACK);		tx = dev->device_prep_dma_memcpy(chan, dma_dest, dma_src, len, flags);

	if (!tx) {		if (!tx) {
	dma_unmap_single(dev->dev, dma_src, len, DMA_TO_DEVICE);		dma_unmap_single(dev->dev, dma_src, len, DMA_TO_DEVICE);
	@@ -898,12 +902,13 @@ dma_async_memcpy_pg_to_pg(struct dma_chan chan, struct page dest_pg,
	dma_addr_t dma_dest, dma_src;		dma_addr_t dma_dest, dma_src;
	dma_cookie_t cookie;		dma_cookie_t cookie;
	int cpu;		int cpu;
			unsigned long flags;

	dma_src = dma_map_page(dev->dev, src_pg, src_off, len, DMA_TO_DEVICE);		dma_src = dma_map_page(dev->dev, src_pg, src_off, len, DMA_TO_DEVICE);
	dma_dest = dma_map_page(dev->dev, dest_pg, dest_off, len,		dma_dest = dma_map_page(dev->dev, dest_pg, dest_off, len,
	DMA_FROM_DEVICE);		DMA_FROM_DEVICE);
	tx = dev->device_prep_dma_memcpy(chan, dma_dest, dma_src, len,		flags = DMA_CTRL_ACK;
	DMA_CTRL_ACK);		tx = dev->device_prep_dma_memcpy(chan, dma_dest, dma_src, len, flags);

	if (!tx) {		if (!tx) {
	dma_unmap_page(dev->dev, dma_src, len, DMA_TO_DEVICE);		dma_unmap_page(dev->dev, dma_src, len, DMA_TO_DEVICE);

drivers/dma/dmatest.c

+1 −3

Original line number	Original line	Diff line number	Diff line
	@@ -531,9 +531,7 @@ static int __init dmatest_init(void)
	chan = dma_request_channel(mask, filter, NULL);		chan = dma_request_channel(mask, filter, NULL);
	if (chan) {		if (chan) {
	err = dmatest_add_channel(chan);		err = dmatest_add_channel(chan);
	if (err == 0)		if (err) {
	continue;
	else {
	dma_release_channel(chan);		dma_release_channel(chan);
	break; /* add_channel failed, punt */		break; /* add_channel failed, punt */
	}		}

drivers/dma/ioat_dma.c

+28 −17

Original line number	Original line	Diff line number	Diff line
	@@ -1063,23 +1063,32 @@ static void ioat_dma_cleanup_tasklet(unsigned long data)
	static void		static void
	ioat_dma_unmap(struct ioat_dma_chan ioat_chan, struct ioat_desc_sw desc)		ioat_dma_unmap(struct ioat_dma_chan ioat_chan, struct ioat_desc_sw desc)
	{		{
	/*		if (!(desc->async_tx.flags & DMA_COMPL_SKIP_DEST_UNMAP)) {
	* yes we are unmapping both _page and _single		if (desc->async_tx.flags & DMA_COMPL_DEST_UNMAP_SINGLE)
	* alloc'd regions with unmap_page. Is this		pci_unmap_single(ioat_chan->device->pdev,
	* really that bad?		pci_unmap_addr(desc, dst),
	*/		pci_unmap_len(desc, len),
	if (!(desc->async_tx.flags & DMA_COMPL_SKIP_DEST_UNMAP))		PCI_DMA_FROMDEVICE);
			else
	pci_unmap_page(ioat_chan->device->pdev,		pci_unmap_page(ioat_chan->device->pdev,
	pci_unmap_addr(desc, dst),		pci_unmap_addr(desc, dst),
	pci_unmap_len(desc, len),		pci_unmap_len(desc, len),
	PCI_DMA_FROMDEVICE);		PCI_DMA_FROMDEVICE);
			}

	if (!(desc->async_tx.flags & DMA_COMPL_SKIP_SRC_UNMAP))		if (!(desc->async_tx.flags & DMA_COMPL_SKIP_SRC_UNMAP)) {
			if (desc->async_tx.flags & DMA_COMPL_SRC_UNMAP_SINGLE)
			pci_unmap_single(ioat_chan->device->pdev,
			pci_unmap_addr(desc, src),
			pci_unmap_len(desc, len),
			PCI_DMA_TODEVICE);
			else
	pci_unmap_page(ioat_chan->device->pdev,		pci_unmap_page(ioat_chan->device->pdev,
	pci_unmap_addr(desc, src),		pci_unmap_addr(desc, src),
	pci_unmap_len(desc, len),		pci_unmap_len(desc, len),
	PCI_DMA_TODEVICE);		PCI_DMA_TODEVICE);
	}		}
			}

	/**		/**
	* ioat_dma_memcpy_cleanup - cleanup up finished descriptors		* ioat_dma_memcpy_cleanup - cleanup up finished descriptors
	@@ -1363,6 +1372,7 @@ static int ioat_dma_self_test(struct ioatdma_device *device)
	int err = 0;		int err = 0;
	struct completion cmp;		struct completion cmp;
	unsigned long tmo;		unsigned long tmo;
			unsigned long flags;

	src = kzalloc(sizeof(u8) * IOAT_TEST_SIZE, GFP_KERNEL);		src = kzalloc(sizeof(u8) * IOAT_TEST_SIZE, GFP_KERNEL);
	if (!src)		if (!src)
	@@ -1392,8 +1402,9 @@ static int ioat_dma_self_test(struct ioatdma_device *device)
	DMA_TO_DEVICE);		DMA_TO_DEVICE);
	dma_dest = dma_map_single(dma_chan->device->dev, dest, IOAT_TEST_SIZE,		dma_dest = dma_map_single(dma_chan->device->dev, dest, IOAT_TEST_SIZE,
	DMA_FROM_DEVICE);		DMA_FROM_DEVICE);
			flags = DMA_COMPL_SRC_UNMAP_SINGLE \| DMA_COMPL_DEST_UNMAP_SINGLE;
	tx = device->common.device_prep_dma_memcpy(dma_chan, dma_dest, dma_src,		tx = device->common.device_prep_dma_memcpy(dma_chan, dma_dest, dma_src,
	IOAT_TEST_SIZE, 0);		IOAT_TEST_SIZE, flags);
	if (!tx) {		if (!tx) {
	dev_err(&device->pdev->dev,		dev_err(&device->pdev->dev,
	"Self-test prep failed, disabling\n");		"Self-test prep failed, disabling\n");

drivers/dma/ipu/ipu_idmac.c

+4 −3

Original line number	Original line	Diff line number	Diff line
	@@ -1272,7 +1272,8 @@ static irqreturn_t idmac_interrupt(int irq, void *dev_id)
	/* Other interrupts do not interfere with this channel */		/* Other interrupts do not interfere with this channel */
	spin_lock(&ichan->lock);		spin_lock(&ichan->lock);
	if (unlikely(chan_id != IDMAC_SDC_0 && chan_id != IDMAC_SDC_1 &&		if (unlikely(chan_id != IDMAC_SDC_0 && chan_id != IDMAC_SDC_1 &&
	((curbuf >> chan_id) & 1) == ichan->active_buffer)) {		((curbuf >> chan_id) & 1) == ichan->active_buffer &&
			!list_is_last(ichan->queue.next, &ichan->queue))) {
	int i = 100;		int i = 100;

	/* This doesn't help. See comment in ipu_disable_channel() */		/* This doesn't help. See comment in ipu_disable_channel() */
	@@ -1547,7 +1548,7 @@ static irqreturn_t ic_sof_irq(int irq, void *dev_id)
	struct idmac_channel *ichan = dev_id;		struct idmac_channel *ichan = dev_id;
	printk(KERN_DEBUG "Got SOF IRQ %d on Channel %d\n",		printk(KERN_DEBUG "Got SOF IRQ %d on Channel %d\n",
	irq, ichan->dma_chan.chan_id);		irq, ichan->dma_chan.chan_id);
	disable_irq(irq);		disable_irq_nosync(irq);
	return IRQ_HANDLED;		return IRQ_HANDLED;
	}		}

	@@ -1556,7 +1557,7 @@ static irqreturn_t ic_eof_irq(int irq, void *dev_id)
	struct idmac_channel *ichan = dev_id;		struct idmac_channel *ichan = dev_id;
	printk(KERN_DEBUG "Got EOF IRQ %d on Channel %d\n",		printk(KERN_DEBUG "Got EOF IRQ %d on Channel %d\n",
	irq, ichan->dma_chan.chan_id);		irq, ichan->dma_chan.chan_id);
	disable_irq(irq);		disable_irq_nosync(irq);
	return IRQ_HANDLED;		return IRQ_HANDLED;
	}		}

include/linux/dmaengine.h

+6 −0

Original line number	Original line	Diff line number	Diff line
	@@ -78,12 +78,18 @@ enum dma_transaction_type {
	* dependency chains		* dependency chains
	* @DMA_COMPL_SKIP_SRC_UNMAP - set to disable dma-unmapping the source buffer(s)		* @DMA_COMPL_SKIP_SRC_UNMAP - set to disable dma-unmapping the source buffer(s)
	* @DMA_COMPL_SKIP_DEST_UNMAP - set to disable dma-unmapping the destination(s)		* @DMA_COMPL_SKIP_DEST_UNMAP - set to disable dma-unmapping the destination(s)
			* @DMA_COMPL_SRC_UNMAP_SINGLE - set to do the source dma-unmapping as single
			* (if not set, do the source dma-unmapping as page)
			* @DMA_COMPL_DEST_UNMAP_SINGLE - set to do the destination dma-unmapping as single
			* (if not set, do the destination dma-unmapping as page)
	*/		*/
	enum dma_ctrl_flags {		enum dma_ctrl_flags {
	DMA_PREP_INTERRUPT = (1 << 0),		DMA_PREP_INTERRUPT = (1 << 0),
	DMA_CTRL_ACK = (1 << 1),		DMA_CTRL_ACK = (1 << 1),
	DMA_COMPL_SKIP_SRC_UNMAP = (1 << 2),		DMA_COMPL_SKIP_SRC_UNMAP = (1 << 2),
	DMA_COMPL_SKIP_DEST_UNMAP = (1 << 3),		DMA_COMPL_SKIP_DEST_UNMAP = (1 << 3),
			DMA_COMPL_SRC_UNMAP_SINGLE = (1 << 4),
			DMA_COMPL_DEST_UNMAP_SINGLE = (1 << 5),
	};		};

	/**		/**