* linux-next: manual merge of the dmaengine tree with the slave-dma tree
@ 2013-09-10 1:56 Stephen Rothwell
0 siblings, 0 replies; 3+ messages in thread
From: Stephen Rothwell @ 2013-09-10 1:56 UTC (permalink / raw)
To: Dan Williams
Cc: linux-next, linux-kernel, Jon Mason, Zhangfei Gao, Vinod Koul
[-- Attachment #1: Type: text/plain, Size: 1223 bytes --]
Hi Dan,
Today's linux-next merge of the dmaengine tree got a conflict in
include/linux/dmaengine.h between commit 7bb587f4eef8 ("dmaengine: add
interface of dma_get_slave_channel") from the slave-dma tree and commit
4a43f394a082 ("dmaengine: dma_sync_wait and dma_find_channel undefined")
from the dmaengine tree.
I fixed it up (see below) and can carry the fix as necessary (no action
is required).
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
diff --cc include/linux/dmaengine.h
index 2601186,0c72b89..0000000
--- a/include/linux/dmaengine.h
+++ b/include/linux/dmaengine.h
@@@ -1030,8 -1006,6 +1042,7 @@@ static inline void dma_release_channel(
int dma_async_device_register(struct dma_device *device);
void dma_async_device_unregister(struct dma_device *device);
void dma_run_dependencies(struct dma_async_tx_descriptor *tx);
- struct dma_chan *dma_find_channel(enum dma_transaction_type tx_type);
+struct dma_chan *dma_get_slave_channel(struct dma_chan *chan);
struct dma_chan *net_dma_find_channel(void);
#define dma_request_channel(mask, x, y) __dma_request_channel(&(mask), x, y)
#define dma_request_slave_channel_compat(mask, x, y, dev, name) \
[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]
^ permalink raw reply [flat|nested] 3+ messages in thread
* linux-next: manual merge of the dmaengine tree with the slave-dma tree
@ 2013-11-15 1:56 Stephen Rothwell
2013-11-16 6:31 ` Vinod Koul
0 siblings, 1 reply; 3+ messages in thread
From: Stephen Rothwell @ 2013-11-15 1:56 UTC (permalink / raw)
To: Dan Williams; +Cc: linux-next, linux-kernel, Vinod Koul
[-- Attachment #1: Type: text/plain, Size: 1631 bytes --]
Hi Dan,
Today's linux-next merge of the dmaengine tree got a conflict in
drivers/dma/dmatest.c between commit 19e9f99f273b ("dmaengine: dmatest:
use DMA_COMPLETE for dma completion status") from the slave-dma tree and
commit 872f05c6e9a3 ("dmatest: replace stored results mechanism, with
uniform messages") from the dmaengine tree.
I fixed it up (see below) and can carry the fix as necessary (no action
is required).
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
diff --cc drivers/dma/dmatest.c
index 59e287f56dfc,329b7cf02f8e..000000000000
--- a/drivers/dma/dmatest.c
+++ b/drivers/dma/dmatest.c
@@@ -735,17 -633,17 +633,17 @@@ static int dmatest_func(void *data
* free it this time?" dancing. For now, just
* leave it dangling.
*/
- thread_result_add(info, result, DMATEST_ET_TIMEOUT,
- total_tests, src_off, dst_off,
- len, 0);
+ dmaengine_unmap_put(um);
+ result("test timed out", total_tests, src_off, dst_off,
+ len, 0);
failed_tests++;
continue;
- } else if (status != DMA_SUCCESS) {
+ } else if (status != DMA_COMPLETE) {
- enum dmatest_error_type type = (status == DMA_ERROR) ?
- DMATEST_ET_DMA_ERROR : DMATEST_ET_DMA_IN_PROGRESS;
- thread_result_add(info, result, type,
- total_tests, src_off, dst_off,
- len, status);
+ dmaengine_unmap_put(um);
+ result(status == DMA_ERROR ?
+ "completion error status" :
+ "completion busy status", total_tests, src_off,
+ dst_off, len, ret);
failed_tests++;
continue;
}
[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: linux-next: manual merge of the dmaengine tree with the slave-dma tree
2013-11-15 1:56 Stephen Rothwell
@ 2013-11-16 6:31 ` Vinod Koul
0 siblings, 0 replies; 3+ messages in thread
From: Vinod Koul @ 2013-11-16 6:31 UTC (permalink / raw)
To: Stephen Rothwell; +Cc: Dan Williams, linux-next, linux-kernel
[-- Attachment #1: Type: text/plain, Size: 1918 bytes --]
On Fri, Nov 15, 2013 at 12:56:04PM +1100, Stephen Rothwell wrote:
> Hi Dan,
>
> Today's linux-next merge of the dmaengine tree got a conflict in
> drivers/dma/dmatest.c between commit 19e9f99f273b ("dmaengine: dmatest:
> use DMA_COMPLETE for dma completion status") from the slave-dma tree and
> commit 872f05c6e9a3 ("dmatest: replace stored results mechanism, with
> uniform messages") from the dmaengine tree.
>
> I fixed it up (see below) and can carry the fix as necessary (no action
> is required).
Thanks, we are sending single PULL to linus so I am merging Dan's tree to mine
so this should vanish
--
~Vinod
>
> --
> Cheers,
> Stephen Rothwell sfr@canb.auug.org.au
>
> diff --cc drivers/dma/dmatest.c
> index 59e287f56dfc,329b7cf02f8e..000000000000
> --- a/drivers/dma/dmatest.c
> +++ b/drivers/dma/dmatest.c
> @@@ -735,17 -633,17 +633,17 @@@ static int dmatest_func(void *data
> * free it this time?" dancing. For now, just
> * leave it dangling.
> */
> - thread_result_add(info, result, DMATEST_ET_TIMEOUT,
> - total_tests, src_off, dst_off,
> - len, 0);
> + dmaengine_unmap_put(um);
> + result("test timed out", total_tests, src_off, dst_off,
> + len, 0);
> failed_tests++;
> continue;
> - } else if (status != DMA_SUCCESS) {
> + } else if (status != DMA_COMPLETE) {
> - enum dmatest_error_type type = (status == DMA_ERROR) ?
> - DMATEST_ET_DMA_ERROR : DMATEST_ET_DMA_IN_PROGRESS;
> - thread_result_add(info, result, type,
> - total_tests, src_off, dst_off,
> - len, status);
> + dmaengine_unmap_put(um);
> + result(status == DMA_ERROR ?
> + "completion error status" :
> + "completion busy status", total_tests, src_off,
> + dst_off, len, ret);
> failed_tests++;
> continue;
> }
--
[-- Attachment #2: Digital signature --]
[-- Type: application/pgp-signature, Size: 836 bytes --]
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2013-11-16 7:27 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2013-09-10 1:56 linux-next: manual merge of the dmaengine tree with the slave-dma tree Stephen Rothwell
2013-11-15 1:56 Stephen Rothwell
2013-11-16 6:31 ` Vinod Koul
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).