June 2017 - Sound-open-firmware - mailman.alsa-project.org

[Sound-open-firmware] [PATCH 1/5] Audio/buffer: Set alloc_size
by Seppo Ingalsuo 29 Jun '17

29 Jun '17

The buffer->alloc_size was not set. It needs to be equal to buffer->end_addr minus buffer->addr for circular buffers. Signed-off-by: Seppo Ingalsuo <seppo.ingalsuo(a)linux.intel.com> --- src/audio/buffer.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/audio/buffer.c b/src/audio/buffer.c index 5bd3b30..39289f6 100644 --- a/src/audio/buffer.c +++ b/src/audio/buffer.c @@ -77,7 +77,7 @@ struct comp_buffer *buffer_new(struct sof_ipc_buffer *desc) memcpy(&buffer->ipc_buffer, desc, sizeof(*desc)); //buffer->size = - //buffer->alloc_size = + buffer->alloc_size = desc->size; buffer->ipc_buffer = *desc; buffer->w_ptr = buffer->r_ptr = buffer->addr; buffer->end_addr = buffer->addr + buffer->ipc_buffer.size; -- 2.11.0

2 5

[Sound-open-firmware] [PATCH 1/4] SRC: IPC updates and fixes v2
by Seppo Ingalsuo 28 Jun '17

28 Jun '17

