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

[Sound-open-firmware] [PATCH] host: build fix for missing string.h
by Liam Girdwood 12 Apr '18

12 Apr '18

Add string.h for host build. Signed-off-by: Liam Girdwood <liam.r.girdwood(a)linux.intel.com> --- src/arch/host/include/arch/sof.h | 3 --- src/arch/host/include/arch/string.h | 40 +++++++++++++++++++++++++++++++++++ src/library/include/platform/memory.h | 5 +++++ 3 files changed, 45 insertions(+), 3 deletions(-) create mode 100644 src/arch/host/include/arch/string.h diff --git a/src/arch/host/include/arch/sof.h b/src/arch/host/include/arch/sof.h index 75d0b25d..ce2bd698 100644 --- a/src/arch/host/include/arch/sof.h +++ b/src/arch/host/include/arch/sof.h @@ -42,9 +42,6 @@ /* architecture specific stack frames to dump */ #define ARCH_STACK_DUMP_FRAMES 32 -#define arch_memcpy(dest, src, size) \ - memcpy(dest, src, size) - static inline void *arch_get_stack_ptr(void) { void *frames[ARCH_STACK_DUMP_FRAMES]; diff --git a/src/arch/host/include/arch/string.h b/src/arch/host/include/arch/string.h new file mode 100644 index 00000000..56258b34 --- /dev/null +++ b/src/arch/host/include/arch/string.h @@ -0,0 +1,40 @@ +/* + * Copyright (c) 2018, Intel Corporation + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions are met: + * * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * * Neither the name of the Intel Corporation nor the + * names of its contributors may be used to endorse or promote products + * derived from this software without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" + * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE + * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE + * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE + * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR + * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF + * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS + * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN + * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) + * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. + * + * Author: Liam Girdwood <liam.r.girdwood(a)linux.intel.com> + * + */ + +#ifndef __INCLUDE_ARCH_STRING_SOF__ +#define __INCLUDE_ARCH_STRING_SOF__ + +void *xthal_memcpy(void *dst, const void *src, size_t len); + +#define arch_memcpy(dest, src, size) \ + xthal_memcpy(dest, src, size) + +#endif diff --git a/src/library/include/platform/memory.h b/src/library/include/platform/memory.h index ed7de103..4e5cc700 100644 --- a/src/library/include/platform/memory.h +++ b/src/library/include/platform/memory.h @@ -86,4 +86,9 @@ (DRAM0_SIZE - HEAP_MOD_SIZE - HEAP_BUF_SIZE) #endif + +#define MAILBOX_DSPBOX_BASE 0 +#define MAILBOX_HOSTBOX_BASE 0 +#define MAILBOX_BASE 0 + #endif -- 2.14.1

1 0

[Sound-open-firmware] [PATCH] core: sof.h: remove unused code.
by Liam Girdwood 12 Apr '18

12 Apr '18

Code is not used or referenced anywhere. Signed-off-by: Liam Girdwood <liam.r.girdwood(a)linux.intel.com> --- src/include/sof/sof.h | 16 ---------------- 1 file changed, 16 deletions(-) diff --git a/src/include/sof/sof.h b/src/include/sof/sof.h index d1c6452a..b9d7aff0 100644 --- a/src/include/sof/sof.h +++ b/src/include/sof/sof.h @@ -44,18 +44,6 @@ struct sa; ({const typeof(((type *)0)->member) *__memberptr = (ptr); \ (type *)((char *)__memberptr - offsetof(type, member));}) -/* C memcpy for arch that dont have arch_memcpy() */ -void cmemcpy(void *dest, void *src, size_t size); - -// TODO: add detection for arch memcpy -#if 1 -#define rmemcpy(dest, src, size) \ - arch_memcpy(dest, src, size) -#else -#define rmemcpy(dest, src, size) \ - cmemcpy(dest, src, size) -#endif - /* general firmware context */ struct sof { /* init data */ @@ -70,10 +58,6 @@ struct sof { /* DMA for Trace*/ struct dma_trace_data *dmat; - - /* private data */ - void *arch_private; - void *plat_private; }; #endif -- 2.14.1

