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

[Sound-open-firmware] [PATCH 1/5] DMIC: Bug fix for IPM value calculation for HW version 2
by Seppo Ingalsuo 20 Jun '18

20 Jun '18

The IPM bit field should be set to the number of used stereo controllers. This patch fixes the issue that pdm[0] got counted twice. Signed-off-by: Sathish K. Kuttan <sathish.k.kuttan(a)intel.com> --- src/drivers/dmic.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/drivers/dmic.c b/src/drivers/dmic.c index 97ca8b2..0f55474 100644 --- a/src/drivers/dmic.c +++ b/src/drivers/dmic.c @@ -714,7 +714,7 @@ static inline void source_ipm_helper(int source[], int *ipm, int stereo[], /* IPM bit field is set to count of active pdm controllers. */ *ipm = pdm[0]; - for (i = 0; i < dmic->num_pdm_active; i++) + for (i = 1; i < dmic->num_pdm_active; i++) *ipm += pdm[i]; } #endif -- 2.14.1

2 5

[Sound-open-firmware] [PATCH 1/2] configure: add OBJCOPY and OBJDUMP log
by Xiuli Pan 19 Jun '18

19 Jun '18

From: Pan Xiuli <xiuli.pan(a)linux.intel.com> Output OBJCOPY and OBJDUMP to check if we misuse them. Signed-off-by: Pan Xiuli <xiuli.pan(a)linux.intel.com> --- configure.ac | 2 ++ 1 file changed, 2 insertions(+) diff --git a/configure.ac b/configure.ac index c3e9fc4..65114f3 100644 --- a/configure.ac +++ b/configure.ac @@ -483,6 +483,8 @@ Install Prefix: ${prefix} PEM: ${PEM_KEY_PREFIX} Compiler: ${CC} +OBJCOPY: ${OBJCOPY} +OBJDUMP: ${OBJDUMP} CFLAGS: ${CFLAGS} LDFLAGS: ${LDFLAGS} ARCH_CFLAGS: ${ARCH_CFLAGS} -- 2.7.4

2 2

[Sound-open-firmware] [PATCH v2] volume: support 8-channel feature
by Wu Zhigang 19 Jun '18

19 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> --- v2: rebase the code and make patch. --- test with: apl-gpmrb with tdf8532 codec linux topic/sof-dev: commit 0d51a5ed28c5 sof master: commit 48d2a1c551d7 soft master: commit 2cc3ad2a9287 pass the regression test already: Minnowboard Turbo UP^2 CNL-RVP --- src/audio/volume_generic.c | 363 +++++++++++++++++++++++++++++++++++++ 1 file changed, 363 insertions(+) diff --git a/src/audio/volume_generic.c b/src/audio/volume_generic.c index 200cf12..fa23240 100644 --- a/src/audio/volume_generic.c +++ b/src/audio/volume_generic.c @@ -466,6 +466,358 @@ static void vol_s24_to_s24_4ch(struct comp_dev *dev, struct comp_buffer *sink, } } +#ifdef CONFIG_APOLLOLAKE +/* 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}, {SOF_IPC_FRAME_S16_LE, SOF_IPC_FRAME_S32_LE, 2, vol_s16_to_s32_2ch}, @@ -485,6 +837,17 @@ 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}, +#ifdef CONFIG_APOLLOLAKE + {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 3

[Sound-open-firmware] [PATCH 0/5] SSP fixes
by Pierre-Louis Bossart 19 Jun '18

19 Jun '18

This patchset adds corrections for APL and BYT. For APL, the first two patches add support for a 'mclk_id' needed for specific boards, in addition to allowing for independent dividers and sources for bclk and clkc. Follow-up patches will be needed to add a 'mclk_id' topology token and kernel support. For BYT, the patches add support for DSP_A/B modes as well as the slave mode (only CBM_CFM was tested), tested with Minnowboards and LogicPro. Comments welcome. Pierre-Louis Bossart (5): ssp: rename clk_id as mclk_id, remove dead code apl-ssp: fix MCLK and BCLK source selection byt-ssp: fixes for DSP modes byt-ssp: fix frame sync polarity for DSP modes byt-ssp: minor changes to test slave mode src/drivers/apl-ssp.c | 132 +++++++++++++++++++++++++++++++++---------------- src/drivers/byt-ssp.c | 49 +++++++----------- src/drivers/hsw-ssp.c | 25 ---------- src/include/sof/ssp.h | 5 ++ src/include/uapi/ipc.h | 2 +- 5 files changed, 112 insertions(+), 101 deletions(-) base-commit: f6f3ab0d55ee9a26235d3912851c72ffea34fca7 -- 2.14.1

