Commit cdae05a0 authored by Thomas Gleixner's avatar Thomas Gleixner Committed by Vinod Koul

dmaengine: edma: Make reading the position of active channels work

As Joel pointed out, edma_read_position() uses memcpy_fromio() to read
the parameter ram. That's not synchronized with the internal update as
it does a byte by byte copy. We need to do a 32bit read to get a
consistent value.

Further reading destination and source is pointless. In DEV_TO_MEM
transfers we are only interested in the destination, in MEM_TO_DEV we
care about the source. In MEM_TO_MEM it really does not matter which
one you read.

Simple solution: Remove the pointers, select dest/source via a bool
and return the read value.

Remove the export of this function while at it. The only potential
user is the dmaengine and that's always builtin.
Signed-off-by: default avatarThomas Gleixner <tglx@linutronix.de>
Acked-by: default avatarSekhar Nori <nsekhar@ti.com>
Signed-off-by: default avatarJoel Fernandes <joelf@ti.com>
Signed-off-by: default avatarVinod Koul <vinod.koul@intel.com>
parent c2da2340
...@@ -994,29 +994,23 @@ void edma_set_dest(unsigned slot, dma_addr_t dest_port, ...@@ -994,29 +994,23 @@ void edma_set_dest(unsigned slot, dma_addr_t dest_port,
EXPORT_SYMBOL(edma_set_dest); EXPORT_SYMBOL(edma_set_dest);
/** /**
* edma_get_position - returns the current transfer points * edma_get_position - returns the current transfer point
* @slot: parameter RAM slot being examined * @slot: parameter RAM slot being examined
* @src: pointer to source port position * @dst: true selects the dest position, false the source
* @dst: pointer to destination port position
* *
* Returns current source and destination addresses for a particular * Returns the position of the current active slot
* parameter RAM slot. Its channel should not be active when this is called.
*/ */
void edma_get_position(unsigned slot, dma_addr_t *src, dma_addr_t *dst) dma_addr_t edma_get_position(unsigned slot, bool dst)
{ {
struct edmacc_param temp; u32 offs, ctlr = EDMA_CTLR(slot);
unsigned ctlr;
ctlr = EDMA_CTLR(slot);
slot = EDMA_CHAN_SLOT(slot); slot = EDMA_CHAN_SLOT(slot);
edma_read_slot(EDMA_CTLR_CHAN(ctlr, slot), &temp); offs = PARM_OFFSET(slot);
if (src != NULL) offs += dst ? PARM_DST : PARM_SRC;
*src = temp.src;
if (dst != NULL) return edma_read(ctlr, offs);
*dst = temp.dst;
} }
EXPORT_SYMBOL(edma_get_position);
/** /**
* edma_set_src_index - configure DMA source address indexing * edma_set_src_index - configure DMA source address indexing
......
...@@ -130,7 +130,7 @@ void edma_set_src(unsigned slot, dma_addr_t src_port, ...@@ -130,7 +130,7 @@ void edma_set_src(unsigned slot, dma_addr_t src_port,
enum address_mode mode, enum fifo_width); enum address_mode mode, enum fifo_width);
void edma_set_dest(unsigned slot, dma_addr_t dest_port, void edma_set_dest(unsigned slot, dma_addr_t dest_port,
enum address_mode mode, enum fifo_width); enum address_mode mode, enum fifo_width);
void edma_get_position(unsigned slot, dma_addr_t *src, dma_addr_t *dst); dma_addr_t edma_get_position(unsigned slot, bool dst);
void edma_set_src_index(unsigned slot, s16 src_bidx, s16 src_cidx); void edma_set_src_index(unsigned slot, s16 src_bidx, s16 src_cidx);
void edma_set_dest_index(unsigned slot, s16 dest_bidx, s16 dest_cidx); void edma_set_dest_index(unsigned slot, s16 dest_bidx, s16 dest_cidx);
void edma_set_transfer_params(unsigned slot, u16 acnt, u16 bcnt, u16 ccnt, void edma_set_transfer_params(unsigned slot, u16 acnt, u16 bcnt, u16 ccnt,
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment