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

[Sound-open-firmware] [PATCH 4/4] Add IPC processing code for DMA tracing.
by yan.wang＠linux.intel.com 18 Sep '17

18 Sep '17

From: Yan Wang <yan.wang(a)linux.intel.com> 1. Add processing case branch of SOF_IPC_GLB_TRACE_MSG. 2. Add processing functions for SOF_IPC_TRACE_DMA_INIT and SOF_IPC_TRACE_DMA_PARAMS for initlizing DMA for Trace and reply host. 3. Modify page table parsing fucntion for using in both PCM streaming and DMA tracing case. Signed-off-by: Yan Wang <yan.wang(a)linux.intel.com> --- src/include/reef/ipc.h | 4 ++ src/ipc/intel-ipc.c | 115 ++++++++++++++++++++++++++++++++++++++++++++++--- 2 files changed, 114 insertions(+), 5 deletions(-) diff --git a/src/include/reef/ipc.h b/src/include/reef/ipc.h index 3eb94d8..84a1dc1 100644 --- a/src/include/reef/ipc.h +++ b/src/include/reef/ipc.h @@ -40,6 +40,7 @@ #include <uapi/ipc.h> #include <reef/audio/pipeline.h> #include <reef/audio/component.h> +#include <reef/audio/dma-trace.h> struct reef; struct dai_config; @@ -99,6 +100,9 @@ struct ipc { /* pipelines, components and buffers */ struct list_item comp_list; /* list of component devices */ + /* DMA for Trace*/ + struct dma_trace_data dmat; + void *private; }; diff --git a/src/ipc/intel-ipc.c b/src/ipc/intel-ipc.c index 01c83b6..dbd9ec7 100644 --- a/src/ipc/intel-ipc.c +++ b/src/ipc/intel-ipc.c @@ -155,14 +155,22 @@ out: * page table entry and adding each elem to a list in struct dma_sg_config. */ static int parse_page_descriptors(struct intel_ipc_data *iipc, - struct sof_ipc_host_buffer *ring, struct comp_dev *cd) + struct sof_ipc_host_buffer *ring, void *data, uint32_t is_trace) { - struct sof_ipc_comp_host *host = (struct sof_ipc_comp_host *)&cd->comp; + struct comp_dev* cd = NULL; + struct sof_ipc_comp_host *host = NULL; + struct dma_trace_data *d = NULL; struct dma_sg_elem elem; int i, err; uint32_t idx, phy_addr; elem.size = HOST_PAGE_SIZE; + if (is_trace) + d = (struct dma_trace_data *)data; + else { + cd = (struct comp_dev *)data; + host = (struct sof_ipc_comp_host *)&cd->comp; + } for (i = 0; i < ring->pages; i++) { @@ -176,12 +184,15 @@ static int parse_page_descriptors(struct intel_ipc_data *iipc, phy_addr <<= 12; phy_addr &= 0xfffff000; - if (host->direction == SOF_IPC_STREAM_PLAYBACK) + if (!is_trace && host->direction == SOF_IPC_STREAM_PLAYBACK) elem.src = phy_addr; else elem.dest = phy_addr; - err = comp_host_buffer(cd, &elem, ring->size); + if (is_trace) + err = dma_trace_host_buffer(d, &elem, ring->size); + else + err = comp_host_buffer(cd, &elem, ring->size); if (err < 0) { trace_ipc_error("ePb"); return err; @@ -235,7 +246,7 @@ static int ipc_stream_pcm_params(uint32_t stream) /* Parse host tables */ err = parse_page_descriptors(iipc, &pcm_params->params.buffer, - pcm_dev->cd); + pcm_dev->cd, 0); if (err < 0) { trace_ipc_error("eAP"); goto error; @@ -551,6 +562,98 @@ static int ipc_glb_pm_message(uint32_t header) } /* + * Debug IPC Operations. + */ + +static int ipc_dma_trace_init(uint32_t header) +{ + struct sof_ipc_reply reply; + int err; + + trace_ipc("Dti"); + + /* Initialize DMA for Trace*/ + err = dma_trace_init(&_ipc->dmat); + if (err < 0) { + trace_ipc_error("eIP"); + goto error; + } + + /* write component values to the outbox */ + reply.hdr.size = sizeof(reply); + reply.hdr.cmd = header; + reply.error = 0; + mailbox_hostbox_write(0, &reply, sizeof(reply)); + return 0; + +error: + if (err < 0) + trace_ipc_error("eA!"); + return -EINVAL; +} + +static int ipc_dma_trace_config(uint32_t header) +{ + struct intel_ipc_data *iipc = ipc_get_drvdata(_ipc); + struct sof_ipc_dma_trace_params *params = _ipc->comp_data; + struct sof_ipc_reply reply; + int err; + + trace_ipc("DAl"); + + /* use DMA to read in compressed page table ringbuffer from host */ + err = get_page_descriptors(iipc, &params->buffer); + if (err < 0) { + trace_ipc_error("eCp"); + goto error; + } + + trace_ipc("DAg"); + + /* Parse host tables */ + err = parse_page_descriptors(iipc, &params->buffer, + &_ipc->dmat, 1); + if (err < 0) { + trace_ipc_error("ePP"); + goto error; + } + + trace_ipc("DAp"); + + dma_trace_config_ready(&_ipc->dmat); + + /* write component values to the outbox */ + reply.hdr.size = sizeof(reply); + reply.hdr.cmd = header; + reply.error = 0; + mailbox_hostbox_write(0, &reply, sizeof(reply)); + return 0; + +error: + if (err < 0) + trace_ipc_error("eA!"); + return -EINVAL; +} + +static int ipc_glb_debug_message(uint32_t header) +{ + uint32_t cmd = (header & SOF_CMD_TYPE_MASK) >> SOF_CMD_TYPE_SHIFT; + + trace_ipc("Idn"); + + switch (cmd) { + case iCS(SOF_IPC_TRACE_DMA_INIT): + return ipc_dma_trace_init(header); + case iCS(SOF_IPC_TRACE_DMA_PARAMS): + return ipc_dma_trace_config(header); + default: + trace_ipc_error("eDc"); + trace_value(header); + return -EINVAL; + } +} + +/* * Topology IPC Operations. */ @@ -766,6 +869,8 @@ int ipc_cmd(void) return ipc_glb_stream_message(hdr->cmd); case iGS(SOF_IPC_GLB_DAI_MSG): return ipc_glb_dai_message(hdr->cmd); + case iGS(SOF_IPC_GLB_TRACE_MSG): + return ipc_glb_debug_message(hdr->cmd); default: trace_ipc_error("eGc"); trace_value(type); -- 2.7.4

1 0

[Sound-open-firmware] [PATCH 3/4] Add the implementation for DMA tracing.
by yan.wang＠linux.intel.com 18 Sep '17

18 Sep '17