SRC updates sink and downstream pipeline PCM rate, period_count and period_bytes in src_params() according to received out_rate via IPC. Also the use of incorrect alloc_size is replaced by ipc_buffer.size. Signed-off-by: Seppo Ingalsuo <seppo.ingalsuo(a)linux.intel.com> --- src/audio/src.c | 90 ++++++++++++++++++++++++----------------- src/include/reef/audio/buffer.h | 8 ++-- src/include/uapi/ipc.h | 1 + 3 files changed, 57 insertions(+), 42 deletions(-) diff --git a/src/audio/src.c b/src/audio/src.c index c338220..f1f4b86 100644 --- a/src/audio/src.c +++ b/src/audio/src.c @@ -56,9 +56,13 @@ /* src component private data */ struct comp_data { struct polyphase_src src[PLATFORM_MAX_CHANNELS]; + /* Next two elements must be kept in this order since + * the end of pcm_params is a flexible array. + */ + struct sof_ipc_pcm_params pcm_params; + enum sof_ipc_chmap channel_map[PLATFORM_MAX_CHANNELS]; int32_t *delay_lines; int scratch_length; - //int32_t z[STAGE_BUF_SIZE]; void (*src_func)(struct comp_dev *dev, struct comp_buffer *source, struct comp_buffer *sink, @@ -155,7 +159,7 @@ static void src_2s_s32_default(struct comp_dev *dev, s1.times = n_times1; s1.x_end_addr = source->end_addr; - s1.x_size = source->alloc_size; + s1.x_size = source->ipc_buffer.size; s1.x_inc = nch; s1.y_end_addr = &cd->delay_lines[cd->scratch_length]; s1.y_size = STAGE_BUF_SIZE * sizeof(int32_t); @@ -166,7 +170,7 @@ static void src_2s_s32_default(struct comp_dev *dev, s2.x_size = STAGE_BUF_SIZE * sizeof(int32_t); s2.x_inc = 1; s2.y_end_addr = sink->end_addr; - s2.y_size = sink->alloc_size; + s2.y_size = sink->ipc_buffer.size; s2.y_inc = nch; s1.x_rptr = src + nch - 1; @@ -227,10 +231,10 @@ static void src_1s_s32_default(struct comp_dev *dev, s1.times = n_times; s1.x_end_addr = source->end_addr; - s1.x_size = source->alloc_size; + s1.x_size = source->ipc_buffer.size; s1.x_inc = nch; s1.y_end_addr = sink->end_addr; - s1.y_size = sink->alloc_size; + s1.y_size = sink->ipc_buffer.size; s1.y_inc = nch; s1.x_rptr = src + nch - 1; s1.y_wptr = dest + nch - 1; @@ -263,7 +267,7 @@ static struct comp_dev *src_new(struct sof_ipc_comp *comp) { struct comp_dev *dev; struct sof_ipc_comp_src *src; - struct sof_ipc_comp_src *ipc_src = (struct sof_ipc_comp_src *)comp; + struct sof_ipc_comp_src *ipc_src = (struct sof_ipc_comp_src *) comp; struct comp_data *cd; int i; @@ -274,7 +278,7 @@ static struct comp_dev *src_new(struct sof_ipc_comp *comp) if (dev == NULL) return NULL; - src = (struct sof_ipc_comp_src *)&dev->comp; + src = (struct sof_ipc_comp_src *) &dev->comp; memcpy(src, ipc_src, sizeof(struct sof_ipc_comp_src)); cd = rmalloc(RZONE_RUNTIME, RFLAGS_NONE, sizeof(*cd)); @@ -317,6 +321,7 @@ static int src_params(struct comp_dev *dev, struct stream_params *params) int32_t *buffer_start; int n = 0; struct comp_data *cd = comp_get_drvdata(dev); + struct sof_ipc_comp_src *src = (struct sof_ipc_comp_src *) &dev->comp; trace_src("SPa"); @@ -325,23 +330,43 @@ static int src_params(struct comp_dev *dev, struct stream_params *params) || (params->pcm->frame_fmt != SOF_IPC_FRAME_S32_LE)) return -EINVAL; - /* No data transformation */ - comp_set_sink_params(dev, params); - - /* Allocate needed memory for delay lines */ source = list_first_item(&dev->bsource_list, struct comp_buffer, sink_list); sink = list_first_item(&dev->bsink_list, struct comp_buffer, source_list); - src_buffer_lengths(&need, source->params.pcm->rate, - sink->params.pcm->rate, source->params.pcm->channels); + + /* Copy PCM stream parameters and the channel map array */ + memcpy(&cd->pcm_params, &(*params->pcm), + sizeof(struct sof_ipc_pcm_params)); + for (i = 0; i < params->pcm->channels; i++) + cd->pcm_params.channel_map[i] = params->pcm->channel_map[i]; + + /* Point sink stream parameters to copy */ + sink->params.pcm = &cd->pcm_params; + + /* Stored IPC from src_new() contains the output rate for sink, + * set the new rate for sink. + */ + sink->params.pcm->rate = src->out_rate; + + /* Adjust sink buffer parameters to match fs_out/fs_in */ + sink->params.pcm->period_count = sink->params.pcm->period_count + * sink->params.pcm->rate / source->params.pcm->rate; + sink->params.pcm->period_bytes = sink->params.pcm->period_bytes + * sink->params.pcm->rate / source->params.pcm->rate; + + /* Allocate needed memory for delay lines */ + if (src_buffer_lengths(&need, source->params.pcm->rate, + sink->params.pcm->rate, source->params.pcm->channels) < 0) + return -EINVAL; + delay_lines_size = sizeof(int32_t) * need.total; if (cd->delay_lines != NULL) rfree(cd->delay_lines); cd->delay_lines = rmalloc(RZONE_RUNTIME, RFLAGS_NONE, delay_lines_size); if (cd->delay_lines == NULL) - return -EINVAL; + return -ENOMEM; /* Clear all delay lines here */ memset(cd->delay_lines, 0, delay_lines_size); @@ -369,19 +394,20 @@ static int src_params(struct comp_dev *dev, struct stream_params *params) */ trace_src("SFa"); cd->src_func = fallback_s32; - return(-EINVAL); - break; + rfree(cd->delay_lines); + return -EINVAL; } /* Check that src blk_in and blk_out are less than params.period_frames. * Return an error if the period is too short. */ - if (src_polyphase_get_blk_in(&cd->src[0]) > source->params.pcm->period_count) - return(-EINVAL); - - if (src_polyphase_get_blk_out(&cd->src[0]) > sink->params.pcm->period_count) - return(-EINVAL); + if (src_polyphase_get_blk_in(&cd->src[0]) + > source->params.pcm->period_count) + return -EINVAL; + if (src_polyphase_get_blk_out(&cd->src[0]) + > sink->params.pcm->period_count) + return -EINVAL; return 0; } @@ -453,7 +479,8 @@ static int src_copy(struct comp_dev *dev) struct comp_buffer *sink; uint32_t frames_source; uint32_t frames_sink; - int need_source, need_sink, min_frames; + int need_source, need_sink; + // int min_frames; trace_comp("SRC"); @@ -464,25 +491,12 @@ static int src_copy(struct comp_dev *dev) source_list); /* Check that source has enough frames available and sink enough - * frames free. + * frames free. Increase tried period_count if not sufficient to run. */ frames_source = source->params.pcm->period_count; frames_sink = sink->params.pcm->period_count; - min_frames = src_polyphase_get_blk_in(&cd->src[0]); - if (frames_source > min_frames) - need_source = frames_source * source->params.pcm->frame_size; - else { - frames_source = min_frames; - need_source = min_frames * source->params.pcm->frame_size; - } - - min_frames = src_polyphase_get_blk_out(&cd->src[0]); - if (frames_sink > min_frames) - need_sink = frames_sink * sink->params.pcm->frame_size; - else { - frames_sink = min_frames; - need_sink = min_frames * sink->params.pcm->frame_size; - } + need_source = source->params.pcm->period_bytes; + need_sink = sink->params.pcm->period_bytes; /* Run as many times as buffers allow */ while ((source->avail >= need_source) && (sink->free >= need_sink)) { diff --git a/src/include/reef/audio/buffer.h b/src/include/reef/audio/buffer.h index 5f2dbb7..0817a40 100644 --- a/src/include/reef/audio/buffer.h +++ b/src/include/reef/audio/buffer.h @@ -119,20 +119,20 @@ static inline void comp_update_sink_free_avail(struct comp_buffer *snk, int n) static inline void comp_wrap_source_r_ptr_circular(struct comp_buffer *src) { if (src->r_ptr >= src->end_addr) - src->r_ptr -= src->alloc_size; + src->r_ptr -= src->ipc_buffer.size; if (src->r_ptr < src->addr) - src->r_ptr += src->alloc_size; + src->r_ptr += src->ipc_buffer.size; } static inline void comp_wrap_sink_w_ptr_circular(struct comp_buffer *snk) { if (snk->w_ptr >= snk->end_addr) - snk->w_ptr -= snk->alloc_size; + snk->w_ptr -= snk->ipc_buffer.size; if (snk->w_ptr < snk->addr) - snk->w_ptr += snk->alloc_size; + snk->w_ptr += snk->ipc_buffer.size; } #endif diff --git a/src/include/uapi/ipc.h b/src/include/uapi/ipc.h index 3d78db3..d89039e 100644 --- a/src/include/uapi/ipc.h +++ b/src/include/uapi/ipc.h @@ -488,6 +488,7 @@ struct sof_ipc_comp_src { struct sof_ipc_pcm_comp pcm; uint32_t in_mask; /* SOF_RATE_ supported input rates */ uint32_t out_mask; /* SOF_RATE_ supported output rates */ + int32_t out_rate; } __attribute__((packed)); /* generic MUX component */ -- 2.11.0

2 4

[Sound-open-firmware] [PATCH] ipc: byt: use SOF_IPC_FW_READY for boot notification
by Liam Girdwood 26 Jun '17

26 Jun '17

Use global SOF_IPC_FW_READY to notify FW boot, Signed-off-by: Liam Girdwood <liam.r.girdwood(a)linux.intel.com> --- src/platform/baytrail/include/platform/platform.h | 2 -- src/platform/baytrail/platform.c | 2 +- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/src/platform/baytrail/include/platform/platform.h b/src/platform/baytrail/include/platform/platform.h index e016da7..8dac653 100644 --- a/src/platform/baytrail/include/platform/platform.h +++ b/src/platform/baytrail/include/platform/platform.h @@ -60,8 +60,6 @@ struct reef; #define PLATFORM_SCHEDULE_COST 200 -#define PLATFORM_FW_READY (0x1 << 29) - /* DMA treats PHY addresses as host address unless within DSP region */ #define PLATFORM_HOST_DMA_MASK 0xFF000000 diff --git a/src/platform/baytrail/platform.c b/src/platform/baytrail/platform.c index 77cb248..ab111c9 100644 --- a/src/platform/baytrail/platform.c +++ b/src/platform/baytrail/platform.c @@ -86,7 +86,7 @@ int platform_boot_complete(uint32_t boot_message) mailbox_outbox_write(0, &ready, sizeof(ready)); /* now interrupt host to tell it we are done booting */ - shim_write(SHIM_IPCDL, PLATFORM_FW_READY | outbox); + shim_write(SHIM_IPCDL, SOF_IPC_FW_READY | outbox); shim_write(SHIM_IPCDH, SHIM_IPCDH_BUSY); /* boot now complete so we can relax the CPU */ -- 2.11.0

1 1

[Sound-open-firmware] [PATCH 1/4] SRC: IPC updates and fixes
by Seppo Ingalsuo 26 Jun '17

26 Jun '17

SRC sets sink and downstream pipeline PCM rate in src_params() to received out_rate. Also the use of incorrect alloc_size is replaced by ipc_buffer.size. Signed-off-by: Seppo Ingalsuo <seppo.ingalsuo(a)linux.intel.com> --- src/audio/src.c | 22 +++++++++++++--------- src/include/reef/audio/buffer.h | 8 ++++---- src/include/uapi/ipc.h | 1 + 3 files changed, 18 insertions(+), 13 deletions(-) diff --git a/src/audio/src.c b/src/audio/src.c index c338220..58ecf4b 100644 --- a/src/audio/src.c +++ b/src/audio/src.c @@ -155,7 +155,7 @@ static void src_2s_s32_default(struct comp_dev *dev, s1.times = n_times1; s1.x_end_addr = source->end_addr; - s1.x_size = source->alloc_size; + s1.x_size = source->ipc_buffer.size; s1.x_inc = nch; s1.y_end_addr = &cd->delay_lines[cd->scratch_length]; s1.y_size = STAGE_BUF_SIZE * sizeof(int32_t); @@ -166,7 +166,7 @@ static void src_2s_s32_default(struct comp_dev *dev, s2.x_size = STAGE_BUF_SIZE * sizeof(int32_t); s2.x_inc = 1; s2.y_end_addr = sink->end_addr; - s2.y_size = sink->alloc_size; + s2.y_size = sink->ipc_buffer.size; s2.y_inc = nch; s1.x_rptr = src + nch - 1; @@ -227,10 +227,10 @@ static void src_1s_s32_default(struct comp_dev *dev, s1.times = n_times; s1.x_end_addr = source->end_addr; - s1.x_size = source->alloc_size; + s1.x_size = source->ipc_buffer.size; s1.x_inc = nch; s1.y_end_addr = sink->end_addr; - s1.y_size = sink->alloc_size; + s1.y_size = sink->ipc_buffer.size; s1.y_inc = nch; s1.x_rptr = src + nch - 1; s1.y_wptr = dest + nch - 1; @@ -263,7 +263,7 @@ static struct comp_dev *src_new(struct sof_ipc_comp *comp) { struct comp_dev *dev; struct sof_ipc_comp_src *src; - struct sof_ipc_comp_src *ipc_src = (struct sof_ipc_comp_src *)comp; + struct sof_ipc_comp_src *ipc_src = (struct sof_ipc_comp_src *) comp; struct comp_data *cd; int i; @@ -274,7 +274,7 @@ static struct comp_dev *src_new(struct sof_ipc_comp *comp) if (dev == NULL) return NULL; - src = (struct sof_ipc_comp_src *)&dev->comp; + src = (struct sof_ipc_comp_src *) &dev->comp; memcpy(src, ipc_src, sizeof(struct sof_ipc_comp_src)); cd = rmalloc(RZONE_RUNTIME, RFLAGS_NONE, sizeof(*cd)); @@ -317,6 +317,7 @@ static int src_params(struct comp_dev *dev, struct stream_params *params) int32_t *buffer_start; int n = 0; struct comp_data *cd = comp_get_drvdata(dev); + struct sof_ipc_comp_src *src = (struct sof_ipc_comp_src *) &dev->comp; trace_src("SPa"); @@ -325,7 +326,8 @@ static int src_params(struct comp_dev *dev, struct stream_params *params) || (params->pcm->frame_fmt != SOF_IPC_FRAME_S32_LE)) return -EINVAL; - /* No data transformation */ + /* Stored IPC from src_new() contains the output rate for sink */ + params->pcm->rate = src->out_rate; comp_set_sink_params(dev, params); /* Allocate needed memory for delay lines */ @@ -333,8 +335,10 @@ static int src_params(struct comp_dev *dev, struct stream_params *params) sink_list); sink = list_first_item(&dev->bsink_list, struct comp_buffer, source_list); - src_buffer_lengths(&need, source->params.pcm->rate, - sink->params.pcm->rate, source->params.pcm->channels); + if (src_buffer_lengths(&need, source->params.pcm->rate, + sink->params.pcm->rate, source->params.pcm->channels) < 0) + return -EINVAL; + delay_lines_size = sizeof(int32_t) * need.total; if (cd->delay_lines != NULL) rfree(cd->delay_lines); diff --git a/src/include/reef/audio/buffer.h b/src/include/reef/audio/buffer.h index 5f2dbb7..0817a40 100644 --- a/src/include/reef/audio/buffer.h +++ b/src/include/reef/audio/buffer.h @@ -119,20 +119,20 @@ static inline void comp_update_sink_free_avail(struct comp_buffer *snk, int n) static inline void comp_wrap_source_r_ptr_circular(struct comp_buffer *src) { if (src->r_ptr >= src->end_addr) - src->r_ptr -= src->alloc_size; + src->r_ptr -= src->ipc_buffer.size; if (src->r_ptr < src->addr) - src->r_ptr += src->alloc_size; + src->r_ptr += src->ipc_buffer.size; } static inline void comp_wrap_sink_w_ptr_circular(struct comp_buffer *snk) { if (snk->w_ptr >= snk->end_addr) - snk->w_ptr -= snk->alloc_size; + snk->w_ptr -= snk->ipc_buffer.size; if (snk->w_ptr < snk->addr) - snk->w_ptr += snk->alloc_size; + snk->w_ptr += snk->ipc_buffer.size; } #endif diff --git a/src/include/uapi/ipc.h b/src/include/uapi/ipc.h index 3d78db3..d89039e 100644 --- a/src/include/uapi/ipc.h +++ b/src/include/uapi/ipc.h @@ -488,6 +488,7 @@ struct sof_ipc_comp_src { struct sof_ipc_pcm_comp pcm; uint32_t in_mask; /* SOF_RATE_ supported input rates */ uint32_t out_mask; /* SOF_RATE_ supported output rates */ + int32_t out_rate; } __attribute__((packed)); /* generic MUX component */ -- 2.11.0

6 13

[Sound-open-firmware] [PATCH 1/3] rimage: show correct error on write failure.
by Liam Girdwood 15 Jun '17

15 Jun '17

Signed-off-by: Liam Girdwood <liam.r.girdwood(a)linux.intel.com> --- rimage/baytrail.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/rimage/baytrail.c b/rimage/baytrail.c index 12ccd23..ed1c840 100644 --- a/rimage/baytrail.c +++ b/rimage/baytrail.c @@ -159,7 +159,8 @@ int byt_write_modules(struct image *image) count = fwrite(&hdr, sizeof(hdr), 1, image->out_fd); if (count != 1) { - fprintf(stderr, "error: failed to write section header %d\n", i); + fprintf(stderr, "error: failed to write section header %d\n", + -errno); return -errno ; } -- 1.9.1

1 2

[Sound-open-firmware] [PATCH 1/2] comp: dai: remove extra memcpy()
by Liam Girdwood 15 Jun '17

15 Jun '17

No need to copy data twice during DAI init. Signed-off-by: Liam Girdwood <liam.r.girdwood(a)linux.intel.com> --- src/audio/dai.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/src/audio/dai.c b/src/audio/dai.c index d14c86a..98fe30e 100644 --- a/src/audio/dai.c +++ b/src/audio/dai.c @@ -190,8 +190,6 @@ static struct comp_dev *dai_new_ssp(struct sof_ipc_comp *comp) dai = (struct sof_ipc_comp_dai *)&dev->comp; memcpy(dai, ipc_dai, sizeof(struct sof_ipc_comp_dai)); - memcpy(&dev->comp, comp, sizeof(struct sof_ipc_comp_dai)); - dd = rzalloc(RZONE_RUNTIME, RFLAGS_NONE, sizeof(*dd)); if (dd == NULL) { rfree(dev); -- 1.9.1

1 1

[Sound-open-firmware] [PATCH] tone: The endpoint needs to be set
by Seppo Ingalsuo 14 Jun '17

14 Jun '17

The signal generator is an endpoint component so this needs to be set for the pipeline to function. Signed-off-by: Seppo Ingalsuo <seppo.ingalsuo(a)linux.intel.com> --- src/audio/tone.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/audio/tone.c b/src/audio/tone.c index 211d480..f45d8be 100644 --- a/src/audio/tone.c +++ b/src/audio/tone.c @@ -380,7 +380,7 @@ static struct comp_dev *tone_new(struct sof_ipc_comp *comp) } comp_set_drvdata(dev, cd); - + comp_set_endpoint(dev); tonegen_reset(&cd->sg); -- 2.11.0

2 1

[Sound-open-firmware] [PATCH] pipeline: set component pipeline ID when connecting components.
by Liam Girdwood 13 Jun '17

13 Jun '17

Signed-off-by: Liam Girdwood <liam.r.girdwood(a)linux.intel.com> --- src/audio/pipeline.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/audio/pipeline.c b/src/audio/pipeline.c index 37e45f5..7da9ab7 100644 --- a/src/audio/pipeline.c +++ b/src/audio/pipeline.c @@ -136,12 +136,14 @@ int pipeline_comp_connect(struct pipeline *p, struct comp_dev *source, spin_lock(&source->lock); list_item_prepend(&buffer->source_list, &source->bsink_list); buffer->source = source; + source->pipeline = p; spin_unlock(&source->lock); /* connect sink to buffer */ spin_lock(&sink->lock); list_item_prepend(&buffer->sink_list, &sink->bsource_list); buffer->sink = sink; + sink->pipeline = p; spin_unlock(&sink->lock); /* connect the components */ -- 2.11.0

1 0

[Sound-open-firmware] [PATCH 1/3] FIR equalizer: Fix a null pointer issue
by Seppo Ingalsuo 12 Jun '17

12 Jun '17

The cd->config could be passed as null pointer to eq_fir_setup() if the previous malloc() would fail. Signed-off-by: Seppo Ingalsuo <seppo.ingalsuo(a)linux.intel.com> --- src/audio/eq_fir.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/audio/eq_fir.c b/src/audio/eq_fir.c index 274393f..69e27fe 100644 --- a/src/audio/eq_fir.c +++ b/src/audio/eq_fir.c @@ -334,9 +334,10 @@ static int eq_fir_cmd(struct comp_dev *dev, int cmd, void *data) return -EINVAL; cd->config = rmalloc(RZONE_RUNTIME, RFLAGS_NONE, bs); - if (cd->config != NULL) - memcpy(cd->config, blob->data, bs); + if (cd->config == NULL) + return -EINVAL; + memcpy(cd->config, blob->data, bs); eq_fir_setup(cd->fir, cd->config, source->params.pcm->channels); break; case COMP_CMD_MUTE: -- 2.11.0

2 3

[Sound-open-firmware] [PATCH 1/4] pipeline: err might be used uninitialized in component_op_upstream()
by Liam Girdwood 09 Jun '17

09 Jun '17

Signed-off-by: Liam Girdwood <liam.r.girdwood(a)linux.intel.com> --- src/audio/pipeline.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/audio/pipeline.c b/src/audio/pipeline.c index e6bfda4..37e45f5 100644 --- a/src/audio/pipeline.c +++ b/src/audio/pipeline.c @@ -310,7 +310,7 @@ static int component_op_upstream(struct op_data *op_data, struct comp_dev *start, struct comp_dev *current, int op_start) { struct list_item *clist; - int err; + int err = 0; trace_pipe("CO+"); trace_value(current->comp.id); -- 2.11.0

1 3