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

[DNM] dai: zephyr: add support for parsing new SAI/ESAI handshake encoding #8844

Closed
wants to merge 2 commits into from
Closed

[DNM] dai: zephyr: add support for parsing new SAI/ESAI handshake encoding #8844

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
65a300d
audio: dai-zephyr: add function for computing DMA slot
LaurentiuM1234 Feb 8, 2024
5cbf0be
ipc3: dai: change channel decoding function for native SAI and ESAI
LaurentiuM1234 Feb 8, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
39 changes: 37 additions & 2 deletions src/audio/dai-zephyr.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -565,6 +565,37 @@ static int dai_verify_params(struct dai_data *dd, struct comp_dev *dev,
return 0;
}

static int dai_get_dma_slot(struct dai_data *dd, struct comp_dev *dev, uint32_t *slot)
{
struct dai_config cfg;
int ret;
int hs;

ret = dai_config_get(dd->dai->dev, &cfg, dev->direction);
if (ret < 0) {
comp_err(dev, "failed to fetch DAI configuration");
return ret;
}

hs = dai_get_handshake(dd->dai, dev->direction, dd->stream_id);
if (ret < 0) {
comp_err(dev, "failed to fetch DAI handshake");
return ret;
}

switch (cfg.type) {
case DAI_IMX_SAI:
case DAI_IMX_ESAI:
*slot = (hs & GENMASK(15, 8)) >> 8;
break;
default:
*slot = hs;
return 0;
}

return 0;
}

static int dai_set_sg_config(struct dai_data *dd, struct comp_dev *dev, uint32_t period_bytes,
uint32_t period_count)
{
Expand All @@ -578,11 +609,15 @@ static int dai_set_sg_config(struct dai_data *dd, struct comp_dev *dev, uint32_t
if (dev->direction == SOF_IPC_STREAM_PLAYBACK) {
dd->process = pcm_get_conversion_function(local_fmt, dma_fmt);
config->direction = DMA_DIR_MEM_TO_DEV;
config->dest_dev = dai_get_handshake(dd->dai, dev->direction, dd->stream_id);
err = dai_get_dma_slot(dd, dev, &config->dest_dev);
if (err < 0)
return err;
} else {
dd->process = pcm_get_conversion_function(dma_fmt, local_fmt);
config->direction = DMA_DIR_DEV_TO_MEM;
config->src_dev = dai_get_handshake(dd->dai, dev->direction, dd->stream_id);
err = dai_get_dma_slot(dd, dev, &config->src_dev);
if (err < 0)
return err;
}

if (!dd->process) {
Expand Down
5 changes: 5 additions & 0 deletions src/ipc/ipc3/dai.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,12 @@ int dai_config_dma_channel(struct dai_data *dd, struct comp_dev *dev, const void
case SOF_DAI_IMX_ESAI:
handshake = dai_get_handshake(dd->dai, dai->direction,
dd->stream_id);
/* TODO: remove this when transition to native drivers is complete on all NXP platforms */
#ifndef CONFIG_ZEPHYR_NATIVE_DRIVERS
channel = EDMA_HS_GET_CHAN(handshake);
#else
channel = handshake & GENMASK(7, 0);
#endif /* CONFIG_ZEPHYR_NATIVE_DRIVERS */
break;
case SOF_DAI_IMX_MICFIL:
channel = dai_get_handshake(dd->dai, dai->direction,
Expand Down
Loading