From: Yan Wang <yan.wang(a)linux.intel.com> 1. Initialize the data structure. a) Create local DMA buffer for saving trace data. b) Initialize the tracing work handler for syatem work queue. 2. Implement local circle buffer. a) When the local buffer is full, empty it and reset reading/writing pointer. 3. Save the host buffer PHY addr which is parsed from IPC message. After this config, start trace work in work queue. 4. Provide dtrace_event() for recroding trace string into local buffer. 5. Add rstrlen() utility function for getting the trace string length because DSP side hasn't strlen(). 6. Enbale trace DMA copying once every 500ms or some special cases. a) Schedule the tracing sending work once every 500ms. b) If the local buffer is half full, call trace sending immediately. c) When the wrting pointer will arrive iat the end of local buffer, call trace sending immediately. 7. Use dma_copy_to_host() function to do trace sending. Signed-off-by: Yan Wang <yan.wang(a)linux.intel.com> --- src/audio/Makefile.am | 1 + src/audio/dma-trace.c | 194 ++++++++++++++++++++++ src/include/reef/alloc.h | 1 + src/include/reef/audio/dma-trace.h | 69 ++++++++ src/lib/lib.c | 9 + src/platform/baytrail/include/platform/platform.h | 6 + 6 files changed, 280 insertions(+) create mode 100644 src/audio/dma-trace.c create mode 100644 src/include/reef/audio/dma-trace.h diff --git a/src/audio/Makefile.am b/src/audio/Makefile.am index 285422e..7ffe01f 100644 --- a/src/audio/Makefile.am +++ b/src/audio/Makefile.am @@ -17,6 +17,7 @@ libaudio_a_SOURCES = \ pipeline.c \ pipeline_static.c \ component.c \ + dma-trace.c \ buffer.c libaudio_a_CFLAGS = \ diff --git a/src/audio/dma-trace.c b/src/audio/dma-trace.c new file mode 100644 index 0000000..8fc220e --- /dev/null +++ b/src/audio/dma-trace.c @@ -0,0 +1,194 @@ +/* + * 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: Yan Wang <yan.wang(a)linux.intel.com> + */ + +#include <reef/trace.h> +#include <reef/audio/dma-trace.h> +#include <reef/ipc.h> +#include <reef/reef.h> +#include <reef/alloc.h> +#include <arch/cache.h> +#include <platform/timer.h> +#include <platform/dma.h> +#include <reef/lock.h> +#include <stdint.h> + +static struct dma_trace_data *trace_data = NULL; + +static int dma_trace_new_buffer(struct dma_trace_data *d, uint32_t buffer_size) +{ + struct dma_trace_buf *buffer = &d->dmatb; + + trace_buffer("nlb"); + + /* validate request */ + if (buffer_size == 0 || buffer_size > HEAP_BUFFER_SIZE) { + trace_buffer_error("ebg"); + trace_value(buffer_size); + return -ENOMEM; + } + + /* allocate new buffer */ + buffer->addr = rballoc(RZONE_RUNTIME, RFLAGS_NONE, buffer_size); + if (buffer->addr == NULL) { + trace_buffer_error("ebm"); + return -ENOMEM; + } + + bzero(buffer->addr, buffer_size); + + buffer->size = buffer_size; + buffer->w_ptr = buffer->r_ptr = buffer->addr; + buffer->end_addr = buffer->addr + buffer->size; + + return 0; +} + +static void trace_send(struct dma_trace_data *d) +{ + struct dma_trace_buf *buffer = &d->dmatb; + struct dma_sg_config *config = &d->config; + uint32_t size = 0; + int32_t offset = 0; + + if (buffer->w_ptr == buffer->r_ptr) + return; + + size = buffer->w_ptr - buffer->r_ptr; + if (d->host_offset + size > d->host_size) + d->host_offset = 0; + + offset = dma_copy_to_host(config, d->host_offset, + buffer->r_ptr, size); + if (offset < 0) { + trace_buffer_error("ebb"); + return; + } + + d->host_offset += size; + buffer->r_ptr += size; + + trace_buffer("dts"); +} + +static uint32_t trace_work(void *data, uint32_t delay) +{ + struct dma_trace_data *d = (struct dma_trace_data *)data; + + trace_send(d); + + /* reschedule the trace copying work */ + return DMA_TRACE_US; +} + +int dma_trace_init(struct dma_trace_data *d) +{ + int err; + + trace_buffer("dtn"); + + /* init buffer elems */ + list_init(&d->config.elem_list); + + /* allocate local DMA buffer */ + err = dma_trace_new_buffer(d, DMA_TRACE_LOCAL_SIZE); + if (err < 0) { + trace_buffer_error("ePb"); + return err; + } + + d->host_offset = 0; + trace_data = d; + + work_init(&d->dmat_work, trace_work, d, WORK_ASYNC); + return 0; +} + +int dma_trace_host_buffer(struct dma_trace_data *d, struct dma_sg_elem *elem, + uint32_t host_size) +{ + struct dma_sg_elem *e; + + /* allocate new host DMA elem and add it to our list */ + e = rzalloc(RZONE_RUNTIME, RFLAGS_NONE, sizeof(*e)); + if (e == NULL) + return -ENOMEM; + + *e = *elem; + d->host_size = host_size; + + list_item_append(&e->list, &d->config.elem_list); + return 0; +} + +void dma_trace_config_ready(struct dma_trace_data *d) +{ + work_schedule_default(&d->dmat_work, DMA_TRACE_US); +} + +void dtrace_event(char *e) +{ + struct dma_trace_buf *buffer = NULL; + int length = rstrlen(e); + int margin = 0; + + if (trace_data == NULL || length < 1) { + trace_buffer_error("ele"); + return; + } + + buffer = &trace_data->dmatb; + if (buffer == NULL) { + trace_buffer_error("ele"); + return; + } + + margin = buffer->end_addr - buffer->w_ptr; + + if (margin > length) { + memcpy(buffer->w_ptr, e, length); + buffer->w_ptr += length; + } else { + memcpy(buffer->w_ptr, e, margin); + buffer->w_ptr += margin; + + trace_send(trace_data); + buffer->w_ptr = buffer->r_ptr = buffer->addr; + bzero(buffer->addr, buffer->size); + + memcpy(buffer->w_ptr, e + margin, length - margin); + buffer->w_ptr += length -margin; + + trace_buffer("ebs"); + } + + length = buffer->w_ptr - buffer->r_ptr; + if (length >= (DMA_TRACE_LOCAL_SIZE / 2)) + trace_send(trace_data); +} diff --git a/src/include/reef/alloc.h b/src/include/reef/alloc.h index d263052..a589959 100644 --- a/src/include/reef/alloc.h +++ b/src/include/reef/alloc.h @@ -82,6 +82,7 @@ void rbfree(void *ptr); /* utility */ void bzero(void *s, size_t n); void *memset(void *s, int c, size_t n); +int rstrlen(char *s); /* Heap save/restore contents and context for PM D0/D3 events */ uint32_t mm_pm_context_size(void); diff --git a/src/include/reef/audio/dma-trace.h b/src/include/reef/audio/dma-trace.h new file mode 100644 index 0000000..9ee88a0 --- /dev/null +++ b/src/include/reef/audio/dma-trace.h @@ -0,0 +1,69 @@ +/* + * 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: Yan Wang <yan.wang(a)linux.intel.com> + */ + +#ifndef __INCLUDE_DMA_TRACE__ +#define __INCLUDE_DMA_TRACE__ + +#include <stdint.h> +#include <stdlib.h> +#include <reef/reef.h> +#include <reef/list.h> +#include <reef/mailbox.h> +#include <reef/debug.h> +#include <reef/timer.h> +#include <reef/dma.h> +#include <reef/work.h> +#include <platform/platform.h> +#include <platform/timer.h> + +struct dma_trace_buf { + void *w_ptr; /* buffer write pointer */ + void *r_ptr; /* buffer read position */ + void *addr; /* buffer base address */ + void *end_addr; /* buffer end address */ + uint32_t size; /* size of buffer in bytes */ +}; + +struct dma_trace_data { + struct dma_sg_config config; + struct dma_trace_buf dmatb; + int32_t host_offset; + uint32_t host_size; + struct work dmat_work; +}; + +int dma_trace_init(struct dma_trace_data *d); +int dma_trace_host_buffer(struct dma_trace_data *d, struct dma_sg_elem *elem, + uint32_t host_size); +void dma_trace_config_ready(struct dma_trace_data *d); + +void dtrace_event(char *e); + +#endif diff --git a/src/lib/lib.c b/src/lib/lib.c index d018f5e..764e53b 100644 --- a/src/lib/lib.c +++ b/src/lib/lib.c @@ -89,3 +89,12 @@ void *memset(void *s, int c, size_t n) return s; } + +/* generic strlen - TODO: can be optimsed for ARCH ? */ +int rstrlen(char *s) +{ + char *p = s; + + while(*p++ != 0); + return (p - s) - 1; +} diff --git a/src/platform/baytrail/include/platform/platform.h b/src/platform/baytrail/include/platform/platform.h index 1ad0a22..ff3a117 100644 --- a/src/platform/baytrail/include/platform/platform.h +++ b/src/platform/baytrail/include/platform/platform.h @@ -76,6 +76,12 @@ struct reef; /* WorkQ window size in microseconds */ #define PLATFORM_WORKQ_WINDOW 2000 +/* local buffer size of DMA tracing */ +#define DMA_TRACE_LOCAL_SIZE HOST_PAGE_SIZE + +/* the interval of DMA trace copying */ +#define DMA_TRACE_US 500000 + /* Platform defined panic code */ #define platform_panic(__x) \ shim_write(SHIM_IPCXL, ((shim_read(SHIM_IPCXL) & 0xc0000000) |\ -- 2.7.4

