linux-next: manual merge of the slave-dma tree with Linus' tree

linux-next: manual merge of the slave-dma tree with Linus' tree

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 1024 bytes --]

Hi Vinod,

Today's linux-next merge of the slave-dma tree got a conflict in
arch/arm/mach-imx/Kconfig between commit 3c77c29c49c6 ("ASoC: imx: move
audmux driver into sound/soc/imx") from Linus' tree and commit
6bd081277ea0 ("dmaengine: imx-dma: merge old dma-v1.c with imx-dma.c")
from the slave-dma tree.

Just context changes.  I fixed it up (see below) and can carry the fix as
necessary.
-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au

diff --cc arch/arm/mach-imx/Kconfig
index 3919fba,3da1421..0000000
--- a/arch/arm/mach-imx/Kconfig
+++ b/arch/arm/mach-imx/Kconfig
@@@ -46,7 -30,7 +42,6 @@@ config SOC_IMX2
  	bool
  	select MACH_MX21
  	select CPU_ARM926T
- 	select IMX_HAVE_DMA_V1
 -	select ARCH_MXC_AUDMUX_V1
  	select IMX_HAVE_IOMUX_V1
  	select MXC_AVIC
  
@@@ -61,7 -46,7 +56,6 @@@ config SOC_IMX2
  	bool
  	select MACH_MX27
  	select CPU_ARM926T
- 	select IMX_HAVE_DMA_V1
 -	select ARCH_MXC_AUDMUX_V1
  	select IMX_HAVE_IOMUX_V1
  	select MXC_AVIC
  

[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]

Re: linux-next: manual merge of the slave-dma tree with Linus' tree

[Vinod Koul]

On 12-03-20, 09:16, Peter Ujfalusi wrote:
> Hi Stephen, Vinod,
> 
> On 12/03/2020 7.26, Stephen Rothwell wrote:
> > Hi all,
> > 
> > Today's linux-next merge of the slave-dma tree got a conflict in:
> > 
> >   drivers/dma/ti/k3-udma.c
> > 
> > between commit:
> > 
> >   16cd3c670183 ("dmaengine: ti: k3-udma: Workaround for RX teardown with stale data in peer")
> > 
> > from Linus' tree
> 
> In Linus' tree the drivers/dma/ti/k3-udma.c latest commit is:
> 8390318c04bb ("dmaengine: ti: k3-udma: Fix terminated transfer handling")
> 
> git log --oneline drivers/dma/ti/k3-udma.c shows:
> 8390318c04bb dmaengine: ti: k3-udma: Fix terminated transfer handling
> c7450bb211f3 dmaengine: ti: k3-udma: Use the channel direction in pause/resume functions
> 6cf668a4ef82 dmaengine: ti: k3-udma: Use the TR counter helper for slave_sg and cyclic
> a97934071fc3 dmaengine: ti: k3-udma: Move the TR counter calculation to helper function
> 16cd3c670183 dmaengine: ti: k3-udma: Workaround for RX teardown with stale data in peer
> 1c83767c9d41 dmaengine: ti: k3-udma: Use ktime/usleep_range based TX completion check
> 6c0157be02f0 dmaengine: ti: k3-udma: fix spelling mistake "limted" -> "limited"
> d70241913413 dmaengine: ti: k3-udma: Add glue layer for non DMAengine users
> 25dcb5dd7b7c dmaengine: ti: New driver for K3 UDMA
> 
> > and commit:
> > 
> >   db8d9b4c9b30 ("dmaengine: ti: k3-udma: Implement custom dbg_summary_show for debugfs")
> 
> However slave-dma's next branch shows the following log for k3-udma.c:
> db8d9b4c9b30 dmaengine: ti: k3-udma: Implement custom dbg_summary_show for debugfs
> 0ebcf1a274c5 dmaengine: ti: k3-udma: Implement support for atype (for virtualization)
> 6c0157be02f0 dmaengine: ti: k3-udma: fix spelling mistake "limted" -> "limited"
> d70241913413 dmaengine: ti: k3-udma: Add glue layer for non DMAengine users
> 25dcb5dd7b7c dmaengine: ti: New driver for K3 UDMA
> 
> The 5.6-rc5 patches (1c83767c9d41...8390318c04bb) is not present in slave-dma/next which
> causes the conflict.

Yeah I typically dont merge fixes to next, unless we have a dependency.

> > from the slave-dma tree.
> > 
> > I fixed it up (see below) and can carry the fix as necessary. This
> > is now fixed as far as linux-next is concerned, but any non trivial
> > conflicts should be mentioned to your upstream maintainer when your tree
> > is submitted for merging.  You may also want to consider cooperating
> > with the maintainer of the conflicting tree to minimise any particularly
> > complex conflicts.
> 
> I ended up with the exactly same resolution patch when merging dlave-dma/next
> to Linus' tree.

Thanks for confirming.. I will let Linus know about this, I dont think
we need to do much here :)

-- 
~Vinod

Re: linux-next: manual merge of the slave-dma tree with Linus' tree

[Peter Ujfalusi]

Hi Stephen, Vinod,

On 12/03/2020 7.26, Stephen Rothwell wrote:
> Hi all,
> 
> Today's linux-next merge of the slave-dma tree got a conflict in:
> 
>   drivers/dma/ti/k3-udma.c
> 
> between commit:
> 
>   16cd3c670183 ("dmaengine: ti: k3-udma: Workaround for RX teardown with stale data in peer")
> 
> from Linus' tree

In Linus' tree the drivers/dma/ti/k3-udma.c latest commit is:
8390318c04bb ("dmaengine: ti: k3-udma: Fix terminated transfer handling")

