* [PATCH 0/4] ASoC: fsi: DMA support 1st step
@ 2010-09-16 4:33 Kuninori Morimoto
2010-09-16 4:34 ` [PATCH 1/4] ASoC: fsi: Add fsi_dma_get_area Kuninori Morimoto
` (3 more replies)
0 siblings, 4 replies; 7+ messages in thread
From: Kuninori Morimoto @ 2010-09-16 4:33 UTC (permalink / raw)
To: Mark Brown; +Cc: Linux-ALSA, Liam Girdwood
Dear Mark, Liam
These patches are 1st step for DMA support of FSI driver
Kuninori Morimoto (4):
ASoC: fsi: Add fsi_dma_get_area
ASoC: fsi: Add fsi_dma_soft_push/pop function
ASoC: fsi: modify variable name to easy to understand
ASoC: fsi: merge fsi_data_push/pop to fsi_fifo_data_ctrl
These patches didn't add new feature.
FSI driver is still using PIO.
And above patches indicate it as "soft dma".
I will add DMAEngine support for FSI in future
Best regards
--
Kuninori Morimoto
^ permalink raw reply [flat|nested] 7+ messages in thread
* [PATCH 1/4] ASoC: fsi: Add fsi_dma_get_area
2010-09-16 4:33 [PATCH 0/4] ASoC: fsi: DMA support 1st step Kuninori Morimoto
@ 2010-09-16 4:34 ` Kuninori Morimoto
2010-09-16 4:34 ` [PATCH 2/4] ASoC: fsi: Add fsi_dma_soft_push/pop function Kuninori Morimoto
` (2 subsequent siblings)
3 siblings, 0 replies; 7+ messages in thread
From: Kuninori Morimoto @ 2010-09-16 4:34 UTC (permalink / raw)
To: Mark Brown; +Cc: Linux-ALSA, Liam Girdwood
Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
---
sound/soc/sh/fsi.c | 11 +++++++----
1 files changed, 7 insertions(+), 4 deletions(-)
diff --git a/sound/soc/sh/fsi.c b/sound/soc/sh/fsi.c
index abc6d83..44a2b6e 100644
--- a/sound/soc/sh/fsi.c
+++ b/sound/soc/sh/fsi.c
@@ -357,6 +357,11 @@ static int fsi_get_fifo_residue(struct fsi_priv *fsi, int is_play)
return residue;
}
+static u8 *fsi_dma_get_area(struct fsi_priv *fsi)
+{
+ return fsi->substream->runtime->dma_area + fsi->byte_offset;
+}
+
/************************************************************************
@@ -550,8 +555,7 @@ static int fsi_data_push(struct fsi_priv *fsi, int startup)
if (fifo_free < send)
send = fifo_free;
- start = runtime->dma_area;
- start += fsi->byte_offset;
+ start = fsi_dma_get_area(fsi);
switch (width) {
case 2:
@@ -633,8 +637,7 @@ static int fsi_data_pop(struct fsi_priv *fsi, int startup)
if (free < fifo_fill)
fifo_fill = free;
- start = runtime->dma_area;
- start += fsi->byte_offset;
+ start = fsi_dma_get_area(fsi);
switch (width) {
case 2:
--
1.7.0.4
^ permalink raw reply related [flat|nested] 7+ messages in thread
* [PATCH 2/4] ASoC: fsi: Add fsi_dma_soft_push/pop function
2010-09-16 4:33 [PATCH 0/4] ASoC: fsi: DMA support 1st step Kuninori Morimoto
2010-09-16 4:34 ` [PATCH 1/4] ASoC: fsi: Add fsi_dma_get_area Kuninori Morimoto
@ 2010-09-16 4:34 ` Kuninori Morimoto
2010-09-16 13:28 ` Liam Girdwood
2010-09-16 4:34 ` [PATCH 3/4] ASoC: fsi: modify variable name to easy to understand Kuninori Morimoto
2010-09-16 4:34 ` [PATCH 4/4] ASoC: fsi: merge fsi_data_push/pop to fsi_fifo_data_ctrl Kuninori Morimoto
3 siblings, 1 reply; 7+ messages in thread
From: Kuninori Morimoto @ 2010-09-16 4:34 UTC (permalink / raw)
To: Mark Brown; +Cc: Linux-ALSA, Liam Girdwood
Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
---
sound/soc/sh/fsi.c | 75 +++++++++++++++++++++++++++++++++++++++------------
1 files changed, 57 insertions(+), 18 deletions(-)
diff --git a/sound/soc/sh/fsi.c b/sound/soc/sh/fsi.c
index 44a2b6e..156c73b 100644
--- a/sound/soc/sh/fsi.c
+++ b/sound/soc/sh/fsi.c
@@ -357,11 +357,62 @@ static int fsi_get_fifo_residue(struct fsi_priv *fsi, int is_play)
return residue;
}
+/************************************************************************
+
+
+ dma function
+
+
+************************************************************************/
static u8 *fsi_dma_get_area(struct fsi_priv *fsi)
{
return fsi->substream->runtime->dma_area + fsi->byte_offset;
}
+static void fsi_dma_soft_push16(struct fsi_priv *fsi, int size)
+{
+ u16 *start;
+ int i;
+
+ start = (u16 *)fsi_dma_get_area(fsi);
+
+ for (i = 0; i < size; i++)
+ fsi_reg_write(fsi, DODT, ((u32)*(start + i) << 8));
+}
+
+static void fsi_dma_soft_pop16(struct fsi_priv *fsi, int size)
+{
+ u16 *start;
+ int i;
+
+ start = (u16 *)fsi_dma_get_area(fsi);
+
+ for (i = 0; i < size; i++)
+ *(start + i) = (u16)(fsi_reg_read(fsi, DIDT) >> 8);
+}
+
+static void fsi_dma_soft_push32(struct fsi_priv *fsi, int size)
+{
+ u32 *start;
+ int i;
+
+ start = (u32 *)fsi_dma_get_area(fsi);
+
+ for (i = 0; i < size; i++)
+ fsi_reg_write(fsi, DODT, *(start + i));
+}
+
+static void fsi_dma_soft_pop32(struct fsi_priv *fsi, int size)
+{
+ u32 *start;
+ int i;
+
+ start = (u32 *)fsi_dma_get_area(fsi);
+
+ for (i = 0; i < size; i++)
+ *(start + i) = fsi_reg_read(fsi, DIDT);
+}
+
/************************************************************************
@@ -517,8 +568,7 @@ static int fsi_data_push(struct fsi_priv *fsi, int startup)
int send;
int fifo_free;
int width;
- u8 *start;
- int i, over_period;
+ int over_period;
if (!fsi ||
!fsi->substream ||
@@ -555,17 +605,12 @@ static int fsi_data_push(struct fsi_priv *fsi, int startup)
if (fifo_free < send)
send = fifo_free;
- start = fsi_dma_get_area(fsi);
-
switch (width) {
case 2:
- for (i = 0; i < send; i++)
- fsi_reg_write(fsi, DODT,
- ((u32)*((u16 *)start + i) << 8));
+ fsi_dma_soft_push16(fsi, send);
break;
case 4:
- for (i = 0; i < send; i++)
- fsi_reg_write(fsi, DODT, *((u32 *)start + i));
+ fsi_dma_soft_push32(fsi, send);
break;
default:
return -EINVAL;
@@ -600,8 +645,7 @@ static int fsi_data_pop(struct fsi_priv *fsi, int startup)
int free;
int fifo_fill;
int width;
- u8 *start;
- int i, over_period;
+ int over_period;
if (!fsi ||
!fsi->substream ||
@@ -637,17 +681,12 @@ static int fsi_data_pop(struct fsi_priv *fsi, int startup)
if (free < fifo_fill)
fifo_fill = free;
- start = fsi_dma_get_area(fsi);
-
switch (width) {
case 2:
- for (i = 0; i < fifo_fill; i++)
- *((u16 *)start + i) =
- (u16)(fsi_reg_read(fsi, DIDT) >> 8);
+ fsi_dma_soft_pop16(fsi, fifo_fill);
break;
case 4:
- for (i = 0; i < fifo_fill; i++)
- *((u32 *)start + i) = fsi_reg_read(fsi, DIDT);
+ fsi_dma_soft_pop32(fsi, fifo_fill);
break;
default:
return -EINVAL;
--
1.7.0.4
^ permalink raw reply related [flat|nested] 7+ messages in thread
* [PATCH 3/4] ASoC: fsi: modify variable name to easy to understand
2010-09-16 4:33 [PATCH 0/4] ASoC: fsi: DMA support 1st step Kuninori Morimoto
2010-09-16 4:34 ` [PATCH 1/4] ASoC: fsi: Add fsi_dma_get_area Kuninori Morimoto
2010-09-16 4:34 ` [PATCH 2/4] ASoC: fsi: Add fsi_dma_soft_push/pop function Kuninori Morimoto
@ 2010-09-16 4:34 ` Kuninori Morimoto
2010-09-16 13:25 ` Liam Girdwood
2010-09-16 4:34 ` [PATCH 4/4] ASoC: fsi: merge fsi_data_push/pop to fsi_fifo_data_ctrl Kuninori Morimoto
3 siblings, 1 reply; 7+ messages in thread
From: Kuninori Morimoto @ 2010-09-16 4:34 UTC (permalink / raw)
To: Mark Brown; +Cc: Linux-ALSA, Liam Girdwood
Current FSI driver is using data
length, width, number, offset for variables.
But it was a very confusing name.
This patch rename them to easy to understand,
and add new functions for it.
Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
---
sound/soc/sh/fsi.c | 179 +++++++++++++++++++++++++++++-----------------------
1 files changed, 99 insertions(+), 80 deletions(-)
diff --git a/sound/soc/sh/fsi.c b/sound/soc/sh/fsi.c
index 156c73b..06f1e1b 100644
--- a/sound/soc/sh/fsi.c
+++ b/sound/soc/sh/fsi.c
@@ -101,6 +101,15 @@
#define FSI_FMTS (SNDRV_PCM_FMTBIT_S24_LE | SNDRV_PCM_FMTBIT_S16_LE)
+/*
+ * FSI driver use below type name for variable
+ *
+ * xxx_len : data length
+ * xxx_width : data width
+ * xxx_ofs : data offset
+ * xxx_num : number of data
+ */
+
/************************************************************************
@@ -113,13 +122,13 @@ struct fsi_priv {
struct snd_pcm_substream *substream;
struct fsi_master *master;
- int fifo_max;
- int chan;
+ int fifo_max_num;
+ int chan_num;
- int byte_offset;
- int period_len;
- int buffer_len;
- int periods;
+ int buff_ofs;
+ int buff_len;
+ int period_width;
+ int period_num;
u32 mst_ctrl;
};
@@ -329,32 +338,43 @@ static void fsi_stream_push(struct fsi_priv *fsi,
u32 period_len)
{
fsi->substream = substream;
- fsi->buffer_len = buffer_len;
- fsi->period_len = period_len;
- fsi->byte_offset = 0;
- fsi->periods = 0;
+ fsi->buff_len = buffer_len;
+ fsi->buff_ofs = 0;
+ fsi->period_width = period_len;
+ fsi->period_num = 0;
}
static void fsi_stream_pop(struct fsi_priv *fsi)
{
fsi->substream = NULL;
- fsi->buffer_len = 0;
- fsi->period_len = 0;
- fsi->byte_offset = 0;
- fsi->periods = 0;
+ fsi->buff_len = 0;
+ fsi->buff_ofs = 0;
+ fsi->period_width = 0;
+ fsi->period_num = 0;
}
-static int fsi_get_fifo_residue(struct fsi_priv *fsi, int is_play)
+static int fsi_get_fifo_data_num(struct fsi_priv *fsi, int is_play)
{
u32 status;
u32 reg = is_play ? DOFF_ST : DIFF_ST;
- int residue;
+ int data_num;
status = fsi_reg_read(fsi, reg);
- residue = 0x1ff & (status >> 8);
- residue *= fsi->chan;
+ data_num = 0x1ff & (status >> 8);
+ data_num *= fsi->chan_num;
+
+ return data_num;
+}
- return residue;
+static int fsi_len2num(int len, int width)
+{
+ return len / width;
+}
+
+#define fsi_num2ofs(a, b) fsi_num2len(a, b)
+static int fsi_num2len(int num, int width)
+{
+ return num * width;
}
/************************************************************************
@@ -366,50 +386,50 @@ static int fsi_get_fifo_residue(struct fsi_priv *fsi, int is_play)
************************************************************************/
static u8 *fsi_dma_get_area(struct fsi_priv *fsi)
{
- return fsi->substream->runtime->dma_area + fsi->byte_offset;
+ return fsi->substream->runtime->dma_area + fsi->buff_ofs;
}
-static void fsi_dma_soft_push16(struct fsi_priv *fsi, int size)
+static void fsi_dma_soft_push16(struct fsi_priv *fsi, int num)
{
u16 *start;
int i;
start = (u16 *)fsi_dma_get_area(fsi);
- for (i = 0; i < size; i++)
+ for (i = 0; i < num; i++)
fsi_reg_write(fsi, DODT, ((u32)*(start + i) << 8));
}
-static void fsi_dma_soft_pop16(struct fsi_priv *fsi, int size)
+static void fsi_dma_soft_pop16(struct fsi_priv *fsi, int num)
{
u16 *start;
int i;
start = (u16 *)fsi_dma_get_area(fsi);
- for (i = 0; i < size; i++)
+ for (i = 0; i < num; i++)
*(start + i) = (u16)(fsi_reg_read(fsi, DIDT) >> 8);
}
-static void fsi_dma_soft_push32(struct fsi_priv *fsi, int size)
+static void fsi_dma_soft_push32(struct fsi_priv *fsi, int num)
{
u32 *start;
int i;
start = (u32 *)fsi_dma_get_area(fsi);
- for (i = 0; i < size; i++)
+ for (i = 0; i < num; i++)
fsi_reg_write(fsi, DODT, *(start + i));
}
-static void fsi_dma_soft_pop32(struct fsi_priv *fsi, int size)
+static void fsi_dma_soft_pop32(struct fsi_priv *fsi, int num)
{
u32 *start;
int i;
start = (u32 *)fsi_dma_get_area(fsi);
- for (i = 0; i < size; i++)
+ for (i = 0; i < num; i++)
*(start + i) = fsi_reg_read(fsi, DIDT);
}
@@ -512,8 +532,8 @@ static void fsi_fifo_init(struct fsi_priv *fsi,
shift = fsi_master_read(master, FIFO_SZ);
shift >>= fsi_is_port_a(fsi) ? AO_SZ_SHIFT : BO_SZ_SHIFT;
shift &= OUT_SZ_MASK;
- fsi->fifo_max = 256 << shift;
- dev_dbg(dai->dev, "fifo = %d words\n", fsi->fifo_max);
+ fsi->fifo_max_num = 256 << shift;
+ dev_dbg(dai->dev, "fifo = %d words\n", fsi->fifo_max_num);
/*
* The maximum number of sample data varies depending
@@ -534,9 +554,10 @@ static void fsi_fifo_init(struct fsi_priv *fsi,
* 7 channels: 32 ( 32 x 7 = 224)
* 8 channels: 32 ( 32 x 8 = 256)
*/
- for (i = 1; i < fsi->chan; i <<= 1)
- fsi->fifo_max >>= 1;
- dev_dbg(dai->dev, "%d channel %d store\n", fsi->chan, fsi->fifo_max);
+ for (i = 1; i < fsi->chan_num; i <<= 1)
+ fsi->fifo_max_num >>= 1;
+ dev_dbg(dai->dev, "%d channel %d store\n",
+ fsi->chan_num, fsi->fifo_max_num);
ctrl = is_play ? DOFF_CTL : DIFF_CTL;
@@ -565,9 +586,9 @@ static int fsi_data_push(struct fsi_priv *fsi, int startup)
struct snd_pcm_runtime *runtime;
struct snd_pcm_substream *substream = NULL;
u32 status;
- int send;
- int fifo_free;
- int width;
+ int push_num;
+ int push_num_max;
+ int ch_width;
int over_period;
if (!fsi ||
@@ -582,41 +603,40 @@ static int fsi_data_push(struct fsi_priv *fsi, int startup)
/* FSI FIFO has limit.
* So, this driver can not send periods data at a time
*/
- if (fsi->byte_offset >=
- fsi->period_len * (fsi->periods + 1)) {
+ if (fsi->buff_ofs >=
+ fsi_num2ofs(fsi->period_num + 1, fsi->period_width)) {
over_period = 1;
- fsi->periods = (fsi->periods + 1) % runtime->periods;
+ fsi->period_num = (fsi->period_num + 1) % runtime->periods;
- if (0 == fsi->periods)
- fsi->byte_offset = 0;
+ if (0 == fsi->period_num)
+ fsi->buff_ofs = 0;
}
/* get 1 channel data width */
- width = frames_to_bytes(runtime, 1) / fsi->chan;
+ ch_width = frames_to_bytes(runtime, 1) / fsi->chan_num;
- /* get send size for alsa */
- send = (fsi->buffer_len - fsi->byte_offset) / width;
+ /* number of push data */
+ push_num = fsi_len2num(fsi->buff_len - fsi->buff_ofs, ch_width);
- /* get FIFO free size */
- fifo_free = (fsi->fifo_max * fsi->chan) - fsi_get_fifo_residue(fsi, 1);
+ /* max number of push data */
+ push_num_max = (fsi->fifo_max_num * fsi->chan_num) -
+ fsi_get_fifo_data_num(fsi, 1);
- /* size check */
- if (fifo_free < send)
- send = fifo_free;
+ push_num = min(push_num, push_num_max);
- switch (width) {
+ switch (ch_width) {
case 2:
- fsi_dma_soft_push16(fsi, send);
+ fsi_dma_soft_push16(fsi, push_num);
break;
case 4:
- fsi_dma_soft_push32(fsi, send);
+ fsi_dma_soft_push32(fsi, push_num);
break;
default:
return -EINVAL;
}
- fsi->byte_offset += send * width;
+ fsi->buff_ofs += fsi_num2ofs(push_num, ch_width);
status = fsi_reg_read(fsi, DOFF_ST);
if (!startup) {
@@ -642,9 +662,9 @@ static int fsi_data_pop(struct fsi_priv *fsi, int startup)
struct snd_pcm_runtime *runtime;
struct snd_pcm_substream *substream = NULL;
u32 status;
- int free;
- int fifo_fill;
- int width;
+ int pop_num;
+ int pop_num_max;
+ int ch_width;
int over_period;
if (!fsi ||
@@ -659,40 +679,39 @@ static int fsi_data_pop(struct fsi_priv *fsi, int startup)
/* FSI FIFO has limit.
* So, this driver can not send periods data at a time
*/
- if (fsi->byte_offset >=
- fsi->period_len * (fsi->periods + 1)) {
+ if (fsi->buff_ofs >=
+ fsi_num2ofs(fsi->period_num + 1, fsi->period_width)) {
over_period = 1;
- fsi->periods = (fsi->periods + 1) % runtime->periods;
+ fsi->period_num = (fsi->period_num + 1) % runtime->periods;
- if (0 == fsi->periods)
- fsi->byte_offset = 0;
+ if (0 == fsi->period_num)
+ fsi->buff_ofs = 0;
}
/* get 1 channel data width */
- width = frames_to_bytes(runtime, 1) / fsi->chan;
+ ch_width = frames_to_bytes(runtime, 1) / fsi->chan_num;
/* get free space for alsa */
- free = (fsi->buffer_len - fsi->byte_offset) / width;
+ pop_num_max = fsi_len2num(fsi->buff_len - fsi->buff_ofs, ch_width);
/* get recv size */
- fifo_fill = fsi_get_fifo_residue(fsi, 0);
+ pop_num = fsi_get_fifo_data_num(fsi, 0);
- if (free < fifo_fill)
- fifo_fill = free;
+ pop_num = min(pop_num_max, pop_num);
- switch (width) {
+ switch (ch_width) {
case 2:
- fsi_dma_soft_pop16(fsi, fifo_fill);
+ fsi_dma_soft_pop16(fsi, pop_num);
break;
case 4:
- fsi_dma_soft_pop32(fsi, fifo_fill);
+ fsi_dma_soft_pop32(fsi, pop_num);
break;
default:
return -EINVAL;
}
- fsi->byte_offset += fifo_fill * width;
+ fsi->buff_ofs += fsi_num2ofs(pop_num, ch_width);
status = fsi_reg_read(fsi, DIFF_ST);
if (!startup) {
@@ -786,29 +805,29 @@ static int fsi_dai_startup(struct snd_pcm_substream *substream,
switch (fmt) {
case SH_FSI_FMT_MONO:
data = CR_MONO;
- fsi->chan = 1;
+ fsi->chan_num = 1;
break;
case SH_FSI_FMT_MONO_DELAY:
data = CR_MONO_D;
- fsi->chan = 1;
+ fsi->chan_num = 1;
break;
case SH_FSI_FMT_PCM:
data = CR_PCM;
- fsi->chan = 2;
+ fsi->chan_num = 2;
break;
case SH_FSI_FMT_I2S:
data = CR_I2S;
- fsi->chan = 2;
+ fsi->chan_num = 2;
break;
case SH_FSI_FMT_TDM:
- fsi->chan = is_play ?
+ fsi->chan_num = is_play ?
SH_FSI_GET_CH_O(flags) : SH_FSI_GET_CH_I(flags);
- data = CR_TDM | (fsi->chan - 1);
+ data = CR_TDM | (fsi->chan_num - 1);
break;
case SH_FSI_FMT_TDM_DELAY:
- fsi->chan = is_play ?
+ fsi->chan_num = is_play ?
SH_FSI_GET_CH_O(flags) : SH_FSI_GET_CH_I(flags);
- data = CR_TDM_D | (fsi->chan - 1);
+ data = CR_TDM_D | (fsi->chan_num - 1);
break;
case SH_FSI_FMT_SPDIF:
if (master->core->ver < 2) {
@@ -816,7 +835,7 @@ static int fsi_dai_startup(struct snd_pcm_substream *substream,
return -EINVAL;
}
data = CR_SPDIF;
- fsi->chan = 2;
+ fsi->chan_num = 2;
fsi_spdif_clk_ctrl(fsi, 1);
fsi_reg_mask_set(fsi, OUT_SEL, 0x0010, 0x0010);
break;
@@ -1018,7 +1037,7 @@ static snd_pcm_uframes_t fsi_pointer(struct snd_pcm_substream *substream)
struct fsi_priv *fsi = fsi_get_priv(substream);
long location;
- location = (fsi->byte_offset - 1);
+ location = (fsi->buff_ofs - 1);
if (location < 0)
location = 0;
--
1.7.0.4
^ permalink raw reply related [flat|nested] 7+ messages in thread
* [PATCH 4/4] ASoC: fsi: merge fsi_data_push/pop to fsi_fifo_data_ctrl
2010-09-16 4:33 [PATCH 0/4] ASoC: fsi: DMA support 1st step Kuninori Morimoto
` (2 preceding siblings ...)
2010-09-16 4:34 ` [PATCH 3/4] ASoC: fsi: modify variable name to easy to understand Kuninori Morimoto
@ 2010-09-16 4:34 ` Kuninori Morimoto
3 siblings, 0 replies; 7+ messages in thread
From: Kuninori Morimoto @ 2010-09-16 4:34 UTC (permalink / raw)
To: Mark Brown; +Cc: Linux-ALSA, Liam Girdwood
Current FSI driver had data push/pop functions.
But the main difference of these 2 were only data src/dst address.
This mean it is possible to merge these to 1 function.
Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
---
sound/soc/sh/fsi.c | 161 +++++++++++++++++++++------------------------------
1 files changed, 66 insertions(+), 95 deletions(-)
diff --git a/sound/soc/sh/fsi.c b/sound/soc/sh/fsi.c
index 06f1e1b..ef7a606 100644
--- a/sound/soc/sh/fsi.c
+++ b/sound/soc/sh/fsi.c
@@ -580,16 +580,18 @@ static void fsi_soft_all_reset(struct fsi_master *master)
mdelay(10);
}
-/* playback interrupt */
-static int fsi_data_push(struct fsi_priv *fsi, int startup)
+static int fsi_fifo_data_ctrl(struct fsi_priv *fsi, int startup, int is_play)
{
struct snd_pcm_runtime *runtime;
struct snd_pcm_substream *substream = NULL;
u32 status;
- int push_num;
- int push_num_max;
+ u32 status_reg = is_play ? DOFF_ST : DIFF_ST;
+ int data_residue_num;
+ int data_num;
+ int data_num_max;
int ch_width;
int over_period;
+ void (*fn)(struct fsi_priv *fsi, int size);
if (!fsi ||
!fsi->substream ||
@@ -616,29 +618,62 @@ static int fsi_data_push(struct fsi_priv *fsi, int startup)
/* get 1 channel data width */
ch_width = frames_to_bytes(runtime, 1) / fsi->chan_num;
- /* number of push data */
- push_num = fsi_len2num(fsi->buff_len - fsi->buff_ofs, ch_width);
+ /* get residue data number of alsa */
+ data_residue_num = fsi_len2num(fsi->buff_len - fsi->buff_ofs, ch_width);
- /* max number of push data */
- push_num_max = (fsi->fifo_max_num * fsi->chan_num) -
- fsi_get_fifo_data_num(fsi, 1);
+ if (is_play) {
+ /*
+ * for play-back
+ *
+ * data_num_max : number of FSI fifo free space
+ * data_num : number of ALSA residue data
+ */
+ data_num_max = fsi->fifo_max_num * fsi->chan_num;
+ data_num_max -= fsi_get_fifo_data_num(fsi, is_play);
- push_num = min(push_num, push_num_max);
+ data_num = data_residue_num;
- switch (ch_width) {
- case 2:
- fsi_dma_soft_push16(fsi, push_num);
- break;
- case 4:
- fsi_dma_soft_push32(fsi, push_num);
- break;
- default:
- return -EINVAL;
+ switch (ch_width) {
+ case 2:
+ fn = fsi_dma_soft_push16;
+ break;
+ case 4:
+ fn = fsi_dma_soft_push32;
+ break;
+ default:
+ return -EINVAL;
+ }
+ } else {
+ /*
+ * for capture
+ *
+ * data_num_max : number of ALSA free space
+ * data_num : number of data in FSI fifo
+ */
+ data_num_max = data_residue_num;
+ data_num = fsi_get_fifo_data_num(fsi, is_play);
+
+ switch (ch_width) {
+ case 2:
+ fn = fsi_dma_soft_pop16;
+ break;
+ case 4:
+ fn = fsi_dma_soft_pop32;
+ break;
+ default:
+ return -EINVAL;
+ }
}
- fsi->buff_ofs += fsi_num2ofs(push_num, ch_width);
+ data_num = min(data_num, data_num_max);
+
+ fn(fsi, data_num);
- status = fsi_reg_read(fsi, DOFF_ST);
+ /* update buff_ofs */
+ fsi->buff_ofs += fsi_num2ofs(data_num, ch_width);
+
+ /* check fifo status */
+ status = fsi_reg_read(fsi, status_reg);
if (!startup) {
struct snd_soc_dai *dai = fsi_get_dai(substream);
@@ -647,9 +682,10 @@ static int fsi_data_push(struct fsi_priv *fsi, int startup)
if (status & ERR_UNDER)
dev_err(dai->dev, "under run\n");
}
- fsi_reg_write(fsi, DOFF_ST, 0);
+ fsi_reg_write(fsi, status_reg, 0);
- fsi_irq_enable(fsi, 1);
+ /* re-enable irq */
+ fsi_irq_enable(fsi, is_play);
if (over_period)
snd_pcm_period_elapsed(substream);
@@ -659,77 +695,12 @@ static int fsi_data_push(struct fsi_priv *fsi, int startup)
static int fsi_data_pop(struct fsi_priv *fsi, int startup)
{
- struct snd_pcm_runtime *runtime;
- struct snd_pcm_substream *substream = NULL;
- u32 status;
- int pop_num;
- int pop_num_max;
- int ch_width;
- int over_period;
-
- if (!fsi ||
- !fsi->substream ||
- !fsi->substream->runtime)
- return -EINVAL;
-
- over_period = 0;
- substream = fsi->substream;
- runtime = substream->runtime;
-
- /* FSI FIFO has limit.
- * So, this driver can not send periods data at a time
- */
- if (fsi->buff_ofs >=
- fsi_num2ofs(fsi->period_num + 1, fsi->period_width)) {
-
- over_period = 1;
- fsi->period_num = (fsi->period_num + 1) % runtime->periods;
-
- if (0 == fsi->period_num)
- fsi->buff_ofs = 0;
- }
-
- /* get 1 channel data width */
- ch_width = frames_to_bytes(runtime, 1) / fsi->chan_num;
-
- /* get free space for alsa */
- pop_num_max = fsi_len2num(fsi->buff_len - fsi->buff_ofs, ch_width);
-
- /* get recv size */
- pop_num = fsi_get_fifo_data_num(fsi, 0);
-
- pop_num = min(pop_num_max, pop_num);
-
- switch (ch_width) {
- case 2:
- fsi_dma_soft_pop16(fsi, pop_num);
- break;
- case 4:
- fsi_dma_soft_pop32(fsi, pop_num);
- break;
- default:
- return -EINVAL;
- }
-
- fsi->buff_ofs += fsi_num2ofs(pop_num, ch_width);
-
- status = fsi_reg_read(fsi, DIFF_ST);
- if (!startup) {
- struct snd_soc_dai *dai = fsi_get_dai(substream);
-
- if (status & ERR_OVER)
- dev_err(dai->dev, "over run\n");
- if (status & ERR_UNDER)
- dev_err(dai->dev, "under run\n");
- }
- fsi_reg_write(fsi, DIFF_ST, 0);
-
- fsi_irq_enable(fsi, 0);
-
- if (over_period)
- snd_pcm_period_elapsed(substream);
+ return fsi_fifo_data_ctrl(fsi, startup, 0);
+}
- return 0;
+static int fsi_data_push(struct fsi_priv *fsi, int startup)
+{
+ return fsi_fifo_data_ctrl(fsi, startup, 1);
}
static irqreturn_t fsi_interrupt(int irq, void *data)
--
1.7.0.4
^ permalink raw reply related [flat|nested] 7+ messages in thread
* Re: [PATCH 3/4] ASoC: fsi: modify variable name to easy to understand
2010-09-16 4:34 ` [PATCH 3/4] ASoC: fsi: modify variable name to easy to understand Kuninori Morimoto
@ 2010-09-16 13:25 ` Liam Girdwood
0 siblings, 0 replies; 7+ messages in thread
From: Liam Girdwood @ 2010-09-16 13:25 UTC (permalink / raw)
To: Kuninori Morimoto; +Cc: Linux-ALSA, Mark Brown
On Thu, 2010-09-16 at 13:34 +0900, Kuninori Morimoto wrote:
> Current FSI driver is using data
> length, width, number, offset for variables.
> But it was a very confusing name.
>
> This patch rename them to easy to understand,
> and add new functions for it.
>
> Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
> ---
> sound/soc/sh/fsi.c | 179 +++++++++++++++++++++++++++++-----------------------
> 1 files changed, 99 insertions(+), 80 deletions(-)
>
> diff --git a/sound/soc/sh/fsi.c b/sound/soc/sh/fsi.c
> index 156c73b..06f1e1b 100644
> --- a/sound/soc/sh/fsi.c
> +++ b/sound/soc/sh/fsi.c
> @@ -101,6 +101,15 @@
>
> #define FSI_FMTS (SNDRV_PCM_FMTBIT_S24_LE | SNDRV_PCM_FMTBIT_S16_LE)
>
> +/*
> + * FSI driver use below type name for variable
> + *
> + * xxx_len : data length
> + * xxx_width : data width
> + * xxx_ofs : data offset
Best to keep this as xxx_offset
> + * xxx_num : number of data
> + */
> +
> /************************************************************************
>
>
> @@ -113,13 +122,13 @@ struct fsi_priv {
> struct snd_pcm_substream *substream;
> struct fsi_master *master;
>
> - int fifo_max;
> - int chan;
> + int fifo_max_num;
> + int chan_num;
>
> - int byte_offset;
> - int period_len;
> - int buffer_len;
> - int periods;
> + int buff_ofs;
> + int buff_len;
> + int period_width;
Do you mean the _size_ of the period here in bytes or frames or
something else ?
Fwiw, it's often better to qualify the variable with it's unit of
measurement. e.g. period_bytes or period_frames
> + int period_num;
>
> u32 mst_ctrl;
> };
> @@ -329,32 +338,43 @@ static void fsi_stream_push(struct fsi_priv *fsi,
> u32 period_len)
> {
> fsi->substream = substream;
> - fsi->buffer_len = buffer_len;
> - fsi->period_len = period_len;
> - fsi->byte_offset = 0;
> - fsi->periods = 0;
> + fsi->buff_len = buffer_len;
> + fsi->buff_ofs = 0;
> + fsi->period_width = period_len;
> + fsi->period_num = 0;
> }
>
> static void fsi_stream_pop(struct fsi_priv *fsi)
> {
> fsi->substream = NULL;
> - fsi->buffer_len = 0;
> - fsi->period_len = 0;
> - fsi->byte_offset = 0;
> - fsi->periods = 0;
> + fsi->buff_len = 0;
> + fsi->buff_ofs = 0;
> + fsi->period_width = 0;
> + fsi->period_num = 0;
> }
>
> -static int fsi_get_fifo_residue(struct fsi_priv *fsi, int is_play)
> +static int fsi_get_fifo_data_num(struct fsi_priv *fsi, int is_play)
> {
> u32 status;
> u32 reg = is_play ? DOFF_ST : DIFF_ST;
> - int residue;
> + int data_num;
>
> status = fsi_reg_read(fsi, reg);
> - residue = 0x1ff & (status >> 8);
> - residue *= fsi->chan;
> + data_num = 0x1ff & (status >> 8);
> + data_num *= fsi->chan_num;
> +
> + return data_num;
> +}
>
> - return residue;
> +static int fsi_len2num(int len, int width)
> +{
> + return len / width;
> +}
> +
> +#define fsi_num2ofs(a, b) fsi_num2len(a, b)
> +static int fsi_num2len(int num, int width)
> +{
> + return num * width;
> }
>
> /************************************************************************
> @@ -366,50 +386,50 @@ static int fsi_get_fifo_residue(struct fsi_priv *fsi, int is_play)
> ************************************************************************/
> static u8 *fsi_dma_get_area(struct fsi_priv *fsi)
> {
> - return fsi->substream->runtime->dma_area + fsi->byte_offset;
> + return fsi->substream->runtime->dma_area + fsi->buff_ofs;
> }
>
> -static void fsi_dma_soft_push16(struct fsi_priv *fsi, int size)
> +static void fsi_dma_soft_push16(struct fsi_priv *fsi, int num)
> {
> u16 *start;
> int i;
>
> start = (u16 *)fsi_dma_get_area(fsi);
>
> - for (i = 0; i < size; i++)
> + for (i = 0; i < num; i++)
> fsi_reg_write(fsi, DODT, ((u32)*(start + i) << 8));
> }
>
> -static void fsi_dma_soft_pop16(struct fsi_priv *fsi, int size)
> +static void fsi_dma_soft_pop16(struct fsi_priv *fsi, int num)
> {
> u16 *start;
> int i;
>
> start = (u16 *)fsi_dma_get_area(fsi);
>
> - for (i = 0; i < size; i++)
> + for (i = 0; i < num; i++)
> *(start + i) = (u16)(fsi_reg_read(fsi, DIDT) >> 8);
> }
>
> -static void fsi_dma_soft_push32(struct fsi_priv *fsi, int size)
> +static void fsi_dma_soft_push32(struct fsi_priv *fsi, int num)
> {
> u32 *start;
> int i;
>
> start = (u32 *)fsi_dma_get_area(fsi);
>
> - for (i = 0; i < size; i++)
> + for (i = 0; i < num; i++)
> fsi_reg_write(fsi, DODT, *(start + i));
> }
>
> -static void fsi_dma_soft_pop32(struct fsi_priv *fsi, int size)
> +static void fsi_dma_soft_pop32(struct fsi_priv *fsi, int num)
> {
> u32 *start;
> int i;
>
> start = (u32 *)fsi_dma_get_area(fsi);
>
> - for (i = 0; i < size; i++)
> + for (i = 0; i < num; i++)
> *(start + i) = fsi_reg_read(fsi, DIDT);
> }
>
> @@ -512,8 +532,8 @@ static void fsi_fifo_init(struct fsi_priv *fsi,
> shift = fsi_master_read(master, FIFO_SZ);
> shift >>= fsi_is_port_a(fsi) ? AO_SZ_SHIFT : BO_SZ_SHIFT;
> shift &= OUT_SZ_MASK;
> - fsi->fifo_max = 256 << shift;
> - dev_dbg(dai->dev, "fifo = %d words\n", fsi->fifo_max);
> + fsi->fifo_max_num = 256 << shift;
> + dev_dbg(dai->dev, "fifo = %d words\n", fsi->fifo_max_num);
>
> /*
> * The maximum number of sample data varies depending
> @@ -534,9 +554,10 @@ static void fsi_fifo_init(struct fsi_priv *fsi,
> * 7 channels: 32 ( 32 x 7 = 224)
> * 8 channels: 32 ( 32 x 8 = 256)
> */
> - for (i = 1; i < fsi->chan; i <<= 1)
> - fsi->fifo_max >>= 1;
> - dev_dbg(dai->dev, "%d channel %d store\n", fsi->chan, fsi->fifo_max);
> + for (i = 1; i < fsi->chan_num; i <<= 1)
> + fsi->fifo_max_num >>= 1;
> + dev_dbg(dai->dev, "%d channel %d store\n",
> + fsi->chan_num, fsi->fifo_max_num);
>
> ctrl = is_play ? DOFF_CTL : DIFF_CTL;
>
> @@ -565,9 +586,9 @@ static int fsi_data_push(struct fsi_priv *fsi, int startup)
> struct snd_pcm_runtime *runtime;
> struct snd_pcm_substream *substream = NULL;
> u32 status;
> - int send;
> - int fifo_free;
> - int width;
> + int push_num;
> + int push_num_max;
> + int ch_width;
> int over_period;
>
> if (!fsi ||
> @@ -582,41 +603,40 @@ static int fsi_data_push(struct fsi_priv *fsi, int startup)
> /* FSI FIFO has limit.
> * So, this driver can not send periods data at a time
> */
> - if (fsi->byte_offset >=
> - fsi->period_len * (fsi->periods + 1)) {
> + if (fsi->buff_ofs >=
> + fsi_num2ofs(fsi->period_num + 1, fsi->period_width)) {
>
> over_period = 1;
> - fsi->periods = (fsi->periods + 1) % runtime->periods;
> + fsi->period_num = (fsi->period_num + 1) % runtime->periods;
>
> - if (0 == fsi->periods)
> - fsi->byte_offset = 0;
> + if (0 == fsi->period_num)
> + fsi->buff_ofs = 0;
> }
>
> /* get 1 channel data width */
> - width = frames_to_bytes(runtime, 1) / fsi->chan;
> + ch_width = frames_to_bytes(runtime, 1) / fsi->chan_num;
>
> - /* get send size for alsa */
> - send = (fsi->buffer_len - fsi->byte_offset) / width;
> + /* number of push data */
> + push_num = fsi_len2num(fsi->buff_len - fsi->buff_ofs, ch_width);
>
> - /* get FIFO free size */
> - fifo_free = (fsi->fifo_max * fsi->chan) - fsi_get_fifo_residue(fsi, 1);
> + /* max number of push data */
> + push_num_max = (fsi->fifo_max_num * fsi->chan_num) -
> + fsi_get_fifo_data_num(fsi, 1);
>
> - /* size check */
> - if (fifo_free < send)
> - send = fifo_free;
> + push_num = min(push_num, push_num_max);
>
> - switch (width) {
> + switch (ch_width) {
> case 2:
> - fsi_dma_soft_push16(fsi, send);
> + fsi_dma_soft_push16(fsi, push_num);
> break;
> case 4:
> - fsi_dma_soft_push32(fsi, send);
> + fsi_dma_soft_push32(fsi, push_num);
> break;
> default:
> return -EINVAL;
> }
>
> - fsi->byte_offset += send * width;
> + fsi->buff_ofs += fsi_num2ofs(push_num, ch_width);
>
> status = fsi_reg_read(fsi, DOFF_ST);
> if (!startup) {
> @@ -642,9 +662,9 @@ static int fsi_data_pop(struct fsi_priv *fsi, int startup)
> struct snd_pcm_runtime *runtime;
> struct snd_pcm_substream *substream = NULL;
> u32 status;
> - int free;
> - int fifo_fill;
> - int width;
> + int pop_num;
> + int pop_num_max;
> + int ch_width;
> int over_period;
>
> if (!fsi ||
> @@ -659,40 +679,39 @@ static int fsi_data_pop(struct fsi_priv *fsi, int startup)
> /* FSI FIFO has limit.
> * So, this driver can not send periods data at a time
> */
> - if (fsi->byte_offset >=
> - fsi->period_len * (fsi->periods + 1)) {
> + if (fsi->buff_ofs >=
> + fsi_num2ofs(fsi->period_num + 1, fsi->period_width)) {
>
> over_period = 1;
> - fsi->periods = (fsi->periods + 1) % runtime->periods;
> + fsi->period_num = (fsi->period_num + 1) % runtime->periods;
>
> - if (0 == fsi->periods)
> - fsi->byte_offset = 0;
> + if (0 == fsi->period_num)
> + fsi->buff_ofs = 0;
> }
>
> /* get 1 channel data width */
> - width = frames_to_bytes(runtime, 1) / fsi->chan;
> + ch_width = frames_to_bytes(runtime, 1) / fsi->chan_num;
>
> /* get free space for alsa */
> - free = (fsi->buffer_len - fsi->byte_offset) / width;
> + pop_num_max = fsi_len2num(fsi->buff_len - fsi->buff_ofs, ch_width);
>
> /* get recv size */
> - fifo_fill = fsi_get_fifo_residue(fsi, 0);
> + pop_num = fsi_get_fifo_data_num(fsi, 0);
>
> - if (free < fifo_fill)
> - fifo_fill = free;
> + pop_num = min(pop_num_max, pop_num);
>
> - switch (width) {
> + switch (ch_width) {
> case 2:
> - fsi_dma_soft_pop16(fsi, fifo_fill);
> + fsi_dma_soft_pop16(fsi, pop_num);
> break;
> case 4:
> - fsi_dma_soft_pop32(fsi, fifo_fill);
> + fsi_dma_soft_pop32(fsi, pop_num);
> break;
> default:
> return -EINVAL;
> }
>
> - fsi->byte_offset += fifo_fill * width;
> + fsi->buff_ofs += fsi_num2ofs(pop_num, ch_width);
>
> status = fsi_reg_read(fsi, DIFF_ST);
> if (!startup) {
> @@ -786,29 +805,29 @@ static int fsi_dai_startup(struct snd_pcm_substream *substream,
> switch (fmt) {
> case SH_FSI_FMT_MONO:
> data = CR_MONO;
> - fsi->chan = 1;
> + fsi->chan_num = 1;
> break;
> case SH_FSI_FMT_MONO_DELAY:
> data = CR_MONO_D;
> - fsi->chan = 1;
> + fsi->chan_num = 1;
> break;
> case SH_FSI_FMT_PCM:
> data = CR_PCM;
> - fsi->chan = 2;
> + fsi->chan_num = 2;
> break;
> case SH_FSI_FMT_I2S:
> data = CR_I2S;
> - fsi->chan = 2;
> + fsi->chan_num = 2;
> break;
> case SH_FSI_FMT_TDM:
> - fsi->chan = is_play ?
> + fsi->chan_num = is_play ?
> SH_FSI_GET_CH_O(flags) : SH_FSI_GET_CH_I(flags);
> - data = CR_TDM | (fsi->chan - 1);
> + data = CR_TDM | (fsi->chan_num - 1);
> break;
> case SH_FSI_FMT_TDM_DELAY:
> - fsi->chan = is_play ?
> + fsi->chan_num = is_play ?
> SH_FSI_GET_CH_O(flags) : SH_FSI_GET_CH_I(flags);
> - data = CR_TDM_D | (fsi->chan - 1);
> + data = CR_TDM_D | (fsi->chan_num - 1);
> break;
> case SH_FSI_FMT_SPDIF:
> if (master->core->ver < 2) {
> @@ -816,7 +835,7 @@ static int fsi_dai_startup(struct snd_pcm_substream *substream,
> return -EINVAL;
> }
> data = CR_SPDIF;
> - fsi->chan = 2;
> + fsi->chan_num = 2;
> fsi_spdif_clk_ctrl(fsi, 1);
> fsi_reg_mask_set(fsi, OUT_SEL, 0x0010, 0x0010);
> break;
> @@ -1018,7 +1037,7 @@ static snd_pcm_uframes_t fsi_pointer(struct snd_pcm_substream *substream)
> struct fsi_priv *fsi = fsi_get_priv(substream);
> long location;
>
> - location = (fsi->byte_offset - 1);
> + location = (fsi->buff_ofs - 1);
> if (location < 0)
> location = 0;
>
--
Freelance Developer, SlimLogic Ltd
ASoC and Voltage Regulator Maintainer.
http://www.slimlogic.co.uk
^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: [PATCH 2/4] ASoC: fsi: Add fsi_dma_soft_push/pop function
2010-09-16 4:34 ` [PATCH 2/4] ASoC: fsi: Add fsi_dma_soft_push/pop function Kuninori Morimoto
@ 2010-09-16 13:28 ` Liam Girdwood
0 siblings, 0 replies; 7+ messages in thread
From: Liam Girdwood @ 2010-09-16 13:28 UTC (permalink / raw)
To: Kuninori Morimoto; +Cc: Linux-ALSA, Mark Brown
On Thu, 2010-09-16 at 13:34 +0900, Kuninori Morimoto wrote:
> Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
> ---
> sound/soc/sh/fsi.c | 75 +++++++++++++++++++++++++++++++++++++++------------
> 1 files changed, 57 insertions(+), 18 deletions(-)
>
> diff --git a/sound/soc/sh/fsi.c b/sound/soc/sh/fsi.c
> index 44a2b6e..156c73b 100644
> --- a/sound/soc/sh/fsi.c
> +++ b/sound/soc/sh/fsi.c
> @@ -357,11 +357,62 @@ static int fsi_get_fifo_residue(struct fsi_priv *fsi, int is_play)
> return residue;
> }
>
> +/************************************************************************
> +
> +
> + dma function
> +
> +
> +************************************************************************/
Btw, is there any need for such a large empty comment here.
Thanks
Liam
--
Freelance Developer, SlimLogic Ltd
ASoC and Voltage Regulator Maintainer.
http://www.slimlogic.co.uk
^ permalink raw reply [flat|nested] 7+ messages in thread
end of thread, other threads:[~2010-09-16 13:28 UTC | newest]
Thread overview: 7+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2010-09-16 4:33 [PATCH 0/4] ASoC: fsi: DMA support 1st step Kuninori Morimoto
2010-09-16 4:34 ` [PATCH 1/4] ASoC: fsi: Add fsi_dma_get_area Kuninori Morimoto
2010-09-16 4:34 ` [PATCH 2/4] ASoC: fsi: Add fsi_dma_soft_push/pop function Kuninori Morimoto
2010-09-16 13:28 ` Liam Girdwood
2010-09-16 4:34 ` [PATCH 3/4] ASoC: fsi: modify variable name to easy to understand Kuninori Morimoto
2010-09-16 13:25 ` Liam Girdwood
2010-09-16 4:34 ` [PATCH 4/4] ASoC: fsi: merge fsi_data_push/pop to fsi_fifo_data_ctrl Kuninori Morimoto
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.