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

Commit 54f8d501 authored by Bartlomiej Zolnierkiewicz's avatar Bartlomiej Zolnierkiewicz Committed by Dan Williams
Browse files

dmaengine: remove DMA unmap from drivers 



Remove support for DMA unmapping from drivers as it is no longer
needed (DMA core code is now handling it).

Cc: Vinod Koul <vinod.koul@intel.com>
Cc: Tomasz Figa <t.figa@samsung.com>
Cc: Dave Jiang <dave.jiang@intel.com>
Signed-off-by: default avatarBartlomiej Zolnierkiewicz <b.zolnierkie@samsung.com>
Signed-off-by: default avatarKyungmin Park <kyungmin.park@samsung.com>
[djbw: fix up chan2parent() unused warning in drivers/dma/dw/core.c]
Signed-off-by: default avatarDan Williams <dan.j.williams@intel.com>
parent 6f57fd05

arch/arm/include/asm/hardware/iop3xx-adma.h

+0 −30
Original line number Diff line number Diff line
@@ -393,36 +393,6 @@ static inline int iop_chan_zero_sum_slot_count(size_t len, int src_cnt, 
	return slot_cnt;

}



static inline int iop_desc_is_pq(struct iop_adma_desc_slot *desc)

{

	return 0;

}



static inline u32 iop_desc_get_dest_addr(struct iop_adma_desc_slot *desc,

					struct iop_adma_chan *chan)

{

	union iop3xx_desc hw_desc = { .ptr = desc->hw_desc, };



	switch (chan->device->id) {

	case DMA0_ID:

	case DMA1_ID:

		return hw_desc.dma->dest_addr;

	case AAU_ID:

		return hw_desc.aau->dest_addr;

	default:

		BUG();

	}

	return 0;

}





static inline u32 iop_desc_get_qdest_addr(struct iop_adma_desc_slot *desc,

					  struct iop_adma_chan *chan)

{

	BUG();

	return 0;

}



static inline u32 iop_desc_get_byte_count(struct iop_adma_desc_slot *desc,

					struct iop_adma_chan *chan)

