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

[Sound-open-firmware] SOF git repo?
by Christian Daudt 16 Mar '18

16 Mar '18

Hi, Sorry for the dense first question but are there public git repos where I can see the current code/docs? I saw the talk @ELC2018 announcing the project, and looked at the nice splashy proj page at https://www.sofproject.org/ but it gives no hint (that I could find) of where to go after that. And I wanted to find out more about which parts and for which platforms your work is focused on. Some github comparisons between patches sent to this list and repos in there leads me to think that https://github.com/plbossart/sound-open-firmware is the place to start looking through code. Just wanted to confirm that that's the right place and if so to suggest to a link to it from the sofproject.org . I'm from Cypress and we do a lot of audio solutions in the IoT connectivity team I'm part of, so that led to a natural curiosity about a proj that is working on open sourcing sound firmware. I look forward to learning more about it! Thanks, Christian Daudt. PS: Using gmail instead of my cypress email because outlook and mailing lists don't mix well...

3 5

[Sound-open-firmware] [PATCH] topology: pcm: Fix PCM ID for topologies > 1 PCM
by Liam Girdwood 16 Mar '18

16 Mar '18

PCM number was not being preserved and was always zero. This would overwrite previous PCMs and cause the FW to return invalid PCM error messages. Signed-off-by: Liam Girdwood <liam.r.girdwood(a)linux.intel.com> --- topology/m4/pcm.m4 | 36 +++++++++++++++---------------- topology/sof/pipe-low-latency-capture.m4 | 6 +++--- topology/sof/pipe-low-latency-playback.m4 | 6 +++--- topology/sof/pipe-passthrough-capture.m4 | 6 +++--- topology/sof/pipe-passthrough-playback.m4 | 6 +++--- topology/sof/pipe-pcm-media.m4 | 6 +++--- topology/sof/pipe-src-capture.m4 | 6 +++--- topology/sof/pipe-src-playback.m4 | 6 +++--- topology/sof/pipe-volume-capture.m4 | 6 +++--- topology/sof/pipe-volume-playback.m4 | 6 +++--- 10 files changed, 45 insertions(+), 45 deletions(-) diff --git a/topology/m4/pcm.m4 b/topology/m4/pcm.m4 index 596f2fe..f77cb01 100644 --- a/topology/m4/pcm.m4 +++ b/topology/m4/pcm.m4 @@ -3,18 +3,18 @@ divert(-1) dnl Define the macro for PCM playback/capture/capabilities dnl PCM name) -define(`N_PCMP', `PCM'PCM_ID`P') -define(`N_PCMC', `PCM'PCM_ID`C') +define(`N_PCMP', `PCM'$1`P') +define(`N_PCMC', `PCM'$1`C') -dnl W_PCM_PLAYBACK(stream, dmac, dmac_chan, periods_sink, periods_source, preload) +dnl W_PCM_PLAYBACK(pcm, stream, dmac, dmac_chan, periods_sink, periods_source, preload) dnl PCM platform configuration define(`W_PCM_PLAYBACK', `SectionVendorTuples."'N_PCMP($1)`_tuples_w_comp" {' ` tokens "sof_comp_tokens"' ` tuples."word" {' -` SOF_TKN_COMP_PERIOD_SINK_COUNT' STR($4) -` SOF_TKN_COMP_PERIOD_SOURCE_COUNT' STR($5) -` SOF_TKN_COMP_PRELOAD_COUNT' STR($6) +` SOF_TKN_COMP_PERIOD_SINK_COUNT' STR($5) +` SOF_TKN_COMP_PERIOD_SOURCE_COUNT' STR($6) +` SOF_TKN_COMP_PRELOAD_COUNT' STR($7) ` }' `}' `SectionData."'N_PCMP($1)`_data_w_comp" {' @@ -23,18 +23,18 @@ define(`W_PCM_PLAYBACK', `SectionVendorTuples."'N_PCMP($1)`_tuples" {' ` tokens "sof_pcm_tokens"' ` tuples."word" {' -` SOF_TKN_PCM_DMAC' STR($2) -` SOF_TKN_PCM_DMAC_CHAN' STR($3) +` SOF_TKN_PCM_DMAC' STR($3) +` SOF_TKN_PCM_DMAC_CHAN' STR($4) ` }' `}' `SectionData."'N_PCMP($1)`_data" {' ` tuples "'N_PCMP($1)`_tuples"' `}' -`SectionWidget."'N_PCMP`" {' +`SectionWidget."'N_PCMP($1)`" {' ` index "'PIPELINE_ID`"' ` type "aif_in"' ` no_pm "true"' -` stream_name "'$1`"' +` stream_name "'$2`"' ` data [' ` "'N_PCMP($1)`_data"' ` "'N_PCMP($1)`_data_w_comp"' @@ -42,14 +42,14 @@ define(`W_PCM_PLAYBACK', `}') -dnl W_PCM_CAPTURE(stream, dmac, dmac_chan, periods_sink, periods_source, preload) +dnl W_PCM_CAPTURE(pcm, stream, dmac, dmac_chan, periods_sink, periods_source, preload) define(`W_PCM_CAPTURE', `SectionVendorTuples."'N_PCMC($1)`_tuples_w_comp" {' ` tokens "sof_comp_tokens"' ` tuples."word" {' -` SOF_TKN_COMP_PERIOD_SINK_COUNT' STR($4) -` SOF_TKN_COMP_PERIOD_SOURCE_COUNT' STR($5) -` SOF_TKN_COMP_PRELOAD_COUNT' STR($6) +` SOF_TKN_COMP_PERIOD_SINK_COUNT' STR($5) +` SOF_TKN_COMP_PERIOD_SOURCE_COUNT' STR($6) +` SOF_TKN_COMP_PRELOAD_COUNT' STR($7) ` }' `}' `SectionData."'N_PCMC($1)`_data_w_comp" {' @@ -58,18 +58,18 @@ define(`W_PCM_CAPTURE', `SectionVendorTuples."'N_PCMC($1)`_tuples" {' ` tokens "sof_pcm_tokens"' ` tuples."word" {' -` SOF_TKN_PCM_DMAC' STR($2) -` SOF_TKN_PCM_DMAC_CHAN' STR($3) +` SOF_TKN_PCM_DMAC' STR($3) +` SOF_TKN_PCM_DMAC_CHAN' STR($4) ` }' `}' `SectionData."'N_PCMC($1)`_data" {' ` tuples "'N_PCMC($1)`_tuples"' `}' -`SectionWidget."'N_PCMC`" {' +`SectionWidget."'N_PCMC($1)`" {' ` index "'PIPELINE_ID`"' ` type "aif_out"' ` no_pm "true"' -` stream_name "'$1`"' +` stream_name "'$2`"' ` data [' ` "'N_PCMC($1)`_data"' ` "'N_PCMC($1)`_data_w_comp"' diff --git a/topology/sof/pipe-low-latency-capture.m4 b/topology/sof/pipe-low-latency-capture.m4 index 5619999..96fa3cc 100644 --- a/topology/sof/pipe-low-latency-capture.m4 +++ b/topology/sof/pipe-low-latency-capture.m4 @@ -29,7 +29,7 @@ C_CONTROLMIXER(PCM PCM_ID Capture Volume, PIPELINE_ID, # Host "Low Latency Capture" PCM uses pipeline DMAC and channel # with 0 sink and 2 source periods -W_PCM_CAPTURE(Low Latency Capture, PIPELINE_DMAC, PIPELINE_DMAC_CHAN, 0, 2, 0) +W_PCM_CAPTURE(PCM_ID, Low Latency Capture, PIPELINE_DMAC, PIPELINE_DMAC_CHAN, 0, 2, 0) # "Capture Volume" has 2 sink and source periods for host and DAI ping-pong W_PGA(0, PIPELINE_FORMAT, 2, 2, 0, LIST(` ', "PCM PCM_ID Capture Volume")) @@ -49,8 +49,8 @@ W_BUFFER(1, COMP_BUFFER_SIZE(2, P_GRAPH(pipe-ll-capture-PIPELINE_ID, PIPELINE_ID, LIST(` ', - `dapm(Low Latency Capture PCM_ID, N_PCMC)', - `dapm(N_PCMC, N_BUFFER(1))', + `dapm(Low Latency Capture PCM_ID, N_PCMC(PCM_ID))', + `dapm(N_PCMC(PCM_ID), N_BUFFER(1))', `dapm(N_BUFFER(1), N_PGA(0))', `dapm(N_PGA(0), N_BUFFER(0))')) diff --git a/topology/sof/pipe-low-latency-playback.m4 b/topology/sof/pipe-low-latency-playback.m4 index 4a4fca9..b7f2d11 100644 --- a/topology/sof/pipe-low-latency-playback.m4 +++ b/topology/sof/pipe-low-latency-playback.m4 @@ -54,7 +54,7 @@ C_CONTROLMIXER(Master Playback Volume, PIPELINE_ID, # Host "Low latency Playback" PCM uses pipeline DMAC and channel # with 2 sink and 0 source periods -W_PCM_PLAYBACK(Low Latency Playback, PIPELINE_DMAC, PIPELINE_DMAC_CHAN, 2, 0, 2) +W_PCM_PLAYBACK(PCM_ID, Low Latency Playback, PIPELINE_DMAC, PIPELINE_DMAC_CHAN, 2, 0, 2) # "Playback Volume" has 1 sink period and 2 source periods for host ping-pong W_PGA(0, PIPELINE_FORMAT, 1, 2, 1, LIST(` ', "PCM PCM_ID Playback Volume")) @@ -93,8 +93,8 @@ W_BUFFER(3, COMP_BUFFER_SIZE(2, P_GRAPH(pipe-ll-playback-PIPELINE_ID, PIPELINE_ID, LIST(` ', - `dapm(N_PCMP, Low Latency Playback PCM_ID)', - `dapm(N_BUFFER(0), N_PCMP)', + `dapm(N_PCMP(PCM_ID), Low Latency Playback PCM_ID)', + `dapm(N_BUFFER(0), N_PCMP(PCM_ID))', `dapm(N_PGA(0), N_BUFFER(0))', `dapm(N_BUFFER(1), N_PGA(0))', `dapm(N_MIXER(0), N_BUFFER(1))', diff --git a/topology/sof/pipe-passthrough-capture.m4 b/topology/sof/pipe-passthrough-capture.m4 index 07961b3..ff7c842 100644 --- a/topology/sof/pipe-passthrough-capture.m4 +++ b/topology/sof/pipe-passthrough-capture.m4 @@ -17,7 +17,7 @@ include(`pipeline.m4') # Host "Passthrough Capture" PCM uses pipeline DMAC and channel # with 0 sink and 2 source periods -W_PCM_CAPTURE(Passthrough Capture, PIPELINE_DMAC, PIPELINE_DMAC_CHAN, 0, 2, 2) +W_PCM_CAPTURE(PCM_ID, Passthrough Capture, PIPELINE_DMAC, PIPELINE_DMAC_CHAN, 0, 2, 2) # Capture Buffers W_BUFFER(0, COMP_BUFFER_SIZE(2, @@ -41,8 +41,8 @@ W_PIPELINE(N_DAI_IN, SCHEDULE_DEADLINE, SCHEDULE_PRIORITY, SCHEDULE_FRAMES, SCHE P_GRAPH(pipe-pass-capture-PIPELINE_ID, PIPELINE_ID, LIST(` ', - `dapm(Passthrough Capture PCM_ID, N_PCMC)', - `dapm(N_PCMC, N_BUFFER(0))')) + `dapm(Passthrough Capture PCM_ID, N_PCMC(PCM_ID))', + `dapm(N_PCMC(PCM_ID), N_BUFFER(0))')) # # Pipeline Source and Sinks diff --git a/topology/sof/pipe-passthrough-playback.m4 b/topology/sof/pipe-passthrough-playback.m4 index 715fcee..84aa126 100644 --- a/topology/sof/pipe-passthrough-playback.m4 +++ b/topology/sof/pipe-passthrough-playback.m4 @@ -17,7 +17,7 @@ include(`pipeline.m4') # Host "Passthrough Playback" PCM uses pipeline DMAC and channel # with 2 sink and 0 source periods -W_PCM_PLAYBACK(Passthrough Playback, PIPELINE_DMAC, PIPELINE_DMAC_CHAN, 2, 0, 2) +W_PCM_PLAYBACK(PCM_ID, Passthrough Playback, PIPELINE_DMAC, PIPELINE_DMAC_CHAN, 2, 0, 2) # Playback Buffers W_BUFFER(0, COMP_BUFFER_SIZE(2, @@ -41,8 +41,8 @@ W_PIPELINE(N_DAI_OUT, SCHEDULE_DEADLINE, SCHEDULE_PRIORITY, SCHEDULE_FRAMES, SCH P_GRAPH(pipe-pass-playback-PIPELINE_ID, PIPELINE_ID, LIST(` ', - `dapm(N_PCMP, Passthrough Playback PCM_ID)', - `dapm(N_BUFFER(0), N_PCMP)')) + `dapm(N_PCMP(PCM_ID), Passthrough Playback PCM_ID)', + `dapm(N_BUFFER(0), N_PCMP(PCM_ID))')) # # Pipeline Source and Sinks diff --git a/topology/sof/pipe-pcm-media.m4 b/topology/sof/pipe-pcm-media.m4 index f2053b7..1ca829f 100644 --- a/topology/sof/pipe-pcm-media.m4 +++ b/topology/sof/pipe-pcm-media.m4 @@ -41,7 +41,7 @@ W_DATA(media_src_conf, media_src_tokens) # Host "Low latency Playback" PCM uses pipeline DMAC and channel # with 2 sink and 0 source periods -W_PCM_PLAYBACK(Media Playback, PIPELINE_DMAC, PIPELINE_DMAC_CHAN, 2, 0, 2) +W_PCM_PLAYBACK(PCM_ID, Media Playback, PIPELINE_DMAC, PIPELINE_DMAC_CHAN, 2, 0, 2) # "Playback Volume" has 2 sink period and 2 source periods for host ping-pong W_PGA(0, PIPELINE_FORMAT, 2, 2, 2, LIST(` ', "PCM PCM_ID Playback Volume")) @@ -70,8 +70,8 @@ W_BUFFER(2, COMP_BUFFER_SIZE(3, P_GRAPH(pipe-media-PIPELINE_ID, PIPELINE_ID, LIST(` ', - `dapm(N_PCMP, Media Playback PCM_ID)', - `dapm(N_BUFFER(0), N_PCMP)', + `dapm(N_PCMP(PCM_ID), Media Playback PCM_ID)', + `dapm(N_BUFFER(0), N_PCMP(PCM_ID))', `dapm(N_PGA(0), N_BUFFER(0))', `dapm(N_BUFFER(1), N_PGA(0))', `dapm(N_SRC(0), N_BUFFER(1))' diff --git a/topology/sof/pipe-src-capture.m4 b/topology/sof/pipe-src-capture.m4 index 1b1a58d..54eeea3 100644 --- a/topology/sof/pipe-src-capture.m4 +++ b/topology/sof/pipe-src-capture.m4 @@ -18,7 +18,7 @@ include(`pipeline.m4') # Host "Passthrough Capture" PCM uses pipeline DMAC and channel # with 4 sink and 0 source periods -W_PCM_CAPTURE(Passthrough Capture, PIPELINE_DMAC, PIPELINE_DMAC_CHAN, 4, 0, 2) +W_PCM_CAPTURE(PCM_ID, Passthrough Capture, PIPELINE_DMAC, PIPELINE_DMAC_CHAN, 4, 0, 2) # # SRC Configuration @@ -58,8 +58,8 @@ W_PIPELINE(N_DAI_IN, SCHEDULE_DEADLINE, SCHEDULE_PRIORITY, SCHEDULE_FRAMES, P_GRAPH(pipe-pass-src-capture-PIPELINE_ID, PIPELINE_ID, LIST(` ', - `dapm(Passthrough Capture PCM_ID, N_PCMC)', - `dapm(N_PCMC, N_BUFFER(0))', + `dapm(Passthrough Capture PCM_ID, N_PCMC(PCM_ID))', + `dapm(N_PCMC(PCM_ID), N_BUFFER(0))', `dapm(N_BUFFER(0), N_SRC(0))', `dapm(N_SRC(0), N_BUFFER(1))')) diff --git a/topology/sof/pipe-src-playback.m4 b/topology/sof/pipe-src-playback.m4 index 9dfdcd8..51237ac 100644 --- a/topology/sof/pipe-src-playback.m4 +++ b/topology/sof/pipe-src-playback.m4 @@ -18,7 +18,7 @@ include(`pipeline.m4') # Host "Passthrough Playback" PCM uses pipeline DMAC and channel # with 4 sink and 0 source periods -W_PCM_PLAYBACK(Passthrough Playback, PIPELINE_DMAC, PIPELINE_DMAC_CHAN, 4, 0, 2) +W_PCM_PLAYBACK(PCM_ID, Passthrough Playback, PIPELINE_DMAC, PIPELINE_DMAC_CHAN, 4, 0, 2) # # SRC Configuration @@ -58,8 +58,8 @@ W_PIPELINE(N_DAI_OUT, SCHEDULE_DEADLINE, SCHEDULE_PRIORITY, SCHEDULE_FRAMES, P_GRAPH(pipe-pass-src-playback-PIPELINE_ID, PIPELINE_ID, LIST(` ', - `dapm(N_PCMP, Passthrough Playback PCM_ID)', - `dapm(N_BUFFER(0), N_PCMP)', + `dapm(N_PCMP(PCM_ID), Passthrough Playback PCM_ID)', + `dapm(N_BUFFER(0), N_PCMP(PCM_ID))', `dapm(N_SRC(0), N_BUFFER(0))', `dapm(N_BUFFER(1), N_SRC(0))')) diff --git a/topology/sof/pipe-volume-capture.m4 b/topology/sof/pipe-volume-capture.m4 index 61b70a9..c3917ca 100644 --- a/topology/sof/pipe-volume-capture.m4 +++ b/topology/sof/pipe-volume-capture.m4 @@ -31,7 +31,7 @@ C_CONTROLMIXER(Master Capture Volume, PIPELINE_ID, # Host "Passthrough Capture" PCM uses pipeline DMAC and channel # with 0 sink and 2 source periods -W_PCM_CAPTURE(Passthrough Capture, PIPELINE_DMAC, PIPELINE_DMAC_CHAN, 0, 2, 2) +W_PCM_CAPTURE(PCM_ID, Passthrough Capture, PIPELINE_DMAC, PIPELINE_DMAC_CHAN, 0, 2, 2) # "Volume" has 2 source and 2 sink periods W_PGA(0, PIPELINE_FORMAT, 2, 2, 2, LIST(` ', "Master Capture Volume")) @@ -63,8 +63,8 @@ W_PIPELINE(N_DAI_IN, SCHEDULE_DEADLINE, SCHEDULE_PRIORITY, SCHEDULE_FRAMES, P_GRAPH(pipe-pass-vol-capture-PIPELINE_ID, PIPELINE_ID, LIST(` ', - `dapm(Passthrough Capture PCM_ID, N_PCMC)', - `dapm(N_PCMC, N_BUFFER(0))', + `dapm(Passthrough Capture PCM_ID, N_PCMC(PCM_ID))', + `dapm(N_PCMC(PCM_ID), N_BUFFER(0))', `dapm(N_BUFFER(0), N_PGA(0))', `dapm(N_PGA(0), N_BUFFER(1))')) diff --git a/topology/sof/pipe-volume-playback.m4 b/topology/sof/pipe-volume-playback.m4 index 5fea0c7..194aad9 100644 --- a/topology/sof/pipe-volume-playback.m4 +++ b/topology/sof/pipe-volume-playback.m4 @@ -31,7 +31,7 @@ C_CONTROLMIXER(Master Playback Volume, PIPELINE_ID, # Host "Passthrough Playback" PCM uses pipeline DMAC and channel # with 2 sink and 0 source periods -W_PCM_PLAYBACK(Passthrough Playback, PIPELINE_DMAC, PIPELINE_DMAC_CHAN, 2, 0, 2) +W_PCM_PLAYBACK(PCM_ID, Passthrough Playback, PIPELINE_DMAC, PIPELINE_DMAC_CHAN, 2, 0, 2) # "Volume" has 2 source and 2 sink periods W_PGA(0, PIPELINE_FORMAT, 2, 2, 2, LIST(` ', "Master Playback Volume")) @@ -63,8 +63,8 @@ W_PIPELINE(N_DAI_OUT, SCHEDULE_DEADLINE, SCHEDULE_PRIORITY, SCHEDULE_FRAMES, P_GRAPH(pipe-pass-vol-playback-PIPELINE_ID, PIPELINE_ID, LIST(` ', - `dapm(N_PCMP, Passthrough Playback PCM_ID)', - `dapm(N_BUFFER(0), N_PCMP)', + `dapm(N_PCMP(PCM_ID), Passthrough Playback PCM_ID)', + `dapm(N_BUFFER(0), N_PCMP(PCM_ID))', `dapm(N_PGA(0), N_BUFFER(0))', `dapm(N_BUFFER(1), N_PGA(0))')) -- 2.14.1

1 0

[Sound-open-firmware] [PATCH] core: ipc: Fix error handling pointer deref
by Liam Girdwood 16 Mar '18

16 Mar '18

elem.next/prev can be accessed whilst NULL in certain error handling conditions. Signed-off-by: Liam Girdwood <liam.r.girdwood(a)linux.intel.com> --- src/ipc/intel-ipc.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/src/ipc/intel-ipc.c b/src/ipc/intel-ipc.c index 4173a276..a9398229 100644 --- a/src/ipc/intel-ipc.c +++ b/src/ipc/intel-ipc.c @@ -254,6 +254,9 @@ static int ipc_stream_pcm_params(uint32_t stream) cd->params = pcm_params->params; #ifdef CONFIG_HOST_PTABLE + + list_init(&elem_list); + /* use DMA to read in compressed page table ringbuffer from host */ err = get_page_descriptors(iipc, &pcm_params->params.buffer); if (err < 0) { @@ -264,7 +267,6 @@ static int ipc_stream_pcm_params(uint32_t stream) /* Parse host tables */ host = (struct sof_ipc_comp_host *)&cd->comp; ring_size = pcm_params->params.buffer.size; - list_init(&elem_list); err = parse_page_descriptors(iipc, &pcm_params->params.buffer, &elem_list, host->direction); @@ -650,6 +652,9 @@ static int ipc_dma_trace_config(uint32_t header) trace_ipc_error("DA1"); #ifdef CONFIG_HOST_PTABLE + + list_init(&elem_list); + /* use DMA to read in compressed page table ringbuffer from host */ err = get_page_descriptors(iipc, &params->buffer); if (err < 0) { @@ -661,7 +666,6 @@ static int ipc_dma_trace_config(uint32_t header) /* Parse host tables */ ring_size = params->buffer.size; - list_init(&elem_list); err = parse_page_descriptors(iipc, &params->buffer, &elem_list, SOF_IPC_STREAM_CAPTURE); -- 2.14.1

1 0

[Sound-open-firmware] [PATCH] topology: byt-rt5640: Fix DAI config
by Liam Girdwood 16 Mar '18

16 Mar '18

DAI config was coming from deprecated machine driver. Fix it to use bytcr-rt5640 machine driver. Signed-off-by: Liam Girdwood <liam.r.girdwood(a)linux.intel.com> --- topology/reef-byt-rt5640.m4 | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/topology/reef-byt-rt5640.m4 b/topology/reef-byt-rt5640.m4 index 879e9a9..bf2b004 100644 --- a/topology/reef-byt-rt5640.m4 +++ b/topology/reef-byt-rt5640.m4 @@ -1,5 +1,5 @@ # -# Topology for generic Baytrail board with no codec. +# Topology for generic Baytrail board with no RT5640. # # Include topology builder @@ -76,7 +76,7 @@ SectionGraph."pipe-byt-rt5640" { # playback DAI is SSP2 using 2 periods # Buffers use s24le format, with 48 frame per 1000us on core 0 with priority 0 DAI_ADD(sof/pipe-dai-playback.m4, - 1, SSP, 2, SSP-Codec + 1, SSP, 2, SSP-Codec, PIPELINE_SOURCE_1, 2, s24le, 48, 1000, 0, 0) @@ -93,7 +93,7 @@ PCM_DUPLEX_ADD(Low Latency, 6, 0, 0, PIPELINE_PCM_1, PIPELINE_PCM_2) # # BE configurations - overrides config in ACPI if present # -DAI_CONFIG(SSP, 2, Baytrail Audio, I2S, 24, +DAI_CONFIG(SSP, 2, SSP2-Codec, I2S, 24, DAI_CLOCK(mclk, 19200000, slave), DAI_CLOCK(bclk, 2400000, slave), DAI_CLOCK(fsync, 48000, slave), -- 2.14.1

2 3

[Sound-open-firmware] [PATCH] Don't call dma_trace_init_complete if dma trace is disabled.
by Mike Mason 16 Mar '18

16 Mar '18

Hide dma_trace_init_complete if --disable-dma-trace was passed to configure. Otherwise, the compile with fail. Signed-off-by: Mike Mason <michael.w.mason(a)intel.com> --- src/platform/apollolake/platform.c | 2 ++ src/platform/baytrail/platform.c | 2 ++ src/platform/cannonlake/platform.c | 2 ++ src/platform/haswell/platform.c | 2 ++ 4 files changed, 8 insertions(+) diff --git a/src/platform/apollolake/platform.c b/src/platform/apollolake/platform.c index 84f8e71..f601961 100644 --- a/src/platform/apollolake/platform.c +++ b/src/platform/apollolake/platform.c @@ -263,7 +263,9 @@ int platform_init(struct reef *reef) } /* Initialize DMA for Trace*/ +#if defined(CONFIG_DMA_TRACE) dma_trace_init_complete(reef->dmat); +#endif return 0; } diff --git a/src/platform/baytrail/platform.c b/src/platform/baytrail/platform.c index cec8297..658ae35 100644 --- a/src/platform/baytrail/platform.c +++ b/src/platform/baytrail/platform.c @@ -407,7 +407,9 @@ int platform_init(struct reef *reef) #endif /* Initialize DMA for Trace*/ +#if defined(CONFIG_DMA_TRACE) dma_trace_init_complete(reef->dmat); +#endif return 0; } diff --git a/src/platform/cannonlake/platform.c b/src/platform/cannonlake/platform.c index 8bf2d7a..28643e0 100644 --- a/src/platform/cannonlake/platform.c +++ b/src/platform/cannonlake/platform.c @@ -284,7 +284,9 @@ int platform_init(struct reef *reef) } /* Initialize DMA for Trace*/ +#if defined(CONFIG_DMA_TRACE) dma_trace_init_complete(reef->dmat); +#endif return 0; } diff --git a/src/platform/haswell/platform.c b/src/platform/haswell/platform.c index f84d6e3..569c80a 100644 --- a/src/platform/haswell/platform.c +++ b/src/platform/haswell/platform.c @@ -284,7 +284,9 @@ int platform_init(struct reef *reef) dai_probe(ssp1); /* Initialize DMA for Trace*/ +#if defined(CONFIG_DMA_TRACE) dma_trace_init_complete(reef->dmat); +#endif return 0; } -- 2.16.2

3 2

[Sound-open-firmware] [PATCH 1/2] topology: byt-rt5640: rt5640 uses SSP2-Codec
by Liam Girdwood 16 Mar '18

16 Mar '18

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 d301ea6..14313db 100644 --- a/topology/reef-byt-rt5640.m4 +++ b/topology/reef-byt-rt5640.m4 @@ -76,14 +76,14 @@ SectionGraph."pipe-byt-rt5640" { # playback DAI is SSP2 using 2 periods # Buffers use s24le format, with 48 frame per 1000us on core 0 with priority 0 DAI_ADD(sof/pipe-dai-playback.m4, - 1, SSP, 2, SSP-Codec, + 1, SSP, 2, SSP2-Codec, PIPELINE_SOURCE_1, 2, s24le, 48, 1000, 0, 0) # capture DAI is SSP2 using 2 periods # Buffers use s24le format, with 48 frame per 1000us on core 0 with priority 0 DAI_ADD(sof/pipe-dai-capture.m4, - 2, SSP, 2, SSP-Codec, + 2, SSP, 2, SSP2-Codec, PIPELINE_SINK_2, 2, s24le, 48, 1000, 0, 0) -- 2.14.1

1 1

[Sound-open-firmware] [PATCH] trace: dma: remove disable DMA trace option
by Liam Girdwood 16 Mar '18

16 Mar '18

DMA based trace is the standard default trace method. mailbox trace is no longer supported. Signed-off-by: Liam Girdwood <liam.r.girdwood(a)linux.intel.com> --- configure.ac | 10 -------- src/ipc/dma-copy.c | 2 -- src/ipc/intel-ipc.c | 4 --- src/lib/Makefile.am | 6 +---- src/lib/trace.c | 70 +---------------------------------------------------- 5 files changed, 2 insertions(+), 90 deletions(-) diff --git a/configure.ac b/configure.ac index bb4d2e9f..9b74c6a9 100644 --- a/configure.ac +++ b/configure.ac @@ -241,16 +241,6 @@ case "$with_dsp_core" in esac -# dma trace support (Optional), dma trace by default -AC_ARG_ENABLE([dma-trace], - AS_HELP_STRING([--disable-dma-trace], [Disabled dma trace and use fallback mailbox trace])) - -AS_IF([test "x$enable_dma_trace" != "xno"], [ - AC_DEFINE([CONFIG_DMA_TRACE], [1], [Configure DMA trace]) - ]) - -AM_CONDITIONAL(BUILD_DMA_TRACE, test "x$enable_dma_trace" != "xno") - PLATFORM_BOOT_LDR_LDSCRIPT="boot_ldr.x" AC_SUBST(PLATFORM_BOOT_LDR_LDSCRIPT) diff --git a/src/ipc/dma-copy.c b/src/ipc/dma-copy.c index 3c073567..ba7592af 100644 --- a/src/ipc/dma-copy.c +++ b/src/ipc/dma-copy.c @@ -79,9 +79,7 @@ static void dma_complete(void *data, uint32_t type, struct dma_sg_elem *next) if (type == DMA_IRQ_TYPE_LLIST) wait_completed(comp); -#if defined(CONFIG_DMA_TRACE) ipc_dma_trace_send_position(); -#endif next->size = DMA_RELOAD_END; } diff --git a/src/ipc/intel-ipc.c b/src/ipc/intel-ipc.c index 8263fffe..4173a276 100644 --- a/src/ipc/intel-ipc.c +++ b/src/ipc/intel-ipc.c @@ -631,7 +631,6 @@ static int ipc_glb_pm_message(uint32_t header) } } -#if defined(CONFIG_DMA_TRACE) /* * Debug IPC Operations. */ @@ -747,7 +746,6 @@ static int ipc_glb_debug_message(uint32_t header) return -EINVAL; } } -#endif /* * Topology IPC Operations. @@ -963,10 +961,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); -#if defined(CONFIG_DMA_TRACE) case iGS(SOF_IPC_GLB_TRACE_MSG): return ipc_glb_debug_message(hdr->cmd); -#endif default: trace_ipc_error("eGc"); trace_value(type); diff --git a/src/lib/Makefile.am b/src/lib/Makefile.am index c4da98c9..ea91904a 100644 --- a/src/lib/Makefile.am +++ b/src/lib/Makefile.am @@ -8,12 +8,8 @@ libcore_a_SOURCES = \ trace.c \ schedule.c \ agent.c \ - interrupt.c - -if BUILD_DMA_TRACE -libcore_a_SOURCES += \ + interrupt.c \ dma-trace.c -endif libcore_a_CFLAGS = \ $(ARCH_CFLAGS) \ diff --git a/src/lib/trace.c b/src/lib/trace.c index bfac6d32..de99a4e6 100644 --- a/src/lib/trace.c +++ b/src/lib/trace.c @@ -49,9 +49,7 @@ void _trace_error(uint32_t event) { unsigned long flags; volatile uint64_t *t; -#if defined(CONFIG_DMA_TRACE) uint64_t dt[2]; -#endif uint64_t time; if (!trace.enable) @@ -59,12 +57,10 @@ void _trace_error(uint32_t event) time = platform_timer_get(platform_timer); -#if defined(CONFIG_DMA_TRACE) /* save event to DMA tracing buffer */ dt[0] = time; dt[1] = event; dtrace_event((const char*)dt, sizeof(uint64_t) * 2); -#endif /* send event by mail box too. */ spin_lock_irq(&trace.lock, flags); @@ -88,9 +84,8 @@ void _trace_error(uint32_t event) void _trace_error_atomic(uint32_t event) { volatile uint64_t *t; -#if defined(CONFIG_DMA_TRACE) uint64_t dt[2]; -#endif + uint64_t time; if (!trace.enable) @@ -98,12 +93,10 @@ void _trace_error_atomic(uint32_t event) time = platform_timer_get(platform_timer); -#if defined(CONFIG_DMA_TRACE) /* save event to DMA tracing buffer */ dt[0] = time; dt[1] = event; dtrace_event_atomic((const char*)dt, sizeof(uint64_t) * 2); -#endif /* write timestamp and event to trace buffer */ t = (volatile uint64_t*)(MAILBOX_TRACE_BASE + trace.pos); @@ -119,8 +112,6 @@ void _trace_error_atomic(uint32_t event) dcache_writeback_region((void*)t, sizeof(uint64_t) * 2); } -#if defined(CONFIG_DMA_TRACE) - void _trace_event(uint32_t event) { uint64_t dt[2]; @@ -145,62 +136,6 @@ void _trace_event_atomic(uint32_t event) dtrace_event_atomic((const char*)dt, sizeof(uint64_t) * 2); } -#else - -void _trace_event(uint32_t event) -{ - unsigned long flags; - uint64_t time, *t; - - if (!trace.enable) - return; - - time = platform_timer_get(platform_timer); - - /* send event by mail box too. */ - spin_lock_irq(&trace.lock, flags); - - /* write timestamp and event to trace buffer */ - t = (uint64_t *)(MAILBOX_TRACE_BASE + trace.pos); - trace.pos += (sizeof(uint64_t) << 1); - - if (trace.pos > MAILBOX_TRACE_SIZE - sizeof(uint64_t) * 2) - trace.pos = 0; - - spin_unlock_irq(&trace.lock, flags); - - t[0] = time; - t[1] = event; - - /* writeback trace data */ - dcache_writeback_region((void *)t, sizeof(uint64_t) * 2); -} - -void _trace_event_atomic(uint32_t event) -{ - uint64_t time, *t; - - if (!trace.enable) - return; - - time = platform_timer_get(platform_timer); - - /* write timestamp and event to trace buffer */ - t = (uint64_t *)(MAILBOX_TRACE_BASE + trace.pos); - trace.pos += (sizeof(uint64_t) << 1); - - if (trace.pos > MAILBOX_TRACE_SIZE - sizeof(uint64_t) * 2) - trace.pos = 0; - - t[0] = time; - t[1] = event; - - /* writeback trace data */ - dcache_writeback_region((void *)t, sizeof(uint64_t) * 2); -} - -#endif - void trace_off(void) { trace.enable = 0; @@ -208,10 +143,7 @@ void trace_off(void) void trace_init(struct reef *reef) { - -#if defined(CONFIG_DMA_TRACE) dma_trace_init_early(reef); -#endif trace.enable = 1; trace.pos = 0; spinlock_init(&trace.lock); -- 2.14.1

3 6

[Sound-open-firmware] [PATCH] Increase HEAP_SYSTEM_SIZE for DMA trace local buffer.
by yan.wang＠linux.intel.com 16 Mar '18

16 Mar '18

From: Yan Wang <yan.wang(a)linux.intel.com> After enable DMA trace on APL, original HEAP_SYSTEM_SIZE is not enough and will cause allocation failure. Signed-off-by: Yan Wang <yan.wang(a)linux.intel.com> --- src/platform/apollolake/include/platform/memory.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/platform/apollolake/include/platform/memory.h b/src/platform/apollolake/include/platform/memory.h index 6bdb0ba..a0dab04 100644 --- a/src/platform/apollolake/include/platform/memory.h +++ b/src/platform/apollolake/include/platform/memory.h @@ -180,7 +180,7 @@ #define HEAP_SYSTEM_BASE \ (REEF_TEXT_BASE + REEF_TEXT_SIZE +\ REEF_DATA_SIZE + REEF_BSS_DATA_SIZE) -#define HEAP_SYSTEM_SIZE 0x2000 +#define HEAP_SYSTEM_SIZE 0x3200 #define HEAP_RUNTIME_BASE (HEAP_SYSTEM_BASE + HEAP_SYSTEM_SIZE) #define HEAP_RUNTIME_SIZE \ -- 2.14.3

1 0

[Sound-open-firmware] [PATCH] topology: byt-rt5640. Fix DAI stream name.
by Liam Girdwood 15 Mar '18

15 Mar '18

Stream name should match bytcr driver and not legacy byt-rt5640 driver. 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 c971d41..879e9a9 100644 --- a/topology/reef-byt-rt5640.m4 +++ b/topology/reef-byt-rt5640.m4 @@ -76,14 +76,14 @@ SectionGraph."pipe-byt-rt5640" { # playback DAI is SSP2 using 2 periods # Buffers use s24le format, with 48 frame per 1000us on core 0 with priority 0 DAI_ADD(sof/pipe-dai-playback.m4, - 1, SSP, 2, Audio + 1, SSP, 2, SSP-Codec PIPELINE_SOURCE_1, 2, s24le, 48, 1000, 0, 0) # capture DAI is SSP2 using 2 periods # Buffers use s24le format, with 48 frame per 1000us on core 0 with priority 0 DAI_ADD(sof/pipe-dai-capture.m4, - 2, SSP, 2, Audio, + 2, SSP, 2, SSP-Codec, PIPELINE_SINK_2, 2, s24le, 48, 1000, 0, 0) -- 2.14.1

2 2

[Sound-open-firmware] [PATCH] cnl: enable L1 cache
by Liam Girdwood 15 Mar '18

15 Mar '18

From: Tomasz Lauda <tomasz.lauda(a)linux.intel.com> Enable L1 cache for DSP. Signed-off-by: Tomasz Lauda <tomasz.lauda(a)linux.intel.com> --- src/platform/cannonlake/cannonlake.x.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/platform/cannonlake/cannonlake.x.in b/src/platform/cannonlake/cannonlake.x.in index 0ed5bc60..47acd5e0 100644 --- a/src/platform/cannonlake/cannonlake.x.in +++ b/src/platform/cannonlake/cannonlake.x.in @@ -158,7 +158,7 @@ _memmap_cacheattr_bp_base = 0x22022000; _memmap_cacheattr_unused_mask = 0x00F00FFF; _memmap_cacheattr_wb_trapnull = 0x4422422F; _memmap_cacheattr_wba_trapnull = 0x4422422F; -_memmap_cacheattr_wbna_trapnull = 0x25222222; +_memmap_cacheattr_wbna_trapnull = 0xFF42FFF2; _memmap_cacheattr_wt_trapnull = 0x1122122F; _memmap_cacheattr_bp_trapnull = 0x2222222F; _memmap_cacheattr_wb_strict = 0x44F24FFF; -- 2.14.1

1 0