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

[Sound-open-firmware] [PATCH] scripts: xtensa-build: fix ROOT var alais for BXT/APL gcc
by Xiuli Pan 22 Jun '18

22 Jun '18

From: Pan Xiuli <xiuli.pan(a)linux.intel.com> Need to change ROOT as well as HOST target. Signed-off-by: Pan Xiuli <xiuli.pan(a)linux.intel.com> --- scripts/xtensa-build-all.sh | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/scripts/xtensa-build-all.sh b/scripts/xtensa-build-all.sh index 9a0f3e4..abf4e87 100755 --- a/scripts/xtensa-build-all.sh +++ b/scripts/xtensa-build-all.sh @@ -95,7 +95,6 @@ do then PLATFORM="apollolake" XTENSA_CORE="X4H3I16w2D48w3a_2017_8" - ROOT="$pwd/../xtensa-root/xtensa-bxt-elf" # test APL compiler aliases and ignore set -e here type xtensa-bxt-elf-gcc > /dev/null 2>&1 && true @@ -105,6 +104,8 @@ do else HOST="xtensa-apl-elf" fi + + ROOT="$pwd/../xtensa-root/$HOST" XTENSA_TOOLS_VERSION="RG-2017.8-linux" fi if [ $j == "cnl" ] -- 2.7.4

2 1

[Sound-open-firmware] [PATCH 0/3] Add MCLK ID to SSP config
by Ranjani Sridharan 21 Jun '18

21 Jun '18

Some platforms expose more than one MCLK's. Add a MCLK_ID token to use in such cases. Please note that there arent any examples of MCLK ID other than 0 in any of the test topologies yet. But future platforms might have the need for it. Ranjani Sridharan (3): topology: add new token for SSP MCLK ID topology: modify ssp config definition to add the tuple for mclk id topology: replace SSP_SAMPLE_BITS() users with SSP_CONFIG_DATA() topology/m4/dai.m4 | 23 ++++++++++++++++++++--- topology/sof-apl-nocodec.m4 | 2 +- topology/sof-apl-tdf8532.m4 | 12 ++++++------ topology/sof-bdw-rt286.m4 | 2 +- topology/sof-bdw-rt5640.m4 | 2 +- topology/sof-byt-da7213.m4 | 2 +- topology/sof-byt-nocodec.m4 | 2 +- topology/sof-byt-rt5640.m4 | 2 +- topology/sof-byt-rt5645.m4 | 2 +- topology/sof-byt-rt5651.m4 | 2 +- topology/sof-cht-max98090.m4 | 2 +- topology/sof-cht-nocodec.m4 | 2 +- topology/sof-cnl-rt274.m4 | 2 +- topology/sof-hsw-rt5640.m4 | 2 +- topology/sof/tokens.m4 | 1 + topology/test/test-all.m4 | 2 +- topology/test/test-capture.m4 | 2 +- topology/test/test-playback.m4 | 2 +- topology/test/test-tone-playback.m4 | 2 +- 19 files changed, 43 insertions(+), 25 deletions(-) -- 2.17.1

3 6

[Sound-open-firmware] [PATCH 1/5] dai: add lbm status for dai ssp
by Xiuli Pan 21 Jun '18

21 Jun '18

From: Pan Xiuli <xiuli.pan(a)linux.intel.com> Add a status to track dai ssp lbm. Signed-off-by: Pan Xiuli <xiuli.pan(a)linux.intel.com> --- Work with patch set: SOF-Kernel(6): ASoC: SOF: Add debug_mode flag in sof dev ASoC: SOF: debug: add debugmode debugfs for sof_dev debug_mode ASoC: SOF: uapi: topology: Add SOF_TKN_DAI_SSP_LBM for ssp loopback mode ASoC: SOF: add headers for lbm control callback functions ASoC: SOF: add lbm kcontrol callback functions ASoC: SOF: topology: Add topology handler for dai ssp loopback mode SOF(5): dai: add lbm status for dai ssp dai: add get_loopback_mode function DMIC: add empty get_loopback_mode function SSP: support for get/set_loopback_mode functions dai: add dai_cmd support for loopback mode switch SOF-Tools(3): topology: Add SOF_TKN_DAI_SSP_LBM for ssp loopback mode topology: m4: Add DAI_OUT_SSP_LOOPBACK marco for SSP LOOPBACK dai comp topology: test: Add loopback topology test & santity test with: Mininow max rt5651 and UP2 Hifiberry PRO and CNL nocodec SOF master: 48d2a1c551d7b3c8f76d44f3c04dd59a37ff6a8f SOF-Tool master: bd7dc88231f31d385340310cef467f211a739eeb https://github.com/plbossart/sound/tree/topic/sof-v4.14: 0d51a5ed28c5e97f09b59c4cafaddfb9d3b24b77 --- src/include/sof/ssp.h | 1 + 1 file changed, 1 insertion(+) diff --git a/src/include/sof/ssp.h b/src/include/sof/ssp.h index fdcfcac..92db71f 100644 --- a/src/include/sof/ssp.h +++ b/src/include/sof/ssp.h @@ -231,6 +231,7 @@ struct ssp_pdata { uint32_t psp; spinlock_t lock; uint32_t state[2]; /* SSP_STATE_ for each direction */ + uint32_t lbm; completion_t drain_complete; struct sof_ipc_dai_config config; struct sof_ipc_dai_ssp_params params; -- 2.7.4

