mux: implement ipc4 support by fkwasowi · Pull Request #6385 · thesofproject/sof

fkwasowi · 2022-10-10T10:19:46Z

mux module does not support ipc4

A change is needed to work properly: thesofproject/rimage#112

lgirdwood

Lots of complex looking code in here, can you provide more inline comments on each block to help reviewers. Thanks.

kv2019i

Thanks @fkwasowi ! A few comments inline, please see.

juimonen · 2022-10-10T13:28:00Z

@fkwasowi is it so that copier or mixinmixout can't do the operations the mux/demux is doing? Anyway good to have this, but we need to get the "full story" how these parameters are coming from the user space via topology and kernel to firmware. As I understand current mux/demux is a "process component" with binary blob interface -> so it should be ipc agnostic? so why do we need a new interface for it?

kv2019i

Thanks, the comment in build_config() is very good. Only one very minor nit left, please see inline, otherwise seems good to go.

stale

fkwasowi · 2022-10-18T06:53:34Z

Fine to me. @fkwasowi If you compare to #6429 , the rimage history is missing from commit description, but this is not a mandatory part (and is missing from some earlier updates as well). I'm good with this version as well. We can merge this directly when Marc approves.

Commit message changed

marc-hb

Fails to compile TGL in https://sof-ci.01.org/sof-pr-viewer/#/build/PR6385/build10613048

/localdisk/tools/xtensa/RG-2017.8-linux/XtensaTools/bin/xt-xcc -DBLD_COUNTERS=0 -DRELATIVE_FILE=\"src/audio/copier/copier.c\" -I/quickbuild/workspace1/24733/SOF_FW/src/platform/intel/cavs/include -I/quickbuild/workspace1/24733/SOF_FW/src/arch/xtensa/include -I/quickbuild/workspace1/24733/SOF_FW/src/arch/xtensa/xtos -I/quickbuild/workspace1/24733/SOF_FW/xtos/include -I/quickbuild/workspace1/24733/SOF_FW/src/platform/tigerlake/include -I/localdisk/tools/xtensa/RG-2017.8-linux/cavs2x_LX6HiFi3_2017_8/xtensa-elf/arch/include -I/localdisk/tools/xtensa/RG-2017.8-linux/cavs2x_LX6HiFi3_2017_8/xtensa-elf/include -I/quickbuild/workspace1/24733/SOF_FW/rimage/src/include -I/quickbuild/workspace1/24733/SOF_FW/src/include -I/quickbuild/workspace1/24733/SOF_FW/build_fw/generated/include -I/quickbuild/workspace1/24733/SOF_FW/third_party_include -nostdlib -fno-inline-functions -mlongcalls -O2 -g -Wall -Werror -Wl,-EL -Wmissing-prototypes -Wpointer-arith -mtext-section-literals -imacros/quickbuild/workspace1/24733/SOF_FW/build_fw/generated/include/autoconfig.h -MD -MT CMakeFiles/sof.dir/src/audio/copier/copier.c.o -MF CMakeFiles/sof.dir/src/audio/copier/copier.c.o.d -o CMakeFiles/sof.dir/src/audio/copier/copier.c.o -c /quickbuild/workspace1/24733/SOF_FW/src/audio/copier/copier.c
/quickbuild/workspace1/24733/SOF_FW/src/audio/copier/copier.c: In function ‘copier_new’:
/quickbuild/workspace1/24733/SOF_FW/src/audio/copier/copier.c:463: error: ‘for’ loop initial declaration used outside C99 mode
/quickbuild/workspace1/24733/SOF_FW/src/audio/copier/copier.c: In function ‘copier_prepare’:
/quickbuild/workspace1/24733/SOF_FW/src/audio/copier/copier.c:622: error: ‘for’ loop initial declaration used outside C99 mode
CMakeFiles/sof.dir/build.make:1037: recipe for target 'CMakeFiles/sof.dir/src/audio/copier/copier.c.o' failed
make[3]: *** [CMakeFiles/sof.dir/src/audio/copier/copier.c.o] Error 2

TGL compiles just fine in https://sof-ci.01.org/sofpr/PR6385/build1949/build/tgl_zph.txt with xcc/install/builds/RG-2017.8-linux/cavs2x_LX6HiFi3_2017_8 and (hopefully) in your workspace too? What toolchain did you use?

So this looks a CI misconfiguration problem. CI should never compile anything with "secret flags" or secret options / configurations that developers cannot reproduce easily, all the entire build configurations MUST be available in version control. No CI "secret sauce" ever.

Whatever the root cause is, we can't merge code that does not compile for whatever reason.

fkwasowi · 2022-10-19T10:03:02Z

Fails to compile TGL in https://sof-ci.01.org/sof-pr-viewer/#/build/PR6385/build10613048