2 6

[Sound-open-firmware] [PATCH] scripts: xtensa-build: fix alias detection for bxt/apl gcc
by Liam Girdwood 19 Jun '18

19 Jun '18

use bash builtin type instead of -x (requires full path) Signed-off-by: Liam Girdwood <liam.r.girdwood(a)linux.intel.com> --- scripts/xtensa-build-all.sh | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/scripts/xtensa-build-all.sh b/scripts/xtensa-build-all.sh index 62b94b2..100ba6a 100755 --- a/scripts/xtensa-build-all.sh +++ b/scripts/xtensa-build-all.sh @@ -96,7 +96,10 @@ do PLATFORM="apollolake" XTENSA_CORE="X4H3I16w2D48w3a_2017_8" ROOT="$pwd/../xtensa-root/xtensa-bxt-elf" - if [ -x xtensa-bxt-elf-gcc ] + + # test APL compiler aliases and ignore set -e here + type xtensa-bxt-elf-gcc > /dev/null 2>&1 && true + if [ $? == 0 ] then HOST="xtensa-bxt-elf" else -- 2.17.1

1 0

[Sound-open-firmware] [PATCH 1/2] scripts: xtensa-build-all.sh. Fix bash error.
by Liam Girdwood 19 Jun '18

19 Jun '18