git log --oneline drivers/dma/ti/k3-udma.c shows:
8390318c04bb dmaengine: ti: k3-udma: Fix terminated transfer handling
c7450bb211f3 dmaengine: ti: k3-udma: Use the channel direction in pause/resume functions
6cf668a4ef82 dmaengine: ti: k3-udma: Use the TR counter helper for slave_sg and cyclic
a97934071fc3 dmaengine: ti: k3-udma: Move the TR counter calculation to helper function
16cd3c670183 dmaengine: ti: k3-udma: Workaround for RX teardown with stale data in peer
1c83767c9d41 dmaengine: ti: k3-udma: Use ktime/usleep_range based TX completion check
6c0157be02f0 dmaengine: ti: k3-udma: fix spelling mistake "limted" -> "limited"
d70241913413 dmaengine: ti: k3-udma: Add glue layer for non DMAengine users
25dcb5dd7b7c dmaengine: ti: New driver for K3 UDMA

> and commit:
> 
>   db8d9b4c9b30 ("dmaengine: ti: k3-udma: Implement custom dbg_summary_show for debugfs")

However slave-dma's next branch shows the following log for k3-udma.c:
db8d9b4c9b30 dmaengine: ti: k3-udma: Implement custom dbg_summary_show for debugfs
0ebcf1a274c5 dmaengine: ti: k3-udma: Implement support for atype (for virtualization)
6c0157be02f0 dmaengine: ti: k3-udma: fix spelling mistake "limted" -> "limited"
d70241913413 dmaengine: ti: k3-udma: Add glue layer for non DMAengine users
25dcb5dd7b7c dmaengine: ti: New driver for K3 UDMA

The 5.6-rc5 patches (1c83767c9d41...8390318c04bb) is not present in slave-dma/next which
causes the conflict.
 
> from the slave-dma tree.
> 
> I fixed it up (see below) and can carry the fix as necessary. This
> is now fixed as far as linux-next is concerned, but any non trivial
> conflicts should be mentioned to your upstream maintainer when your tree
> is submitted for merging.  You may also want to consider cooperating
> with the maintainer of the conflicting tree to minimise any particularly
> complex conflicts.

I ended up with the exactly same resolution patch when merging dlave-dma/next
to Linus' tree.

Stephen, thank you!

Vinod, is there anything I can do?

- Péter

Texas Instruments Finland Oy, Porkkalankatu 22, 00180 Helsinki. Y-tunnus/Business ID: 0615521-4. Kotipaikka/Domicile: Helsinki

linux-next: manual merge of the slave-dma tree with Linus' tree

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 6797 bytes --]

Hi all,

Today's linux-next merge of the slave-dma tree got a conflict in:

  drivers/dma/ti/k3-udma.c

between commit:

  16cd3c670183 ("dmaengine: ti: k3-udma: Workaround for RX teardown with stale data in peer")

from Linus' tree and commit:

  db8d9b4c9b30 ("dmaengine: ti: k3-udma: Implement custom dbg_summary_show for debugfs")

from the slave-dma tree.

I fixed it up (see below) and can carry the fix as necessary. This
is now fixed as far as linux-next is concerned, but any non trivial
conflicts should be mentioned to your upstream maintainer when your tree
is submitted for merging.  You may also want to consider cooperating
with the maintainer of the conflicting tree to minimise any particularly
complex conflicts.

-- 
Cheers,
Stephen Rothwell

diff --cc drivers/dma/ti/k3-udma.c
index 0536866a58ce,1e6aac87302d..000000000000
--- a/drivers/dma/ti/k3-udma.c
+++ b/drivers/dma/ti/k3-udma.c
@@@ -149,8 -128,19 +149,9 @@@ struct udma_dev 
  
  	struct udma_chan *channels;
  	u32 psil_base;