5 18

[Sound-open-firmware] [PATCH v2 1/2] platform: add trace code for debug
by Wu Zhigang 21 Jun '18

21 Jun '18

add the trace code for easy to debug the case: when the xrun happen in capture/playback working at the same time. we could confirm the xrun's direction easily. Signed-off-by: Wu Zhigang <zhigang.wu(a)linux.intel.com> --- test with: apl-gpmrb with tdf8532 codec linux topic/sof-dev: 0d51a5ed28c5 sof master: 48d2a1c551d7 soft master: 2cc3ad2a9287 pass the regression test: Minnowboard Turbo UP^2 CNL-RVP --- src/audio/src.c | 4 ++++ src/audio/volume.c | 4 ++++ 2 files changed, 8 insertions(+) diff --git a/src/audio/src.c b/src/audio/src.c index c19828a..3566976 100644 --- a/src/audio/src.c +++ b/src/audio/src.c @@ -800,10 +800,14 @@ static int src_copy(struct comp_dev *dev) */ if (source->avail < need_source) { trace_src_error("xru"); + trace_error_value(source->source->comp.id); + trace_error_value(sink->sink->comp.id); return -EIO; /* xrun */ } if (sink->free < need_sink) { trace_src_error("xro"); + trace_error_value(source->source->comp.id); + trace_error_value(sink->sink->comp.id); return -EIO; /* xrun */ } diff --git a/src/audio/volume.c b/src/audio/volume.c index 9e2968d..64c5d39 100644 --- a/src/audio/volume.c +++ b/src/audio/volume.c @@ -356,11 +356,15 @@ static int volume_copy(struct comp_dev *dev) */ if (source->avail < cd->source_period_bytes) { trace_volume_error("xru"); + trace_error_value(source->source->comp.id); + trace_error_value(sink->sink->comp.id); comp_underrun(dev, source, cd->source_period_bytes, 0); return -EIO; /* xrun */ } if (sink->free < cd->sink_period_bytes) { trace_volume_error("xro"); + trace_error_value(source->source->comp.id); + trace_error_value(sink->sink->comp.id); comp_overrun(dev, sink, cd->sink_period_bytes, 0); return -EIO; /* xrun */ } -- 2.17.1

2 2

[Sound-open-firmware] [PATCH v3 1/2] volume: support 8-channel feature
by Wu Zhigang 21 Jun '18

21 Jun '18

