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

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

23 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 | 82 +++++++++++++++++++++++++-------------------- 1 file changed, 46 insertions(+), 36 deletions(-) diff --git a/scripts/xtensa-build-all.sh b/scripts/xtensa-build-all.sh index dfee2d2..598af02 100755 --- a/scripts/xtensa-build-all.sh +++ b/scripts/xtensa-build-all.sh @@ -4,46 +4,56 @@ 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 +# build all images for chosen targets +if [ "$#" -eq 0 ] +then + PLATFORMS=(byt cht bdw hsw apl cnl) +else + PLATFORMS=$@ +fi + +for i in ${PLATFORMS[@]} +do + 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 +done # list all the images ls -l src/arch/xtensa/*.ri -- 2.14.1

1 0

[Sound-open-firmware] [PATCH] timer: fix external timer doesn't work issue for APL/CNL
by Keyon Jie 23 Feb '18

23 Feb '18

On some platforms(e.g. APL, CNL), the external timer(wall clock) uses the external interrupt bits, here change the common timer logic to call interrupt APIs, which give a chance to handle for different cases. Signed-off-by: Keyon Jie <yang.jie(a)linux.intel.com> --- Test on GPMRB with: SOF master: 019637ab250daa53c15da0a0a98c54f1c58d8ca3 SOF-Tool master: 33e4b0cc6f6a44e3e7ee849c04c515a5537242c7 https://github.com/plbossart/sound/tree/topic/sof-v4.14: 6fa721a8b7c6567eea0a2181bf9a3d2a12c31b00 src/arch/xtensa/timer.c | 16 ++++++++++++++++ src/include/reef/timer.h | 18 +++--------------- 2 files changed, 19 insertions(+), 15 deletions(-) diff --git a/src/arch/xtensa/timer.c b/src/arch/xtensa/timer.c index 9408eb8..ee01d08 100644 --- a/src/arch/xtensa/timer.c +++ b/src/arch/xtensa/timer.c @@ -217,3 +217,19 @@ int arch_timer_set(struct timer *timer, uint64_t ticks) arch_interrupt_global_enable(flags); return 0; } + +void timer_unregister(struct timer *timer) +{ + interrupt_unregister(timer->irq); +} + +void timer_enable(struct timer *timer) +{ + interrupt_enable(timer->irq); +} + +void timer_disable(struct timer *timer) +{ + interrupt_disable(timer->irq); +} + diff --git a/src/include/reef/timer.h b/src/include/reef/timer.h index 613cb8b..50d0825 100644 --- a/src/include/reef/timer.h +++ b/src/include/reef/timer.h @@ -36,21 +36,9 @@ int timer_register(struct timer *timer, void(*handler)(void *arg), void *arg); - -static inline void timer_unregister(struct timer *timer) -{ - arch_timer_unregister(timer); -} - -static inline void timer_enable(struct timer *timer) -{ - arch_timer_enable(timer); -} - -static inline void timer_disable(struct timer *timer) -{ - arch_timer_disable(timer); -} +void timer_unregister(struct timer *timer); +void timer_enable(struct timer *timer); +void timer_disable(struct timer *timer); static inline int timer_set(struct timer *timer, uint64_t ticks) { -- 2.11.0

2 1

[Sound-open-firmware] [PATCH] Enable CNL topology generating.
by yan.wang＠linux.intel.com 23 Feb '18

23 Feb '18

From: Yan Wang <yan.wang(a)linux.intel.com> Currently CNL topology definition is added but not enabled. Signed-off-by: Yan Wang <yan.wang(a)linux.intel.com> --- topology/Makefile.am | 2 ++ 1 file changed, 2 insertions(+) diff --git a/topology/Makefile.am b/topology/Makefile.am index 3b5a3a9..1e80d57 100644 --- a/topology/Makefile.am +++ b/topology/Makefile.am @@ -27,6 +27,7 @@ MACHINES = \ reef-byt-rt5645.tplg \ reef-byt-rt5651.tplg \ reef-byt-da7212.tplg \ + reef-cnl-rt274.tplg \ reef-hsw-rt5640.tplg # Uncomment the following line if you want to debug conf files @@ -56,4 +57,5 @@ EXTRA_DIST = \ reef-byt-rt5645.m4 \ reef-byt-rt5651.m4 \ reef-byt-da7212.m4 \ + reef-cnl-rt274.m4 \ reef-hsw-rt5640.m4 -- 2.14.3

2 1

[Sound-open-firmware] [PATCH 1/3] platform: add sof_ipc_window for byt, hsw and bdw
by Xiuli Pan 23 Feb '18

23 Feb '18

