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

[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

[Sound-open-firmware] [PATCH] Fix wrong rimage command in firmware generating.
by yan.wang＠linux.intel.com 22 Feb '18

22 Feb '18

From: Yan Wang <yan.wang(a)linux.intel.com> Need add "-l" for boot loader and "-i" for input file. Signed-off-by: Yan Wang <yan.wang(a)linux.intel.com> --- src/arch/xtensa/Makefile.am | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/arch/xtensa/Makefile.am b/src/arch/xtensa/Makefile.am index b94d14e..b660bb1 100644 --- a/src/arch/xtensa/Makefile.am +++ b/src/arch/xtensa/Makefile.am @@ -151,7 +151,7 @@ bin-local: $(BIN_FLAGS) $(MODULE_INSERT) $(OBJDUMP) -S reef-$(FW_NAME) > reef-$(FW_NAME).lst $(OBJDUMP) -D reef-$(FW_NAME) > reef-$(FW_NAME).dis - rimage -o reef-$(FW_NAME).ri -m $(FW_NAME) $(RIMAGE_BOOT_FLAGS) $(RIMAGE_FLAGS) + rimage -o reef-$(FW_NAME).ri -m $(FW_NAME) -l $(RIMAGE_BOOT_FLAGS) -i $(RIMAGE_FLAGS) vminstall-local: scp -P 5555 reef-*.ri root@localhost:/lib/firmware/intel/ -- 2.14.3

3 2

[Sound-open-firmware] [PATCH v2] 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 initialization to avoid FW crash. Signed-off-by: Tomasz Lauda <tomasz.lauda(a)linux.intel.com> --- src/drivers/hda-dma.c | 2 +- src/platform/cannonlake/dma.c | 13 +++++++++---- src/platform/cannonlake/platform.c | 10 ++++++++++ 3 files changed, 20 insertions(+), 5 deletions(-) diff --git a/src/drivers/hda-dma.c b/src/drivers/hda-dma.c index 226a34e..6526b74 100644 --- a/src/drivers/hda-dma.c +++ b/src/drivers/hda-dma.c @@ -77,7 +77,7 @@ /* DGBS */ #define DGBS_MASK 0xfffff0 -#define HDA_DMA_MAX_CHANS 8 +#define HDA_DMA_MAX_CHANS 9 struct hda_chan_data { uint32_t stream_id; 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..beb6582 100644 --- a/src/platform/cannonlake/platform.c +++ b/src/platform/cannonlake/platform.c @@ -253,6 +253,16 @@ int platform_init(struct reef *reef) 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

3 4

[Sound-open-firmware] [PATCH] apl: clk: clock data to be allocated in system heap.
by Liam Girdwood 21 Feb '18

21 Feb '18

Fix clock data to be allocated in the system heap like other system init data. Signed-off-by: Liam Girdwood <liam.r.girdwood(a)linux.intel.com> --- src/platform/apollolake/clk.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/platform/apollolake/clk.c b/src/platform/apollolake/clk.c index a10805b..72d2e9f 100644 --- a/src/platform/apollolake/clk.c +++ b/src/platform/apollolake/clk.c @@ -197,7 +197,7 @@ uint64_t clock_time_elapsed(int clock, uint64_t previous, uint64_t *current) void init_platform_clocks(void) { - clk_pdata = rmalloc(RZONE_RUNTIME, RFLAGS_NONE, sizeof(*clk_pdata)); + clk_pdata = rmalloc(RZONE_SYS, RFLAGS_NONE, sizeof(*clk_pdata)); spinlock_init(&clk_pdata->clk[0].lock); spinlock_init(&clk_pdata->clk[1].lock); -- 2.14.1

1 7

[Sound-open-firmware] [PATCH] CONFIG_DMA_GW is defined for CNL, but host and link DMAs initialization is missing
by Tomasz Lauda 20 Feb '18

20 Feb '18

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 20 Feb '18

20 Feb '18

Signed-off-by: Tomasz Lauda <tomasz.lauda(a)linux.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 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

1 0