add the 8-channel feature for the capture function for apl-gpmrb platform. Signed-off-by: Wu Zhigang <zhigang.wu(a)linux.intel.com> Reviewed-by: Keyon Jie <yang.jie(a)linux.intel.com> --- test with: apl-gpmrb with tdf8532 codec linux topic/sof-dev: 0d51a5ed28c5 sof master: 48d2a1c551d7 soft master: 2cc3ad2a9287 pass the regression test: Minnowboard Turbo UP^2 CNL-RVP --- src/audio/volume_generic.c | 367 +++++++++++++++++++++++++++++++++++++ 1 file changed, 367 insertions(+) diff --git a/src/audio/volume_generic.c b/src/audio/volume_generic.c index 200cf12..d07fd30 100644 --- a/src/audio/volume_generic.c +++ b/src/audio/volume_generic.c @@ -220,6 +220,7 @@ static void vol_s24_to_s24_2ch(struct comp_dev *dev, struct comp_buffer *sink, } } +#if PLATFORM_MAX_CHANNELS >= 4 /* volume scaling functions for 4-channel input */ /* copy and scale volume from 16 bit source buffer to 32 bit dest buffer */ @@ -465,6 +466,359 @@ static void vol_s24_to_s24_4ch(struct comp_dev *dev, struct comp_buffer *sink, Q_SHIFT_BITS_64(23, 16, 23)); } } +#endif + +#if PLATFORM_MAX_CHANNELS >= 8 +/* volume scaling functions for 8-channel input */ + +/* copy and scale volume from 16 bit source buffer to 32 bit dest buffer */ +static void vol_s16_to_s32_8ch(struct comp_dev *dev, struct comp_buffer *sink, + struct comp_buffer *source) +{ + struct comp_data *cd = comp_get_drvdata(dev); + int16_t *src = (int16_t *)source->r_ptr; + int32_t *dest = (int32_t *)sink->w_ptr; + int32_t i; + + /* buffer sizes are always divisible by period frames */ + /* Samples are Q1.15 --> Q1.31 and volume is Q1.16 */ + for (i = 0; i < dev->frames * 8; i += 8) { + dest[i] = (int32_t)src[i] * cd->volume[0]; + dest[i + 1] = (int32_t)src[i + 1] * cd->volume[1]; + dest[i + 2] = (int32_t)src[i + 2] * cd->volume[2]; + dest[i + 3] = (int32_t)src[i + 3] * cd->volume[3]; + dest[i + 4] = (int32_t)src[i + 4] * cd->volume[4]; + dest[i + 5] = (int32_t)src[i + 5] * cd->volume[5]; + dest[i + 6] = (int32_t)src[i + 6] * cd->volume[6]; + dest[i + 7] = (int32_t)src[i + 7] * cd->volume[7]; + } +} + +/* copy and scale volume from 32 bit source buffer to 16 bit dest buffer */ +static void vol_s32_to_s16_8ch(struct comp_dev *dev, struct comp_buffer *sink, + struct comp_buffer *source) +{ + struct comp_data *cd = comp_get_drvdata(dev); + int32_t *src = (int32_t *)source->r_ptr; + int16_t *dest = (int16_t *)sink->w_ptr; + int32_t i; + + /* buffer sizes are always divisible by period frames */ + /* Samples are Q1.31 --> Q1.15 and volume is Q1.16 */ + for (i = 0; i < dev->frames * 8; i += 8) { + dest[i] = (int16_t)q_multsr_sat_32x32(src[i], cd->volume[0], + Q_SHIFT_BITS_64(31, 16, + 15)); + dest[i + 1] = (int16_t)q_multsr_sat_32x32(src[i + 1], + cd->volume[1], + Q_SHIFT_BITS_64(31, + 16, + 15)); + dest[i + 2] = (int16_t)q_multsr_sat_32x32(src[i + 2], + cd->volume[2], + Q_SHIFT_BITS_64(31, + 16, + 15)); + dest[i + 3] = (int16_t)q_multsr_sat_32x32(src[i + 3], + cd->volume[3], + Q_SHIFT_BITS_64(31, + 16, + 15)); + dest[i + 4] = (int16_t)q_multsr_sat_32x32(src[i + 4], + cd->volume[4], + Q_SHIFT_BITS_64(31, + 16, + 15)); + dest[i + 5] = (int16_t)q_multsr_sat_32x32(src[i + 5], + cd->volume[5], + Q_SHIFT_BITS_64(31, + 16, + 15)); + dest[i + 6] = (int16_t)q_multsr_sat_32x32(src[i + 6], + cd->volume[6], + Q_SHIFT_BITS_64(31, + 16, + 15)); + dest[i + 7] = (int16_t)q_multsr_sat_32x32(src[i + 7], + cd->volume[7], + Q_SHIFT_BITS_64(31, + 16, + 15)); + } +} + +/* copy and scale volume from 32 bit source buffer to 32 bit dest buffer */ +static void vol_s32_to_s32_8ch(struct comp_dev *dev, struct comp_buffer *sink, + struct comp_buffer *source) +{ + struct comp_data *cd = comp_get_drvdata(dev); + int32_t *src = (int32_t *)source->r_ptr; + int32_t *dest = (int32_t *)sink->w_ptr; + int32_t i; + + /* buffer sizes are always divisible by period frames */ + /* Samples are Q1.31 --> Q1.31 and volume is Q1.16 */ + for (i = 0; i < dev->frames * 8; i += 8) { + dest[i] = q_multsr_sat_32x32(src[i], cd->volume[0], + Q_SHIFT_BITS_64(31, 16, 31)); + dest[i + 1] = q_multsr_sat_32x32(src[i + 1], cd->volume[1], + Q_SHIFT_BITS_64(31, 16, 31)); + dest[i + 2] = q_multsr_sat_32x32(src[i + 2], cd->volume[2], + Q_SHIFT_BITS_64(31, 16, 31)); + dest[i + 3] = q_multsr_sat_32x32(src[i + 3], cd->volume[3], + Q_SHIFT_BITS_64(31, 16, 31)); + dest[i + 4] = q_multsr_sat_32x32(src[i + 4], cd->volume[4], + Q_SHIFT_BITS_64(31, 16, 31)); + dest[i + 5] = q_multsr_sat_32x32(src[i + 5], cd->volume[5], + Q_SHIFT_BITS_64(31, 16, 31)); + dest[i + 6] = q_multsr_sat_32x32(src[i + 6], cd->volume[6], + Q_SHIFT_BITS_64(31, 16, 31)); + dest[i + 7] = q_multsr_sat_32x32(src[i + 7], cd->volume[7], + Q_SHIFT_BITS_64(31, 16, 31)); + } +} + +/* copy and scale volume from 16 bit source buffer to 16 bit dest buffer */ +static void vol_s16_to_s16_8ch(struct comp_dev *dev, struct comp_buffer *sink, + struct comp_buffer *source) +{ + struct comp_data *cd = comp_get_drvdata(dev); + int16_t *src = (int16_t *)source->r_ptr; + int16_t *dest = (int16_t *)sink->w_ptr; + int32_t i; + + /* buffer sizes are always divisible by period frames */ + /* Samples are Q1.15 --> Q1.15 and volume is Q1.16 */ + for (i = 0; i < dev->frames * 8; i += 8) { + dest[i] = q_multsr_sat_16x16(src[i], cd->volume[0], + Q_SHIFT_BITS_32(15, 16, 15)); + dest[i + 1] = q_multsr_sat_16x16(src[i + 1], cd->volume[1], + Q_SHIFT_BITS_32(15, 16, 15)); + dest[i + 2] = q_multsr_sat_16x16(src[i + 2], cd->volume[2], + Q_SHIFT_BITS_32(15, 16, 15)); + dest[i + 3] = q_multsr_sat_16x16(src[i + 3], cd->volume[3], + Q_SHIFT_BITS_32(15, 16, 15)); + dest[i + 4] = q_multsr_sat_16x16(src[i + 4], cd->volume[4], + Q_SHIFT_BITS_32(15, 16, 15)); + dest[i + 5] = q_multsr_sat_16x16(src[i + 5], cd->volume[5], + Q_SHIFT_BITS_32(15, 16, 15)); + dest[i + 6] = q_multsr_sat_16x16(src[i + 6], cd->volume[6], + Q_SHIFT_BITS_32(15, 16, 15)); + dest[i + 7] = q_multsr_sat_16x16(src[i + 7], cd->volume[7], + Q_SHIFT_BITS_32(15, 16, 15)); + } +} + +/* copy and scale volume from 16 bit source buffer to 24 bit + * on 32 bit boundary buffer + */ +static void vol_s16_to_s24_8ch(struct comp_dev *dev, struct comp_buffer *sink, + struct comp_buffer *source) +{ + struct comp_data *cd = comp_get_drvdata(dev); + int16_t *src = (int16_t *)source->r_ptr; + int32_t *dest = (int32_t *)sink->w_ptr; + int32_t i; + + /* buffer sizes are always divisible by period frames */ + /* Samples are Q1.15 and volume is Q1.16 */ + for (i = 0; i < dev->frames * 8; i += 8) { + dest[i] = q_multsr_sat_32x32(src[i], cd->volume[0], + Q_SHIFT_BITS_64(15, 16, 23)); + dest[i + 1] = q_multsr_sat_32x32(src[i + 1], cd->volume[1], + Q_SHIFT_BITS_64(15, 16, 23)); + dest[i + 2] = q_multsr_sat_32x32(src[i + 2], cd->volume[2], + Q_SHIFT_BITS_64(15, 16, 23)); + dest[i + 3] = q_multsr_sat_32x32(src[i + 3], cd->volume[3], + Q_SHIFT_BITS_64(15, 16, 23)); + dest[i + 4] = q_multsr_sat_32x32(src[i + 4], cd->volume[4], + Q_SHIFT_BITS_64(15, 16, 23)); + dest[i + 5] = q_multsr_sat_32x32(src[i + 5], cd->volume[5], + Q_SHIFT_BITS_64(15, 16, 23)); + dest[i + 6] = q_multsr_sat_32x32(src[i + 6], cd->volume[6], + Q_SHIFT_BITS_64(15, 16, 23)); + dest[i + 7] = q_multsr_sat_32x32(src[i + 7], cd->volume[7], + Q_SHIFT_BITS_64(15, 16, 23)); + } +} + +/* copy and scale volume from 16 bit source buffer to 24 bit + * on 32 bit boundary dest buffer + */ +static void vol_s24_to_s16_8ch(struct comp_dev *dev, struct comp_buffer *sink, + struct comp_buffer *source) +{ + struct comp_data *cd = comp_get_drvdata(dev); + int32_t *src = (int32_t *)source->r_ptr; + int16_t *dest = (int16_t *)sink->w_ptr; + int32_t i, sample; + + /* buffer sizes are always divisible by period frames */ + /* Samples are Q1.23 --> Q1.15 and volume is Q1.16 */ + for (i = 0; i < dev->frames * 8; i += 8) { + sample = sign_extend_s24(src[i]); + dest[i] = (int16_t)q_multsr_sat_32x32(sample, cd->volume[0], + Q_SHIFT_BITS_64(23, 16, + 15)); + sample = sign_extend_s24(src[i + 1]); + dest[i + 1] = (int16_t)q_multsr_sat_32x32(sample, + cd->volume[1], + Q_SHIFT_BITS_64(23, + 16, + 15)); + sample = sign_extend_s24(src[i + 2]); + dest[i + 2] = (int16_t)q_multsr_sat_32x32(sample, + cd->volume[2], + Q_SHIFT_BITS_64(23, + 16, + 15)); + sample = sign_extend_s24(src[i + 3]); + dest[i + 3] = (int16_t)q_multsr_sat_32x32(sample, + cd->volume[3], + Q_SHIFT_BITS_64(23, + 16, + 15)); + sample = sign_extend_s24(src[i + 4]); + dest[i + 4] = (int16_t)q_multsr_sat_32x32(sample, + cd->volume[4], + Q_SHIFT_BITS_64(23, + 16, + 15)); + sample = sign_extend_s24(src[i + 5]); + dest[i + 5] = (int16_t)q_multsr_sat_32x32(sample, + cd->volume[5], + Q_SHIFT_BITS_64(23, + 16, + 15)); + sample = sign_extend_s24(src[i + 6]); + dest[i + 6] = (int16_t)q_multsr_sat_32x32(sample, + cd->volume[6], + Q_SHIFT_BITS_64(23, + 16, + 15)); + sample = sign_extend_s24(src[i + 7]); + dest[i + 7] = (int16_t)q_multsr_sat_32x32(sample, + cd->volume[7], + Q_SHIFT_BITS_64(23, + 16, + 15)); + } +} + +/* copy and scale volume from 32 bit source buffer to 24 bit + * on 32 bit boundary dest buffer + */ +static void vol_s32_to_s24_8ch(struct comp_dev *dev, struct comp_buffer *sink, + struct comp_buffer *source) +{ + struct comp_data *cd = comp_get_drvdata(dev); + int32_t *src = (int32_t *)source->r_ptr; + int32_t *dest = (int32_t *)sink->w_ptr; + int32_t i; + + /* buffer sizes are always divisible by period frames */ + /* Samples are Q1.31 --> Q1.23 and volume is Q1.16 */ + for (i = 0; i < dev->frames * 8; i += 8) { + dest[i] = q_multsr_sat_32x32(src[i], cd->volume[0], + Q_SHIFT_BITS_64(31, 16, 23)); + dest[i + 1] = q_multsr_sat_32x32(src[i + 1], cd->volume[1], + Q_SHIFT_BITS_64(31, 16, 23)); + dest[i + 2] = q_multsr_sat_32x32(src[i + 2], cd->volume[2], + Q_SHIFT_BITS_64(31, 16, 23)); + dest[i + 3] = q_multsr_sat_32x32(src[i + 3], cd->volume[3], + Q_SHIFT_BITS_64(31, 16, 23)); + dest[i + 4] = q_multsr_sat_32x32(src[i + 4], cd->volume[4], + Q_SHIFT_BITS_64(31, 16, 23)); + dest[i + 5] = q_multsr_sat_32x32(src[i + 5], cd->volume[5], + Q_SHIFT_BITS_64(31, 16, 23)); + dest[i + 6] = q_multsr_sat_32x32(src[i + 6], cd->volume[6], + Q_SHIFT_BITS_64(31, 16, 23)); + dest[i + 7] = q_multsr_sat_32x32(src[i + 7], cd->volume[7], + Q_SHIFT_BITS_64(31, 16, 23)); + } +} + +/* copy and scale volume from 16 bit source buffer to 24 bit + * on 32 bit boundary dest buffer + */ +static void vol_s24_to_s32_8ch(struct comp_dev *dev, struct comp_buffer *sink, + struct comp_buffer *source) +{ + struct comp_data *cd = comp_get_drvdata(dev); + int32_t *src = (int32_t *)source->r_ptr; + int32_t *dest = (int32_t *)sink->w_ptr; + int32_t i; + + /* buffer sizes are always divisible by period frames */ + /* Samples are Q1.23 --> Q1.31 and volume is Q1.16 */ + for (i = 0; i < dev->frames * 8; i += 8) { + dest[i] = q_multsr_sat_32x32(sign_extend_s24(src[i]), + cd->volume[0], + Q_SHIFT_BITS_64(23, 16, 31)); + dest[i + 1] = q_multsr_sat_32x32(sign_extend_s24(src[i + 1]), + cd->volume[1], + Q_SHIFT_BITS_64(23, 16, 31)); + dest[i + 2] = q_multsr_sat_32x32(sign_extend_s24(src[i + 2]), + cd->volume[2], + Q_SHIFT_BITS_64(23, 16, 31)); + dest[i + 3] = q_multsr_sat_32x32(sign_extend_s24(src[i + 3]), + cd->volume[3], + Q_SHIFT_BITS_64(23, 16, 31)); + dest[i + 4] = q_multsr_sat_32x32(sign_extend_s24(src[i + 4]), + cd->volume[4], + Q_SHIFT_BITS_64(23, 16, 31)); + dest[i + 5] = q_multsr_sat_32x32(sign_extend_s24(src[i + 5]), + cd->volume[5], + Q_SHIFT_BITS_64(23, 16, 31)); + dest[i + 6] = q_multsr_sat_32x32(sign_extend_s24(src[i + 6]), + cd->volume[6], + Q_SHIFT_BITS_64(23, 16, 31)); + dest[i + 7] = q_multsr_sat_32x32(sign_extend_s24(src[i + 7]), + cd->volume[7], + Q_SHIFT_BITS_64(23, 16, 31)); + } +} + +/* Copy and scale volume from 24 bit source buffer to 24 bit on 32 bit boundary + * dest buffer. + */ +static void vol_s24_to_s24_8ch(struct comp_dev *dev, struct comp_buffer *sink, + struct comp_buffer *source) +{ + struct comp_data *cd = comp_get_drvdata(dev); + int32_t i, *src = (int32_t *)source->r_ptr; + int32_t *dest = (int32_t *)sink->w_ptr; + + /* buffer sizes are always divisible by period frames */ + /* Samples are Q1.23 --> Q1.23 and volume is Q1.16 */ + for (i = 0; i < dev->frames * 8; i += 8) { + dest[i] = q_multsr_sat_32x32(sign_extend_s24(src[i]), + cd->volume[0], + Q_SHIFT_BITS_64(23, 16, 23)); + dest[i + 1] = q_multsr_sat_32x32(sign_extend_s24(src[i + 1]), + cd->volume[1], + Q_SHIFT_BITS_64(23, 16, 23)); + dest[i + 2] = q_multsr_sat_32x32(sign_extend_s24(src[i + 2]), + cd->volume[2], + Q_SHIFT_BITS_64(23, 16, 23)); + dest[i + 3] = q_multsr_sat_32x32(sign_extend_s24(src[i + 3]), + cd->volume[3], + Q_SHIFT_BITS_64(23, 16, 23)); + dest[i + 4] = q_multsr_sat_32x32(sign_extend_s24(src[i + 4]), + cd->volume[4], + Q_SHIFT_BITS_64(23, 16, 23)); + dest[i + 5] = q_multsr_sat_32x32(sign_extend_s24(src[i + 5]), + cd->volume[5], + Q_SHIFT_BITS_64(23, 16, 23)); + dest[i + 6] = q_multsr_sat_32x32(sign_extend_s24(src[i + 6]), + cd->volume[6], + Q_SHIFT_BITS_64(23, 16, 23)); + dest[i + 7] = q_multsr_sat_32x32(sign_extend_s24(src[i + 7]), + cd->volume[7], + Q_SHIFT_BITS_64(23, 16, 23)); + } +} +#endif const struct comp_func_map func_map[] = { {SOF_IPC_FRAME_S16_LE, SOF_IPC_FRAME_S16_LE, 2, vol_s16_to_s16_2ch}, @@ -476,6 +830,7 @@ const struct comp_func_map func_map[] = { {SOF_IPC_FRAME_S32_LE, SOF_IPC_FRAME_S24_4LE, 2, vol_s32_to_s24_2ch}, {SOF_IPC_FRAME_S24_4LE, SOF_IPC_FRAME_S32_LE, 2, vol_s24_to_s32_2ch}, {SOF_IPC_FRAME_S24_4LE, SOF_IPC_FRAME_S24_4LE, 2, vol_s24_to_s24_2ch}, +#if PLATFORM_MAX_CHANNELS >= 4 {SOF_IPC_FRAME_S16_LE, SOF_IPC_FRAME_S16_LE, 4, vol_s16_to_s16_4ch}, {SOF_IPC_FRAME_S16_LE, SOF_IPC_FRAME_S32_LE, 4, vol_s16_to_s32_4ch}, {SOF_IPC_FRAME_S32_LE, SOF_IPC_FRAME_S16_LE, 4, vol_s32_to_s16_4ch}, @@ -485,6 +840,18 @@ const struct comp_func_map func_map[] = { {SOF_IPC_FRAME_S32_LE, SOF_IPC_FRAME_S24_4LE, 4, vol_s32_to_s24_4ch}, {SOF_IPC_FRAME_S24_4LE, SOF_IPC_FRAME_S32_LE, 4, vol_s24_to_s32_4ch}, {SOF_IPC_FRAME_S24_4LE, SOF_IPC_FRAME_S24_4LE, 4, vol_s24_to_s24_4ch}, +#endif +#if PLATFORM_MAX_CHANNELS >= 8 + {SOF_IPC_FRAME_S16_LE, SOF_IPC_FRAME_S16_LE, 8, vol_s16_to_s16_8ch}, + {SOF_IPC_FRAME_S16_LE, SOF_IPC_FRAME_S32_LE, 8, vol_s16_to_s32_8ch}, + {SOF_IPC_FRAME_S32_LE, SOF_IPC_FRAME_S16_LE, 8, vol_s32_to_s16_8ch}, + {SOF_IPC_FRAME_S32_LE, SOF_IPC_FRAME_S32_LE, 8, vol_s32_to_s32_8ch}, + {SOF_IPC_FRAME_S16_LE, SOF_IPC_FRAME_S24_4LE, 8, vol_s16_to_s24_8ch}, + {SOF_IPC_FRAME_S24_4LE, SOF_IPC_FRAME_S16_LE, 8, vol_s24_to_s16_8ch}, + {SOF_IPC_FRAME_S32_LE, SOF_IPC_FRAME_S24_4LE, 8, vol_s32_to_s24_8ch}, + {SOF_IPC_FRAME_S24_4LE, SOF_IPC_FRAME_S32_LE, 8, vol_s24_to_s32_8ch}, + {SOF_IPC_FRAME_S24_4LE, SOF_IPC_FRAME_S24_4LE, 8, vol_s24_to_s24_8ch}, +#endif }; scale_vol vol_get_processing_function(struct comp_dev *dev) -- 2.17.1