+ 	u32 atype;
  };
  
 -struct udma_hwdesc {
 -	size_t cppi5_desc_size;
 -	void *cppi5_desc_vaddr;
 -	dma_addr_t cppi5_desc_paddr;
 -
 -	/* TR descriptor internal pointers */
 -	void *tr_req_base;
 -	struct cppi5_tr_resp_t *tr_resp_base;
 -};
 -
  struct udma_desc {
  	struct virt_dma_desc vd;
  
@@@ -3381,98 -3276,66 +3409,158 @@@ static int udma_setup_resources(struct 
  	return ch_count;
  }
  
 +static int udma_setup_rx_flush(struct udma_dev *ud)
 +{
 +	struct udma_rx_flush *rx_flush = &ud->rx_flush;
 +	struct cppi5_desc_hdr_t *tr_desc;
 +	struct cppi5_tr_type1_t *tr_req;
 +	struct cppi5_host_desc_t *desc;
 +	struct device *dev = ud->dev;
 +	struct udma_hwdesc *hwdesc;
 +	size_t tr_size;
 +
 +	/* Allocate 1K buffer for discarded data on RX channel teardown */
 +	rx_flush->buffer_size = SZ_1K;
 +	rx_flush->buffer_vaddr = devm_kzalloc(dev, rx_flush->buffer_size,
 +					      GFP_KERNEL);
 +	if (!rx_flush->buffer_vaddr)
 +		return -ENOMEM;
 +
 +	rx_flush->buffer_paddr = dma_map_single(dev, rx_flush->buffer_vaddr,
 +						rx_flush->buffer_size,
 +						DMA_TO_DEVICE);
 +	if (dma_mapping_error(dev, rx_flush->buffer_paddr))
 +		return -ENOMEM;
 +
 +	/* Set up descriptor to be used for TR mode */
 +	hwdesc = &rx_flush->hwdescs[0];
 +	tr_size = sizeof(struct cppi5_tr_type1_t);
 +	hwdesc->cppi5_desc_size = cppi5_trdesc_calc_size(tr_size, 1);
 +	hwdesc->cppi5_desc_size = ALIGN(hwdesc->cppi5_desc_size,
 +					ud->desc_align);
 +
 +	hwdesc->cppi5_desc_vaddr = devm_kzalloc(dev, hwdesc->cppi5_desc_size,
 +						GFP_KERNEL);
 +	if (!hwdesc->cppi5_desc_vaddr)
 +		return -ENOMEM;
 +
 +	hwdesc->cppi5_desc_paddr = dma_map_single(dev, hwdesc->cppi5_desc_vaddr,
 +						  hwdesc->cppi5_desc_size,
 +						  DMA_TO_DEVICE);
 +	if (dma_mapping_error(dev, hwdesc->cppi5_desc_paddr))
 +		return -ENOMEM;
 +
 +	/* Start of the TR req records */
 +	hwdesc->tr_req_base = hwdesc->cppi5_desc_vaddr + tr_size;
 +	/* Start address of the TR response array */
 +	hwdesc->tr_resp_base = hwdesc->tr_req_base + tr_size;
 +
 +	tr_desc = hwdesc->cppi5_desc_vaddr;
 +	cppi5_trdesc_init(tr_desc, 1, tr_size, 0, 0);
 +	cppi5_desc_set_pktids(tr_desc, 0, CPPI5_INFO1_DESC_FLOWID_DEFAULT);
 +	cppi5_desc_set_retpolicy(tr_desc, 0, 0);
 +
 +	tr_req = hwdesc->tr_req_base;
 +	cppi5_tr_init(&tr_req->flags, CPPI5_TR_TYPE1, false, false,
 +		      CPPI5_TR_EVENT_SIZE_COMPLETION, 0);
 +	cppi5_tr_csf_set(&tr_req->flags, CPPI5_TR_CSF_SUPR_EVT);
 +
 +	tr_req->addr = rx_flush->buffer_paddr;
 +	tr_req->icnt0 = rx_flush->buffer_size;
 +	tr_req->icnt1 = 1;
 +
 +	/* Set up descriptor to be used for packet mode */
 +	hwdesc = &rx_flush->hwdescs[1];
 +	hwdesc->cppi5_desc_size = ALIGN(sizeof(struct cppi5_host_desc_t) +
 +					CPPI5_INFO0_HDESC_EPIB_SIZE +
 +					CPPI5_INFO0_HDESC_PSDATA_MAX_SIZE,
 +					ud->desc_align);
 +
 +	hwdesc->cppi5_desc_vaddr = devm_kzalloc(dev, hwdesc->cppi5_desc_size,
 +						GFP_KERNEL);
 +	if (!hwdesc->cppi5_desc_vaddr)
 +		return -ENOMEM;
 +
 +	hwdesc->cppi5_desc_paddr = dma_map_single(dev, hwdesc->cppi5_desc_vaddr,
 +						  hwdesc->cppi5_desc_size,
 +						  DMA_TO_DEVICE);
 +	if (dma_mapping_error(dev, hwdesc->cppi5_desc_paddr))
 +		return -ENOMEM;
 +
 +	desc = hwdesc->cppi5_desc_vaddr;
 +	cppi5_hdesc_init(desc, 0, 0);
 +	cppi5_desc_set_pktids(&desc->hdr, 0, CPPI5_INFO1_DESC_FLOWID_DEFAULT);
 +	cppi5_desc_set_retpolicy(&desc->hdr, 0, 0);
 +
 +	cppi5_hdesc_attach_buf(desc,
 +			       rx_flush->buffer_paddr, rx_flush->buffer_size,
 +			       rx_flush->buffer_paddr, rx_flush->buffer_size);
 +
 +	dma_sync_single_for_device(dev, hwdesc->cppi5_desc_paddr,
 +				   hwdesc->cppi5_desc_size, DMA_TO_DEVICE);
 +	return 0;
 +}
 +
+ #ifdef CONFIG_DEBUG_FS
+ static void udma_dbg_summary_show_chan(struct seq_file *s,
+ 				       struct dma_chan *chan)
+ {
+ 	struct udma_chan *uc = to_udma_chan(chan);
+ 	struct udma_chan_config *ucc = &uc->config;
+ 
+ 	seq_printf(s, " %-13s| %s", dma_chan_name(chan),
+ 		   chan->dbg_client_name ?: "in-use");
+ 	seq_printf(s, " (%s, ", dmaengine_get_direction_text(uc->config.dir));
+ 
+ 	switch (uc->config.dir) {
+ 	case DMA_MEM_TO_MEM:
+ 		seq_printf(s, "chan%d pair [0x%04x -> 0x%04x], ", uc->tchan->id,
+ 			   ucc->src_thread, ucc->dst_thread);
+ 		break;
+ 	case DMA_DEV_TO_MEM:
+ 		seq_printf(s, "rchan%d [0x%04x -> 0x%04x], ", uc->rchan->id,
+ 			   ucc->src_thread, ucc->dst_thread);
+ 		break;
+ 	case DMA_MEM_TO_DEV:
+ 		seq_printf(s, "tchan%d [0x%04x -> 0x%04x], ", uc->tchan->id,
+ 			   ucc->src_thread, ucc->dst_thread);
+ 		break;
+ 	default:
+ 		seq_printf(s, ")\n");
+ 		return;
+ 	}
+ 
+ 	if (ucc->ep_type == PSIL_EP_NATIVE) {
+ 		seq_printf(s, "PSI-L Native");
+ 		if (ucc->metadata_size) {
+ 			seq_printf(s, "[%s", ucc->needs_epib ? " EPIB" : "");
+ 			if (ucc->psd_size)
+ 				seq_printf(s, " PSDsize:%u", ucc->psd_size);
+ 			seq_printf(s, " ]");
+ 		}
+ 	} else {
+ 		seq_printf(s, "PDMA");
+ 		if (ucc->enable_acc32 || ucc->enable_burst)
+ 			seq_printf(s, "[%s%s ]",
+ 				   ucc->enable_acc32 ? " ACC32" : "",
+ 				   ucc->enable_burst ? " BURST" : "");
+ 	}
+ 
+ 	seq_printf(s, ", %s)\n", ucc->pkt_mode ? "Packet mode" : "TR mode");
+ }
+ 
+ static void udma_dbg_summary_show(struct seq_file *s,
+ 				  struct dma_device *dma_dev)
+ {
+ 	struct dma_chan *chan;
+ 
+ 	list_for_each_entry(chan, &dma_dev->channels, device_node) {
+ 		if (chan->client_count)
+ 			udma_dbg_summary_show_chan(s, chan);
+ 	}
+ }
+ #endif /* CONFIG_DEBUG_FS */
+ 
  #define TI_UDMAC_BUSWIDTHS	(BIT(DMA_SLAVE_BUSWIDTH_1_BYTE) | \
  				 BIT(DMA_SLAVE_BUSWIDTH_2_BYTES) | \
  				 BIT(DMA_SLAVE_BUSWIDTH_3_BYTES) | \

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]