make[1]: Leaving directory '/home/lrg/source/reef/sof.git' ./scripts/xtensa-build-all.sh: line 123: [: ==: unary operator expected Fix, set variable to "none" if xcc not found. Signed-off-by: Liam Girdwood <liam.r.girdwood(a)linux.intel.com> --- scripts/xtensa-build-all.sh | 2 ++ 1 file changed, 2 insertions(+) diff --git a/scripts/xtensa-build-all.sh b/scripts/xtensa-build-all.sh index c1147d8..d873d7e 100755 --- a/scripts/xtensa-build-all.sh +++ b/scripts/xtensa-build-all.sh @@ -116,6 +116,8 @@ do if [ -d $XTENSA_TOOLS_DIR ] then XCC="xt-xcc" + else + XCC="none" fi fi -- 2.17.1

2 5

[Sound-open-firmware] [RFC PATCH 0/6] Hostless pipeline updates
by Ranjani Sridharan 14 Jun '18

14 Jun '18

This set of patches make changes to the tone component, pipeline and generic component to support hostless pipelines. The changes to component and pipeline are mainly to avoid errors when the user repeatedly triggers the pipeline on/off. Ranjani Sridharan (6): ipc: skip host page table set up for hostless tone pipeline tone: add command handler to return tone state and compute tone sample rate pipeline: ignore request for pipeline_prepare() if the pipeline is running comp: ignore state set request when the old state is unchanged ipc: add sample_rate member to ipc tone comp def tone: set sample rate from topology src/audio/component.c | 19 +++++++++++ src/audio/pipeline.c | 5 +++ src/audio/tone.c | 26 ++++++++++++++- src/include/uapi/ipc.h | 1 + src/ipc/handler.c | 76 +++++++++++++++++++++++++++++++++++++++++- 5 files changed, 125 insertions(+), 2 deletions(-) -- 2.17.1

3 13

[Sound-open-firmware] [PATCH] dmic: fix size while copying DMIC params
by Ranjani Sridharan 14 Jun '18

14 Jun '18

The size argument for memcpy should be sizeof struct sof_ipc_dai_dmic_params. Signed-off-by: Ranjani Sridharan <ranjani.sridharan(a)linux.intel.com> --- src/drivers/dmic.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/drivers/dmic.c b/src/drivers/dmic.c index b66769c..97ca8b2 100644 --- a/src/drivers/dmic.c +++ b/src/drivers/dmic.c @@ -1032,8 +1032,8 @@ static int dmic_set_config(struct dai *dai, struct sof_ipc_dai_config *config) * sizeof(struct sof_ipc_dai_dmic_pdm_ctrl); prm = rzalloc(RZONE_SYS, SOF_MEM_CAPS_RAM, size); - /* copy the command DAI config params and DMIC params */ - memcpy(prm, &config->dmic, sizeof(struct sof_ipc_dai_config)); + /* copy the DMIC params */ + memcpy(prm, &config->dmic, sizeof(struct sof_ipc_dai_dmic_params)); /* copy the pdm controller params from ipc */ for (i = 0; i < DMIC_HW_CONTROLLERS; i++) { -- 2.17.1

2 1

[Sound-open-firmware] [PATCH 1/2] ipc: add parameters validation
by Liam Girdwood 14 Jun '18

14 Jun '18

From: Tomasz Lauda <tomasz.lauda(a)linux.intel.com> This patch adds parameters validation for ipc. It uses generic macros. Signed-off-by: Tomasz Lauda <tomasz.lauda(a)linux.intel.com> --- src/ipc/handler.c | 53 ++++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 52 insertions(+), 1 deletion(-) diff --git a/src/ipc/handler.c b/src/ipc/handler.c index 581ce9e..a83ef69 100644 --- a/src/ipc/handler.c +++ b/src/ipc/handler.c @@ -62,6 +62,9 @@ #define iGS(x) ((x >> SOF_GLB_TYPE_SHIFT) & 0xf) #define iCS(x) ((x >> SOF_CMD_TYPE_SHIFT) & 0xfff) +#define IPC_INVALID_SIZE(ipc) \ + (sizeof(*(ipc)) != ipc->hdr.size) + /* IPC context - shared with platform IPC driver */ struct ipc *_ipc; @@ -106,12 +109,18 @@ static int ipc_stream_pcm_params(uint32_t stream) trace_ipc("SAl"); + /* sanity check size */ + if (IPC_INVALID_SIZE(pcm_params)) { + trace_ipc_error("eAS"); + return -EINVAL; + } + /* get the pcm_dev */ pcm_dev = ipc_get_comp(_ipc, pcm_params->comp_id); if (pcm_dev == NULL) { trace_ipc_error("eAC"); trace_error_value(pcm_params->comp_id); - return -EINVAL; + return -ENODEV; } /* sanity check comp */ @@ -214,6 +223,12 @@ static int ipc_stream_pcm_free(uint32_t header) trace_ipc("SFr"); + /* sanity check size */ + if (IPC_INVALID_SIZE(free_req)) { + trace_ipc_error("eFs"); + return -EINVAL; + } + /* get the pcm_dev */ pcm_dev = ipc_get_comp(_ipc, free_req->comp_id); if (pcm_dev == NULL) { @@ -243,6 +258,12 @@ static int ipc_stream_position(uint32_t header) memset(&posn, 0, sizeof(posn)); + /* sanity check size */ + if (IPC_INVALID_SIZE(stream)) { + trace_ipc_error("ePs"); + return -EINVAL; + } + /* get the pcm_dev */ pcm_dev = ipc_get_comp(_ipc, stream->comp_id); if (pcm_dev == NULL) { @@ -314,6 +335,12 @@ static int ipc_stream_trigger(uint32_t header) trace_ipc("tri"); + /* sanity check size */ + if (IPC_INVALID_SIZE(stream)) { + trace_ipc_error("eRs"); + return -EINVAL; + } + /* get the pcm_dev */ pcm_dev = ipc_get_comp(_ipc, stream->comp_id); if (pcm_dev == NULL) { @@ -525,6 +552,12 @@ static int ipc_dma_trace_config(uint32_t header) trace_ipc("DA1"); + /* sanity check size */ + if (IPC_INVALID_SIZE(params)) { + trace_ipc_error("DAs"); + return -EINVAL; + } + #ifdef CONFIG_HOST_PTABLE list_init(&elem_list); @@ -734,6 +767,12 @@ static int ipc_glb_tplg_pipe_new(uint32_t header) trace_ipc("Ipn"); + /* sanity check size */ + if (IPC_INVALID_SIZE(ipc_pipeline)) { + trace_ipc_error("Ips"); + return -EINVAL; + } + ret = ipc_pipeline_new(_ipc, ipc_pipeline); if (ret < 0) { trace_ipc_error("pn1"); @@ -764,6 +803,12 @@ static int ipc_glb_tplg_comp_connect(uint32_t header) trace_ipc("Icn"); + /* sanity check size */ + if (IPC_INVALID_SIZE(connect)) { + trace_ipc_error("Ics"); + return -EINVAL; + } + return ipc_comp_connect(_ipc, connect); } @@ -774,6 +819,12 @@ static int ipc_glb_tplg_free(uint32_t header, trace_ipc("Tcf"); + /* sanity check size */ + if (IPC_INVALID_SIZE(ipc_free)) { + trace_ipc_error("Tcs"); + return -EINVAL; + } + /* free the object */ free_func(_ipc, ipc_free->id); -- 2.17.1

1 2

[Sound-open-firmware] [PATCH] scripts: use xt-xcc for compiling if available
by Xiuli Pan 14 Jun '18

14 Jun '18

From: Ranjani Sridharan <ranjani.sridharan(a)linux.intel.com> Check ENV XTENSA_TOOLS_ROOT to determain which compiler to use, and set the PATH and other ENV needed for xt-xcc. Signed-off-by: Ranjani Sridharan <ranjani.sridharan(a)linux.intel.com> Signed-off-by: Pan Xiuli <xiuli.pan(a)linux.intel.com> --- scripts/xtensa-build-all.sh | 54 ++++++++++++++++++++++++++++++++++++++------- 1 file changed, 46 insertions(+), 8 deletions(-) diff --git a/scripts/xtensa-build-all.sh b/scripts/xtensa-build-all.sh index 198ab8d..c1147d8 100755 --- a/scripts/xtensa-build-all.sh +++ b/scripts/xtensa-build-all.sh @@ -58,41 +58,79 @@ else PATH=$pwd/local/bin:$PATH fi +OLDPATH=$PATH + # build platform for j in ${PLATFORMS[@]} do if [ $j == "byt" ] then PLATFORM="baytrail" - ROOT="xtensa-byt-elf" + XTENSA_CORE="Intel_HiFiEP" + ROOT="$pwd/../xtensa-root/xtensa-byt-elf" + HOST="xtensa-byt-elf" + XTENSA_TOOLS_VERSION="RD-2012.5-linux" fi if [ $j == "cht" ] then PLATFORM="cherrytrail" - ROOT="xtensa-byt-elf" + XTENSA_CORE="CHT_audio_hifiep" + ROOT="$pwd/../xtensa-root/xtensa-byt-elf" + HOST="xtensa-byt-elf" + XTENSA_TOOLS_VERSION="RD-2012.5-linux" fi if [ $j == "bdw" ] then PLATFORM="broadwell" - ROOT="xtensa-hsw-elf" + ROOT="$pwd/../xtensa-root/xtensa-hsw-elf" + HOST="xtensa-hsw-elf" fi if [ $j == "hsw" ] then PLATFORM="haswell" - ROOT="xtensa-hsw-elf" + ROOT="$pwd/../xtensa-root/xtensa-hsw-elf" + HOST="xtensa-hsw-elf" fi if [ $j == "apl" ] then PLATFORM="apollolake" - ROOT="xtensa-bxt-elf" + XTENSA_CORE="X4H3I16w2D48w3a_2017_8" + ROOT="$pwd/../xtensa-root/xtensa-bxt-elf" + HOST="xtensa-bxt-elf" + XTENSA_TOOLS_VERSION="RG-2017.8-linux" fi if [ $j == "cnl" ] then PLATFORM="cannonlake" - ROOT="xtensa-cnl-elf" + XTENSA_CORE="X6H3CNL_2016_4_linux" + ROOT="$pwd/../xtensa-root/xtensa-cnl-elf" + HOST="xtensa-cnl-elf" + XTENSA_TOOLS_VERSION="RF-2016.4-linux" + fi + if [ $XTENSA_TOOLS_ROOT ] + then + XTENSA_TOOLS_DIR="$XTENSA_TOOLS_ROOT/install/tools/$XTENSA_TOOLS_VERSION" + XTENSA_BUILDS_DIR="$XTENSA_TOOLS_ROOT/install/builds/$XTENSA_TOOLS_VERSION" + + # make sure the required version of xtensa tools is installed + if [ -d $XTENSA_TOOLS_DIR ] + then + XCC="xt-xcc" + fi fi - PATH=$pwd/../xtensa-root/$ROOT/bin:$PATH - ./configure --with-arch=xtensa --with-platform=$PLATFORM --with-root-dir=$pwd/../xtensa-root/$ROOT --host=$ROOT + + # update ROOT directory for xt-xcc + if [ $XCC == "xt-xcc" ] + then + ROOT="$XTENSA_BUILDS_DIR/$XTENSA_CORE/xtensa-elf" + XTENSA_SYSTEM=$XTENSA_BUILDS_DIR/$XTENSA_CORE/config + PATH=$XTENSA_TOOLS_DIR/XtensaTools/bin:$OLDPATH + else + PATH=$pwd/../$HOST/bin:$OLDPATH + fi + + ./configure --with-arch=xtensa --with-platform=$PLATFORM --with-root-dir=$ROOT --host=$HOST CC=$XCC --with-dsp-core=$XTENSA_CORE + make clean make make bin -- 2.7.4

2 3