From: Pan Xiuli <xiuli.pan(a)linux.intel.com> Add sof_ipc_window for all platforms, and add IPC send after boot compelted. Also remove the deprecated ready window. Signed-off-by: Pan Xiuli <xiuli.pan(a)linux.intel.com> --- Test with: Mininow max rt5651 SOF master: 019637ab250daa53c15da0a0a98c54f1c58d8ca3 SOF-Tool master: 33e4b0cc6f6a44e3e7ee849c04c515a5537242c7 https://github.com/plbossart/sound/tree/topic/sof-v4.14: 6fa721a8b7c6567eea0a2181bf9a3d2a12c31b00 --- src/platform/baytrail/platform.c | 45 ++++++++++++++++++++++++++++++++++++---- src/platform/haswell/platform.c | 45 ++++++++++++++++++++++++++++++++++++---- 2 files changed, 82 insertions(+), 8 deletions(-) diff --git a/src/platform/baytrail/platform.c b/src/platform/baytrail/platform.c index 3114ac1..6d08e47 100644 --- a/src/platform/baytrail/platform.c +++ b/src/platform/baytrail/platform.c @@ -59,10 +59,6 @@ static const struct sof_ipc_fw_ready ready = { .size = sizeof(struct sof_ipc_fw_ready), }, /* dspbox is for DSP initiated IPC, hostbox is for host initiated IPC */ - .dspbox_offset = MAILBOX_HOST_OFFSET + MAILBOX_DSPBOX_OFFSET, - .hostbox_offset = MAILBOX_HOST_OFFSET + MAILBOX_HOSTBOX_OFFSET, - .dspbox_size = MAILBOX_DSPBOX_SIZE, - .hostbox_size = MAILBOX_HOSTBOX_SIZE, .version = { .build = REEF_BUILD, .minor = REEF_MINOR, @@ -74,6 +70,45 @@ static const struct sof_ipc_fw_ready ready = { /* TODO: add capabilities */ }; +#define NUM_BYT_WINDOWS 4 +static const struct sof_ipc_window sram_window = { + .ext_hdr = { + .hdr.cmd = SOF_IPC_FW_READY, + .hdr.size = sizeof(struct sof_ipc_window) + + sizeof(struct sof_ipc_window_elem) * NUM_BYT_WINDOWS, + .type = SOF_IPC_EXT_WINDOW, + }, + .num_windows = NUM_BYT_WINDOWS, + .window[0] = { + .type = SOF_IPC_REGION_UPBOX, + .id = 0, /* map to host window 0 */ + .flags = 0, // TODO: set later + .size = MAILBOX_DSPBOX_SIZE, + .offset = MAILBOX_DSPBOX_OFFSET, + }, + .window[1] = { + .type = SOF_IPC_REGION_DOWNBOX, + .id = 0, /* map to host window 0 */ + .flags = 0, // TODO: set later + .size = MAILBOX_HOSTBOX_SIZE, + .offset = MAILBOX_HOSTBOX_OFFSET, + }, + .window[2] = { + .type = SOF_IPC_REGION_DEBUG, + .id = 0, /* map to host window 0 */ + .flags = 0, // TODO: set later + .size = MAILBOX_DEBUG_SIZE, + .offset = MAILBOX_DEBUG_OFFSET, + }, + .window[3] = { + .type = SOF_IPC_REGION_TRACE, + .id = 0, /* map to host window 0 */ + .flags = 0, // TODO: set later + .size = MAILBOX_TRACE_SIZE, + .offset = MAILBOX_TRACE_OFFSET, + }, +}; + static struct work_queue_timesource platform_generic_queue = { .timer = { .id = TIMER3, /* external timer */ @@ -93,6 +128,8 @@ int platform_boot_complete(uint32_t boot_message) uint64_t outbox = MAILBOX_HOST_OFFSET >> 3; mailbox_dspbox_write(0, &ready, sizeof(ready)); + mailbox_dspbox_write(sizeof(ready), &sram_window, + sram_window.ext_hdr.hdr.size); /* now interrupt host to tell it we are done booting */ shim_write(SHIM_IPCDL, SOF_IPC_FW_READY | outbox); diff --git a/src/platform/haswell/platform.c b/src/platform/haswell/platform.c index 1b82464..2ed3d50 100644 --- a/src/platform/haswell/platform.c +++ b/src/platform/haswell/platform.c @@ -58,10 +58,6 @@ static const struct sof_ipc_fw_ready ready = { .size = sizeof(struct sof_ipc_fw_ready), }, /* dspbox is for DSP initiated IPC, hostbox is for host initiated IPC */ - .dspbox_offset = MAILBOX_HOST_OFFSET + MAILBOX_DSPBOX_OFFSET, - .hostbox_offset = MAILBOX_HOST_OFFSET + MAILBOX_HOSTBOX_OFFSET, - .dspbox_size = MAILBOX_DSPBOX_SIZE, - .hostbox_size = MAILBOX_HOSTBOX_SIZE, .version = { .build = REEF_BUILD, .minor = REEF_MINOR, @@ -73,6 +69,45 @@ static const struct sof_ipc_fw_ready ready = { /* TODO: add capabilities */ }; +#define NUM_HSW_WINDOWS 4 +static const struct sof_ipc_window sram_window = { + .ext_hdr = { + .hdr.cmd = SOF_IPC_FW_READY, + .hdr.size = sizeof(struct sof_ipc_window) + + sizeof(struct sof_ipc_window_elem) * NUM_HSW_WINDOWS, + .type = SOF_IPC_EXT_WINDOW, + }, + .num_windows = NUM_HSW_WINDOWS, + .window[0] = { + .type = SOF_IPC_REGION_UPBOX, + .id = 0, /* map to host window 0 */ + .flags = 0, // TODO: set later + .size = MAILBOX_DSPBOX_SIZE, + .offset = MAILBOX_DSPBOX_OFFSET, + }, + .window[1] = { + .type = SOF_IPC_REGION_DOWNBOX, + .id = 0, /* map to host window 0 */ + .flags = 0, // TODO: set later + .size = MAILBOX_HOSTBOX_SIZE, + .offset = MAILBOX_HOSTBOX_OFFSET, + }, + .window[2] = { + .type = SOF_IPC_REGION_DEBUG, + .id = 0, /* map to host window 0 */ + .flags = 0, // TODO: set later + .size = MAILBOX_DEBUG_SIZE, + .offset = MAILBOX_DEBUG_OFFSET, + }, + .window[3] = { + .type = SOF_IPC_REGION_TRACE, + .id = 0, /* map to host window 0 */ + .flags = 0, // TODO: set later + .size = MAILBOX_TRACE_SIZE, + .offset = MAILBOX_TRACE_OFFSET, + }, +}; + static struct work_queue_timesource platform_generic_queue = { .timer = { .id = TIMER0, /* external timer using SSP */ @@ -92,6 +127,8 @@ int platform_boot_complete(uint32_t boot_message) uint64_t outbox = MAILBOX_HOST_OFFSET >> 3; mailbox_dspbox_write(0, &ready, sizeof(ready)); + mailbox_dspbox_write(sizeof(ready), &sram_window, + sram_window.ext_hdr.hdr.size); /* now interrupt host to tell it we are done booting */ shim_write(SHIM_IPCD, outbox | SHIM_IPCD_BUSY); -- 2.7.4

