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

[Sound-open-firmware] Using the Qemu DSP emulator
by Daniel Baluta 19 Mar '18

19 Mar '18

Hi, I'm following the instruction on SOF wiki page on how to use the emulator [1] and both VM0 and VM1 are up, anyhow SOF DSP device isn't probed. How do you do it in your qemu setup? Are you using an ACPI file? (or DT?). I'm running the following commands: # ./xtensa-host.sh bxt # ./x86-host.sh bxt and pointing qemu to load my bzimage. thanks, Daniel. [1] https://www.alsa-project.org/main/index.php/Firmware#Using_the_Qemu_DSP_emu…

2 14

[Sound-open-firmware] How to create topologies
by Mustafa, Muhammad 01 Mar '18

01 Mar '18

Hi, Is there any documentation on how to create topology on SOF? Regards, Mustafa Intel Deutschland GmbH Registered Address: Am Campeon 10-12, 85579 Neubiberg, Germany Tel: +49 89 99 8853-0, www.intel.de Managing Directors: Christin Eisenschmid, Christian Lamprechter Chairperson of the Supervisory Board: Nicole Lau Registered Office: Munich Commercial Register: Amtsgericht Muenchen HRB 186928

2 1

[Sound-open-firmware] [PATCH] cnl: gp-dma: fix gp-dma dead loop issue
by Rander Wang 01 Mar '18

01 Mar '18

In irq function, two dma would be checked which one is the interrupted one, so get it after check. Signed-off-by: Rander Wang <rander.wang(a)intel.com> --- src/drivers/dw-dma.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/drivers/dw-dma.c b/src/drivers/dw-dma.c index be19e12..6fd46e0 100644 --- a/src/drivers/dw-dma.c +++ b/src/drivers/dw-dma.c @@ -1034,7 +1034,7 @@ static int dw_dma_probe(struct dma *dma) static void dw_dma_irq_handler(void *data) { struct dma *dma = (struct dma *)data; - struct dma_pdata *p = dma_get_drvdata(dma); + struct dma_pdata *p; struct dma_sg_elem next; uint32_t status_tfr = 0; uint32_t status_block = 0; @@ -1058,6 +1058,7 @@ static void dw_dma_irq_handler(void *data) } tracev_dma("DIr"); + p = dma_get_drvdata(dma); /* get the source of our IRQ. */ status_block = dw_read(dma, DW_STATUS_BLOCK); -- 2.14.1

3 3

[Sound-open-firmware] [PATCH] cnl: clk: correct it on cnl according to spec
by Rander Wang 28 Feb '18

28 Feb '18

