Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history 
yaml
---
r: 270588
b: refs/heads/master
c: be4ff96
h: refs/heads/master
v: v3
  • Loading branch information
Ben Gardiner authored and Mark Brown committed Sep 16, 2011
1 parent a6aa1ae commit e88b19b
Show file tree
Hide file tree
Showing 2 changed files with 60 additions and 65 deletions.
2 changes: 1 addition & 1 deletion [refs]
View file
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 8a386ca26d51d477729f2b54e9d81bd97da4467e
refs/heads/master: be4ff9612271ac63e16bb2a8e6666e62538b60ea
123 changes: 59 additions & 64 deletions trunk/sound/soc/davinci/davinci-pcm.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -180,7 +180,6 @@ static void davinci_pcm_enqueue_dma(struct snd_pcm_substream *substream)
{
struct davinci_runtime_data *prtd = substream->runtime->private_data;
struct snd_pcm_runtime *runtime = substream->runtime;
int link = prtd->asp_link[0];
unsigned int period_size;
unsigned int dma_offset;
dma_addr_t dma_pos;
Expand All @@ -198,7 +197,8 @@ static void davinci_pcm_enqueue_dma(struct snd_pcm_substream *substream)
fifo_level = prtd->params->fifo_level;

pr_debug("davinci_pcm: audio_set_dma_params_play channel = %d "
"dma_ptr = %x period_size=%x\n", link, dma_pos, period_size);
"dma_ptr = %x period_size=%x\n", prtd->asp_link[0], dma_pos,
period_size);

data_type = prtd->params->data_type;
count = period_size / data_type;
Expand All @@ -222,17 +222,19 @@ static void davinci_pcm_enqueue_dma(struct snd_pcm_substream *substream)
}

acnt = prtd->params->acnt;
edma_set_src(link, src, INCR, W8BIT);
edma_set_dest(link, dst, INCR, W8BIT);
edma_set_src(prtd->asp_link[0], src, INCR, W8BIT);
edma_set_dest(prtd->asp_link[0], dst, INCR, W8BIT);

edma_set_src_index(link, src_bidx, src_cidx);
edma_set_dest_index(link, dst_bidx, dst_cidx);
edma_set_src_index(prtd->asp_link[0], src_bidx, src_cidx);
edma_set_dest_index(prtd->asp_link[0], dst_bidx, dst_cidx);

if (!fifo_level)
edma_set_transfer_params(link, acnt, count, 1, 0, ASYNC);
edma_set_transfer_params(prtd->asp_link[0], acnt, count, 1, 0,
ASYNC);
else
edma_set_transfer_params(link, acnt, fifo_level, count,
fifo_level, ABSYNC);
edma_set_transfer_params(prtd->asp_link[0], acnt, fifo_level,
count, fifo_level,
ABSYNC);
}

static void davinci_pcm_dma_irq(unsigned link, u16 ch_status, void *data)
Expand Down Expand Up @@ -305,7 +307,6 @@ static int ping_pong_dma_setup(struct snd_pcm_substream *substream)
unsigned int acnt = params->acnt;
/* divide by 2 for ping/pong */
unsigned int ping_size = snd_pcm_lib_period_bytes(substream) >> 1;
int link = prtd->asp_link[1];
unsigned int fifo_level = prtd->params->fifo_level;
unsigned int count;
if ((data_type == 0) || (data_type > 4)) {
Expand All @@ -316,28 +317,26 @@ static int ping_pong_dma_setup(struct snd_pcm_substream *substream)
dma_addr_t asp_src_pong = iram_dma->addr + ping_size;
ram_src_cidx = ping_size;
ram_dst_cidx = -ping_size;
edma_set_src(link, asp_src_pong, INCR, W8BIT);
edma_set_src(prtd->asp_link[1], asp_src_pong, INCR, W8BIT);

link = prtd->asp_link[0];
edma_set_src_index(link, data_type, data_type * fifo_level);
link = prtd->asp_link[1];
edma_set_src_index(link, data_type, data_type * fifo_level);
edma_set_src_index(prtd->asp_link[0], data_type,
data_type * fifo_level);
edma_set_src_index(prtd->asp_link[1], data_type,
data_type * fifo_level);

link = prtd->ram_link;
edma_set_src(link, runtime->dma_addr, INCR, W32BIT);
edma_set_src(prtd->ram_link, runtime->dma_addr, INCR, W32BIT);
} else {
dma_addr_t asp_dst_pong = iram_dma->addr + ping_size;
ram_src_cidx = -ping_size;
ram_dst_cidx = ping_size;
edma_set_dest(link, asp_dst_pong, INCR, W8BIT);
edma_set_dest(prtd->asp_link[1], asp_dst_pong, INCR, W8BIT);

link = prtd->asp_link[0];
edma_set_dest_index(link, data_type, data_type * fifo_level);
link = prtd->asp_link[1];
edma_set_dest_index(link, data_type, data_type * fifo_level);
edma_set_dest_index(prtd->asp_link[0], data_type,
data_type * fifo_level);
edma_set_dest_index(prtd->asp_link[1], data_type,
data_type * fifo_level);

link = prtd->ram_link;
edma_set_dest(link, runtime->dma_addr, INCR, W32BIT);
edma_set_dest(prtd->ram_link, runtime->dma_addr, INCR, W32BIT);
}