1 0

[Sound-open-firmware] [PATCH 2/4] Add IPC message definition for DMA tracing.
by yan.wang＠linux.intel.com 18 Sep '17

18 Sep '17

From: Yan Wang <yan.wang(a)linux.intel.com> 1. Add SOF_IPC_GLB_TRACE_MSG class of IPC communication. 2. Add two IPC commands for DMA tracing. a) SOF_IPC_TRACE_DMA_INIT is used to initilize local buffer on DSP side. b) SOF_IPC_TRACE_DMA_PARAMS is used to receive host DMA buffer PHY. 3. Define DMA for Trace params IPC info structure. Signed-off-by: Yan Wang <yan.wang(a)linux.intel.com> --- src/include/uapi/ipc.h | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/src/include/uapi/ipc.h b/src/include/uapi/ipc.h index cbccb55..acfa05e 100644 --- a/src/include/uapi/ipc.h +++ b/src/include/uapi/ipc.h @@ -63,6 +63,7 @@ #define SOF_IPC_GLB_STREAM_MSG SOF_GLB_TYPE(0x6U) #define SOF_IPC_FW_READY SOF_GLB_TYPE(0x7U) #define SOF_IPC_GLB_DAI_MSG SOF_GLB_TYPE(0x8U) +#define SOF_IPC_GLB_TRACE_MSG SOF_GLB_TYPE(0x9U) /* * DSP Command Message Types @@ -113,6 +114,9 @@ #define SOF_IPC_STREAM_VORBIS_PARAMS SOF_CMD_TYPE(0x010) #define SOF_IPC_STREAM_VORBIS_FREE SOF_CMD_TYPE(0x011) +/* trace and debug */ +#define SOF_IPC_TRACE_DMA_INIT SOF_CMD_TYPE(0x001) +#define SOF_IPC_TRACE_DMA_PARAMS SOF_CMD_TYPE(0x002) /* Get message component id */ #define SOF_IPC_MESSAGE_ID(x) (x & 0xffff) @@ -796,4 +800,14 @@ struct sof_ipc_window { struct sof_ipc_window_elem window[]; } __attribute__((packed)); +/* + * DMA for Trace + */ + +/* DMA for Trace params info - SOF_IPC_DEBUG_DMA_PARAMS */ +struct sof_ipc_dma_trace_params { + struct sof_ipc_hdr hdr; + struct sof_ipc_host_buffer buffer; +} __attribute__((packed)); + #endif -- 2.7.4

1 0

[Sound-open-firmware] [PATCH 0/3] soft: make .m4 topology files more readable
by Pierre-Louis Bossart 14 Sep '17

14 Sep '17

Existing topology files are hard to look at, nothing is aligned, fits in 80 columns and comparisons between streams aren't straighforward. Re-indent files to make things more self-explanatory This also exposed a mistake in one of the passthrough test files (missing format). Pierre-Louis Bossart (3): topology: build: fix PIPELINE/DAI_ADD comments topology: test: fix passthrough 24bit-48k-ssp2 topology: indent reef-*.m4 files, fix typos topology/m4/build.m4 | 19 +++++++++++----- topology/reef-apl-nocodec.m4 | 34 +++++++++++++++++++++-------- topology/reef-bdw-rt286.m4 | 34 +++++++++++++++++++++-------- topology/reef-bdw-rt5640.m4 | 34 +++++++++++++++++++++-------- topology/reef-bxt-nocodec.m4 | 34 +++++++++++++++++++++-------- topology/reef-byt-nocodec.m4 | 30 ++++++++++++++++++------- topology/reef-byt-rt5640.m4 | 30 ++++++++++++++++++------- topology/reef-byt-rt5651.m4 | 30 ++++++++++++++++++------- topology/reef-cht-nocodec.m4 | 30 ++++++++++++++++++------- topology/reef-hsw-rt5640.m4 | 34 +++++++++++++++++++++-------- topology/test-passthrough-24bit-48k-ssp2.m4 | 2 +- 11 files changed, 228 insertions(+), 83 deletions(-) -- 2.11.0

2 4

[Sound-open-firmware] [PATCH v2 1/2] MUX component added
by Ranjani Sridharan 13 Sep '17

13 Sep '17