Re: linux-next: manual merge of the slave-dma tree with Linus' tree

[Vinod Koul]

On 11-06-19, 16:32, Stephen Rothwell wrote:
> Hi all,
> 
> Today's linux-next merge of the slave-dma tree got a conflict in:
> 
>   include/linux/sudmac.h
> 
> between commit:
> 
>   49833cbeafa4 ("treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 311")
> 
> from Linus' tree and commit:
> 
>   9a0f780958bb ("dmaengine: sudmac: remove unused driver")
> 
> from the slave-dma tree.
> 
> I fixed it up (I removed the file) and can carry the fix as
> necessary. This is now fixed as far as linux-next is concerned, but any

Thanks Stephen,

I will keep this in mind before I send this to Linus

> non trivial conflicts should be mentioned to your upstream maintainer
> when your tree is submitted for merging.  You may also want to consider
> cooperating with the maintainer of the conflicting tree to minimise any
> particularly complex conflicts.
> 
> -- 
> Cheers,
> Stephen Rothwell



-- 
~Vinod

linux-next: manual merge of the slave-dma tree with Linus' tree

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 756 bytes --]

Hi all,

Today's linux-next merge of the slave-dma tree got a conflict in:

  include/linux/sudmac.h

between commit:

  49833cbeafa4 ("treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 311")

from Linus' tree and commit:

  9a0f780958bb ("dmaengine: sudmac: remove unused driver")

from the slave-dma tree.

I fixed it up (I removed the file) and can carry the fix as
necessary. This is now fixed as far as linux-next is concerned, but any
non trivial conflicts should be mentioned to your upstream maintainer
when your tree is submitted for merging.  You may also want to consider
cooperating with the maintainer of the conflicting tree to minimise any
particularly complex conflicts.

-- 
Cheers,
Stephen Rothwell

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]

Re: linux-next: manual merge of the slave-dma tree with Linus' tree

[Vinod Koul]

On 26-02-19, 15:24, Stephen Rothwell wrote:
> Hi Vinod,
> 
> Today's linux-next merge of the slave-dma tree got a conflict in:
> 
>   drivers/dma/dmatest.c
> 
> between commit:
> 
>   6454368a804c ("dmaengine: dmatest: Abort test in case of mapping error")
> 
> from Linus' tree and commit:
> 
>   361deb7243d2 ("dmaengine: dmatest: wrap src & dst data into a struct")
> 
> from the slave-dma tree.
> 
> I fixed it up (see below) and can carry the fix as necessary. This
> is now fixed as far as linux-next is concerned, but any non trivial
> conflicts should be mentioned to your upstream maintainer when your tree
> is submitted for merging.  You may also want to consider cooperating
> with the maintainer of the conflicting tree to minimise any particularly
> complex conflicts.

Thanks for the fix, this seems fine to me. Also, in this case that Linus
so let me see how to ease it :)

> -- 
> Cheers,
> Stephen Rothwell
> 
> diff --cc drivers/dma/dmatest.c
> index 6511928b4cdf,50221d467d86..000000000000
> --- a/drivers/dma/dmatest.c
> +++ b/drivers/dma/dmatest.c
> @@@ -708,12 -726,14 +726,12 @@@ static int dmatest_func(void *data
>   
>   			um->addr[i] = dma_map_page(dev->dev, pg, pg_off,
>   						   um->len, DMA_TO_DEVICE);
> - 			srcs[i] = um->addr[i] + src_off;
> + 			srcs[i] = um->addr[i] + src->off;
>   			ret = dma_mapping_error(dev->dev, um->addr[i]);
>   			if (ret) {
>  -				dmaengine_unmap_put(um);
>   				result("src mapping error", total_tests,
> - 				       src_off, dst_off, len, ret);
> + 				       src->off, dst->off, len, ret);
>  -				failed_tests++;
>  -				continue;
>  +				goto error_unmap_continue;
>   			}
>   			um->to_cnt++;
>   		}
> @@@ -728,9 -748,11 +746,9 @@@
>   					       DMA_BIDIRECTIONAL);
>   			ret = dma_mapping_error(dev->dev, dsts[i]);
>   			if (ret) {
>  -				dmaengine_unmap_put(um);
>   				result("dst mapping error", total_tests,
> - 				       src_off, dst_off, len, ret);
> + 				       src->off, dst->off, len, ret);
>  -				failed_tests++;
>  -				continue;
>  +				goto error_unmap_continue;
>   			}
>   			um->bidi_cnt++;
>   		}
> @@@ -758,10 -780,12 +776,10 @@@
>   		}
>   
>   		if (!tx) {
> - 			result("prep error", total_tests, src_off,
> - 			       dst_off, len, ret);
>  -			dmaengine_unmap_put(um);
> + 			result("prep error", total_tests, src->off,
> + 			       dst->off, len, ret);
>   			msleep(100);
>  -			failed_tests++;
>  -			continue;
>  +			goto error_unmap_continue;
>   		}
>   
>   		done->done = false;
> @@@ -770,10 -794,12 +788,10 @@@
>   		cookie = tx->tx_submit(tx);
>   
>   		if (dma_submit_error(cookie)) {
> - 			result("submit error", total_tests, src_off,
> - 			       dst_off, len, ret);
>  -			dmaengine_unmap_put(um);
> + 			result("submit error", total_tests, src->off,
> + 			       dst->off, len, ret);
>   			msleep(100);
>  -			failed_tests++;
>  -			continue;
>  +			goto error_unmap_continue;
>   		}
>   		dma_async_issue_pending(chan);
>   
> @@@ -782,23 -808,25 +800,23 @@@
>   
>   		status = dma_async_is_tx_complete(chan, cookie, NULL, NULL);
>   
>  -		dmaengine_unmap_put(um);
>  -
>   		if (!done->done) {
> - 			result("test timed out", total_tests, src_off, dst_off,
> + 			result("test timed out", total_tests, src->off, dst->off,
>   			       len, 0);
>  -			failed_tests++;
>  -			continue;
>  +			goto error_unmap_continue;
>   		} else if (status != DMA_COMPLETE) {
>   			result(status == DMA_ERROR ?
>   			       "completion error status" :
> - 			       "completion busy status", total_tests, src_off,
> - 			       dst_off, len, ret);
> + 			       "completion busy status", total_tests, src->off,
> + 			       dst->off, len, ret);
>  -			failed_tests++;
>  -			continue;
>  +			goto error_unmap_continue;
>   		}
>   
>  +		dmaengine_unmap_put(um);
>  +
>   		if (params->noverify) {
> - 			verbose_result("test passed", total_tests, src_off,
> - 				       dst_off, len, 0);
> + 			verbose_result("test passed", total_tests, src->off,
> + 				       dst->off, len, 0);
>   			continue;
>   		}
>   
> @@@ -833,15 -861,9 +851,15 @@@
>   			       len, error_count);
>   			failed_tests++;
>   		} else {
> - 			verbose_result("test passed", total_tests, src_off,
> - 				       dst_off, len, 0);
> + 			verbose_result("test passed", total_tests, src->off,
> + 				       dst->off, len, 0);
>   		}
>  +
>  +		continue;
>  +
>  +error_unmap_continue:
>  +		dmaengine_unmap_put(um);
>  +		failed_tests++;
>   	}
>   	ktime = ktime_sub(ktime_get(), ktime);
>   	ktime = ktime_sub(ktime, comparetime);