if (!fifo_level) {
Expand All @@ -354,10 +353,9 @@ static int ping_pong_dma_setup(struct snd_pcm_substream *substream)
count, fifo_level, ABSYNC);
}

link = prtd->ram_link;
edma_set_src_index(link, ping_size, ram_src_cidx);
edma_set_dest_index(link, ping_size, ram_dst_cidx);
edma_set_transfer_params(link, ping_size, 2,
edma_set_src_index(prtd->ram_link, ping_size, ram_src_cidx);
edma_set_dest_index(prtd->ram_link, ping_size, ram_dst_cidx);
edma_set_transfer_params(prtd->ram_link, ping_size, 2,
runtime->periods, 2, ASYNC);

/* init master params */
Expand Down Expand Up @@ -406,32 +404,32 @@ static int request_ping_pong(struct snd_pcm_substream *substream,
{
dma_addr_t asp_src_ping;
dma_addr_t asp_dst_ping;
int link;
int ret;
struct davinci_pcm_dma_params *params = prtd->params;

/* Request ram master channel */
link = prtd->ram_channel = edma_alloc_channel(EDMA_CHANNEL_ANY,
ret = prtd->ram_channel = edma_alloc_channel(EDMA_CHANNEL_ANY,
davinci_pcm_dma_irq, substream,
prtd->params->ram_chan_q);
if (link < 0)
if (ret < 0)
goto exit1;

/* Request ram link channel */
link = prtd->ram_link = edma_alloc_slot(
ret = prtd->ram_link = edma_alloc_slot(
EDMA_CTLR(prtd->ram_channel), EDMA_SLOT_ANY);
if (link < 0)
if (ret < 0)
goto exit2;

link = prtd->asp_link[1] = edma_alloc_slot(
ret = prtd->asp_link[1] = edma_alloc_slot(
EDMA_CTLR(prtd->asp_channel), EDMA_SLOT_ANY);
if (link < 0)
if (ret < 0)
goto exit3;

prtd->ram_link2 = -1;
if (substream->stream == SNDRV_PCM_STREAM_PLAYBACK) {
link = prtd->ram_link2 = edma_alloc_slot(
ret = prtd->ram_link2 = edma_alloc_slot(
EDMA_CTLR(prtd->ram_channel), EDMA_SLOT_ANY);
if (link < 0)
if (ret < 0)
goto exit4;
}
/* circle ping-pong buffers */
Expand All @@ -448,36 +446,33 @@ static int request_ping_pong(struct snd_pcm_substream *substream,
asp_dst_ping = iram_dma->addr;
}
/* ping */
link = prtd->asp_link[0];
edma_set_src(link, asp_src_ping, INCR, W16BIT);
edma_set_dest(link, asp_dst_ping, INCR, W16BIT);
edma_set_src_index(link, 0, 0);
edma_set_dest_index(link, 0, 0);
edma_set_src(prtd->asp_link[0], asp_src_ping, INCR, W16BIT);
edma_set_dest(prtd->asp_link[0], asp_dst_ping, INCR, W16BIT);
edma_set_src_index(prtd->asp_link[0], 0, 0);
edma_set_dest_index(prtd->asp_link[0], 0, 0);

edma_read_slot(link, &prtd->asp_params);
edma_read_slot(prtd->asp_link[0], &prtd->asp_params);
prtd->asp_params.opt &= ~(TCCMODE | EDMA_TCC(0x3f) | TCINTEN);
prtd->asp_params.opt |= TCCHEN |
EDMA_TCC(prtd->ram_channel & 0x3f);
edma_write_slot(link, &prtd->asp_params);
edma_write_slot(prtd->asp_link[0], &prtd->asp_params);

/* pong */
link = prtd->asp_link[1];
edma_set_src(link, asp_src_ping, INCR, W16BIT);
edma_set_dest(link, asp_dst_ping, INCR, W16BIT);
edma_set_src_index(link, 0, 0);
edma_set_dest_index(link, 0, 0);
edma_set_src(prtd->asp_link[1], asp_src_ping, INCR, W16BIT);
edma_set_dest(prtd->asp_link[1], asp_dst_ping, INCR, W16BIT);
edma_set_src_index(prtd->asp_link[1], 0, 0);
edma_set_dest_index(prtd->asp_link[1], 0, 0);

edma_read_slot(link, &prtd->asp_params);
edma_read_slot(prtd->asp_link[1], &prtd->asp_params);
prtd->asp_params.opt &= ~(TCCMODE | EDMA_TCC(0x3f));
/* interrupt after every pong completion */
prtd->asp_params.opt |= TCINTEN | TCCHEN |
EDMA_TCC(prtd->ram_channel & 0x3f);
edma_write_slot(link, &prtd->asp_params);
edma_write_slot(prtd->asp_link[1], &prtd->asp_params);

/* ram */
link = prtd->ram_link;
edma_set_src(link, iram_dma->addr, INCR, W32BIT);
edma_set_dest(link, iram_dma->addr, INCR, W32BIT);
edma_set_src(prtd->ram_link, iram_dma->addr, INCR, W32BIT);
edma_set_dest(prtd->ram_link, iram_dma->addr, INCR, W32BIT);
pr_debug("%s: audio dma channels/slots in use for ram:%u %u %u,"
"for asp:%u %u %u\n", __func__,
prtd->ram_channel, prtd->ram_link, prtd->ram_link2,
Expand All @@ -494,30 +489,30 @@ static int request_ping_pong(struct snd_pcm_substream *substream,
edma_free_channel(prtd->ram_channel);
prtd->ram_channel = -1;
exit1:
return link;
return ret;
}

static int davinci_pcm_dma_request(struct snd_pcm_substream *substream)
{
struct snd_dma_buffer *iram_dma;
struct davinci_runtime_data *prtd = substream->runtime->private_data;
struct davinci_pcm_dma_params *params = prtd->params;
int link;
int ret;

if (!params)
return -ENODEV;

/* Request asp master DMA channel */
link = prtd->asp_channel = edma_alloc_channel(params->channel,
ret = prtd->asp_channel = edma_alloc_channel(params->channel,
davinci_pcm_dma_irq, substream,
prtd->params->asp_chan_q);
if (link < 0)
if (ret < 0)
goto exit1;

/* Request asp link channels */
link = prtd->asp_link[0] = edma_alloc_slot(
ret = prtd->asp_link[0] = edma_alloc_slot(
EDMA_CTLR(prtd->asp_channel), EDMA_SLOT_ANY);
if (link < 0)
if (ret < 0)
goto exit2;

iram_dma = (struct snd_dma_buffer *)substream->dma_buffer.private_data;
Expand All @@ -537,17 +532,17 @@ static int davinci_pcm_dma_request(struct snd_pcm_substream *substream)
* the buffer and its length (ccnt) ... use it as a template
* so davinci_pcm_enqueue_dma() takes less time in IRQ.
*/
edma_read_slot(link, &prtd->asp_params);
edma_read_slot(prtd->asp_link[0], &prtd->asp_params);
prtd->asp_params.opt |= TCINTEN |
EDMA_TCC(EDMA_CHAN_SLOT(prtd->asp_channel));
prtd->asp_params.link_bcntrld = EDMA_CHAN_SLOT(link) << 5;
edma_write_slot(link, &prtd->asp_params);
prtd->asp_params.link_bcntrld = EDMA_CHAN_SLOT(prtd->asp_link[0]) << 5;
edma_write_slot(prtd->asp_link[0], &prtd->asp_params);
return 0;
exit2:
edma_free_channel(prtd->asp_channel);
prtd->asp_channel = -1;
exit1:
return link;
return ret;
}

static int davinci_pcm_trigger(struct snd_pcm_substream *substream, int cmd)
Expand Down

0 comments on commit e88b19b

Please sign in to comment.