/localdisk/tools/xtensa/RG-2017.8-linux/XtensaTools/bin/xt-xcc -DBLD_COUNTERS=0 -DRELATIVE_FILE=\"src/audio/copier/copier.c\" -I/quickbuild/workspace1/24733/SOF_FW/src/platform/intel/cavs/include -I/quickbuild/workspace1/24733/SOF_FW/src/arch/xtensa/include -I/quickbuild/workspace1/24733/SOF_FW/src/arch/xtensa/xtos -I/quickbuild/workspace1/24733/SOF_FW/xtos/include -I/quickbuild/workspace1/24733/SOF_FW/src/platform/tigerlake/include -I/localdisk/tools/xtensa/RG-2017.8-linux/cavs2x_LX6HiFi3_2017_8/xtensa-elf/arch/include -I/localdisk/tools/xtensa/RG-2017.8-linux/cavs2x_LX6HiFi3_2017_8/xtensa-elf/include -I/quickbuild/workspace1/24733/SOF_FW/rimage/src/include -I/quickbuild/workspace1/24733/SOF_FW/src/include -I/quickbuild/workspace1/24733/SOF_FW/build_fw/generated/include -I/quickbuild/workspace1/24733/SOF_FW/third_party_include -nostdlib -fno-inline-functions -mlongcalls -O2 -g -Wall -Werror -Wl,-EL -Wmissing-prototypes -Wpointer-arith -mtext-section-literals -imacros/quickbuild/workspace1/24733/SOF_FW/build_fw/generated/include/autoconfig.h -MD -MT CMakeFiles/sof.dir/src/audio/copier/copier.c.o -MF CMakeFiles/sof.dir/src/audio/copier/copier.c.o.d -o CMakeFiles/sof.dir/src/audio/copier/copier.c.o -c /quickbuild/workspace1/24733/SOF_FW/src/audio/copier/copier.c
/quickbuild/workspace1/24733/SOF_FW/src/audio/copier/copier.c: In function ‘copier_new’:
/quickbuild/workspace1/24733/SOF_FW/src/audio/copier/copier.c:463: error: ‘for’ loop initial declaration used outside C99 mode
/quickbuild/workspace1/24733/SOF_FW/src/audio/copier/copier.c: In function ‘copier_prepare’:
/quickbuild/workspace1/24733/SOF_FW/src/audio/copier/copier.c:622: error: ‘for’ loop initial declaration used outside C99 mode
CMakeFiles/sof.dir/build.make:1037: recipe for target 'CMakeFiles/sof.dir/src/audio/copier/copier.c.o' failed
make[3]: *** [CMakeFiles/sof.dir/src/audio/copier/copier.c.o] Error 2

Fixed

marc-hb · 2022-10-19T14:45:32Z

So this looks a CI misconfiguration problem. CI should never compile anything with "secret flags" or secret options / configurations that developers cannot reproduce easily, all the entire build configurations MUST be available in version control. No CI "secret sauce" ever.

Fixed

What was fixed, is the CI secret sauce gone? It looks like you just changed the code to avoid the issue.

marc-hb · 2022-10-20T01:16:03Z

Fails to compile TGL in https://sof-ci.01.org/sof-pr-viewer/#/build/PR6385/build10613048

Apologies, this was not a Zephyr build. Thanks @mwasko for the tip.

Now compiles

upgrade rimage to 3ee717e3ee717e probe: mtl.toml invaliv probe type 1f4a36e mux: fix module type dcfd11b mux: add mux cfg to list of modules d957e03 rimage: make ace15 signing to support openssl3 a1b6e6d manifest: add fw_ver_micro to manifest fb28357 config: mtl: add probe module Signed-off-by: Kwasowiec, Fabiola <fabiola.kwasowiec@intel.com>

mux module does not support ipc4 Signed-off-by: "Kwasowiec, Fabiola" <fabiola.kwasowiec@intel.com>

conversion function and out_fmt is set only for first pin Signed-off-by: "Kwasowiec, Fabiola" <fabiola.kwasowiec@intel.com>

aborisovich · 2022-10-20T07:14:55Z

SOF CI

fkwasowi · 2022-10-20T07:18:06Z

