Skip to content

Init: move to Zephyr native - #6989

Merged
kv2019i merged 37 commits into
thesofproject:mainfrom
lyakh:init
Jan 26, 2023
Merged

Init: move to Zephyr native#6989
kv2019i merged 37 commits into
thesofproject:mainfrom
lyakh:init

Conversation

@lyakh

@lyakh lyakh commented Jan 24, 2023

Copy link
Copy Markdown
Collaborator

Remove hard-coded module initialisation from task_main_start() and use the native Zephyr initialisation framework.
Note: Not all modules converted yet

@lyakh lyakh changed the title [DNM][PoC] Init: move to Zephyr native [DNM][WiP] Init: move to Zephyr native Jan 24, 2023
lyakh added 27 commits January 25, 2023 15:34
@lyakh
zephyr: move primary_core_init() to POST_KERNEL
b130f85 
Zephyr has an elaborate subsystem initialisation framework. Use it
for primary_core_init() instead of calling it from main(). This
prepares for a migration of module initialisation to that framework
too.

Signed-off-by: Guennadi Liakhovetski <guennadi.liakhovetski@linux.intel.com>
@lyakh
zephyr: add a macro for module initialisation
af98b12 
This macro integrates SOF modules into Zephyr initialisation
framework. SOF module initialisation functions use
DECLARE_MODULE_ADAPTER() or DECLARE_MODULE() to register with the SOF
native initialisation scheme, now the same initialisation functions
can be used with the new SOF_MODULE_INIT() macro to integrate them
into the Zephyr initialisation flow.

Signed-off-by: Guennadi Liakhovetski <guennadi.liakhovetski@linux.intel.com>
@lyakh
volume: convert to Zephyr native initialisation
c750068 
Use SOF_MODULE_INIT() to register volume with the Zephyr
initialisation framework.

Signed-off-by: Guennadi Liakhovetski <guennadi.liakhovetski@linux.intel.com>
@lyakh
mixer: convert to Zephyr native initialisation
379d6b8 
Use SOF_MODULE_INIT() to register mixer, mixin and mixout with the
Zephyr initialisation framework.

Signed-off-by: Guennadi Liakhovetski <guennadi.liakhovetski@linux.intel.com>
@lyakh
dai: convert to Zephyr native initialisation
b5e3709 
Use SOF_MODULE_INIT() to register dai with the Zephyr
initialisation framework.

Signed-off-by: Guennadi Liakhovetski <guennadi.liakhovetski@linux.intel.com>
@lyakh
src: convert to Zephyr native initialisation
1c505af 
Use SOF_MODULE_INIT() to register src with the Zephyr
initialisation framework.

Signed-off-by: Guennadi Liakhovetski <guennadi.liakhovetski@linux.intel.com>
@lyakh
chain-dma: convert to Zephyr native initialisation
0ab9ea8 
Use SOF_MODULE_INIT() to register chain-dma with the Zephyr
initialisation framework.

Signed-off-by: Guennadi Liakhovetski <guennadi.liakhovetski@linux.intel.com>
@lyakh
selector: convert to Zephyr native initialisation
71ec0b4 
Use SOF_MODULE_INIT() to register selector with the Zephyr
initialisation framework.

Signed-off-by: Guennadi Liakhovetski <guennadi.liakhovetski@linux.intel.com>
@lyakh
switch: convert to Zephyr native initialisation
a63ed1b 
Use SOF_MODULE_INIT() to register switch with the Zephyr
initialisation framework.

Signed-off-by: Guennadi Liakhovetski <guennadi.liakhovetski@linux.intel.com>
@lyakh
tone: convert to Zephyr native initialisation
8080a72 
Use SOF_MODULE_INIT() to register tone with the Zephyr
initialisation framework.

Signed-off-by: Guennadi Liakhovetski <guennadi.liakhovetski@linux.intel.com>
@lyakh
eq-fir: convert to Zephyr native initialisation
04130ea 
Use SOF_MODULE_INIT() to register eq-fir with the Zephyr
initialisation framework.

Signed-off-by: Guennadi Liakhovetski <guennadi.liakhovetski@linux.intel.com>
@lyakh
eq-iir: convert to Zephyr native initialisation
41deb55 
Use SOF_MODULE_INIT() to register eq-iir with the Zephyr
initialisation framework.

Signed-off-by: Guennadi Liakhovetski <guennadi.liakhovetski@linux.intel.com>
@lyakh
keyword: convert to Zephyr native initialisation
244c02a 
Use SOF_MODULE_INIT() to register keyword with the Zephyr
initialisation framework.