This patch adds a 1:N or N:1 MUX/DEMUX component. Only one source and one sink buffer can be active at run-time. The MUX component is configured using the COMP_CMD_MUX_SWITCH command passed along with the chosen source and sink buffer configuration. It performs no processing on the input samples, but simply copies the input frames from the source to the sink buffer. Signed-off-by: Ranjani Sridharan <ranjani.sridharan(a)linux.intel.com> --- src/audio/mux.c | 293 +++++++++++++++++++++++++++++++++++-- src/include/reef/audio/Makefile.am | 3 +- src/include/reef/audio/component.h | 1 - src/include/reef/audio/mux.h | 50 +++++++ src/include/uapi/ipc.h | 1 - 5 files changed, 335 insertions(+), 13 deletions(-) create mode 100644 src/include/reef/audio/mux.h diff --git a/src/audio/mux.c b/src/audio/mux.c index f420bd3..e010104 100644 --- a/src/audio/mux.c +++ b/src/audio/mux.c @@ -26,61 +26,333 @@ * POSSIBILITY OF SUCH DAMAGE. * * Author: Liam Girdwood <liam.r.girdwood(a)linux.intel.com> + * 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/mux.h> +#include <reef/audio/pipeline.h> +#include <uapi/ipc.h> /* tracing */ -#define trace_mux(__e) trace_event(TRACE_CLASS_MUX, __e) +#define trace_mux(__e) trace_event(TRACE_CLASS_MUX, __e) #define trace_mux_error(__e) trace_error(TRACE_CLASS_MUX, __e) #define tracev_mux(__e) tracev_event(TRACE_CLASS_MUX, __e) +/* + * mux_comp_data structure + * num_src_buffer - number of source buffers + * num_sink_buffer - number of sink buffers + * config - current configuration of the MUX component + * mux_func - function that performs the routing of input buffer to + * the output buffer based on config + */ +struct mux_comp_data { + uint32_t num_src_buffer, num_sink_buffer; + struct mux_config *config; + int (*mux_func)(struct comp_dev *dev, struct comp_buffer *sink, + struct comp_buffer *source, uint32_t frames); + +}; + +/* mux function to copy data from source to sink buffer */ +static int mux_function(struct comp_dev *dev, struct comp_buffer *sink_buffer, + struct comp_buffer *source_buffer, uint32_t frames) +{ + int32_t *src = (int32_t *) source_buffer->r_ptr; + int32_t *dest = (int32_t *) sink_buffer->w_ptr; + int nch = dev->params.channels; + struct sof_ipc_comp_config *config = COMP_GET_CONFIG(dev); + int ret = 0; + + /* 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_mux_error("MUf"); + ret = -EINVAL; + break; + } + + return ret; +} + static struct comp_dev *mux_new(struct sof_ipc_comp *comp) { - trace_mux("new"); + struct comp_dev *dev; + struct mux_comp_data *cd; + + trace_mux("MUn"); + dev = rzalloc(RZONE_RUNTIME, RFLAGS_NONE, + COMP_SIZE(struct sof_ipc_comp_mux)); + if (dev == NULL) + return NULL; + + memcpy(&dev->comp, comp, sizeof(struct sof_ipc_comp_mux)); + + cd = rzalloc(RZONE_RUNTIME, RFLAGS_NONE, sizeof(*cd)); + if (cd == NULL) { + rfree(dev); + return NULL; + } + + cd->config = rzalloc(RZONE_RUNTIME, RFLAGS_NONE, + sizeof(struct mux_config)); + if (cd == NULL) { + rfree(dev); + rfree(cd); + return NULL; + } + + cd->config->source_buffer_id = -1; + cd->config->sink_buffer_id = -1; + + comp_set_drvdata(dev, cd); + cd->mux_func = mux_function; - return NULL; + return dev; } static void mux_free(struct comp_dev *dev) { + struct mux_comp_data *cd = comp_get_drvdata(dev); + rfree(cd->config); + rfree(cd); + rfree(dev); } -/* set component audio stream paramters */ +/* set component audio stream parameters */ static int mux_params(struct comp_dev *dev) { + return 0; +} + +/* set new mux component configuration + * updates the connection status of sink/source buffers + */ +static int mux_route(struct comp_dev *dev, + int32_t source_buffer_index, int sink_buffer_index) +{ + struct mux_comp_data *cd = comp_get_drvdata(dev); + struct comp_buffer *source_buffer, *sink_buffer; + struct list_item *clist; + int i = 0; + + if ((source_buffer_index > (cd->num_src_buffer - 1)) || + (sink_buffer_index > (cd->num_sink_buffer - 1))) { + trace_mux_error("MUb"); + return -EINVAL; + } + + /* switch source buffer if needed */ + if (source_buffer_index != cd->config->source_buffer_id) { + cd->config->source_buffer_id = source_buffer_index; + /* connect new MUX source buffer and disconnect the rest */ + list_for_item_prev(clist, &dev->bsource_list) { + source_buffer = container_of(clist, struct comp_buffer, + sink_list); + if (i == cd->config->source_buffer_id) { + source_buffer->connected = 1; + cd->config->source_buffer = source_buffer; + } else + source_buffer->connected = 0; + i++; + } + } + + /* switch sink buffer if needed */ + i = 0; + if (sink_buffer_index != cd->config->sink_buffer_id) { + cd->config->sink_buffer_id = sink_buffer_index; + /* connect new MUX sink buffer and disconnect the rest */ + list_for_item_prev(clist, &dev->bsink_list) { + sink_buffer = container_of(clist, struct comp_buffer, + source_list); + if (i == cd->config->sink_buffer_id) { + sink_buffer->connected = 1; + cd->config->sink_buffer = sink_buffer; + } else + sink_buffer->connected = 0; + i++; + } + } + + return 0; +} + +/* set the number of input and output buffers connected at pipeline setup */ +static int set_buffer_count(struct comp_dev *dev) +{ + struct list_item *clist; + struct mux_comp_data *cd = comp_get_drvdata(dev); + int count = 0; + + if (list_is_empty(&dev->bsource_list) || + list_is_empty(&dev->bsink_list)) { + trace_mux_error("Mbc"); + return -EINVAL; + } + + list_for_item(clist, &dev->bsource_list) + count++; + cd->num_src_buffer = count; + + count = 0; + list_for_item(clist, &dev->bsink_list) + count++; + cd->num_sink_buffer = count; return 0; } +static int mux_ctrl_cmd(struct comp_dev *dev, struct sof_ipc_ctrl_data *cdata) +{ + struct mux_comp_data *cd = comp_get_drvdata(dev); + int source_buffer_index = -1, sink_buffer_index = -1, ret = 0; + + switch (cdata->cmd) { + case SOF_CTRL_CMD_ROUTE: + /* check if the ctrl cmd is for this component */ + if (cdata->comp_id != dev->comp.id) + break; + + if (cdata->num_elems < 1) { + trace_mux_error("Mcd"); + ret = -EINVAL; + } + + if (cdata->compv[0].index == 0) { + /* new source buffer index */ + source_buffer_index = cdata->compv[0].uvalue; + /* sink buffer index is unchanged */ + sink_buffer_index = cd->config->sink_buffer_id; + } else { + /* new sink buffer index */ + sink_buffer_index = cdata->compv[0].uvalue; + /* source buffer index is unchanged */ + source_buffer_index = cd->config->source_buffer_id; + } + /* switch to the new source/sink buffer(s)*/ + ret = mux_route(dev, source_buffer_index, + sink_buffer_index); + break; + default: + break; + } + + if (ret < 0) + trace_mux_error("Mct"); + return ret; + +} + /* used to pass standard and bespoke commands (with data) to component */ static int mux_cmd(struct comp_dev *dev, int cmd, void *data) { - /* mux will use buffer "connected" status */ - return 0; + struct sof_ipc_ctrl_data *cdata = data; + int ret = 0; + + switch (cmd) { + case COMP_CMD_SET_VALUE: + ret = mux_ctrl_cmd(dev, cdata); + break; + 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; } -/* copy and process stream data from source to sink buffers */ +/* copy and process stream data from source to sink buffers + * returns the number of frames copied + */ static int mux_copy(struct comp_dev *dev) { + struct mux_comp_data *cd = comp_get_drvdata(dev); + struct comp_buffer *source_buffer = NULL, *sink_buffer = NULL; + uint32_t copy_bytes; - return 0; + /* get the connected source and sink buffers */ + source_buffer = cd->config->source_buffer; + sink_buffer = cd->config->sink_buffer; + + if (!source_buffer || !sink_buffer) { + trace_mux_error("Mbn"); + return -EINVAL; + } + + /* 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_mux_error("Mcb"); + return -EINVAL; + } + + /* Run passthrough if buffers have enough room */ + cd->mux_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; +} + +static int mux_preload(struct comp_dev *dev) +{ + return mux_copy(dev); +} + +static int mux_default_config(struct comp_dev *dev) +{ + int ret = 0; + + ret = set_buffer_count(dev); + if (ret < 0) + return -EINVAL; + + ret = mux_route(dev, 0, 0); + + return ret; } static int mux_reset(struct comp_dev *dev) { - return 0; + trace_mux("MUr"); + dev->state = COMP_STATE_INIT; + return mux_default_config(dev); } static int mux_prepare(struct comp_dev *dev) { - return 0; + trace_mux("MUp"); + dev->state = COMP_STATE_PREPARE; + return mux_default_config(dev); } struct comp_driver comp_mux = { @@ -93,6 +365,7 @@ struct comp_driver comp_mux = { .copy = mux_copy, .prepare = mux_prepare, .reset = mux_reset, + .preload = mux_preload, }, }; diff --git a/src/include/reef/audio/Makefile.am b/src/include/reef/audio/Makefile.am index b02684c..509a34a 100644 --- a/src/include/reef/audio/Makefile.am +++ b/src/include/reef/audio/Makefile.am @@ -1,4 +1,5 @@ noinst_HEADERS = \ component.h \ pipeline.h \ - buffer.h + buffer.h \ + mux.h diff --git a/src/include/reef/audio/component.h b/src/include/reef/audio/component.h index e20ffed..ed29da4 100644 --- a/src/include/reef/audio/component.h +++ b/src/include/reef/audio/component.h @@ -80,7 +80,6 @@ #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 */ #define COMP_CMD_IPC_MMAP_PPOS 201 /* DAI presentation position */ diff --git a/src/include/reef/audio/mux.h b/src/include/reef/audio/mux.h new file mode 100644 index 0000000..6c6b6af --- /dev/null +++ b/src/include/reef/audio/mux.h @@ -0,0 +1,50 @@ +/* + * Copyright (c) 2017, 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> + */ + +#ifndef SOF_COMP_MUX_H +#define SOF_COMP_MUX_H + +#include <reef/audio/component.h> +/* + * mux_config data structure + * in_buffer_id - ID of input buffer connected to the MUX component + * out_buffer_id - ID of output buffer connected to the MUX component + * in_buffer - pointer to the connected source buffer + * out_buffer - pointer to the connected sink buffer + */ + +struct mux_config { + uint32_t source_buffer_id, sink_buffer_id; + struct comp_buffer *source_buffer, *sink_buffer; +}; + + + +#endif diff --git a/src/include/uapi/ipc.h b/src/include/uapi/ipc.h index c8cdedb..be4c9f2 100644 --- a/src/include/uapi/ipc.h +++ b/src/include/uapi/ipc.h @@ -641,7 +641,6 @@ struct sof_ipc_comp_eq_iir { struct sof_ipc_comp_config config; } __attribute__((packed)); - /* frees components, buffers and pipelines * SOF_IPC_TPLG_COMP_FREE, SOF_IPC_TPLG_PIPE_FREE, SOF_IPC_TPLG_BUFFER_FREE */ -- 2.9.3