@kv2019i , You recently released a change with the same failing step (#6383), "Known fail in IPC4 test set, proceeding with merge."-could I also ask for such a merge? Because I do not know how to pass the step sof-ci. I have the same problem as Tomasz Lissowski had.

marc-hb · 2022-10-20T17:37:08Z

I merged @kv2019i 's hard work in thesofproject/sof-test#971 so https://sof-ci.01.org/sofpr/PR6385/build2000/devicetest is all green. No need to ask for any exception now

fkwasowi requested a review from akloniex as a code owner October 10, 2022 10:19

fkwasowi force-pushed the mux_module_ipc4_support branch from 4ed7f08 to 929075fCompare October 10, 2022 10:32

lgirdwood reviewed Oct 10, 2022
View reviewed changes

kv2019i requested changes Oct 10, 2022
View reviewed changes

kv2019i requested review from RanderWang, aiChaoSONG, juimonen, lyakh, marcinszkudlinski and ranj063 October 10, 2022 11:38

fkwasowi force-pushed the mux_module_ipc4_support branch 3 times, most recently from 020c9d1 to a472329Compare October 10, 2022 13:06

fkwasowi requested review from kv2019i and lgirdwood October 10, 2022 13:09

fkwasowi force-pushed the mux_module_ipc4_support branch from a472329 to 6f542b2Compare October 10, 2022 13:23

fkwasowi force-pushed the mux_module_ipc4_support branch from 6f542b2 to 52b971eCompare October 10, 2022 13:31

aiChaoSONG reviewed Oct 11, 2022
View reviewed changes

Comment threadsrc/audio/mux/mux.c Outdated

aiChaoSONG reviewed Oct 11, 2022
View reviewed changes

Comment threadsrc/audio/mux/mux.c Outdated

aiChaoSONG reviewed Oct 11, 2022
View reviewed changes

Comment threadsrc/audio/mux/mux.c Outdated

fkwasowi force-pushed the mux_module_ipc4_support branch 3 times, most recently from a523547 to 1daad89Compare October 11, 2022 09:35

fkwasowi requested a review from aiChaoSONG October 11, 2022 09:55

kv2019i requested changes Oct 11, 2022
View reviewed changes

Comment threadsrc/audio/mux/mux.c Outdated
Comment threadsrc/audio/mux/mux.c Outdated

fkwasowi requested review from dbaluta, lbetlej, mmaka1 and plbossart as code owners October 11, 2022 11:01

fkwasowi force-pushed the mux_module_ipc4_support branch from 1b89ee6 to 58dc1aeCompare October 18, 2022 06:51

fkwasowi force-pushed the mux_module_ipc4_support branch from 58dc1ae to 6c0b8b3Compare October 18, 2022 06:55

lyakh reviewed Oct 18, 2022
View reviewed changes

Comment threadsrc/audio/copier/copier.c Outdated

marc-hb previously requested changes Oct 18, 2022
View reviewed changes

fkwasowi force-pushed the mux_module_ipc4_support branch 2 times, most recently from a51e0b7 to 00bdacbCompare October 19, 2022 09:57

fkwasowi force-pushed the mux_module_ipc4_support branch from 00bdacb to 2d8918cCompare October 19, 2022 10:14

fkwasowi requested review from aborisovich, bardliao, bhiregoudar and sunilkumardommati as code owners October 19, 2022 10:14

fkwasowi force-pushed the mux_module_ipc4_support branch from 2d8918c to b3abf8dCompare October 19, 2022 10:16

kv2019i mentioned this pull request Oct 19, 2022
west.yml: upgrade rimage to 3ee717eebc6a2a512a0216363ae77473f94532c1 #6429
Closed

fkwasowi requested a review from marc-hb October 19, 2022 11:25

fkwasowi force-pushed the mux_module_ipc4_support branch from b3abf8d to 3c3ad13Compare October 19, 2022 13:22

fkwasowi added 3 commits October 20, 2022 08:33

mux: implement ipc4 support
59c54fa
mux module does not support ipc4 Signed-off-by: "Kwasowiec, Fabiola" <fabiola.kwasowiec@intel.com>

copier: set conversion function for all pins
f7c0b29
conversion function and out_fmt is set only for first pin Signed-off-by: "Kwasowiec, Fabiola" <fabiola.kwasowiec@intel.com>

fkwasowi force-pushed the mux_module_ipc4_support branch from 3c3ad13 to f7c0b29Compare October 20, 2022 07:07

mwasko approved these changes Oct 20, 2022
View reviewed changes

mwasko merged commit 8083eb0 into thesofproject:mainOct 20, 2022

Uh oh!

Conversation

fkwasowi commented Oct 10, 2022• edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

lgirdwood left a comment

Choose a reason for hiding this comment

Uh oh!

kv2019i left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

juimonen commented Oct 10, 2022• edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

kv2019i left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

fkwasowi commented Oct 18, 2022

Uh oh!

Uh oh!

marc-hb left a comment • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

fkwasowi commented Oct 19, 2022• edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

marc-hb commented Oct 19, 2022• edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

marc-hb commented Oct 20, 2022

Uh oh!

aborisovich commented Oct 20, 2022

Uh oh!

fkwasowi commented Oct 20, 2022

Uh oh!

marc-hb commented Oct 20, 2022

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

11 participants

fkwasowi commented Oct 10, 2022•
edited
Loading

juimonen commented Oct 10, 2022•
edited
Loading

marc-hb left a comment •
edited
Loading

fkwasowi commented Oct 19, 2022•
edited
Loading

marc-hb commented Oct 19, 2022•
edited
Loading