Signed-off-by: Rander Wang <rander.wang(a)intel.com> --- src/platform/cannonlake/clk.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/platform/cannonlake/clk.c b/src/platform/cannonlake/clk.c index 3a16c1a..dcfe4b3 100644 --- a/src/platform/cannonlake/clk.c +++ b/src/platform/cannonlake/clk.c @@ -72,7 +72,7 @@ static const struct freq_table cpu_freq[] = { static const struct freq_table ssp_freq[] = { {19200000, 19,}, - {25000000, 25,}, /* default */ + {24000000, 24,}, /* default */ }; #define CPU_DEFAULT_IDX 1 -- 2.14.1

2 1

[Sound-open-firmware] [PATCH] topology: Remove unsupport multiple kcontrol for volume playback
by Xiuli Pan 28 Feb '18

28 Feb '18

From: Pan Xiuli <xiuli.pan(a)linux.intel.com> Now we did not support multiple kcontrol, remove the two kcontrol in volume playback template. Signed-off-by: Pan Xiuli <xiuli.pan(a)linux.intel.com> --- topology/sof/pipe-volume-playback.m4 | 28 +--------------------------- 1 file changed, 1 insertion(+), 27 deletions(-) diff --git a/topology/sof/pipe-volume-playback.m4 b/topology/sof/pipe-volume-playback.m4 index 8aa02fb..9ccc5da 100644 --- a/topology/sof/pipe-volume-playback.m4 +++ b/topology/sof/pipe-volume-playback.m4 @@ -38,32 +38,6 @@ SectionControlMixer.STR(Master Playback Volume) { tlv "vtlv_m90s3" } -SectionControlMixer.STR(Master Playback Volume Switch) { - - # control belongs to this index group - index STR(PIPELINE_ID) - - # Channel register and shift for Front Left/Right - channel."FL" { - reg "1" - shift "0" - } - channel."FR" { - reg "1" - shift "1" - } - - # control uses bespoke driver get/put/info ID 0 - ops."ctl" { - info "volsw" - get "256" - put "256" - } - - # Volume mute on/off - max "1" - invert "false" -} # # Components and Buffers # @@ -73,7 +47,7 @@ SectionControlMixer.STR(Master Playback Volume Switch) { W_PCM_PLAYBACK(Passthrough Playback, PIPELINE_DMAC, PIPELINE_DMAC_CHAN, 2, 0, 2) # "Volume" has 2 source and 2 sink periods -W_PGA(0, PIPELINE_FORMAT, 2, 2, 2, KCONTROLS("Master Playback Volume Switch", "Master Playback Volume")) +W_PGA(0, PIPELINE_FORMAT, 2, 2, 2, KCONTROLS("Master Playback Volume")) # Playback Buffers W_BUFFER(0, COMP_BUFFER_SIZE(2, -- 2.7.4

5 5

[Sound-open-firmware] [PATCH 1/3] rimage: validate manifest segments
by Liam Girdwood 27 Feb '18

27 Feb '18

make sure no manifest segments collide with each other and fail if they do. Signed-off-by: Liam Girdwood <liam.r.girdwood(a)linux.intel.com> --- rimage/manifest.c | 60 +++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 60 insertions(+) diff --git a/rimage/manifest.c b/rimage/manifest.c index 2b7e07f..b9848d0 100644 --- a/rimage/manifest.c +++ b/rimage/manifest.c @@ -260,6 +260,62 @@ static int man_get_module_manifest(struct image *image, struct module *module, return 0; } +static inline const char *segment_name(int i) +{ + switch (i) { + case SOF_MAN_SEGMENT_TEXT: + return "TEXT"; + case SOF_MAN_SEGMENT_RODATA: + return "DATA"; + case SOF_MAN_SEGMENT_BSS: + return "BSS"; + default: + return "NONE"; + } +} + +/* make sure no segments collide */ +static int man_module_validate(struct sof_man_module *man_module) +{ + uint32_t istart, iend; + uint32_t jstart, jend; + int i, j; + + for (i = 0; i < 3; i++) { + + istart = man_module->segment[i].v_base_addr; + iend = istart + man_module->segment[i].flags.r.length * + MAN_PAGE_SIZE; + + for (j = 0; j < 3; j++) { + + /* don't validate segment against itself */ + if (i == j) + continue; + + jstart = man_module->segment[j].v_base_addr; + jend = jstart + man_module->segment[j].flags.r.length * + MAN_PAGE_SIZE; + + if (jstart > istart && jstart < iend) + goto err; + + if (jend > istart && jend < iend) + goto err; + } + } + + /* success, no overlapping segments */ + return 0; + +err: + fprintf(stderr, "error: segment %s [0x%8.8x:0x%8.8x] overlaps", + segment_name(i), istart, iend); + fprintf(stderr, " with %s [0x%8.8x:0x%8.8x]\n", + segment_name(j), jstart, jend); + return -EINVAL; +} + static int man_module_create(struct image *image, struct module *module, struct sof_man_module *man_module) { @@ -328,6 +384,10 @@ static int man_module_create(struct image *image, struct module *module, fprintf(stdout, "\tNo\tAddress\t\tSize\tFile\tType\n"); + /* validate segments */ + if (man_module_validate(man_module) < 0) + return -EINVAL; + /* find all sections and copy to corresponding segments */ for (i = 0; i < module->hdr.e_shnum; i++) { -- 2.14.1

1 2

[Sound-open-firmware] Qemu code loader updates pushed.
by Liam Girdwood 26 Feb '18

26 Feb '18

I've just pushed some updates so the the qemu xtensa VM can now self code load FW binaries (without x86 VM Linux driver). This is useful for debugging any boot related problems or as a functional test harness for xtensa binaries. Supported platforms are BYT, CHT, BSW, HSW, BDW, APL and CNL. Liam

1 0

[Sound-open-firmware] [PATCH v4] scripts: modified build-all script for xtensa platforms
by Ranjani Sridharan 26 Feb '18

26 Feb '18

This patch modifies the build-all script for xtensa platforms to make it easier to choose platforms Signed-off-by: Ranjani Sridharan <ranjani.sridharan(a)linux.intel.com> --- scripts/xtensa-build-all.sh | 85 +++++++++++++++++++++++++++------------------ 1 file changed, 51 insertions(+), 34 deletions(-) diff --git a/scripts/xtensa-build-all.sh b/scripts/xtensa-build-all.sh index dfee2d2..5111383 100755 --- a/scripts/xtensa-build-all.sh +++ b/scripts/xtensa-build-all.sh @@ -4,46 +4,63 @@ set -e # run autogen.sh ./autogen.sh -# build all images for all targets. pwd=`pwd` rm -fr src/arch/xtensa/*.ri -# Build for Baytrail -./configure --with-arch=xtensa --with-platform=baytrail --with-root-dir=$pwd/../xtensa-root/xtensa-byt-elf --host=xtensa-byt-elf -make clean -make -make bin +SUPPORTED_PLATFORMS=(byt cht bdw hsw apl cnl) -# Build for Cherrytrail -make clean -./configure --with-arch=xtensa --with-platform=cherrytrail --with-root-dir=$pwd/../xtensa-root/xtensa-byt-elf --host=xtensa-byt-elf -make -make bin +# build all images for chosen targets +if [ "$#" -eq 0 ] +then + PLATFORMS=${SUPPORTED_PLATFORMS[@]} +else + PLATFORMS=$@ +fi -# Build for Broadwell -make clean -./configure --with-arch=xtensa --with-platform=broadwell --with-root-dir=$pwd/../xtensa-root/xtensa-hsw-elf --host=xtensa-hsw-elf -make -make bin - -# Build for Haswell -make clean -./configure --with-arch=xtensa --with-platform=haswell --with-root-dir=$pwd/../xtensa-root/xtensa-hsw-elf --host=xtensa-hsw-elf -make -make bin - -# Build for Apollolake -make clean -./configure --with-arch=xtensa --with-platform=apollolake --with-root-dir=$pwd/../xtensa-root/xtensa-bxt-elf --host=xtensa-bxt-elf -make -make bin - -# Build for Cannonlake -make clean -./configure --with-arch=xtensa --with-platform=cannonlake --with-root-dir=$pwd/../xtensa-root/xtensa-cnl-elf --host=xtensa-cnl-elf -make -make bin +for i in ${PLATFORMS[@]} +do + for j in ${SUPPORTED_PLATFORMS[@]} + do + if [ $j == $i ] + then + if [ $j == "byt" ] + then + PLATFORM="baytrail" + ROOT="xtensa-byt-elf" + fi + if [ $j == "cht" ] + then + PLATFORM="cherrytrail" + ROOT="xtensa-byt-elf" + fi + if [ $j == "bdw" ] + then + PLATFORM="broadwell" + ROOT="xtensa-hsw-elf" + fi + if [ $j == "hsw" ] + then + PLATFORM="haswell" + ROOT="xtensa-hsw-elf" + fi + if [ $j == "apl" ] + then + PLATFORM="apollolake" + ROOT="xtensa-bxt-elf" + fi + if [ $j == "cnl" ] + then + PLATFORM="cannonlake" + ROOT="xtensa-cnl-elf" + fi + ./configure --with-arch=xtensa --with-platform=$PLATFORM --with-root-dir=$pwd/../xtensa-root/$ROOT --host=$ROOT + make clean + make + make bin + fi + done +done # list all the images ls -l src/arch/xtensa/*.ri -- 2.14.1

2 1

[Sound-open-firmware] [PATCH v3] scripts: modified build-all script for xtensa platforms
by Ranjani Sridharan 26 Feb '18

26 Feb '18

This patch modifies the build-all script for xtensa platforms to make it easier to choose platforms Signed-off-by: Ranjani Sridharan <ranjani.sridharan(a)linux.intel.com> --- scripts/xtensa-build-all.sh | 90 +++++++++++++++++++++++++++------------------ 1 file changed, 54 insertions(+), 36 deletions(-) diff --git a/scripts/xtensa-build-all.sh b/scripts/xtensa-build-all.sh index dfee2d2..903750a 100755 --- a/scripts/xtensa-build-all.sh +++ b/scripts/xtensa-build-all.sh @@ -4,46 +4,64 @@ set -e # run autogen.sh ./autogen.sh -# build all images for all targets. pwd=`pwd` rm -fr src/arch/xtensa/*.ri -# Build for Baytrail -./configure --with-arch=xtensa --with-platform=baytrail --with-root-dir=$pwd/../xtensa-root/xtensa-byt-elf --host=xtensa-byt-elf -make clean -make -make bin - -# Build for Cherrytrail -make clean -./configure --with-arch=xtensa --with-platform=cherrytrail --with-root-dir=$pwd/../xtensa-root/xtensa-byt-elf --host=xtensa-byt-elf -make -make bin - -# Build for Broadwell -make clean -./configure --with-arch=xtensa --with-platform=broadwell --with-root-dir=$pwd/../xtensa-root/xtensa-hsw-elf --host=xtensa-hsw-elf -make -make bin - -# Build for Haswell -make clean -./configure --with-arch=xtensa --with-platform=haswell --with-root-dir=$pwd/../xtensa-root/xtensa-hsw-elf --host=xtensa-hsw-elf -make -make bin - -# Build for Apollolake -make clean -./configure --with-arch=xtensa --with-platform=apollolake --with-root-dir=$pwd/../xtensa-root/xtensa-bxt-elf --host=xtensa-bxt-elf -make -make bin - -# Build for Cannonlake -make clean -./configure --with-arch=xtensa --with-platform=cannonlake --with-root-dir=$pwd/../xtensa-root/xtensa-cnl-elf --host=xtensa-cnl-elf -make -make bin +SUPPORTED_PLATFORMS=(byt cht bdw hsw apl cnl) + +# build all images for chosen targets +if [ "$#" -eq 0 ] +then + PLATFORMS=$SUPPORTED_PLATFORMS +else + PLATFORMS=$@ +fi + +for i in ${PLATFORMS[@]} +do + for j in ${SUPPORTED_PLATFORMS[@]} + do + if [ $j == $i ] + then + if [ $i == "byt" ] + then + PLATFORM="baytrail" + ROOT="xtensa-byt-elf" + fi + if [ $i == "cht" ] + then + PLATFORM="cherrytrail" + ROOT="xtensa-byt-elf" + fi + if [ $i == "bdw" ] + then + PLATFORM="broadwell" + ROOT="xtensa-hsw-elf" + fi + if [ $i == "hsw" ] + then + PLATFORM="haswell" + ROOT="xtensa-hsw-elf" + fi + if [ $i == "apl" ] + then + PLATFORM="apollolake" + ROOT="xtensa-bxt-elf" + fi + if [ $i == "cnl" ] + then + PLATFORM="cannonlake" + ROOT="xtensa-cnl-elf" + fi + + ./configure --with-arch=xtensa --with-platform=$PLATFORM --with-root-dir=$pwd/../xtensa-root/$ROOT --host=$ROOT + make clean + make + make bin + fi + done +done # list all the images ls -l src/arch/xtensa/*.ri -- 2.14.1

2 2

[Sound-open-firmware] [PATCH] cache: bdw: cache writeback/invalidate not needed on HSW/BDW
by Liam Girdwood 26 Feb '18

26 Feb '18

Signed-off-by: Liam Girdwood <liam.r.girdwood(a)linux.intel.com> --- src/arch/xtensa/include/arch/cache.h | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/arch/xtensa/include/arch/cache.h b/src/arch/xtensa/include/arch/cache.h index f3e8062..6a1320e 100644 --- a/src/arch/xtensa/include/arch/cache.h +++ b/src/arch/xtensa/include/arch/cache.h @@ -35,7 +35,8 @@ #include <stddef.h> #include <xtensa/hal.h> -#if defined CONFIG_BAYTRAIL || defined CONFIG_CHERRYTRAIL +#if defined CONFIG_BAYTRAIL || defined CONFIG_CHERRYTRAIL ||\ + defined CONFIG_HASWELL || defined CONFIG_BROADWELL static inline void dcache_writeback_region(void *addr, size_t size) {} static inline void dcache_invalidate_region(void *addr, size_t size) {} -- 2.14.1

1 14