3 9

[Sound-open-firmware] [PATCH] rimage: add unsigned firmware support
by Xiuli Pan 23 Feb '18

23 Feb '18

From: Pan Xiuli <xiuli.pan(a)linux.intel.com> Add unsigned firmware support, that can directly use the FW or sign it with other tools. Signed-off-by: Pan Xiuli <xiuli.pan(a)linux.intel.com> --- Test with: Mininow max rt5651 SOF master: 019637ab250daa53c15da0a0a98c54f1c58d8ca3 SOF-Tool master: 33e4b0cc6f6a44e3e7ee849c04c515a5537242c7 https://github.com/plbossart/sound/tree/topic/sof-v4.14: 6fa721a8b7c6567eea0a2181bf9a3d2a12c31b00 --- rimage/manifest.c | 58 +++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 58 insertions(+) diff --git a/rimage/manifest.c b/rimage/manifest.c index a4780b7..2b7e07f 100644 --- a/rimage/manifest.c +++ b/rimage/manifest.c @@ -51,6 +51,21 @@ static int man_open_rom_file(struct image *image) return 0; } +static int man_open_unsigned_file(struct image *image) +{ + sprintf(image->out_unsigned_file, "%s.uns", image->out_file); + unlink(image->out_unsigned_file); + + /* open unsigned FW outfile for writing */ + image->out_unsigned_fd = fopen(image->out_unsigned_file, "w"); + if (image->out_unsigned_fd == NULL) { + fprintf(stderr, "error: unable to open %s for writing %d\n", + image->out_unsigned_file, errno); + } + + return 0; +} + static int man_open_manifest_file(struct image *image) { /* open manifest outfile for writing */ @@ -351,6 +366,39 @@ static int man_module_create(struct image *image, struct module *module, return 0; } +static int man_write_unsigned_mod(struct image *image) +{ + int count; + + /* write metadata file for unsigned FW */ + count = fwrite(image->fw_image + MAN_META_EXT_OFFSET, + sizeof(struct sof_man_adsp_meta_file_ext), 1, + image->out_man_fd); + + /* did the metadata/manifest write succeed ? */ + if (count != 1) { + fprintf(stderr, "error: failed to write meta %s %d\n", + image->out_man_file, -errno); + return -errno; + } + fclose(image->out_man_fd); + + /* now prepare the unsigned rimage */ + count = fwrite(image->fw_image + MAN_FW_DESC_OFFSET, + image->image_end - MAN_FW_DESC_OFFSET, + 1, image->out_unsigned_fd); + + /* did the unsigned FW write succeed ? */ + if (count != 1) { + fprintf(stderr, "error: failed to write firmware %s %d\n", + image->out_unsigned_file, -errno); + return -errno; + } + fclose(image->out_unsigned_fd); + + return 0; +} + static int man_write_fw_mod(struct image *image) { int count; @@ -400,6 +448,11 @@ static int man_write_fw(struct image *image) if (ret < 0) goto err; + /* open unsigned firmware */ + ret = man_open_unsigned_file(image); + if (ret < 0) + goto err; + /* create the manifest */ ret = man_open_manifest_file(image); if (ret < 0) @@ -477,6 +530,11 @@ static int man_write_fw(struct image *image) if (ret < 0) goto err; + /* write the unsigned files*/ + ret = man_write_unsigned_mod(image); + if (ret < 0) + goto err; + fprintf(stdout, "Firmware manifest and signing completed !\n"); return 0; -- 2.7.4

