audio: host-zephyr: Allocate DMA block configuration on heap #8867
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
LaurentiuM1234
requested review from
lgirdwood,
plbossart,
mmaka1,
lbetlej,
dbaluta and
kv2019i
as code owners
dbaluta
approved these changes
Feb 15, 2024
|
@marc-hb @lgirdwood I think I'm out of the loop here, what is the status of fixing zephyr builds? Are we waiting for some change to be merged into zephyr right? |
This is tracked in #8818 |
iuliana-prodan
approved these changes
Feb 16, 2024
kv2019i
approved these changes
Feb 16, 2024
lyakh
reviewed
Feb 19, 2024
src/audio/host-zephyr.c
Outdated
| break; | ||
| } | ||
|
|
||
| err = dma_config(hd->chan->dma->z_dev, hd->chan->index, dma_cfg); | ||
| if (err < 0) { | ||
| comp_err(dev, "host_params(): dma_config() failed"); | ||
| dma_release_channel(hd->dma->z_dev, hd->chan->index); | ||
| rfree(dma_block_cfg); |
There was a problem hiding this comment.
do we also want to reset dma_cfg->head_block to NULL before freeing? Might be worth making an error handling label at the bottom of the function
There was a problem hiding this comment.
fixed, should be ok now
Currently, the DMA block configuration (struct dma_block_config) is placed on the stack during host_common_params(). Later on, host_copy_one_shot() tries to re-configure the DMAC driver using the same block configuration that's located in a stack frame that's no longer valid. As such, allocate a DMA block configuration on the heap during host_common_params() which can be used later on (e.g: during host_copy_one_shot()) to reconfigure the DMAC. Signed-off-by: Laurentiu Mihalcea <[email protected]>
LaurentiuM1234
force-pushed
the
dma_block_cfg_patch
branch
from
2a368ac to
53bcdbd
Compare
lgirdwood
approved these changes
Feb 19, 2024
lyakh
approved these changes
Feb 20, 2024
| } | ||
|
|
||
| err = dma_get_attribute(hd->dma->z_dev, DMA_ATTR_COPY_ALIGNMENT, | ||
| &hd->dma_copy_align); | ||
|
|
||
| if (err < 0) { | ||
| comp_err(dev, "host_params(): dma_get_attribute()"); | ||
| return err; | ||
| goto err_free_block_cfg; |
There was a problem hiding this comment.
this actually seems to be a bug-fix...
abonislawski
approved these changes
Feb 20, 2024
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Currently, the DMA block configuration (struct dma_block_config) is placed on the stack during host_common_params(). Later on, host_copy_one_shot() tries to re-configure the DMAC driver using the same block configuration that's located in a stack frame that's no longer valid. As such, allocate a DMA block configuration on the heap during host_common_params() which can be used later on (e.g: during host_copy_one_shot()) to reconfigure the DMAC.
Cherry-picked from #8859