Commit 86eaf54d authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'dmaengine-fix-4.4-rc2' of git://git.infradead.org/users/vkoul/slave-dma 

Pull dmaengine fixes from Vinod Koul:
 "This has odd fixes spreadout drivers, not major here

   - usbdmac fixes for pm
   - edma build and logic fixes
   - build warn fixes for few drivers"

* tag 'dmaengine-fix-4.4-rc2' of git://git.infradead.org/users/vkoul/slave-dma:
  dmaengine: at_hdmac: use %pad format string for dma_addr_t
  dmaengine: at_xdmac: use %pad format string for dma_addr_t
  dmaengine: imx-sdma: remove __init annotation on sdma_event_remap
  dmaengine: edma: predecence bug in GET_NUM_QDMACH()
  dmaengine: edma: fix build without CONFIG_OF
  dmaengine: of_dma: Correct return code for of_dma_request_slave_channel in case !CONFIG_OF
  dmaengine: sh: usb-dmac: Fix pm_runtime_{enable,disable}() imbalance
  dmaengine: sh: usb-dmac: Fix crash on runtime suspend
parents c69bde78 2c5d7407

drivers/dma/at_hdmac.c

+10 −10
Original line number Diff line number Diff line
@@ -729,8 +729,8 @@ atc_prep_dma_interleaved(struct dma_chan *chan, 
		return NULL;



	dev_info(chan2dev(chan),

		 "%s: src=0x%08x, dest=0x%08x, numf=%d, frame_size=%d, flags=0x%lx\n",

		__func__, xt->src_start, xt->dst_start, xt->numf,

		 "%s: src=%pad, dest=%pad, numf=%d, frame_size=%d, flags=0x%lx\n",

		__func__, &xt->src_start, &xt->dst_start, xt->numf,

		xt->frame_size, flags);



	/*
@@ -824,8 +824,8 @@ atc_prep_dma_memcpy(struct dma_chan *chan, dma_addr_t dest, dma_addr_t src, 
	u32			ctrla;

	u32			ctrlb;



	dev_vdbg(chan2dev(chan), "prep_dma_memcpy: d0x%x s0x%x l0x%zx f0x%lx\n",

			dest, src, len, flags);

	dev_vdbg(chan2dev(chan), "prep_dma_memcpy: d%pad s%pad l0x%zx f0x%lx\n",

			&dest, &src, len, flags);



	if (unlikely(!len)) {

		dev_dbg(chan2dev(chan), "prep_dma_memcpy: length is zero!\n");
@@ -938,8 +938,8 @@ atc_prep_dma_memset(struct dma_chan *chan, dma_addr_t dest, int value, 
	void __iomem		*vaddr;

	dma_addr_t		paddr;



	dev_vdbg(chan2dev(chan), "%s: d0x%x v0x%x l0x%zx f0x%lx\n", __func__,

		dest, value, len, flags);

	dev_vdbg(chan2dev(chan), "%s: d%pad v0x%x l0x%zx f0x%lx\n", __func__,

		&dest, value, len, flags);



	if (unlikely(!len)) {

		dev_dbg(chan2dev(chan), "%s: length is zero!\n", __func__);
@@ -1022,8 +1022,8 @@ atc_prep_dma_memset_sg(struct dma_chan *chan, 
		dma_addr_t dest = sg_dma_address(sg);

		size_t len = sg_dma_len(sg);



		dev_vdbg(chan2dev(chan), "%s: d0x%08x, l0x%zx\n",

			 __func__, dest, len);

		dev_vdbg(chan2dev(chan), "%s: d%pad, l0x%zx\n",

			 __func__, &dest, len);



		if (!is_dma_fill_aligned(chan->device, dest, 0, len)) {

			dev_err(chan2dev(chan), "%s: buffer is not aligned\n",
@@ -1439,9 +1439,9 @@ atc_prep_dma_cyclic(struct dma_chan *chan, dma_addr_t buf_addr, size_t buf_len, 
	unsigned int		periods = buf_len / period_len;

	unsigned int		i;



	dev_vdbg(chan2dev(chan), "prep_dma_cyclic: %s buf@0x%08x - %d (%d/%d)\n",

	dev_vdbg(chan2dev(chan), "prep_dma_cyclic: %s buf@%pad - %d (%d/%d)\n",

			direction == DMA_MEM_TO_DEV ? "TO DEVICE" : "FROM DEVICE",

			buf_addr,

			&buf_addr,

			periods, buf_len, period_len);



	if (unlikely(!atslave || !buf_len || !period_len)) {

drivers/dma/at_hdmac_regs.h

+3 −3
Original line number Diff line number Diff line
@@ -385,9 +385,9 @@ static void vdbg_dump_regs(struct at_dma_chan *atchan) {} 
static void atc_dump_lli(struct at_dma_chan *atchan, struct at_lli *lli)

{

	dev_crit(chan2dev(&atchan->chan_common),

		 "  desc: s0x%x d0x%x ctrl0x%x:0x%x l0x%x\n",

		 lli->saddr, lli->daddr,

		 lli->ctrla, lli->ctrlb, lli->dscr);

		 "  desc: s%pad d%pad ctrl0x%x:0x%x l0x%pad\n",

		 &lli->saddr, &lli->daddr,

		 lli->ctrla, lli->ctrlb, &lli->dscr);

}

drivers/dma/at_xdmac.c

+10 −10
Original line number Diff line number Diff line
@@ -920,8 +920,8 @@ at_xdmac_interleaved_queue_desc(struct dma_chan *chan, 
	desc->lld.mbr_cfg = chan_cc;



	dev_dbg(chan2dev(chan),

		"%s: lld: mbr_sa=0x%08x, mbr_da=0x%08x, mbr_ubc=0x%08x, mbr_cfg=0x%08x\n",

		__func__, desc->lld.mbr_sa, desc->lld.mbr_da,

		"%s: lld: mbr_sa=%pad, mbr_da=%pad, mbr_ubc=0x%08x, mbr_cfg=0x%08x\n",

		__func__, &desc->lld.mbr_sa, &desc->lld.mbr_da,

		desc->lld.mbr_ubc, desc->lld.mbr_cfg);



	/* Chain lld. */
@@ -953,8 +953,8 @@ at_xdmac_prep_interleaved(struct dma_chan *chan, 
	if ((xt->numf > 1) && (xt->frame_size > 1))

		return NULL;



	dev_dbg(chan2dev(chan), "%s: src=0x%08x, dest=0x%08x, numf=%d, frame_size=%d, flags=0x%lx\n",

		__func__, xt->src_start, xt->dst_start,	xt->numf,

	dev_dbg(chan2dev(chan), "%s: src=%pad, dest=%pad, numf=%d, frame_size=%d, flags=0x%lx\n",

		__func__, &xt->src_start, &xt->dst_start,	xt->numf,

		xt->frame_size, flags);



	src_addr = xt->src_start;
@@ -1179,8 +1179,8 @@ static struct at_xdmac_desc *at_xdmac_memset_create_desc(struct dma_chan *chan, 
	desc->lld.mbr_cfg = chan_cc;



	dev_dbg(chan2dev(chan),

		"%s: lld: mbr_da=0x%08x, mbr_ds=0x%08x, mbr_ubc=0x%08x, mbr_cfg=0x%08x\n",

		__func__, desc->lld.mbr_da, desc->lld.mbr_ds, desc->lld.mbr_ubc,

		"%s: lld: mbr_da=%pad, mbr_ds=%pad, mbr_ubc=0x%08x, mbr_cfg=0x%08x\n",

		__func__, &desc->lld.mbr_da, &desc->lld.mbr_ds, desc->lld.mbr_ubc,

		desc->lld.mbr_cfg);



	return desc;
@@ -1193,8 +1193,8 @@ at_xdmac_prep_dma_memset(struct dma_chan *chan, dma_addr_t dest, int value, 
	struct at_xdmac_chan	*atchan = to_at_xdmac_chan(chan);

	struct at_xdmac_desc	*desc;



	dev_dbg(chan2dev(chan), "%s: dest=0x%08x, len=%d, pattern=0x%x, flags=0x%lx\n",

		__func__, dest, len, value, flags);

	dev_dbg(chan2dev(chan), "%s: dest=%pad, len=%d, pattern=0x%x, flags=0x%lx\n",

		__func__, &dest, len, value, flags);



	if (unlikely(!len))

		return NULL;
@@ -1229,8 +1229,8 @@ at_xdmac_prep_dma_memset_sg(struct dma_chan *chan, struct scatterlist *sgl, 


	/* Prepare descriptors. */

	for_each_sg(sgl, sg, sg_len, i) {

		dev_dbg(chan2dev(chan), "%s: dest=0x%08x, len=%d, pattern=0x%x, flags=0x%lx\n",

			__func__, sg_dma_address(sg), sg_dma_len(sg),

		dev_dbg(chan2dev(chan), "%s: dest=%pad, len=%d, pattern=0x%x, flags=0x%lx\n",

			__func__, &sg_dma_address(sg), sg_dma_len(sg),

			value, flags);

		desc = at_xdmac_memset_create_desc(chan, atchan,

						   sg_dma_address(sg),

drivers/dma/edma.c

+2 −2
Original line number Diff line number Diff line
@@ -107,7 +107,7 @@ 


/* CCCFG register */

#define GET_NUM_DMACH(x)	(x & 0x7) /* bits 0-2 */

#define GET_NUM_QDMACH(x)	(x & 0x70 >> 4) /* bits 4-6 */

#define GET_NUM_QDMACH(x)	((x & 0x70) >> 4) /* bits 4-6 */

#define GET_NUM_PAENTRY(x)	((x & 0x7000) >> 12) /* bits 12-14 */

#define GET_NUM_EVQUE(x)	((x & 0x70000) >> 16) /* bits 16-18 */

#define GET_NUM_REGN(x)		((x & 0x300000) >> 20) /* bits 20-21 */
@@ -1565,7 +1565,7 @@ static void edma_tc_set_pm_state(struct edma_tc *tc, bool enable) 
	struct platform_device *tc_pdev;

	int ret;



	if (!tc)

	if (!IS_ENABLED(CONFIG_OF) || !tc)

		return;



	tc_pdev = of_find_device_by_node(tc->node);

drivers/dma/imx-sdma.c

+1 −1
Original line number Diff line number Diff line
@@ -1462,7 +1462,7 @@ err_firmware: 


#define EVENT_REMAP_CELLS 3



static int __init sdma_event_remap(struct sdma_engine *sdma)

static int sdma_event_remap(struct sdma_engine *sdma)

{

	struct device_node *np = sdma->dev->of_node;

	struct device_node *gpr_np = of_parse_phandle(np, "gpr", 0);

CRA Git | Maintained and supported by SUSTech CRA and CCSE