Skip to content

Conversation

@kv2019i
Copy link
Collaborator

@kv2019i kv2019i commented May 29, 2023

If SOF is built with Zephyr, the GPDMA/ALH ownership programming should happen in Zephyr platform code, not on SOF side.

Link: zephyrproject-rtos/zephyr#55738
Closes: #7249

@kv2019i
Copy link
Collaborator Author

kv2019i commented May 29, 2023

Marking as DNM until Zephyr-side dependency is merged (to Zephyr).

Copy link

@juimonen juimonen left a comment

Choose a reason for hiding this comment

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

I think zephyr is merged, though we need west update for zephyr

@kv2019i
Copy link
Collaborator Author

kv2019i commented Jun 1, 2023

@juimonen wrote:

I think zephyr is merged, though we need west update for zephyr

Yup, only a west update needed now, I could update this PR to do that.

I'm a bit tempted by your PR #7706 to remove the platform for cavs altogether. The results are amazingly good! :) I wonder if the IMR state save is working correctly, maybe that's something we need to double-check, but that's one option. Or we merge this and then #7706 and keep more options open in case we need a a quick revert.

@juimonen
Copy link

juimonen commented Jun 1, 2023

yeah also personally little bit suspicious about the #7706 results... I would still do some more testing with, exactly with pm/sleep/contextsave area...

kv2019i added 2 commits June 5, 2023 15:36
Forward Zephyr to commit 2ad1a24fd60d0df8cb45fb6ed6acf7b0d3820754 .

Contains 566 commits, including following:

dd09b04dc33e boards: xtensa: update rimage and west sign documentation
d98a7c2f8ddb soc: xtensa: cmake: add new WEST_SIGN_OPTS variable
794dff37754f boards: xtensa: mention the $HOME/.flexlmrc file alternative
ac3cafa2edd8 boards: xtensa: remove UP2 from README file
aa5b66be5f1f intel_adsp: cavs25: configure access to ALH
8e3437461d78 soc: intel_adsp: remove obsolete headers for cAVS platforms
44415eb881c8 intel_adsp: Initialize threadptr register
1c130d006099 arch: xtensa: Enable builds without the multithreading
f0b7c275bba9 boards: xtensa: intel_adsp_generic.rst: fix cAVS meaning
49c7aa56fa0c soc: intel_adsp: undefine NOP32
445f4e887712 arch/xtensa: undefine NOP32

Signed-off-by: Kai Vehmanen <kai.vehmanen@linux.intel.com>
If SOF is built with Zephyr, the GPDMA/ALH ownership programming
should happen in Zephyr platform code, not on SOF side.

Link: zephyrproject-rtos/zephyr#55738
Closes: thesofproject#7249
Signed-off-by: Kai Vehmanen <kai.vehmanen@linux.intel.com>
@kv2019i kv2019i force-pushed the 202304-cavs25-platform-clean-for-zephyr-builds branch from 48f07b3 to 5e2f53f Compare June 5, 2023 12:39
@kv2019i kv2019i changed the title [DNM] platform: cavs: do not program GPDMA/ALH ownership in Zephyr builds platform: cavs: do not program GPDMA/ALH ownership in Zephyr builds [MANIFEST UDPATE!] Jun 5, 2023
@kv2019i kv2019i added the manifest-update contains updates to west.yml label Jun 5, 2023
@kv2019i
Copy link
Collaborator Author

kv2019i commented Jun 5, 2023

#7706 is likely to make this PR no longer needed at all, but given that requires a bit more time to get the IMR boot implemetned, let's go ahead and proceed with this in the mean time.

Copy link
Contributor

@tmleman tmleman left a comment

Choose a reason for hiding this comment

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

Of the changes that may be important, you missed these two:

9515a5228b drivers: hda: power management changes
4f29930e4c pm: Fix cpus active count

@kv2019i
Copy link
Collaborator Author

kv2019i commented Jun 6, 2023

One PM fail in https://sof-ci.01.org/sofpr/PR7702/build8959/devicetest/index.html , otherwise looks good. Proceeding with merge.

@kv2019i kv2019i merged commit 07ed14b into thesofproject:main Jun 6, 2023
@marc-hb
Copy link
Collaborator

marc-hb commented Jun 7, 2023

LPGPDMA_CHOSEL_FLAG | LPGPDMA_CTLOSEL_FLAG);
#endif
}

Copy link
Collaborator

Choose a reason for hiding this comment

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

@kv2019i did you guys moved the DMA drivers to zephyr? Care to let me know the path in zephyr where this happens?

Copy link
Collaborator Author

Choose a reason for hiding this comment

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

@dbaluta Ack, all DMA drivers (HD-DMA and DW-DMA) moved now. They are in work/zephyr/drivers/dma/

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

manifest-update contains updates to west.yml

Projects

None yet

Development

Successfully merging this pull request may close these issues.

[BUG] cavs platform_init should not write to DSP shim registers in Zephyr build

5 participants