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

[Sound-open-firmware] [PATCH] makefile: link reset vector to main image if there is no boot ldr
by Marcin Maka 29 May '18

29 May '18

Reset vector linked to main image is not executed if there is boot ldr in the path. Signed-off-by: Marcin Maka <marcin.maka(a)linux.intel.com> --- src/arch/xtensa/Makefile.am | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/src/arch/xtensa/Makefile.am b/src/arch/xtensa/Makefile.am index 44883ad..d966691 100644 --- a/src/arch/xtensa/Makefile.am +++ b/src/arch/xtensa/Makefile.am @@ -61,7 +61,6 @@ sof_LDADD = \ ../../audio/libaudio.a \ ../../drivers/libdrivers.a \ ../../math/libsof_math.a \ - libreset.a \ xtos/libxtos.a \ xtos/libxlevel2.a \ xtos/libxlevel3.a \ @@ -70,6 +69,11 @@ sof_LDADD = \ hal/libhal.a \ -lgcc +if !BUILD_BOOTLOADER +sof_LDADD += \ + libreset.a +endif + sof_LDFLAGS = \ $(ARCH_LDFLAGS) -Wl,-Map=sof-$(FW_NAME).map \ -T ../../platform/$(PLATFORM)/$(PLATFORM_LDSCRIPT) -- 2.7.4

2 1

[Sound-open-firmware] [PATCH] SSP: Add trace print for config->format value into ssp_set_config()
by Seppo Ingalsuo 29 May '18

29 May '18

This patch adds the trace information to BYT and APL platforms type SSP drivers. The traced value helps to determine the configured serial bus format. Signed-off-by: Seppo Ingalsuo <seppo.ingalsuo(a)linux.intel.com> --- src/drivers/apl-ssp.c | 1 + src/drivers/byt-ssp.c | 1 + 2 files changed, 2 insertions(+) diff --git a/src/drivers/apl-ssp.c b/src/drivers/apl-ssp.c index 53bb8be..6571b90 100644 --- a/src/drivers/apl-ssp.c +++ b/src/drivers/apl-ssp.c @@ -131,6 +131,7 @@ static inline int ssp_set_config(struct dai *dai, } trace_ssp("cos"); + trace_value(config->format); /* reset SSP settings */ /* sscr0 dynamic settings are DSS, EDSS, SCR, FRDC, ECS */ diff --git a/src/drivers/byt-ssp.c b/src/drivers/byt-ssp.c index ca3385d..d058c5f 100644 --- a/src/drivers/byt-ssp.c +++ b/src/drivers/byt-ssp.c @@ -117,6 +117,7 @@ static inline int ssp_set_config(struct dai *dai, } trace_ssp("cos"); + trace_value(config->format); /* reset SSP settings */ /* sscr0 dynamic settings are DSS, EDSS, SCR, FRDC, ECS */ -- 2.14.1

2 1

[Sound-open-firmware] Graceful exit during DSP exception
by Ranjani Sridharan 28 May '18

28 May '18

