zephyr: update SYS_INIT calls #6480

gmarull · 2022-10-25T09:48:23Z

Use the new call signature: int (*init_fn)(void);

NOTE: This should not be merged before zephyrproject-rtos/zephyr#51217 reaches Zephyr main and this project updates Zephyr revision.

sofci · 2022-10-25T09:52:05Z

Can one of the admins verify this patch?

reply test this please to run this test once

gkbldcig · 2022-10-25T10:19:19Z

Can one of the admins verify this patch?

lgirdwood · 2022-10-25T14:56:59Z

@gmarull thanks - I will run the CI after the Zephyr PR is merged. @kv2019i @mwasko fyi.

lgirdwood · 2022-11-01T15:36:30Z

@gmarull can you pls ping this PR when the Zephyr dependency is merged. It looks like things are fine here.

lyakh

this is good, and we'll need one more small change to

sof/zephyr/include/rtos/init.h

Lines 12 to 14 in a5dfa56

    
           static int zephyr_##name##_init(const struct device *dev) \ 
        
           { \ 
        
           	ARG_UNUSED(dev); \

- I'll mark this "request changes" not to forget that

lgirdwood · 2023-01-27T13:35:27Z

@gmarull Zephyr PR not currently merged, any update ?

gmarull · 2023-01-27T13:50:07Z

@gmarull Zephyr PR not currently merged, any update ?

it's been delayed until the 3.4 release.

lgirdwood · 2023-01-27T13:53:55Z

@gmarull Zephyr PR not currently merged, any update ?

it's been delayed until the 3.4 release.

Ack, pls ping after merge and we can also include a west update to this PR too.

nashif · 2023-04-12T11:11:10Z

@gmarull can you updater this PR?

gmarull · 2023-04-12T11:17:13Z

Updated PR, pending west.yml Zephyr SHA update (to be done after zephyrproject-rtos/zephyr#51217 is merged).

src/init/init.c

gmarull · 2023-04-19T08:08:09Z

@gmarull Can you update the PR to use latest Zephyr main tip to take in zephyrproject-rtos/zephyr#57000 , tests should now pass.

done

btian1 · 2023-04-19T08:56:44Z

Can this PR fix CI reported build errors like:
/zep_workspace/zephyr/include/zephyr/init.h:156:44: error: initialization of 'int ()(void)' from incompatible pointer type 'int ()(const struct device *)' [-Werror=incompatible-pointer-types]
156 | .init_fn = {.sys = (init_fn_)},
| ^
/zep_workspace/zephyr/include/zephyr/init.h:137:9: note: in expansion of macro 'SYS_INIT_NAMED'
137 | SYS_INIT_NAMED(init_fn, init_fn, level, prio)
| ^~~~~~~~~~~~~~
/zep_workspace/sof/src/init/init.c:350:1: note: in expansion of macro 'SYS_INIT'
350 | SYS_INIT(sof_init, POST_KERNEL, 99);
| ^~~~~~~~
/zep_workspace/zephyr/include/zephyr/init.h:156:44: note: (near initialization for '_init_sof_init.init_fn.sys')
156 | .init_fn = {.sys = (init_fn)},
| ^
/zep_workspace/zephyr/include/zephyr/init.h:137:9: note: in expansion of macro 'SYS_INIT_NAMED'
137 | SYS_INIT_NAMED(init_fn, init_fn, level, prio)
| ^~~~~~~~~~~~~~
/zep_workspace/sof/src/init/init.c:350:1: note: in expansion of macro 'SYS_INIT'
350 | SYS_INIT(sof_init, POST_KERNEL, 99);
| ^~~~~~~~

paulstelian97 · 2023-04-19T09:00:27Z

Does CI check every commit? Because I did notice that this may break bisect indeed.

kv2019i · 2023-04-19T09:52:01Z

@paulstelian97 wrote:

Does CI check every commit? Because I did notice that this may break bisect indeed.

CI doesn't check, but with bisect you will hit the problem if you build the tree from middle of this 3 patch series. But given this is a build-time warning only (fails CI but local build is ok), I'm willing to give this is a pass. Squashed commits are not nice either (but sometimes just mandatory).

gmarull · 2023-04-19T09:56:03Z

squashed to preserve bisectability.

paulstelian97

Given how small the patch is I'd say nobody should mind that this was squashed. Looks good now!

kv2019i · 2023-04-19T20:21:10Z

SOFCI TEST

kv2019i · 2023-04-20T08:48:07Z

@wszypelt @keqiaozhang @greg-intel we are really struggling with the CI on this one. Now the regression on Zephyr side should be fixed, but I'm seeing lot of failures in both SOF driver CI and the Intel FW CI. I can't fully decipher what's going on, it seems even the builds failed here (the rimage issue?). I re-kicked the driver CI already once, but still failing...

tmleman · 2023-04-20T10:25:12Z

@kv2019i we need this one too zephyrproject-rtos/zephyr#56790
TGL will not build without that.

kv2019i · 2023-04-20T10:29:50Z

@tmleman wrote:

@kv2019i we need this one too zephyrproject-rtos/zephyr#56790 TGL will not build without that.

Thanks! I just realized the same thing locally, it's definitely this one.

kv2019i · 2023-04-20T12:16:43Z

@gmarull So one more update would be needed to take zephyrproject-rtos/zephyr#56790 in (was just merged to Zephyr).

gmarull · 2023-04-20T12:32:26Z

@gmarull So one more update would be needed to take zephyrproject-rtos/zephyr#56790 in (was just merged to Zephyr).

done

kv2019i · 2023-04-20T12:39:37Z

@gmarull wrote:

@gmarull So one more update would be needed to take zephyrproject-rtos/zephyr#56790 in (was just merged to Zephyr).

done

Thanks and sorry for the hassle. These are not anyway related to the PR and we should have caught the Zephyr side problems earlier.

kv2019i · 2023-04-21T06:48:34Z

SOFCI TEST

kv2019i · 2023-04-21T08:04:59Z

Pains me to report but we have still failures:

These are not normal, we have multiple basic cases failing again.

kv2019i · 2023-04-21T14:12:56Z

Two more regressions identified -> zephyrproject-rtos/zephyr#57127
@gmarull No need to update,let me do a full test cycle with a working Zephyr version. Given so many problems, there could be more lurking in, so let me find them all before we proceed with this.

kv2019i · 2023-04-21T16:57:24Z

Got a clean test run now with #7491

So once zephyrproject-rtos/zephyr#57127 is merged, we can retry updating.

kv2019i · 2023-04-21T18:10:33Z

@gmarull zephyrproject-rtos/zephyr#57127 updated, one more update? Should pass the CI now (as #7491 passed).

Update Zephyr head, and use the new call signature: int (*init_fn)(void); Signed-off-by: Gerard Marull-Paretas <gerard@teslabs.com>

kv2019i · 2023-04-24T13:21:42Z

SOFCI TEST

kv2019i · 2023-04-24T16:13:37Z

One boot-log fail in https://sof-ci.01.org/sofpr/PR6480/build6378/devicetest/index.html and lack of test machines in https://sof-ci.01.org/sofpr/PR6480/build6379/devicetest/index.html . Given other tests are ok, and I got green runs with the draft PR #7491 , I think we are finally good to go with this.

Thank you @gmarull for the many updates!

gmarull requested review from dbaluta, lbetlej, lgirdwood, mmaka1 and plbossart as code owners October 25, 2022 09:48

gmarull mentioned this pull request Oct 25, 2022

zephyr: update SYS_INIT calls zephyrproject-rtos/sof#19

Merged

lgirdwood approved these changes Oct 25, 2022

View reviewed changes

lgirdwood added this to the v2.4 milestone Oct 25, 2022

marcinszkudlinski approved these changes Jan 25, 2023

View reviewed changes

lyakh requested changes Jan 27, 2023

View reviewed changes

kv2019i removed this from the v2.4 milestone Feb 17, 2023

gmarull force-pushed the sys-init-update branch from b3fb9bd to 3a3cf26 Compare April 12, 2023 11:15

gmarull requested review from abonislawski, dabekjakub, iuliana-prodan and kv2019i as code owners April 12, 2023 11:15

iuliana-prodan approved these changes Apr 12, 2023

View reviewed changes

nashif requested a review from lyakh April 12, 2023 22:49

nashif mentioned this pull request Apr 12, 2023

init: remove the need for a dummy device pointer in SYS_INIT functions zephyrproject-rtos/zephyr#51217

Merged

lyakh reviewed Apr 13, 2023

View reviewed changes

src/init/init.c Outdated Show resolved Hide resolved

gmarull force-pushed the sys-init-update branch from 3a3cf26 to 5111eaa Compare April 13, 2023 07:09

gmarull force-pushed the sys-init-update branch from 9d6679f to 09a5164 Compare April 19, 2023 08:07

gmarull force-pushed the sys-init-update branch from 09a5164 to e9def8b Compare April 19, 2023 09:55

paulstelian97 approved these changes Apr 19, 2023

View reviewed changes

paulstelian97 mentioned this pull request Apr 19, 2023

src: init: init.c: Remove unused sof_init parameter #7468

Closed

gmarull force-pushed the sys-init-update branch from e9def8b to 2006cc1 Compare April 20, 2023 12:32

kv2019i mentioned this pull request Apr 21, 2023

drivers: dai: fix regressions on Intel platforms zephyrproject-rtos/zephyr#57127

Merged

zephyr: update SYS_INIT calls

2c73b46

Update Zephyr head, and use the new call signature: int (*init_fn)(void); Signed-off-by: Gerard Marull-Paretas <gerard@teslabs.com>

gmarull force-pushed the sys-init-update branch from 2006cc1 to 2c73b46 Compare April 24, 2023 08:57

kv2019i merged commit ca68ba6 into thesofproject:main Apr 24, 2023

gmarull deleted the sys-init-update branch April 24, 2023 16:14

marc-hb mentioned this pull request Apr 24, 2023

[SKIP CI] parse_sparse_output.sh: add "removes address space" and "too many" #7488

Merged

	static int zephyr_##name##_init(const struct device *dev) \
	{ \
	ARG_UNUSED(dev); \

zephyr: update SYS_INIT calls #6480

zephyr: update SYS_INIT calls #6480

Uh oh!

Conversation

gmarull commented Oct 25, 2022

Uh oh!

sofci commented Oct 25, 2022

Uh oh!

gkbldcig commented Oct 25, 2022

Uh oh!

lgirdwood commented Oct 25, 2022

Uh oh!

lgirdwood commented Nov 1, 2022

Uh oh!

lyakh left a comment

Choose a reason for hiding this comment

Uh oh!

lgirdwood commented Jan 27, 2023

Uh oh!

gmarull commented Jan 27, 2023

Uh oh!

lgirdwood commented Jan 27, 2023

Uh oh!

nashif commented Apr 12, 2023

Uh oh!

gmarull commented Apr 12, 2023

Uh oh!

Uh oh!

gmarull commented Apr 19, 2023

Uh oh!

btian1 commented Apr 19, 2023

Uh oh!

paulstelian97 commented Apr 19, 2023

Uh oh!

kv2019i commented Apr 19, 2023

Uh oh!

gmarull commented Apr 19, 2023

Uh oh!

paulstelian97 left a comment

Choose a reason for hiding this comment

Uh oh!

kv2019i commented Apr 19, 2023

Uh oh!

kv2019i commented Apr 20, 2023

Uh oh!

tmleman commented Apr 20, 2023

Uh oh!

kv2019i commented Apr 20, 2023

Uh oh!

kv2019i commented Apr 20, 2023

Uh oh!

gmarull commented Apr 20, 2023

Uh oh!

kv2019i commented Apr 20, 2023

Uh oh!

kv2019i commented Apr 21, 2023

Uh oh!

kv2019i commented Apr 21, 2023

Uh oh!

kv2019i commented Apr 21, 2023

Uh oh!

kv2019i commented Apr 21, 2023

Uh oh!

kv2019i commented Apr 21, 2023

Uh oh!

kv2019i commented Apr 24, 2023

Uh oh!

kv2019i commented Apr 24, 2023

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

16 participants