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

[Sound-open-firmware] [PATCH v3] Passthrough component added
by Ranjani Sridharan 05 Sep '17

05 Sep '17

This patch adds a passthrough component that copies the input stream from the source buffer to the sink buffer. It is meant to serve as a template for creating new components. Signed-off-by: Ranjani Sridharan <ranjani.sridharan(a)linux.intel.com> --- src/audio/Makefile.am | 3 +- src/audio/passthrough.c | 238 +++++++++++++++++++++++++++++++++++++++++++++++ src/include/reef/trace.h | 1 + src/include/uapi/ipc.h | 7 ++ 4 files changed, 248 insertions(+), 1 deletion(-) create mode 100644 src/audio/passthrough.c diff --git a/src/audio/Makefile.am b/src/audio/Makefile.am index 285422e..c71430c 100644 --- a/src/audio/Makefile.am +++ b/src/audio/Makefile.am @@ -17,7 +17,8 @@ libaudio_a_SOURCES = \ pipeline.c \ pipeline_static.c \ component.c \ - buffer.c + buffer.c \ + passthrough.c libaudio_a_CFLAGS = \ $(ARCH_CFLAGS) \ diff --git a/src/audio/passthrough.c b/src/audio/passthrough.c new file mode 100644 index 0000000..420d502 --- /dev/null +++ b/src/audio/passthrough.c @@ -0,0 +1,238 @@ +/* + * Copyright (c) 2016, Intel Corporation + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions are met: + * * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * * Neither the name of the Intel Corporation nor the + * names of its contributors may be used to endorse or promote products + * derived from this software without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" + * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE + * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE + * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE + * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR + * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF + * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS + * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN + * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) + * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. + * + * Author: Ranjani Sridharan <ranjani.sridharan(a)linux.intel.com> + */ + +#include <stdio.h> +#include <stdint.h> +#include <stddef.h> +#include <reef/lock.h> +#include <reef/alloc.h> +#include <reef/list.h> +#include <reef/stream.h> +#include <reef/trace.h> +#include <reef/audio/component.h> +#include <reef/audio/pipeline.h> +#include <uapi/ipc.h> + +/* tracing */ +#define trace_pass(__e) trace_event(TRACE_CLASS_PASS, __e) +#define trace_pass_error(__e) trace_error(TRACE_CLASS_PASS, __e) +#define tracev_pass(__e) tracev_event(TRACE_CLASS_PASS, __e) + +/* The passthrough component, as the name inplies, allows the source buffer + * to pass through the component, without any processing, to the sink buffer. + * It supports 16-bits and 32-bits data formats. + * This code is intended to be used as a template for creating new components. + */ + +/* + * passthrough_comp_data structure: This is private data that cannot be touched + * outside the component. It contains: + * passthrough_func - function that performs the buffer copy + */ +struct passthrough_comp_data { + int (*passthrough_func)(struct comp_dev *dev, struct comp_buffer *sink, + struct comp_buffer *source, uint32_t frames); + +}; + +/* This function performs memcpy of the stream data from the source buffer to + * the sink buffer. It returns the number of frames that were copied. + */ +static int passthrough_function(struct comp_dev *dev, + struct comp_buffer *sink_buffer, + struct comp_buffer *source_buffer, uint32_t frames) +{ + struct sof_ipc_comp_config *config = COMP_GET_CONFIG(dev); + int32_t *src = (int32_t *) source_buffer->r_ptr; + int32_t *dest = (int32_t *) sink_buffer->w_ptr; + int nch = dev->params.channels; + + /* copy frames from source to destination */ + switch (config->frame_fmt) { + case SOF_IPC_FRAME_S16_LE: + memcpy(dest, src, frames * nch * sizeof(int16_t)); + break; + case SOF_IPC_FRAME_S32_LE: + case SOF_IPC_FRAME_S24_4LE: + case SOF_IPC_FRAME_FLOAT: + memcpy(dest, src, frames * nch * sizeof(int32_t)); + break; + default: + trace_pass_error("PTp"); + return -EINVAL; + } + + return frames; +} + +/* passthrough_new create the new passthrough component and allocates + * memory for the component and its private data. + * It returns a pointer to struct comp_dev that was created. + */ +static struct comp_dev *passthrough_new(struct sof_ipc_comp *comp) +{ + struct comp_dev *dev; + struct passthrough_comp_data *cd; + + trace_pass("PTn"); + dev = rzalloc(RZONE_RUNTIME, RFLAGS_NONE, + COMP_SIZE(struct sof_ipc_comp_passthrough)); + if (dev == NULL) + return NULL; + + memcpy(&dev->comp, comp, sizeof(struct sof_ipc_comp_passthrough)); + + cd = rzalloc(RZONE_RUNTIME, RFLAGS_NONE, sizeof(*cd)); + if (cd == NULL) { + rfree(dev); + return NULL; + } + + comp_set_drvdata(dev, cd); + cd->passthrough_func = passthrough_function; + + return dev; +} + +/* passthrough_free performs the clean-up */ +static void passthrough_free(struct comp_dev *dev) +{ + struct passthrough_comp_data *cd = comp_get_drvdata(dev); + + rfree(cd); + rfree(dev); +} + +/* passthrough_params sets the component audio stream parameters */ +static int passthrough_params(struct comp_dev *dev) +{ + return 0; +} + +/* passthrough_cmd is used to pass standard and bespoke commands (with data) + * to the component + */ +static int passthrough_cmd(struct comp_dev *dev, int cmd, void *data) +{ + int ret = 0; + + switch (cmd) { + case COMP_CMD_START: + case COMP_CMD_STOP: + case COMP_CMD_PAUSE: + case COMP_CMD_RELEASE: + default: + ret = comp_set_state(dev, cmd); + break; + } + + return ret; +} + +/* passthrough_copy is called when stream data flows through the pipeline + * It calls passthrough_function to copy the source buffer to the sink buffer. + * It returns the number of frames that were copied. + */ +static int passthrough_copy(struct comp_dev *dev) +{ + struct passthrough_comp_data *cd = comp_get_drvdata(dev); + struct comp_buffer *source_buffer = NULL, *sink_buffer = NULL; + uint32_t copy_bytes; + + /* get source and sink buffers */ + source_buffer = list_first_item(&dev->bsource_list, struct comp_buffer, + sink_list); + sink_buffer = list_first_item(&dev->bsink_list, struct comp_buffer, + source_list); + + /* check that source has enough frames available and sink enough + * frames free + */ + copy_bytes = comp_buffer_get_copy_bytes(dev, source_buffer, + sink_buffer); + + if (copy_bytes < dev->params.host_period_bytes) { + trace_pass_error("PTc"); + return -EINVAL; + } + + /* Run passthrough if buffers have enough room */ + cd->passthrough_func(dev, sink_buffer, source_buffer, dev->frames); + + comp_update_buffer_consume(source_buffer, + dev->params.host_period_bytes); + comp_update_buffer_produce(sink_buffer, dev->params.host_period_bytes); + + return dev->frames; +} + +/* passthrough_preload is used for preloading the component buffers before + * pipeline start + */ +static int passthrough_preload(struct comp_dev *dev) +{ + return passthrough_copy(dev); +} + +/* passthrough_reset rests the component state */ +static int passthrough_reset(struct comp_dev *dev) +{ + trace_pass("PTe"); + dev->state = COMP_STATE_INIT; + return 0; +} + +/* passthrough_prepare prepares the component for receiving stream data */ +static int passthrough_prepare(struct comp_dev *dev) +{ + trace_pass("PTl"); + dev->state = COMP_STATE_PREPARE; + return 0; +} + +/* passthrough component driver ops */ +struct comp_driver comp_passthrough = { + .type = SOF_COMP_PASSTHROUGH, + .ops = { + .new = passthrough_new, + .free = passthrough_free, + .params = passthrough_params, + .cmd = passthrough_cmd, + .copy = passthrough_copy, + .prepare = passthrough_prepare, + .reset = passthrough_reset, + .preload = passthrough_preload, + }, +}; + +void sys_comp_passthrough_init(void) +{ + comp_register(&comp_passthrough); +} diff --git a/src/include/reef/trace.h b/src/include/reef/trace.h index 300e8d8..b7ec31a 100644 --- a/src/include/reef/trace.h +++ b/src/include/reef/trace.h @@ -87,6 +87,7 @@ #define TRACE_CLASS_TONE (18 << 24) #define TRACE_CLASS_EQ_FIR (19 << 24) #define TRACE_CLASS_EQ_IIR (20 << 24) +#define TRACE_CLASS_PASS (21 << 24) /* move to config.h */ #define TRACE 1 diff --git a/src/include/uapi/ipc.h b/src/include/uapi/ipc.h index be4c9f2..127ecf1 100644 --- a/src/include/uapi/ipc.h +++ b/src/include/uapi/ipc.h @@ -516,6 +516,7 @@ enum sof_comp_type { SOF_COMP_EQ_FIR, SOF_COMP_FILEREAD, /* host test based file IO */ SOF_COMP_FILEWRITE, /* host test based file IO */ + SOF_COMP_PASSTHROUGH, }; /* XRUN action for component */ @@ -615,6 +616,12 @@ struct sof_ipc_comp_mux { struct sof_ipc_comp_config config; } __attribute__((packed)); +/* generic passthrough component */ +struct sof_ipc_comp_passthrough { + struct sof_ipc_comp comp; + struct sof_ipc_comp_config config; +} __attribute__((packed)); + /* generic tone generator component */ struct sof_ipc_comp_tone { struct sof_ipc_comp comp; -- 2.9.3

1 0

[Sound-open-firmware] [PATCH] component: data: Make component get/set data host API generic
by Liam Girdwood 05 Sep '17

05 Sep '17

