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

[Sound-open-firmware] [PATCH] topology: Add format and scheduling info to DAI pipelines.
by Liam Girdwood 30 Aug '17

30 Aug '17

Some pipelines can be used to service DAIs before data is sent on to other processing pipelines. Add scheduling and format info to DAI pipelines. Signed-off-by: Liam Girdwood <liam.r.girdwood(a)linux.intel.com> --- topology/m4/build.m4 | 12 +++++++++++- topology/reef-apl-nocodec.m4 | 6 ++++-- topology/reef-bdw-rt286.m4 | 6 ++++-- topology/reef-bdw-rt5640.m4 | 6 ++++-- topology/reef-bxt-nocodec.m4 | 6 ++++-- topology/reef-byt-nocodec.m4 | 6 ++++-- topology/reef-byt-rt5640.m4 | 6 ++++-- topology/reef-byt-rt5651.m4 | 6 ++++-- topology/reef-cht-nocodec.m4 | 6 ++++-- topology/reef-hsw-rt5640.m4 | 6 ++++-- 10 files changed, 47 insertions(+), 19 deletions(-) diff --git a/topology/m4/build.m4 b/topology/m4/build.m4 index 843dcbb..7d248da 100644 --- a/topology/m4/build.m4 +++ b/topology/m4/build.m4 @@ -81,7 +81,7 @@ define(`PIPELINE_ADD', `include($1)' ) -dnl DAI_ADD(pipeline, dai type, dai_index, stream_name, buffer, periods) +dnl DAI_ADD(pipeline, dai type, dai_index, stream_name, buffer, periods, format, frames, deadline, priority, core) define(`DAI_ADD', `undefine(`PIPELINE_ID')' `undefine(`DAI_TYPE')' @@ -89,6 +89,11 @@ define(`DAI_ADD', `undefine(`DAI_SNAME')' `undefine(`DAI_BUF')' `undefine(`DAI_PERIODS')' +`undefine(`DAI_FORMAT')' +`undefine(`SCHEDULE_FRAMES')' +`undefine(`SCHEDULE_DEADLINE')' +`undefine(`SCHEDULE_PRIORITY')' +`undefine(`SCHEDULE_CORE')' `define(`PIPELINE_ID', 0)' `define(`DAI_TYPE', STR($2))' `define(`DAI_INDEX', STR($3))' @@ -96,6 +101,11 @@ define(`DAI_ADD', `define(`DAI_BUF', $5)' `define(`DAI_NAME', $2$3)' `define(`DAI_PERIODS', $6)' +`define(`DAI_FORMAT', $7)' +`define(`SCHEDULE_FRAMES', $8)' +`define(`SCHEDULE_DEADLINE', $9)' +`define(`SCHEDULE_PRIORITY', $10)' +`define(`SCHEDULE_CORE', $11)' `include($1)' ) diff --git a/topology/reef-apl-nocodec.m4 b/topology/reef-apl-nocodec.m4 index 93b57fe..ef80fd3 100644 --- a/topology/reef-apl-nocodec.m4 +++ b/topology/reef-apl-nocodec.m4 @@ -74,10 +74,12 @@ SectionGraph."pipe-apl-nocodec" { # # playback DAI is SSP2 using I2S DAPM stream and 2 periods -DAI_ADD(sof/pipe-dai-playback.m4, SSP, 2, I2S, PIPELINE_SOURCE_1, 2) +# Buffers use s24le format, with 48 frame per 1000us on core 0 with priorty 0 +DAI_ADD(sof/pipe-dai-playback.m4, SSP, 2, I2S, PIPELINE_SOURCE_1, 2, s24le, 48, 1000, 0, 0) # capture DAI is SSP2 using I2S DAPM stream and 2 periods -DAI_ADD(sof/pipe-dai-capture.m4, SSP, 2, I2S, PIPELINE_SINK_2, 2) +# Buffers use s24le format, with 48 frame per 1000us on core 0 with priorty 0 +DAI_ADD(sof/pipe-dai-capture.m4, SSP, 2, I2S, PIPELINE_SINK_2, 2, s24le, 48, 1000, 0, 0) # # BE configurations - overrides config in ACPI if present diff --git a/topology/reef-bdw-rt286.m4 b/topology/reef-bdw-rt286.m4 index e4b600a..e3f8dd9 100644 --- a/topology/reef-bdw-rt286.m4 +++ b/topology/reef-bdw-rt286.m4 @@ -74,10 +74,12 @@ SectionGraph."pipe-bdw-rt286" { # # playback DAI is SSP0 using I2S DAPM stream and 2 periods -DAI_ADD(sof/pipe-dai-playback.m4, SSP, 0, I2S, PIPELINE_SOURCE_1, 2) +# Buffers use s24le format, with 48 frame per 1000us on core 0 with priorty 0 +DAI_ADD(sof/pipe-dai-playback.m4, SSP, 0, I2S, PIPELINE_SOURCE_1, 2, s24le, 48, 1000, 0, 0) # capture DAI is SSP0 using I2S DAPM stream and 2 periods -DAI_ADD(sof/pipe-dai-capture.m4, SSP, 0, I2S, PIPELINE_SINK_2, 2) +# Buffers use s24le format, with 48 frame per 1000us on core 0 with priorty 0 +DAI_ADD(sof/pipe-dai-capture.m4, SSP, 0, I2S, PIPELINE_SINK_2, 2, s24le, 48, 1000, 0, 0) # # BE configurations - overrides config in ACPI if present diff --git a/topology/reef-bdw-rt5640.m4 b/topology/reef-bdw-rt5640.m4 index 5d96236..4344605 100644 --- a/topology/reef-bdw-rt5640.m4 +++ b/topology/reef-bdw-rt5640.m4 @@ -74,10 +74,12 @@ SectionGraph."pipe-bdw-rt5640" { # # playback DAI is SSP0 using I2S DAPM stream and 2 periods -DAI_ADD(sof/pipe-dai-playback.m4, SSP, 0, I2S, PIPELINE_SOURCE_1, 2) +# Buffers use s24le format, with 48 frame per 1000us on core 0 with priorty 0 +DAI_ADD(sof/pipe-dai-playback.m4, SSP, 0, I2S, PIPELINE_SOURCE_1, 2, s24le, 48, 1000, 0, 0) # capture DAI is SSP0 using I2S DAPM stream and 2 periods -DAI_ADD(sof/pipe-dai-capture.m4, SSP, 0, I2S, PIPELINE_SINK_2, 2) +# Buffers use s24le format, with 48 frame per 1000us on core 0 with priorty 0 +DAI_ADD(sof/pipe-dai-capture.m4, SSP, 0, I2S, PIPELINE_SINK_2, 2, s24le, 48, 1000, 0, 0) # # BE configurations - overrides config in ACPI if present diff --git a/topology/reef-bxt-nocodec.m4 b/topology/reef-bxt-nocodec.m4 index a8fd320..2028323 100644 --- a/topology/reef-bxt-nocodec.m4 +++ b/topology/reef-bxt-nocodec.m4 @@ -74,10 +74,12 @@ SectionGraph."pipe-bxt-nocodec" { # # playback DAI is SSP2 using I2S DAPM stream and 2 periods -DAI_ADD(sof/pipe-dai-playback.m4, SSP, 2, I2S, PIPELINE_SOURCE_1, 2) +# Buffers use s24le format, with 48 frame per 1000us on core 0 with priorty 0 +DAI_ADD(sof/pipe-dai-playback.m4, SSP, 2, I2S, PIPELINE_SOURCE_1, 2, s24le, 48, 1000, 0, 0) # capture DAI is SSP2 using I2S DAPM stream and 2 periods -DAI_ADD(sof/pipe-dai-capture.m4, SSP, 2, I2S, PIPELINE_SINK_2, 2) +# Buffers use s24le format, with 48 frame per 1000us on core 0 with priorty 0 +DAI_ADD(sof/pipe-dai-capture.m4, SSP, 2, I2S, PIPELINE_SINK_2, 2, s24le, 48, 1000, 0, 0) # # BE configurations - overrides config in ACPI if present diff --git a/topology/reef-byt-nocodec.m4 b/topology/reef-byt-nocodec.m4 index 01b223d..1c3cf5f 100644 --- a/topology/reef-byt-nocodec.m4 +++ b/topology/reef-byt-nocodec.m4 @@ -65,10 +65,12 @@ SectionGraph."pipe-byt-nocodec" { # # playback DAI is SSP2 using I2S DAPM stream and 2 periods -DAI_ADD(sof/pipe-dai-playback.m4, SSP, 2, I2S, PIPELINE_SOURCE_1, 2) +# Buffers use s24le format, with 48 frame per 1000us on core 0 with priorty 0 +DAI_ADD(sof/pipe-dai-playback.m4, SSP, 2, I2S, PIPELINE_SOURCE_1, 2, s24le, 48, 1000, 0, 0) # capture DAI is SSP2 using I2S DAPM stream and 2 periods -DAI_ADD(sof/pipe-dai-capture.m4, SSP, 2, I2S, PIPELINE_SINK_2, 2) +# Buffers use s24le format, with 48 frame per 1000us on core 0 with priorty 0 +DAI_ADD(sof/pipe-dai-capture.m4, SSP, 2, I2S, PIPELINE_SINK_2, 2, s24le, 48, 1000, 0, 0) # # BE configurations - overrides config in ACPI if present diff --git a/topology/reef-byt-rt5640.m4 b/topology/reef-byt-rt5640.m4 index 00d31c7..0629d43 100644 --- a/topology/reef-byt-rt5640.m4 +++ b/topology/reef-byt-rt5640.m4 @@ -65,10 +65,12 @@ SectionGraph."pipe-byt-rt5640" { # # playback DAI is SSP2 using I2S DAPM stream and 2 periods -DAI_ADD(sof/pipe-dai-playback.m4, SSP, 2, I2S, PIPELINE_SOURCE_1, 2) +# Buffers use s24le format, with 48 frame per 1000us on core 0 with priorty 0 +DAI_ADD(sof/pipe-dai-playback.m4, SSP, 2, I2S, PIPELINE_SOURCE_1, 2, s24le, 48, 1000, 0, 0) # capture DAI is SSP2 using I2S DAPM stream and 2 periods -DAI_ADD(sof/pipe-dai-capture.m4, SSP, 2, I2S, PIPELINE_SINK_2, 2) +# Buffers use s24le format, with 48 frame per 1000us on core 0 with priorty 0 +DAI_ADD(sof/pipe-dai-capture.m4, SSP, 2, I2S, PIPELINE_SINK_2, 2, s24le, 48, 1000, 0, 0) # # BE configurations - overrides config in ACPI if present diff --git a/topology/reef-byt-rt5651.m4 b/topology/reef-byt-rt5651.m4 index fd5263f..1b492b7 100644 --- a/topology/reef-byt-rt5651.m4 +++ b/topology/reef-byt-rt5651.m4 @@ -65,10 +65,12 @@ SectionGraph."pipe-byt-rt5651" { # # playback DAI is SSP2 using "Audio" DAPM stream name and 2 periods -DAI_ADD(sof/pipe-dai-playback.m4, SSP, 2, Audio, PIPELINE_SOURCE_1, 2) +# Buffers use s24le format, with 48 frame per 1000us on core 0 with priorty 0 +DAI_ADD(sof/pipe-dai-playback.m4, SSP, 2, Audio, PIPELINE_SOURCE_1, 2, s24le, 48, 1000, 0, 0) # capture DAI is SSP2 using "Audio" DAPM stream name and 2 periods -DAI_ADD(sof/pipe-dai-capture.m4, SSP, 2, Audio, PIPELINE_SINK_2, 2) +# Buffers use s24le format, with 48 frame per 1000us on core 0 with priorty 0 +DAI_ADD(sof/pipe-dai-capture.m4, SSP, 2, Audio, PIPELINE_SINK_2, 2, s24le, 48, 1000, 0, 0) # # BE configurations - overrides config in ACPI if present diff --git a/topology/reef-cht-nocodec.m4 b/topology/reef-cht-nocodec.m4 index 334443b..ead0f75 100644 --- a/topology/reef-cht-nocodec.m4 +++ b/topology/reef-cht-nocodec.m4 @@ -65,10 +65,12 @@ SectionGraph."pipe-cht-nocodec" { # # playback DAI is SSP2 using I2S DAPM stream and 2 periods -DAI_ADD(sof/pipe-dai-playback.m4, SSP, 2, I2S, PIPELINE_SOURCE_1, 2) +# Buffers use s24le format, with 48 frame per 1000us on core 0 with priorty 0 +DAI_ADD(sof/pipe-dai-playback.m4, SSP, 2, I2S, PIPELINE_SOURCE_1, 2, s24le, 48, 1000, 0, 0) # capture DAI is SSP2 using I2S DAPM stream and 2 periods -DAI_ADD(sof/pipe-dai-capture.m4, SSP, 2, I2S, PIPELINE_SINK_2, 2) +# Buffers use s24le format, with 48 frame per 1000us on core 0 with priorty 0 +DAI_ADD(sof/pipe-dai-capture.m4, SSP, 2, I2S, PIPELINE_SINK_2, 2, s24le, 48, 1000, 0, 0) # # BE configurations - overrides config in ACPI if present diff --git a/topology/reef-hsw-rt5640.m4 b/topology/reef-hsw-rt5640.m4 index 3a76223..e4d9392 100644 --- a/topology/reef-hsw-rt5640.m4 +++ b/topology/reef-hsw-rt5640.m4 @@ -74,10 +74,12 @@ SectionGraph."pipe-hsw-rt5640" { # # playback DAI is SSP0 using I2S DAPM stream and 2 periods -DAI_ADD(sof/pipe-dai-playback.m4, SSP, 0, I2S, PIPELINE_SOURCE_1, 2) +# Buffers use s24le format, with 48 frame per 1000us on core 0 with priorty 0 +DAI_ADD(sof/pipe-dai-playback.m4, SSP, 0, I2S, PIPELINE_SOURCE_1, 2, s24le, 48, 1000, 0, 0) # capture DAI is SSP0 using I2S DAPM stream and 2 periods -DAI_ADD(sof/pipe-dai-capture.m4, SSP, 0, I2S, PIPELINE_SINK_2, 2) +# Buffers use s24le format, with 48 frame per 1000us on core 0 with priorty 0 +DAI_ADD(sof/pipe-dai-capture.m4, SSP, 0, I2S, PIPELINE_SINK_2, 2, s24le, 48, 1000, 0, 0) # # BE configurations - overrides config in ACPI if present -- 2.11.0

1 2

[Sound-open-firmware] [PATCH] drivers: ssp: Improve SSP I2S and DSP mode generation from topology.
by Liam Girdwood 30 Aug '17

30 Aug '17

Improve support for I2S and DSP modes alongside using topology data to define the mode configuration. Add trace errors to reject any unsupported configurations. Signed-off-by: Liam Girdwood <liam.r.girdwood(a)linux.intel.com> --- src/drivers/ssp.c | 75 +++++++++++++++++++++++++------------------------- src/include/reef/ssp.h | 20 +++++++++++++- 2 files changed, 56 insertions(+), 39 deletions(-) diff --git a/src/drivers/ssp.c b/src/drivers/ssp.c index 1a1000a..0b7589a 100644 --- a/src/drivers/ssp.c +++ b/src/drivers/ssp.c @@ -69,8 +69,8 @@ static inline int ssp_set_config(struct dai *dai, struct sof_ipc_dai_config *config) { struct ssp_pdata *ssp = dai_get_drvdata(dai); - uint32_t sscr0, sscr1, sspsp, sfifott, mdiv, bdiv; - uint32_t stop_size, data_size; + uint32_t sscr0, sscr1, sscr2, sscr3, sspsp, sfifott, mdiv, bdiv; + uint32_t data_size, frame_len = 0; int ret = 0; spin_lock(&ssp->lock); @@ -78,7 +78,7 @@ static inline int ssp_set_config(struct dai *dai, /* is playback/capture already running */ if (ssp->state[DAI_DIR_PLAYBACK] > SSP_STATE_IDLE || ssp->state[DAI_DIR_CAPTURE] > SSP_STATE_IDLE) { - trace_ssp_error("wsS"); + trace_ssp_error("ec1"); goto out; } @@ -87,6 +87,8 @@ static inline int ssp_set_config(struct dai *dai, /* reset SSP settings */ sscr0 = 0; sscr1 = 0; + sscr2 = 0xc1; + sscr3 = 0x2c018; sspsp = 0; ssp->config = *config; @@ -102,6 +104,7 @@ static inline int ssp_set_config(struct dai *dai, break; case SOF_DAI_FMT_CBS_CFS: sscr1 |= SSCR1_SCFR | SSCR1_RWOT; + sscr3 |= SSCR3_I2S_FRM_MST | SSCR3_I2S_CLK_MST; break; case SOF_DAI_FMT_CBM_CFS: sscr1 |= SSCR1_SFRMDIR; @@ -112,6 +115,7 @@ static inline int ssp_set_config(struct dai *dai, case SSP_CLK_DEFAULT: break; default: + trace_ssp_error("ec2"); ret = -EINVAL; goto out; } @@ -129,6 +133,7 @@ static inline int ssp_set_config(struct dai *dai, sspsp |= SSPSP_SCMODE(2) | SSPSP_SFRMP; break; default: + trace_ssp_error("ec3"); ret = -EINVAL; goto out; } @@ -148,13 +153,14 @@ static inline int ssp_set_config(struct dai *dai, sscr0 |= SSCR0_NCS | SSCR0_MOD; break; default: + trace_ssp_error("ec4"); ret = -EINVAL; goto out; } /* BCLK is generated from MCLK - must be divisable */ if (config->mclk % config->bclk) { - trace_ssp_error("ec1"); + trace_ssp_error("ec5"); ret = -EINVAL; goto out; } @@ -162,17 +168,17 @@ static inline int ssp_set_config(struct dai *dai, /* divisor must be within SCR range */ mdiv = (config->mclk / config->bclk)- 1; if (mdiv > (SSCR0_SCR_MASK >> 8)) { - trace_ssp_error("ec2"); + trace_ssp_error("ec6"); ret = -EINVAL; goto out; } - /* set the divisor */ + /* set the SCR divisor */ sscr0 |= SSCR0_SCR(mdiv); /* calc frame width based on BCLK and rate - must be divisable */ if (config->bclk % config->fclk) { - trace_ssp_error("ec3"); + trace_ssp_error("ec7"); ret = -EINVAL; goto out; } @@ -180,61 +186,60 @@ static inline int ssp_set_config(struct dai *dai, /* must be enouch BCLKs for data */ bdiv = config->bclk / config->fclk; if (bdiv < config->sample_container_bits * config->num_slots) { - trace_ssp_error("ec4"); + trace_ssp_error("ec8"); ret = -EINVAL; goto out; } /* sample_container_bits must be <= 38 for SSP */ if (config->sample_container_bits > 38) { - trace_ssp_error("ec5"); + trace_ssp_error("ec9"); ret = -EINVAL; goto out; } - trace_value(mdiv); - trace_value(bdiv); - /* format */ switch (config->format & SOF_DAI_FMT_FORMAT_MASK) { case SOF_DAI_FMT_I2S: - /* calculate dummy stop size and include dummy start */ - stop_size = config->sample_container_bits - - (config->sample_valid_bits) - 1; - trace_value(stop_size); - if (stop_size > 3) { - trace_ssp_error("ec6"); - ret = -EINVAL; - goto out; - } + /* enable I2S mode */ + sscr3 |= SSCR3_I2S_ENA | SSCR3_I2S_TX_ENA | SSCR3_I2S_RX_ENA; sscr0 |= SSCR0_PSP; sscr1 |= SSCR1_TRAIL; - sspsp |= SSPSP_SFRMWDTH(config->sample_container_bits); - /* subtract 1 for I2S start delay */ - sspsp |= SSPSP_SFRMDLY((config->sample_container_bits - 1) * 2); - sspsp |= SSPSP_DMYSTRT(1); - sspsp |= SSPSP_DMYSTOP(stop_size); + + /* set asserted frame length */ + frame_len = config->sample_container_bits; break; case SOF_DAI_FMT_DSP_A: - sspsp |= SSPSP_FSRT; + sscr0 |= SSCR0_PSP | SSCR0_MOD | SSCR0_FRDC(config->num_slots); + sscr1 |= SSCR1_TRAIL; + sspsp |= SSPSP_SFRMWDTH(1) | SSPSP_SFRMDLY(2); case SOF_DAI_FMT_DSP_B: - sscr0 |= SSCR0_PSP; + sscr0 |= SSCR0_PSP | SSCR0_MOD | SSCR0_FRDC(config->num_slots); sscr1 |= SSCR1_TRAIL; + sspsp |= SSPSP_SFRMWDTH(1); break; default: + trace_ssp_error("eca"); ret = -EINVAL; goto out; } + /* set frame length and slot mask in I2s & PCM modes */ + ssp_write(dai, SSCR4, + SSCR4_FRM_CLOCKS(config->sample_container_bits << 1)); + ssp_write(dai, SSCR5, SSCR5_FRM_ASRT_CLOCKS(frame_len)); + ssp_write(dai, SSTSA, config->tx_slot_mask); + ssp_write(dai, SSRSA, config->rx_slot_mask); + /* sample data size on SSP FIFO */ switch (config->sample_valid_bits) { case 16: /* 2 * 16bit packed into 32bit FIFO */ data_size = 32; break; default: - data_size = config->sample_valid_bits; + data_size = config->sample_container_bits; } if (data_size > 16) @@ -242,20 +247,14 @@ static inline int ssp_set_config(struct dai *dai, else sscr0 |= SSCR0_DSIZE(data_size); - /* watermarks - TODO: do we still need old sscr1 method ?? */ - sscr1 |= (SSCR1_TX(4) | SSCR1_RX(4)); - /* watermarks - (RFT + 1) should equal DMA SRC_MSIZE */ sfifott = (SFIFOTT_TX(8) | SFIFOTT_RX(8)); -#if 0 - if (dai->config.lbm) - sscr1 |= SSCR1_LBM; - else - sscr1 &= ~SSCR1_LBM; -#endif + trace_ssp("coe"); ssp_write(dai, SSCR0, sscr0); ssp_write(dai, SSCR1, sscr1); + ssp_write(dai, SSCR2, sscr2); + ssp_write(dai, SSCR3, sscr3); ssp_write(dai, SSPSP, sspsp); ssp_write(dai, SFIFOTT, sfifott); diff --git a/src/include/reef/ssp.h b/src/include/reef/ssp.h index 7e557ed..42efb14 100644 --- a/src/include/reef/ssp.h +++ b/src/include/reef/ssp.h @@ -55,7 +55,11 @@ #define SSTSA 0x30 #define SSRSA 0x34 #define SSTSS 0x38 +#define SSCR2 0x40 #define SFIFOTT 0x6C +#define SSCR3 0x70 +#define SSCR4 0x74 +#define SSCR5 0x78 extern const struct dai_ops ssp_ops; @@ -75,7 +79,7 @@ extern const struct dai_ops ssp_ops; #define SSCR0_NCS (1 << 21) #define SSCR0_RIM (1 << 22) #define SSCR0_TUM (1 << 23) -#define SSCR0_FRDC (0x07000000) +#define SSCR0_FRDC(x) ((x - 1) << 24) #define SSCR0_ACS (1 << 30) #define SSCR0_MOD (1 << 31) @@ -127,6 +131,20 @@ extern const struct dai_ops ssp_ops; #define SSPSP_DMYSTOP(x) ((x) << 23) #define SSPSP_FSRT (1 << 25) +/* SSCR3 bits */ +#define SSCR3_I2S_FRM_MST (1 << 0) +#define SSCR3_I2S_ENA (1 << 1) +#define SSCR3_I2S_FRM_POL (1 << 2) +#define SSCR3_I2S_TX_ENA (1 << 9) +#define SSCR3_I2S_RX_ENA (1 << 10) +#define SSCR3_I2S_CLK_MST (1 << 16) + +/* SSCR4 bits */ +#define SSCR4_FRM_CLOCKS(x) (x << 7) + +/* SSCR5 bits */ +#define SSCR5_FRM_ASRT_CLOCKS(x) ((x - 1) << 1) + /* SFIFOTT bits */ #define SFIFOTT_TX(x) (x - 1) #define SFIFOTT_RX(x) ((x - 1) << 16) -- 2.11.0

1 0

[Sound-open-firmware] [PATCH] uapi: fix SOF_RATE common frequencies
by Pierre-Louis Bossart 26 Aug '17

26 Aug '17

Current definitions are missing 12 and 64 kHz, have typos (11250, 22500), list a weird 40kHz and don't have extension capabilities for non-standard rates Before we create ABI problems with the Linux kernel, let's add all the sampling frequencies needed before we submit stuff upstream (the same list needs to be reflected in the kernel include/uapi) Signed-off-by: Pierre-Louis Bossart <pierre-louis.bossart(a)linux.intel.com> --- src/include/uapi/ipc.h | 32 ++++++++++++++++++-------------- 1 file changed, 18 insertions(+), 14 deletions(-) diff --git a/src/include/uapi/ipc.h b/src/include/uapi/ipc.h index c820118..733d8e5 100644 --- a/src/include/uapi/ipc.h +++ b/src/include/uapi/ipc.h @@ -302,20 +302,24 @@ enum sof_ipc_chmap { }; /* common sample rates for use in masks */ -#define SOF_RATE_8000 (1 << 0) -#define SOF_RATE_11250 (1 << 1) -#define SOF_RATE_16000 (1 << 2) -#define SOF_RATE_22500 (1 << 3) -#define SOF_RATE_24000 (1 << 4) -#define SOF_RATE_32000 (1 << 5) -#define SOF_RATE_40000 (1 << 6) -#define SOF_RATE_44100 (1 << 7) -#define SOF_RATE_48000 (1 << 8) -#define SOF_RATE_88200 (1 << 9) -#define SOF_RATE_96000 (1 << 10) -#define SOF_RATE_176400 (1 << 11) -#define SOF_RATE_192000 (1 << 12) - +#define SOF_RATE_8000 (1 << 0) /* 8000Hz */ +#define SOF_RATE_11025 (1 << 1) /* 11025Hz */ +#define SOF_RATE_12000 (1 << 2) /* 12000Hz */ +#define SOF_RATE_16000 (1 << 3) /* 16000Hz */ +#define SOF_RATE_22050 (1 << 4) /* 22050Hz */ +#define SOF_RATE_24000 (1 << 5) /* 24000Hz */ +#define SOF_RATE_32000 (1 << 6) /* 32000Hz */ +#define SOF_RATE_44100 (1 << 7) /* 44100Hz */ +#define SOF_RATE_48000 (1 << 8) /* 48000Hz */ +#define SOF_RATE_64000 (1 << 9) /* 64000Hz */ +#define SOF_RATE_88200 (1 << 10) /* 88200Hz */ +#define SOF_RATE_96000 (1 << 11) /* 96000Hz */ +#define SOF_RATE_176400 (1 << 12) /* 176400Hz */ +#define SOF_RATE_192000 (1 << 13) /* 192000Hz */ + +/* continuous and non-standard rates for flexibility */ +#define SOF_RATE_CONTINUOUS (1 << 30) /* range */ +#define SOF_RATE_KNOT (1 << 31) /* non-continuous */ /* stream PCM frame format */ enum sof_ipc_frame { -- 2.9.3

1 0

[Sound-open-firmware] [PATCH] rmbox: Add EQs, SRC and Tone components to trace output
by Liam Girdwood 24 Aug '17

24 Aug '17

Signed-off-by: Liam Girdwood <liam.r.girdwood(a)linux.intel.com> --- rmbox/rmbox.c | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/rmbox/rmbox.c b/rmbox/rmbox.c index 83d3c6e..1ea7835 100644 --- a/rmbox/rmbox.c +++ b/rmbox/rmbox.c @@ -38,6 +38,10 @@ #define TRACE_CLASS_VOLUME (14 << 24) #define TRACE_CLASS_SWITCH (15 << 24) #define TRACE_CLASS_MUX (16 << 24) +#define TRACE_CLASS_SRC (17 << 24) +#define TRACE_CLASS_TONE (18 << 24) +#define TRACE_CLASS_EQ_FIR (19 << 24) +#define TRACE_CLASS_EQ_IIR (20 << 24) #define MAILBOX_HOST_OFFSET 0x144000 @@ -146,6 +150,14 @@ static void show_trace(uint32_t val, uint32_t addr, uint32_t *timestamp, uint32_ trace = "switch"; else if (class == TRACE_CLASS_MUX) trace = "mux"; + else if (class == TRACE_CLASS_SRC) + trace = "src"; + else if (class == TRACE_CLASS_TONE) + trace = "tone"; + else if (class == TRACE_CLASS_EQ_FIR) + trace = "eq-fir"; + else if (class == TRACE_CLASS_EQ_IIR) + trace = "eq-iir"; else { printf("value 0x%8.8x\n", (uint32_t)val); return; -- 2.11.0

1 2

[Sound-open-firmware] [PATCH] ipc: make sure all messages start at 1 instead of 0 to simplify debug
by Liam Girdwood 24 Aug '17

24 Aug '17

Messages starting at offset 1 remove any ambiguity over whether the message has been constructed correctly. Signed-off-by: Liam Girdwood <liam.r.girdwood(a)linux.intel.com> --- src/include/uapi/ipc.h | 34 +++++++++++++++++----------------- 1 file changed, 17 insertions(+), 17 deletions(-) diff --git a/src/include/uapi/ipc.h b/src/include/uapi/ipc.h index 003b96e..c820118 100644 --- a/src/include/uapi/ipc.h +++ b/src/include/uapi/ipc.h @@ -70,9 +70,9 @@ /* topology */ -#define SOF_IPC_TPLG_COMP_NEW SOF_CMD_TYPE(0x000) -#define SOF_IPC_TPLG_COMP_FREE SOF_CMD_TYPE(0x001) -#define SOF_IPC_TPLG_COMP_CONNECT SOF_CMD_TYPE(0x002) +#define SOF_IPC_TPLG_COMP_NEW SOF_CMD_TYPE(0x001) +#define SOF_IPC_TPLG_COMP_FREE SOF_CMD_TYPE(0x002) +#define SOF_IPC_TPLG_COMP_CONNECT SOF_CMD_TYPE(0x003) #define SOF_IPC_TPLG_PIPE_NEW SOF_CMD_TYPE(0x010) #define SOF_IPC_TPLG_PIPE_FREE SOF_CMD_TYPE(0x011) #define SOF_IPC_TPLG_PIPE_CONNECT SOF_CMD_TYPE(0x012) @@ -81,22 +81,22 @@ #define SOF_IPC_TPLG_BUFFER_FREE SOF_CMD_TYPE(0x021) /* PM */ -#define SOF_IPC_PM_CTX_SAVE SOF_CMD_TYPE(0x000) -#define SOF_IPC_PM_CTX_RESTORE SOF_CMD_TYPE(0x001) -#define SOF_IPC_PM_CTX_SIZE SOF_CMD_TYPE(0x002) -#define SOF_IPC_PM_CLK_SET SOF_CMD_TYPE(0x003) -#define SOF_IPC_PM_CLK_GET SOF_CMD_TYPE(0x004) -#define SOF_IPC_PM_CLK_REQ SOF_CMD_TYPE(0x005) +#define SOF_IPC_PM_CTX_SAVE SOF_CMD_TYPE(0x001) +#define SOF_IPC_PM_CTX_RESTORE SOF_CMD_TYPE(0x002) +#define SOF_IPC_PM_CTX_SIZE SOF_CMD_TYPE(0x003) +#define SOF_IPC_PM_CLK_SET SOF_CMD_TYPE(0x004) +#define SOF_IPC_PM_CLK_GET SOF_CMD_TYPE(0x005) +#define SOF_IPC_PM_CLK_REQ SOF_CMD_TYPE(0x006) /* component - multiple different types */ -#define SOF_IPC_COMP_SET_VOLUME SOF_CMD_TYPE(0x000) -#define SOF_IPC_COMP_GET_VOLUME SOF_CMD_TYPE(0x001) -#define SOF_IPC_COMP_SET_MIXER SOF_CMD_TYPE(0x002) -#define SOF_IPC_COMP_GET_MIXER SOF_CMD_TYPE(0x003) -#define SOF_IPC_COMP_SET_MUX SOF_CMD_TYPE(0x004) -#define SOF_IPC_COMP_GET_MUX SOF_CMD_TYPE(0x005) -#define SOF_IPC_COMP_SET_SRC SOF_CMD_TYPE(0x006) -#define SOF_IPC_COMP_GET_SRC SOF_CMD_TYPE(0x007) +#define SOF_IPC_COMP_SET_VOLUME SOF_CMD_TYPE(0x001) +#define SOF_IPC_COMP_GET_VOLUME SOF_CMD_TYPE(0x002) +#define SOF_IPC_COMP_SET_MIXER SOF_CMD_TYPE(0x003) +#define SOF_IPC_COMP_GET_MIXER SOF_CMD_TYPE(0x004) +#define SOF_IPC_COMP_SET_MUX SOF_CMD_TYPE(0x005) +#define SOF_IPC_COMP_GET_MUX SOF_CMD_TYPE(0x006) +#define SOF_IPC_COMP_SET_SRC SOF_CMD_TYPE(0x007) +#define SOF_IPC_COMP_GET_SRC SOF_CMD_TYPE(0x008) /* DAI messages */ #define SOF_IPC_DAI_CONFIG SOF_CMD_TYPE(0x001) -- 2.11.0

1 2

[Sound-open-firmware] [PATCH] comp: host: make sure we have enough data to copy to/from host
by Liam Girdwood 24 Aug '17

24 Aug '17

Perform a check in the copy() function to make sure there is enough data to copy to/from host buffers. Signed-off-by: Liam Girdwood <liam.r.girdwood(a)linux.intel.com> --- src/audio/host.c | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/src/audio/host.c b/src/audio/host.c index b467036..e71e95f 100644 --- a/src/audio/host.c +++ b/src/audio/host.c @@ -636,12 +636,30 @@ static int host_reset(struct comp_dev *dev) static int host_copy(struct comp_dev *dev) { struct host_data *hd = comp_get_drvdata(dev); + struct comp_buffer *dma_buffer; + struct dma_sg_elem *local_elem; tracev_host("cpy"); if (dev->state != COMP_STATE_RUNNING) return 0; + local_elem = list_first_item(&hd->config.elem_list, + struct dma_sg_elem, list); + + /* enough free or avail to copy ? */ + if (dev->params.direction == SOF_IPC_STREAM_PLAYBACK) { + dma_buffer = list_first_item(&dev->bsink_list, + struct comp_buffer, source_list); + if (dma_buffer->free < local_elem->size) + return 0; + } else { + dma_buffer = list_first_item(&dev->bsource_list, + struct comp_buffer, sink_list); + if (dma_buffer->avail < local_elem->size) + return 0; + } + /* do DMA transfer */ dma_set_config(hd->dma, hd->chan, &hd->config); dma_start(hd->dma, hd->chan); -- 2.11.0

1 3

[Sound-open-firmware] [PATCH] byt: mailbox: fix mailbox size.
by Liam Girdwood 22 Aug '17

22 Aug '17

4k is correct size. Signed-off-by: Liam Girdwood <liam.r.girdwood(a)linux.intel.com> --- src/include/reef/mailbox.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/include/reef/mailbox.h b/src/include/reef/mailbox.h index 44366e4..9233587 100644 --- a/src/include/reef/mailbox.h +++ b/src/include/reef/mailbox.h @@ -35,8 +35,8 @@ #include <arch/cache.h> #include <stdint.h> -/* almost 1k should be enough for everyone ..... */ -#define IPC_MAX_MAILBOX_BYTES 0xe80 +/* 4k should be enough for everyone ..... */ +#define IPC_MAX_MAILBOX_BYTES 0x1000 #define mailbox_get_exception_base() \ MAILBOX_EXCEPTION_BASE -- 2.11.0

1 5

[Sound-open-firmware] [PATCH] dai: config: Use a generic structure for DAI configuration
by Liam Girdwood 21 Aug '17

21 Aug '17

Use a generic structure containing common DAI settings for configuration. This structure also contains a tail of DAI specific data that can also be used by DAI drivers. Signed-off-by: Liam Girdwood <liam.r.girdwood(a)linux.intel.com> --- src/audio/dai.c | 31 +++++++-------- src/drivers/ssp.c | 52 ++++++++++++------------- src/include/reef/audio/component.h | 7 ++-- src/include/reef/dai.h | 16 ++------ src/include/reef/ipc.h | 2 +- src/include/reef/ssp.h | 1 + src/include/uapi/ipc.h | 77 ++++++++++++++++++++++++-------------- src/ipc/intel-ipc.c | 31 ++++++--------- src/ipc/ipc.c | 2 +- 9 files changed, 110 insertions(+), 109 deletions(-) diff --git a/src/audio/dai.c b/src/audio/dai.c index 4464398..c89103d 100644 --- a/src/audio/dai.c +++ b/src/audio/dai.c @@ -544,26 +544,23 @@ static int dai_position(struct comp_dev *dev, struct sof_ipc_stream_posn *posn) return 0; } -static int dai_config(struct comp_dev *dev, struct dai_config *dai_config) +static int dai_config(struct comp_dev *dev, struct sof_ipc_dai_config *config) { - struct dai_data *dd = comp_get_drvdata(dev); - - switch (dai_config->type) { - case DAI_TYPE_INTEL_SSP: - switch (dai_config->ssp->frame_width) { - case 16: - dd->sample_width = 2; - break; - case 17 ... 32: - dd->sample_width = 4; - break; - default: - trace_dai_error("eft"); - return -EINVAL; - } + /* calc frame bytes */ + switch (config->sample_valid_bits) { + case 16: + dev->frame_bytes = 2 * config->num_slots; + break; + case 17 ... 32: + dev->frame_bytes = 4 * config->num_slots; break; default: - dd->sample_width = 2; + break; + } + + if (dev->frame_bytes == 0) { + trace_dai_error("de1"); + return -EINVAL; } return 0; diff --git a/src/drivers/ssp.c b/src/drivers/ssp.c index 2146f83..1a1000a 100644 --- a/src/drivers/ssp.c +++ b/src/drivers/ssp.c @@ -65,12 +65,12 @@ static int ssp_context_restore(struct dai *dai) } /* Digital Audio interface formatting */ -static inline int ssp_set_config(struct dai *dai, struct dai_config *dai_config) +static inline int ssp_set_config(struct dai *dai, + struct sof_ipc_dai_config *config) { struct ssp_pdata *ssp = dai_get_drvdata(dai); - struct sof_ipc_dai_ssp_params *params = &ssp->params; uint32_t sscr0, sscr1, sspsp, sfifott, mdiv, bdiv; - uint32_t stop_size, phy_frame_size, data_size; + uint32_t stop_size, data_size; int ret = 0; spin_lock(&ssp->lock); @@ -88,10 +88,15 @@ static inline int ssp_set_config(struct dai *dai, struct dai_config *dai_config) sscr0 = 0; sscr1 = 0; sspsp = 0; - ssp->params = *dai_config->ssp; + + ssp->config = *config; + ssp->params = config->ssp[0]; + + /* TODO: allow topology to define SSP clock type */ + config->ssp[0].clk_id = SSP_CLK_EXT; /* clock masters */ - switch (params->format & SOF_DAI_FMT_MASTER_MASK) { + switch (config->format & SOF_DAI_FMT_MASTER_MASK) { case SOF_DAI_FMT_CBM_CFM: sscr1 |= SSCR1_SCLKDIR | SSCR1_SFRMDIR; break; @@ -112,7 +117,7 @@ static inline int ssp_set_config(struct dai *dai, struct dai_config *dai_config) } /* clock signal polarity */ - switch (params->format & SOF_DAI_FMT_INV_MASK) { + switch (config->format & SOF_DAI_FMT_INV_MASK) { case SOF_DAI_FMT_NB_NF: break; case SOF_DAI_FMT_NB_IF: @@ -129,7 +134,7 @@ static inline int ssp_set_config(struct dai *dai, struct dai_config *dai_config) } /* clock source */ - switch (params->clk_id) { + switch (config->ssp[0].clk_id) { case SSP_CLK_AUDIO: sscr0 |= SSCR0_ACS; break; @@ -148,14 +153,14 @@ static inline int ssp_set_config(struct dai *dai, struct dai_config *dai_config) } /* BCLK is generated from MCLK - must be divisable */ - if (params->mclk % params->bclk) { + if (config->mclk % config->bclk) { trace_ssp_error("ec1"); ret = -EINVAL; goto out; } /* divisor must be within SCR range */ - mdiv = (params->mclk / params->bclk)- 1; + mdiv = (config->mclk / config->bclk)- 1; if (mdiv > (SSCR0_SCR_MASK >> 8)) { trace_ssp_error("ec2"); ret = -EINVAL; @@ -166,23 +171,22 @@ static inline int ssp_set_config(struct dai *dai, struct dai_config *dai_config) sscr0 |= SSCR0_SCR(mdiv); /* calc frame width based on BCLK and rate - must be divisable */ - if (params->bclk % params->fclk) { + if (config->bclk % config->fclk) { trace_ssp_error("ec3"); ret = -EINVAL; goto out; } /* must be enouch BCLKs for data */ - bdiv = params->bclk / params->fclk; - if (bdiv < params->frame_width * params->num_slots) { + bdiv = config->bclk / config->fclk; + if (bdiv < config->sample_container_bits * config->num_slots) { trace_ssp_error("ec4"); ret = -EINVAL; goto out; } - /* physical frame size must be <= 38 */ - phy_frame_size = bdiv / params->num_slots; - if (phy_frame_size > 38) { + /* sample_container_bits must be <= 38 for SSP */ + if (config->sample_container_bits > 38) { trace_ssp_error("ec5"); ret = -EINVAL; goto out; @@ -190,14 +194,14 @@ static inline int ssp_set_config(struct dai *dai, struct dai_config *dai_config) trace_value(mdiv); trace_value(bdiv); - trace_value(phy_frame_size); /* format */ - switch (params->format & SOF_DAI_FMT_FORMAT_MASK) { + switch (config->format & SOF_DAI_FMT_FORMAT_MASK) { case SOF_DAI_FMT_I2S: /* calculate dummy stop size and include dummy start */ - stop_size = phy_frame_size - params->frame_width - 1; + stop_size = config->sample_container_bits - + (config->sample_valid_bits) - 1; trace_value(stop_size); if (stop_size > 3) { trace_ssp_error("ec6"); @@ -207,9 +211,9 @@ static inline int ssp_set_config(struct dai *dai, struct dai_config *dai_config) sscr0 |= SSCR0_PSP; sscr1 |= SSCR1_TRAIL; - sspsp |= SSPSP_SFRMWDTH(phy_frame_size); + sspsp |= SSPSP_SFRMWDTH(config->sample_container_bits); /* subtract 1 for I2S start delay */ - sspsp |= SSPSP_SFRMDLY((phy_frame_size - 1) * 2); + sspsp |= SSPSP_SFRMDLY((config->sample_container_bits - 1) * 2); sspsp |= SSPSP_DMYSTRT(1); sspsp |= SSPSP_DMYSTOP(stop_size); break; @@ -225,16 +229,12 @@ static inline int ssp_set_config(struct dai *dai, struct dai_config *dai_config) } /* sample data size on SSP FIFO */ - switch (params->frame_width) { + switch (config->sample_valid_bits) { case 16: /* 2 * 16bit packed into 32bit FIFO */ - case 24: /* 1 * 24bit in 32bit FIFO (8 MSBs not used) */ - case 32: /* 1 * 32bit packed into 32bit FIFO */ data_size = 32; break; default: - trace_ssp_error("ec7"); - ret = -EINVAL; - goto out; + data_size = config->sample_valid_bits; } if (data_size > 16) diff --git a/src/include/reef/audio/component.h b/src/include/reef/audio/component.h index a74395c..260fbda 100644 --- a/src/include/reef/audio/component.h +++ b/src/include/reef/audio/component.h @@ -122,7 +122,8 @@ struct comp_ops { int (*preload)(struct comp_dev *dev); /* set component audio stream paramters */ - int (*dai_config)(struct comp_dev *dev, struct dai_config *dai_config); + int (*dai_config)(struct comp_dev *dev, + struct sof_ipc_dai_config *dai_config); /* used to pass standard and bespoke commands (with data) to component */ int (*cmd)(struct comp_dev *dev, int cmd, void *data); @@ -261,10 +262,10 @@ static inline int comp_reset(struct comp_dev *dev) /* DAI configuration - only mandatory for DAI components */ static inline int comp_dai_config(struct comp_dev *dev, - struct dai_config *dai_config) + struct sof_ipc_dai_config *config) { if (dev->drv->ops.dai_config) - return dev->drv->ops.dai_config(dev, dai_config); + return dev->drv->ops.dai_config(dev, config); return 0; } diff --git a/src/include/reef/dai.h b/src/include/reef/dai.h index 258b016..75eabce 100644 --- a/src/include/reef/dai.h +++ b/src/include/reef/dai.h @@ -58,7 +58,7 @@ struct dai; /* DAI operations - all optional */ struct dai_ops { - int (*set_config)(struct dai *dai, struct dai_config *dai_config); + int (*set_config)(struct dai *dai, struct sof_ipc_dai_config *config); int (*trigger)(struct dai *dai, int cmd, int direction); int (*pm_context_restore)(struct dai *dai); int (*pm_context_store)(struct dai *dai); @@ -78,15 +78,6 @@ enum dai_type { DAI_TYPE_INTEL_DMIC, }; -/* DAI runtime hardware configuration */ -struct dai_config { - enum dai_type type; - union { - struct sof_ipc_dai_ssp_params *ssp; - struct sof_ipc_dai_hda_params *hda; - struct sof_ipc_dai_dmic_params *dmic; - }; -}; struct dai_plat_fifo_data { uint32_t offset; @@ -126,9 +117,10 @@ struct dai *dai_get(uint32_t type, uint32_t index); dai->plat_data.fifo[direction].offset /* Digital Audio interface formatting */ -static inline int dai_set_config(struct dai *dai, struct dai_config *dai_config) +static inline int dai_set_config(struct dai *dai, + struct sof_ipc_dai_config *config) { - return dai->ops->set_config(dai, dai_config); + return dai->ops->set_config(dai, config); } /* Digital Audio interface formatting */ diff --git a/src/include/reef/ipc.h b/src/include/reef/ipc.h index 96f2924..253f4f4 100644 --- a/src/include/reef/ipc.h +++ b/src/include/reef/ipc.h @@ -157,6 +157,6 @@ struct ipc_comp_dev *ipc_get_comp(struct ipc *ipc, uint32_t id); /* * Configure all DAI components attached to DAI. */ -int ipc_comp_dai_config(struct ipc *ipc, struct dai_config *config); +int ipc_comp_dai_config(struct ipc *ipc, struct sof_ipc_dai_config *config); #endif diff --git a/src/include/reef/ssp.h b/src/include/reef/ssp.h index 77d7b2e..7e557ed 100644 --- a/src/include/reef/ssp.h +++ b/src/include/reef/ssp.h @@ -153,6 +153,7 @@ struct ssp_pdata { spinlock_t lock; uint32_t state[2]; /* SSP_STATE_ for each direction */ completion_t drain_complete; + struct sof_ipc_dai_config config; struct sof_ipc_dai_ssp_params params; }; diff --git a/src/include/uapi/ipc.h b/src/include/uapi/ipc.h index 19ee898..ddca551 100644 --- a/src/include/uapi/ipc.h +++ b/src/include/uapi/ipc.h @@ -99,10 +99,8 @@ #define SOF_IPC_COMP_GET_SRC SOF_CMD_TYPE(0x007) /* DAI messages */ -#define SOF_IPC_COMP_SSP_CONFIG SOF_CMD_TYPE(0x000) -#define SOF_IPC_COMP_HDA_CONFIG SOF_CMD_TYPE(0x001) -#define SOF_IPC_COMP_DMIC_CONFIG SOF_CMD_TYPE(0x002) -#define SOF_IPC_COMP_LOOPBACK SOF_CMD_TYPE(0x003) +#define SOF_IPC_DAI_CONFIG SOF_CMD_TYPE(0x001) +#define SOF_IPC_DAI_LOOPBACK SOF_CMD_TYPE(0x002) /* stream */ #define SOF_IPC_STREAM_PCM_PARAMS SOF_CMD_TYPE(0x001) @@ -193,37 +191,68 @@ struct sof_ipc_compound_hdr { #define SOF_DAI_FMT_INV_MASK 0x0f00 #define SOF_DAI_FMT_MASTER_MASK 0xf000 +/* types of DAI */ +enum sof_ipc_dai_type { + SOF_DAI_INTEL_NONE = 0, + SOF_DAI_INTEL_SSP, + SOF_DAI_INTEL_DMIC, + SOF_DAI_INTEL_HDA, +}; + /* SSP Configuration Request - SOF_IPC_DAI_SSP_CONFIG */ struct sof_ipc_dai_ssp_params { struct sof_ipc_hdr hdr; - uint32_t mclk; - uint32_t bclk; - uint32_t fclk; - uint16_t ssp_id; uint16_t mode; - uint16_t num_slots; - uint16_t frame_width; uint16_t clk_id; - uint16_t format; /* SOF_DAI_FMT_ */ - uint16_t mclk_master; } __attribute__((packed)); /* HDA Configuration Request - SOF_IPC_DAI_HDA_CONFIG */ struct sof_ipc_dai_hda_params { struct sof_ipc_hdr hdr; - uint32_t hda_id; - uint32_t mclk; /* TODO */ } __attribute__((packed)); /* DMIC Configuration Request - SOF_IPC_DAI_DMIC_CONFIG */ struct sof_ipc_dai_dmic_params { struct sof_ipc_hdr hdr; - uint32_t dmic_id; - uint32_t mclk; /* TODO */ } __attribute__((packed)); + +/* general purpose DAI configuration */ +struct sof_ipc_dai_config { + struct sof_ipc_hdr hdr; + enum sof_ipc_dai_type type; + uint32_t id; /* physical number if more than 1 of this type */ + + /* physical protocol and clocking */ + uint16_t format; /* SOF_DAI_FMT_ */ + uint16_t reserved; /* alignment */ + uint32_t mclk; /* mclk frequency in Hz */ + uint32_t bclk; /* bclk frequency in Hz */ + uint32_t fclk; /* cclk frequency in Hz */ + + /* TDM */ + uint32_t num_slots; + uint32_t rx_slot_mask; + uint32_t tx_slot_mask; + + /* data */ + uint16_t sample_valid_bits; + uint16_t sample_container_bits; + + /* MCLK */ + uint16_t mclk_always_run; + uint16_t mclk_master; + + /* HW specific data */ + union { + struct sof_ipc_dai_ssp_params ssp[0]; + struct sof_ipc_dai_hda_params hda[0]; + struct sof_ipc_dai_dmic_params dmic[0]; + }; +}; + /* * Stream configuration. */ @@ -325,9 +354,11 @@ struct sof_ipc_stream_params { enum sof_ipc_buffer_format buffer_fmt; uint32_t rate; uint32_t channels; - uint32_t sample_size; + uint32_t sample_valid_bytes; + uint32_t sample_container_bytes; /* for notifying host period has completed - 0 means no period IRQ */ uint32_t host_period_bytes; + enum sof_ipc_chmap chmap[SOF_IPC_MAX_CHANNELS]; /* channel map */ } __attribute__((packed)); /* PCM params info - SOF_IPC_STREAM_PCM_PARAMS */ @@ -454,25 +485,13 @@ struct sof_ipc_buffer { uint32_t size; /* buffer size in bytes */ } __attribute__((packed)); -/* types of DAI */ -enum sof_ipc_dai_type { - SOF_DAI_INTEL_NONE = 0, - SOF_DAI_INTEL_SSP, - SOF_DAI_INTEL_DMIC, - SOF_DAI_INTEL_HDA, -}; /* generic component config data */ struct sof_ipc_comp_config { - uint32_t format; /* data format */ - uint32_t frames; /* number of frames to process, 0 is variable */ - uint32_t channels; /* max number of channels */ - uint32_t frame_size; /* sample size in bytes */ uint32_t periods_sink; /* 0 means variable */ uint32_t periods_source; /* 0 means variable */ uint32_t preload_count; /* how many periods to preload */ enum sof_ipc_frame frame_fmt; - enum sof_ipc_chmap chmap[SOF_IPC_MAX_CHANNELS]; /* channel map */ } __attribute__((packed)); /* generic host component */ diff --git a/src/ipc/intel-ipc.c b/src/ipc/intel-ipc.c index 2d73fbb..81b30b5 100644 --- a/src/ipc/intel-ipc.c +++ b/src/ipc/intel-ipc.c @@ -400,39 +400,32 @@ static int ipc_glb_stream_message(uint32_t header) * DAI IPC Operations. */ -static int ipc_dai_ssp_config(uint32_t header) +static int ipc_dai_config(uint32_t header) { - struct sof_ipc_dai_ssp_params *ssp = _ipc->comp_data; - struct dai_config dai_config; + struct sof_ipc_dai_config *config = _ipc->comp_data; struct dai *dai; int ret; trace_ipc("DsF"); - /* TODO: set type in topology */ - dai_config.type = DAI_TYPE_INTEL_SSP; - dai_config.ssp = ssp; - - /* TODO: allow topology to define SSP clock type */ - dai_config.ssp->clk_id = SSP_CLK_EXT; - /* get DAI */ - dai = dai_get(SOF_DAI_INTEL_SSP, ssp->ssp_id); + dai = dai_get(config->type, config->id); if (dai == NULL) { trace_ipc_error("eDi"); - trace_value(ssp->ssp_id); + trace_value(config->type); + trace_value(config->id); return -ENODEV; } /* configure DAI */ - ret = dai_set_config(dai, &dai_config); + ret = dai_set_config(dai, config); if (ret < 0) { trace_ipc_error("eDC"); return ret; } - /* now send params to all components who use that DAI */ - return ipc_comp_dai_config(_ipc, &dai_config); + /* now send params to all DAI components who use that physical DAI */ + return ipc_comp_dai_config(_ipc, config); } static int ipc_glb_dai_message(uint32_t header) @@ -440,12 +433,10 @@ static int ipc_glb_dai_message(uint32_t header) uint32_t cmd = (header & SOF_CMD_TYPE_MASK) >> SOF_CMD_TYPE_SHIFT; switch (cmd) { - case iCS(SOF_IPC_COMP_SSP_CONFIG): - return ipc_dai_ssp_config(header); - case iCS(SOF_IPC_COMP_LOOPBACK): + case iCS(SOF_IPC_DAI_CONFIG): + return ipc_dai_config(header); + case iCS(SOF_IPC_DAI_LOOPBACK): //return ipc_comp_set_value(header, COMP_CMD_LOOPBACK); - case iCS(SOF_IPC_COMP_HDA_CONFIG): - case iCS(SOF_IPC_COMP_DMIC_CONFIG): default: trace_ipc_error("eDc"); trace_value(header); diff --git a/src/ipc/ipc.c b/src/ipc/ipc.c index 530fee9..323468b 100644 --- a/src/ipc/ipc.c +++ b/src/ipc/ipc.c @@ -307,7 +307,7 @@ void ipc_pipeline_complete(struct ipc *ipc, uint32_t comp_id) pipeline_complete(ipc_pipe->pipeline); } -int ipc_comp_dai_config(struct ipc *ipc, struct dai_config *config) +int ipc_comp_dai_config(struct ipc *ipc, struct sof_ipc_dai_config *config) { struct ipc_comp_dev *icd; struct list_item *clist; -- 2.11.0

1 5

[Sound-open-firmware] [PATCH] topology: Add sample bits to DAI_CONFIG
by Liam Girdwood 21 Aug '17

21 Aug '17

Add a token for number of bits in a sample for DAI configs Signed-off-by: Liam Girdwood <liam.r.girdwood(a)linux.intel.com> --- topology/m4/local.m4 | 29 +++++++++++++++++++++++++++-- topology/reef-apl-nocodec.m4 | 4 ++-- topology/reef-bdw-rt286.m4 | 4 ++-- topology/reef-bdw-rt5640.m4 | 4 ++-- topology/reef-bxt-nocodec.m4 | 4 ++-- topology/reef-byt-nocodec.m4 | 4 ++-- topology/reef-byt-rt5640.m4 | 4 ++-- topology/reef-byt-rt5651.m4 | 4 ++-- topology/reef-cht-nocodec.m4 | 4 ++-- topology/reef-hsw-rt5640.m4 | 4 ++-- topology/sof/tokens.m4 | 1 + 11 files changed, 46 insertions(+), 20 deletions(-) diff --git a/topology/m4/local.m4 b/topology/m4/local.m4 index a14f310..a559670 100644 --- a/topology/m4/local.m4 +++ b/topology/m4/local.m4 @@ -394,17 +394,38 @@ define(`DAI_TDM', ` rx_slots 'STR($4) ) -dnl DAI_CONFIG(type, idx, name, sname, format, mclk, bclk, fsync, tdm) +dnl Pipeline name) +define(`N_DAI_CONFIG', `DAICONFIG.'$1) + +dnl DAI_CONFIG(type, idx, name, sname, format, valid bits, mclk, bclk, fsync, tdm) define(`DAI_CONFIG', `SectionHWConfig."'$1$2`" {' `' ` id "'$2`"' ` format "'$5`"' `' -` '$6 ` '$7 ` '$8 ` '$9 +` '$10 +`}' +`SectionVendorTuples."'N_DAI_CONFIG($1$2)`_tuples_str" {' +` tokens "sof_dai_tokens"' +` tuples."string" {' +` SOF_TKN_DAI_TYPE' STR($1) +` }' +`}' +`SectionData."'N_DAI_CONFIG($1$2)`_data_str" {' +` tuples "'N_DAI_CONFIG($1$2)`_tuples_str"' +`}' +`SectionVendorTuples."'N_DAI_CONFIG($1$2)`_tuples" {' +` tokens "sof_dai_tokens"' +` tuples."word" {' +` SOF_TKN_DAI_SAMPLE_BITS' STR($6) +` }' +`}' +`SectionData."'N_DAI_CONFIG($1$2)`_data" {' +` tuples "'N_DAI_CONFIG($1$2)`_tuples"' `}' `' `SectionBE."'$3`" {' @@ -414,6 +435,10 @@ define(`DAI_CONFIG', ` hw_configs [' ` "'$1$2`"' ` ]' +` data [' +` "'N_DAI_CONFIG($1$2)`_data"' +` "'N_DAI_CONFIG($1$2)`_data_str"' +` ]' `}') dnl COMP_SAMPLE_SIZE(FMT) diff --git a/topology/reef-apl-nocodec.m4 b/topology/reef-apl-nocodec.m4 index 93febe0..93b57fe 100644 --- a/topology/reef-apl-nocodec.m4 +++ b/topology/reef-apl-nocodec.m4 @@ -82,8 +82,8 @@ DAI_ADD(sof/pipe-dai-capture.m4, SSP, 2, I2S, PIPELINE_SINK_2, 2) # # BE configurations - overrides config in ACPI if present # -DAI_CONFIG(SSP, 2, NoCodec, I2S, I2S, +DAI_CONFIG(SSP, 2, NoCodec, I2S, I2S, 24, DAI_CLOCK(mclk, 19200000, slave), DAI_CLOCK(bclk, 2400000, slave), DAI_CLOCK(fsync, 48000, slave), - DAI_TDM(2, 24, 3, 3)) + DAI_TDM(2, 25, 3, 3)) diff --git a/topology/reef-bdw-rt286.m4 b/topology/reef-bdw-rt286.m4 index 4135353..e4b600a 100644 --- a/topology/reef-bdw-rt286.m4 +++ b/topology/reef-bdw-rt286.m4 @@ -82,8 +82,8 @@ DAI_ADD(sof/pipe-dai-capture.m4, SSP, 0, I2S, PIPELINE_SINK_2, 2) # # BE configurations - overrides config in ACPI if present # -DAI_CONFIG(SSP, 0, Codec, I2S, I2S, +DAI_CONFIG(SSP, 0, Codec, I2S, I2S, 24, DAI_CLOCK(mclk, 24000000, slave), DAI_CLOCK(bclk, 2400000, slave), DAI_CLOCK(fsync, 48000, slave), - DAI_TDM(2, 24, 3, 3)) + DAI_TDM(2, 25, 3, 3)) diff --git a/topology/reef-bdw-rt5640.m4 b/topology/reef-bdw-rt5640.m4 index 540ac4c..5d96236 100644 --- a/topology/reef-bdw-rt5640.m4 +++ b/topology/reef-bdw-rt5640.m4 @@ -82,8 +82,8 @@ DAI_ADD(sof/pipe-dai-capture.m4, SSP, 0, I2S, PIPELINE_SINK_2, 2) # # BE configurations - overrides config in ACPI if present # -DAI_CONFIG(SSP, 0, Codec, I2S, I2S, +DAI_CONFIG(SSP, 0, Codec, I2S, I2S, 24, DAI_CLOCK(mclk, 24000000, slave), DAI_CLOCK(bclk, 2400000, slave), DAI_CLOCK(fsync, 48000, slave), - DAI_TDM(2, 24, 3, 3)) + DAI_TDM(2, 25, 3, 3)) diff --git a/topology/reef-bxt-nocodec.m4 b/topology/reef-bxt-nocodec.m4 index 564e78c..a8fd320 100644 --- a/topology/reef-bxt-nocodec.m4 +++ b/topology/reef-bxt-nocodec.m4 @@ -82,8 +82,8 @@ DAI_ADD(sof/pipe-dai-capture.m4, SSP, 2, I2S, PIPELINE_SINK_2, 2) # # BE configurations - overrides config in ACPI if present # -DAI_CONFIG(SSP, 2, NoCodec, I2S, I2S, +DAI_CONFIG(SSP, 2, NoCodec, I2S, I2S, 24, DAI_CLOCK(mclk, 19200000, slave), DAI_CLOCK(bclk, 2400000, slave), DAI_CLOCK(fsync, 48000, slave), - DAI_TDM(2, 24, 3, 3)) + DAI_TDM(2, 25, 3, 3)) diff --git a/topology/reef-byt-nocodec.m4 b/topology/reef-byt-nocodec.m4 index ab0cd8e..96e2e4b 100644 --- a/topology/reef-byt-nocodec.m4 +++ b/topology/reef-byt-nocodec.m4 @@ -82,8 +82,8 @@ DAI_ADD(sof/pipe-dai-capture.m4, SSP, 2, I2S, PIPELINE_SINK_2, 2) # # BE configurations - overrides config in ACPI if present # -DAI_CONFIG(SSP, 2, NoCodec, I2S, I2S, +DAI_CONFIG(SSP, 2, NoCodec, I2S, I2S, 24, DAI_CLOCK(mclk, 19200000, slave), DAI_CLOCK(bclk, 2400000, slave), DAI_CLOCK(fsync, 48000, slave), - DAI_TDM(2, 24, 3, 3)) + DAI_TDM(2, 25, 3, 3)) diff --git a/topology/reef-byt-rt5640.m4 b/topology/reef-byt-rt5640.m4 index 2cee093..c135fed 100644 --- a/topology/reef-byt-rt5640.m4 +++ b/topology/reef-byt-rt5640.m4 @@ -82,8 +82,8 @@ DAI_ADD(sof/pipe-dai-capture.m4, SSP, 2, I2S, PIPELINE_SINK_2, 2) # # BE configurations - overrides config in ACPI if present # -DAI_CONFIG(SSP, 2, Baytrail Audio, Audio, I2S, +DAI_CONFIG(SSP, 2, Baytrail Audio, Audio, I2S, 24, DAI_CLOCK(mclk, 19200000, slave), DAI_CLOCK(bclk, 2400000, slave), DAI_CLOCK(fsync, 48000, slave), - DAI_TDM(2, 24, 3, 3)) + DAI_TDM(2, 25, 3, 3)) diff --git a/topology/reef-byt-rt5651.m4 b/topology/reef-byt-rt5651.m4 index 4679343..877492a 100644 --- a/topology/reef-byt-rt5651.m4 +++ b/topology/reef-byt-rt5651.m4 @@ -82,8 +82,8 @@ DAI_ADD(sof/pipe-dai-capture.m4, SSP, 2, I2S, PIPELINE_SINK_2, 2) # # BE configurations - overrides config in ACPI if present # -DAI_CONFIG(SSP, 2, Baytrail Audio, Audio, I2S, +DAI_CONFIG(SSP, 2, Baytrail Audio, Audio, I2S, 24, DAI_CLOCK(mclk, 19200000, slave), DAI_CLOCK(bclk, 2400000, slave), DAI_CLOCK(fsync, 48000, slave), - DAI_TDM(2, 24, 3, 3)) + DAI_TDM(2, 25, 3, 3)) diff --git a/topology/reef-cht-nocodec.m4 b/topology/reef-cht-nocodec.m4 index f754551..381ff12 100644 --- a/topology/reef-cht-nocodec.m4 +++ b/topology/reef-cht-nocodec.m4 @@ -82,8 +82,8 @@ DAI_ADD(sof/pipe-dai-capture.m4, SSP, 2, I2S, PIPELINE_SINK_2, 2) # # BE configurations - overrides config in ACPI if present # -DAI_CONFIG(SSP, 2, NoCodec, I2S, I2S, +DAI_CONFIG(SSP, 2, NoCodec, I2S, I2S, 24, DAI_CLOCK(mclk, 19200000, slave), DAI_CLOCK(bclk, 2400000, slave), DAI_CLOCK(fsync, 48000, slave), - DAI_TDM(2, 24, 3, 3)) + DAI_TDM(2, 25, 3, 3)) diff --git a/topology/reef-hsw-rt5640.m4 b/topology/reef-hsw-rt5640.m4 index cbbbfbe..3a76223 100644 --- a/topology/reef-hsw-rt5640.m4 +++ b/topology/reef-hsw-rt5640.m4 @@ -82,8 +82,8 @@ DAI_ADD(sof/pipe-dai-capture.m4, SSP, 0, I2S, PIPELINE_SINK_2, 2) # # BE configurations - overrides config in ACPI if present # -DAI_CONFIG(SSP, 0, Codec, I2S, I2S, +DAI_CONFIG(SSP, 0, Codec, I2S, I2S, 24, DAI_CLOCK(mclk, 24000000, slave), DAI_CLOCK(bclk, 2400000, slave), DAI_CLOCK(fsync, 48000, slave), - DAI_TDM(2, 24, 3, 3)) + DAI_TDM(2, 25, 3, 3)) diff --git a/topology/sof/tokens.m4 b/topology/sof/tokens.m4 index 3902c36..530220a 100644 --- a/topology/sof/tokens.m4 +++ b/topology/sof/tokens.m4 @@ -19,6 +19,7 @@ SectionVendorTokens."sof_dai_tokens" { SOF_TKN_DAI_DMAC_CONFIG "153" SOF_TKN_DAI_TYPE "154" SOF_TKN_DAI_INDEX "155" + SOF_TKN_DAI_SAMPLE_BITS "156" } SectionVendorTokens."sof_sched_tokens" { -- 2.11.0

1 2

[Sound-open-firmware] [PATCH] topology: pipelines: give more headroom for buffer size refinement
by Liam Girdwood 16 Aug '17

16 Aug '17

Give the ALSA HW refinement code more headroom for buffer calculations to provide more buffering options. Signed-off-by: Liam Girdwood <liam.r.girdwood(a)linux.intel.com> --- topology/sof/pipe-low-latency-capture.m4 | 2 +- topology/sof/pipe-low-latency-playback.m4 | 4 ++-- topology/sof/pipe-passthrough-playback.m4 | 4 ++-- topology/sof/pipe-pcm-media.m4 | 2 +- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/topology/sof/pipe-low-latency-capture.m4 b/topology/sof/pipe-low-latency-capture.m4 index ca9fe9c..3b53d0a 100644 --- a/topology/sof/pipe-low-latency-capture.m4 +++ b/topology/sof/pipe-low-latency-capture.m4 @@ -98,7 +98,7 @@ SectionPCMCapabilities.STR(Low Latency Capture PCM_ID) { periods_max "4" period_size_min "192" period_size_max "16384" - buffer_size_min "384" + buffer_size_min "65536" buffer_size_max "65536" } diff --git a/topology/sof/pipe-low-latency-playback.m4 b/topology/sof/pipe-low-latency-playback.m4 index a8e3fa5..00f7447 100644 --- a/topology/sof/pipe-low-latency-playback.m4 +++ b/topology/sof/pipe-low-latency-playback.m4 @@ -161,10 +161,10 @@ SectionPCMCapabilities.STR(Low Latency Playback PCM_ID) { channels_min "2" channels_max "2" periods_min "2" - periods_max "4" + periods_max "16" period_size_min "192" period_size_max "16384" - buffer_size_min "384" + buffer_size_min "65536" buffer_size_max "65536" } diff --git a/topology/sof/pipe-passthrough-playback.m4 b/topology/sof/pipe-passthrough-playback.m4 index 1fc76c7..98b479f 100644 --- a/topology/sof/pipe-passthrough-playback.m4 +++ b/topology/sof/pipe-passthrough-playback.m4 @@ -58,10 +58,10 @@ SectionPCMCapabilities.STR(Passthrough Playback PCM_ID) { channels_min "2" channels_max "4" periods_min "2" - periods_max "4" + periods_max "16" period_size_min "192" period_size_max "16384" - buffer_size_min "384" + buffer_size_min "65536" buffer_size_max "65536" } diff --git a/topology/sof/pipe-pcm-media.m4 b/topology/sof/pipe-pcm-media.m4 index ac2aaa7..fd6db04 100644 --- a/topology/sof/pipe-pcm-media.m4 +++ b/topology/sof/pipe-pcm-media.m4 @@ -129,7 +129,7 @@ SectionPCMCapabilities.STR(Media Playback PCM_ID) { periods_max "32" period_size_min "4096" period_size_max "262144" - buffer_size_min "8192" + buffer_size_min "8388608" buffer_size_max "8388608" } -- 1.9.1

1 1