1 0

[Sound-open-firmware] [PATCH] rimage: display ELF section names.
by Liam Girdwood 12 Apr '18

12 Apr '18

Display the name of each ELF section to aid build and debug. Signed-off-by: Liam Girdwood <liam.r.girdwood(a)linux.intel.com> --- rimage/elf.c | 36 +++++++++++++++++++++++++++++++----- rimage/rimage.h | 1 + 2 files changed, 32 insertions(+), 5 deletions(-) diff --git a/rimage/elf.c b/rimage/elf.c index 78f6d57d..b1a1861b 100644 --- a/rimage/elf.c +++ b/rimage/elf.c @@ -51,6 +51,29 @@ static int elf_read_sections(struct image *image, struct module *module) return -errno; } + /* read in strings */ + module->strings = calloc(1, section[hdr->e_shstrndx].sh_size); + if (!module->strings) { + fprintf(stderr, "error: failed %s to read ELF strings for %d\n", + module->elf_file, -errno); + return -errno; + } + + ret = fseek(module->fd, section[hdr->e_shstrndx].sh_offset, SEEK_SET); + if (ret < 0) { + fprintf(stderr, "error: can't seek to %s stringss %d\n", + module->elf_file, ret); + return ret; + } + + count = fread(module->strings, 1, section[hdr->e_shstrndx].sh_size, + module->fd); + if (count != section[hdr->e_shstrndx].sh_size) { + fprintf(stderr, "error: failed to read %s strings %d\n", + module->elf_file, -errno); + return -errno; + } + /* find manifest module data */ man_section_idx = elf_find_section(image, module, ".bss"); if (man_section_idx < 0) { @@ -233,7 +256,7 @@ static void elf_module_size(struct image *image, struct module *module, if (module->text_end < section->sh_addr + section->sh_size) module->text_end = section->sh_addr + section->sh_size; - fprintf(stdout, "\tTEXT\n"); + fprintf(stdout, "\tTEXT\t"); } else { /* initialized data, also calc the writable sections */ if (module->data_start > section->sh_addr) @@ -241,7 +264,7 @@ static void elf_module_size(struct image *image, struct module *module, if (module->data_end < section->sh_addr + section->sh_size) module->data_end = section->sh_addr + section->sh_size; - fprintf(stdout, "\tDATA\n"); + fprintf(stdout, "\tDATA\t"); } break; case SHT_NOBITS: @@ -250,9 +273,9 @@ static void elf_module_size(struct image *image, struct module *module, /* updated the .bss segment */ module->bss_start = section->sh_addr; module->bss_end = section->sh_addr + section->sh_size; - fprintf(stdout, "\tBSS\n"); + fprintf(stdout, "\tBSS\t"); } else { - fprintf(stdout, "\tHEAP\n"); + fprintf(stdout, "\tHEAP\t"); } break; default: @@ -272,7 +295,7 @@ static void elf_module_limits(struct image *image, struct module *module) fprintf(stdout, " Found %d sections, listing valid sections......\n", module->hdr.e_shnum); - fprintf(stdout, "\tNo\tStart\t\tEnd\t\tBytes\tType\n"); + fprintf(stdout, "\tNo\tStart\t\tEnd\t\tBytes\tType\tName\n"); /* iterate all sections and get size of segments */ for (i = 0; i < module->hdr.e_shnum; i++) { @@ -296,6 +319,8 @@ static void elf_module_limits(struct image *image, struct module *module) /* text or data section */ elf_module_size(image, module, section, i); + /* section name */ + fprintf(stdout, "%s\n", module->strings + section->sh_name); } fprintf(stdout, "\n"); @@ -528,5 +553,6 @@ void elf_free_module(struct image *image, int module_index) free(module->prg); free(module->section); + free(module->strings); fclose(module->fd); } diff --git a/rimage/rimage.h b/rimage/rimage.h index 654ba90f..8b46766d 100644 --- a/rimage/rimage.h +++ b/rimage/rimage.h @@ -53,6 +53,7 @@ struct module { Elf32_Ehdr hdr; Elf32_Shdr *section; Elf32_Phdr *prg; + char *strings; uint32_t text_start; uint32_t text_end; -- 2.14.1

1 0

[Sound-open-firmware] [PATCH] lib: string: Add rstrcmp() string compare.
by Liam Girdwood 12 Apr '18

12 Apr '18

Add strcmp() equivalent. Signed-off-by: Liam Girdwood <liam.r.girdwood(a)linux.intel.com> --- src/include/sof/alloc.h | 1 + src/lib/lib.c | 17 +++++++++++++++++ 2 files changed, 18 insertions(+) diff --git a/src/include/sof/alloc.h b/src/include/sof/alloc.h index d87795d2..d5fc1c2d 100644 --- a/src/include/sof/alloc.h +++ b/src/include/sof/alloc.h @@ -113,6 +113,7 @@ void *rballoc(int zone, uint32_t flags, size_t bytes); void bzero(void *s, size_t n); void *memset(void *s, int c, size_t n); int rstrlen(const char *s); +int rstrcmp(const char *s1, const char *s2); /* Heap save/restore contents and context for PM D0/D3 events */ uint32_t mm_pm_context_size(void); diff --git a/src/lib/lib.c b/src/lib/lib.c index 5aa194c8..79198fd9 100644 --- a/src/lib/lib.c +++ b/src/lib/lib.c @@ -106,3 +106,20 @@ int rstrlen(const char *s) while(*p++ != 0); return (p - s) - 1; } + +/* generic string compare */ +int rstrcmp(const char *s1, const char *s2) +{ + while (*s1 != 0 && *s2 != 0) { + if (*s1 < *s2) + return -1; + if (*s1 > *s2) + return 1; + s1++; + s2++; + } + + /* match */ + return 0; +} + -- 2.14.1

1 0

[Sound-open-firmware] [PATCH] dist: fix make dist compiling issue for HSW, APL and CNL
by Keqiao.Zhang 11 Apr '18

11 Apr '18

Signed-off-by: Keqiao.Zhang <keqiao.zhang(a)linux.intel.com> --- src/arch/xtensa/include/arch/Makefile.am | 1 + src/arch/xtensa/xtos/Makefile.am | 1 + src/audio/Makefile.am | 4 ++++ src/include/sof/Makefile.am | 2 ++ src/platform/apollolake/Makefile.am | 2 ++ src/platform/cannonlake/Makefile.am | 4 ++++ src/platform/cannonlake/include/xtensa/config/Makefile.am | 1 + src/platform/haswell/Makefile.am | 2 ++ src/platform/haswell/include/xtensa/config/Makefile.am | 1 + 9 files changed, 18 insertions(+) diff --git a/src/arch/xtensa/include/arch/Makefile.am b/src/arch/xtensa/include/arch/Makefile.am index 779e449..8e08ff5 100644 --- a/src/arch/xtensa/include/arch/Makefile.am +++ b/src/arch/xtensa/include/arch/Makefile.am @@ -6,4 +6,5 @@ noinst_HEADERS = \ spinlock.h \ task.h \ timer.h \ + string.h \ wait.h diff --git a/src/arch/xtensa/xtos/Makefile.am b/src/arch/xtensa/xtos/Makefile.am index 2e855e7..46a3dfe 100644 --- a/src/arch/xtensa/xtos/Makefile.am +++ b/src/arch/xtensa/xtos/Makefile.am @@ -3,6 +3,7 @@ noinst_HEADERS = \ xtos-params.h \ interrupt-pri.h \ window-vectors-new.S \ + int-highpri-dispatcher.S \ int-medpri-dispatcher.S noinst_LIBRARIES = \ diff --git a/src/audio/Makefile.am b/src/audio/Makefile.am index 8a0415e..5f69b65 100644 --- a/src/audio/Makefile.am +++ b/src/audio/Makefile.am @@ -2,6 +2,10 @@ includedir = $(prefix)/include/sof/audio include_HEADERS = \ eq_iir.h \ + iir.h \ + fir.h \ + src_config.h \ + src.h \ eq_fir.h COMP_SRC = \ diff --git a/src/include/sof/Makefile.am b/src/include/sof/Makefile.am index f620835..b667459 100644 --- a/src/include/sof/Makefile.am +++ b/src/include/sof/Makefile.am @@ -33,4 +33,6 @@ include_HEADERS = \ timer.h \ trace.h \ wait.h \ + string.h \ + hda-dma.h \ work.h diff --git a/src/platform/apollolake/Makefile.am b/src/platform/apollolake/Makefile.am index 8b441b8..fcf321e 100644 --- a/src/platform/apollolake/Makefile.am +++ b/src/platform/apollolake/Makefile.am @@ -1,5 +1,7 @@ SUBDIRS = include +EXTRA_DIST = apollolake.x.in + noinst_LIBRARIES = libplatform.a libplatform_a_SOURCES = \ diff --git a/src/platform/cannonlake/Makefile.am b/src/platform/cannonlake/Makefile.am index 3fe45ac..503271c 100644 --- a/src/platform/cannonlake/Makefile.am +++ b/src/platform/cannonlake/Makefile.am @@ -1,5 +1,9 @@ SUBDIRS = include +EXTRA_DIST = \ + cannonlake.x.in \ + boot_ldr.x.in + noinst_LIBRARIES = libplatform.a libplatform_a_SOURCES = \ diff --git a/src/platform/cannonlake/include/xtensa/config/Makefile.am b/src/platform/cannonlake/include/xtensa/config/Makefile.am index 99c21a5..bfca58b 100644 --- a/src/platform/cannonlake/include/xtensa/config/Makefile.am +++ b/src/platform/cannonlake/include/xtensa/config/Makefile.am @@ -5,4 +5,5 @@ noinst_HEADERS = \ specreg.h \ system.h \ tie.h \ + core-isa-boot.h \ tie-asm.h diff --git a/src/platform/haswell/Makefile.am b/src/platform/haswell/Makefile.am index 59c33b3..4591c12 100644 --- a/src/platform/haswell/Makefile.am +++ b/src/platform/haswell/Makefile.am @@ -1,5 +1,7 @@ SUBDIRS = include +EXTRA_DIST = haswell.x.in + noinst_LIBRARIES = libplatform.a libplatform_a_SOURCES = \ diff --git a/src/platform/haswell/include/xtensa/config/Makefile.am b/src/platform/haswell/include/xtensa/config/Makefile.am index 99c21a5..2404f99 100644 --- a/src/platform/haswell/include/xtensa/config/Makefile.am +++ b/src/platform/haswell/include/xtensa/config/Makefile.am @@ -5,4 +5,5 @@ noinst_HEADERS = \ specreg.h \ system.h \ tie.h \ + core-isa-hsw.h \ tie-asm.h -- 2.11.0

2 1

[Sound-open-firmware] [PATCH v2] Makefile: fix the make clean issue at the top-level directory
by Keqiao.Zhang 11 Apr '18

11 Apr '18

make clean done at the top-level does not clean the topology/test directory, use clean-local instead of clean Signed-off-by: Keqiao.Zhang <keqiao.zhang(a)linux.intel.com> --- topology/Makefile.am | 2 +- topology/test/Makefile.am | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/topology/Makefile.am b/topology/Makefile.am index a7e86fd..31d266e 100644 --- a/topology/Makefile.am +++ b/topology/Makefile.am @@ -42,7 +42,7 @@ MACHINES = \ all: ${MACHINES} -clean: +clean-local: rm -f *.conf rm -f *.tplg diff --git a/topology/test/Makefile.am b/topology/test/Makefile.am index 49f2240..d4f1722 100644 --- a/topology/test/Makefile.am +++ b/topology/test/Makefile.am @@ -17,7 +17,7 @@ DEPS = \ all : *.m4 ${DEPS} ./tplg-build.sh -clean: +clean-local: rm -f *.conf rm -f *.tplg -- 2.11.0

3 2

[Sound-open-firmware] [PATCH] dist: fix make dist for tone topology M4
by Keqiao.Zhang 11 Apr '18

11 Apr '18

Signed-off-by: Keqiao.Zhang <keqiao.zhang(a)linux.intel.com> --- topology/test/Makefile.am | 1 + 1 file changed, 1 insertion(+) diff --git a/topology/test/Makefile.am b/topology/test/Makefile.am index 49f2240..565f222 100644 --- a/topology/test/Makefile.am +++ b/topology/test/Makefile.am @@ -25,5 +25,6 @@ clean: EXTRA_DIST = \ test-capture-ssp.m4 \ test-playback-ssp.m4 \ + test-tone-playback-ssp.m4 \ test-ssp.m4 \ tplg-build.sh -- 2.11.0

2 1

[Sound-open-firmware] [PATCH] Makefile: fix the make clean issue at the top-level directory
by Keqiao.Zhang 11 Apr '18

11 Apr '18

make clean done at the top-level does not clean the topology/test directory, updated the SUBDIRS to fix it. Signed-off-by: Keqiao.Zhang <keqiao.zhang(a)linux.intel.com> --- Makefile.am | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile.am b/Makefile.am index ea5d746..ef6d1b0 100644 --- a/Makefile.am +++ b/Makefile.am @@ -1 +1 @@ -SUBDIRS = rmbox topology +SUBDIRS = rmbox topology/test/ -- 2.11.0

3 2

[Sound-open-firmware] [PATCH] dist: fix make dist compling issue for HSW, APL and CNL
by Keqiao.Zhang 10 Apr '18

10 Apr '18

Signed-off-by: Keqiao.Zhang <keqiao.zhang(a)linux.intel.com> --- src/arch/xtensa/include/arch/Makefile.am | 1 + src/arch/xtensa/xtos/Makefile.am | 1 + src/audio/Makefile.am | 4 ++++ src/include/sof/Makefile.am | 2 ++ src/platform/apollolake/Makefile.am | 2 ++ src/platform/cannonlake/Makefile.am | 4 ++++ src/platform/cannonlake/include/xtensa/config/Makefile.am | 1 + src/platform/haswell/Makefile.am | 2 ++ src/platform/haswell/include/xtensa/config/Makefile.am | 1 + 9 files changed, 18 insertions(+) diff --git a/src/arch/xtensa/include/arch/Makefile.am b/src/arch/xtensa/include/arch/Makefile.am index 779e449..8e08ff5 100644 --- a/src/arch/xtensa/include/arch/Makefile.am +++ b/src/arch/xtensa/include/arch/Makefile.am @@ -6,4 +6,5 @@ noinst_HEADERS = \ spinlock.h \ task.h \ timer.h \ + string.h \ wait.h diff --git a/src/arch/xtensa/xtos/Makefile.am b/src/arch/xtensa/xtos/Makefile.am index 2e855e7..46a3dfe 100644 --- a/src/arch/xtensa/xtos/Makefile.am +++ b/src/arch/xtensa/xtos/Makefile.am @@ -3,6 +3,7 @@ noinst_HEADERS = \ xtos-params.h \ interrupt-pri.h \ window-vectors-new.S \ + int-highpri-dispatcher.S \ int-medpri-dispatcher.S noinst_LIBRARIES = \ diff --git a/src/audio/Makefile.am b/src/audio/Makefile.am index 8a0415e..5f69b65 100644 --- a/src/audio/Makefile.am +++ b/src/audio/Makefile.am @@ -2,6 +2,10 @@ includedir = $(prefix)/include/sof/audio include_HEADERS = \ eq_iir.h \ + iir.h \ + fir.h \ + src_config.h \ + src.h \ eq_fir.h COMP_SRC = \ diff --git a/src/include/sof/Makefile.am b/src/include/sof/Makefile.am index f620835..b667459 100644 --- a/src/include/sof/Makefile.am +++ b/src/include/sof/Makefile.am @@ -33,4 +33,6 @@ include_HEADERS = \ timer.h \ trace.h \ wait.h \ + string.h \ + hda-dma.h \ work.h diff --git a/src/platform/apollolake/Makefile.am b/src/platform/apollolake/Makefile.am index 8b441b8..fcf321e 100644 --- a/src/platform/apollolake/Makefile.am +++ b/src/platform/apollolake/Makefile.am @@ -1,5 +1,7 @@ SUBDIRS = include +EXTRA_DIST = apollolake.x.in + noinst_LIBRARIES = libplatform.a libplatform_a_SOURCES = \ diff --git a/src/platform/cannonlake/Makefile.am b/src/platform/cannonlake/Makefile.am index 3fe45ac..503271c 100644 --- a/src/platform/cannonlake/Makefile.am +++ b/src/platform/cannonlake/Makefile.am @@ -1,5 +1,9 @@ SUBDIRS = include +EXTRA_DIST = \ + cannonlake.x.in \ + boot_ldr.x.in + noinst_LIBRARIES = libplatform.a libplatform_a_SOURCES = \ diff --git a/src/platform/cannonlake/include/xtensa/config/Makefile.am b/src/platform/cannonlake/include/xtensa/config/Makefile.am index 99c21a5..bfca58b 100644 --- a/src/platform/cannonlake/include/xtensa/config/Makefile.am +++ b/src/platform/cannonlake/include/xtensa/config/Makefile.am @@ -5,4 +5,5 @@ noinst_HEADERS = \ specreg.h \ system.h \ tie.h \ + core-isa-boot.h \ tie-asm.h diff --git a/src/platform/haswell/Makefile.am b/src/platform/haswell/Makefile.am index 59c33b3..4591c12 100644 --- a/src/platform/haswell/Makefile.am +++ b/src/platform/haswell/Makefile.am @@ -1,5 +1,7 @@ SUBDIRS = include +EXTRA_DIST = haswell.x.in + noinst_LIBRARIES = libplatform.a libplatform_a_SOURCES = \ diff --git a/src/platform/haswell/include/xtensa/config/Makefile.am b/src/platform/haswell/include/xtensa/config/Makefile.am index 99c21a5..2404f99 100644 --- a/src/platform/haswell/include/xtensa/config/Makefile.am +++ b/src/platform/haswell/include/xtensa/config/Makefile.am @@ -5,4 +5,5 @@ noinst_HEADERS = \ specreg.h \ system.h \ tie.h \ + core-isa-hsw.h \ tie-asm.h -- 2.11.0

2 1

[Sound-open-firmware] [PATCH] configure: Fix --with-dsp-core flag
by Liam Girdwood 06 Apr '18

06 Apr '18

From: Tomasz Lauda <tomasz.lauda(a)linux.intel.com> --with-dsp-core flag should accept every core name. Signed-off-by: Tomasz Lauda <tomasz.lauda(a)linux.intel.com> --- configure.ac | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/configure.ac b/configure.ac index 9b74c6a9..fddb2b76 100644 --- a/configure.ac +++ b/configure.ac @@ -233,9 +233,8 @@ AC_ARG_WITH([dsp-core], [], [with_dsp_core=no]) case "$with_dsp_core" in - CHT_audio_hifiep*) - # BXT/CHT DSP Core - XTENSA_CORE="CHT_audio_hifiep" + *) + XTENSA_CORE="$with_dsp_core" AC_SUBST(XTENSA_CORE) ;; -- 2.14.1

1 0