-- 
~Vinod

linux-next: manual merge of the slave-dma tree with Linus' tree

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 4248 bytes --]

Hi Vinod,

Today's linux-next merge of the slave-dma tree got a conflict in:

  drivers/dma/dmatest.c

between commit:

  6454368a804c ("dmaengine: dmatest: Abort test in case of mapping error")

from Linus' tree and commit:

  361deb7243d2 ("dmaengine: dmatest: wrap src & dst data into a struct")

from the slave-dma tree.

I fixed it up (see below) and can carry the fix as necessary. This
is now fixed as far as linux-next is concerned, but any non trivial
conflicts should be mentioned to your upstream maintainer when your tree
is submitted for merging.  You may also want to consider cooperating
with the maintainer of the conflicting tree to minimise any particularly
complex conflicts.

-- 
Cheers,
Stephen Rothwell

diff --cc drivers/dma/dmatest.c
index 6511928b4cdf,50221d467d86..000000000000
--- a/drivers/dma/dmatest.c
+++ b/drivers/dma/dmatest.c
@@@ -708,12 -726,14 +726,12 @@@ static int dmatest_func(void *data
  
  			um->addr[i] = dma_map_page(dev->dev, pg, pg_off,
  						   um->len, DMA_TO_DEVICE);
- 			srcs[i] = um->addr[i] + src_off;
+ 			srcs[i] = um->addr[i] + src->off;
  			ret = dma_mapping_error(dev->dev, um->addr[i]);
  			if (ret) {
 -				dmaengine_unmap_put(um);
  				result("src mapping error", total_tests,
- 				       src_off, dst_off, len, ret);
+ 				       src->off, dst->off, len, ret);
 -				failed_tests++;
 -				continue;
 +				goto error_unmap_continue;
  			}
  			um->to_cnt++;
  		}
@@@ -728,9 -748,11 +746,9 @@@
  					       DMA_BIDIRECTIONAL);
  			ret = dma_mapping_error(dev->dev, dsts[i]);
  			if (ret) {
 -				dmaengine_unmap_put(um);
  				result("dst mapping error", total_tests,
- 				       src_off, dst_off, len, ret);
+ 				       src->off, dst->off, len, ret);
 -				failed_tests++;
 -				continue;
 +				goto error_unmap_continue;
  			}
  			um->bidi_cnt++;
  		}
@@@ -758,10 -780,12 +776,10 @@@
  		}
  
  		if (!tx) {
- 			result("prep error", total_tests, src_off,
- 			       dst_off, len, ret);
 -			dmaengine_unmap_put(um);
+ 			result("prep error", total_tests, src->off,
+ 			       dst->off, len, ret);
  			msleep(100);
 -			failed_tests++;
 -			continue;
 +			goto error_unmap_continue;
  		}
  
  		done->done = false;
@@@ -770,10 -794,12 +788,10 @@@
  		cookie = tx->tx_submit(tx);
  
  		if (dma_submit_error(cookie)) {
- 			result("submit error", total_tests, src_off,
- 			       dst_off, len, ret);
 -			dmaengine_unmap_put(um);
+ 			result("submit error", total_tests, src->off,
+ 			       dst->off, len, ret);
  			msleep(100);
 -			failed_tests++;
 -			continue;
 +			goto error_unmap_continue;
  		}
  		dma_async_issue_pending(chan);
  
@@@ -782,23 -808,25 +800,23 @@@
  
  		status = dma_async_is_tx_complete(chan, cookie, NULL, NULL);
  
 -		dmaengine_unmap_put(um);
 -
  		if (!done->done) {
- 			result("test timed out", total_tests, src_off, dst_off,
+ 			result("test timed out", total_tests, src->off, dst->off,
  			       len, 0);
 -			failed_tests++;
 -			continue;
 +			goto error_unmap_continue;
  		} else if (status != DMA_COMPLETE) {
  			result(status == DMA_ERROR ?
  			       "completion error status" :
- 			       "completion busy status", total_tests, src_off,
- 			       dst_off, len, ret);
+ 			       "completion busy status", total_tests, src->off,
+ 			       dst->off, len, ret);
 -			failed_tests++;
 -			continue;
 +			goto error_unmap_continue;
  		}
  
 +		dmaengine_unmap_put(um);
 +
  		if (params->noverify) {
- 			verbose_result("test passed", total_tests, src_off,
- 				       dst_off, len, 0);
+ 			verbose_result("test passed", total_tests, src->off,
+ 				       dst->off, len, 0);
  			continue;
  		}
  