3 3

[Sound-open-firmware] [PATCH] SRC: Sink and source buffers handling bug fixes
by Seppo Ingalsuo 12 Sep '17

12 Sep '17

This patch improves robustness to various buffering settings by adding more check for sufficient buffers sizes vs. internal block processing length of SRC. The resize of sink buffer is changed to allow at least internal output block length plus one period to the buffer. The bug in rejecting disabled SRC modes is fixed in SRC core module. Signed-off-by: Seppo Ingalsuo <seppo.ingalsuo(a)linux.intel.com> --- src/audio/src.c | 34 ++++++++++++++++++++++++++++------ src/audio/src_core.c | 23 +++++++++++------------ 2 files changed, 39 insertions(+), 18 deletions(-) diff --git a/src/audio/src.c b/src/audio/src.c index 54c798e..2ecf025 100644 --- a/src/audio/src.c +++ b/src/audio/src.c @@ -60,7 +60,7 @@ struct comp_data { int scratch_length; uint32_t sink_rate; uint32_t source_rate; - uint32_t period_bytes; /* sink period */ + uint32_t period_bytes; /* sink period */ void (*src_func)(struct comp_dev *dev, struct comp_buffer *source, struct comp_buffer *sink, @@ -308,12 +308,12 @@ static int src_params(struct comp_dev *dev) struct sof_ipc_comp_src *src = COMP_GET_IPC(dev, sof_ipc_comp_src); struct sof_ipc_comp_config *config = COMP_GET_CONFIG(dev); struct comp_data *cd = comp_get_drvdata(dev); - struct comp_buffer *sink; + struct comp_buffer *sink, *source; struct src_alloc need; size_t delay_lines_size; uint32_t source_rate, sink_rate; int32_t *buffer_start; - int n = 0, i, err, frames_is_for_source; + int n = 0, i, err, frames_is_for_source, q; trace_src("par"); @@ -405,9 +405,22 @@ static int src_params(struct comp_dev *dev) dev->params.sample_container_bytes * dev->params.channels; cd->period_bytes = dev->frames * dev->frame_bytes; - /* configure downstream buffer */ - sink = list_first_item(&dev->bsink_list, struct comp_buffer, source_list); - err = buffer_set_size(sink, cd->period_bytes * config->periods_sink); + /* The downstream buffer must be at least length of blk_out plus + * dev->frames and an integer multiple of dev->frames. The + * buffer_set_size will return an error if the required length would + * be too long. + */ + q = need.blk_out / dev->frames; + if (q * dev->frames < need.blk_out) + ++q; + + if (q * dev->frames < need.blk_out + dev->frames) + ++q; + + /* Configure downstream buffer */ + sink = list_first_item(&dev->bsink_list, struct comp_buffer, + source_list); + err = buffer_set_size(sink, q * dev->frames * dev->frame_bytes); if (err < 0) { trace_src_error("eSz"); return err; @@ -415,6 +428,15 @@ static int src_params(struct comp_dev *dev) buffer_reset_pos(sink); + /* Check that source buffer has sufficient size */ + source = list_first_item(&dev->bsource_list, struct comp_buffer, + sink_list); + if (source->size < need.blk_in * dev->frame_bytes) { + trace_src_error("eSy"); + return -EINVAL; + } + + return 0; } diff --git a/src/audio/src_core.c b/src/audio/src_core.c index cc44734..a9331a0 100644 --- a/src/audio/src_core.c +++ b/src/audio/src_core.c @@ -151,10 +151,12 @@ int src_buffer_lengths(struct src_alloc *a, int fs_in, int fs_out, int nch, k = max_frames / blk_out; } - /* Return with error if max_frames is too small even for smallest - possible SRC block length. */ + /* Mininum k is 1, when 0 max_frames is less than block length. In + * that case need to check in src.c that sink/source size is large + * enough for at least one block. + */ if (k < 1) - return -EINVAL; + k = 1; a->blk_mult = k; a->blk_in = blk_in * k; @@ -209,9 +211,6 @@ static int init_stages( if (stage1->blk_out == 0) return -EINVAL; } else { - if ((stage1->blk_out == 0) || (stage1->blk_in == 0)) - return -EINVAL; - src->stage1_times = res->stage1_times; src->stage2_times = res->stage2_times; src->blk_in = res->blk_in; @@ -219,14 +218,14 @@ static int init_stages( } /* Delay line sizes */ - src->state1.fir_delay_size = res->fir_s1; //src_fir_delay_length(stage1); - src->state1.out_delay_size = res->out_s1; //src_out_delay_length(stage1); + src->state1.fir_delay_size = res->fir_s1; + src->state1.out_delay_size = res->out_s1; src->state1.fir_delay = delay_lines_start; src->state1.out_delay = src->state1.fir_delay + src->state1.fir_delay_size; if (n > 1) { - src->state2.fir_delay_size = res->fir_s2; // src_fir_delay_length(stage2); - src->state2.out_delay_size = res->out_s2; // src_out_delay_length(stage2); + src->state2.fir_delay_size = res->fir_s2; + src->state2.out_delay_size = res->out_s2; src->state2.fir_delay = src->state1.out_delay + src->state1.out_delay_size; src->state2.out_delay = @@ -289,7 +288,7 @@ int src_polyphase_init(struct polyphase_src *src, int fs1, int fs2, return -EINVAL; /* Get number of stages used for optimize opportunity. 2nd - * stage lenth is one if conversion needs only one stage. + * stage length is one if conversion needs only one stage. */ n_stages = (src->stage2->filter_length == 1) ? 1 : 2; @@ -297,7 +296,7 @@ int src_polyphase_init(struct polyphase_src *src, int fs1, int fs2, * mode from in/out matrix. Computing of such SRC mode needs * to be prevented. */ - if (src->stage2->filter_length == 0) + if (src->stage1->filter_length == 0) return -EINVAL; return n_stages; -- 2.11.0

2 1

[Sound-open-firmware] [PATCH v2 1/2] volume: check if ctrl cmd is for volume component
by Ranjani Sridharan 12 Sep '17

12 Sep '17

This patch adds a fix to check if the ctrl cmd is meant for the volume component and if so, the data is valid. Signed-off-by: Ranjani Sridharan <ranjani.sridharan(a)linux.intel.com> --- src/audio/volume.c | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/src/audio/volume.c b/src/audio/volume.c index 5808bed..363055d 100644 --- a/src/audio/volume.c +++ b/src/audio/volume.c @@ -385,6 +385,11 @@ static int volume_ctrl_set_cmd(struct comp_dev *dev, struct sof_ipc_ctrl_data *c struct comp_data *cd = comp_get_drvdata(dev); int i, j; + if (cdata == NULL) { + trace_volume_error("Sws"); + return -EINVAL; + } + /* validate */ if (cdata->num_elems == 0 || cdata->num_elems >= SOF_IPC_MAX_CHANNELS) { trace_volume_error("gs0"); @@ -436,6 +441,11 @@ static int volume_ctrl_get_cmd(struct comp_dev *dev, struct sof_ipc_ctrl_data *c struct comp_data *cd = comp_get_drvdata(dev); int i, j; + if (cdata == NULL) { + trace_volume_error("Swg"); + return -EINVAL; + } + /* validate */ if (cdata->num_elems == 0 || cdata->num_elems >= SOF_IPC_MAX_CHANNELS) { trace_volume_error("gc0"); @@ -469,6 +479,10 @@ static int volume_cmd(struct comp_dev *dev, int cmd, void *data) trace_volume("cmd"); + /* check if the ctrl cmd is for this component */ + if ((cdata != NULL) && (cdata->comp_id != dev->comp.id)) + return 0; + switch (cmd) { case COMP_CMD_SET_VALUE: return volume_ctrl_set_cmd(dev, cdata); -- 2.11.0

2 2

[Sound-open-firmware] [PATCH] volume: ctrl cmd id check and prepare fix
by Ranjani Sridharan 12 Sep '17

12 Sep '17

This patch fixes the following: a. source_period_bytes/sink_period_bytes calculation fix with the correct frame_bytes b. check if the ctrl cmd is for the volume before processing it Signed-off-by: Ranjani Sridharan <ranjani.sridharan(a)linux.intel.com> --- src/audio/volume.c | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) diff --git a/src/audio/volume.c b/src/audio/volume.c index 5808bed..82b8848 100644 --- a/src/audio/volume.c +++ b/src/audio/volume.c @@ -471,9 +471,17 @@ static int volume_cmd(struct comp_dev *dev, int cmd, void *data) switch (cmd) { case COMP_CMD_SET_VALUE: - return volume_ctrl_set_cmd(dev, cdata); + /* check if the ctrl cmd is for this component */ + if ((cdata != NULL) && (cdata->comp_id != dev->comp.id)) + return 0; + else + return volume_ctrl_set_cmd(dev, cdata); case COMP_CMD_GET_VALUE: - return volume_ctrl_get_cmd(dev, cdata); + /* check if the ctrl cmd is for this component */ + if ((cdata != NULL) && (cdata->comp_id != dev->comp.id)) + return 0; + else + return volume_ctrl_get_cmd(dev, cdata); case COMP_CMD_START: case COMP_CMD_STOP: case COMP_CMD_PAUSE: @@ -555,7 +563,7 @@ static int volume_prepare(struct comp_dev *dev) sconfig = COMP_GET_CONFIG(sourceb->source); cd->source_format = sconfig->frame_fmt; cd->source_period_bytes = dev->frames * - sourceb->source->frame_bytes; + comp_frame_bytes(sourceb->source); break; } @@ -575,7 +583,7 @@ static int volume_prepare(struct comp_dev *dev) sconfig = COMP_GET_CONFIG(sinkb->sink); cd->sink_format = sconfig->frame_fmt; cd->sink_period_bytes = dev->frames * - sinkb->sink->frame_bytes; + comp_frame_bytes(sinkb->sink); break; } -- 2.11.0

2 2

[Sound-open-firmware] [PATCH v2 1/2] Switch component added
by Ranjani Sridharan 11 Sep '17

11 Sep '17

This patch adds a new switch component that mutes the pipeline when the when the switch is OFF. Stream data flows through the pipeline normally when it is ON. Signed-off-by: Ranjani Sridharan <ranjani.sridharan(a)linux.intel.com> --- src/audio/switch.c | 178 +++++++++++++++++++++++++++++++++++++++++++++++-- src/include/uapi/ipc.h | 6 ++ 2 files changed, 178 insertions(+), 6 deletions(-) diff --git a/src/audio/switch.c b/src/audio/switch.c index 7149b61..67f723c 100644 --- a/src/audio/switch.c +++ b/src/audio/switch.c @@ -26,6 +26,7 @@ * POSSIBILITY OF SUCH DAMAGE. * * Author: Liam Girdwood <liam.r.girdwood(a)linux.intel.com> + * Ranjani Sridharan <ranjani.sridharan(a)linux.intel.com> */ #include <stdint.h> @@ -40,46 +41,211 @@ #define trace_switch_error(__e) trace_error(TRACE_CLASS_SWITCH, __e) #define tracev_switch(__e) tracev_event(TRACE_CLASS_SWITCH, __e) +/* Simple switch component + * This component copies stream data from source buffer to the sink buffer + * if the switch is ON. Otherwise it discards the source buffer data and + * writes 0's to the sink buffer. + */ + +/* + * switch_comp_data structure + * on_switch - indicates if the switch is ON/OFF + * switch_func - function that performs the routing of input buffer to + * the output buffer based on on_switch + */ +struct switch_comp_data { + int on_switch; + int (*switch_func)(struct comp_dev *dev, struct comp_buffer *sink, + struct comp_buffer *source, uint32_t frames); + +}; + +/* switch function to copy data from source to sink buffer */ +static int switch_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); + struct switch_comp_data *cd = comp_get_drvdata(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 source buffer to sink buffer if switch is on */ + if (cd->on_switch == 1) { + /* 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_switch_error("SWf"); + return -EINVAL; + } + + return frames; + } + + /* discard source data and copy 0's if switch is off */ + memset(dest, 0, frames * nch * sizeof(int32_t)); + + return frames; +} + static struct comp_dev *switch_new(struct sof_ipc_comp *comp) { - trace_switch("new"); + struct comp_dev *dev; + struct switch_comp_data *cd; + + trace_switch("Swn"); + dev = rzalloc(RZONE_RUNTIME, RFLAGS_NONE, + COMP_SIZE(struct sof_ipc_comp_switch)); + if (dev == NULL) + return NULL; + + memcpy(&dev->comp, comp, sizeof(struct sof_ipc_comp_switch)); - return NULL; + cd = rzalloc(RZONE_RUNTIME, RFLAGS_NONE, sizeof(*cd)); + if (cd == NULL) { + rfree(dev); + return NULL; + } + + /* switch is on by default */ + cd->on_switch = 1; + + comp_set_drvdata(dev, cd); + cd->switch_func = switch_function; + + return dev; } static void switch_free(struct comp_dev *dev) { + struct switch_comp_data *cd = comp_get_drvdata(dev); + rfree(cd); + rfree(dev); } /* set component audio stream paramters */ static int switch_params(struct comp_dev *dev) { - return 0; } +static int switch_ctrl_cmd(struct comp_dev *dev, + struct sof_ipc_ctrl_data *cdata) +{ + struct switch_comp_data *cd = comp_get_drvdata(dev); + int ret = 0; + + if (cdata == NULL) { + trace_switch_error("swe"); + return -EINVAL; + } + + switch (cdata->cmd) { + case SOF_CTRL_CMD_ROUTE: + /* check if the ctrl cmd is for this component */ + if (cdata->comp_id != dev->comp.id) + break; + + if (cdata->num_elems < 1) { + trace_switch_error("Swd"); + ret = -EINVAL; + } + + cd->on_switch = cdata->compv[0].uvalue; + break; + default: + break; + } + + return ret; +} + /* used to pass standard and bespoke commands (with data) to component */ static int switch_cmd(struct comp_dev *dev, int cmd, void *data) { - /* switch will use buffer "connected" status */ - return 0; + struct sof_ipc_ctrl_data *cdata = data; + int ret = 0; + + switch (cmd) { + case COMP_CMD_SET_VALUE: + ret = switch_ctrl_cmd(dev, cdata); + break; + 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; } /* copy and process stream data from source to sink buffers */ static int switch_copy(struct comp_dev *dev) { + struct switch_comp_data *cd = comp_get_drvdata(dev); + struct comp_buffer *source_buffer = NULL, *sink_buffer = NULL; + uint32_t copy_bytes; - return 0; + /* 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); + + if (!source_buffer || !sink_buffer) { + trace_switch_error("Scp"); + return -EINVAL; + } + + /* 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_switch_error("Scb"); + return -EINVAL; + } + + /* Run passthrough if buffers have enough room */ + cd->switch_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; } static int switch_reset(struct comp_dev *dev) { + struct switch_comp_data *cd = comp_get_drvdata(dev); + + /* reset switch to on status */ + cd->on_switch = 1; + dev->state = COMP_STATE_INIT; + return 0; } static int switch_prepare(struct comp_dev *dev) { + dev->state = COMP_STATE_PREPARE; + return 0; } diff --git a/src/include/uapi/ipc.h b/src/include/uapi/ipc.h index 2c2f415..cbef325 100644 --- a/src/include/uapi/ipc.h +++ b/src/include/uapi/ipc.h @@ -616,6 +616,12 @@ struct sof_ipc_comp_mux { struct sof_ipc_comp_config config; } __attribute__((packed)); +/* generic switch component */ +struct sof_ipc_comp_switch { + struct sof_ipc_comp comp; + struct sof_ipc_comp_config config; +} __attribute__((packed)); + /* generic passthrough component */ struct sof_ipc_comp_passthrough { struct sof_ipc_comp comp; -- 2.11.0

1 0

[Sound-open-firmware] [PATCH] topology: SRC: Use 4ms for topology scheduling and increase buffers
by Liam Girdwood 11 Sep '17

11 Sep '17

SRC should be scheduled on at least 4ms tick. Increase buffers to deal with 2 times output rate. Signed-off-by: Liam Girdwood <liam.r.girdwood(a)linux.intel.com> --- topology/reef-bxt-nocodec.m4 | 10 +++++----- topology/reef-byt-nocodec.m4 | 4 ++-- topology/reef-byt-rt5640.m4 | 4 ++-- topology/reef-byt-rt5651.m4 | 4 ++-- topology/reef-cht-nocodec.m4 | 8 ++++---- topology/reef-hsw-rt5640.m4 | 10 +++++----- topology/sof/pipe-pcm-media.m4 | 10 ++++++---- 7 files changed, 26 insertions(+), 24 deletions(-) diff --git a/topology/reef-bxt-nocodec.m4 b/topology/reef-bxt-nocodec.m4 index 2028323..486d4ea 100644 --- a/topology/reef-bxt-nocodec.m4 +++ b/topology/reef-bxt-nocodec.m4 @@ -40,14 +40,14 @@ PIPELINE_PCM_ADD(sof/pipe-low-latency-playback.m4, 1, 0, 2, s32le, 48, 1000, 0, PIPELINE_PCM_ADD(sof/pipe-low-latency-capture.m4, 2, 1, 2, s32le, 48, 1000, 0, 0, 0, 2) # PCM Media Playback pipeline 3 on PCM 2 using max 2 channels of s32le. -# Schedule 96 frames per 2000us deadline on core 0 with priority 1 +# Schedule 192 frames per 4000us deadline on core 0 with priority 1 # Use DMAC 0 channel 3 for PCM audio playback data -PIPELINE_PCM_ADD(sof/pipe-pcm-media.m4, 3, 2, 2, s32le, 96, 2000, 1, 0, 0, 3) +PIPELINE_PCM_ADD(sof/pipe-pcm-media.m4, 3, 2, 2, s32le, 192, 4000, 1, 0, 0, 3) # PCM Media Playback pipeline 4 on PCM 3 using max 2 channels of s32le. -# Schedule 96 frames per 2000us deadline on core 0 with priority 1 -# Use DMAC 0 channel 4 for PCM audio playback data -PIPELINE_PCM_ADD(sof/pipe-pcm-media.m4, 4, 3, 2, s32le, 96, 2000, 1, 0, 0, 4) +# Schedule 192 frames per 4000us deadline on core 0 with priority 1 +# Use DMAC 0 channel 3 for PCM audio playback data +PIPELINE_PCM_ADD(sof/pipe-pcm-media.m4, 3, 2, 2, s32le, 192, 4000, 1, 0, 0, 4) # Tone Playback pipeline 5 using max 2 channels of s32le. # Schedule 192 frames per 4000us deadline on core 0 with priority 2 diff --git a/topology/reef-byt-nocodec.m4 b/topology/reef-byt-nocodec.m4 index 1c3cf5f..938666d 100644 --- a/topology/reef-byt-nocodec.m4 +++ b/topology/reef-byt-nocodec.m4 @@ -38,9 +38,9 @@ PIPELINE_PCM_ADD(sof/pipe-low-latency-playback.m4, 1, 0, 2, s32le, 48, 1000, 0, PIPELINE_PCM_ADD(sof/pipe-low-latency-capture.m4, 2, 1, 2, s32le, 48, 1000, 0, 0, 0, 2) # PCM Media Playback pipeline 3 on PCM 2 using max 2 channels of s32le. -# Schedule 96 frames per 2000us deadline on core 0 with priority 1 +# Schedule 192 frames per 4000us deadline on core 0 with priority 1 # Use DMAC 0 channel 3 for PCM audio playback data -PIPELINE_PCM_ADD(sof/pipe-pcm-media.m4, 3, 2, 2, s32le, 96, 2000, 1, 0, 0, 3) +PIPELINE_PCM_ADD(sof/pipe-pcm-media.m4, 3, 2, 2, s32le, 192, 4000, 1, 0, 0, 3) # Tone Playback pipeline 5 using max 2 channels of s32le. # Schedule 192 frames per 4000us deadline on core 0 with priority 2 diff --git a/topology/reef-byt-rt5640.m4 b/topology/reef-byt-rt5640.m4 index 9855f1a..05743e2 100644 --- a/topology/reef-byt-rt5640.m4 +++ b/topology/reef-byt-rt5640.m4 @@ -38,9 +38,9 @@ PIPELINE_PCM_ADD(sof/pipe-low-latency-playback.m4, 1, 0, 2, s32le, 48, 1000, 0, PIPELINE_PCM_ADD(sof/pipe-low-latency-capture.m4, 2, 1, 2, s32le, 48, 1000, 0, 0, 0, 2) # PCM Media Playback pipeline 3 on PCM 2 using max 2 channels of s32le. -# Schedule 96 frames per 2000us deadline on core 0 with priority 1 +# Schedule 192 frames per 4000us deadline on core 0 with priority 1 # Use DMAC 0 channel 3 for PCM audio playback data -PIPELINE_PCM_ADD(sof/pipe-pcm-media.m4, 3, 2, 2, s32le, 96, 2000, 1, 0, 0, 3) +PIPELINE_PCM_ADD(sof/pipe-pcm-media.m4, 3, 2, 2, s32le, 192, 4000, 1, 0, 0, 3) # Tone Playback pipeline 5 using max 2 channels of s32le. # Schedule 192 frames per 4000us deadline on core 0 with priority 2 diff --git a/topology/reef-byt-rt5651.m4 b/topology/reef-byt-rt5651.m4 index 1b492b7..cb9dcc2 100644 --- a/topology/reef-byt-rt5651.m4 +++ b/topology/reef-byt-rt5651.m4 @@ -38,9 +38,9 @@ PIPELINE_PCM_ADD(sof/pipe-low-latency-playback.m4, 1, 0, 2, s32le, 48, 1000, 0, PIPELINE_PCM_ADD(sof/pipe-low-latency-capture.m4, 2, 1, 2, s32le, 48, 1000, 0, 0, 0, 2) # PCM Media Playback pipeline 3 on PCM 2 using max 2 channels of s32le. -# Schedule 96 frames per 2000us deadline on core 0 with priority 1 +# Schedule 192 frames per 4000us deadline on core 0 with priority 1 # Use DMAC 0 channel 3 for PCM audio playback data -PIPELINE_PCM_ADD(sof/pipe-pcm-media.m4, 3, 2, 2, s32le, 96, 2000, 1, 0, 0, 3) +PIPELINE_PCM_ADD(sof/pipe-pcm-media.m4, 3, 2, 2, s32le, 192, 4000, 1, 0, 0, 3) # Tone Playback pipeline 5 using max 2 channels of s32le. # Schedule 192 frames per 4000us deadline on core 0 with priority 2 diff --git a/topology/reef-cht-nocodec.m4 b/topology/reef-cht-nocodec.m4 index ead0f75..52e8d50 100644 --- a/topology/reef-cht-nocodec.m4 +++ b/topology/reef-cht-nocodec.m4 @@ -37,10 +37,10 @@ PIPELINE_PCM_ADD(sof/pipe-low-latency-playback.m4, 1, 0, 2, s32le, 48, 1000, 0, # Use DMAC 0 channel 2 for PCM audio capture data PIPELINE_PCM_ADD(sof/pipe-low-latency-capture.m4, 2, 1, 2, s32le, 48, 1000, 0, 0, 0, 2) -# PCM Media Playback pipeline 4 on PCM 3 using max 2 channels of s32le. -# Schedule 96 frames per 2000us deadline on core 0 with priority 1 -# Use DMAC 0 channel 4 for PCM audio playback data -PIPELINE_PCM_ADD(sof/pipe-pcm-media.m4, 4, 3, 2, s32le, 96, 2000, 1, 0, 0, 4) +# PCM Media Playback pipeline 3 on PCM 2 using max 2 channels of s32le. +# Schedule 192 frames per 4000us deadline on core 0 with priority 1 +# Use DMAC 0 channel 3 for PCM audio playback data +PIPELINE_PCM_ADD(sof/pipe-pcm-media.m4, 3, 2, 2, s32le, 192, 4000, 1, 0, 0, 3) # Tone Playback pipeline 5 using max 2 channels of s32le. # Schedule 192 frames per 4000us deadline on core 0 with priority 2 diff --git a/topology/reef-hsw-rt5640.m4 b/topology/reef-hsw-rt5640.m4 index e4d9392..af18633 100644 --- a/topology/reef-hsw-rt5640.m4 +++ b/topology/reef-hsw-rt5640.m4 @@ -40,14 +40,14 @@ PIPELINE_PCM_ADD(sof/pipe-low-latency-playback.m4, 1, 0, 2, s32le, 48, 1000, 0, PIPELINE_PCM_ADD(sof/pipe-low-latency-capture.m4, 2, 1, 2, s32le, 48, 1000, 0, 0, 0, 2) # PCM Media Playback pipeline 3 on PCM 2 using max 2 channels of s32le. -# Schedule 96 frames per 2000us deadline on core 0 with priority 1 +# Schedule 192 frames per 4000us deadline on core 0 with priority 1 # Use DMAC 0 channel 3 for PCM audio playback data -PIPELINE_PCM_ADD(sof/pipe-pcm-media.m4, 3, 2, 2, s32le, 96, 2000, 1, 0, 0, 3) +PIPELINE_PCM_ADD(sof/pipe-pcm-media.m4, 3, 2, 2, s32le, 192, 4000, 1, 0, 0, 3) # PCM Media Playback pipeline 4 on PCM 3 using max 2 channels of s32le. -# Schedule 96 frames per 2000us deadline on core 0 with priority 1 -# Use DMAC 0 channel 4 for PCM audio playback data -PIPELINE_PCM_ADD(sof/pipe-pcm-media.m4, 4, 3, 2, s32le, 96, 2000, 1, 0, 0, 4) +# Schedule 192 frames per 4000us deadline on core 0 with priority 1 +# Use DMAC 0 channel 3 for PCM audio playback data +PIPELINE_PCM_ADD(sof/pipe-pcm-media.m4, 3, 2, 2, s32le, 192, 4000, 1, 0, 0, 4) # Tone Playback pipeline 5 using max 2 channels of s32le. # Schedule 192 frames per 4000us deadline on core 0 with priority 2 diff --git a/topology/sof/pipe-pcm-media.m4 b/topology/sof/pipe-pcm-media.m4 index bde9dd2..97958cd 100644 --- a/topology/sof/pipe-pcm-media.m4 +++ b/topology/sof/pipe-pcm-media.m4 @@ -73,12 +73,14 @@ W_PGA(0, PCM PCM_ID Playback Volume, PIPELINE_FORMAT, 2, 2, 2) # "SRC 0" has 2 sink and source periods. W_SRC(0, PIPELINE_FORMAT, 2, 2, media_src_conf, 2) -# Media Buffers -W_BUFFER(0, COMP_BUFFER_SIZE(2, +# Media Source Buffers to SRC, make them big enough to deal with 2 * rate. +W_BUFFER(0, COMP_BUFFER_SIZE(4, COMP_SAMPLE_SIZE(PIPELINE_FORMAT), PIPELINE_CHANNELS, SCHEDULE_FRAMES)) -W_BUFFER(1,COMP_BUFFER_SIZE(2, +W_BUFFER(1,COMP_BUFFER_SIZE(4, COMP_SAMPLE_SIZE(PIPELINE_FORMAT), PIPELINE_CHANNELS, SCHEDULE_FRAMES)) -W_BUFFER(2, COMP_BUFFER_SIZE(2, + +# Buffer B2 is on fixed rate sink side of SRC. Set it 1.5 * rate. +W_BUFFER(2, COMP_BUFFER_SIZE(3, COMP_SAMPLE_SIZE(PIPELINE_FORMAT), PIPELINE_CHANNELS, SCHEDULE_FRAMES)) # -- 2.11.0

3 7