Make the host API and IPC to set and get component runtime data and values generic with no bespoke commands at the IPC level. Create a generic structure that descibes the type and size of data and whether that data is appended to the IPC message or is available to be DMAed from host. Update the components to use the new structure. Some components like SRC, tone and tone still require some work to export thier ABI. Signed-off-by: Liam Girdwood <liam.r.girdwood(a)linux.intel.com> --- src/audio/eq_fir.c | 58 ++++++++++++++-------- src/audio/eq_iir.c | 53 +++++++++++++-------- src/audio/src.c | 31 ++++++++---- src/audio/tone.c | 49 +++++++++++++------ src/audio/volume.c | 71 +++++++++++++++------------ src/include/reef/audio/component.h | 25 +++++----- src/include/uapi/ipc.h | 98 +++++++++++++++++++++++--------------- src/ipc/intel-ipc.c | 53 ++++++--------------- 8 files changed, 254 insertions(+), 184 deletions(-) diff --git a/src/audio/eq_fir.c b/src/audio/eq_fir.c index 534a4a1..540c68f 100644 --- a/src/audio/eq_fir.c +++ b/src/audio/eq_fir.c @@ -299,26 +299,25 @@ static int eq_fir_params(struct comp_dev *dev) return 0; } -/* used to pass standard and bespoke commands (with data) to component */ -static int eq_fir_cmd(struct comp_dev *dev, int cmd, void *data) +static int fir_cmd(struct comp_dev *dev, struct sof_ipc_ctrl_data *cdata) { struct comp_data *cd = comp_get_drvdata(dev); - struct sof_ipc_eq_fir_blob *blob; - struct sof_ipc_eq_fir_switch *assign; - struct eq_fir_update *fir_update; - int i; - int ret = 0; + struct eq_fir_update *fir_update; /* TODO: move this to IPC as it's ABI */ size_t bs; + int i, ret = 0; - trace_src("cmd"); + /* TODO: determine if data is DMAed or appended to cdata */ - switch (cmd) { - case COMP_CMD_EQ_FIR_SWITCH: + switch (cdata->cmd) { + case SOF_CTRL_CMD_EQ_SWITCH: trace_src("EFx"); - assign = (struct sof_ipc_eq_fir_switch *) data; - fir_update = (struct eq_fir_update *) assign->data; + fir_update = (struct eq_fir_update *)cdata->data; ret = eq_fir_switch_response(cd->fir, cd->config, fir_update, PLATFORM_MAX_CHANNELS); + if (ret < 0) { + trace_src_error("ec1"); + return ret; + } /* Print trace information */ tracev_value(fir_update->stream_max_channels); @@ -326,14 +325,13 @@ static int eq_fir_cmd(struct comp_dev *dev, int cmd, void *data) tracev_value(fir_update->assign_response[i]); break; - case COMP_CMD_EQ_FIR_CONFIG: + case SOF_CTRL_CMD_EQ_CONFIG: trace_src("EFc"); /* Check and free old config */ eq_fir_free_parameters(&cd->config); /* Copy new config, need to decode data to know the size */ - blob = (struct sof_ipc_eq_fir_blob *) data; - bs = blob->comp.hdr.size - sizeof(struct sof_ipc_hdr); + bs = cdata->num_elems; if (bs > EQ_FIR_MAX_BLOB_SIZE) return -EINVAL; @@ -341,7 +339,7 @@ static int eq_fir_cmd(struct comp_dev *dev, int cmd, void *data) if (cd->config == NULL) return -EINVAL; - memcpy(cd->config, blob->data, bs); + memcpy(cd->config, cdata->data, bs); ret = eq_fir_setup(cd->fir, cd->config, PLATFORM_MAX_CHANNELS); /* Print trace information */ @@ -349,20 +347,40 @@ static int eq_fir_cmd(struct comp_dev *dev, int cmd, void *data) tracev_value(cd->config->number_of_responses_defined); for (i = 0; i < cd->config->stream_max_channels; i++) tracev_value(cd->config->assign_response[i]); - break; - case COMP_CMD_MUTE: + case SOF_CTRL_CMD_MUTE: trace_src("EFm"); for (i = 0; i < PLATFORM_MAX_CHANNELS; i++) fir_mute(&cd->fir[i]); break; - case COMP_CMD_UNMUTE: + case SOF_CTRL_CMD_UNMUTE: trace_src("EFu"); for (i = 0; i < PLATFORM_MAX_CHANNELS; i++) fir_unmute(&cd->fir[i]); break; + default: + trace_src_error("ec1"); + ret = -EINVAL; + break; + } + + return ret; +} + +/* used to pass standard and bespoke commands (with data) to component */ +static int eq_fir_cmd(struct comp_dev *dev, int cmd, void *data) +{ + struct sof_ipc_ctrl_data *cdata = data; + int ret = 0; + + trace_src("cmd"); + + switch (cmd) { + case COMP_CMD_SET_DATA: + ret = fir_cmd(dev, cdata); + break; case COMP_CMD_START: trace_src("EFs"); dev->state = COMP_STATE_RUNNING; @@ -389,6 +407,8 @@ static int eq_fir_cmd(struct comp_dev *dev, int cmd, void *data) break; default: trace_src("EDf"); + ret = -EINVAL; + break; } return ret; diff --git a/src/audio/eq_iir.c b/src/audio/eq_iir.c index 0ac2ef9..f75be71 100644 --- a/src/audio/eq_iir.c +++ b/src/audio/eq_iir.c @@ -303,24 +303,17 @@ static int eq_iir_params(struct comp_dev *dev) return 0; } -/* used to pass standard and bespoke commands (with data) to component */ -static int eq_iir_cmd(struct comp_dev *dev, int cmd, void *data) +static int iir_cmd(struct comp_dev *dev, struct sof_ipc_ctrl_data *cdata) { struct comp_data *cd = comp_get_drvdata(dev); - struct sof_ipc_eq_iir_switch *assign; - struct sof_ipc_eq_iir_blob *blob; - struct eq_iir_update *iir_update; - int i; - int ret = 0; + struct eq_iir_update *iir_update; /* TODO: move to IPC header as part of ABI */ + int i, ret = 0; size_t bs; - trace_eq_iir("cmd"); - - switch (cmd) { - case COMP_CMD_EQ_IIR_SWITCH: + switch (cdata->cmd) { + case SOF_CTRL_CMD_EQ_SWITCH: trace_eq_iir("EFx"); - assign = (struct sof_ipc_eq_iir_switch *) data; - iir_update = (struct eq_iir_update *) assign->data; + iir_update = (struct eq_iir_update *) cdata->data; ret = eq_iir_switch_response(cd->iir, cd->config, iir_update, PLATFORM_MAX_CHANNELS); @@ -330,15 +323,13 @@ static int eq_iir_cmd(struct comp_dev *dev, int cmd, void *data) tracev_value(iir_update->assign_response[i]); break; - case COMP_CMD_EQ_IIR_CONFIG: + case SOF_CTRL_CMD_EQ_CONFIG: trace_eq_iir("EFc"); /* Check and free old config */ eq_iir_free_parameters(&cd->config); /* Copy new config, need to decode data to know the size */ - blob = (struct sof_ipc_eq_iir_blob *) data; - bs = blob->comp.hdr.size - sizeof(struct sof_ipc_hdr) - - sizeof(struct sof_ipc_host_buffer); + bs = cdata->num_elems; if (bs > EQ_IIR_MAX_BLOB_SIZE) return -EINVAL; @@ -347,7 +338,7 @@ static int eq_iir_cmd(struct comp_dev *dev, int cmd, void *data) if (cd->config == NULL) return -EINVAL; - memcpy(cd->config, blob->data, bs); + memcpy(cd->config, cdata->data, bs); /* Initialize all channels, the actual number of channels may * not be set yet. */ @@ -360,18 +351,39 @@ static int eq_iir_cmd(struct comp_dev *dev, int cmd, void *data) tracev_value(cd->config->assign_response[i]); break; - case COMP_CMD_MUTE: + case SOF_CTRL_CMD_MUTE: trace_eq_iir("EFm"); for (i = 0; i < PLATFORM_MAX_CHANNELS; i++) iir_mute_df2t(&cd->iir[i]); break; - case COMP_CMD_UNMUTE: + case SOF_CTRL_CMD_UNMUTE: trace_eq_iir("EFu"); for (i = 0; i < PLATFORM_MAX_CHANNELS; i++) iir_unmute_df2t(&cd->iir[i]); break; + default: + trace_eq_iir_error("ec1"); + ret = -EINVAL; + break; + } + + return ret; +} + +/* used to pass standard and bespoke commands (with data) to component */ +static int eq_iir_cmd(struct comp_dev *dev, int cmd, void *data) +{ + struct sof_ipc_ctrl_data *cdata = data; + int ret = 0; + + trace_eq_iir("cmd"); + + switch (cmd) { + case COMP_CMD_SET_DATA: + ret = iir_cmd(dev, cdata); + break; case COMP_CMD_START: trace_eq_iir("EFs"); dev->state = COMP_STATE_RUNNING; @@ -398,6 +410,7 @@ static int eq_iir_cmd(struct comp_dev *dev, int cmd, void *data) break; default: trace_eq_iir("EDf"); + ret = -EINVAL; break; } diff --git a/src/audio/src.c b/src/audio/src.c index 0279841..5dd8345 100644 --- a/src/audio/src.c +++ b/src/audio/src.c @@ -376,29 +376,42 @@ static int src_params(struct comp_dev *dev) return 0; } -/* used to pass standard and bespoke commands (with data) to component */ -static int src_cmd(struct comp_dev *dev, int cmd, void *data) +static int src_ctrl_cmd(struct comp_dev *dev, struct sof_ipc_ctrl_data *cdata) { - trace_src("SCm"); struct comp_data *cd = comp_get_drvdata(dev); int i; - switch (cmd) { - case COMP_CMD_SRC: - trace_src("SMa"); - break; - case COMP_CMD_MUTE: + switch (cdata->cmd) { + case SOF_CTRL_CMD_MUTE: trace_src("SMu"); for (i = 0; i < PLATFORM_MAX_CHANNELS; i++) src_polyphase_mute(&cd->src[i]); break; - case COMP_CMD_UNMUTE: + case SOF_CTRL_CMD_UNMUTE: trace_src("SUm"); for (i = 0; i < PLATFORM_MAX_CHANNELS; i++) src_polyphase_unmute(&cd->src[i]); break; + default: + trace_src_error("ec1"); + return -EINVAL; + } + + return 0; +} + +/* used to pass standard and bespoke commands (with data) to component */ +static int src_cmd(struct comp_dev *dev, int cmd, void *data) +{ + struct sof_ipc_ctrl_data *cdata = data; + + trace_src("SCm"); + + switch (cmd) { + case COMP_CMD_SET_VALUE: + return src_ctrl_cmd(dev, cdata); case COMP_CMD_START: trace_src("SSt"); dev->state = COMP_STATE_RUNNING; diff --git a/src/audio/tone.c b/src/audio/tone.c index cbc50ac..448c472 100644 --- a/src/audio/tone.c +++ b/src/audio/tone.c @@ -229,6 +229,7 @@ static inline void tonegen_set_f(struct tone_state *sg, int32_t f) sg->f = f; } +#if 0 /* Tone sweep parameters description: * fc - Multiplication factor for frequency as Q2.30 for logarithmic change * ac - Multiplication factor for amplitude as Q2.30 for logarithmic change @@ -250,6 +251,7 @@ static void tonegen_set_sweep(struct tone_state *sg, int32_t fc, int32_t ac, sg->tone_length = (l > 0) ? l : INT32_MAXVALUE; /* Count rate 125 us */ sg->tone_period = (p > 0) ? p : INT32_MAXVALUE; /* Count rate 125 us */ } +#endif /* Tone ramp parameters: * step - Value that is added or subtracted to amplitude. A zero or negative @@ -428,16 +430,22 @@ static int tone_params(struct comp_dev *dev) return 0; } -/* used to pass standard and bespoke commands (with data) to component */ -static int tone_cmd(struct comp_dev *dev, int cmd, void *data) +static int tone_ctrl_cmd(struct comp_dev *dev, struct sof_ipc_ctrl_data *cdata) { struct comp_data *cd = comp_get_drvdata(dev); - struct sof_ipc_comp_tone *ct; - - trace_tone("tri"); - switch (cmd) { - case COMP_CMD_TONE: + switch (cdata->cmd) { + case SOF_CTRL_CMD_MUTE: + trace_tone("TMu"); + tonegen_mute(&cd->sg); + break; + case SOF_CTRL_CMD_UNMUTE: + trace_tone("TUm"); + tonegen_unmute(&cd->sg); + break; +/* TODO: use comp value list array to set this */ +#if 0 + case SOF_CTRL_TYPE_VALUE_COMP_SET: trace_tone("Tto"); ct = (struct sof_ipc_comp_tone *) data; /* Ignore channels while tone implementation is mono */ @@ -447,14 +455,25 @@ static int tone_cmd(struct comp_dev *dev, int cmd, void *data) ct->length, ct->period, ct->repeats); tonegen_set_linramp(&cd->sg, ct->ramp_step); break; - case COMP_CMD_MUTE: - trace_tone("TMu"); - tonegen_mute(&cd->sg); - break; - case COMP_CMD_UNMUTE: - trace_tone("TUm"); - tonegen_unmute(&cd->sg); - break; +#endif + default: + trace_tone_error("ec1"); + return -EINVAL; + } + + return 0; +} + +/* used to pass standard and bespoke commands (with data) to component */ +static int tone_cmd(struct comp_dev *dev, int cmd, void *data) +{ + struct sof_ipc_ctrl_data *cdata = data; + + trace_tone("tri"); + + switch (cmd) { + case COMP_CMD_SET_VALUE: + return tone_ctrl_cmd(dev, cdata); case COMP_CMD_START: trace_tone("TSt"); dev->state = COMP_STATE_RUNNING; diff --git a/src/audio/volume.c b/src/audio/volume.c index 93a3839..6cbd6ff 100644 --- a/src/audio/volume.c +++ b/src/audio/volume.c @@ -69,16 +69,16 @@ struct comp_data { uint32_t sink_period_bytes; enum sof_ipc_frame source_format; enum sof_ipc_frame sink_format; - uint32_t chan[PLATFORM_MAX_CHANNELS]; - uint32_t volume[PLATFORM_MAX_CHANNELS]; /* current volume */ - uint32_t tvolume[PLATFORM_MAX_CHANNELS]; /* target volume */ - uint32_t mvolume[PLATFORM_MAX_CHANNELS]; /* mute volume */ + uint32_t chan[SOF_IPC_MAX_CHANNELS]; + uint32_t volume[SOF_IPC_MAX_CHANNELS]; /* current volume */ + uint32_t tvolume[SOF_IPC_MAX_CHANNELS]; /* target volume */ + uint32_t mvolume[SOF_IPC_MAX_CHANNELS]; /* mute volume */ void (*scale_vol)(struct comp_dev *dev, struct comp_buffer *sink, struct comp_buffer *source, uint32_t frames); struct work volwork; /* host volume readback */ - struct sof_ipc_ctrl_values *hvol; + struct sof_ipc_ctrl_value_chan *hvol; }; struct comp_func_map { @@ -234,9 +234,9 @@ static void vol_sync_host(struct comp_data *cd, uint32_t chan) if (cd->hvol == NULL) return; - for (i = 0; i < cd->hvol->num_values; i++) { - if (cd->hvol->values[i].channel == cd->chan[chan]) - cd->hvol->values[i].value = cd->volume[chan]; + for (i = 0; i < SOF_IPC_MAX_CHANNELS; i++) { + if (cd->hvol[i].channel == cd->chan[chan]) + cd->hvol[i].value = cd->volume[chan]; } } @@ -380,50 +380,61 @@ static inline void volume_set_chan_unmute(struct comp_dev *dev, int chan) cd->tvolume[chan] = cd->mvolume[chan]; } -/* used to pass standard and bespoke commands (with data) to component */ -static int volume_cmd(struct comp_dev *dev, int cmd, void *data) +static int volume_ctrl_cmd(struct comp_dev *dev, struct sof_ipc_ctrl_data *cdata) { struct comp_data *cd = comp_get_drvdata(dev); - struct sof_ipc_ctrl_values *cv; int i, j; - trace_volume("cmd"); - - switch (cmd) { - case COMP_CMD_VOLUME: - cv = (struct sof_ipc_ctrl_values*)data; + switch (cdata->cmd) { + case SOF_CTRL_CMD_VOLUME: - for (i = 0; i < PLATFORM_MAX_CHANNELS; i++) { - for (j = 0; j < cv->num_values; j++) { - if (cv->values[j].channel == cd->chan[i]) - volume_set_chan(dev, i, cv->values[j].value); + for (i = 0; i < SOF_IPC_MAX_CHANNELS; i++) { + for (j = 0; j < cdata->num_elems; j++) { + if (cdata->chanv[j].value == cd->chan[i]) + volume_set_chan(dev, i, cdata->chanv[j].value); } } work_schedule_default(&cd->volwork, VOL_RAMP_US); break; - case COMP_CMD_MUTE: - cv = (struct sof_ipc_ctrl_values*)data; + case SOF_CTRL_CMD_MUTE: - for (i = 0; i < PLATFORM_MAX_CHANNELS; i++) { - for (j = 0; j < cv->num_values; j++) { - if (cv->values[j].channel == cd->chan[i]) + for (i = 0; i < SOF_IPC_MAX_CHANNELS; i++) { + for (j = 0; j < cdata->num_elems; j++) { + if (cdata->chanv[j].value == cd->chan[i]) volume_set_chan_mute(dev, i); } } work_schedule_default(&cd->volwork, VOL_RAMP_US); break; - case COMP_CMD_UNMUTE: - cv = (struct sof_ipc_ctrl_values*)data; + case SOF_CTRL_CMD_UNMUTE: - for (i = 0; i < PLATFORM_MAX_CHANNELS; i++) { - for (j = 0; j < cv->num_values; j++) { - if (cv->values[j].channel == cd->chan[i]) + for (i = 0; i < SOF_IPC_MAX_CHANNELS; i++) { + for (j = 0; j < cdata->num_elems; j++) { + if (cdata->chanv[j].value == cd->chan[i]) volume_set_chan_unmute(dev, i); } } work_schedule_default(&cd->volwork, VOL_RAMP_US); break; + default: + trace_volume_error("ec1"); + return -EINVAL; + } + + return 0; +} + +/* used to pass standard and bespoke commands (with data) to component */ +static int volume_cmd(struct comp_dev *dev, int cmd, void *data) +{ + struct sof_ipc_ctrl_data *cdata = data; + + trace_volume("cmd"); + + switch (cmd) { + case COMP_CMD_SET_VALUE: + return volume_ctrl_cmd(dev, cdata); case COMP_CMD_START: dev->state = COMP_STATE_RUNNING; break; diff --git a/src/include/reef/audio/component.h b/src/include/reef/audio/component.h index e73a22a..35c80de 100644 --- a/src/include/reef/audio/component.h +++ b/src/include/reef/audio/component.h @@ -59,7 +59,9 @@ #define COMP_STATE_PAUSED 5 /* component paused */ #define COMP_STATE_RUNNING 6 /* component active */ -/* standard component commands */ +/* + * standard component stream commands + */ #define COMP_CMD_STOP 0 /* stop component stream */ #define COMP_CMD_START 1 /* start component stream */ @@ -69,18 +71,15 @@ #define COMP_CMD_SUSPEND 5 /* suspend component */ #define COMP_CMD_RESUME 6 /* resume component */ -#define COMP_CMD_VOLUME 100 -#define COMP_CMD_MUTE 101 -#define COMP_CMD_UNMUTE 102 -#define COMP_CMD_ROUTE 103 -#define COMP_CMD_SRC 104 -#define COMP_CMD_LOOPBACK 105 - -#define COMP_CMD_TONE 106 /* Tone generator amplitude and frequency */ -#define COMP_CMD_EQ_FIR_CONFIG 107 /* Configuration data for FIR EQ */ -#define COMP_CMD_EQ_FIR_SWITCH 108 /* Update request for FIR EQ */ -#define COMP_CMD_EQ_IIR_CONFIG 109 /* Configuration data for IIR EQ */ -#define COMP_CMD_EQ_IIR_SWITCH 110 /* Response update request for IIR EQ */ +/* + * standard component control commands + */ + +#define COMP_CMD_SET_VALUE 100 +#define COMP_CMD_GET_VALUE 101 +#define COMP_CMD_SET_DATA 102 +#define COMP_CMD_GET_DATA 103 + /* MMAP IPC status */ #define COMP_CMD_IPC_MMAP_RPOS 200 /* host read position */ diff --git a/src/include/uapi/ipc.h b/src/include/uapi/ipc.h index 053390c..c8cdedb 100644 --- a/src/include/uapi/ipc.h +++ b/src/include/uapi/ipc.h @@ -88,15 +88,12 @@ #define SOF_IPC_PM_CLK_GET SOF_CMD_TYPE(0x005) #define SOF_IPC_PM_CLK_REQ SOF_CMD_TYPE(0x006) -/* component - multiple different types */ -#define SOF_IPC_COMP_SET_VOLUME SOF_CMD_TYPE(0x001) -#define SOF_IPC_COMP_GET_VOLUME SOF_CMD_TYPE(0x002) -#define SOF_IPC_COMP_SET_MIXER SOF_CMD_TYPE(0x003) -#define SOF_IPC_COMP_GET_MIXER SOF_CMD_TYPE(0x004) -#define SOF_IPC_COMP_SET_MUX SOF_CMD_TYPE(0x005) -#define SOF_IPC_COMP_GET_MUX SOF_CMD_TYPE(0x006) -#define SOF_IPC_COMP_SET_SRC SOF_CMD_TYPE(0x007) -#define SOF_IPC_COMP_GET_SRC SOF_CMD_TYPE(0x008) +/* component runtime config - multiple different types */ +#define SOF_IPC_COMP_SET_VALUE SOF_CMD_TYPE(0x001) +#define SOF_IPC_COMP_GET_VALUE SOF_CMD_TYPE(0x002) +#define SOF_IPC_COMP_SET_DATA SOF_CMD_TYPE(0x003) +#define SOF_IPC_COMP_GET_DATA SOF_CMD_TYPE(0x004) + /* DAI messages */ #define SOF_IPC_DAI_CONFIG SOF_CMD_TYPE(0x001) @@ -433,24 +430,69 @@ struct sof_ipc_stream_posn { * Component Mixers and Controls */ -struct sof_ipc_ctrl_chan { +/* control data type and direction */ +enum sof_ipc_ctrl_type { + SOF_CTRL_TYPE_VALUE_CHAN_GET = 0, + SOF_CTRL_TYPE_VALUE_CHAN_SET, + SOF_CTRL_TYPE_VALUE_COMP_GET, + SOF_CTRL_TYPE_VALUE_COMP_SET, + SOF_CTRL_TYPE_DATA_GET, + SOF_CTRL_TYPE_DATA_SET, +}; + +/* control command type */ +enum sof_ipc_ctrl_cmd { + SOF_CTRL_CMD_VOLUME = 0, + SOF_CTRL_CMD_ROUTE, + SOF_CTRL_CMD_SRC, + SOF_CTRL_CMD_LOOPBACK, + SOF_CTRL_CMD_EQ_SWITCH, + SOF_CTRL_CMD_EQ_CONFIG, + /* Mute is similar to volume, but maps better onto ALSA switch controls */ + SOF_CTRL_CMD_MUTE, + SOF_CTRL_CMD_UNMUTE, +}; + +/* generic channel mapped value data */ +struct sof_ipc_ctrl_value_chan { enum sof_ipc_chmap channel; uint32_t value; } __attribute__((packed)); -struct sof_ipc_ctrl_values { - struct sof_ipc_hdr hdr; - uint32_t comp_id; - uint32_t num_values; - struct sof_ipc_ctrl_chan values[SOF_IPC_MAX_CHANNELS]; +/* generic component mapped value data */ +struct sof_ipc_ctrl_value_comp { + uint32_t index; /* component source/sink/control index in control */ + union { + uint32_t uvalue; + int32_t svalue; + }; } __attribute__((packed)); -struct sof_ipc_ctrl_get_values { +/* generic control data */ +struct sof_ipc_ctrl_data { struct sof_ipc_hdr hdr; uint32_t comp_id; - uint32_t num_values; + + /* control access and data type */ + enum sof_ipc_ctrl_type type; + enum sof_ipc_ctrl_cmd cmd; + + /* control data - can either be appended or DMAed from host */ + struct sof_ipc_host_buffer buffer; + uint32_t num_elems; /* in array elems or bytes */ + + /* control data - add new types if needed */ + union { + /* channel values can be used by volume type controls */ + struct sof_ipc_ctrl_value_chan chanv[0]; + /* component values used by routing controls like mux, mixer */ + struct sof_ipc_ctrl_value_comp compv[0]; + /* data can be used by binary controls */ + char data[0]; + }; } __attribute__((packed)); + /* * Component */ @@ -599,28 +641,6 @@ struct sof_ipc_comp_eq_iir { struct sof_ipc_comp_config config; } __attribute__((packed)); -/* IPC to pass configuration blobs to equalizers and re-assign responses */ -struct sof_ipc_eq_fir_blob { - struct sof_ipc_comp comp; - struct sof_ipc_host_buffer buffer; - int32_t data[]; -} __attribute__((packed)); - -struct sof_ipc_eq_iir_blob { - struct sof_ipc_comp comp; - struct sof_ipc_host_buffer buffer; - int32_t data[]; -} __attribute__((packed)); - -struct sof_ipc_eq_fir_switch { - struct sof_ipc_comp comp; - int32_t data[]; -} __attribute__((packed)); - -struct sof_ipc_eq_iir_switch { - struct sof_ipc_comp comp; - int32_t data[]; -} __attribute__((packed)); /* frees components, buffers and pipelines * SOF_IPC_TPLG_COMP_FREE, SOF_IPC_TPLG_PIPE_FREE, SOF_IPC_TPLG_BUFFER_FREE diff --git a/src/ipc/intel-ipc.c b/src/ipc/intel-ipc.c index 60001c3..4f397c1 100644 --- a/src/ipc/intel-ipc.c +++ b/src/ipc/intel-ipc.c @@ -559,48 +559,31 @@ static int ipc_glb_pm_message(uint32_t header) * Topology IPC Operations. */ -static int ipc_comp_set_value(uint32_t header, uint32_t cmd) +/* get/set component values or runtime data */ +static int ipc_comp_value(uint32_t header, uint32_t cmd) { struct ipc_comp_dev *stream_dev; - struct sof_ipc_ctrl_values *values = _ipc->comp_data; - - trace_ipc("VoS"); - - /* get the component */ - stream_dev = ipc_get_comp(_ipc, values->comp_id); - if (stream_dev == NULL) { - trace_ipc_error("eVs"); - return -ENODEV; - } - - /* set component values */ - return comp_cmd(stream_dev->cd, cmd, values); -} - -static int ipc_comp_get_value(uint32_t header, uint32_t cmd) -{ - struct ipc_comp_dev *stream_dev; - struct sof_ipc_ctrl_values *values = _ipc->comp_data; + struct sof_ipc_ctrl_data *data = _ipc->comp_data; int ret; trace_ipc("VoG"); /* get the component */ - stream_dev = ipc_get_comp(_ipc, values->comp_id); + stream_dev = ipc_get_comp(_ipc, data->comp_id); if (stream_dev == NULL){ trace_ipc_error("eVg"); return -ENODEV; } /* get component values */ - ret = comp_cmd(stream_dev->cd, COMP_CMD_VOLUME, values); + ret = comp_cmd(stream_dev->cd, cmd, data); if (ret < 0) { trace_ipc_error("eVG"); return ret; } /* write component values to the outbox */ - mailbox_outbox_write(values, 0, sizeof(*values)); + mailbox_outbox_write(0, data, data->hdr.size); return 0; } @@ -610,22 +593,14 @@ static int ipc_glb_comp_message(uint32_t header) uint32_t cmd = (header & SOF_CMD_TYPE_MASK) >> SOF_CMD_TYPE_SHIFT; switch (cmd) { - case iCS(SOF_IPC_COMP_SET_VOLUME): - return ipc_comp_set_value(header, COMP_CMD_VOLUME); - case iCS(SOF_IPC_COMP_GET_VOLUME): - return ipc_comp_get_value(header, COMP_CMD_VOLUME); - case iCS(SOF_IPC_COMP_SET_MIXER): - return ipc_comp_set_value(header, COMP_CMD_ROUTE); - case iCS(SOF_IPC_COMP_GET_MIXER): - return ipc_comp_get_value(header, COMP_CMD_ROUTE); - case iCS(SOF_IPC_COMP_SET_MUX): - return ipc_comp_set_value(header, COMP_CMD_ROUTE); - case iCS(SOF_IPC_COMP_GET_MUX): - return ipc_comp_get_value(header, COMP_CMD_ROUTE); - case iCS(SOF_IPC_COMP_SET_SRC): - return ipc_comp_set_value(header, COMP_CMD_SRC); - case iCS(SOF_IPC_COMP_GET_SRC): - return ipc_comp_get_value(header, COMP_CMD_SRC); + case iCS(SOF_IPC_COMP_SET_VALUE): + return ipc_comp_value(header, COMP_CMD_SET_VALUE); + case iCS(SOF_IPC_COMP_GET_VALUE): + return ipc_comp_value(header, COMP_CMD_GET_VALUE); + case iCS(SOF_IPC_COMP_SET_DATA): + return ipc_comp_value(header, COMP_CMD_SET_DATA); + case iCS(SOF_IPC_COMP_GET_DATA): + return ipc_comp_value(header, COMP_CMD_GET_DATA); default: trace_ipc_error("eCc"); trace_value(header); -- 2.11.0

2 1

[Sound-open-firmware] [PATCH v2 2/2] Passthrough component added
by Ranjani Sridharan 05 Sep '17

05 Sep '17

This patch adds a passthrough component that copies the input stream from the source buffer to the sink buffer. It is meant to serve as a template for creating new components. Signed-off-by: Ranjani Sridharan <ranjani.sridharan(a)linux.intel.com> --- src/audio/Makefile.am | 3 +- src/audio/passthrough.c | 238 +++++++++++++++++++++++++++++++++++++++++++++++ src/include/reef/trace.h | 1 + src/include/uapi/ipc.h | 7 ++ 4 files changed, 248 insertions(+), 1 deletion(-) create mode 100644 src/audio/passthrough.c diff --git a/src/audio/Makefile.am b/src/audio/Makefile.am index 285422e..c71430c 100644 --- a/src/audio/Makefile.am +++ b/src/audio/Makefile.am @@ -17,7 +17,8 @@ libaudio_a_SOURCES = \ pipeline.c \ pipeline_static.c \ component.c \ - buffer.c + buffer.c \ + passthrough.c libaudio_a_CFLAGS = \ $(ARCH_CFLAGS) \ diff --git a/src/audio/passthrough.c b/src/audio/passthrough.c new file mode 100644 index 0000000..4163db9 --- /dev/null +++ b/src/audio/passthrough.c @@ -0,0 +1,238 @@ +/* + * Copyright (c) 2016, Intel Corporation + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions are met: + * * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * * Neither the name of the Intel Corporation nor the + * names of its contributors may be used to endorse or promote products + * derived from this software without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" + * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE + * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE + * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE + * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR + * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF + * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS + * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN + * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) + * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. + * + * Author: Ranjani Sridharan <ranjani.sridharan(a)linux.intel.com> + */ + +#include <stdio.h> +#include <stdint.h> +#include <stddef.h> +#include <reef/lock.h> +#include <reef/alloc.h> +#include <reef/list.h> +#include <reef/stream.h> +#include <reef/trace.h> +#include <reef/audio/component.h> +#include <reef/audio/pipeline.h> +#include <uapi/ipc.h> + +/* tracing */ +#define trace_pass(__e) trace_event(TRACE_CLASS_PASS, __e) +#define trace_pass_error(__e) trace_error(TRACE_CLASS_PASS, __e) +#define tracev_pass(__e) tracev_event(TRACE_CLASS_PASS, __e) + +/* The passthrough component, as the name inplies, allows the source buffer + * to pass through the component, without any processing, to the sink buffer. + * It supports 16-bits and 32-bits data formats. + * This code is intended to be used as a template for creating new components. + */ + +/* + * passthrough_comp_data structure: This is private data that cannot be touched + * outside the component. It contains: + * passthrough_func - function that performs the buffer copy + */ +struct passthrough_comp_data { + int (*passthrough_func)(struct comp_dev *dev, struct comp_buffer *sink, + struct comp_buffer *source, uint32_t frames); + +}; + +/* This function performs memcpy of the stream data from the source buffer to + * the sink buffer. It returns the number of frames that were copied. + */ +static int passthrough_function(struct comp_dev *dev, + struct comp_buffer *sink_buffer, + struct comp_buffer *source_buffer, uint32_t frames) +{ + struct sof_ipc_comp_config *config = COMP_GET_CONFIG(dev); + int32_t *src = (int32_t *) source_buffer->r_ptr; + int32_t *dest = (int32_t *) sink_buffer->w_ptr; + int nch = dev->params.channels; + + /* copy frames from source to destination */ + switch (config->frame_fmt) { + case SOF_IPC_FRAME_S16_LE: + memcpy(dest, src, frames * nch * sizeof(int16_t)); + break; + case SOF_IPC_FRAME_S32_LE: + case SOF_IPC_FRAME_S24_4LE: + case SOF_IPC_FRAME_FLOAT: + memcpy(dest, src, frames * nch * sizeof(int32_t)); + break; + default: + trace_pass_error("PTp"); + return -EINVAL; + } + + return frames; +} + +/* passthrough_new create the new passthrough component and allocates + * memory for the component and its private data. + * It returns a pointer to struct comp_dev that was created. + */ +static struct comp_dev *passthrough_new(struct sof_ipc_comp *comp) +{ + struct comp_dev *dev; + struct passthrough_comp_data *cd; + + trace_pass("PTn"); + dev = rzalloc(RZONE_RUNTIME, RFLAGS_NONE, + COMP_SIZE(struct sof_ipc_comp_passthrough)); + if (dev == NULL) + return NULL; + + memcpy(&dev->comp, comp, sizeof(struct sof_ipc_comp_passthrough)); + + cd = rzalloc(RZONE_RUNTIME, RFLAGS_NONE, sizeof(*cd)); + if (cd == NULL) { + rfree(dev); + return NULL; + } + + comp_set_drvdata(dev, cd); + cd->passthrough_func = passthrough_function; + + return dev; +} + +/* passthrough_free performs the clean-up */ +static void passthrough_free(struct comp_dev *dev) +{ + struct passthrough_comp_data *cd = comp_get_drvdata(dev); + + rfree(cd); + rfree(dev); +} + +/* passthrough_params sets the component audio stream parameters */ +static int passthrough_params(struct comp_dev *dev) +{ + return 0; +} + +/* passthrough_cmd is used to pass standard and bespoke commands (with data) + * to the component + */ +static int passthrough_cmd(struct comp_dev *dev, int cmd, void *data) +{ + int ret = 0; + + switch (cmd) { + case COMP_CMD_START: + case COMP_CMD_STOP: + case COMP_CMD_PAUSE: + case COMP_CMD_RELEASE: + default: + ret = comp_set_state(dev, cmd); + break; + } + + return ret; +} + +/* passthrough_copy is called when stream data flows through the pipeline + * It calls passthrough_function to copy the source buffer to the sink buffer. + * It returns the number of frames that were copied. + */ +static int passthrough_copy(struct comp_dev *dev) +{ + struct passthrough_comp_data *cd = comp_get_drvdata(dev); + struct comp_buffer *source_buffer = NULL, *sink_buffer = NULL; + uint32_t copy_bytes; + + /* get source and sink buffers */ + source_buffer = list_first_item(&dev->bsource_list, struct comp_buffer, + sink_list); + sink_buffer = list_first_item(&dev->bsink_list, struct comp_buffer, + source_list); + + /* check that source has enough frames available and sink enough + * frames free + */ + copy_bytes = comp_buffer_get_copy_bytes(dev, source_buffer, + sink_buffer); + + if (copy_bytes < dev->frames * dev->frame_bytes) { + trace_pass_error("PTc"); + return -EINVAL; + } + + /* Run passthrough if buffers have enough room */ + cd->passthrough_func(dev, sink_buffer, source_buffer, dev->frames); + + comp_update_buffer_consume(source_buffer, + dev->params.host_period_bytes); + comp_update_buffer_produce(sink_buffer, dev->params.host_period_bytes); + + return dev->frames; +} + +/* passthrough_preload is used for preloading the component buffers before + * pipeline start + */ +static int passthrough_preload(struct comp_dev *dev) +{ + return passthrough_copy(dev); +} + +/* passthrough_reset rests the component state */ +static int passthrough_reset(struct comp_dev *dev) +{ + trace_pass("PTe"); + dev->state = COMP_STATE_INIT; + return 0; +} + +/* passthrough_prepare prepares the component for receiving stream data */ +static int passthrough_prepare(struct comp_dev *dev) +{ + trace_pass("PTl"); + dev->state = COMP_STATE_PREPARE; + return 0; +} + +/* passthrough component driver ops */ +struct comp_driver comp_passthrough = { + .type = SOF_COMP_PASSTHROUGH, + .ops = { + .new = passthrough_new, + .free = passthrough_free, + .params = passthrough_params, + .cmd = passthrough_cmd, + .copy = passthrough_copy, + .prepare = passthrough_prepare, + .reset = passthrough_reset, + .preload = passthrough_preload, + }, +}; + +void sys_comp_passthrough_init(void) +{ + comp_register(&comp_passthrough); +} diff --git a/src/include/reef/trace.h b/src/include/reef/trace.h index 300e8d8..b7ec31a 100644 --- a/src/include/reef/trace.h +++ b/src/include/reef/trace.h @@ -87,6 +87,7 @@ #define TRACE_CLASS_TONE (18 << 24) #define TRACE_CLASS_EQ_FIR (19 << 24) #define TRACE_CLASS_EQ_IIR (20 << 24) +#define TRACE_CLASS_PASS (21 << 24) /* move to config.h */ #define TRACE 1 diff --git a/src/include/uapi/ipc.h b/src/include/uapi/ipc.h index be4c9f2..127ecf1 100644 --- a/src/include/uapi/ipc.h +++ b/src/include/uapi/ipc.h @@ -516,6 +516,7 @@ enum sof_comp_type { SOF_COMP_EQ_FIR, SOF_COMP_FILEREAD, /* host test based file IO */ SOF_COMP_FILEWRITE, /* host test based file IO */ + SOF_COMP_PASSTHROUGH, }; /* XRUN action for component */ @@ -615,6 +616,12 @@ struct sof_ipc_comp_mux { struct sof_ipc_comp_config config; } __attribute__((packed)); +/* generic passthrough component */ +struct sof_ipc_comp_passthrough { + struct sof_ipc_comp comp; + struct sof_ipc_comp_config config; +} __attribute__((packed)); + /* generic tone generator component */ struct sof_ipc_comp_tone { struct sof_ipc_comp comp; -- 2.9.3

1 0

[Sound-open-firmware] [PATCH] topology: byt-rt5640: Fix stream name for BE DAI link
by Liam Girdwood 04 Sep '17

04 Sep '17

Signed-off-by: Liam Girdwood <liam.r.girdwood(a)linux.intel.com> --- topology/reef-byt-rt5640.m4 | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/topology/reef-byt-rt5640.m4 b/topology/reef-byt-rt5640.m4 index 0629d43..9855f1a 100644 --- a/topology/reef-byt-rt5640.m4 +++ b/topology/reef-byt-rt5640.m4 @@ -66,11 +66,11 @@ SectionGraph."pipe-byt-rt5640" { # playback DAI is SSP2 using I2S DAPM stream and 2 periods # Buffers use s24le format, with 48 frame per 1000us on core 0 with priorty 0 -DAI_ADD(sof/pipe-dai-playback.m4, SSP, 2, I2S, PIPELINE_SOURCE_1, 2, s24le, 48, 1000, 0, 0) +DAI_ADD(sof/pipe-dai-playback.m4, SSP, 2, Audio, PIPELINE_SOURCE_1, 2, s24le, 48, 1000, 0, 0) # capture DAI is SSP2 using I2S DAPM stream and 2 periods # Buffers use s24le format, with 48 frame per 1000us on core 0 with priorty 0 -DAI_ADD(sof/pipe-dai-capture.m4, SSP, 2, I2S, PIPELINE_SINK_2, 2, s24le, 48, 1000, 0, 0) +DAI_ADD(sof/pipe-dai-capture.m4, SSP, 2, Audio, PIPELINE_SINK_2, 2, s24le, 48, 1000, 0, 0) # # BE configurations - overrides config in ACPI if present -- 2.11.0

1 0

[Sound-open-firmware] [PATCH v2 1/3] comp: default function to set comp state
by Ranjani Sridharan 04 Sep '17

04 Sep '17

This patch adds a the comp_set_state() used for the mandatory pipeline commands, START, STOP, PAUSE and RELEASE. It also updates the cmd method in existing components to use comp_set_state(). Signed-off-by: Ranjani Sridharan <ranjani.sridharan(a)linux.intel.com> --- src/audio/component.c | 38 ++++++++++++++++++++++++++++++++++++++ src/audio/eq_fir.c | 23 +---------------------- src/audio/host.c | 16 ++++------------ src/audio/src.c | 26 +++----------------------- src/audio/tone.c | 29 ++++++----------------------- src/audio/volume.c | 21 ++++----------------- src/include/reef/audio/component.h | 3 +++ 7 files changed, 59 insertions(+), 97 deletions(-) diff --git a/src/audio/component.c b/src/audio/component.c index 6369e2e..232ef02 100644 --- a/src/audio/component.c +++ b/src/audio/component.c @@ -117,6 +117,44 @@ void comp_unregister(struct comp_driver *drv) spin_unlock(&cd->lock); } +int comp_set_state(struct comp_dev *dev, int cmd) +{ + int ret = 0; + + switch (cmd) { + case COMP_CMD_START: + case COMP_CMD_RELEASE: + dev->state = COMP_STATE_RUNNING; + break; + case COMP_CMD_STOP: + if (dev->state == COMP_STATE_RUNNING || + dev->state == COMP_STATE_DRAINING || + dev->state == COMP_STATE_PAUSED) { + comp_buffer_reset(dev); + dev->state = COMP_STATE_SETUP; + } else { + trace_comp_error("CEs"); + ret = -EINVAL; + } + break; + case COMP_CMD_PAUSE: + /* only support pausing for running */ + if (dev->state == COMP_STATE_RUNNING) + dev->state = COMP_STATE_PAUSED; + else { + trace_comp_error("CEp"); + ret = -EINVAL; + } + break; + default: + trace_comp_error("CEd"); + ret = -EINVAL; + break; + } + + return ret; +} + void sys_comp_init(void) { cd = rzalloc(RZONE_SYS, RFLAGS_NONE, sizeof(*cd)); diff --git a/src/audio/eq_fir.c b/src/audio/eq_fir.c index 540c68f..98cd43e 100644 --- a/src/audio/eq_fir.c +++ b/src/audio/eq_fir.c @@ -382,32 +382,11 @@ static int eq_fir_cmd(struct comp_dev *dev, int cmd, void *data) ret = fir_cmd(dev, cdata); break; case COMP_CMD_START: - trace_src("EFs"); - dev->state = COMP_STATE_RUNNING; - break; case COMP_CMD_STOP: - trace_src("ESp"); - if (dev->state == COMP_STATE_RUNNING || - dev->state == COMP_STATE_DRAINING || - dev->state == COMP_STATE_PAUSED) { - comp_buffer_reset(dev); - dev->state = COMP_STATE_SETUP; - } - break; case COMP_CMD_PAUSE: - trace_src("EPe"); - /* only support pausing for running */ - if (dev->state == COMP_STATE_RUNNING) - dev->state = COMP_STATE_PAUSED; - - break; case COMP_CMD_RELEASE: - trace_src("ERl"); - dev->state = COMP_STATE_RUNNING; - break; default: - trace_src("EDf"); - ret = -EINVAL; + ret = comp_set_state(dev, cmd); break; } diff --git a/src/audio/host.c b/src/audio/host.c index e71e95f..f81fd66 100644 --- a/src/audio/host.c +++ b/src/audio/host.c @@ -553,28 +553,20 @@ static int host_cmd(struct comp_dev *dev, int cmd, void *data) // TODO: align cmd macros. switch (cmd) { - case COMP_CMD_PAUSE: - /* only support pausing for running, channel is paused by DAI */ - if (dev->state == COMP_STATE_RUNNING) - dev->state = COMP_STATE_PAUSED; - break; case COMP_CMD_STOP: if (dev->state == COMP_STATE_RUNNING || dev->state == COMP_STATE_DRAINING || dev->state == COMP_STATE_PAUSED) ret = host_stop(dev); break; - case COMP_CMD_RELEASE: - /* channel is released by DAI */ - dev->state = COMP_STATE_RUNNING; - break; - case COMP_CMD_START: - dev->state = COMP_STATE_RUNNING; - break; case COMP_CMD_SUSPEND: case COMP_CMD_RESUME: break; + case COMP_CMD_START: + case COMP_CMD_PAUSE: + case COMP_CMD_RELEASE: default: + ret = comp_set_state(dev, cmd); break; } diff --git a/src/audio/src.c b/src/audio/src.c index c11ef3f..056822f 100644 --- a/src/audio/src.c +++ b/src/audio/src.c @@ -404,7 +404,7 @@ static int src_params(struct comp_dev *dev) static int src_ctrl_cmd(struct comp_dev *dev, struct sof_ipc_ctrl_data *cdata) { struct comp_data *cd = comp_get_drvdata(dev); - int i; + int i, ret = 0; switch (cdata->cmd) { case SOF_CTRL_CMD_MUTE: @@ -438,35 +438,15 @@ static int src_cmd(struct comp_dev *dev, int cmd, void *data) case COMP_CMD_SET_VALUE: return src_ctrl_cmd(dev, cdata); case COMP_CMD_START: - trace_src("SSt"); - dev->state = COMP_STATE_RUNNING; - break; case COMP_CMD_STOP: - trace_src("SSp"); - if (dev->state == COMP_STATE_RUNNING || - dev->state == COMP_STATE_DRAINING || - dev->state == COMP_STATE_PAUSED) { - comp_buffer_reset(dev); - dev->state = COMP_STATE_SETUP; - } - break; case COMP_CMD_PAUSE: - trace_src("SPe"); - /* only support pausing for running */ - if (dev->state == COMP_STATE_RUNNING) - dev->state = COMP_STATE_PAUSED; - - break; case COMP_CMD_RELEASE: - trace_src("SRl"); - dev->state = COMP_STATE_RUNNING; - break; default: - trace_src("SDf"); + ret = comp_set_state(dev, cmd); break; } - return 0; + return ret; } /* copy and process stream data from source to sink buffers */ diff --git a/src/audio/tone.c b/src/audio/tone.c index 448c472..5d844b2 100644 --- a/src/audio/tone.c +++ b/src/audio/tone.c @@ -433,6 +433,10 @@ static int tone_params(struct comp_dev *dev) static int tone_ctrl_cmd(struct comp_dev *dev, struct sof_ipc_ctrl_data *cdata) { struct comp_data *cd = comp_get_drvdata(dev); + struct sof_ipc_comp_tone *ct; + int ret = 0; + + trace_tone("tri"); switch (cdata->cmd) { case SOF_CTRL_CMD_MUTE: @@ -475,36 +479,15 @@ static int tone_cmd(struct comp_dev *dev, int cmd, void *data) case COMP_CMD_SET_VALUE: return tone_ctrl_cmd(dev, cdata); case COMP_CMD_START: - trace_tone("TSt"); - dev->state = COMP_STATE_RUNNING; - break; case COMP_CMD_STOP: - trace_tone("TSp"); - if (dev->state == COMP_STATE_RUNNING || - dev->state == COMP_STATE_DRAINING || - dev->state == COMP_STATE_PAUSED) { - comp_buffer_reset(dev); - dev->state = COMP_STATE_SETUP; - } - break; case COMP_CMD_PAUSE: - trace_tone("TPe"); - /* only support pausing for running */ - if (dev->state == COMP_STATE_RUNNING) - dev->state = COMP_STATE_PAUSED; - - break; case COMP_CMD_RELEASE: - trace_tone("TRl"); - dev->state = COMP_STATE_RUNNING; - break; default: - trace_tone("TDf"); - + ret = comp_set_state(dev, cmd); break; } - return 0; + return ret; } /* copy and process stream data from source to sink buffers */ diff --git a/src/audio/volume.c b/src/audio/volume.c index 6cbd6ff..cde117c 100644 --- a/src/audio/volume.c +++ b/src/audio/volume.c @@ -383,7 +383,8 @@ static inline void volume_set_chan_unmute(struct comp_dev *dev, int chan) static int volume_ctrl_cmd(struct comp_dev *dev, struct sof_ipc_ctrl_data *cdata) { struct comp_data *cd = comp_get_drvdata(dev); - int i, j; + struct sof_ipc_ctrl_values *cv; + int i, j, ret = 0; switch (cdata->cmd) { case SOF_CTRL_CMD_VOLUME: @@ -436,29 +437,15 @@ static int volume_cmd(struct comp_dev *dev, int cmd, void *data) case COMP_CMD_SET_VALUE: return volume_ctrl_cmd(dev, cdata); case COMP_CMD_START: - dev->state = COMP_STATE_RUNNING; - break; case COMP_CMD_STOP: - if (dev->state == COMP_STATE_RUNNING || - dev->state == COMP_STATE_DRAINING || - dev->state == COMP_STATE_PAUSED) { - comp_buffer_reset(dev); - dev->state = COMP_STATE_SETUP; - } - break; case COMP_CMD_PAUSE: - /* only support pausing for running */ - if (dev->state == COMP_STATE_RUNNING) - dev->state = COMP_STATE_PAUSED; - break; case COMP_CMD_RELEASE: - dev->state = COMP_STATE_RUNNING; - break; default: + ret = comp_set_state(dev, cmd); break; } - return 0; + return ret; } /* copy and process stream data from source to sink buffers */ diff --git a/src/include/reef/audio/component.h b/src/include/reef/audio/component.h index 35c80de..e20ffed 100644 --- a/src/include/reef/audio/component.h +++ b/src/include/reef/audio/component.h @@ -214,6 +214,9 @@ static inline void comp_free(struct comp_dev *dev) dev->drv->ops.free(dev); } +/* component state set */ +int comp_set_state(struct comp_dev *dev, int cmd); + /* component parameter init - mandatory */ static inline int comp_params(struct comp_dev *dev) { -- 2.9.3

1 0

[Sound-open-firmware] [PATCH] pipeline: fixed return value from preload_downstream
by Ranjani Sridharan 04 Sep '17

04 Sep '17

This patch fixes the return value from the preload_downstream() call in pipeline_params() Signed-off-by: Ranjani Sridharan <ranjani.sridharan(a)linux.intel.com> --- src/audio/pipeline.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/audio/pipeline.c b/src/audio/pipeline.c index 4327254..49a0c51 100644 --- a/src/audio/pipeline.c +++ b/src/audio/pipeline.c @@ -505,7 +505,7 @@ static int preload_downstream(struct comp_dev *start, struct comp_dev *current) int pipeline_prepare(struct pipeline *p, struct comp_dev *dev) { struct op_data op_data; - int ret, count, i; + int ret, i; trace_pipe("pre"); @@ -527,10 +527,10 @@ int pipeline_prepare(struct pipeline *p, struct comp_dev *dev) * trigger start */ for (i = 0; i < MAX_PRELOAD_SIZE; i++) { - count = preload_downstream(dev, dev); + ret = preload_downstream(dev, dev); /* complete ? */ - if (count <= 0) + if (ret <= 0) goto out; } -- 2.9.3

2 1

[Sound-open-firmware] [PATCH] rmbox: check for non printable chars in trace.
by Liam Girdwood 04 Sep '17

04 Sep '17

Non printable means trace is a value. Signed-off-by: Liam Girdwood <liam.r.girdwood(a)linux.intel.com> --- rmbox/rmbox.c | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/rmbox/rmbox.c b/rmbox/rmbox.c index 1f81e06..3ef6fb4 100644 --- a/rmbox/rmbox.c +++ b/rmbox/rmbox.c @@ -19,6 +19,7 @@ #include <stdint.h> #include <errno.h> #include <string.h> +#include <ctype.h> // TODO: include all this stuff @@ -135,6 +136,12 @@ static void show_trace(uint32_t val, uint32_t addr, uint32_t *timestamp, float c return; } + /* check for printable values - otherwise it's a value */ + if (!isprint((char)(val >> 16)) || !isprint((char)(val >> 8)) || !isprint((char)val)) { + printf("value 0x%8.8x\n", (uint32_t)val); + return; + } + class = val & 0xff000000; if (class == TRACE_CLASS_IRQ) trace = "irq"; -- 2.11.0

1 0

[Sound-open-firmware] [PATCH v1 1/3] comp: default function to set comp state
by Ranjani Sridharan 04 Sep '17

04 Sep '17

This patch adds a the comp_set_state() used for the mandatory pipeline commands, START, STOP, PAUSE and RELEASE. It also updates the cmd method in existing components to use comp_set_state(). Signed-off-by: Ranjani Sridharan <ranjani.sridharan(a)linux.intel.com> --- src/audio/component.c | 36 ++++++++++++++++++++++++++++++++++++ src/audio/eq_fir.c | 23 ++--------------------- src/audio/host.c | 16 ++++------------ src/audio/src.c | 26 +++----------------------- src/audio/tone.c | 26 +++----------------------- src/audio/volume.c | 20 +++----------------- src/include/reef/audio/component.h | 3 +++ 7 files changed, 54 insertions(+), 96 deletions(-) diff --git a/src/audio/component.c b/src/audio/component.c index 6369e2e..6f2e0c3 100644 --- a/src/audio/component.c +++ b/src/audio/component.c @@ -117,6 +117,42 @@ void comp_unregister(struct comp_driver *drv) spin_unlock(&cd->lock); } +int comp_set_state(struct comp_dev *dev, int cmd) +{ + int ret = 0; + + switch (cmd) { + case COMP_CMD_START: + case COMP_CMD_RELEASE: + dev->state = COMP_STATE_RUNNING; + break; + case COMP_CMD_STOP: + if (dev->state == COMP_STATE_RUNNING || + dev->state == COMP_STATE_DRAINING || + dev->state == COMP_STATE_PAUSED) { + comp_buffer_reset(dev); + dev->state = COMP_STATE_SETUP; + } else { + trace_comp_error("CEs"); + ret = -EINVAL; + } + break; + case COMP_CMD_PAUSE: + /* only support pausing for running */ + if (dev->state == COMP_STATE_RUNNING) + dev->state = COMP_STATE_PAUSED; + else { + trace_comp_error("CEp"); + ret = -EINVAL; + } + break; + default: + break; + } + + return ret; +} + void sys_comp_init(void) { cd = rzalloc(RZONE_SYS, RFLAGS_NONE, sizeof(*cd)); diff --git a/src/audio/eq_fir.c b/src/audio/eq_fir.c index 534a4a1..6380340 100644 --- a/src/audio/eq_fir.c +++ b/src/audio/eq_fir.c @@ -364,31 +364,12 @@ static int eq_fir_cmd(struct comp_dev *dev, int cmd, void *data) break; case COMP_CMD_START: - trace_src("EFs"); - dev->state = COMP_STATE_RUNNING; - break; case COMP_CMD_STOP: - trace_src("ESp"); - if (dev->state == COMP_STATE_RUNNING || - dev->state == COMP_STATE_DRAINING || - dev->state == COMP_STATE_PAUSED) { - comp_buffer_reset(dev); - dev->state = COMP_STATE_SETUP; - } - break; case COMP_CMD_PAUSE: - trace_src("EPe"); - /* only support pausing for running */ - if (dev->state == COMP_STATE_RUNNING) - dev->state = COMP_STATE_PAUSED; - - break; case COMP_CMD_RELEASE: - trace_src("ERl"); - dev->state = COMP_STATE_RUNNING; - break; default: - trace_src("EDf"); + ret = comp_set_state(dev, cmd); + break; } return ret; diff --git a/src/audio/host.c b/src/audio/host.c index e71e95f..f81fd66 100644 --- a/src/audio/host.c +++ b/src/audio/host.c @@ -553,28 +553,20 @@ static int host_cmd(struct comp_dev *dev, int cmd, void *data) // TODO: align cmd macros. switch (cmd) { - case COMP_CMD_PAUSE: - /* only support pausing for running, channel is paused by DAI */ - if (dev->state == COMP_STATE_RUNNING) - dev->state = COMP_STATE_PAUSED; - break; case COMP_CMD_STOP: if (dev->state == COMP_STATE_RUNNING || dev->state == COMP_STATE_DRAINING || dev->state == COMP_STATE_PAUSED) ret = host_stop(dev); break; - case COMP_CMD_RELEASE: - /* channel is released by DAI */ - dev->state = COMP_STATE_RUNNING; - break; - case COMP_CMD_START: - dev->state = COMP_STATE_RUNNING; - break; case COMP_CMD_SUSPEND: case COMP_CMD_RESUME: break; + case COMP_CMD_START: + case COMP_CMD_PAUSE: + case COMP_CMD_RELEASE: default: + ret = comp_set_state(dev, cmd); break; } diff --git a/src/audio/src.c b/src/audio/src.c index 0279841..0ecb48c 100644 --- a/src/audio/src.c +++ b/src/audio/src.c @@ -381,7 +381,7 @@ static int src_cmd(struct comp_dev *dev, int cmd, void *data) { trace_src("SCm"); struct comp_data *cd = comp_get_drvdata(dev); - int i; + int i, ret = 0; switch (cmd) { case COMP_CMD_SRC: @@ -400,35 +400,15 @@ static int src_cmd(struct comp_dev *dev, int cmd, void *data) break; case COMP_CMD_START: - trace_src("SSt"); - dev->state = COMP_STATE_RUNNING; - break; case COMP_CMD_STOP: - trace_src("SSp"); - if (dev->state == COMP_STATE_RUNNING || - dev->state == COMP_STATE_DRAINING || - dev->state == COMP_STATE_PAUSED) { - comp_buffer_reset(dev); - dev->state = COMP_STATE_SETUP; - } - break; case COMP_CMD_PAUSE: - trace_src("SPe"); - /* only support pausing for running */ - if (dev->state == COMP_STATE_RUNNING) - dev->state = COMP_STATE_PAUSED; - - break; case COMP_CMD_RELEASE: - trace_src("SRl"); - dev->state = COMP_STATE_RUNNING; - break; default: - trace_src("SDf"); + ret = comp_set_state(dev, cmd); break; } - return 0; + return ret; } /* copy and process stream data from source to sink buffers */ diff --git a/src/audio/tone.c b/src/audio/tone.c index cbc50ac..305563e 100644 --- a/src/audio/tone.c +++ b/src/audio/tone.c @@ -433,6 +433,7 @@ static int tone_cmd(struct comp_dev *dev, int cmd, void *data) { struct comp_data *cd = comp_get_drvdata(dev); struct sof_ipc_comp_tone *ct; + int ret = 0; trace_tone("tri"); @@ -456,36 +457,15 @@ static int tone_cmd(struct comp_dev *dev, int cmd, void *data) tonegen_unmute(&cd->sg); break; case COMP_CMD_START: - trace_tone("TSt"); - dev->state = COMP_STATE_RUNNING; - break; case COMP_CMD_STOP: - trace_tone("TSp"); - if (dev->state == COMP_STATE_RUNNING || - dev->state == COMP_STATE_DRAINING || - dev->state == COMP_STATE_PAUSED) { - comp_buffer_reset(dev); - dev->state = COMP_STATE_SETUP; - } - break; case COMP_CMD_PAUSE: - trace_tone("TPe"); - /* only support pausing for running */ - if (dev->state == COMP_STATE_RUNNING) - dev->state = COMP_STATE_PAUSED; - - break; case COMP_CMD_RELEASE: - trace_tone("TRl"); - dev->state = COMP_STATE_RUNNING; - break; default: - trace_tone("TDf"); - + ret = comp_set_state(dev, cmd); break; } - return 0; + return ret; } /* copy and process stream data from source to sink buffers */ diff --git a/src/audio/volume.c b/src/audio/volume.c index 93a3839..2e097d5 100644 --- a/src/audio/volume.c +++ b/src/audio/volume.c @@ -385,7 +385,7 @@ static int volume_cmd(struct comp_dev *dev, int cmd, void *data) { struct comp_data *cd = comp_get_drvdata(dev); struct sof_ipc_ctrl_values *cv; - int i, j; + int i, j, ret = 0; trace_volume("cmd"); @@ -425,29 +425,15 @@ static int volume_cmd(struct comp_dev *dev, int cmd, void *data) work_schedule_default(&cd->volwork, VOL_RAMP_US); break; case COMP_CMD_START: - dev->state = COMP_STATE_RUNNING; - break; case COMP_CMD_STOP: - if (dev->state == COMP_STATE_RUNNING || - dev->state == COMP_STATE_DRAINING || - dev->state == COMP_STATE_PAUSED) { - comp_buffer_reset(dev); - dev->state = COMP_STATE_SETUP; - } - break; case COMP_CMD_PAUSE: - /* only support pausing for running */ - if (dev->state == COMP_STATE_RUNNING) - dev->state = COMP_STATE_PAUSED; - break; case COMP_CMD_RELEASE: - dev->state = COMP_STATE_RUNNING; - break; default: + ret = comp_set_state(dev, cmd); break; } - return 0; + return ret; } /* copy and process stream data from source to sink buffers */ diff --git a/src/include/reef/audio/component.h b/src/include/reef/audio/component.h index e73a22a..cbd2356 100644 --- a/src/include/reef/audio/component.h +++ b/src/include/reef/audio/component.h @@ -215,6 +215,9 @@ static inline void comp_free(struct comp_dev *dev) dev->drv->ops.free(dev); } +/* component state set */ +int comp_set_state(struct comp_dev *dev, int cmd); + /* component parameter init - mandatory */ static inline int comp_params(struct comp_dev *dev) { -- 2.9.3

2 5

[Sound-open-firmware] [PATCH] alloc: Add support for allocating different types of memory from the heap
by Keyon Jie 04 Sep '17

04 Sep '17

To add support for different types of heap memory, here it will: 1. add handle for RFLAGS_DMA which will allocate DMA buffer blocks if exist; 2. refine free_block, which will free blocks of runtime heap, general buffer heap, or dma buffer heap. Signed-off-by: Keyon Jie <yang.jie(a)linux.intel.com> Tested-by: Zhang Keqiao <keqiao.zhang(a)intel.com> --- src/lib/alloc.c | 82 +++++++++++++++++++++++++++++++++++++++------------------ 1 file changed, 56 insertions(+), 26 deletions(-) diff --git a/src/lib/alloc.c b/src/lib/alloc.c index 86c2bc7..e28817b 100644 --- a/src/lib/alloc.c +++ b/src/lib/alloc.c @@ -334,20 +334,38 @@ found: /* free block(s) */ static void free_block(struct mm_heap *heap, void *ptr) { - struct block_map *map; + struct mm_heap * mm_heap; + struct block_map * block_map; struct block_hdr *hdr; - int i, block; + int i, block, array_size; /* sanity check */ if (ptr == NULL) return; + /* find mm_heap that ptr belongs to */ + if ((uint32_t)ptr >= memmap.runtime.heap && + (uint32_t)ptr < memmap.runtime.heap + memmap.runtime.size) { + mm_heap = &memmap.runtime; + array_size = ARRAY_SIZE(rt_heap_map); + } else if ((uint32_t)ptr >= memmap.buffer.heap && + (uint32_t)ptr < memmap.buffer.heap + memmap.buffer.size) { + mm_heap = &memmap.buffer; + array_size = ARRAY_SIZE(buf_heap_map); +#if (HEAP_DMA_BUFFER_SIZE > 0) + } else if ((uint32_t)ptr >= memmap.dma.heap && + (uint32_t)ptr < memmap.dma.heap + memmap.dma.size) { + mm_heap = &memmap.dma; + array_size = ARRAY_SIZE(dma_buf_heap_map); +#endif + } else + return; + /* find block that ptr belongs to */ - for (i = 0; i < ARRAY_SIZE(rt_heap_map) - 1; i ++) { + for (i = 0; i < array_size - 1; i ++) { /* is ptr in this block */ - if ((uint32_t)ptr >= rt_heap_map[i].base && - (uint32_t)ptr < rt_heap_map[i + 1].base) + if ((uint32_t)ptr < mm_heap->map[i + 1].base) goto found; } @@ -356,27 +374,29 @@ static void free_block(struct mm_heap *heap, void *ptr) return; found: + /* the block i is it */ + block_map = &mm_heap->map[i]; + /* calculate block header */ - map = &rt_heap_map[i]; - block = ((uint32_t)ptr - map->base) / map->block_size; - hdr = &map->block[block]; + block = ((uint32_t)ptr - block_map->base) / block_map->block_size; + hdr = &block_map->block[block]; /* free block header and continious blocks */ for (i = block; i < block + hdr->size; i++) { - hdr = &map->block[i]; + hdr = &block_map->block[i]; hdr->size = 0; hdr->flags = 0; - map->free_count++; - heap->info.used -= map->block_size; - heap->info.free += map->block_size; + block_map->free_count++; + heap->info.used -= block_map->block_size; + heap->info.free += block_map->block_size; } /* set first free */ - if (block < map->first_free) - map->first_free = block; + if (block < block_map->first_free) + block_map->first_free = block; #if DEBUG_BLOCK_FREE - alloc_memset_region(ptr, map->block_size * (i - 1), DEBUG_BLOCK_FREE_VALUE); + alloc_memset_region(ptr, block_map->block_size * (i - 1), DEBUG_BLOCK_FREE_VALUE); #endif } @@ -443,47 +463,57 @@ void *rzalloc(int zone, int bflags, size_t bytes) /* allocates continuous buffer on 1k boundary */ void *rballoc(int zone, int bflags, size_t bytes) { + struct block_map * block_map = buf_heap_map; + struct mm_heap * mm_heap = &memmap.buffer; + int i, array_size = ARRAY_SIZE(buf_heap_map); uint32_t flags; void *ptr = NULL; - int i; +#if (HEAP_DMA_BUFFER_SIZE > 0) + if (bflags & RFLAGS_DMA) { + mm_heap = &memmap.dma; + block_map = dma_buf_heap_map; + array_size = ARRAY_SIZE(dma_buf_heap_map); + } +#endif spin_lock_irq(&memmap.lock, flags); /* will request fit in single block */ - for (i = 0; i < ARRAY_SIZE(buf_heap_map); i++) { + for (i = 0; i < array_size; i++) { + trace_value(block_map[i].block_size); /* is block big enough */ - if (buf_heap_map[i].block_size < bytes) + if (block_map[i].block_size < bytes) continue; /* does block have free space */ - if (buf_heap_map[i].free_count == 0) + if (block_map[i].free_count == 0) continue; /* allocate block */ - ptr = alloc_block(&memmap.buffer, i, bflags); + ptr = alloc_block(mm_heap, i, bflags); goto out; } /* request spans > 1 block */ /* only 1 choice for block size */ - if (ARRAY_SIZE(buf_heap_map) == 1) { - ptr = alloc_cont_blocks(&memmap.buffer, 0, bflags, bytes); + if (array_size == 1) { + ptr = alloc_cont_blocks(mm_heap, 0, bflags, bytes); goto out; } else { /* find best block size for request */ - for (i = 0; i < ARRAY_SIZE(buf_heap_map); i++) { + for (i = 0; i < array_size; i++) { /* allocate is block size smaller than request */ - if (buf_heap_map[i].block_size < bytes) - alloc_cont_blocks(&memmap.buffer, i, bflags, + if (block_map[i].block_size < bytes) + alloc_cont_blocks(mm_heap, i, bflags, bytes); } } - ptr = alloc_cont_blocks(&memmap.buffer, ARRAY_SIZE(buf_heap_map) - 1, + ptr = alloc_cont_blocks(mm_heap, array_size - 1, bflags, bytes); out: -- 2.11.0

2 1

[Sound-open-firmware] [PATCH] sof: abi: Add component ABI header for host configuration
by Liam Girdwood 04 Sep '17

04 Sep '17

Add an ABI header to be pre-pended to all binary blobs or bespoke component data structures that will be passed from host to DSP component or vice versa (i.e via binary kcontrols). Signed-off-by: Liam Girdwood <liam.r.girdwood(a)linux.intel.com> --- src/include/uapi/Makefile.am | 3 ++- src/include/uapi/abi.h | 50 ++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 52 insertions(+), 1 deletion(-) create mode 100644 src/include/uapi/abi.h diff --git a/src/include/uapi/Makefile.am b/src/include/uapi/Makefile.am index b49560c..c4c2fe6 100644 --- a/src/include/uapi/Makefile.am +++ b/src/include/uapi/Makefile.am @@ -1,2 +1,3 @@ include_HEADERS = \ - ipc.h + ipc.h \ + abi.h diff --git a/src/include/uapi/abi.h b/src/include/uapi/abi.h new file mode 100644 index 0000000..66ec16a --- /dev/null +++ b/src/include/uapi/abi.h @@ -0,0 +1,50 @@ +/* + * Copyright (c) 2016, Intel Corporation + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions are met: + * * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * * Neither the name of the Intel Corporation nor the + * names of its contributors may be used to endorse or promote products + * derived from this software without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" + * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE + * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE + * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE + * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR + * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF + * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS + * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN + * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) + * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. + * + * Author: Liam Girdwood <liam.r.girdwood(a)linux.intel.com> + */ + +#ifndef __INCLUDE_UAPI_ABI_H__ +#define __INCLUDE_UAPI_ABI_H__ + +#define SOF_ABI_VERSION 1 + +/* + * Header for all non IPC ABI data. Identifies data type, size and ABI. + * Used by any bespoke component data structures or binary blobs. + */ + +struct sof_abi_hdr { + char magic[4]; /* 'S', 'O', 'F', '\0' */ + uint32_t type; /* component specific type */ + uint32_t size; /* size in bytes of data excluding this struct */ + uint32_t abi; /* SOF ABI version */ + uint32_t comp_abi; /* component specific ABI version */ +} __attribute__((packed)); + +#endif + -- 2.11.0

1 0