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

[Sound-open-firmware] [PATCH 1/5] topology: Add token support for PCMs and components buffers.
by Liam Girdwood 09 Aug '17

09 Aug '17

Add topology tokens for PCM and buffer configuration. Signed-off-by: Liam Girdwood <liam.r.girdwood(a)linux.intel.com> --- topology/sof/tokens.m4 | 17 ++++++++++++++++- 1 file changed, 16 insertions(+), 1 deletion(-) diff --git a/topology/sof/tokens.m4 b/topology/sof/tokens.m4 index 1ec48df..3902c36 100644 --- a/topology/sof/tokens.m4 +++ b/topology/sof/tokens.m4 @@ -11,13 +11,14 @@ SectionVendorTokens."sof_buffer_tokens" { SOF_TKN_BUF_SIZE "100" - SOF_TKN_BUF_PRELOAD "101" } SectionVendorTokens."sof_dai_tokens" { SOF_TKN_DAI_DMAC "151" SOF_TKN_DAI_DMAC_CHAN "152" SOF_TKN_DAI_DMAC_CONFIG "153" + SOF_TKN_DAI_TYPE "154" + SOF_TKN_DAI_INDEX "155" } SectionVendorTokens."sof_sched_tokens" { @@ -25,6 +26,7 @@ SectionVendorTokens."sof_sched_tokens" { SOF_TKN_SCHED_PRIORITY "201" SOF_TKN_SCHED_MIPS "202" SOF_TKN_SCHED_CORE "203" + SOF_TKN_SCHED_FRAMES "204" } SectionVendorTokens."sof_volume_tokens" { @@ -36,3 +38,16 @@ SectionVendorTokens."sof_src_tokens" { SOF_TKN_SRC_RATE_IN "300" SOF_TKN_SRC_RATE_OUT "301" } + +SectionVendorTokens."sof_pcm_tokens" { + SOF_TKN_PCM_DMAC "351" + SOF_TKN_PCM_DMAC_CHAN "352" + SOF_TKN_PCM_DMAC_CONFIG "353" +} + +SectionVendorTokens."sof_comp_tokens" { + SOF_TKN_COMP_PERIOD_SINK_COUNT "400" + SOF_TKN_COMP_PERIOD_SOURCE_COUNT "401" + SOF_TKN_COMP_FORMAT "402" + SOF_TKN_COMP_PRELOAD_COUNT "403" +} -- 2.11.0

1 4

[Sound-open-firmware] ALSA Wiki create account
by Seppo Ingalsuo 08 Aug '17

08 Aug '17

Hi, I'd like to create Wiki documentation for setting up SOF SRC and EQ components. The create account page suggests to ask for a token on mailing list. Can you please help me. Thanks, Seppo

1 0

[Sound-open-firmware] [PATCH] byt-ipc: fix a src/dst error
by Keyon Jie 07 Jul '17

07 Jul '17

We should copy from [inbox_base + offset(0 here)] src to msg->rx_data dst here, otherwise, copying to 0 dst will crash the firmware here. Reported-by: Luo Xionghu <xionghu.luo(a)intel.com> Signed-off-by: Keyon Jie <yang.jie(a)linux.intel.com> --- src/ipc/byt-ipc.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/ipc/byt-ipc.c b/src/ipc/byt-ipc.c index b1bec23..ef30bbc 100644 --- a/src/ipc/byt-ipc.c +++ b/src/ipc/byt-ipc.c @@ -68,7 +68,7 @@ static void do_notify(void) /* copy the data returned from DSP */ if (msg->rx_size && msg->rx_size < MSG_MAX_SIZE) - mailbox_inbox_read(0, msg->rx_data, msg->rx_size); + mailbox_inbox_read(msg->rx_data, 0, msg->rx_size); /* any callback ? */ if (msg->cb) -- 2.11.0

2 1

[Sound-open-firmware] [PATCH 1/6] topology: Add initial SOF topology pipeline definitions
by Liam Girdwood 06 Jul '17

06 Jul '17

Add pipeline and token definitions to allow creation of SOF topology files. The files define standard pipelines and tokens that can be reused to build machine specific topology files. Signed-off-by: Liam Girdwood <liam.r.girdwood(a)linux.intel.com> --- topology/sof/pipe-dai.m4 | 24 +++++ topology/sof/pipe-low-latency-capture.m4 | 107 +++++++++++++++++++ topology/sof/pipe-low-latency-playback.m4 | 167 ++++++++++++++++++++++++++++++ topology/sof/pipe-pcm-media.m4 | 136 ++++++++++++++++++++++++ topology/sof/pipe-tone.m4 | 75 ++++++++++++++ topology/sof/tokens.m4 | 38 +++++++ 6 files changed, 547 insertions(+) create mode 100644 topology/sof/pipe-dai.m4 create mode 100644 topology/sof/pipe-low-latency-capture.m4 create mode 100644 topology/sof/pipe-low-latency-playback.m4 create mode 100644 topology/sof/pipe-pcm-media.m4 create mode 100644 topology/sof/pipe-tone.m4 create mode 100644 topology/sof/tokens.m4 diff --git a/topology/sof/pipe-dai.m4 b/topology/sof/pipe-dai.m4 new file mode 100644 index 0000000..06ac453 --- /dev/null +++ b/topology/sof/pipe-dai.m4 @@ -0,0 +1,24 @@ +# DAI connector + +# Include topology builder +include(`local.m4') + +# +# DAI definitions +# +W_DAI_OUT(DAI_SNAME, dai0p_plat_conf) +W_DAI_IN(DAI_SNAME, dai0c_plat_conf) + +#D_DAI(0, 1, 1) + +# +# Graph connections to pipelines + +SectionGraph.STR(DAI_NAME) { + index "0" + + lines [ + dapm(N_DAI_IN, OUT_BUF) + dapm(IN_BUF, N_DAI_OUT) + ] +} diff --git a/topology/sof/pipe-low-latency-capture.m4 b/topology/sof/pipe-low-latency-capture.m4 new file mode 100644 index 0000000..ddb5d8e --- /dev/null +++ b/topology/sof/pipe-low-latency-capture.m4 @@ -0,0 +1,107 @@ +# Low Latency Pipeline and PCM +# +# Pipeline Endpoints for connection are :- +# +# host PCM_C <--B5-- volume(0C) <--B4-- source DAI0 + +# Include topology builder +include(`local.m4') + +# +# Controls +# + +SectionControlMixer.STR(PCM PCM_ID Capture Volume) { + + # control belongs to this index group + index STR(PIPELINE_ID) + + # Channel register and shift for Front Left/Right + channel."FL" { + reg "0" + shift "0" + } + channel."FR" { + reg "0" + shift "1" + } + + # control uses bespoke driver get/put/info ID 0 + ops."ctl" { + info "volsw" + get "256" + put "256" + } + + # TLV 40 steps from -90dB to +20dB for 3dB + max "40" + invert "false" + tlv "vtlv_m90s3" +} + +# +# Components and Buffers +# + +W_PCM_CAPTURE(Low Latency Capture) +W_PGA(Capture Volume) +W_BUFFER(0, BUF_INT_SIZE) +W_BUFFER(1, BUF_PCM_SIZE) + +# +# Pipeline Graph +# +# host PCM <--B1-- volume( <--B0-- source DAI0 + +SectionGraph."pipe-ll-capture-PIPELINE_ID" { + index STR(PIPELINE_ID) + + lines [ + dapm(N_PCM, N_BUFFER(1)) + dapm(N_BUFFER(1), N_PGA(Capture Volume)) + dapm(N_PGA(Capture Volume), N_BUFFER(0)) + ] +} + +# +# Pipeline Configuration. +# + +W_PIPELINE(N_PGA(Capture Volume), SCHEDULE_DEADLINE, pipe_ll_schedule_plat) + +# +# PCM Configuration +# + +SectionPCMCapabilities.STR(Low Latency Capture PCM_ID) { + + formats "S24_LE,S16_LE" + rate_min "48000" + rate_max "48000" + channels_min "2" + channels_max "4" + periods_min "2" + periods_max "4" + period_size_min "192" + period_size_max "16384" + buffer_size_min "384" + buffer_size_max "65536" +} + +# PCM Low Latency Capture +SectionPCM.STR(PCM PCM_ID) { + + index STR(PIPELINE_ID) + + # used for binding to the PCM + id STR(PCM_ID) + + dai.STR(Low Latency Capture PCM_ID) { + id STR(PCM_ID) + } + + pcm."capture" { + + capabilities STR(Low Latency Capture PCM_ID) + } +} diff --git a/topology/sof/pipe-low-latency-playback.m4 b/topology/sof/pipe-low-latency-playback.m4 new file mode 100644 index 0000000..6604ad1 --- /dev/null +++ b/topology/sof/pipe-low-latency-playback.m4 @@ -0,0 +1,167 @@ +# Low Latency Pipeline +# +# Low Latency Playback PCM mixed into single sink pipe. +# Low latency Capture PCM. +# +# Pipeline Endpoints for connection are :- +# +# LL Playback Mixer (Mixer) +# LL Capture Volume B4 (DAI buffer) +# LL Playback Volume B3 (DAI buffer) +# +# +# host PCM_P --B0--> volume(0P) --B1--+ +# |--ll mixer(M) --B2--> volume(LL) ---B3--> sink DAI0 +# pipeline n+1 >---+ +# | +# pipeline n+2 >---+ +# | +# pipeline n+3 >---+ .....etc....more pipes can be mixed here +# + +# Include topology builder +include(`local.m4') + +# +# Controls +# + +SectionControlMixer.STR(PCM PCM_ID Playback Volume) { + + # control belongs to this index group + index STR(PIPELINE_ID) + + # Channel register and shift for Front Left/Right + channel."FL" { + reg "0" + shift "0" + } + channel."FR" { + reg "0" + shift "1" + } + + # control uses bespoke driver get/put/info ID 0 + ops."ctl" { + info "volsw" + get "256" + put "256" + } + + # TLV 32 steps from -90dB to +6dB for 3dB + max "32" + invert "false" + tlv "vtlv_m90s3" +} + +SectionControlMixer.STR(Master Playback Volume) { + + # control belongs to this index group + index STR(PIPELINE_ID) + + # Channel register and shift for Front Left/Right + channel."FL" { + reg "1" + shift "0" + } + channel."FR" { + reg "1" + shift "1" + } + + # control uses bespoke driver get/put/info ID 0 + ops."ctl" { + info "volsw" + get "256" + put "256" + } + + # TLV 32 steps from -90dB to +6dB for 3dB + max "32" + invert "false" + tlv "vtlv_m90s3" +} + +# +# Components and Buffers +# + +W_PCM_PLAYBACK(Low Latency Playback) +W_PGA(Playback Volume) +W_PGA(Mixer Volume) +W_MIXER(0) +W_BUFFER(0, BUF_PCM_SIZE) +W_BUFFER(1, BUF_INT_SIZE) +W_BUFFER(2, BUF_INT_SIZE) +W_BUFFER(3, BUF_INT_SIZE) + +# +# Pipeline Graph +# +# host PCM_P --B0--> volume(0P) --B1--+ +# |--ll mixer(M) --B2--> volume(LL) ---B3--> sink DAI0 +# pipeline n+1 >---+ +# | +# pipeline n+2 >---+ +# | +# pipeline n+3 >---+ .....etc....more pipes can be mixed here +# + +SectionGraph."pipe-ll-playback-PIPELINE_ID" { + index STR(PIPELINE_ID) + + lines [ + dapm(N_BUFFER(0), N_PCM) + dapm(N_PGA(Playback Volume), N_BUFFER(0)) + dapm(N_BUFFER(1), N_PGA(Playback Volume)) + dapm(N_MIXER(0), N_BUFFER(1)) + dapm(N_BUFFER(2), N_MIXER(0)) + dapm(N_PGA(Mixer Volume), N_BUFFER(2)) + dapm(N_BUFFER(3), N_PGA(Mixer Volume)) + ] +} + +# +# Pipeline Configuration. +# + +W_PIPELINE(N_PGA(Mixer Volume), SCHEDULE_DEADLINE, pipe_ll_schedule_plat) + +# +# PCM Configuration +# + +# PCM capabilities supported by FW +SectionPCMCapabilities.STR(Low Latency Playback PCM_ID) { + + formats "S24_LE,S16_LE" + rate_min "48000" + rate_max "48000" + channels_min "2" + channels_max "2" + periods_min "2" + periods_max "4" + period_size_min "192" + period_size_max "16384" + buffer_size_min "384" + buffer_size_max "65536" +} + +# PCM Low Latency Playback +SectionPCM.STR(PCM PCM_ID) { + + index STR(PIPELINE_ID) + + # used for binding to the PCM + id STR(PCM_ID) + + dai.STR(Low Latency Playback PCM_ID) { + id STR(PCM_ID) + } + + # Playback and Capture Configuration + pcm."playback" { + + capabilities STR(Low Latency Playback PCM_ID) + } +} diff --git a/topology/sof/pipe-pcm-media.m4 b/topology/sof/pipe-pcm-media.m4 new file mode 100644 index 0000000..688c81f --- /dev/null +++ b/topology/sof/pipe-pcm-media.m4 @@ -0,0 +1,136 @@ +# Low Power PCM Media Pipeline +# +# Low power PCM media playback with SRC and volume. +# +# Pipeline Endpoints for connection are :- +# +# host PCM_P --B0--> volume(0P) --B1--> SRC -- B2 --> Endpoint Pipeline +# + +# Include topology builder +include(`local.m4') + +# +# Controls +# + +SectionControlMixer.STR(PCM PCM_ID Playback Volume) { + + # control belongs to this index group + index STR(PIPELINE_ID) + + # Channel register and shift for Front Left/Right + channel."FL" { + reg "1" + shift "0" + } + channel."FR" { + reg "1" + shift "1" + } + + # control uses bespoke driver get/put/info ID 0 + ops."ctl" { + info "volsw" + get "256" + put "256" + } + + # TLV 32 steps from -90dB to +6dB for 3dB + max "32" + invert "false" + tlv "vtlv_m90s3" +} + + +# +# SRC Configuration +# + +SectionVendorTuples."media_src_tokens" { + tokens "sof_src_tokens" + + tuples."word" { + SOF_TKN_SRC_RATE_IN 16000 + SOF_TKN_SRC_RATE_IN 44100 + SOF_TKN_SRC_RATE_OUT 48000 + } +} + +SectionData."media_src_conf" { + tuples "media_src_tokens" +} + +# +# Components and Buffers +# + +W_PCM_PLAYBACK(Media Playback) +W_PGA(Playback Volume) +W_SRC(0, media_src_conf) +W_BUFFER(0, BUF_PCM_SIZE) +W_BUFFER(1, BUF_INT_SIZE) +W_BUFFER(2, BUF_INT_SIZE) + +# +# Pipeline Graph +# +# PCM --B0--> volume --B1--> SRC --> B2 --> Endpoint Pipeline +# + +SectionGraph."pipe-media-PIPELINE_ID" { + index STR(PIPELINE_ID) + + lines [ + dapm(N_BUFFER(0), Media Playback PCM_ID) + dapm(N_PGA(Playback Volume), N_BUFFER(0)) + dapm(N_BUFFER(1), N_PGA(Playback Volume)) + dapm(N_SRC(0), N_BUFFER(1)) + dapm(N_BUFFER(2), N_SRC(0)) + ] +} + +# +# Pipeline Configuration. +# + +W_PIPELINE(N_SRC(0), SCHEDULE_DEADLINE, pipe_media_schedule_plat) + +# +# PCM Configuration +# + +# PCM capabilities supported by FW + +SectionPCMCapabilities.STR(Media Playback PCM_ID) { + formats "S24_LE,S16_LE" + rate_min "8000" + rate_max "192000" + channels_min "2" + channels_max "2" + periods_min "2" + periods_max "32" + period_size_min "4096" + period_size_max "262144" + buffer_size_min "8192" + buffer_size_max "8388608" +} + +# PCM Low Latency Playback and Capture +SectionPCM.STR(PCM PCM_ID) { + + index STR(PIPELINE_ID) + + # used for binding to the PCM + id STR(PCM_ID) + + dai.STR(Media Playback PCM_ID) { + id STR(PCM_ID) + } + + # Playback and Capture Configuration + pcm."playback" { + + capabilities STR(Media Playback PCM_ID) + } +} diff --git a/topology/sof/pipe-tone.m4 b/topology/sof/pipe-tone.m4 new file mode 100644 index 0000000..24fe10f --- /dev/null +++ b/topology/sof/pipe-tone.m4 @@ -0,0 +1,75 @@ +# Tone Generator +# +# Multi Frequency Tone Generator. +# +# Pipeline Endpoints for connection are :- +# +# Tone --B0--> volume --B1--> Endpoint Pipeline +# + +# Include topology builder +include(`local.m4') + +# +# Controls +# + +SectionControlMixer.STR(Tone Volume PIPELINE_ID) { + + # control belongs to this index group + index STR(PIPELINE_ID) + + # Channel register and shift for Front Left/Right + channel."FL" { + reg "1" + shift "0" + } + channel."FR" { + reg "1" + shift "1" + } + + # control uses bespoke driver get/put/info ID 0 + ops."ctl" { + info "volsw" + get "256" + put "256" + } + + # TLV 32 steps from -90dB to +6dB for 3dB + max "32" + invert "false" + tlv "vtlv_m90s3" +} + +# +# Components and Buffers +# + +W_TONE(0) +W_PGA(Tone Volume) +W_BUFFER(0, BUF_INT_SIZE) +W_BUFFER(1, BUF_INT_SIZE) + + +# +# Pipeline Graph +# +# Tone --B0--> volume --B1--> Endpoint Pipeline +# + +SectionGraph."pipe-tone-PIPELINE_ID" { + index STR(PIPELINE_ID) + + lines [ + dapm(N_BUFFER(0), N_TONE(0)) + dapm(N_PGA(Tone Volume), N_BUFFER(0)) + dapm(N_BUFFER(1), N_PGA(Tone Volume)) + ] +} + +# +# Pipeline Configuration. +# + +W_PIPELINE(N_TONE(0), SCHEDULE_DEADLINE, pipe_tone_schedule_plat) diff --git a/topology/sof/tokens.m4 b/topology/sof/tokens.m4 new file mode 100644 index 0000000..1ec48df --- /dev/null +++ b/topology/sof/tokens.m4 @@ -0,0 +1,38 @@ + +# +# SOF Tokens for differentiation. +# +# Differentiation can be done at the platform and machine level. +# +# Tokens are GUIDs + +# TODO: pre-process this with UAPI headers GNU cpp. + + +SectionVendorTokens."sof_buffer_tokens" { + SOF_TKN_BUF_SIZE "100" + SOF_TKN_BUF_PRELOAD "101" +} + +SectionVendorTokens."sof_dai_tokens" { + SOF_TKN_DAI_DMAC "151" + SOF_TKN_DAI_DMAC_CHAN "152" + SOF_TKN_DAI_DMAC_CONFIG "153" +} + +SectionVendorTokens."sof_sched_tokens" { + SOF_TKN_SCHED_DEADLINE "200" + SOF_TKN_SCHED_PRIORITY "201" + SOF_TKN_SCHED_MIPS "202" + SOF_TKN_SCHED_CORE "203" +} + +SectionVendorTokens."sof_volume_tokens" { + SOF_TKN_VOLUME_RAMP_STEP_TYPE "250" + SOF_TKN_VOLUME_RAMP_STEP_MS "251" +} + +SectionVendorTokens."sof_src_tokens" { + SOF_TKN_SRC_RATE_IN "300" + SOF_TKN_SRC_RATE_OUT "301" +} -- 2.11.0

1 5

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

29 Jun '17

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

2 5

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

28 Jun '17

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

2 4

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

26 Jun '17

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

1 1

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

26 Jun '17

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

6 13

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

15 Jun '17

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

1 2

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

15 Jun '17

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

1 1