4 5

[Sound-open-firmware] [PATCH] DMIC: Set DAI parameters from topology parameters instead of hardwired
by Seppo Ingalsuo 21 Jun '18

21 Jun '18

This patch enables the 1, 2, and 4ch topologies usage with S32_LE and S16_LE sample formats. The DMA burst length is also changed to maximum (8) to fully utilize the DMIC FIFO. Signed-off-by: Seppo Ingalsuo <seppo.ingalsuo(a)linux.intel.com> --- src/audio/dai.c | 36 +++++++++++++++++++++++++++++++++--- src/drivers/dmic.c | 2 +- 2 files changed, 34 insertions(+), 4 deletions(-) diff --git a/src/audio/dai.c b/src/audio/dai.c index 21a3b80..7cef5a7 100644 --- a/src/audio/dai.c +++ b/src/audio/dai.c @@ -645,9 +645,39 @@ static int dai_config(struct comp_dev *dev, struct sof_ipc_dai_config *config) } break; case SOF_DAI_INTEL_DMIC: - /* TODO: No hardwired values here. */ - dd->config.burst_elems = 2; - dev->frame_bytes = 8; + /* The frame bytes setting follows only FIFO A setting in + * this DMIC driver version. + */ + trace_dai("did"); + + /* We can use always the largest burst length. */ + dd->config.burst_elems = 8; + + /* Set frame size in bytes to match the configuration. */ + if (config->dmic.num_pdm_active > 1) { + /* For two or more controllers capture from each + * controller must be stereo. + */ + dev->frame_bytes = 2 * config->dmic.num_pdm_active * + config->dmic.fifo_bits_a >> 3; + } else { + /* For one controller the capture can be mono or + * stereo. In mono configuration only one of mic A or B + * is enabled. + */ + if (config->dmic.pdm[0].enable_mic_a + + config->dmic.pdm[0].enable_mic_b == 1) + dev->frame_bytes = + config->dmic.fifo_bits_a >> 3; + else + dev->frame_bytes = 2 * + config->dmic.fifo_bits_a >> 3; + } + trace_value(config->dmic.fifo_bits_a); + trace_value(config->dmic.num_pdm_active); + trace_value(config->dmic.pdm[0].enable_mic_a); + trace_value(config->dmic.pdm[0].enable_mic_b); + trace_value(dev->frame_bytes); break; default: /* other types of DAIs not handled for now */ diff --git a/src/drivers/dmic.c b/src/drivers/dmic.c index 58d5e20..47c966d 100644 --- a/src/drivers/dmic.c +++ b/src/drivers/dmic.c @@ -828,7 +828,7 @@ static int configure_registers(struct dai *dai, struct dmic_configuration *cfg, int array_b = 0; int cic_mute = 1; int fir_mute = 1; - int bfth = 1; /* Should be 3 for 8 entries, 1 is 2 entries */ + int bfth = 3; /* Should be 3 for 8 entries, 1 is 2 entries */ int th = 0; /* Used with TIE=1 */ /* Normal start sequence */ -- 2.14.1

2 1

[Sound-open-firmware] [PATCH 01/10] math: Comment for the innerworkings of ceil_divide() Signed-off-by: Slawomir Blauciak <slawomir.blauciak@linux.intel.com>
by Liam Girdwood 21 Jun '18

21 Jun '18

From: Slawomir Blauciak <slawomir.blauciak(a)linux.intel.com> math: ceil_divide - Check the signs of the dividant and divisor before rounding Signed-off-by: Slawomir Blauciak <slawomir.blauciak(a)linux.intel.com> --- src/include/sof/math/numbers.h | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/src/include/sof/math/numbers.h b/src/include/sof/math/numbers.h index 5aacd8b..4ba812a 100644 --- a/src/include/sof/math/numbers.h +++ b/src/include/sof/math/numbers.h @@ -48,7 +48,15 @@ static inline int ceil_divide(int a, int b) int c; c = a / b; - if (c * b < a) + + /* First, we check whether the signs of the params are different. + * If they are, we already know the result is going to be negative and + * therefore, is going to be already rounded up (truncated). + * + * If the signs are the same, we check if there was any remainder in + * the division by multiplying the number back. + */ + if (!((a ^ b) & (1 << ((sizeof(int) * 8) - 1))) && c * b != a) c++; return c; -- 2.17.0

1 9

[Sound-open-firmware] [PATCH V2 1/3] topology: Add SOF_TKN_DAI_LBM_KCONTROL for ssp loopback mode kcontrol
by Xiuli Pan 21 Jun '18

21 Jun '18

From: Pan Xiuli <xiuli.pan(a)linux.intel.com> Add token SOF_TKN_DAI_LBM_KCONTROL for SSP loopback mode kcontrol Signed-off-by: Pan Xiuli <xiuli.pan(a)linux.intel.com> --- V2: Rename token Work with patch set: SOF-Kernel(7): ASoC: SOF: Add debug_mode flag in sof dev ASoC: SOF: debug: add debugmode debugfs for sof_dev debug_mode ASoC: SOF: uapi: topology: Add SOF_TKN_DAI_LBM_KCONTROL for ssp loopback mode kcontrol ASoC: SOF: add headers for switch control callback functions ASoC: SOF: add switch kcontrol callback functions ASoC: SOF: topology: Add DAI TOKEN string bool parser ASoC: SOF: topology: Add topology handler for dai lbm kcontrol SOF(5): dai: add lbm status for dai ssp dai: add get_loopback_mode function DMIC: add empty get_loopback_mode function SSP: support for get/set_loopback_mode functions dai: add dai_cmd support for loopback mode switch SOF-Tools(3): topology: Add SOF_TKN_DAI_LBM_KCONTROL for ssp loopback mode kcontrol topology: m4: add dai lbm kcotnrol support topology: test: Add loopback topology test & santity test with: Mininow max rt5651 and UP2 Hifiberry PRO and CNL nocodec SOF master: 27795ece0ff9405795cef866fc28a7ab6db20d82 SOF-Tool master: bd7dc88231f31d385340310cef467f211a739eeb sof-dev: df15329163229fe3436ad914561430c20f778cf1 --- topology/sof/tokens.m4 | 1 + 1 file changed, 1 insertion(+) diff --git a/topology/sof/tokens.m4 b/topology/sof/tokens.m4 index f0b3428..f17ed35 100644 --- a/topology/sof/tokens.m4 +++ b/topology/sof/tokens.m4 @@ -19,6 +19,7 @@ SectionVendorTokens."sof_dai_tokens" { SOF_TKN_DAI_TYPE "154" SOF_TKN_DAI_INDEX "155" SOF_TKN_DAI_SAMPLE_BITS "156" + SOF_TKN_DAI_LBM_KCONTROL "157" } SectionVendorTokens."sof_sched_tokens" { -- 2.7.4

4 5

[Sound-open-firmware] [PATCH 1/3] topology: Add SOF_TKN_DAI_SSP_LBM for ssp loopback mode
by Xiuli Pan 21 Jun '18

21 Jun '18

From: Pan Xiuli <xiuli.pan(a)linux.intel.com> Add token SOF_TKN_DAI_SSP_LBM for SSP loopback mode. Signed-off-by: Pan Xiuli <xiuli.pan(a)linux.intel.com> --- Work with patch set: SOF-Kernel(6): ASoC: SOF: Add debug_mode flag in sof dev ASoC: SOF: debug: add debugmode debugfs for sof_dev debug_mode ASoC: SOF: uapi: topology: Add SOF_TKN_DAI_SSP_LBM for ssp loopback mode ASoC: SOF: add headers for lbm control callback functions ASoC: SOF: add lbm kcontrol callback functions ASoC: SOF: topology: Add topology handler for dai ssp loopback mode SOF(5): dai: add lbm status for dai ssp dai: add get_loopback_mode function DMIC: add empty get_loopback_mode function SSP: support for get/set_loopback_mode functions dai: add dai_cmd support for loopback mode switch SOF-Tools(3): topology: Add SOF_TKN_DAI_SSP_LBM for ssp loopback mode topology: m4: Add DAI_OUT_SSP_LOOPBACK marco for SSP LOOPBACK dai comp topology: test: Add loopback topology test & santity test with: Mininow max rt5651 and UP2 Hifiberry PRO and CNL nocodec SOF master: 48d2a1c551d7b3c8f76d44f3c04dd59a37ff6a8f SOF-Tool master: bd7dc88231f31d385340310cef467f211a739eeb https://github.com/plbossart/sound/tree/topic/sof-v4.14: 0d51a5ed28c5e97f09b59c4cafaddfb9d3b24b77 --- topology/sof/tokens.m4 | 1 + 1 file changed, 1 insertion(+) diff --git a/topology/sof/tokens.m4 b/topology/sof/tokens.m4 index f0b3428..ad74893 100644 --- a/topology/sof/tokens.m4 +++ b/topology/sof/tokens.m4 @@ -19,6 +19,7 @@ SectionVendorTokens."sof_dai_tokens" { SOF_TKN_DAI_TYPE "154" SOF_TKN_DAI_INDEX "155" SOF_TKN_DAI_SAMPLE_BITS "156" + SOF_TKN_DAI_SSP_LBM "157" } SectionVendorTokens."sof_sched_tokens" { -- 2.7.4

4 13

[Sound-open-firmware] [PATCH] platform: add trace code for debug
by Wu Zhigang 20 Jun '18

20 Jun '18

1. add the trace code for easy to debug the case: when the xrun happen in capture/playback working at the same time. we could confirm the xrun's direction easily. 2. fix typo error in mixer. Signed-off-by: Wu Zhigang <zhigang.wu(a)linux.intel.com> --- test with: apl-gpmrb with tdf8532 codec linux topic/sof-dev: 0d51a5ed28c5 sof master: 48d2a1c551d7 soft master: 2cc3ad2a9287 pass the regression test: Minnowboard Turbo UP^2 CNL-RVP --- src/audio/mixer.c | 2 +- src/audio/src.c | 4 ++++ src/audio/volume.c | 4 ++++ 3 files changed, 9 insertions(+), 1 deletion(-) diff --git a/src/audio/mixer.c b/src/audio/mixer.c index ac6b7f9..3ddea0a 100644 --- a/src/audio/mixer.c +++ b/src/audio/mixer.c @@ -255,7 +255,7 @@ static int mixer_copy(struct comp_dev *dev) comp_underrun(dev, sources[i], sources[i]->avail, md->period_bytes); } else if (res > 0) { - trace_mixer_error("xru"); + trace_mixer_error("xro"); comp_overrun(dev, sources[i], sink->free, md->period_bytes); } diff --git a/src/audio/src.c b/src/audio/src.c index c19828a..e641874 100644 --- a/src/audio/src.c +++ b/src/audio/src.c @@ -800,10 +800,14 @@ static int src_copy(struct comp_dev *dev) */ if (source->avail < need_source) { trace_src_error("xru"); + trace_error_value(source->source->comp.type); + trace_error_value(sink->sink->comp.type); return -EIO; /* xrun */ } if (sink->free < need_sink) { trace_src_error("xro"); + trace_error_value(source->source->comp.type); + trace_error_value(sink->sink->comp.type); return -EIO; /* xrun */ } diff --git a/src/audio/volume.c b/src/audio/volume.c index 9e2968d..a9efbaf 100644 --- a/src/audio/volume.c +++ b/src/audio/volume.c @@ -356,11 +356,15 @@ static int volume_copy(struct comp_dev *dev) */ if (source->avail < cd->source_period_bytes) { trace_volume_error("xru"); + trace_error_value(source->source->comp.type); + trace_error_value(sink->sink->comp.type); comp_underrun(dev, source, cd->source_period_bytes, 0); return -EIO; /* xrun */ } if (sink->free < cd->sink_period_bytes) { trace_volume_error("xro"); + trace_error_value(source->source->comp.type); + trace_error_value(sink->sink->comp.type); comp_overrun(dev, sink, cd->sink_period_bytes, 0); return -EIO; /* xrun */ } -- 2.17.1

3 4