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

Commit 893e63e3 authored by Russell King's avatar Russell King
Browse files

dmaengine: omap-dma: improve efficiency loading C.SA/C.EI/C.FI registers 



The only thing which changes is which registers are written, so put this
in local variables instead.  This results in smaller code.

Acked-by: default avatarTony Lindgren <tony@atomide.com>
Acked-by: default avatarVinod Koul <vinod.koul@intel.com>
Signed-off-by: default avatarRussell King <rmk+kernel@arm.linux.org.uk>
parent 470b23f7

drivers/dma/omap-dma.c

+20 −12
Original line number Diff line number Diff line
@@ -275,17 +275,21 @@ static void omap_dma_start_sg(struct omap_chan *c, struct omap_desc *d, 
	unsigned idx)

{

	struct omap_sg *sg = d->sg + idx;

	unsigned cxsa, cxei, cxfi;



	if (d->dir == DMA_DEV_TO_MEM) {

		c->plat->dma_write(sg->addr, CDSA, c->dma_ch);

		c->plat->dma_write(0, CDEI, c->dma_ch);

		c->plat->dma_write(0, CDFI, c->dma_ch);

		cxsa = CDSA;

		cxei = CDEI;

		cxfi = CDFI;

	} else {

		c->plat->dma_write(sg->addr, CSSA, c->dma_ch);

		c->plat->dma_write(0, CSEI, c->dma_ch);

		c->plat->dma_write(0, CSFI, c->dma_ch);

		cxsa = CSSA;

		cxei = CSEI;

		cxfi = CSFI;

	}



	c->plat->dma_write(sg->addr, cxsa, c->dma_ch);

	c->plat->dma_write(0, cxei, c->dma_ch);

	c->plat->dma_write(0, cxfi, c->dma_ch);

	c->plat->dma_write(sg->en, CEN, c->dma_ch);

	c->plat->dma_write(sg->fn, CFN, c->dma_ch);
@@ -296,6 +300,7 @@ static void omap_dma_start_desc(struct omap_chan *c) 
{

	struct virt_dma_desc *vd = vchan_next_desc(&c->vc);

	struct omap_desc *d;

	unsigned cxsa, cxei, cxfi;



	if (!vd) {

		c->desc = NULL;
@@ -312,15 +317,18 @@ static void omap_dma_start_desc(struct omap_chan *c) 
		c->plat->dma_write(d->ccr >> 16, CCR2, c->dma_ch);



	if (d->dir == DMA_DEV_TO_MEM) {

		c->plat->dma_write(d->dev_addr, CSSA, c->dma_ch);

		c->plat->dma_write(0, CSEI, c->dma_ch);

		c->plat->dma_write(d->fi, CSFI, c->dma_ch);

		cxsa = CSSA;

		cxei = CSEI;

		cxfi = CSFI;

	} else {

		c->plat->dma_write(d->dev_addr, CDSA, c->dma_ch);

		c->plat->dma_write(0, CDEI, c->dma_ch);

		c->plat->dma_write(d->fi, CDFI, c->dma_ch);

		cxsa = CDSA;

		cxei = CDEI;

		cxfi = CDFI;

	}



	c->plat->dma_write(d->dev_addr, cxsa, c->dma_ch);

	c->plat->dma_write(0, cxei, c->dma_ch);

	c->plat->dma_write(d->fi, cxfi, c->dma_ch);

	c->plat->dma_write(d->csdp, CSDP, c->dma_ch);



	omap_dma_start_sg(c, d, 0);