Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

zephyr: cavs: use zephyr pm, clk and dma glue #7183

Merged
merged 1 commit into from
Mar 27, 2023
Merged

zephyr: cavs: use zephyr pm, clk and dma glue #7183

merged 1 commit into from
Mar 27, 2023

Conversation

juimonen
Copy link

Start using zephyr pm_runtime, clk and dma glue code in cavs25 native drivers build. Move the files from ace/lib into zephyr/lib.

tmleman
tmleman reviewed Mar 1, 2023
View reviewed changes
zephyr/lib/pm_runtime.c Outdated Show resolved Hide resolved
@juimonen juimonen force-pushed the pm_move branch 2 times, most recently from ee870c4 to 7016c6e Compare March 2, 2023 15:07
@lgirdwood
Copy link
Member

@juimonen ping ? any update ?

@lgirdwood lgirdwood added this to the v2.5 milestone Mar 8, 2023
@kv2019i kv2019i mentioned this pull request Mar 9, 2023
Open
25 tasks
@juimonen juimonen force-pushed the pm_move branch 2 times, most recently from caaab3c to dc2da1b Compare March 9, 2023 12:56
@juimonen
Copy link
Author

juimonen commented Mar 9, 2023

updated. actually going to D3 now in tgl.

lgirdwood
lgirdwood reviewed Mar 9, 2023
View reviewed changes
Copy link
Member

@lgirdwood lgirdwood left a comment

Choose a reason for hiding this comment

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

Do we have any Zephyr commits as a dependecy prior to merge ?

@juimonen
Copy link
Author

juimonen commented Mar 9, 2023

Do we have any Zephyr commits as a dependecy prior to merge ?
yes, https://github.com/juimonen/zephyr/tree/pm_move

@juimonen juimonen force-pushed the pm_move branch 4 times, most recently from 8af5d89 to 3f85590 Compare March 10, 2023 12:07
@kv2019i kv2019i modified the milestones: v2.5, v2.6 Mar 13, 2023
@juimonen juimonen force-pushed the pm_move branch 2 times, most recently from e29541c to 098192b Compare March 16, 2023 10:19
@juimonen
Copy link
Author

SOFCI TEST

@juimonen juimonen marked this pull request as ready for review March 17, 2023 07:30
@juimonen
Copy link
Author

Finally should go to D3 even with asserts enabled. Cavs path had some arch_timer_disable to mess things up...
related zephyr change: zephyrproject-rtos/zephyr#55667

@juimonen juimonen mentioned this pull request Mar 17, 2023
Merged
lgirdwood
lgirdwood reviewed Mar 17, 2023
View reviewed changes
Copy link
Member

@lgirdwood lgirdwood left a comment

Choose a reason for hiding this comment

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

LGTM, pls ping when Zephyr part merged and update west commit.

kv2019i
kv2019i approved these changes Mar 20, 2023
View reviewed changes
Copy link
Collaborator

@kv2019i kv2019i left a comment

Choose a reason for hiding this comment

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

Looking good. Need the Zephyr dependency of course, but otherwise looks good. We can potentially remove the old implementation soon for cavs25.

lyakh
lyakh reviewed Mar 20, 2023
View reviewed changes
zephyr/lib/cpu.c
@@ -57,71 +57,7 @@ static FUNC_NORETURN void secondary_init(void *arg)
CODE_UNREACHABLE; /* LCOV_EXCL_LINE */
}

#ifndef CONFIG_ACE
Copy link
Collaborator

Choose a reason for hiding this comment

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

would the diff be smaller if you changed this to #if !CONFIG_ZEPHYR_NATIVE_DRIVERS and moved the added code here? With this kind of a change it's difficult to see whether the code id changed or just moved.

Copy link
Author

Choose a reason for hiding this comment

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

yeah probably. I personally dont like the !CONFIGs as they are really "easy" to misinterpret for not having the ! when reading the code. So I would prefer to have the configs without ! if not absolutely needed. But yes, you are also right that this PR didnt change the code of the other branch at all, just moved it around.

west.yml Outdated Show resolved Hide resolved
@juimonen juimonen changed the title zephyr: cavs: use zephyr pm, clk and dma glue [DO NOT MERGE] zephyr: cavs: use zephyr pm, clk and dma glue Mar 20, 2023
@marc-hb marc-hb marked this pull request as draft March 20, 2023 20:17
@juimonen juimonen force-pushed the pm_move branch 2 times, most recently from ae017c8 to f390185 Compare March 23, 2023 14:55
@juimonen juimonen marked this pull request as ready for review March 23, 2023 15:00
@juimonen juimonen changed the title [DO NOT MERGE] zephyr: cavs: use zephyr pm, clk and dma glue zephyr: cavs: use zephyr pm, clk and dma glue Mar 23, 2023
@juimonen
Copy link
Author

zephyr side pr merged, let's see the CI results...

zephyr: cavs: use zephyr pm, clk and dma glue
5d7dd6c 
Start using zephyr pm_runtime, clk and dma glue code in cavs25 native
drivers build. Move the files from ace/lib into zephyr/lib.

Also update west.yaml to related zephyr commit as power related
files have been moved to zephyr side.

Signed-off-by: Jaska Uimonen <[email protected]>
@kv2019i
Copy link
Collaborator

kv2019i commented Mar 27, 2023

One failure with capture tests but this was happening last week already:
https://sof-ci.01.org/sofpr/PR7183/build5003/devicetest/index.html

System-PM failures on one DUT in (also seen before this PR).
https://sof-ci.01.org/sofpr/PR7183/build5004/devicetest/index.html

Proceeding with merge.

@kv2019i kv2019i merged commit e9cfb64 into thesofproject:main Mar 27, 2023
@kv2019i kv2019i mentioned this pull request Jun 20, 2023
Closed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@lgirdwood lgirdwood lgirdwood left review comments

@lyakh lyakh lyakh left review comments

@tmleman tmleman tmleman approved these changes

@kv2019i kv2019i kv2019i approved these changes

@marc-hb marc-hb Awaiting requested review from marc-hb

@aborisovich aborisovich Awaiting requested review from aborisovich

@iuliana-prodan iuliana-prodan Awaiting requested review from iuliana-prodan iuliana-prodan is a code owner

@dbaluta dbaluta Awaiting requested review from dbaluta dbaluta is a code owner

@abonislawski abonislawski Awaiting requested review from abonislawski abonislawski 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

Assignees

@juimonen juimonen

Labels
None yet
Projects
None yet
Milestone
v2.6
Development

Successfully merging this pull request may close these issues.
5 participants
@juimonen @lgirdwood @kv2019i @lyakh @tmleman