Signed-off-by: Guennadi Liakhovetski <guennadi.liakhovetski@linux.intel.com>
@lyakh
host: convert to Zephyr native initialisation
b3e3eaa 
Use SOF_MODULE_INIT() to register host with the Zephyr
initialisation framework.

Signed-off-by: Guennadi Liakhovetski <guennadi.liakhovetski@linux.intel.com>
@lyakh
kpb: convert to Zephyr native initialisation
eb589e7 
Use SOF_MODULE_INIT() to register kpb with the Zephyr
initialisation framework.

Signed-off-by: Guennadi Liakhovetski <guennadi.liakhovetski@linux.intel.com>
@lyakh
smart-amp: convert to Zephyr native initialisation
f325b9c 
Use SOF_MODULE_INIT() to register smart-amp with the Zephyr
initialisation framework.

Signed-off-by: Guennadi Liakhovetski <guennadi.liakhovetski@linux.intel.com>
@lyakh
asrc: convert to Zephyr native initialisation
cef8756 
Use SOF_MODULE_INIT() to register asrc with the Zephyr
initialisation framework.

Signed-off-by: Guennadi Liakhovetski <guennadi.liakhovetski@linux.intel.com>
@lyakh
dcblock: convert to Zephyr native initialisation
fbe6cc6 
Use SOF_MODULE_INIT() to register dcblock with the Zephyr
initialisation framework.

Signed-off-by: Guennadi Liakhovetski <guennadi.liakhovetski@linux.intel.com>
@lyakh
mux: convert to Zephyr native initialisation
6a1b713 
Use SOF_MODULE_INIT() to register mux with the Zephyr
initialisation framework.

Signed-off-by: Guennadi Liakhovetski <guennadi.liakhovetski@linux.intel.com>
@lyakh
basefw: convert to Zephyr native initialisation
1c5eda4 
Use SOF_MODULE_INIT() to register basefw with the Zephyr
initialisation framework.

Signed-off-by: Guennadi Liakhovetski <guennadi.liakhovetski@linux.intel.com>
@lyakh
copier: convert to Zephyr native initialisation
4f0a474 
Use SOF_MODULE_INIT() to register copier with the Zephyr
initialisation framework.

Signed-off-by: Guennadi Liakhovetski <guennadi.liakhovetski@linux.intel.com>
@lyakh
cadence: convert to Zephyr native initialisation
ab18579 
Use SOF_MODULE_INIT() to register cadence with the Zephyr
initialisation framework.

Signed-off-by: Guennadi Liakhovetski <guennadi.liakhovetski@linux.intel.com>
@lyakh
passthrough: convert to Zephyr native initialisation
c6c3735 
Use SOF_MODULE_INIT() to register passthrough with the Zephyr
initialisation framework.

Signed-off-by: Guennadi Liakhovetski <guennadi.liakhovetski@linux.intel.com>
@lyakh
aria: convert to Zephyr native initialisation
01ea2dc 
Use SOF_MODULE_INIT() to register aria with the Zephyr
initialisation framework.

Signed-off-by: Guennadi Liakhovetski <guennadi.liakhovetski@linux.intel.com>
@lyakh
crossover: convert to Zephyr native initialisation
dadc152 
Use SOF_MODULE_INIT() to register crossover with the Zephyr
initialisation framework.

Signed-off-by: Guennadi Liakhovetski <guennadi.liakhovetski@linux.intel.com>
@lyakh
drc: convert to Zephyr native initialisation
351c54b 
Use SOF_MODULE_INIT() to register drc with the Zephyr
initialisation framework.

Signed-off-by: Guennadi Liakhovetski <guennadi.liakhovetski@linux.intel.com>
@lyakh
multiband-drc: convert to Zephyr native initialisation
b5fb4a6 
Use SOF_MODULE_INIT() to register multiband-drc with the Zephyr
initialisation framework.

Signed-off-by: Guennadi Liakhovetski <guennadi.liakhovetski@linux.intel.com>
lyakh added 10 commits January 25, 2023 15:41
@lyakh
google-rtc: convert to Zephyr native initialisation
ed41ed9 
Use SOF_MODULE_INIT() to register google-rtc with the Zephyr
initialisation framework.

Signed-off-by: Guennadi Liakhovetski <guennadi.liakhovetski@linux.intel.com>
@lyakh
igo-nr: convert to Zephyr native initialisation
7b15828 
Use SOF_MODULE_INIT() to register igo-nr with the Zephyr
initialisation framework.

Signed-off-by: Guennadi Liakhovetski <guennadi.liakhovetski@linux.intel.com>
@lyakh
rtnr: convert to Zephyr native initialisation
8a638ca 
Use SOF_MODULE_INIT() to register rtnr with the Zephyr
initialisation framework.