@@@ -833,15 -861,9 +851,15 @@@
  			       len, error_count);
  			failed_tests++;
  		} else {
- 			verbose_result("test passed", total_tests, src_off,
- 				       dst_off, len, 0);
+ 			verbose_result("test passed", total_tests, src->off,
+ 				       dst->off, len, 0);
  		}
 +
 +		continue;
 +
 +error_unmap_continue:
 +		dmaengine_unmap_put(um);
 +		failed_tests++;
  	}
  	ktime = ktime_sub(ktime_get(), ktime);
  	ktime = ktime_sub(ktime, comparetime);

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]

linux-next: manual merge of the slave-dma tree with Linus' tree

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 1848 bytes --]

Hi Vinod,

Today's linux-next merge of the slave-dma tree got a conflict in:

  drivers/dma/imx-sdma.c

between commit:

  750afb08ca71 ("cross-tree: phase out dma_zalloc_coherent()")

from Linus' tree and commit:

  ceaf52265148 ("dmaengine: imx-sdma: pass ->dev to dma_alloc_coherent() API")

from the slave-dma tree.

I fixed it up (see below) and can carry the fix as necessary. This
is now fixed as far as linux-next is concerned, but any non trivial
conflicts should be mentioned to your upstream maintainer when your tree
is submitted for merging.  You may also want to consider cooperating
with the maintainer of the conflicting tree to minimise any particularly
complex conflicts.

-- 
Cheers,
Stephen Rothwell

