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

[Sound-open-firmware] [PATCH] trace: comp: Make high frequency trace output verbose level
by Liam Girdwood 15 Aug '17

15 Aug '17

make sure our high frequency component and pipeline trace uses verbose trace level. Signed-off-by: Liam Girdwood <liam.r.girdwood(a)linux.intel.com> --- src/audio/dai.c | 2 +- src/audio/host.c | 4 ++-- src/audio/mixer.c | 2 +- src/audio/pipeline.c | 4 ++-- src/audio/volume.c | 2 +- 5 files changed, 7 insertions(+), 7 deletions(-) diff --git a/src/audio/dai.c b/src/audio/dai.c index 518836a..8f41026 100644 --- a/src/audio/dai.c +++ b/src/audio/dai.c @@ -80,7 +80,7 @@ static void dai_dma_cb(void *data, uint32_t type, struct dma_sg_elem *next) struct comp_buffer *dma_buffer; uint32_t copied_size; - trace_dai("irq"); + tracev_dai("irq"); if (dev->params.direction == SOF_IPC_STREAM_PLAYBACK) { dma_buffer = list_first_item(&dev->bsource_list, diff --git a/src/audio/host.c b/src/audio/host.c index 944edfe..5ac2cf4 100644 --- a/src/audio/host.c +++ b/src/audio/host.c @@ -120,7 +120,7 @@ static void host_dma_cb(void *data, uint32_t type, struct dma_sg_elem *next) local_elem = list_first_item(&hd->config.elem_list, struct dma_sg_elem, list); - trace_host("irq"); + tracev_host("irq"); /* update buffer positions */ dma_buffer = hd->dma_buffer; @@ -615,7 +615,7 @@ static int host_copy(struct comp_dev *dev) struct host_data *hd = comp_get_drvdata(dev); struct sof_ipc_comp_config *config = COMP_GET_CONFIG(dev); - trace_host("cpy"); + tracev_host("cpy"); if (dev->state != COMP_STATE_RUNNING) return 0; diff --git a/src/audio/mixer.c b/src/audio/mixer.c index cc4701f..74c0ffb 100644 --- a/src/audio/mixer.c +++ b/src/audio/mixer.c @@ -203,7 +203,7 @@ static int mixer_copy(struct comp_dev *dev) struct list_item *blist; int32_t i = 0, num_mix_sources = 0; - trace_mixer("cpy"); + tracev_mixer("cpy"); /* calculate the highest runtime component status between input streams */ list_for_item(blist, &dev->bsource_list) { diff --git a/src/audio/pipeline.c b/src/audio/pipeline.c index 5674877..185b4f3 100644 --- a/src/audio/pipeline.c +++ b/src/audio/pipeline.c @@ -716,13 +716,13 @@ static void pipeline_task(void *arg) struct task *task = &p->pipe_task; struct comp_dev *dev = task->sdata; - trace_pipe("PWs"); + tracev_pipe("PWs"); /* copy data from upstream source enpoints to downstream endpoints */ pipeline_copy_from_upstream(dev, dev); pipeline_copy_to_downstream(dev, dev); - trace_pipe("PWe"); + tracev_pipe("PWe"); } /* init pipeline */ diff --git a/src/audio/volume.c b/src/audio/volume.c index d0c3e4a..33ac07d 100644 --- a/src/audio/volume.c +++ b/src/audio/volume.c @@ -483,7 +483,7 @@ static int volume_copy(struct comp_dev *dev) struct sof_ipc_comp_config *config = COMP_GET_CONFIG(dev); uint32_t copy_bytes; - trace_volume("cpy"); + tracev_volume("cpy"); /* volume components will only ever have 1 source and 1 sink buffer */ source = list_first_item(&dev->bsource_list, struct comp_buffer, sink_list); -- 2.11.0

1 5

[Sound-open-firmware] [PATCH] pipeline: static: move static buffer sizes out of platform header
by Liam Girdwood 10 Aug '17

10 Aug '17

Signed-off-by: Liam Girdwood <liam.r.girdwood(a)linux.intel.com> --- src/audio/pipeline_static.c | 8 ++++++++ src/platform/baytrail/include/platform/platform.h | 7 ------- 2 files changed, 8 insertions(+), 7 deletions(-) diff --git a/src/audio/pipeline_static.c b/src/audio/pipeline_static.c index d52afda..d08bb98 100644 --- a/src/audio/pipeline_static.c +++ b/src/audio/pipeline_static.c @@ -45,6 +45,14 @@ #include <reef/audio/component.h> #include <reef/audio/pipeline.h> + +/* 2 * 32 bit*/ +#define PLATFORM_INT_FRAME_SIZE 8 +/* 2 * 16 bit*/ +#define PLATFORM_HOST_FRAME_SIZE 4 +/* 2 * 24 (32) bit*/ +#define PLATFORM_DAI_FRAME_SIZE 8 + /* * Static Buffer Convenience Constructors. */ diff --git a/src/platform/baytrail/include/platform/platform.h b/src/platform/baytrail/include/platform/platform.h index 8dac653..222ffd2 100644 --- a/src/platform/baytrail/include/platform/platform.h +++ b/src/platform/baytrail/include/platform/platform.h @@ -67,13 +67,6 @@ struct reef; #define PLATFORM_MAX_CHANNELS 4 #define PLATFORM_MAX_STREAMS 5 -/* TODO: get this from IPC - 2 * 32 bit*/ -#define PLATFORM_INT_FRAME_SIZE 8 -/* TODO: get this from IPC - 2 * 16 bit*/ -#define PLATFORM_HOST_FRAME_SIZE 4 -/* TODO: get this from IPC - 2 * 24 (32) bit*/ -#define PLATFORM_DAI_FRAME_SIZE 8 - /* Platform Host DMA buffer config - these should align with DMA engine */ #define PLAT_HOST_PERIOD_FRAMES 48 /* must be multiple of DMA burst size */ #define PLAT_HOST_PERIODS 2 /* give enough latency for DMA refill */ -- 2.11.0

1 4

[Sound-open-firmware] [PATCH] trace: provide locking around trace output.
by Liam Girdwood 09 Aug '17

09 Aug '17

Make sure trace mailbox writes are atomic and provide reef context. Signed-off-by: Liam Girdwood <liam.r.girdwood(a)linux.intel.com> --- src/include/reef/trace.h | 2 ++ src/init/init.c | 2 ++ src/lib/trace.c | 41 +++++++++++++++++++++++++++++++---------- 3 files changed, 35 insertions(+), 10 deletions(-) diff --git a/src/include/reef/trace.h b/src/include/reef/trace.h index 00dbb5b..300e8d8 100644 --- a/src/include/reef/trace.h +++ b/src/include/reef/trace.h @@ -34,6 +34,7 @@ #include <stdint.h> #include <stdlib.h> +#include <reef/reef.h> #include <reef/mailbox.h> #include <reef/debug.h> #include <reef/timer.h> @@ -94,6 +95,7 @@ void _trace_event(uint32_t event); void trace_off(void); +void trace_init(struct reef * reef); #if TRACE diff --git a/src/init/init.c b/src/init/init.c index 1dc1237..491a6ad 100644 --- a/src/init/init.c +++ b/src/init/init.c @@ -65,6 +65,8 @@ int main(int argc, char *argv[]) trace_point(TRACE_BOOT_SYS_HEAP); init_heap(&reef); + trace_init(&reef); + trace_point(TRACE_BOOT_SYS_NOTE); init_system_notify(&reef); diff --git a/src/lib/trace.c b/src/lib/trace.c index 79d026e..5da7c95 100644 --- a/src/lib/trace.c +++ b/src/lib/trace.c @@ -29,34 +29,55 @@ */ #include <reef/trace.h> +#include <reef/reef.h> +#include <reef/alloc.h> #include <arch/cache.h> +#include <platform/timer.h> +#include <reef/lock.h> #include <stdint.h> -/* trace position */ -static uint32_t trace_pos = 0; -static uint32_t trace_enable = 1; +struct trace { + uint32_t pos ; /* trace position */ + uint32_t enable; + spinlock_t lock; +}; + +static struct trace trace; void _trace_event(uint32_t event) { - volatile uint32_t *t = - (volatile uint32_t*)(MAILBOX_TRACE_BASE + trace_pos); + unsigned long flags; + volatile uint32_t *t; - if (!trace_enable) + if (!trace.enable) return; + spin_lock_irq(&trace.lock, flags); + /* write timestamp and event to trace buffer */ + t =(volatile uint32_t*)(MAILBOX_TRACE_BASE + trace.pos); t[0] = platform_timer_get(0); t[1] = event; /* writeback trace data */ dcache_writeback_region((void*)t, sizeof(uint32_t) * 2); - trace_pos += (sizeof(uint32_t) << 1); - if (trace_pos >= MAILBOX_TRACE_SIZE) - trace_pos = 0; + trace.pos += (sizeof(uint32_t) << 1); + + if (trace.pos >= MAILBOX_TRACE_SIZE) + trace.pos = 0; + + spin_unlock_irq(&trace.lock, flags); } void trace_off(void) { - trace_enable = 0; + trace.enable = 0; }; + +void trace_init(struct reef *reef) +{ + trace.enable = 1; + trace.pos = 0; + spinlock_init(&trace.lock); +} -- 2.11.0

1 0

[Sound-open-firmware] [PATCH] Incorrect trace variable name
by Curtis Malainey 09 Aug '17

09 Aug '17

Minor debugging issue, when verbose trace is turned on it will not compile because these variables are incorrect. --- src/audio/eq_fir.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/audio/eq_fir.c b/src/audio/eq_fir.c index ae87f92..41c6d38 100644 --- a/src/audio/eq_fir.c +++ b/src/audio/eq_fir.c @@ -323,9 +323,9 @@ static int eq_fir_cmd(struct comp_dev *dev, int cmd, void *data) fir_update, PLATFORM_MAX_CHANNELS); /* Print trace information */ - tracev_value(iir_update->stream_max_channels); + tracev_value(fir_update->stream_max_channels); for (i = 0; i < fir_update->stream_max_channels; i++) - tracev_value(iir_update->assign_response[i]); + tracev_value(fir_update->assign_response[i]); break; case COMP_CMD_EQ_FIR_CONFIG: -- 2.14.0.rc1.383.gd1ce394fe2-goog

4 4

[Sound-open-firmware] [PATCH] arch: xtensa: generate a disassembly output fro debug.
by Liam Girdwood 09 Aug '17

09 Aug '17

Also generate a disassembly with no interleaved source for easier memory debugging. Signed-off-by: Liam Girdwood <liam.r.girdwood(a)linux.intel.com> --- src/arch/xtensa/Makefile.am | 1 + 1 file changed, 1 insertion(+) diff --git a/src/arch/xtensa/Makefile.am b/src/arch/xtensa/Makefile.am index 28d99bf..828db91 100644 --- a/src/arch/xtensa/Makefile.am +++ b/src/arch/xtensa/Makefile.am @@ -71,6 +71,7 @@ reef_LDFLAGS = \ bin-local: reef $(OBJCOPY) -O binary reef reef-$(FW_NAME).bin $(OBJDUMP) -S reef > reef-$(FW_NAME).lst + $(OBJDUMP) -D reef > reef-$(FW_NAME).dis rimage -i reef -o reef-$(FW_NAME).ri -m $(FW_NAME) vminstall-local: -- 2.11.0

1 0

[Sound-open-firmware] [PATCH] build: Generate separate .map and .lst files.
by Liam Girdwood 09 Aug '17

09 Aug '17

From: Rajavardhan Gundi <rajavardhan.gundi(a)intel.com> Signed-off-by: Rajavardhan Gundi <rajavardhan.gundi(a)intel.com> --- src/arch/xtensa/Makefile.am | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/arch/xtensa/Makefile.am b/src/arch/xtensa/Makefile.am index e9f8f5d..28d99bf 100644 --- a/src/arch/xtensa/Makefile.am +++ b/src/arch/xtensa/Makefile.am @@ -65,12 +65,12 @@ reef_LDADD = \ -lgcc reef_LDFLAGS = \ - $(ARCH_LDFLAGS) \ + $(ARCH_LDFLAGS) -Wl,-Map=reef-$(FW_NAME).map \ -T ../../platform/$(PLATFORM)/$(PLATFORM_LDSCRIPT) bin-local: reef $(OBJCOPY) -O binary reef reef-$(FW_NAME).bin - $(OBJDUMP) -h -D reef > reef-$(FW_NAME).map + $(OBJDUMP) -S reef > reef-$(FW_NAME).lst rimage -i reef -o reef-$(FW_NAME).ri -m $(FW_NAME) vminstall-local: -- 2.9.4

1 0

[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