hollalinux
/
linux-sg2042
mirror of https://github.com/sophgo/linux-riscv.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

DMA: PL08x: separately store source/destination cctl 

Store the source/destination cctl values into the channel structure.
This moves us towards being able to avoid a configuration call each
time we use the channel.

Acked-by: Linus Walleij <linus.walleij@linaro.org>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
Signed-off-by: Vinod Koul <vinod.koul@intel.com>
This commit is contained in:
Russell King - ARM Linux 2011-07-21 17:12:47 +01:00 committed by Vinod Koul
parent b207b4d02b
commit f14c426c72
2 changed files with 18 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
drivers/dma/amba-pl08x.c
View File

@ -1095,12 +1095,21 @@ static const struct burst_table burst_sizes[] = {
}, },
}; };
static u32 pl08x_cctl(u32 cctl)
{
cctl &= ~(PL080_CONTROL_SRC_AHB2 | PL080_CONTROL_DST_AHB2 |
PL080_CONTROL_SRC_INCR | PL080_CONTROL_DST_INCR |
PL080_CONTROL_PROT_MASK);
/* Access the cell in privileged mode, non-bufferable, non-cacheable */
return cctl | PL080_CONTROL_PROT_SYS;
}
static int dma_set_runtime_config(struct dma_chan *chan, static int dma_set_runtime_config(struct dma_chan *chan,
struct dma_slave_config *config) struct dma_slave_config *config)
{ {
struct pl08x_dma_chan *plchan = to_pl08x_chan(chan); struct pl08x_dma_chan *plchan = to_pl08x_chan(chan);
struct pl08x_driver_data *pl08x = plchan->host; struct pl08x_driver_data *pl08x = plchan->host;
struct pl08x_channel_data *cd = plchan->cd;
enum dma_slave_buswidth addr_width; enum dma_slave_buswidth addr_width;
u32 maxburst; u32 maxburst;
u32 cctl = 0; u32 cctl = 0;
@ -1160,13 +1169,12 @@ static int dma_set_runtime_config(struct dma_chan *chan,
if (plchan->runtime_direction == DMA_FROM_DEVICE) { if (plchan->runtime_direction == DMA_FROM_DEVICE) {
plchan->src_addr = config->src_addr; plchan->src_addr = config->src_addr;
plchan->src_cctl = pl08x_cctl(cctl);
} else { } else {
plchan->dst_addr = config->dst_addr; plchan->dst_addr = config->dst_addr;
plchan->dst_cctl = pl08x_cctl(cctl);
} }
/* Modify the default channel data to fit PrimeCell request */
cd->cctl = cctl;
dev_dbg(&pl08x->adev->dev, dev_dbg(&pl08x->adev->dev,
"configured channel %s (%s) for %s, data width %d, " "configured channel %s (%s) for %s, data width %d, "
"maxburst %d words, LE, CCTL=0x%08x\n", "maxburst %d words, LE, CCTL=0x%08x\n",
@ -1385,24 +1393,16 @@ static struct dma_async_tx_descriptor *pl08x_prep_slave_sg(
txd->direction = direction; txd->direction = direction;
txd->len = sgl->length; txd->len = sgl->length;
txd->cctl = plchan->cd->cctl &
~(PL080_CONTROL_SRC_AHB2 | PL080_CONTROL_DST_AHB2 |
PL080_CONTROL_SRC_INCR | PL080_CONTROL_DST_INCR |
PL080_CONTROL_PROT_MASK);
/* Access the cell in privileged mode, non-bufferable, non-cacheable */
txd->cctl |= PL080_CONTROL_PROT_SYS;
if (direction == DMA_TO_DEVICE) { if (direction == DMA_TO_DEVICE) {
txd->ccfg |= PL080_FLOW_MEM2PER << PL080_CONFIG_FLOW_CONTROL_SHIFT; txd->ccfg |= PL080_FLOW_MEM2PER << PL080_CONFIG_FLOW_CONTROL_SHIFT;
txd->cctl |= PL080_CONTROL_SRC_INCR; txd->cctl = plchan->dst_cctl | PL080_CONTROL_SRC_INCR;
txd->src_addr = sgl->dma_address; txd->src_addr = sgl->dma_address;
txd->dst_addr = plchan->dst_addr; txd->dst_addr = plchan->dst_addr;
src_buses = pl08x->mem_buses; src_buses = pl08x->mem_buses;
dst_buses = plchan->cd->periph_buses; dst_buses = plchan->cd->periph_buses;
} else if (direction == DMA_FROM_DEVICE) { } else if (direction == DMA_FROM_DEVICE) {
txd->ccfg |= PL080_FLOW_PER2MEM << PL080_CONFIG_FLOW_CONTROL_SHIFT; txd->ccfg |= PL080_FLOW_PER2MEM << PL080_CONFIG_FLOW_CONTROL_SHIFT;
txd->cctl |= PL080_CONTROL_DST_INCR; txd->cctl = plchan->src_cctl | PL080_CONTROL_DST_INCR;
txd->src_addr = plchan->src_addr; txd->src_addr = plchan->src_addr;
txd->dst_addr = sgl->dma_address; txd->dst_addr = sgl->dma_address;
src_buses = plchan->cd->periph_buses; src_buses = plchan->cd->periph_buses;
@ -1701,6 +1701,8 @@ static int pl08x_dma_init_virtual_channels(struct pl08x_driver_data *pl08x,
chan->cd = &pl08x->pd->slave_channels[i]; chan->cd = &pl08x->pd->slave_channels[i];
chan->src_addr = chan->cd->addr; chan->src_addr = chan->cd->addr;
chan->dst_addr = chan->cd->addr; chan->dst_addr = chan->cd->addr;
chan->src_cctl = pl08x_cctl(chan->cd->cctl);
chan->dst_cctl = pl08x_cctl(chan->cd->cctl);
} else { } else {
chan->cd = &pl08x->pd->memcpy_channel; chan->cd = &pl08x->pd->memcpy_channel;
chan->name = kasprintf(GFP_KERNEL, "memcpy%d", i); chan->name = kasprintf(GFP_KERNEL, "memcpy%d", i);

2
include/linux/amba/pl08x.h
View File

@ -175,6 +175,8 @@ struct pl08x_dma_chan {
struct pl08x_channel_data *cd; struct pl08x_channel_data *cd;
dma_addr_t src_addr; dma_addr_t src_addr;
dma_addr_t dst_addr; dma_addr_t dst_addr;
u32 src_cctl;
u32 dst_cctl;
enum dma_data_direction runtime_direction; enum dma_data_direction runtime_direction;
dma_cookie_t lc; dma_cookie_t lc;
struct list_head pend_list; struct list_head pend_list;