diff --cc drivers/dma/imx-sdma.c
index 86708fb9bda1,af14a8d6efa8..000000000000
--- a/drivers/dma/imx-sdma.c
+++ b/drivers/dma/imx-sdma.c
@@@ -1182,8 -1189,8 +1189,8 @@@ static int sdma_request_channel0(struc
  {
  	int ret = -EBUSY;
  
- 	sdma->bd0 = dma_alloc_coherent(NULL, PAGE_SIZE, &sdma->bd0_phys,
 -	sdma->bd0 = dma_zalloc_coherent(sdma->dev, PAGE_SIZE, &sdma->bd0_phys,
 -					GFP_NOWAIT);
++	sdma->bd0 = dma_alloc_coherent(sdma->dev, PAGE_SIZE, &sdma->bd0_phys,
 +				       GFP_NOWAIT);
  	if (!sdma->bd0) {
  		ret = -ENOMEM;
  		goto out;
@@@ -1205,8 -1212,8 +1212,8 @@@ static int sdma_alloc_bd(struct sdma_de
  	u32 bd_size = desc->num_bd * sizeof(struct sdma_buffer_descriptor);
  	int ret = 0;
  
- 	desc->bd = dma_alloc_coherent(NULL, bd_size, &desc->bd_phys,
- 				      GFP_NOWAIT);
 -	desc->bd = dma_zalloc_coherent(desc->sdmac->sdma->dev, bd_size,
 -				       &desc->bd_phys, GFP_NOWAIT);
++	desc->bd = dma_alloc_coherent(desc->sdmac->sdma->dev, bd_size,
++				      &desc->bd_phys, GFP_NOWAIT);
  	if (!desc->bd) {
  		ret = -ENOMEM;
  		goto out;

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]

linux-next: manual merge of the slave-dma tree with Linus' tree

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 1446 bytes --]

Hi Vinod,

Today's linux-next merge of the slave-dma tree got a conflict in
drivers/dma/dmatest.c between commit 632fd28326c0 ("dmatest: implement
two helpers to unmap dma memory") from the  tree and commit f04f98e91bd8
("dmatest: adjust invalid module parameters for number of source
buffers") from the slave-dma 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 64b048d,0e2deaa..0000000
--- a/drivers/dma/dmatest.c
+++ b/drivers/dma/dmatest.c
@@@ -228,20 -228,13 +228,27 @@@ static void dmatest_callback(void *arg
  	wake_up_all(done->wait);
  }
  
 +static inline void unmap_src(struct device *dev, dma_addr_t *addr, size_t len,
 +			     unsigned int count)
 +{
 +	while (count--)
 +		dma_unmap_single(dev, addr[count], len, DMA_TO_DEVICE);
 +}
 +
 +static inline void unmap_dst(struct device *dev, dma_addr_t *addr, size_t len,
 +			     unsigned int count)
 +{
 +	while (count--)
 +		dma_unmap_single(dev, addr[count], len, DMA_BIDIRECTIONAL);
 +}
 +
+ static unsigned int min_odd(unsigned int x, unsigned int y)
+ {
+ 	unsigned int val = min(x, y);
+ 
+ 	return val % 2 ? val : val - 1;
+ }
+ 
  /*
   * This function repeatedly tests DMA transfers of various lengths and
   * offsets for a given operation type until it is told to exit by

[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]

linux-next: manual merge of the slave-dma tree with Linus' tree

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 1907 bytes --]

Hi Vinod,

Today's linux-next merge of the slave-dma tree got conflicts in
arch/arm/include/asm/hardware/pl330.h and arch/arm/common/pl330.c between
commits 4272f98a1ae8 ("ARM: 7164/3: PL330: Fix the size of the
dst_cache_ctrl field") and 46e33c606af8 ("ARM: 7326/2: PL330: fix null
pointer dereference in pl330_chan_ctrl()") from Linus' tree and commit
b7d861d93945 ("DMA: PL330: Merge PL330 driver into drivers/dma/") from
the slave-dma tree.

I removed the files and then applied changes from the patchs in Linus'
tree to drivers/dma/pl330.c.

From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Fri, 9 Mar 2012 13:21:55 +1100
Subject: [PATCH] DMA: PL330: update for code movement

Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
---
 drivers/dma/pl330.c |    5 +++--
 1 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/drivers/dma/pl330.c b/drivers/dma/pl330.c
index 7253d17..41ec06d 100644
--- a/drivers/dma/pl330.c
+++ b/drivers/dma/pl330.c
@@ -48,7 +48,7 @@ enum pl330_dstcachectrl {
 	DCCTRL1,	/* Bufferable only */
 	DCCTRL2,	/* Cacheable, but do not allocate */
 	DCCTRL3,	/* Cacheable and bufferable, but do not allocate */
-	DINVALID1 = 8,
+	DINVALID1,		/* AWCACHE = 0x1000 */
 	DINVALID2,
 	DCCTRL6,	/* Cacheable write-through, allocate on writes only */
 	DCCTRL7,	/* Cacheable write-back, allocate on writes only */
@@ -1799,12 +1799,13 @@ static int pl330_chan_ctrl(void *ch_id, enum pl330_chan_op op)
 	struct pl330_thread *thrd = ch_id;
 	struct pl330_dmac *pl330;
 	unsigned long flags;
-	int ret = 0, active = thrd->req_running;
+	int ret = 0, active;
 
 	if (!thrd || thrd->free || thrd->dmac->state == DYING)
 		return -EINVAL;
 
 	pl330 = thrd->dmac;
+	active = thrd->req_running;
 
 	spin_lock_irqsave(&pl330->lock, flags);
 
-- 
1.7.9.1

-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au

[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]

linux-next: manual merge of the slave-dma tree with Linus' tree

[Stephen Rothwell]

Hi Vinod,

Today's linux-next merge of the slave-dma tree got a conflict in
drivers/dma/amba-pl08x.c between commit 4d66164e997e ("dmaengine: PL08x:
Fix trivial build error") from Linus' tree and commit 0c38d7013913
("dmaengine/amba-pl08x: Rearrange inclusion of header files in ascending
order") from the slave-dma tree.

I fixed it up (see below) and can carry the fix as necessary.
-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au

diff --cc drivers/dma/amba-pl08x.c
index be21e3f,849eab8..0000000
--- a/drivers/dma/amba-pl08x.c
+++ b/drivers/dma/amba-pl08x.c
@@@ -77,17 -72,16 +72,17 @@@
  #include <linux/amba/bus.h>
  #include <linux/amba/pl08x.h>
  #include <linux/debugfs.h>
+ #include <linux/delay.h>
+ #include <linux/device.h>
+ #include <linux/dmaengine.h>
+ #include <linux/dmapool.h>
++#include <linux/dma-mapping.h>
+ #include <linux/init.h>
+ #include <linux/interrupt.h>
+ #include <linux/module.h>
+ #include <linux/pm_runtime.h>
  #include <linux/seq_file.h>
- 
+ #include <linux/slab.h>
  #include <asm/hardware/pl080.h>
  
  #define DRIVER_NAME	"pl08xdmac"

Re: linux-next: manual merge of the slave-dma tree with Linus' tree

[Grant Likely]

On Wed, Jul 27, 2011 at 2:19 PM, Russell King - ARM Linux
<linux@arm.linux.org.uk> wrote:
> On Wed, Jul 27, 2011 at 09:55:44PM +0530, Koul, Vinod wrote:
>> >
>> > On Wed, 2011-07-27 at 12:08 +1000, Stephen Rothwell wrote:
>> > > Hi Vinod,
>> > >
>> > > Today's linux-next merge of the slave-dma tree got a conflict in
>> > > drivers/spi/spi-pl022.c (called drivers/spi/amba-pl022.c in the sleav-dma
>> > > tree) between commit 083be3f05371 ("spi/pl022: initialize burstsize from
>> > > FIFO trigger level") from Linus' tree and commit 001b0585ff16 ("Improve
>> > > slave/cyclic DMA engine documentation") from the slave-dma tree.
>> > >
>> > > I fixed it up (see below) anc acn carry the fix as necessary.
>> >
>> > The correct fix would be:
>> >
>> > diff --cc drivers/spi/spi-pl022.c
>> > index eba88c7,99e7880..0000000
>> > --- a/drivers/spi/spi-pl022.c
>> > +++ b/drivers/spi/spi-pl022.c
>> > @@@ -910,11 -908,11 +910,9 @@@ static int configure_dma(struct pl022 *
>> >   {
>> >         struct dma_slave_config rx_conf = {
>> >                 .src_addr = SSP_DR(pl022->phybase),
>> > +                   .direction = DMA_TO_DEVICE,
>> >         };
>> >         struct dma_slave_config tx_conf = {
>> >                 .dst_addr = SSP_DR(pl022->phybase),
>> >                 .direction = DMA_TO_DEVICE,
>> >  -              .dst_maxburst = pl022->vendor->fifodepth >> 1,
>> >         };
>> >         unsigned int pages;
>> >         int ret;
>> >
>> Grant, Russell,
>> Can you please ack this fix before I apply in my tree to resolve this conflict
>
> I don't see why I need to - my documentation patch should only be touching
> Documentation/dmaengine.txt, not drivers/spi/spi-pl022.c.  So it really
> should not be causing a conflict in this file.

The commit includes 3 stray hunks not in the original patch.  Sounds
like it got borked on commit.

g.


-- 
Grant Likely, B.Sc., P.Eng.
Secret Lab Technologies Ltd.

Re: linux-next: manual merge of the slave-dma tree with Linus' tree

[Russell King - ARM Linux]

On Wed, Jul 27, 2011 at 09:55:44PM +0530, Koul, Vinod wrote:
> > 
> > On Wed, 2011-07-27 at 12:08 +1000, Stephen Rothwell wrote:
> > > Hi Vinod,
> > >
> > > Today's linux-next merge of the slave-dma tree got a conflict in
> > > drivers/spi/spi-pl022.c (called drivers/spi/amba-pl022.c in the sleav-dma
> > > tree) between commit 083be3f05371 ("spi/pl022: initialize burstsize from
> > > FIFO trigger level") from Linus' tree and commit 001b0585ff16 ("Improve
> > > slave/cyclic DMA engine documentation") from the slave-dma tree.
> > >
> > > I fixed it up (see below) anc acn carry the fix as necessary.
> > 
> > The correct fix would be:
> > 
> > diff --cc drivers/spi/spi-pl022.c
> > index eba88c7,99e7880..0000000
> > --- a/drivers/spi/spi-pl022.c
> > +++ b/drivers/spi/spi-pl022.c
> > @@@ -910,11 -908,11 +910,9 @@@ static int configure_dma(struct pl022 *
> >   {
> >         struct dma_slave_config rx_conf = {
> >                 .src_addr = SSP_DR(pl022->phybase),
> > +			.direction = DMA_TO_DEVICE,
> >         };
> >         struct dma_slave_config tx_conf = {
> >                 .dst_addr = SSP_DR(pl022->phybase),
> >                 .direction = DMA_TO_DEVICE,
> >  -              .dst_maxburst = pl022->vendor->fifodepth >> 1,
> >         };
> >         unsigned int pages;
> >         int ret;
> > 
> Grant, Russell,
> Can you please ack this fix before I apply in my tree to resolve this conflict

I don't see why I need to - my documentation patch should only be touching
Documentation/dmaengine.txt, not drivers/spi/spi-pl022.c.  So it really
should not be causing a conflict in this file.

RE: linux-next: manual merge of the slave-dma tree with Linus' tree

[Koul, Vinod]

> 
> On Wed, 2011-07-27 at 12:08 +1000, Stephen Rothwell wrote:
> > Hi Vinod,
> >
> > Today's linux-next merge of the slave-dma tree got a conflict in
> > drivers/spi/spi-pl022.c (called drivers/spi/amba-pl022.c in the sleav-dma
> > tree) between commit 083be3f05371 ("spi/pl022: initialize burstsize from
> > FIFO trigger level") from Linus' tree and commit 001b0585ff16 ("Improve
> > slave/cyclic DMA engine documentation") from the slave-dma tree.
> >
> > I fixed it up (see below) anc acn carry the fix as necessary.
> 
> The correct fix would be:
> 
> diff --cc drivers/spi/spi-pl022.c
> index eba88c7,99e7880..0000000
> --- a/drivers/spi/spi-pl022.c
> +++ b/drivers/spi/spi-pl022.c
> @@@ -910,11 -908,11 +910,9 @@@ static int configure_dma(struct pl022 *
>   {
>         struct dma_slave_config rx_conf = {
>                 .src_addr = SSP_DR(pl022->phybase),
> +			.direction = DMA_TO_DEVICE,
>         };
>         struct dma_slave_config tx_conf = {
>                 .dst_addr = SSP_DR(pl022->phybase),
>                 .direction = DMA_TO_DEVICE,
>  -              .dst_maxburst = pl022->vendor->fifodepth >> 1,
>         };
>         unsigned int pages;
>         int ret;
> 
Grant, Russell,
Can you please ack this fix before I apply in my tree to resolve this conflict

~Vinod

Re: linux-next: manual merge of the slave-dma tree with Linus' tree

[Koul, Vinod]

On Wed, 2011-07-27 at 12:08 +1000, Stephen Rothwell wrote:
> Hi Vinod,
> 
> Today's linux-next merge of the slave-dma tree got a conflict in
> drivers/spi/spi-pl022.c (called drivers/spi/amba-pl022.c in the sleav-dma
> tree) between commit 083be3f05371 ("spi/pl022: initialize burstsize from
> FIFO trigger level") from Linus' tree and commit 001b0585ff16 ("Improve
> slave/cyclic DMA engine documentation") from the slave-dma tree.
> 
> I fixed it up (see below) anc acn carry the fix as necessary.

The correct fix would be:

diff --cc drivers/spi/spi-pl022.c
index eba88c7,99e7880..0000000
--- a/drivers/spi/spi-pl022.c
+++ b/drivers/spi/spi-pl022.c
@@@ -910,11 -908,11 +910,9 @@@ static int configure_dma(struct pl022 *
  {
        struct dma_slave_config rx_conf = {
                .src_addr = SSP_DR(pl022->phybase),
+		.direction = DMA_TO_DEVICE,
        };
        struct dma_slave_config tx_conf = {
                .dst_addr = SSP_DR(pl022->phybase),
                .direction = DMA_TO_DEVICE,
 -              .dst_maxburst = pl022->vendor->fifodepth >> 1,
        };
        unsigned int pages;
        int ret;

For now the direction flags remains to be set and checked is in both
tree so should not cause conflict.
I will rebase my tree tonight to 3.0, that should resolve conflict as
well

-- 
~Vinod

linux-next: manual merge of the slave-dma tree with Linus' tree

[Stephen Rothwell]

Hi Vinod,

Today's linux-next merge of the slave-dma tree got a conflict in
drivers/spi/spi-pl022.c (called drivers/spi/amba-pl022.c in the sleav-dma
tree) between commit 083be3f05371 ("spi/pl022: initialize burstsize from
FIFO trigger level") from Linus' tree and commit 001b0585ff16 ("Improve
slave/cyclic DMA engine documentation") from the slave-dma tree.

I fixed it up (see below) anc acn carry the fix as necessary.
-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/

diff --cc drivers/spi/spi-pl022.c
index eba88c7,99e7880..0000000
--- a/drivers/spi/spi-pl022.c
+++ b/drivers/spi/spi-pl022.c
@@@ -910,11 -908,11 +910,9 @@@ static int configure_dma(struct pl022 *
  {
  	struct dma_slave_config rx_conf = {
  		.src_addr = SSP_DR(pl022->phybase),
  	};
  	struct dma_slave_config tx_conf = {
  		.dst_addr = SSP_DR(pl022->phybase),
- 		.direction = DMA_TO_DEVICE,
 -		.dst_maxburst = pl022->vendor->fifodepth >> 1,
  	};
  	unsigned int pages;
  	int ret;