Hi, While trying to send an IPC message to configure the DMIC params, I forgot to add the message size in the in the IPC header. The FW ran into an exception and seemed like it was stuck in an infinite loop. Is there way to exit gracefully in such cases? The dmesg log (partial)is shown below. Thanks, Ranjani [ 124.894619] sof-audio sof-audio: pcm: hw params stream 0 dir 1 [ 124.894625] sof-audio sof-audio: generating page table for ffffabae00dd1000 size 0xfc00 pages 16 [ 124.894630] sof-audio sof-audio: pfn i 0 idx 0 pfn 177730 [ 124.894633] sof-audio sof-audio: pfn i 1 idx 2 pfn 177731 [ 124.894637] sof-audio sof-audio: pfn i 2 idx 5 pfn 177732 [ 124.894640] sof-audio sof-audio: pfn i 3 idx 7 pfn 177733 [ 124.894643] sof-audio sof-audio: pfn i 4 idx 10 pfn 177734 [ 124.894646] sof-audio sof-audio: pfn i 5 idx 12 pfn 177735 [ 124.894649] sof-audio sof-audio: pfn i 6 idx 15 pfn 177736 [ 124.894653] sof-audio sof-audio: pfn i 7 idx 17 pfn 177737 [ 124.894656] sof-audio sof-audio: pfn i 8 idx 20 pfn 177738 [ 124.894659] sof-audio sof-audio: pfn i 9 idx 22 pfn 177739 [ 124.894662] sof-audio sof-audio: pfn i 10 idx 25 pfn 17773a [ 124.894665] sof-audio sof-audio: pfn i 11 idx 27 pfn 17773b [ 124.894669] sof-audio sof-audio: pfn i 12 idx 30 pfn 17773c [ 124.894672] sof-audio sof-audio: pfn i 13 idx 32 pfn 17773d [ 124.894675] sof-audio sof-audio: pfn i 14 idx 35 pfn 17773e [ 124.894678] sof-audio sof-audio: pfn i 15 idx 37 pfn 17773f [ 124.894701] sof-audio sof-audio: period_bytes:0x3c00 [ 124.894713] sof-audio sof-audio: stream_tag 2 [ 125.198613] sof-audio sof-audio: error: ipc timed out for 0x60010000 size 0x60 [ 125.206695] sof-audio sof-audio: status: fw entered - code 00000005 [ 125.213713] sof-audio sof-audio: error: runtime exception [ 125.219744] sof-audio sof-audio: error: trace point 00004000 [ 125.226063] sof-audio sof-audio: error: DSP Firmware Oops [ 125.232093] sof-audio sof-audio: EXCCAUSE 0x0000000d EXCVADDR 0xbe020000 PS 0x00070025 SAR 0x00000020 [ 125.243365] sof-audio sof-audio: EPC1 0xa001b7bc EPC2 0xa000b882 EPC3 0x00000000 EPC4 0x00000000 [ 125.254639] sof-audio sof-audio: EPC5 0x00000000 EPC6 0x00000000 EPC7 0x00000000 DEPC 0x00000000 [ 125.265926] sof-audio sof-audio: EPS2 0x00060520 EPS3 0x00000000 EPS4 0x00000000 EPS5 0x00000000 [ 125.277203] sof-audio sof-audio: EPS6 0x00000000 EPS7 0x00000000 INTENABL 0x000101d8 INTERRU 0x00000222 [ 125.288479] sof-audio sof-audio: stack dump from 0xa005fe50 [ 125.294706] sof-audio sof-audio: 0xa005fe50: 0xa001b7bc 0x00000000 0x00000020 0x00000000 [ 125.303748] sof-audio sof-audio: 0xa005fe54: 0xa0041874 0x00000000 0xfffffff8 0x00000000 [ 125.312791] sof-audio sof-audio: 0xa005fe58: 0x0000000d 0x00000000 0xa001b7b6 0xa001b7cc [ 125.321833] sof-audio sof-audio: 0xa005fe5c: 0xa000ebd1 0x00000000 0xa0040acc 0x00000000 [ 125.330875] sof-audio sof-audio: 0xa005fe60: 0xa0015c8c 0x00000000 0xa00408bc 0x00000000 [ 125.339918] sof-audio sof-audio: 0xa005fe64: 0xa000f5ce 0x00000000 0xa004186c 0x00000000 [ 125.348960] sof-audio sof-audio: 0xa005fe68: 0x00000000 0x00000000 0x00000001 0x00000000 [ 125.357995] sof-audio sof-audio: 0xa005fe6c: 0x019175d6 0x00000000 0x024e6d73 0x00000000 [ 125.367036] sof-audio sof-audio: error: waking up any trace sleepers [ 125.374283] sof-audio sof-audio: error: got wrong posn offset 0xffff8d1b for PCM -110 [ 125.383046] sof-audio sof-audio: ASoC: sof-audio hw params failed: -110 [ 125.396414] sof-audio sof-audio: pcm: free stream 0 dir 1 [ 125.710883] sof-audio sof-audio: error: ipc timed out for 0x60030000 size 0xc [ 125.718873] sof-audio sof-audio: status: fw entered - code 00000005 [ 125.725897] sof-audio sof-audio: error: runtime exception [ 125.731929] sof-audio sof-audio: error: trace point 00004000 [ 125.738253] sof-audio sof-audio: error: DSP Firmware Oops [ 125.744287] sof-audio sof-audio: EXCCAUSE 0x0000000d EXCVADDR 0xbe020000 PS 0x00070025 SAR 0x00000020 [ 125.755568] sof-audio sof-audio: EPC1 0xa001b7bc EPC2 0xa000b882 EPC3 0x00000000 EPC4 0x00000000 [ 125.766847] sof-audio sof-audio: EPC5 0x00000000 EPC6 0x00000000 EPC7 0x00000000 DEPC 0x00000000 [ 125.778127] sof-audio sof-audio: EPS2 0x00060520 EPS3 0x00000000 EPS4 0x00000000 EPS5 0x00000000 [ 125.789408] sof-audio sof-audio: EPS6 0x00000000 EPS7 0x00000000 INTENABL 0x000101d8 INTERRU 0x00000222 [ 125.800688] sof-audio sof-audio: stack dump from 0xa005fe50 [ 125.806917] sof-audio sof-audio: 0xa005fe50: 0xa001b7bc 0x00000000 0x00000020 0x00000000 [ 125.815964] sof-audio sof-audio: 0xa005fe54: 0xa0041874 0x00000000 0xfffffff8 0x00000000 [ 125.825010] sof-audio sof-audio: 0xa005fe58: 0x0000000d 0x00000000 0xa001b7b6 0xa001b7cc [ 125.834057] sof-audio sof-audio: 0xa005fe5c: 0xa000ebd1 0x00000000 0xa0040acc 0x00000000 [ 125.843102] sof-audio sof-audio: 0xa005fe60: 0xa0015c8c 0x00000000 0xa00408bc 0x00000000 [ 125.852148] sof-audio sof-audio: 0xa005fe64: 0xa000f5ce 0x00000000 0xa004186c 0x00000000 [ 125.861193] sof-audio sof-audio: 0xa005fe68: 0x00000000 0x00000000 0x00000001 0x00000000 [ 125.870238] sof-audio sof-audio: 0xa005fe6c: 0x019175d6 0x00000000 0x024e6d73 0x00000000 [ 125.879284] sof-audio sof-audio: error: waking up any trace sleepers [ 125.886887] sof-audio sof-audio: pcm: hw params stream 0 dir 1 [ 125.886890] sof-audio sof-audio: generating page table for ffffabae00dd1000 size 0xfc00 pages 16 [ 125.886892] sof-audio sof-audio: pfn i 0 idx 0 pfn 177730 [ 125.886894] sof-audio sof-audio: pfn i 1 idx 2 pfn 177731 [ 125.886895] sof-audio sof-audio: pfn i 2 idx 5 pfn 177732 [ 125.886897] sof-audio sof-audio: pfn i 3 idx 7 pfn 177733 [ 125.886898] sof-audio sof-audio: pfn i 4 idx 10 pfn 177734 [ 125.886900] sof-audio sof-audio: pfn i 5 idx 12 pfn 177735 [ 125.886901] sof-audio sof-audio: pfn i 6 idx 15 pfn 177736 [ 125.886903] sof-audio sof-audio: pfn i 7 idx 17 pfn 177737 [ 125.886904] sof-audio sof-audio: pfn i 8 idx 20 pfn 177738 [ 125.886906] sof-audio sof-audio: pfn i 9 idx 22 pfn 177739 [ 125.886907] sof-audio sof-audio: pfn i 10 idx 25 pfn 17773a [ 125.886908] sof-audio sof-audio: pfn i 11 idx 27 pfn 17773b [ 125.886910] sof-audio sof-audio: pfn i 12 idx 30 pfn 17773c [ 125.886911] sof-audio sof-audio: pfn i 13 idx 32 pfn 17773d [ 125.886913] sof-audio sof-audio: pfn i 14 idx 35 pfn 17773e [ 125.886914] sof-audio sof-audio: pfn i 15 idx 37 pfn 17773f [ 125.886933] sof-audio sof-audio: period_bytes:0x1800 [ 125.886940] sof-audio sof-audio: stream_tag 2