2 1

[Sound-open-firmware] [PATCH] ASOC: topology: Fix hw_config setting for DAI
by Xiuli Pan 23 Feb '18

23 Feb '18

From: Pan Xiuli <xiuli.pan(a)linux.intel.com> DAI is codec here in topology pipeline, thus we should not change the settinga into oppsite value, as the tplg file is written from the codec view. Signed-off-by: Pan Xiuli <xiuli.pan(a)linux.intel.com> --- Test with: Mininow max rt5651 SOF master: 019637ab250daa53c15da0a0a98c54f1c58d8ca3 SOF-Tool master: 33e4b0cc6f6a44e3e7ee849c04c515a5537242c7 https://github.com/plbossart/sound/tree/topic/sof-v4.14: 6fa721a8b7c6567eea0a2181bf9a3d2a12c31b00 Work with patch of SOF-Tool: topology: m4: add default_hw_conf_id --- sound/soc/soc-topology.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/sound/soc/soc-topology.c b/sound/soc/soc-topology.c index e471352..df3bcf0 100644 --- a/sound/soc/soc-topology.c +++ b/sound/soc/soc-topology.c @@ -2018,11 +2018,11 @@ static void set_link_hw_format(struct snd_soc_dai_link *link, /* clock signal polarity */ invert_bclk = hw_config->invert_bclk; invert_fsync = hw_config->invert_fsync; - if (!invert_bclk && !invert_fsync) + if (invert_bclk && invert_fsync) link->dai_fmt |= SND_SOC_DAIFMT_NB_NF; - else if (!invert_bclk && invert_fsync) + else if (invert_bclk && invert_fsync) link->dai_fmt |= SND_SOC_DAIFMT_NB_IF; - else if (invert_bclk && !invert_fsync) + else if (!invert_bclk && invert_fsync) link->dai_fmt |= SND_SOC_DAIFMT_IB_NF; else link->dai_fmt |= SND_SOC_DAIFMT_IB_IF; @@ -2030,11 +2030,11 @@ static void set_link_hw_format(struct snd_soc_dai_link *link, /* clock masters */ bclk_master = hw_config->bclk_master; fsync_master = hw_config->fsync_master; - if (!bclk_master && !fsync_master) + if (bclk_master && fsync_master) link->dai_fmt |= SND_SOC_DAIFMT_CBM_CFM; - else if (bclk_master && !fsync_master) - link->dai_fmt |= SND_SOC_DAIFMT_CBS_CFM; else if (!bclk_master && fsync_master) + link->dai_fmt |= SND_SOC_DAIFMT_CBS_CFM; + else if (bclk_master && !fsync_master) link->dai_fmt |= SND_SOC_DAIFMT_CBM_CFS; else link->dai_fmt |= SND_SOC_DAIFMT_CBS_CFS; -- 2.7.4

4 4

[Sound-open-firmware] [PATCH] BYT memory: Fix calculation of HEAP_BUFFER_SIZE
by Seppo Ingalsuo 22 Feb '18

22 Feb '18

This patch fixes the overlap between heap buffer and stack. The macro for calculation missed the data size that caused heap to become too large. Compilation of sof with xt-xcc triggers this issue in rimage and causes image build fail. Signed-off-by: Seppo Ingalsuo <seppo.ingalsuo(a)linux.intel.com> --- src/platform/baytrail/include/platform/memory.h | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/platform/baytrail/include/platform/memory.h b/src/platform/baytrail/include/platform/memory.h index c6a1301..082592c 100644 --- a/src/platform/baytrail/include/platform/memory.h +++ b/src/platform/baytrail/include/platform/memory.h @@ -122,8 +122,9 @@ HEAP_RT_COUNT512 * 512 + HEAP_RT_COUNT1024 * 1024) #define HEAP_BUFFER_BASE (HEAP_RUNTIME_BASE + HEAP_RUNTIME_SIZE) -#define HEAP_BUFFER_SIZE \ - (DRAM0_SIZE - HEAP_RUNTIME_SIZE - REEF_STACK_SIZE - HEAP_SYSTEM_SIZE) +#define HEAP_BUFFER_SIZE \ + (DRAM0_SIZE - HEAP_RUNTIME_SIZE - REEF_STACK_SIZE -\ + HEAP_SYSTEM_SIZE - REEF_DATA_SIZE) #define HEAP_BUFFER_BLOCK_SIZE 0x180 #define HEAP_BUFFER_COUNT (HEAP_BUFFER_SIZE / HEAP_BUFFER_BLOCK_SIZE) -- 2.14.1

