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

[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