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

Commit 5dc18f51 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/djbw/async_tx 

* 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/djbw/async_tx:
  dmatest: fix use after free in dmatest_exit
  ipu_idmac: fix spinlock type
  iop-adma, mv_xor: fix mem leak on self-test setup failure
  fsldma: fix off by one in dma_halt
  I/OAT: fail self-test if callback test reaches timeout
  I/OAT: update driver version and copyright dates
  I/OAT: list usage cleanup
  I/OAT: set tcp_dma_copybreak to 256k for I/OAT ver.3
  I/OAT: cancel watchdog before dma remove
  I/OAT: fail initialization on zero channels detection
  I/OAT: do not set DCACTRL_CMPL_WRITE_ENABLE for I/OAT ver.3
  I/OAT: add verification for proper APICID_TAG_MAP setting by BIOS
  dmaengine: update kerneldoc
parents fd6ec5f3 7cbd4877

drivers/dca/dca-core.c

+1 −1
Original line number Diff line number Diff line 
/*

 * Copyright(c) 2007 Intel Corporation. All rights reserved.

 * Copyright(c) 2007 - 2009 Intel Corporation. All rights reserved.

 *

 * This program is free software; you can redistribute it and/or modify it

 * under the terms of the GNU General Public License as published by the Free

drivers/dma/dmatest.c

+4 −2
Original line number Diff line number Diff line
@@ -430,13 +430,15 @@ late_initcall(dmatest_init); 
static void __exit dmatest_exit(void)

{

	struct dmatest_chan *dtc, *_dtc;

	struct dma_chan *chan;



	list_for_each_entry_safe(dtc, _dtc, &dmatest_channels, node) {

		list_del(&dtc->node);

		chan = dtc->chan;

		dmatest_cleanup_channel(dtc);

		pr_debug("dmatest: dropped channel %s\n",

			 dma_chan_name(dtc->chan));

		dma_release_channel(dtc->chan);

			 dma_chan_name(chan));

		dma_release_channel(chan);

	}

}

module_exit(dmatest_exit);

drivers/dma/fsldma.c

+6 −2
Original line number Diff line number Diff line
@@ -158,7 +158,8 @@ static void dma_start(struct fsl_dma_chan *fsl_chan) 


static void dma_halt(struct fsl_dma_chan *fsl_chan)

{

	int i = 0;

	int i;



	DMA_OUT(fsl_chan, &fsl_chan->reg_base->mr,

		DMA_IN(fsl_chan, &fsl_chan->reg_base->mr, 32) | FSL_DMA_MR_CA,

		32);
@@ -166,8 +167,11 @@ static void dma_halt(struct fsl_dma_chan *fsl_chan) 
		DMA_IN(fsl_chan, &fsl_chan->reg_base->mr, 32) & ~(FSL_DMA_MR_CS

		| FSL_DMA_MR_EMS_EN | FSL_DMA_MR_CA), 32);



	while (!dma_is_idle(fsl_chan) && (i++ < 100))

	for (i = 0; i < 100; i++) {

		if (dma_is_idle(fsl_chan))

			break;

		udelay(10);

	}

	if (i >= 100 && !dma_is_idle(fsl_chan))

		dev_err(fsl_chan->dev, "DMA halt timeout!\n");

}

drivers/dma/ioat.c

+1 −1
Original line number Diff line number Diff line 
/*

 * Intel I/OAT DMA Linux driver

 * Copyright(c) 2007 Intel Corporation.

 * Copyright(c) 2007 - 2009 Intel Corporation.

 *

 * This program is free software; you can redistribute it and/or modify it

 * under the terms and conditions of the GNU General Public License,

drivers/dma/ioat_dca.c

+25 −1
Original line number Diff line number Diff line 
/*

 * Intel I/OAT DMA Linux driver

 * Copyright(c) 2007 Intel Corporation.

 * Copyright(c) 2007 - 2009 Intel Corporation.

 *

 * This program is free software; you can redistribute it and/or modify it

 * under the terms and conditions of the GNU General Public License,
@@ -49,6 +49,23 @@ 


#define DCA_TAG_MAP_MASK 0xDF



/* expected tag map bytes for I/OAT ver.2 */

#define DCA2_TAG_MAP_BYTE0 0x80

#define DCA2_TAG_MAP_BYTE1 0x0

#define DCA2_TAG_MAP_BYTE2 0x81

#define DCA2_TAG_MAP_BYTE3 0x82

#define DCA2_TAG_MAP_BYTE4 0x82



/* verify if tag map matches expected values */

static inline int dca2_tag_map_valid(u8 *tag_map)

{

	return ((tag_map[0] == DCA2_TAG_MAP_BYTE0) &&

		(tag_map[1] == DCA2_TAG_MAP_BYTE1) &&

		(tag_map[2] == DCA2_TAG_MAP_BYTE2) &&

		(tag_map[3] == DCA2_TAG_MAP_BYTE3) &&

		(tag_map[4] == DCA2_TAG_MAP_BYTE4));

}



/*

 * "Legacy" DCA systems do not implement the DCA register set in the

 * I/OAT device.  Software needs direct support for their tag mappings.
@@ -452,6 +469,13 @@ struct dca_provider *ioat2_dca_init(struct pci_dev *pdev, void __iomem *iobase) 
			ioatdca->tag_map[i] = 0;

	}



	if (!dca2_tag_map_valid(ioatdca->tag_map)) {

		dev_err(&pdev->dev, "APICID_TAG_MAP set incorrectly by BIOS, "

			"disabling DCA\n");

		free_dca_provider(dca);

		return NULL;

	}



	err = register_dca_provider(dca, &pdev->dev);

	if (err) {

		free_dca_provider(dca);