2 2

[Sound-open-firmware] [PATCH] hsw: fix heap buffer size so it doesnt overwrite stack
by Liam Girdwood 22 Feb '18

22 Feb '18

buffer heap overflowed. Fix. Signed-off-by: Liam Girdwood <liam.r.girdwood(a)linux.intel.com> --- src/platform/haswell/include/platform/memory.h | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/platform/haswell/include/platform/memory.h b/src/platform/haswell/include/platform/memory.h index 8cbc408..c5ada16 100644 --- a/src/platform/haswell/include/platform/memory.h +++ b/src/platform/haswell/include/platform/memory.h @@ -118,7 +118,8 @@ #define HEAP_BUFFER_BASE (HEAP_RUNTIME_BASE + HEAP_RUNTIME_SIZE) #define HEAP_BUFFER_SIZE \ - (DRAM0_SIZE - HEAP_RUNTIME_SIZE - REEF_STACK_SIZE - HEAP_SYSTEM_SIZE) + (DRAM0_SIZE - HEAP_RUNTIME_SIZE - REEF_STACK_SIZE -\ + HEAP_SYSTEM_SIZE - REEF_DATA_SIZE) #define HEAP_BUFFER_BLOCK_SIZE 0x180 #define HEAP_BUFFER_COUNT (HEAP_BUFFER_SIZE / HEAP_BUFFER_BLOCK_SIZE) -- 2.14.1

1 0

[Sound-open-firmware] [PATCH] Pipeline: Compilation fix for xt-xcc compiler
by Seppo Ingalsuo 22 Feb '18

22 Feb '18