Signed-off-by: Guennadi Liakhovetski <guennadi.liakhovetski@linux.intel.com>
@lyakh
up-down-mixer: convert to Zephyr native initialisation
a3d522f 
Use SOF_MODULE_INIT() to register up-down-mixer with the Zephyr
initialisation framework.

Signed-off-by: Guennadi Liakhovetski <guennadi.liakhovetski@linux.intel.com>
@lyakh
tdfb: convert to Zephyr native initialisation
64748f0 
Use SOF_MODULE_INIT() to register tdfb with the Zephyr
initialisation framework.

Signed-off-by: Guennadi Liakhovetski <guennadi.liakhovetski@linux.intel.com>
@lyakh
google-hotword: convert to Zephyr native initialisation
2326b39 
Use SOF_MODULE_INIT() to register google-hotword with the Zephyr
initialisation framework.

Signed-off-by: Guennadi Liakhovetski <guennadi.liakhovetski@linux.intel.com>
@lyakh
dts: convert to Zephyr native initialisation
ae21eb3 
Use SOF_MODULE_INIT() to register dts with the Zephyr
initialisation framework.

Signed-off-by: Guennadi Liakhovetski <guennadi.liakhovetski@linux.intel.com>
@lyakh
waves: convert to Zephyr native initialisation
50b4827 
Use SOF_MODULE_INIT() to register waves with the Zephyr
initialisation framework.

Signed-off-by: Guennadi Liakhovetski <guennadi.liakhovetski@linux.intel.com>
@lyakh
probe: convert to Zephyr native initialisation
aa1816f 
Use SOF_MODULE_INIT() to register probe with the Zephyr
initialisation framework.

Signed-off-by: Guennadi Liakhovetski <guennadi.liakhovetski@linux.intel.com>
@lyakh
zephyr: remove unused module initialisation
4bb3ec8 
All SOF modules are now initialised using native Zephyr APIs, no need
any more in a dedicated ELF section. TODO: remove from linker scripts
once this is merged.

Signed-off-by: Guennadi Liakhovetski <guennadi.liakhovetski@linux.intel.com>
@lyakh
lyakh marked this pull request as ready for review January 25, 2023 15:33
@lyakh lyakh changed the title [DNM][WiP] Init: move to Zephyr native [DNM] Init: move to Zephyr native Jan 25, 2023
@lyakh lyakh changed the title [DNM] Init: move to Zephyr native Init: move to Zephyr native Jan 25, 2023
@lyakh

lyakh commented Jan 26, 2023

Copy link
Copy Markdown
Collaborator Author

@kv2019i @lgirdwood would be good to merge this ASAP to avoid merge conflicts. BTW even zephyrproject-rtos/zephyr#51217 won't be a big problem for this - we'd only need to change a single header when that's merged

kv2019i
kv2019i approved these changes Jan 26, 2023
View reviewed changes

@kv2019i kv2019i left a comment

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks very nice, a good cleanup in the wrapper.

Comment thread zephyr/wrapper.c
void sys_comp_module_mixer_interface_init(void);
#else
void sys_comp_module_mixout_interface_init(void);
#endif

@kv2019i kv2019i Jan 26, 2023

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It's nice to get reid of these ifdefs!

@kv2019i
kv2019i merged commit 6b9c3ca into thesofproject:main Jan 26, 2023
@lyakh
lyakh deleted the init branch January 26, 2023 15:10
@kv2019i kv2019i mentioned this pull request Jan 26, 2023
Closed
@aiChaoSONG aiChaoSONG mentioned this pull request Jan 30, 2023
Merged
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@kv2019i kv2019i kv2019i approved these changes
@iuliana-prodan iuliana-prodan iuliana-prodan approved these changes
@singalsu singalsu Awaiting requested review from singalsu singalsu is a code owner
@akloniex akloniex Awaiting requested review from akloniex
@abonislawski abonislawski Awaiting requested review from abonislawski abonislawski is a code owner
@lgirdwood lgirdwood Awaiting requested review from lgirdwood lgirdwood is a code owner
@plbossart plbossart Awaiting requested review from plbossart plbossart is a code owner
@mmaka1 mmaka1 Awaiting requested review from mmaka1 mmaka1 is a code owner
@lbetlej lbetlej Awaiting requested review from lbetlej lbetlej is a code owner
@dbaluta dbaluta Awaiting requested review from dbaluta dbaluta is a code owner

Assignees

No one assigned

Labels

None yet

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

3 participants

@lyakh @kv2019i @iuliana-prodan