{

arch/arm/include/asm/hardware/iop_adma.h

+0 −4
Original line number Diff line number Diff line
@@ -82,8 +82,6 @@ struct iop_adma_chan { 
 * @slot_cnt: total slots used in an transaction (group of operations)

 * @slots_per_op: number of slots per operation

 * @idx: pool index

 * @unmap_src_cnt: number of xor sources

 * @unmap_len: transaction bytecount

 * @tx_list: list of descriptors that are associated with one operation

 * @async_tx: support for the async_tx api

 * @group_list: list of slots that make up a multi-descriptor transaction
@@ -99,8 +97,6 @@ struct iop_adma_desc_slot { 
	u16 slot_cnt;

	u16 slots_per_op;

	u16 idx;

	u16 unmap_src_cnt;

	size_t unmap_len;

	struct list_head tx_list;

	struct dma_async_tx_descriptor async_tx;

	union {

arch/arm/mach-iop13xx/include/mach/adma.h

+0 −26
Original line number Diff line number Diff line
@@ -218,20 +218,6 @@ iop_chan_xor_slot_count(size_t len, int src_cnt, int *slots_per_op) 
#define iop_chan_pq_slot_count iop_chan_xor_slot_count

#define iop_chan_pq_zero_sum_slot_count iop_chan_xor_slot_count



static inline u32 iop_desc_get_dest_addr(struct iop_adma_desc_slot *desc,

					struct iop_adma_chan *chan)

{

	struct iop13xx_adma_desc_hw *hw_desc = desc->hw_desc;

	return hw_desc->dest_addr;

}



static inline u32 iop_desc_get_qdest_addr(struct iop_adma_desc_slot *desc,

					  struct iop_adma_chan *chan)

{

	struct iop13xx_adma_desc_hw *hw_desc = desc->hw_desc;

	return hw_desc->q_dest_addr;

}



static inline u32 iop_desc_get_byte_count(struct iop_adma_desc_slot *desc,

					struct iop_adma_chan *chan)

{
@@ -350,18 +336,6 @@ iop_desc_init_pq(struct iop_adma_desc_slot *desc, int src_cnt, 
	hw_desc->desc_ctrl = u_desc_ctrl.value;

}



static inline int iop_desc_is_pq(struct iop_adma_desc_slot *desc)

{

	struct iop13xx_adma_desc_hw *hw_desc = desc->hw_desc;

	union {

		u32 value;

		struct iop13xx_adma_desc_ctrl field;

	} u_desc_ctrl;



	u_desc_ctrl.value = hw_desc->desc_ctrl;

	return u_desc_ctrl.field.pq_xfer_en;

}



static inline void

iop_desc_init_pq_zero_sum(struct iop_adma_desc_slot *desc, int src_cnt,

			  unsigned long flags)

drivers/dma/amba-pl08x.c

+0 −31
Original line number Diff line number Diff line
@@ -1164,43 +1164,12 @@ static void pl08x_free_txd(struct pl08x_driver_data *pl08x, 
	kfree(txd);

}



static void pl08x_unmap_buffers(struct pl08x_txd *txd)

{

	struct device *dev = txd->vd.tx.chan->device->dev;

	struct pl08x_sg *dsg;



	if (!(txd->vd.tx.flags & DMA_COMPL_SKIP_SRC_UNMAP)) {

		if (txd->vd.tx.flags & DMA_COMPL_SRC_UNMAP_SINGLE)

			list_for_each_entry(dsg, &txd->dsg_list, node)

				dma_unmap_single(dev, dsg->src_addr, dsg->len,

						DMA_TO_DEVICE);

		else {

			list_for_each_entry(dsg, &txd->dsg_list, node)

				dma_unmap_page(dev, dsg->src_addr, dsg->len,

						DMA_TO_DEVICE);

		}

	}

	if (!(txd->vd.tx.flags & DMA_COMPL_SKIP_DEST_UNMAP)) {

		if (txd->vd.tx.flags & DMA_COMPL_DEST_UNMAP_SINGLE)

			list_for_each_entry(dsg, &txd->dsg_list, node)

				dma_unmap_single(dev, dsg->dst_addr, dsg->len,

						DMA_FROM_DEVICE);

		else

			list_for_each_entry(dsg, &txd->dsg_list, node)

				dma_unmap_page(dev, dsg->dst_addr, dsg->len,

						DMA_FROM_DEVICE);

	}

}



static void pl08x_desc_free(struct virt_dma_desc *vd)

{

	struct pl08x_txd *txd = to_pl08x_txd(&vd->tx);

	struct pl08x_dma_chan *plchan = to_pl08x_chan(vd->tx.chan);



	dma_descriptor_unmap(txd);

	if (!plchan->slave)

		pl08x_unmap_buffers(txd);



	if (!txd->done)

		pl08x_release_mux(plchan);

drivers/dma/at_hdmac.c

+0 −25
Original line number Diff line number Diff line
@@ -344,32 +344,7 @@ atc_chain_complete(struct at_dma_chan *atchan, struct at_desc *desc) 
	/* move myself to free_list */

	list_move(&desc->desc_node, &atchan->free_list);



	/* unmap dma addresses (not on slave channels) */

	dma_descriptor_unmap(txd);

	if (!atchan->chan_common.private) {

		struct device *parent = chan2parent(&atchan->chan_common);

		if (!(txd->flags & DMA_COMPL_SKIP_DEST_UNMAP)) {

			if (txd->flags & DMA_COMPL_DEST_UNMAP_SINGLE)

				dma_unmap_single(parent,

						desc->lli.daddr,

						desc->len, DMA_FROM_DEVICE);

			else

				dma_unmap_page(parent,

						desc->lli.daddr,

						desc->len, DMA_FROM_DEVICE);

		}

		if (!(txd->flags & DMA_COMPL_SKIP_SRC_UNMAP)) {

			if (txd->flags & DMA_COMPL_SRC_UNMAP_SINGLE)

				dma_unmap_single(parent,

						desc->lli.saddr,

						desc->len, DMA_TO_DEVICE);

			else

				dma_unmap_page(parent,

						desc->lli.saddr,

						desc->len, DMA_TO_DEVICE);

		}

	}



	/* for cyclic transfers,

	 * no need to replay callback function while stopping */

	if (!atc_chan_is_cyclic(atchan)) {