The xt-xcc compiler does not accept NULL as return value from an int function. Signed-off-by: Seppo Ingalsuo <seppo.ingalsuo(a)linux.intel.com> --- src/audio/pipeline_static.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/audio/pipeline_static.c b/src/audio/pipeline_static.c index 7812dad..d307e09 100644 --- a/src/audio/pipeline_static.c +++ b/src/audio/pipeline_static.c @@ -367,7 +367,7 @@ int init_static_pipeline(struct ipc *ipc) /* init system pipeline core */ ret = pipeline_init(); if (ret < 0) - return NULL; + return ret; /* create the pipelines */ for (i = 0; i < ARRAY_SIZE(pipeline); i++) { -- 2.14.1

2 1

[Sound-open-firmware] [PATCH] cnl: Add missing host and link DMA init
by Tomasz Lauda 22 Feb '18

22 Feb '18

CONFIG_DMA_GW is set for Cannonlake, so add host and link initializations to avoid FW crash. Signed-off-by: Tomasz Lauda <tomasz.lauda(a)linux.intel.com> --- src/platform/cannonlake/dma.c | 13 +++++++++---- src/platform/cannonlake/platform.c | 15 +++++++++++++++ 2 files changed, 24 insertions(+), 4 deletions(-) diff --git a/src/platform/cannonlake/dma.c b/src/platform/cannonlake/dma.c index beac6cf..a47ce9f 100644 --- a/src/platform/cannonlake/dma.c +++ b/src/platform/cannonlake/dma.c @@ -32,6 +32,7 @@ #include <reef/dma.h> #include <reef/dw-dma.h> +#include <reef/hd-dma.h> #include <platform/memory.h> #include <platform/interrupt.h> #include <platform/dma.h> @@ -133,33 +134,37 @@ static struct dma dma[] = { .plat_data = { .id = DMA_HOST_IN_DMAC, .base = GTW_HOST_IN_STREAM_BASE(0), - .channels = 7, + .channels = 9, .irq = IRQ_EXT_HOST_DMA_IN_LVL3(0, 0), }, + .ops = &hda_host_dma_ops, }, { /* Host out DMAC */ .plat_data = { .id = DMA_HOST_OUT_DMAC, .base = GTW_HOST_OUT_STREAM_BASE(0), - .channels = 6, + .channels = 7, .irq = IRQ_EXT_HOST_DMA_OUT_LVL3(0, 0), }, + .ops = &hda_host_dma_ops, }, { /* Link In DMAC */ .plat_data = { .id = DMA_LINK_IN_DMAC, .base = GTW_LINK_IN_STREAM_BASE(0), - .channels = 8, + .channels = 9, .irq = IRQ_EXT_LINK_DMA_IN_LVL4(0, 0), }, + .ops = &hda_link_dma_ops, }, { /* Link out DMAC */ .plat_data = { .id = DMA_LINK_OUT_DMAC, .base = GTW_LINK_OUT_STREAM_BASE(0), - .channels = 8, + .channels = 7, .irq = IRQ_EXT_LINK_DMA_OUT_LVL4(0, 0), }, + .ops = &hda_link_dma_ops, },}; struct dma *dma_get(int dmac_id) diff --git a/src/platform/cannonlake/platform.c b/src/platform/cannonlake/platform.c index f387109..1a9b88a 100644 --- a/src/platform/cannonlake/platform.c +++ b/src/platform/cannonlake/platform.c @@ -253,6 +253,21 @@ int platform_init(struct reef *reef) return -ENODEV; dma_probe(dmac); + dmac = dma_get(DMA_GP_LP_DMAC1); + if (!dmac) + return -ENODEV; + dma_probe(dmac); + + dmac = dma_get(DMA_HOST_OUT_DMAC); + if (!dmac) + return -ENODEV; + dma_probe(dmac); + + dmac = dma_get(DMA_HOST_IN_DMAC); + if (!dmac) + return -ENODEV; + dma_probe(dmac); + /* init SSP ports */ trace_point(TRACE_BOOT_PLATFORM_SSP); for(i = 0; i < PLATFORM_SSP_COUNT; i++) { -- 2.7.4

2 1

[Sound-open-firmware] [PATCH] Fix the referencing out of bounds clock
by Tomasz Lauda 22 Feb '18

22 Feb '18

--- 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 bcce20d..3a16c1a 100644 --- a/src/platform/cannonlake/clk.c +++ b/src/platform/cannonlake/clk.c @@ -75,7 +75,7 @@ static const struct freq_table ssp_freq[] = { {25000000, 25,}, /* default */ }; -#define CPU_DEFAULT_IDX 2 +#define CPU_DEFAULT_IDX 1 #define SSP_DEFAULT_IDX 1 static inline uint32_t get_freq(const struct freq_table *table, int size, -- 2.7.4 -------------------------------------------------------------------- Intel Technology Poland sp. z o.o. ul. Slowackiego 173 | 80-298 Gdansk | Sad Rejonowy Gdansk Polnoc | VII Wydzial Gospodarczy Krajowego Rejestru Sadowego - KRS 101882 | NIP 957-07-52-316 | Kapital zakladowy 200.000 PLN. Ta wiadomosc wraz z zalacznikami jest przeznaczona dla okreslonego adresata i moze zawierac informacje poufne. W razie przypadkowego otrzymania tej wiadomosci, prosimy o powiadomienie nadawcy oraz trwale jej usuniecie; jakiekolwiek przegladanie lub rozpowszechnianie jest zabronione. This e-mail and any attachments may contain confidential material for the sole use of the intended recipient(s). If you are not the intended recipient, please contact the sender and delete all copies; any review or distribution by others is strictly prohibited.

3 2

[Sound-open-firmware] [PATCH] Correct platform name in CNL linker script
by Tomasz Lauda 22 Feb '18

22 Feb '18

--- src/platform/cannonlake/cannonlake.x.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/platform/cannonlake/cannonlake.x.in b/src/platform/cannonlake/cannonlake.x.in index 9ca28f0..0ed5bc6 100644 --- a/src/platform/cannonlake/cannonlake.x.in +++ b/src/platform/cannonlake/cannonlake.x.in @@ -1,5 +1,5 @@ /* - * Linker Script for Apololake. + * Linker Script for Cannonlake. * * This script is run through the GNU C preprocessor to align the memory * offsets with headers. -- 2.7.4 -------------------------------------------------------------------- Intel Technology Poland sp. z o.o. ul. Slowackiego 173 | 80-298 Gdansk | Sad Rejonowy Gdansk Polnoc | VII Wydzial Gospodarczy Krajowego Rejestru Sadowego - KRS 101882 | NIP 957-07-52-316 | Kapital zakladowy 200.000 PLN. Ta wiadomosc wraz z zalacznikami jest przeznaczona dla okreslonego adresata i moze zawierac informacje poufne. W razie przypadkowego otrzymania tej wiadomosci, prosimy o powiadomienie nadawcy oraz trwale jej usuniecie; jakiekolwiek przegladanie lub rozpowszechnianie jest zabronione. This e-mail and any attachments may contain confidential material for the sole use of the intended recipient(s). If you are not the intended recipient, please contact the sender and delete all copies; any review or distribution by others is strictly prohibited.

2 1

[Sound-open-firmware] [PATCH] soft: kmod_scripts: initial import
by Pierre-Louis Bossart 22 Feb '18

22 Feb '18

set of basic bash scripts to remove/insert SOF Linux kernel modules in the right order. This is typically used to avoid rebooting every time the SOF image or topology are updated - and detect leaks on remove. sof_remove.sh: remove all SOF modules sof_insert.sh: probe SOF modules sof_bootone.sh: combination of remove/insert in one shot sof_bootloop.sh: boot loop to see if firmware boot is reliable over time This can probably be enhanced to remove spurious "module is not currently loaded" logs. Signed-off-by: Pierre-Louis Bossart <pierre-louis.bossart(a)linux.intel.com> --- kmod_scripts/sof_bootloop.sh | 11 +++++++++++ kmod_scripts/sof_bootone.sh | 19 +++++++++++++++++++ kmod_scripts/sof_insert.sh | 12 ++++++++++++ kmod_scripts/sof_remove.sh | 27 +++++++++++++++++++++++++++ 4 files changed, 69 insertions(+) create mode 100755 kmod_scripts/sof_bootloop.sh create mode 100755 kmod_scripts/sof_bootone.sh create mode 100755 kmod_scripts/sof_insert.sh create mode 100755 kmod_scripts/sof_remove.sh diff --git a/kmod_scripts/sof_bootloop.sh b/kmod_scripts/sof_bootloop.sh new file mode 100755 index 0000000..f1bc99b --- /dev/null +++ b/kmod_scripts/sof_bootloop.sh @@ -0,0 +1,11 @@ +#!/bin/bash + +MAXLOOPS=100 +COUNTER=0 + +while [ $COUNTER -lt $MAXLOOPS ]; do + echo "test $COUNTER" + ./sof_bootone.sh + dmesg > boot_$COUNTER.bootlog + let COUNTER+=1 +done diff --git a/kmod_scripts/sof_bootone.sh b/kmod_scripts/sof_bootone.sh new file mode 100755 index 0000000..6bc5f27 --- /dev/null +++ b/kmod_scripts/sof_bootone.sh @@ -0,0 +1,19 @@ +#!/bin/bash + +dmesg -C +./sof_remove.sh +./sof_insert.sh +sleep 1 + +unset FW_BOOT +unset ERROR +FW_BOOT=$(dmesg | grep sof-audio | grep "boot complete") +ERROR=$(dmesg | grep sof-audio | grep "error") + +if [ ! -z "$ERROR" ] || [ -z "$FW_BOOT" ] +then + echo "boot failed" +else + echo "boot success" +fi + diff --git a/kmod_scripts/sof_insert.sh b/kmod_scripts/sof_insert.sh new file mode 100755 index 0000000..93b2242 --- /dev/null +++ b/kmod_scripts/sof_insert.sh @@ -0,0 +1,12 @@ +#!/bin/bash + +modprobe snd_soc_rt5670 +modprobe snd_soc_rt5645 +modprobe snd_soc_rt5651 +modprobe snd_soc_rt5640 +modprobe snd_soc_da7213 + +modprobe sof_acpi_dev +modprobe sof_pci_dev + + diff --git a/kmod_scripts/sof_remove.sh b/kmod_scripts/sof_remove.sh new file mode 100755 index 0000000..1ea0598 --- /dev/null +++ b/kmod_scripts/sof_remove.sh @@ -0,0 +1,27 @@ +#!/bin/bash + +rmmod sof_pci_dev +rmmod sof_acpi_dev +rmmod snd_soc_acpi_intel_match +rmmod snd_sof_intel_byt +rmmod snd_sof_intel_hsw +rmmod snd_sof_intel_bdw +rmmod snd_sof_intel_apl +rmmod snd_sof_intel_cnl +rmmod snd_sof_intel_hda_common +rmmod snd_sof + +rmmod snd_soc_sst_bytcr_rt5640 +rmmod snd_soc_sst_bytcr_rt5651 +rmmod snd_soc_sst_cht_bsw_rt5645 +rmmod snd_soc_sst_cht_bsw_rt5670 +rmmod snd_soc_sst_byt_cht_da7213 + +rmmod snd_soc_rt5670 +rmmod snd_soc_rt5645 +rmmod snd_soc_rt5651 +rmmod snd_soc_rt5640 +rmmod snd_soc_rl6231 +rmmod snd_soc_da7213 + +rmmod snd_soc_acpi -- 2.14.1

2 1

[Sound-open-firmware] [PATCH] rimage: fix elf section collision detection.
by Liam Girdwood 22 Feb '18

22 Feb '18

Section end was not checked. Now fixed. Added more error output to identify. Signed-off-by: Liam Girdwood <liam.r.girdwood(a)linux.intel.com> --- rimage/elf.c | 21 ++++++++++++++------- rimage/rimage.h | 2 +- 2 files changed, 15 insertions(+), 8 deletions(-) diff --git a/rimage/elf.c b/rimage/elf.c index 3f00f1d..b96222b 100644 --- a/rimage/elf.c +++ b/rimage/elf.c @@ -303,7 +303,7 @@ static void elf_module_limits(struct image *image, struct module *module) /* make sure no section overlap from any modules */ int elf_validate_section(struct image *image, struct module *module, - Elf32_Shdr *section) + Elf32_Shdr *section, int index) { struct module *m; Elf32_Shdr *s; @@ -322,14 +322,21 @@ int elf_validate_section(struct image *image, struct module *module, continue; /* only check valid sections */ - if (!(section->sh_flags & valid)) + if (!(s->sh_flags & valid)) continue; - if (section->sh_size == 0) + if (s->sh_size == 0) continue; - /* is section non overlapping ? */ + /* is section start non overlapping ? */ if (section->sh_addr >= s->sh_addr && + section->sh_addr < + s->sh_addr + s->sh_size) { + goto err; + } + + /* is section end non overlapping ? */ + if (section->sh_addr + section->sh_size > s->sh_addr && section->sh_addr + section->sh_size <= s->sh_addr + s->sh_size) { goto err; @@ -340,8 +347,8 @@ int elf_validate_section(struct image *image, struct module *module, return 0; err: - fprintf(stderr, "error: section overlap between %s and %s\n", - module->elf_file, m->elf_file); + fprintf(stderr, "error: section overlap between %s:%d and %s:%d\n", + module->elf_file, index, m->elf_file, j); fprintf(stderr, " [0x%x : 0x%x] overlaps with [0x%x :0x%x]\n", section->sh_addr, section->sh_addr + section->sh_size, s->sh_addr, s->sh_addr + s->sh_size); @@ -372,7 +379,7 @@ int elf_validate_modules(struct image *image) continue; /* is section non overlapping ? */ - ret = elf_validate_section(image, module, section); + ret = elf_validate_section(image, module, section, j); if (ret < 0) return ret; } diff --git a/rimage/rimage.h b/rimage/rimage.h index 4e387e9..adcb8c5 100644 --- a/rimage/rimage.h +++ b/rimage/rimage.h @@ -156,7 +156,7 @@ int elf_validate_modules(struct image *image); int elf_find_section(struct image *image, struct module *module, const char *name); int elf_validate_section(struct image *image, struct module *module, - Elf32_Shdr *section); + Elf32_Shdr *section, int index); /* supported machines */ extern const struct adsp machine_byt; -- 2.14.1

1 0

[Sound-open-firmware] [PATCH] Configure: Change XTENSA_CORE to Intel_HiFiEP for compatible platforms
by Seppo Ingalsuo 22 Feb '18

22 Feb '18

This patch changes the environment variable XTENSA_CORE for BYT, CHT, HSW, and BDW platforms. It is used during the configure script run to define the configuration for the xt-xcc compiler. The xt-xcc version for Minnowboard developers uses this configuration name so this edit avoids to specify it via configure command line (with another issue there). Also the earlier used configuration name is not available in that compiler. Signed-off-by: Seppo Ingalsuo <seppo.ingalsuo(a)linux.intel.com> --- configure.ac | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/configure.ac b/configure.ac index bb4d2e9..2e92bb3 100644 --- a/configure.ac +++ b/configure.ac @@ -112,7 +112,7 @@ case "$with_platform" in FW_NAME="byt" AC_SUBST(FW_NAME) - XTENSA_CORE="hifiep_bd5" + XTENSA_CORE="Intel_HiFiEP" AC_SUBST(XTENSA_CORE) AC_DEFINE([CONFIG_BAYTRAIL], [1], [Configure for Baytrail]) @@ -129,7 +129,7 @@ case "$with_platform" in FW_NAME="cht" AC_SUBST(FW_NAME) - XTENSA_CORE="hifiep_bd5" + XTENSA_CORE="Intel_HiFiEP" AC_SUBST(XTENSA_CORE) AC_DEFINE([CONFIG_CHERRYTRAIL], [1], [Configure for Cherrytrail]) @@ -164,7 +164,7 @@ case "$with_platform" in FW_NAME="hsw" AC_SUBST(FW_NAME) - XTENSA_CORE="hifiep_bd5" + XTENSA_CORE="Intel_HiFiEP" AC_SUBST(XTENSA_CORE) AC_DEFINE([CONFIG_HASWELL], [1], [Configure for Haswell]) @@ -181,7 +181,7 @@ case "$with_platform" in FW_NAME="bdw" AC_SUBST(FW_NAME) - XTENSA_CORE="hifiep_bd5" + XTENSA_CORE="Intel_HiFiEP" AC_SUBST(XTENSA_CORE) AC_DEFINE([CONFIG_BROADWELL], [1], [Configure for Broadwell]) -- 2.14.1

1 0