3 6

[Sound-open-firmware] about multiple BE dai_links support
by Keyon Jie 27 May '18

27 May '18

Hi all, As we are using link->id for BE dai_link match in snd_soc_find_dai_link(), so the link->id define in machine driver is crucial. Previously we set all link->id to be 0s in machine drivers(e.g. nocodec.c, bytcr_rt5651.c, cnl_rt274.c, bxt_pcm512x.c...), but in many other cAVS machine drivers(skl_rt286.c, kbl_rt5663_max98927.c, bxt_tdf8532.c, ...), they are using different link->id for different BE dai_links. So, to reuse those machine driver and BE dai_links for SOF, we have 2 solution to fix this: 1. remove the hardcode(to 0) of link->id in topology and add a param for that. I provide a RFC patch below. 2. change snd_soc_find_dai_link(), remove the link->id comparison. Personally I don't like the #2 solution, it will lead to backward compatibility issue for those exist drivers, and also is mismatch with the comment of snd_soc_find_dai_link(): * @id: DAI link ID to match * @name: DAI link name to match, optional * @stream_name: DAI link stream name to match, optional Hi Pierre/Liam, any comments on this? I hope we can align this soon then I can refine and send machine driver for GPMRB. Thanks, ~Keyon diff --git a/topology/m4/dai.m4 b/topology/m4/dai.m4 index 0b030af..0a79364 100644 --- a/topology/m4/dai.m4 +++ b/topology/m4/dai.m4 @@ -140,17 +140,17 @@ define(`DAI_TDM', dnl DAI Config) define(`N_DAI_CONFIG', `DAICONFIG.'$1) -dnl DAI_CONFIG(type, idx, name, format, valid bits, mclk, bclk, fsync, tdm) +dnl DAI_CONFIG(type, idx, link_id, name, format, valid bits, mclk, bclk, fsync, tdm) define(`DAI_CONFIG', `SectionHWConfig."'$1$2`" {' `' ` id "'$2`"' ` format "'$4`"' `' -` '$6 ` '$7 ` '$8 ` '$9 +` '$10 `}' `SectionVendorTuples."'N_DAI_CONFIG($1$2)`_tuples_str" {' ` tokens "sof_dai_tokens"' @@ -164,15 +164,15 @@ define(`DAI_CONFIG', `SectionVendorTuples."'N_DAI_CONFIG($1$2)`_tuples" {' ` tokens "sof_dai_tokens"' ` tuples."word" {' -` SOF_TKN_DAI_SAMPLE_BITS' STR($5) +` SOF_TKN_DAI_SAMPLE_BITS' STR($6) ` }' `}' `SectionData."'N_DAI_CONFIG($1$2)`_data" {' ` tuples "'N_DAI_CONFIG($1$2)`_tuples"' `}' `' -`SectionBE."'$3`" {' -` index "0"' +`SectionBE."'$4`" {' +` index "'$3`"' ` default_hw_conf_id "'$2`"' `' ` hw_configs ['

5 10

[Sound-open-firmware] [PATCH] topology:scripts: fix tplg build script to compile last topology when using xargs
by Ranjani Sridharan 26 May '18

26 May '18

When using xargs, the last topology file while batch processing alsatplg doesn't get compiled properly. It also removes a stray ; in the script. Signed-off-by: Ranjani Sridharan <ranjani.sridharan(a)linux.intel.com> --- topology/test/tplg-build.sh | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/topology/test/tplg-build.sh b/topology/test/tplg-build.sh index 004e8b1..9efda10 100755 --- a/topology/test/tplg-build.sh +++ b/topology/test/tplg-build.sh @@ -207,12 +207,14 @@ simple_test nocodec passthrough "DMIC0" s32le DMIC 0 s32le 1 500000 4800000 40 6 if [ "$USE_XARGS" == "yes" ] then echo "Batch processing m4 files..." - M4_STRINGS=${M4_STRINGS%?}; + M4_STRINGS=${M4_STRINGS%?} #m4 processing echo $M4_STRINGS | tr " " "," | tr '\n' '\0' | xargs -P0 -d ',' -n13 bash -c 'm4 "${@:1:${#}-1}" > ${13}.conf' m4 #execute alsatplg to create topology binary TEST_STRINGS=${TEST_STRINGS%?} - echo $TEST_STRINGS | tr '\n' '\0' | xargs -d ',' -P0 -n1 -I string alsatplg -v 1 -c string".conf" -o string".tplg" + echo $TEST_STRINGS | tr '\n' ',' |\ + xargs -d ',' -P0 -n1 -I string alsatplg -v 1 -c\ + string".conf" -o string".tplg" fi -- 2.17.0

2 1

[Sound-open-firmware] [PATCH v3 0/7] Multiple DAI type support in topology
by Ranjani Sridharan 26 May '18

26 May '18

This patchset adds the changes required for multiple DAI types in topology. The main changes are as follows: 1. The tplg build script was hardwired for SSP DAI type. Make changes to accomodate other types. 2. Changes to DAI_CONFIG to accomodate more than just SSP type DAI. 3. The test m4 files similarly were hardwired for SSP. This patchset makes them DAI type agnostic 4. Add DMIC DAI type config definition 5. Add DMIC specific tokens. This is the preliminary version. More tokens will be added as needed. 6. Add DMIC test topology v3 changes: - Added an extra token for fifo word length Ranjani Sridharan (7): [RFC]topology: separate ssp params from dai common params [RFC]topology: scripts: changes to accomodate different DAI types [RFC]topology: add DMIC tokens [RFC]topology: make m4 filenames dai type agnostic [RFC]topology: scripts: add dmic test topology [RFC]topology: add DMIC config definition to DAI config [RFC]topology: add DMIC dai support in test capture m4 topology/m4/dai.m4 | 74 +++++-- topology/sof-apl-nocodec.m4 | 11 +- topology/sof-apl-tdf8532.m4 | 22 ++- topology/sof-bdw-rt286.m4 | 11 +- topology/sof-bdw-rt5640.m4 | 11 +- topology/sof-byt-da7213.m4 | 11 +- topology/sof-byt-nocodec.m4 | 11 +- topology/sof-byt-rt5640.m4 | 11 +- topology/sof-byt-rt5645.m4 | 11 +- topology/sof-byt-rt5651.m4 | 11 +- topology/sof-cht-max98090.m4 | 11 +- topology/sof-cht-nocodec.m4 | 11 +- topology/sof-cnl-rt274.m4 | 11 +- topology/sof-hsw-rt5640.m4 | 11 +- topology/sof/tokens.m4 | 13 ++ topology/test/{test-ssp.m4 => test-all.m4} | 39 ++-- .../{test-capture-ssp.m4 => test-capture.m4} | 40 ++-- ...{test-playback-ssp.m4 => test-playback.m4} | 31 +-- ...-playback-ssp.m4 => test-tone-playback.m4} | 25 +-- topology/test/tplg-build.sh | 182 +++++++++++------- 20 files changed, 347 insertions(+), 211 deletions(-) rename topology/test/{test-ssp.m4 => test-all.m4} (65%) rename topology/test/{test-capture-ssp.m4 => test-capture.m4} (54%) rename topology/test/{test-playback-ssp.m4 => test-playback.m4} (65%) rename topology/test/{test-tone-playback-ssp.m4 => test-tone-playback.m4} (65%) -- 2.17.0

2 11

[Sound-open-firmware] [PATCH] makefile: add reset vector back
by Xiuli Pan 25 May '18

25 May '18

From: Pan Xiuli <xiuli.pan(a)linux.intel.com> Without reset vector, APL and BYT will fail to boot up. Signed-off-by: Pan Xiuli <xiuli.pan(a)linux.intel.com> --- santity test with: Mininow max rt5651 and UP2 Hifiberry PRO and CNL nocodec SOF master: fba1f1b106a7ece3c10892c07b043cd7d0a4feab SOF-Tool master: 7ee114d2ed822a0dbfc0dc3a37fd5c4977e00be8 https://github.com/plbossart/sound/tree/topic/sof-v4.14: ea7cb2577ca4343881b5179f97201449aa73345c --- src/arch/xtensa/Makefile.am | 1 + 1 file changed, 1 insertion(+) diff --git a/src/arch/xtensa/Makefile.am b/src/arch/xtensa/Makefile.am index 85ebadb..44883ad 100644 --- a/src/arch/xtensa/Makefile.am +++ b/src/arch/xtensa/Makefile.am @@ -61,6 +61,7 @@ sof_LDADD = \ ../../audio/libaudio.a \ ../../drivers/libdrivers.a \ ../../math/libsof_math.a \ + libreset.a \ xtos/libxtos.a \ xtos/libxlevel2.a \ xtos/libxlevel3.a \ -- 2.7.4

2 1

[Sound-open-firmware] [PATCH] topology: dai: add link_id for dai_link matching in DAI_CONFIG
by Keyon Jie 24 May '18

24 May '18

This is used for the matching with snd_soc_dai_link.id in BE dai_links. Signed-off-by: Keyon Jie <yang.jie(a)linux.intel.com> --- Test with: APL-MRB with tdf8532 codec Linux topic/sof-v4.14: 0de0fcb1d077c3c2c3b06a6c64e85f14b7e75c0b SOF master: e5dab2ada6ef98dbc6224863110cc86b5839ea01 Tool master: b4f3670870ba5a933c3ec58a51b59ff9ef8b3588 --- topology/m4/dai.m4 | 11 ++++++----- topology/sof-apl-nocodec.m4 | 2 +- topology/sof-apl-tdf8532.m4 | 4 ++-- topology/sof-bdw-rt286.m4 | 2 +- topology/sof-bdw-rt5640.m4 | 2 +- topology/sof-byt-da7213.m4 | 2 +- topology/sof-byt-nocodec.m4 | 2 +- topology/sof-byt-rt5640.m4 | 2 +- topology/sof-byt-rt5645.m4 | 2 +- topology/sof-byt-rt5651.m4 | 2 +- topology/sof-cht-max98090.m4 | 2 +- topology/sof-cht-nocodec.m4 | 2 +- topology/sof-cnl-rt274.m4 | 2 +- topology/sof-hsw-rt5640.m4 | 2 +- topology/test/test-capture-ssp.m4 | 2 +- topology/test/test-playback-ssp.m4 | 2 +- topology/test/test-ssp.m4 | 2 +- topology/test/test-tone-playback-ssp.m4 | 2 +- 18 files changed, 24 insertions(+), 23 deletions(-) diff --git a/topology/m4/dai.m4 b/topology/m4/dai.m4 index 0b030af..ba6cba4 100644 --- a/topology/m4/dai.m4 +++ b/topology/m4/dai.m4 @@ -140,17 +140,17 @@ define(`DAI_TDM', dnl DAI Config) define(`N_DAI_CONFIG', `DAICONFIG.'$1) -dnl DAI_CONFIG(type, idx, name, format, valid bits, mclk, bclk, fsync, tdm) +dnl DAI_CONFIG(type, idx, link_id, name, format, valid bits, mclk, bclk, fsync, tdm) define(`DAI_CONFIG', `SectionHWConfig."'$1$2`" {' `' ` id "'$2`"' -` format "'$4`"' +` format "'$5`"' `' -` '$6 ` '$7 ` '$8 ` '$9 +` '$10 `}' `SectionVendorTuples."'N_DAI_CONFIG($1$2)`_tuples_str" {' ` tokens "sof_dai_tokens"' @@ -164,14 +164,15 @@ define(`DAI_CONFIG', `SectionVendorTuples."'N_DAI_CONFIG($1$2)`_tuples" {' ` tokens "sof_dai_tokens"' ` tuples."word" {' -` SOF_TKN_DAI_SAMPLE_BITS' STR($5) +` SOF_TKN_DAI_SAMPLE_BITS' STR($6) ` }' `}' `SectionData."'N_DAI_CONFIG($1$2)`_data" {' ` tuples "'N_DAI_CONFIG($1$2)`_tuples"' `}' `' -`SectionBE."'$3`" {' +`SectionBE."'$4`" {' +` id "'$3`"' ` index "0"' ` default_hw_conf_id "'$2`"' `' diff --git a/topology/sof-apl-nocodec.m4 b/topology/sof-apl-nocodec.m4 index 9c4286b..68380e4 100644 --- a/topology/sof-apl-nocodec.m4 +++ b/topology/sof-apl-nocodec.m4 @@ -93,7 +93,7 @@ PCM_DUPLEX_ADD(Low Latency, 6, 0, 0, PIPELINE_PCM_1, PIPELINE_PCM_2) # # BE configurations - overrides config in ACPI if present # -DAI_CONFIG(SSP, 2, NoCodec, I2S, 24, +DAI_CONFIG(SSP, 2, 0, NoCodec, I2S, 24, DAI_CLOCK(mclk, 19200000, codec_mclk_in), DAI_CLOCK(bclk, 2400000, codec_slave), DAI_CLOCK(fsync, 48000, codec_slave), diff --git a/topology/sof-apl-tdf8532.m4 b/topology/sof-apl-tdf8532.m4 index 11299cd..b897346 100644 --- a/topology/sof-apl-tdf8532.m4 +++ b/topology/sof-apl-tdf8532.m4 @@ -76,13 +76,13 @@ PCM_DUPLEX_ADD(Port2, 4, 1, 1, PIPELINE_PCM_2, PIPELINE_PCM_3) # # BE configurations - overrides config in ACPI if present # -DAI_CONFIG(SSP, 4, SSP4-Codec, DSP_B, 32, +DAI_CONFIG(SSP, 4, 4, SSP4-Codec, DSP_B, 32, DAI_CLOCK(mclk, 24576000, codec_mclk_in), DAI_CLOCK(bclk, 12288000, codec_slave), DAI_CLOCK(fsync, 48000, codec_slave), DAI_TDM(8, 32, 15, 15)) -DAI_CONFIG(SSP, 2, SSP2-Codec, I2S, 16, +DAI_CONFIG(SSP, 2, 2, SSP2-Codec, I2S, 16, DAI_CLOCK(mclk, 24576000, codec_mclk_in), DAI_CLOCK(bclk, 1536000, codec_slave), DAI_CLOCK(fsync, 48000, codec_slave), diff --git a/topology/sof-bdw-rt286.m4 b/topology/sof-bdw-rt286.m4 index a13a49c..098d4c8 100644 --- a/topology/sof-bdw-rt286.m4 +++ b/topology/sof-bdw-rt286.m4 @@ -93,7 +93,7 @@ PCM_DUPLEX_ADD(Low Latency, 6, 0, 0, PIPELINE_PCM_1, PIPELINE_PCM_2) # # BE configurations - overrides config in ACPI if present # -DAI_CONFIG(SSP, 0, Codec, I2S, 24, +DAI_CONFIG(SSP, 0, 0, Codec, I2S, 24, DAI_CLOCK(mclk, 24000000, codec_mclk_in), DAI_CLOCK(bclk, 2400000, codec_slave), DAI_CLOCK(fsync, 48000, codec_slave), diff --git a/topology/sof-bdw-rt5640.m4 b/topology/sof-bdw-rt5640.m4 index 007944a..bbbbbe4 100644 --- a/topology/sof-bdw-rt5640.m4 +++ b/topology/sof-bdw-rt5640.m4 @@ -93,7 +93,7 @@ PCM_DUPLEX_ADD(Low Latency, 6, 0, 0, PIPELINE_PCM_1, PIPELINE_PCM_2) # # BE configurations - overrides config in ACPI if present # -DAI_CONFIG(SSP, 0, Codec, I2S, 24, +DAI_CONFIG(SSP, 0, 0, Codec, I2S, 24, DAI_CLOCK(mclk, 24000000, codec_mclk_in), DAI_CLOCK(bclk, 2400000, codec_slave), DAI_CLOCK(fsync, 48000, codec_slave), diff --git a/topology/sof-byt-da7213.m4 b/topology/sof-byt-da7213.m4 index ecf90c6..e3c7952 100644 --- a/topology/sof-byt-da7213.m4 +++ b/topology/sof-byt-da7213.m4 @@ -93,7 +93,7 @@ PCM_DUPLEX_ADD(Low Latency, 6, 0, 0, PIPELINE_PCM_1, PIPELINE_PCM_2) # # BE configurations - overrides config in ACPI if present # -DAI_CONFIG(SSP, 2, SSP2-Codec, I2S, 24, +DAI_CONFIG(SSP, 2, 0, SSP2-Codec, I2S, 24, DAI_CLOCK(mclk, 19200000, codec_mclk_in), DAI_CLOCK(bclk, 2400000, codec_slave), DAI_CLOCK(fsync, 48000, codec_slave), diff --git a/topology/sof-byt-nocodec.m4 b/topology/sof-byt-nocodec.m4 index efa321b..5c65fb0 100644 --- a/topology/sof-byt-nocodec.m4 +++ b/topology/sof-byt-nocodec.m4 @@ -93,7 +93,7 @@ PCM_DUPLEX_ADD(Low Latency, 6, 0, 0, PIPELINE_PCM_1, PIPELINE_PCM_2) # # BE configurations - overrides config in ACPI if present # -DAI_CONFIG(SSP, 2, NoCodec, I2S, 24, +DAI_CONFIG(SSP, 2, 0, NoCodec, I2S, 24, DAI_CLOCK(mclk, 19200000, codec_mclk_in), DAI_CLOCK(bclk, 2400000, codec_slave), DAI_CLOCK(fsync, 48000, codec_slave), diff --git a/topology/sof-byt-rt5640.m4 b/topology/sof-byt-rt5640.m4 index ae54969..7fae6f0 100644 --- a/topology/sof-byt-rt5640.m4 +++ b/topology/sof-byt-rt5640.m4 @@ -93,7 +93,7 @@ PCM_DUPLEX_ADD(Low Latency, 6, 0, 0, PIPELINE_PCM_1, PIPELINE_PCM_2) # # BE configurations - overrides config in ACPI if present # -DAI_CONFIG(SSP, 2, SSP2-Codec, I2S, 24, +DAI_CONFIG(SSP, 2, 0, SSP2-Codec, I2S, 24, DAI_CLOCK(mclk, 19200000, codec_mclk_in), DAI_CLOCK(bclk, 2400000, codec_slave), DAI_CLOCK(fsync, 48000, codec_slave), diff --git a/topology/sof-byt-rt5645.m4 b/topology/sof-byt-rt5645.m4 index 364121f..7b81cbd 100644 --- a/topology/sof-byt-rt5645.m4 +++ b/topology/sof-byt-rt5645.m4 @@ -93,7 +93,7 @@ PCM_DUPLEX_ADD(Low Latency, 6, 0, 0, PIPELINE_PCM_1, PIPELINE_PCM_2) # # BE configurations - overrides config in ACPI if present # -DAI_CONFIG(SSP, 2, SSP2-Codec, I2S, 24, +DAI_CONFIG(SSP, 2, 0, SSP2-Codec, I2S, 24, DAI_CLOCK(mclk, 19200000, codec_mclk_in), DAI_CLOCK(bclk, 2400000, codec_slave), DAI_CLOCK(fsync, 48000, codec_slave), diff --git a/topology/sof-byt-rt5651.m4 b/topology/sof-byt-rt5651.m4 index be3d994..91324ae 100644 --- a/topology/sof-byt-rt5651.m4 +++ b/topology/sof-byt-rt5651.m4 @@ -93,7 +93,7 @@ PCM_DUPLEX_ADD(Low Latency, 3, 0, 0, PIPELINE_PCM_1, PIPELINE_PCM_2) # # BE configurations - overrides config in ACPI if present # -DAI_CONFIG(SSP, 2, SSP2-Codec, I2S, 24, +DAI_CONFIG(SSP, 2, 0, SSP2-Codec, I2S, 24, DAI_CLOCK(mclk, 19200000, codec_mclk_in), DAI_CLOCK(bclk, 2400000, codec_slave), DAI_CLOCK(fsync, 48000, codec_slave), diff --git a/topology/sof-cht-max98090.m4 b/topology/sof-cht-max98090.m4 index 7ba4df7..5fb7802 100644 --- a/topology/sof-cht-max98090.m4 +++ b/topology/sof-cht-max98090.m4 @@ -93,7 +93,7 @@ PCM_DUPLEX_ADD(Low Latency, 6, 0, 0, PIPELINE_PCM_1, PIPELINE_PCM_2) # # BE configurations - overrides config in ACPI if present # -DAI_CONFIG(SSP, 2, SSP2-Codec, I2S, 16, +DAI_CONFIG(SSP, 2, 0, SSP2-Codec, I2S, 16, DAI_CLOCK(mclk, 19200000, codec_mclk_in), DAI_CLOCK(bclk, 1920000, codec_slave), DAI_CLOCK(fsync, 48000, codec_slave), diff --git a/topology/sof-cht-nocodec.m4 b/topology/sof-cht-nocodec.m4 index a0eb9cd..bd4d969 100644 --- a/topology/sof-cht-nocodec.m4 +++ b/topology/sof-cht-nocodec.m4 @@ -93,7 +93,7 @@ PCM_DUPLEX_ADD(Low Latency, 6, 0, 0, PIPELINE_PCM_1, PIPELINE_PCM_2) # # BE configurations - overrides config in ACPI if present # -DAI_CONFIG(SSP, 2, NoCodec, I2S, 24, +DAI_CONFIG(SSP, 2, 0, NoCodec, I2S, 24, DAI_CLOCK(mclk, 19200000, codec_mclk_in), DAI_CLOCK(bclk, 2400000, codec_slave), DAI_CLOCK(fsync, 48000, codec_slave), diff --git a/topology/sof-cnl-rt274.m4 b/topology/sof-cnl-rt274.m4 index 36cd91f..01cd203 100644 --- a/topology/sof-cnl-rt274.m4 +++ b/topology/sof-cnl-rt274.m4 @@ -64,7 +64,7 @@ PCM_DUPLEX_ADD(Passthrough, 3, 0, 0, PIPELINE_PCM_1, PIPELINE_PCM_2) # # BE configurations - overrides config in ACPI if present # -DAI_CONFIG(SSP, 0, SSP0-Codec, DSP_B, 24, +DAI_CONFIG(SSP, 0, 0, SSP0-Codec, DSP_B, 24, DAI_CLOCK(mclk, 24000000, codec_mclk_in), DAI_CLOCK(bclk, 4800000, codec_slave), DAI_CLOCK(fsync, 48000, codec_slave), diff --git a/topology/sof-hsw-rt5640.m4 b/topology/sof-hsw-rt5640.m4 index 85b8209..28d5c6a 100644 --- a/topology/sof-hsw-rt5640.m4 +++ b/topology/sof-hsw-rt5640.m4 @@ -93,7 +93,7 @@ PCM_DUPLEX_ADD(Low Latency, 6, 0, 0, PIPELINE_PCM_1, PIPELINE_PCM_2) # # BE configurations - overrides config in ACPI if present # -DAI_CONFIG(SSP, 0, Codec, I2S, 24, +DAI_CONFIG(SSP, 0, 0, Codec, I2S, 24, DAI_CLOCK(mclk, 24000000, codec_mclk_in), DAI_CLOCK(bclk, 2400000, codec_slave), DAI_CLOCK(fsync, 48000, codec_slave), diff --git a/topology/test/test-capture-ssp.m4 b/topology/test/test-capture-ssp.m4 index 6d666dc..67f0da9 100644 --- a/topology/test/test-capture-ssp.m4 +++ b/topology/test/test-capture-ssp.m4 @@ -68,7 +68,7 @@ PCM_CAPTURE_ADD(Passthrough, 3, 0, 0, PIPELINE_PCM_2) # # TEST_SSP_DATA_BITS bit I2S using TEST_SSP_PHY_BITS bit sample conatiner on SSP TEST_SSP_PORT # -DAI_CONFIG(SSP, TEST_SSP_PORT, TEST_DAI_LINK_NAME, TEST_SSP_MODE, TEST_SSP_DATA_BITS, +DAI_CONFIG(SSP, TEST_SSP_PORT, 0, TEST_DAI_LINK_NAME, TEST_SSP_MODE, TEST_SSP_DATA_BITS, DAI_CLOCK(mclk, TEST_SSP_MCLK, codec_mclk_in), DAI_CLOCK(bclk, TEST_SSP_BCLK, codec_slave), DAI_CLOCK(fsync, 48000, codec_slave), diff --git a/topology/test/test-playback-ssp.m4 b/topology/test/test-playback-ssp.m4 index 5ee1b53..22943b0 100644 --- a/topology/test/test-playback-ssp.m4 +++ b/topology/test/test-playback-ssp.m4 @@ -68,7 +68,7 @@ PCM_PLAYBACK_ADD(Passthrough, 3, 0, 0, PIPELINE_PCM_1) # # TEST_SSP_DATA_BITS bit I2S using TEST_SSP_PHY_BITS bit sample conatiner on SSP TEST_SSP_PORT # -DAI_CONFIG(SSP, TEST_SSP_PORT, TEST_DAI_LINK_NAME, TEST_SSP_MODE, TEST_SSP_DATA_BITS, +DAI_CONFIG(SSP, TEST_SSP_PORT, 0, TEST_DAI_LINK_NAME, TEST_SSP_MODE, TEST_SSP_DATA_BITS, DAI_CLOCK(mclk, TEST_SSP_MCLK, codec_slave), DAI_CLOCK(bclk, TEST_SSP_BCLK, codec_slave), DAI_CLOCK(fsync, 48000, codec_slave), diff --git a/topology/test/test-ssp.m4 b/topology/test/test-ssp.m4 index 1bdce2f..0b305e1 100644 --- a/topology/test/test-ssp.m4 +++ b/topology/test/test-ssp.m4 @@ -86,7 +86,7 @@ PCM_DUPLEX_ADD(Passthrough, 3, 0, 0, PIPELINE_PCM_1, PIPELINE_PCM_2) # # TEST_SSP_DATA_BITS bit I2S using TEST_SSP_PHY_BITS bit sample conatiner on SSP TEST_SSP_PORT # -DAI_CONFIG(SSP, TEST_SSP_PORT, TEST_DAI_LINK_NAME, TEST_SSP_MODE, TEST_SSP_DATA_BITS, +DAI_CONFIG(SSP, TEST_SSP_PORT, 0, TEST_DAI_LINK_NAME, TEST_SSP_MODE, TEST_SSP_DATA_BITS, DAI_CLOCK(mclk, TEST_SSP_MCLK, codec_mclk_in), DAI_CLOCK(bclk, TEST_SSP_BCLK, codec_slave), DAI_CLOCK(fsync, 48000, codec_slave), diff --git a/topology/test/test-tone-playback-ssp.m4 b/topology/test/test-tone-playback-ssp.m4 index 069ad64..b08447a 100644 --- a/topology/test/test-tone-playback-ssp.m4 +++ b/topology/test/test-tone-playback-ssp.m4 @@ -56,7 +56,7 @@ DAI_ADD(sof/pipe-dai-playback.m4, # # TEST_SSP_DATA_BITS bit I2S using TEST_SSP_PHY_BITS bit sample conatiner on SSP TEST_SSP_PORT # -DAI_CONFIG(SSP, TEST_SSP_PORT, TEST_DAI_LINK_NAME, I2S, TEST_SSP_DATA_BITS, +DAI_CONFIG(SSP, TEST_SSP_PORT, 0, TEST_DAI_LINK_NAME, I2S, TEST_SSP_DATA_BITS, DAI_CLOCK(mclk, TEST_SSP_MCLK, codec_mclk_in), DAI_CLOCK(bclk, TEST_SSP_BCLK, codec_slave), DAI_CLOCK(fsync, 48000, codec_slave), -- 2.14.1

4 4

[Sound-open-firmware] [PATCH] Removing unneeded XTOS sections from boot_ldr and main fw.
by Liam Girdwood 24 May '18

24 May '18

From: Marcin Maka <marcin.maka(a)linux.intel.com> Signed-off-by: Marcin Maka <marcin.maka(a)linux.intel.com> --- rimage/elf.c | 10 +++++++--- rimage/manifest.c | 5 +++++ src/arch/xtensa/Makefile.am | 6 ------ 3 files changed, 12 insertions(+), 9 deletions(-) diff --git a/rimage/elf.c b/rimage/elf.c index 6c7e3da..4efed7a 100644 --- a/rimage/elf.c +++ b/rimage/elf.c @@ -77,9 +77,12 @@ static int elf_read_sections(struct image *image, struct module *module) /* find manifest module data */ man_section_idx = elf_find_section(image, module, ".bss"); if (man_section_idx < 0) { - return -EINVAL; + /* no bss - it is OK for boot_ldr */ + module->bss_start = 0; + module->bss_end = 0; + } else { + module->bss_index = man_section_idx; } - module->bss_index = man_section_idx; fprintf(stdout, " BSS module metadata section at index %d\n", man_section_idx); @@ -325,7 +328,8 @@ static void elf_module_limits(struct image *image, struct module *module) uint32_t valid = (SHF_WRITE | SHF_ALLOC | SHF_EXECINSTR); int i; - module->text_start = module->data_start = module->bss_start = 0xffffffff; + module->text_start = module->data_start = 0xffffffff; + module->bss_start = 0; module->text_end = module->data_end = module->bss_end = 0; fprintf(stdout, " Found %d sections, listing valid sections......\n", diff --git a/rimage/manifest.c b/rimage/manifest.c index 6bb4ad3..257aa0d 100644 --- a/rimage/manifest.c +++ b/rimage/manifest.c @@ -400,6 +400,11 @@ static int man_module_create(struct image *image, struct module *module, if ((module->bss_end - module->bss_start) % MAN_PAGE_SIZE) pages += 1; man_module->segment[SOF_MAN_SEGMENT_BSS].flags.r.length = pages; + if (pages == 0) { + man_module->segment[SOF_MAN_SEGMENT_BSS].flags.ul = 0; + man_module->segment[SOF_MAN_SEGMENT_BSS].flags.r.type = + SOF_MAN_SEGMENT_EMPTY; + } fprintf(stdout, "\tNo\tAddress\t\tSize\t\tFile\tType\n"); diff --git a/src/arch/xtensa/Makefile.am b/src/arch/xtensa/Makefile.am index 9f53e88..eafde0d 100644 --- a/src/arch/xtensa/Makefile.am +++ b/src/arch/xtensa/Makefile.am @@ -61,7 +61,6 @@ sof_LDADD = \ ../../audio/libaudio.a \ ../../math/libsof_math.a \ ../../drivers/libdrivers.a \ - libreset.a \ xtos/libxtos.a \ xtos/libxlevel2.a \ xtos/libxlevel3.a \ @@ -111,11 +110,6 @@ boot_ldr_CCASFLAGS = \ boot_ldr_LDADD = \ hal/libhal.a \ libreset.a \ - xtos/libxtos.a \ - xtos/libxlevel2.a \ - xtos/libxlevel3.a \ - xtos/libxlevel4.a \ - xtos/libxlevel5.a \ -lgcc boot_ldr_LDFLAGS = \ -- 2.17.0

1 2

[Sound-open-firmware] [PATCH 1/2] topology: change virtual widget types to non-DSP ones
by Keyon Jie 24 May '18

24 May '18

This means they won't be sent to firmware for components creation. Signed-off-by: Keyon Jie <yang.jie(a)linux.intel.com> --- Test with: APL-MRB with tdf8532 codec Linux topic/sof-v4.14: 0de0fcb1d077c3c2c3b06a6c64e85f14b7e75c0b SOF master: e5dab2ada6ef98dbc6224863110cc86b5839ea01 Tool master: b4f3670870ba5a933c3ec58a51b59ff9ef8b3588 --- topology/m4/utils.m4 | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/topology/m4/utils.m4 b/topology/m4/utils.m4 index 8b397b6..73faae6 100644 --- a/topology/m4/utils.m4 +++ b/topology/m4/utils.m4 @@ -74,7 +74,7 @@ dnl VIRTUAL_DAPM_ROUTE_OUT(name, dai type, dai index, direction, index) define(`VIRTUAL_DAPM_ROUTE_OUT', `SectionWidget.STR($1) {' ` index STR($5)' -` type "aif_out"' +` type "output"' ` no_pm "true"' `}' `SectionGraph.STR($2) {' @@ -89,7 +89,7 @@ dnl VIRTUAL_DAPM_ROUTE_IN(name, dai type, dai index, direction, index) define(`VIRTUAL_DAPM_ROUTE_IN', `SectionWidget.STR($1) {' ` index STR($5)' -` type "aif_in"' +` type "input"' ` no_pm "true"' `}' `SectionGraph.STR($2) {' @@ -104,7 +104,7 @@ dnl VIRTUAL_WIDGET(name, index) define(`VIRTUAL_WIDGET', `SectionWidget.STR($1) {' ` index STR($2)' -` type "mixer"' +` type "out_drv"' ` no_pm "true"' `}') -- 2.14.1

3 5