Skip to content

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

Merged
kv2019i merged 1 commit into
thesofproject:mainfrom
juimonen:pm_move
Mar 27, 2023
Merged

zephyr: cavs: use zephyr pm, clk and dma glue#7183
kv2019i merged 1 commit into
thesofproject:mainfrom
juimonen:pm_move

Conversation

@juimonen

@juimonenjuimonen commented Feb 28, 2023

Copy link
Copy Markdown

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
Comment threadzephyr/lib/pm_runtime.c Outdated
@juimonen
juimonenforce-pushed the pm_move branch 2 times, most recently from ee870c4 to 7016c6eCompareMarch 2, 2023 15:07
@lgirdwood

lgirdwood commented Mar 8, 2023

Copy link
Copy Markdown
Member

@juimonen ping ? any update ?

@lgirdwoodlgirdwood added this to the v2.5 milestone Mar 8, 2023
@kv2019ikv2019i mentioned this pull request Mar 9, 2023
Open
26 tasks
@juimonen
juimonenforce-pushed the pm_move branch 2 times, most recently from caaab3c to dc2da1bCompareMarch 9, 2023 12:56
@juimonen

juimonen commented Mar 9, 2023

Copy link
Copy Markdown
Author

updated. actually going to D3 now in tgl.

lgirdwood
lgirdwood reviewed Mar 9, 2023
View reviewed changes

@lgirdwoodlgirdwood left a comment

Copy link
Copy Markdown
Member

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

juimonen commented Mar 9, 2023

Copy link
Copy Markdown
Author

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

@juimonen
juimonenforce-pushed the pm_move branch 4 times, most recently from 8af5d89 to 3f85590CompareMarch 10, 2023 12:07
@kv2019ikv2019i modified the milestones: v2.5, v2.6Mar 13, 2023
@juimonen
juimonenforce-pushed the pm_move branch 2 times, most recently from e29541c to 098192bCompareMarch 16, 2023 10:19
@juimonen

juimonen commented Mar 16, 2023

Copy link
Copy Markdown
Author

SOFCI TEST

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

juimonen commented Mar 17, 2023

Copy link
Copy Markdown
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

@juimonenjuimonen mentioned this pull request Mar 17, 2023
Merged
lgirdwood
lgirdwood reviewed Mar 17, 2023
View reviewed changes

@lgirdwoodlgirdwood left a comment

Copy link
Copy Markdown
Member

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

@kv2019ikv2019i 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.

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
Comment threadzephyr/lib/cpu.c Outdated

@lyakhlyakhMar 20, 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.

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.

@juimonenjuimonenMar 24, 2023

Copy link
Copy Markdown
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.

Comment threadwest.yml Outdated
@juimonenjuimonen changed the title zephyr: cavs: use zephyr pm, clk and dma glue[DO NOT MERGE] zephyr: cavs: use zephyr pm, clk and dma glueMar 20, 2023
@marc-hb
marc-hb marked this pull request as draft March 20, 2023 20:17
@juimonen
juimonenforce-pushed the pm_move branch 2 times, most recently from ae017c8 to f390185CompareMarch 23, 2023 14:55
@juimonen
juimonen marked this pull request as ready for review March 23, 2023 15:00
@juimonenjuimonen changed the title [DO NOT MERGE] zephyr: cavs: use zephyr pm, clk and dma gluezephyr: cavs: use zephyr pm, clk and dma glueMar 23, 2023
@juimonen

juimonen commented Mar 23, 2023

Copy link
Copy Markdown
Author

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

Jaska Uimonen
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 <jaska.uimonen@intel.com>
@kv2019i

kv2019i commented Mar 27, 2023

Copy link
Copy Markdown
Collaborator

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:mainMar 27, 2023
@kv2019ikv2019i mentioned this pull request Jun 20, 2023
Closed
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@lyakhlyakhlyakh left review comments
@lgirdwoodlgirdwoodlgirdwood left review comments
@kv2019ikv2019ikv2019i approved these changes
@tmlemantmlemantmleman approved these changes
@marc-hbmarc-hbAwaiting requested review from marc-hb
@aborisovichaborisovichAwaiting requested review from aborisovich
@iuliana-prodaniuliana-prodanAwaiting requested review from iuliana-prodaniuliana-prodan is a code owner
@dbalutadbalutaAwaiting requested review from dbalutadbaluta is a code owner
@abonislawskiabonislawskiAwaiting requested review from abonislawskiabonislawski is a code owner
@plbossartplbossartAwaiting requested review from plbossartplbossart is a code owner
@mmaka1mmaka1Awaiting requested review from mmaka1mmaka1 is a code owner
@lbetlejlbetlejAwaiting requested review from lbetlejlbetlej is a code owner

Assignees

@juimonenjuimonen

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